Apache DataFusion SQL Query Engine
feat: support complex expr for prepared statement argument (#18383)
Chen Chongchena6fab6bbe7ca
diff --git a/datafusion/core/src/execution/context/mod.rs b/datafusion/core/src/execution/context/mod.rsindex 687779787a..c732c2c92f 100644--- a/datafusion/core/src/execution/context/mod.rs+++ b/datafusion/core/src/execution/context/mod.rs@@ -76,6 +76,7 @@ pub use datafusion_execution::config::SessionConfig;use datafusion_execution::registry::SerializerRegistry;pub use datafusion_execution::TaskContext;pub use datafusion_expr::execution_props::ExecutionProps;+use datafusion_expr::simplify::SimplifyContext;use datafusion_expr::{expr_rewriter::FunctionRewrite,logical_plan::{DdlStatement, Statement},@@ -83,6 +84,7 @@ use datafusion_expr::{Expr, UserDefinedLogicalNode, WindowUDF,};use datafusion_optimizer::analyzer::type_coercion::TypeCoercion;+use datafusion_optimizer::simplify_expressions::ExprSimplifier;use datafusion_optimizer::Analyzer;use datafusion_optimizer::{AnalyzerRule, OptimizerRule};use datafusion_session::SessionStore;@@ -1269,14 +1271,18 @@ impl SessionContext {exec_datafusion_err!("Prepared statement '{}' does not exist", name)})?;+ let state = self.state.read();+ let context = SimplifyContext::new(state.execution_props());+ let simplifier = ExprSimplifier::new(context);+// Only allow literals as parameters for now.let mut params: Vec<ScalarAndMetadata> = parameters.into_iter()- .map(|e| match e {+ .map(|e| match simplifier.simplify(e)? {Expr::Literal(scalar, metadata) => {Ok(ScalarAndMetadata::new(scalar, metadata))}- _ => not_impl_err!("Unsupported parameter type: {}", e),+ e => not_impl_err!("Unsupported parameter type: {e}"),}).collect::<Result<_>>()?;diff --git a/datafusion/sqllogictest/test_files/prepare.slt b/datafusion/sqllogictest/test_files/prepare.sltindex 486baca6f5..650527cef6 100644--- a/datafusion/sqllogictest/test_files/prepare.slt+++ b/datafusion/sqllogictest/test_files/prepare.slt@@ -204,9 +204,11 @@ EXECUTE my_plan6(20.0);statement error Cast error: Cannot cast string 'foo' to value of Int32 typeEXECUTE my_plan6('foo');-# TODO: support non-literal expressions-statement error Unsupported parameter type-EXECUTE my_plan6(10 + 20);+# support non-literal expressions+query II+EXECUTE my_plan6(10 + 10);+----+1 20statement okDEALLOCATE my_plan6;