core: Fix/unify SQL for forward message fetch

NOTE: This commit should be squashed into the previous commit from
justJanne.  It's committed separately just to make it easier to see
what I changed.

Fixup the SQLite and PostgreSQL queries to treat "<= 0" as any
type/flag instead of just "= 0".  This matches the function
definitions and fixes specifying "-1" instead of "0".  Without this
change, specifying "-1" will result in missing messages!

diff --git a/src/core/SQL/PostgreSQL/select_messagesForward.sql b/src/core/SQL/PostgreSQL/select_messagesForward.sql
index e645e96..d8e76e8 100644 (file)
--- a/src/core/SQL/PostgreSQL/select_messagesForward.sql
+++ b/src/core/SQL/PostgreSQL/select_messagesForward.sql
@@ -1,10 +1,10 @@
-SELECT messageid, time,  type, flags, sender, senderprefixes, realname, avatarurl, message
+SELECT messageid, time, type, flags, sender, senderprefixes, realname, avatarurl, message
 FROM backlog
 JOIN sender ON backlog.senderid = sender.senderid
 WHERE backlog.messageid >= $1
     AND backlog.messageid < $2
     AND bufferid = $3
-    AND backlog.type & $4 != 0
-    AND ($5 = 0 OR backlog.flags & $5 != 0)
+    AND ($4 <= 0 OR backlog.type & $4 != 0)
+    AND ($5 <= 0 OR backlog.flags & $5 != 0)
 ORDER BY messageid ASC
 LIMIT $6

diff --git a/src/core/SQL/SQLite/select_messagesForward.sql b/src/core/SQL/SQLite/select_messagesForward.sql
index 881bb9f..e4e7819 100644 (file)
--- a/src/core/SQL/SQLite/select_messagesForward.sql
+++ b/src/core/SQL/SQLite/select_messagesForward.sql
@@ -1,10 +1,10 @@
-SELECT messageid, time,  type, flags, sender, senderprefixes, realname, avatarurl, message
+SELECT messageid, time, type, flags, sender, senderprefixes, realname, avatarurl, message
 FROM backlog
 JOIN sender ON backlog.senderid = sender.senderid
 WHERE bufferid = :bufferid
     AND backlog.messageid >= :firstmsg
     AND backlog.messageid < :lastmsg
-    AND (:type = 0 OR backlog.type & :type != 0)
-    AND (:flags = 0 OR backlog.flags & :flags != 0)
+    AND (:type <= 0 OR backlog.type & :type != 0)
+    AND (:flags <= 0 OR backlog.flags & :flags != 0)
 ORDER BY messageid ASC
 LIMIT :limit