Skip to content

Commit

Permalink
fix: translate queries for all table types in JDBC metadata (#295)
Browse files Browse the repository at this point in the history 
Add translations for all table types in the JDBC getTables metadata
query.
  • Loading branch information
@olavloite
olavloite authored Aug 4, 2022
1 parent 612fc44 commit 4cb43e6
Show file tree
Hide file tree
Showing 2 changed files with 102 additions and 0 deletions.
54 changes: 54 additions & 0 deletions src/main/java/com/google/cloud/spanner/pgadapter/statements/JdbcMetadataStatementHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,9 +246,63 @@ private static String replaceGetTablesQuery(String sql) {
.replace(
"c.relkind IN ('r','p') AND n.nspname !~ '^pg_' AND n.nspname <> 'information_schema'",
"(CASE WHEN TABLE_TYPE = 'BASE TABLE' THEN 'TABLE' ELSE TABLE_TYPE END) = 'TABLE'")
.replace(
"c.relkind = 'p' AND n.nspname !~ '^pg_' AND n.nspname <> 'information_schema'",
"(CASE WHEN TABLE_TYPE = 'BASE TABLE' THEN 'TABLE' ELSE TABLE_TYPE END) = 'TABLE'")
.replace(
"c.relkind = 'v' AND n.nspname <> 'pg_catalog' AND n.nspname <> 'information_schema'",
"(CASE WHEN TABLE_TYPE = 'BASE TABLE' THEN 'TABLE' ELSE TABLE_TYPE END) = 'VIEW'")
.replace(
"c.relkind = 'i' AND n.nspname !~ '^pg_' AND n.nspname <> 'information_schema'",
"(CASE WHEN TABLE_TYPE = 'BASE TABLE' THEN 'TABLE' ELSE TABLE_TYPE END) = 'INDEX'")
.replace(
"c.relkind = 'I' AND n.nspname !~ '^pg_' AND n.nspname <> 'information_schema'",
"(CASE WHEN TABLE_TYPE = 'BASE TABLE' THEN 'TABLE' ELSE TABLE_TYPE END) = 'INDEX'")
.replace(
"c.relkind = 'S' AND n.nspname ~ '^pg_temp_'",
"(CASE WHEN TABLE_TYPE = 'BASE TABLE' THEN 'TABLE' ELSE TABLE_TYPE END) = 'TEMP SEQUENCE'")
.replace(
"c.relkind = 'S'",
"(CASE WHEN TABLE_TYPE = 'BASE TABLE' THEN 'TABLE' ELSE TABLE_TYPE END) = 'SEQUENCE'")
.replace(
"c.relkind = 'c' AND n.nspname !~ '^pg_' AND n.nspname <> 'information_schema'",
"(CASE WHEN TABLE_TYPE = 'BASE TABLE' THEN 'TABLE' ELSE TABLE_TYPE END) = 'TYPE'")
.replace(
"c.relkind = 'r' AND (n.nspname = 'pg_catalog' OR n.nspname = 'information_schema')",
"(CASE WHEN TABLE_TYPE = 'BASE TABLE' THEN 'TABLE' ELSE TABLE_TYPE END) = 'SYSTEM TABLE'")
.replace(
"c.relkind = 'r' AND n.nspname = 'pg_toast'",
"(CASE WHEN TABLE_TYPE = 'BASE TABLE' THEN 'TABLE' ELSE TABLE_TYPE END) = 'SYSTEM TOAST TABLE'")
.replace(
"c.relkind = 'i' AND n.nspname = 'pg_toast'",
"(CASE WHEN TABLE_TYPE = 'BASE TABLE' THEN 'TABLE' ELSE TABLE_TYPE END) = 'SYSTEM TOAST INDEX'")
.replace(
"c.relkind = 'v' AND (n.nspname = 'pg_catalog' OR n.nspname = 'information_schema')",
"(CASE WHEN TABLE_TYPE = 'BASE TABLE' THEN 'TABLE' ELSE TABLE_TYPE END) = 'SYSTEM VIEW'")
.replace(
"c.relkind = 'i' AND (n.nspname = 'pg_catalog' OR n.nspname = 'information_schema')",
"(CASE WHEN TABLE_TYPE = 'BASE TABLE' THEN 'TABLE' ELSE TABLE_TYPE END) = 'SYSTEM INDEX'")
.replace(
"c.relkind IN ('r','p') AND n.nspname ~ '^pg_temp_'",
"(CASE WHEN TABLE_TYPE = 'BASE TABLE' THEN 'TABLE' ELSE TABLE_TYPE END) = 'TEMP TABLE'")
.replace(
"c.relkind = 'r' AND n.nspname ~ '^pg_temp_'",
"(CASE WHEN TABLE_TYPE = 'BASE TABLE' THEN 'TABLE' ELSE TABLE_TYPE END) = 'TEMP TABLE'")
.replace(
"c.relkind = 'i' AND n.nspname ~ '^pg_temp_'",
"(CASE WHEN TABLE_TYPE = 'BASE TABLE' THEN 'TABLE' ELSE TABLE_TYPE END) = 'TEMP INDEX'")
.replace(
"c.relkind = 'v' AND n.nspname ~ '^pg_temp_'",
"(CASE WHEN TABLE_TYPE = 'BASE TABLE' THEN 'TABLE' ELSE TABLE_TYPE END) = 'TEMP VIEW'")
.replace(
"c.relkind = 'S' AND n.nspname ~ '^pg_temp_'",
"(CASE WHEN TABLE_TYPE = 'BASE TABLE' THEN 'TABLE' ELSE TABLE_TYPE END) = 'TEMP SEQUENCE'")
.replace(
"c.relkind = 'f'",
"(CASE WHEN TABLE_TYPE = 'BASE TABLE' THEN 'TABLE' ELSE TABLE_TYPE END) = 'FOREIGN TABLE'")
.replace(
"c.relkind = 'm'",
"(CASE WHEN TABLE_TYPE = 'BASE TABLE' THEN 'TABLE' ELSE TABLE_TYPE END) = 'MATERIALIZED VIEW'")
.replace(
"ORDER BY TABLE_TYPE,TABLE_SCHEM,TABLE_NAME",
"ORDER BY TABLE_CATALOG, TABLE_SCHEMA, TABLE_NAME");
Expand Down
48 changes: 48 additions & 0 deletions src/test/java/com/google/cloud/spanner/pgadapter/ITJdbcMetadataTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,54 @@ public void testDatabaseMetaDataTables_TablesAndViews() throws Exception {
});
}

