Skip to content

Commit fb16907

Browse files
committed
Fix resolution Batch's Oracle schema location
Closes gh-30564
1 parent 60e389e commit fb16907

File tree

2 files changed

+0
-3
lines changed

2 files changed

+0
-3
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchDataSourceScriptDatabaseInitializer.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ public static DatabaseInitializationSettings getSettings(DataSource dataSource,
7878

7979
private static List<String> resolveSchemaLocations(DataSource dataSource, BatchProperties.Jdbc properties) {
8080
PlatformPlaceholderDatabaseDriverResolver platformResolver = new PlatformPlaceholderDatabaseDriverResolver();
81-
platformResolver = platformResolver.withDriverPlatform(DatabaseDriver.ORACLE, "oracle10g");
8281
platformResolver = platformResolver.withDriverPlatform(DatabaseDriver.MARIADB, "mysql");
8382
if (StringUtils.hasText(properties.getPlatform())) {
8483
return platformResolver.resolveAll(properties.getPlatform(), properties.getSchema());

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchDataSourceScriptDatabaseInitializerTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626

2727
import javax.sql.DataSource;
2828

29-
import org.junit.Assume;
3029
import org.junit.jupiter.api.Test;
3130
import org.junit.jupiter.params.ParameterizedTest;
3231
import org.junit.jupiter.params.provider.EnumSource;
@@ -66,7 +65,6 @@ void getSettingsWithPlatformDoesNotTouchDataSource() {
6665
@EnumSource(value = DatabaseDriver.class, mode = Mode.EXCLUDE,
6766
names = { "FIREBIRD", "INFORMIX", "JTDS", "PHOENIX", "REDSHIFT", "TERADATA", "TESTCONTAINERS", "UNKNOWN" })
6867
void batchSchemaCanBeLocated(DatabaseDriver driver) throws IOException, SQLException {
69-
Assume.assumeFalse("gh-30564", driver == DatabaseDriver.ORACLE);
7068
DefaultResourceLoader resourceLoader = new DefaultResourceLoader();
7169
BatchProperties properties = new BatchProperties();
7270
DataSource dataSource = mock(DataSource.class);

0 commit comments

Comments
 (0)