diff --git a/datafusion/src/sql/planner.rs b/datafusion/src/sql/planner.rs index ac3d3b176dcdb..5219587c8c4df 100644 --- a/datafusion/src/sql/planner.rs +++ b/datafusion/src/sql/planner.rs @@ -768,7 +768,7 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> { let plan = plan?; // The SELECT expressions, with wildcards expanded. - let select_exprs = self.prepare_select_exprs(&plan, &select.projection)?; + let select_exprs = self.prepare_select_exprs(&plan, select)?; // having and group by clause may reference aliases defined in select projection let projected_plan = self.project(plan.clone(), select_exprs.clone())?; @@ -899,10 +899,10 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> { fn prepare_select_exprs( &self, plan: &LogicalPlan, - projection: &[SelectItem], + select: &Select, ) -> Result> { let input_schema = plan.schema(); - + let projection = &select.projection; projection .iter() .map(|expr| self.sql_select_to_rex(expr, input_schema)) @@ -910,7 +910,15 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> { .into_iter() .map(|expr| { Ok(match expr { - Expr::Wildcard => expand_wildcard(input_schema, plan)?, + Expr::Wildcard => { + if select.from.is_empty() { + return Err(DataFusionError::Plan( + "SELECT * with no tables specified is not valid" + .to_string(), + )); + } + expand_wildcard(input_schema, plan)? + } _ => vec![normalize_col(expr, plan)?], }) }) diff --git a/datafusion/tests/sql.rs b/datafusion/tests/sql.rs index 640556cb27249..c34275c88d9d7 100644 --- a/datafusion/tests/sql.rs +++ b/datafusion/tests/sql.rs @@ -6422,3 +6422,20 @@ async fn test_specific_nulls_first_asc() -> Result<()> { assert_batches_eq!(expected, &actual); Ok(()) } + +#[tokio::test] +async fn test_select_wildcard_without_table() -> Result<()> { + let mut ctx = ExecutionContext::new(); + let sql = "SELECT * "; + let actual = ctx.sql(sql).await; + match actual { + Ok(_) => panic!("expect err"), + Err(e) => { + assert_contains!( + e.to_string(), + "Error during planning: SELECT * with no tables specified is not valid" + ); + } + } + Ok(()) +}