From 9a37dbe03e028ea19796b871eb7ff45fe35fba00 Mon Sep 17 00:00:00 2001 From: dsyer Date: Wed, 6 Aug 2008 18:20:37 +0000 Subject: [PATCH] Incomplete - task 107: ExecutionContext re-factor Create CLOB and BLOB columns and foreign keys ready for JSON --- spring-batch-core/src/main/sql/db2.properties | 1 + spring-batch-core/src/main/sql/derby.properties | 1 + spring-batch-core/src/main/sql/hsqldb.properties | 1 + spring-batch-core/src/main/sql/mysql.properties | 1 + .../src/main/sql/oracle10g.properties | 1 + .../src/main/sql/postgresql.properties | 1 + .../src/main/sql/sqlserver.properties | 1 + spring-batch-core/src/main/sql/sybase.properties | 1 + .../src/main/sql/tables-context.sql.vpp | 13 +++---------- spring-batch-core/src/main/sql/tables-main.sql.vpp | 14 +++++++++++--- spring-batch-infrastructure/.project | 1 - 11 files changed, 22 insertions(+), 14 deletions(-) diff --git a/spring-batch-core/src/main/sql/db2.properties b/spring-batch-core/src/main/sql/db2.properties index 5c58989a7..4e659c301 100644 --- a/spring-batch-core/src/main/sql/db2.properties +++ b/spring-batch-core/src/main/sql/db2.properties @@ -4,6 +4,7 @@ BIGINT = BIGINT IDENTITY = DOUBLE = DOUBLE PRECISION BLOB = BLOB +CLOB = CLOB TIMESTAMP = TIMESTAMP VARCHAR = VARCHAR # for generating drop statements... diff --git a/spring-batch-core/src/main/sql/derby.properties b/spring-batch-core/src/main/sql/derby.properties index 0c98e78fa..714a1d172 100644 --- a/spring-batch-core/src/main/sql/derby.properties +++ b/spring-batch-core/src/main/sql/derby.properties @@ -5,6 +5,7 @@ IDENTITY = GENERATED = GENERATED BY DEFAULT AS IDENTITY DOUBLE = DOUBLE PRECISION BLOB = BLOB +CLOB = CLOB TIMESTAMP = TIMESTAMP VARCHAR = VARCHAR # for generating drop statements... diff --git a/spring-batch-core/src/main/sql/hsqldb.properties b/spring-batch-core/src/main/sql/hsqldb.properties index 220cd60e8..e5ff67c12 100644 --- a/spring-batch-core/src/main/sql/hsqldb.properties +++ b/spring-batch-core/src/main/sql/hsqldb.properties @@ -5,6 +5,7 @@ IDENTITY = IDENTITY IFEXISTS = IF EXISTS DOUBLE = DOUBLE PRECISION BLOB = LONGVARBINARY +CLOB = CLOB TIMESTAMP = TIMESTAMP VARCHAR = VARCHAR # for generating drop statements... diff --git a/spring-batch-core/src/main/sql/mysql.properties b/spring-batch-core/src/main/sql/mysql.properties index 5007b0ba9..baad0f9d5 100644 --- a/spring-batch-core/src/main/sql/mysql.properties +++ b/spring-batch-core/src/main/sql/mysql.properties @@ -7,6 +7,7 @@ VOODOO = type=InnoDB IFEXISTSBEFORE = IF EXISTS DOUBLE = DOUBLE PRECISION BLOB = BLOB +CLOB = CLOB TIMESTAMP = DATETIME VARCHAR = VARCHAR # for generating drop statements... diff --git a/spring-batch-core/src/main/sql/oracle10g.properties b/spring-batch-core/src/main/sql/oracle10g.properties index 0f3d18973..ae4f19112 100644 --- a/spring-batch-core/src/main/sql/oracle10g.properties +++ b/spring-batch-core/src/main/sql/oracle10g.properties @@ -5,6 +5,7 @@ IDENTITY = GENERATED = DOUBLE = NUMBER BLOB = BLOB +CLOB = CLOB TIMESTAMP = TIMESTAMP VARCHAR = VARCHAR2 # for generating drop statements... diff --git a/spring-batch-core/src/main/sql/postgresql.properties b/spring-batch-core/src/main/sql/postgresql.properties index 68b7bddc1..a30b1fa29 100644 --- a/spring-batch-core/src/main/sql/postgresql.properties +++ b/spring-batch-core/src/main/sql/postgresql.properties @@ -5,6 +5,7 @@ IDENTITY = GENERATED = DOUBLE = DOUBLE PRECISION BLOB = BYTEA +CLOB = BYTEA TIMESTAMP = TIMESTAMP VARCHAR = VARCHAR # for generating drop statements... diff --git a/spring-batch-core/src/main/sql/sqlserver.properties b/spring-batch-core/src/main/sql/sqlserver.properties index 9ab4484cb..60b6aa24e 100644 --- a/spring-batch-core/src/main/sql/sqlserver.properties +++ b/spring-batch-core/src/main/sql/sqlserver.properties @@ -4,6 +4,7 @@ IDENTITY = GENERATED = DOUBLE = DOUBLE PRECISION BLOB = IMAGE +CLOB = TEXT TIMESTAMP = DATETIME VARCHAR = VARCHAR # for generating drop statements... diff --git a/spring-batch-core/src/main/sql/sybase.properties b/spring-batch-core/src/main/sql/sybase.properties index 35d7c8d06..78adc66a1 100644 --- a/spring-batch-core/src/main/sql/sybase.properties +++ b/spring-batch-core/src/main/sql/sybase.properties @@ -4,6 +4,7 @@ IDENTITY = GENERATED = DOUBLE = DOUBLE PRECISION BLOB = IMAGE +CLOB = TEXT TIMESTAMP = DATETIME VARCHAR = VARCHAR NULL = NULL diff --git a/spring-batch-core/src/main/sql/tables-context.sql.vpp b/spring-batch-core/src/main/sql/tables-context.sql.vpp index f588b355f..ace34ea4b 100644 --- a/spring-batch-core/src/main/sql/tables-context.sql.vpp +++ b/spring-batch-core/src/main/sql/tables-context.sql.vpp @@ -1,11 +1,4 @@ -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 ${TIMESTAMP} DEFAULT NULL, - LONG_VAL ${BIGINT} $!{NULL}, - DOUBLE_VAL ${DOUBLE} $!{NULL}, - OBJECT_VAL ${BLOB} $!{NULL} +CREATE TABLE BATCH_MAP_STORE ( + MAP_STORE_ID ${BIGINT} $!{IDENTITY} NOT NULL PRIMARY KEY $!{GENERATED}, + OBJECT_VAL ${BLOB} NOT NULL ) $!{VOODOO}; diff --git a/spring-batch-core/src/main/sql/tables-main.sql.vpp b/spring-batch-core/src/main/sql/tables-main.sql.vpp index b54c5eeac..1868de2a5 100644 --- a/spring-batch-core/src/main/sql/tables-main.sql.vpp +++ b/spring-batch-core/src/main/sql/tables-main.sql.vpp @@ -7,7 +7,7 @@ CREATE TABLE BATCH_JOB_INSTANCE ( CREATE TABLE BATCH_JOB_EXECUTION ( JOB_EXECUTION_ID ${BIGINT} $!{IDENTITY} NOT NULL PRIMARY KEY $!{GENERATED}, - VERSION ${BIGINT} $!{NULL}, + VERSION ${BIGINT} $!{NULL}, JOB_INSTANCE_ID ${BIGINT} NOT NULL, CREATE_TIME ${TIMESTAMP} NOT NULL, START_TIME ${TIMESTAMP} DEFAULT NULL $!{NULL}, @@ -16,8 +16,12 @@ CREATE TABLE BATCH_JOB_EXECUTION ( CONTINUABLE CHAR(1) $!{NULL}, EXIT_CODE ${VARCHAR}(20) $!{NULL}, EXIT_MESSAGE ${VARCHAR}(2500) $!{NULL}, + EXECUTION_CONTEXT ${CLOB} $!{NULL}, + MAP_STORE_ID ${BIGINT} $!{NULL}, constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID) - references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID) + references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID), + constraint MAP_JOB_EXEC_FK foreign key (MAP_STORE_ID) + references BATCH_MAP_STORE(MAP_STORE_ID) ) $!{VOODOO}; CREATE TABLE BATCH_JOB_PARAMS ( @@ -48,6 +52,10 @@ CREATE TABLE BATCH_STEP_EXECUTION ( CONTINUABLE CHAR(1) $!{NULL}, EXIT_CODE ${VARCHAR}(20) $!{NULL}, EXIT_MESSAGE ${VARCHAR}(2500) $!{NULL}, + EXECUTION_CONTEXT ${CLOB} $!{NULL}, + MAP_STORE_ID ${BIGINT} $!{NULL}, constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID) - references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) + references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID), + constraint MAP_STEP_EXEC_FK foreign key (MAP_STORE_ID) + references BATCH_MAP_STORE(MAP_STORE_ID) ) $!{VOODOO}; diff --git a/spring-batch-infrastructure/.project b/spring-batch-infrastructure/.project index 57493d4b9..079c0065c 100644 --- a/spring-batch-infrastructure/.project +++ b/spring-batch-infrastructure/.project @@ -27,7 +27,6 @@ - com.springsource.platform.ide.facet.core.bundlenature org.springframework.ide.eclipse.core.springnature org.eclipse.jdt.core.javanature org.devzuz.q.maven.jdt.core.mavenNature