Skip to content

Commit f9018f5

Browse files
committed
[CONJ-1049] Metadata getTableTypes result was not ordered by TABLE_TYPE
1 parent 0694cf2 commit f9018f5

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
* CONJ-1137 ensuring never having NPE in OkPacket when setting auto commit
2020
* CONJ-1138 Inconsistency in Behavior of PreparedStatement After closeOnCompletion() Between MariaDB and MySQL
2121
Connectors
22+
* CONJ-1049 Metadata getTableTypes result was not ordered by TABLE_TYPE
2223

2324
## [3.3.1](https://github.com/mariadb-corporation/mariadb-connector-j/tree/3.3.1) (Nov 2023)
2425

src/main/java/org/mariadb/jdbc/DatabaseMetaData.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -2401,11 +2401,11 @@ public ResultSet getCatalogs() throws SQLException {
24012401

24022402
public ResultSet getTableTypes() throws SQLException {
24032403
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 "
24062406
+ "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");
24092409
}
24102410

24112411
/**

src/test/java/org/mariadb/jdbc/integration/resultset/ResultSetMetadataTest.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -244,13 +244,16 @@ public void databaseResultsetMeta() throws SQLException {
244244
ResultSetMetaData rsMeta = rs.getMetaData();
245245
assertEquals("TABLE_TYPE", rsMeta.getColumnName(1));
246246
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));
248251
assertTrue(rs.next());
249252
assertEquals("SYSTEM VIEW", rs.getString(1));
250253
assertTrue(rs.next());
251-
assertEquals("VIEW", rs.getString(1));
254+
assertEquals("TABLE", rs.getString(1));
252255
assertTrue(rs.next());
253-
assertEquals("LOCAL TEMPORARY", rs.getString(1));
256+
assertEquals("VIEW", rs.getString(1));
254257
assertFalse(rs.next());
255258
}
256259
}

0 commit comments

Comments
 (0)