diff --git a/spring-batch-core/src/main/resources/schema-db2.sql b/spring-batch-core/src/main/resources/schema-db2.sql
index 2cfc46608..8dece8d1e 100644
--- a/spring-batch-core/src/main/resources/schema-db2.sql
+++ b/spring-batch-core/src/main/resources/schema-db2.sql
@@ -9,70 +9,70 @@ DROP SEQUENCE  BATCH_STEP_EXECUTION_SEQ ;
 DROP SEQUENCE  BATCH_JOB_EXECUTION_SEQ ;
 DROP SEQUENCE  BATCH_JOB_SEQ ;
 
--- Autogenerated: do not edit this file
-CREATE TABLE BATCH_JOB_INSTANCE  (
-	JOB_INSTANCE_ID BIGINT  PRIMARY KEY ,  
-	VERSION BIGINT,  
-	JOB_NAME VARCHAR(100) NOT NULL , 
-	JOB_KEY VARCHAR(2500)
-) ;
-
-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,
-	STATUS VARCHAR(10),
-	CONTINUABLE CHAR(1),
-	EXIT_CODE VARCHAR(20),
-	EXIT_MESSAGE VARCHAR(2500),
-	constraint JOB_INSTANCE_EXECUTION_FK foreign key (JOB_INSTANCE_ID)
-	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
-) ;
-	
-CREATE TABLE BATCH_JOB_PARAMS  (
-	JOB_INSTANCE_ID BIGINT NOT NULL ,
-    TYPE_CD VARCHAR(6) NOT NULL ,
-	KEY_NAME VARCHAR(100) NOT NULL , 
-	STRING_VAL VARCHAR(250) , 
-	DATE_VAL TIMESTAMP DEFAULT NULL,
-	LONG_VAL BIGINT ,
-	DOUBLE_VAL DOUBLE PRECISION,
-	constraint JOB_INSTANCE_PARAMS_FK foreign key (JOB_INSTANCE_ID)
-	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
-) ;
-	
-CREATE TABLE BATCH_STEP_EXECUTION  (
-	STEP_EXECUTION_ID BIGINT  PRIMARY KEY ,
-	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,  
-	STATUS VARCHAR(10),
-	COMMIT_COUNT BIGINT , 
-	ITEM_COUNT BIGINT , 
-	CONTINUABLE CHAR(1),
-	EXIT_CODE VARCHAR(20),
-	EXIT_MESSAGE VARCHAR(2500),
-	constraint JOB_EXECUTION_STEP_FK foreign key (JOB_EXECUTION_ID)
-	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
-) ;
-	
-CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
-	STEP_EXECUTION_ID BIGINT NOT NULL ,
-    TYPE_CD VARCHAR(6) NOT NULL ,
-	KEY_NAME VARCHAR(1000) NOT NULL , 
-	STRING_VAL VARCHAR(1000) , 
-	DATE_VAL TIMESTAMP DEFAULT NULL ,
-	LONG_VAL VARCHAR(10) ,
-	DOUBLE_VAL DOUBLE PRECISION ,
-    OBJECT_VAL BLOB,
-	constraint STEP_EXECUTION_CONTEXT_FK foreign key (STEP_EXECUTION_ID)
-	references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
-) ;
-
+-- Autogenerated: do not edit this file
+CREATE TABLE BATCH_JOB_INSTANCE  (
+	JOB_INSTANCE_ID BIGINT  PRIMARY KEY ,  
+	VERSION BIGINT,  
+	JOB_NAME VARCHAR(100) NOT NULL , 
+	JOB_KEY VARCHAR(2500)
+) ;
+
+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,
+	STATUS VARCHAR(10),
+	CONTINUABLE CHAR(1),
+	EXIT_CODE VARCHAR(20),
+	EXIT_MESSAGE VARCHAR(2500),
+	constraint JOB_INSTANCE_EXECUTION_FK foreign key (JOB_INSTANCE_ID)
+	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
+) ;
+	
+CREATE TABLE BATCH_JOB_PARAMS  (
+	JOB_INSTANCE_ID BIGINT NOT NULL ,
+    TYPE_CD VARCHAR(6) NOT NULL ,
+	KEY_NAME VARCHAR(100) NOT NULL , 
+	STRING_VAL VARCHAR(250) , 
+	DATE_VAL TIMESTAMP DEFAULT NULL,
+	LONG_VAL BIGINT ,
+	DOUBLE_VAL DOUBLE PRECISION,
+	constraint JOB_INSTANCE_PARAMS_FK foreign key (JOB_INSTANCE_ID)
+	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
+) ;
+	
+CREATE TABLE BATCH_STEP_EXECUTION  (
+	STEP_EXECUTION_ID BIGINT  PRIMARY KEY ,
+	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,  
+	STATUS VARCHAR(10),
+	COMMIT_COUNT BIGINT , 
+	ITEM_COUNT BIGINT , 
+	CONTINUABLE CHAR(1),
+	EXIT_CODE VARCHAR(20),
+	EXIT_MESSAGE VARCHAR(2500),
+	constraint JOB_EXECUTION_STEP_FK foreign key (JOB_EXECUTION_ID)
+	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
+) ;
+	
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
+	STEP_EXECUTION_ID BIGINT NOT NULL ,
+    TYPE_CD VARCHAR(6) NOT NULL ,
+	KEY_NAME VARCHAR(1000) NOT NULL , 
+	STRING_VAL VARCHAR(1000) , 
+	DATE_VAL TIMESTAMP DEFAULT NULL ,
+	LONG_VAL VARCHAR(10) ,
+	DOUBLE_VAL DOUBLE PRECISION ,
+    OBJECT_VAL BLOB,
+	constraint STEP_EXECUTION_CONTEXT_FK foreign key (STEP_EXECUTION_ID)
+	references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
+) ;
+
 CREATE SEQUENCE BATCH_STEP_EXECUTION_SEQ;
 CREATE SEQUENCE BATCH_JOB_EXECUTION_SEQ;
 CREATE SEQUENCE BATCH_JOB_SEQ;
