Merge pull request #6 from cloudblue/bugfix/LITE-23661

LITE-23661 Added support for N or expressions (exp|exp...|exp)
cloudblue · May 17, 2022 · d13f65b · d13f65b
2 parents fe156a0 + 5592cc2
commit d13f65b
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 25 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/py_rql/grammar.py b/py_rql/grammar.py
@@ -40,8 +40,8 @@
     | _L_BRACE _or _R_BRACE
 
 _or: _OR _logical_exp
-    | _L_BRACE term "|" term _R_BRACE
-    | _L_BRACE term ";" term _R_BRACE
+    | _L_BRACE term ("|" term)+ _R_BRACE
+    | _L_BRACE term (";" term)+ _R_BRACE
 
 _logical_exp: _L_BRACE expr_term (_COMMA expr_term)+ _R_BRACE
 

diff --git a/tests/test_parser/test_logical.py b/tests/test_parser/test_logical.py
@@ -51,9 +51,23 @@ def test_and_ok(operator, expression):
     assert alias_result == base_result
 
 
+@pytest.mark.parametrize('operator', ['|', ';'])
+def test_or_ok_3(operator):
+    query = '({logical})'.format(logical=operator.join(['a=b'] * 3))
+    result = logical_transform(query)
+
+    assert result == {
+        LogicalOperators.get_grammar_key(LogicalOperators.OR): [
+            (ComparisonOperators.EQ, 'a', 'b'),
+            (ComparisonOperators.EQ, 'a', 'b'),
+            (ComparisonOperators.EQ, 'a', 'b'),
+        ],
+    }
+
+
 @pytest.mark.parametrize('operator', ['|', ';'])
 @pytest.mark.parametrize('expression', ok_expressions)
-def test_or_ok(operator, expression):
+def test_or_ok_2(operator, expression):
     base_result = base_or_logical_transform(LogicalOperators.OR, expression)
     check_expression(LogicalOperators.OR, expression, base_result)