25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。
TypeScript aicliclickhousedatabasedatabase-clientdatabase-managementdockerguimcpmongodbmysqlpostgresqlredisrustsql-serversqlitetaurivue
fix(export): write postgres arrays as array literals
Jeff50f5d1698dc0
diff --git a/crates/dbx-core/src/data/database_export.rs b/crates/dbx-core/src/data/database_export.rsindex 760b9576a5..102a1bcdce 100644--- a/crates/dbx-core/src/data/database_export.rs+++ b/crates/dbx-core/src/data/database_export.rs@@ -25,6 +25,7 @@ use crate::transfer::{quote_postgres_string_literal, wrap_dameng_identity_insert_sql_for_table,};use crate::types::{ObjectSourceKind, SpatialColumn, SqlExportColumnSelection};+use dbx_sql::value_literals::format_pg_array_text;static EXPORT_CANCELLED: std::sync::LazyLock<RwLock<HashSet<String>>> =std::sync::LazyLock::new(|| RwLock::new(HashSet::new()));@@ -625,7 +626,7 @@ pub fn format_export_sql_literal(value: &Value) -> String {format_export_sql_literal_for_database(value, None)}-fn format_standard_sql_literal(value: &Value) -> String {+fn format_standard_sql_literal(value: &Value, database_type: Option<DatabaseType>) -> String {if value.is_null() {return "NULL".to_string();}@@ -635,6 +636,14 @@ fn format_standard_sql_literal(value: &Value) -> String {if let Some(value) = value.as_bool() {return if value { "TRUE" } else { "FALSE" }.to_string();}+ if let Some(arr) = value.as_array() {+ if database_type == Some(DatabaseType::Postgres) {+ // The array text carries its own backslash escapes, which a plain+ // '...' literal keeps verbatim under PostgreSQL's default+ // `standard_conforming_strings = on`, as it does for other text.+ return quote_standard_export_sql_string(&format_pg_array_text(arr));+ }+ }let text = value.as_str().map_or_else(|| value.to_string(), ToString::to_string);quote_standard_export_sql_string(&text)@@ -1690,7 +1699,7 @@ pub(crate) fn build_export_insert_statements_excluding_with_dialect(value};let literal = if insert_dialect == SqlInsertDialect::Standard {- format_standard_sql_literal(value)+ format_standard_sql_literal(value, options.database_type)} else if let Some(literal) =crate::data_grid_sql::format_oracle_lob_export_literal(value, options.database_type, column_type)?{@@ -7930,6 +7939,30 @@ mod tests {assert!(!sql.contains("N'"));}+ #[test]+ fn standard_sql_insert_writes_postgres_arrays_as_array_literals() {+ let options: BuildExportSqlInsertOptions = serde_json::from_value(json!({+ "databaseType": "postgres",+ "insertDialect": "standard",+ "schema": "public",+ "tableName": "users_role",+ "columns": ["id", "permissions", "tricky", "empty", "meta"],+ "columnTypes": ["integer", "text[]", "text[]", "integer[]", "jsonb"],+ "rows": [+ [1, ["add_issue", "view_issues"], ["say \"hi\"", "a,b", null, "C:\\tmp", "it's"], [], "{\"k\": [1]}"]+ ],+ "batchSize": 10+ }))+ .expect("deserialize Standard SQL INSERT payload");++ let sql = build_export_sql_insert(options).expect("build Standard SQL INSERT");++ assert_eq!(+ sql,+ r#"INSERT INTO "public"."users_role" ("id", "permissions", "tricky", "empty", "meta") VALUES (1, '{"add_issue","view_issues"}', '{"say \"hi\"","a,b",NULL,"C:\\tmp","it''s"}', '{}', '{"k": [1]}');"#+ );+ }+#[test]fn standard_sql_insert_keeps_requested_batch_mode_for_oracle_sources() {let options: BuildExportSqlInsertOptions = serde_json::from_value(json!({diff --git a/crates/dbx-sql-core/src/value_literals.rs b/crates/dbx-sql-core/src/value_literals.rsindex 9be03396e2..b6c93d8bc0 100644--- a/crates/dbx-sql-core/src/value_literals.rs+++ b/crates/dbx-sql-core/src/value_literals.rs@@ -2,8 +2,7 @@ pub fn format_pg_array_sql_literal(arr: &[serde_json::Value]) -> String {if arr.is_empty() {return "'{}'".to_string();}- let elements: Vec<String> = arr.iter().map(format_pg_array_element).collect();- let inner = format!("{{{}}}", elements.join(","));+ let inner = format_pg_array_text(arr);// The array text already carries its own backslash escapes, so doubling// them is only valid inside an escape string constant (E'...'); a plain// '...' literal keeps backslashes verbatim under the default@@ -11,6 +10,11 @@ pub fn format_pg_array_sql_literal(arr: &[serde_json::Value]) -> String {quote_postgres_string_literal(&inner)}+pub fn format_pg_array_text(arr: &[serde_json::Value]) -> String {+ let elements: Vec<String> = arr.iter().map(format_pg_array_element).collect();+ format!("{{{}}}", elements.join(","))+}+pub fn format_pg_array_element(val: &serde_json::Value) -> String {match val {serde_json::Value::Null => "NULL".to_string(),