mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Merge branch '2.7.x' into 3.0.x
Closes gh-36098
This commit is contained in:
commit
79cd3a027a
@ -236,14 +236,17 @@ public class FlywayAutoConfiguration {
|
|||||||
map.from(properties.getDryRunOutput()).to(configuration::dryRunOutput);
|
map.from(properties.getDryRunOutput()).to(configuration::dryRunOutput);
|
||||||
map.from(properties.getErrorOverrides()).to(configuration::errorOverrides);
|
map.from(properties.getErrorOverrides()).to(configuration::errorOverrides);
|
||||||
map.from(properties.getLicenseKey()).to(configuration::licenseKey);
|
map.from(properties.getLicenseKey()).to(configuration::licenseKey);
|
||||||
map.from(properties.getOracleSqlplus()).to(configuration::oracleSqlplus);
|
// No method references for Oracle props for compatibility with Flyway 9.20+
|
||||||
map.from(properties.getOracleSqlplusWarn()).to(configuration::oracleSqlplusWarn);
|
map.from(properties.getOracleSqlplus()).to((oracleSqlplus) -> configuration.oracleSqlplus(oracleSqlplus));
|
||||||
|
map.from(properties.getOracleSqlplusWarn())
|
||||||
|
.to((oracleSqlplusWarn) -> configuration.oracleSqlplusWarn(oracleSqlplusWarn));
|
||||||
|
map.from(properties.getOracleKerberosCacheFile())
|
||||||
|
.to((oracleKerberosCacheFile) -> configuration.oracleKerberosCacheFile(oracleKerberosCacheFile));
|
||||||
map.from(properties.getStream()).to(configuration::stream);
|
map.from(properties.getStream()).to(configuration::stream);
|
||||||
map.from(properties.getUndoSqlMigrationPrefix()).to(configuration::undoSqlMigrationPrefix);
|
map.from(properties.getUndoSqlMigrationPrefix()).to(configuration::undoSqlMigrationPrefix);
|
||||||
map.from(properties.getCherryPick()).to(configuration::cherryPick);
|
map.from(properties.getCherryPick()).to(configuration::cherryPick);
|
||||||
map.from(properties.getJdbcProperties()).whenNot(Map::isEmpty).to(configuration::jdbcProperties);
|
map.from(properties.getJdbcProperties()).whenNot(Map::isEmpty).to(configuration::jdbcProperties);
|
||||||
map.from(properties.getKerberosConfigFile()).to(configuration::kerberosConfigFile);
|
map.from(properties.getKerberosConfigFile()).to(configuration::kerberosConfigFile);
|
||||||
map.from(properties.getOracleKerberosCacheFile()).to(configuration::oracleKerberosCacheFile);
|
|
||||||
map.from(properties.getOutputQueryResults()).to(configuration::outputQueryResults);
|
map.from(properties.getOutputQueryResults()).to(configuration::outputQueryResults);
|
||||||
map.from(properties.getSqlServerKerberosLoginFile())
|
map.from(properties.getSqlServerKerberosLoginFile())
|
||||||
.whenNonNull()
|
.whenNonNull()
|
||||||
|
@ -0,0 +1,53 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2012-2023 the original author or authors.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* https://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.springframework.boot.autoconfigure.flyway;
|
||||||
|
|
||||||
|
import org.flywaydb.core.Flyway;
|
||||||
|
import org.flywaydb.core.api.Location;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
import org.springframework.boot.autoconfigure.AutoConfigurations;
|
||||||
|
import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
|
||||||
|
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
|
||||||
|
import org.springframework.boot.testsupport.classpath.ClassPathOverrides;
|
||||||
|
|
||||||
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Tests for {@link FlywayAutoConfiguration} with Flyway 9.20.
|
||||||
|
*
|
||||||
|
* @author Andy Wilkinson
|
||||||
|
*/
|
||||||
|
@ClassPathOverrides({ "org.flywaydb:flyway-core:9.20.0", "org.flywaydb:flyway-sqlserver:9.20.0",
|
||||||
|
"com.h2database:h2:2.1.210" })
|
||||||
|
class Flyway920AutoConfigurationTests {
|
||||||
|
|
||||||
|
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
|
||||||
|
.withConfiguration(AutoConfigurations.of(FlywayAutoConfiguration.class))
|
||||||
|
.withPropertyValues("spring.datasource.generate-unique-name=true");
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void defaultFlyway() {
|
||||||
|
this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class).run((context) -> {
|
||||||
|
assertThat(context).hasSingleBean(Flyway.class);
|
||||||
|
Flyway flyway = context.getBean(Flyway.class);
|
||||||
|
assertThat(flyway.getConfiguration().getLocations())
|
||||||
|
.containsExactly(new Location("classpath:db/migration"));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user