Add lastmsgid limit on fetching backlog to SQLite

[quassel.git] / src / core / SQL / SQLite / 21 / select_messagesNewerThan.sql

diff --git a/src/core/SQL/SQLite/21/select_messagesNewerThan.sql b/src/core/SQL/SQLite/21/select_messagesNewerThan.sql
index 69d948d..bac2a04 100644 (file)
--- a/src/core/SQL/SQLite/21/select_messagesNewerThan.sql
+++ b/src/core/SQL/SQLite/21/select_messagesNewerThan.sql
@@ -1,7 +1,8 @@
 SELECT messageid, time,  type, flags, sender, message
 FROM backlog
 JOIN sender ON backlog.senderid = sender.senderid
-WHERE bufferid = :bufferid
-    AND backlog.messageid >= :firstmsg
+WHERE backlog.messageid >= :firstmsg
+    AND backlog.messageid <= (SELECT buffer.lastmsgid FROM buffer WHERE buffer.bufferid = :bufferid)
+    AND bufferid = :bufferid
 ORDER BY messageid DESC
 LIMIT :limit