From 16982b61114fe57af3713b4006e32d339d454e35 Mon Sep 17 00:00:00 2001
From: Evgeny <evgeny@poberezkin.com>
Date: Sat, 30 May 2026 17:16:56 +0100
Subject: [PATCH] core: rename migrations (#7028)

---
 simplex-chat.cabal                                   | 12 ++++++------
 src/Simplex/Chat/Store/Postgres/Migrations.hs        | 12 ++++++------
 ..._senders.hs => M20260529_delivery_job_senders.hs} | 10 +++++-----
 ...ient_services.hs => M20260530_client_services.hs} | 10 +++++-----
 ..._removed_at.hs => M20260531_member_removed_at.hs} | 10 +++++-----
 .../Chat/Store/Postgres/Migrations/chat_schema.sql   |  2 +-
 src/Simplex/Chat/Store/SQLite/Migrations.hs          | 12 ++++++------
 ..._senders.hs => M20260529_delivery_job_senders.hs} | 10 +++++-----
 ...ient_services.hs => M20260530_client_services.hs} | 10 +++++-----
 ..._removed_at.hs => M20260531_member_removed_at.hs} | 10 +++++-----
 tests/PostgresSchemaDump.hs                          |  2 +-
 tests/SchemaDump.hs                                  |  2 +-
 12 files changed, 51 insertions(+), 51 deletions(-)
 rename src/Simplex/Chat/Store/Postgres/Migrations/{M20260515_delivery_job_senders.hs => M20260529_delivery_job_senders.hs} (89%)
 rename src/Simplex/Chat/Store/Postgres/Migrations/{M20260520_client_services.hs => M20260530_client_services.hs} (57%)
 rename src/Simplex/Chat/Store/Postgres/Migrations/{M20260525_member_removed_at.hs => M20260531_member_removed_at.hs} (56%)
 rename src/Simplex/Chat/Store/SQLite/Migrations/{M20260515_delivery_job_senders.hs => M20260529_delivery_job_senders.hs} (89%)
 rename src/Simplex/Chat/Store/SQLite/Migrations/{M20260520_client_services.hs => M20260530_client_services.hs} (56%)
 rename src/Simplex/Chat/Store/SQLite/Migrations/{M20260525_member_removed_at.hs => M20260531_member_removed_at.hs} (54%)

diff --git a/simplex-chat.cabal b/simplex-chat.cabal
index 20cad947bb..0116ddbc56 100644
--- a/simplex-chat.cabal
+++ b/simplex-chat.cabal
@@ -133,9 +133,9 @@ library
           Simplex.Chat.Store.Postgres.Migrations.M20260429_relay_request_retries
           Simplex.Chat.Store.Postgres.Migrations.M20260507_relay_inactive_at
           Simplex.Chat.Store.Postgres.Migrations.M20260514_relay_request_group_link_index
-          Simplex.Chat.Store.Postgres.Migrations.M20260515_delivery_job_senders
-          Simplex.Chat.Store.Postgres.Migrations.M20260520_client_services
-          Simplex.Chat.Store.Postgres.Migrations.M20260525_member_removed_at
+          Simplex.Chat.Store.Postgres.Migrations.M20260529_delivery_job_senders
+          Simplex.Chat.Store.Postgres.Migrations.M20260530_client_services
+          Simplex.Chat.Store.Postgres.Migrations.M20260531_member_removed_at
   else
       exposed-modules:
           Simplex.Chat.Archive
@@ -291,9 +291,9 @@ library
           Simplex.Chat.Store.SQLite.Migrations.M20260429_relay_request_retries
           Simplex.Chat.Store.SQLite.Migrations.M20260507_relay_inactive_at
           Simplex.Chat.Store.SQLite.Migrations.M20260514_relay_request_group_link_index
-          Simplex.Chat.Store.SQLite.Migrations.M20260515_delivery_job_senders
-          Simplex.Chat.Store.SQLite.Migrations.M20260520_client_services
-          Simplex.Chat.Store.SQLite.Migrations.M20260525_member_removed_at
+          Simplex.Chat.Store.SQLite.Migrations.M20260529_delivery_job_senders
+          Simplex.Chat.Store.SQLite.Migrations.M20260530_client_services
+          Simplex.Chat.Store.SQLite.Migrations.M20260531_member_removed_at
   other-modules:
       Paths_simplex_chat
   hs-source-dirs:
