Merge branch '3.0.x' into 3.1.x

Closes gh-36786
spring-projects · Aug 8, 2023 · ed89272 · ed89272
2 parents f2fce3a + 34b2de3
commit ed89272
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/...ot/src/main/java/org/springframework/boot/sql/init/AbstractScriptDatabaseInitializer.java b/...ot/src/main/java/org/springframework/boot/sql/init/AbstractScriptDatabaseInitializer.java
@@ -122,7 +122,7 @@ private List<Resource> getScripts(List<String> locations, String type, ScriptLoc
 				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) {

diff --git a/...c/test/java/org/springframework/boot/sql/init/AbstractScriptDatabaseInitializerTests.java b/...c/test/java/org/springframework/boot/sql/init/AbstractScriptDatabaseInitializerTests.java
@@ -44,6 +44,16 @@ void whenDatabaseIsInitializedThenSchemaAndDataScriptsAreApplied() {
 		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();