Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Query: Fixes native c# parser not recognizing query with multiple IN statements #2451

Merged
merged 6 commits into from
May 11, 2021
Merged

Query: Fixes native c# parser not recognizing query with multiple IN statements #2451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bf2fca5
Modifies the grammar
May 10, 2021
7897450
Adds test
May 10, 2021
6f67d9d
Merge branch 'master' into users/leminh/PaserLogicalExpressionRewrite
j82w May 10, 2021
72435f6
addressed code reviews
May 10, 2021
ffe9881
Merge branch 'users/leminh/PaserLogicalExpressionRewrite' of https://…
May 10, 2021
d8e9ec3
Merge branch 'master' into users/leminh/PaserLogicalExpressionRewrite
j82w May 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion Microsoft.Azure.Cosmos/src/Query/Core/Parser/CstToAstVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,7 +796,21 @@ public override SqlObject VisitLogical_scalar_expression([NotNull] sqlParser.Log
}
else
{
throw new NotImplementedException();
// logical_expression binary_operator logical_expression
Contract.Requires(context.ChildCount == 3);

SqlScalarExpression left = (SqlScalarExpression)this.Visit(context.logical_scalar_expression(0));

if (!CstToAstVisitor.binaryOperatorKindLookup.TryGetValue(
context.children[1].GetText(),
out SqlBinaryScalarOperatorKind operatorKind))
{
throw new ArgumentOutOfRangeException($"Unknown logical operator: {context.children[1].GetText()}.");
}

SqlScalarExpression right = (SqlScalarExpression)this.Visit(context.logical_scalar_expression(1));

sqlObject = SqlBinaryScalarExpression.Create(operatorKind, left, right);
}

return sqlObject;
Expand Down
4 changes: 2 additions & 2 deletions Microsoft.Azure.Cosmos/src/Query/Core/Parser/sql.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ logical_scalar_expression
: binary_scalar_expression
| in_scalar_expression
| like_scalar_expression
| logical_scalar_expression K_AND logical_scalar_expression
| logical_scalar_expression K_OR logical_scalar_expression
;

in_scalar_expression
Expand All @@ -112,8 +114,6 @@ binary_scalar_expression
| binary_scalar_expression bitwise_and_operator binary_scalar_expression
| binary_scalar_expression bitwise_exclusive_or_operator binary_scalar_expression
| binary_scalar_expression bitwise_inclusive_or_operator binary_scalar_expression
| binary_scalar_expression K_AND binary_scalar_expression
| binary_scalar_expression K_OR binary_scalar_expression
| binary_scalar_expression string_concat_operator binary_scalar_expression
;

Expand Down
Loading