Skip to content

Apache DataFusion SQL Query Engine

feat: Implement `SessionState::create_logical_expr_from_sql_expr` (#18423)

Peter Nguyen0e6be30454f9
diff --git a/datafusion/core/src/execution/session_state.rs b/datafusion/core/src/execution/session_state.rs
index c15b7eae08..d7a66db28a 100644
--- a/datafusion/core/src/execution/session_state.rs
+++ b/datafusion/core/src/execution/session_state.rs
@@ -547,6 +547,16 @@ impl SessionState {
let sql_expr = self.sql_to_expr_with_alias(sql, &dialect)?;
+ self.create_logical_expr_from_sql_expr(sql_expr, df_schema)
+ }
+
+ /// Creates a datafusion style AST [`Expr`] from a SQL expression.
+ #[cfg(feature = "sql")]
+ pub fn create_logical_expr_from_sql_expr(
+ &self,
+ sql_expr: SQLExprWithAlias,
+ df_schema: &DFSchema,
+ ) -> datafusion_common::Result<Expr> {
let provider = SessionContextProvider {
state: self,
tables: HashMap::new(),
@@ -2097,6 +2107,36 @@ mod tests {
assert!(sql_to_expr(&state).is_err())
}
+ #[test]
+ #[cfg(feature = "sql")]
+ fn test_create_logical_expr_from_sql_expr() {
+ let state = SessionStateBuilder::new().with_default_features().build();
+
+ let provider = SessionContextProvider {
+ state: &state,
+ tables: HashMap::new(),
+ };
+
+ let schema = Schema::new(vec![Field::new("a", DataType::Int32, true)]);
+ let df_schema = DFSchema::try_from(schema).unwrap();
+ let dialect = state.config.options().sql_parser.dialect;
+ let query = SqlToRel::new_with_options(&provider, state.get_parser_options());
+
+ for sql in ["[1,2,3]", "a > 10", "SUM(a)"] {
+ let sql_expr = state.sql_to_expr(sql, &dialect).unwrap();
+ let from_str = query
+ .sql_to_expr(sql_expr, &df_schema, &mut PlannerContext::new())
+ .unwrap();
+
+ let sql_expr_with_alias =
+ state.sql_to_expr_with_alias(sql, &dialect).unwrap();
+ let from_expr = state
+ .create_logical_expr_from_sql_expr(sql_expr_with_alias, &df_schema)
+ .unwrap();
+ assert_eq!(from_str, from_expr);
+ }
+ }
+
#[test]
fn test_from_existing() -> Result<()> {
fn employee_batch() -> RecordBatch {