diff --git a/spring-batch-core/src/main/resources/schema-derby.sql b/spring-batch-core/src/main/resources/schema-derby.sql
index 9e55d5723..d26a2cef8 100644
--- a/spring-batch-core/src/main/resources/schema-derby.sql
+++ b/spring-batch-core/src/main/resources/schema-derby.sql
@@ -9,70 +9,70 @@ DROP TABLE  BATCH_STEP_EXECUTION_SEQ ;
 DROP TABLE  BATCH_JOB_EXECUTION_SEQ ;
 DROP TABLE  BATCH_JOB_SEQ ;
 
--- Autogenerated: do not edit this file
-CREATE TABLE BATCH_JOB_INSTANCE  (
-	JOB_INSTANCE_ID BIGINT  PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,  
-	VERSION BIGINT,  
-	JOB_NAME VARCHAR(100) NOT NULL , 
-	JOB_KEY VARCHAR(2500)
-) ;
-
-CREATE TABLE BATCH_JOB_EXECUTION  (
-	JOB_EXECUTION_ID BIGINT  PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
-	VERSION BIGINT,  
-	JOB_INSTANCE_ID BIGINT NOT NULL,
-	START_TIME TIMESTAMP DEFAULT NULL, 
-	END_TIME TIMESTAMP DEFAULT NULL,
-	STATUS VARCHAR(10),
-	CONTINUABLE CHAR(1),
-	EXIT_CODE VARCHAR(20),
-	EXIT_MESSAGE VARCHAR(2500),
-	constraint JOB_INSTANCE_EXECUTION_FK foreign key (JOB_INSTANCE_ID)
-	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
-) ;
-	
-CREATE TABLE BATCH_JOB_PARAMS  (
-	JOB_INSTANCE_ID BIGINT NOT NULL ,
-    TYPE_CD VARCHAR(6) NOT NULL ,
-	KEY_NAME VARCHAR(100) NOT NULL , 
-	STRING_VAL VARCHAR(250) , 
-	DATE_VAL TIMESTAMP DEFAULT NULL,
-	LONG_VAL BIGINT ,
-	DOUBLE_VAL DOUBLE PRECISION,
-	constraint JOB_INSTANCE_PARAMS_FK foreign key (JOB_INSTANCE_ID)
-	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
-) ;
-	
-CREATE TABLE BATCH_STEP_EXECUTION  (
-	STEP_EXECUTION_ID BIGINT  PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
-	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,  
-	STATUS VARCHAR(10),
-	COMMIT_COUNT BIGINT , 
-	ITEM_COUNT BIGINT , 
-	CONTINUABLE CHAR(1),
-	EXIT_CODE VARCHAR(20),
-	EXIT_MESSAGE VARCHAR(2500),
-	constraint JOB_EXECUTION_STEP_FK foreign key (JOB_EXECUTION_ID)
-	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
-) ;
-	
-CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
-	STEP_EXECUTION_ID BIGINT NOT NULL ,
-    TYPE_CD VARCHAR(6) NOT NULL ,
-	KEY_NAME VARCHAR(1000) NOT NULL , 
-	STRING_VAL VARCHAR(1000) , 
-	DATE_VAL TIMESTAMP DEFAULT NULL ,
-	LONG_VAL VARCHAR(10) ,
-	DOUBLE_VAL DOUBLE PRECISION ,
-    OBJECT_VAL BLOB,
-	constraint STEP_EXECUTION_CONTEXT_FK foreign key (STEP_EXECUTION_ID)
-	references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
-) ;
-
+-- Autogenerated: do not edit this file
+CREATE TABLE BATCH_JOB_INSTANCE  (
+	JOB_INSTANCE_ID BIGINT  PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,  
+	VERSION BIGINT,  
+	JOB_NAME VARCHAR(100) NOT NULL , 
+	JOB_KEY VARCHAR(2500)
+) ;
+
+CREATE TABLE BATCH_JOB_EXECUTION  (
+	JOB_EXECUTION_ID BIGINT  PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
+	VERSION BIGINT,  
+	JOB_INSTANCE_ID BIGINT NOT NULL,
+	START_TIME TIMESTAMP DEFAULT NULL, 
+	END_TIME TIMESTAMP DEFAULT NULL,
+	STATUS VARCHAR(10),
+	CONTINUABLE CHAR(1),
+	EXIT_CODE VARCHAR(20),
+	EXIT_MESSAGE VARCHAR(2500),
+	constraint JOB_INSTANCE_EXECUTION_FK foreign key (JOB_INSTANCE_ID)
+	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
+) ;
+	
+CREATE TABLE BATCH_JOB_PARAMS  (
+	JOB_INSTANCE_ID BIGINT NOT NULL ,
+    TYPE_CD VARCHAR(6) NOT NULL ,
+	KEY_NAME VARCHAR(100) NOT NULL , 
+	STRING_VAL VARCHAR(250) , 
+	DATE_VAL TIMESTAMP DEFAULT NULL,
+	LONG_VAL BIGINT ,
+	DOUBLE_VAL DOUBLE PRECISION,
+	constraint JOB_INSTANCE_PARAMS_FK foreign key (JOB_INSTANCE_ID)
+	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
+) ;
+	
+CREATE TABLE BATCH_STEP_EXECUTION  (
+	STEP_EXECUTION_ID BIGINT  PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
+	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,  
+	STATUS VARCHAR(10),
+	COMMIT_COUNT BIGINT , 
+	ITEM_COUNT BIGINT , 
+	CONTINUABLE CHAR(1),
+	EXIT_CODE VARCHAR(20),
+	EXIT_MESSAGE VARCHAR(2500),
+	constraint JOB_EXECUTION_STEP_FK foreign key (JOB_EXECUTION_ID)
+	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
+) ;
+	
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
+	STEP_EXECUTION_ID BIGINT NOT NULL ,
+    TYPE_CD VARCHAR(6) NOT NULL ,
+	KEY_NAME VARCHAR(1000) NOT NULL , 
+	STRING_VAL VARCHAR(1000) , 
+	DATE_VAL TIMESTAMP DEFAULT NULL ,
+	LONG_VAL VARCHAR(10) ,
+	DOUBLE_VAL DOUBLE PRECISION ,
+    OBJECT_VAL BLOB,
+	constraint STEP_EXECUTION_CONTEXT_FK foreign key (STEP_EXECUTION_ID)
+	references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
+) ;
+
 CREATE TABLE BATCH_STEP_EXECUTION_SEQ (ID BIGINT  PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, DUMMY VARCHAR(1));
 CREATE TABLE BATCH_JOB_EXECUTION_SEQ (ID BIGINT  PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, DUMMY VARCHAR(1));
 CREATE TABLE BATCH_JOB_SEQ (ID BIGINT  PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, DUMMY VARCHAR(1));
