From 39378d7875c281ddbb4d97af61e49fecf3b8ddbf Mon Sep 17 00:00:00 2001 From: Abel Lucas Date: Fri, 17 Jan 2025 14:23:05 +0100 Subject: [PATCH] fixup! phase 1: transparent migration --- ...0110124422_v2_job_completed_compatibility_view.up.sql | 2 +- .../migrations/20250110124423_v2_job_completed.down.sql | 1 - .../migrations/20250110124423_v2_job_completed.up.sql | 2 -- .../20250110145629_v2_job_completed_constraints.down.sql | 1 + .../20250110145629_v2_job_completed_constraints.up.sql | 1 + .../20250110145630_v2_queue_compatibility_view.up.sql | 3 ++- ...0110145631_v2_completed_job_compatibility_view.up.sql | 9 ++++++--- 7 files changed, 11 insertions(+), 8 deletions(-) diff --git a/backend/migrations/20250110124422_v2_job_completed_compatibility_view.up.sql b/backend/migrations/20250110124422_v2_job_completed_compatibility_view.up.sql index 342e04c5ad..7519a1c585 100644 --- a/backend/migrations/20250110124422_v2_job_completed_compatibility_view.up.sql +++ b/backend/migrations/20250110124422_v2_job_completed_compatibility_view.up.sql @@ -14,7 +14,7 @@ CREATE OR REPLACE VIEW completed_job AS ( args AS args, result, logs AS logs, - deleted AS deleted, + deleted, raw_code AS raw_code, canceled AS canceled, canceled_by, diff --git a/backend/migrations/20250110124423_v2_job_completed.down.sql b/backend/migrations/20250110124423_v2_job_completed.down.sql index 7139036929..4028819661 100644 --- a/backend/migrations/20250110124423_v2_job_completed.down.sql +++ b/backend/migrations/20250110124423_v2_job_completed.down.sql @@ -12,7 +12,6 @@ ALTER TABLE v2_job_completed RENAME COLUMN __script_hash TO script_hash; ALTER TABLE v2_job_completed RENAME COLUMN __script_path TO script_path; ALTER TABLE v2_job_completed RENAME COLUMN __args TO args; ALTER TABLE v2_job_completed RENAME COLUMN __logs TO logs; -ALTER TABLE v2_job_completed RENAME COLUMN __deleted TO deleted; ALTER TABLE v2_job_completed RENAME COLUMN __raw_code TO raw_code; ALTER TABLE v2_job_completed RENAME COLUMN __canceled TO canceled; ALTER TABLE v2_job_completed RENAME COLUMN __job_kind TO job_kind; diff --git a/backend/migrations/20250110124423_v2_job_completed.up.sql b/backend/migrations/20250110124423_v2_job_completed.up.sql index ba56e9bc30..09146ecc9b 100644 --- a/backend/migrations/20250110124423_v2_job_completed.up.sql +++ b/backend/migrations/20250110124423_v2_job_completed.up.sql @@ -13,7 +13,6 @@ ALTER TABLE v2_job_completed RENAME COLUMN script_hash TO __script_hash; ALTER TABLE v2_job_completed RENAME COLUMN script_path TO __script_path; ALTER TABLE v2_job_completed RENAME COLUMN args TO __args; ALTER TABLE v2_job_completed RENAME COLUMN logs TO __logs; -ALTER TABLE v2_job_completed RENAME COLUMN deleted TO __deleted; ALTER TABLE v2_job_completed RENAME COLUMN raw_code TO __raw_code; ALTER TABLE v2_job_completed RENAME COLUMN canceled TO __canceled; ALTER TABLE v2_job_completed RENAME COLUMN job_kind TO __job_kind; @@ -29,4 +28,3 @@ ALTER TABLE v2_job_completed RENAME COLUMN email TO __email; ALTER TABLE v2_job_completed RENAME COLUMN visible_to_owner TO __visible_to_owner; ALTER TABLE v2_job_completed RENAME COLUMN tag TO __tag; ALTER TABLE v2_job_completed RENAME COLUMN priority TO __priority; -ALTER TABLE v2_job_completed ALTER COLUMN started_at DROP NOT NULL; diff --git a/backend/migrations/20250110145629_v2_job_completed_constraints.down.sql b/backend/migrations/20250110145629_v2_job_completed_constraints.down.sql index 291310d9b8..928a5feb5a 100644 --- a/backend/migrations/20250110145629_v2_job_completed_constraints.down.sql +++ b/backend/migrations/20250110145629_v2_job_completed_constraints.down.sql @@ -2,6 +2,7 @@ ALTER TABLE v2_job_completed ALTER COLUMN status DROP NOT NULL; ALTER TABLE v2_job_completed ALTER COLUMN completed_at DROP DEFAULT; ALTER TABLE v2_job_completed ALTER COLUMN completed_at DROP NOT NULL; +ALTER TABLE v2_job_completed ALTER COLUMN started_at SET NOT NULL; ALTER TABLE v2_job_completed ALTER COLUMN __created_at SET NOT NULL; ALTER TABLE v2_job_completed ALTER COLUMN __created_by SET NOT NULL; ALTER TABLE v2_job_completed ALTER COLUMN __success SET NOT NULL; diff --git a/backend/migrations/20250110145629_v2_job_completed_constraints.up.sql b/backend/migrations/20250110145629_v2_job_completed_constraints.up.sql index 535e935def..9c4772ec72 100644 --- a/backend/migrations/20250110145629_v2_job_completed_constraints.up.sql +++ b/backend/migrations/20250110145629_v2_job_completed_constraints.up.sql @@ -2,6 +2,7 @@ ALTER TABLE v2_job_completed ALTER COLUMN status SET NOT NULL; ALTER TABLE v2_job_completed ALTER COLUMN completed_at SET DEFAULT now(); ALTER TABLE v2_job_completed ALTER COLUMN completed_at SET NOT NULL; +ALTER TABLE v2_job_completed ALTER COLUMN started_at DROP NOT NULL; ALTER TABLE v2_job_completed ALTER COLUMN __created_at DROP NOT NULL; ALTER TABLE v2_job_completed ALTER COLUMN __created_by DROP NOT NULL; ALTER TABLE v2_job_completed ALTER COLUMN __success DROP NOT NULL; diff --git a/backend/migrations/20250110145630_v2_queue_compatibility_view.up.sql b/backend/migrations/20250110145630_v2_queue_compatibility_view.up.sql index 753f942827..89f6ef7ad0 100644 --- a/backend/migrations/20250110145630_v2_queue_compatibility_view.up.sql +++ b/backend/migrations/20250110145630_v2_queue_compatibility_view.up.sql @@ -41,7 +41,8 @@ SELECT j.flow_step_id, j.cache_ttl, j.priority, - NULL::TEXT AS logs + NULL::TEXT AS logs, + NULL::BIGINT AS env_id FROM v2_job_queue q JOIN v2_job j USING (id) LEFT JOIN v2_job_runtime r USING (id) diff --git a/backend/migrations/20250110145631_v2_completed_job_compatibility_view.up.sql b/backend/migrations/20250110145631_v2_completed_job_compatibility_view.up.sql index b49442078c..61f08717f0 100644 --- a/backend/migrations/20250110145631_v2_completed_job_compatibility_view.up.sql +++ b/backend/migrations/20250110145631_v2_completed_job_compatibility_view.up.sql @@ -12,7 +12,7 @@ SELECT j.runnable_path AS script_path, j.args, c.result, - FALSE AS deleted, + c.deleted, j.raw_code, c.status = 'canceled' AS canceled, c.canceled_by, @@ -32,7 +32,8 @@ SELECT c.memory_peak AS mem_peak, j.tag, j.priority, - NULL::TEXT AS logs + NULL::TEXT AS logs, + NULL::BIGINT AS env_id FROM v2_job_completed c JOIN v2_job j USING (id) ; @@ -66,9 +67,11 @@ CREATE OR REPLACE FUNCTION v2_completed_job_update(OLD v2_completed_job, NEW v2_ END IF; -- Update the `v2_job_completed` table IF NEW.result::TEXT IS DISTINCT FROM OLD.result::TEXT + OR NEW.deleted IS DISTINCT FROM OLD.deleted THEN UPDATE v2_job_completed - SET result = NEW.result + SET result = NEW.result, + deleted = NEW.deleted WHERE id = OLD.id; END IF; END $$ LANGUAGE plpgsql;