@Test
public void testDatabaseMetaDataTables_AllTypes() throws Exception {
runForAllVersions(
connection -> {
try {
DatabaseMetaData metadata = connection.getMetaData();
try (ResultSet tables =
metadata.getTables(
null,
"public",
"%a%",
new String[] {
"TABLE",
"PARTITIONED TABLE",
"INDEX",
"PARTITIONED INDEX",
"SEQUENCE",
"TYPE",
"SYSTEM TABLE",
"SYSTEM TOAST TABLE",
"SYSTEM TOAST INDEX",
"SYSTEM VIEW",
"SYSTEM INDEX",
"TEMPORARY TABLE",
"TEMPORARY INDEX",
"TEMPORARY VIEW",
"TEMPORARY SEQUENCE",
"FOREIGN TABLE",
"MATERIALIZED VIEW",
"VIEW"
})) {
assertTrue(tables.next());
assertEquals("albums", tables.getString("TABLE_NAME"));
assertTrue(tables.next());
assertEquals("all_types", tables.getString("TABLE_NAME"));
assertTrue(tables.next());
assertEquals("recording_attempt", tables.getString("TABLE_NAME"));
assertTrue(tables.next());
assertEquals("tracks", tables.getString("TABLE_NAME"));

assertFalse(tables.next());
}
} catch (SQLException e) {
throw SpannerExceptionFactory.asSpannerException(e);
}
});
}

@Test
public void testDatabaseMetaDataColumns() throws Exception {
runForAllVersions(
Expand Down

0 comments on commit 4cb43e6

Please sign in to comment.