From 749f6adc00ba8f00574c3c11bf144fcd1f48ed5d Mon Sep 17 00:00:00 2001
From: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com>
Date: Fri, 25 Jul 2025 10:44:19 +0000
Subject: [PATCH] core: fix queries so they work for postgres (#6103)

---
 src/Simplex/Chat/Store/Groups.hs                            | 6 +++---
 .../Chat/Store/SQLite/Migrations/chat_query_plans.txt       | 4 ++--
 tests/ChatClient.hs                                         | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Simplex/Chat/Store/Groups.hs b/src/Simplex/Chat/Store/Groups.hs
index 54da62e9bb..e94bedea8e 100644
--- a/src/Simplex/Chat/Store/Groups.hs
+++ b/src/Simplex/Chat/Store/Groups.hs
@@ -2147,7 +2147,7 @@ getMatchingContacts db vr user@User {userId} Contact {contactId, profile = Local
         WHERE ct.user_id = ? AND ct.contact_id != ?
           AND ct.contact_status = ? AND ct.deleted = 0 AND ct.is_user = 0
           AND p.display_name = ? AND p.full_name = ?
-          AND p.short_descr IS ? AND p.image IS ?
+          AND p.short_descr IS NOT DISTINCT FROM ? AND p.image IS NOT DISTINCT FROM ?
       |]
 
 getMatchingMembers :: DB.Connection -> VersionRangeChat -> User -> Contact -> IO [GroupMember]
@@ -2164,7 +2164,7 @@ getMatchingMembers db vr user@User {userId} Contact {profile = LocalProfile {dis
         WHERE m.user_id = ? AND m.contact_id IS NULL
           AND m.member_category != ?
           AND p.display_name = ? AND p.full_name = ?
-          AND p.short_descr IS ? AND p.image IS ?
+          AND p.short_descr IS NOT DISTINCT FROM ? AND p.image IS NOT DISTINCT FROM ?
       |]
 
 getMatchingMemberContacts :: DB.Connection -> VersionRangeChat -> User -> GroupMember -> IO [Contact]
@@ -2181,7 +2181,7 @@ getMatchingMemberContacts db vr user@User {userId} GroupMember {memberProfile =
         WHERE ct.user_id = ?
           AND ct.contact_status = ? AND ct.deleted = 0 AND ct.is_user = 0
           AND p.display_name = ? AND p.full_name = ?
-          AND p.short_descr IS ? AND p.image IS ?
+          AND p.short_descr IS NOT DISTINCT FROM ? AND p.image IS NOT DISTINCT FROM ?
       |]
 
 createSentProbe :: DB.Connection -> TVar ChaChaDRG -> UserId -> ContactOrMember -> ExceptT StoreError IO (Probe, Int64)
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 968697b1c3..ab35c46aa2 100644
--- a/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt
+++ b/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt
@@ -3230,7 +3230,7 @@ Query:
         WHERE ct.user_id = ?
           AND ct.contact_status = ? AND ct.deleted = 0 AND ct.is_user = 0
           AND p.display_name = ? AND p.full_name = ?
-          AND p.short_descr IS ? AND p.image IS ?
+          AND p.short_descr IS NOT DISTINCT FROM ? AND p.image IS NOT DISTINCT FROM ?
       
 Plan:
 SEARCH ct USING INDEX idx_contacts_chat_ts (user_id=?)
@@ -3360,7 +3360,7 @@ Query:
         WHERE m.user_id = ? AND m.contact_id IS NULL
           AND m.member_category != ?
           AND p.display_name = ? AND p.full_name = ?
-          AND p.short_descr IS ? AND p.image IS ?
+          AND p.short_descr IS NOT DISTINCT FROM ? AND p.image IS NOT DISTINCT FROM ?
       
 Plan:
 SEARCH m USING INDEX idx_group_members_user_id (user_id=?)
diff --git a/tests/ChatClient.hs b/tests/ChatClient.hs
index 12a63d2333..9c19923772 100644
--- a/tests/ChatClient.hs
+++ b/tests/ChatClient.hs
@@ -529,6 +529,7 @@ smpServerCfg =
       newQueueBasicAuth = Nothing, -- Just "server_password",
       controlPortUserAuth = Nothing,
       controlPortAdminAuth = Nothing,
+      dailyBlockQueueQuota = 20,
       messageExpiration = Just defaultMessageExpiration,
       expireMessagesOnStart = False,
       idleQueueInterval = defaultIdleQueueInterval,