Skip to content

fix(postgres): double quote field names to avoid keyword colission #671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 28, 2025
+12 −8
Merged

fix(postgres): double quote field names to avoid keyword colission #671

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions src/ops/targets/postgres.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,17 +194,17 @@ impl ExportContext {
) -> Result<Self> {
let key_fields = key_fields_schema
.iter()
.map(|f| f.name.as_str())
.map(|f| format!("\"{}\"", f.name))
.collect::<Vec<_>>()
.join(", ");
let value_fields = value_fields_schema
.iter()
.map(|f| f.name.as_str())
.map(|f| format!("\"{}\"", f.name))
.collect::<Vec<_>>()
.join(", ");
let set_value_fields = value_fields_schema
.iter()
.map(|f| format!("{} = EXCLUDED.{}", f.name, f.name))
.map(|f| format!("\"{}\" = EXCLUDED.\"{}\"", f.name, f.name))
.collect::<Vec<_>>()
.join(", ");

Expand Down Expand Up @@ -288,7 +288,9 @@ impl ExportContext {
if i > 0 {
query_builder.push(" AND ");
}
query_builder.push("\"");
query_builder.push(schema.name.as_str());
query_builder.push("\"");
query_builder.push("=");
bind_key_field(&mut query_builder, value)?;
}
Expand Down Expand Up @@ -547,14 +549,16 @@ impl SetupStatus {
.await?;
}
for index_name in self.actions.indexes_to_delete.iter() {
let sql = format!("DROP INDEX IF EXISTS {}", index_name);
let sql = format!("DROP INDEX IF EXISTS {index_name}");
sqlx::query(&sql).execute(db_pool).await?;
}
if let Some(table_upsertion) = &self.actions.table_action.table_upsertion {
match table_upsertion {
TableUpsertionAction::Create { keys, values } => {
let mut fields = (keys.iter().map(|(k, v)| format!("{k} {v} NOT NULL")))
.chain(values.iter().map(|(k, v)| format!("{k} {v}")));
let mut fields = (keys
.iter()
.map(|(name, typ)| format!("\"{name}\" {typ} NOT NULL")))
.chain(values.iter().map(|(name, typ)| format!("\"{name}\" {typ}")));
let sql = format!(
"CREATE TABLE IF NOT EXISTS {table_name} ({}, PRIMARY KEY ({}))",
fields.join(", "),
Expand All @@ -568,13 +572,13 @@ impl SetupStatus {
} => {
for column_name in columns_to_delete.iter() {
let sql = format!(
"ALTER TABLE {table_name} DROP COLUMN IF EXISTS {column_name}",
"ALTER TABLE {table_name} DROP COLUMN IF EXISTS \"{column_name}\"",
);
sqlx::query(&sql).execute(db_pool).await?;
}
for (column_name, column_type) in columns_to_upsert.iter() {
let sql = format!(
"ALTER TABLE {table_name} DROP COLUMN IF EXISTS {column_name}, ADD COLUMN {column_name} {column_type}"
"ALTER TABLE {table_name} DROP COLUMN IF EXISTS \"{column_name}\", ADD COLUMN \"{column_name}\" {column_type}"
);
sqlx::query(&sql).execute(db_pool).await?;
}
Expand Down