Skip to content

Commit e74e928

Browse files
committed
Rename BATCH_JOB_SEQ to BATCH_JOB_INSTANCE_SEQ
Resolves #4977
1 parent 8ffad1b commit e74e928

31 files changed

+46
-40
lines changed

spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/JobRepositoryFactoryBean.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,8 @@ public void afterPropertiesSet() throws Exception {
269269
protected JobInstanceDao createJobInstanceDao() throws Exception {
270270
JdbcJobInstanceDao dao = new JdbcJobInstanceDao();
271271
dao.setJdbcTemplate(jdbcOperations);
272-
dao.setJobInstanceIncrementer(incrementerFactory.getIncrementer(databaseType, tablePrefix + "JOB_SEQ"));
272+
dao.setJobInstanceIncrementer(
273+
incrementerFactory.getIncrementer(databaseType, tablePrefix + "JOB_INSTANCE_SEQ"));
273274
dao.setJobKeyGenerator(jobKeyGenerator);
274275
dao.setTablePrefix(tablePrefix);
275276
dao.afterPropertiesSet();

spring-batch-core/src/main/resources/org/springframework/batch/core/schema-db2.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,4 @@ CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
7575

7676
CREATE SEQUENCE BATCH_STEP_EXECUTION_SEQ AS BIGINT MAXVALUE 9223372036854775807 NO CYCLE;
7777
CREATE SEQUENCE BATCH_JOB_EXECUTION_SEQ AS BIGINT MAXVALUE 9223372036854775807 NO CYCLE;
78-
CREATE SEQUENCE BATCH_JOB_SEQ AS BIGINT MAXVALUE 9223372036854775807 NO CYCLE;
78+
CREATE SEQUENCE BATCH_JOB_INSTANCE_SEQ AS BIGINT MAXVALUE 9223372036854775807 NO CYCLE;

spring-batch-core/src/main/resources/org/springframework/batch/core/schema-derby.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,4 @@ CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
7575

7676
CREATE TABLE BATCH_STEP_EXECUTION_SEQ (ID BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, DUMMY VARCHAR(1));
7777
CREATE TABLE BATCH_JOB_EXECUTION_SEQ (ID BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, DUMMY VARCHAR(1));
78-
CREATE TABLE BATCH_JOB_SEQ (ID BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, DUMMY VARCHAR(1));
78+
CREATE TABLE BATCH_JOB_INSTANCE_SEQ (ID BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, DUMMY VARCHAR(1));

spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-db2.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ DROP TABLE BATCH_JOB_INSTANCE;
99

1010
DROP SEQUENCE BATCH_STEP_EXECUTION_SEQ;
1111
DROP SEQUENCE BATCH_JOB_EXECUTION_SEQ;
12-
DROP SEQUENCE BATCH_JOB_SEQ;
12+
DROP SEQUENCE BATCH_JOB_INSTANCE_SEQ;

spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-derby.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ DROP TABLE BATCH_JOB_INSTANCE;
99

1010
DROP TABLE BATCH_STEP_EXECUTION_SEQ;
1111
DROP TABLE BATCH_JOB_EXECUTION_SEQ;
12-
DROP TABLE BATCH_JOB_SEQ;
12+
DROP TABLE BATCH_JOB_INSTANCE_SEQ;

spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-h2.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ DROP TABLE BATCH_JOB_INSTANCE IF EXISTS;
99

1010
DROP SEQUENCE BATCH_STEP_EXECUTION_SEQ IF EXISTS;
1111
DROP SEQUENCE BATCH_JOB_EXECUTION_SEQ IF EXISTS;
12-
DROP SEQUENCE BATCH_JOB_SEQ IF EXISTS;
12+
DROP SEQUENCE BATCH_JOB_INSTANCE_SEQ IF EXISTS;

spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-hana.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ DROP TABLE BATCH_JOB_INSTANCE ;
88

99
DROP SEQUENCE BATCH_STEP_EXECUTION_SEQ ;
1010
DROP SEQUENCE BATCH_JOB_EXECUTION_SEQ ;
11-
DROP SEQUENCE BATCH_JOB_SEQ ;
11+
DROP SEQUENCE BATCH_JOB_INSTANCE_SEQ ;

spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-hsqldb.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ DROP TABLE BATCH_JOB_INSTANCE IF EXISTS;
99

1010
DROP TABLE BATCH_STEP_EXECUTION_SEQ IF EXISTS;
1111
DROP TABLE BATCH_JOB_EXECUTION_SEQ IF EXISTS;
12-
DROP TABLE BATCH_JOB_SEQ IF EXISTS;
12+
DROP TABLE BATCH_JOB_INSTANCE_SEQ IF EXISTS;

spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-mariadb.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ DROP TABLE IF EXISTS BATCH_JOB_INSTANCE;
77

88
DROP SEQUENCE IF EXISTS BATCH_STEP_EXECUTION_SEQ;
99
DROP SEQUENCE IF EXISTS BATCH_JOB_EXECUTION_SEQ;
10-
DROP SEQUENCE IF EXISTS BATCH_JOB_SEQ;
10+
DROP SEQUENCE IF EXISTS BATCH_JOB_INSTANCE_SEQ;

spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-mysql.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ DROP TABLE IF EXISTS BATCH_JOB_INSTANCE;
99

1010
DROP TABLE IF EXISTS BATCH_STEP_EXECUTION_SEQ;
1111
DROP TABLE IF EXISTS BATCH_JOB_EXECUTION_SEQ;
12-
DROP TABLE IF EXISTS BATCH_JOB_SEQ;
12+
DROP TABLE IF EXISTS BATCH_JOB_INSTANCE_SEQ;

0 commit comments

Comments
 (0)