From 7960d725e6f2852955964404766d547ec2ae8a07 Mon Sep 17 00:00:00 2001
From: Tomas Kopecek <tkopecek@redhat.com>
Date: Feb 20 2023 08:38:27 +0000
Subject: PR#3697: Unify migration script Koji 1.31 -> 1.32


Merges #3697
https://pagure.io/koji/pull-request/3697

Fixes: #3696
https://pagure.io/koji/issue/3696
1.32.0 seems to have two different schema upgrade files?

---

diff --git a/docs/schema-update-1.31-1.32.sql b/docs/schema-update-1.31-1.32.sql
deleted file mode 100644
index a3c6fc5..0000000
--- a/docs/schema-update-1.31-1.32.sql
+++ /dev/null
@@ -1,13 +0,0 @@
--- upgrade script to migrate the Koji database schema
--- from version 1.31 to 1.32
-
-BEGIN;
-
-    -- fix duplicate extension in archivetypes
-    UPDATE archivetypes SET extensions = 'vhdx.gz vhdx.xz' WHERE name = 'vhdx-compressed';
-
-    -- for tag if session is closed or not
-    ALTER TABLE sessions ADD COLUMN closed BOOLEAN NOT NULL DEFAULT FALSE;
-    ALTER TABLE sessions ADD CONSTRAINT no_closed_exclusive CHECK (closed IS FALSE OR "exclusive" IS NULL);
-    ALTER TABLE sessions DROP CONSTRAINT exclusive_expired_sane;
-COMMIT;
diff --git a/docs/schema-upgrade-1.31-1.32.sql b/docs/schema-upgrade-1.31-1.32.sql
index 3a86f95..2cf0cb3 100644
--- a/docs/schema-upgrade-1.31-1.32.sql
+++ b/docs/schema-upgrade-1.31-1.32.sql
@@ -6,6 +6,11 @@ BEGIN;
     -- fix duplicate extension in archivetypes
     UPDATE archivetypes SET extensions = 'vhdx.gz vhdx.xz' WHERE name = 'vhdx-compressed';
 
+    -- for tag if session is closed or not
+    ALTER TABLE sessions ADD COLUMN closed BOOLEAN NOT NULL DEFAULT FALSE;
+    ALTER TABLE sessions ADD CONSTRAINT no_closed_exclusive CHECK (closed IS FALSE OR "exclusive" IS NULL);
+    ALTER TABLE sessions DROP CONSTRAINT exclusive_expired_sane;
+
     -- track checksum of rpms
     CREATE TABLE rpm_checksum (
             rpm_id INTEGER NOT NULL REFERENCES rpminfo(id),