fix(postgres): include partition children when generating table DDL

This commit is contained in:
Melody Ruch authored and GitHub committed 2026-08-18 13:18:18 +08:00
1 parent f997a8a39b
commit 1345e3f57b
7 files changed
+1993 -98

No files matched your search

+43 -3
View File
@@ -151,17 +151,32 @@ pub fn append_table_modifiers(ddl: &str, modifiers: &TableModifiers) -> Result<S
}
fn render_external_table_ddl(ddl: &str, external: &ExternalTableDefinition) -> Result<String, String> {
// The fallback DDL may already read `CREATE FOREIGN TABLE` — a foreign
// table's own relkind ('f') makes the generic renderer emit that header
// directly — or plain `CREATE TABLE` from an older/other rendering path.
// Accept either so this doesn't regress when the upstream header changes.
let create_foreign_table = "CREATE FOREIGN TABLE ";
let create_table = "CREATE TABLE ";
if !ddl.starts_with(create_table) {
let header_len = if ddl.starts_with(create_foreign_table) {
create_foreign_table.len()
} else if ddl.starts_with(create_table) {
create_table.len()
} else {
return Err("Cloudberry external-table fallback expected CREATE TABLE DDL".to_string());
}
};
let insertion = ddl
.find(";\n")
.or_else(|| ddl.find(';'))
.ok_or_else(|| "Cloudberry fallback DDL has no CREATE TABLE terminator".to_string())?;
// When the fallback DDL already read `CREATE FOREIGN TABLE`, the generic
// renderer also already appended its own ` SERVER ... [OPTIONS (...)]`
// clause (from the same relkind='f' catalog data). Drop that so this
// doesn't emit the clause twice — Cloudberry's own `external` definition
// above is authoritative here.
let body_end = ddl[header_len..insertion].find(" SERVER \"").map(|pos| header_len + pos).unwrap_or(insertion);
let mut output = String::with_capacity(ddl.len() + external.options.len() * 24 + 48);
output.push_str("CREATE FOREIGN TABLE ");
output.push_str(&ddl[create_table.len()..insertion]);
output.push_str(&ddl[header_len..body_end]);
output.push_str("\nSERVER ");
output.push_str(&db::postgres::pg_quote_ident(&external.server));
if !external.options.is_empty() {
@@ -324,6 +339,31 @@ mod tests {
assert!(rendered.contains("\"null\" ''"));
}
#[test]
fn renders_external_table_from_already_foreign_ddl_without_duplicate_server_clause() {
// The generic renderer now derives `is_foreign` straight from relkind
// and may hand back a `CREATE FOREIGN TABLE ... SERVER ...` fallback
// DDL directly, not just plain `CREATE TABLE`.
let ddl =
"CREATE FOREIGN TABLE \"public\".\"external_events\" (\n \"id\" integer\n) SERVER \"stale_server\";\n";
let rendered = append_table_modifiers(
ddl,
&TableModifiers {
external: Some(ExternalTableDefinition {
server: "gp_exttable_server".to_string(),
options: vec!["format=csv".to_string()],
}),
..modifiers(None)
},
)
.unwrap();
assert!(rendered.starts_with("CREATE FOREIGN TABLE \"public\".\"external_events\""));
assert_eq!(rendered.matches("SERVER").count(), 1);
assert!(rendered.contains("SERVER \"gp_exttable_server\""));
assert!(!rendered.contains("stale_server"));
}
#[test]
fn ddl_queries_avoid_privileged_external_catalog_view() {
assert_eq!(CLOUD_BERRY_TABLE_DDL_SQL, "SELECT pg_get_tabledef($1, $2, true)");
File diff suppressed because it is too large. Load diff