From 745483a6a5cdac09f9366790d70f1cba09c16ee7 Mon Sep 17 00:00:00 2001
From: Tomas Kopecek <tkopecek@redhat.com>
Date: Dec 12 2022 09:49:29 +0000
Subject: unify migration scripts


Related: https://pagure.io/koji/issue/3623

---

diff --git a/docs/schema-update-1.29-1.30.sql b/docs/schema-update-1.29-1.30.sql
index 31bd457..fb97eae 100644
--- a/docs/schema-update-1.29-1.30.sql
+++ b/docs/schema-update-1.29-1.30.sql
@@ -4,10 +4,4 @@
 
 BEGIN;
 
--- clean some unused old indices if they still exist
--- https://pagure.io/koji/issue/3160
-DROP INDEX IF EXISTS image_listing_archives;
-DROP INDEX IF EXISTS image_listing_rpms;
-DROP INDEX IF EXISTS imageinfo_listing_rpms;
-
 COMMIT;
diff --git a/docs/schema-update-1.30-1.31.sql b/docs/schema-update-1.30-1.31.sql
deleted file mode 100644
index 2d311f4..0000000
--- a/docs/schema-update-1.30-1.31.sql
+++ /dev/null
@@ -1,7 +0,0 @@
--- upgrade script to migrate the Koji database schema
--- from version 1.30 to 1.31
-
-BEGIN;
-    -- index for default search method for rpms
-    CREATE INDEX rpminfo_filename ON rpminfo((name || '-' || version || '-' || release || '.' || arch || '.rpm')) INCLUDE (id);
-COMMIT;
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 2c25886..0000000
--- a/docs/schema-update-1.31-1.32.sql
+++ /dev/null
@@ -1,9 +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';
-
-COMMIT;
diff --git a/docs/schema-upgrade-1.29-1.30.sql b/docs/schema-upgrade-1.29-1.30.sql
index 483b1b1..4ab6bc0 100644
--- a/docs/schema-upgrade-1.29-1.30.sql
+++ b/docs/schema-upgrade-1.29-1.30.sql
@@ -10,4 +10,10 @@ UPDATE archivetypes set compression_type='zip' WHERE name = 'jar';
 UPDATE archivetypes set compression_type='zip' WHERE name = 'zip';
 UPDATE archivetypes set compression_type='tar' WHERE name = 'tar';
 
+-- clean some unused old indices if they still exist
+-- https://pagure.io/koji/issue/3160
+DROP INDEX IF EXISTS image_listing_archives;
+DROP INDEX IF EXISTS image_listing_rpms;
+DROP INDEX IF EXISTS imageinfo_listing_rpms;
+
 COMMIT;
diff --git a/docs/schema-upgrade-1.30-1.31.sql b/docs/schema-upgrade-1.30-1.31.sql
new file mode 100644
index 0000000..2d311f4
--- /dev/null
+++ b/docs/schema-upgrade-1.30-1.31.sql
@@ -0,0 +1,7 @@
+-- upgrade script to migrate the Koji database schema
+-- from version 1.30 to 1.31
+
+BEGIN;
+    -- index for default search method for rpms
+    CREATE INDEX rpminfo_filename ON rpminfo((name || '-' || version || '-' || release || '.' || arch || '.rpm')) INCLUDE (id);
+COMMIT;
diff --git a/docs/schema-upgrade-1.31-1.32.sql b/docs/schema-upgrade-1.31-1.32.sql
new file mode 100644
index 0000000..2c25886
--- /dev/null
+++ b/docs/schema-upgrade-1.31-1.32.sql
@@ -0,0 +1,9 @@
+-- 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';
+
+COMMIT;