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

Merge branch '2.7.x' into 3.0.x

Browse Source 
Closes gh-36785
This commit is contained in:
Andy Wilkinson
2023-08-08 11:28:59 +01:00
parent a91f1f0387 35d3cdbe74
commit 34b2de3095
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/AbstractScriptDatabaseInitializer.java
View File

@@ -122,7 +122,7 @@ public abstract class AbstractScriptDatabaseInitializer implements ResourceLoade
location = location.substring(OPTIONAL_LOCATION_PREFIX.length());
}
for (Resource resource : doGetResources(location, locationResolver)) {
if (resource.exists()) {
if (resource.isReadable()) {
resources.add(resource);
}
else if (!optional) {

10
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/sql/init/AbstractScriptDatabaseInitializerTests.java
View File

@@ -44,6 +44,16 @@ public abstract class AbstractScriptDatabaseInitializerTests<T extends AbstractS
assertThat(numberOfEmbeddedRows("SELECT COUNT(*) FROM EXAMPLE")).isOne();
}
@Test
void whenDatabaseIsInitializedWithDirectoryLocationsThenFailureIsHelpful() {
DatabaseInitializationSettings settings = new DatabaseInitializationSettings();
settings.setSchemaLocations(Arrays.asList("/org/springframework/boot/sql/init"));
settings.setDataLocations(Arrays.asList("/org/springframework/boot/sql/init"));
T initializer = createEmbeddedDatabaseInitializer(settings);
assertThatIllegalStateException().isThrownBy(initializer::initializeDatabase)
.withMessage("No schema scripts found at location '/org/springframework/boot/sql/init'");
}
@Test
void whenContinueOnErrorIsFalseThenInitializationFailsOnError() {
DatabaseInitializationSettings settings = new DatabaseInitializationSettings();