From 85676949d9f829ffa757bf52dd1c6b3240789cc3 Mon Sep 17 00:00:00 2001 From: Bryan Frimin Date: Mon, 8 Jun 2026 15:27:11 +0200 Subject: [PATCH] Drop agent-run lease columns in one migration The intermediate migration added lease_generation only for the next migration to remove it. Fold the drops into 20260608T090000Z with IF EXISTS so fresh installs and databases that already ran 20260607 both migrate cleanly. Signed-off-by: Bryan Frimin --- pkg/coredata/migrations/20260607T060000Z.sql | 17 ----------------- pkg/coredata/migrations/20260608T090000Z.sql | 5 +++-- 2 files changed, 3 insertions(+), 19 deletions(-) delete mode 100644 pkg/coredata/migrations/20260607T060000Z.sql diff --git a/pkg/coredata/migrations/20260607T060000Z.sql b/pkg/coredata/migrations/20260607T060000Z.sql deleted file mode 100644 index 1688b4a6e..000000000 --- a/pkg/coredata/migrations/20260607T060000Z.sql +++ /dev/null @@ -1,17 +0,0 @@ --- Copyright (c) 2026 Probo Inc . --- --- Permission to use, copy, modify, and/or distribute this software for any --- purpose with or without fee is hereby granted, provided that the above --- copyright notice and this permission notice appear in all copies. --- --- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH --- REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY --- AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, --- INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM --- LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR --- OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR --- PERFORMANCE OF THIS SOFTWARE. - -ALTER TABLE agent_runs - ADD COLUMN lease_generation BIGINT NOT NULL DEFAULT 0, - DROP COLUMN lease_owner; diff --git a/pkg/coredata/migrations/20260608T090000Z.sql b/pkg/coredata/migrations/20260608T090000Z.sql index a7294a489..1ffe0c857 100644 --- a/pkg/coredata/migrations/20260608T090000Z.sql +++ b/pkg/coredata/migrations/20260608T090000Z.sql @@ -21,5 +21,6 @@ DROP INDEX IF EXISTS idx_agent_runs_running_lease; ALTER TABLE agent_runs - DROP COLUMN lease_expires_at, - DROP COLUMN lease_generation; + DROP COLUMN IF EXISTS lease_owner, + DROP COLUMN IF EXISTS lease_expires_at, + DROP COLUMN IF EXISTS lease_generation;