diff --git a/src/Simplex/Chat/Store/Postgres/Migrations.hs b/src/Simplex/Chat/Store/Postgres/Migrations.hs
index 9e6376fa2b..792865a3d7 100644
--- a/src/Simplex/Chat/Store/Postgres/Migrations.hs
+++ b/src/Simplex/Chat/Store/Postgres/Migrations.hs
@@ -31,9 +31,9 @@ import Simplex.Chat.Store.Postgres.Migrations.M20260403_item_viewed
 import Simplex.Chat.Store.Postgres.Migrations.M20260429_relay_request_retries
 import Simplex.Chat.Store.Postgres.Migrations.M20260507_relay_inactive_at
 import Simplex.Chat.Store.Postgres.Migrations.M20260514_relay_request_group_link_index
-import Simplex.Chat.Store.Postgres.Migrations.M20260515_delivery_job_senders
-import Simplex.Chat.Store.Postgres.Migrations.M20260520_client_services
-import Simplex.Chat.Store.Postgres.Migrations.M20260525_member_removed_at
+import Simplex.Chat.Store.Postgres.Migrations.M20260529_delivery_job_senders
+import Simplex.Chat.Store.Postgres.Migrations.M20260530_client_services
+import Simplex.Chat.Store.Postgres.Migrations.M20260531_member_removed_at
 import Simplex.Messaging.Agent.Store.Shared (Migration (..))
 
 schemaMigrations :: [(String, Text, Maybe Text)]
@@ -65,9 +65,9 @@ schemaMigrations =
     ("20260429_relay_request_retries", m20260429_relay_request_retries, Just down_m20260429_relay_request_retries),
     ("20260507_relay_inactive_at", m20260507_relay_inactive_at, Just down_m20260507_relay_inactive_at),
     ("20260514_relay_request_group_link_index", m20260514_relay_request_group_link_index, Just down_m20260514_relay_request_group_link_index),
-    ("20260515_delivery_job_senders", m20260515_delivery_job_senders, Just down_m20260515_delivery_job_senders),
-    ("20260520_client_services", m20260520_client_services, Just down_m20260520_client_services),
-    ("20260525_member_removed_at", m20260525_member_removed_at, Just down_m20260525_member_removed_at)
+    ("20260529_delivery_job_senders", m20260529_delivery_job_senders, Just down_m20260529_delivery_job_senders),
+    ("20260530_client_services", m20260530_client_services, Just down_m20260530_client_services),
+    ("20260531_member_removed_at", m20260531_member_removed_at, Just down_m20260531_member_removed_at)
   ]
 
 -- | The list of migrations in ascending order by date
diff --git a/src/Simplex/Chat/Store/Postgres/Migrations/M20260515_delivery_job_senders.hs b/src/Simplex/Chat/Store/Postgres/Migrations/M20260529_delivery_job_senders.hs
similarity index 89%
rename from src/Simplex/Chat/Store/Postgres/Migrations/M20260515_delivery_job_senders.hs
rename to src/Simplex/Chat/Store/Postgres/Migrations/M20260529_delivery_job_senders.hs
index d082587391..660e33561f 100644
--- a/src/Simplex/Chat/Store/Postgres/Migrations/M20260515_delivery_job_senders.hs
+++ b/src/Simplex/Chat/Store/Postgres/Migrations/M20260529_delivery_job_senders.hs
@@ -5,13 +5,13 @@
 -- NULL means [] (sender-less jobs, e.g. DJRelayRemoved). One column carries
 -- single- and multi-sender jobs uniformly; the per-job introduction bits live
 -- in group_members.member_relations_vector (MRIntroduced).
-module Simplex.Chat.Store.Postgres.Migrations.M20260515_delivery_job_senders where
+module Simplex.Chat.Store.Postgres.Migrations.M20260529_delivery_job_senders where
 
 import Data.Text (Text)
 import Text.RawString.QQ (r)
 
-m20260515_delivery_job_senders :: Text
-m20260515_delivery_job_senders =
+m20260529_delivery_job_senders :: Text
+m20260529_delivery_job_senders =
   [r|
 DROP INDEX idx_delivery_jobs_single_sender_group_member_id;
 
@@ -24,8 +24,8 @@ WHERE single_sender_group_member_id IS NOT NULL;
 ALTER TABLE delivery_jobs DROP COLUMN single_sender_group_member_id;
 |]
 
