From 4a38a4a218d41500f0fb2a937befa6ab1cb15340 Mon Sep 17 00:00:00 2001 From: robokaso Date: Tue, 19 Feb 2008 16:42:36 +0000 Subject: [PATCH] IN PROGRESS - issue BATCH-366: Do we still need StepInstance? http://jira.springframework.org/browse/BATCH-366 removed remaining STEP_INSTANCE-related entries from schema --- spring-batch-execution/src/main/resources/schema-db2.sql | 3 --- spring-batch-execution/src/main/resources/schema-derby.sql | 3 --- spring-batch-execution/src/main/resources/schema-hsqldb.sql | 5 ----- spring-batch-execution/src/main/resources/schema-mysql.sql | 4 ---- .../src/main/resources/schema-oracle10g.sql | 3 --- .../src/main/resources/schema-postgresql.sql | 3 --- spring-batch-execution/src/main/sql/destroy.sql.vpp | 2 -- spring-batch-execution/src/main/sql/init.sql.vpp | 1 - .../batch/execution/repository/dao/destroy.sql | 2 -- .../springframework/batch/execution/repository/dao/init.sql | 3 --- 10 files changed, 29 deletions(-) diff --git a/spring-batch-execution/src/main/resources/schema-db2.sql b/spring-batch-execution/src/main/resources/schema-db2.sql index 818472a2f..dae12dd84 100644 --- a/spring-batch-execution/src/main/resources/schema-db2.sql +++ b/spring-batch-execution/src/main/resources/schema-db2.sql @@ -1,13 +1,11 @@ -- Autogenerated: do not edit this file DROP TABLE BATCH_STEP_EXECUTION ; DROP TABLE BATCH_JOB_EXECUTION ; -DROP TABLE BATCH_STEP_INSTANCE ; DROP TABLE BATCH_JOB_INSTANCE ; DROP TABLE BATCH_JOB_PARAMS ; DROP TABLE BATCH_STEP_EXECUTION_CONTEXT ; DROP SEQUENCE BATCH_STEP_EXECUTION_SEQ ; -DROP SEQUENCE BATCH_STEP_SEQ ; DROP SEQUENCE BATCH_JOB_EXECUTION_SEQ ; DROP SEQUENCE BATCH_JOB_SEQ ; @@ -63,6 +61,5 @@ CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT ( OBJECT_VAL BLOB); CREATE SEQUENCE BATCH_STEP_EXECUTION_SEQ; -CREATE SEQUENCE BATCH_STEP_SEQ; CREATE SEQUENCE BATCH_JOB_EXECUTION_SEQ; CREATE SEQUENCE BATCH_JOB_SEQ; diff --git a/spring-batch-execution/src/main/resources/schema-derby.sql b/spring-batch-execution/src/main/resources/schema-derby.sql index 112ca19f9..cfbc1e887 100644 --- a/spring-batch-execution/src/main/resources/schema-derby.sql +++ b/spring-batch-execution/src/main/resources/schema-derby.sql @@ -1,13 +1,11 @@ -- Autogenerated: do not edit this file DROP TABLE BATCH_STEP_EXECUTION ; DROP TABLE BATCH_JOB_EXECUTION ; -DROP TABLE BATCH_STEP_INSTANCE ; DROP TABLE BATCH_JOB_INSTANCE ; DROP TABLE BATCH_JOB_PARAMS ; DROP TABLE BATCH_STEP_EXECUTION_CONTEXT ; DROP TABLE BATCH_STEP_EXECUTION_SEQ ; -DROP TABLE BATCH_STEP_SEQ ; DROP TABLE BATCH_JOB_EXECUTION_SEQ ; DROP TABLE BATCH_JOB_SEQ ; @@ -63,6 +61,5 @@ CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT ( OBJECT_VAL BLOB); CREATE TABLE BATCH_STEP_EXECUTION_SEQ (ID BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, DUMMY VARCHAR(1)); -CREATE TABLE BATCH_STEP_SEQ (ID BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, DUMMY VARCHAR(1)); CREATE TABLE BATCH_JOB_EXECUTION_SEQ (ID BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, DUMMY VARCHAR(1)); CREATE TABLE BATCH_JOB_SEQ (ID BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, DUMMY VARCHAR(1)); diff --git a/spring-batch-execution/src/main/resources/schema-hsqldb.sql b/spring-batch-execution/src/main/resources/schema-hsqldb.sql index 92f44eea1..c42ed8ab8 100644 --- a/spring-batch-execution/src/main/resources/schema-hsqldb.sql +++ b/spring-batch-execution/src/main/resources/schema-hsqldb.sql @@ -1,13 +1,11 @@ -- Autogenerated: do not edit this file DROP TABLE BATCH_STEP_EXECUTION IF EXISTS; DROP TABLE BATCH_JOB_EXECUTION IF EXISTS; -DROP TABLE BATCH_STEP_INSTANCE IF EXISTS; DROP TABLE BATCH_JOB_INSTANCE IF EXISTS; DROP TABLE BATCH_JOB_PARAMS IF EXISTS; DROP TABLE BATCH_STEP_EXECUTION_CONTEXT IF EXISTS; DROP TABLE BATCH_STEP_EXECUTION_SEQ IF EXISTS; -DROP TABLE BATCH_STEP_SEQ IF EXISTS; DROP TABLE BATCH_JOB_EXECUTION_SEQ IF EXISTS; DROP TABLE BATCH_JOB_SEQ IF EXISTS; @@ -65,9 +63,6 @@ CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT ( CREATE TABLE BATCH_STEP_EXECUTION_SEQ ( ID BIGINT IDENTITY ); -CREATE TABLE BATCH_STEP_SEQ ( - ID BIGINT IDENTITY -); CREATE TABLE BATCH_JOB_EXECUTION_SEQ ( ID BIGINT IDENTITY ); diff --git a/spring-batch-execution/src/main/resources/schema-mysql.sql b/spring-batch-execution/src/main/resources/schema-mysql.sql index 6a0811561..56ef8fda9 100644 --- a/spring-batch-execution/src/main/resources/schema-mysql.sql +++ b/spring-batch-execution/src/main/resources/schema-mysql.sql @@ -1,13 +1,11 @@ -- Autogenerated: do not edit this file DROP TABLE IF EXISTS BATCH_STEP_EXECUTION ; DROP TABLE IF EXISTS BATCH_JOB_EXECUTION ; -DROP TABLE IF EXISTS BATCH_STEP_INSTANCE ; DROP TABLE IF EXISTS BATCH_JOB_INSTANCE ; DROP TABLE IF EXISTS BATCH_JOB_PARAMS ; DROP TABLE IF EXISTS BATCH_STEP_EXECUTION_CONTEXT ; DROP TABLE IF EXISTS BATCH_STEP_EXECUTION_SEQ ; -DROP TABLE IF EXISTS BATCH_STEP_SEQ ; DROP TABLE IF EXISTS BATCH_JOB_EXECUTION_SEQ ; DROP TABLE IF EXISTS BATCH_JOB_SEQ ; @@ -64,8 +62,6 @@ CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT ( CREATE TABLE BATCH_STEP_EXECUTION_SEQ (ID BIGINT NOT NULL) type=MYISAM; INSERT INTO BATCH_STEP_EXECUTION_SEQ values(0); -CREATE TABLE BATCH_STEP_SEQ (ID BIGINT NOT NULL) type=MYISAM; -INSERT INTO BATCH_STEP_SEQ values(0); CREATE TABLE BATCH_JOB_EXECUTION_SEQ (ID BIGINT NOT NULL) type=MYISAM; INSERT INTO BATCH_JOB_EXECUTION_SEQ values(0); CREATE TABLE BATCH_JOB_SEQ (ID BIGINT NOT NULL) type=MYISAM; diff --git a/spring-batch-execution/src/main/resources/schema-oracle10g.sql b/spring-batch-execution/src/main/resources/schema-oracle10g.sql index 6c476cd08..ce7e67582 100644 --- a/spring-batch-execution/src/main/resources/schema-oracle10g.sql +++ b/spring-batch-execution/src/main/resources/schema-oracle10g.sql @@ -1,13 +1,11 @@ -- Autogenerated: do not edit this file DROP TABLE BATCH_STEP_EXECUTION ; DROP TABLE BATCH_JOB_EXECUTION ; -DROP TABLE BATCH_STEP_INSTANCE ; DROP TABLE BATCH_JOB_INSTANCE ; DROP TABLE BATCH_JOB_PARAMS ; DROP TABLE BATCH_STEP_EXECUTION_CONTEXT ; DROP SEQUENCE BATCH_STEP_EXECUTION_SEQ ; -DROP SEQUENCE BATCH_STEP_SEQ ; DROP SEQUENCE BATCH_JOB_EXECUTION_SEQ ; DROP SEQUENCE BATCH_JOB_SEQ ; @@ -63,6 +61,5 @@ CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT ( OBJECT_VAL BLOB); CREATE SEQUENCE BATCH_STEP_EXECUTION_SEQ; -CREATE SEQUENCE BATCH_STEP_SEQ; CREATE SEQUENCE BATCH_JOB_EXECUTION_SEQ; CREATE SEQUENCE BATCH_JOB_SEQ; diff --git a/spring-batch-execution/src/main/resources/schema-postgresql.sql b/spring-batch-execution/src/main/resources/schema-postgresql.sql index 818472a2f..dae12dd84 100644 --- a/spring-batch-execution/src/main/resources/schema-postgresql.sql +++ b/spring-batch-execution/src/main/resources/schema-postgresql.sql @@ -1,13 +1,11 @@ -- Autogenerated: do not edit this file DROP TABLE BATCH_STEP_EXECUTION ; DROP TABLE BATCH_JOB_EXECUTION ; -DROP TABLE BATCH_STEP_INSTANCE ; DROP TABLE BATCH_JOB_INSTANCE ; DROP TABLE BATCH_JOB_PARAMS ; DROP TABLE BATCH_STEP_EXECUTION_CONTEXT ; DROP SEQUENCE BATCH_STEP_EXECUTION_SEQ ; -DROP SEQUENCE BATCH_STEP_SEQ ; DROP SEQUENCE BATCH_JOB_EXECUTION_SEQ ; DROP SEQUENCE BATCH_JOB_SEQ ; @@ -63,6 +61,5 @@ CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT ( OBJECT_VAL BLOB); CREATE SEQUENCE BATCH_STEP_EXECUTION_SEQ; -CREATE SEQUENCE BATCH_STEP_SEQ; CREATE SEQUENCE BATCH_JOB_EXECUTION_SEQ; CREATE SEQUENCE BATCH_JOB_SEQ; diff --git a/spring-batch-execution/src/main/sql/destroy.sql.vpp b/spring-batch-execution/src/main/sql/destroy.sql.vpp index ede2ae0b7..3873da951 100644 --- a/spring-batch-execution/src/main/sql/destroy.sql.vpp +++ b/spring-batch-execution/src/main/sql/destroy.sql.vpp @@ -1,12 +1,10 @@ -- Autogenerated: do not edit this file DROP TABLE $!{IFEXISTSBEFORE} BATCH_STEP_EXECUTION $!{IFEXISTS}; DROP TABLE $!{IFEXISTSBEFORE} BATCH_JOB_EXECUTION $!{IFEXISTS}; -DROP TABLE $!{IFEXISTSBEFORE} BATCH_STEP_INSTANCE $!{IFEXISTS}; DROP TABLE $!{IFEXISTSBEFORE} BATCH_JOB_INSTANCE $!{IFEXISTS}; DROP TABLE $!{IFEXISTSBEFORE} BATCH_JOB_PARAMS $!{IFEXISTS}; DROP TABLE $!{IFEXISTSBEFORE} BATCH_STEP_EXECUTION_CONTEXT $!{IFEXISTS}; DROP ${SEQUENCE} $!{IFEXISTSBEFORE} BATCH_STEP_EXECUTION_SEQ $!{IFEXISTS}; -DROP ${SEQUENCE} $!{IFEXISTSBEFORE} BATCH_STEP_SEQ $!{IFEXISTS}; DROP ${SEQUENCE} $!{IFEXISTSBEFORE} BATCH_JOB_EXECUTION_SEQ $!{IFEXISTS}; DROP ${SEQUENCE} $!{IFEXISTSBEFORE} BATCH_JOB_SEQ $!{IFEXISTS}; \ No newline at end of file diff --git a/spring-batch-execution/src/main/sql/init.sql.vpp b/spring-batch-execution/src/main/sql/init.sql.vpp index 3728d1c39..6894f5ea0 100644 --- a/spring-batch-execution/src/main/sql/init.sql.vpp +++ b/spring-batch-execution/src/main/sql/init.sql.vpp @@ -50,6 +50,5 @@ CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT ( OBJECT_VAL ${BLOB}); #sequence( "BATCH_STEP_EXECUTION_SEQ" ) -#sequence( "BATCH_STEP_SEQ" ) #sequence( "BATCH_JOB_EXECUTION_SEQ" ) #sequence( "BATCH_JOB_SEQ" ) diff --git a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/destroy.sql b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/destroy.sql index 4722ad067..489809f9b 100644 --- a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/destroy.sql +++ b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/destroy.sql @@ -1,12 +1,10 @@ -- Autogenerated: do not edit this file DROP TABLE BATCH_STEP_EXECUTION IF EXISTS; DROP TABLE BATCH_JOB_EXECUTION IF EXISTS; -DROP TABLE BATCH_STEP_INSTANCE IF EXISTS; DROP TABLE BATCH_JOB_INSTANCE IF EXISTS; DROP TABLE BATCH_JOB_PARAMS IF EXISTS; DROP TABLE BATCH_STEP_EXECUTION_CONTEXT IF EXISTS; DROP TABLE BATCH_STEP_EXECUTION_SEQ IF EXISTS; -DROP TABLE BATCH_STEP_SEQ IF EXISTS; DROP TABLE BATCH_JOB_EXECUTION_SEQ IF EXISTS; DROP TABLE BATCH_JOB_SEQ IF EXISTS; \ No newline at end of file diff --git a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/init.sql b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/init.sql index d571f6497..76462d6fd 100644 --- a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/init.sql +++ b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/init.sql @@ -52,9 +52,6 @@ CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT ( CREATE TABLE BATCH_STEP_EXECUTION_SEQ ( ID BIGINT IDENTITY ); -CREATE TABLE BATCH_STEP_SEQ ( - ID BIGINT IDENTITY -); CREATE TABLE BATCH_JOB_EXECUTION_SEQ ( ID BIGINT IDENTITY );