Internal QueryParser: Adds / Fixes multiple arguments in IN clause (#…

…1926) * fixed issue with multiple arguments in IN clause * added double quotes object create baseline test
Azure · Oct 19, 2020 · 0e0bdb7 · 0e0bdb7
1 parent 967bc7f
commit 0e0bdb7
Show file tree

Hide file tree

Showing 6 changed files with 721 additions and 687 deletions.
diff --git a/Microsoft.Azure.Cosmos/src/Query/Core/Parser/sql.g4 b/Microsoft.Azure.Cosmos/src/Query/Core/Parser/sql.g4
@@ -91,7 +91,7 @@ logical_scalar_expression
 	;
 
 in_scalar_expression
-	: binary_scalar_expression K_NOT? K_IN scalar_expression_list
+	: binary_scalar_expression K_NOT? K_IN '(' scalar_expression_list ')'
 	;
 
 binary_scalar_expression
@@ -227,7 +227,8 @@ NUMERIC_LITERAL
 	;
 
 STRING_LITERAL
-	: ('\'' | '"') (ESC | SAFECODEPOINT)* ('\'' | '"')
+	: '"' (ESC | SAFECODEPOINT)* '"'
+	| '\'' (ESC | SAFECODEPOINT)* '\''
 	;
 
 fragment ESC

diff --git a/Microsoft.Azure.Cosmos/src/Query/Core/Parser/sqlLexer.cs b/Microsoft.Azure.Cosmos/src/Query/Core/Parser/sqlLexer.cs
diff --git a/Microsoft.Azure.Cosmos/src/Query/Core/Parser/sqlParser.cs b/Microsoft.Azure.Cosmos/src/Query/Core/Parser/sqlParser.cs
diff --git a/...zure.Cosmos.Tests/BaselineTest/TestBaseline/ScalarExpressionSqlParserBaselineTests.In.xml b/...zure.Cosmos.Tests/BaselineTest/TestBaseline/ScalarExpressionSqlParserBaselineTests.In.xml
@@ -11,10 +11,19 @@
   <Result>
     <Input>
       <Description><![CDATA[multiple arguments]]></Description>
-      <Query><![CDATA[SELECT VALUE 42 IN ('asdf', 'as')]]></Query>
+      <Query><![CDATA[SELECT VALUE 42 IN (1, 2, 3)]]></Query>
     </Input>
     <Output>
-      <ParsedQuery><![CDATA[SELECT VALUE (42 IN ("asdf', 'as"))]]></ParsedQuery>
+      <ParsedQuery><![CDATA[SELECT VALUE (42 IN (1, 2, 3))]]></ParsedQuery>
+    </Output>
+  </Result>
+  <Result>
+    <Input>
+      <Description><![CDATA[multiple string arguments]]></Description>
+      <Query><![CDATA[SELECT VALUE 42 IN ("WA", "CA")]]></Query>
+    </Input>
+    <Output>
+      <ParsedQuery><![CDATA[SELECT VALUE (42 IN ("WA", "CA"))]]></ParsedQuery>
     </Output>
   </Result>
   <Result>
@@ -41,7 +50,7 @@
       <Query><![CDATA[SELECT VALUE 42 IN (-123]]></Query>
     </Input>
     <Output>
-      <Exception><![CDATA[Exception of type 'Antlr4.Runtime.NoViableAltException' was thrown.]]></Exception>
+      <Exception><![CDATA[can not recover.]]></Exception>
     </Output>
   </Result>
   <Result>
@@ -77,7 +86,7 @@
       <Query><![CDATA[SELECT VALUE 42 IN ]]></Query>
     </Input>
     <Output>
-      <Exception><![CDATA[Exception of type 'Antlr4.Runtime.NoViableAltException' was thrown.]]></Exception>
+      <Exception><![CDATA[can not recover.]]></Exception>
     </Output>
   </Result>
   <Result>

diff --git a/...s.Tests/BaselineTest/TestBaseline/ScalarExpressionSqlParserBaselineTests.ObjectCreate.xml b/...s.Tests/BaselineTest/TestBaseline/ScalarExpressionSqlParserBaselineTests.ObjectCreate.xml
@@ -26,6 +26,15 @@
       <ParsedQuery><![CDATA[SELECT VALUE {"prop1' : 42, 'prop2": 1337}]]></ParsedQuery>
     </Output>
   </Result>
+  <Result>
+    <Input>
+      <Description><![CDATA[Double Quotes]]></Description>
+      <Query><![CDATA[SELECT VALUE { "prop" : "Some String" }]]></Query>
+    </Input>
+    <Output>
+      <ParsedQuery><![CDATA[SELECT VALUE {"prop": "Some String"}]]></ParsedQuery>
+    </Output>
+  </Result>
   <Result>
     <Input>
       <Description><![CDATA[Missing Close Brace]]></Description>

diff --git a/...tests/Microsoft.Azure.Cosmos.Tests/Query/Parser/ScalarExpressionSqlParserBaselineTests.cs b/...tests/Microsoft.Azure.Cosmos.Tests/Query/Parser/ScalarExpressionSqlParserBaselineTests.cs
@@ -216,7 +216,8 @@ public void In()
             {
                 // Positive
                 CreateInput(description: "Basic", scalarExpression: "42 IN(42)"),
-                CreateInput(description: "multiple arguments", scalarExpression: "42 IN ('asdf', 'as')"),
+                CreateInput(description: "multiple arguments", scalarExpression: "42 IN (1, 2, 3)"),
+                CreateInput(description: "multiple string arguments", scalarExpression: "42 IN (\"WA\", \"CA\")"),
                 CreateInput(description: "NOT IN", scalarExpression: "42 NOT IN (42)"),
 
                 // Negative
@@ -282,6 +283,7 @@ public void ObjectCreate()
                 CreateInput(description: "Empty Object", scalarExpression: "{}"),
                 CreateInput(description: "Single Property", scalarExpression: "{ 'prop' : 42 }"),
                 CreateInput(description: "Multiple Property", scalarExpression: "{ 'prop1' : 42, 'prop2' : 1337 }"),
+                CreateInput(description: "Double Quotes", scalarExpression: "{ \"prop\" : \"Some String\" }"),
 
                 // Negative
                 CreateInput(description: "Missing Close Brace", scalarExpression: "{"),