GH-2668 - Optimise update of relationship properties.

There is no need to fetch start and end node if we already have the
identifier of the relationship to update.

Closes #2668

Author: meistermeier

src/main/java/org/springframework/data/neo4j/core/mapping/CypherGenerator.java

@@ -518,24 +518,28 @@ public Statement prepareUpdateOfRelationshipsWithProperties(Neo4jPersistentEntit
 		String row = "row";
 		Property relationshipProperties = Cypher.property(row, Constants.NAME_OF_PROPERTIES_PARAM);
 		Property idProperty = Cypher.property(row, Constants.FROM_ID_PARAMETER_NAME);
-		StatementBuilder.OngoingReadingWithWhere matchStartAndEndNode =
-				Cypher.unwind(parameter(Constants.NAME_OF_RELATIONSHIP_LIST_PARAM)).as(row)
-				.with(row)
-				.match(startNode)
-				.where(neo4jPersistentEntity.isUsingInternalIds() ? startNode.internalId().isEqualTo(idProperty)
-						: startNode.property(idPropertyName).isEqualTo(idProperty))
-				.match(endNode).where(endNode.internalId().isEqualTo(Cypher.property(row, Constants.TO_ID_PARAMETER_NAME)));
 
-		StatementBuilder.ExposesSet createOrUpdateRelationship = isNew
-				? matchStartAndEndNode.create(relationshipFragment)
-				: matchStartAndEndNode.match(relationshipFragment)
-				.where(Functions.id(relationshipFragment).isEqualTo(Cypher.property(row, Constants.NAME_OF_KNOWN_RELATIONSHIP_PARAM)));
+		StatementBuilder.OrderableOngoingReadingAndWithWithoutWhere relationshipUnwind = Cypher.unwind(parameter(Constants.NAME_OF_RELATIONSHIP_LIST_PARAM))
+				.as(row).with(row);
 
 		if (isNew) {
-			return createOrUpdateRelationship.mutate(RELATIONSHIP_NAME, relationshipProperties).returning(Functions.id(relationshipFragment)).build();
+			return relationshipUnwind
+					.match(startNode)
+					.where(
+							neo4jPersistentEntity.isUsingInternalIds()
+									? startNode.internalId().isEqualTo(idProperty)
+									: startNode.property(idPropertyName).isEqualTo(idProperty)
+					)
+					.match(endNode).where(endNode.internalId().isEqualTo(Cypher.property(row, Constants.TO_ID_PARAMETER_NAME)))
+					.create(relationshipFragment)
+					.mutate(RELATIONSHIP_NAME, relationshipProperties)
+					.returning(Functions.id(relationshipFragment)).build();
+		} else {
+			return relationshipUnwind
+					.match(relationshipFragment)
+					.where(Functions.id(relationshipFragment).isEqualTo(Cypher.property(row, Constants.NAME_OF_KNOWN_RELATIONSHIP_PARAM)))
+					.mutate(RELATIONSHIP_NAME, relationshipProperties).build();
 		}
-
-		return createOrUpdateRelationship.mutate(RELATIONSHIP_NAME, relationshipProperties).build();
 	}
 
 	@NonNull

src/test/java/org/springframework/data/neo4j/integration/imperative/RepositoryWithADifferentDatabaseIT.java

