This is an automated email from the ASF dual-hosted git repository.
alamb pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion.git
The following commit(s) were added to refs/heads/main by this push:
new 8c2264ca3a Use qualified names on DELETE selections (#16033)
8c2264ca3a is described below
commit 8c2264ca3a5c646fb2156c46880889e643a188cf
Author: Nuno Faria <[email protected]>
AuthorDate: Tue May 20 17:34:05 2025 +0100
Use qualified names on DELETE selections (#16033)
Co-authored-by: Andrew Lamb <[email protected]>
---
datafusion/sql/src/statement.rs | 5 +-
datafusion/sql/tests/sql_integration.rs | 4 +-
datafusion/sqllogictest/test_files/delete.slt | 107 ++++++++++++++++++++++++++
3 files changed, 113 insertions(+), 3 deletions(-)
diff --git a/datafusion/sql/src/statement.rs b/datafusion/sql/src/statement.rs
index 7fae48aac2..09e89cee69 100644
--- a/datafusion/sql/src/statement.rs
+++ b/datafusion/sql/src/statement.rs
@@ -1794,7 +1794,10 @@ impl<S: ContextProvider> SqlToRel<'_, S> {
// Do a table lookup to verify the table exists
let table_ref =
self.object_name_to_table_reference(table_name.clone())?;
let table_source =
self.context_provider.get_table_source(table_ref.clone())?;
- let schema = table_source.schema().to_dfschema_ref()?;
+ let schema = DFSchema::try_from_qualified_schema(
+ table_ref.clone(),
+ &table_source.schema(),
+ )?;
let scan =
LogicalPlanBuilder::scan(table_ref.clone(),
Arc::clone(&table_source), None)?
.build()?;
diff --git a/datafusion/sql/tests/sql_integration.rs
b/datafusion/sql/tests/sql_integration.rs
index 6d08dd4fe5..352f45fd79 100644
--- a/datafusion/sql/tests/sql_integration.rs
+++ b/datafusion/sql/tests/sql_integration.rs
@@ -761,7 +761,7 @@ fn plan_delete() {
plan,
@r#"
Dml: op=[Delete] table=[person]
- Filter: id = Int64(1)
+ Filter: person.id = Int64(1)
TableScan: person
"#
);
@@ -776,7 +776,7 @@ fn plan_delete_quoted_identifier_case_sensitive() {
plan,
@r#"
Dml: op=[Delete] table=[SomeCatalog.SomeSchema.UPPERCASE_test]
- Filter: Id = Int64(1)
+ Filter: SomeCatalog.SomeSchema.UPPERCASE_test.Id = Int64(1)
TableScan: SomeCatalog.SomeSchema.UPPERCASE_test
"#
);
diff --git a/datafusion/sqllogictest/test_files/delete.slt
b/datafusion/sqllogictest/test_files/delete.slt
new file mode 100644
index 0000000000..d096aa9f43
--- /dev/null
+++ b/datafusion/sqllogictest/test_files/delete.slt
@@ -0,0 +1,107 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+
+# http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+##########
+## Delete Tests
+##########
+
+statement ok
+create table t1(a int, b varchar, c double, d int);
+
+# Turn off the optimizer to make the logical plan closer to the initial one
+statement ok
+set datafusion.optimizer.max_passes = 0;
+
+
+# Delete all
+query TT
+explain delete from t1;
+----
+logical_plan
+01)Dml: op=[Delete] table=[t1]
+02)--TableScan: t1
+physical_plan_error This feature is not implemented: Unsupported logical plan:
Dml(Delete)
+
+
+# Filtered by existing columns
+query TT
+explain delete from t1 where a = 1 and b = 2 and c > 3 and d != 4;
+----
+logical_plan
+01)Dml: op=[Delete] table=[t1]
+02)--Filter: CAST(t1.a AS Int64) = Int64(1) AND t1.b = CAST(Int64(2) AS Utf8)
AND t1.c > CAST(Int64(3) AS Float64) AND CAST(t1.d AS Int64) != Int64(4)
+03)----TableScan: t1
+physical_plan_error This feature is not implemented: Unsupported logical plan:
Dml(Delete)
+
+
+# Filtered by existing columns, using qualified and unqualified names
+query TT
+explain delete from t1 where t1.a = 1 and b = 2 and t1.c > 3 and d != 4;
+----
+logical_plan
+01)Dml: op=[Delete] table=[t1]
+02)--Filter: CAST(t1.a AS Int64) = Int64(1) AND t1.b = CAST(Int64(2) AS Utf8)
AND t1.c > CAST(Int64(3) AS Float64) AND CAST(t1.d AS Int64) != Int64(4)
+03)----TableScan: t1
+physical_plan_error This feature is not implemented: Unsupported logical plan:
Dml(Delete)
+
+
+# Filtered by a mix of columns and literal predicates
+query TT
+explain delete from t1 where a = 1 and 1 = 1 and true;
+----
+logical_plan
+01)Dml: op=[Delete] table=[t1]
+02)--Filter: CAST(t1.a AS Int64) = Int64(1) AND Int64(1) = Int64(1) AND
Boolean(true)
+03)----TableScan: t1
+physical_plan_error This feature is not implemented: Unsupported logical plan:
Dml(Delete)
+
+
+# Deleting by columns that do not exist returns an error
+query error DataFusion error: Schema error: No field named e. Valid fields are
t1.a, t1.b, t1.c, t1.d.
+explain delete from t1 where e = 1;
+
+
+# Filtering using subqueries
+
+statement ok
+create table t2(a int, b varchar, c double, d int);
+
+query TT
+explain delete from t1 where a = (select max(a) from t2 where t1.b = t2.b);
+----
+logical_plan
+01)Dml: op=[Delete] table=[t1]
+02)--Filter: t1.a = (<subquery>)
+03)----Subquery:
+04)------Projection: max(t2.a)
+05)--------Aggregate: groupBy=[[]], aggr=[[max(t2.a)]]
+06)----------Filter: outer_ref(t1.b) = t2.b
+07)------------TableScan: t2
+08)----TableScan: t1
+physical_plan_error This feature is not implemented: Physical plan does not
support logical expression ScalarSubquery(<subquery>)
+
+query TT
+explain delete from t1 where a in (select a from t2);
+----
+logical_plan
+01)Dml: op=[Delete] table=[t1]
+02)--Filter: t1.a IN (<subquery>)
+03)----Subquery:
+04)------Projection: t2.a
+05)--------TableScan: t2
+06)----TableScan: t1
+physical_plan_error This feature is not implemented: Physical plan does not
support logical expression InSubquery(InSubquery { expr: Column(Column {
relation: Some(Bare { table: "t1" }), name: "a" }), subquery: <subquery>,
negated: false })
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
