Rename schema-oracle10g.sql to schema-oracle.sql

Resolves #spring-projects#1057
lcmarvin · Apr 16, 2022 · 5c645c2 · 5c645c2
1 parent 7aee981
commit 5c645c2
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 8 deletions.
diff --git a/spring-batch-core/src/main/resources/batch-oracle.properties b/spring-batch-core/src/main/resources/batch-oracle.properties
@@ -5,8 +5,8 @@ batch.jdbc.url=jdbc:oracle:thin:@oracle:1521:xe
 batch.jdbc.user=spring
 batch.jdbc.password=spring
 batch.database.incrementer.class=org.springframework.jdbc.support.incrementer.OracleSequenceMaxValueIncrementer
-batch.schema.script=classpath:/org/springframework/batch/core/schema-oracle10g.sql
-batch.drop.script=classpath:/org/springframework/batch/core/schema-drop-oracle10g.sql
+batch.schema.script=classpath:/org/springframework/batch/core/schema-oracle.sql
+batch.drop.script=classpath:/org/springframework/batch/core/schema-drop-oracle.sql
 batch.jdbc.testWhileIdle=false
 batch.jdbc.validationQuery=
 

diff --git a/...ore/migration/2.2/migration-oracle10g.sql → ...h/core/migration/2.2/migration-oracle.sql b/...ore/migration/2.2/migration-oracle10g.sql → ...h/core/migration/2.2/migration-oracle.sql
diff --git a/...ore/migration/4.1/migration-oracle10g.sql → ...h/core/migration/4.1/migration-oracle.sql b/...ore/migration/4.1/migration-oracle10g.sql → ...h/core/migration/4.1/migration-oracle.sql
diff --git a/...work/batch/core/schema-drop-oracle10g.sql → ...amework/batch/core/schema-drop-oracle.sql b/...work/batch/core/schema-drop-oracle10g.sql → ...amework/batch/core/schema-drop-oracle.sql
diff --git a/...framework/batch/core/schema-oracle10g.sql → ...ingframework/batch/core/schema-oracle.sql b/...framework/batch/core/schema-oracle10g.sql → ...ingframework/batch/core/schema-oracle.sql
diff --git a/...a/org/springframework/batch/core/test/repository/OracleJobRepositoryIntegrationTests.java b/...a/org/springframework/batch/core/test/repository/OracleJobRepositoryIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,7 +73,7 @@ public class OracleJobRepositoryIntegrationTests {
 	@Before
 	public void setUp() {
 		ResourceDatabasePopulator databasePopulator = new ResourceDatabasePopulator();
-		databasePopulator.addScript(new ClassPathResource("/org/springframework/batch/core/schema-oracle10g.sql"));
+		databasePopulator.addScript(new ClassPathResource("/org/springframework/batch/core/schema-oracle.sql"));
 		databasePopulator.execute(this.dataSource);
 	}
 

diff --git a/spring-batch-samples/src/main/resources/batch-oracle.properties b/spring-batch-samples/src/main/resources/batch-oracle.properties
@@ -6,9 +6,9 @@ batch.jdbc.user=spring
 batch.jdbc.password=spring
 batch.jdbc.testWhileIdle=false
 batch.jdbc.validationQuery=
-batch.drop.script=classpath:/org/springframework/batch/core/schema-drop-oracle10g.sql
-batch.schema.script=classpath:/org/springframework/batch/core/schema-oracle10g.sql
-batch.business.schema.script=business-schema-oracle10g.sql
+batch.drop.script=classpath:/org/springframework/batch/core/schema-drop-oracle.sql
+batch.schema.script=classpath:/org/springframework/batch/core/schema-oracle.sql
+batch.business.schema.script=business-schema-oracle.sql
 batch.database.incrementer.class=org.springframework.jdbc.support.incrementer.OracleSequenceMaxValueIncrementer
 batch.database.incrementer.parent=sequenceIncrementerParent
 batch.lob.handler.class=org.springframework.jdbc.support.lob.OracleLobHandler

diff --git a/...n/resources/business-schema-oracle10g.sql → ...main/resources/business-schema-oracle.sql b/...n/resources/business-schema-oracle10g.sql → ...main/resources/business-schema-oracle.sql
diff --git a/...samples/src/main/sql/oracle10g.properties → ...ch-samples/src/main/sql/oracle.properties b/...samples/src/main/sql/oracle10g.properties → ...ch-samples/src/main/sql/oracle.properties
@@ -1,4 +1,4 @@
-platform=oracle10g
+platform=oracle
 # SQL language oddities
 BIGINT = NUMBER(38)
 IDENTITY =