Merge pull request #8 from cloudblue/fix/LITE-24935_nested-function-logical

LITE-24935 added support for nested function-style logical operators

Author: d3rky

py_rql/grammar.py

@@ -32,9 +32,9 @@
 and_op: _and 
     | _L_BRACE _and _R_BRACE
 
-_and: _AND _logical_exp
-    | term "&" term
-    | term _COMMA term
+_and: _AND? _logical_exp
+    | term ("&" term)+
+    | term (_COMMA term)+
 
 or_op: _or
     | _L_BRACE _or _R_BRACE
@@ -43,7 +43,7 @@
     | _L_BRACE term ("|" term)+ _R_BRACE
     | _L_BRACE term (";" term)+ _R_BRACE
 
-_logical_exp: _L_BRACE expr_term (_COMMA expr_term)+ _R_BRACE
+_logical_exp: _L_BRACE term (_COMMA term)+ _R_BRACE
 
 not_op: _NOT _L_BRACE expr_term _R_BRACE
 

tests/test_parser/test_logical.py

@@ -102,9 +102,14 @@ def test_logical_fail(query):
         logical_transform(query)
 
 
-def test_logical_nesting():
-    q = '((p1=v1|p1=ge=v2)&(p3=le=v4,gt(p5,v6));ne(p7,p8))'
-    result = logical_transform(q)
+@pytest.mark.parametrize('query', [
+    '((p1=v1|p1=ge=v2)&(p3=le=v4,gt(p5,v6));ne(p7,p8))',
+    '(or(p1=v1,p1=ge=v2)&(p3=le=v4,gt(p5,v6));ne(p7,p8))',
+    '(or(p1=v1,p1=ge=v2)&and(p3=le=v4,gt(p5,v6));ne(p7,p8))',
+    'or(and((p1=v1|p1=ge=v2),(p3=le=v4,gt(p5,v6))),ne(p7,p8))',
+])
+def test_logical_nesting_or(query):
+    result = logical_transform(query)
 
     and_grammar_key = LogicalOperators.get_grammar_key(LogicalOperators.AND)
     or_grammar_key = LogicalOperators.get_grammar_key(LogicalOperators.OR)
@@ -126,6 +131,42 @@ def test_logical_nesting():
     }
 
 
+@pytest.mark.parametrize('query', [
+    '((p1=v1,or(p2=v2,p3=v3),and(p4=v4,p5=v5)))',
+    '(p1=v1,or(p2=v2,p3=v3),and(p4=v4,p5=v5))',
+    'and(p1=v1,or(p2=v2,p3=v3),and(p4=v4,p5=v5))',
+    'p1=v1&(p2=v2|p3=v3)&(p4=v4,p5=v5)',
+    'p1=v1,(p2=v2|p3=v3),(p4=v4,p5=v5)',
+])
+def test_logical_nesting_and(query):
+    result = logical_transform(query)
+
+    and_grammar_key = LogicalOperators.get_grammar_key(LogicalOperators.AND)
+    or_grammar_key = LogicalOperators.get_grammar_key(LogicalOperators.OR)
+
+    assert result == {
+        and_grammar_key: [
+            ('eq', 'p1', 'v1'),
+            {
+                and_grammar_key: [
+                    {
+                        or_grammar_key: [
+                            ('eq', 'p2', 'v2'),
+                            ('eq', 'p3', 'v3'),
+                        ],
+                    },
+                    {
+                        and_grammar_key: [
+                            ('eq', 'p4', 'v4'),
+                            ('eq', 'p5', 'v5'),
+                        ],
+                    },
+                ],
+            },
+        ],
+    }
+
+
 def test_and_chain():
     q = 'ne(p1,v1)&p2=ge=and,or=v3'
     result = logical_transform(q)