Skip to content
Open
Show file tree
Hide file tree
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
25 changes: 20 additions & 5 deletions core/src/duckdb/write.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ use crate::util::{
constraints,
count_exec::make_count_exec,
dml::{
assignments_to_sql, delete_statement, filters_to_sql, update_statement, DeletionExec,
DeletionSink, UpdateExec, UpdateSink,
assignments_to_sql_with_schema, delete_statement, filters_to_sql_with_schema,
update_statement, DeletionExec, DeletionSink, UpdateExec, UpdateSink,
},
on_conflict::OnConflict,
retriable_error::{check_and_mark_retriable_error, to_retriable_data_write_error},
Expand Down Expand Up @@ -261,7 +261,11 @@ impl TableProvider for DuckDBTableWriter {
let sql_where = if filters.is_empty() {
None
} else {
Some(filters_to_sql(&filters, Some(expr::Engine::DuckDB))?)
Some(filters_to_sql_with_schema(
&filters,
Some(expr::Engine::DuckDB),
Some(&self.schema()),
)?)
};
let table_definition = Arc::clone(&self.table_definition);
let pool = Arc::clone(&self.pool);
Expand All @@ -283,11 +287,22 @@ impl TableProvider for DuckDBTableWriter {
return make_count_exec(0);
}

let set_clause = assignments_to_sql(&assignments, Some(expr::Engine::DuckDB))?;
// Bound once so the SET clause and the WHERE clause are visibly rendered against the
// same schema.
let schema = self.schema();
let set_clause = assignments_to_sql_with_schema(
&assignments,
Some(expr::Engine::DuckDB),
Some(&schema),
)?;
let sql_where = if filters.is_empty() {
None
} else {
Some(filters_to_sql(&filters, Some(expr::Engine::DuckDB))?)
Some(filters_to_sql_with_schema(
&filters,
Some(expr::Engine::DuckDB),
Some(&schema),
)?)
};
let table_definition = Arc::clone(&self.table_definition);
let pool = Arc::clone(&self.pool);
Expand Down
Loading
Loading