support new grouping features

Author: Dairyo Sekine

src/parser.rs

@@ -1671,6 +1671,13 @@ impl Parser {
             let mut groupby = self.construct_node(NodeType::XXXByExprs)?;
             self.next_token()?; // GROUP -> BY
             groupby.push_node("by", self.construct_node(NodeType::Keyword)?);
+            if self.get_token(1)?.in_(&vec!["ROLLUP", "CUBE"]) {
+                self.next_token()?; // -> ROLLUP | CUBE
+                groupby.push_node_vec("how", self.parse_n_keywords(1)?);
+            } else if self.get_token(1)?.in_(&vec!["GROUPING"]) {
+                self.next_token()?; // -> GROUPING
+                groupby.push_node_vec("how", self.parse_n_keywords(2)?);
+            }
             self.next_token()?; // BY -> expr
             groupby.push_node_vec("exprs", self.parse_exprs(&vec![], false)?);
             node.push_node("groupby", groupby);

src/parser/tests/tests_select.rs

@@ -2062,7 +2062,6 @@ groupby:
 ",
             0,
         )),
-        // NOTE ROLLUP is not a function but it is OK
         Box::new(SuccessTestCase::new(
             "\
 SELECT x, SUM(y) FROM t GROUP BY ROLLUP(x)
@@ -2089,13 +2088,57 @@ groupby:
   by:
     self: BY (Keyword)
   exprs:
-  - self: ( (CallingFunction)
-    args:
-    - self: x (Identifier)
-    func:
-      self: ROLLUP (Identifier)
+  - self: ( (GroupedExpr)
+    expr:
+      self: x (Identifier)
+    rparen:
+      self: ) (Symbol)
+  how:
+  - self: ROLLUP (Keyword)
+",
+            0,
+        )),
+        // CUBE() may be not a function but it's OK
+        Box::new(SuccessTestCase::new(
+            "\
+SELECT count(*) FROM t GROUP BY GROUPING SETS (a, CUBE(b))
+",
+            "\
+self: SELECT (SelectStatement)
+exprs:
+- self: ( (CallingFunction)
+  args:
+  - self: * (Asterisk)
+  func:
+    self: count (Identifier)
+  rparen:
+    self: ) (Symbol)
+from:
+  self: FROM (KeywordWithExpr)
+  expr:
+    self: t (Identifier)
+groupby:
+  self: GROUP (XXXByExprs)
+  by:
+    self: BY (Keyword)
+  exprs:
+  - self: ( (StructLiteral)
+    exprs:
+    - self: a (Identifier)
+      comma:
+        self: , (Symbol)
+    - self: ( (CallingFunction)
+      args:
+      - self: b (Identifier)
+      func:
+        self: CUBE (Identifier)
+      rparen:
+        self: ) (Symbol)
     rparen:
       self: ) (Symbol)
+  how:
+  - self: GROUPING (Keyword)
+  - self: SETS (Keyword)
 ",
             0,
         )),