diff --git a/spring-batch-core/src/main/resources/schema-hsqldb.sql b/spring-batch-core/src/main/resources/schema-hsqldb.sql
index d8f5ebe18..b4902f8dd 100644
--- a/spring-batch-core/src/main/resources/schema-hsqldb.sql
+++ b/spring-batch-core/src/main/resources/schema-hsqldb.sql
@@ -9,70 +9,70 @@ DROP TABLE  BATCH_STEP_EXECUTION_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  (
-	JOB_INSTANCE_ID BIGINT IDENTITY PRIMARY KEY ,  
-	VERSION BIGINT,  
-	JOB_NAME VARCHAR(100) NOT NULL , 
-	JOB_KEY VARCHAR(2500)
-) ;
-
-CREATE TABLE BATCH_JOB_EXECUTION  (
-	JOB_EXECUTION_ID BIGINT IDENTITY PRIMARY KEY ,
-	VERSION BIGINT,  
-	JOB_INSTANCE_ID BIGINT NOT NULL,
-	START_TIME TIMESTAMP DEFAULT NULL, 
-	END_TIME TIMESTAMP DEFAULT NULL,
-	STATUS VARCHAR(10),
-	CONTINUABLE CHAR(1),
-	EXIT_CODE VARCHAR(20),
-	EXIT_MESSAGE VARCHAR(2500),
-	constraint JOB_INSTANCE_EXECUTION_FK foreign key (JOB_INSTANCE_ID)
-	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
-) ;
-	
-CREATE TABLE BATCH_JOB_PARAMS  (
-	JOB_INSTANCE_ID BIGINT NOT NULL ,
-    TYPE_CD VARCHAR(6) NOT NULL ,
-	KEY_NAME VARCHAR(100) NOT NULL , 
-	STRING_VAL VARCHAR(250) , 
-	DATE_VAL TIMESTAMP DEFAULT NULL,
-	LONG_VAL BIGINT ,
-	DOUBLE_VAL DOUBLE PRECISION,
-	constraint JOB_INSTANCE_PARAMS_FK foreign key (JOB_INSTANCE_ID)
-	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
-) ;
-	
-CREATE TABLE BATCH_STEP_EXECUTION  (
-	STEP_EXECUTION_ID BIGINT IDENTITY PRIMARY KEY ,
-	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,  
-	STATUS VARCHAR(10),
-	COMMIT_COUNT BIGINT , 
-	ITEM_COUNT BIGINT , 
-	CONTINUABLE CHAR(1),
-	EXIT_CODE VARCHAR(20),
-	EXIT_MESSAGE VARCHAR(2500),
-	constraint JOB_EXECUTION_STEP_FK foreign key (JOB_EXECUTION_ID)
-	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
-) ;
-	
-CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
-	STEP_EXECUTION_ID BIGINT NOT NULL ,
-    TYPE_CD VARCHAR(6) NOT NULL ,
-	KEY_NAME VARCHAR(1000) NOT NULL , 
-	STRING_VAL VARCHAR(1000) , 
-	DATE_VAL TIMESTAMP DEFAULT NULL ,
-	LONG_VAL VARCHAR(10) ,
-	DOUBLE_VAL DOUBLE PRECISION ,
-    OBJECT_VAL LONGVARBINARY,
-	constraint STEP_EXECUTION_CONTEXT_FK foreign key (STEP_EXECUTION_ID)
-	references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
-) ;
-
+-- Autogenerated: do not edit this file
+CREATE TABLE BATCH_JOB_INSTANCE  (
+	JOB_INSTANCE_ID BIGINT IDENTITY PRIMARY KEY ,  
+	VERSION BIGINT,  
+	JOB_NAME VARCHAR(100) NOT NULL , 
+	JOB_KEY VARCHAR(2500)
+) ;
+
+CREATE TABLE BATCH_JOB_EXECUTION  (
+	JOB_EXECUTION_ID BIGINT IDENTITY PRIMARY KEY ,
+	VERSION BIGINT,  
+	JOB_INSTANCE_ID BIGINT NOT NULL,
+	START_TIME TIMESTAMP DEFAULT NULL, 
+	END_TIME TIMESTAMP DEFAULT NULL,
+	STATUS VARCHAR(10),
+	CONTINUABLE CHAR(1),
+	EXIT_CODE VARCHAR(20),
+	EXIT_MESSAGE VARCHAR(2500),
+	constraint JOB_INSTANCE_EXECUTION_FK foreign key (JOB_INSTANCE_ID)
+	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
+) ;
+	
+CREATE TABLE BATCH_JOB_PARAMS  (
+	JOB_INSTANCE_ID BIGINT NOT NULL ,
+    TYPE_CD VARCHAR(6) NOT NULL ,
+	KEY_NAME VARCHAR(100) NOT NULL , 
+	STRING_VAL VARCHAR(250) , 
+	DATE_VAL TIMESTAMP DEFAULT NULL,
+	LONG_VAL BIGINT ,
+	DOUBLE_VAL DOUBLE PRECISION,
+	constraint JOB_INSTANCE_PARAMS_FK foreign key (JOB_INSTANCE_ID)
+	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
+) ;
+	
+CREATE TABLE BATCH_STEP_EXECUTION  (
+	STEP_EXECUTION_ID BIGINT IDENTITY PRIMARY KEY ,
+	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,  
+	STATUS VARCHAR(10),
+	COMMIT_COUNT BIGINT , 
+	ITEM_COUNT BIGINT , 
+	CONTINUABLE CHAR(1),
+	EXIT_CODE VARCHAR(20),
+	EXIT_MESSAGE VARCHAR(2500),
+	constraint JOB_EXECUTION_STEP_FK foreign key (JOB_EXECUTION_ID)
+	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
+) ;
+	
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
+	STEP_EXECUTION_ID BIGINT NOT NULL ,
+    TYPE_CD VARCHAR(6) NOT NULL ,
+	KEY_NAME VARCHAR(1000) NOT NULL , 
+	STRING_VAL VARCHAR(1000) , 
+	DATE_VAL TIMESTAMP DEFAULT NULL ,
+	LONG_VAL VARCHAR(10) ,
+	DOUBLE_VAL DOUBLE PRECISION ,
+    OBJECT_VAL LONGVARBINARY,
+	constraint STEP_EXECUTION_CONTEXT_FK foreign key (STEP_EXECUTION_ID)
+	references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
+) ;
+
 CREATE TABLE BATCH_STEP_EXECUTION_SEQ (
 	ID BIGINT IDENTITY
 );
