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

Fix Flyway filesystem prefix location check 

Co-authored-by: Andy Bell <andyrbell@gmail.com>

Closes gh-13863
This commit is contained in:
Stephane Nicoll 2018-07-24 10:31:53 +02:00
parent f1cf41f544
commit 7865233b16
3 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,13 +117,17 @@ public class FlywayAutoConfiguration {
private boolean hasAtLeastOneLocation() { private boolean hasAtLeastOneLocation() {
for (String location : this.properties.getLocations()) { for (String location : this.properties.getLocations()) {
if (this.resourceLoader.getResource(location).exists()) { if (this.resourceLoader.getResource(normalizePrefix(location)).exists()) {
return true; return true;
} }
} }
return false; return false;
} }
private String normalizePrefix(String location) {
return location.replace("filesystem:", "file:");
}
@Bean @Bean
@ConfigurationProperties(prefix = "flyway") @ConfigurationProperties(prefix = "flyway")
public Flyway flyway() { public Flyway flyway() {

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2017 the original author or authors. * Copyright 2012-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -153,7 +153,7 @@ public class FlywayAutoConfigurationTests {
@Test @Test
public void changeLogDoesNotExist() throws Exception { public void changeLogDoesNotExist() throws Exception {
EnvironmentTestUtils.addEnvironment(this.context, EnvironmentTestUtils.addEnvironment(this.context,
"flyway.locations:file:no-such-dir"); "flyway.locations:filesystem:no-such-dir");
this.thrown.expect(BeanCreationException.class); this.thrown.expect(BeanCreationException.class);
registerAndRefresh(EmbeddedDataSourceConfiguration.class, registerAndRefresh(EmbeddedDataSourceConfiguration.class,
FlywayAutoConfiguration.class, FlywayAutoConfiguration.class,
@ -192,6 +192,16 @@ public class FlywayAutoConfigurationTests {
PropertyPlaceholderAutoConfiguration.class); PropertyPlaceholderAutoConfiguration.class);
} }
@Test
public void checkLocationsAllExistWithImplicitFilesystemPrefix() {
EnvironmentTestUtils.addEnvironment(this.context,
"flyway.locations:filesystem:src/test/resources/db/migration",
"flyway.check-location:true");
registerAndRefresh(EmbeddedDataSourceConfiguration.class,
FlywayAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class);
}
@Test @Test
public void customFlywayMigrationStrategy() throws Exception { public void customFlywayMigrationStrategy() throws Exception {
registerAndRefresh(EmbeddedDataSourceConfiguration.class, registerAndRefresh(EmbeddedDataSourceConfiguration.class,

14
spring-boot-docs/src/main/asciidoc/howto.adoc
View File

@ -2246,8 +2246,18 @@ To automatically run Flyway database migrations on startup, add the
The migrations are scripts in the form `V<VERSION>__<NAME>.sql` (with `<VERSION>` an The migrations are scripts in the form `V<VERSION>__<NAME>.sql` (with `<VERSION>` an
underscore-separated version, e.g. '`1`' or '`2_1`'). By default they live in a folder underscore-separated version, e.g. '`1`' or '`2_1`'). By default they live in a folder
`classpath:db/migration` but you can modify that using `flyway.locations`. You can also `classpath:db/migration` but you can modify that using `flyway.locations`. This is a
add a special `{vendor}` placeholder to use vendor-specific scripts. Assume the following: comma-separated list of one or more `classpath:` or `filesystem:` locations. For example,
the following configuration would search for scripts in both the default classpath
location and the `/opt/migration` directory:
[source,properties,indent=0]
----
spring.flyway.locations=classpath:db/migration,filesystem:/opt/migration
----
You can also add a special `{vendor}` placeholder to use vendor-specific scripts. Assume
the following:
[source,properties,indent=0] [source,properties,indent=0]
---- ----