Merge pull request #901 from soerenreichardt/fix-return-clause-validation

Make return clause check case-insensitive

Author: soerenreichardt

changelog.md

@@ -9,6 +9,7 @@
 ## Bug fixes
 
 - Fixed a bug where remote projections would fail when the database is clustered
+- Fixed a bug where the validation of gds.graph.project.cypher would fail when the return clause was not uppercase
 
 ## Improvements
 

graphdatascience/graph/graph_cypher_runner.py

@@ -103,7 +103,7 @@ def _verify_query_ends_with_return_clause(namespace: str, query: str) -> None:
                             at_end = True
                             break
 
-            if query_token == "RETURN":
+            if query_token.upper() == "RETURN":
                 # State 1: We found the start of a `RETURN` clause.
                 # Check if it is the `RETURN gds.graph.project` call.
                 # We split tokens on `__separators` and flatten the nested iters.

graphdatascience/tests/unit/test_graph_cypher.py

@@ -107,8 +107,8 @@ def test_with_multiple_returns(gds: GraphDataScience) -> None:
         "MATCH (s)-->(t) RETURN gds.graph.project('g' + foo, s, t)",
         "MATCH (s)-->(t) RETURN gds.graph.project('g' + CALL foo(bar), s, t)",
         "MATCH (s)-->(t) RETURN gds.graph.project($graph_name, s, t)",
-        "MATCH (s)-->(t) RETURN gds.graph.project($the_gg, s, t)",
-        "MATCH (s)-->(t) RETURN gds.graph.project($graph_name, s, t, { property: labels(s) })",
+        "MATCH (s)-->(t) ReTuRn gds.graph.project($the_gg, s, t)",
+        "MATCH (s)-->(t) return gds.graph.project($graph_name, s, t, { property: labels(s) })",
     ],
 )
 def test_verify_query_ends_with_return_clause(query: str) -> None: