() {
- public Void execute(Connection connectionMetaDataTable, Connection connectionUserObjects, MigrationResolver migrationResolver, DbSupport dbSupport, Schema[] schemas) {
+ public Void execute(Connection connectionMetaDataTable, Connection connectionUserObjects, MigrationResolver migrationResolver, DbSupport dbSupport, Schema[] schemas, FlywayCallback[] flywayCallbacks) {
assertEquals("PUBLIC", flyway.getSchemas()[0]);
return null;
}
diff --git a/flyway-core/src/test/java/org/flywaydb/core/internal/info/MigrationInfoImplSmallTest.java b/flyway-core/src/test/java/org/flywaydb/core/internal/info/MigrationInfoImplSmallTest.java
index 5ff444f54c..7ec5349c32 100644
--- a/flyway-core/src/test/java/org/flywaydb/core/internal/info/MigrationInfoImplSmallTest.java
+++ b/flyway-core/src/test/java/org/flywaydb/core/internal/info/MigrationInfoImplSmallTest.java
@@ -47,4 +47,19 @@ public void validate() {
assertTrue(message.contains("123"));
assertTrue(message.contains("456"));
}
+
+ @Test
+ public void validateFuture() {
+ MigrationVersion version = MigrationVersion.fromVersion("1");
+ String description = "test";
+ MigrationType type = MigrationType.SQL;
+
+ AppliedMigration appliedMigration = new AppliedMigration(1, version, description, type, null, 123, new Date(), "abc", 0, true);
+
+ MigrationInfoImpl migrationInfo =
+ new MigrationInfoImpl(null, appliedMigration, new MigrationInfoContext(), false);
+ String message = migrationInfo.validate();
+
+ assertTrue(message, message.contains("not resolved"));
+ }
}
diff --git a/flyway-core/src/test/java/org/flywaydb/core/internal/resolver/FlywayConfigurationForTests.java b/flyway-core/src/test/java/org/flywaydb/core/internal/resolver/FlywayConfigurationForTests.java
index b77f32506b..9fe0fd108b 100644
--- a/flyway-core/src/test/java/org/flywaydb/core/internal/resolver/FlywayConfigurationForTests.java
+++ b/flyway-core/src/test/java/org/flywaydb/core/internal/resolver/FlywayConfigurationForTests.java
@@ -38,6 +38,7 @@ public class FlywayConfigurationForTests implements FlywayConfiguration {
private String sqlMigrationSuffix;
private MyCustomMigrationResolver[] migrationResolvers = new MyCustomMigrationResolver[0];
private boolean skipDefaultResolvers;
+ private boolean skipDefaultCallbacks;
public FlywayConfigurationForTests(ClassLoader contextClassLoader, String[] locations, String encoding,
String sqlMigrationPrefix, String repeatableSqlMigrationPrefix, String sqlMigrationSeparator, String sqlMigrationSuffix,
@@ -69,6 +70,15 @@ public FlywayCallback[] getCallbacks() {
return null;
}
+ @Override
+ public boolean isSkipDefaultCallbacks() {
+ return skipDefaultCallbacks;
+ }
+
+ public void setSkipDefaultCallbacks(boolean skipDefaultCallbacks) {
+ this.skipDefaultCallbacks = skipDefaultCallbacks;
+ }
+
@Override
public ClassLoader getClassLoader() {
return classLoader;
diff --git a/flyway-gradle-plugin/src/main/groovy/org/flywaydb/gradle/FlywayExtension.groovy b/flyway-gradle-plugin/src/main/groovy/org/flywaydb/gradle/FlywayExtension.groovy
index dc8393b2e5..bf2dd70ccb 100644
--- a/flyway-gradle-plugin/src/main/groovy/org/flywaydb/gradle/FlywayExtension.groovy
+++ b/flyway-gradle-plugin/src/main/groovy/org/flywaydb/gradle/FlywayExtension.groovy
@@ -134,6 +134,12 @@ public class FlywayExtension {
/** An array of fully qualified FlywayCallback class implementations */
String[] callbacks
+ /**
+ * If set to true, default built-in callbacks will be skipped, only custom migration callbacks will be used.
+ * (default: false)
+ */
+ Boolean skipDefaultCallbacks
+
/** Allows migrations to be run "out of order" */
Boolean outOfOrder
diff --git a/flyway-gradle-plugin/src/main/groovy/org/flywaydb/gradle/task/AbstractFlywayTask.groovy b/flyway-gradle-plugin/src/main/groovy/org/flywaydb/gradle/task/AbstractFlywayTask.groovy
index d2db044414..f626278b63 100644
--- a/flyway-gradle-plugin/src/main/groovy/org/flywaydb/gradle/task/AbstractFlywayTask.groovy
+++ b/flyway-gradle-plugin/src/main/groovy/org/flywaydb/gradle/task/AbstractFlywayTask.groovy
@@ -107,6 +107,7 @@ abstract class AbstractFlywayTask extends DefaultTask {
propSetAsBoolean(flyway, 'cleanDisabled')
propSetAsBoolean(flyway, 'baselineOnMigrate')
propSetAsBoolean(flyway, 'skipDefaultResolvers')
+ propSetAsBoolean(flyway, 'skipDefaultCallbacks')
def sysSchemas = System.getProperty("flyway.schemas")
if (sysSchemas != null) {
diff --git a/flyway-maven-plugin/src/main/java/org/flywaydb/maven/AbstractFlywayMojo.java b/flyway-maven-plugin/src/main/java/org/flywaydb/maven/AbstractFlywayMojo.java
index 195a54e413..810a023ccb 100644
--- a/flyway-maven-plugin/src/main/java/org/flywaydb/maven/AbstractFlywayMojo.java
+++ b/flyway-maven-plugin/src/main/java/org/flywaydb/maven/AbstractFlywayMojo.java
@@ -320,6 +320,15 @@ abstract class AbstractFlywayMojo extends AbstractMojo {
*/
private String[] callbacks = new String[0];
+ /**
+ * When set to true, default callbacks are skipped, i.e. only custom callbacks as defined by 'resolvers'
+ * are used. (default: false)
Also configurable with Maven or System Property:
+ * ${flyway.skipDefaultCallbacks}
+ *
+ * @parameter property="flyway.skipDefaultCallbacks"
+ */
+ private boolean skipDefaultCallbacks;
+
/**
*
* Whether to automatically call baseline when migrate is executed against a non-empty schema with no metadata table.
@@ -461,6 +470,7 @@ public final void execute() throws MojoExecutionException, MojoFailureException
flyway.setResolversAsClassNames(resolvers);
flyway.setSkipDefaultResolvers(skipDefaultResolvers);
flyway.setCallbacksAsClassNames(callbacks);
+ flyway.setSkipDefaultCallbacks(skipDefaultCallbacks);
flyway.setEncoding(encoding);
flyway.setSqlMigrationPrefix(sqlMigrationPrefix);
flyway.setRepeatableSqlMigrationPrefix(repeatableSqlMigrationPrefix);
diff --git a/flyway-sbt/src/main/scala/org/flywaydb/sbt/FlywayPlugin.scala b/flyway-sbt/src/main/scala/org/flywaydb/sbt/FlywayPlugin.scala
index 7cfce44add..293d582d88 100644
--- a/flyway-sbt/src/main/scala/org/flywaydb/sbt/FlywayPlugin.scala
+++ b/flyway-sbt/src/main/scala/org/flywaydb/sbt/FlywayPlugin.scala
@@ -64,6 +64,7 @@ object FlywayPlugin extends AutoPlugin {
val flywayTarget = settingKey[String]("The target version up to which Flyway should run migrations. Migrations with a higher version number will not be applied. (default: the latest version)")
val flywayOutOfOrder = settingKey[Boolean]("Allows migrations to be run \"out of order\" (default: {@code false}). If you already have versions 1 and 3 applied, and now a version 2 is found, it will be applied too instead of being ignored.")
val flywayCallbacks = settingKey[Seq[String]]("A list of fully qualified FlywayCallback implementation classnames that will be used for Flyway lifecycle notifications. (default: Empty)")
+ val flywaySkipDefaultCallbacks = settingKey[Boolean]("Whether default built-in callbacks should be skipped. (default: false)")
//*********************
// settings for migrate
@@ -101,7 +102,8 @@ object FlywayPlugin extends AutoPlugin {
}
private case class ConfigBase(schemas: Seq[String], table: String, baselineVersion: String, baselineDescription: String)
private case class ConfigMigrationLoading(locations: Seq[String], resolvers: Seq[String], skipDefaultResolvers: Boolean, encoding: String,
- cleanOnValidationError: Boolean, cleanDisabled: Boolean, target: String, outOfOrder: Boolean, callbacks: Seq[String])
+ cleanOnValidationError: Boolean, cleanDisabled: Boolean, target: String, outOfOrder: Boolean,
+ callbacks: Seq[String], skipDefaultCallbacks: Boolean)
private case class ConfigSqlMigration(sqlMigrationPrefix: String, repeatableSqlMigrationPrefix: String, sqlMigrationSeparator: String, sqlMigrationSuffix: String)
private case class ConfigMigrate(ignoreFailedFutureMigration: Boolean, placeholderReplacement: Boolean, placeholders: Map[String, String],
placeholderPrefix: String, placeholderSuffix: String, baselineOnMigrate: Boolean, validateOnMigrate: Boolean)
@@ -144,6 +146,7 @@ object FlywayPlugin extends AutoPlugin {
flywayTarget := defaults.getTarget.getVersion,
flywayOutOfOrder := defaults.isOutOfOrder,
flywayCallbacks := new Array[String](0),
+ flywaySkipDefaultCallbacks := defaults.isSkipDefaultCallbacks,
flywayIgnoreFailedFutureMigration := defaults.isIgnoreFailedFutureMigration,
flywayPlaceholderReplacement := defaults.isPlaceholderReplacement,
flywayPlaceholders := defaults.getPlaceholders.asScala.toMap,
@@ -160,9 +163,9 @@ object FlywayPlugin extends AutoPlugin {
(schemas, table, baselineVersion, baselineDescription) =>
ConfigBase(schemas, table, baselineVersion, baselineDescription)
},
- flywayConfigMigrationLoading <<= (flywayLocations, flywayResolvers, flywaySkipDefaultResolvers, flywayEncoding, flywayCleanOnValidationError, flywayCleanDisabled, flywayTarget, flywayOutOfOrder, flywayCallbacks) map {
- (locations, resolvers, skipDefaultResolvers, encoding, cleanOnValidationError, cleanDisabled, target, outOfOrder, callbacks) =>
- ConfigMigrationLoading(locations, resolvers, skipDefaultResolvers, encoding, cleanOnValidationError, cleanDisabled, target, outOfOrder, callbacks)
+ flywayConfigMigrationLoading <<= (flywayLocations, flywayResolvers, flywaySkipDefaultResolvers, flywayEncoding, flywayCleanOnValidationError, flywayCleanDisabled, flywayTarget, flywayOutOfOrder, flywayCallbacks, flywaySkipDefaultCallbacks) map {
+ (locations, resolvers, skipDefaultResolvers, encoding, cleanOnValidationError, cleanDisabled, target, outOfOrder, callbacks, skipDefaultCallbacks) =>
+ ConfigMigrationLoading(locations, resolvers, skipDefaultResolvers, encoding, cleanOnValidationError, cleanDisabled, target, outOfOrder, callbacks, skipDefaultCallbacks)
},
flywayConfigSqlMigration <<= (flywaySqlMigrationPrefix, flywayRepeatableSqlMigrationPrefix, flywaySqlMigrationSeparator, flywaySqlMigrationSuffix) map {
(sqlMigrationPrefix, repeatableSqlMigrationPrefix, sqlMigrationSeparator, sqlMigrationSuffix) =>
@@ -266,6 +269,7 @@ object FlywayPlugin extends AutoPlugin {
flyway.setCallbacksAsClassNames(config.callbacks: _*)
flyway.setResolversAsClassNames(config.resolvers: _*)
flyway.setSkipDefaultResolvers(config.skipDefaultResolvers)
+ flyway.setSkipDefaultCallbacks(config.skipDefaultCallbacks)
flyway
}
def configure(config: ConfigSqlMigration): Flyway = {