Skip to content

Commit 5c645c2

Browse files
fmbenhassinelcmarvin
authored andcommitted
Rename schema-oracle10g.sql to schema-oracle.sql
Resolves #spring-projects#1057
1 parent 7aee981 commit 5c645c2

File tree

9 files changed

+8
-8
lines changed

9 files changed

+8
-8
lines changed

spring-batch-core/src/main/resources/batch-oracle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ batch.jdbc.url=jdbc:oracle:thin:@oracle:1521:xe
55
batch.jdbc.user=spring
66
batch.jdbc.password=spring
77
batch.database.incrementer.class=org.springframework.jdbc.support.incrementer.OracleSequenceMaxValueIncrementer
8-
batch.schema.script=classpath:/org/springframework/batch/core/schema-oracle10g.sql
9-
batch.drop.script=classpath:/org/springframework/batch/core/schema-drop-oracle10g.sql
8+
batch.schema.script=classpath:/org/springframework/batch/core/schema-oracle.sql
9+
batch.drop.script=classpath:/org/springframework/batch/core/schema-drop-oracle.sql
1010
batch.jdbc.testWhileIdle=false
1111
batch.jdbc.validationQuery=
1212

spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/OracleJobRepositoryIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020-2021 the original author or authors.
2+
* Copyright 2020-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -73,7 +73,7 @@ public class OracleJobRepositoryIntegrationTests {
7373
@Before
7474
public void setUp() {
7575
ResourceDatabasePopulator databasePopulator = new ResourceDatabasePopulator();
76-
databasePopulator.addScript(new ClassPathResource("/org/springframework/batch/core/schema-oracle10g.sql"));
76+
databasePopulator.addScript(new ClassPathResource("/org/springframework/batch/core/schema-oracle.sql"));
7777
databasePopulator.execute(this.dataSource);
7878
}
7979

spring-batch-samples/src/main/resources/batch-oracle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ batch.jdbc.user=spring
66
batch.jdbc.password=spring
77
batch.jdbc.testWhileIdle=false
88
batch.jdbc.validationQuery=
9-
batch.drop.script=classpath:/org/springframework/batch/core/schema-drop-oracle10g.sql
10-
batch.schema.script=classpath:/org/springframework/batch/core/schema-oracle10g.sql
11-
batch.business.schema.script=business-schema-oracle10g.sql
9+
batch.drop.script=classpath:/org/springframework/batch/core/schema-drop-oracle.sql
10+
batch.schema.script=classpath:/org/springframework/batch/core/schema-oracle.sql
11+
batch.business.schema.script=business-schema-oracle.sql
1212
batch.database.incrementer.class=org.springframework.jdbc.support.incrementer.OracleSequenceMaxValueIncrementer
1313
batch.database.incrementer.parent=sequenceIncrementerParent
1414
batch.lob.handler.class=org.springframework.jdbc.support.lob.OracleLobHandler

spring-batch-samples/src/main/sql/oracle10g.properties renamed to spring-batch-samples/src/main/sql/oracle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
platform=oracle10g
1+
platform=oracle
22
# SQL language oddities
33
BIGINT = NUMBER(38)
44
IDENTITY =

0 commit comments

Comments
 (0)