From 6319efdce6f1816e94a33c9c7b3bb3afba2b6d53 Mon Sep 17 00:00:00 2001 From: dsyer Date: Tue, 29 Jan 2008 11:08:57 +0000 Subject: [PATCH] RESOLVED BATCH-322: Keyword KEY is not allowed in the script mysql http://jira.springframework.org/browse/BATCH-322 --- .../batch/execution/repository/dao/JdbcJobDao.java | 2 +- spring-batch-execution/src/main/resources/schema-db2.sql | 4 ++-- spring-batch-execution/src/main/resources/schema-derby.sql | 4 ++-- spring-batch-execution/src/main/resources/schema-hsqldb.sql | 4 ++-- spring-batch-execution/src/main/resources/schema-mysql.sql | 4 ++-- .../src/main/resources/schema-oracle10g.sql | 4 ++-- .../src/main/resources/schema-postgresql.sql | 4 ++-- spring-batch-execution/src/main/sql/init.sql.vpp | 4 ++-- .../springframework/batch/execution/repository/dao/init.sql | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobDao.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobDao.java index b8dc53837..14c4b698c 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobDao.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobDao.java @@ -60,7 +60,7 @@ public class JdbcJobDao implements JobDao, InitializingBean { private static final String CREATE_JOB = "INSERT into %PREFIX%JOB_INSTANCE(ID, JOB_NAME, JOB_KEY)" + " values (?, ?, ?)"; - private static final String CREATE_JOB_PARAMETERS = "INSERT into %PREFIX%JOB_INSTANCE_PROPERTIES(JOB_ID, KEY, TYPE_CD, " + + private static final String CREATE_JOB_PARAMETERS = "INSERT into %PREFIX%JOB_INSTANCE_PARAMS(JOB_ID, KEY_NAME, TYPE_CD, " + "STRING_VAL, DATE_VAL, LONG_VAL) values (?, ?, ?, ?, ?, ?)"; /** diff --git a/spring-batch-execution/src/main/resources/schema-db2.sql b/spring-batch-execution/src/main/resources/schema-db2.sql index a233da758..0c6e32446 100644 --- a/spring-batch-execution/src/main/resources/schema-db2.sql +++ b/spring-batch-execution/src/main/resources/schema-db2.sql @@ -29,10 +29,10 @@ CREATE TABLE BATCH_JOB_EXECUTION ( EXIT_CODE VARCHAR(20), EXIT_MESSAGE VARCHAR(2500)); -CREATE TABLE BATCH_JOB_INSTANCE_PROPERTIES ( +CREATE TABLE BATCH_JOB_INSTANCE_PARAMS ( JOB_ID BIGINT NOT NULL , TYPE_CD VARCHAR(6) NOT NULL , - KEY VARCHAR(100) NOT NULL , + KEY_NAME VARCHAR(100) NOT NULL , STRING_VAL VARCHAR(250) , DATE_VAL TIMESTAMP , LONG_VAL VARCHAR(10) ); diff --git a/spring-batch-execution/src/main/resources/schema-derby.sql b/spring-batch-execution/src/main/resources/schema-derby.sql index 15c381c40..e4ccfa899 100644 --- a/spring-batch-execution/src/main/resources/schema-derby.sql +++ b/spring-batch-execution/src/main/resources/schema-derby.sql @@ -29,10 +29,10 @@ CREATE TABLE BATCH_JOB_EXECUTION ( EXIT_CODE VARCHAR(20), EXIT_MESSAGE VARCHAR(2500)); -CREATE TABLE BATCH_JOB_INSTANCE_PROPERTIES ( +CREATE TABLE BATCH_JOB_INSTANCE_PARAMS ( JOB_ID BIGINT NOT NULL , TYPE_CD VARCHAR(6) NOT NULL , - KEY VARCHAR(100) NOT NULL , + KEY_NAME VARCHAR(100) NOT NULL , STRING_VAL VARCHAR(250) , DATE_VAL TIMESTAMP , LONG_VAL VARCHAR(10) ); diff --git a/spring-batch-execution/src/main/resources/schema-hsqldb.sql b/spring-batch-execution/src/main/resources/schema-hsqldb.sql index 24434f9d7..ba45ea1a2 100644 --- a/spring-batch-execution/src/main/resources/schema-hsqldb.sql +++ b/spring-batch-execution/src/main/resources/schema-hsqldb.sql @@ -29,10 +29,10 @@ CREATE TABLE BATCH_JOB_EXECUTION ( EXIT_CODE VARCHAR(20), EXIT_MESSAGE VARCHAR(2500)); -CREATE TABLE BATCH_JOB_INSTANCE_PROPERTIES ( +CREATE TABLE BATCH_JOB_INSTANCE_PARAMS ( JOB_ID BIGINT NOT NULL , TYPE_CD VARCHAR(6) NOT NULL , - KEY VARCHAR(100) NOT NULL , + KEY_NAME VARCHAR(100) NOT NULL , STRING_VAL VARCHAR(250) , DATE_VAL TIMESTAMP , LONG_VAL VARCHAR(10) ); diff --git a/spring-batch-execution/src/main/resources/schema-mysql.sql b/spring-batch-execution/src/main/resources/schema-mysql.sql index 35aa1740e..063fd0eb6 100644 --- a/spring-batch-execution/src/main/resources/schema-mysql.sql +++ b/spring-batch-execution/src/main/resources/schema-mysql.sql @@ -29,10 +29,10 @@ CREATE TABLE BATCH_JOB_EXECUTION ( EXIT_CODE VARCHAR(20), EXIT_MESSAGE VARCHAR(2500)); -CREATE TABLE BATCH_JOB_INSTANCE_PROPERTIES ( +CREATE TABLE BATCH_JOB_INSTANCE_PARAMS ( JOB_ID BIGINT NOT NULL , TYPE_CD VARCHAR(6) NOT NULL , - KEY VARCHAR(100) NOT NULL , + KEY_NAME VARCHAR(100) NOT NULL , STRING_VAL VARCHAR(250) , DATE_VAL TIMESTAMP , LONG_VAL VARCHAR(10) ); diff --git a/spring-batch-execution/src/main/resources/schema-oracle10g.sql b/spring-batch-execution/src/main/resources/schema-oracle10g.sql index 9710da69b..88eebfe47 100644 --- a/spring-batch-execution/src/main/resources/schema-oracle10g.sql +++ b/spring-batch-execution/src/main/resources/schema-oracle10g.sql @@ -29,10 +29,10 @@ CREATE TABLE BATCH_JOB_EXECUTION ( EXIT_CODE VARCHAR(20), EXIT_MESSAGE VARCHAR(2500)); -CREATE TABLE BATCH_JOB_INSTANCE_PROPERTIES ( +CREATE TABLE BATCH_JOB_INSTANCE_PARAMS ( JOB_ID BIGINT NOT NULL , TYPE_CD VARCHAR(6) NOT NULL , - KEY VARCHAR(100) NOT NULL , + KEY_NAME VARCHAR(100) NOT NULL , STRING_VAL VARCHAR(250) , DATE_VAL TIMESTAMP , LONG_VAL VARCHAR(10) ); diff --git a/spring-batch-execution/src/main/resources/schema-postgresql.sql b/spring-batch-execution/src/main/resources/schema-postgresql.sql index a233da758..0c6e32446 100644 --- a/spring-batch-execution/src/main/resources/schema-postgresql.sql +++ b/spring-batch-execution/src/main/resources/schema-postgresql.sql @@ -29,10 +29,10 @@ CREATE TABLE BATCH_JOB_EXECUTION ( EXIT_CODE VARCHAR(20), EXIT_MESSAGE VARCHAR(2500)); -CREATE TABLE BATCH_JOB_INSTANCE_PROPERTIES ( +CREATE TABLE BATCH_JOB_INSTANCE_PARAMS ( JOB_ID BIGINT NOT NULL , TYPE_CD VARCHAR(6) NOT NULL , - KEY VARCHAR(100) NOT NULL , + KEY_NAME VARCHAR(100) NOT NULL , STRING_VAL VARCHAR(250) , DATE_VAL TIMESTAMP , LONG_VAL VARCHAR(10) ); diff --git a/spring-batch-execution/src/main/sql/init.sql.vpp b/spring-batch-execution/src/main/sql/init.sql.vpp index 3f491e9c1..a6a7ef23f 100644 --- a/spring-batch-execution/src/main/sql/init.sql.vpp +++ b/spring-batch-execution/src/main/sql/init.sql.vpp @@ -17,10 +17,10 @@ CREATE TABLE BATCH_JOB_EXECUTION ( EXIT_CODE VARCHAR(20), EXIT_MESSAGE VARCHAR(2500)); -CREATE TABLE BATCH_JOB_INSTANCE_PROPERTIES ( +CREATE TABLE BATCH_JOB_INSTANCE_PARAMS ( JOB_ID BIGINT NOT NULL , TYPE_CD VARCHAR(6) NOT NULL , - KEY VARCHAR(100) NOT NULL , + KEY_NAME VARCHAR(100) NOT NULL , STRING_VAL VARCHAR(250) , DATE_VAL TIMESTAMP , LONG_VAL VARCHAR(10) ); diff --git a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/init.sql b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/init.sql index 3d3e2ee9e..10171a06c 100644 --- a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/init.sql +++ b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/init.sql @@ -17,10 +17,10 @@ CREATE TABLE BATCH_JOB_EXECUTION ( EXIT_CODE VARCHAR(20), EXIT_MESSAGE VARCHAR(2500)); -CREATE TABLE BATCH_JOB_INSTANCE_PROPERTIES ( +CREATE TABLE BATCH_JOB_INSTANCE_PARAMS ( JOB_ID BIGINT NOT NULL , TYPE_CD VARCHAR(6) NOT NULL , - KEY VARCHAR(100) NOT NULL , + KEY_NAME VARCHAR(100) NOT NULL , STRING_VAL VARCHAR(250) , DATE_VAL TIMESTAMP , LONG_VAL VARCHAR(10) );