diff --git a/README.adoc b/README.adoc index 874eaa2e46..6de89b9b0b 100644 --- a/README.adoc +++ b/README.adoc @@ -6,7 +6,7 @@ :artifactId: neo4j-cypher-dsl // This will be next version and also the one that will be put into the manual for the main branch -:neo4j-cypher-dsl-version: 2023.9.6-SNAPSHOT +:neo4j-cypher-dsl-version: 2023.10.0-SNAPSHOT // This is the latest released version, used only in the readme :neo4j-cypher-dsl-version-latest: 2023.9.5 diff --git a/neo4j-cypher-dsl/src/main/java/org/neo4j/cypherdsl/core/DefaultStatementBuilder.java b/neo4j-cypher-dsl/src/main/java/org/neo4j/cypherdsl/core/DefaultStatementBuilder.java index f222529155..c00f678d57 100644 --- a/neo4j-cypher-dsl/src/main/java/org/neo4j/cypherdsl/core/DefaultStatementBuilder.java +++ b/neo4j-cypher-dsl/src/main/java/org/neo4j/cypherdsl/core/DefaultStatementBuilder.java @@ -456,7 +456,7 @@ protected final void addUpdatingClause(UpdatingClause updatingClause) { @NotNull @Override - public StatementBuilder.OngoingReadingWithoutWhere call(Statement statement, IdentifiableElement... imports) { + public BuildableSubquery call(Statement statement, IdentifiableElement... imports) { this.closeCurrentOngoingMatch(); this.closeCurrentOngoingUpdate(); @@ -466,6 +466,18 @@ public StatementBuilder.OngoingReadingWithoutWhere call(Statement statement, Ide return this; } + @NotNull + @Override + public BuildableSubquery callRawCypher(String rawCypher, Object... args) { + + this.closeCurrentOngoingMatch(); + this.closeCurrentOngoingUpdate(); + + this.currentSinglePartElements.add(Subquery.raw(rawCypher, args)); + + return this; + } + @NotNull @Override public BuildableSubquery callInTransactions(Statement statement, Integer rows, IdentifiableElement... imports) { @@ -951,13 +963,21 @@ public OngoingUnwind unwind(Expression expression) { @NotNull @Override - public OngoingReadingWithoutWhere call(Statement statement, IdentifiableElement... imports) { + public BuildableSubquery call(Statement statement, IdentifiableElement... imports) { return DefaultStatementBuilder.this .addWith(buildWith()) .call(statement, imports); } + @Override + public @NotNull BuildableSubquery callRawCypher(String rawCypher, Object... args) { + + return DefaultStatementBuilder.this + .addWith(buildWith()) + .callRawCypher(rawCypher, args); + } + @NotNull @Override public BuildableSubquery callInTransactions(Statement statement, Integer rows, IdentifiableElement... imports) { @@ -1663,10 +1683,15 @@ public StatementBuilder.OrderableOngoingReadingAndWithWithoutWhere withDistinct( @NotNull @Override - public StatementBuilder.OngoingReadingWithoutWhere call(Statement statement, IdentifiableElement... imports) { + public BuildableSubquery call(Statement statement, IdentifiableElement... imports) { return new DefaultStatementBuilder(this.buildCall()).call(statement, imports); } + @Override + public @NotNull BuildableSubquery callRawCypher(String rawCypher, Object... args) { + return new DefaultStatementBuilder(this.buildCall()).callRawCypher(rawCypher, args); + } + @NotNull @Override public BuildableSubquery callInTransactions(Statement statement, Integer rows, IdentifiableElement... imports) { @@ -1784,12 +1809,19 @@ public OrderableOngoingReadingAndWithWithoutWhere withDistinct(Collection org.neo4j.cypherdsl.core.StatementBuilder$ExposesSetAndRemove#set(org.neo4j.cypherdsl.core.Node,java.util.Collection) org.neo4j.cypherdsl.core.StatementBuilder$ExposesSetAndRemove#set(org.neo4j.cypherdsl.core.Node,java.lang.String[]) + + org.neo4j.cypherdsl.core.ExposesSubqueryCall#call(org.neo4j.cypherdsl.core.Statement) + org.neo4j.cypherdsl.core.ExposesSubqueryCall#call(org.neo4j.cypherdsl.core.Statement,java.lang.String[]) + org.neo4j.cypherdsl.core.ExposesSubqueryCall#call(org.neo4j.cypherdsl.core.Statement,org.neo4j.cypherdsl.core.IdentifiableElement[])