diff --git a/spring-batch-core/src/main/resources/schema-mysql.sql b/spring-batch-core/src/main/resources/schema-mysql.sql
index 8d0af37e3..426bef64c 100644
--- a/spring-batch-core/src/main/resources/schema-mysql.sql
+++ b/spring-batch-core/src/main/resources/schema-mysql.sql
@@ -9,70 +9,70 @@ DROP TABLE IF EXISTS BATCH_STEP_EXECUTION_SEQ ;
 DROP TABLE IF EXISTS BATCH_JOB_EXECUTION_SEQ ;
 DROP TABLE IF EXISTS BATCH_JOB_SEQ ;
 
--- Autogenerated: do not edit this file
-CREATE TABLE BATCH_JOB_INSTANCE  (
-	JOB_INSTANCE_ID BIGINT  PRIMARY KEY ,  
-	VERSION BIGINT,  
-	JOB_NAME VARCHAR(100) NOT NULL , 
-	JOB_KEY VARCHAR(2500)
-) type=InnoDB;
-
-CREATE TABLE BATCH_JOB_EXECUTION  (
-	JOB_EXECUTION_ID BIGINT  PRIMARY KEY ,
-	VERSION BIGINT,  
-	JOB_INSTANCE_ID BIGINT NOT NULL,
-	START_TIME DATETIME DEFAULT NULL, 
-	END_TIME DATETIME DEFAULT NULL,
-	STATUS VARCHAR(10),
-	CONTINUABLE CHAR(1),
-	EXIT_CODE VARCHAR(20),
-	EXIT_MESSAGE VARCHAR(2500),
-	constraint JOB_INSTANCE_EXECUTION_FK foreign key (JOB_INSTANCE_ID)
-	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
-) type=InnoDB;
-	
-CREATE TABLE BATCH_JOB_PARAMS  (
-	JOB_INSTANCE_ID BIGINT NOT NULL ,
-    TYPE_CD VARCHAR(6) NOT NULL ,
-	KEY_NAME VARCHAR(100) NOT NULL , 
-	STRING_VAL VARCHAR(250) , 
-	DATE_VAL DATETIME DEFAULT NULL,
-	LONG_VAL BIGINT ,
-	DOUBLE_VAL DOUBLE PRECISION,
-	constraint JOB_INSTANCE_PARAMS_FK foreign key (JOB_INSTANCE_ID)
-	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
-) type=InnoDB;
-	
-CREATE TABLE BATCH_STEP_EXECUTION  (
-	STEP_EXECUTION_ID BIGINT  PRIMARY KEY ,
-	VERSION BIGINT NOT NULL,  
-	STEP_NAME VARCHAR(100) NOT NULL,
-	JOB_EXECUTION_ID BIGINT NOT NULL,
-	START_TIME DATETIME NOT NULL , 
-	END_TIME DATETIME DEFAULT NULL,  
-	STATUS VARCHAR(10),
-	COMMIT_COUNT BIGINT , 
-	ITEM_COUNT BIGINT , 
-	CONTINUABLE CHAR(1),
-	EXIT_CODE VARCHAR(20),
-	EXIT_MESSAGE VARCHAR(2500),
-	constraint JOB_EXECUTION_STEP_FK foreign key (JOB_EXECUTION_ID)
-	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
-) type=InnoDB;
-	
-CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
-	STEP_EXECUTION_ID BIGINT NOT NULL ,
-    TYPE_CD VARCHAR(6) NOT NULL ,
-	KEY_NAME VARCHAR(1000) NOT NULL , 
-	STRING_VAL VARCHAR(1000) , 
-	DATE_VAL DATETIME DEFAULT NULL ,
-	LONG_VAL VARCHAR(10) ,
-	DOUBLE_VAL DOUBLE PRECISION ,
-    OBJECT_VAL BLOB,
-	constraint STEP_EXECUTION_CONTEXT_FK foreign key (STEP_EXECUTION_ID)
-	references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
-) type=InnoDB;
-
+-- Autogenerated: do not edit this file
+CREATE TABLE BATCH_JOB_INSTANCE  (
+	JOB_INSTANCE_ID BIGINT  PRIMARY KEY ,  
+	VERSION BIGINT,  
+	JOB_NAME VARCHAR(100) NOT NULL , 
+	JOB_KEY VARCHAR(2500)
+) type=InnoDB;
+
+CREATE TABLE BATCH_JOB_EXECUTION  (
+	JOB_EXECUTION_ID BIGINT  PRIMARY KEY ,
+	VERSION BIGINT,  
+	JOB_INSTANCE_ID BIGINT NOT NULL,
+	START_TIME DATETIME DEFAULT NULL, 
+	END_TIME DATETIME DEFAULT NULL,
+	STATUS VARCHAR(10),
+	CONTINUABLE CHAR(1),
+	EXIT_CODE VARCHAR(20),
+	EXIT_MESSAGE VARCHAR(2500),
+	constraint JOB_INSTANCE_EXECUTION_FK foreign key (JOB_INSTANCE_ID)
+	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
+) type=InnoDB;
+	
+CREATE TABLE BATCH_JOB_PARAMS  (
+	JOB_INSTANCE_ID BIGINT NOT NULL ,
+    TYPE_CD VARCHAR(6) NOT NULL ,
+	KEY_NAME VARCHAR(100) NOT NULL , 
+	STRING_VAL VARCHAR(250) , 
+	DATE_VAL DATETIME DEFAULT NULL,
+	LONG_VAL BIGINT ,
+	DOUBLE_VAL DOUBLE PRECISION,
+	constraint JOB_INSTANCE_PARAMS_FK foreign key (JOB_INSTANCE_ID)
+	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
+) type=InnoDB;
+	
+CREATE TABLE BATCH_STEP_EXECUTION  (
+	STEP_EXECUTION_ID BIGINT  PRIMARY KEY ,
+	VERSION BIGINT NOT NULL,  
+	STEP_NAME VARCHAR(100) NOT NULL,
+	JOB_EXECUTION_ID BIGINT NOT NULL,
+	START_TIME DATETIME NOT NULL , 
+	END_TIME DATETIME DEFAULT NULL,  
+	STATUS VARCHAR(10),
+	COMMIT_COUNT BIGINT , 
+	ITEM_COUNT BIGINT , 
+	CONTINUABLE CHAR(1),
+	EXIT_CODE VARCHAR(20),
+	EXIT_MESSAGE VARCHAR(2500),
+	constraint JOB_EXECUTION_STEP_FK foreign key (JOB_EXECUTION_ID)
+	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
+) type=InnoDB;
+	
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
+	STEP_EXECUTION_ID BIGINT NOT NULL ,
+    TYPE_CD VARCHAR(6) NOT NULL ,
+	KEY_NAME VARCHAR(1000) NOT NULL , 
+	STRING_VAL VARCHAR(1000) , 
+	DATE_VAL DATETIME DEFAULT NULL ,
+	LONG_VAL VARCHAR(10) ,
+	DOUBLE_VAL DOUBLE PRECISION ,
+    OBJECT_VAL BLOB,
+	constraint STEP_EXECUTION_CONTEXT_FK foreign key (STEP_EXECUTION_ID)
+	references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
+) type=InnoDB;
+
 CREATE TABLE BATCH_STEP_EXECUTION_SEQ (ID BIGINT NOT NULL) type=MYISAM;
 INSERT INTO BATCH_STEP_EXECUTION_SEQ values(0);
 CREATE TABLE BATCH_JOB_EXECUTION_SEQ (ID BIGINT NOT NULL) type=MYISAM;
