fix: Allow match after unwind as defined by OpenCypher. (#531)

neo4j-contrib · Dec 19, 2022 · d62e720 · d62e720
1 parent 3db7f6f
commit d62e720
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/neo4j-cypher-dsl/src/main/java/org/neo4j/cypherdsl/core/StatementBuilder.java b/neo4j-cypher-dsl/src/main/java/org/neo4j/cypherdsl/core/StatementBuilder.java
@@ -172,7 +172,7 @@ interface OngoingReadingWithWhere extends OngoingReading, ExposesMatch,
 	 * @since 1.0
 	 */
 	interface OngoingReading
-		extends ExposesReturning, ExposesWith, ExposesUpdatingClause, ExposesUnwind, ExposesCreate,
+		extends ExposesReturning, ExposesWith, ExposesUpdatingClause, ExposesUnwind, ExposesCreate, ExposesMatch,
 		ExposesCall<OngoingInQueryCallWithoutArguments>, ExposesSubqueryCall {
 	}
 

diff --git a/neo4j-cypher-dsl/src/test/java/org/neo4j/cypherdsl/core/IssueRelatedIT.java b/neo4j-cypher-dsl/src/test/java/org/neo4j/cypherdsl/core/IssueRelatedIT.java
@@ -31,6 +31,7 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.neo4j.cypherdsl.core.renderer.Configuration;
+import org.neo4j.cypherdsl.core.renderer.Dialect;
 import org.neo4j.cypherdsl.core.renderer.Renderer;
 
 /**
@@ -1408,4 +1409,19 @@ void testLabelRemoval() {
 
 		assertThat(correctQuery).isEqualTo("MATCH (n:`Wine`) WHERE id(n) = 1 REMOVE n:`Drink` RETURN id(n) AS id");
 	}
+
+	@Test // GH-524
+	void unwindWithoutWith() {
+
+		SymbolicName id = Cypher.name("id");
+		Node n = Cypher.node("Person").named("n");
+		Renderer renderer = Renderer.getRenderer(Configuration.newConfig().withDialect(Dialect.NEO4J_5).build());
+		Statement statement = Cypher.unwind(Cypher.parameter("ids"))
+			.as(id)
+			.match(n)
+			.where(n.elementId().isEqualTo(id))
+			.returning(n)
+			.build();
+		assertThat(renderer.render(statement)).isEqualTo("UNWIND $ids AS id MATCH (n:`Person`) WHERE elementId(n) = id RETURN n");
+	}
 }