From cddf11baa08a19182615b31001b0c49fa0938102 Mon Sep 17 00:00:00 2001
From: nafraf <nafraf@gmail.com>
Date: Wed, 21 Jun 2023 12:05:15 -0500
Subject: [PATCH] Add subquery-clause to parser.leg

---
 lib/src/parser.leg | 51 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 50 insertions(+), 1 deletion(-)

diff --git a/lib/src/parser.leg b/lib/src/parser.leg
index 26ebe01..c0cd1e8 100644
--- a/lib/src/parser.leg
+++ b/lib/src/parser.leg
@@ -227,6 +227,23 @@ clause =
     | union-clause
     ) ~{ERR("a clause")}
 
+subquery-clause =
+    ( match-clause
+    | subquery-return-clause
+    | unwind-clause
+    | merge-clause
+    | create-clause
+    | set-clause
+    | delete-clause
+    | remove-clause
+    | with-clause
+    | foreach-clause
+    | call-clause
+    | loadcsv-clause
+    | start-clause
+    | union-clause
+    ) ~{ERR("a clause")}
+
 loadcsv-clause =
       < LOADCSV WITH-HEADERS FROM u:expression AS i:identifier
         (FIELDTERMINATOR t:string-literal | t:_null_) >
@@ -416,7 +433,7 @@ call-proc =
 
 call-subquery =
     < CALL LEFT-CURLY -
-    ( c:clause                         { sequence_add(c); }
+    ( c:subquery-clause                { sequence_add(c); }
     )+ RIGHT-CURLY >                   { $$ = call_subquery(); }
     -
 
@@ -443,6 +460,7 @@ return-clause =
         (o:order-by | o:_null_) (s:skip | s:_null_) (l:limit | l:_null_) >
                                        { $$ = return_clause(false,false,o,s,l); }
       )
+
 additional-return-projections =
     ( COMMA - i:return-projection      { sequence_add(i); }
     )*
@@ -458,6 +476,37 @@ return-projection =
                                        }
       ) >                              { $$ = projection(e, i); }
 
+subquery-return-clause =
+    < RETURN
+      ( DISTINCT STAR - subquery-additional-return-projections
+        (o:order-by | o:_null_) (s:skip | s:_null_) (l:limit | l:_null_) >
+                                       { $$ = return_clause(true,true,o,s,l); }
+      | DISTINCT i:subquery-return-projection   { sequence_add(i); }
+        subquery-additional-return-projections
+        (o:order-by | o:_null_) (s:skip | s:_null_) (l:limit | l:_null_) >
+                                       { $$ = return_clause(true,false,o,s,l); }
+      | STAR -
+        subquery-additional-return-projections
+        (o:order-by | o:_null_) (s:skip | s:_null_) (l:limit | l:_null_) >
+                                       { $$ = return_clause(false,true,o,s,l); }
+      | i:subquery-return-projection            { sequence_add(i); }
+        subquery-additional-return-projections
+        (o:order-by | o:_null_) (s:skip | s:_null_) (l:limit | l:_null_) >
+                                       { $$ = return_clause(false,false,o,s,l); }
+      )
+
+subquery-additional-return-projections =
+    ( COMMA - i:subquery-return-projection      { sequence_add(i); }
+    )*
+
+# if the projection in CALL SUBQUERY does not have an alias,
+# its identifier will be NULL
+subquery-return-projection =
+    < _block_start_ e:expression
+      ( AS i:identifier _block_merge_
+      | i:_null_ _block_merge_
+      ) >                              { $$ = projection(e, i); }
+
 order-by = < ORDER-BY s:sort-item      { sequence_add(s); }
            ( COMMA - s:sort-item       { sequence_add(s); }
            )* >                        { $$ = order_by(); }