From 201620ce807294844d1ff4fd39b39cc7c125906a Mon Sep 17 00:00:00 2001 From: willschipp Date: Sat, 16 Mar 2013 07:36:11 -0400 Subject: [PATCH 1/4] BATCH-1977 - script to migrate batch_job_params to new batch_job_execution_params --- .../batch/core/2.1-to-2.2-migration.sql | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration.sql diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration.sql new file mode 100644 index 000000000..104ae6073 --- /dev/null +++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration.sql @@ -0,0 +1,18 @@ + +--insert script that 'copies' existing batch_job_params to batch_job_execution_params +--sets new params to identifying ones +--selects the 'first'(minimum) job_execution_id for a job_instance_id + +INSERT INTO BATCH_JOB_EXECUTION_PARAMS ( + JOB_EXECUTION_ID , TYPE_CD , KEY_NAME , STRING_VAL , DATE_VAL , LONG_VAL , DOUBLE_VAL , IDENTIFYING +) SELECT ( + SELECT + MIN(JOB_EXECUTION_ID) + FROM + BATCH_JOB_EXECUTION JE, BATCH_JOB_PARAMS JP + WHERE + JP.JOB_INSTANCE_ID = JE.JOB_INSTANCE_ID AND JE.JOB_INSTANCE_ID = J.JOB_INSTANCE_ID + ), + J.TYPE_CD, J.KEY_NAME, J.STRING_VAL, J.DATE_VAL, J.LONG_VAL, J.DOUBLE_VAL, 1 +FROM + BATCH_JOB_PARAMS J; \ No newline at end of file From 2e67b5c6d023d3cd4faf9baaf7d932af17d24f68 Mon Sep 17 00:00:00 2001 From: willschipp Date: Fri, 22 Mar 2013 07:50:18 -0400 Subject: [PATCH 2/4] BATCH-1977 updated insert statement to copy all the job executions for all the instances and their parameters --- .../batch/core/2.1-to-2.2-migration.sql | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration.sql index 104ae6073..0c9d41881 100644 --- a/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration.sql +++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration.sql @@ -1,18 +1,13 @@ --insert script that 'copies' existing batch_job_params to batch_job_execution_params --sets new params to identifying ones ---selects the 'first'(minimum) job_execution_id for a job_instance_id +--verified on h2, -INSERT INTO BATCH_JOB_EXECUTION_PARAMS ( - JOB_EXECUTION_ID , TYPE_CD , KEY_NAME , STRING_VAL , DATE_VAL , LONG_VAL , DOUBLE_VAL , IDENTIFYING -) SELECT ( - SELECT - MIN(JOB_EXECUTION_ID) - FROM - BATCH_JOB_EXECUTION JE, BATCH_JOB_PARAMS JP - WHERE - JP.JOB_INSTANCE_ID = JE.JOB_INSTANCE_ID AND JE.JOB_INSTANCE_ID = J.JOB_INSTANCE_ID - ), - J.TYPE_CD, J.KEY_NAME, J.STRING_VAL, J.DATE_VAL, J.LONG_VAL, J.DOUBLE_VAL, 1 +INSERT INTO BATCH_JOB_EXECUTION_PARAMS + ( JOB_EXECUTION_ID , TYPE_CD, KEY_NAME, STRING_VAL, DATE_VAL, LONG_VAL, DOUBLE_VAL, IDENTIFYING ) +SELECT + JE.JOB_EXECUTION_ID , JP.TYPE_CD , JP.KEY_NAME , JP.STRING_VAL , JP.DATE_VAL , JP.LONG_VAL , JP.DOUBLE_VAL , 1 FROM - BATCH_JOB_PARAMS J; \ No newline at end of file + BATCH_JOB_PARAMS JP,BATCH_JOB_EXECUTION JE +WHERE + JP.JOB_INSTANCE_ID = JE.JOB_INSTANCE_ID; \ No newline at end of file From 133fa2b60233398f411c1611590fe47c30b7df79 Mon Sep 17 00:00:00 2001 From: willschipp Date: Fri, 22 Mar 2013 07:57:39 -0400 Subject: [PATCH 3/4] BATCH-1977 - migration scripts included create tables --- .../batch/core/2.1-to-2.2-migration-h2.sql | 28 +++++++++++++++++++ .../core/2.1-to-2.2-migration-hsqldb.sql | 28 +++++++++++++++++++ ...l => 2.1-to-2.2-migration-insert-only.sql} | 0 .../batch/core/2.1-to-2.2-migration-mysql.sql | 28 +++++++++++++++++++ .../core/2.1-to-2.2-migration-oracle10g.sql | 28 +++++++++++++++++++ .../core/2.1-to-2.2-migration-postgresql.sql | 28 +++++++++++++++++++ .../batch/core/2.1-to-2.2-migration-sqlf.sql | 28 +++++++++++++++++++ .../core/2.1-to-2.2-migration-sqlserver.sql | 28 +++++++++++++++++++ .../core/2.1-to-2.2-migration-sybase.sql | 28 +++++++++++++++++++ 9 files changed, 224 insertions(+) create mode 100644 spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-h2.sql create mode 100644 spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-hsqldb.sql rename spring-batch-core/src/main/resources/org/springframework/batch/core/{2.1-to-2.2-migration.sql => 2.1-to-2.2-migration-insert-only.sql} (100%) create mode 100644 spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-mysql.sql create mode 100644 spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-oracle10g.sql create mode 100644 spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-postgresql.sql create mode 100644 spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-sqlf.sql create mode 100644 spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-sqlserver.sql create mode 100644 spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-sybase.sql diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-h2.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-h2.sql new file mode 100644 index 000000000..3eac13d8f --- /dev/null +++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-h2.sql @@ -0,0 +1,28 @@ + +--create the requisite table + +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) , + DATE_VAL TIMESTAMP DEFAULT NULL , + LONG_VAL BIGINT , + DOUBLE_VAL DOUBLE PRECISION , + IDENTIFYING CHAR(1) NOT NULL , + constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID) + references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) +) ; + +--insert script that 'copies' existing batch_job_params to batch_job_execution_params +--sets new params to identifying ones +--verified on h2, + +INSERT INTO BATCH_JOB_EXECUTION_PARAMS + ( JOB_EXECUTION_ID , TYPE_CD, KEY_NAME, STRING_VAL, DATE_VAL, LONG_VAL, DOUBLE_VAL, IDENTIFYING ) +SELECT + JE.JOB_EXECUTION_ID , JP.TYPE_CD , JP.KEY_NAME , JP.STRING_VAL , JP.DATE_VAL , JP.LONG_VAL , JP.DOUBLE_VAL , 1 +FROM + BATCH_JOB_PARAMS JP,BATCH_JOB_EXECUTION JE +WHERE + JP.JOB_INSTANCE_ID = JE.JOB_INSTANCE_ID; \ No newline at end of file diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-hsqldb.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-hsqldb.sql new file mode 100644 index 000000000..3eac13d8f --- /dev/null +++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-hsqldb.sql @@ -0,0 +1,28 @@ + +--create the requisite table + +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) , + DATE_VAL TIMESTAMP DEFAULT NULL , + LONG_VAL BIGINT , + DOUBLE_VAL DOUBLE PRECISION , + IDENTIFYING CHAR(1) NOT NULL , + constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID) + references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) +) ; + +--insert script that 'copies' existing batch_job_params to batch_job_execution_params +--sets new params to identifying ones +--verified on h2, + +INSERT INTO BATCH_JOB_EXECUTION_PARAMS + ( JOB_EXECUTION_ID , TYPE_CD, KEY_NAME, STRING_VAL, DATE_VAL, LONG_VAL, DOUBLE_VAL, IDENTIFYING ) +SELECT + JE.JOB_EXECUTION_ID , JP.TYPE_CD , JP.KEY_NAME , JP.STRING_VAL , JP.DATE_VAL , JP.LONG_VAL , JP.DOUBLE_VAL , 1 +FROM + BATCH_JOB_PARAMS JP,BATCH_JOB_EXECUTION JE +WHERE + JP.JOB_INSTANCE_ID = JE.JOB_INSTANCE_ID; \ No newline at end of file diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-insert-only.sql similarity index 100% rename from spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration.sql rename to spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-insert-only.sql diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-mysql.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-mysql.sql new file mode 100644 index 000000000..e29aaa05c --- /dev/null +++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-mysql.sql @@ -0,0 +1,28 @@ + +--create the requisite table + +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) , + DATE_VAL DATETIME DEFAULT NULL , + LONG_VAL BIGINT , + DOUBLE_VAL DOUBLE PRECISION , + IDENTIFYING CHAR(1) NOT NULL , + constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID) + references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) +) ENGINE=InnoDB; + +--insert script that 'copies' existing batch_job_params to batch_job_execution_params +--sets new params to identifying ones +--verified on h2, + +INSERT INTO BATCH_JOB_EXECUTION_PARAMS + ( JOB_EXECUTION_ID , TYPE_CD, KEY_NAME, STRING_VAL, DATE_VAL, LONG_VAL, DOUBLE_VAL, IDENTIFYING ) +SELECT + JE.JOB_EXECUTION_ID , JP.TYPE_CD , JP.KEY_NAME , JP.STRING_VAL , JP.DATE_VAL , JP.LONG_VAL , JP.DOUBLE_VAL , 1 +FROM + BATCH_JOB_PARAMS JP,BATCH_JOB_EXECUTION JE +WHERE + JP.JOB_INSTANCE_ID = JE.JOB_INSTANCE_ID; \ No newline at end of file diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-oracle10g.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-oracle10g.sql new file mode 100644 index 000000000..87b9e9103 --- /dev/null +++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-oracle10g.sql @@ -0,0 +1,28 @@ + +--create the requisite table + +CREATE TABLE BATCH_JOB_EXECUTION_PARAMS ( + JOB_EXECUTION_ID NUMBER(19,0) NOT NULL , + TYPE_CD VARCHAR2(6) NOT NULL , + KEY_NAME VARCHAR2(100) NOT NULL , + STRING_VAL VARCHAR2(250) , + DATE_VAL TIMESTAMP DEFAULT NULL , + LONG_VAL NUMBER(19,0) , + DOUBLE_VAL NUMBER , + IDENTIFYING CHAR(1) NOT NULL , + constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID) + references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) +) ; + +--insert script that 'copies' existing batch_job_params to batch_job_execution_params +--sets new params to identifying ones +--verified on h2, + +INSERT INTO BATCH_JOB_EXECUTION_PARAMS + ( JOB_EXECUTION_ID , TYPE_CD, KEY_NAME, STRING_VAL, DATE_VAL, LONG_VAL, DOUBLE_VAL, IDENTIFYING ) +SELECT + JE.JOB_EXECUTION_ID , JP.TYPE_CD , JP.KEY_NAME , JP.STRING_VAL , JP.DATE_VAL , JP.LONG_VAL , JP.DOUBLE_VAL , 1 +FROM + BATCH_JOB_PARAMS JP,BATCH_JOB_EXECUTION JE +WHERE + JP.JOB_INSTANCE_ID = JE.JOB_INSTANCE_ID; \ No newline at end of file diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-postgresql.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-postgresql.sql new file mode 100644 index 000000000..3eac13d8f --- /dev/null +++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-postgresql.sql @@ -0,0 +1,28 @@ + +--create the requisite table + +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) , + DATE_VAL TIMESTAMP DEFAULT NULL , + LONG_VAL BIGINT , + DOUBLE_VAL DOUBLE PRECISION , + IDENTIFYING CHAR(1) NOT NULL , + constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID) + references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) +) ; + +--insert script that 'copies' existing batch_job_params to batch_job_execution_params +--sets new params to identifying ones +--verified on h2, + +INSERT INTO BATCH_JOB_EXECUTION_PARAMS + ( JOB_EXECUTION_ID , TYPE_CD, KEY_NAME, STRING_VAL, DATE_VAL, LONG_VAL, DOUBLE_VAL, IDENTIFYING ) +SELECT + JE.JOB_EXECUTION_ID , JP.TYPE_CD , JP.KEY_NAME , JP.STRING_VAL , JP.DATE_VAL , JP.LONG_VAL , JP.DOUBLE_VAL , 1 +FROM + BATCH_JOB_PARAMS JP,BATCH_JOB_EXECUTION JE +WHERE + JP.JOB_INSTANCE_ID = JE.JOB_INSTANCE_ID; \ No newline at end of file diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-sqlf.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-sqlf.sql new file mode 100644 index 000000000..3eac13d8f --- /dev/null +++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-sqlf.sql @@ -0,0 +1,28 @@ + +--create the requisite table + +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) , + DATE_VAL TIMESTAMP DEFAULT NULL , + LONG_VAL BIGINT , + DOUBLE_VAL DOUBLE PRECISION , + IDENTIFYING CHAR(1) NOT NULL , + constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID) + references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) +) ; + +--insert script that 'copies' existing batch_job_params to batch_job_execution_params +--sets new params to identifying ones +--verified on h2, + +INSERT INTO BATCH_JOB_EXECUTION_PARAMS + ( JOB_EXECUTION_ID , TYPE_CD, KEY_NAME, STRING_VAL, DATE_VAL, LONG_VAL, DOUBLE_VAL, IDENTIFYING ) +SELECT + JE.JOB_EXECUTION_ID , JP.TYPE_CD , JP.KEY_NAME , JP.STRING_VAL , JP.DATE_VAL , JP.LONG_VAL , JP.DOUBLE_VAL , 1 +FROM + BATCH_JOB_PARAMS JP,BATCH_JOB_EXECUTION JE +WHERE + JP.JOB_INSTANCE_ID = JE.JOB_INSTANCE_ID; \ No newline at end of file diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-sqlserver.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-sqlserver.sql new file mode 100644 index 000000000..c3d9e1d10 --- /dev/null +++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-sqlserver.sql @@ -0,0 +1,28 @@ + +--create the requisite table + +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) , + DATE_VAL DATETIME DEFAULT NULL , + LONG_VAL BIGINT , + DOUBLE_VAL DOUBLE PRECISION , + IDENTIFYING CHAR(1) NOT NULL , + constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID) + references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) +) ; + +--insert script that 'copies' existing batch_job_params to batch_job_execution_params +--sets new params to identifying ones +--verified on h2, + +INSERT INTO BATCH_JOB_EXECUTION_PARAMS + ( JOB_EXECUTION_ID , TYPE_CD, KEY_NAME, STRING_VAL, DATE_VAL, LONG_VAL, DOUBLE_VAL, IDENTIFYING ) +SELECT + JE.JOB_EXECUTION_ID , JP.TYPE_CD , JP.KEY_NAME , JP.STRING_VAL , JP.DATE_VAL , JP.LONG_VAL , JP.DOUBLE_VAL , 1 +FROM + BATCH_JOB_PARAMS JP,BATCH_JOB_EXECUTION JE +WHERE + JP.JOB_INSTANCE_ID = JE.JOB_INSTANCE_ID; \ No newline at end of file diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-sybase.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-sybase.sql new file mode 100644 index 000000000..3edba710f --- /dev/null +++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-sybase.sql @@ -0,0 +1,28 @@ + +--create the requisite table + +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 DATETIME DEFAULT NULL NULL, + LONG_VAL BIGINT NULL, + DOUBLE_VAL DOUBLE PRECISION NULL, + IDENTIFYING CHAR(1) NOT NULL , + constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID) + references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) +) ; + +--insert script that 'copies' existing batch_job_params to batch_job_execution_params +--sets new params to identifying ones +--verified on h2, + +INSERT INTO BATCH_JOB_EXECUTION_PARAMS + ( JOB_EXECUTION_ID , TYPE_CD, KEY_NAME, STRING_VAL, DATE_VAL, LONG_VAL, DOUBLE_VAL, IDENTIFYING ) +SELECT + JE.JOB_EXECUTION_ID , JP.TYPE_CD , JP.KEY_NAME , JP.STRING_VAL , JP.DATE_VAL , JP.LONG_VAL , JP.DOUBLE_VAL , 1 +FROM + BATCH_JOB_PARAMS JP,BATCH_JOB_EXECUTION JE +WHERE + JP.JOB_INSTANCE_ID = JE.JOB_INSTANCE_ID; \ No newline at end of file From f3bb44d14e6f11870a7265639838818c6972efd1 Mon Sep 17 00:00:00 2001 From: Michael Minella Date: Fri, 22 Mar 2013 16:24:54 -0500 Subject: [PATCH 4/4] BATCH-1977: Rearranged scripts and fixed comment issue --- .../migration-h2.sql} | 8 ++++---- .../migration-hsqldb.sql} | 8 ++++---- .../migration-insert-only.sql} | 6 +++--- .../migration-mysql.sql} | 8 ++++---- .../migration-oracle10g.sql} | 8 ++++---- .../migration-postgresql.sql} | 8 ++++---- .../migration-sqlf.sql} | 8 ++++---- .../migration-sqlserver.sql} | 8 ++++---- .../migration-sybase.sql} | 8 ++++---- 9 files changed, 35 insertions(+), 35 deletions(-) rename spring-batch-core/src/main/resources/org/springframework/batch/core/{2.1-to-2.2-migration-h2.sql => 2.1-to-2.2-migration/migration-h2.sql} (81%) rename spring-batch-core/src/main/resources/org/springframework/batch/core/{2.1-to-2.2-migration-hsqldb.sql => 2.1-to-2.2-migration/migration-hsqldb.sql} (81%) rename spring-batch-core/src/main/resources/org/springframework/batch/core/{2.1-to-2.2-migration-insert-only.sql => 2.1-to-2.2-migration/migration-insert-only.sql} (71%) rename spring-batch-core/src/main/resources/org/springframework/batch/core/{2.1-to-2.2-migration-mysql.sql => 2.1-to-2.2-migration/migration-mysql.sql} (81%) rename spring-batch-core/src/main/resources/org/springframework/batch/core/{2.1-to-2.2-migration-oracle10g.sql => 2.1-to-2.2-migration/migration-oracle10g.sql} (81%) rename spring-batch-core/src/main/resources/org/springframework/batch/core/{2.1-to-2.2-migration-postgresql.sql => 2.1-to-2.2-migration/migration-postgresql.sql} (81%) rename spring-batch-core/src/main/resources/org/springframework/batch/core/{2.1-to-2.2-migration-sqlf.sql => 2.1-to-2.2-migration/migration-sqlf.sql} (81%) rename spring-batch-core/src/main/resources/org/springframework/batch/core/{2.1-to-2.2-migration-sqlserver.sql => 2.1-to-2.2-migration/migration-sqlserver.sql} (81%) rename spring-batch-core/src/main/resources/org/springframework/batch/core/{2.1-to-2.2-migration-sybase.sql => 2.1-to-2.2-migration/migration-sybase.sql} (81%) diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-h2.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration/migration-h2.sql similarity index 81% rename from spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-h2.sql rename to spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration/migration-h2.sql index 3eac13d8f..c3f08c886 100644 --- a/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-h2.sql +++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration/migration-h2.sql @@ -1,5 +1,5 @@ ---create the requisite table +-- create the requisite table CREATE TABLE BATCH_JOB_EXECUTION_PARAMS ( JOB_EXECUTION_ID BIGINT NOT NULL , @@ -14,9 +14,9 @@ CREATE TABLE BATCH_JOB_EXECUTION_PARAMS ( references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) ) ; ---insert script that 'copies' existing batch_job_params to batch_job_execution_params ---sets new params to identifying ones ---verified on h2, +-- insert script that 'copies' existing batch_job_params to batch_job_execution_params +-- sets new params to identifying ones +-- verified on h2, INSERT INTO BATCH_JOB_EXECUTION_PARAMS ( JOB_EXECUTION_ID , TYPE_CD, KEY_NAME, STRING_VAL, DATE_VAL, LONG_VAL, DOUBLE_VAL, IDENTIFYING ) diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-hsqldb.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration/migration-hsqldb.sql similarity index 81% rename from spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-hsqldb.sql rename to spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration/migration-hsqldb.sql index 3eac13d8f..c3f08c886 100644 --- a/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-hsqldb.sql +++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration/migration-hsqldb.sql @@ -1,5 +1,5 @@ ---create the requisite table +-- create the requisite table CREATE TABLE BATCH_JOB_EXECUTION_PARAMS ( JOB_EXECUTION_ID BIGINT NOT NULL , @@ -14,9 +14,9 @@ CREATE TABLE BATCH_JOB_EXECUTION_PARAMS ( references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) ) ; ---insert script that 'copies' existing batch_job_params to batch_job_execution_params ---sets new params to identifying ones ---verified on h2, +-- insert script that 'copies' existing batch_job_params to batch_job_execution_params +-- sets new params to identifying ones +-- verified on h2, INSERT INTO BATCH_JOB_EXECUTION_PARAMS ( JOB_EXECUTION_ID , TYPE_CD, KEY_NAME, STRING_VAL, DATE_VAL, LONG_VAL, DOUBLE_VAL, IDENTIFYING ) diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-insert-only.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration/migration-insert-only.sql similarity index 71% rename from spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-insert-only.sql rename to spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration/migration-insert-only.sql index 0c9d41881..10114d974 100644 --- a/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-insert-only.sql +++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration/migration-insert-only.sql @@ -1,7 +1,7 @@ ---insert script that 'copies' existing batch_job_params to batch_job_execution_params ---sets new params to identifying ones ---verified on h2, +-- insert script that 'copies' existing batch_job_params to batch_job_execution_params +-- sets new params to identifying ones +-- verified on h2, INSERT INTO BATCH_JOB_EXECUTION_PARAMS ( JOB_EXECUTION_ID , TYPE_CD, KEY_NAME, STRING_VAL, DATE_VAL, LONG_VAL, DOUBLE_VAL, IDENTIFYING ) diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-mysql.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration/migration-mysql.sql similarity index 81% rename from spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-mysql.sql rename to spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration/migration-mysql.sql index e29aaa05c..bfe9c6b30 100644 --- a/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-mysql.sql +++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration/migration-mysql.sql @@ -1,5 +1,5 @@ ---create the requisite table +-- create the requisite table CREATE TABLE BATCH_JOB_EXECUTION_PARAMS ( JOB_EXECUTION_ID BIGINT NOT NULL , @@ -14,9 +14,9 @@ CREATE TABLE BATCH_JOB_EXECUTION_PARAMS ( references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) ) ENGINE=InnoDB; ---insert script that 'copies' existing batch_job_params to batch_job_execution_params ---sets new params to identifying ones ---verified on h2, +-- insert script that 'copies' existing batch_job_params to batch_job_execution_params +-- sets new params to identifying ones +-- verified on h2, INSERT INTO BATCH_JOB_EXECUTION_PARAMS ( JOB_EXECUTION_ID , TYPE_CD, KEY_NAME, STRING_VAL, DATE_VAL, LONG_VAL, DOUBLE_VAL, IDENTIFYING ) diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-oracle10g.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration/migration-oracle10g.sql similarity index 81% rename from spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-oracle10g.sql rename to spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration/migration-oracle10g.sql index 87b9e9103..c63a01240 100644 --- a/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-oracle10g.sql +++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration/migration-oracle10g.sql @@ -1,5 +1,5 @@ ---create the requisite table +-- create the requisite table CREATE TABLE BATCH_JOB_EXECUTION_PARAMS ( JOB_EXECUTION_ID NUMBER(19,0) NOT NULL , @@ -14,9 +14,9 @@ CREATE TABLE BATCH_JOB_EXECUTION_PARAMS ( references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) ) ; ---insert script that 'copies' existing batch_job_params to batch_job_execution_params ---sets new params to identifying ones ---verified on h2, +-- insert script that 'copies' existing batch_job_params to batch_job_execution_params +-- sets new params to identifying ones +-- verified on h2, INSERT INTO BATCH_JOB_EXECUTION_PARAMS ( JOB_EXECUTION_ID , TYPE_CD, KEY_NAME, STRING_VAL, DATE_VAL, LONG_VAL, DOUBLE_VAL, IDENTIFYING ) diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-postgresql.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration/migration-postgresql.sql similarity index 81% rename from spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-postgresql.sql rename to spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration/migration-postgresql.sql index 3eac13d8f..c3f08c886 100644 --- a/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-postgresql.sql +++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration/migration-postgresql.sql @@ -1,5 +1,5 @@ ---create the requisite table +-- create the requisite table CREATE TABLE BATCH_JOB_EXECUTION_PARAMS ( JOB_EXECUTION_ID BIGINT NOT NULL , @@ -14,9 +14,9 @@ CREATE TABLE BATCH_JOB_EXECUTION_PARAMS ( references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) ) ; ---insert script that 'copies' existing batch_job_params to batch_job_execution_params ---sets new params to identifying ones ---verified on h2, +-- insert script that 'copies' existing batch_job_params to batch_job_execution_params +-- sets new params to identifying ones +-- verified on h2, INSERT INTO BATCH_JOB_EXECUTION_PARAMS ( JOB_EXECUTION_ID , TYPE_CD, KEY_NAME, STRING_VAL, DATE_VAL, LONG_VAL, DOUBLE_VAL, IDENTIFYING ) diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-sqlf.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration/migration-sqlf.sql similarity index 81% rename from spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-sqlf.sql rename to spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration/migration-sqlf.sql index 3eac13d8f..c3f08c886 100644 --- a/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-sqlf.sql +++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration/migration-sqlf.sql @@ -1,5 +1,5 @@ ---create the requisite table +-- create the requisite table CREATE TABLE BATCH_JOB_EXECUTION_PARAMS ( JOB_EXECUTION_ID BIGINT NOT NULL , @@ -14,9 +14,9 @@ CREATE TABLE BATCH_JOB_EXECUTION_PARAMS ( references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) ) ; ---insert script that 'copies' existing batch_job_params to batch_job_execution_params ---sets new params to identifying ones ---verified on h2, +-- insert script that 'copies' existing batch_job_params to batch_job_execution_params +-- sets new params to identifying ones +-- verified on h2, INSERT INTO BATCH_JOB_EXECUTION_PARAMS ( JOB_EXECUTION_ID , TYPE_CD, KEY_NAME, STRING_VAL, DATE_VAL, LONG_VAL, DOUBLE_VAL, IDENTIFYING ) diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-sqlserver.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration/migration-sqlserver.sql similarity index 81% rename from spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-sqlserver.sql rename to spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration/migration-sqlserver.sql index c3d9e1d10..bacb5a53b 100644 --- a/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-sqlserver.sql +++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration/migration-sqlserver.sql @@ -1,5 +1,5 @@ ---create the requisite table +-- create the requisite table CREATE TABLE BATCH_JOB_EXECUTION_PARAMS ( JOB_EXECUTION_ID BIGINT NOT NULL , @@ -14,9 +14,9 @@ CREATE TABLE BATCH_JOB_EXECUTION_PARAMS ( references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) ) ; ---insert script that 'copies' existing batch_job_params to batch_job_execution_params ---sets new params to identifying ones ---verified on h2, +-- insert script that 'copies' existing batch_job_params to batch_job_execution_params +-- sets new params to identifying ones +-- verified on h2, INSERT INTO BATCH_JOB_EXECUTION_PARAMS ( JOB_EXECUTION_ID , TYPE_CD, KEY_NAME, STRING_VAL, DATE_VAL, LONG_VAL, DOUBLE_VAL, IDENTIFYING ) diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-sybase.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration/migration-sybase.sql similarity index 81% rename from spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-sybase.sql rename to spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration/migration-sybase.sql index 3edba710f..586712c58 100644 --- a/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration-sybase.sql +++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/2.1-to-2.2-migration/migration-sybase.sql @@ -1,5 +1,5 @@ ---create the requisite table +-- create the requisite table CREATE TABLE BATCH_JOB_EXECUTION_PARAMS ( JOB_EXECUTION_ID BIGINT NOT NULL , @@ -14,9 +14,9 @@ CREATE TABLE BATCH_JOB_EXECUTION_PARAMS ( references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) ) ; ---insert script that 'copies' existing batch_job_params to batch_job_execution_params ---sets new params to identifying ones ---verified on h2, +-- insert script that 'copies' existing batch_job_params to batch_job_execution_params +-- sets new params to identifying ones +-- verified on h2, INSERT INTO BATCH_JOB_EXECUTION_PARAMS ( JOB_EXECUTION_ID , TYPE_CD, KEY_NAME, STRING_VAL, DATE_VAL, LONG_VAL, DOUBLE_VAL, IDENTIFYING )