Skip to content

Support ExprNamed arguments to Scalar UDFs #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 25, 2025
Merged

Support ExprNamed arguments to Scalar UDFs #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8116e1a
support ExprNamed until 17379 ships
mach-kernel Sep 23, 2025
1d9c680
add same exprnamed lifting to udtf
mach-kernel Sep 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion datafusion/sql/src/expr/function.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@
// under the License.

use crate::planner::{ContextProvider, PlannerContext, SqlToRel};
use std::collections::BTreeMap;

use arrow::datatypes::DataType;
use datafusion_common::{
internal_datafusion_err, internal_err, not_impl_err, plan_datafusion_err, plan_err,
DFSchema, Dependency, Diagnostic, Result, Span,
};
use datafusion_expr::expr::{ScalarFunction, Unnest, WildcardOptions};
use datafusion_expr::expr::{FieldMetadata, ScalarFunction, Unnest, WildcardOptions};
use datafusion_expr::planner::{PlannerResult, RawAggregateExpr, RawWindowExpr};
use datafusion_expr::{
expr, Expr, ExprFunctionExt, ExprSchemable, WindowFrame, WindowFunctionDefinition,
Expand Down Expand Up @@ -558,6 +559,22 @@ impl<S: ContextProvider> SqlToRel<'_, S> {
arg: FunctionArgExpr::Expr(arg),
operator: _,
} => self.sql_expr_to_logical_expr(arg, schema, planner_context),
FunctionArg::ExprNamed {
name: SQLExpr::Identifier(ident),
arg: FunctionArgExpr::Expr(arg),
operator: _,
} => match self.sql_expr_to_logical_expr(arg, schema, planner_context) {
Ok(Expr::Literal(scalar, meta)) => {
let spice_metadata = FieldMetadata::new(BTreeMap::from([(
"spice.parameter_name".to_string(),
ident.value,
)]));
let mut meta = meta.unwrap_or(FieldMetadata::default());
meta.extend(spice_metadata);
Ok(Expr::Literal(scalar, Some(meta)))
}
other => other,
},
FunctionArg::Named {
name: _,
arg: FunctionArgExpr::Wildcard,
Expand Down
39 changes: 32 additions & 7 deletions datafusion/sql/src/relation/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

use std::collections::BTreeMap;
use std::sync::Arc;

use crate::planner::{ContextProvider, PlannerContext, SqlToRel};
Expand All @@ -24,9 +25,12 @@ use datafusion_common::{
not_impl_err, plan_err, DFSchema, Diagnostic, Result, Span, Spans, TableReference,
};
use datafusion_expr::builder::subquery_alias;
use datafusion_expr::expr::FieldMetadata;
use datafusion_expr::{expr::Unnest, Expr, LogicalPlan, LogicalPlanBuilder};
use datafusion_expr::{Subquery, SubqueryAlias};
use sqlparser::ast::{FunctionArg, FunctionArgExpr, Spanned, TableFactor};
use sqlparser::ast::{
Expr as SQLExpr, FunctionArg, FunctionArgExpr, Spanned, TableFactor,
};

mod join;

Expand All @@ -48,15 +52,36 @@ impl<S: ContextProvider> SqlToRel<'_, S> {
let args = func_args
.args
.into_iter()
.flat_map(|arg| {
if let FunctionArg::Unnamed(FunctionArgExpr::Expr(expr)) = arg
{
self.sql_expr_to_logical_expr(
.flat_map(|arg| match arg {
FunctionArg::Unnamed(FunctionArgExpr::Expr(expr)) => self
.sql_expr_to_logical_expr(
expr,
&DFSchema::empty(),
planner_context,
)
} else {
),
FunctionArg::ExprNamed {
name: SQLExpr::Identifier(ident),
arg: FunctionArgExpr::Expr(arg),
operator: _,
} => match self.sql_expr_to_logical_expr(
arg,
&DFSchema::empty(),
planner_context,
) {
Ok(Expr::Literal(scalar, meta)) => {
let spice_metadata =
FieldMetadata::new(BTreeMap::from([(
"spice.parameter_name".to_string(),
ident.value,
)]));
let mut meta =
meta.unwrap_or(FieldMetadata::default());
meta.extend(spice_metadata);
Ok(Expr::Literal(scalar, Some(meta)))
}
other => other,
},
_ => {
plan_err!("Unsupported function argument type: {:?}", arg)
}
})
Expand Down