Apache DataFusion SQL Query Engine
bugfix: select_columns should validate column names (#18623)
Tim Saucer30eaff315828
diff --git a/datafusion/core/src/dataframe/mod.rs b/datafusion/core/src/dataframe/mod.rsindex b43c9c671f..aa378d4262 100644--- a/datafusion/core/src/dataframe/mod.rs+++ b/datafusion/core/src/dataframe/mod.rs@@ -52,8 +52,8 @@ use arrow::datatypes::{DataType, Field, Schema, SchemaRef};use datafusion_common::config::{CsvOptions, JsonOptions};use datafusion_common::{exec_err, internal_datafusion_err, not_impl_err, plan_datafusion_err, plan_err,- Column, DFSchema, DataFusionError, ParamValues, ScalarValue, SchemaError,- TableReference, UnnestOptions,+ unqualified_field_not_found, Column, DFSchema, DataFusionError, ParamValues,+ ScalarValue, SchemaError, TableReference, UnnestOptions,};use datafusion_expr::select_expr::SelectExpr;use datafusion_expr::{@@ -310,11 +310,20 @@ impl DataFrame {pub fn select_columns(self, columns: &[&str]) -> Result<DataFrame> {let fields = columns.iter()- .flat_map(|name| {- self.plan+ .map(|name| {+ let fields = self+ .plan.schema()- .qualified_fields_with_unqualified_name(name)+ .qualified_fields_with_unqualified_name(name);+ if fields.is_empty() {+ Err(unqualified_field_not_found(name, self.plan.schema()))+ } else {+ Ok(fields)+ }})+ .collect::<Result<Vec<_>, _>>()?+ .into_iter()+ .flatten().collect::<Vec<_>>();let expr: Vec<Expr> = fields.into_iter()diff --git a/datafusion/core/tests/dataframe/mod.rs b/datafusion/core/tests/dataframe/mod.rsindex 50b7b9f433..8fb0694192 100644--- a/datafusion/core/tests/dataframe/mod.rs+++ b/datafusion/core/tests/dataframe/mod.rs@@ -67,7 +67,7 @@ use datafusion_catalog::TableProvider;use datafusion_common::test_util::{batches_to_sort_string, batches_to_string};use datafusion_common::{assert_contains, internal_datafusion_err, Constraint, Constraints, DFSchema,- DataFusionError, ScalarValue, TableReference, UnnestOptions,+ DataFusionError, ScalarValue, SchemaError, TableReference, UnnestOptions,};use datafusion_common_runtime::SpawnedTask;use datafusion_datasource::file_format::format_as_file_type;@@ -305,6 +305,27 @@ async fn select_columns() -> Result<()> {Ok(())}+#[tokio::test]+async fn select_columns_with_nonexistent_columns() -> Result<()> {+ let t = test_table().await?;+ let t2 = t.select_columns(&["canada", "c2", "rocks"]);++ match t2 {+ Err(DataFusionError::SchemaError(boxed_err, _)) => {+ // Verify it's the first invalid column+ match boxed_err.as_ref() {+ SchemaError::FieldNotFound { field, .. } => {+ assert_eq!(field.name(), "canada");+ }+ _ => panic!("Expected SchemaError::FieldNotFound for 'canada'"),+ }+ }+ _ => panic!("Expected SchemaError"),+ }++ Ok(())+}+#[tokio::test]async fn select_expr() -> Result<()> {// build plan using Table API