From: Michael Marley <michael@michaelmarley.com>
Date: Mon, 1 Sep 2014 22:42:22 +0000 (-0400)
Subject: Use null QVariant instead of "ALL" for select limit on psql
X-Git-Tag: 0.10.1~12
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=195cee2a4bc0bcccde0806103860f5a0531fe47d

Use null QVariant instead of "ALL" for select limit on psql

Using "ALL" as it was before was making PostgreSQL error out when
attempting to return backlog for Quasseldroid when Quasseldroid is
in "Unread messages per chat" mode.  According to
http://www.postgresql.org/docs/9.3/static/queries-limit.html,
LIMIT NULL is the same thing as having no LIMIT at all.  According
to http://qt-project.org/doc/qt-4.8/qsqlquery.html, NULL values
are bound in Qt SQL prepared statements by using a null QVariant.
---

diff --git a/src/core/postgresqlstorage.cpp b/src/core/postgresqlstorage.cpp
index 299e7391..317abf9c 100644
--- a/src/core/postgresqlstorage.cpp
+++ b/src/core/postgresqlstorage.cpp
@@ -1516,7 +1516,7 @@ QList<Message> PostgreSqlStorage::requestMsgs(UserId user, BufferId bufferId, Ms
     if (limit != -1)
         params << limit;
     else
-        params << "ALL";
+        params << QVariant(QVariant::Int);
 
     QSqlQuery query = executePreparedQuery(queryName, params, db);