From 644cc19a858981fed656f2d5be53e6e4e0e61cb4 Mon Sep 17 00:00:00 2001 From: dsyer Date: Wed, 12 Dec 2007 22:09:10 +0000 Subject: [PATCH] Fix schema for YEAR reserved word --- .../main/resources/business-schema-db2.sql | 26 +++++++++----- .../main/resources/business-schema-derby.sql | 26 +++++++++----- .../main/resources/business-schema-hsqldb.sql | 36 ++++++++++++------- .../resources/business-schema-oracle10g.sql | 26 +++++++++----- .../resources/business-schema-postgresql.sql | 26 +++++++++----- 5 files changed, 96 insertions(+), 44 deletions(-) diff --git a/spring-batch-samples/src/main/resources/business-schema-db2.sql b/spring-batch-samples/src/main/resources/business-schema-db2.sql index 9a198dd55..11ab84d3a 100644 --- a/spring-batch-samples/src/main/resources/business-schema-db2.sql +++ b/spring-batch-samples/src/main/resources/business-schema-db2.sql @@ -1,13 +1,27 @@ -- Autogenerated: do not edit this file -DROP TABLE TRADE ; +DROP SEQUENCE BATCH_STAGING_SEQ ; DROP SEQUENCE TRADE_SEQ ; -DROP TABLE CUSTOMER ; DROP SEQUENCE CUSTOMER_SEQ ; +DROP TABLE BATCH_STAGING ; +DROP TABLE TRADE ; +DROP TABLE CUSTOMER ; DROP TABLE PLAYERS ; DROP TABLE GAMES ; DROP TABLE PLAYER_SUMMARY ; -- Autogenerated: do not edit this file + +CREATE SEQUENCE CUSTOMER_SEQ; +CREATE SEQUENCE BATCH_STAGING_SEQ; +CREATE SEQUENCE TRADE_SEQ; + +CREATE TABLE BATCH_STAGING ( + ID BIGINT PRIMARY KEY , + JOB_ID BIGINT NOT NULL, + VALUE BLOB NOT NULL, + PROCESSED CHAR(1) NOT NULL +); + CREATE TABLE TRADE ( ID BIGINT PRIMARY KEY , VERSION BIGINT, @@ -17,8 +31,6 @@ CREATE TABLE TRADE ( CUSTOMER VARCHAR(45) ); -CREATE SEQUENCE TRADE_SEQ; - CREATE TABLE CUSTOMER ( ID BIGINT PRIMARY KEY , VERSION BIGINT, @@ -26,8 +38,6 @@ CREATE TABLE CUSTOMER ( CREDIT FLOAT ); -CREATE SEQUENCE CUSTOMER_SEQ; - 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); @@ -44,7 +54,7 @@ CREATE TABLE PLAYERS ( CREATE TABLE GAMES ( PLAYER_ID char(8) not null, - YEAR BIGINT not null, + YEAR_NO BIGINT not null, TEAM char(3) not null, WEEK BIGINT not null, OPPONENT char(3), @@ -62,7 +72,7 @@ CREATE TABLE GAMES ( CREATE TABLE PLAYER_SUMMARY ( ID CHAR(8) NOT NULL, - YEAR BIGINT NOT NULL, + YEAR_NO BIGINT NOT NULL, COMPLETES BIGINT NOT NULL , ATTEMPTS BIGINT NOT NULL , PASSING_YARDS BIGINT NOT NULL , diff --git a/spring-batch-samples/src/main/resources/business-schema-derby.sql b/spring-batch-samples/src/main/resources/business-schema-derby.sql index 7aab25bdf..d62f7c1b8 100644 --- a/spring-batch-samples/src/main/resources/business-schema-derby.sql +++ b/spring-batch-samples/src/main/resources/business-schema-derby.sql @@ -1,13 +1,27 @@ -- Autogenerated: do not edit this file +DROP TABLE BATCH_STAGING_SEQ ; +DROP TABLE TRADE_SEQ ; +DROP TABLE CUSTOMER_SEQ ; +DROP TABLE BATCH_STAGING ; DROP TABLE TRADE ; -DROP SEQUENCE TRADE_SEQ ; DROP TABLE CUSTOMER ; -DROP SEQUENCE CUSTOMER_SEQ ; DROP TABLE PLAYERS ; DROP TABLE GAMES ; DROP TABLE PLAYER_SUMMARY ; -- Autogenerated: do not edit this file + +CREATE TABLE CUSTOMER_SEQ (ID BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, DUMMY VARCHAR(1)); +CREATE TABLE BATCH_STAGING_SEQ (ID BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, DUMMY VARCHAR(1)); +CREATE TABLE TRADE_SEQ (ID BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, DUMMY VARCHAR(1)); + +CREATE TABLE BATCH_STAGING ( + ID BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, + JOB_ID BIGINT NOT NULL, + VALUE BLOB NOT NULL, + PROCESSED CHAR(1) NOT NULL +); + CREATE TABLE TRADE ( ID BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, VERSION BIGINT, @@ -17,8 +31,6 @@ CREATE TABLE TRADE ( CUSTOMER VARCHAR(45) ); -CREATE SEQUENCE TRADE_SEQ; - CREATE TABLE CUSTOMER ( ID BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, VERSION BIGINT, @@ -26,8 +38,6 @@ CREATE TABLE CUSTOMER ( CREDIT FLOAT ); -CREATE SEQUENCE CUSTOMER_SEQ; - 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); @@ -44,7 +54,7 @@ CREATE TABLE PLAYERS ( CREATE TABLE GAMES ( PLAYER_ID char(8) not null, - YEAR BIGINT not null, + YEAR_NO BIGINT not null, TEAM char(3) not null, WEEK BIGINT not null, OPPONENT char(3), @@ -62,7 +72,7 @@ CREATE TABLE GAMES ( CREATE TABLE PLAYER_SUMMARY ( ID CHAR(8) NOT NULL, - YEAR BIGINT NOT NULL, + YEAR_NO BIGINT NOT NULL, COMPLETES BIGINT NOT NULL , ATTEMPTS BIGINT NOT NULL , PASSING_YARDS BIGINT NOT NULL , diff --git a/spring-batch-samples/src/main/resources/business-schema-hsqldb.sql b/spring-batch-samples/src/main/resources/business-schema-hsqldb.sql index 8ce8ab2de..dc0f2c449 100644 --- a/spring-batch-samples/src/main/resources/business-schema-hsqldb.sql +++ b/spring-batch-samples/src/main/resources/business-schema-hsqldb.sql @@ -1,13 +1,33 @@ -- Autogenerated: do not edit this file -DROP TABLE TRADE IF EXISTS; +DROP TABLE BATCH_STAGING_SEQ IF EXISTS; DROP TABLE TRADE_SEQ IF EXISTS; -DROP TABLE CUSTOMER 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 IDENTITY +); +CREATE TABLE BATCH_STAGING_SEQ ( + ID BIGINT IDENTITY +); +CREATE TABLE TRADE_SEQ ( + ID BIGINT IDENTITY +); + +CREATE TABLE BATCH_STAGING ( + ID BIGINT IDENTITY PRIMARY KEY , + JOB_ID BIGINT NOT NULL, + VALUE LONGVARBINARY NOT NULL, + PROCESSED CHAR(1) NOT NULL +); + CREATE TABLE TRADE ( ID BIGINT IDENTITY PRIMARY KEY , VERSION BIGINT, @@ -17,10 +37,6 @@ CREATE TABLE TRADE ( CUSTOMER VARCHAR(45) ); -CREATE TABLE TRADE_SEQ ( - ID BIGINT IDENTITY -); - CREATE TABLE CUSTOMER ( ID BIGINT IDENTITY PRIMARY KEY , VERSION BIGINT, @@ -28,10 +44,6 @@ CREATE TABLE CUSTOMER ( CREDIT FLOAT ); -CREATE TABLE CUSTOMER_SEQ ( - ID BIGINT IDENTITY -); - 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); @@ -48,7 +60,7 @@ CREATE TABLE PLAYERS ( CREATE TABLE GAMES ( PLAYER_ID char(8) not null, - YEAR BIGINT not null, + YEAR_NO BIGINT not null, TEAM char(3) not null, WEEK BIGINT not null, OPPONENT char(3), @@ -66,7 +78,7 @@ CREATE TABLE GAMES ( CREATE TABLE PLAYER_SUMMARY ( ID CHAR(8) NOT NULL, - YEAR BIGINT NOT NULL, + YEAR_NO BIGINT NOT NULL, COMPLETES BIGINT NOT NULL , ATTEMPTS BIGINT NOT NULL , PASSING_YARDS BIGINT NOT NULL , diff --git a/spring-batch-samples/src/main/resources/business-schema-oracle10g.sql b/spring-batch-samples/src/main/resources/business-schema-oracle10g.sql index cc991da91..adca48a3e 100644 --- a/spring-batch-samples/src/main/resources/business-schema-oracle10g.sql +++ b/spring-batch-samples/src/main/resources/business-schema-oracle10g.sql @@ -1,13 +1,27 @@ -- Autogenerated: do not edit this file -DROP TABLE TRADE ; +DROP SEQUENCE BATCH_STAGING_SEQ ; DROP SEQUENCE TRADE_SEQ ; -DROP TABLE CUSTOMER ; DROP SEQUENCE CUSTOMER_SEQ ; +DROP TABLE BATCH_STAGING ; +DROP TABLE TRADE ; +DROP TABLE CUSTOMER ; DROP TABLE PLAYERS ; DROP TABLE GAMES ; DROP TABLE PLAYER_SUMMARY ; -- Autogenerated: do not edit this file + +CREATE SEQUENCE CUSTOMER_SEQ; +CREATE SEQUENCE BATCH_STAGING_SEQ; +CREATE SEQUENCE TRADE_SEQ; + +CREATE TABLE BATCH_STAGING ( + ID NUMBER(38) PRIMARY KEY , + JOB_ID NUMBER(38) NOT NULL, + VALUE BLOB NOT NULL, + PROCESSED CHAR(1) NOT NULL +); + CREATE TABLE TRADE ( ID NUMBER(38) PRIMARY KEY , VERSION NUMBER(38), @@ -17,8 +31,6 @@ CREATE TABLE TRADE ( CUSTOMER VARCHAR(45) ); -CREATE SEQUENCE TRADE_SEQ; - CREATE TABLE CUSTOMER ( ID NUMBER(38) PRIMARY KEY , VERSION NUMBER(38), @@ -26,8 +38,6 @@ CREATE TABLE CUSTOMER ( CREDIT FLOAT ); -CREATE SEQUENCE CUSTOMER_SEQ; - 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); @@ -44,7 +54,7 @@ CREATE TABLE PLAYERS ( CREATE TABLE GAMES ( PLAYER_ID char(8) not null, - YEAR NUMBER(38) not null, + YEAR_NO NUMBER(38) not null, TEAM char(3) not null, WEEK NUMBER(38) not null, OPPONENT char(3), @@ -62,7 +72,7 @@ CREATE TABLE GAMES ( CREATE TABLE PLAYER_SUMMARY ( ID CHAR(8) NOT NULL, - YEAR NUMBER(38) NOT NULL, + YEAR_NO NUMBER(38) NOT NULL, COMPLETES NUMBER(38) NOT NULL , ATTEMPTS NUMBER(38) NOT NULL , PASSING_YARDS NUMBER(38) NOT NULL , diff --git a/spring-batch-samples/src/main/resources/business-schema-postgresql.sql b/spring-batch-samples/src/main/resources/business-schema-postgresql.sql index 9a198dd55..11ab84d3a 100644 --- a/spring-batch-samples/src/main/resources/business-schema-postgresql.sql +++ b/spring-batch-samples/src/main/resources/business-schema-postgresql.sql @@ -1,13 +1,27 @@ -- Autogenerated: do not edit this file -DROP TABLE TRADE ; +DROP SEQUENCE BATCH_STAGING_SEQ ; DROP SEQUENCE TRADE_SEQ ; -DROP TABLE CUSTOMER ; DROP SEQUENCE CUSTOMER_SEQ ; +DROP TABLE BATCH_STAGING ; +DROP TABLE TRADE ; +DROP TABLE CUSTOMER ; DROP TABLE PLAYERS ; DROP TABLE GAMES ; DROP TABLE PLAYER_SUMMARY ; -- Autogenerated: do not edit this file + +CREATE SEQUENCE CUSTOMER_SEQ; +CREATE SEQUENCE BATCH_STAGING_SEQ; +CREATE SEQUENCE TRADE_SEQ; + +CREATE TABLE BATCH_STAGING ( + ID BIGINT PRIMARY KEY , + JOB_ID BIGINT NOT NULL, + VALUE BLOB NOT NULL, + PROCESSED CHAR(1) NOT NULL +); + CREATE TABLE TRADE ( ID BIGINT PRIMARY KEY , VERSION BIGINT, @@ -17,8 +31,6 @@ CREATE TABLE TRADE ( CUSTOMER VARCHAR(45) ); -CREATE SEQUENCE TRADE_SEQ; - CREATE TABLE CUSTOMER ( ID BIGINT PRIMARY KEY , VERSION BIGINT, @@ -26,8 +38,6 @@ CREATE TABLE CUSTOMER ( CREDIT FLOAT ); -CREATE SEQUENCE CUSTOMER_SEQ; - 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); @@ -44,7 +54,7 @@ CREATE TABLE PLAYERS ( CREATE TABLE GAMES ( PLAYER_ID char(8) not null, - YEAR BIGINT not null, + YEAR_NO BIGINT not null, TEAM char(3) not null, WEEK BIGINT not null, OPPONENT char(3), @@ -62,7 +72,7 @@ CREATE TABLE GAMES ( CREATE TABLE PLAYER_SUMMARY ( ID CHAR(8) NOT NULL, - YEAR BIGINT NOT NULL, + YEAR_NO BIGINT NOT NULL, COMPLETES BIGINT NOT NULL , ATTEMPTS BIGINT NOT NULL , PASSING_YARDS BIGINT NOT NULL ,