From 9798bfefe1101c00a3cde590a635dfc72db1964a Mon Sep 17 00:00:00 2001 From: lucasward Date: Tue, 26 Aug 2008 04:06:37 +0000 Subject: [PATCH] BATCH-453:Missed reverting the execution context template as well. --- spring-batch-core/src/main/resources/schema-db2.sql | 13 ++++++++++--- .../src/main/resources/schema-derby.sql | 13 ++++++++++--- .../src/main/resources/schema-hsqldb.sql | 13 ++++++++++--- .../src/main/resources/schema-mysql.sql | 13 ++++++++++--- .../src/main/resources/schema-oracle10g.sql | 13 ++++++++++--- .../src/main/resources/schema-postgresql.sql | 13 ++++++++++--- .../src/main/resources/schema-sqlserver.sql | 13 ++++++++++--- .../src/main/resources/schema-sybase.sql | 13 ++++++++++--- 8 files changed, 80 insertions(+), 24 deletions(-) diff --git a/spring-batch-core/src/main/resources/schema-db2.sql b/spring-batch-core/src/main/resources/schema-db2.sql index 0f76107f0..63fd47f1f 100644 --- a/spring-batch-core/src/main/resources/schema-db2.sql +++ b/spring-batch-core/src/main/resources/schema-db2.sql @@ -66,9 +66,16 @@ CREATE TABLE BATCH_STEP_EXECUTION ( references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) ) ; -CREATE TABLE BATCH_MAP_STORE ( - MAP_STORE_ID BIGINT NOT NULL PRIMARY KEY , - OBJECT_VAL BLOB NOT NULL +CREATE TABLE BATCH_EXECUTION_CONTEXT ( + EXECUTION_ID BIGINT NOT NULL, + DISCRIMINATOR VARCHAR(1) NOT NULL, + TYPE_CD VARCHAR(6) NOT NULL, + KEY_NAME VARCHAR(1000) NOT NULL, + STRING_VAL VARCHAR(1000) , + DATE_VAL TIMESTAMP DEFAULT NULL, + LONG_VAL BIGINT , + DOUBLE_VAL DOUBLE PRECISION , + OBJECT_VAL BLOB ) ; CREATE SEQUENCE BATCH_STEP_EXECUTION_SEQ; diff --git a/spring-batch-core/src/main/resources/schema-derby.sql b/spring-batch-core/src/main/resources/schema-derby.sql index cfad8e92d..749409b40 100644 --- a/spring-batch-core/src/main/resources/schema-derby.sql +++ b/spring-batch-core/src/main/resources/schema-derby.sql @@ -66,9 +66,16 @@ CREATE TABLE BATCH_STEP_EXECUTION ( references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) ) ; -CREATE TABLE BATCH_MAP_STORE ( - MAP_STORE_ID BIGINT NOT NULL PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, - OBJECT_VAL BLOB NOT NULL +CREATE TABLE BATCH_EXECUTION_CONTEXT ( + EXECUTION_ID BIGINT NOT NULL, + DISCRIMINATOR VARCHAR(1) NOT NULL, + TYPE_CD VARCHAR(6) NOT NULL, + KEY_NAME VARCHAR(1000) NOT NULL, + STRING_VAL VARCHAR(1000) , + DATE_VAL TIMESTAMP DEFAULT NULL, + LONG_VAL BIGINT , + DOUBLE_VAL DOUBLE PRECISION , + OBJECT_VAL BLOB ) ; CREATE TABLE BATCH_STEP_EXECUTION_SEQ (ID BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, DUMMY VARCHAR(1)); diff --git a/spring-batch-core/src/main/resources/schema-hsqldb.sql b/spring-batch-core/src/main/resources/schema-hsqldb.sql index efd24e6da..ffc43f726 100644 --- a/spring-batch-core/src/main/resources/schema-hsqldb.sql +++ b/spring-batch-core/src/main/resources/schema-hsqldb.sql @@ -66,9 +66,16 @@ CREATE TABLE BATCH_STEP_EXECUTION ( references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) ) ; -CREATE TABLE BATCH_MAP_STORE ( - MAP_STORE_ID BIGINT IDENTITY NOT NULL PRIMARY KEY , - OBJECT_VAL LONGVARBINARY NOT NULL +CREATE TABLE BATCH_EXECUTION_CONTEXT ( + EXECUTION_ID BIGINT NOT NULL, + DISCRIMINATOR VARCHAR(1) NOT NULL, + TYPE_CD VARCHAR(6) NOT NULL, + KEY_NAME VARCHAR(1000) NOT NULL, + STRING_VAL VARCHAR(1000) , + DATE_VAL TIMESTAMP DEFAULT NULL, + LONG_VAL BIGINT , + DOUBLE_VAL DOUBLE PRECISION , + OBJECT_VAL LONGVARBINARY ) ; CREATE TABLE BATCH_STEP_EXECUTION_SEQ ( diff --git a/spring-batch-core/src/main/resources/schema-mysql.sql b/spring-batch-core/src/main/resources/schema-mysql.sql index 52978da88..14bd39af2 100644 --- a/spring-batch-core/src/main/resources/schema-mysql.sql +++ b/spring-batch-core/src/main/resources/schema-mysql.sql @@ -66,9 +66,16 @@ CREATE TABLE BATCH_STEP_EXECUTION ( references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) ) type=InnoDB; -CREATE TABLE BATCH_MAP_STORE ( - MAP_STORE_ID BIGINT NOT NULL PRIMARY KEY , - OBJECT_VAL BLOB NOT NULL +CREATE TABLE BATCH_EXECUTION_CONTEXT ( + EXECUTION_ID BIGINT NOT NULL, + DISCRIMINATOR VARCHAR(1) NOT NULL, + TYPE_CD VARCHAR(6) NOT NULL, + KEY_NAME VARCHAR(1000) NOT NULL, + STRING_VAL VARCHAR(1000) , + DATE_VAL DATETIME DEFAULT NULL, + LONG_VAL BIGINT , + DOUBLE_VAL DOUBLE PRECISION , + OBJECT_VAL BLOB ) type=InnoDB; CREATE TABLE BATCH_STEP_EXECUTION_SEQ (ID BIGINT NOT NULL) type=MYISAM; diff --git a/spring-batch-core/src/main/resources/schema-oracle10g.sql b/spring-batch-core/src/main/resources/schema-oracle10g.sql index ec6382fde..d81864ac0 100644 --- a/spring-batch-core/src/main/resources/schema-oracle10g.sql +++ b/spring-batch-core/src/main/resources/schema-oracle10g.sql @@ -66,9 +66,16 @@ CREATE TABLE BATCH_STEP_EXECUTION ( references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) ) ; -CREATE TABLE BATCH_MAP_STORE ( - MAP_STORE_ID NUMBER(38) NOT NULL PRIMARY KEY , - OBJECT_VAL BLOB NOT NULL +CREATE TABLE BATCH_EXECUTION_CONTEXT ( + EXECUTION_ID NUMBER(38) NOT NULL, + DISCRIMINATOR VARCHAR2(1) NOT NULL, + TYPE_CD VARCHAR2(6) NOT NULL, + KEY_NAME VARCHAR2(1000) NOT NULL, + STRING_VAL VARCHAR2(1000) , + DATE_VAL TIMESTAMP DEFAULT NULL, + LONG_VAL NUMBER(38) , + DOUBLE_VAL NUMBER , + OBJECT_VAL BLOB ) ; CREATE SEQUENCE BATCH_STEP_EXECUTION_SEQ; diff --git a/spring-batch-core/src/main/resources/schema-postgresql.sql b/spring-batch-core/src/main/resources/schema-postgresql.sql index fda2d4340..1bc2d6d0e 100644 --- a/spring-batch-core/src/main/resources/schema-postgresql.sql +++ b/spring-batch-core/src/main/resources/schema-postgresql.sql @@ -66,9 +66,16 @@ CREATE TABLE BATCH_STEP_EXECUTION ( references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) ) ; -CREATE TABLE BATCH_MAP_STORE ( - MAP_STORE_ID BIGINT NOT NULL PRIMARY KEY , - OBJECT_VAL BYTEA NOT NULL +CREATE TABLE BATCH_EXECUTION_CONTEXT ( + EXECUTION_ID BIGINT NOT NULL, + DISCRIMINATOR VARCHAR(1) NOT NULL, + TYPE_CD VARCHAR(6) NOT NULL, + KEY_NAME VARCHAR(1000) NOT NULL, + STRING_VAL VARCHAR(1000) , + DATE_VAL TIMESTAMP DEFAULT NULL, + LONG_VAL BIGINT , + DOUBLE_VAL DOUBLE PRECISION , + OBJECT_VAL BYTEA ) ; CREATE SEQUENCE BATCH_STEP_EXECUTION_SEQ; diff --git a/spring-batch-core/src/main/resources/schema-sqlserver.sql b/spring-batch-core/src/main/resources/schema-sqlserver.sql index cdcaa6ded..c993d55c1 100644 --- a/spring-batch-core/src/main/resources/schema-sqlserver.sql +++ b/spring-batch-core/src/main/resources/schema-sqlserver.sql @@ -66,9 +66,16 @@ CREATE TABLE BATCH_STEP_EXECUTION ( references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) ) ; -CREATE TABLE BATCH_MAP_STORE ( - MAP_STORE_ID BIGINT NOT NULL PRIMARY KEY , - OBJECT_VAL IMAGE NOT NULL +CREATE TABLE BATCH_EXECUTION_CONTEXT ( + EXECUTION_ID BIGINT NOT NULL, + DISCRIMINATOR VARCHAR(1) NOT NULL, + TYPE_CD VARCHAR(6) NOT NULL, + KEY_NAME VARCHAR(1000) NOT NULL, + STRING_VAL VARCHAR(1000) , + DATE_VAL DATETIME DEFAULT NULL, + LONG_VAL BIGINT , + DOUBLE_VAL DOUBLE PRECISION , + OBJECT_VAL IMAGE ) ; CREATE TABLE BATCH_STEP_EXECUTION_SEQ (ID BIGINT IDENTITY); diff --git a/spring-batch-core/src/main/resources/schema-sybase.sql b/spring-batch-core/src/main/resources/schema-sybase.sql index bde800973..8b4cf69be 100644 --- a/spring-batch-core/src/main/resources/schema-sybase.sql +++ b/spring-batch-core/src/main/resources/schema-sybase.sql @@ -66,9 +66,16 @@ CREATE TABLE BATCH_STEP_EXECUTION ( references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) ) ; -CREATE TABLE BATCH_MAP_STORE ( - MAP_STORE_ID BIGINT NOT NULL PRIMARY KEY , - OBJECT_VAL IMAGE NOT NULL +CREATE TABLE BATCH_EXECUTION_CONTEXT ( + EXECUTION_ID BIGINT NOT NULL, + DISCRIMINATOR VARCHAR(1) NOT NULL, + TYPE_CD VARCHAR(6) NOT NULL, + KEY_NAME VARCHAR(1000) NOT NULL, + STRING_VAL VARCHAR(1000) NULL, + DATE_VAL DATETIME DEFAULT NULL, + LONG_VAL BIGINT NULL, + DOUBLE_VAL DOUBLE PRECISION NULL, + OBJECT_VAL IMAGE NULL ) ; CREATE TABLE BATCH_STEP_EXECUTION_SEQ (ID BIGINT IDENTITY);