From dcdac74657c9550d13bee326d2ed6f144760990c Mon Sep 17 00:00:00 2001 From: dsyer Date: Tue, 15 Jan 2008 13:23:07 +0000 Subject: [PATCH] IN PROGRESS - issue BATCH-277: Add Mysql schema and configurations to the DAO classes http://jira.springframework.org/browse/BATCH-277 Switched order of "IF EXISTS" for MySQL. --- .../src/main/resources/schema-mysql.sql | 69 -------------- .../src/main/sql/destroy.sql.vpp | 16 ++-- .../src/main/sql/mysql.properties | 2 +- .../execution/repository/dao/destroy.sql | 16 ++-- .../main/resources/business-schema-mysql.sql | 89 ------------------- .../src/main/sql/destroy.sql.vpp | 18 ++-- .../src/main/sql/mysql.properties | 2 +- 7 files changed, 27 insertions(+), 185 deletions(-) delete mode 100644 spring-batch-execution/src/main/resources/schema-mysql.sql delete mode 100644 spring-batch-samples/src/main/resources/business-schema-mysql.sql diff --git a/spring-batch-execution/src/main/resources/schema-mysql.sql b/spring-batch-execution/src/main/resources/schema-mysql.sql deleted file mode 100644 index a01cd85eb..000000000 --- a/spring-batch-execution/src/main/resources/schema-mysql.sql +++ /dev/null @@ -1,69 +0,0 @@ --- 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_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; - --- Autogenerated: do not edit this file -CREATE TABLE BATCH_JOB_INSTANCE ( - ID BIGINT unsigned PRIMARY KEY , - VERSION BIGINT, - JOB_NAME VARCHAR(100) NOT NULL , - JOB_KEY VARCHAR(250) , - STATUS VARCHAR(10) ); - -CREATE TABLE BATCH_JOB_EXECUTION ( - ID BIGINT unsigned PRIMARY KEY , - VERSION BIGINT, - JOB_ID BIGINT NOT NULL, - START_TIME TIMESTAMP NOT NULL , - END_TIME TIMESTAMP , - STATUS VARCHAR(10), - CONTINUABLE CHAR(1), - EXIT_CODE VARCHAR(20), - EXIT_MESSAGE VARCHAR(250)); - -CREATE TABLE BATCH_JOB_INSTANCE_PROPERTIES ( - JOB_ID BIGINT NOT NULL , - TYPE_CD VARCHAR(6) NOT NULL , - KEY VARCHAR(100) NOT NULL , - STRING_VAL VARCHAR(250) , - DATE_VAL TIMESTAMP , - LONG_VAL VARCHAR(10) ); - -CREATE TABLE BATCH_STEP_INSTANCE ( - ID BIGINT unsigned PRIMARY KEY , - VERSION BIGINT, - JOB_ID BIGINT NOT NULL, - STEP_NAME VARCHAR(100) NOT NULL, - STATUS VARCHAR(10), - RESTART_DATA VARCHAR(1000)); - -CREATE TABLE BATCH_STEP_EXECUTION ( - ID BIGINT unsigned PRIMARY KEY , - VERSION BIGINT NOT NULL, - STEP_ID BIGINT NOT NULL, - JOB_EXECUTION_ID BIGINT NOT NULL, - START_TIME TIMESTAMP NOT NULL , - END_TIME TIMESTAMP , - STATUS VARCHAR(10), - COMMIT_COUNT BIGINT , - TASK_COUNT BIGINT , - TASK_STATISTICS VARCHAR(1000), - CONTINUABLE CHAR(1), - EXIT_CODE VARCHAR(20), - EXIT_MESSAGE VARCHAR(250)); - -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; -INSERT INTO BATCH_JOB_SEQ values(0); diff --git a/spring-batch-execution/src/main/sql/destroy.sql.vpp b/spring-batch-execution/src/main/sql/destroy.sql.vpp index a14db1e8f..c2260004e 100644 --- a/spring-batch-execution/src/main/sql/destroy.sql.vpp +++ b/spring-batch-execution/src/main/sql/destroy.sql.vpp @@ -1,10 +1,10 @@ -- Autogenerated: do not edit this file -DROP TABLE BATCH_STEP_EXECUTION $!{IFEXISTS}; -DROP TABLE BATCH_JOB_EXECUTION $!{IFEXISTS}; -DROP TABLE BATCH_STEP_INSTANCE $!{IFEXISTS}; -DROP TABLE BATCH_JOB_INSTANCE $!{IFEXISTS}; +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 ${SEQUENCE} BATCH_STEP_EXECUTION_SEQ $!{IFEXISTS}; -DROP ${SEQUENCE} BATCH_STEP_SEQ $!{IFEXISTS}; -DROP ${SEQUENCE} BATCH_JOB_EXECUTION_SEQ $!{IFEXISTS}; -DROP ${SEQUENCE} BATCH_JOB_SEQ $!{IFEXISTS}; \ No newline at end of file +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/mysql.properties b/spring-batch-execution/src/main/sql/mysql.properties index c193d2628..ad5102915 100644 --- a/spring-batch-execution/src/main/sql/mysql.properties +++ b/spring-batch-execution/src/main/sql/mysql.properties @@ -3,6 +3,6 @@ platform=oracle10g BIGINT = BIGINT IDENTITY = unsigned GENERATED = -IFEXISTS = IF EXISTS +IFEXISTSBEFORE = IF EXISTS # for generating drop statements... SEQUENCE = TABLE 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 46008eae7..e26536405 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,10 +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_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_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 +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-samples/src/main/resources/business-schema-mysql.sql b/spring-batch-samples/src/main/resources/business-schema-mysql.sql deleted file mode 100644 index 0cb694b50..000000000 --- a/spring-batch-samples/src/main/resources/business-schema-mysql.sql +++ /dev/null @@ -1,89 +0,0 @@ --- Autogenerated: do not edit this file -DROP TABLE BATCH_STAGING_SEQ IF EXISTS; -DROP TABLE TRADE_SEQ IF EXISTS; -DROP TABLE CUSTOMER_SEQ IF EXISTS; -DROP TABLE BATCH_STAGING IF EXISTS; -DROP TABLE TRADE IF EXISTS; -DROP TABLE CUSTOMER IF EXISTS; -DROP TABLE PLAYERS IF EXISTS; -DROP TABLE GAMES IF EXISTS; -DROP TABLE PLAYER_SUMMARY IF EXISTS; - --- Autogenerated: do not edit this file - -CREATE TABLE CUSTOMER_SEQ (ID BIGINT NOT NULL) type=MYISAM; -INSERT INTO CUSTOMER_SEQ values(0); -CREATE TABLE BATCH_STAGING_SEQ (ID BIGINT NOT NULL) type=MYISAM; -INSERT INTO BATCH_STAGING_SEQ values(0); -CREATE TABLE TRADE_SEQ (ID BIGINT NOT NULL) type=MYISAM; -INSERT INTO TRADE_SEQ values(0); - -CREATE TABLE BATCH_STAGING ( - ID BIGINT unsigned PRIMARY KEY , - JOB_ID BIGINT NOT NULL, - VALUE ${BLOB} NOT NULL, - PROCESSED CHAR(1) NOT NULL -); - -CREATE TABLE TRADE ( - ID BIGINT unsigned PRIMARY KEY , - VERSION BIGINT, - ISIN VARCHAR(45) NOT NULL, - QUANTITY BIGINT, - PRICE FLOAT, - CUSTOMER VARCHAR(45) -); - -CREATE TABLE CUSTOMER ( - ID BIGINT unsigned PRIMARY KEY , - VERSION BIGINT, - NAME VARCHAR(45), - CREDIT FLOAT -); - -INSERT INTO customer (id, version, name, credit) VALUES (1, 0, 'customer1', 100000); -INSERT INTO customer (id, version, name, credit) VALUES (2, 0, 'customer2', 100000); -INSERT INTO customer (id, version, name, credit) VALUES (3, 0, 'customer3', 100000); -INSERT INTO customer (id, version, name, credit) VALUES (4, 0, 'customer4', 100000); - -CREATE TABLE PLAYERS ( - PLAYER_ID char(8) NOT NULL PRIMARY KEY, - LAST_NAME varchar(35) not null, - FIRST_NAME varchar(25) not null, - POS varchar(10), - YEAR_OF_BIRTH BIGINT not null, - YEAR_DRAFTED BIGINT not null -); - -CREATE TABLE GAMES ( - PLAYER_ID char(8) not null, - YEAR_NO BIGINT not null, - TEAM char(3) not null, - WEEK BIGINT not null, - OPPONENT char(3), - COMPLETES BIGINT, - ATTEMPTS BIGINT, - PASSING_YARDS BIGINT, - PASSING_TD BIGINT, - INTERCEPTIONS BIGINT, - RUSHES BIGINT, - RUSH_YARDS BIGINT, - RECEPTIONS BIGINT, - RECEPTIONS_YARDS BIGINT, - TOTAL_TD BIGINT -); - -CREATE TABLE PLAYER_SUMMARY ( - ID CHAR(8) NOT NULL, - YEAR_NO BIGINT NOT NULL, - COMPLETES BIGINT NOT NULL , - ATTEMPTS BIGINT NOT NULL , - PASSING_YARDS BIGINT NOT NULL , - PASSING_TD BIGINT NOT NULL , - INTERCEPTIONS BIGINT NOT NULL , - RUSHES BIGINT NOT NULL , - RUSH_YARDS BIGINT NOT NULL , - RECEPTIONS BIGINT NOT NULL , - RECEPTIONS_YARDS BIGINT NOT NULL , - TOTAL_TD BIGINT NOT NULL -); \ No newline at end of file diff --git a/spring-batch-samples/src/main/sql/destroy.sql.vpp b/spring-batch-samples/src/main/sql/destroy.sql.vpp index 856e6e5b3..8e61a5308 100644 --- a/spring-batch-samples/src/main/sql/destroy.sql.vpp +++ b/spring-batch-samples/src/main/sql/destroy.sql.vpp @@ -1,10 +1,10 @@ -- Autogenerated: do not edit this file -DROP ${SEQUENCE} BATCH_STAGING_SEQ $!{IFEXISTS}; -DROP ${SEQUENCE} TRADE_SEQ $!{IFEXISTS}; -DROP ${SEQUENCE} CUSTOMER_SEQ $!{IFEXISTS}; -DROP TABLE BATCH_STAGING $!{IFEXISTS}; -DROP TABLE TRADE $!{IFEXISTS}; -DROP TABLE CUSTOMER $!{IFEXISTS}; -DROP TABLE PLAYERS $!{IFEXISTS}; -DROP TABLE GAMES $!{IFEXISTS}; -DROP TABLE PLAYER_SUMMARY $!{IFEXISTS}; +DROP ${SEQUENCE} $!{IFEXISTSBEFORE} BATCH_STAGING_SEQ $!{IFEXISTS}; +DROP ${SEQUENCE} $!{IFEXISTSBEFORE} TRADE_SEQ $!{IFEXISTS}; +DROP ${SEQUENCE} $!{IFEXISTSBEFORE} CUSTOMER_SEQ $!{IFEXISTS}; +DROP TABLE $!{IFEXISTSBEFORE} BATCH_STAGING $!{IFEXISTS}; +DROP TABLE $!{IFEXISTSBEFORE} TRADE $!{IFEXISTS}; +DROP TABLE $!{IFEXISTSBEFORE} CUSTOMER $!{IFEXISTS}; +DROP TABLE $!{IFEXISTSBEFORE} PLAYERS $!{IFEXISTS}; +DROP TABLE $!{IFEXISTSBEFORE} GAMES $!{IFEXISTS}; +DROP TABLE $!{IFEXISTSBEFORE} PLAYER_SUMMARY $!{IFEXISTS}; diff --git a/spring-batch-samples/src/main/sql/mysql.properties b/spring-batch-samples/src/main/sql/mysql.properties index c193d2628..ad5102915 100644 --- a/spring-batch-samples/src/main/sql/mysql.properties +++ b/spring-batch-samples/src/main/sql/mysql.properties @@ -3,6 +3,6 @@ platform=oracle10g BIGINT = BIGINT IDENTITY = unsigned GENERATED = -IFEXISTS = IF EXISTS +IFEXISTSBEFORE = IF EXISTS # for generating drop statements... SEQUENCE = TABLE