From 43f52463de9161e1d2720c4db648cb387b154210 Mon Sep 17 00:00:00 2001 From: t8y2 <1156263951@qq.com> Date: Fri, 10 Jul 2026 23:24:21 +0800 Subject: [PATCH] fix(vastbase): include check constraints in table DDL --- .../com/dbx/agent/CheckConstraintInfo.java | 19 +++++ .../main/java/com/dbx/agent/DdlBuilder.java | 33 +++++++++ .../java/com/dbx/agent/PostgresLikeAgent.java | 45 +++++++++++- .../com/dbx/agent/PostgresLikeAgentTest.java | 73 +++++++++++++++++++ 4 files changed, 169 insertions(+), 1 deletion(-) create mode 100644 agents/common/src/main/java/com/dbx/agent/CheckConstraintInfo.java diff --git a/agents/common/src/main/java/com/dbx/agent/CheckConstraintInfo.java b/agents/common/src/main/java/com/dbx/agent/CheckConstraintInfo.java new file mode 100644 index 0000000000..a38d7f6ddd --- /dev/null +++ b/agents/common/src/main/java/com/dbx/agent/CheckConstraintInfo.java @@ -0,0 +1,19 @@ +package com.dbx.agent; + +public final class CheckConstraintInfo { + private final String name; + private final String definition; + + public CheckConstraintInfo(String name, String definition) { + this.name = name; + this.definition = definition; + } + + public String getName() { + return name; + } + + public String getDefinition() { + return definition; + } +} diff --git a/agents/common/src/main/java/com/dbx/agent/DdlBuilder.java b/agents/common/src/main/java/com/dbx/agent/DdlBuilder.java index e7549edc01..b03ef7e277 100644 --- a/agents/common/src/main/java/com/dbx/agent/DdlBuilder.java +++ b/agents/common/src/main/java/com/dbx/agent/DdlBuilder.java @@ -1,6 +1,7 @@ package com.dbx.agent; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Locale; @@ -37,6 +38,28 @@ public final class DdlBuilder { List foreignKeys, boolean useBacktick, boolean includeColumnComments + ) { + return buildTableDdl( + schema, + table, + columns, + indexes, + foreignKeys, + Collections.emptyList(), + useBacktick, + includeColumnComments + ); + } + + public static String buildTableDdl( + String schema, + String table, + List columns, + List indexes, + List foreignKeys, + List checkConstraints, + boolean useBacktick, + boolean includeColumnComments ) { String tableRef = qualifiedName(schema, table, useBacktick); List columnLines = new ArrayList<>(); @@ -74,6 +97,16 @@ public final class DdlBuilder { ); } + for (CheckConstraintInfo constraint : checkConstraints) { + if (!notBlank(constraint.getDefinition())) { + continue; + } + String name = notBlank(constraint.getName()) + ? "CONSTRAINT " + quoteIdent(constraint.getName(), useBacktick) + " " + : ""; + columnLines.add(" " + name + constraint.getDefinition()); + } + StringBuilder ddl = new StringBuilder(); ddl.append("CREATE TABLE "); ddl.append(tableRef); diff --git a/agents/common/src/main/java/com/dbx/agent/PostgresLikeAgent.java b/agents/common/src/main/java/com/dbx/agent/PostgresLikeAgent.java index 0ad8e805bf..fa3bd15490 100644 --- a/agents/common/src/main/java/com/dbx/agent/PostgresLikeAgent.java +++ b/agents/common/src/main/java/com/dbx/agent/PostgresLikeAgent.java @@ -245,7 +245,50 @@ public abstract class PostgresLikeAgent extends AbstractJdbcAgent { foreignKeys = Collections.emptyList(); } - return DdlBuilder.buildTableDdl(schema, table, getColumns(schema, table), indexes, foreignKeys, mysqlCompatMode, true); + List checkConstraints; + try { + checkConstraints = listCheckConstraints(schema, table); + } catch (RuntimeException e) { + // Some PostgreSQL-compatible databases expose incomplete catalog APIs. + // DDL generation should still succeed with columns, indexes, and foreign keys. + checkConstraints = Collections.emptyList(); + } + + return DdlBuilder.buildTableDdl( + schema, + table, + getColumns(schema, table), + indexes, + foreignKeys, + checkConstraints, + mysqlCompatMode, + true + ); + } + + protected List listCheckConstraints(String schema, String table) { + return unchecked(() -> { + List result = new ArrayList<>(); + String sql = "SELECT co.conname AS constraint_name, pg_catalog.pg_get_constraintdef(co.oid, true) AS constraint_definition " + + "FROM pg_catalog.pg_constraint co " + + "JOIN pg_catalog.pg_class c ON c.oid = co.conrelid " + + "JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace " + + "WHERE co.contype = 'c' AND n.nspname = ? AND c.relname = ? " + + "ORDER BY co.conname"; + try (java.sql.PreparedStatement stmt = requireConnection().prepareStatement(sql)) { + stmt.setString(1, schema); + stmt.setString(2, table); + try (ResultSet rs = stmt.executeQuery()) { + while (rs.next()) { + result.add(new CheckConstraintInfo( + rs.getString("constraint_name"), + rs.getString("constraint_definition") + )); + } + } + } + return result; + }); } @Override diff --git a/agents/common/src/test/java/com/dbx/agent/PostgresLikeAgentTest.java b/agents/common/src/test/java/com/dbx/agent/PostgresLikeAgentTest.java index bcd5a23944..f3d427917f 100644 --- a/agents/common/src/test/java/com/dbx/agent/PostgresLikeAgentTest.java +++ b/agents/common/src/test/java/com/dbx/agent/PostgresLikeAgentTest.java @@ -27,6 +27,7 @@ class PostgresLikeAgentTest { agent.listTables("app"); agent.listObjects("app"); agent.getColumns("app", "orders"); + agent.listCheckConstraintsForTest("app", "orders"); agent.listForeignKeys("app", "orders"); agent.listTriggers("app", "orders"); @@ -39,6 +40,7 @@ class PostgresLikeAgentTest { assertTrue(sql.contains("pg_catalog.pg_proc"), sql); assertTrue(sql.contains("pg_catalog.pg_attribute"), sql); assertTrue(sql.contains("pg_catalog.pg_constraint"), sql); + assertTrue(sql.contains("pg_catalog.pg_get_constraintdef"), sql); assertTrue(sql.contains("pg_catalog.pg_trigger"), sql); assertFalse(sql.contains(" AS key "), sql); assertFalse(sql.contains(" key."), sql); @@ -80,6 +82,28 @@ class PostgresLikeAgentTest { assertEquals(Integer.valueOf(255), columns.get(1).getCharacter_maximum_length()); } + @Test + void tableDdlIncludesNamedCheckConstraints() { + ConstraintDdlAgent agent = new ConstraintDdlAgent(); + + String ddl = agent.getTableDdl("public", "orders"); + + assertTrue( + ddl.contains("CONSTRAINT \"chk_balance_status\" CHECK (status = ANY (ARRAY['PLAN'::text, 'EXECUTION'::text]))"), + ddl + ); + } + + @Test + void tableDdlFallsBackWhenCheckConstraintCatalogIsUnavailable() { + ConstraintDdlAgent agent = new ConstraintDdlAgent(true); + + String ddl = agent.getTableDdl("public", "orders"); + + assertTrue(ddl.startsWith("CREATE TABLE \"public\".\"orders\""), ddl); + assertFalse(ddl.contains("CHECK"), ddl); + } + @Test void postgisGeometryTypeNameDetection() { assertTrue(PostgresLikeAgent.isPostgisGeometryTypeName("geometry")); @@ -158,6 +182,55 @@ class PostgresLikeAgentTest { return rs.getObject(index); }; } + + List listCheckConstraintsForTest(String schema, String table) { + return listCheckConstraints(schema, table); + } + } + + private static final class ConstraintDdlAgent extends PostgresLikeAgent { + private final boolean failCheckConstraintLookup; + + private ConstraintDdlAgent() { + this(false); + } + + private ConstraintDdlAgent(boolean failCheckConstraintLookup) { + super(new PostgresLikeAgentProfile( + PostgresLikeAgentTest.class.getName(), + "jdbc:test://{host}:{port}/{database}" + )); + this.failCheckConstraintLookup = failCheckConstraintLookup; + } + + @Override + public List getColumns(String schema, String table) { + return java.util.Arrays.asList( + new ColumnInfo("id", "bigint", false, null, true), + new ColumnInfo("status", "character varying", false, "'PLAN'::character varying", false) + ); + } + + @Override + public List listIndexes(String schema, String table) { + return java.util.Collections.emptyList(); + } + + @Override + public List listForeignKeys(String schema, String table) { + return java.util.Collections.emptyList(); + } + + @Override + protected List listCheckConstraints(String schema, String table) { + if (failCheckConstraintLookup) { + throw new RuntimeException("pg_get_constraintdef is unavailable"); + } + return java.util.Collections.singletonList(new CheckConstraintInfo( + "chk_balance_status", + "CHECK (status = ANY (ARRAY['PLAN'::text, 'EXECUTION'::text]))" + )); + } } private static Connection preparedConnection(ResultSet... resultSets) {