Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BACKLOG-15174] Fix migrations script #5806

Merged
merged 1 commit into from
Dec 9, 2024
Merged

[BACKLOG-15174] Fix migrations script #5806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions assemblies/pentaho-data/src/main/resources/data/mysql/migrate_old_quartz_data_mysql.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
14 changes: 4 additions & 10 deletions assemblies/pentaho-data/src/main/resources/data/oracle/migrate_old_quartz_data_oracle.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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;
13 changes: 4 additions & 9 deletions ...es/pentaho-data/src/main/resources/data/postgresql/migrate_old_quartz_data_postgresql.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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;
14 changes: 4 additions & 10 deletions ...lies/pentaho-data/src/main/resources/data/sqlserver/migrate_old_quartz_data_sqlserver.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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