github/dbx
4
0
Fork 0
mirror of https://github.com/t8y2/dbx.git synced 2026-10-21 08:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(kingbase): preserve column comments

Browse Source
This commit is contained in:
t8y2
2026-07-15 10:38:26 +08:00
parent 27e75e9c81
commit f0044d733b
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
agents/drivers/kingbase/src/main/java/com/dbx/agent/kingbase/KingbaseAgent.java
+14 -7
View File
@@ -450,12 +450,19 @@ public final class KingbaseAgent extends PostgresLikeAgent {
private List<ColumnInfo> getInformationSchemaColumns(String schema, String table, Set<String> primaryKeys) {
return unchecked(() -> {
List<ColumnInfo> result = new ArrayList<>();
String sql = "SELECT column_name, data_type, is_nullable, column_default, " +
"numeric_precision, numeric_scale, character_maximum_length " +
"FROM information_schema.columns " +
"WHERE table_schema = " + sqlString(effectiveSchema(schema)) +
" AND table_name = " + sqlString(table) + " " +
"ORDER BY ordinal_position";
String sql = "SELECT ic.column_name, ic.data_type, ic.is_nullable, ic.column_default, " +
"ic.numeric_precision, ic.numeric_scale, ic.character_maximum_length, " +
"d.description AS column_comment " +
"FROM information_schema.columns ic " +
// information_schema preserves MySQL-compatible type metadata but does not expose comments.
"LEFT JOIN sys_catalog.sys_namespace n ON n.nspname = ic.table_schema " +
"LEFT JOIN sys_catalog.sys_class c ON c.relnamespace = n.oid AND c.relname = ic.table_name " +
"LEFT JOIN sys_catalog.sys_attribute a ON a.attrelid = c.oid AND a.attname = ic.column_name " +
"AND a.attnum > 0 AND NOT a.attisdropped " +
"LEFT JOIN sys_catalog.sys_description d ON d.objoid = a.attrelid AND d.objsubid = a.attnum " +
"WHERE ic.table_schema = " + sqlString(effectiveSchema(schema)) +
" AND ic.table_name = " + sqlString(table) + " " +
"ORDER BY ic.ordinal_position";
try (Statement stmt = requireConnected().createStatement()) {
try (ResultSet rs = stmt.executeQuery(sql)) {
while (rs.next()) {
@@ -467,7 +474,7 @@ public final class KingbaseAgent extends PostgresLikeAgent {
rs.getString("column_default"),
primaryKeys.contains(columnName),
null,
null,
rs.getString("column_comment"),
intObject(rs, "numeric_precision"),
intObject(rs, "numeric_scale"),
intObject(rs, "character_maximum_length")
agents/drivers/kingbase/src/test/java/com/dbx/agent/kingbase/KingbaseAgentTest.java
+5 -2
View File
@@ -426,16 +426,19 @@ class KingbaseAgentTest extends JdbcFakeExecutionBehaviorTest {
"column_default",
"numeric_precision",
"numeric_scale",
"character_maximum_length"
"character_maximum_length",
"column_comment"
},
new Object[][]{{"id", "int", "NO", null, 32, 0, null}}
new Object[][]{{"id", "int", "NO", null, 32, 0, null, "identifier"}}
)
));
List<ColumnInfo> columns = agent.getColumns("PUBLIC", "orders");
Assertions.assertEquals("int", columns.get(0).getData_type());
Assertions.assertEquals("identifier", columns.get(0).getComment());
Assertions.assertTrue(sql.get(1).contains("FROM information_schema.columns"), sql.get(1));
Assertions.assertTrue(sql.get(1).contains("LEFT JOIN sys_catalog.sys_description"), sql.get(1));
}
@Test