Apache DataFusion SQL Query Engine
fix: Show unique valid field names when an invalid one is provided (#24774)
Nuno Faria4b8ad8809747
diff --git a/datafusion/common/src/column.rs b/datafusion/common/src/column.rsindex f8893aa423..7a6bef8381 100644--- a/datafusion/common/src/column.rs+++ b/datafusion/common/src/column.rs@@ -22,6 +22,7 @@ use crate::utils::parse_identifiers_normalized;use crate::utils::quote_identifier;use crate::{DFSchema, Diagnostic, Result, SchemaError, Spans, TableReference};use arrow::datatypes::{Field, FieldRef};+use itertools::Itertools;use std::collections::HashSet;use std::fmt;@@ -295,6 +296,7 @@ impl Column {.iter().flat_map(|s| s.iter()).flat_map(|s| s.columns())+ .unique().collect(),})}diff --git a/datafusion/sqllogictest/test_files/errors.slt b/datafusion/sqllogictest/test_files/errors.sltindex ab934279c3..5d3ddd43f0 100644--- a/datafusion/sqllogictest/test_files/errors.slt+++ b/datafusion/sqllogictest/test_files/errors.slt@@ -191,3 +191,12 @@ select ammp from a;statement okdrop table a;+++# Test valid fields in a nested query when providing an invalid column name+# (https://github.com/apache/datafusion/issues/24773)+query error DataFusion error: Schema error: No field named y\.\nValid fields are t\.x\.$+select * from (select 1 as x) t order by y;++query error DataFusion error: Schema error: No field named t\.y\. Did you mean 't\.x'\?\nValid fields are t\.x\.$+select * from (select 1 as x) t order by t.y;