From d5aa3777aa16faba5af96bbeafcc2d5b5235fd65 Mon Sep 17 00:00:00 2001 From: Glenn Renfro Date: Fri, 20 Jan 2023 13:38:01 -0500 Subject: [PATCH] Fixed bug where there was a missing column in updates Also set the correct table name for CREATED_DATE. Also incorrect data type for CREATED_DATE in TASK_LOCK resolves #885 --- .../cloud/task/migration/3.0.x/migration-db2.sql | 3 ++- .../cloud/task/migration/3.0.x/migration-h2.sql | 3 ++- .../cloud/task/migration/3.0.x/migration-hsqldb.sql | 3 ++- .../cloud/task/migration/3.0.x/migration-mysql.sql | 4 ++++ .../cloud/task/migration/3.0.x/migration-oracle.sql | 4 +++- .../resources/org/springframework/cloud/task/schema-mysql.sql | 4 ++-- 6 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/3.0.x/migration-mysql.sql diff --git a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/3.0.x/migration-db2.sql b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/3.0.x/migration-db2.sql index 54c69b20..19afac19 100644 --- a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/3.0.x/migration-db2.sql +++ b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/3.0.x/migration-db2.sql @@ -1,4 +1,5 @@ ALTER TABLE TASK_EXECUTION ALTER COLUMN START_TIME SET DATA TYPE TIMESTAMP(9); ALTER TABLE TASK_EXECUTION ALTER COLUMN END_TIME SET DATA TYPE TIMESTAMP(9); -ALTER TABLE TASK_LOCK ALTER COLUMN LAST_UPDATED SET DATA TYPE TIMESTAMP(9); +ALTER TABLE TASK_EXECUTION ALTER COLUMN LAST_UPDATED SET DATA TYPE TIMESTAMP(9); +ALTER TABLE TASK_LOCK ALTER COLUMN CREATED_DATE SET DATA TYPE TIMESTAMP(9); diff --git a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/3.0.x/migration-h2.sql b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/3.0.x/migration-h2.sql index b2a32c79..d5da28aa 100644 --- a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/3.0.x/migration-h2.sql +++ b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/3.0.x/migration-h2.sql @@ -1,3 +1,4 @@ ALTER TABLE TASK_EXECUTION ALTER COLUMN START_TIME SET DATA TYPE TIMESTAMP(9); ALTER TABLE TASK_EXECUTION ALTER COLUMN END_TIME SET DATA TYPE TIMESTAMP(9); -ALTER TABLE TASK_LOCK ALTER COLUMN LAST_UPDATED SET DATA TYPE TIMESTAMP(9); +ALTER TABLE TASK_EXECUTION ALTER COLUMN LAST_UPDATED SET DATA TYPE TIMESTAMP(9); +ALTER TABLE TASK_LOCK ALTER COLUMN CREATED_DATE SET DATA TYPE TIMESTAMP(9); diff --git a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/3.0.x/migration-hsqldb.sql b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/3.0.x/migration-hsqldb.sql index b2a32c79..d5da28aa 100644 --- a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/3.0.x/migration-hsqldb.sql +++ b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/3.0.x/migration-hsqldb.sql @@ -1,3 +1,4 @@ ALTER TABLE TASK_EXECUTION ALTER COLUMN START_TIME SET DATA TYPE TIMESTAMP(9); ALTER TABLE TASK_EXECUTION ALTER COLUMN END_TIME SET DATA TYPE TIMESTAMP(9); -ALTER TABLE TASK_LOCK ALTER COLUMN LAST_UPDATED SET DATA TYPE TIMESTAMP(9); +ALTER TABLE TASK_EXECUTION ALTER COLUMN LAST_UPDATED SET DATA TYPE TIMESTAMP(9); +ALTER TABLE TASK_LOCK ALTER COLUMN CREATED_DATE SET DATA TYPE TIMESTAMP(9); diff --git a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/3.0.x/migration-mysql.sql b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/3.0.x/migration-mysql.sql new file mode 100644 index 00000000..5cb1ae62 --- /dev/null +++ b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/3.0.x/migration-mysql.sql @@ -0,0 +1,4 @@ +ALTER TABLE TASK_EXECUTION MODIFY COLUMN END_TIME DATETIME(6) NULL; +ALTER TABLE TASK_EXECUTION MODIFY COLUMN START_TIME DATETIME(6) NULL; +ALTER TABLE TASK_EXECUTION MODIFY COLUMN LAST_UPDATED DATETIME(6) NULL; +ALTER TABLE TASK_LOCK MODIFY COLUMN CREATED_DATE DATETIME(6) NULL; diff --git a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/3.0.x/migration-oracle.sql b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/3.0.x/migration-oracle.sql index 25ab9b04..d7aeb843 100644 --- a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/3.0.x/migration-oracle.sql +++ b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/3.0.x/migration-oracle.sql @@ -1,5 +1,7 @@ ALTER TABLE TASK_EXECUTION MODIFY COLUMN CREATE_TIME TIMESTAMP(9); ALTER TABLE TASK_EXECUTION MODIFY COLUMN START_TIME TIMESTAMP(9); -ALTER TABLE TASK_LOCK MODIFY COLUMN LAST_UPDATED TIMESTAMP(9); +ALTER TABLE TASK_EXECUTION MODIFY COLUMN LAST_UPDATED TIMESTAMP(9); +ALTER TABLE TASK_LOCK MODIFY COLUMN CREATED_DATE TIMESTAMP(9); + ALTER SEQUENCE TASK_SEQ ORDER; diff --git a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-mysql.sql b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-mysql.sql index 8af197d9..7dba8928 100644 --- a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-mysql.sql +++ b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-mysql.sql @@ -1,8 +1,8 @@ CREATE TABLE TASK_EXECUTION ( TASK_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY , - START_TIME DATETIME DEFAULT NULL , - END_TIME DATETIME DEFAULT NULL , + START_TIME DATETIME(6) DEFAULT NULL , + END_TIME DATETIME(6) DEFAULT NULL , TASK_NAME VARCHAR(100) , EXIT_CODE INTEGER , EXIT_MESSAGE VARCHAR(2500) ,