Skip to content
Merged
Changes from all commits
Commits
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
36 changes: 35 additions & 1 deletion pgdog/src/backend/replication/logical/publisher/table.rs
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,8 @@ impl Table {
let where_clause = self
.columns
.iter()
.filter(|c| c.identity)
.enumerate()
.filter(|(_, c)| c.identity)
.map(|(i, c)| format!("\"{}\" = ${}", escape_identifier(&c.name), i + 1))
.collect::<Vec<_>>()
.join(" AND ");
Expand Down Expand Up @@ -334,6 +334,40 @@ mod test {
assert!(pg_query::parse(&delete).is_ok(), "delete: {}", delete);
}

#[test]
fn test_delete_sequential_params_identity_not_first() {
// Regression: when identity columns aren't at the start of the column list,
// delete() must still produce sequential $1, $2, ... parameters.
let table = make_table(vec![("name", false), ("value", false), ("id", true)]);
let delete = table.delete();
assert!(delete.contains("$1"), "expected $1 in delete: {}", delete);
assert!(
!delete.contains("$3"),
"delete should not skip to $3: {}",
delete
);
assert!(pg_query::parse(&delete).is_ok(), "delete: {}", delete);
}

#[test]
fn test_delete_sequential_params_composite_key() {
// Regression: composite key with non-contiguous identity columns
// must produce $1, $2 not $1, $3.
let table = make_table(vec![("id", true), ("name", false), ("version", true)]);
let delete = table.delete();
assert!(
delete.contains("$1") && delete.contains("$2"),
"expected $1 and $2 in delete: {}",
delete
);
assert!(
!delete.contains("$3"),
"delete should not reference $3: {}",
delete
);
assert!(pg_query::parse(&delete).is_ok(), "delete: {}", delete);
}

#[test]
fn test_sql_generation_special_chars() {
let table = make_table(vec![
Expand Down
Loading