diff --git a/spring-batch-core/src/main/resources/schema-oracle10g.sql b/spring-batch-core/src/main/resources/schema-oracle10g.sql
index 783d4551a..365a8a987 100644
--- a/spring-batch-core/src/main/resources/schema-oracle10g.sql
+++ b/spring-batch-core/src/main/resources/schema-oracle10g.sql
@@ -9,70 +9,70 @@ DROP SEQUENCE  BATCH_STEP_EXECUTION_SEQ ;
 DROP SEQUENCE  BATCH_JOB_EXECUTION_SEQ ;
 DROP SEQUENCE  BATCH_JOB_SEQ ;
 
--- Autogenerated: do not edit this file
-CREATE TABLE BATCH_JOB_INSTANCE  (
-	JOB_INSTANCE_ID NUMBER(38)  PRIMARY KEY ,  
-	VERSION NUMBER(38),  
-	JOB_NAME VARCHAR(100) NOT NULL , 
-	JOB_KEY VARCHAR(2500)
-) ;
-
-CREATE TABLE BATCH_JOB_EXECUTION  (
-	JOB_EXECUTION_ID NUMBER(38)  PRIMARY KEY ,
-	VERSION NUMBER(38),  
-	JOB_INSTANCE_ID NUMBER(38) NOT NULL,
-	START_TIME TIMESTAMP DEFAULT NULL, 
-	END_TIME TIMESTAMP DEFAULT NULL,
-	STATUS VARCHAR(10),
-	CONTINUABLE CHAR(1),
-	EXIT_CODE VARCHAR(20),
-	EXIT_MESSAGE VARCHAR(2500),
-	constraint JOB_INSTANCE_EXECUTION_FK foreign key (JOB_INSTANCE_ID)
-	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
-) ;
-	
-CREATE TABLE BATCH_JOB_PARAMS  (
-	JOB_INSTANCE_ID NUMBER(38) NOT NULL ,
-    TYPE_CD VARCHAR(6) NOT NULL ,
-	KEY_NAME VARCHAR(100) NOT NULL , 
-	STRING_VAL VARCHAR(250) , 
-	DATE_VAL TIMESTAMP DEFAULT NULL,
-	LONG_VAL NUMBER(38) ,
-	DOUBLE_VAL DOUBLE PRECISION,
-	constraint JOB_INSTANCE_PARAMS_FK foreign key (JOB_INSTANCE_ID)
-	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
-) ;
-	
-CREATE TABLE BATCH_STEP_EXECUTION  (
-	STEP_EXECUTION_ID NUMBER(38)  PRIMARY KEY ,
-	VERSION NUMBER(38) NOT NULL,  
-	STEP_NAME VARCHAR(100) NOT NULL,
-	JOB_EXECUTION_ID NUMBER(38) NOT NULL,
-	START_TIME TIMESTAMP NOT NULL , 
-	END_TIME TIMESTAMP DEFAULT NULL,  
-	STATUS VARCHAR(10),
-	COMMIT_COUNT NUMBER(38) , 
-	ITEM_COUNT NUMBER(38) , 
-	CONTINUABLE CHAR(1),
-	EXIT_CODE VARCHAR(20),
-	EXIT_MESSAGE VARCHAR(2500),
-	constraint JOB_EXECUTION_STEP_FK foreign key (JOB_EXECUTION_ID)
-	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
-) ;
-	
-CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
-	STEP_EXECUTION_ID NUMBER(38) NOT NULL ,
-    TYPE_CD VARCHAR(6) NOT NULL ,
-	KEY_NAME VARCHAR(1000) NOT NULL , 
-	STRING_VAL VARCHAR(1000) , 
-	DATE_VAL TIMESTAMP DEFAULT NULL ,
-	LONG_VAL VARCHAR(10) ,
-	DOUBLE_VAL DOUBLE PRECISION ,
-    OBJECT_VAL BLOB,
-	constraint STEP_EXECUTION_CONTEXT_FK foreign key (STEP_EXECUTION_ID)
-	references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
-) ;
-
+-- Autogenerated: do not edit this file
+CREATE TABLE BATCH_JOB_INSTANCE  (
+	JOB_INSTANCE_ID NUMBER(38)  PRIMARY KEY ,  
+	VERSION NUMBER(38),  
+	JOB_NAME VARCHAR2(100) NOT NULL , 
+	JOB_KEY VARCHAR2(2500)
+) ;
+
+CREATE TABLE BATCH_JOB_EXECUTION  (
+	JOB_EXECUTION_ID NUMBER(38)  PRIMARY KEY ,
+	VERSION NUMBER(38),  
+	JOB_INSTANCE_ID NUMBER(38) NOT NULL,
+	START_TIME TIMESTAMP DEFAULT NULL, 
+	END_TIME TIMESTAMP DEFAULT NULL,
+	STATUS VARCHAR2(10),
+	CONTINUABLE CHAR(1),
+	EXIT_CODE VARCHAR2(20),
+	EXIT_MESSAGE VARCHAR2(2500),
+	constraint JOB_INSTANCE_EXECUTION_FK foreign key (JOB_INSTANCE_ID)
+	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
+) ;
+	
+CREATE TABLE BATCH_JOB_PARAMS  (
+	JOB_INSTANCE_ID NUMBER(38) NOT NULL ,
+    TYPE_CD VARCHAR2(6) NOT NULL ,
+	KEY_NAME VARCHAR2(100) NOT NULL , 
+	STRING_VAL VARCHAR2(250) , 
+	DATE_VAL TIMESTAMP DEFAULT NULL,
+	LONG_VAL NUMBER(38) ,
+	DOUBLE_VAL NUMBER,
+	constraint JOB_INSTANCE_PARAMS_FK foreign key (JOB_INSTANCE_ID)
+	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
+) ;
+	
+CREATE TABLE BATCH_STEP_EXECUTION  (
+	STEP_EXECUTION_ID NUMBER(38)  PRIMARY KEY ,
+	VERSION NUMBER(38) NOT NULL,  
+	STEP_NAME VARCHAR2(100) NOT NULL,
+	JOB_EXECUTION_ID NUMBER(38) NOT NULL,
+	START_TIME TIMESTAMP NOT NULL , 
+	END_TIME TIMESTAMP DEFAULT NULL,  
+	STATUS VARCHAR2(10),
+	COMMIT_COUNT NUMBER(38) , 
+	ITEM_COUNT NUMBER(38) , 
+	CONTINUABLE CHAR(1),
+	EXIT_CODE VARCHAR2(20),
+	EXIT_MESSAGE VARCHAR2(2500),
+	constraint JOB_EXECUTION_STEP_FK foreign key (JOB_EXECUTION_ID)
+	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
+) ;
+	
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
+	STEP_EXECUTION_ID NUMBER(38) NOT NULL ,
+    TYPE_CD VARCHAR2(6) NOT NULL ,
+	KEY_NAME VARCHAR2(1000) NOT NULL , 
+	STRING_VAL VARCHAR2(1000) , 
+	DATE_VAL TIMESTAMP DEFAULT NULL ,
+	LONG_VAL VARCHAR2(10) ,
+	DOUBLE_VAL NUMBER ,
+    OBJECT_VAL BLOB,
+	constraint STEP_EXECUTION_CONTEXT_FK foreign key (STEP_EXECUTION_ID)
+	references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
+) ;
+
 CREATE SEQUENCE BATCH_STEP_EXECUTION_SEQ;
 CREATE SEQUENCE BATCH_JOB_EXECUTION_SEQ;
 CREATE SEQUENCE BATCH_JOB_SEQ;
