RedisGraph · swilly22 · Jul 12, 2020 · Jul 8, 2020 · Jul 8, 2020 · Jul 12, 2020
diff --git a/src/ast/ast_validations.c b/src/ast/ast_validations.c
@@ -651,6 +651,9 @@ static AST_Validation _ValidateMergeRelation(const cypher_astnode_t *entity, rax
 		return AST_INVALID;
 	}
 
+	// We don't need to validate the MERGE edge's direction, as an undirected edge in MERGE
+	// should cause a single outgoing edge to be created.
+
 	return AST_VALID;
 }
 
@@ -754,6 +757,12 @@ static AST_Validation _Validate_CREATE_Entities(const cypher_astnode_t *clause,
 				QueryCtx_SetError("Exactly one relationship type must be specified for CREATE");
 				return AST_INVALID;
 			}
+
+			// Validate that each relation being created is directed.
+			if(cypher_ast_rel_pattern_get_direction(rel) == CYPHER_REL_BIDIRECTIONAL) {
+				QueryCtx_SetError("Only directed relationships are supported in CREATE");
+				return AST_INVALID;
+			}
 		}
 	}
 

diff --git a/tests/flow/test_query_validation.py b/tests/flow/test_query_validation.py
@@ -226,7 +226,7 @@ def test18_undefined_variable_access(self):
             assert("not defined" in e.message)
             pass
 
-    def test_invalid_cypher_options(self):
+    def test19_invalid_cypher_options(self):
         query = "EXPLAIN MATCH (p:president)-[:born]->(:state {name:'Hawaii'}) RETURN p"
         try:
             redis_graph.query(query)
@@ -259,3 +259,13 @@ def test_invalid_cypher_options(self):
             # Expecting an error.
             pass
 
+    # Undirected edges are not allowed in CREATE clauses.
+    def test20_undirected_edge_creation(self):
+        try:
+            query = """CREATE (:Endpoint)-[:R]-(:Endpoint)"""
+            redis_graph.query(query)
+            assert(False)
+        except redis.exceptions.ResponseError as e:
+            # Expecting an error.
+            assert("Only directed relationships" in e.message)
+            pass
diff --git a/tests/tck/features/CreateAcceptance.feature b/tests/tck/features/CreateAcceptance.feature
@@ -508,7 +508,6 @@ Feature: CreateAcceptance
       | +nodes         | 2 |
       | +relationships | 2 |
 
-@skip
   Scenario: Fail when trying to create using an undirected relationship pattern
     Given any graph
     When executing query:

diff --git a/tests/tck/features/MiscellaneousErrorAcceptance.feature b/tests/tck/features/MiscellaneousErrorAcceptance.feature
@@ -186,15 +186,13 @@ Feature: MiscellaneousErrorAcceptance
       """
     Then a SyntaxError should be raised at compile time: InvalidClauseComposition
 
-@skip
   Scenario: Failing when creating without direction
     When executing query:
       """
       CREATE (a)-[:FOO]-(b)
       """
     Then a SyntaxError should be raised at compile time: RequiresDirectedRelationship
 
-@skip
   Scenario: Failing when creating with two directions
     When executing query:
       """

diff --git a/tests/tck/features/steps/Steps.py b/tests/tck/features/steps/Steps.py
@@ -182,3 +182,9 @@ def step_impl(context):
     global exception
     assert exception != None
     assert "Invalid numeric value" in exception.message
+
+@then(u'a SyntaxError should be raised at compile time: RequiresDirectedRelationship')
+def step_impl(context):
+    global exception
+    assert exception != None
+    assert "Only directed relationships" in exception.message