RESOLVED - issue BATCH-528: Inserting non-date JobParameter fails on MySQL

TIMESTAMP externalized as property with DATETIME value for MySQL

spring-batch-core/src/main/resources/schema-mysql.sql

@@ -21,8 +21,8 @@ CREATE TABLE BATCH_JOB_EXECUTION  (
 	JOB_EXECUTION_ID BIGINT  PRIMARY KEY ,
 	VERSION BIGINT,  
 	JOB_INSTANCE_ID BIGINT NOT NULL,
-	START_TIME TIMESTAMP DEFAULT NULL, 
-	END_TIME TIMESTAMP DEFAULT NULL,
+	START_TIME DATETIME DEFAULT NULL, 
+	END_TIME DATETIME DEFAULT NULL,
 	STATUS VARCHAR(10),
 	CONTINUABLE CHAR(1),
 	EXIT_CODE VARCHAR(20),
@@ -36,7 +36,7 @@ CREATE TABLE BATCH_JOB_PARAMS  (
     TYPE_CD VARCHAR(6) NOT NULL ,
 	KEY_NAME VARCHAR(100) NOT NULL , 
 	STRING_VAL VARCHAR(250) , 
-	DATE_VAL TIMESTAMP DEFAULT NULL,
+	DATE_VAL DATETIME DEFAULT NULL,
 	LONG_VAL BIGINT ,
 	DOUBLE_VAL DOUBLE PRECISION,
 	constraint JOB_INSTANCE_PARAMS_FK foreign key (JOB_INSTANCE_ID)
@@ -48,8 +48,8 @@ CREATE TABLE BATCH_STEP_EXECUTION  (
 	VERSION BIGINT NOT NULL,  
 	STEP_NAME VARCHAR(100) NOT NULL,
 	JOB_EXECUTION_ID BIGINT NOT NULL,
-	START_TIME TIMESTAMP NOT NULL , 
-	END_TIME TIMESTAMP DEFAULT NULL,  
+	START_TIME DATETIME NOT NULL , 
+	END_TIME DATETIME DEFAULT NULL,  
 	STATUS VARCHAR(10),
 	COMMIT_COUNT BIGINT , 
 	ITEM_COUNT BIGINT , 
@@ -65,7 +65,7 @@ CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
     TYPE_CD VARCHAR(6) NOT NULL ,
 	KEY_NAME VARCHAR(1000) NOT NULL , 
 	STRING_VAL VARCHAR(1000) , 
-	DATE_VAL TIMESTAMP DEFAULT NULL ,
+	DATE_VAL DATETIME DEFAULT NULL ,
 	LONG_VAL VARCHAR(10) ,
 	DOUBLE_VAL DOUBLE PRECISION ,
     OBJECT_VAL BLOB,

spring-batch-core/src/main/sql/db2.properties

@@ -4,5 +4,6 @@ BIGINT = BIGINT
 IDENTITY = 
 DOUBLE = DOUBLE PRECISION
 BLOB = BLOB
+TIMESTAMP = TIMESTAMP
 # for generating drop statements...
 SEQUENCE = SEQUENCE

spring-batch-core/src/main/sql/derby.properties

@@ -5,5 +5,6 @@ IDENTITY =
 GENERATED = GENERATED BY DEFAULT AS IDENTITY
 DOUBLE = DOUBLE PRECISION
 BLOB = BLOB
+TIMESTAMP = TIMESTAMP
 # for generating drop statements...
 SEQUENCE = TABLE

spring-batch-core/src/main/sql/hsqldb.properties

@@ -5,5 +5,6 @@ IDENTITY = IDENTITY
 IFEXISTS = IF EXISTS
 DOUBLE = DOUBLE PRECISION
 BLOB = LONGVARBINARY
+TIMESTAMP = TIMESTAMP
 # for generating drop statements...
 SEQUENCE = TABLE

spring-batch-core/src/main/sql/init.sql.vpp

@@ -10,8 +10,8 @@ CREATE TABLE BATCH_JOB_EXECUTION  (
 	JOB_EXECUTION_ID ${BIGINT} $!{IDENTITY} PRIMARY KEY $!{GENERATED},
 	VERSION ${BIGINT},  
 	JOB_INSTANCE_ID ${BIGINT} NOT NULL,
-	START_TIME TIMESTAMP DEFAULT NULL, 
-	END_TIME TIMESTAMP DEFAULT NULL,
+	START_TIME ${TIMESTAMP} DEFAULT NULL, 
+	END_TIME ${TIMESTAMP} DEFAULT NULL,
 	STATUS VARCHAR(10),
 	CONTINUABLE CHAR(1),
 	EXIT_CODE VARCHAR(20),
@@ -25,7 +25,7 @@ CREATE TABLE BATCH_JOB_PARAMS  (
     TYPE_CD VARCHAR(6) NOT NULL ,
 	KEY_NAME VARCHAR(100) NOT NULL , 
 	STRING_VAL VARCHAR(250) , 
-	DATE_VAL TIMESTAMP DEFAULT NULL,
+	DATE_VAL ${TIMESTAMP} DEFAULT NULL,
 	LONG_VAL ${BIGINT} ,
 	DOUBLE_VAL ${DOUBLE},
 	constraint JOB_INSTANCE_PARAMS_FK foreign key (JOB_INSTANCE_ID)
@@ -37,8 +37,8 @@ CREATE TABLE BATCH_STEP_EXECUTION  (
 	VERSION ${BIGINT} NOT NULL,  
 	STEP_NAME VARCHAR(100) NOT NULL,
 	JOB_EXECUTION_ID ${BIGINT} NOT NULL,
-	START_TIME TIMESTAMP NOT NULL , 
-	END_TIME TIMESTAMP DEFAULT NULL,  
+	START_TIME ${TIMESTAMP} NOT NULL , 
+	END_TIME ${TIMESTAMP} DEFAULT NULL,  
 	STATUS VARCHAR(10),
 	COMMIT_COUNT ${BIGINT} , 
 	ITEM_COUNT ${BIGINT} , 
@@ -54,7 +54,7 @@ CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
     TYPE_CD VARCHAR(6) NOT NULL ,
 	KEY_NAME VARCHAR(1000) NOT NULL , 
 	STRING_VAL VARCHAR(1000) , 
-	DATE_VAL TIMESTAMP DEFAULT NULL ,
+	DATE_VAL ${TIMESTAMP} DEFAULT NULL ,
 	LONG_VAL VARCHAR(10) ,
 	DOUBLE_VAL ${DOUBLE} ,
     OBJECT_VAL ${BLOB},

spring-batch-core/src/main/sql/mysql.properties

@@ -7,5 +7,6 @@ VOODOO = type=InnoDB
 IFEXISTSBEFORE = IF EXISTS
 DOUBLE = DOUBLE PRECISION
 BLOB = BLOB
+TIMESTAMP = DATETIME
 # for generating drop statements...
 SEQUENCE = TABLE

spring-batch-core/src/main/sql/oracle10g.properties

@@ -5,5 +5,6 @@ IDENTITY =
 GENERATED = 
 DOUBLE = DOUBLE PRECISION
 BLOB = BLOB
+TIMESTAMP = TIMESTAMP
 # for generating drop statements...
 SEQUENCE = SEQUENCE

spring-batch-core/src/main/sql/postgresql.properties

@@ -5,5 +5,6 @@ IDENTITY =
 GENERATED = 
 DOUBLE = DOUBLE PRECISION
 BLOB = BYTEA
+TIMESTAMP = TIMESTAMP
 # for generating drop statements...
 SEQUENCE = SEQUENCE