diff --git a/spring-batch-core/src/main/resources/schema-postgresql.sql b/spring-batch-core/src/main/resources/schema-postgresql.sql
index 3d349d253..fe52aadf6 100644
--- a/spring-batch-core/src/main/resources/schema-postgresql.sql
+++ b/spring-batch-core/src/main/resources/schema-postgresql.sql
@@ -9,70 +9,70 @@ DROP SEQUENCE  BATCH_STEP_EXECUTION_SEQ ;
 DROP SEQUENCE  BATCH_JOB_EXECUTION_SEQ ;
 DROP SEQUENCE  BATCH_JOB_SEQ ;
 
--- Autogenerated: do not edit this file
-CREATE TABLE BATCH_JOB_INSTANCE  (
-	JOB_INSTANCE_ID BIGINT  PRIMARY KEY ,  
-	VERSION BIGINT,  
-	JOB_NAME VARCHAR(100) NOT NULL , 
-	JOB_KEY VARCHAR(2500)
-) ;
-
-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,
-	STATUS VARCHAR(10),
-	CONTINUABLE CHAR(1),
-	EXIT_CODE VARCHAR(20),
-	EXIT_MESSAGE VARCHAR(2500),
-	constraint JOB_INSTANCE_EXECUTION_FK foreign key (JOB_INSTANCE_ID)
-	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
-) ;
-	
-CREATE TABLE BATCH_JOB_PARAMS  (
-	JOB_INSTANCE_ID BIGINT NOT NULL ,
-    TYPE_CD VARCHAR(6) NOT NULL ,
-	KEY_NAME VARCHAR(100) NOT NULL , 
-	STRING_VAL VARCHAR(250) , 
-	DATE_VAL TIMESTAMP DEFAULT NULL,
-	LONG_VAL BIGINT ,
-	DOUBLE_VAL DOUBLE PRECISION,
-	constraint JOB_INSTANCE_PARAMS_FK foreign key (JOB_INSTANCE_ID)
-	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
-) ;
-	
-CREATE TABLE BATCH_STEP_EXECUTION  (
-	STEP_EXECUTION_ID BIGINT  PRIMARY KEY ,
-	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,  
-	STATUS VARCHAR(10),
-	COMMIT_COUNT BIGINT , 
-	ITEM_COUNT BIGINT , 
-	CONTINUABLE CHAR(1),
-	EXIT_CODE VARCHAR(20),
-	EXIT_MESSAGE VARCHAR(2500),
-	constraint JOB_EXECUTION_STEP_FK foreign key (JOB_EXECUTION_ID)
-	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
-) ;
-	
-CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
-	STEP_EXECUTION_ID BIGINT NOT NULL ,
-    TYPE_CD VARCHAR(6) NOT NULL ,
-	KEY_NAME VARCHAR(1000) NOT NULL , 
-	STRING_VAL VARCHAR(1000) , 
-	DATE_VAL TIMESTAMP DEFAULT NULL ,
-	LONG_VAL VARCHAR(10) ,
-	DOUBLE_VAL DOUBLE PRECISION ,
-    OBJECT_VAL BYTEA,
-	constraint STEP_EXECUTION_CONTEXT_FK foreign key (STEP_EXECUTION_ID)
-	references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
-) ;
-
+-- Autogenerated: do not edit this file
+CREATE TABLE BATCH_JOB_INSTANCE  (
+	JOB_INSTANCE_ID BIGINT  PRIMARY KEY ,  
+	VERSION BIGINT,  
+	JOB_NAME VARCHAR(100) NOT NULL , 
+	JOB_KEY VARCHAR(2500)
+) ;
+
+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,
+	STATUS VARCHAR(10),
+	CONTINUABLE CHAR(1),
+	EXIT_CODE VARCHAR(20),
+	EXIT_MESSAGE VARCHAR(2500),
+	constraint JOB_INSTANCE_EXECUTION_FK foreign key (JOB_INSTANCE_ID)
+	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
+) ;
+	
+CREATE TABLE BATCH_JOB_PARAMS  (
+	JOB_INSTANCE_ID BIGINT NOT NULL ,
+    TYPE_CD VARCHAR(6) NOT NULL ,
+	KEY_NAME VARCHAR(100) NOT NULL , 
+	STRING_VAL VARCHAR(250) , 
+	DATE_VAL TIMESTAMP DEFAULT NULL,
+	LONG_VAL BIGINT ,
+	DOUBLE_VAL DOUBLE PRECISION,
+	constraint JOB_INSTANCE_PARAMS_FK foreign key (JOB_INSTANCE_ID)
+	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
+) ;
+	
+CREATE TABLE BATCH_STEP_EXECUTION  (
+	STEP_EXECUTION_ID BIGINT  PRIMARY KEY ,
+	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,  
+	STATUS VARCHAR(10),
+	COMMIT_COUNT BIGINT , 
+	ITEM_COUNT BIGINT , 
+	CONTINUABLE CHAR(1),
+	EXIT_CODE VARCHAR(20),
+	EXIT_MESSAGE VARCHAR(2500),
+	constraint JOB_EXECUTION_STEP_FK foreign key (JOB_EXECUTION_ID)
+	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
+) ;
+	
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
+	STEP_EXECUTION_ID BIGINT NOT NULL ,
+    TYPE_CD VARCHAR(6) NOT NULL ,
+	KEY_NAME VARCHAR(1000) NOT NULL , 
+	STRING_VAL VARCHAR(1000) , 
+	DATE_VAL TIMESTAMP DEFAULT NULL ,
+	LONG_VAL VARCHAR(10) ,
+	DOUBLE_VAL DOUBLE PRECISION ,
+    OBJECT_VAL BYTEA,
+	constraint STEP_EXECUTION_CONTEXT_FK foreign key (STEP_EXECUTION_ID)
+	references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
+) ;
+
 CREATE SEQUENCE BATCH_STEP_EXECUTION_SEQ;
 CREATE SEQUENCE BATCH_JOB_EXECUTION_SEQ;
 CREATE SEQUENCE BATCH_JOB_SEQ;
