diff --git a/spring-batch-core/src/main/resources/schema-db2.sql b/spring-batch-core/src/main/resources/schema-db2.sql index e63f2c579..64ad48150 100644 --- a/spring-batch-core/src/main/resources/schema-db2.sql +++ b/spring-batch-core/src/main/resources/schema-db2.sql @@ -86,6 +86,6 @@ CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT ( references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) ) ; -CREATE SEQUENCE BATCH_STEP_EXECUTION_SEQ; -CREATE SEQUENCE BATCH_JOB_EXECUTION_SEQ; -CREATE SEQUENCE BATCH_JOB_SEQ; +CREATE SEQUENCE BATCH_STEP_EXECUTION_SEQ AS BIGINT MAXVALUE 9223372036854775807 NO CYCLE; +CREATE SEQUENCE BATCH_JOB_EXECUTION_SEQ AS BIGINT MAXVALUE 9223372036854775807 NO CYCLE; +CREATE SEQUENCE BATCH_JOB_SEQ AS BIGINT MAXVALUE 9223372036854775807 NO CYCLE; diff --git a/spring-batch-core/src/main/resources/schema-oracle10g.sql b/spring-batch-core/src/main/resources/schema-oracle10g.sql index 3984e2a7a..fa9ec76c1 100644 --- a/spring-batch-core/src/main/resources/schema-oracle10g.sql +++ b/spring-batch-core/src/main/resources/schema-oracle10g.sql @@ -12,16 +12,16 @@ DROP SEQUENCE BATCH_JOB_EXECUTION_SEQ ; DROP SEQUENCE BATCH_JOB_SEQ ; CREATE TABLE BATCH_JOB_INSTANCE ( - JOB_INSTANCE_ID NUMBER(38) NOT NULL PRIMARY KEY , - VERSION NUMBER(38) , + JOB_INSTANCE_ID NUMBER(19,0) NOT NULL PRIMARY KEY , + VERSION NUMBER(19,0) , JOB_NAME VARCHAR2(100) NOT NULL, JOB_KEY VARCHAR2(2500) ) ; CREATE TABLE BATCH_JOB_EXECUTION ( - JOB_EXECUTION_ID NUMBER(38) NOT NULL PRIMARY KEY , - VERSION NUMBER(38) , - JOB_INSTANCE_ID NUMBER(38) NOT NULL, + JOB_EXECUTION_ID NUMBER(19,0) NOT NULL PRIMARY KEY , + VERSION NUMBER(19,0) , + JOB_INSTANCE_ID NUMBER(19,0) NOT NULL, CREATE_TIME TIMESTAMP NOT NULL, START_TIME TIMESTAMP DEFAULT NULL , END_TIME TIMESTAMP DEFAULT NULL , @@ -35,33 +35,33 @@ CREATE TABLE BATCH_JOB_EXECUTION ( ) ; CREATE TABLE BATCH_JOB_PARAMS ( - JOB_INSTANCE_ID NUMBER(38) NOT NULL , + JOB_INSTANCE_ID NUMBER(19,0) NOT NULL , TYPE_CD VARCHAR2(6) NOT NULL , KEY_NAME VARCHAR2(100) NOT NULL , STRING_VAL VARCHAR2(250) , DATE_VAL TIMESTAMP DEFAULT NULL , - LONG_VAL NUMBER(38) , + LONG_VAL NUMBER(19,0) , DOUBLE_VAL NUMBER , constraint JOB_INST_PARAMS_FK foreign key (JOB_INSTANCE_ID) references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID) ) ; CREATE TABLE BATCH_STEP_EXECUTION ( - STEP_EXECUTION_ID NUMBER(38) NOT NULL PRIMARY KEY , - VERSION NUMBER(38) NOT NULL, + STEP_EXECUTION_ID NUMBER(19,0) NOT NULL PRIMARY KEY , + VERSION NUMBER(19,0) NOT NULL, STEP_NAME VARCHAR2(100) NOT NULL, - JOB_EXECUTION_ID NUMBER(38) NOT NULL, + JOB_EXECUTION_ID NUMBER(19,0) NOT NULL, START_TIME TIMESTAMP NOT NULL , END_TIME TIMESTAMP DEFAULT NULL , STATUS VARCHAR2(10) , - COMMIT_COUNT NUMBER(38) , - READ_COUNT NUMBER(38) , - FILTER_COUNT NUMBER(38) , - WRITE_COUNT NUMBER(38) , - READ_SKIP_COUNT NUMBER(38) , - WRITE_SKIP_COUNT NUMBER(38) , - PROCESS_SKIP_COUNT NUMBER(38) , - ROLLBACK_COUNT NUMBER(38) , + COMMIT_COUNT NUMBER(19,0) , + READ_COUNT NUMBER(19,0) , + FILTER_COUNT NUMBER(19,0) , + WRITE_COUNT NUMBER(19,0) , + READ_SKIP_COUNT NUMBER(19,0) , + WRITE_SKIP_COUNT NUMBER(19,0) , + PROCESS_SKIP_COUNT NUMBER(19,0) , + ROLLBACK_COUNT NUMBER(19,0) , CONTINUABLE CHAR(1) , EXIT_CODE VARCHAR2(20) , EXIT_MESSAGE VARCHAR2(2500) , @@ -71,7 +71,7 @@ CREATE TABLE BATCH_STEP_EXECUTION ( ) ; CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT ( - STEP_EXECUTION_ID NUMBER(38) NOT NULL PRIMARY KEY, + STEP_EXECUTION_ID NUMBER(19,0) NOT NULL PRIMARY KEY, SHORT_CONTEXT VARCHAR2(2500) NOT NULL, SERIALIZED_CONTEXT CLOB , constraint STEP_EXEC_CTX_FK foreign key (STEP_EXECUTION_ID) @@ -79,13 +79,13 @@ CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT ( ) ; CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT ( - JOB_EXECUTION_ID NUMBER(38) NOT NULL PRIMARY KEY, + JOB_EXECUTION_ID NUMBER(19,0) NOT NULL PRIMARY KEY, SHORT_CONTEXT VARCHAR2(2500) NOT NULL, SERIALIZED_CONTEXT CLOB , constraint JOB_EXEC_CTX_FK foreign key (JOB_EXECUTION_ID) references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) ) ; -CREATE SEQUENCE BATCH_STEP_EXECUTION_SEQ; -CREATE SEQUENCE BATCH_JOB_EXECUTION_SEQ; -CREATE SEQUENCE BATCH_JOB_SEQ; +CREATE SEQUENCE BATCH_STEP_EXECUTION_SEQ MAXVALUE 9223372036854775807 NOCYCLE; +CREATE SEQUENCE BATCH_JOB_EXECUTION_SEQ MAXVALUE 9223372036854775807 NOCYCLE; +CREATE SEQUENCE BATCH_JOB_SEQ MAXVALUE 9223372036854775807 NOCYCLE; diff --git a/spring-batch-core/src/main/resources/schema-postgresql.sql b/spring-batch-core/src/main/resources/schema-postgresql.sql index 7c2e0c689..6ea6824d1 100644 --- a/spring-batch-core/src/main/resources/schema-postgresql.sql +++ b/spring-batch-core/src/main/resources/schema-postgresql.sql @@ -86,6 +86,6 @@ CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT ( references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) ) ; -CREATE SEQUENCE BATCH_STEP_EXECUTION_SEQ; -CREATE SEQUENCE BATCH_JOB_EXECUTION_SEQ; -CREATE SEQUENCE BATCH_JOB_SEQ; +CREATE SEQUENCE BATCH_STEP_EXECUTION_SEQ MAXVALUE 9223372036854775807 NO CYCLE; +CREATE SEQUENCE BATCH_JOB_EXECUTION_SEQ MAXVALUE 9223372036854775807 NO CYCLE; +CREATE SEQUENCE BATCH_JOB_SEQ MAXVALUE 9223372036854775807 NO CYCLE; diff --git a/spring-batch-core/src/main/resources/schema-upgrade-oracle10g.sql b/spring-batch-core/src/main/resources/schema-upgrade-oracle10g.sql index 74fe96ad5..b736e9cab 100644 --- a/spring-batch-core/src/main/resources/schema-upgrade-oracle10g.sql +++ b/spring-batch-core/src/main/resources/schema-upgrade-oracle10g.sql @@ -3,7 +3,7 @@ -- Upgrades an existing 1.0 schema to version 1.1. CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT ( - STEP_EXECUTION_ID NUMBER(38) NOT NULL PRIMARY KEY, + STEP_EXECUTION_ID NUMBER(19,0) NOT NULL PRIMARY KEY, SHORT_CONTEXT VARCHAR2(2500) NOT NULL, SERIALIZED_CONTEXT CLOB , constraint STEP_EXEC_CTX_FK foreign key (STEP_EXECUTION_ID) @@ -11,7 +11,7 @@ CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT ( ) ; CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT ( - JOB_EXECUTION_ID NUMBER(38) NOT NULL PRIMARY KEY, + JOB_EXECUTION_ID NUMBER(19,0) NOT NULL PRIMARY KEY, SHORT_CONTEXT VARCHAR2(2500) NOT NULL, SERIALIZED_CONTEXT CLOB , constraint JOB_EXEC_CTX_FK foreign key (JOB_EXECUTION_ID) @@ -24,6 +24,6 @@ DROP TABLE BATCH_STEP_EXECUTION_CONTEXT; ALTER TABLE BATCH_JOB_EXECUTION ADD CREATE_TIME TIMESTAMP; UPDATE BATCH_JOB_EXECUTION SET CREATE_TIME = START_TIME; ALTER TABLE BATCH_JOB_EXECUTION MODIFY CREATE_TIME NOT NULL; -ALTER TABLE BATCH_STEP_EXECUTION ADD READ_SKIP_COUNT NUMBER(38); -ALTER TABLE BATCH_STEP_EXECUTION ADD WRITE_SKIP_COUNT NUMBER(38); -ALTER TABLE BATCH_STEP_EXECUTION ADD ROLLBACK_COUNT NUMBER(38); +ALTER TABLE BATCH_STEP_EXECUTION ADD READ_SKIP_COUNT NUMBER(19,0); +ALTER TABLE BATCH_STEP_EXECUTION ADD WRITE_SKIP_COUNT NUMBER(19,0); +ALTER TABLE BATCH_STEP_EXECUTION ADD ROLLBACK_COUNT NUMBER(19,0); diff --git a/spring-batch-core/src/main/sql/db2.vpp b/spring-batch-core/src/main/sql/db2.vpp index 4a1945336..131f81d1d 100644 --- a/spring-batch-core/src/main/sql/db2.vpp +++ b/spring-batch-core/src/main/sql/db2.vpp @@ -1,3 +1,3 @@ -#macro (sequence $name)CREATE SEQUENCE ${name}; +#macro (sequence $name)CREATE SEQUENCE ${name} AS BIGINT MAXVALUE 9223372036854775807 NO CYCLE; #end #macro (notnull $name $type)ALTER COLUMN ${name} SET NOT NULL#end diff --git a/spring-batch-core/src/main/sql/oracle10g.properties b/spring-batch-core/src/main/sql/oracle10g.properties index ae4f19112..64ffa268e 100644 --- a/spring-batch-core/src/main/sql/oracle10g.properties +++ b/spring-batch-core/src/main/sql/oracle10g.properties @@ -1,6 +1,6 @@ platform=oracle10g # SQL language oddities -BIGINT = NUMBER(38) +BIGINT = NUMBER(19\,0) IDENTITY = GENERATED = DOUBLE = NUMBER diff --git a/spring-batch-core/src/main/sql/oracle10g.vpp b/spring-batch-core/src/main/sql/oracle10g.vpp index 7596ff2c4..43fd38da0 100644 --- a/spring-batch-core/src/main/sql/oracle10g.vpp +++ b/spring-batch-core/src/main/sql/oracle10g.vpp @@ -1,3 +1,3 @@ -#macro (sequence $name)CREATE SEQUENCE ${name}; +#macro (sequence $name)CREATE SEQUENCE ${name} MAXVALUE 9223372036854775807 NOCYCLE; #end #macro (notnull $name $type)MODIFY ${name} NOT NULL#end diff --git a/spring-batch-core/src/main/sql/postgresql.vpp b/spring-batch-core/src/main/sql/postgresql.vpp index 4a1945336..22af0b8e4 100644 --- a/spring-batch-core/src/main/sql/postgresql.vpp +++ b/spring-batch-core/src/main/sql/postgresql.vpp @@ -1,3 +1,3 @@ -#macro (sequence $name)CREATE SEQUENCE ${name}; +#macro (sequence $name)CREATE SEQUENCE ${name} MAXVALUE 9223372036854775807 NO CYCLE; #end #macro (notnull $name $type)ALTER COLUMN ${name} SET NOT NULL#end