Merge pull request #180 from matthias-Q/subquery_unions

fix: subquery unions & invalid tests
DerekStride · Jul 13, 2023 · e40d0c1 · e40d0c1
2 parents 00ae620 + 0f02bbd
commit e40d0c1
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 19 deletions.
diff --git a/grammar.js b/grammar.js
@@ -2372,11 +2372,7 @@ module.exports = grammar({
     ),
 
     subquery: $ => wrapped_in_parenthesis(
-      seq(
-        $.select,
-        optional($.from),
-        optional(";"),
-      ),
+      $._dml_read
     ),
 
     list: $ => paren_list($._expression),

diff --git a/test/corpus/functions.txt b/test/corpus/functions.txt
@@ -352,7 +352,7 @@ SELECT *
 FROM foo
 WHERE id IN (
   SELECT 1
-  FROM bar;
+  FROM bar
 )
 
 --------------------------------------------------------------------------------
@@ -397,11 +397,11 @@ WHERE (
   NOT EXISTS (
     SELECT 1
     FROM bar
-    WHERE 0;
+    WHERE 0
   ) OR EXISTS (
     SELECT 1
     FROM baz
-    WHERE 1;
+    WHERE 1
   )
 )
 

diff --git a/test/corpus/select.txt b/test/corpus/select.txt
@@ -402,8 +402,8 @@ WHERE id NOT IN(1,2);
           left: (field
             name: (identifier))
           operator: (not_in
-              (keyword_not)
-              (keyword_in))
+            (keyword_not)
+            (keyword_in))
           right: (list
             (literal)
             (literal)))))))
@@ -452,16 +452,16 @@ WHERE id NOT IN(1,2) AND id NOT IN (SELECT id FROM other_table);
               (keyword_in))
             right: (subquery
               (select
-               (keyword_select)
-               (select_expression
-                (term
-                 value: (field
-                   name: (identifier)))))
+                (keyword_select)
+                (select_expression
+                  (term
+                    value: (field
+                      name: (identifier)))))
               (from
-               (keyword_from)
-               (relation
-                (object_reference
-                 name: (identifier)))))))))))
+                (keyword_from)
+                (relation
+                  (object_reference
+                    name: (identifier)))))))))))
 
 ================================================================================
 Simple select with IF
@@ -2897,3 +2897,55 @@ FROM tab
       (relation
         (object_reference
           (identifier))))))
+
+================================================================================
+SELECT FROM SUBQUERY WITH UNION
+================================================================================
+
+SELECT
+a1.*
+FROM (
+  SELECT * FROM tb01
+  UNION ALL
+  SELECT * FROM tb01
+) a1;
+
+--------------------------------------------------------------------------------
+
+(program
+  (statement
+    (select
+      (keyword_select)
+      (select_expression
+        (term
+          (all_fields
+            (object_reference
+              (identifier))))))
+    (from
+      (keyword_from)
+      (relation
+        (subquery
+          (set_operation
+            (select
+              (keyword_select)
+              (select_expression
+                (term
+                  (all_fields))))
+            (from
+              (keyword_from)
+              (relation
+                (object_reference
+                  (identifier))))
+            (keyword_union)
+            (keyword_all)
+            (select
+              (keyword_select)
+              (select_expression
+                (term
+                  (all_fields))))
+            (from
+              (keyword_from)
+              (relation
+                (object_reference
+                  (identifier))))))
+        (identifier)))))