From: Marcus Eggenberger Date: Mon, 6 Mar 2017 09:01:26 +0000 (+0100) Subject: Merge pull request #276 from digitalcircuit/fix-sql-postgres-newerthan X-Git-Tag: travis-deploy-test~333 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=8af0ba8424957091f3b661e9f52b787681f0a51d;hp=570fe57edab50ce8acee57843b233354b6fc1c83 Merge pull request #276 from digitalcircuit/fix-sql-postgres-newerthan core: Fix Postgres messagesNewerThan wrong buffer --- diff --git a/src/core/SQL/PostgreSQL/20/select_messagesNewerThan.sql b/src/core/SQL/PostgreSQL/20/select_messagesNewerThan.sql index 881ce5e4..571f5383 100644 --- a/src/core/SQL/PostgreSQL/20/select_messagesNewerThan.sql +++ b/src/core/SQL/PostgreSQL/20/select_messagesNewerThan.sql @@ -2,7 +2,7 @@ SELECT messageid, time, type, flags, sender, message FROM backlog JOIN sender ON backlog.senderid = sender.senderid WHERE backlog.messageid >= $1 -AND backlog.messageid <= (SELECT buffer.lastmsgid FROM buffer WHERE buffer.bufferid = $1) +AND backlog.messageid <= (SELECT buffer.lastmsgid FROM buffer WHERE buffer.bufferid = $2) AND bufferid = $2 ORDER BY messageid DESC LIMIT $3