X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fpostgresqlstorage.cpp;h=59d6f772ec7216956dc834c4c1868c7cec6ca071;hp=27c286684fa0703ea5844bac0ffb30bd4153aea0;hb=644837b45714e41246a8fd10fc6efc0e129280ff;hpb=6f4a6454e49db703bd6336f575bbbeff95388404

diff --git a/src/core/postgresqlstorage.cpp b/src/core/postgresqlstorage.cpp
index 27c28668..59d6f772 100644
--- a/src/core/postgresqlstorage.cpp
+++ b/src/core/postgresqlstorage.cpp
@@ -1102,6 +1102,7 @@ bool PostgreSqlStorage::mergeBuffersPermanently(const UserId &user, const Buffer
 
   QSqlQuery delBufferQuery(logDb());
   delBufferQuery.prepare(queryString("delete_buffer_for_bufferid"));
+  delBufferQuery.bindValue(":userid", user.toInt());
   delBufferQuery.bindValue(":bufferid", bufferId2.toInt());
   safeExec(delBufferQuery);
   if(!watchQuery(delBufferQuery)) {
@@ -1218,6 +1219,12 @@ bool PostgreSqlStorage::logMessage(Message &msg) {
     db.rollback();
     db.transaction();
 
+    if(!prepareQuery("insert_sender", queryString("insert_sender"), db)) {
+      qWarning() << "PostgreSqlStorage::logMessages(): unable to prepare query:" << queryString("insert_sender");
+      qWarning() << "  Error:" << db.lastError().text();
+      db.rollback();
+      return false;
+    }
 
     // it's possible that the sender was already added by another thread
     // since the insert might fail we're setting a savepoint