From 3a0f908a4f9a83d47f2d0049b3bb903fd2c9a5d3 Mon Sep 17 00:00:00 2001
From: "Evgeny @ SimpleX Chat"
 <259188159+evgeny-simplex@users.noreply.github.com>
Date: Mon, 5 Oct 2026 16:03:51 +0000
Subject: [PATCH] fix tests

---
 .../SQLite/Migrations/agent_query_plans.txt   | 64 +++++++++----------
 .../SQLite/Migrations/chat_query_plans.txt    |  6 +-
 tests/Bots/DirectoryTests.hs                  | 11 ++--
 tests/ChatTests/Direct.hs                     |  3 +-
 4 files changed, 39 insertions(+), 45 deletions(-)

diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/agent_query_plans.txt b/src/Simplex/Chat/Store/SQLite/Migrations/agent_query_plans.txt
index cb122cf4ee..fb677d8f0c 100644
--- a/src/Simplex/Chat/Store/SQLite/Migrations/agent_query_plans.txt
+++ b/src/Simplex/Chat/Store/SQLite/Migrations/agent_query_plans.txt
@@ -525,6 +525,23 @@ Query:
 Plan:
 SEARCH conn_confirmations USING INDEX idx_conn_confirmations_conn_id (conn_id=?)
 
+Query: 
+        SELECT conn_id, (
+          SELECT processed_ratchet_key_hash_id
+          FROM processed_ratchet_key_hashes
+          WHERE conn_id = c.conn_id
+          ORDER BY processed_ratchet_key_hash_id DESC
+          LIMIT 1 OFFSET ?
+        ) AS max_excess_id
+        FROM processed_ratchet_key_hashes c
+        GROUP BY conn_id
+        HAVING COUNT(*) > ?
+      
+Plan:
+SCAN c USING COVERING INDEX idx_processed_ratchet_key_hashes_conn_id
+CORRELATED SCALAR SUBQUERY 1
+SEARCH processed_ratchet_key_hashes USING COVERING INDEX idx_processed_ratchet_key_hashes_conn_id (conn_id=?)
+
 Query: 
         SELECT conn_id, ratchet_state, sender_key, e2e_snd_pub_key, sender_conn_info, smp_reply_queues, smp_client_version
         FROM conn_confirmations
@@ -663,21 +680,6 @@ SEARCH snd_message_deliveries USING COVERING INDEX idx_snd_message_deliveries_co
 SEARCH snd_messages USING COVERING INDEX idx_snd_messages_conn_id_internal_id (conn_id=? AND internal_id=?)
 SEARCH rcv_messages USING COVERING INDEX idx_rcv_messages_conn_id_internal_id (conn_id=? AND internal_id=?)
 
-Query: 
-      DELETE FROM processed_ratchet_key_hashes
-      WHERE processed_ratchet_key_hash_id IN (
-        SELECT processed_ratchet_key_hash_id
-        FROM processed_ratchet_key_hashes
-        WHERE created_at < ?
-        ORDER BY created_at ASC
-        LIMIT ?
-      )
-    
-Plan:
-SEARCH processed_ratchet_key_hashes USING INTEGER PRIMARY KEY (rowid=?)
-LIST SUBQUERY 1
-SEARCH processed_ratchet_key_hashes USING COVERING INDEX idx_processed_ratchet_key_hashes_created_at (created_at<?)
-
 Query: 
       INSERT INTO address_ratchet_keys
         (conn_id, ratchet_key_id, x3dh_priv_key_1, x3dh_priv_key_2, pq_priv_kem)
@@ -1159,18 +1161,6 @@ SEARCH s USING PRIMARY KEY (host=? AND port=?)
 SEARCH q USING PRIMARY KEY (host=? AND port=?)
 SEARCH c USING PRIMARY KEY (conn_id=?)
 
