Merge pull request #126 from zonkyio/flyway-7.x

Support Flyway 7.0 and 7.1

Author: tomix26

build.gradle

@@ -23,7 +23,7 @@ ext {
             [core: '4.0.3', test: '5.0.0'],
             [core: '4.1.2', test: '5.0.0'],
             [core: '4.2.0', test: '5.0.0'],
-            
+
             [core: '5.1.4', test: '5.1.0'],
             [core: '5.2.4', test: '5.2.4'],
             [core: '6.0.2', test: '6.0.0'],
@@ -34,6 +34,8 @@ ext {
             [core: '6.3.3', test: '6.3.3'],
             [core: '6.4.4', test: '6.4.0'],
             [core: '6.5.3', test: '6.4.0'],
+            [core: '7.0.4', test: '7.0.0'],
+            [core: '7.1.1', test: '7.0.0'],
 
             [core: '5.0.7', test: '5.0.0'] // default version
     ]

embedded-database-spring-test/src/main/java/io/zonky/test/db/flyway/DefaultFlywayDataSourceContext.java

@@ -19,6 +19,7 @@
 import io.zonky.test.db.provider.DatabaseDescriptor;
 import io.zonky.test.db.provider.DatabasePreparer;
 import io.zonky.test.db.provider.GenericDatabaseProvider;
+import io.zonky.test.db.util.ReflectionUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.flywaydb.core.Flyway;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -170,7 +171,8 @@ public FlywayDatabasePreparer(Flyway flyway) {
         public void prepare(DataSource ds) {
             preparerDataSourceHolder.set(ds);
             try {
-                flyway.migrate();
+                // Return type changed in v7, breaking static call
+                ReflectionUtils.invokeMethod(flyway, "migrate");
             } finally {
                 preparerDataSourceHolder.remove();
             }

embedded-database-spring-test/src/main/java/io/zonky/test/db/flyway/FlywayClassUtils.java

@@ -46,12 +46,12 @@ public class FlywayClassUtils {
             try {
                 if (flywayVersion >= 60) {
                     Object flywayConfig = invokeStaticMethod(Flyway.class, "configure");
-                    invokeMethod(flywayConfig, "getUndoSqlMigrationPrefix");
+                    invokeMethod(flywayConfig, "undoSqlMigrationPrefix", "U");
                 } else if (flywayVersion >= 51) {
                     Object flywayConfig = getField(new Flyway(), "configuration");
-                    invokeMethod(flywayConfig, "getUndoSqlMigrationPrefix");
+                    invokeMethod(flywayConfig, "setUndoSqlMigrationPrefix", "U");
                 } else {
-                    new Flyway().getUndoSqlMigrationPrefix();
+                    new Flyway().setUndoSqlMigrationPrefix("U");
                 }
                 isCommercial = true;
             } catch (FlywayException e) {

embedded-database-spring-test/src/main/java/io/zonky/test/db/flyway/FlywayConfigSnapshot.java

@@ -48,6 +48,8 @@ public class FlywayConfigSnapshot {
     private final List<Class<?>> javaMigrations;
     private final List<String> errorOverrides;
     private final Map<String, String> placeholders;
+    private final Map<String, String> jdbcProperties;
+    private final List<Object> cherryPick;
     private final String table;
     private final String tablespace;
     private final String defaultSchemaName;
@@ -61,8 +63,12 @@ public class FlywayConfigSnapshot {
     private final Object encoding;
     private final String initSql;
     private final String licenseKey;
+    private final String url;
+    private final String user;
+    private final String password;
     private final boolean skipDefaultResolvers;
     private final boolean skipDefaultCallbacks;
+    private final boolean skipExecutingMigrations;
     private final boolean placeholderReplacement;
     private final boolean baselineOnMigrate;
     private final boolean outOfOrder;
@@ -84,8 +90,11 @@ public class FlywayConfigSnapshot {
     private final boolean batch;
     private final boolean oracleSqlPlus;
     private final boolean oracleSqlplusWarn;
+    private final String oracleKerberosConfigFile;
+    private final String oracleKerberosCacheFile;
     private final boolean outputQueryResults;
     private final int connectRetries;
+    private final int lockRetryCount;
 
     public FlywayConfigSnapshot(Flyway flyway) {
         final Object config;
@@ -259,6 +268,36 @@ public FlywayConfigSnapshot(Flyway flyway) {
             this.javaMigrationClassProvider = null;
             this.createSchemas = true;
         }
+
+        if (flywayVersion >= 70) {
+            this.url = getValue(config, "getUrl");
+            this.user = getValue(config, "getUser");
+            this.password = getValue(config, "getPassword");
+        } else {
+            this.url = null;
+            this.user = null;
+            this.password = null;
+        }
+
+        if (flywayVersion >= 70 && isFlywayPro) {
+            this.jdbcProperties = ImmutableMap.copyOf(getMap(config, "getJdbcProperties"));
+            this.cherryPick = ImmutableList.copyOf(getArray(config, "getCherryPick"));
+            this.skipExecutingMigrations = getValue(config, "isSkipExecutingMigrations");
+            this.oracleKerberosConfigFile = getValue(config, "getOracleKerberosConfigFile");
+            this.oracleKerberosCacheFile = getValue(config, "getOracleKerberosCacheFile");
+        } else {
+            this.jdbcProperties = ImmutableMap.of();;
+            this.cherryPick = ImmutableList.of();;
+            this.skipExecutingMigrations = false;
+            this.oracleKerberosConfigFile = "";
+            this.oracleKerberosCacheFile = "";
+        }
+
+        if (flywayVersion >= 71) {
+            this.lockRetryCount = getValue(config, "getLockRetryCount");
+        } else {
+            this.lockRetryCount = 50;
+        }
     }
 
     private static <T> T getValue(Object target, String method) {
@@ -313,6 +352,10 @@ public boolean isSkipDefaultCallbacks() {
         return skipDefaultCallbacks;
     }
 
+    public boolean isSkipExecutingMigrations() {
+        return skipExecutingMigrations;
+    }
+
     public List<String> getSqlMigrationSuffixes() {
         return sqlMigrationSuffixes;
     }
@@ -353,6 +396,14 @@ public Map<String, String> getPlaceholders() {
         return placeholders;
     }
 
+    public Map<String, String> getJdbcProperties() {
+        return jdbcProperties;
+    }
+
+    public List<Object> getCherryPick() {
+        return cherryPick;
+    }
+
     public MigrationVersion getTarget() {
         return target;
     }
@@ -385,6 +436,18 @@ public String getLicenseKey() {
         return licenseKey;
     }
 
+    public String getUrl() {
+        return url;
+    }
+
+    public String getUser() {
+        return user;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
     public List<Object> getLocations() {
         return locations;
     }
@@ -477,6 +540,14 @@ public boolean isOracleSqlplusWarn() {
         return oracleSqlplusWarn;
     }
 
+    public String getOracleKerberosConfigFile() {
+        return oracleKerberosConfigFile;
+    }
+
+    public String getOracleKerberosCacheFile() {
+        return oracleKerberosCacheFile;
+    }
+
     public boolean isOutputQueryResults() {
         return outputQueryResults;
     }
@@ -485,13 +556,18 @@ public int getConnectRetries() {
         return connectRetries;
     }
 
+    public int getLockRetryCount() {
+        return lockRetryCount;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         FlywayConfigSnapshot that = (FlywayConfigSnapshot) o;
         return skipDefaultResolvers == that.skipDefaultResolvers &&
                 skipDefaultCallbacks == that.skipDefaultCallbacks &&
+                skipExecutingMigrations == that.skipExecutingMigrations &&
                 placeholderReplacement == that.placeholderReplacement &&
                 baselineOnMigrate == that.baselineOnMigrate &&
                 outOfOrder == that.outOfOrder &&
@@ -514,6 +590,7 @@ public boolean equals(Object o) {
                 oracleSqlplusWarn == that.oracleSqlplusWarn &&
                 outputQueryResults == that.outputQueryResults &&
                 connectRetries == that.connectRetries &&
+                lockRetryCount == that.lockRetryCount &&
                 Objects.equals(resolvers, that.resolvers) &&
                 Objects.equals(errorHandlers, that.errorHandlers) &&
                 Objects.equals(resourceProvider, that.resourceProvider) &&
@@ -526,6 +603,8 @@ public boolean equals(Object o) {
                 Objects.equals(javaMigrations, that.javaMigrations) &&
                 Objects.equals(errorOverrides, that.errorOverrides) &&
                 Objects.equals(placeholders, that.placeholders) &&
+                Objects.equals(jdbcProperties, that.jdbcProperties) &&
+                Objects.equals(cherryPick, that.cherryPick) &&
                 Objects.equals(table, that.table) &&
                 Objects.equals(tablespace, that.tablespace) &&
                 Objects.equals(defaultSchemaName, that.defaultSchemaName) &&
@@ -539,23 +618,31 @@ public boolean equals(Object o) {
                 Objects.equals(encoding, that.encoding) &&
                 Objects.equals(initSql, that.initSql) &&
                 Objects.equals(licenseKey, that.licenseKey) &&
-                Objects.equals(installedBy, that.installedBy);
+                Objects.equals(installedBy, that.installedBy) &&
+                Objects.equals(url, that.url) &&
+                Objects.equals(user, that.user) &&
+                Objects.equals(password, that.password) &&
+                Objects.equals(oracleKerberosConfigFile, that.oracleKerberosConfigFile) &&
+                Objects.equals(oracleKerberosCacheFile, that.oracleKerberosCacheFile);
     }
 
     @Override
     public int hashCode() {
         return Objects.hash(
                 resolvers, errorHandlers, resourceProvider, javaMigrationClassProvider,
                 baselineVersion, target, locations, schemas, sqlMigrationSuffixes,
-                javaMigrations, errorOverrides, placeholders, table, tablespace, defaultSchemaName,
+                javaMigrations, errorOverrides, placeholders, jdbcProperties, cherryPick,
+                table, tablespace, defaultSchemaName,
                 baselineDescription, undoSqlMigrationPrefix, repeatableSqlMigrationPrefix,
                 sqlMigrationSeparator, sqlMigrationPrefix, placeholderPrefix,
-                placeholderSuffix, encoding, initSql, licenseKey,
-                skipDefaultResolvers, skipDefaultCallbacks, placeholderReplacement, baselineOnMigrate,
-                outOfOrder, ignoreMissingMigrations, ignoreIgnoredMigrations, ignorePendingMigrations,
+                placeholderSuffix, encoding, initSql, licenseKey, url, user, password,
+                skipDefaultResolvers, skipDefaultCallbacks, skipExecutingMigrations,
+                placeholderReplacement, baselineOnMigrate, outOfOrder,
+                ignoreMissingMigrations, ignoreIgnoredMigrations, ignorePendingMigrations,
                 ignoreFutureMigrations, validateMigrationNaming, validateOnMigrate,
                 cleanOnValidationError, cleanDisabled, allowMixedMigrations, createSchemas,
                 mixed, group, installedBy, dryRun, stream, batch,
-                oracleSqlPlus, oracleSqlplusWarn, outputQueryResults, connectRetries);
+                oracleSqlPlus, oracleSqlplusWarn, oracleKerberosConfigFile, oracleKerberosCacheFile,
+                outputQueryResults, connectRetries, lockRetryCount);
     }
 }

embedded-database-spring-test/src/main/java/io/zonky/test/db/flyway/OptimizedFlywayTestExecutionListener.java

@@ -286,6 +286,16 @@ protected static MigrationResolver createMigrationResolver(Flyway flyway, String
     protected static Object createScanner(Flyway flyway) throws ClassNotFoundException {
         Object configuration = getField(flyway, "configuration");
 
+        if (flywayVersion >= 70) {
+            return invokeConstructor("org.flywaydb.core.internal.scanner.Scanner",
+                    ClassUtils.forName("org.flywaydb.core.api.migration.JavaMigration", classLoader),
+                    Arrays.asList((Object[]) invokeMethod(configuration, "getLocations")),
+                    invokeMethod(configuration, "getClassLoader"),
+                    invokeMethod(configuration, "getEncoding"),
+                    false,
+                    getField(flyway, "resourceNameCache"),
+                    getField(flyway, "locationScannerCache"));
+        }
         if (flywayVersion >= 63) {
             try {
                 // this code is only for version 6.3.3 and above