Fix parsing priority issue with NULL/TRUE/FALSE. Add support for IN Clause. (#66)

* Fix parsing priority issue with NULL/TRUE/FALSE. Remove deprecated Python builds.

* Add support for IN clause

* Add additional Python versions to build workflow

* Add id() function

* Rename function in spec to scalar_function

Author: davidmezzetti

.github/workflows/python-package.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9, '3.10', '3.11']
+        python-version: [3.9, '3.10', '3.11', '3.12', '3.13']
 
     steps:
     - uses: actions/checkout@v2

grandcypher/__init__.py

@@ -63,14 +63,15 @@
                     | "(" compound_condition boolean_arithmetic compound_condition ")"
                     | compound_condition boolean_arithmetic compound_condition
 
-condition           : entity_id op entity_id_or_value
+condition           : (entity_id | scalar_function) op entity_id_or_value
+                    | (entity_id | scalar_function) op_list value_list
                     | "not"i condition -> condition_not
 
 ?entity_id_or_value : entity_id
                     | value
-                    | "NULL"i -> null
-                    | "TRUE"i -> true
-                    | "FALSE"i -> false
+                    | NULL -> null
+                    | TRUE -> true
+                    | FALSE -> false
 
 op                  : "==" -> op_eq
                     | "=" -> op_eq
@@ -80,22 +81,24 @@
                     | ">="-> op_gte
                     | "<="-> op_lte
                     | "is"i -> op_is
-                    | "in"i -> op_in
                     | "contains"i -> op_contains
                     | "starts with"i -> op_starts_with
                     | "ends with"i -> op_ends_with
 
+op_list             : "in"i -> op_in
 
 
 
 return_clause       : "return"i distinct_return? return_item ("," return_item)*
-return_item         : (entity_id | aggregation_function | entity_id "." attribute_id) ( "AS"i alias )?
+return_item         : (entity_id | aggregation_function | scalar_function | entity_id "." attribute_id) ( "AS"i alias )?
 alias               : CNAME
 
 aggregation_function : AGGREGATE_FUNC "(" entity_id ( "." attribute_id )? ")"
 AGGREGATE_FUNC       : "COUNT" | "SUM" | "AVG" | "MAX" | "MIN"
 attribute_id         : CNAME
 
+scalar_function      : "id"i "(" entity_id ")" -> id_function
+
 distinct_return     : "DISTINCT"i
 limit_clause        : "limit"i NUMBER
 skip_clause         : "skip"i NUMBER
@@ -131,6 +134,7 @@
                     | LEFT_ANGLE? "-[" CNAME ":" TYPE "*" MIN_HOP "]-" RIGHT_ANGLE?
                     | LEFT_ANGLE? "-[" CNAME ":" TYPE "*" MIN_HOP  ".." MAX_HOP "]-" RIGHT_ANGLE?
 
+value_list          : "[" [value ("," value)*] "]"
 type_list           : TYPE ( "|" TYPE )*
 
 LEFT_ANGLE          : "<"
@@ -149,9 +153,13 @@
 key                 : CNAME
 ?value              : ESTRING
                     | NUMBER
-                    | "NULL"i -> null
-                    | "TRUE"i -> true
-                    | "FALSE"i -> false
+                    | NULL -> null
+                    | TRUE -> true
+                    | FALSE -> false
+
+NULL.1                : "NULL"i
+TRUE.1                : "TRUE"i
+FALSE.1               : "FALSE"i
 
 
 %import common.CNAME            -> CNAME
@@ -1175,6 +1183,12 @@ def condition_not(self, processed_condition):
     ESTRING = v_args(inline=True)(eval)
     NUMBER = v_args(inline=True)(eval)
 
+    def id_function(self, entity_id):
+        return entity_id[0].value
+
+    def value_list(self, items):
+        return list(items)
+
     def op(self, operator):
         return operator
 

grandcypher/test_queries.py

@@ -2166,3 +2166,42 @@ def test_multigraph_match_with_single_or_operator(self):
         res = GrandCypher(host).run(qry)
         assert res["n1.name"] == ["Bob", "Bob"]
         assert res["n2.name"] == ["Carol", "Derek"]
+
+class TestFunction:
+    @pytest.mark.parametrize("graph_type", ACCEPTED_GRAPH_TYPES)
+    def test_id(self, graph_type):
+        host = graph_type()
+        host.add_node(1, name="Ford Prefect")
+        host.add_node(2, name="Arthur Dent")
+        host.add_node(3, name="John Smith")
+        host.add_edge(1, 2)
+        host.add_edge(2, 3)
+
+        qry = """
+        MATCH (A)
+        WHERE id(A) == 1 OR id(A) == 2
+        RETURN id(A)
+        """
+
+        res = GrandCypher(host).run(qry)
+        assert res["A"] == [1, 2]
+
+
+class TestList:
+    @pytest.mark.parametrize("graph_type", ACCEPTED_GRAPH_TYPES)
+    def test_in(self, graph_type):
+        host = graph_type()
+        host.add_node(1, name="Ford Prefect")
+        host.add_node(2, name="Arthur Dent")
+        host.add_node(3, name="John Smith")
+        host.add_edge(1, 2)
+        host.add_edge(2, 3)
+
+        qry = """
+        MATCH (A)
+        WHERE id(A) IN [1, 3]
+        RETURN A
+        """
+
+        res = GrandCypher(host).run(qry)
+        assert res["A"] == [1, 3]