fix types

kitta65 · Dec 29, 2023 · 759b67d · 759b67d · kitta65 · Dec 29, 2023
1 parent f7d48b9
commit 759b67d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/src/cst.rs b/src/cst.rs
@@ -67,6 +67,7 @@ pub enum NodeType {
     ForSystemTimeAsOfClause, // FOR SYSTEM_TIME AS OF ts
     ForStatement,
     GrantStatement,
+    GroupByExprs,
     GroupedIdentWithOptions,             // (col OPTIONS())
     GroupedExpr,                         // (1)
     GroupedExprs,                        // (1, 2, 3)

diff --git a/src/parser.rs b/src/parser.rs
@@ -1668,7 +1668,7 @@ impl Parser {
         // GROUP BY
         if self.get_token(1)?.is("GROUP") {
             self.next_token()?; // expr -> GROUP
-            let mut groupby = self.construct_node(NodeType::XXXByExprs)?;
+            let mut groupby = self.construct_node(NodeType::GroupByExprs)?;
             self.next_token()?; // GROUP -> BY
             groupby.push_node("by", self.construct_node(NodeType::Keyword)?);
             if self.get_token(1)?.in_(&vec!["ROLLUP", "CUBE"]) {

diff --git a/src/parser/tests/tests_select.rs b/src/parser/tests/tests_select.rs
@@ -2051,7 +2051,7 @@ from:
   expr:
     self: t (Identifier)
 groupby:
-  self: GROUP (XXXByExprs)
+  self: GROUP (GroupByExprs)
   by:
     self: BY (Keyword)
   exprs:
@@ -2084,7 +2084,7 @@ from:
   expr:
     self: t (Identifier)
 groupby:
-  self: GROUP (XXXByExprs)
+  self: GROUP (GroupByExprs)
   by:
     self: BY (Keyword)
   exprs:
@@ -2118,7 +2118,7 @@ from:
   expr:
     self: t (Identifier)
 groupby:
-  self: GROUP (XXXByExprs)
+  self: GROUP (GroupByExprs)
   by:
     self: BY (Keyword)
   exprs:
@@ -2167,7 +2167,7 @@ from:
   expr:
     self: t (Identifier)
 groupby:
-  self: GROUP (XXXByExprs)
+  self: GROUP (GroupByExprs)
   by:
     self: BY (Keyword)
   exprs:

diff --git a/src/types.rs b/src/types.rs
@@ -59,6 +59,7 @@ export type UnknownNode =
   | ForStatement
   | ForSystemTimeAsOfClause
   | GrantStatement
+  | GroupByExprs
   | GroupedExpr
   | GroupedExprs
   | GroupedIdentWithOptions
@@ -810,6 +811,16 @@ export type GrantStatement = XXXStatement & {
   };
 };
 
+export type GroupByExprs = BaseNode & {
+  token: Token;
+  node_type: "GroupByExprs";
+  children: {
+    by: NodeChild;
+    how?: NodeVecChild;
+    exprs: { NodeVec: Expr[] & UnknownNode[] };
+  };
+};
+
 export type GroupedExpr = FromItemExpr & {
   node_type: "GroupedExpr";
   children: {