From 5ff7b42333573bd3cb87226514938c603ff61f2b Mon Sep 17 00:00:00 2001
From: Yanming Zhou <zhouyanming@gmail.com>
Date: Wed, 26 Mar 2025 17:35:54 +0800
Subject: [PATCH] Polishing sql files

1. `\s+,\s*$` -> `,`
2. `\s+\(\s*$` -> ` (`

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
---
 .../core/migration/2.2/migration-db2.sql      | 18 ++---
 .../core/migration/2.2/migration-derby.sql    | 18 ++---
 .../batch/core/migration/2.2/migration-h2.sql | 18 ++---
 .../core/migration/2.2/migration-hsqldb.sql   | 18 ++---
 .../core/migration/2.2/migration-mysql.sql    | 18 ++---
 .../core/migration/2.2/migration-oracle.sql   | 18 ++---
 .../migration/2.2/migration-postgresql.sql    | 18 ++---
 .../core/migration/2.2/migration-sqlf.sql     | 18 ++---
 .../migration/2.2/migration-sqlserver.sql     | 18 ++---
 .../core/migration/2.2/migration-sybase.sql   | 10 +--
 .../springframework/batch/core/schema-db2.sql | 72 ++++++++---------
 .../batch/core/schema-derby.sql               | 66 +++++++--------
 .../springframework/batch/core/schema-h2.sql  | 72 ++++++++---------
 .../batch/core/schema-hana.sql                | 68 ++++++++--------
 .../batch/core/schema-hsqldb.sql              | 74 ++++++++---------
 .../batch/core/schema-mariadb.sql             | 72 ++++++++---------
 .../batch/core/schema-mysql.sql               | 72 ++++++++---------
 .../batch/core/schema-oracle.sql              | 72 ++++++++---------
 .../batch/core/schema-postgresql.sql          | 72 ++++++++---------
 .../batch/core/schema-sqlite.sql              | 66 +++++++--------
 .../batch/core/schema-sqlserver.sql           | 36 ++++-----
 .../batch/core/schema-sybase.sql              | 28 +++----
 spring-batch-core/src/test/resources/foo.sql  |  6 +-
 .../test/resources/football-schema-hsqldb.sql | 42 +++++-----
 .../repository/dao/schema-prefix-hsqldb.sql   | 80 +++++++++----------
 .../test/resources/schema-hsqldb-extended.sql | 80 +++++++++----------
 .../samples/common/business-schema-hsqldb.sql | 68 ++++++++--------
 27 files changed, 609 insertions(+), 609 deletions(-)

diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-db2.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-db2.sql
index e52da193b6..fbb92b8168 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-db2.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-db2.sql
@@ -1,15 +1,15 @@
 
 -- create the requisite table
 
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS  (
-	JOB_EXECUTION_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 ,
-	IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+	JOB_EXECUTION_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,
+	IDENTIFYING CHAR(1) NOT NULL,
 	constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-derby.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-derby.sql
index e52da193b6..fbb92b8168 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-derby.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-derby.sql
@@ -1,15 +1,15 @@
 
 -- create the requisite table
 
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS  (
-	JOB_EXECUTION_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 ,
-	IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+	JOB_EXECUTION_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,
+	IDENTIFYING CHAR(1) NOT NULL,
 	constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-h2.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-h2.sql
index e52da193b6..fbb92b8168 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-h2.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-h2.sql
@@ -1,15 +1,15 @@
 
 -- create the requisite table
 
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS  (
-	JOB_EXECUTION_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 ,
-	IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+	JOB_EXECUTION_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,
+	IDENTIFYING CHAR(1) NOT NULL,
 	constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-hsqldb.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-hsqldb.sql
index e52da193b6..fbb92b8168 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-hsqldb.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-hsqldb.sql
@@ -1,15 +1,15 @@
 
 -- create the requisite table
 
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS  (
-	JOB_EXECUTION_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 ,
-	IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+	JOB_EXECUTION_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,
+	IDENTIFYING CHAR(1) NOT NULL,
 	constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-mysql.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-mysql.sql
index 56eaa20d15..ee6d1fcb30 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-mysql.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-mysql.sql
@@ -1,15 +1,15 @@
 
 -- create the requisite table
 
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS  (
-	JOB_EXECUTION_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 ,
-	IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+	JOB_EXECUTION_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,
+	IDENTIFYING CHAR(1) NOT NULL,
 	constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ENGINE=InnoDB;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-oracle.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-oracle.sql
index dd3d074daf..27f54d3f6c 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-oracle.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-oracle.sql
@@ -1,15 +1,15 @@
 
 -- create the requisite table
 
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS  (
-	JOB_EXECUTION_ID NUMBER(19,0) 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(19,0) ,
-	DOUBLE_VAL NUMBER ,
-	IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+	JOB_EXECUTION_ID NUMBER(19,0) 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(19,0),
+	DOUBLE_VAL NUMBER,
+	IDENTIFYING CHAR(1) NOT NULL,
 	constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-postgresql.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-postgresql.sql
index e52da193b6..fbb92b8168 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-postgresql.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-postgresql.sql
@@ -1,15 +1,15 @@
 
 -- create the requisite table
 
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS  (
-	JOB_EXECUTION_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 ,
-	IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+	JOB_EXECUTION_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,
+	IDENTIFYING CHAR(1) NOT NULL,
 	constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-sqlf.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-sqlf.sql
index e52da193b6..fbb92b8168 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-sqlf.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-sqlf.sql
@@ -1,15 +1,15 @@
 
 -- create the requisite table
 
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS  (
-	JOB_EXECUTION_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 ,
-	IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+	JOB_EXECUTION_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,
+	IDENTIFYING CHAR(1) NOT NULL,
 	constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-sqlserver.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-sqlserver.sql
index 4c24789ee8..e0cb8e524e 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-sqlserver.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-sqlserver.sql
@@ -1,15 +1,15 @@
 
 -- create the requisite table
 
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS  (
-	JOB_EXECUTION_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 ,
-	IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+	JOB_EXECUTION_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,
+	IDENTIFYING CHAR(1) NOT NULL,
 	constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-sybase.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-sybase.sql
index d8def25a63..cf0e5dafca 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-sybase.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-sybase.sql
@@ -1,15 +1,15 @@
 
 -- create the requisite table
 
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS  (
-	JOB_EXECUTION_ID BIGINT NOT NULL ,
-	TYPE_CD VARCHAR(6) NOT NULL ,
-	KEY_NAME VARCHAR(100) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+	JOB_EXECUTION_ID BIGINT NOT NULL,
+	TYPE_CD VARCHAR(6) NOT NULL,
+	KEY_NAME VARCHAR(100) NOT NULL,
 	STRING_VAL VARCHAR(250) NULL,
 	DATE_VAL DATETIME DEFAULT NULL NULL,
 	LONG_VAL BIGINT NULL,
 	DOUBLE_VAL DOUBLE PRECISION NULL,
-	IDENTIFYING CHAR(1) NOT NULL ,
+	IDENTIFYING CHAR(1) NOT NULL,
 	constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-db2.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-db2.sql
index c883c354c9..11d10bad3c 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-db2.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-db2.sql
@@ -1,74 +1,74 @@
 -- Autogenerated: do not edit this file
 
-CREATE TABLE BATCH_JOB_INSTANCE  (
-	JOB_INSTANCE_ID BIGINT  NOT NULL PRIMARY KEY ,
-	VERSION BIGINT ,
+CREATE TABLE BATCH_JOB_INSTANCE (
+	JOB_INSTANCE_ID BIGINT  NOT NULL PRIMARY KEY,
+	VERSION BIGINT,
 	JOB_NAME VARCHAR(100) NOT NULL,
 	JOB_KEY VARCHAR(32) NOT NULL,
 	constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
 ) ;
 
-CREATE TABLE BATCH_JOB_EXECUTION  (
-	JOB_EXECUTION_ID BIGINT  NOT NULL PRIMARY KEY ,
-	VERSION BIGINT  ,
+CREATE TABLE BATCH_JOB_EXECUTION (
+	JOB_EXECUTION_ID BIGINT  NOT NULL PRIMARY KEY,
+	VERSION BIGINT,
 	JOB_INSTANCE_ID BIGINT NOT NULL,
 	CREATE_TIME TIMESTAMP(9) NOT NULL,
-	START_TIME TIMESTAMP(9) DEFAULT NULL ,
-	END_TIME TIMESTAMP(9) DEFAULT NULL ,
-	STATUS VARCHAR(10) ,
-	EXIT_CODE VARCHAR(2500) ,
-	EXIT_MESSAGE VARCHAR(2500) ,
+	START_TIME TIMESTAMP(9) DEFAULT NULL,
+	END_TIME TIMESTAMP(9) DEFAULT NULL,
+	STATUS VARCHAR(10),
+	EXIT_CODE VARCHAR(2500),
+	EXIT_MESSAGE VARCHAR(2500),
 	LAST_UPDATED TIMESTAMP(9),
 	constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID)
 	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
 ) ;
 
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS  (
-	JOB_EXECUTION_ID BIGINT NOT NULL ,
-	PARAMETER_NAME VARCHAR(100) NOT NULL ,
-	PARAMETER_TYPE VARCHAR(100) NOT NULL ,
-	PARAMETER_VALUE VARCHAR(2500) ,
-	IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+	JOB_EXECUTION_ID BIGINT NOT NULL,
+	PARAMETER_NAME VARCHAR(100) NOT NULL,
+	PARAMETER_TYPE VARCHAR(100) NOT NULL,
+	PARAMETER_VALUE VARCHAR(2500),
+	IDENTIFYING CHAR(1) NOT NULL,
 	constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
 
-CREATE TABLE BATCH_STEP_EXECUTION  (
-	STEP_EXECUTION_ID BIGINT  NOT NULL PRIMARY KEY ,
+CREATE TABLE BATCH_STEP_EXECUTION (
+	STEP_EXECUTION_ID BIGINT  NOT NULL PRIMARY KEY,
 	VERSION BIGINT NOT NULL,
 	STEP_NAME VARCHAR(100) NOT NULL,
 	JOB_EXECUTION_ID BIGINT NOT NULL,
 	CREATE_TIME TIMESTAMP(9) NOT NULL,
-	START_TIME TIMESTAMP(9) DEFAULT NULL ,
-	END_TIME TIMESTAMP(9) DEFAULT NULL ,
-	STATUS VARCHAR(10) ,
-	COMMIT_COUNT BIGINT ,
-	READ_COUNT BIGINT ,
-	FILTER_COUNT BIGINT ,
-	WRITE_COUNT BIGINT ,
-	READ_SKIP_COUNT BIGINT ,
-	WRITE_SKIP_COUNT BIGINT ,
-	PROCESS_SKIP_COUNT BIGINT ,
-	ROLLBACK_COUNT BIGINT ,
-	EXIT_CODE VARCHAR(2500) ,
-	EXIT_MESSAGE VARCHAR(2500) ,
+	START_TIME TIMESTAMP(9) DEFAULT NULL,
+	END_TIME TIMESTAMP(9) DEFAULT NULL,
+	STATUS VARCHAR(10),
+	COMMIT_COUNT BIGINT,
+	READ_COUNT BIGINT,
+	FILTER_COUNT BIGINT,
+	WRITE_COUNT BIGINT,
+	READ_SKIP_COUNT BIGINT,
+	WRITE_SKIP_COUNT BIGINT,
+	PROCESS_SKIP_COUNT BIGINT,
+	ROLLBACK_COUNT BIGINT,
+	EXIT_CODE VARCHAR(2500),
+	EXIT_MESSAGE VARCHAR(2500),
 	LAST_UPDATED TIMESTAMP(9),
 	constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
 
-CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
 	STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
 	SHORT_CONTEXT VARCHAR(2500) NOT NULL,
-	SERIALIZED_CONTEXT CLOB ,
+	SERIALIZED_CONTEXT CLOB,
 	constraint STEP_EXEC_CTX_FK foreign key (STEP_EXECUTION_ID)
 	references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
 ) ;
 
-CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT  (
+CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
 	JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
 	SHORT_CONTEXT VARCHAR(2500) NOT NULL,
-	SERIALIZED_CONTEXT CLOB ,
+	SERIALIZED_CONTEXT CLOB,
 	constraint JOB_EXEC_CTX_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-derby.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-derby.sql
index c9510a5bc3..e1cef9b9cb 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-derby.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-derby.sql
@@ -1,74 +1,74 @@
 -- Autogenerated: do not edit this file
 
-CREATE TABLE BATCH_JOB_INSTANCE  (
+CREATE TABLE BATCH_JOB_INSTANCE (
 	JOB_INSTANCE_ID BIGINT  NOT NULL PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
-	VERSION BIGINT ,
+	VERSION BIGINT,
 	JOB_NAME VARCHAR(100) NOT NULL,
 	JOB_KEY VARCHAR(32) NOT NULL,
 	constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
 ) ;
 
-CREATE TABLE BATCH_JOB_EXECUTION  (
+CREATE TABLE BATCH_JOB_EXECUTION (
 	JOB_EXECUTION_ID BIGINT  NOT NULL PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
-	VERSION BIGINT  ,
+	VERSION BIGINT,
 	JOB_INSTANCE_ID BIGINT NOT NULL,
 	CREATE_TIME TIMESTAMP NOT NULL,
-	START_TIME TIMESTAMP DEFAULT NULL ,
-	END_TIME TIMESTAMP DEFAULT NULL ,
-	STATUS VARCHAR(10) ,
-	EXIT_CODE VARCHAR(2500) ,
-	EXIT_MESSAGE VARCHAR(2500) ,
+	START_TIME TIMESTAMP DEFAULT NULL,
+	END_TIME TIMESTAMP DEFAULT NULL,
+	STATUS VARCHAR(10),
+	EXIT_CODE VARCHAR(2500),
+	EXIT_MESSAGE VARCHAR(2500),
 	LAST_UPDATED TIMESTAMP,
 	constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID)
 	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
 ) ;
 
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS  (
-	JOB_EXECUTION_ID BIGINT NOT NULL ,
-	PARAMETER_NAME VARCHAR(100) NOT NULL ,
-	PARAMETER_TYPE VARCHAR(100) NOT NULL ,
-	PARAMETER_VALUE VARCHAR(2500) ,
-	IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+	JOB_EXECUTION_ID BIGINT NOT NULL,
+	PARAMETER_NAME VARCHAR(100) NOT NULL,
+	PARAMETER_TYPE VARCHAR(100) NOT NULL,
+	PARAMETER_VALUE VARCHAR(2500),
+	IDENTIFYING CHAR(1) NOT NULL,
 	constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
 
-CREATE TABLE BATCH_STEP_EXECUTION  (
+CREATE TABLE BATCH_STEP_EXECUTION (
 	STEP_EXECUTION_ID BIGINT  NOT NULL PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
 	VERSION BIGINT NOT NULL,
 	STEP_NAME VARCHAR(100) NOT NULL,
 	JOB_EXECUTION_ID BIGINT NOT NULL,
 	CREATE_TIME TIMESTAMP NOT NULL,
-	START_TIME TIMESTAMP DEFAULT NULL ,
-	END_TIME TIMESTAMP DEFAULT NULL ,
-	STATUS VARCHAR(10) ,
-	COMMIT_COUNT BIGINT ,
-	READ_COUNT BIGINT ,
-	FILTER_COUNT BIGINT ,
-	WRITE_COUNT BIGINT ,
-	READ_SKIP_COUNT BIGINT ,
-	WRITE_SKIP_COUNT BIGINT ,
-	PROCESS_SKIP_COUNT BIGINT ,
-	ROLLBACK_COUNT BIGINT ,
-	EXIT_CODE VARCHAR(2500) ,
-	EXIT_MESSAGE VARCHAR(2500) ,
+	START_TIME TIMESTAMP DEFAULT NULL,
+	END_TIME TIMESTAMP DEFAULT NULL,
+	STATUS VARCHAR(10),
+	COMMIT_COUNT BIGINT,
+	READ_COUNT BIGINT,
+	FILTER_COUNT BIGINT,
+	WRITE_COUNT BIGINT,
+	READ_SKIP_COUNT BIGINT,
+	WRITE_SKIP_COUNT BIGINT,
+	PROCESS_SKIP_COUNT BIGINT,
+	ROLLBACK_COUNT BIGINT,
+	EXIT_CODE VARCHAR(2500),
+	EXIT_MESSAGE VARCHAR(2500),
 	LAST_UPDATED TIMESTAMP,
 	constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
 
-CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
 	STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
 	SHORT_CONTEXT VARCHAR(2500) NOT NULL,
-	SERIALIZED_CONTEXT CLOB ,
+	SERIALIZED_CONTEXT CLOB,
 	constraint STEP_EXEC_CTX_FK foreign key (STEP_EXECUTION_ID)
 	references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
 ) ;
 
-CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT  (
+CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
 	JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
 	SHORT_CONTEXT VARCHAR(2500) NOT NULL,
-	SERIALIZED_CONTEXT CLOB ,
+	SERIALIZED_CONTEXT CLOB,
 	constraint JOB_EXEC_CTX_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-h2.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-h2.sql
index dc51c373ca..5c33d838c0 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-h2.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-h2.sql
@@ -1,74 +1,74 @@
 -- Autogenerated: do not edit this file
 
-CREATE TABLE BATCH_JOB_INSTANCE  (
-	JOB_INSTANCE_ID BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY ,
-	VERSION BIGINT ,
+CREATE TABLE BATCH_JOB_INSTANCE (
+	JOB_INSTANCE_ID BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
+	VERSION BIGINT,
 	JOB_NAME VARCHAR(100) NOT NULL,
 	JOB_KEY VARCHAR(32) NOT NULL,
 	constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
 ) ;
 
-CREATE TABLE BATCH_JOB_EXECUTION  (
-	JOB_EXECUTION_ID BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY ,
-	VERSION BIGINT  ,
+CREATE TABLE BATCH_JOB_EXECUTION (
+	JOB_EXECUTION_ID BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
+	VERSION BIGINT,
 	JOB_INSTANCE_ID BIGINT NOT NULL,
 	CREATE_TIME TIMESTAMP(9) NOT NULL,
-	START_TIME TIMESTAMP(9) DEFAULT NULL ,
-	END_TIME TIMESTAMP(9) DEFAULT NULL ,
-	STATUS VARCHAR(10) ,
-	EXIT_CODE VARCHAR(2500) ,
-	EXIT_MESSAGE VARCHAR(2500) ,
+	START_TIME TIMESTAMP(9) DEFAULT NULL,
+	END_TIME TIMESTAMP(9) DEFAULT NULL,
+	STATUS VARCHAR(10),
+	EXIT_CODE VARCHAR(2500),
+	EXIT_MESSAGE VARCHAR(2500),
 	LAST_UPDATED TIMESTAMP(9),
 	constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID)
 	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
 ) ;
 
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS  (
-	JOB_EXECUTION_ID BIGINT NOT NULL ,
-	PARAMETER_NAME VARCHAR(100) NOT NULL ,
-	PARAMETER_TYPE VARCHAR(100) NOT NULL ,
-	PARAMETER_VALUE VARCHAR(2500) ,
-	IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+	JOB_EXECUTION_ID BIGINT NOT NULL,
+	PARAMETER_NAME VARCHAR(100) NOT NULL,
+	PARAMETER_TYPE VARCHAR(100) NOT NULL,
+	PARAMETER_VALUE VARCHAR(2500),
+	IDENTIFYING CHAR(1) NOT NULL,
 	constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
 
-CREATE TABLE BATCH_STEP_EXECUTION  (
-	STEP_EXECUTION_ID BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY ,
+CREATE TABLE BATCH_STEP_EXECUTION (
+	STEP_EXECUTION_ID BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
 	VERSION BIGINT NOT NULL,
 	STEP_NAME VARCHAR(100) NOT NULL,
 	JOB_EXECUTION_ID BIGINT NOT NULL,
 	CREATE_TIME TIMESTAMP(9) NOT NULL,
-	START_TIME TIMESTAMP(9) DEFAULT NULL ,
-	END_TIME TIMESTAMP(9) DEFAULT NULL ,
-	STATUS VARCHAR(10) ,
-	COMMIT_COUNT BIGINT ,
-	READ_COUNT BIGINT ,
-	FILTER_COUNT BIGINT ,
-	WRITE_COUNT BIGINT ,
-	READ_SKIP_COUNT BIGINT ,
-	WRITE_SKIP_COUNT BIGINT ,
-	PROCESS_SKIP_COUNT BIGINT ,
-	ROLLBACK_COUNT BIGINT ,
-	EXIT_CODE VARCHAR(2500) ,
-	EXIT_MESSAGE VARCHAR(2500) ,
+	START_TIME TIMESTAMP(9) DEFAULT NULL,
+	END_TIME TIMESTAMP(9) DEFAULT NULL,
+	STATUS VARCHAR(10),
+	COMMIT_COUNT BIGINT,
+	READ_COUNT BIGINT,
+	FILTER_COUNT BIGINT,
+	WRITE_COUNT BIGINT,
+	READ_SKIP_COUNT BIGINT,
+	WRITE_SKIP_COUNT BIGINT,
+	PROCESS_SKIP_COUNT BIGINT,
+	ROLLBACK_COUNT BIGINT,
+	EXIT_CODE VARCHAR(2500),
+	EXIT_MESSAGE VARCHAR(2500),
 	LAST_UPDATED TIMESTAMP(9),
 	constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
 
-CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
 	STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
 	SHORT_CONTEXT VARCHAR(2500) NOT NULL,
-	SERIALIZED_CONTEXT LONGVARCHAR ,
+	SERIALIZED_CONTEXT LONGVARCHAR,
 	constraint STEP_EXEC_CTX_FK foreign key (STEP_EXECUTION_ID)
 	references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
 ) ;
 
-CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT  (
+CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
 	JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
 	SHORT_CONTEXT VARCHAR(2500) NOT NULL,
-	SERIALIZED_CONTEXT LONGVARCHAR ,
+	SERIALIZED_CONTEXT LONGVARCHAR,
 	constraint JOB_EXEC_CTX_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-hana.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-hana.sql
index 8dc2dc843c..50702acb36 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-hana.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-hana.sql
@@ -1,74 +1,74 @@
 -- Autogenerated: do not edit this file
 
-CREATE TABLE BATCH_JOB_INSTANCE  (
+CREATE TABLE BATCH_JOB_INSTANCE (
 	JOB_INSTANCE_ID BIGINT  NOT NULL PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
-	VERSION BIGINT ,
+	VERSION BIGINT,
 	JOB_NAME VARCHAR(100) NOT NULL,
 	JOB_KEY VARCHAR(32) NOT NULL,
 	constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
 ) ;
 
-CREATE TABLE BATCH_JOB_EXECUTION  (
+CREATE TABLE BATCH_JOB_EXECUTION (
 	JOB_EXECUTION_ID BIGINT  NOT NULL PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
-	VERSION BIGINT  ,
+	VERSION BIGINT,
 	JOB_INSTANCE_ID BIGINT NOT NULL,
 	CREATE_TIME TIMESTAMP NOT NULL,
-	START_TIME TIMESTAMP DEFAULT NULL ,
-	END_TIME TIMESTAMP DEFAULT NULL ,
-	STATUS VARCHAR(10) ,
-	EXIT_CODE VARCHAR(2500) ,
-	EXIT_MESSAGE VARCHAR(2500) ,
+	START_TIME TIMESTAMP DEFAULT NULL,
+	END_TIME TIMESTAMP DEFAULT NULL,
+	STATUS VARCHAR(10),
+	EXIT_CODE VARCHAR(2500),
+	EXIT_MESSAGE VARCHAR(2500),
 	LAST_UPDATED TIMESTAMP,
 	constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID)
 	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
 ) ;
 
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS  (
-	JOB_EXECUTION_ID BIGINT NOT NULL ,
-	PARAMETER_NAME VARCHAR(100) NOT NULL ,
-	PARAMETER_TYPE VARCHAR(100) NOT NULL ,
-	PARAMETER_VALUE VARCHAR(2500) ,
-	IDENTIFYING VARCHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+	JOB_EXECUTION_ID BIGINT NOT NULL,
+	PARAMETER_NAME VARCHAR(100) NOT NULL,
+	PARAMETER_TYPE VARCHAR(100) NOT NULL,
+	PARAMETER_VALUE VARCHAR(2500),
+	IDENTIFYING VARCHAR(1) NOT NULL,
 	constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
 
-CREATE TABLE BATCH_STEP_EXECUTION  (
+CREATE TABLE BATCH_STEP_EXECUTION (
 	STEP_EXECUTION_ID BIGINT  NOT NULL PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
 	VERSION BIGINT NOT NULL,
 	STEP_NAME VARCHAR(100) NOT NULL,
 	JOB_EXECUTION_ID BIGINT NOT NULL,
-	CREATE_TIME TIMESTAMP NOT NULL ,
-	START_TIME TIMESTAMP DEFAULT NULL ,
-	END_TIME TIMESTAMP DEFAULT NULL ,
-	STATUS VARCHAR(10) ,
-	COMMIT_COUNT BIGINT ,
-	READ_COUNT BIGINT ,
-	FILTER_COUNT BIGINT ,
-	WRITE_COUNT BIGINT ,
-	READ_SKIP_COUNT BIGINT ,
-	WRITE_SKIP_COUNT BIGINT ,
-	PROCESS_SKIP_COUNT BIGINT ,
-	ROLLBACK_COUNT BIGINT ,
-	EXIT_CODE VARCHAR(2500) ,
-	EXIT_MESSAGE VARCHAR(2500) ,
+	CREATE_TIME TIMESTAMP NOT NULL,
+	START_TIME TIMESTAMP DEFAULT NULL,
+	END_TIME TIMESTAMP DEFAULT NULL,
+	STATUS VARCHAR(10),
+	COMMIT_COUNT BIGINT,
+	READ_COUNT BIGINT,
+	FILTER_COUNT BIGINT,
+	WRITE_COUNT BIGINT,
+	READ_SKIP_COUNT BIGINT,
+	WRITE_SKIP_COUNT BIGINT,
+	PROCESS_SKIP_COUNT BIGINT,
+	ROLLBACK_COUNT BIGINT,
+	EXIT_CODE VARCHAR(2500),
+	EXIT_MESSAGE VARCHAR(2500),
 	LAST_UPDATED TIMESTAMP,
 	constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
 
-CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
 	STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
 	SHORT_CONTEXT VARCHAR(2500) NOT NULL,
-	SERIALIZED_CONTEXT CLOB ,
+	SERIALIZED_CONTEXT CLOB,
 	constraint STEP_EXEC_CTX_FK foreign key (STEP_EXECUTION_ID)
 	references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
 ) ;
 
-CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT  (
+CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
 	JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
 	SHORT_CONTEXT VARCHAR(2500) NOT NULL,
-	SERIALIZED_CONTEXT CLOB ,
+	SERIALIZED_CONTEXT CLOB,
 	constraint JOB_EXEC_CTX_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-hsqldb.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-hsqldb.sql
index 758699f152..09573c2a7b 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-hsqldb.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-hsqldb.sql
@@ -1,74 +1,74 @@
 -- Autogenerated: do not edit this file
 
-CREATE TABLE BATCH_JOB_INSTANCE  (
-	JOB_INSTANCE_ID BIGINT IDENTITY NOT NULL PRIMARY KEY ,
-	VERSION BIGINT ,
+CREATE TABLE BATCH_JOB_INSTANCE (
+	JOB_INSTANCE_ID BIGINT IDENTITY NOT NULL PRIMARY KEY,
+	VERSION BIGINT,
 	JOB_NAME VARCHAR(100) NOT NULL,
 	JOB_KEY VARCHAR(32) NOT NULL,
 	constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
 ) ;
 
-CREATE TABLE BATCH_JOB_EXECUTION  (
-	JOB_EXECUTION_ID BIGINT IDENTITY NOT NULL PRIMARY KEY ,
-	VERSION BIGINT  ,
+CREATE TABLE BATCH_JOB_EXECUTION (
+	JOB_EXECUTION_ID BIGINT IDENTITY NOT NULL PRIMARY KEY,
+	VERSION BIGINT,
 	JOB_INSTANCE_ID BIGINT NOT NULL,
 	CREATE_TIME TIMESTAMP(9) NOT NULL,
-	START_TIME TIMESTAMP(9) DEFAULT NULL ,
-	END_TIME TIMESTAMP(9) DEFAULT NULL ,
-	STATUS VARCHAR(10) ,
-	EXIT_CODE VARCHAR(2500) ,
-	EXIT_MESSAGE VARCHAR(2500) ,
+	START_TIME TIMESTAMP(9) DEFAULT NULL,
+	END_TIME TIMESTAMP(9) DEFAULT NULL,
+	STATUS VARCHAR(10),
+	EXIT_CODE VARCHAR(2500),
+	EXIT_MESSAGE VARCHAR(2500),
 	LAST_UPDATED TIMESTAMP(9),
 	constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID)
 	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
 ) ;
 
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS  (
-	JOB_EXECUTION_ID BIGINT NOT NULL ,
-	PARAMETER_NAME VARCHAR(100) NOT NULL ,
-	PARAMETER_TYPE VARCHAR(100) NOT NULL ,
-	PARAMETER_VALUE VARCHAR(2500) ,
-	IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+	JOB_EXECUTION_ID BIGINT NOT NULL,
+	PARAMETER_NAME VARCHAR(100) NOT NULL,
+	PARAMETER_TYPE VARCHAR(100) NOT NULL,
+	PARAMETER_VALUE VARCHAR(2500),
+	IDENTIFYING CHAR(1) NOT NULL,
 	constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
 
-CREATE TABLE BATCH_STEP_EXECUTION  (
-	STEP_EXECUTION_ID BIGINT IDENTITY NOT NULL PRIMARY KEY ,
+CREATE TABLE BATCH_STEP_EXECUTION (
+	STEP_EXECUTION_ID BIGINT IDENTITY NOT NULL PRIMARY KEY,
 	VERSION BIGINT NOT NULL,
 	STEP_NAME VARCHAR(100) NOT NULL,
 	JOB_EXECUTION_ID BIGINT NOT NULL,
-	CREATE_TIME TIMESTAMP(9) NOT NULL ,
-	START_TIME TIMESTAMP(9) DEFAULT NULL ,
-	END_TIME TIMESTAMP(9) DEFAULT NULL ,
-	STATUS VARCHAR(10) ,
-	COMMIT_COUNT BIGINT ,
-	READ_COUNT BIGINT ,
-	FILTER_COUNT BIGINT ,
-	WRITE_COUNT BIGINT ,
-	READ_SKIP_COUNT BIGINT ,
-	WRITE_SKIP_COUNT BIGINT ,
-	PROCESS_SKIP_COUNT BIGINT ,
-	ROLLBACK_COUNT BIGINT ,
-	EXIT_CODE VARCHAR(2500) ,
-	EXIT_MESSAGE VARCHAR(2500) ,
+	CREATE_TIME TIMESTAMP(9) NOT NULL,
+	START_TIME TIMESTAMP(9) DEFAULT NULL,
+	END_TIME TIMESTAMP(9) DEFAULT NULL,
+	STATUS VARCHAR(10),
+	COMMIT_COUNT BIGINT,
+	READ_COUNT BIGINT,
+	FILTER_COUNT BIGINT,
+	WRITE_COUNT BIGINT,
+	READ_SKIP_COUNT BIGINT,
+	WRITE_SKIP_COUNT BIGINT,
+	PROCESS_SKIP_COUNT BIGINT,
+	ROLLBACK_COUNT BIGINT,
+	EXIT_CODE VARCHAR(2500),
+	EXIT_MESSAGE VARCHAR(2500),
 	LAST_UPDATED TIMESTAMP(9),
 	constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
 
-CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
 	STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
 	SHORT_CONTEXT VARCHAR(2500) NOT NULL,
-	SERIALIZED_CONTEXT LONGVARCHAR ,
+	SERIALIZED_CONTEXT LONGVARCHAR,
 	constraint STEP_EXEC_CTX_FK foreign key (STEP_EXECUTION_ID)
 	references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
 ) ;
 
-CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT  (
+CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
 	JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
 	SHORT_CONTEXT VARCHAR(2500) NOT NULL,
-	SERIALIZED_CONTEXT LONGVARCHAR ,
+	SERIALIZED_CONTEXT LONGVARCHAR,
 	constraint JOB_EXEC_CTX_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-mariadb.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-mariadb.sql
index 31f585fbc0..90e25c5d2b 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-mariadb.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-mariadb.sql
@@ -1,72 +1,72 @@
-CREATE TABLE BATCH_JOB_INSTANCE  (
-	JOB_INSTANCE_ID BIGINT  NOT NULL PRIMARY KEY ,
-	VERSION BIGINT ,
+CREATE TABLE BATCH_JOB_INSTANCE (
+	JOB_INSTANCE_ID BIGINT  NOT NULL PRIMARY KEY,
+	VERSION BIGINT,
 	JOB_NAME VARCHAR(100) NOT NULL,
 	JOB_KEY VARCHAR(32) NOT NULL,
 	constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
 ) ENGINE=InnoDB;
 
-CREATE TABLE BATCH_JOB_EXECUTION  (
-	JOB_EXECUTION_ID BIGINT  NOT NULL PRIMARY KEY ,
-	VERSION BIGINT  ,
+CREATE TABLE BATCH_JOB_EXECUTION (
+	JOB_EXECUTION_ID BIGINT  NOT NULL PRIMARY KEY,
+	VERSION BIGINT,
 	JOB_INSTANCE_ID BIGINT NOT NULL,
 	CREATE_TIME DATETIME(6) NOT NULL,
-	START_TIME DATETIME(6) DEFAULT NULL ,
-	END_TIME DATETIME(6) DEFAULT NULL ,
-	STATUS VARCHAR(10) ,
-	EXIT_CODE VARCHAR(2500) ,
-	EXIT_MESSAGE VARCHAR(2500) ,
+	START_TIME DATETIME(6) DEFAULT NULL,
+	END_TIME DATETIME(6) DEFAULT NULL,
+	STATUS VARCHAR(10),
+	EXIT_CODE VARCHAR(2500),
+	EXIT_MESSAGE VARCHAR(2500),
 	LAST_UPDATED DATETIME(6),
 	constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID)
 	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
 ) ENGINE=InnoDB;
 
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS  (
-	JOB_EXECUTION_ID BIGINT NOT NULL ,
-	PARAMETER_NAME VARCHAR(100) NOT NULL ,
-	PARAMETER_TYPE VARCHAR(100) NOT NULL ,
-	PARAMETER_VALUE VARCHAR(2500) ,
-	IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+	JOB_EXECUTION_ID BIGINT NOT NULL,
+	PARAMETER_NAME VARCHAR(100) NOT NULL,
+	PARAMETER_TYPE VARCHAR(100) NOT NULL,
+	PARAMETER_VALUE VARCHAR(2500),
+	IDENTIFYING CHAR(1) NOT NULL,
 	constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ENGINE=InnoDB;
 
-CREATE TABLE BATCH_STEP_EXECUTION  (
-	STEP_EXECUTION_ID BIGINT  NOT NULL PRIMARY KEY ,
+CREATE TABLE BATCH_STEP_EXECUTION (
+	STEP_EXECUTION_ID BIGINT  NOT NULL PRIMARY KEY,
 	VERSION BIGINT NOT NULL,
 	STEP_NAME VARCHAR(100) NOT NULL,
 	JOB_EXECUTION_ID BIGINT NOT NULL,
 	CREATE_TIME DATETIME(6) NOT NULL,
-	START_TIME DATETIME(6) DEFAULT NULL ,
-	END_TIME DATETIME(6) DEFAULT NULL ,
-	STATUS VARCHAR(10) ,
-	COMMIT_COUNT BIGINT ,
-	READ_COUNT BIGINT ,
-	FILTER_COUNT BIGINT ,
-	WRITE_COUNT BIGINT ,
-	READ_SKIP_COUNT BIGINT ,
-	WRITE_SKIP_COUNT BIGINT ,
-	PROCESS_SKIP_COUNT BIGINT ,
-	ROLLBACK_COUNT BIGINT ,
-	EXIT_CODE VARCHAR(2500) ,
-	EXIT_MESSAGE VARCHAR(2500) ,
+	START_TIME DATETIME(6) DEFAULT NULL,
+	END_TIME DATETIME(6) DEFAULT NULL,
+	STATUS VARCHAR(10),
+	COMMIT_COUNT BIGINT,
+	READ_COUNT BIGINT,
+	FILTER_COUNT BIGINT,
+	WRITE_COUNT BIGINT,
+	READ_SKIP_COUNT BIGINT,
+	WRITE_SKIP_COUNT BIGINT,
+	PROCESS_SKIP_COUNT BIGINT,
+	ROLLBACK_COUNT BIGINT,
+	EXIT_CODE VARCHAR(2500),
+	EXIT_MESSAGE VARCHAR(2500),
 	LAST_UPDATED DATETIME(6),
 	constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ENGINE=InnoDB;
 
-CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
 	STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
 	SHORT_CONTEXT VARCHAR(2500) NOT NULL,
-	SERIALIZED_CONTEXT TEXT ,
+	SERIALIZED_CONTEXT TEXT,
 	constraint STEP_EXEC_CTX_FK foreign key (STEP_EXECUTION_ID)
 	references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
 ) ENGINE=InnoDB;
 
-CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT  (
+CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
 	JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
 	SHORT_CONTEXT VARCHAR(2500) NOT NULL,
-	SERIALIZED_CONTEXT TEXT ,
+	SERIALIZED_CONTEXT TEXT,
 	constraint JOB_EXEC_CTX_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ENGINE=InnoDB;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-mysql.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-mysql.sql
index 197ef3ff02..e4de2b3277 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-mysql.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-mysql.sql
@@ -1,74 +1,74 @@
 -- Autogenerated: do not edit this file
 
-CREATE TABLE BATCH_JOB_INSTANCE  (
-	JOB_INSTANCE_ID BIGINT  NOT NULL PRIMARY KEY ,
-	VERSION BIGINT ,
+CREATE TABLE BATCH_JOB_INSTANCE (
+	JOB_INSTANCE_ID BIGINT  NOT NULL PRIMARY KEY,
+	VERSION BIGINT,
 	JOB_NAME VARCHAR(100) NOT NULL,
 	JOB_KEY VARCHAR(32) NOT NULL,
 	constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
 ) ENGINE=InnoDB;
 
-CREATE TABLE BATCH_JOB_EXECUTION  (
-	JOB_EXECUTION_ID BIGINT  NOT NULL PRIMARY KEY ,
-	VERSION BIGINT  ,
+CREATE TABLE BATCH_JOB_EXECUTION (
+	JOB_EXECUTION_ID BIGINT  NOT NULL PRIMARY KEY,
+	VERSION BIGINT,
 	JOB_INSTANCE_ID BIGINT NOT NULL,
 	CREATE_TIME DATETIME(6) NOT NULL,
-	START_TIME DATETIME(6) DEFAULT NULL ,
-	END_TIME DATETIME(6) DEFAULT NULL ,
-	STATUS VARCHAR(10) ,
-	EXIT_CODE VARCHAR(2500) ,
-	EXIT_MESSAGE VARCHAR(2500) ,
+	START_TIME DATETIME(6) DEFAULT NULL,
+	END_TIME DATETIME(6) DEFAULT NULL,
+	STATUS VARCHAR(10),
+	EXIT_CODE VARCHAR(2500),
+	EXIT_MESSAGE VARCHAR(2500),
 	LAST_UPDATED DATETIME(6),
 	constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID)
 	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
 ) ENGINE=InnoDB;
 
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS  (
-	JOB_EXECUTION_ID BIGINT NOT NULL ,
-	PARAMETER_NAME VARCHAR(100) NOT NULL ,
-	PARAMETER_TYPE VARCHAR(100) NOT NULL ,
-	PARAMETER_VALUE VARCHAR(2500) ,
-	IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+	JOB_EXECUTION_ID BIGINT NOT NULL,
+	PARAMETER_NAME VARCHAR(100) NOT NULL,
+	PARAMETER_TYPE VARCHAR(100) NOT NULL,
+	PARAMETER_VALUE VARCHAR(2500),
+	IDENTIFYING CHAR(1) NOT NULL,
 	constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ENGINE=InnoDB;
 
-CREATE TABLE BATCH_STEP_EXECUTION  (
-	STEP_EXECUTION_ID BIGINT  NOT NULL PRIMARY KEY ,
+CREATE TABLE BATCH_STEP_EXECUTION (
+	STEP_EXECUTION_ID BIGINT  NOT NULL PRIMARY KEY,
 	VERSION BIGINT NOT NULL,
 	STEP_NAME VARCHAR(100) NOT NULL,
 	JOB_EXECUTION_ID BIGINT NOT NULL,
 	CREATE_TIME DATETIME(6) NOT NULL,
-	START_TIME DATETIME(6) DEFAULT NULL ,
-	END_TIME DATETIME(6) DEFAULT NULL ,
-	STATUS VARCHAR(10) ,
-	COMMIT_COUNT BIGINT ,
-	READ_COUNT BIGINT ,
-	FILTER_COUNT BIGINT ,
-	WRITE_COUNT BIGINT ,
-	READ_SKIP_COUNT BIGINT ,
-	WRITE_SKIP_COUNT BIGINT ,
-	PROCESS_SKIP_COUNT BIGINT ,
-	ROLLBACK_COUNT BIGINT ,
-	EXIT_CODE VARCHAR(2500) ,
-	EXIT_MESSAGE VARCHAR(2500) ,
+	START_TIME DATETIME(6) DEFAULT NULL,
+	END_TIME DATETIME(6) DEFAULT NULL,
+	STATUS VARCHAR(10),
+	COMMIT_COUNT BIGINT,
+	READ_COUNT BIGINT,
+	FILTER_COUNT BIGINT,
+	WRITE_COUNT BIGINT,
+	READ_SKIP_COUNT BIGINT,
+	WRITE_SKIP_COUNT BIGINT,
+	PROCESS_SKIP_COUNT BIGINT,
+	ROLLBACK_COUNT BIGINT,
+	EXIT_CODE VARCHAR(2500),
+	EXIT_MESSAGE VARCHAR(2500),
 	LAST_UPDATED DATETIME(6),
 	constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ENGINE=InnoDB;
 
-CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
 	STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
 	SHORT_CONTEXT VARCHAR(2500) NOT NULL,
-	SERIALIZED_CONTEXT TEXT ,
+	SERIALIZED_CONTEXT TEXT,
 	constraint STEP_EXEC_CTX_FK foreign key (STEP_EXECUTION_ID)
 	references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
 ) ENGINE=InnoDB;
 
-CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT  (
+CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
 	JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
 	SHORT_CONTEXT VARCHAR(2500) NOT NULL,
-	SERIALIZED_CONTEXT TEXT ,
+	SERIALIZED_CONTEXT TEXT,
 	constraint JOB_EXEC_CTX_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ENGINE=InnoDB;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-oracle.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-oracle.sql
index 73deea519e..a6344600e9 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-oracle.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-oracle.sql
@@ -1,74 +1,74 @@
 -- Autogenerated: do not edit this file
 
-CREATE TABLE BATCH_JOB_INSTANCE  (
-	JOB_INSTANCE_ID NUMBER(19,0)  NOT NULL PRIMARY KEY ,
-	VERSION NUMBER(19,0) ,
+CREATE TABLE BATCH_JOB_INSTANCE (
+	JOB_INSTANCE_ID NUMBER(19,0)  NOT NULL PRIMARY KEY,
+	VERSION NUMBER(19,0),
 	JOB_NAME VARCHAR2(100 char) NOT NULL,
 	JOB_KEY VARCHAR2(32 char) NOT NULL,
 	constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
 ) SEGMENT CREATION IMMEDIATE;
 
-CREATE TABLE BATCH_JOB_EXECUTION  (
-	JOB_EXECUTION_ID NUMBER(19,0)  NOT NULL PRIMARY KEY ,
-	VERSION NUMBER(19,0)  ,
+CREATE TABLE BATCH_JOB_EXECUTION (
+	JOB_EXECUTION_ID NUMBER(19,0)  NOT NULL PRIMARY KEY,
+	VERSION NUMBER(19,0),
 	JOB_INSTANCE_ID NUMBER(19,0) NOT NULL,
 	CREATE_TIME TIMESTAMP(9) NOT NULL,
-	START_TIME TIMESTAMP(9) DEFAULT NULL ,
-	END_TIME TIMESTAMP(9) DEFAULT NULL ,
-	STATUS VARCHAR2(10 char) ,
-	EXIT_CODE VARCHAR2(2500 char) ,
-	EXIT_MESSAGE VARCHAR2(2500 char) ,
+	START_TIME TIMESTAMP(9) DEFAULT NULL,
+	END_TIME TIMESTAMP(9) DEFAULT NULL,
+	STATUS VARCHAR2(10 char),
+	EXIT_CODE VARCHAR2(2500 char),
+	EXIT_MESSAGE VARCHAR2(2500 char),
 	LAST_UPDATED TIMESTAMP(9),
 	constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID)
 	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
 ) SEGMENT CREATION IMMEDIATE;
 
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS  (
-	JOB_EXECUTION_ID NUMBER(19,0) NOT NULL ,
-	PARAMETER_NAME VARCHAR(100 char) NOT NULL ,
-	PARAMETER_TYPE VARCHAR(100 char) NOT NULL ,
-	PARAMETER_VALUE VARCHAR(2500 char) ,
-	IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+	JOB_EXECUTION_ID NUMBER(19,0) NOT NULL,
+	PARAMETER_NAME VARCHAR(100 char) NOT NULL,
+	PARAMETER_TYPE VARCHAR(100 char) NOT NULL,
+	PARAMETER_VALUE VARCHAR(2500 char),
+	IDENTIFYING CHAR(1) NOT NULL,
 	constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) SEGMENT CREATION IMMEDIATE;
 
-CREATE TABLE BATCH_STEP_EXECUTION  (
-	STEP_EXECUTION_ID NUMBER(19,0)  NOT NULL PRIMARY KEY ,
+CREATE TABLE BATCH_STEP_EXECUTION (
+	STEP_EXECUTION_ID NUMBER(19,0)  NOT NULL PRIMARY KEY,
 	VERSION NUMBER(19,0) NOT NULL,
 	STEP_NAME VARCHAR2(100 char) NOT NULL,
 	JOB_EXECUTION_ID NUMBER(19,0) NOT NULL,
 	CREATE_TIME TIMESTAMP(9) NOT NULL,
-	START_TIME TIMESTAMP(9) DEFAULT NULL ,
-	END_TIME TIMESTAMP(9) DEFAULT NULL ,
-	STATUS VARCHAR2(10 char) ,
-	COMMIT_COUNT NUMBER(19,0) ,
-	READ_COUNT NUMBER(19,0) ,
-	FILTER_COUNT NUMBER(19,0) ,
-	WRITE_COUNT NUMBER(19,0) ,
-	READ_SKIP_COUNT NUMBER(19,0) ,
-	WRITE_SKIP_COUNT NUMBER(19,0) ,
-	PROCESS_SKIP_COUNT NUMBER(19,0) ,
-	ROLLBACK_COUNT NUMBER(19,0) ,
-	EXIT_CODE VARCHAR2(2500 char) ,
-	EXIT_MESSAGE VARCHAR2(2500 char) ,
+	START_TIME TIMESTAMP(9) DEFAULT NULL,
+	END_TIME TIMESTAMP(9) DEFAULT NULL,
+	STATUS VARCHAR2(10 char),
+	COMMIT_COUNT NUMBER(19,0),
+	READ_COUNT NUMBER(19,0),
+	FILTER_COUNT NUMBER(19,0),
+	WRITE_COUNT NUMBER(19,0),
+	READ_SKIP_COUNT NUMBER(19,0),
+	WRITE_SKIP_COUNT NUMBER(19,0),
+	PROCESS_SKIP_COUNT NUMBER(19,0),
+	ROLLBACK_COUNT NUMBER(19,0),
+	EXIT_CODE VARCHAR2(2500 char),
+	EXIT_MESSAGE VARCHAR2(2500 char),
 	LAST_UPDATED TIMESTAMP(9),
 	constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) SEGMENT CREATION IMMEDIATE;
 
-CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
 	STEP_EXECUTION_ID NUMBER(19,0) NOT NULL PRIMARY KEY,
 	SHORT_CONTEXT VARCHAR2(2500 char) NOT NULL,
-	SERIALIZED_CONTEXT CLOB ,
+	SERIALIZED_CONTEXT CLOB,
 	constraint STEP_EXEC_CTX_FK foreign key (STEP_EXECUTION_ID)
 	references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
 ) SEGMENT CREATION IMMEDIATE;
 
-CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT  (
+CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
 	JOB_EXECUTION_ID NUMBER(19,0) NOT NULL PRIMARY KEY,
 	SHORT_CONTEXT VARCHAR2(2500 char) NOT NULL,
-	SERIALIZED_CONTEXT CLOB ,
+	SERIALIZED_CONTEXT CLOB,
 	constraint JOB_EXEC_CTX_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) SEGMENT CREATION IMMEDIATE;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-postgresql.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-postgresql.sql
index dd146f1f0f..585dc5773d 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-postgresql.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-postgresql.sql
@@ -1,74 +1,74 @@
 -- Autogenerated: do not edit this file
 
-CREATE TABLE BATCH_JOB_INSTANCE  (
-	JOB_INSTANCE_ID BIGINT  NOT NULL PRIMARY KEY ,
-	VERSION BIGINT ,
+CREATE TABLE BATCH_JOB_INSTANCE (
+	JOB_INSTANCE_ID BIGINT  NOT NULL PRIMARY KEY,
+	VERSION BIGINT,
 	JOB_NAME VARCHAR(100) NOT NULL,
 	JOB_KEY VARCHAR(32) NOT NULL,
 	constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
 ) ;
 
-CREATE TABLE BATCH_JOB_EXECUTION  (
-	JOB_EXECUTION_ID BIGINT  NOT NULL PRIMARY KEY ,
-	VERSION BIGINT  ,
+CREATE TABLE BATCH_JOB_EXECUTION (
+	JOB_EXECUTION_ID BIGINT  NOT NULL PRIMARY KEY,
+	VERSION BIGINT,
 	JOB_INSTANCE_ID BIGINT NOT NULL,
 	CREATE_TIME TIMESTAMP NOT NULL,
-	START_TIME TIMESTAMP DEFAULT NULL ,
-	END_TIME TIMESTAMP DEFAULT NULL ,
-	STATUS VARCHAR(10) ,
-	EXIT_CODE VARCHAR(2500) ,
-	EXIT_MESSAGE VARCHAR(2500) ,
+	START_TIME TIMESTAMP DEFAULT NULL,
+	END_TIME TIMESTAMP DEFAULT NULL,
+	STATUS VARCHAR(10),
+	EXIT_CODE VARCHAR(2500),
+	EXIT_MESSAGE VARCHAR(2500),
 	LAST_UPDATED TIMESTAMP,
 	constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID)
 	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
 ) ;
 
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS  (
-	JOB_EXECUTION_ID BIGINT NOT NULL ,
-	PARAMETER_NAME VARCHAR(100) NOT NULL ,
-	PARAMETER_TYPE VARCHAR(100) NOT NULL ,
-	PARAMETER_VALUE VARCHAR(2500) ,
-	IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+	JOB_EXECUTION_ID BIGINT NOT NULL,
+	PARAMETER_NAME VARCHAR(100) NOT NULL,
+	PARAMETER_TYPE VARCHAR(100) NOT NULL,
+	PARAMETER_VALUE VARCHAR(2500),
+	IDENTIFYING CHAR(1) NOT NULL,
 	constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
 
-CREATE TABLE BATCH_STEP_EXECUTION  (
-	STEP_EXECUTION_ID BIGINT  NOT NULL PRIMARY KEY ,
+CREATE TABLE BATCH_STEP_EXECUTION (
+	STEP_EXECUTION_ID BIGINT  NOT NULL PRIMARY KEY,
 	VERSION BIGINT NOT NULL,
 	STEP_NAME VARCHAR(100) NOT NULL,
 	JOB_EXECUTION_ID BIGINT NOT NULL,
 	CREATE_TIME TIMESTAMP NOT NULL,
-	START_TIME TIMESTAMP DEFAULT NULL ,
-	END_TIME TIMESTAMP DEFAULT NULL ,
-	STATUS VARCHAR(10) ,
-	COMMIT_COUNT BIGINT ,
-	READ_COUNT BIGINT ,
-	FILTER_COUNT BIGINT ,
-	WRITE_COUNT BIGINT ,
-	READ_SKIP_COUNT BIGINT ,
-	WRITE_SKIP_COUNT BIGINT ,
-	PROCESS_SKIP_COUNT BIGINT ,
-	ROLLBACK_COUNT BIGINT ,
-	EXIT_CODE VARCHAR(2500) ,
-	EXIT_MESSAGE VARCHAR(2500) ,
+	START_TIME TIMESTAMP DEFAULT NULL,
+	END_TIME TIMESTAMP DEFAULT NULL,
+	STATUS VARCHAR(10),
+	COMMIT_COUNT BIGINT,
+	READ_COUNT BIGINT,
+	FILTER_COUNT BIGINT,
+	WRITE_COUNT BIGINT,
+	READ_SKIP_COUNT BIGINT,
+	WRITE_SKIP_COUNT BIGINT,
+	PROCESS_SKIP_COUNT BIGINT,
+	ROLLBACK_COUNT BIGINT,
+	EXIT_CODE VARCHAR(2500),
+	EXIT_MESSAGE VARCHAR(2500),
 	LAST_UPDATED TIMESTAMP,
 	constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
 
-CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
 	STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
 	SHORT_CONTEXT VARCHAR(2500) NOT NULL,
-	SERIALIZED_CONTEXT TEXT ,
+	SERIALIZED_CONTEXT TEXT,
 	constraint STEP_EXEC_CTX_FK foreign key (STEP_EXECUTION_ID)
 	references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
 ) ;
 
-CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT  (
+CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
 	JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
 	SHORT_CONTEXT VARCHAR(2500) NOT NULL,
-	SERIALIZED_CONTEXT TEXT ,
+	SERIALIZED_CONTEXT TEXT,
 	constraint JOB_EXEC_CTX_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-sqlite.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-sqlite.sql
index 5a39c09e2a..8cf2582a6b 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-sqlite.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-sqlite.sql
@@ -1,74 +1,74 @@
 -- Autogenerated: do not edit this file
 
-CREATE TABLE BATCH_JOB_INSTANCE  (
+CREATE TABLE BATCH_JOB_INSTANCE (
 	JOB_INSTANCE_ID INTEGER  NOT NULL PRIMARY KEY AUTOINCREMENT,
-	VERSION INTEGER ,
+	VERSION INTEGER,
 	JOB_NAME VARCHAR(100) NOT NULL,
 	JOB_KEY VARCHAR(32) NOT NULL,
 	constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
 ) ;
 
-CREATE TABLE BATCH_JOB_EXECUTION  (
+CREATE TABLE BATCH_JOB_EXECUTION (
 	JOB_EXECUTION_ID INTEGER  NOT NULL PRIMARY KEY AUTOINCREMENT,
-	VERSION INTEGER  ,
+	VERSION INTEGER,
 	JOB_INSTANCE_ID INTEGER NOT NULL,
 	CREATE_TIME TIMESTAMP NOT NULL,
-	START_TIME TIMESTAMP DEFAULT NULL ,
-	END_TIME TIMESTAMP DEFAULT NULL ,
-	STATUS VARCHAR(10) ,
-	EXIT_CODE VARCHAR(100) ,
-	EXIT_MESSAGE VARCHAR(2500) ,
+	START_TIME TIMESTAMP DEFAULT NULL,
+	END_TIME TIMESTAMP DEFAULT NULL,
+	STATUS VARCHAR(10),
+	EXIT_CODE VARCHAR(100),
+	EXIT_MESSAGE VARCHAR(2500),
 	LAST_UPDATED TIMESTAMP,
 	constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID)
 	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
 ) ;
 
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS  (
-	JOB_EXECUTION_ID INTEGER NOT NULL ,
-	PARAMETER_NAME VARCHAR(100) NOT NULL ,
-	PARAMETER_TYPE VARCHAR(100) NOT NULL ,
-	PARAMETER_VALUE VARCHAR(2500) ,
-	IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+	JOB_EXECUTION_ID INTEGER NOT NULL,
+	PARAMETER_NAME VARCHAR(100) NOT NULL,
+	PARAMETER_TYPE VARCHAR(100) NOT NULL,
+	PARAMETER_VALUE VARCHAR(2500),
+	IDENTIFYING CHAR(1) NOT NULL,
 	constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
 
-CREATE TABLE BATCH_STEP_EXECUTION  (
+CREATE TABLE BATCH_STEP_EXECUTION (
 	STEP_EXECUTION_ID INTEGER  NOT NULL PRIMARY KEY AUTOINCREMENT,
 	VERSION INTEGER NOT NULL,
 	STEP_NAME VARCHAR(100) NOT NULL,
 	JOB_EXECUTION_ID INTEGER NOT NULL,
 	CREATE_TIME TIMESTAMP NOT NULL,
-	START_TIME TIMESTAMP DEFAULT NULL ,
-	END_TIME TIMESTAMP DEFAULT NULL ,
-	STATUS VARCHAR(10) ,
-	COMMIT_COUNT INTEGER ,
-	READ_COUNT INTEGER ,
-	FILTER_COUNT INTEGER ,
-	WRITE_COUNT INTEGER ,
-	READ_SKIP_COUNT INTEGER ,
-	WRITE_SKIP_COUNT INTEGER ,
-	PROCESS_SKIP_COUNT INTEGER ,
-	ROLLBACK_COUNT INTEGER ,
-	EXIT_CODE VARCHAR(100) ,
-	EXIT_MESSAGE VARCHAR(2500) ,
+	START_TIME TIMESTAMP DEFAULT NULL,
+	END_TIME TIMESTAMP DEFAULT NULL,
+	STATUS VARCHAR(10),
+	COMMIT_COUNT INTEGER,
+	READ_COUNT INTEGER,
+	FILTER_COUNT INTEGER,
+	WRITE_COUNT INTEGER,
+	READ_SKIP_COUNT INTEGER,
+	WRITE_SKIP_COUNT INTEGER,
+	PROCESS_SKIP_COUNT INTEGER,
+	ROLLBACK_COUNT INTEGER,
+	EXIT_CODE VARCHAR(100),
+	EXIT_MESSAGE VARCHAR(2500),
 	LAST_UPDATED TIMESTAMP,
 	constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
 
-CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
 	STEP_EXECUTION_ID INTEGER NOT NULL PRIMARY KEY,
 	SHORT_CONTEXT VARCHAR(2500) NOT NULL,
-	SERIALIZED_CONTEXT CLOB ,
+	SERIALIZED_CONTEXT CLOB,
 	constraint STEP_EXEC_CTX_FK foreign key (STEP_EXECUTION_ID)
 	references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
 ) ;
 
-CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT  (
+CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
 	JOB_EXECUTION_ID INTEGER NOT NULL PRIMARY KEY,
 	SHORT_CONTEXT VARCHAR(2500) NOT NULL,
-	SERIALIZED_CONTEXT CLOB ,
+	SERIALIZED_CONTEXT CLOB,
 	constraint JOB_EXEC_CTX_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-sqlserver.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-sqlserver.sql
index 70c89664c0..ca654183de 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-sqlserver.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-sqlserver.sql
@@ -1,20 +1,20 @@
 -- Autogenerated: do not edit this file
 
-CREATE TABLE BATCH_JOB_INSTANCE  (
-	JOB_INSTANCE_ID BIGINT  NOT NULL PRIMARY KEY ,
+CREATE TABLE BATCH_JOB_INSTANCE (
+	JOB_INSTANCE_ID BIGINT  NOT NULL PRIMARY KEY,
 	VERSION BIGINT NULL,
 	JOB_NAME VARCHAR(100) NOT NULL,
 	JOB_KEY VARCHAR(32) NOT NULL,
 	constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
 ) ;
 
-CREATE TABLE BATCH_JOB_EXECUTION  (
-	JOB_EXECUTION_ID BIGINT  NOT NULL PRIMARY KEY ,
+CREATE TABLE BATCH_JOB_EXECUTION (
+	JOB_EXECUTION_ID BIGINT  NOT NULL PRIMARY KEY,
 	VERSION BIGINT NULL,
 	JOB_INSTANCE_ID BIGINT NOT NULL,
 	CREATE_TIME DATETIME NOT NULL,
-	START_TIME DATETIME DEFAULT NULL ,
-	END_TIME DATETIME DEFAULT NULL ,
+	START_TIME DATETIME DEFAULT NULL,
+	END_TIME DATETIME DEFAULT NULL,
 	STATUS VARCHAR(10) NULL,
 	EXIT_CODE VARCHAR(2500) NULL,
 	EXIT_MESSAGE VARCHAR(2500) NULL,
@@ -23,24 +23,24 @@ CREATE TABLE BATCH_JOB_EXECUTION  (
 	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
 ) ;
 
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS  (
-	JOB_EXECUTION_ID BIGINT NOT NULL ,
-	PARAMETER_NAME VARCHAR(100) NOT NULL ,
-	PARAMETER_TYPE VARCHAR(100) NOT NULL ,
-	PARAMETER_VALUE VARCHAR(2500) ,
-	IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+	JOB_EXECUTION_ID BIGINT NOT NULL,
+	PARAMETER_NAME VARCHAR(100) NOT NULL,
+	PARAMETER_TYPE VARCHAR(100) NOT NULL,
+	PARAMETER_VALUE VARCHAR(2500),
+	IDENTIFYING CHAR(1) NOT NULL,
 	constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
 
-CREATE TABLE BATCH_STEP_EXECUTION  (
-	STEP_EXECUTION_ID BIGINT  NOT NULL PRIMARY KEY ,
+CREATE TABLE BATCH_STEP_EXECUTION (
+	STEP_EXECUTION_ID BIGINT  NOT NULL PRIMARY KEY,
 	VERSION BIGINT NOT NULL,
 	STEP_NAME VARCHAR(100) NOT NULL,
 	JOB_EXECUTION_ID BIGINT NOT NULL,
 	CREATE_TIME DATETIME NOT NULL,
-	START_TIME DATETIME DEFAULT NULL ,
-	END_TIME DATETIME DEFAULT NULL ,
+	START_TIME DATETIME DEFAULT NULL,
+	END_TIME DATETIME DEFAULT NULL,
 	STATUS VARCHAR(10) NULL,
 	COMMIT_COUNT BIGINT NULL,
 	READ_COUNT BIGINT NULL,
@@ -57,7 +57,7 @@ CREATE TABLE BATCH_STEP_EXECUTION  (
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
 
-CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
 	STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
 	SHORT_CONTEXT VARCHAR(2500) NOT NULL,
 	SERIALIZED_CONTEXT VARCHAR(MAX) NULL,
@@ -65,7 +65,7 @@ CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
 	references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
 ) ;
 
-CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT  (
+CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
 	JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
 	SHORT_CONTEXT VARCHAR(2500) NOT NULL,
 	SERIALIZED_CONTEXT VARCHAR(MAX) NULL,
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-sybase.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-sybase.sql
index 15b221970e..131c0847a3 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-sybase.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-sybase.sql
@@ -1,15 +1,15 @@
 -- Autogenerated: do not edit this file
 
-CREATE TABLE BATCH_JOB_INSTANCE  (
-	JOB_INSTANCE_ID BIGINT  NOT NULL PRIMARY KEY ,
+CREATE TABLE BATCH_JOB_INSTANCE (
+	JOB_INSTANCE_ID BIGINT  NOT NULL PRIMARY KEY,
 	VERSION BIGINT NULL,
 	JOB_NAME VARCHAR(100) NOT NULL,
 	JOB_KEY VARCHAR(32) NOT NULL,
 	constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
 ) ;
 
-CREATE TABLE BATCH_JOB_EXECUTION  (
-	JOB_EXECUTION_ID BIGINT  NOT NULL PRIMARY KEY ,
+CREATE TABLE BATCH_JOB_EXECUTION (
+	JOB_EXECUTION_ID BIGINT  NOT NULL PRIMARY KEY,
 	VERSION BIGINT  NULL,
 	JOB_INSTANCE_ID BIGINT NOT NULL,
 	CREATE_TIME DATETIME NOT NULL,
@@ -23,18 +23,18 @@ CREATE TABLE BATCH_JOB_EXECUTION  (
 	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
 ) ;
 
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS  (
-	JOB_EXECUTION_ID BIGINT NOT NULL ,
-	PARAMETER_NAME VARCHAR(100) NOT NULL ,
-	PARAMETER_TYPE VARCHAR(100) NOT NULL ,
-	PARAMETER_VALUE VARCHAR(2500) ,
-	IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+	JOB_EXECUTION_ID BIGINT NOT NULL,
+	PARAMETER_NAME VARCHAR(100) NOT NULL,
+	PARAMETER_TYPE VARCHAR(100) NOT NULL,
+	PARAMETER_VALUE VARCHAR(2500),
+	IDENTIFYING CHAR(1) NOT NULL,
 	constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
 
-CREATE TABLE BATCH_STEP_EXECUTION  (
-	STEP_EXECUTION_ID BIGINT  NOT NULL PRIMARY KEY ,
+CREATE TABLE BATCH_STEP_EXECUTION (
+	STEP_EXECUTION_ID BIGINT  NOT NULL PRIMARY KEY,
 	VERSION BIGINT NOT NULL,
 	STEP_NAME VARCHAR(100) NOT NULL,
 	JOB_EXECUTION_ID BIGINT NOT NULL,
@@ -57,7 +57,7 @@ CREATE TABLE BATCH_STEP_EXECUTION  (
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
 
-CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
 	STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
 	SHORT_CONTEXT VARCHAR(2500) NOT NULL,
 	SERIALIZED_CONTEXT TEXT NULL,
@@ -65,7 +65,7 @@ CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
 	references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
 ) ;
 
-CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT  (
+CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
 	JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
 	SHORT_CONTEXT VARCHAR(2500) NOT NULL,
 	SERIALIZED_CONTEXT TEXT NULL,
diff --git a/spring-batch-core/src/test/resources/foo.sql b/spring-batch-core/src/test/resources/foo.sql
index 1c32c772d2..24dc334b8e 100644
--- a/spring-batch-core/src/test/resources/foo.sql
+++ b/spring-batch-core/src/test/resources/foo.sql
@@ -9,9 +9,9 @@ CREATE TABLE T_FOOS (
 
 ALTER TABLE T_FOOS ADD PRIMARY KEY (ID);
 
-CREATE TABLE ERROR_LOG  (
-    JOB_NAME CHAR(20) ,
-    STEP_NAME CHAR(20) ,
+CREATE TABLE ERROR_LOG (
+    JOB_NAME CHAR(20),
+    STEP_NAME CHAR(20),
     MESSAGE VARCHAR(300) NOT NULL
 ) ;
 
diff --git a/spring-batch-core/src/test/resources/football-schema-hsqldb.sql b/spring-batch-core/src/test/resources/football-schema-hsqldb.sql
index 3ab21d7c0e..d411108131 100644
--- a/spring-batch-core/src/test/resources/football-schema-hsqldb.sql
+++ b/spring-batch-core/src/test/resources/football-schema-hsqldb.sql
@@ -7,7 +7,7 @@ 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) ,
+	POS VARCHAR(10),
 	YEAR_OF_BIRTH BIGINT NOT NULL,
 	YEAR_DRAFTED BIGINT NOT NULL
 ) ;
@@ -17,30 +17,30 @@ CREATE TABLE GAMES (
    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 ,
+   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  (
+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 , 
+		  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
 ) ;
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/repository/dao/schema-prefix-hsqldb.sql b/spring-batch-core/src/test/resources/org/springframework/batch/core/repository/dao/schema-prefix-hsqldb.sql
index 72a8fc0917..fe14ed2a64 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/repository/dao/schema-prefix-hsqldb.sql
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/repository/dao/schema-prefix-hsqldb.sql
@@ -9,78 +9,78 @@ DROP TABLE  PREFIX_STEP_EXECUTION_SEQ IF EXISTS;
 DROP TABLE  PREFIX_JOB_EXECUTION_SEQ IF EXISTS;
 DROP TABLE  PREFIX_JOB_SEQ IF EXISTS;
 
-CREATE TABLE PREFIX_JOB_INSTANCE  (
-	JOB_INSTANCE_ID BIGINT IDENTITY NOT NULL PRIMARY KEY ,
-	VERSION BIGINT ,
+CREATE TABLE PREFIX_JOB_INSTANCE (
+	JOB_INSTANCE_ID BIGINT IDENTITY NOT NULL PRIMARY KEY,
+	VERSION BIGINT,
 	JOB_NAME VARCHAR(100) NOT NULL,
 	JOB_KEY VARCHAR(32) NOT NULL,
 	constraint PREFIX_JOB_INST_UN unique (JOB_NAME, JOB_KEY)
 ) ;
 
-CREATE TABLE PREFIX_JOB_EXECUTION  (
-	JOB_EXECUTION_ID BIGINT IDENTITY NOT NULL PRIMARY KEY ,
-	VERSION BIGINT  ,
+CREATE TABLE PREFIX_JOB_EXECUTION (
+	JOB_EXECUTION_ID BIGINT IDENTITY NOT NULL PRIMARY KEY,
+	VERSION BIGINT,
 	JOB_INSTANCE_ID BIGINT NOT NULL,
 	CREATE_TIME TIMESTAMP NOT NULL,
-	START_TIME TIMESTAMP DEFAULT NULL ,
-	END_TIME TIMESTAMP DEFAULT NULL ,
-	STATUS VARCHAR(10) ,
-	EXIT_CODE VARCHAR(20) ,
-	EXIT_MESSAGE VARCHAR(2500) ,
+	START_TIME TIMESTAMP DEFAULT NULL,
+	END_TIME TIMESTAMP DEFAULT NULL,
+	STATUS VARCHAR(10),
+	EXIT_CODE VARCHAR(20),
+	EXIT_MESSAGE VARCHAR(2500),
 	LAST_UPDATED TIMESTAMP,
 	constraint PREFIX_JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID)
 	references PREFIX_JOB_INSTANCE(JOB_INSTANCE_ID)
 ) ;
 
-CREATE TABLE PREFIX_JOB_EXECUTION_PARAMS  (
-	JOB_EXECUTION_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 ,
-	IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE PREFIX_JOB_EXECUTION_PARAMS (
+	JOB_EXECUTION_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,
+	IDENTIFYING CHAR(1) NOT NULL,
 	constraint PREFIX_JOB_INST_PARAMS_FK foreign key (JOB_EXECUTION_ID)
 	references PREFIX_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
 
-CREATE TABLE PREFIX_STEP_EXECUTION  (
-	STEP_EXECUTION_ID BIGINT IDENTITY NOT NULL PRIMARY KEY ,
+CREATE TABLE PREFIX_STEP_EXECUTION (
+	STEP_EXECUTION_ID BIGINT IDENTITY NOT NULL PRIMARY KEY,
 	VERSION BIGINT NOT NULL,
 	STEP_NAME VARCHAR(100) NOT NULL,
 	JOB_EXECUTION_ID BIGINT NOT NULL,
-	CREATE_TIME TIMESTAMP NOT NULL ,
-	START_TIME TIMESTAMP DEFAULT NULL ,
-	END_TIME TIMESTAMP DEFAULT NULL ,
-	STATUS VARCHAR(10) ,
-	COMMIT_COUNT BIGINT ,
-	READ_COUNT BIGINT ,
-	FILTER_COUNT BIGINT ,
-	WRITE_COUNT BIGINT ,
-	READ_SKIP_COUNT BIGINT ,
-	WRITE_SKIP_COUNT BIGINT ,
-	PROCESS_SKIP_COUNT BIGINT ,
-	ROLLBACK_COUNT BIGINT ,
-	EXIT_CODE VARCHAR(20) ,
-	EXIT_MESSAGE VARCHAR(2500) ,
+	CREATE_TIME TIMESTAMP NOT NULL,
+	START_TIME TIMESTAMP DEFAULT NULL,
+	END_TIME TIMESTAMP DEFAULT NULL,
+	STATUS VARCHAR(10),
+	COMMIT_COUNT BIGINT,
+	READ_COUNT BIGINT,
+	FILTER_COUNT BIGINT,
+	WRITE_COUNT BIGINT,
+	READ_SKIP_COUNT BIGINT,
+	WRITE_SKIP_COUNT BIGINT,
+	PROCESS_SKIP_COUNT BIGINT,
+	ROLLBACK_COUNT BIGINT,
+	EXIT_CODE VARCHAR(20),
+	EXIT_MESSAGE VARCHAR(2500),
 	LAST_UPDATED TIMESTAMP,
 	constraint PREFIX_JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID)
 	references PREFIX_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
 
-CREATE TABLE PREFIX_STEP_EXECUTION_CONTEXT  (
+CREATE TABLE PREFIX_STEP_EXECUTION_CONTEXT (
 	STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
 	SHORT_CONTEXT VARCHAR(2500) NOT NULL,
-	SERIALIZED_CONTEXT LONGVARCHAR ,
+	SERIALIZED_CONTEXT LONGVARCHAR,
 	constraint PREFIX_STEP_EXEC_CTX_FK foreign key (STEP_EXECUTION_ID)
 	references PREFIX_STEP_EXECUTION(STEP_EXECUTION_ID)
 ) ;
 
-CREATE TABLE PREFIX_JOB_EXECUTION_CONTEXT  (
+CREATE TABLE PREFIX_JOB_EXECUTION_CONTEXT (
 	JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
 	SHORT_CONTEXT VARCHAR(2500) NOT NULL,
-	SERIALIZED_CONTEXT LONGVARCHAR ,
+	SERIALIZED_CONTEXT LONGVARCHAR,
 	constraint PREFIX_JOB_EXEC_CTX_FK foreign key (JOB_EXECUTION_ID)
 	references PREFIX_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
diff --git a/spring-batch-core/src/test/resources/schema-hsqldb-extended.sql b/spring-batch-core/src/test/resources/schema-hsqldb-extended.sql
index 4eb969ebcb..7a6abaa8a4 100644
--- a/spring-batch-core/src/test/resources/schema-hsqldb-extended.sql
+++ b/spring-batch-core/src/test/resources/schema-hsqldb-extended.sql
@@ -4,78 +4,78 @@
 -- store and verify the stack traces of failure exceptions,
 -- which could be larger than the default 2500 characters.
 
-CREATE TABLE BATCH_JOB_INSTANCE  (
-	JOB_INSTANCE_ID BIGINT IDENTITY NOT NULL PRIMARY KEY ,
-	VERSION BIGINT ,
+CREATE TABLE BATCH_JOB_INSTANCE (
+	JOB_INSTANCE_ID BIGINT IDENTITY NOT NULL PRIMARY KEY,
+	VERSION BIGINT,
 	JOB_NAME VARCHAR(100) NOT NULL,
 	JOB_KEY VARCHAR(32) NOT NULL,
 	constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
 ) ;
 
-CREATE TABLE BATCH_JOB_EXECUTION  (
-	JOB_EXECUTION_ID BIGINT IDENTITY NOT NULL PRIMARY KEY ,
-	VERSION BIGINT  ,
+CREATE TABLE BATCH_JOB_EXECUTION (
+	JOB_EXECUTION_ID BIGINT IDENTITY NOT NULL PRIMARY KEY,
+	VERSION BIGINT,
 	JOB_INSTANCE_ID BIGINT NOT NULL,
 	CREATE_TIME TIMESTAMP(9) NOT NULL,
-	START_TIME TIMESTAMP(9) DEFAULT NULL ,
-	END_TIME TIMESTAMP(9) DEFAULT NULL ,
-	STATUS VARCHAR(10) ,
-	EXIT_CODE VARCHAR(20000) ,
-	EXIT_MESSAGE VARCHAR(20000) ,
+	START_TIME TIMESTAMP(9) DEFAULT NULL,
+	END_TIME TIMESTAMP(9) DEFAULT NULL,
+	STATUS VARCHAR(10),
+	EXIT_CODE VARCHAR(20000),
+	EXIT_MESSAGE VARCHAR(20000),
 	LAST_UPDATED TIMESTAMP(9),
 	constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID)
 	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
 ) ;
 
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS  (
-	JOB_EXECUTION_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 ,
-	IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+	JOB_EXECUTION_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,
+	IDENTIFYING CHAR(1) NOT NULL,
 	constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
 
-CREATE TABLE BATCH_STEP_EXECUTION  (
-	STEP_EXECUTION_ID BIGINT IDENTITY NOT NULL PRIMARY KEY ,
+CREATE TABLE BATCH_STEP_EXECUTION (
+	STEP_EXECUTION_ID BIGINT IDENTITY NOT NULL PRIMARY KEY,
 	VERSION BIGINT NOT NULL,
 	STEP_NAME VARCHAR(100) NOT NULL,
 	JOB_EXECUTION_ID BIGINT NOT NULL,
-	CREATE_TIME TIMESTAMP(9) NOT NULL ,
-	START_TIME TIMESTAMP(9) DEFAULT NULL ,
-	END_TIME TIMESTAMP(9) DEFAULT NULL ,
-	STATUS VARCHAR(10) ,
-	COMMIT_COUNT BIGINT ,
-	READ_COUNT BIGINT ,
-	FILTER_COUNT BIGINT ,
-	WRITE_COUNT BIGINT ,
-	READ_SKIP_COUNT BIGINT ,
-	WRITE_SKIP_COUNT BIGINT ,
-	PROCESS_SKIP_COUNT BIGINT ,
-	ROLLBACK_COUNT BIGINT ,
-	EXIT_CODE VARCHAR(20000) ,
-	EXIT_MESSAGE VARCHAR(20000) ,
+	CREATE_TIME TIMESTAMP(9) NOT NULL,
+	START_TIME TIMESTAMP(9) DEFAULT NULL,
+	END_TIME TIMESTAMP(9) DEFAULT NULL,
+	STATUS VARCHAR(10),
+	COMMIT_COUNT BIGINT,
+	READ_COUNT BIGINT,
+	FILTER_COUNT BIGINT,
+	WRITE_COUNT BIGINT,
+	READ_SKIP_COUNT BIGINT,
+	WRITE_SKIP_COUNT BIGINT,
+	PROCESS_SKIP_COUNT BIGINT,
+	ROLLBACK_COUNT BIGINT,
+	EXIT_CODE VARCHAR(20000),
+	EXIT_MESSAGE VARCHAR(20000),
 	LAST_UPDATED TIMESTAMP(9),
 	constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
 
-CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
 	STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
 	SHORT_CONTEXT VARCHAR(20000) NOT NULL,
-	SERIALIZED_CONTEXT LONGVARCHAR ,
+	SERIALIZED_CONTEXT LONGVARCHAR,
 	constraint STEP_EXEC_CTX_FK foreign key (STEP_EXECUTION_ID)
 	references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
 ) ;
 
-CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT  (
+CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
 	JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
 	SHORT_CONTEXT VARCHAR(20000) NOT NULL,
-	SERIALIZED_CONTEXT LONGVARCHAR ,
+	SERIALIZED_CONTEXT LONGVARCHAR,
 	constraint JOB_EXEC_CTX_FK foreign key (JOB_EXECUTION_ID)
 	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
 ) ;
diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/samples/common/business-schema-hsqldb.sql b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/common/business-schema-hsqldb.sql
index 52a8c890f0..f86890ec58 100644
--- a/spring-batch-samples/src/main/resources/org/springframework/batch/samples/common/business-schema-hsqldb.sql
+++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/common/business-schema-hsqldb.sql
@@ -26,26 +26,26 @@ CREATE TABLE TRADE_SEQ (
 );
 INSERT INTO TRADE_SEQ (ID) values (0);
 
-CREATE TABLE BATCH_STAGING  (
-	ID BIGINT IDENTITY NOT NULL PRIMARY KEY ,  
+CREATE TABLE BATCH_STAGING (
+	ID BIGINT IDENTITY NOT NULL PRIMARY KEY,
 	JOB_ID BIGINT NOT NULL,
 	VALUE LONGVARBINARY NOT NULL,
 	PROCESSED CHAR(1) NOT NULL
 ) ;
 
-CREATE TABLE TRADE  (
-	ID BIGINT IDENTITY NOT NULL PRIMARY KEY ,  
-	VERSION BIGINT ,
+CREATE TABLE TRADE (
+	ID BIGINT IDENTITY NOT NULL PRIMARY KEY,
+	VERSION BIGINT,
 	ISIN VARCHAR(45) NOT NULL, 
-	QUANTITY BIGINT ,
-	PRICE DECIMAL(8,2) , 
+	QUANTITY BIGINT,
+	PRICE DECIMAL(8,2),
 	CUSTOMER VARCHAR(45) 
 ) ;
  
 CREATE TABLE CUSTOMER (
-	ID BIGINT IDENTITY NOT NULL PRIMARY KEY ,  
-	VERSION BIGINT ,
-	NAME VARCHAR(45) ,
+	ID BIGINT IDENTITY NOT NULL PRIMARY KEY,
+	VERSION BIGINT,
+	NAME VARCHAR(45),
 	CREDIT DECIMAL(10,2) 
 ) ;
  
@@ -58,7 +58,7 @@ 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) ,
+	POS VARCHAR(10),
 	YEAR_OF_BIRTH BIGINT NOT NULL,
 	YEAR_DRAFTED BIGINT NOT NULL
 ) ;
@@ -68,37 +68,37 @@ CREATE TABLE GAMES (
    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 ,
+   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  (
+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 , 
+		  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
 ) ;
 
-CREATE TABLE ERROR_LOG  (
-		JOB_NAME CHAR(20) ,
-		STEP_NAME CHAR(20) ,
+CREATE TABLE ERROR_LOG (
+		JOB_NAME CHAR(20),
+		STEP_NAME CHAR(20),
 		MESSAGE VARCHAR(300) NOT NULL
 ) ;