Merge branch 'master' into chat-relays

src/Simplex/Chat/Store/Postgres/Migrations.hs

@@ -22,7 +22,7 @@ import Simplex.Chat.Store.Postgres.Migrations.M20250922_remove_unused_connection
 import Simplex.Chat.Store.Postgres.Migrations.M20251007_connections_sync
 import Simplex.Chat.Store.Postgres.Migrations.M20251017_chat_tags_cascade
 import Simplex.Chat.Store.Postgres.Migrations.M20251117_member_relations_vector
--- import Simplex.Chat.Store.Postgres.Migrations.M20251128_member_relations_vector_stage_2
+import Simplex.Chat.Store.Postgres.Migrations.M20251128_migrate_member_relations
 import Simplex.Chat.Store.Postgres.Migrations.M20251212_chat_relays
 import Simplex.Messaging.Agent.Store.Shared (Migration (..))
 
@@ -46,7 +46,7 @@ schemaMigrations =
     ("20251007_connections_sync", m20251007_connections_sync, Just down_m20251007_connections_sync),
     ("20251017_chat_tags_cascade", m20251017_chat_tags_cascade, Just down_m20251017_chat_tags_cascade),
     ("20251117_member_relations_vector", m20251117_member_relations_vector, Just down_m20251117_member_relations_vector),
-    -- ("20251128_member_relations_vector_stage_2", m20251128_member_relations_vector_stage_2, Just down_m20251128_member_relations_vector_stage_2)
+    ("20251128_migrate_member_relations", m20251128_migrate_member_relations, Just down_m20251128_migrate_member_relations),
     ("20251212_chat_relays", m20251212_chat_relays, Just down_m20251212_chat_relays)
   ]
 

src/Simplex/Chat/Store/Postgres/Migrations/M20251117_member_relations_vector.hs

@@ -7,7 +7,7 @@ import qualified Data.Text as T
 import Text.RawString.QQ (r)
 
 -- This migration creates custom aggregate function migrate_relations_vector(idx, direction, intro_status).
--- Used in live migration and stage 2 migration (M20251128_member_relations_vector_stage_2).
+-- Used in live migration and stage 2 migration (M20251128_migrate_member_relations).
 --
 -- Vector byte encoding: 4 reserved | 1 direction | 3 status
 -- Direction: 0 = IDSubjectIntroduced, 1 = IDReferencedIntroduced

src/Simplex/Chat/Store/Postgres/Migrations/M20251128_migrate_member_relations.hs

@@ -1,9 +1,9 @@
+{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE QuasiQuotes #-}
 
-module Simplex.Chat.Store.Postgres.Migrations.M20251128_member_relations_vector_stage_2 where
+module Simplex.Chat.Store.Postgres.Migrations.M20251128_migrate_member_relations where
 
 import Data.Text (Text)
-import qualified Data.Text as T
 import Text.RawString.QQ (r)
 
 -- Build member_relations_vector for all members that don't have it yet.
@@ -13,11 +13,9 @@ import Text.RawString.QQ (r)
 -- - direction 0 (IDSubjectIntroduced): current member (subject) is re_group_member_id, was introduced to referenced member
 -- - direction 1 (IDReferencedIntroduced): current member (subject) is to_group_member_id, referenced member was introduced to it
 
--- TODO [relations vector] drop group_member_intros in the end of migration
-m20251128_member_relations_vector_stage_2 :: Text
-m20251128_member_relations_vector_stage_2 =
-  T.pack
-    [r|
+m20251128_migrate_member_relations :: Text
+m20251128_migrate_member_relations =
+  [r|
 UPDATE group_members
 SET member_relations_vector = (
   SELECT migrate_relations_vector(idx, direction, intro_status)
@@ -34,12 +32,14 @@ SET member_relations_vector = (
   ) AS relations
 )
 WHERE member_relations_vector IS NULL;
+
+DROP INDEX idx_pending_group_messages_group_member_intro_id;
+ALTER TABLE pending_group_messages DROP COLUMN group_member_intro_id;
 |]
 
--- TODO [relations vector] re-create group_member_intros
-down_m20251128_member_relations_vector_stage_2 :: Text
-down_m20251128_member_relations_vector_stage_2 =
-  T.pack
-    [r|
-
+down_m20251128_migrate_member_relations :: Text
+down_m20251128_migrate_member_relations =
+  [r|
+ALTER TABLE pending_group_messages ADD COLUMN group_member_intro_id BIGINT REFERENCES group_member_intros ON DELETE CASCADE;
+CREATE INDEX idx_pending_group_messages_group_member_intro_id ON pending_group_messages(group_member_intro_id);
 |]

src/Simplex/Chat/Store/Postgres/Migrations/chat_schema.sql

@@ -1060,7 +1060,6 @@ CREATE TABLE test_chat_schema.pending_group_messages (
     pending_group_message_id bigint NOT NULL,
     group_member_id bigint NOT NULL,
     message_id bigint NOT NULL,
-    group_member_intro_id bigint,
     created_at timestamp with time zone DEFAULT now() NOT NULL,
     updated_at timestamp with time zone DEFAULT now() NOT NULL
 );
@@ -2321,10 +2320,6 @@ CREATE INDEX idx_pending_group_messages_group_member_id ON test_chat_schema.pend
 
 
 
-CREATE INDEX idx_pending_group_messages_group_member_intro_id ON test_chat_schema.pending_group_messages USING btree (group_member_intro_id);
-
-
-
 CREATE INDEX idx_pending_group_messages_message_id ON test_chat_schema.pending_group_messages USING btree (message_id);
 
 
@@ -2991,11 +2986,6 @@ ALTER TABLE ONLY test_chat_schema.pending_group_messages
 
 
 
-ALTER TABLE ONLY test_chat_schema.pending_group_messages
-    ADD CONSTRAINT pending_group_messages_group_member_intro_id_fkey FOREIGN KEY (group_member_intro_id) REFERENCES test_chat_schema.group_member_intros(group_member_intro_id) ON DELETE CASCADE;
-
-
-
 ALTER TABLE ONLY test_chat_schema.pending_group_messages
     ADD CONSTRAINT pending_group_messages_message_id_fkey FOREIGN KEY (message_id) REFERENCES test_chat_schema.messages(message_id) ON DELETE CASCADE;