From 04a97eac62c97fe14920e7a8ca72b84a82ad70ca Mon Sep 17 00:00:00 2001 From: Tim Kafalas Date: Mon, 9 Dec 2024 12:08:00 -0500 Subject: [PATCH] [BACKLOG-15174] Fix migrations script --- .../data/mysql/migrate_old_quartz_data_mysql.sql | 12 +++--------- .../data/oracle/migrate_old_quartz_data_oracle.sql | 14 ++++---------- .../migrate_old_quartz_data_postgresql.sql | 13 ++++--------- .../migrate_old_quartz_data_sqlserver.sql | 14 ++++---------- 4 files changed, 15 insertions(+), 38 deletions(-) diff --git a/assemblies/pentaho-data/src/main/resources/data/mysql/migrate_old_quartz_data_mysql.sql b/assemblies/pentaho-data/src/main/resources/data/mysql/migrate_old_quartz_data_mysql.sql index b8b63dfcac..8f149ae966 100644 --- a/assemblies/pentaho-data/src/main/resources/data/mysql/migrate_old_quartz_data_mysql.sql +++ b/assemblies/pentaho-data/src/main/resources/data/mysql/migrate_old_quartz_data_mysql.sql @@ -26,11 +26,11 @@ SELECT 'PentahoQuartzScheduler', TRIGGER_NAME, TRIGGER_GROUP, REPEAT_COUNT, REPEAT_INTERVAL, TIMES_TRIGGERED FROM QRTZ5_SIMPLE_TRIGGERS; --- Not writing SCHED_TIME because it is not defined anywhere +-- Writing SCHED_TIME as FIRED_TIME because it is not defined anywhere INSERT INTO QRTZ6_FIRED_TRIGGERS - (SCHED_NAME, ENTRY_ID, TRIGGER_NAME, TRIGGER_GROUP, INSTANCE_NAME, FIRED_TIME, PRIORITY, STATE, JOB_NAME, JOB_GROUP, IS_NONCONCURRENT, REQUESTS_RECOVERY) + (SCHED_NAME, ENTRY_ID, TRIGGER_NAME, TRIGGER_GROUP, INSTANCE_NAME, FIRED_TIME, SCHED_TIME, PRIORITY, STATE, JOB_NAME, JOB_GROUP, IS_NONCONCURRENT, REQUESTS_RECOVERY) SELECT - 'PentahoQuartzScheduler', ENTRY_ID, TRIGGER_NAME, TRIGGER_GROUP, INSTANCE_NAME, FIRED_TIME, PRIORITY, STATE, JOB_NAME, JOB_GROUP, IS_STATEFUL, REQUESTS_RECOVERY + 'PentahoQuartzScheduler', ENTRY_ID, TRIGGER_NAME, TRIGGER_GROUP, INSTANCE_NAME, FIRED_TIME, FIRED_TIME, PRIORITY, STATE, JOB_NAME, JOB_GROUP, IS_STATEFUL, REQUESTS_RECOVERY FROM QRTZ5_FIRED_TRIGGERS; INSERT INTO QRTZ6_CALENDARS @@ -50,9 +50,3 @@ INSERT INTO QRTZ6_SCHEDULER_STATE SELECT 'PentahoQuartzScheduler', INSTANCE_NAME, LAST_CHECKIN_TIME, CHECKIN_INTERVAL FROM QRTZ5_SCHEDULER_STATE; - -INSERT INTO QRTZ6_LOCKS - (SCHED_NAME, LOCK_NAME) -SELECT - 'PentahoQuartzScheduler', LOCK_NAME -FROM QRTZ5_LOCKS; diff --git a/assemblies/pentaho-data/src/main/resources/data/oracle/migrate_old_quartz_data_oracle.sql b/assemblies/pentaho-data/src/main/resources/data/oracle/migrate_old_quartz_data_oracle.sql index ddcae64234..107a5867e5 100644 --- a/assemblies/pentaho-data/src/main/resources/data/oracle/migrate_old_quartz_data_oracle.sql +++ b/assemblies/pentaho-data/src/main/resources/data/oracle/migrate_old_quartz_data_oracle.sql @@ -11,7 +11,7 @@ FROM QRTZ5_JOB_DETAILS; INSERT INTO QRTZ6_TRIGGERS (SCHED_NAME, TRIGGER_NAME, TRIGGER_GROUP, JOB_NAME, JOB_GROUP, DESCRIPTION, NEXT_FIRE_TIME, PREV_FIRE_TIME, PRIORITY, TRIGGER_STATE, TRIGGER_TYPE, START_TIME, END_TIME, CALENDAR_NAME, MISFIRE_INSTR, JOB_DATA) SELECT - 'PentahoQuartzScheduler', TRIGGER_NAME, TRIGGER_GROUP, JOB_NAME, JOB_GROUP, DESCRIPTION, NEXT_FIRE_TIME, PREV_FIRE_TIME, PRIORITY, TRIGGER_STATE, TRIGGER_TYPE, START_TIME, END_TIME, CALENDAR_NAME, MISFIRE_INSTR, JOB_DATA + 'PentahoQuartzScheduler', TRIGGER_NAME, TRIGGER_GROUP, JOB_NAME, JOB_GROUP, DESCRIPTION, NEXT_FIRE_TIME, PREV_FIRE_TIME, PRIORITY, TRIGGER_STATE, TRIGGER_TYPE, START_TIME, END_TIME, CALENDAR_NAME, MISFIRE_INSTR, JOB_DATA FROM QRTZ5_TRIGGERS; INSERT INTO QRTZ6_CRON_TRIGGERS @@ -26,11 +26,11 @@ SELECT 'PentahoQuartzScheduler', TRIGGER_NAME, TRIGGER_GROUP, REPEAT_COUNT, REPEAT_INTERVAL, TIMES_TRIGGERED FROM QRTZ5_SIMPLE_TRIGGERS; --- Not writing SCHED_TIME because it is not defined anywhere +-- Writing SCHED_TIME as FIRED_TIME because it is not defined anywhere INSERT INTO QRTZ6_FIRED_TRIGGERS - (SCHED_NAME, ENTRY_ID, TRIGGER_NAME, TRIGGER_GROUP, INSTANCE_NAME, FIRED_TIME, PRIORITY, STATE, JOB_NAME, JOB_GROUP, IS_NONCONCURRENT, REQUESTS_RECOVERY) + (SCHED_NAME, ENTRY_ID, TRIGGER_NAME, TRIGGER_GROUP, INSTANCE_NAME, FIRED_TIME, SCHED_TIME, PRIORITY, STATE, JOB_NAME, JOB_GROUP, IS_NONCONCURRENT, REQUESTS_RECOVERY) SELECT - 'PentahoQuartzScheduler', ENTRY_ID, TRIGGER_NAME, TRIGGER_GROUP, INSTANCE_NAME, FIRED_TIME, PRIORITY, STATE, JOB_NAME, JOB_GROUP, IS_STATEFUL, REQUESTS_RECOVERY + 'PentahoQuartzScheduler', ENTRY_ID, TRIGGER_NAME, TRIGGER_GROUP, INSTANCE_NAME, FIRED_TIME, FIRED_TIME, PRIORITY, STATE, JOB_NAME, JOB_GROUP, IS_STATEFUL, REQUESTS_RECOVERY FROM QRTZ5_FIRED_TRIGGERS; INSERT INTO QRTZ6_CALENDARS @@ -51,10 +51,4 @@ SELECT 'PentahoQuartzScheduler', INSTANCE_NAME, LAST_CHECKIN_TIME, CHECKIN_INTERVAL FROM QRTZ5_SCHEDULER_STATE; -INSERT INTO QRTZ6_LOCKS - (SCHED_NAME, LOCK_NAME) -SELECT - 'PentahoQuartzScheduler', LOCK_NAME -FROM QRTZ5_LOCKS; - COMMIT; diff --git a/assemblies/pentaho-data/src/main/resources/data/postgresql/migrate_old_quartz_data_postgresql.sql b/assemblies/pentaho-data/src/main/resources/data/postgresql/migrate_old_quartz_data_postgresql.sql index f36904df34..d255e94412 100644 --- a/assemblies/pentaho-data/src/main/resources/data/postgresql/migrate_old_quartz_data_postgresql.sql +++ b/assemblies/pentaho-data/src/main/resources/data/postgresql/migrate_old_quartz_data_postgresql.sql @@ -11,7 +11,7 @@ FROM QRTZ5_JOB_DETAILS; INSERT INTO QRTZ6_TRIGGERS (SCHED_NAME, TRIGGER_NAME, TRIGGER_GROUP, JOB_NAME, JOB_GROUP, DESCRIPTION, NEXT_FIRE_TIME, PREV_FIRE_TIME, PRIORITY, TRIGGER_STATE, TRIGGER_TYPE, START_TIME, END_TIME, CALENDAR_NAME, MISFIRE_INSTR, JOB_DATA) SELECT - 'PentahoQuartzScheduler', TRIGGER_NAME, TRIGGER_GROUP, JOB_NAME, JOB_GROUP, DESCRIPTION, NEXT_FIRE_TIME, PREV_FIRE_TIME, PRIORITY, TRIGGER_STATE, TRIGGER_TYPE, START_TIME, END_TIME, CALENDAR_NAME, MISFIRE_INSTR, JOB_DATA + 'PentahoQuartzScheduler', TRIGGER_NAME, TRIGGER_GROUP, JOB_NAME, JOB_GROUP, DESCRIPTION, NEXT_FIRE_TIME, PREV_FIRE_TIME, PRIORITY, TRIGGER_STATE, TRIGGER_TYPE, START_TIME, END_TIME, CALENDAR_NAME, MISFIRE_INSTR, JOB_DATA FROM QRTZ5_TRIGGERS; INSERT INTO QRTZ6_CRON_TRIGGERS @@ -26,11 +26,11 @@ SELECT 'PentahoQuartzScheduler', TRIGGER_NAME, TRIGGER_GROUP, REPEAT_COUNT, REPEAT_INTERVAL, TIMES_TRIGGERED FROM QRTZ5_SIMPLE_TRIGGERS; --- Not writing SCHED_TIME because it is not defined anywhere +-- Writing SCHED_TIME as FIRED_TIME because it is not defined anywhere INSERT INTO QRTZ6_FIRED_TRIGGERS - (SCHED_NAME, ENTRY_ID, TRIGGER_NAME, TRIGGER_GROUP, INSTANCE_NAME, FIRED_TIME, PRIORITY, STATE, JOB_NAME, JOB_GROUP, IS_NONCONCURRENT, REQUESTS_RECOVERY) + (SCHED_NAME, ENTRY_ID, TRIGGER_NAME, TRIGGER_GROUP, INSTANCE_NAME, FIRED_TIME, SCHED_TIME, PRIORITY, STATE, JOB_NAME, JOB_GROUP, IS_NONCONCURRENT, REQUESTS_RECOVERY) SELECT - 'PentahoQuartzScheduler', ENTRY_ID, TRIGGER_NAME, TRIGGER_GROUP, INSTANCE_NAME, FIRED_TIME, PRIORITY, STATE, JOB_NAME, JOB_GROUP, IS_STATEFUL, REQUESTS_RECOVERY + 'PentahoQuartzScheduler', ENTRY_ID, TRIGGER_NAME, TRIGGER_GROUP, INSTANCE_NAME, FIRED_TIME, FIRED_TIME, PRIORITY, STATE, JOB_NAME, JOB_GROUP, IS_STATEFUL, REQUESTS_RECOVERY FROM QRTZ5_FIRED_TRIGGERS; INSERT INTO QRTZ6_CALENDARS @@ -51,8 +51,3 @@ SELECT 'PentahoQuartzScheduler', INSTANCE_NAME, LAST_CHECKIN_TIME, CHECKIN_INTERVAL FROM QRTZ5_SCHEDULER_STATE; -INSERT INTO QRTZ6_LOCKS - (SCHED_NAME, LOCK_NAME) -SELECT - 'PentahoQuartzScheduler', LOCK_NAME -FROM QRTZ5_LOCKS; diff --git a/assemblies/pentaho-data/src/main/resources/data/sqlserver/migrate_old_quartz_data_sqlserver.sql b/assemblies/pentaho-data/src/main/resources/data/sqlserver/migrate_old_quartz_data_sqlserver.sql index b38722839e..86e7c0b85f 100644 --- a/assemblies/pentaho-data/src/main/resources/data/sqlserver/migrate_old_quartz_data_sqlserver.sql +++ b/assemblies/pentaho-data/src/main/resources/data/sqlserver/migrate_old_quartz_data_sqlserver.sql @@ -11,7 +11,7 @@ FROM QRTZ5_JOB_DETAILS; INSERT INTO QRTZ6_TRIGGERS (SCHED_NAME, TRIGGER_NAME, TRIGGER_GROUP, JOB_NAME, JOB_GROUP, DESCRIPTION, NEXT_FIRE_TIME, PREV_FIRE_TIME, PRIORITY, TRIGGER_STATE, TRIGGER_TYPE, START_TIME, END_TIME, CALENDAR_NAME, MISFIRE_INSTR, JOB_DATA) SELECT - 'PentahoQuartzScheduler', TRIGGER_NAME, TRIGGER_GROUP, JOB_NAME, JOB_GROUP, DESCRIPTION, NEXT_FIRE_TIME, PREV_FIRE_TIME, PRIORITY, TRIGGER_STATE, TRIGGER_TYPE, START_TIME, END_TIME, CALENDAR_NAME, MISFIRE_INSTR, JOB_DATA + 'PentahoQuartzScheduler', TRIGGER_NAME, TRIGGER_GROUP, JOB_NAME, JOB_GROUP, DESCRIPTION, NEXT_FIRE_TIME, PREV_FIRE_TIME, PRIORITY, TRIGGER_STATE, TRIGGER_TYPE, START_TIME, END_TIME, CALENDAR_NAME, MISFIRE_INSTR, JOB_DATA FROM QRTZ5_TRIGGERS; INSERT INTO QRTZ6_CRON_TRIGGERS @@ -26,11 +26,11 @@ SELECT 'PentahoQuartzScheduler', TRIGGER_NAME, TRIGGER_GROUP, REPEAT_COUNT, REPEAT_INTERVAL, TIMES_TRIGGERED FROM QRTZ5_SIMPLE_TRIGGERS; --- Not writing SCHED_TIME because it is not defined anywhere +-- Writing SCHED_TIME as FIRED_TIME because it is not defined anywhere INSERT INTO QRTZ6_FIRED_TRIGGERS - (SCHED_NAME, ENTRY_ID, TRIGGER_NAME, TRIGGER_GROUP, INSTANCE_NAME, FIRED_TIME, PRIORITY, STATE, JOB_NAME, JOB_GROUP, IS_NONCONCURRENT, REQUESTS_RECOVERY) + (SCHED_NAME, ENTRY_ID, TRIGGER_NAME, TRIGGER_GROUP, INSTANCE_NAME, FIRED_TIME, SCHED_TIME, PRIORITY, STATE, JOB_NAME, JOB_GROUP, IS_NONCONCURRENT, REQUESTS_RECOVERY) SELECT - 'PentahoQuartzScheduler', ENTRY_ID, TRIGGER_NAME, TRIGGER_GROUP, INSTANCE_NAME, FIRED_TIME, PRIORITY, STATE, JOB_NAME, JOB_GROUP, IS_STATEFUL, REQUESTS_RECOVERY + 'PentahoQuartzScheduler', ENTRY_ID, TRIGGER_NAME, TRIGGER_GROUP, INSTANCE_NAME, FIRED_TIME, FIRED_TIME, PRIORITY, STATE, JOB_NAME, JOB_GROUP, IS_STATEFUL, REQUESTS_RECOVERY FROM QRTZ5_FIRED_TRIGGERS; INSERT INTO QRTZ6_CALENDARS @@ -50,10 +50,4 @@ INSERT INTO QRTZ6_SCHEDULER_STATE SELECT 'PentahoQuartzScheduler', INSTANCE_NAME, LAST_CHECKIN_TIME, CHECKIN_INTERVAL FROM QRTZ5_SCHEDULER_STATE; - -INSERT INTO QRTZ6_LOCKS - (SCHED_NAME, LOCK_NAME) -SELECT - 'PentahoQuartzScheduler', LOCK_NAME -FROM QRTZ5_LOCKS; GO