diff --git a/agents/drivers/dameng/src/main/java/com/dbx/agent/dameng/DamengAgent.java b/agents/drivers/dameng/src/main/java/com/dbx/agent/dameng/DamengAgent.java index e7eba9140d..80582de85b 100644 --- a/agents/drivers/dameng/src/main/java/com/dbx/agent/dameng/DamengAgent.java +++ b/agents/drivers/dameng/src/main/java/com/dbx/agent/dameng/DamengAgent.java @@ -216,7 +216,7 @@ public final class DamengAgent extends AbstractJdbcAgent { return listVisibleSchemas(); } catch (SQLException catalogError) { try { - return listVisibleUsers(); + return listJdbcSchemas(); } catch (Exception fallbackError) { catalogError.addSuppressed(fallbackError); throw catalogError; @@ -238,6 +238,19 @@ public final class DamengAgent extends AbstractJdbcAgent { return result; } + private List listJdbcSchemas() throws Exception { + Set schemas = new LinkedHashSet<>(); + try (ResultSet rs = requireConnected().getMetaData().getSchemas()) { + while (rs.next()) { + String schema = rs.getString("TABLE_SCHEM"); + if (schema != null && !schema.isBlank()) { + schemas.add(schema); + } + } + } + return schemas.stream().sorted().toList(); + } + private List listVisibleSchemas() throws Exception { List result = new ArrayList<>(); String sql = "SELECT NAME FROM SYS.SYSOBJECTS WHERE TYPE$ = 'SCH' ORDER BY NAME"; diff --git a/agents/drivers/dameng/src/test/java/com/dbx/agent/dameng/DamengAgentMetadataTest.java b/agents/drivers/dameng/src/test/java/com/dbx/agent/dameng/DamengAgentMetadataTest.java index a54343d071..0a9bf36145 100644 --- a/agents/drivers/dameng/src/test/java/com/dbx/agent/dameng/DamengAgentMetadataTest.java +++ b/agents/drivers/dameng/src/test/java/com/dbx/agent/dameng/DamengAgentMetadataTest.java @@ -341,17 +341,31 @@ class DamengAgentMetadataTest { } @Test - void listSchemasFallsBackToAllUsersWithoutSysObjectsPrivilege() { + void listSchemasFallsBackToJdbcMetadataWithoutSysObjectsPrivilege() { DamengAgent agent = new DamengAgent(); List sqls = new ArrayList<>(); - TestSupport.setPrivateConnection(agent, restrictedSchemaConnection(sqls)); + List jdbcMetadataCalls = new ArrayList<>(); + TestSupport.setPrivateConnection(agent, restrictedSchemaConnection(sqls, jdbcMetadataCalls, null)); List schemas = agent.listSchemas(); - Assertions.assertEquals(List.of("APP", "REPORTING", "SYSDBA"), schemas); - Assertions.assertEquals(2, sqls.size(), String.join("\n", sqls)); + Assertions.assertEquals(List.of("APP", "REPORTING", "REPORTING_ARCHIVE", "SYSDBA"), schemas); + Assertions.assertEquals(1, sqls.size(), String.join("\n", sqls)); Assertions.assertTrue(sqls.get(0).contains("SYS.SYSOBJECTS"), sqls.get(0)); - Assertions.assertTrue(sqls.get(1).contains("ALL_USERS"), sqls.get(1)); + Assertions.assertEquals(List.of("getSchemas"), jdbcMetadataCalls); + } + + @Test + void listSchemasPreservesCatalogErrorWhenJdbcMetadataFails() { + DamengAgent agent = new DamengAgent(); + SQLException metadataError = new SQLException("JDBC metadata getSchemas failed"); + TestSupport.setPrivateConnection(agent, restrictedSchemaConnection(new ArrayList<>(), new ArrayList<>(), metadataError)); + + RuntimeException error = Assertions.assertThrows(RuntimeException.class, agent::listSchemas); + + Assertions.assertEquals("no SYS.SYSOBJECTS privilege", error.getCause().getMessage()); + Assertions.assertEquals(1, error.getCause().getSuppressed().length); + Assertions.assertSame(metadataError, error.getCause().getSuppressed()[0]); } @Test @@ -1087,7 +1101,11 @@ class DamengAgentMetadataTest { }); } - private static Connection restrictedSchemaConnection(List sqls) { + private static Connection restrictedSchemaConnection( + List sqls, + List jdbcMetadataCalls, + SQLException jdbcMetadataError + ) { return proxy(Connection.class, (method, args) -> { String name = method.getName(); if ("prepareStatement".equals(name)) { @@ -1096,11 +1114,11 @@ class DamengAgentMetadataTest { if (sql.contains("SYS.SYSOBJECTS")) { return failingMetadataStatement("no SYS.SYSOBJECTS privilege"); } - if (sql.contains("ALL_USERS")) { - return metadataStatement(List.of(List.of("APP"), List.of("REPORTING"), List.of("SYSDBA"))); - } throw new AssertionError("Unexpected SQL: " + sql); } + if ("getMetaData".equals(name)) { + return jdbcSchemaMetadata(jdbcMetadataCalls, jdbcMetadataError); + } if ("close".equals(name)) { return null; } @@ -1111,6 +1129,25 @@ class DamengAgentMetadataTest { }); } + private static DatabaseMetaData jdbcSchemaMetadata(List calls, SQLException failure) { + return proxy(DatabaseMetaData.class, (method, args) -> { + if ("getSchemas".equals(method.getName())) { + calls.add("getSchemas"); + if (failure != null) { + throw failure; + } + return metadataResultSet(List.of( + List.of("REPORTING_ARCHIVE"), + List.of("APP"), + List.of("REPORTING"), + List.of("SYSDBA"), + List.of("APP") + )); + } + return defaultValue(method.getReturnType()); + }); + } + private static Connection schemaConnection(List params) { return proxy(Connection.class, (method, args) -> { String name = method.getName(); @@ -1183,7 +1220,7 @@ class DamengAgentMetadataTest { return value == null ? null : value.toString(); } return switch (((String) args[0]).toUpperCase()) { - case "TABLE_NAME", "OBJECT_NAME" -> string(rows, index[0], 0); + case "TABLE_NAME", "TABLE_SCHEM", "OBJECT_NAME" -> string(rows, index[0], 0); case "TABLE_TYPE", "OBJECT_TYPE" -> string(rows, index[0], 1); case "COLUMN_NAME" -> string(rows, index[0], 0); case "DATA_TYPE" -> string(rows, index[0], 1);