Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish "Fix @FlywayDataSource with multiple data sources"

Browse Source 
See gh-20617
This commit is contained in:
Stephane Nicoll
2020-03-23 14:34:54 +01:00
parent 2410d6bbd1
commit 8f265f8d57
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2020 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.

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

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2020 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.
@@ -523,19 +523,19 @@ class FlywayAutoConfigurationTests {
static class FlywayMultipleDataSourcesConfiguration {
@Bean
DataSource mainDataSource() {
return DataSourceBuilder.create().url("jdbc:hsqldb:mem:main").username("sa").build();
DataSource firstDataSource() {
return DataSourceBuilder.create().url("jdbc:hsqldb:mem:first").username("sa").build();
}
@Bean
DataSource secondlyDataSource() {
return DataSourceBuilder.create().url("jdbc:hsqldb:mem:secondly").username("sa").build();
DataSource secondDataSource() {
return DataSourceBuilder.create().url("jdbc:hsqldb:mem:second").username("sa").build();
}
@FlywayDataSource
@Bean
DataSource flywayDataSource(DataSource mainDataSource) {
return mainDataSource;
DataSource flywayDataSource() {
return DataSourceBuilder.create().url("jdbc:hsqldb:mem:flywaytest").username("sa").build();
}
}