Merge pull request #44912 from gastaldi/flyway_deprecated

Remove `cleanOnValidationError` config in Flyway
quarkusio · Dec 4, 2024 · 5006bf3 · 5006bf3
2 parents 0ac0e12 + 58f6144
commit 5006bf3
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 23 deletions.
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
@@ -117,7 +117,6 @@ public Flyway createFlyway(DataSource dataSource) {
         }
 
         configure.ignoreMigrationPatterns(ignoreMigrationPatterns);
-        configure.cleanOnValidationError(flywayRuntimeConfig.cleanOnValidationError);
         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
@@ -131,12 +131,6 @@ public static FlywayDataSourceRuntimeConfig defaultConfig() {
     @ConfigItem
     public boolean cleanDisabled;
 
-    /**
-     * true to automatically call clean when a validation error occurs, false otherwise.
-     */
-    @ConfigItem
-    public boolean cleanOnValidationError;
-
     /**
      * true to execute Flyway automatically when the application starts, false otherwise.
      *

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
@@ -222,22 +222,6 @@ void testIgnoreFutureMigrations() {
         assertTrue(ValidatePatternUtils.isFutureIgnored(createdFlywayConfig().getIgnoreMigrationPatterns()));
     }
 
-    @Test
-    @DisplayName("cleanOnValidationError defaults to false and is correctly set")
-    void testCleanOnValidationError() {
-        creator = new FlywayCreator(runtimeConfig, buildConfig);
-        assertEquals(runtimeConfig.cleanOnValidationError, createdFlywayConfig().isCleanOnValidationError());
-        assertFalse(runtimeConfig.cleanOnValidationError);
-
-        runtimeConfig.cleanOnValidationError = false;
-        creator = new FlywayCreator(runtimeConfig, buildConfig);
-        assertFalse(createdFlywayConfig().isCleanOnValidationError());
-
-        runtimeConfig.cleanOnValidationError = true;
-        creator = new FlywayCreator(runtimeConfig, buildConfig);
-        assertTrue(createdFlywayConfig().isCleanOnValidationError());
-    }
-
     @ParameterizedTest
     @MethodSource("validateOnMigrateOverwritten")
     @DisplayName("validate on migrate overwritten in configuration")