Merge pull request #388 from kitta65/feature/fix-types

Feature/fix types
kitta65 · Jul 9, 2024 · 9f85157 · 9f85157
2 parents 68b3e60 + 6e16f71
commit 9f85157
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/src/parser/tests/tests_select.rs b/src/parser/tests/tests_select.rs
@@ -1693,6 +1693,32 @@ from:
     with_offset:
     - self: WITH (Keyword)
     - self: OFFSET (Keyword)
+",
+            0,
+        )),
+        Box::new(SuccessTestCase::new(
+            "\
+SELECT * FROM t, t.arr WITH OFFSET
+",
+            "\
+self: SELECT (SelectStatement)
+exprs:
+- self: * (Asterisk)
+from:
+  self: FROM (KeywordWithExpr)
+  expr:
+    self: , (JoinOperator)
+    left:
+      self: t (Identifier)
+    right:
+      self: . (DotOperator)
+      left:
+        self: t (Identifier)
+      right:
+        self: arr (Identifier)
+      with_offset:
+      - self: WITH (Keyword)
+      - self: OFFSET (Keyword)
 ",
             0,
         )),

diff --git a/src/types.rs b/src/types.rs
@@ -180,6 +180,7 @@ export type Expr = BaseNode & {
 
 export type FromItemExpr = Expr & {
   children: {
+    with_offset: NodeChild;
     pivot?: NodeChild;
     unpivot?: NodeChild;
   };
@@ -474,7 +475,6 @@ export type CallingUnnest = FromItemExpr &
   CallingFunctionGeneral & {
     node_type: "CallingUnnest";
     children: {
-      with_offset: NodeChild;
       offset_alias: NodeChild;
       offset_as: NodeChild;
       distinct: undefined;