From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Tue, 17 Mar 2009 15:40:54 +0000 (+0100)
Subject: fixing buffer merging with postgres backend
X-Git-Tag: 0.5-rc1~259
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=7723c1357b48dd30842d40d4e4237e15dbffad70;ds=sidebyside

fixing buffer merging with postgres backend
---

diff --git a/src/core/postgresqlstorage.cpp b/src/core/postgresqlstorage.cpp
index bd1e089e..13aa8c94 100644
--- a/src/core/postgresqlstorage.cpp
+++ b/src/core/postgresqlstorage.cpp
@@ -1067,7 +1067,7 @@ bool PostgreSqlStorage::mergeBuffersPermanently(const UserId &user, const Buffer
   }
 
   QSqlQuery checkQuery(db);
-  checkQuery.prepare("SELECT count(*) FROM buffer"
+  checkQuery.prepare("SELECT count(*) FROM buffer "
 		     "WHERE userid = :userid AND bufferid IN (:buffer1, :buffer2)");
   checkQuery.bindValue(":userid", user.toInt());
   checkQuery.bindValue(":buffer1", bufferId1.toInt());