From 0469a314da20af3b5fa547403998120fb7b08920 Mon Sep 17 00:00:00 2001 From: t8y2 <1156263951@qq.com> Date: Sat, 11 Jul 2026 09:02:34 +0800 Subject: [PATCH] fix(postgres): skip creating existing transfer schemas --- crates/dbx-core/src/transfer.rs | 42 +++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/crates/dbx-core/src/transfer.rs b/crates/dbx-core/src/transfer.rs index 4feac5c77c..b6e0cc7f4a 100644 --- a/crates/dbx-core/src/transfer.rs +++ b/crates/dbx-core/src/transfer.rs @@ -233,6 +233,14 @@ fn quote_string_literal(value: &str) -> String { format!("'{}'", value.replace('\'', "''")) } +fn postgres_schema_exists_sql(schema: &str) -> String { + format!("SELECT 1 FROM pg_catalog.pg_namespace WHERE nspname = {} LIMIT 1", quote_string_literal(schema)) +} + +fn query_result_has_rows(result: &db::QueryResult) -> bool { + !result.rows.is_empty() +} + fn is_simple_identifier(value: &str) -> bool { let mut chars = value.chars(); let Some(first) = chars.next() else { @@ -4248,13 +4256,19 @@ where } if !request.target_schema.trim().is_empty() { - let create_schema_sql = format!( - "CREATE SCHEMA IF NOT EXISTS {}", - quote_identifier(&request.target_schema, &DatabaseType::Postgres) - ); - execute_on_pool(state, target_pool_key, &create_schema_sql) - .await - .map_err(|e| format!("Failed to ensure PostgreSQL target schema exists: {e}"))?; + let schema_exists = + execute_on_pool(state, target_pool_key, &postgres_schema_exists_sql(&request.target_schema)) + .await + .map_err(|e| format!("Failed to check PostgreSQL target schema: {e}"))?; + if !query_result_has_rows(&schema_exists) { + // CREATE SCHEMA requires database-level CREATE privilege even with + // IF NOT EXISTS, so only issue it after confirming the schema is absent. + let create_schema_sql = + format!("CREATE SCHEMA {}", quote_identifier(&request.target_schema, &DatabaseType::Postgres)); + execute_on_pool(state, target_pool_key, &create_schema_sql) + .await + .map_err(|e| format!("Failed to create PostgreSQL target schema: {e}"))?; + } } let extensions = @@ -4701,6 +4715,20 @@ mod tests { } } + #[test] + fn postgres_schema_exists_query_escapes_schema_name() { + assert_eq!( + postgres_schema_exists_sql("team's data"), + "SELECT 1 FROM pg_catalog.pg_namespace WHERE nspname = 'team''s data' LIMIT 1" + ); + } + + #[test] + fn postgres_schema_exists_depends_on_returned_rows() { + assert!(!query_result_has_rows(&test_query_result(Vec::new()))); + assert!(query_result_has_rows(&test_query_result(vec![vec![serde_json::json!(1)]]))); + } + fn test_transfer_request(tables: Vec<&str>) -> TransferRequest { TransferRequest { transfer_id: "transfer-1".to_string(),