fix(dameng): fall back for restricted table DDL

This commit is contained in:
t8y2 committed 2026-08-02 18:45:03 +08:00
1 parent b2811788a7
commit 2ac8799cb0
2 files changed
+104 -16

No files matched your search

@@ -297,7 +297,9 @@ public final class DamengAgent extends AbstractJdbcAgent {
boolean metadataObject = normalized.contains("all_objects")
|| normalized.contains("sysobjects")
|| normalized.contains("all_dependencies")
|| normalized.contains("all_tab_comments");
|| normalized.contains("all_tab_comments")
|| normalized.contains("dbms_metadata")
|| normalized.contains("get_ddl");
boolean permissionDenied = normalized.contains("权限")
|| normalized.contains("privilege")
|| normalized.contains("permission denied")
@@ -795,25 +797,37 @@ public final class DamengAgent extends AbstractJdbcAgent {
@Override
public String getTableDdl(String schema, String table) {
return unchecked(() -> {
String sql = "SELECT /*+ PARALLEL(1) */ DBMS_METADATA.GET_DDL(?, ?, ?) FROM DUAL";
String ddl = null;
try (PreparedStatement stmt = requireConnected().prepareStatement(sql)) {
stmt.setString(1, "TABLE");
stmt.setString(2, table);
stmt.setString(3, schema);
try (ResultSet rs = stmt.executeQuery()) {
if (rs.next()) {
ddl = coalesce(readTextColumn(rs, 1));
try {
return unchecked(() -> {
String sql = "SELECT /*+ PARALLEL(1) */ DBMS_METADATA.GET_DDL(?, ?, ?) FROM DUAL";
String ddl = null;
try (PreparedStatement stmt = requireConnected().prepareStatement(sql)) {
stmt.setString(1, "TABLE");
stmt.setString(2, table);
stmt.setString(3, schema);
try (ResultSet rs = stmt.executeQuery()) {
if (rs.next()) {
ddl = coalesce(readTextColumn(rs, 1));
}
}
}
if (ddl != null) {
ddl = appendTableAndColumnComments(ddl, schema, table);
return appendIndependentIndexDdl(ddl, schema, table);
}
throw new IllegalArgumentException("Table not found: " + schema + "." + table);
});
} catch (RuntimeException error) {
if (!isDamengMetadataPermissionError(error)) {
throw error;
}
if (ddl != null) {
ddl = appendTableAndColumnComments(ddl, schema, table);
return appendIndependentIndexDdl(ddl, schema, table);
try {
return super.getTableDdl(schema, table);
} catch (RuntimeException fallbackError) {
fallbackError.addSuppressed(error);
throw fallbackError;
}
throw new IllegalArgumentException("Table not found: " + schema + "." + table);
});
}
}
@Override
@@ -610,6 +610,42 @@ class DamengAgentMetadataTest {
Assertions.assertTrue(ddl.contains("DBX_FULL_DDL_END"), ddl);
}
@Test
void fallsBackToGeneratedTableDdlWhenDbmsMetadataPermissionIsDenied() {
DamengAgent agent = new DamengAgent();
List<String> sqls = new ArrayList<>();
TestSupport.setPrivateConnection(agent, metadataConnectionWithDbmsMetadataError(
sqls,
"没有[SYS.DBMS_METADATA.GET_DDL]对象的执行权限"
));
String ddl = agent.getTableDdl("APP", "USERS");
Assertions.assertTrue(ddl.contains("CREATE TABLE \"APP\".\"USERS\""), ddl);
Assertions.assertTrue(ddl.contains("\"ID\" NUMBER(10) NOT NULL"), ddl);
Assertions.assertEquals(1, sqls.stream().filter(sql -> sql.contains("DBMS_METADATA.GET_DDL")).count());
Assertions.assertTrue(sqls.stream().anyMatch(sql -> sql.contains("ALL_TAB_COLUMNS")), String.join("\n", sqls));
}
@Test
void propagatesNonPermissionDbmsMetadataErrorsWithoutFallback() {
DamengAgent agent = new DamengAgent();
List<String> sqls = new ArrayList<>();
TestSupport.setPrivateConnection(agent, metadataConnectionWithDbmsMetadataError(
sqls,
"DBMS_METADATA.GET_DDL connection reset"
));
RuntimeException error = Assertions.assertThrows(
RuntimeException.class,
() -> agent.getTableDdl("APP", "USERS")
);
Assertions.assertEquals("DBMS_METADATA.GET_DDL connection reset", error.getCause().getMessage());
Assertions.assertEquals(1, sqls.size());
Assertions.assertTrue(sqls.get(0).contains("DBMS_METADATA.GET_DDL"), sqls.toString());
}
@Test
void appendsIndependentIndexesToTableDdl() {
DamengAgent agent = new DamengAgent();
@@ -685,6 +721,19 @@ class DamengAgentMetadataTest {
);
}
private static Connection metadataConnectionWithDbmsMetadataError(List<String> sqls, String message) {
return metadataConnection(
"id comment",
null,
false,
List.of(),
sqls,
"CREATE TABLE \"APP\".\"USERS\" (\n \"ID\" NUMBER\n);",
defaultColumnMetadataRows("id comment"),
message
);
}
private static Connection metadataConnection(
String allColumnComment,
String fallbackColumnComment,
@@ -734,6 +783,28 @@ class DamengAgentMetadataTest {
List<String> sqls,
String dbmsMetadataDdl,
List<List<Object>> columnRows
) {
return metadataConnection(
allColumnComment,
fallbackColumnComment,
includeMaterializedView,
independentIndexes,
sqls,
dbmsMetadataDdl,
columnRows,
null
);
}
private static Connection metadataConnection(
String allColumnComment,
String fallbackColumnComment,
boolean includeMaterializedView,
List<List<Object>> independentIndexes,
List<String> sqls,
String dbmsMetadataDdl,
List<List<Object>> columnRows,
String dbmsMetadataError
) {
boolean[] dbmsMetadataResultOpen = {false};
return proxy(Connection.class, (method, args) -> {
@@ -747,6 +818,9 @@ class DamengAgentMetadataTest {
sqls.add(sql);
}
if (sql.contains("DBMS_METADATA.GET_DDL")) {
if (dbmsMetadataError != null) {
return failingMetadataStatement(dbmsMetadataError);
}
return dbmsMetadataStatement(dbmsMetadataDdl, dbmsMetadataResultOpen);
}
if (sql.startsWith("SELECT NAME FROM SYS.SYSOBJECTS WHERE TYPE$ = 'SCH'")) {