diff --git a/spring-batch-core/src/main/sql/db2.properties b/spring-batch-core/src/main/sql/db2.properties
index 367d1fd83..5c58989a7 100644
--- a/spring-batch-core/src/main/sql/db2.properties
+++ b/spring-batch-core/src/main/sql/db2.properties
@@ -5,5 +5,6 @@ IDENTITY =
 DOUBLE = DOUBLE PRECISION
 BLOB = BLOB
 TIMESTAMP = TIMESTAMP
+VARCHAR = VARCHAR
 # for generating drop statements...
 SEQUENCE = SEQUENCE
diff --git a/spring-batch-core/src/main/sql/derby.properties b/spring-batch-core/src/main/sql/derby.properties
index 2e0382cb0..0c98e78fa 100644
--- a/spring-batch-core/src/main/sql/derby.properties
+++ b/spring-batch-core/src/main/sql/derby.properties
@@ -6,5 +6,6 @@ GENERATED = GENERATED BY DEFAULT AS IDENTITY
 DOUBLE = DOUBLE PRECISION
 BLOB = BLOB
 TIMESTAMP = TIMESTAMP
+VARCHAR = VARCHAR
 # for generating drop statements...
 SEQUENCE = TABLE
diff --git a/spring-batch-core/src/main/sql/hsqldb.properties b/spring-batch-core/src/main/sql/hsqldb.properties
index 940445db8..220cd60e8 100644
--- a/spring-batch-core/src/main/sql/hsqldb.properties
+++ b/spring-batch-core/src/main/sql/hsqldb.properties
@@ -6,5 +6,6 @@ IFEXISTS = IF EXISTS
 DOUBLE = DOUBLE PRECISION
 BLOB = LONGVARBINARY
 TIMESTAMP = TIMESTAMP
+VARCHAR = VARCHAR
 # for generating drop statements...
 SEQUENCE = TABLE
