added new test, cleanup

Azure · Oct 21, 2022 · a3e88e8 · a3e88e8
1 parent 7314390
commit a3e88e8
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 20 deletions.
diff --git a/...Azure.Cosmos.Tests/BaselineTest/TestBaseline/AggregateAllSqlParserBaselineTests.Tests.xml b/...Azure.Cosmos.Tests/BaselineTest/TestBaseline/AggregateAllSqlParserBaselineTests.Tests.xml
@@ -65,7 +65,7 @@
   <Result>
     <Input>
       <Description><![CDATA[ALL in a function call]]></Description>
-      <Query><![CDATA[SELECT ALL( 1, 2)]]></Query>
+      <Query><![CDATA[SELECT ALL(1, 2)]]></Query>
     </Input>
     <Output>
       <ParsedQuery><![CDATA[SELECT ALL(1, 2)]]></ParsedQuery>
@@ -74,10 +74,19 @@
   <Result>
     <Input>
       <Description><![CDATA[ALL in a UDF function call]]></Description>
-      <Query><![CDATA[SELECT udf.ALL( 1, 2)]]></Query>
+      <Query><![CDATA[SELECT udf.ALL(1, 2)]]></Query>
     </Input>
     <Output>
       <ParsedQuery><![CDATA[SELECT udf.ALL(1, 2)]]></ParsedQuery>
     </Output>
   </Result>
+  <Result>
+    <Input>
+      <Description><![CDATA[ALL in every possible grammar rule at the same time]]></Description>
+      <Query><![CDATA[SELECT ALL(1, 2) as ALL FROM ALL IN (SELECT ALL.ALL) WHERE ALL(     SELECT ALL     FROM (SELECT udf.ALL(1, 2)) as ALL     WHERE ALL( SELECT VALUE 1) )]]></Query>
+    </Input>
+    <Output>
+      <ParsedQuery><![CDATA[SELECT ALL(1, 2) AS ALL FROM ALL IN (SELECT ALL.ALL) WHERE ALL(SELECT ALL FROM (SELECT udf.ALL(1, 2)) AS ALL WHERE ALL(SELECT VALUE 1))]]></ParsedQuery>
+    </Output>
+  </Result>
 </Results>
diff --git a/...mos/tests/Microsoft.Azure.Cosmos.Tests/Query/Parser/AggregateAllSqlParserBaselineTests.cs b/...mos/tests/Microsoft.Azure.Cosmos.Tests/Query/Parser/AggregateAllSqlParserBaselineTests.cs
@@ -15,29 +15,54 @@ public void Tests()
         {
             List<SqlParserBaselineTestInput> inputs = new List<SqlParserBaselineTestInput>()
             {
-                CreateInput(description: "ALL in an SqlSelectItem as an alias", scalarExpression: "SELECT 1 as ALL"),
-                CreateInput(description: "ALL in an AliasedCollectionExpression as an alias", scalarExpression:
-               "SELECT * " +
-               "FROM (SELECT VALUE 1) as ALL"),
-                CreateInput(description: "ALL in an ArrayIteratorCollectionExpression", scalarExpression:
-               "SELECT * " +
-               "FROM ALL IN (SELECT VALUE 1)"),
-                CreateInput(description: "ALL in an InputPathCollection and IdentifierPathExpression", scalarExpression:
-               "SELECT * " +
-               "FROM ALL.ALL"),
-                CreateInput(description: "ALL in a PropertyRefScalarExpression", scalarExpression: "SELECT ALL"),
-                CreateInput(description: "ALL in a PropertyRefScalarExpression as child", scalarExpression: "SELECT c.ALL"),
-                CreateInput(description: "ALL in a PropertyRefScalarExpression as parent and child", scalarExpression: "SELECT ALL.ALL"),
-                CreateInput(description: "ALL in a function call", scalarExpression: "SELECT ALL( 1, 2)"),
-                CreateInput(description: "ALL in a UDF function call", scalarExpression: "SELECT udf.ALL( 1, 2)"),
+                CreateInput(
+                    description: "ALL in an SqlSelectItem as an alias",
+                    query: "SELECT 1 as ALL"),
+                CreateInput(
+                    description: "ALL in an AliasedCollectionExpression as an alias",
+                    query: "SELECT * " +
+                           "FROM (SELECT VALUE 1) as ALL"),
+                CreateInput(
+                    description: "ALL in an ArrayIteratorCollectionExpression",
+                    query: "SELECT * " +
+                           "FROM ALL IN (SELECT VALUE 1)"),
+                CreateInput(
+                    description: "ALL in an InputPathCollection and IdentifierPathExpression", 
+                    query: "SELECT * " +
+                           "FROM ALL.ALL"),
+                CreateInput(
+                    description: "ALL in a PropertyRefScalarExpression", 
+                    query: "SELECT ALL"),
+                CreateInput(
+                    description: "ALL in a PropertyRefScalarExpression as child", 
+                    query: "SELECT c.ALL"),
+                CreateInput(
+                    description: "ALL in a PropertyRefScalarExpression as parent and child", 
+                    query: "SELECT ALL.ALL"),
+                CreateInput(
+                    description: "ALL in a function call", 
+                    query: "SELECT ALL(1, 2)"),
+                CreateInput(
+                    description: "ALL in a UDF function call", 
+                    query: "SELECT udf.ALL(1, 2)"),
+                CreateInput(
+                    description: "ALL in every possible grammar rule at the same time",
+                    query: "SELECT ALL(1, 2) as ALL " +
+                           "FROM ALL IN (SELECT ALL.ALL) " +
+                           "WHERE ALL( " +
+                           "    SELECT ALL " +
+                           "    FROM (SELECT udf.ALL(1, 2)) as ALL " +
+                           "    WHERE ALL( SELECT VALUE 1) " +
+                           ")")
+
             };
 
             this.ExecuteTestSuite(inputs);
         }
 
-        public static SqlParserBaselineTestInput CreateInput(string description, string scalarExpression)
+        public static SqlParserBaselineTestInput CreateInput(string description, string query)
         {
-            return new SqlParserBaselineTestInput(description, scalarExpression);
+            return new SqlParserBaselineTestInput(description, query);
         }
     }
 }
diff --git a/...tests/Microsoft.Azure.Cosmos.Tests/Query/Parser/ScalarExpressionSqlParserBaselineTests.cs b/...tests/Microsoft.Azure.Cosmos.Tests/Query/Parser/ScalarExpressionSqlParserBaselineTests.cs
@@ -17,7 +17,9 @@ public void All()
                 CreateInput(description: "Basic", scalarExpression: "ALL(SELECT *)"),
                 CreateInput(description: "case insensitive", scalarExpression: "aLl(SELECT *)"),
                 CreateInput(description: "nested", scalarExpression:"ALL( SELECT * WHERE ALL( SELECT *))"),
-                CreateInput(description: "multiple nested", scalarExpression:
+                CreateInput(
+                    description: "multiple nested", 
+                    scalarExpression:
                 "ALL( "                         +
                 "   SELECT * "                  +
                 "   WHERE ALL( "                +