add match3/4 -- and fix some test cases

kuzudb · Sep 11, 2023 · 9fc716b · 9fc716b
1 parent 510d804
commit 9fc716b
Show file tree

Hide file tree

Showing 10 changed files with 1,732 additions and 1,105 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,6 +23,8 @@ tools/python_api/test/test_PYTHON_CSV.csv
 
 # antlr4 jar
 scripts/antlr4/antlr4.jar
+# .antlr
+src/antlr4/.antlr/
 
 # macOS
 .DS_Store

diff --git a/src/antlr4/Cypher.g4 b/src/antlr4/Cypher.g4
@@ -225,7 +225,7 @@ oC_SingleQuery
 oC_SinglePartQuery
     : ( oC_ReadingClause SP? )* oC_Return
         | ( ( oC_ReadingClause SP? )* oC_UpdatingClause ( SP? oC_UpdatingClause )* ( SP? oC_Return )? )
-        | ( oC_ReadingClause SP? )* { notifyQueryNotConcludeWithReturn($ctx->start); }
+        | ( oC_ReadingClause SP? )+ { notifyQueryNotConcludeWithReturn($ctx->start); }
         ;
 
 oC_MultiPartQuery
@@ -722,9 +722,7 @@ WHITESPACE
         ;
 
 Comment
-    : ( '/*' ( Comment_1 | ( '*' Comment_2 ) )* '*/' )
-        | ( '--' ( Comment_3 )* CR? ( LF | EOF ) )
-        ;
+    : ( '/*' ( Comment_1 | ( '*' Comment_2 ) )* '*/' ) ;
 
 oC_LeftArrowHead
     : '<'

diff --git a/src/parser/transform/transform_graph_pattern.cpp b/src/parser/transform/transform_graph_pattern.cpp
@@ -75,17 +75,21 @@ std::unique_ptr<RelPattern> Transformer::transformRelationshipPattern(
     CypherParser::OC_RelationshipPatternContext& ctx) {
     auto relDetail = ctx.oC_RelationshipDetail();
     auto variable = std::string();
-    if (relDetail->oC_Variable()) {
-        variable = transformVariable(*relDetail->oC_Variable());
-    }
     auto relTypes = std::vector<std::string>{};
-    if (relDetail->oC_RelationshipTypes()) {
-        relTypes = transformRelTypes(*relDetail->oC_RelationshipTypes());
-    }
     auto properties = std::vector<std::pair<std::string, std::unique_ptr<ParsedExpression>>>{};
-    if (relDetail->kU_Properties()) {
-        properties = transformProperties(*relDetail->kU_Properties());
+
+    if (relDetail) {
+        if (relDetail->oC_Variable()) {
+            variable = transformVariable(*relDetail->oC_Variable());
+        }
+        if (relDetail->oC_RelationshipTypes()) {
+            relTypes = transformRelTypes(*relDetail->oC_RelationshipTypes());
+        }
+        if (relDetail->kU_Properties()) {
+            properties = transformProperties(*relDetail->kU_Properties());
+        }
     }
+
     ArrowDirection arrowDirection;
     if (ctx.oC_LeftArrowHead()) {
         arrowDirection = ArrowDirection::LEFT;
@@ -94,9 +98,10 @@ std::unique_ptr<RelPattern> Transformer::transformRelationshipPattern(
     } else {
         arrowDirection = ArrowDirection::BOTH;
     }
+
     auto relType = QueryRelType::NON_RECURSIVE;
     std::unique_ptr<RecursiveRelPatternInfo> recursiveInfo;
-    if (relDetail->oC_RangeLiteral()) {
+    if (relDetail && relDetail->oC_RangeLiteral()) {
         if (relDetail->oC_RangeLiteral()->ALL()) {
             relType = QueryRelType::ALL_SHORTEST;
         } else if (relDetail->oC_RangeLiteral()->SHORTEST()) {

diff --git a/test/test_files/copy/copy_to.test b/test/test_files/copy/copy_to.test
@@ -13,7 +13,7 @@ Binder exception: Cannot find property non_prop for a.
 -LOG Non-Query command
 -STATEMENT COPY (EXPLAIN MATCH (p:person) RETURN p.ID) TO "test.csv"
 ---- error
-Parser exception: Query must conclude with RETURN clause (line: 1, offset: 6)
+Parser exception: mismatched input 'EXPLAIN' expecting {CALL, OPTIONAL, MATCH, UNWIND, CREATE, MERGE, SET, DELETE, WITH, RETURN} (line: 1, offset: 6)
 "COPY (EXPLAIN MATCH (p:person) RETURN p.ID) TO "test.csv""
        ^^^^^^^
 

diff --git a/test/test_files/exceptions/parser/syntax_error.test b/test/test_files/exceptions/parser/syntax_error.test
@@ -13,7 +13,7 @@ Parser exception: Query must conclude with RETURN clause (line: 1, offset: 0)
 -CASE QueryNotConcludeWithReturn2
 -STATEMENT MATCH (a:person) WITH *;
 ---- error
-Parser exception: Query must conclude with RETURN clause (line: 1, offset: 23)
+Parser exception: mismatched input ';' expecting {CALL, OPTIONAL, MATCH, UNWIND, CREATE, MERGE, SET, DELETE, WITH, RETURN, SP} (line: 1, offset: 23)
 "MATCH (a:person) WITH *;"
                         ^