From d2549044b869b3ac3cbc397339640e0c537bbbb8 Mon Sep 17 00:00:00 2001 From: Michael Minella Date: Tue, 19 Feb 2013 09:11:59 -0600 Subject: [PATCH] BATCH-1960: Removed cascades and updated .vpp files --- .../batch/core/schema-drop-postgresql.sql | 12 ++++++------ spring-batch-core/src/main/sql/schema.sql.vpp | 9 +++++---- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-postgresql.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-postgresql.sql index 3be649d76..96de64fa4 100644 --- a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-postgresql.sql +++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-postgresql.sql @@ -6,12 +6,12 @@ ALTER TABLE BATCH_STEP_EXECUTION DROP CONSTRAINT IF EXISTS JOB_EXEC_STEP_FK; ALTER TABLE BATCH_STEP_EXECUTION_CONTEXT DROP CONSTRAINT IF EXISTS STEP_EXEC_CTX_FK; ALTER TABLE BATCH_JOB_EXECUTION_CONTEXT DROP CONSTRAINT IF EXISTS JOB_EXEC_CTX_FK; -DROP TABLE IF EXISTS BATCH_STEP_EXECUTION_CONTEXT CASCADE; -DROP TABLE IF EXISTS BATCH_JOB_EXECUTION_CONTEXT CASCADE; -DROP TABLE IF EXISTS BATCH_STEP_EXECUTION CASCADE; -DROP TABLE IF EXISTS BATCH_JOB_EXECUTION_PARAMS CASCADE; -DROP TABLE IF EXISTS BATCH_JOB_EXECUTION CASCADE; -DROP TABLE IF EXISTS BATCH_JOB_INSTANCE CASCADE; +DROP TABLE IF EXISTS BATCH_STEP_EXECUTION_CONTEXT; +DROP TABLE IF EXISTS BATCH_JOB_EXECUTION_CONTEXT; +DROP TABLE IF EXISTS BATCH_STEP_EXECUTION; +DROP TABLE IF EXISTS BATCH_JOB_EXECUTION_PARAMS; +DROP TABLE IF EXISTS BATCH_JOB_EXECUTION; +DROP TABLE IF EXISTS BATCH_JOB_INSTANCE; DROP SEQUENCE IF EXISTS BATCH_STEP_EXECUTION_SEQ ; DROP SEQUENCE IF EXISTS BATCH_JOB_EXECUTION_SEQ ; diff --git a/spring-batch-core/src/main/sql/schema.sql.vpp b/spring-batch-core/src/main/sql/schema.sql.vpp index 223daa836..fd7a0bd92 100644 --- a/spring-batch-core/src/main/sql/schema.sql.vpp +++ b/spring-batch-core/src/main/sql/schema.sql.vpp @@ -23,16 +23,17 @@ CREATE TABLE BATCH_JOB_EXECUTION ( references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID) ) $!{VOODOO}; -CREATE TABLE BATCH_JOB_PARAMS ( - JOB_INSTANCE_ID ${BIGINT} NOT NULL , +CREATE TABLE BATCH_JOB_EXECUTION_PARAMS ( + JOB_EXECUTION_ID ${BIGINT} NOT NULL , TYPE_CD ${VARCHAR}(6) NOT NULL , KEY_NAME ${VARCHAR}(100) NOT NULL , STRING_VAL ${VARCHAR}(250) $!{NULL}, DATE_VAL ${TIMESTAMP} DEFAULT NULL $!{NULL}, LONG_VAL ${BIGINT} $!{NULL}, DOUBLE_VAL ${DOUBLE} $!{NULL}, - constraint JOB_INST_PARAMS_FK foreign key (JOB_INSTANCE_ID) - references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID) + IDENTIFYING ${CHAR}(1) NOT NULL , + constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID) + references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) ) $!{VOODOO}; CREATE TABLE BATCH_STEP_EXECUTION (