Apache DataFusion SQL Query Engine
fix: Coerce aggregate FILTER predicates to boolean (#22774)
pchintare4ae23654c68
diff --git a/datafusion/optimizer/src/analyzer/type_coercion.rs b/datafusion/optimizer/src/analyzer/type_coercion.rsindex df3ccc2825..032fe25240 100644--- a/datafusion/optimizer/src/analyzer/type_coercion.rs+++ b/datafusion/optimizer/src/analyzer/type_coercion.rs@@ -715,6 +715,12 @@ impl TreeNodeRewriter for TypeCoercionRewriter<'_> {}) => {let new_expr =coerce_arguments_for_signature(args, self.schema, func.as_ref())?;++ let filter = filter+ .map(|filter| filter.cast_to(&DataType::Boolean, self.schema))+ .transpose()?+ .map(Box::new);+Ok(Transformed::yes(Expr::AggregateFunction(expr::AggregateFunction::new_udf(func,@@ -752,6 +758,11 @@ impl TreeNodeRewriter for TypeCoercionRewriter<'_> {}};+ let filter = filter+ .map(|filter| filter.cast_to(&DataType::Boolean, self.schema))+ .transpose()?+ .map(Box::new);+let new_expr = Expr::from(WindowFunction {fun,params: expr::WindowFunctionParams {diff --git a/datafusion/sqllogictest/test_files/aggregate.slt b/datafusion/sqllogictest/test_files/aggregate.sltindex c0be055cdc..18c09acf08 100644--- a/datafusion/sqllogictest/test_files/aggregate.slt+++ b/datafusion/sqllogictest/test_files/aggregate.slt@@ -6339,6 +6339,40 @@ GROUP BY g----0 0+# query_with_untyped_null_filter+query I+SELECT count(*) FILTER (WHERE NULL)+----+0++query I+SELECT count(1) FILTER (WHERE NULL)+----+0++query I+SELECT sum(1) FILTER (WHERE NULL)+----+NULL++query R+SELECT avg(1) FILTER (WHERE NULL)+----+NULL++# window_aggregate_with_untyped_null_filter+query I+SELECT count(*) FILTER (WHERE NULL) OVER ()+FROM (VALUES (1)) AS t(x)+----+0++query I+SELECT sum(1) FILTER (WHERE NULL) OVER ()+FROM (VALUES (1)) AS t(x)+----+NULL+# query_with_and_without_filterquery III rowsortSELECT