File tree 3 files changed +11
-7
lines changed
main/java/org/mariadb/jdbc
test/java/org/mariadb/jdbc/integration/resultset
3 files changed +11
-7
lines changed Original file line number Diff line number Diff line change 19
19
* CONJ-1137 ensuring never having NPE in OkPacket when setting auto commit
20
20
* CONJ-1138 Inconsistency in Behavior of PreparedStatement After closeOnCompletion() Between MariaDB and MySQL
21
21
Connectors
22
+ * CONJ-1049 Metadata getTableTypes result was not ordered by TABLE_TYPE
22
23
23
24
## [ 3.3.1] ( https://github.com/mariadb-corporation/mariadb-connector-j/tree/3.3.1 ) (Nov 2023)
24
25
Original file line number Diff line number Diff line change @@ -2401,11 +2401,11 @@ public ResultSet getCatalogs() throws SQLException {
2401
2401
2402
2402
public ResultSet getTableTypes () throws SQLException {
2403
2403
return executeQuery (
2404
- "SELECT 'SYSTEM TABLE ' TABLE_TYPE "
2405
- + "UNION ' TABLE' TABLE_TYPE "
2404
+ "SELECT 'LOCAL TEMPORARY ' TABLE_TYPE "
2405
+ + "UNION SELECT 'SYSTEM TABLE' TABLE_TYPE "
2406
2406
+ "UNION SELECT 'SYSTEM VIEW' TABLE_TYPE "
2407
- + "UNION SELECT 'VIEW ' TABLE_TYPE "
2408
- + "UNION SELECT 'LOCAL TEMPORARY ' TABLE_TYPE" );
2407
+ + "UNION SELECT 'TABLE ' TABLE_TYPE "
2408
+ + "UNION SELECT 'VIEW ' TABLE_TYPE" );
2409
2409
}
2410
2410
2411
2411
/**
Original file line number Diff line number Diff line change @@ -244,13 +244,16 @@ public void databaseResultsetMeta() throws SQLException {
244
244
ResultSetMetaData rsMeta = rs .getMetaData ();
245
245
assertEquals ("TABLE_TYPE" , rsMeta .getColumnName (1 ));
246
246
assertEquals ("" , rsMeta .getTableName (1 ));
247
- assertEquals ("TABLE" , rs .getString (1 ));
247
+
248
+ assertEquals ("LOCAL TEMPORARY" , rs .getString (1 ));
249
+ assertTrue (rs .next ());
250
+ assertEquals ("SYSTEM TABLE" , rs .getString (1 ));
248
251
assertTrue (rs .next ());
249
252
assertEquals ("SYSTEM VIEW" , rs .getString (1 ));
250
253
assertTrue (rs .next ());
251
- assertEquals ("VIEW " , rs .getString (1 ));
254
+ assertEquals ("TABLE " , rs .getString (1 ));
252
255
assertTrue (rs .next ());
253
- assertEquals ("LOCAL TEMPORARY " , rs .getString (1 ));
256
+ assertEquals ("VIEW " , rs .getString (1 ));
254
257
assertFalse (rs .next ());
255
258
}
256
259
}
You can’t perform that action at this time.
0 commit comments