Skip to content

Commit 3c3849e

Browse files
committed
Fix: Allow empty string for spring.flyway.ignore-migration-patterns
Allows 'spring.flyway.ignore-migration-patterns' to be set to an empty string to align with Flyway's documented behavior for unsetting default migration patterns. Signed-off-by: Chanwon-Seo <scwonn60@gmail.com>
1 parent 3dba915 commit 3c3849e

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

module/spring-boot-flyway/src/main/java/org/springframework/boot/flyway/autoconfigure/FlywayAutoConfiguration.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,6 @@ private void configureProperties(FluentConfiguration configuration, FlywayProper
320320
map.from(properties.getSkipExecutingMigrations())
321321
.to((skipExecutingMigrations) -> configuration.skipExecutingMigrations(skipExecutingMigrations));
322322
map.from(properties.getIgnoreMigrationPatterns())
323-
.whenNot(List::isEmpty)
324323
.to((ignoreMigrationPatterns) -> configuration
325324
.ignoreMigrationPatterns(ignoreMigrationPatterns.toArray(new String[0])));
326325
map.from(properties.getDetectEncoding())

module/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/autoconfigure/FlywayAutoConfigurationTests.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -897,6 +897,14 @@ void ignoreMigrationPatternsCorrectlyMapped() {
897897
.containsExactly(ValidatePattern.fromPattern("*:missing")));
898898
}
899899

900+
@Test
901+
void ignoreMigrationPatternsIsEmpty() {
902+
this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
903+
.withPropertyValues("spring.flyway.ignore-migration-patterns=")
904+
.run((context) -> assertThat(context.getBean(Flyway.class).getConfiguration().getIgnoreMigrationPatterns())
905+
.isEmpty());
906+
}
907+
900908
private ContextConsumer<AssertableApplicationContext> validateFlywayTeamsPropertyOnly(String propertyName) {
901909
return (context) -> {
902910
assertThat(context).hasFailed();

0 commit comments

Comments
 (0)