Merge pull request #10660 from RinChanNOWWW/fix-grouping-sets

fix: support positions in grouping sets.

Author: mergify[bot]

src/query/sql/src/planner/binder/aggregate.rs

@@ -509,11 +509,14 @@ impl Binder {
                         self.create_column_binding(None, None, alias, scalar.data_type()?)
                     };
                     bind_context.aggregate_info.group_items.push(ScalarItem {
-                        scalar,
+                        scalar: scalar.clone(),
                         index: column_binding.index,
                     });
                     entry.insert(bind_context.aggregate_info.group_items.len() - 1);
                 }
+                if collect_grouping_sets && !grouping_sets.last().unwrap().contains(&scalar) {
+                    grouping_sets.last_mut().unwrap().push(scalar);
+                }
                 continue;
             }
 

tests/sqllogictests/suites/duckdb/sql/aggregate/group/group_by_grouping_sets.test

@@ -19,6 +19,26 @@ NULL 0
 NULL 1
 NULL 2
 
+query TT
+select number % 2 as a, number % 3 as b from numbers(24) group by grouping sets ((1,2), (1), (2)) order by a,b;
+----
+0 0
+0 1
+0 2
+0 NULL
+1 0
+1 1
+1 2
+1 NULL
+NULL 0
+NULL 1
+NULL 2
+
+statement ok
+create database if not exists grouping_sets;
+
+statement ok
+use grouping_sets;
 
 statement ok
 drop table if exists t;
@@ -55,6 +75,19 @@ NULL B 10 0 1 2 1
 b NULL 11 1 0 1 2
 NULL NULL 18 1 1 3 3
 
+query TTIIIII
+select a, b, sum(c) as sc, grouping(b), grouping(a), grouping(a,b), grouping(b,a) from t group by grouping sets ((1,2),(),(2),(1)) order by sc;
+----
+a A 3 0 0 0 0
+a B 4 0 0 0 0
+b A 5 0 0 0 0
+b B 6 0 0 0 0
+a NULL 7 1 0 1 2
+NULL A 8 0 1 2 1
+NULL B 10 0 1 2 1
+b NULL 11 1 0 1 2
+NULL NULL 18 1 1 3 3
+
 query TTIIIII
 select a, b, sum(c) as sc, grouping(b), grouping(a), grouping(a,b), grouping(b,a) from t group by grouping sets ((a,b),(a),()) order by sc;
 ----
@@ -80,6 +113,19 @@ NULL B 10 0 1 2 1
 b NULL 11 1 0 1 2
 NULL NULL 18 1 1 3 3
 
+query TTIIIII
+select a, b, sum(c) as sc, grouping(b), grouping(a), grouping(a,b), grouping(b,a) from t group by cube (1,2) order by sc;
+----
+a A 3 0 0 0 0
+a B 4 0 0 0 0
+b A 5 0 0 0 0
+b B 6 0 0 0 0
+a NULL 7 1 0 1 2
+NULL A 8 0 1 2 1
+NULL B 10 0 1 2 1
+b NULL 11 1 0 1 2
+NULL NULL 18 1 1 3 3
+
 query TTIIIII
 select a, b, sum(c) as sc, grouping(b), grouping(a), grouping(a,b), grouping(b,a) from t group by rollup (a,b) order by sc;
 ----
@@ -91,5 +137,19 @@ a NULL 7 1 0 1 2
 b NULL 11 1 0 1 2
 NULL NULL 18 1 1 3 3
 
+query TTIIIII
+select a, b, sum(c) as sc, grouping(b), grouping(a), grouping(a,b), grouping(b,a) from t group by rollup (1,2) order by sc;
+----
+a A 3 0 0 0 0
+a B 4 0 0 0 0
+b A 5 0 0 0 0
+b B 6 0 0 0 0
+a NULL 7 1 0 1 2
+b NULL 11 1 0 1 2
+NULL NULL 18 1 1 3 3
+
 statement ok
 drop table t all;
+
+statement ok
+drop database grouping_sets;