fix(postgres): restore 9.x table DDL and sequence export

This commit is contained in:
zipg authored and GitHub committed 2026-09-25 23:57:36 +08:00
1 parent 6db2589e37
commit e91340ee15
2 files changed
+256 -32

No files matched your search

+91 -3
View File
@@ -5204,9 +5204,11 @@ fn postgres_check_constraints_sql() -> &'static str {
pub async fn list_constraints(pool: &Pool, schema: &str, table: &str) -> Result<Vec<ConstraintInfo>, String> {
let schema = if schema.is_empty() { "public" } else { schema };
let client = checkout_postgres_client(pool, None, super::connection_timeout()).await?;
let rows = postgres_query_cached(&client, postgres_constraints_sql(), &[&schema, &table])
.await
.map_err(|e| e.to_string())?;
let tiers = postgres_constraint_query_tiers();
let params: [&(dyn tokio_postgres::types::ToSql + Sync); 2] = [&schema, &table];
let rows =
query_with_compat_fallback("list_constraints", &tiers, |sql| postgres_query_cached(&client, sql, &params))
.await?;
Ok(rows
.iter()
@@ -5427,6 +5429,48 @@ fn postgres_constraints_sql() -> &'static str {
ORDER BY con.conname"
}
fn postgres_constraint_query_tiers() -> [&'static str; 2] {
[postgres_constraints_sql(), postgres_constraints_compat_sql()]
}
/// PostgreSQL 9.2/9.3 sibling of [`postgres_constraints_sql`]: those servers
/// have neither `LATERAL` (9.3+) nor `unnest(...) WITH ORDINALITY` (9.4+), so
/// the whole-table DDL/metadata path used to fail with a bare `db error`
/// (#10079). `generate_subscripts` plus a correlated scalar subquery produce
/// the same column arrays on every supported server.
fn postgres_constraints_compat_sql() -> &'static str {
"SELECT con.conname, \
con.contype::text, \
pg_catalog.pg_get_constraintdef(con.oid, true) AS definition, \
COALESCE(( \
SELECT array_agg(a.attname::text ORDER BY key_order.ord) \
FROM generate_subscripts(con.conkey, 1) AS key_order(ord) \
JOIN pg_catalog.pg_attribute a \
ON a.attrelid = con.conrelid AND a.attnum = con.conkey[key_order.ord] AND NOT a.attisdropped \
), ARRAY[]::text[]) AS columns, \
refn.nspname AS ref_schema, \
refc.relname AS ref_table, \
COALESCE(( \
SELECT array_agg(a.attname::text ORDER BY key_order.ord) \
FROM generate_subscripts(con.confkey, 1) AS key_order(ord) \
JOIN pg_catalog.pg_attribute a \
ON a.attrelid = con.confrelid AND a.attnum = con.confkey[key_order.ord] AND NOT a.attisdropped \
), ARRAY[]::text[]) AS ref_columns, \
CASE WHEN con.contype = 'f' THEN con.confmatchtype::text END AS match_type, \
CASE WHEN con.contype = 'f' THEN con.confupdtype::text END AS on_update, \
CASE WHEN con.contype = 'f' THEN con.confdeltype::text END AS on_delete, \
con.condeferrable, \
con.condeferred, \
con.convalidated \
FROM pg_catalog.pg_constraint con \
JOIN pg_catalog.pg_class c ON c.oid = con.conrelid \
JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace \
LEFT JOIN pg_catalog.pg_class refc ON refc.oid = con.confrelid \
LEFT JOIN pg_catalog.pg_namespace refn ON refn.oid = refc.relnamespace \
WHERE n.nspname = $1 AND c.relname = $2 AND c.relkind IN ('r','p','f') \
ORDER BY con.conname"
}
/// Expand a `pg_constraint.contype` letter to a human-readable label.
fn postgres_constraint_type_label(contype: &str) -> String {
match contype {
@@ -13224,6 +13268,50 @@ mod tests {
assert!(sql.contains("ORDER BY con.conname"));
}
#[test]
fn postgres_constraint_tiers_keep_the_compat_sibling_first_usable() {
let tiers = postgres_constraint_query_tiers();
assert_eq!(tiers[0], postgres_constraints_sql());
assert_eq!(tiers[1], postgres_constraints_compat_sql());
}
#[test]
fn postgres_constraints_compat_sql_avoids_lateral_and_ordinality() {
let sql = postgres_constraints_compat_sql();
// PostgreSQL 9.2/9.3 fail on the primary query's `LEFT JOIN LATERAL`
// (9.3+) and `unnest(...) WITH ORDINALITY` (9.4+); the compat tier must
// not reference either, or table DDL export keeps reporting `db error`.
assert!(!sql.contains("LATERAL"));
assert!(!sql.contains("WITH ORDINALITY"));
assert!(!sql.contains("unnest("));
assert!(sql.contains("generate_subscripts(con.conkey, 1)"));
assert!(sql.contains("generate_subscripts(con.confkey, 1)"));
// Same projection, in the same order, as the primary query so
// `list_constraints`' positional row mapping stays valid.
for column in [
"con.conname",
"con.contype::text",
"pg_catalog.pg_get_constraintdef(con.oid, true) AS definition",
"AS columns",
"refn.nspname AS ref_schema",
"refc.relname AS ref_table",
"AS ref_columns",
"AS match_type",
"AS on_update",
"AS on_delete",
"con.condeferrable",
"con.condeferred",
"con.convalidated",
] {
assert!(sql.contains(column), "compat constraints SQL is missing {column}");
}
assert_eq!(sql.matches("attname::text").count(), 2);
assert!(sql.contains("a.attisdropped"));
assert!(sql.contains("n.nspname = $1 AND c.relname = $2"));
assert!(sql.contains("c.relkind IN ('r','p','f')"));
assert!(sql.contains("ORDER BY con.conname"));
}
#[test]
fn opengauss_constraint_sql_avoids_array_and_ordinality_dependencies() {
let sql = opengauss_constraints_sql(true);