@@ -38,7 +38,7 @@ static void createTestDatabase() {
 
 		try (Session session = neo4jConnectionSupport.getDriver().session(SessionConfig.forDatabase("system"))) {
 
-			session.run("CREATE DATABASE " + TEST_DATABASE_NAME).consume();
+			session.run("CREATE DATABASE " + TEST_DATABASE_NAME + " IF NOT EXISTS").consume();
 		}
 
 		databaseSelection.set(DatabaseSelection.byName(TEST_DATABASE_NAME));
@@ -49,7 +49,7 @@ static void dropTestDatabase() {
 
 		try (Session session = neo4jConnectionSupport.getDriver().session(SessionConfig.forDatabase("system"))) {
 
-			session.run("DROP DATABASE " + TEST_DATABASE_NAME).consume();
+			session.run("DROP DATABASE " + TEST_DATABASE_NAME + " IF EXISTS").consume();
 		}
 
 		databaseSelection.set(DatabaseSelection.undecided());

src/test/java/org/springframework/data/neo4j/integration/imperative/RepositoryWithADifferentUserIT.java

@@ -45,9 +45,9 @@ static void createTestDatabase() {
 
 		try (Session session = neo4jConnectionSupport.getDriver().session(SessionConfig.forDatabase("system"))) {
 
-			session.run("CREATE DATABASE $db", Values.parameters("db", TEST_DATABASE_NAME)).consume();
+			session.run("CREATE DATABASE $db IF NOT EXISTS", Values.parameters("db", TEST_DATABASE_NAME)).consume();
 			session.run("CREATE USER $user SET PASSWORD $password CHANGE NOT REQUIRED SET HOME DATABASE $database",
-							Values.parameters("user", TEST_USER, "password", TEST_USER, "database", TEST_DATABASE_NAME))
+							Values.parameters("user", TEST_USER, "password", TEST_USER + TEST_USER, "database", TEST_DATABASE_NAME))
 					.consume();
 			session.run("GRANT ROLE publisher TO $user", Values.parameters("user", TEST_USER)).consume();
 			session.run("GRANT IMPERSONATE ($targetUser) ON DBMS TO admin", Values.parameters("targetUser", TEST_USER))
@@ -65,7 +65,7 @@ static void dropTestDatabase() {
 			session.run("REVOKE IMPERSONATE ($targetUser) ON DBMS FROM admin",
 					Values.parameters("targetUser", TEST_USER)).consume();
 			session.run("DROP USER $user", Values.parameters("user", TEST_USER)).consume();
-			session.run("DROP DATABASE $db", Values.parameters("db", TEST_DATABASE_NAME)).consume();
+			session.run("DROP DATABASE $db IF EXISTS", Values.parameters("db", TEST_DATABASE_NAME)).consume();
 		}
 
 		userSelection.set(UserSelection.connectedUser());

src/test/java/org/springframework/data/neo4j/integration/reactive/ReactiveRepositoryWithADifferentDatabaseIT.java

@@ -38,7 +38,7 @@ static void createTestDatabase() {
 
 		try (Session session = neo4jConnectionSupport.getDriver().session(SessionConfig.forDatabase("system"))) {
 
-			session.run("CREATE DATABASE " + TEST_DATABASE_NAME).consume();
+			session.run("CREATE DATABASE " + TEST_DATABASE_NAME + " IF NOT EXISTS").consume();
 		}
 
 		databaseSelection.set(DatabaseSelection.byName(TEST_DATABASE_NAME));
@@ -49,7 +49,7 @@ static void dropTestDatabase() {
 
 		try (Session session = neo4jConnectionSupport.getDriver().session(SessionConfig.forDatabase("system"))) {
 
-			session.run("DROP DATABASE " + TEST_DATABASE_NAME).consume();
+			session.run("DROP DATABASE " + TEST_DATABASE_NAME + " IF EXISTS").consume();
 		}
 
 		databaseSelection.set(DatabaseSelection.undecided());

src/test/java/org/springframework/data/neo4j/integration/reactive/ReactiveRepositoryWithADifferentUserIT.java

@@ -45,9 +45,9 @@ static void createTestDatabase() {
 
 		try (Session session = neo4jConnectionSupport.getDriver().session(SessionConfig.forDatabase("system"))) {
 
-			session.run("CREATE DATABASE $db", Values.parameters("db", TEST_DATABASE_NAME)).consume();
+			session.run("CREATE DATABASE $db IF NOT EXISTS", Values.parameters("db", TEST_DATABASE_NAME)).consume();
 			session.run("CREATE USER $user SET PASSWORD $password CHANGE NOT REQUIRED SET HOME DATABASE $database",
-							Values.parameters("user", TEST_USER, "password", TEST_USER, "database", TEST_DATABASE_NAME))
+							Values.parameters("user", TEST_USER, "password", TEST_USER + TEST_USER, "database", TEST_DATABASE_NAME))
 					.consume();
 			session.run("GRANT ROLE publisher TO $user", Values.parameters("user", TEST_USER)).consume();
 			session.run("GRANT IMPERSONATE ($targetUser) ON DBMS TO admin", Values.parameters("targetUser", TEST_USER))
@@ -65,7 +65,7 @@ static void dropTestDatabase() {
 			session.run("REVOKE IMPERSONATE ($targetUser) ON DBMS FROM admin",
 					Values.parameters("targetUser", TEST_USER)).consume();
 			session.run("DROP USER $user", Values.parameters("user", TEST_USER)).consume();
-			session.run("DROP DATABASE $db", Values.parameters("db", TEST_DATABASE_NAME)).consume();
+			session.run("DROP DATABASE $db IF EXISTS", Values.parameters("db", TEST_DATABASE_NAME)).consume();
 		}
 
 		userSelection.set(UserSelection.connectedUser());