Skip to content

Apache DataFusion SQL Query Engine

fix ^ evaluates as bitwise XOR instead of exponentiation (#22314)

Zhen Chen971cf9978221
diff --git a/datafusion/sql/src/expr/binary_op.rs b/datafusion/sql/src/expr/binary_op.rs
index 4e9025e02e..c3e7939370 100644
--- a/datafusion/sql/src/expr/binary_op.rs
+++ b/datafusion/sql/src/expr/binary_op.rs
@@ -16,8 +16,10 @@
// under the License.
use crate::planner::{ContextProvider, SqlToRel};
-use datafusion_common::{Result, not_impl_err};
+use datafusion_common::{Result, internal_datafusion_err, not_impl_err};
use datafusion_expr::Operator;
+use datafusion_expr::expr::ScalarFunction;
+use datafusion_expr::{BinaryExpr, Expr};
use sqlparser::ast::BinaryOperator;
impl<S: ContextProvider> SqlToRel<'_, S> {
@@ -72,4 +74,34 @@ impl<S: ContextProvider> SqlToRel<'_, S> {
_ => not_impl_err!("Unsupported binary operator: {:?}", op),
}
}
+
+ pub(crate) fn build_binary_expr(
+ &self,
+ op: &BinaryOperator,
+ left: Expr,
+ right: Expr,
+ ) -> Result<Expr> {
+ if matches!(op, BinaryOperator::PGExp) {
+ let fun_name = "power";
+ let fun = self
+ .context_provider
+ .get_function_meta(fun_name)
+ .ok_or_else(|| {
+ internal_datafusion_err!(
+ "Unable to find expected '{fun_name}' function"
+ )
+ })?;
+
+ return Ok(Expr::ScalarFunction(ScalarFunction::new_udf(
+ fun,
+ vec![left, right],
+ )));
+ }
+
+ Ok(Expr::BinaryExpr(BinaryExpr::new(
+ Box::new(left),
+ self.parse_sql_binary_op(op)?,
+ Box::new(right),
+ )))
+ }
}
diff --git a/datafusion/sql/src/expr/mod.rs b/datafusion/sql/src/expr/mod.rs
index ba7811acd8..2500a48a91 100644
--- a/datafusion/sql/src/expr/mod.rs
+++ b/datafusion/sql/src/expr/mod.rs
@@ -142,11 +142,7 @@ impl<S: ContextProvider> SqlToRel<'_, S> {
}
let RawBinaryExpr { op, left, right } = binary_expr;
- Ok(Expr::BinaryExpr(BinaryExpr::new(
- Box::new(left),
- self.parse_sql_binary_op(&op)?,
- Box::new(right),
- )))
+ self.build_binary_expr(&op, left, right)
}
pub fn sql_to_expr_with_alias(
diff --git a/datafusion/sqllogictest/test_files/scalar.slt b/datafusion/sqllogictest/test_files/scalar.slt
index 89ae30e3c0..2ac7a9ef36 100644
--- a/datafusion/sqllogictest/test_files/scalar.slt
+++ b/datafusion/sqllogictest/test_files/scalar.slt
@@ -1300,6 +1300,12 @@ NULL -32
statement ok
set datafusion.sql_parser.dialect = postgresql;
+# postgresql exponentiation uses caret
+query R
+select 2 ^ 3;
+----
+8
+
# postgresql bitwise xor with column and scalar
query I rowsort
select c # 856 from signed_integers;