Fix #3111: add target=next

flyway · Aug 4, 2021 · 7b4e34b · 7b4e34b
1 parent 7ec3937
commit 7b4e34b
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 4 deletions.
diff --git a/flyway-core/src/main/java/org/flywaydb/core/api/MigrationVersion.java b/flyway-core/src/main/java/org/flywaydb/core/api/MigrationVersion.java
@@ -41,6 +41,11 @@ public final class MigrationVersion implements Comparable<MigrationVersion> {
      */
     public static final MigrationVersion CURRENT = new MigrationVersion(BigInteger.valueOf(-2), "<< Current Version >>");
 
+    /**
+     * Next version.
+     */
+    public static final MigrationVersion NEXT = new MigrationVersion(BigInteger.valueOf(-3), "<< Next Version >>");
+
     /**
      * Regex for matching proper version format
      */
@@ -66,6 +71,7 @@ public final class MigrationVersion implements Comparable<MigrationVersion> {
     @SuppressWarnings("ConstantConditions")
     public static MigrationVersion fromVersion(String version) {
         if ("current".equalsIgnoreCase(version)) return CURRENT;
+        if ("next".equalsIgnoreCase(version)) return NEXT;
         if ("latest".equalsIgnoreCase(version) || LATEST.getVersion().equals(version)) return LATEST;
         if (version == null) return EMPTY;
         return new MigrationVersion(version);

diff --git a/flyway-core/src/main/java/org/flywaydb/core/api/configuration/ClassicConfiguration.java b/flyway-core/src/main/java/org/flywaydb/core/api/configuration/ClassicConfiguration.java
@@ -27,6 +27,7 @@
 import org.flywaydb.core.internal.jdbc.DriverDataSource;
 import org.flywaydb.core.internal.scanner.ClasspathClassScanner;
 import org.flywaydb.core.internal.util.ClassUtils;
+import org.flywaydb.core.internal.util.FeatureDetector;
 import org.flywaydb.core.internal.util.Locations;
 import org.flywaydb.core.internal.util.StringUtils;
 import org.flywaydb.core.internal.license.Edition;
@@ -891,6 +892,15 @@ public void setTablespace(String tablespace) {
      * Defaults to {@code latest}.
      */
     public void setTarget(MigrationVersion target) {
+        if (!FeatureDetector.areExperimentalFeaturesEnabled() && target == MigrationVersion.NEXT) {
+
+
+
+
+
+             throw new org.flywaydb.core.internal.license.FlywayTeamsUpgradeRequiredException("target=next");
+
+        }
         this.target = target;
     }
 
@@ -919,8 +929,8 @@ public void setTargetAsString(String target) {
 
 
         } else {
-            this.failOnMissingTarget = true;
-            this.target = MigrationVersion.fromVersion(target);
+            setFailOnMissingTarget(true);
+            setTarget(MigrationVersion.fromVersion(target));
         }
     }
 

diff --git a/flyway-core/src/main/java/org/flywaydb/core/internal/command/DbMigrate.java b/flyway-core/src/main/java/org/flywaydb/core/internal/command/DbMigrate.java
@@ -143,6 +143,9 @@ private int migrateAll() {
             if (count == 0) {
                 // No further migrations available
                 break;
+            } else if (configuration.getTarget() == MigrationVersion.NEXT) {
+                // With target=next we only execute one migration
+                break;
             }
         }
 

diff --git a/flyway-core/src/main/java/org/flywaydb/core/internal/info/MigrationInfoImpl.java b/flyway-core/src/main/java/org/flywaydb/core/internal/info/MigrationInfoImpl.java
@@ -161,7 +161,7 @@ public MigrationState getState() {
 
 
 
-                if (context.target != null && resolvedMigration.getVersion().compareTo(context.target) > 0) {
+                if (context.target != null && context.target != MigrationVersion.NEXT && resolvedMigration.getVersion().compareTo(context.target) > 0) {
                     return MigrationState.ABOVE_TARGET;
                 }
                 if ((resolvedMigration.getVersion().compareTo(context.lastApplied) < 0) && !context.outOfOrder) {

diff --git a/flyway-core/src/main/java/org/flywaydb/core/internal/info/MigrationInfoServiceImpl.java b/flyway-core/src/main/java/org/flywaydb/core/internal/info/MigrationInfoServiceImpl.java
@@ -29,6 +29,7 @@
 import org.flywaydb.core.internal.database.base.Schema;
 import org.flywaydb.core.internal.schemahistory.AppliedMigration;
 import org.flywaydb.core.internal.schemahistory.SchemaHistory;
+import org.flywaydb.core.internal.util.FeatureDetector;
 import org.flywaydb.core.internal.util.Pair;
 
 import java.util.*;
@@ -231,7 +232,8 @@ public void refresh() {
         if (configuration.getFailOnMissingTarget() &&
                 target != null &&
                 target != MigrationVersion.CURRENT &&
-                target != MigrationVersion.LATEST) {
+                target != MigrationVersion.LATEST &&
+                target != MigrationVersion.NEXT) {
             boolean targetFound = false;
 
             for (MigrationInfoImpl migration : migrationInfos1) {
@@ -291,6 +293,15 @@ public void refresh() {
         // Set output
         Collections.sort(migrationInfos1);
         migrationInfos = migrationInfos1;
+
+        if (context.target == MigrationVersion.NEXT) {
+            MigrationInfo[] pendingMigrationInfos = pending();
+            if (pendingMigrationInfos.length == 0) {
+                context.target = null;
+            } else {
+                context.target = pendingMigrationInfos[0].getVersion();
+            }
+        }
     }
 
     /**