From 7bb29b45be24e94bd44ca520f415433c2c8131a9 Mon Sep 17 00:00:00 2001
From: Abhimanyu <ABresting@users.noreply.github.com>
Date: Mon, 9 Oct 2023 13:06:40 +0200
Subject: [PATCH] fix: sqlite limited delete query bug (#2111)

---
 waku/waku_archive/driver/sqlite_driver/queries.nim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/waku/waku_archive/driver/sqlite_driver/queries.nim b/waku/waku_archive/driver/sqlite_driver/queries.nim
index 2e218d97d..27ab4de61 100644
--- a/waku/waku_archive/driver/sqlite_driver/queries.nim
+++ b/waku/waku_archive/driver/sqlite_driver/queries.nim
@@ -181,9 +181,9 @@ proc deleteMessagesOlderThanTimestamp*(db: SqliteDatabase, ts: int64):
 ## Delete oldest messages not within limit
 
 proc deleteOldestMessagesNotWithinLimitQuery(table: string, limit: int): SqlQueryStr =
-  "DELETE FROM " & table & " WHERE id NOT IN (" &
-  " SELECT id FROM " & table &
-  " ORDER BY storedAt DESC" &
+  "DELETE FROM " & table & " WHERE (storedAt, id, pubsubTopic) NOT IN (" &
+  " SELECT storedAt, id, pubsubTopic FROM " & table &
+  " ORDER BY storedAt DESC, id DESC" &
   " LIMIT " & $limit &
   ");"