fix bugs

Lordworms · Feb 7, 2025 · adfee55 · adfee55
1 parent 2b02131
commit adfee55
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/datafusion/common/src/column.rs b/datafusion/common/src/column.rs
@@ -17,7 +17,7 @@
 
 //! Column
 
-use crate::error::{_schema_err, add_possible_column_notes};
+use crate::error::{_schema_err, add_possible_columns_to_diag};
 use crate::utils::{parse_identifiers_normalized, quote_identifier};
 use crate::{
     DFSchema, DataFusionError, Diagnostic, Result, SchemaError, Spans, TableReference,
@@ -310,10 +310,10 @@ impl Column {
                 _,
             ) => {
                 let mut diagnostic = Diagnostic::new_error(
-                    format!("column '{}' is ambiguous", &field.name()),
+                    format!("column '{}' not found", &field.name()),
                     field.spans().first(),
                 );
-                add_possible_column_notes(&mut diagnostic, field, valid_fields);
+                add_possible_columns_to_diag(&mut diagnostic, field, valid_fields);
                 e.with_diagnostic(diagnostic)
             }
             _ => e,

diff --git a/datafusion/common/src/error.rs b/datafusion/common/src/error.rs
@@ -723,7 +723,7 @@ pub fn unqualified_field_not_found(name: &str, schema: &DFSchema) -> DataFusionE
     })
 }
 
-pub fn add_possible_column_notes(
+pub fn add_possible_columns_to_diag(
     diagnostic: &mut Diagnostic,
     field: &Column,
     valid_fields: &[Column],

diff --git a/datafusion/sql/src/planner.rs b/datafusion/sql/src/planner.rs
@@ -21,7 +21,7 @@ use std::sync::Arc;
 use std::vec;
 
 use arrow_schema::*;
-use datafusion_common::error::add_possible_column_notes;
+use datafusion_common::error::add_possible_columns_to_diag;
 use datafusion_common::{
     field_not_found, internal_err, plan_datafusion_err, DFSchemaRef, Diagnostic,
     SchemaError,
@@ -389,7 +389,11 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {
                                 col.spans().first(),
                             )
                         };
-                        add_possible_column_notes(&mut diagnostic, field, valid_fields);
+                        add_possible_columns_to_diag(
+                            &mut diagnostic,
+                            field,
+                            valid_fields,
+                        );
                         err.with_diagnostic(diagnostic)
                     }
                     _ => err,