-Query: 
-    SELECT c.user_id, q.conn_id, q.rcv_id, q.rcv_private_key, q.status, c.enable_ntfs, q.client_notice_id,
-      q.rcv_queue_id, q.rcv_primary, q.replace_rcv_queue_id
-    FROM rcv_queues q
-    JOIN servers s ON q.host = s.host AND q.port = s.port
-    JOIN connections c ON q.conn_id = c.conn_id
-   WHERE q.to_subscribe = 1 AND  c.deleted = 0 AND q.deleted = 0 AND c.user_id = ? AND q.host = ? AND q.port = ? AND COALESCE(q.server_key_hash, s.key_hash) = ? ORDER BY q.rcv_id LIMIT ?
-Plan:
-SEARCH q USING INDEX idx_rcv_queues_to_subscribe (to_subscribe=? AND host=? AND port=?)
-SEARCH c USING PRIMARY KEY (conn_id=?)
-SEARCH s USING PRIMARY KEY (host=? AND port=?)
-
 Query: DELETE FROM client_services WHERE user_id = ?
 Plan:
 SEARCH client_services USING COVERING INDEX idx_server_certs_user_id_host_port (user_id=?)
@@ -1191,7 +1181,7 @@ Query: DELETE FROM connections WHERE conn_id = ?
 Plan:
 SEARCH connections USING PRIMARY KEY (conn_id=?)
 SEARCH address_ratchet_keys USING COVERING INDEX idx_address_ratchet_keys (conn_id=?)
-SEARCH processed_ratchet_key_hashes USING COVERING INDEX idx_processed_ratchet_key_hashes_hash (conn_id=?)
+SEARCH processed_ratchet_key_hashes USING COVERING INDEX idx_processed_ratchet_key_hashes_conn_id (conn_id=?)
 SEARCH encrypted_rcv_message_hashes USING COVERING INDEX idx_encrypted_rcv_message_hashes_hash (conn_id=?)
 SEARCH snd_message_deliveries USING COVERING INDEX idx_snd_message_deliveries_conn_id_internal_id (conn_id=?)
 SEARCH commands USING COVERING INDEX idx_commands_conn_id (conn_id=?)
@@ -1206,7 +1196,7 @@ Query: DELETE FROM connections WHERE user_id = 2
 Plan:
 SEARCH connections USING COVERING INDEX idx_connections_user (user_id=?)
 SEARCH address_ratchet_keys USING COVERING INDEX idx_address_ratchet_keys (conn_id=?)
-SEARCH processed_ratchet_key_hashes USING COVERING INDEX idx_processed_ratchet_key_hashes_hash (conn_id=?)
+SEARCH processed_ratchet_key_hashes USING COVERING INDEX idx_processed_ratchet_key_hashes_conn_id (conn_id=?)
 SEARCH encrypted_rcv_message_hashes USING COVERING INDEX idx_encrypted_rcv_message_hashes_hash (conn_id=?)
 SEARCH snd_message_deliveries USING COVERING INDEX idx_snd_message_deliveries_conn_id_internal_id (conn_id=?)
 SEARCH commands USING COVERING INDEX idx_commands_conn_id (conn_id=?)
@@ -1244,6 +1234,10 @@ Query: DELETE FROM ntf_tokens_to_delete WHERE created_at < ?
 Plan:
 SCAN ntf_tokens_to_delete
 
+Query: DELETE FROM processed_ratchet_key_hashes WHERE conn_id = ? AND processed_ratchet_key_hash_id <= ? AND created_at < ?
+Plan:
+SEARCH processed_ratchet_key_hashes USING INDEX idx_processed_ratchet_key_hashes_conn_id (conn_id=? AND processed_ratchet_key_hash_id<?)
+
 Query: DELETE FROM ratchets WHERE conn_id = ?
 Plan:
 SEARCH ratchets USING PRIMARY KEY (conn_id=?)
@@ -1413,10 +1407,6 @@ Query: SELECT deleted FROM snd_files WHERE snd_file_id = ?
 Plan:
 SEARCH snd_files USING INTEGER PRIMARY KEY (rowid=?)
 
-Query: SELECT header_key, msg_n, msg_key FROM skipped_messages WHERE conn_id = ?
-Plan:
-SEARCH skipped_messages USING INDEX idx_skipped_messages_conn_id (conn_id=?)
-
 Query: SELECT key_hash FROM servers WHERE host = ? AND port = ?
 Plan:
 SEARCH servers USING PRIMARY KEY (host=? AND port=?)
