fix(dameng): support configurable system schemas

This commit is contained in:
zipg authored and GitHub committed 2026-07-22 17:40:40 +08:00
1 parent 697b7a4b80
commit a81d6da604
15 files changed
+146 -66

No files matched your search

@@ -72,11 +72,6 @@ public final class DamengAgent extends BaseDatabaseAgent {
ON schema_object.OBJECT_ID = m.SCHID AND schema_object.OBJECT_TYPE = 'SCH'
) mv ON mv.OWNER = o.OWNER AND mv.MVIEW_NAME = o.OBJECT_NAME
""".stripIndent().trim();
private static final Set<String> SYSTEM_USERS = Set.of(
"SYS", "SYSAUDITOR", "SYSSSO", "CTISYS",
"SYSDBA", "SYS_DBA", "_SYS_STATISTICS", "SYS_PHM"
);
private Connection connection;
private String connectedUsername;
@@ -157,13 +152,8 @@ public final class DamengAgent extends BaseDatabaseAgent {
private List<String> listVisibleUsers() throws Exception {
List<String> result = new ArrayList<>();
String placeholders = String.join(",", SYSTEM_USERS.stream().map(user -> "?").toList());
String sql = "SELECT USERNAME FROM ALL_USERS WHERE USERNAME NOT IN (" + placeholders + ") ORDER BY USERNAME";
String sql = "SELECT USERNAME FROM ALL_USERS ORDER BY USERNAME";
try (PreparedStatement stmt = requireConnected().prepareStatement(sql)) {
int index = 1;
for (String user : SYSTEM_USERS) {
stmt.setString(index++, user);
}
try (ResultSet rs = stmt.executeQuery()) {
while (rs.next()) {
result.add(rs.getString(1));
@@ -175,13 +165,8 @@ public final class DamengAgent extends BaseDatabaseAgent {
private List<String> listVisibleSchemas() throws Exception {
List<String> result = new ArrayList<>();
String placeholders = String.join(",", SYSTEM_USERS.stream().map(user -> "?").toList());
String sql = "SELECT NAME FROM SYS.SYSOBJECTS WHERE TYPE$ = 'SCH' AND NAME NOT IN (" + placeholders + ") ORDER BY NAME";
String sql = "SELECT NAME FROM SYS.SYSOBJECTS WHERE TYPE$ = 'SCH' ORDER BY NAME";
try (PreparedStatement stmt = requireConnected().prepareStatement(sql)) {
int index = 1;
for (String user : SYSTEM_USERS) {
stmt.setString(index++, user);
}
try (ResultSet rs = stmt.executeQuery()) {
while (rs.next()) {
result.add(rs.getString(1));
@@ -106,12 +106,24 @@ class DamengAgentMetadataTest {
List<String> schemas = agent.listSchemas();
Assertions.assertEquals(List.of("APP", "EMPTY_SCHEMA"), schemas);
Assertions.assertEquals(List.of("APP", "EMPTY_SCHEMA", "SYSDBA"), schemas);
Assertions.assertTrue(sqls.stream().anyMatch(sql -> sql.contains("SYS.SYSOBJECTS") && sql.contains("TYPE$ = 'SCH'")), String.join("\n", sqls));
Assertions.assertTrue(sqls.stream().noneMatch(sql -> sql.contains("ALL_USERS")), String.join("\n", sqls));
Assertions.assertTrue(sqls.stream().noneMatch(sql -> sql.contains("ALL_OBJECTS")), String.join("\n", sqls));
}
@Test
void listSchemasLeavesSysdbaAvailableForFrontendFiltering() {
DamengAgent agent = new DamengAgent();
List<String> params = new ArrayList<>();
TestSupport.setPrivateConnection(agent, schemaConnection(params));
List<String> schemas = agent.listSchemas();
Assertions.assertEquals(List.of("APP", "SYSDBA"), schemas);
Assertions.assertTrue(params.isEmpty(), params.toString());
}
@Test
void listSchemasFallsBackToAllUsersWithoutSysObjectsPrivilege() {
DamengAgent agent = new DamengAgent();
@@ -120,7 +132,7 @@ class DamengAgentMetadataTest {
List<String> schemas = agent.listSchemas();
Assertions.assertEquals(List.of("APP", "REPORTING"), schemas);
Assertions.assertEquals(List.of("APP", "REPORTING", "SYSDBA"), schemas);
Assertions.assertEquals(2, 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));
@@ -522,7 +534,7 @@ class DamengAgentMetadataTest {
return dbmsMetadataStatement(dbmsMetadataDdl, dbmsMetadataResultOpen);
}
if (sql.contains("SYS.SYSOBJECTS") && sql.contains("TYPE$ = 'SCH'")) {
return metadataStatement(List.of(List.of("APP"), List.of("EMPTY_SCHEMA")));
return metadataStatement(List.of(List.of("APP"), List.of("EMPTY_SCHEMA"), List.of("SYSDBA")));
}
if (sql.contains("ALL_CONS_COLUMNS")) {
return metadataStatement(List.of(List.of("ID")));
@@ -720,7 +732,7 @@ class DamengAgentMetadataTest {
return failingMetadataStatement("no SYS.SYSOBJECTS privilege");
}
if (sql.contains("ALL_USERS")) {
return metadataStatement(List.of(List.of("APP"), List.of("REPORTING")));
return metadataStatement(List.of(List.of("APP"), List.of("REPORTING"), List.of("SYSDBA")));
}
throw new AssertionError("Unexpected SQL: " + sql);
}
@@ -734,6 +746,22 @@ class DamengAgentMetadataTest {
});
}
private static Connection schemaConnection(List<String> params) {
return proxy(Connection.class, (method, args) -> {
String name = method.getName();
if ("prepareStatement".equals(name)) {
return metadataStatement(List.of(List.of("APP"), List.of("SYSDBA")), params);
}
if ("close".equals(name)) {
return null;
}
if ("isClosed".equals(name)) {
return false;
}
return defaultValue(method.getReturnType());
});
}
private static PreparedStatement failingMetadataStatement(String message) {
return proxy(PreparedStatement.class, (method, args) -> {
if ("executeQuery".equals(method.getName())) {