diff --git a/spring-batch-core/src/main/sql/init.sql.vpp b/spring-batch-core/src/main/sql/init.sql.vpp
index 1feb8b4e2..d03b9a4cf 100644
--- a/spring-batch-core/src/main/sql/init.sql.vpp
+++ b/spring-batch-core/src/main/sql/init.sql.vpp
@@ -2,8 +2,8 @@
 CREATE TABLE BATCH_JOB_INSTANCE  (
 	JOB_INSTANCE_ID ${BIGINT} $!{IDENTITY} PRIMARY KEY $!{GENERATED},  
 	VERSION ${BIGINT},  
-	JOB_NAME VARCHAR(100) NOT NULL , 
-	JOB_KEY VARCHAR(2500)
+	JOB_NAME ${VARCHAR}(100) NOT NULL , 
+	JOB_KEY ${VARCHAR}(2500)
 ) $!{VOODOO};
 
 CREATE TABLE BATCH_JOB_EXECUTION  (
@@ -12,19 +12,19 @@ CREATE TABLE BATCH_JOB_EXECUTION  (
 	JOB_INSTANCE_ID ${BIGINT} NOT NULL,
 	START_TIME ${TIMESTAMP} DEFAULT NULL, 
 	END_TIME ${TIMESTAMP} DEFAULT NULL,
-	STATUS VARCHAR(10),
+	STATUS ${VARCHAR}(10),
 	CONTINUABLE CHAR(1),
-	EXIT_CODE VARCHAR(20),
-	EXIT_MESSAGE VARCHAR(2500),
+	EXIT_CODE ${VARCHAR}(20),
+	EXIT_MESSAGE ${VARCHAR}(2500),
 	constraint JOB_INSTANCE_EXECUTION_FK foreign key (JOB_INSTANCE_ID)
 	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
 ) $!{VOODOO};
 	
 CREATE TABLE BATCH_JOB_PARAMS  (
 	JOB_INSTANCE_ID ${BIGINT} NOT NULL ,
-    TYPE_CD VARCHAR(6) NOT NULL ,
-	KEY_NAME VARCHAR(100) NOT NULL , 
-	STRING_VAL VARCHAR(250) , 
+    TYPE_CD ${VARCHAR}(6) NOT NULL ,
+	KEY_NAME ${VARCHAR}(100) NOT NULL , 
+	STRING_VAL ${VARCHAR}(250) , 
 	DATE_VAL ${TIMESTAMP} DEFAULT NULL,
 	LONG_VAL ${BIGINT} ,
 	DOUBLE_VAL ${DOUBLE},
@@ -35,27 +35,27 @@ CREATE TABLE BATCH_JOB_PARAMS  (
 CREATE TABLE BATCH_STEP_EXECUTION  (
 	STEP_EXECUTION_ID ${BIGINT} $!{IDENTITY} PRIMARY KEY $!{GENERATED},
 	VERSION ${BIGINT} NOT NULL,  
-	STEP_NAME VARCHAR(100) NOT NULL,
+	STEP_NAME ${VARCHAR}(100) NOT NULL,
 	JOB_EXECUTION_ID ${BIGINT} NOT NULL,
 	START_TIME ${TIMESTAMP} NOT NULL , 
 	END_TIME ${TIMESTAMP} DEFAULT NULL,  
-	STATUS VARCHAR(10),
+	STATUS ${VARCHAR}(10),
 	COMMIT_COUNT ${BIGINT} , 
 	ITEM_COUNT ${BIGINT} , 
 	CONTINUABLE CHAR(1),
-	EXIT_CODE VARCHAR(20),
-	EXIT_MESSAGE VARCHAR(2500),
+	EXIT_CODE ${VARCHAR}(20),
+	EXIT_MESSAGE ${VARCHAR}(2500),
 	constraint JOB_EXECUTION_STEP_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) $!{VOODOO};
 	
 CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
 	STEP_EXECUTION_ID ${BIGINT} NOT NULL ,
-    TYPE_CD VARCHAR(6) NOT NULL ,
-	KEY_NAME VARCHAR(1000) NOT NULL , 
-	STRING_VAL VARCHAR(1000) , 
+    TYPE_CD ${VARCHAR}(6) NOT NULL ,
+	KEY_NAME ${VARCHAR}(1000) NOT NULL , 
+	STRING_VAL ${VARCHAR}(1000) , 
 	DATE_VAL ${TIMESTAMP} DEFAULT NULL ,
-	LONG_VAL VARCHAR(10) ,
+	LONG_VAL ${VARCHAR}(10) ,
 	DOUBLE_VAL ${DOUBLE} ,
     OBJECT_VAL ${BLOB},
 	constraint STEP_EXECUTION_CONTEXT_FK foreign key (STEP_EXECUTION_ID)
diff --git a/spring-batch-core/src/main/sql/mysql.properties b/spring-batch-core/src/main/sql/mysql.properties
index 54601934b..5007b0ba9 100644
--- a/spring-batch-core/src/main/sql/mysql.properties
+++ b/spring-batch-core/src/main/sql/mysql.properties
@@ -8,5 +8,6 @@ IFEXISTSBEFORE = IF EXISTS
 DOUBLE = DOUBLE PRECISION
 BLOB = BLOB
 TIMESTAMP = DATETIME
+VARCHAR = VARCHAR
 # for generating drop statements...
 SEQUENCE = TABLE
diff --git a/spring-batch-core/src/main/sql/oracle10g.properties b/spring-batch-core/src/main/sql/oracle10g.properties
index 97e7390f3..0f3d18973 100644
--- a/spring-batch-core/src/main/sql/oracle10g.properties
+++ b/spring-batch-core/src/main/sql/oracle10g.properties
@@ -3,8 +3,9 @@ platform=oracle10g
 BIGINT = NUMBER(38)
 IDENTITY = 
 GENERATED = 
-DOUBLE = DOUBLE PRECISION
+DOUBLE = NUMBER
 BLOB = BLOB
 TIMESTAMP = TIMESTAMP
+VARCHAR = VARCHAR2
 # for generating drop statements...
 SEQUENCE = SEQUENCE
diff --git a/spring-batch-core/src/main/sql/postgresql.properties b/spring-batch-core/src/main/sql/postgresql.properties
index 568c97c6b..68b7bddc1 100644
--- a/spring-batch-core/src/main/sql/postgresql.properties
+++ b/spring-batch-core/src/main/sql/postgresql.properties
@@ -6,5 +6,6 @@ GENERATED =
 DOUBLE = DOUBLE PRECISION
 BLOB = BYTEA
 TIMESTAMP = TIMESTAMP
+VARCHAR = VARCHAR
 # for generating drop statements...
 SEQUENCE = SEQUENCE