Skip to content

Apache DataFusion SQL Query Engine

Fix: Error rather than silently ignore extra parameter passed to ceil/floor (#18265)

Aryamaan Singh0a8f15481fb1
diff --git a/datafusion/sql/src/expr/mod.rs b/datafusion/sql/src/expr/mod.rs
index fef0505e99..715a02db8b 100644
--- a/datafusion/sql/src/expr/mod.rs
+++ b/datafusion/sql/src/expr/mod.rs
@@ -20,9 +20,10 @@ use datafusion_expr::planner::{
PlannerResult, RawBinaryExpr, RawDictionaryExpr, RawFieldAccessExpr,
};
use sqlparser::ast::{
- AccessExpr, BinaryOperator, CastFormat, CastKind, DataType as SQLDataType,
- DictionaryField, Expr as SQLExpr, ExprWithAlias as SQLExprWithAlias, MapEntry,
- StructField, Subscript, TrimWhereField, TypedString, Value, ValueWithSpan,
+ AccessExpr, BinaryOperator, CastFormat, CastKind, CeilFloorKind,
+ DataType as SQLDataType, DateTimeField, DictionaryField, Expr as SQLExpr,
+ ExprWithAlias as SQLExprWithAlias, MapEntry, StructField, Subscript, TrimWhereField,
+ TypedString, Value, ValueWithSpan,
};
use datafusion_common::{
@@ -498,14 +499,28 @@ impl<S: ContextProvider> SqlToRel<'_, S> {
self.sql_grouping_sets_to_expr(exprs, schema, planner_context)
}
- SQLExpr::Floor {
- expr,
- field: _field,
- } => self.sql_fn_name_to_expr(*expr, "floor", schema, planner_context),
- SQLExpr::Ceil {
- expr,
- field: _field,
- } => self.sql_fn_name_to_expr(*expr, "ceil", schema, planner_context),
+ SQLExpr::Floor { expr, field } => match field {
+ CeilFloorKind::DateTimeField(DateTimeField::NoDateTime) => {
+ self.sql_fn_name_to_expr(*expr, "floor", schema, planner_context)
+ }
+ CeilFloorKind::DateTimeField(_) => {
+ not_impl_err!("FLOOR with datetime is not supported")
+ }
+ CeilFloorKind::Scale(_) => {
+ not_impl_err!("FLOOR with scale is not supported")
+ }
+ },
+ SQLExpr::Ceil { expr, field } => match field {
+ CeilFloorKind::DateTimeField(DateTimeField::NoDateTime) => {
+ self.sql_fn_name_to_expr(*expr, "ceil", schema, planner_context)
+ }
+ CeilFloorKind::DateTimeField(_) => {
+ not_impl_err!("CEIL with datetime is not supported")
+ }
+ CeilFloorKind::Scale(_) => {
+ not_impl_err!("CEIL with scale is not supported")
+ }
+ },
SQLExpr::Overlay {
expr,
overlay_what,
diff --git a/datafusion/sqllogictest/test_files/scalar.slt b/datafusion/sqllogictest/test_files/scalar.slt
index b0e200015d..faa0d69ae8 100644
--- a/datafusion/sqllogictest/test_files/scalar.slt
+++ b/datafusion/sqllogictest/test_files/scalar.slt
@@ -309,6 +309,14 @@ select ceil(a), ceil(b), ceil(c) from small_floats;
1 0 0
1 0 1
+# ceil with scale parameter(Scale not supported)
+query error DataFusion error: This feature is not implemented: CEIL with scale is not supported
+select ceil(100.1234, 1)
+
+# ceil with datetime parameter (not supported)
+query error DataFusion error: This feature is not implemented: CEIL with datetime is not supported
+select ceil(100.1234 to year)
+
## degrees
# degrees scalar function
@@ -448,6 +456,14 @@ select floor(a), floor(b), floor(c) from signed_integers;
2 -1000 123
4 NULL NULL
+# floor with scale parameter(Scale not supported)
+query error DataFusion error: This feature is not implemented: FLOOR with scale is not supported
+select floor(a, 1)
+
+# floor with datetime parameter ( not supported)
+query error DataFusion error: This feature is not implemented: FLOOR with datetime is not supported
+select floor(a to year)
+
## ln
# ln scalar function