Browse Source

Fix resolution Batch's Oracle schema location

Closes gh-30564
pull/30825/head
Andy Wilkinson 4 years ago
parent
commit
fb16907c0e
  1. 1
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchDataSourceScriptDatabaseInitializer.java
  2. 2
      spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchDataSourceScriptDatabaseInitializerTests.java

1
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 @@ -78,7 +78,6 @@ public class BatchDataSourceScriptDatabaseInitializer extends DataSourceScriptDa
private static List<String> 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());

2
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; @@ -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 { @@ -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);

Loading…
Cancel
Save