Skip to content

Commit df6cb09

Browse files
committed
Address EXECUTE missing name review
1 parent b7e5cb2 commit df6cb09

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

datafusion/sql/src/statement.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -886,16 +886,16 @@ impl<S: ContextProvider> SqlToRel<'_, S> {
886886
"Execute statement with DEFAULT is not supported"
887887
);
888888
}
889+
let name = name.ok_or_else(|| {
890+
plan_datafusion_err!("EXECUTE statement requires a name")
891+
})?;
892+
889893
let empty_schema = DFSchema::empty();
890894
let parameters = parameters
891895
.into_iter()
892896
.map(|expr| self.sql_to_expr(expr, &empty_schema, planner_context))
893897
.collect::<Result<Vec<Expr>>>()?;
894898

895-
let name = name.ok_or_else(|| {
896-
plan_datafusion_err!("EXECUTE statement requires a name")
897-
})?;
898-
899899
Ok(LogicalPlan::Statement(PlanStatement::Execute(Execute {
900900
name: object_name_to_string(&name),
901901
parameters,

datafusion/sqllogictest/test_files/prepare.slt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ EXEC('');
6363
statement error EXECUTE statement requires a name
6464
EXEC('any-string');
6565

66+
statement error EXECUTE statement requires a name
67+
EXEC(unknown_column);
68+
6669
statement error EXECUTE statement requires a name
6770
EXECUTE();
6871

0 commit comments

Comments
 (0)