From f3bb44d14e6f11870a7265639838818c6972efd1 Mon Sep 17 00:00:00 2001 From: Michael Minella Date: Fri, 22 Mar 2013 16:24:54 -0500 Subject: [PATCH] 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 )