fix(dameng): restore exports with identity columns
This commit is contained in:
1 parent
fe03f740b7
commit
796b0ce5b7
9 files changed
+264
-11
No files matched your search
@@ -245,6 +245,7 @@ public final class DamengAgent extends BaseDatabaseAgent {
|
||||
}
|
||||
}
|
||||
|
||||
Set<String> identityColumns = identityColumns(schema, table);
|
||||
List<ColumnInfo> result = new ArrayList<>();
|
||||
// DATA_DEFAULT is a LONG column — it must be selected first and read first
|
||||
// in JDBC, otherwise the data is truncated.
|
||||
@@ -287,7 +288,7 @@ public final class DamengAgent extends BaseDatabaseAgent {
|
||||
"Y".equals(rs.getString("NULLABLE")),
|
||||
dataDefault,
|
||||
pkColumns.contains(name),
|
||||
null,
|
||||
identityColumns.contains(name) ? "identity" : null,
|
||||
rs.getString("COMMENTS"),
|
||||
numPrec,
|
||||
numScale,
|
||||
@@ -301,6 +302,32 @@ public final class DamengAgent extends BaseDatabaseAgent {
|
||||
});
|
||||
}
|
||||
|
||||
private Set<String> identityColumns(String schema, String table) {
|
||||
Set<String> result = new java.util.HashSet<>();
|
||||
String sql = """
|
||||
SELECT c.NAME
|
||||
FROM SYS.SYSCOLUMNS c
|
||||
JOIN SYS.SYSOBJECTS t ON c.ID = t.ID
|
||||
JOIN SYS.SYSOBJECTS s ON t.SCHID = s.ID
|
||||
WHERE s.NAME = ? AND t.NAME = ? AND (c.INFO2 & 0x01) = 0x01
|
||||
""".stripIndent().trim();
|
||||
try (PreparedStatement stmt = requireConnected().prepareStatement(sql)) {
|
||||
stmt.setString(1, schema);
|
||||
stmt.setString(2, table);
|
||||
try (ResultSet rs = stmt.executeQuery()) {
|
||||
while (rs.next()) {
|
||||
String column = rs.getString(1);
|
||||
if (notBlank(column)) {
|
||||
result.add(column);
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (Exception ignored) {
|
||||
// Some Dameng versions or users do not expose SYS.SYSCOLUMNS.
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<IndexInfo> listIndexes(String schema, String table) {
|
||||
return unchecked(() -> {
|
||||
|
||||
@@ -109,6 +109,17 @@ class DamengAgentMetadataTest {
|
||||
Assertions.assertEquals("fallback id comment", columns.get(0).getComment());
|
||||
}
|
||||
|
||||
@Test
|
||||
void mapsIdentityColumnExtraFromSysColumns() {
|
||||
DamengAgent agent = new DamengAgent();
|
||||
TestSupport.setPrivateConnection(agent, metadataConnection());
|
||||
|
||||
List<ColumnInfo> columns = agent.getColumns("APP", "USERS");
|
||||
|
||||
Assertions.assertEquals(1, columns.size());
|
||||
Assertions.assertEquals("identity", columns.get(0).getExtra());
|
||||
}
|
||||
|
||||
@Test
|
||||
void appendsTableAndColumnCommentsToTableDdl() {
|
||||
DamengAgent agent = new DamengAgent();
|
||||
@@ -136,6 +147,9 @@ class DamengAgentMetadataTest {
|
||||
if (sql.contains("ALL_CONS_COLUMNS")) {
|
||||
return metadataStatement(List.of(List.of("ID")));
|
||||
}
|
||||
if (sql.contains("SYS.SYSCOLUMNS")) {
|
||||
return metadataStatement(List.of(List.of("ID")));
|
||||
}
|
||||
if (sql.startsWith("SELECT COMMENTS")) {
|
||||
return metadataStatement(List.of(List.of("用户示例表")));
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user