Support Flyway ignoreMissingMigrations config

Fixes quarkusio#11421
knutwannheden · Aug 18, 2020 · 6b4973d · 6b4973d
1 parent 0c4ac13
commit 6b4973d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayCreator.java b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayCreator.java
@@ -41,6 +41,7 @@ public Flyway createFlyway(DataSource dataSource) {
         }
         configure.baselineOnMigrate(flywayRuntimeConfig.baselineOnMigrate);
         configure.validateOnMigrate(flywayRuntimeConfig.validateOnMigrate);
+        configure.ignoreMissingMigrations(flywayRuntimeConfig.ignoreMissingMigrations);
         configure.outOfOrder(flywayRuntimeConfig.outOfOrder);
         if (flywayRuntimeConfig.baselineVersion.isPresent()) {
             configure.baselineVersion(flywayRuntimeConfig.baselineVersion.get());

diff --git a/...flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayDataSourceRuntimeConfig.java b/...flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayDataSourceRuntimeConfig.java
@@ -108,6 +108,15 @@ public static final FlywayDataSourceRuntimeConfig defaultConfig() {
     @ConfigItem
     public boolean outOfOrder;
 
+    /**
+     * Ignore missing migrations when reading the history table. When set to true any migration present in the history table but
+     * absent in the configured locations will be ignored (and logged as a warning), when false (the default) the validation
+     * step
+     * will fail.
+     */
+    @ConfigItem
+    public boolean ignoreMissingMigrations;
+
     /**
      * Sets the placeholders to replace in SQL migration scripts.
      */

diff --git a/extensions/flyway/runtime/src/test/java/io/quarkus/flyway/runtime/FlywayCreatorTest.java b/extensions/flyway/runtime/src/test/java/io/quarkus/flyway/runtime/FlywayCreatorTest.java
@@ -169,7 +169,7 @@ void testValidateOnMigrate() {
 
     @Test
     @DisplayName("outOfOrder is correctly set")
-    void testOutOfOrder() {
+    void testIgnoreMissing() {
         runtimeConfig.outOfOrder = false;
         creator = new FlywayCreator(runtimeConfig, buildConfig);
         assertFalse(createdFlywayConfig().isOutOfOrder());
@@ -179,6 +179,18 @@ void testOutOfOrder() {
         assertTrue(createdFlywayConfig().isOutOfOrder());
     }
 
+    @Test
+    @DisplayName("ignoreMissingMigrations is correctly set")
+    void testOutOfOrder() {
+        runtimeConfig.ignoreMissingMigrations = false;
+        creator = new FlywayCreator(runtimeConfig, buildConfig);
+        assertFalse(createdFlywayConfig().isIgnoreMissingMigrations());
+
+        runtimeConfig.ignoreMissingMigrations = true;
+        creator = new FlywayCreator(runtimeConfig, buildConfig);
+        assertTrue(createdFlywayConfig().isIgnoreMissingMigrations());
+    }
+
     @ParameterizedTest
     @MethodSource("validateOnMigrateOverwritten")
     @DisplayName("validate on migrate overwritten in configuration")