diff --git a/spring-batch-core/src/main/resources/schema-db2.sql b/spring-batch-core/src/main/resources/schema-db2.sql index 64ad48150..ad32b304c 100644 --- a/spring-batch-core/src/main/resources/schema-db2.sql +++ b/spring-batch-core/src/main/resources/schema-db2.sql @@ -26,7 +26,6 @@ CREATE TABLE BATCH_JOB_EXECUTION ( START_TIME TIMESTAMP DEFAULT NULL , END_TIME TIMESTAMP DEFAULT NULL , STATUS VARCHAR(10) , - CONTINUABLE CHAR(1) , EXIT_CODE VARCHAR(20) , EXIT_MESSAGE VARCHAR(2500) , LAST_UPDATED TIMESTAMP, @@ -62,7 +61,6 @@ CREATE TABLE BATCH_STEP_EXECUTION ( WRITE_SKIP_COUNT BIGINT , PROCESS_SKIP_COUNT BIGINT , ROLLBACK_COUNT BIGINT , - CONTINUABLE CHAR(1) , EXIT_CODE VARCHAR(20) , EXIT_MESSAGE VARCHAR(2500) , LAST_UPDATED TIMESTAMP, diff --git a/spring-batch-core/src/main/resources/schema-derby.sql b/spring-batch-core/src/main/resources/schema-derby.sql index f0d55b87c..73dd4128e 100644 --- a/spring-batch-core/src/main/resources/schema-derby.sql +++ b/spring-batch-core/src/main/resources/schema-derby.sql @@ -26,7 +26,6 @@ CREATE TABLE BATCH_JOB_EXECUTION ( START_TIME TIMESTAMP DEFAULT NULL , END_TIME TIMESTAMP DEFAULT NULL , STATUS VARCHAR(10) , - CONTINUABLE CHAR(1) , EXIT_CODE VARCHAR(20) , EXIT_MESSAGE VARCHAR(2500) , LAST_UPDATED TIMESTAMP, @@ -62,7 +61,6 @@ CREATE TABLE BATCH_STEP_EXECUTION ( WRITE_SKIP_COUNT BIGINT , PROCESS_SKIP_COUNT BIGINT , ROLLBACK_COUNT BIGINT , - CONTINUABLE CHAR(1) , EXIT_CODE VARCHAR(20) , EXIT_MESSAGE VARCHAR(2500) , LAST_UPDATED TIMESTAMP, diff --git a/spring-batch-core/src/main/resources/schema-hsqldb.sql b/spring-batch-core/src/main/resources/schema-hsqldb.sql index 2246c8a8c..3f3398585 100644 --- a/spring-batch-core/src/main/resources/schema-hsqldb.sql +++ b/spring-batch-core/src/main/resources/schema-hsqldb.sql @@ -26,7 +26,6 @@ CREATE TABLE BATCH_JOB_EXECUTION ( START_TIME TIMESTAMP DEFAULT NULL , END_TIME TIMESTAMP DEFAULT NULL , STATUS VARCHAR(10) , - CONTINUABLE CHAR(1) , EXIT_CODE VARCHAR(20) , EXIT_MESSAGE VARCHAR(2500) , LAST_UPDATED TIMESTAMP, @@ -62,7 +61,6 @@ CREATE TABLE BATCH_STEP_EXECUTION ( WRITE_SKIP_COUNT BIGINT , PROCESS_SKIP_COUNT BIGINT , ROLLBACK_COUNT BIGINT , - CONTINUABLE CHAR(1) , EXIT_CODE VARCHAR(20) , EXIT_MESSAGE VARCHAR(2500) , LAST_UPDATED TIMESTAMP, diff --git a/spring-batch-core/src/main/resources/schema-mysql.sql b/spring-batch-core/src/main/resources/schema-mysql.sql index 2a191fb8d..5d3e32a77 100644 --- a/spring-batch-core/src/main/resources/schema-mysql.sql +++ b/spring-batch-core/src/main/resources/schema-mysql.sql @@ -26,7 +26,6 @@ CREATE TABLE BATCH_JOB_EXECUTION ( START_TIME DATETIME DEFAULT NULL , END_TIME DATETIME DEFAULT NULL , STATUS VARCHAR(10) , - CONTINUABLE CHAR(1) , EXIT_CODE VARCHAR(20) , EXIT_MESSAGE VARCHAR(2500) , LAST_UPDATED DATETIME, @@ -62,7 +61,6 @@ CREATE TABLE BATCH_STEP_EXECUTION ( WRITE_SKIP_COUNT BIGINT , PROCESS_SKIP_COUNT BIGINT , ROLLBACK_COUNT BIGINT , - CONTINUABLE CHAR(1) , EXIT_CODE VARCHAR(20) , EXIT_MESSAGE VARCHAR(2500) , LAST_UPDATED DATETIME, diff --git a/spring-batch-core/src/main/resources/schema-oracle10g.sql b/spring-batch-core/src/main/resources/schema-oracle10g.sql index fa9ec76c1..62a46f57d 100644 --- a/spring-batch-core/src/main/resources/schema-oracle10g.sql +++ b/spring-batch-core/src/main/resources/schema-oracle10g.sql @@ -26,7 +26,6 @@ CREATE TABLE BATCH_JOB_EXECUTION ( START_TIME TIMESTAMP DEFAULT NULL , END_TIME TIMESTAMP DEFAULT NULL , STATUS VARCHAR2(10) , - CONTINUABLE CHAR(1) , EXIT_CODE VARCHAR2(20) , EXIT_MESSAGE VARCHAR2(2500) , LAST_UPDATED TIMESTAMP, @@ -62,7 +61,6 @@ CREATE TABLE BATCH_STEP_EXECUTION ( WRITE_SKIP_COUNT NUMBER(19,0) , PROCESS_SKIP_COUNT NUMBER(19,0) , ROLLBACK_COUNT NUMBER(19,0) , - CONTINUABLE CHAR(1) , EXIT_CODE VARCHAR2(20) , EXIT_MESSAGE VARCHAR2(2500) , LAST_UPDATED TIMESTAMP, diff --git a/spring-batch-core/src/main/resources/schema-postgresql.sql b/spring-batch-core/src/main/resources/schema-postgresql.sql index 6ea6824d1..bb8361780 100644 --- a/spring-batch-core/src/main/resources/schema-postgresql.sql +++ b/spring-batch-core/src/main/resources/schema-postgresql.sql @@ -26,7 +26,6 @@ CREATE TABLE BATCH_JOB_EXECUTION ( START_TIME TIMESTAMP DEFAULT NULL , END_TIME TIMESTAMP DEFAULT NULL , STATUS VARCHAR(10) , - CONTINUABLE CHAR(1) , EXIT_CODE VARCHAR(20) , EXIT_MESSAGE VARCHAR(2500) , LAST_UPDATED TIMESTAMP, @@ -62,7 +61,6 @@ CREATE TABLE BATCH_STEP_EXECUTION ( WRITE_SKIP_COUNT BIGINT , PROCESS_SKIP_COUNT BIGINT , ROLLBACK_COUNT BIGINT , - CONTINUABLE CHAR(1) , EXIT_CODE VARCHAR(20) , EXIT_MESSAGE VARCHAR(2500) , LAST_UPDATED TIMESTAMP, diff --git a/spring-batch-core/src/main/resources/schema-sqlserver.sql b/spring-batch-core/src/main/resources/schema-sqlserver.sql index 225618bc0..e330f8acf 100644 --- a/spring-batch-core/src/main/resources/schema-sqlserver.sql +++ b/spring-batch-core/src/main/resources/schema-sqlserver.sql @@ -26,7 +26,6 @@ CREATE TABLE BATCH_JOB_EXECUTION ( START_TIME DATETIME DEFAULT NULL , END_TIME DATETIME DEFAULT NULL , STATUS VARCHAR(10) , - CONTINUABLE CHAR(1) , EXIT_CODE VARCHAR(20) , EXIT_MESSAGE VARCHAR(2500) , LAST_UPDATED DATETIME, @@ -62,7 +61,6 @@ CREATE TABLE BATCH_STEP_EXECUTION ( WRITE_SKIP_COUNT BIGINT , PROCESS_SKIP_COUNT BIGINT , ROLLBACK_COUNT BIGINT , - CONTINUABLE CHAR(1) , EXIT_CODE VARCHAR(20) , EXIT_MESSAGE VARCHAR(2500) , LAST_UPDATED DATETIME, diff --git a/spring-batch-core/src/main/resources/schema-sybase.sql b/spring-batch-core/src/main/resources/schema-sybase.sql index daf9ca40e..43ce9f05b 100644 --- a/spring-batch-core/src/main/resources/schema-sybase.sql +++ b/spring-batch-core/src/main/resources/schema-sybase.sql @@ -26,7 +26,6 @@ CREATE TABLE BATCH_JOB_EXECUTION ( START_TIME DATETIME DEFAULT NULL NULL, END_TIME DATETIME DEFAULT NULL NULL, STATUS VARCHAR(10) NULL, - CONTINUABLE CHAR(1) NULL, EXIT_CODE VARCHAR(20) NULL, EXIT_MESSAGE VARCHAR(2500) NULL, LAST_UPDATED DATETIME, @@ -62,7 +61,6 @@ CREATE TABLE BATCH_STEP_EXECUTION ( WRITE_SKIP_COUNT BIGINT NULL, PROCESS_SKIP_COUNT BIGINT NULL, ROLLBACK_COUNT BIGINT NULL, - CONTINUABLE CHAR(1) NULL, EXIT_CODE VARCHAR(20) NULL, EXIT_MESSAGE VARCHAR(2500) NULL, LAST_UPDATED DATETIME, diff --git a/spring-batch-core/src/main/resources/schema-upgrade-db2.sql b/spring-batch-core/src/main/resources/schema-upgrade-db2.sql index b870f813b..0fb2ddf70 100644 --- a/spring-batch-core/src/main/resources/schema-upgrade-db2.sql +++ b/spring-batch-core/src/main/resources/schema-upgrade-db2.sql @@ -27,3 +27,5 @@ ALTER TABLE BATCH_JOB_EXECUTION ALTER COLUMN CREATE_TIME SET NOT NULL; ALTER TABLE BATCH_STEP_EXECUTION ADD READ_SKIP_COUNT BIGINT; ALTER TABLE BATCH_STEP_EXECUTION ADD WRITE_SKIP_COUNT BIGINT; ALTER TABLE BATCH_STEP_EXECUTION ADD ROLLBACK_COUNT BIGINT; +ALTER TABLE BATCH_STEP_EXECUTION DROP COLUMN CONTINUABLE; +ALTER TABLE BATCH_JOB_EXECUTION DROP COLUMN CONTINUABLE; diff --git a/spring-batch-core/src/main/resources/schema-upgrade-derby.sql b/spring-batch-core/src/main/resources/schema-upgrade-derby.sql index 073565d91..6d9fe4e2a 100644 --- a/spring-batch-core/src/main/resources/schema-upgrade-derby.sql +++ b/spring-batch-core/src/main/resources/schema-upgrade-derby.sql @@ -27,3 +27,5 @@ ALTER TABLE BATCH_JOB_EXECUTION ALTER COLUMN CREATE_TIME NOT NULL; ALTER TABLE BATCH_STEP_EXECUTION ADD READ_SKIP_COUNT BIGINT; ALTER TABLE BATCH_STEP_EXECUTION ADD WRITE_SKIP_COUNT BIGINT; ALTER TABLE BATCH_STEP_EXECUTION ADD ROLLBACK_COUNT BIGINT; +ALTER TABLE BATCH_STEP_EXECUTION DROP COLUMN CONTINUABLE; +ALTER TABLE BATCH_JOB_EXECUTION DROP COLUMN CONTINUABLE; diff --git a/spring-batch-core/src/main/resources/schema-upgrade-hsqldb.sql b/spring-batch-core/src/main/resources/schema-upgrade-hsqldb.sql index 24565f94d..5a80db442 100644 --- a/spring-batch-core/src/main/resources/schema-upgrade-hsqldb.sql +++ b/spring-batch-core/src/main/resources/schema-upgrade-hsqldb.sql @@ -27,3 +27,5 @@ ALTER TABLE BATCH_JOB_EXECUTION ALTER COLUMN CREATE_TIME TIMESTAMP NOT NULL; ALTER TABLE BATCH_STEP_EXECUTION ADD READ_SKIP_COUNT BIGINT; ALTER TABLE BATCH_STEP_EXECUTION ADD WRITE_SKIP_COUNT BIGINT; ALTER TABLE BATCH_STEP_EXECUTION ADD ROLLBACK_COUNT BIGINT; +ALTER TABLE BATCH_STEP_EXECUTION DROP COLUMN CONTINUABLE; +ALTER TABLE BATCH_JOB_EXECUTION DROP COLUMN CONTINUABLE; diff --git a/spring-batch-core/src/main/resources/schema-upgrade-mysql.sql b/spring-batch-core/src/main/resources/schema-upgrade-mysql.sql index abd1715ab..5fe193773 100644 --- a/spring-batch-core/src/main/resources/schema-upgrade-mysql.sql +++ b/spring-batch-core/src/main/resources/schema-upgrade-mysql.sql @@ -27,3 +27,5 @@ ALTER TABLE BATCH_JOB_EXECUTION MODIFY COLUMN CREATE_TIME DATETIME NOT NULL; ALTER TABLE BATCH_STEP_EXECUTION ADD READ_SKIP_COUNT BIGINT; ALTER TABLE BATCH_STEP_EXECUTION ADD WRITE_SKIP_COUNT BIGINT; ALTER TABLE BATCH_STEP_EXECUTION ADD ROLLBACK_COUNT BIGINT; +ALTER TABLE BATCH_STEP_EXECUTION DROP COLUMN CONTINUABLE; +ALTER TABLE BATCH_JOB_EXECUTION DROP COLUMN CONTINUABLE; diff --git a/spring-batch-core/src/main/resources/schema-upgrade-oracle10g.sql b/spring-batch-core/src/main/resources/schema-upgrade-oracle10g.sql index b736e9cab..4bb467cf3 100644 --- a/spring-batch-core/src/main/resources/schema-upgrade-oracle10g.sql +++ b/spring-batch-core/src/main/resources/schema-upgrade-oracle10g.sql @@ -27,3 +27,5 @@ ALTER TABLE BATCH_JOB_EXECUTION MODIFY CREATE_TIME NOT NULL; ALTER TABLE BATCH_STEP_EXECUTION ADD READ_SKIP_COUNT NUMBER(19,0); ALTER TABLE BATCH_STEP_EXECUTION ADD WRITE_SKIP_COUNT NUMBER(19,0); ALTER TABLE BATCH_STEP_EXECUTION ADD ROLLBACK_COUNT NUMBER(19,0); +ALTER TABLE BATCH_STEP_EXECUTION DROP COLUMN CONTINUABLE; +ALTER TABLE BATCH_JOB_EXECUTION DROP COLUMN CONTINUABLE; diff --git a/spring-batch-core/src/main/resources/schema-upgrade-postgresql.sql b/spring-batch-core/src/main/resources/schema-upgrade-postgresql.sql index 07fbc267a..d73a66902 100644 --- a/spring-batch-core/src/main/resources/schema-upgrade-postgresql.sql +++ b/spring-batch-core/src/main/resources/schema-upgrade-postgresql.sql @@ -27,3 +27,5 @@ ALTER TABLE BATCH_JOB_EXECUTION ALTER COLUMN CREATE_TIME SET NOT NULL; ALTER TABLE BATCH_STEP_EXECUTION ADD READ_SKIP_COUNT BIGINT; ALTER TABLE BATCH_STEP_EXECUTION ADD WRITE_SKIP_COUNT BIGINT; ALTER TABLE BATCH_STEP_EXECUTION ADD ROLLBACK_COUNT BIGINT; +ALTER TABLE BATCH_STEP_EXECUTION DROP COLUMN CONTINUABLE; +ALTER TABLE BATCH_JOB_EXECUTION DROP COLUMN CONTINUABLE; 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 73cd55566..d156ad1a7 100644 --- a/spring-batch-core/src/main/sql/tables-main.sql.vpp +++ b/spring-batch-core/src/main/sql/tables-main.sql.vpp @@ -13,7 +13,6 @@ CREATE TABLE BATCH_JOB_EXECUTION ( START_TIME ${TIMESTAMP} DEFAULT NULL $!{NULL}, END_TIME ${TIMESTAMP} DEFAULT NULL $!{NULL}, STATUS ${VARCHAR}(10) $!{NULL}, - CONTINUABLE CHAR(1) $!{NULL}, EXIT_CODE ${VARCHAR}(20) $!{NULL}, EXIT_MESSAGE ${VARCHAR}(2500) $!{NULL}, LAST_UPDATED ${TIMESTAMP}, @@ -49,7 +48,6 @@ CREATE TABLE BATCH_STEP_EXECUTION ( WRITE_SKIP_COUNT ${BIGINT} $!{NULL}, PROCESS_SKIP_COUNT ${BIGINT} $!{NULL}, ROLLBACK_COUNT ${BIGINT} $!{NULL}, - CONTINUABLE CHAR(1) $!{NULL}, EXIT_CODE ${VARCHAR}(20) $!{NULL}, EXIT_MESSAGE ${VARCHAR}(2500) $!{NULL}, LAST_UPDATED ${TIMESTAMP}, diff --git a/spring-batch-core/src/main/sql/upgrade.sql.vpp b/spring-batch-core/src/main/sql/upgrade.sql.vpp index 04004442c..d3218c40e 100644 --- a/spring-batch-core/src/main/sql/upgrade.sql.vpp +++ b/spring-batch-core/src/main/sql/upgrade.sql.vpp @@ -7,3 +7,5 @@ ALTER TABLE BATCH_JOB_EXECUTION #notnull( "CREATE_TIME" ${TIMESTAMP} ); ALTER TABLE BATCH_STEP_EXECUTION ADD READ_SKIP_COUNT ${BIGINT}; ALTER TABLE BATCH_STEP_EXECUTION ADD WRITE_SKIP_COUNT ${BIGINT}; ALTER TABLE BATCH_STEP_EXECUTION ADD ROLLBACK_COUNT ${BIGINT}; +ALTER TABLE BATCH_STEP_EXECUTION DROP COLUMN CONTINUABLE; +ALTER TABLE BATCH_JOB_EXECUTION DROP COLUMN CONTINUABLE;