@@ -1433,6 +1423,10 @@ Query: SELECT ratchet_state, x3dh_pub_key_1, x3dh_pub_key_2, pq_pub_kem FROM rat
 Plan:
 SEARCH ratchets USING PRIMARY KEY (conn_id=?)
 
+Query: SELECT ratchet_sync_state FROM connections WHERE conn_id = ?
+Plan:
+SEARCH connections USING PRIMARY KEY (conn_id=?)
+
 Query: SELECT rcv_file_id FROM rcv_files WHERE rcv_file_entity_id = ?
 Plan:
 SEARCH rcv_files USING COVERING INDEX sqlite_autoindex_rcv_files_1 (rcv_file_entity_id=?)
@@ -1453,6 +1447,10 @@ Query: SELECT rcv_queue_id, broker_id FROM rcv_messages WHERE conn_id = ? AND in
 Plan:
 SEARCH rcv_messages USING PRIMARY KEY (conn_id=?)
 
+Query: SELECT skipped_message_id, header_key, msg_n, msg_key FROM skipped_messages WHERE conn_id = ? ORDER BY skipped_message_id DESC LIMIT ?
+Plan:
+SEARCH skipped_messages USING INDEX idx_skipped_messages_conn_id (conn_id=?)
+
 Query: SELECT snd_file_id FROM snd_files WHERE snd_file_entity_id = ?
 Plan:
 SEARCH snd_files USING COVERING INDEX idx_snd_files_snd_file_entity_id (snd_file_entity_id=?)
diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt b/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt
index 8dc2d929d5..63bbcad32b 100644
--- a/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt
+++ b/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt
@@ -7382,11 +7382,7 @@ Query: SELECT chat_item_id FROM chat_items WHERE group_scope_tag = 'member_suppo
 Plan:
 SCAN chat_items
 
-Query: SELECT chat_item_id FROM chat_items WHERE item_sent = 0 AND item_text LIKE '!2 SB-8H8V3-PF8CV-PQMA2-A54M3!%'
-Plan:
-SCAN chat_items
-
-Query: SELECT chat_item_id FROM chat_items WHERE item_sent = 0 AND item_text LIKE '!2 SB-Y14GX-Z83KW-0E3PK-DEN7X!%'
+Query: SELECT chat_item_id FROM chat_items WHERE item_sent = 0 AND item_text LIKE ? || '%'
 Plan:
 SCAN chat_items
 
diff --git a/tests/Bots/DirectoryTests.hs b/tests/Bots/DirectoryTests.hs
index 6fa0725fae..318a3f1d42 100644
--- a/tests/Bots/DirectoryTests.hs
+++ b/tests/Bots/DirectoryTests.hs
@@ -2044,11 +2044,12 @@ testCaptchaTooManyAttempts ps =
           pure ()
         cath #> "#privacy (support) wrong"
         cath <# "#privacy (support) 'SimpleX Directory'> Too many failed attempts, you can't join group."
-        -- member removal produces multiple messages
-        _ <- getTermLine cath
-        _ <- getTermLine cath
-        _ <- getTermLine cath
-        pure ()
+        let removed = "#privacy: 'SimpleX Directory' removed you from the group (signed)"
+        line <- getTermLine cath
+        when (line /= removed) $ do
+          line `shouldContain` "error: connection authorization failed"
+          cath <## removed
+        cath <## "use /d #privacy to delete the group"
 
 testCaptchaUnknownCommand :: HasCallStack => TestParams -> IO ()
 testCaptchaUnknownCommand ps =
diff --git a/tests/ChatTests/Direct.hs b/tests/ChatTests/Direct.hs
index fbdc27160c..4afe7a31dd 100644
--- a/tests/ChatTests/Direct.hs
+++ b/tests/ChatTests/Direct.hs
@@ -1798,8 +1798,7 @@ testSubscribeAppNSE ps =
     withNewTestChat ps "alice" aliceProfile $ \alice -> do
       withTestChatOpts ps testOpts {coreOptions = testCoreOpts {maintenance = True}} "alice" $ \nseAlice -> do
         alice ##> "/_app suspend 1"
-        alice <## "ok"
-        alice <## "chat suspended"
+        alice <### ["ok", "chat suspended"]
         nseAlice ##> "/_start main=off"
         nseAlice <## "chat started"
         threadDelay 100000