Merge branch 'master' into chat-relays

This commit is contained in:
spaced4ndy
2025-10-23 12:37:29 +04:00
81 changed files with 4670 additions and 983 deletions
@@ -20,7 +20,8 @@ import Simplex.Chat.Store.Postgres.Migrations.M20250813_delivery_tasks
import Simplex.Chat.Store.Postgres.Migrations.M20250919_group_summary
import Simplex.Chat.Store.Postgres.Migrations.M20250922_remove_unused_connections
import Simplex.Chat.Store.Postgres.Migrations.M20251007_connections_sync
import Simplex.Chat.Store.Postgres.Migrations.M20251016_chat_relays
import Simplex.Chat.Store.Postgres.Migrations.M20251017_chat_tags_cascade
import Simplex.Chat.Store.Postgres.Migrations.M20251018_chat_relays
import Simplex.Messaging.Agent.Store.Shared (Migration (..))
schemaMigrations :: [(String, Text, Maybe Text)]
@@ -41,7 +42,8 @@ schemaMigrations =
("20250919_group_summary", m20250919_group_summary, Just down_m20250919_group_summary),
("20250922_remove_unused_connections", m20250922_remove_unused_connections, Just down_m20250922_remove_unused_connections),
("20251007_connections_sync", m20251007_connections_sync, Just down_m20251007_connections_sync),
("20251016_chat_relays", m20251016_chat_relays, Just down_m20251016_chat_relays)
("20251017_chat_tags_cascade", m20251017_chat_tags_cascade, Just down_m20251017_chat_tags_cascade),
("20251018_chat_relays", m20251018_chat_relays, Just down_m20251018_chat_relays)
]
-- | The list of migrations in ascending order by date
@@ -16,7 +16,7 @@ CREATE TABLE connections_sync(
last_sync_ts TIMESTAMPTZ
);
INSERT INTO connections_sync (connections_sync_id, should_sync, last_sync_ts) VALUES (1,0,NULL);
INSERT INTO connections_sync (connections_sync_id, should_sync, last_sync_ts) VALUES (1, 1, NULL);
|]
down_m20251007_connections_sync :: Text
@@ -0,0 +1,32 @@
{-# LANGUAGE QuasiQuotes #-}
module Simplex.Chat.Store.Postgres.Migrations.M20251017_chat_tags_cascade where
import Data.Text (Text)
import qualified Data.Text as T
import Text.RawString.QQ (r)
m20251017_chat_tags_cascade :: Text
m20251017_chat_tags_cascade =
T.pack
[r|
ALTER TABLE chat_tags DROP CONSTRAINT chat_tags_user_id_fkey;
ALTER TABLE chat_tags
ADD CONSTRAINT chat_tags_user_id_fkey
FOREIGN KEY (user_id)
REFERENCES users(user_id)
ON DELETE CASCADE;
|]
down_m20251017_chat_tags_cascade :: Text
down_m20251017_chat_tags_cascade =
T.pack
[r|
ALTER TABLE chat_tags DROP CONSTRAINT chat_tags_user_id_fkey;
ALTER TABLE chat_tags
ADD CONSTRAINT chat_tags_user_id_fkey
FOREIGN KEY (user_id)
REFERENCES users(user_id);
|]
@@ -1,13 +1,13 @@
{-# LANGUAGE QuasiQuotes #-}
module Simplex.Chat.Store.Postgres.Migrations.M20251016_chat_relays where
module Simplex.Chat.Store.Postgres.Migrations.M20251018_chat_relays where
import Data.Text (Text)
import qualified Data.Text as T
import Text.RawString.QQ (r)
m20251016_chat_relays :: Text
m20251016_chat_relays =
m20251018_chat_relays :: Text
m20251018_chat_relays =
T.pack
[r|
CREATE TABLE chat_relays(
@@ -32,8 +32,8 @@ ALTER TABLE users ADD COLUMN is_user_chat_relay SMALLINT NOT NULL DEFAULT 0;
ALTER TABLE group_members ADD COLUMN is_chat_relay SMALLINT NOT NULL DEFAULT 0;
|]
down_m20251016_chat_relays :: Text
down_m20251016_chat_relays =
down_m20251018_chat_relays :: Text
down_m20251018_chat_relays =
T.pack
[r|
ALTER TABLE group_members DROP COLUMN is_chat_relay;
@@ -2479,7 +2479,7 @@ ALTER TABLE ONLY test_chat_schema.chat_tags_chats
ALTER TABLE ONLY test_chat_schema.chat_tags
ADD CONSTRAINT chat_tags_user_id_fkey FOREIGN KEY (user_id) REFERENCES test_chat_schema.users(user_id);
ADD CONSTRAINT chat_tags_user_id_fkey FOREIGN KEY (user_id) REFERENCES test_chat_schema.users(user_id) ON DELETE CASCADE;