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

Author: rusher

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

@@ -722,7 +722,7 @@ public ResultSet getTables(
  StringBuilder sb =
  new StringBuilder(
  "SELECT TABLE_SCHEMA TABLE_CAT, NULL TABLE_SCHEM, TABLE_NAME, IF(TABLE_TYPE='BASE"
- + " TABLE' or TABLE_TYPE='SYSTEM VERSIONED', 'TABLE', TABLE_TYPE) as TABLE_TYPE,"
+ + " TABLE' or TABLE_TYPE='SYSTEM VERSIONED', 'TABLE', IF(TABLE_TYPE='TEMPORARY', 'LOCAL TEMPORARY', TABLE_TYPE)) as TABLE_TYPE,"
  + " TABLE_COMMENT REMARKS, NULL TYPE_CAT, NULL TYPE_SCHEM, NULL TYPE_NAME, NULL"
  + " SELF_REFERENCING_COL_NAME, NULL REF_GENERATION FROM"
  + " INFORMATION_SCHEMA.TABLES");
@@ -744,8 +744,17 @@ public ResultSet getTables(
  mustAddType = false;
  continue;
  }
- String type = "TABLE".equals(s) ? "'BASE TABLE','SYSTEM VERSIONED'" : escapeQuote(s);
- sqlType.append(type);
+ switch (s) {
+ case "TABLE":
+ sqlType.append("'BASE TABLE','SYSTEM VERSIONED'");
+ break;
+ case "LOCAL TEMPORARY":
+ sqlType.append("'TEMPORARY'");
+ break;
+ default:
+ sqlType.append(escapeQuote(s));
+ break;
+ }
  }
  sqlType.append(")");
  if (mustAddType) sb.append(sqlType);
@@ -2382,8 +2391,10 @@ public ResultSet getCatalogs() throws SQLException {
 
  public ResultSet getTableTypes() throws SQLException {
  return executeQuery(
- "SELECT 'TABLE' TABLE_TYPE UNION SELECT 'SYSTEM VIEW' TABLE_TYPE UNION SELECT 'VIEW'"
- + " TABLE_TYPE");
+ "SELECT 'TABLE' TABLE_TYPE " +
+ "UNION SELECT 'SYSTEM VIEW' TABLE_TYPE " +
+ "UNION SELECT 'VIEW' TABLE_TYPE " +
+ "UNION SELECT 'LOCAL TEMPORARY' TABLE_TYPE");
  }
 
  /**

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

@@ -2717,4 +2717,47 @@ public void foreignKeyTest() throws SQLException {
  }
  }
  }
+
+
+ @Test
+ public void testTemporaryTables() throws SQLException {
+ Assumptions.assumeTrue(isMariaDBServer() && minVersion(11,2,0));
+ Assumptions.assumeTrue(
+ !"mariadb-es".equals(System.getenv("srv"))
+ && !"mariadb-es-test".equals(System.getenv("srv")));
+
+ java.sql.Statement stmt = sharedConn.createStatement();
+ stmt.execute("create temporary table testTemporaryTables (b int)");
+ try (Connection con = createCon()) {
+ java.sql.Statement ss = con.createStatement();
+ ResultSet rr = ss.executeQuery("select table_schema, table_name, table_type, temporary " +
+ "from information_schema.tables " +
+ "where TABLE_NAME = 'testTemporaryTables'");
+ assertFalse(rr.next());
+ }
+ DatabaseMetaData dbmd = sharedConn.getMetaData();
+
+ ResultSet rs = dbmd.getTables(null, null, "testTemporary%", null);
+ 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[]{"LOCAL TEMPORARY"});
+ 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"});
+ 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[]{"TABLE"});
+ assertFalse(rs.next());
+ }
+
 }

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

@@ -244,5 +244,13 @@ public void databaseResultsetMeta() throws SQLException {
  ResultSetMetaData rsMeta = rs.getMetaData();
  assertEquals("TABLE_TYPE", rsMeta.getColumnName(1));
  assertEquals("", rsMeta.getTableName(1));
+ assertEquals("TABLE", rs.getString(1));
+ assertTrue(rs.next());
+ assertEquals("SYSTEM VIEW", rs.getString(1));
+ assertTrue(rs.next());
+ assertEquals("VIEW", rs.getString(1));
+ assertTrue(rs.next());
+ assertEquals("LOCAL TEMPORARY", rs.getString(1));
+ assertFalse(rs.next());
  }
 }