Fix: support Qualified Wildcard in count aggregate function

apache · Sep 29, 2024 · 5ea4f37 · 5ea4f37
1 parent 3892499
commit 5ea4f37
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/datafusion/optimizer/src/analyzer/count_wildcard_rule.rs b/datafusion/optimizer/src/analyzer/count_wildcard_rule.rs
@@ -48,13 +48,7 @@ impl AnalyzerRule for CountWildcardRule {
 }
 
 fn is_wildcard(expr: &Expr) -> bool {
-    matches!(
-        expr,
-        Expr::Wildcard {
-            qualifier: None,
-            ..
-        }
-    )
+    matches!(expr, Expr::Wildcard { .. })
 }
 
 fn is_count_star_aggregate(aggregate_function: &AggregateFunction) -> bool {

diff --git a/datafusion/sql/src/expr/function.rs b/datafusion/sql/src/expr/function.rs
@@ -432,6 +432,12 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {
                 qualifier: None,
                 options: WildcardOptions::default(),
             }),
+            FunctionArg::Unnamed(FunctionArgExpr::QualifiedWildcard(object_name)) => {
+                Ok(Expr::Wildcard {
+                    qualifier: Some(self.object_name_to_table_reference(object_name)?),
+                    options: WildcardOptions::default(),
+                })
+            }
             _ => not_impl_err!("Unsupported qualified wildcard argument: {sql:?}"),
         }
     }

diff --git a/datafusion/sqllogictest/test_files/aggregate.slt b/datafusion/sqllogictest/test_files/aggregate.slt
@@ -1124,6 +1124,11 @@ SELECT COUNT(*) FROM aggregate_test_100
 ----
 100
 
+query I
+SELECT COUNT(aggregate_test_100.*) FROM aggregate_test_100
+----
+100
+
 # csv_query_count_literal
 query I
 SELECT COUNT(2) FROM aggregate_test_100