-down_m20260515_delivery_job_senders :: Text
-down_m20260515_delivery_job_senders =
+down_m20260529_delivery_job_senders :: Text
+down_m20260529_delivery_job_senders =
   [r|
 -- Pre-up the FK was ON DELETE CASCADE, so orphan delivery_jobs cannot
 -- exist. After up the FK was dropped and orphans may accumulate. Drop
diff --git a/src/Simplex/Chat/Store/Postgres/Migrations/M20260520_client_services.hs b/src/Simplex/Chat/Store/Postgres/Migrations/M20260530_client_services.hs
similarity index 57%
rename from src/Simplex/Chat/Store/Postgres/Migrations/M20260520_client_services.hs
rename to src/Simplex/Chat/Store/Postgres/Migrations/M20260530_client_services.hs
index af567130eb..2a37f8f4e3 100644
--- a/src/Simplex/Chat/Store/Postgres/Migrations/M20260520_client_services.hs
+++ b/src/Simplex/Chat/Store/Postgres/Migrations/M20260530_client_services.hs
@@ -1,19 +1,19 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE QuasiQuotes #-}
 
-module Simplex.Chat.Store.Postgres.Migrations.M20260520_client_services where
+module Simplex.Chat.Store.Postgres.Migrations.M20260530_client_services where
 
 import Data.Text (Text)
 import Text.RawString.QQ (r)
 
-m20260520_client_services :: Text
-m20260520_client_services =
+m20260530_client_services :: Text
+m20260530_client_services =
   [r|
 ALTER TABLE users ADD COLUMN client_service SMALLINT NOT NULL DEFAULT 0;
 |]
 
-down_m20260520_client_services :: Text
-down_m20260520_client_services =
+down_m20260530_client_services :: Text
+down_m20260530_client_services =
   [r|
 ALTER TABLE users DROP COLUMN client_service;
 |]
diff --git a/src/Simplex/Chat/Store/Postgres/Migrations/M20260525_member_removed_at.hs b/src/Simplex/Chat/Store/Postgres/Migrations/M20260531_member_removed_at.hs
similarity index 56%
rename from src/Simplex/Chat/Store/Postgres/Migrations/M20260525_member_removed_at.hs
rename to src/Simplex/Chat/Store/Postgres/Migrations/M20260531_member_removed_at.hs
index 6099751702..9dde712f0b 100644
--- a/src/Simplex/Chat/Store/Postgres/Migrations/M20260525_member_removed_at.hs
+++ b/src/Simplex/Chat/Store/Postgres/Migrations/M20260531_member_removed_at.hs
@@ -1,19 +1,19 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE QuasiQuotes #-}
 
-module Simplex.Chat.Store.Postgres.Migrations.M20260525_member_removed_at where
+module Simplex.Chat.Store.Postgres.Migrations.M20260531_member_removed_at where
 
 import Data.Text (Text)
 import Text.RawString.QQ (r)
 
-m20260525_member_removed_at :: Text
-m20260525_member_removed_at =
+m20260531_member_removed_at :: Text
+m20260531_member_removed_at =
   [r|
 ALTER TABLE group_members ADD COLUMN removed_at TIMESTAMPTZ;
 |]
 
-down_m20260525_member_removed_at :: Text
-down_m20260525_member_removed_at =
+down_m20260531_member_removed_at :: Text
+down_m20260531_member_removed_at =
   [r|
 ALTER TABLE group_members DROP COLUMN removed_at;
 |]
diff --git a/src/Simplex/Chat/Store/Postgres/Migrations/chat_schema.sql b/src/Simplex/Chat/Store/Postgres/Migrations/chat_schema.sql
index cd38c3f8c2..286fc63a4c 100644
--- a/src/Simplex/Chat/Store/Postgres/Migrations/chat_schema.sql
+++ b/src/Simplex/Chat/Store/Postgres/Migrations/chat_schema.sql
@@ -963,7 +963,7 @@ CREATE TABLE test_chat_schema.groups (
     public_member_count bigint,
     relay_request_retries bigint DEFAULT 0 NOT NULL,
     relay_request_delay bigint DEFAULT 0 NOT NULL,
-    relay_request_execute_at timestamp with time zone DEFAULT '1970-01-01 04:00:00+04'::timestamp with time zone NOT NULL,
+    relay_request_execute_at timestamp with time zone DEFAULT '1970-01-01 01:00:00+01'::timestamp with time zone NOT NULL,
     relay_inactive_at timestamp with time zone
 );
 
diff --git a/src/Simplex/Chat/Store/SQLite/Migrations.hs b/src/Simplex/Chat/Store/SQLite/Migrations.hs
index 3430409fb8..a3c8e8eea7 100644
--- a/src/Simplex/Chat/Store/SQLite/Migrations.hs
+++ b/src/Simplex/Chat/Store/SQLite/Migrations.hs
@@ -154,9 +154,9 @@ import Simplex.Chat.Store.SQLite.Migrations.M20260403_item_viewed
 import Simplex.Chat.Store.SQLite.Migrations.M20260429_relay_request_retries
 import Simplex.Chat.Store.SQLite.Migrations.M20260507_relay_inactive_at
 import Simplex.Chat.Store.SQLite.Migrations.M20260514_relay_request_group_link_index
-import Simplex.Chat.Store.SQLite.Migrations.M20260515_delivery_job_senders
-import Simplex.Chat.Store.SQLite.Migrations.M20260520_client_services
-import Simplex.Chat.Store.SQLite.Migrations.M20260525_member_removed_at
+import Simplex.Chat.Store.SQLite.Migrations.M20260529_delivery_job_senders
+import Simplex.Chat.Store.SQLite.Migrations.M20260530_client_services
+import Simplex.Chat.Store.SQLite.Migrations.M20260531_member_removed_at
 import Simplex.Messaging.Agent.Store.Shared (Migration (..))
 
 schemaMigrations :: [(String, Query, Maybe Query)]
@@ -311,9 +311,9 @@ schemaMigrations =
     ("20260429_relay_request_retries", m20260429_relay_request_retries, Just down_m20260429_relay_request_retries),
     ("20260507_relay_inactive_at", m20260507_relay_inactive_at, Just down_m20260507_relay_inactive_at),
     ("20260514_relay_request_group_link_index", m20260514_relay_request_group_link_index, Just down_m20260514_relay_request_group_link_index),
-    ("20260515_delivery_job_senders", m20260515_delivery_job_senders, Just down_m20260515_delivery_job_senders),
-    ("20260520_client_services", m20260520_client_services, Just down_m20260520_client_services),
-    ("20260525_member_removed_at", m20260525_member_removed_at, Just down_m20260525_member_removed_at)
+    ("20260529_delivery_job_senders", m20260529_delivery_job_senders, Just down_m20260529_delivery_job_senders),
+    ("20260530_client_services", m20260530_client_services, Just down_m20260530_client_services),
+    ("20260531_member_removed_at", m20260531_member_removed_at, Just down_m20260531_member_removed_at)
   ]
 
 -- | The list of migrations in ascending order by date
diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/M20260515_delivery_job_senders.hs b/src/Simplex/Chat/Store/SQLite/Migrations/M20260529_delivery_job_senders.hs
similarity index 89%
rename from src/Simplex/Chat/Store/SQLite/Migrations/M20260515_delivery_job_senders.hs
rename to src/Simplex/Chat/Store/SQLite/Migrations/M20260529_delivery_job_senders.hs
index 67a9ae31e8..9346b16128 100644
--- a/src/Simplex/Chat/Store/SQLite/Migrations/M20260515_delivery_job_senders.hs
+++ b/src/Simplex/Chat/Store/SQLite/Migrations/M20260529_delivery_job_senders.hs
@@ -4,13 +4,13 @@
 -- NULL means [] (sender-less jobs, e.g. DJRelayRemoved). One column carries
 -- single- and multi-sender jobs uniformly; the per-job introduction bits live
 -- in group_members.member_relations_vector (MRIntroduced).
-module Simplex.Chat.Store.SQLite.Migrations.M20260515_delivery_job_senders where
+module Simplex.Chat.Store.SQLite.Migrations.M20260529_delivery_job_senders where
 
 import Database.SQLite.Simple (Query)
 import Database.SQLite.Simple.QQ (sql)
 
-m20260515_delivery_job_senders :: Query
-m20260515_delivery_job_senders =
+m20260529_delivery_job_senders :: Query
+m20260529_delivery_job_senders =
   [sql|
 DROP INDEX idx_delivery_jobs_single_sender_group_member_id;
 
@@ -23,8 +23,8 @@ WHERE single_sender_group_member_id IS NOT NULL;
 ALTER TABLE delivery_jobs DROP COLUMN single_sender_group_member_id;
 |]
 
