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

Fix resolution Batch's Oracle schema location 

Closes gh-30564
This commit is contained in:
Andy Wilkinson 2022-04-25 19:38:37 +01:00
parent 60e389ea38
commit fb16907c0e
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,7 +78,6 @@ public class BatchDataSourceScriptDatabaseInitializer extends DataSourceScriptDa
private static List<String> resolveSchemaLocations(DataSource dataSource, BatchProperties.Jdbc properties) { private static List<String> resolveSchemaLocations(DataSource dataSource, BatchProperties.Jdbc properties) {
PlatformPlaceholderDatabaseDriverResolver platformResolver = new PlatformPlaceholderDatabaseDriverResolver(); PlatformPlaceholderDatabaseDriverResolver platformResolver = new PlatformPlaceholderDatabaseDriverResolver();
platformResolver = platformResolver.withDriverPlatform(DatabaseDriver.ORACLE, "oracle10g");
platformResolver = platformResolver.withDriverPlatform(DatabaseDriver.MARIADB, "mysql"); platformResolver = platformResolver.withDriverPlatform(DatabaseDriver.MARIADB, "mysql");
if (StringUtils.hasText(properties.getPlatform())) { if (StringUtils.hasText(properties.getPlatform())) {
return platformResolver.resolveAll(properties.getPlatform(), properties.getSchema()); return platformResolver.resolveAll(properties.getPlatform(), properties.getSchema());

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

@ -26,7 +26,6 @@ import java.util.stream.Stream;
import javax.sql.DataSource; import javax.sql.DataSource;
import org.junit.Assume;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource; import org.junit.jupiter.params.provider.EnumSource;
@ -66,7 +65,6 @@ class BatchDataSourceScriptDatabaseInitializerTests {
@EnumSource(value = DatabaseDriver.class, mode = Mode.EXCLUDE, @EnumSource(value = DatabaseDriver.class, mode = Mode.EXCLUDE,
names = { "FIREBIRD", "INFORMIX", "JTDS", "PHOENIX", "REDSHIFT", "TERADATA", "TESTCONTAINERS", "UNKNOWN" }) names = { "FIREBIRD", "INFORMIX", "JTDS", "PHOENIX", "REDSHIFT", "TERADATA", "TESTCONTAINERS", "UNKNOWN" })
void batchSchemaCanBeLocated(DatabaseDriver driver) throws IOException, SQLException { void batchSchemaCanBeLocated(DatabaseDriver driver) throws IOException, SQLException {
Assume.assumeFalse("gh-30564", driver == DatabaseDriver.ORACLE);
DefaultResourceLoader resourceLoader = new DefaultResourceLoader(); DefaultResourceLoader resourceLoader = new DefaultResourceLoader();
BatchProperties properties = new BatchProperties(); BatchProperties properties = new BatchProperties();
DataSource dataSource = mock(DataSource.class); DataSource dataSource = mock(DataSource.class);