X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2FSQL%2FPostgreSQL%2F20%2Fselect_messagesNewerThan.sql;fp=src%2Fcore%2FSQL%2FPostgreSQL%2F20%2Fselect_messagesNewerThan.sql;h=d5c01dcd19213364a9e75115710778adaa8910eb;hb=df3e1433ea4850e57cade871ced1b0eab4fd785a;hp=393d3cfa2abba2e6a09091ccf89ca5876203870c;hpb=d682289cc69fac3a5776ef29059cc1f54d8d37d4;p=quassel.git

diff --git a/src/core/SQL/PostgreSQL/20/select_messagesNewerThan.sql b/src/core/SQL/PostgreSQL/20/select_messagesNewerThan.sql
index 393d3cfa..d5c01dcd 100644
--- a/src/core/SQL/PostgreSQL/20/select_messagesNewerThan.sql
+++ b/src/core/SQL/PostgreSQL/20/select_messagesNewerThan.sql
@@ -1,6 +1,8 @@
 SELECT messageid, time,  type, flags, sender, message
 FROM backlog
 LEFT JOIN sender ON backlog.senderid = sender.senderid
-WHERE backlog.messageid >= $1 AND bufferid = $2
+WHERE backlog.messageid >= $1
+AND backlog.messageid <= (SELECT buffer.lastmsgid FROM buffer WHERE buffer.bufferid = $1)
+AND bufferid = $2
 ORDER BY messageid DESC
 LIMIT $3
\ No newline at end of file