support sql udf with unnamed parameters

Signed-off-by: Michael Xu <xzhseh@gmail.com>
risinglightdb · Mar 2, 2024 · 8b1bbd8 · 8b1bbd8
1 parent 0e4a846
commit 8b1bbd8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/binder/expr.rs b/src/binder/expr.rs
@@ -15,7 +15,18 @@ impl Binder {
     /// Bind an expression.
     pub fn bind_expr(&mut self, expr: Expr) -> Result {
         let id = match expr {
-            Expr::Value(v) => Ok(self.egraph.add(Node::Constant(v.into()))),
+            Expr::Value(v) => {
+                // This is okay since only sql udf relies on parameter-like (i.e., `$1`)
+                // values at present
+                // TODO: consider formally `bind_parameter` in the future (e.g., lambda function support, etc.)
+                if let Value::Placeholder(key) = v {
+                    self.udf_context
+                        .get_expr(&key)
+                        .map_or_else(|| Err(BindError::InvalidSQL), |&e| Ok(e))
+                } else {
+                    Ok(self.egraph.add(Node::Constant(v.into())))
+                }
+            },
             Expr::Identifier(ident) => self.bind_ident([ident]),
             Expr::CompoundIdentifier(idents) => self.bind_ident(idents),
             Expr::BinaryOp { left, op, right } => self.bind_binary_op(*left, op, *right),

diff --git a/src/binder/mod.rs b/src/binder/mod.rs
@@ -202,7 +202,7 @@ impl UdfContext {
                             return Err(BindError::InvalidExpression("invalid syntax".to_string()));
                         };
                         if catalog.arg_names[i].is_empty() {
-                            todo!("anonymous parameters not yet supported");
+                            ret.insert(format!("${}", i + 1), e.clone());
                         } else {
                             // The index mapping here is accurate
                             // So that we could directly use the index