Port the previous PostgreSQL improvements to SQLite3.

[quassel.git] / src / core / SQL / PostgreSQL / 20 / select_messagesNewerThan.sql

diff --git a/src/core/SQL/PostgreSQL/20/select_messagesNewerThan.sql b/src/core/SQL/PostgreSQL/20/select_messagesNewerThan.sql
index 393d3cf..881ce5e 100644 (file)
--- 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
+JOIN sender ON backlog.senderid = sender.senderid
+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
+LIMIT $3