From fd9dca3504c91b97d871ee145711fba7293deada Mon Sep 17 00:00:00 2001 From: Mahmoud Ben Hassine Date: Tue, 4 Oct 2022 22:13:40 +0200 Subject: [PATCH] Fix column names in BATCH_JOB_EXECUTION_PARAMS For some DB providers, columns cannot be named "VALUE". This commit adds a prefix where appropriate to the columns of `BATCH_JOB_EXECUTION_PARAMS`. Related to: * https://github.com/spring-projects/spring-batch/issues/3960 --- .../core/repository/dao/JdbcJobExecutionDao.java | 14 +++++++------- .../batch/core/migration/5.0/migration-db2.sql | 6 +++--- .../batch/core/migration/5.0/migration-derby.sql | 6 +++--- .../batch/core/migration/5.0/migration-h2.sql | 6 +++--- .../batch/core/migration/5.0/migration-hsqldb.sql | 6 +++--- .../batch/core/migration/5.0/migration-mysql.sql | 6 +++--- .../batch/core/migration/5.0/migration-oracle.sql | 6 +++--- .../core/migration/5.0/migration-postgresql.sql | 6 +++--- .../batch/core/migration/5.0/migration-sqlite.sql | 6 +++--- .../core/migration/5.0/migration-sqlserver.sql | 6 +++--- .../batch/core/migration/5.0/migration-sybase.sql | 6 +++--- .../org/springframework/batch/core/schema-db2.sql | 6 +++--- .../springframework/batch/core/schema-derby.sql | 6 +++--- .../org/springframework/batch/core/schema-h2.sql | 6 +++--- .../org/springframework/batch/core/schema-hana.sql | 6 +++--- .../springframework/batch/core/schema-hsqldb.sql | 6 +++--- .../springframework/batch/core/schema-mysql.sql | 6 +++--- .../springframework/batch/core/schema-oracle.sql | 6 +++--- .../batch/core/schema-postgresql.sql | 6 +++--- .../springframework/batch/core/schema-sqlite.sql | 6 +++--- .../batch/core/schema-sqlserver.sql | 6 +++--- .../springframework/batch/core/schema-sybase.sql | 6 +++--- .../src/main/asciidoc/schema-appendix.adoc | 14 ++++++-------- 23 files changed, 76 insertions(+), 78 deletions(-) diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobExecutionDao.java index 0446199b5..1cec812df 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobExecutionDao.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobExecutionDao.java @@ -90,11 +90,11 @@ public class JdbcJobExecutionDao extends AbstractJdbcBatchMetadataDao implements private static final String CURRENT_VERSION_JOB_EXECUTION = "SELECT VERSION FROM %PREFIX%JOB_EXECUTION WHERE JOB_EXECUTION_ID=?"; - private static final String FIND_PARAMS_FROM_ID = "SELECT JOB_EXECUTION_ID, NAME, TYPE, " - + "VALUE, IDENTIFYING from %PREFIX%JOB_EXECUTION_PARAMS where JOB_EXECUTION_ID = ?"; + private static final String FIND_PARAMS_FROM_ID = "SELECT JOB_EXECUTION_ID, PARAMETER_NAME, PARAMETER_TYPE, " + + "PARAMETER_VALUE, IDENTIFYING from %PREFIX%JOB_EXECUTION_PARAMS where JOB_EXECUTION_ID = ?"; - private static final String CREATE_JOB_PARAMETERS = "INSERT into %PREFIX%JOB_EXECUTION_PARAMS(JOB_EXECUTION_ID, NAME, TYPE, " - + "VALUE, IDENTIFYING) values (?, ?, ?, ?, ?)"; + private static final String CREATE_JOB_PARAMETERS = "INSERT into %PREFIX%JOB_EXECUTION_PARAMS(JOB_EXECUTION_ID, PARAMETER_NAME, PARAMETER_TYPE, " + + "PARAMETER_VALUE, IDENTIFYING) values (?, ?, ?, ?, ?)"; private static final String DELETE_JOB_EXECUTION = "DELETE FROM %PREFIX%JOB_EXECUTION WHERE JOB_EXECUTION_ID = ?"; @@ -374,16 +374,16 @@ public class JdbcJobExecutionDao extends AbstractJdbcBatchMetadataDao implements RowCallbackHandler handler = new RowCallbackHandler() { @Override public void processRow(ResultSet rs) throws SQLException { - String parameterName = rs.getString("NAME"); + String parameterName = rs.getString("PARAMETER_NAME"); Class parameterType = null; try { - parameterType = Class.forName(rs.getString("TYPE")); + parameterType = Class.forName(rs.getString("PARAMETER_TYPE")); } catch (ClassNotFoundException e) { throw new RuntimeException(e); } - String stringValue = rs.getString("VALUE"); + String stringValue = rs.getString("PARAMETER_VALUE"); Object typedValue = conversionService.convert(stringValue, parameterType); boolean identifying = rs.getString("IDENTIFYING").equalsIgnoreCase("Y"); diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-db2.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-db2.sql index 5011ad6fe..f8f69640b 100644 --- a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-db2.sql +++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-db2.sql @@ -5,6 +5,6 @@ ALTER TABLE BATCH_JOB_EXECUTION_PARAMS DROP COLUMN DATE_VAL; ALTER TABLE BATCH_JOB_EXECUTION_PARAMS DROP COLUMN LONG_VAL; ALTER TABLE BATCH_JOB_EXECUTION_PARAMS DROP COLUMN DOUBLE_VAL; -ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN TYPE_CD TYPE VARCHAR(100); -ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN KEY_NAME NAME VARCHAR(100); -ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN STRING_VAL VALUE VARCHAR(2500); \ No newline at end of file +ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN TYPE_CD PARAMETER_TYPE VARCHAR(100); +ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN KEY_NAME PARAMETER_NAME VARCHAR(100); +ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN STRING_VAL PARAMETER_VALUE VARCHAR(2500); \ No newline at end of file diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-derby.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-derby.sql index 5011ad6fe..f8f69640b 100644 --- a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-derby.sql +++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-derby.sql @@ -5,6 +5,6 @@ ALTER TABLE BATCH_JOB_EXECUTION_PARAMS DROP COLUMN DATE_VAL; ALTER TABLE BATCH_JOB_EXECUTION_PARAMS DROP COLUMN LONG_VAL; ALTER TABLE BATCH_JOB_EXECUTION_PARAMS DROP COLUMN DOUBLE_VAL; -ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN TYPE_CD TYPE VARCHAR(100); -ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN KEY_NAME NAME VARCHAR(100); -ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN STRING_VAL VALUE VARCHAR(2500); \ No newline at end of file +ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN TYPE_CD PARAMETER_TYPE VARCHAR(100); +ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN KEY_NAME PARAMETER_NAME VARCHAR(100); +ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN STRING_VAL PARAMETER_VALUE VARCHAR(2500); \ No newline at end of file diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-h2.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-h2.sql index 5011ad6fe..f8f69640b 100644 --- a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-h2.sql +++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-h2.sql @@ -5,6 +5,6 @@ ALTER TABLE BATCH_JOB_EXECUTION_PARAMS DROP COLUMN DATE_VAL; ALTER TABLE BATCH_JOB_EXECUTION_PARAMS DROP COLUMN LONG_VAL; ALTER TABLE BATCH_JOB_EXECUTION_PARAMS DROP COLUMN DOUBLE_VAL; -ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN TYPE_CD TYPE VARCHAR(100); -ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN KEY_NAME NAME VARCHAR(100); -ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN STRING_VAL VALUE VARCHAR(2500); \ No newline at end of file +ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN TYPE_CD PARAMETER_TYPE VARCHAR(100); +ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN KEY_NAME PARAMETER_NAME VARCHAR(100); +ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN STRING_VAL PARAMETER_VALUE VARCHAR(2500); \ No newline at end of file diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-hsqldb.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-hsqldb.sql index 84dafb375..7d19eadb3 100644 --- a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-hsqldb.sql +++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-hsqldb.sql @@ -5,6 +5,6 @@ ALTER TABLE BATCH_JOB_EXECUTION_PARAMS DROP COLUMN DATE_VAL; ALTER TABLE BATCH_JOB_EXECUTION_PARAMS DROP COLUMN LONG_VAL; ALTER TABLE BATCH_JOB_EXECUTION_PARAMS DROP COLUMN DOUBLE_VAL; -ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN TYPE_CD TYPE VARCHAR(100); -ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN KEY_NAME NAME VARCHAR(100); -ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN STRING_VAL VALUE VARCHAR(2500); \ No newline at end of file +ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN TYPE_CD PARAMETER_TYPE VARCHAR(100); +ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN KEY_NAME PARAMETER_NAME VARCHAR(100); +ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN STRING_VAL PARAMETER_VALUE VARCHAR(2500); \ No newline at end of file diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-mysql.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-mysql.sql index c5facd673..57fda0790 100644 --- a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-mysql.sql +++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-mysql.sql @@ -5,6 +5,6 @@ ALTER TABLE BATCH_JOB_EXECUTION_PARAMS DROP COLUMN DATE_VAL; ALTER TABLE BATCH_JOB_EXECUTION_PARAMS DROP COLUMN LONG_VAL; ALTER TABLE BATCH_JOB_EXECUTION_PARAMS DROP COLUMN DOUBLE_VAL; -ALTER TABLE BATCH_JOB_EXECUTION_PARAMS CHANGE COLUMN TYPE_CD TYPE VARCHAR(100); -ALTER TABLE BATCH_JOB_EXECUTION_PARAMS CHANGE COLUMN KEY_NAME NAME VARCHAR(100); -ALTER TABLE BATCH_JOB_EXECUTION_PARAMS CHANGE COLUMN STRING_VAL VALUE VARCHAR(2500); \ No newline at end of file +ALTER TABLE BATCH_JOB_EXECUTION_PARAMS CHANGE COLUMN TYPE_CD PARAMETER_TYPE VARCHAR(100); +ALTER TABLE BATCH_JOB_EXECUTION_PARAMS CHANGE COLUMN KEY_NAME PARAMETER_NAME VARCHAR(100); +ALTER TABLE BATCH_JOB_EXECUTION_PARAMS CHANGE COLUMN STRING_VAL PARAMETER_VALUE VARCHAR(2500); \ No newline at end of file diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-oracle.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-oracle.sql index d19402c7c..f61d2d93f 100644 --- a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-oracle.sql +++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-oracle.sql @@ -9,6 +9,6 @@ ALTER TABLE BATCH_JOB_EXECUTION_PARAMS DROP COLUMN DATE_VAL; ALTER TABLE BATCH_JOB_EXECUTION_PARAMS DROP COLUMN LONG_VAL; ALTER TABLE BATCH_JOB_EXECUTION_PARAMS DROP COLUMN DOUBLE_VAL; -ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN TYPE_CD TYPE VARCHAR(100); -ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN KEY_NAME NAME VARCHAR(100); -ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN STRING_VAL VALUE VARCHAR(2500); \ No newline at end of file +ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN TYPE_CD PARAMETER_TYPE VARCHAR(100); +ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN KEY_NAME PARAMETER_NAME VARCHAR(100); +ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN STRING_VAL PARAMETER_VALUE VARCHAR(2500); \ No newline at end of file diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-postgresql.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-postgresql.sql index 5011ad6fe..f8f69640b 100644 --- a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-postgresql.sql +++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-postgresql.sql @@ -5,6 +5,6 @@ ALTER TABLE BATCH_JOB_EXECUTION_PARAMS DROP COLUMN DATE_VAL; ALTER TABLE BATCH_JOB_EXECUTION_PARAMS DROP COLUMN LONG_VAL; ALTER TABLE BATCH_JOB_EXECUTION_PARAMS DROP COLUMN DOUBLE_VAL; -ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN TYPE_CD TYPE VARCHAR(100); -ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN KEY_NAME NAME VARCHAR(100); -ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN STRING_VAL VALUE VARCHAR(2500); \ No newline at end of file +ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN TYPE_CD PARAMETER_TYPE VARCHAR(100); +ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN KEY_NAME PARAMETER_NAME VARCHAR(100); +ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN STRING_VAL PARAMETER_VALUE VARCHAR(2500); \ No newline at end of file diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-sqlite.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-sqlite.sql index bd433239c..2f68f5f89 100644 --- a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-sqlite.sql +++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-sqlite.sql @@ -7,6 +7,6 @@ ALTER TABLE BATCH_JOB_EXECUTION_PARAMS DROP COLUMN DATE_VAL; ALTER TABLE BATCH_JOB_EXECUTION_PARAMS DROP COLUMN LONG_VAL; ALTER TABLE BATCH_JOB_EXECUTION_PARAMS DROP COLUMN DOUBLE_VAL; -ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN TYPE_CD TYPE VARCHAR(100); -ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN KEY_NAME NAME VARCHAR(100); -ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN STRING_VAL VALUE VARCHAR(2500); \ No newline at end of file +ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN TYPE_CD PARAMETER_TYPE VARCHAR(100); +ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN KEY_NAME PARAMETER_NAME VARCHAR(100); +ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN STRING_VAL PARAMETER_VALUE VARCHAR(2500); \ No newline at end of file diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-sqlserver.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-sqlserver.sql index 529a5ead6..a03ae55ab 100644 --- a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-sqlserver.sql +++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-sqlserver.sql @@ -8,6 +8,6 @@ ALTER TABLE BATCH_JOB_EXECUTION_PARAMS DROP COLUMN DATE_VAL; ALTER TABLE BATCH_JOB_EXECUTION_PARAMS DROP COLUMN LONG_VAL; ALTER TABLE BATCH_JOB_EXECUTION_PARAMS DROP COLUMN DOUBLE_VAL; -ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN TYPE_CD TYPE VARCHAR(100); -ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN KEY_NAME NAME VARCHAR(100); -ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN STRING_VAL VALUE VARCHAR(2500); \ No newline at end of file +ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN TYPE_CD PARAMETER_TYPE VARCHAR(100); +ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN KEY_NAME PARAMETER_NAME VARCHAR(100); +ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN STRING_VAL PARAMETER_VALUE VARCHAR(2500); \ No newline at end of file diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-sybase.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-sybase.sql index 45ee0636c..b08921da0 100644 --- a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-sybase.sql +++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/5.0/migration-sybase.sql @@ -5,6 +5,6 @@ ALTER TABLE BATCH_JOB_EXECUTION_PARAMS DROP COLUMN DATE_VAL; ALTER TABLE BATCH_JOB_EXECUTION_PARAMS DROP COLUMN LONG_VAL; ALTER TABLE BATCH_JOB_EXECUTION_PARAMS DROP COLUMN DOUBLE_VAL; -ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN TYPE_CD TYPE VARCHAR(100); -ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN KEY_NAME NAME VARCHAR(100); -ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN STRING_VAL VALUE VARCHAR(2500); +ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN TYPE_CD PARAMETER_TYPE VARCHAR(100); +ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN KEY_NAME PARAMETER_NAME VARCHAR(100); +ALTER TABLE BATCH_JOB_EXECUTION_PARAMS MODIFY COLUMN STRING_VAL PARAMETER_VALUE VARCHAR(2500); 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 350f0b437..340cce05a 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 @@ -25,9 +25,9 @@ CREATE TABLE BATCH_JOB_EXECUTION ( CREATE TABLE BATCH_JOB_EXECUTION_PARAMS ( JOB_EXECUTION_ID BIGINT NOT NULL , - NAME VARCHAR(100) NOT NULL , - TYPE VARCHAR(100) NOT NULL , - VALUE VARCHAR(2500) , + 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) 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 997986f37..c9510a5bc 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 @@ -25,9 +25,9 @@ CREATE TABLE BATCH_JOB_EXECUTION ( CREATE TABLE BATCH_JOB_EXECUTION_PARAMS ( JOB_EXECUTION_ID BIGINT NOT NULL , - NAME VARCHAR(100) NOT NULL , - TYPE VARCHAR(100) NOT NULL , - VALUE VARCHAR(2500) , + 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) 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 cbb74c639..d38d051b8 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 @@ -25,9 +25,9 @@ CREATE TABLE BATCH_JOB_EXECUTION ( CREATE TABLE BATCH_JOB_EXECUTION_PARAMS ( JOB_EXECUTION_ID BIGINT NOT NULL , - NAME VARCHAR(100) NOT NULL , - TYPE VARCHAR(100) NOT NULL , - VALUE VARCHAR(2500) , + 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) 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 129717389..8dc2dc843 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 @@ -25,9 +25,9 @@ CREATE TABLE BATCH_JOB_EXECUTION ( CREATE TABLE BATCH_JOB_EXECUTION_PARAMS ( JOB_EXECUTION_ID BIGINT NOT NULL , - NAME VARCHAR(100) NOT NULL , - TYPE VARCHAR(100) NOT NULL , - VALUE VARCHAR(2500) , + 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) 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 300424c35..0b3f0df08 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 @@ -25,9 +25,9 @@ CREATE TABLE BATCH_JOB_EXECUTION ( CREATE TABLE BATCH_JOB_EXECUTION_PARAMS ( JOB_EXECUTION_ID BIGINT NOT NULL , - NAME VARCHAR(100) NOT NULL , - TYPE VARCHAR(100) NOT NULL , - VALUE VARCHAR(2500) , + 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) 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 6c36eaac4..197ef3ff0 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 @@ -25,9 +25,9 @@ CREATE TABLE BATCH_JOB_EXECUTION ( CREATE TABLE BATCH_JOB_EXECUTION_PARAMS ( JOB_EXECUTION_ID BIGINT NOT NULL , - NAME VARCHAR(100) NOT NULL , - TYPE VARCHAR(100) NOT NULL , - VALUE VARCHAR(2500) , + 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) 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 9968515dd..efaacfbd4 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 @@ -25,9 +25,9 @@ CREATE TABLE BATCH_JOB_EXECUTION ( CREATE TABLE BATCH_JOB_EXECUTION_PARAMS ( JOB_EXECUTION_ID NUMBER(19,0) NOT NULL , - NAME VARCHAR(100 char) NOT NULL , - TYPE VARCHAR(100 char) NOT NULL , - VALUE VARCHAR(2500 char) , + 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) 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 cc7ef5c31..dd146f1f0 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 @@ -25,9 +25,9 @@ CREATE TABLE BATCH_JOB_EXECUTION ( CREATE TABLE BATCH_JOB_EXECUTION_PARAMS ( JOB_EXECUTION_ID BIGINT NOT NULL , - NAME VARCHAR(100) NOT NULL , - TYPE VARCHAR(100) NOT NULL , - VALUE VARCHAR(2500) , + 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) 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 8d08cbe25..5a39c09e2 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 @@ -25,9 +25,9 @@ CREATE TABLE BATCH_JOB_EXECUTION ( CREATE TABLE BATCH_JOB_EXECUTION_PARAMS ( JOB_EXECUTION_ID INTEGER NOT NULL , - NAME VARCHAR(100) NOT NULL , - TYPE VARCHAR(100) NOT NULL , - VALUE VARCHAR(2500) , + 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) 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 2ed851f21..70c89664c 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 @@ -25,9 +25,9 @@ CREATE TABLE BATCH_JOB_EXECUTION ( CREATE TABLE BATCH_JOB_EXECUTION_PARAMS ( JOB_EXECUTION_ID BIGINT NOT NULL , - NAME VARCHAR(100) NOT NULL , - TYPE VARCHAR(100) NOT NULL , - VALUE VARCHAR(2500) , + 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) 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 bbdc8a4b8..15b221970 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 @@ -25,9 +25,9 @@ CREATE TABLE BATCH_JOB_EXECUTION ( CREATE TABLE BATCH_JOB_EXECUTION_PARAMS ( JOB_EXECUTION_ID BIGINT NOT NULL , - NAME VARCHAR(100) NOT NULL , - TYPE VARCHAR(100) NOT NULL , - VALUE VARCHAR(2500) , + 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) diff --git a/spring-batch-docs/src/main/asciidoc/schema-appendix.adoc b/spring-batch-docs/src/main/asciidoc/schema-appendix.adoc index 287a43d19..ac17c2c3e 100644 --- a/spring-batch-docs/src/main/asciidoc/schema-appendix.adoc +++ b/spring-batch-docs/src/main/asciidoc/schema-appendix.adoc @@ -138,9 +138,9 @@ listing shows: ---- CREATE TABLE BATCH_JOB_EXECUTION_PARAMS ( JOB_EXECUTION_ID BIGINT NOT NULL , - NAME VARCHAR(100) NOT NULL , - TYPE VARCHAR(100) NOT NULL , - VALUE VARCHAR(2500) , + 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) @@ -152,11 +152,9 @@ The following list describes each column: * `JOB_EXECUTION_ID`: Foreign key from the `BATCH_JOB_EXECUTION` table that indicates the job execution to which the parameter entry belongs. Note that multiple rows (that is, key/value pairs) may exist for each execution. -* TYPE_CD: String representation of the type of value stored, which can be a string, a -date, a long, or a double. Because the type must be known, it cannot be null. -* NAME: The parameter name. -* TYPE: The fully qualified name of the type of the parameter. -* VALUE: Parameter value +* PARAMETER_NAME: The parameter name. +* PARAMETER_TYPE: The fully qualified name of the type of the parameter. +* PARAMETER_VALUE: Parameter value * IDENTIFYING: Flag indicating whether the parameter contributed to the identity of the related `JobInstance`.