-down_m20260515_delivery_job_senders :: Query
-down_m20260515_delivery_job_senders =
+down_m20260529_delivery_job_senders :: Query
+down_m20260529_delivery_job_senders =
   [sql|
 -- Pre-up the FK was ON DELETE CASCADE, so orphan delivery_jobs cannot
 -- exist. After up the FK was dropped and orphans may accumulate. Drop
diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/M20260520_client_services.hs b/src/Simplex/Chat/Store/SQLite/Migrations/M20260530_client_services.hs
similarity index 56%
rename from src/Simplex/Chat/Store/SQLite/Migrations/M20260520_client_services.hs
rename to src/Simplex/Chat/Store/SQLite/Migrations/M20260530_client_services.hs
index db141d6c03..d65f8f1c67 100644
--- a/src/Simplex/Chat/Store/SQLite/Migrations/M20260520_client_services.hs
+++ b/src/Simplex/Chat/Store/SQLite/Migrations/M20260530_client_services.hs
@@ -1,18 +1,18 @@
 {-# LANGUAGE QuasiQuotes #-}
 
-module Simplex.Chat.Store.SQLite.Migrations.M20260520_client_services where
+module Simplex.Chat.Store.SQLite.Migrations.M20260530_client_services where
 
 import Database.SQLite.Simple (Query)
 import Database.SQLite.Simple.QQ (sql)
 
-m20260520_client_services :: Query
-m20260520_client_services =
+m20260530_client_services :: Query
+m20260530_client_services =
   [sql|
 ALTER TABLE users ADD COLUMN client_service INTEGER NOT NULL DEFAULT 0;
 |]
 
-down_m20260520_client_services :: Query
-down_m20260520_client_services =
+down_m20260530_client_services :: Query
+down_m20260530_client_services =
   [sql|
 ALTER TABLE users DROP COLUMN client_service;
 |]
diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/M20260525_member_removed_at.hs b/src/Simplex/Chat/Store/SQLite/Migrations/M20260531_member_removed_at.hs
similarity index 54%
rename from src/Simplex/Chat/Store/SQLite/Migrations/M20260525_member_removed_at.hs
rename to src/Simplex/Chat/Store/SQLite/Migrations/M20260531_member_removed_at.hs
index 704950b3fb..c63e6a37f9 100644
--- a/src/Simplex/Chat/Store/SQLite/Migrations/M20260525_member_removed_at.hs
+++ b/src/Simplex/Chat/Store/SQLite/Migrations/M20260531_member_removed_at.hs
@@ -1,18 +1,18 @@
 {-# LANGUAGE QuasiQuotes #-}
 
-module Simplex.Chat.Store.SQLite.Migrations.M20260525_member_removed_at where
+module Simplex.Chat.Store.SQLite.Migrations.M20260531_member_removed_at where
 
 import Database.SQLite.Simple (Query)
 import Database.SQLite.Simple.QQ (sql)
 
-m20260525_member_removed_at :: Query
-m20260525_member_removed_at =
+m20260531_member_removed_at :: Query
+m20260531_member_removed_at =
   [sql|
 ALTER TABLE group_members ADD COLUMN removed_at TEXT;
 |]
 
-down_m20260525_member_removed_at :: Query
-down_m20260525_member_removed_at =
+down_m20260531_member_removed_at :: Query
+down_m20260531_member_removed_at =
   [sql|
 ALTER TABLE group_members DROP COLUMN removed_at;
 |]
diff --git a/tests/PostgresSchemaDump.hs b/tests/PostgresSchemaDump.hs
index 197e9a9b89..0cd79ac513 100644
--- a/tests/PostgresSchemaDump.hs
+++ b/tests/PostgresSchemaDump.hs
@@ -80,5 +80,5 @@ skipComparisonForDownMigrations =
     -- group_member_intro_id field moves
     "20251128_migrate_member_relations",
     -- on down migration single_sender_group_member_id column is re-added at the end of the table
-    "20260515_delivery_job_senders"
+    "20260529_delivery_job_senders"
   ]
diff --git a/tests/SchemaDump.hs b/tests/SchemaDump.hs
index bc74f3ec33..2336fd56dd 100644
--- a/tests/SchemaDump.hs
+++ b/tests/SchemaDump.hs
@@ -145,7 +145,7 @@ skipComparisonForDownMigrations =
     -- on down migration single_sender_group_member_id column and its index
     -- are re-added at the end of the table / file (ALTER TABLE ADD COLUMN
     -- appends; CREATE INDEX appends).
-    "20260515_delivery_job_senders"
+    "20260529_delivery_job_senders"
   ]
 
 getSchema :: FilePath -> FilePath -> IO String