BREAKING! Support multiple ROLLUP()-s in GROUP BY

Previosly in BigQuery only one was allowed, but PostgreSQL allows many.

Author: nene

src/cst/Select.ts

@@ -265,7 +265,7 @@ export interface GroupByClause extends BaseNode {
   type: "group_by_clause";
   groupByKw: [Keyword<"GROUP">, Keyword<"BY">];
   distinctKw?: Keyword<"ALL" | "DISTINCT">; // PostgreSQL
-  columns: ListExpr<Expr> | GroupByRollup;
+  columns: ListExpr<Expr | GroupByRollup>;
   withRollupKw?: [Keyword<"WITH">, Keyword<"ROLLUP">]; // MySQL, MariaDB
 }
 

src/parser.pegjs

@@ -785,7 +785,7 @@ where_clause
 group_by_clause
   = kws:(GROUP __ BY __)
     distinctKw:(group_by_distinct __)?
-    list:(group_by_rollup / list$expr)
+    list:list$grouping_element
     rolKw:(__ WITH __ ROLLUP)? {
     return loc({
       type: "group_by_clause",
@@ -799,8 +799,12 @@ group_by_clause
 group_by_distinct
   = kw:(ALL / DISTINCT) &postgres { return kw; }
 
+grouping_element
+  = group_by_rollup
+  / expr
+
 group_by_rollup
-  = &bigquery kw:(ROLLUP __) cols:paren$list$expr {
+  = kw:(ROLLUP __) cols:paren$list$expr (&bigquery / &postgres) {
     return loc({
       type: "group_by_rollup",
       rollupKw: read(kw),
@@ -4984,6 +4988,7 @@ list$expr = .
 list$expr_or_default = .
 list$expr_or_explicit_alias = .
 list$func_param = .
+list$grouping_element = .
 list$ident = .
 list$literal = .
 list$named_window = .

test/select/group_by.test.ts

@@ -19,6 +19,21 @@ describe("select GROUP BY", () => {
       testClauseWc("GROUP BY ROLLUP ( id, name + age )");
       testClauseWc("GROUP BY ROLLUP ( id, (name, age) )");
     });
+
+    dialect("postgresql", () => {
+      it("supports multiple ROLLUPs in one GROUP BY", () => {
+        testClauseWc("GROUP BY ROLLUP(id), ROLLUP(name)");
+      });
+
+      it("parses multiple ROLLUPs as group_by_rollup nodes", () => {
+        const clause = parseClause("GROUP BY ROLLUP(id), ROLLUP(name)");
+        if (clause.type !== "group_by_clause") {
+          throw new Error("Expected group_by_clause");
+        }
+        expect(clause.columns.items[0].type).toBe("group_by_rollup");
+        expect(clause.columns.items[1].type).toBe("group_by_rollup");
+      });
+    });
   });
 
   dialect(["mysql", "mariadb"], () => {