fix: The match for versions in the default database was too fuzzy. (#311

)
michael-simons · Nov 21, 2021 · 963d389 · 963d389
1 parent 375541d
commit 963d389
Showing 1 changed file with 29 additions and 22 deletions.
diff --git a/neo4j-migrations-core/src/main/java/ac/simons/neo4j/migrations/core/Migrations.java b/neo4j-migrations-core/src/main/java/ac/simons/neo4j/migrations/core/Migrations.java
@@ -29,9 +29,9 @@
 
 import org.neo4j.driver.AccessMode;
 import org.neo4j.driver.Driver;
+import org.neo4j.driver.Result;
 import org.neo4j.driver.Session;
 import org.neo4j.driver.SessionConfig;
-import org.neo4j.driver.Value;
 import org.neo4j.driver.Values;
 import org.neo4j.driver.exceptions.NoSuchRecordException;
 import org.neo4j.driver.exceptions.ServiceUnavailableException;
@@ -165,29 +165,36 @@ private MigrationVersion recordApplication(String neo4jUser, MigrationVersion pr
 		try (Session session = context.getSchemaSession()) {
 
 			Optional<String> migrationTarget = context.getConfig().getMigrationTargetIn(context);
-			Value parameters = Values.parameters(
-				"neo4jUser", neo4jUser,
-				"previousVersion", previousVersion.getValue(),
-				"appliedMigration", toProperties(appliedMigration),
-				"installedBy", config.getOptionalInstalledBy().map(Values::value).orElse(Values.NULL),
-				"executionTime", executionTime,
-				"migrationTarget", migrationTarget.orElse(null)
-			);
-
-			String merge;
-			if (migrationTarget.isPresent()) {
-				merge = "MERGE (p:__Neo4jMigration {version: $previousVersion, migrationTarget: $migrationTarget}) ";
-			} else {
-				merge = "MERGE (p:__Neo4jMigration {version: $previousVersion}) ";
-			}
+			Map<String, Object> parameters = new HashMap<>();
+			parameters.put("neo4jUser", neo4jUser);
+			parameters.put("previousVersion", previousVersion.getValue());
+			parameters.put("appliedMigration", toProperties(appliedMigration));
+			parameters.put("installedBy", config.getOptionalInstalledBy().map(Values::value).orElse(Values.NULL));
+			parameters.put("executionTime", executionTime);
+			parameters.put("migrationTarget", migrationTarget.orElse(null));
+
+			session.writeTransaction(t -> {
+				String mergeOrMatchAndMaybeCreate;
+				if (migrationTarget.isPresent()) {
+					mergeOrMatchAndMaybeCreate = "MERGE (p:__Neo4jMigration {version: $previousVersion, migrationTarget: $migrationTarget}) ";
+				} else {
+					Result result = t.run(
+						"MATCH (p:__Neo4jMigration {version: $previousVersion}) WHERE p.migrationTarget IS NULL RETURN id(p) AS id",
+						Values.parameters("previousVersion", previousVersion.getValue()));
+					if (result.hasNext()) {
+						parameters.put("id", result.single().get("id").asLong());
+						mergeOrMatchAndMaybeCreate = "MATCH (p) WHERE id(p) = $id WITH p ";
+					} else {
+						mergeOrMatchAndMaybeCreate = "CREATE (p:__Neo4jMigration {version: $previousVersion}) ";
+					}
+				}
 
-			session.writeTransaction(t ->
-				t.run(merge
-					  + "CREATE (c:__Neo4jMigration) SET c = $appliedMigration, c.migrationTarget = $migrationTarget "
-					  + "MERGE (p) - [:MIGRATED_TO {at: datetime({timezone: 'UTC'}), in: duration( {milliseconds: $executionTime} ), by: $installedBy, connectedAs: $neo4jUser}] -> (c)",
+				return t.run(mergeOrMatchAndMaybeCreate
+							 + "CREATE (c:__Neo4jMigration) SET c = $appliedMigration, c.migrationTarget = $migrationTarget "
+							 + "MERGE (p) - [:MIGRATED_TO {at: datetime({timezone: 'UTC'}), in: duration( {milliseconds: $executionTime} ), by: $installedBy, connectedAs: $neo4jUser}] -> (c)",
 						parameters)
-					.consume()
-			);
+					.consume();
+			});
 		}
 
 		return appliedMigration.getVersion();