[CONJ-1108] Database metadata listing TEMPORARY tables/sequences - ensure null handling

Author: rusher

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

@@ -738,12 +738,11 @@ public ResultSet getTables(
  StringBuilder sqlType =
  new StringBuilder(((firstCondition) ? " WHERE " : " AND ") + " TABLE_TYPE IN (");
  for (String s : types) {
- if (mustAddType) sqlType.append(",");
- mustAddType = true;
  if (s == null) {
- mustAddType = false;
  continue;
  }
+ if (mustAddType) sqlType.append(",");
+ mustAddType = true;
  switch (s) {
  case "TABLE":
  sqlType.append("'BASE TABLE','SYSTEM VERSIONED'");

src/test/java/org/mariadb/jdbc/integration/DatabaseMetadataTest.java

@@ -2749,7 +2749,6 @@ public void testTemporaryTables() throws SQLException {
  assertEquals("LOCAL TEMPORARY", rs.getString("TABLE_TYPE"));
  assertFalse(rs.next());
 
-
  rs = dbmd.getTables(null, null, "testTemporary%", new String[]{"TEMPORARY"});
  assertTrue(rs.next());
  assertEquals("testtemporarytables",rs.getString("TABLE_NAME").toLowerCase());
@@ -2758,6 +2757,18 @@ public void testTemporaryTables() throws SQLException {
 
  rs = dbmd.getTables(null, null, "testTemporary%", new String[]{"TABLE"});
  assertFalse(rs.next());
+
+ rs = dbmd.getTables(null, null, "testTemporary%", new String[]{"TEMPORARY", "TABLE"});
+ assertTrue(rs.next());
+ assertEquals("testtemporarytables",rs.getString("TABLE_NAME").toLowerCase());
+ assertEquals("LOCAL TEMPORARY", rs.getString("TABLE_TYPE"));
+ assertFalse(rs.next());
+
+ rs = dbmd.getTables(null, null, "testTemporary%", new String[]{"TEMPORARY", null, "TABLE"});
+ assertTrue(rs.next());
+ assertEquals("testtemporarytables",rs.getString("TABLE_NAME").toLowerCase());
+ assertEquals("LOCAL TEMPORARY", rs.getString("TABLE_TYPE"));
+ assertFalse(rs.next());
  }
 
 }