From fb16907c0ea4323d7bc021db31f41bbb7eeef616 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 25 Apr 2022 19:38:37 +0100 Subject: [PATCH] Fix resolution Batch's Oracle schema location Closes gh-30564 --- .../batch/BatchDataSourceScriptDatabaseInitializer.java | 1 - .../batch/BatchDataSourceScriptDatabaseInitializerTests.java | 2 -- 2 files changed, 3 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchDataSourceScriptDatabaseInitializer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchDataSourceScriptDatabaseInitializer.java index 8e10b3c663a..c4608710f64 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchDataSourceScriptDatabaseInitializer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchDataSourceScriptDatabaseInitializer.java @@ -78,7 +78,6 @@ public class BatchDataSourceScriptDatabaseInitializer extends DataSourceScriptDa private static List resolveSchemaLocations(DataSource dataSource, BatchProperties.Jdbc properties) { PlatformPlaceholderDatabaseDriverResolver platformResolver = new PlatformPlaceholderDatabaseDriverResolver(); - platformResolver = platformResolver.withDriverPlatform(DatabaseDriver.ORACLE, "oracle10g"); platformResolver = platformResolver.withDriverPlatform(DatabaseDriver.MARIADB, "mysql"); if (StringUtils.hasText(properties.getPlatform())) { return platformResolver.resolveAll(properties.getPlatform(), properties.getSchema()); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchDataSourceScriptDatabaseInitializerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchDataSourceScriptDatabaseInitializerTests.java index e3201ec8aa4..89ac66dcb0b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchDataSourceScriptDatabaseInitializerTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchDataSourceScriptDatabaseInitializerTests.java @@ -26,7 +26,6 @@ import java.util.stream.Stream; import javax.sql.DataSource; -import org.junit.Assume; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; @@ -66,7 +65,6 @@ class BatchDataSourceScriptDatabaseInitializerTests { @EnumSource(value = DatabaseDriver.class, mode = Mode.EXCLUDE, names = { "FIREBIRD", "INFORMIX", "JTDS", "PHOENIX", "REDSHIFT", "TERADATA", "TESTCONTAINERS", "UNKNOWN" }) void batchSchemaCanBeLocated(DatabaseDriver driver) throws IOException, SQLException { - Assume.assumeFalse("gh-30564", driver == DatabaseDriver.ORACLE); DefaultResourceLoader resourceLoader = new DefaultResourceLoader(); BatchProperties properties = new BatchProperties(); DataSource dataSource = mock(DataSource.class);