root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Fix mapping of outputQueryResults property 

Closes gh-23645
This commit is contained in:
Stephane Nicoll 2020-10-13 13:17:49 +02:00
parent 98914b65bc
commit 2577c67185
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
View File

@ -233,6 +233,9 @@ public class FlywayAutoConfiguration {
map.from(properties.getOracleKerberosConfigFile()).whenNonNull()
.to((configFile) -> configuration.orackeKerberosConfigFile(configFile));
// No method reference for compatibility with Flyway 6.x
map.from(properties.getOutputQueryResults()).whenNonNull()
.to((outputQueryResults) -> configuration.outputQueryResults(outputQueryResults));
// No method reference for compatibility with Flyway 6.x
map.from(properties.getSkipExecutingMigrations()).whenNonNull()
.to((skipExecutingMigrations) -> configuration.skipExecutingMigrations(skipExecutingMigrations));
}

6
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java
View File

@ -315,7 +315,7 @@ public class FlywayProperties {
* Whether Flyway should output a table with the results of queries when executing
* migrations. Requires Flyway Teams.
*/
private boolean outputQueryResults = true;
private Boolean outputQueryResults;
/**
* Whether Flyway should skip executing the contents of the migrations and only update
@ -743,11 +743,11 @@ public class FlywayProperties {
this.oracleKerberosConfigFile = oracleKerberosConfigFile;
}
public boolean isOutputQueryResults() {
public Boolean getOutputQueryResults() {
return this.outputQueryResults;
}
public void setOutputQueryResults(boolean outputQueryResults) {
public void setOutputQueryResults(Boolean outputQueryResults) {
this.outputQueryResults = outputQueryResults;
}

11
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java
View File

@ -563,6 +563,17 @@ class FlywayAutoConfigurationTests {
});
}
@Test
void outputQueryResultsIsCorrectlyMapped() {
this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
.withPropertyValues("spring.flyway.output-query-results=false").run((context) -> {
assertThat(context).hasFailed();
Throwable failure = context.getStartupFailure();
assertThat(failure).hasRootCauseInstanceOf(FlywayTeamsUpgradeRequiredException.class);
assertThat(failure).hasMessageContaining(" outputQueryResults ");
});
}
@Test
void skipExecutingMigrationsIsCorrectlyMapped() {
this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)