From 4e247e7577623f4006e751a1118f8bb817e5bbec Mon Sep 17 00:00:00 2001 From: dsyer Date: Thu, 26 Jun 2008 06:20:20 +0000 Subject: [PATCH] RESOLVED - issue BATCH-576: The database schema for db2 is incorrect, the constraint name is too long --- spring-batch-core/src/main/resources/schema-db2.sql | 12 ++++++------ .../src/main/resources/schema-derby.sql | 12 ++++++------ .../src/main/resources/schema-hsqldb.sql | 12 ++++++------ .../src/main/resources/schema-mysql.sql | 12 ++++++------ .../src/main/resources/schema-oracle10g.sql | 12 ++++++------ .../src/main/resources/schema-postgresql.sql | 12 ++++++------ spring-batch-core/src/main/sql/init.sql.vpp | 12 ++++++------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/spring-batch-core/src/main/resources/schema-db2.sql b/spring-batch-core/src/main/resources/schema-db2.sql index 8e2378d72..9606b3d5a 100644 --- a/spring-batch-core/src/main/resources/schema-db2.sql +++ b/spring-batch-core/src/main/resources/schema-db2.sql @@ -11,14 +11,14 @@ DROP SEQUENCE BATCH_JOB_SEQ ; -- Autogenerated: do not edit this file CREATE TABLE BATCH_JOB_INSTANCE ( - JOB_INSTANCE_ID BIGINT PRIMARY KEY , + JOB_INSTANCE_ID BIGINT NOT NULL PRIMARY KEY , VERSION BIGINT, JOB_NAME VARCHAR(100) NOT NULL , JOB_KEY VARCHAR(2500) ) ; CREATE TABLE BATCH_JOB_EXECUTION ( - JOB_EXECUTION_ID BIGINT PRIMARY KEY , + JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY , VERSION BIGINT, JOB_INSTANCE_ID BIGINT NOT NULL, CREATE_TIME TIMESTAMP NOT NULL, @@ -28,7 +28,7 @@ CREATE TABLE BATCH_JOB_EXECUTION ( CONTINUABLE CHAR(1), EXIT_CODE VARCHAR(20), EXIT_MESSAGE VARCHAR(2500), - constraint JOB_INSTANCE_EXECUTION_FK foreign key (JOB_INSTANCE_ID) + constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID) references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID) ) ; @@ -40,12 +40,12 @@ CREATE TABLE BATCH_JOB_PARAMS ( DATE_VAL TIMESTAMP DEFAULT NULL, LONG_VAL BIGINT , DOUBLE_VAL DOUBLE PRECISION, - constraint JOB_INSTANCE_PARAMS_FK foreign key (JOB_INSTANCE_ID) + 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 BIGINT PRIMARY KEY , + STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY , VERSION BIGINT NOT NULL, STEP_NAME VARCHAR(100) NOT NULL, JOB_EXECUTION_ID BIGINT NOT NULL, @@ -60,7 +60,7 @@ CREATE TABLE BATCH_STEP_EXECUTION ( CONTINUABLE CHAR(1), EXIT_CODE VARCHAR(20), EXIT_MESSAGE VARCHAR(2500), - constraint JOB_EXECUTION_STEP_FK foreign key (JOB_EXECUTION_ID) + constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID) references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) ) ; diff --git a/spring-batch-core/src/main/resources/schema-derby.sql b/spring-batch-core/src/main/resources/schema-derby.sql index d7ca77d72..38582425a 100644 --- a/spring-batch-core/src/main/resources/schema-derby.sql +++ b/spring-batch-core/src/main/resources/schema-derby.sql @@ -11,14 +11,14 @@ DROP TABLE BATCH_JOB_SEQ ; -- Autogenerated: do not edit this file CREATE TABLE BATCH_JOB_INSTANCE ( - JOB_INSTANCE_ID BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, + JOB_INSTANCE_ID BIGINT NOT NULL PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, VERSION BIGINT, JOB_NAME VARCHAR(100) NOT NULL , JOB_KEY VARCHAR(2500) ) ; CREATE TABLE BATCH_JOB_EXECUTION ( - JOB_EXECUTION_ID BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, + JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, VERSION BIGINT, JOB_INSTANCE_ID BIGINT NOT NULL, CREATE_TIME TIMESTAMP NOT NULL, @@ -28,7 +28,7 @@ CREATE TABLE BATCH_JOB_EXECUTION ( CONTINUABLE CHAR(1), EXIT_CODE VARCHAR(20), EXIT_MESSAGE VARCHAR(2500), - constraint JOB_INSTANCE_EXECUTION_FK foreign key (JOB_INSTANCE_ID) + constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID) references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID) ) ; @@ -40,12 +40,12 @@ CREATE TABLE BATCH_JOB_PARAMS ( DATE_VAL TIMESTAMP DEFAULT NULL, LONG_VAL BIGINT , DOUBLE_VAL DOUBLE PRECISION, - constraint JOB_INSTANCE_PARAMS_FK foreign key (JOB_INSTANCE_ID) + 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 BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, + STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, VERSION BIGINT NOT NULL, STEP_NAME VARCHAR(100) NOT NULL, JOB_EXECUTION_ID BIGINT NOT NULL, @@ -60,7 +60,7 @@ CREATE TABLE BATCH_STEP_EXECUTION ( CONTINUABLE CHAR(1), EXIT_CODE VARCHAR(20), EXIT_MESSAGE VARCHAR(2500), - constraint JOB_EXECUTION_STEP_FK foreign key (JOB_EXECUTION_ID) + constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID) references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) ) ; diff --git a/spring-batch-core/src/main/resources/schema-hsqldb.sql b/spring-batch-core/src/main/resources/schema-hsqldb.sql index 3183770b4..56d9265e7 100644 --- a/spring-batch-core/src/main/resources/schema-hsqldb.sql +++ b/spring-batch-core/src/main/resources/schema-hsqldb.sql @@ -11,14 +11,14 @@ DROP TABLE BATCH_JOB_SEQ IF EXISTS; -- Autogenerated: do not edit this file CREATE TABLE BATCH_JOB_INSTANCE ( - JOB_INSTANCE_ID BIGINT IDENTITY PRIMARY KEY , + JOB_INSTANCE_ID BIGINT IDENTITY NOT NULL PRIMARY KEY , VERSION BIGINT, JOB_NAME VARCHAR(100) NOT NULL , JOB_KEY VARCHAR(2500) ) ; CREATE TABLE BATCH_JOB_EXECUTION ( - JOB_EXECUTION_ID BIGINT IDENTITY PRIMARY KEY , + JOB_EXECUTION_ID BIGINT IDENTITY NOT NULL PRIMARY KEY , VERSION BIGINT, JOB_INSTANCE_ID BIGINT NOT NULL, CREATE_TIME TIMESTAMP NOT NULL, @@ -28,7 +28,7 @@ CREATE TABLE BATCH_JOB_EXECUTION ( CONTINUABLE CHAR(1), EXIT_CODE VARCHAR(20), EXIT_MESSAGE VARCHAR(2500), - constraint JOB_INSTANCE_EXECUTION_FK foreign key (JOB_INSTANCE_ID) + constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID) references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID) ) ; @@ -40,12 +40,12 @@ CREATE TABLE BATCH_JOB_PARAMS ( DATE_VAL TIMESTAMP DEFAULT NULL, LONG_VAL BIGINT , DOUBLE_VAL DOUBLE PRECISION, - constraint JOB_INSTANCE_PARAMS_FK foreign key (JOB_INSTANCE_ID) + 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 BIGINT IDENTITY PRIMARY KEY , + STEP_EXECUTION_ID BIGINT IDENTITY NOT NULL PRIMARY KEY , VERSION BIGINT NOT NULL, STEP_NAME VARCHAR(100) NOT NULL, JOB_EXECUTION_ID BIGINT NOT NULL, @@ -60,7 +60,7 @@ CREATE TABLE BATCH_STEP_EXECUTION ( CONTINUABLE CHAR(1), EXIT_CODE VARCHAR(20), EXIT_MESSAGE VARCHAR(2500), - constraint JOB_EXECUTION_STEP_FK foreign key (JOB_EXECUTION_ID) + constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID) references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) ) ; diff --git a/spring-batch-core/src/main/resources/schema-mysql.sql b/spring-batch-core/src/main/resources/schema-mysql.sql index 00dd797c4..ca90523d2 100644 --- a/spring-batch-core/src/main/resources/schema-mysql.sql +++ b/spring-batch-core/src/main/resources/schema-mysql.sql @@ -11,14 +11,14 @@ DROP TABLE IF EXISTS BATCH_JOB_SEQ ; -- Autogenerated: do not edit this file CREATE TABLE BATCH_JOB_INSTANCE ( - JOB_INSTANCE_ID BIGINT PRIMARY KEY , + JOB_INSTANCE_ID BIGINT NOT NULL PRIMARY KEY , VERSION BIGINT, JOB_NAME VARCHAR(100) NOT NULL , JOB_KEY VARCHAR(2500) ) type=InnoDB; CREATE TABLE BATCH_JOB_EXECUTION ( - JOB_EXECUTION_ID BIGINT PRIMARY KEY , + JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY , VERSION BIGINT, JOB_INSTANCE_ID BIGINT NOT NULL, CREATE_TIME DATETIME NOT NULL, @@ -28,7 +28,7 @@ CREATE TABLE BATCH_JOB_EXECUTION ( CONTINUABLE CHAR(1), EXIT_CODE VARCHAR(20), EXIT_MESSAGE VARCHAR(2500), - constraint JOB_INSTANCE_EXECUTION_FK foreign key (JOB_INSTANCE_ID) + constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID) references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID) ) type=InnoDB; @@ -40,12 +40,12 @@ CREATE TABLE BATCH_JOB_PARAMS ( DATE_VAL DATETIME DEFAULT NULL, LONG_VAL BIGINT , DOUBLE_VAL DOUBLE PRECISION, - constraint JOB_INSTANCE_PARAMS_FK foreign key (JOB_INSTANCE_ID) + constraint JOB_INST_PARAMS_FK foreign key (JOB_INSTANCE_ID) references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID) ) type=InnoDB; CREATE TABLE BATCH_STEP_EXECUTION ( - STEP_EXECUTION_ID BIGINT PRIMARY KEY , + STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY , VERSION BIGINT NOT NULL, STEP_NAME VARCHAR(100) NOT NULL, JOB_EXECUTION_ID BIGINT NOT NULL, @@ -60,7 +60,7 @@ CREATE TABLE BATCH_STEP_EXECUTION ( CONTINUABLE CHAR(1), EXIT_CODE VARCHAR(20), EXIT_MESSAGE VARCHAR(2500), - constraint JOB_EXECUTION_STEP_FK foreign key (JOB_EXECUTION_ID) + constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID) references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) ) type=InnoDB; diff --git a/spring-batch-core/src/main/resources/schema-oracle10g.sql b/spring-batch-core/src/main/resources/schema-oracle10g.sql index cee2edb6a..3a8d0441e 100644 --- a/spring-batch-core/src/main/resources/schema-oracle10g.sql +++ b/spring-batch-core/src/main/resources/schema-oracle10g.sql @@ -11,14 +11,14 @@ DROP SEQUENCE BATCH_JOB_SEQ ; -- Autogenerated: do not edit this file CREATE TABLE BATCH_JOB_INSTANCE ( - JOB_INSTANCE_ID NUMBER(38) PRIMARY KEY , + JOB_INSTANCE_ID NUMBER(38) NOT NULL PRIMARY KEY , VERSION NUMBER(38), JOB_NAME VARCHAR2(100) NOT NULL , JOB_KEY VARCHAR2(2500) ) ; CREATE TABLE BATCH_JOB_EXECUTION ( - JOB_EXECUTION_ID NUMBER(38) PRIMARY KEY , + JOB_EXECUTION_ID NUMBER(38) NOT NULL PRIMARY KEY , VERSION NUMBER(38), JOB_INSTANCE_ID NUMBER(38) NOT NULL, CREATE_TIME TIMESTAMP NOT NULL, @@ -28,7 +28,7 @@ CREATE TABLE BATCH_JOB_EXECUTION ( CONTINUABLE CHAR(1), EXIT_CODE VARCHAR2(20), EXIT_MESSAGE VARCHAR2(2500), - constraint JOB_INSTANCE_EXECUTION_FK foreign key (JOB_INSTANCE_ID) + constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID) references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID) ) ; @@ -40,12 +40,12 @@ CREATE TABLE BATCH_JOB_PARAMS ( DATE_VAL TIMESTAMP DEFAULT NULL, LONG_VAL NUMBER(38) , DOUBLE_VAL NUMBER, - constraint JOB_INSTANCE_PARAMS_FK foreign key (JOB_INSTANCE_ID) + 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) PRIMARY KEY , + STEP_EXECUTION_ID NUMBER(38) NOT NULL PRIMARY KEY , VERSION NUMBER(38) NOT NULL, STEP_NAME VARCHAR2(100) NOT NULL, JOB_EXECUTION_ID NUMBER(38) NOT NULL, @@ -60,7 +60,7 @@ CREATE TABLE BATCH_STEP_EXECUTION ( CONTINUABLE CHAR(1), EXIT_CODE VARCHAR2(20), EXIT_MESSAGE VARCHAR2(2500), - constraint JOB_EXECUTION_STEP_FK foreign key (JOB_EXECUTION_ID) + constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID) references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) ) ; diff --git a/spring-batch-core/src/main/resources/schema-postgresql.sql b/spring-batch-core/src/main/resources/schema-postgresql.sql index 4eb94b2e4..4c3b5f8f0 100644 --- a/spring-batch-core/src/main/resources/schema-postgresql.sql +++ b/spring-batch-core/src/main/resources/schema-postgresql.sql @@ -11,14 +11,14 @@ DROP SEQUENCE BATCH_JOB_SEQ ; -- Autogenerated: do not edit this file CREATE TABLE BATCH_JOB_INSTANCE ( - JOB_INSTANCE_ID BIGINT PRIMARY KEY , + JOB_INSTANCE_ID BIGINT NOT NULL PRIMARY KEY , VERSION BIGINT, JOB_NAME VARCHAR(100) NOT NULL , JOB_KEY VARCHAR(2500) ) ; CREATE TABLE BATCH_JOB_EXECUTION ( - JOB_EXECUTION_ID BIGINT PRIMARY KEY , + JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY , VERSION BIGINT, JOB_INSTANCE_ID BIGINT NOT NULL, CREATE_TIME TIMESTAMP NOT NULL, @@ -28,7 +28,7 @@ CREATE TABLE BATCH_JOB_EXECUTION ( CONTINUABLE CHAR(1), EXIT_CODE VARCHAR(20), EXIT_MESSAGE VARCHAR(2500), - constraint JOB_INSTANCE_EXECUTION_FK foreign key (JOB_INSTANCE_ID) + constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID) references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID) ) ; @@ -40,12 +40,12 @@ CREATE TABLE BATCH_JOB_PARAMS ( DATE_VAL TIMESTAMP DEFAULT NULL, LONG_VAL BIGINT , DOUBLE_VAL DOUBLE PRECISION, - constraint JOB_INSTANCE_PARAMS_FK foreign key (JOB_INSTANCE_ID) + 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 BIGINT PRIMARY KEY , + STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY , VERSION BIGINT NOT NULL, STEP_NAME VARCHAR(100) NOT NULL, JOB_EXECUTION_ID BIGINT NOT NULL, @@ -60,7 +60,7 @@ CREATE TABLE BATCH_STEP_EXECUTION ( CONTINUABLE CHAR(1), EXIT_CODE VARCHAR(20), EXIT_MESSAGE VARCHAR(2500), - constraint JOB_EXECUTION_STEP_FK foreign key (JOB_EXECUTION_ID) + constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID) references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) ) ; diff --git a/spring-batch-core/src/main/sql/init.sql.vpp b/spring-batch-core/src/main/sql/init.sql.vpp index 9ed60a596..4d175cd7e 100644 --- a/spring-batch-core/src/main/sql/init.sql.vpp +++ b/spring-batch-core/src/main/sql/init.sql.vpp @@ -1,13 +1,13 @@ -- Autogenerated: do not edit this file CREATE TABLE BATCH_JOB_INSTANCE ( - JOB_INSTANCE_ID ${BIGINT} $!{IDENTITY} PRIMARY KEY $!{GENERATED}, + JOB_INSTANCE_ID ${BIGINT} $!{IDENTITY} NOT NULL PRIMARY KEY $!{GENERATED}, VERSION ${BIGINT}, JOB_NAME ${VARCHAR}(100) NOT NULL , JOB_KEY ${VARCHAR}(2500) ) $!{VOODOO}; CREATE TABLE BATCH_JOB_EXECUTION ( - JOB_EXECUTION_ID ${BIGINT} $!{IDENTITY} PRIMARY KEY $!{GENERATED}, + JOB_EXECUTION_ID ${BIGINT} $!{IDENTITY} NOT NULL PRIMARY KEY $!{GENERATED}, VERSION ${BIGINT}, JOB_INSTANCE_ID ${BIGINT} NOT NULL, CREATE_TIME ${TIMESTAMP} NOT NULL, @@ -17,7 +17,7 @@ CREATE TABLE BATCH_JOB_EXECUTION ( CONTINUABLE CHAR(1), EXIT_CODE ${VARCHAR}(20), EXIT_MESSAGE ${VARCHAR}(2500), - constraint JOB_INSTANCE_EXECUTION_FK foreign key (JOB_INSTANCE_ID) + constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID) references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID) ) $!{VOODOO}; @@ -29,12 +29,12 @@ CREATE TABLE BATCH_JOB_PARAMS ( DATE_VAL ${TIMESTAMP} DEFAULT NULL, LONG_VAL ${BIGINT} , DOUBLE_VAL ${DOUBLE}, - constraint JOB_INSTANCE_PARAMS_FK foreign key (JOB_INSTANCE_ID) + constraint JOB_INST_PARAMS_FK foreign key (JOB_INSTANCE_ID) references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID) ) $!{VOODOO}; CREATE TABLE BATCH_STEP_EXECUTION ( - STEP_EXECUTION_ID ${BIGINT} $!{IDENTITY} PRIMARY KEY $!{GENERATED}, + STEP_EXECUTION_ID ${BIGINT} $!{IDENTITY} NOT NULL PRIMARY KEY $!{GENERATED}, VERSION ${BIGINT} NOT NULL, STEP_NAME ${VARCHAR}(100) NOT NULL, JOB_EXECUTION_ID ${BIGINT} NOT NULL, @@ -49,7 +49,7 @@ CREATE TABLE BATCH_STEP_EXECUTION ( CONTINUABLE CHAR(1), EXIT_CODE ${VARCHAR}(20), EXIT_MESSAGE ${VARCHAR}(2500), - constraint JOB_EXECUTION_STEP_FK foreign key (JOB_EXECUTION_ID) + constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID) references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) ) $!{VOODOO};