X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fpostgresqlstorage.cpp;h=2877ae0fc0f38b77d5cd5b24528ecc0830d85c15;hb=efee441a243efb88929e1e275d71ee27991bf074;hp=05da7a12cc152f8b216321940acaaa089e985a47;hpb=d682289cc69fac3a5776ef29059cc1f54d8d37d4;p=quassel.git

diff --git a/src/core/postgresqlstorage.cpp b/src/core/postgresqlstorage.cpp
index 05da7a12..2877ae0f 100644
--- a/src/core/postgresqlstorage.cpp
+++ b/src/core/postgresqlstorage.cpp
@@ -1547,7 +1547,7 @@ QList<Message> PostgreSqlStorage::requestMsgs(UserId user, BufferId bufferId, Ms
     QString queryName;
     QVariantList params;
     if (last == -1 && first == -1) {
-        queryName = "select_messages";
+        queryName = "select_messagesNewestK";
     }
     else if (last == -1) {
         queryName = "select_messagesNewerThan";
@@ -1969,10 +1969,11 @@ bool PostgreSqlMigrationWriter::writeMo(const BufferMO &buffer)
     bindValue(4, buffer.buffername);
     bindValue(5, buffer.buffercname);
     bindValue(6, (int)buffer.buffertype);
-    bindValue(7, buffer.lastseenmsgid);
-    bindValue(8, buffer.markerlinemsgid);
-    bindValue(9, buffer.key);
-    bindValue(10, buffer.joined);
+    bindValue(7, buffer.lastmsgid);
+    bindValue(8, buffer.lastseenmsgid);
+    bindValue(9, buffer.markerlinemsgid);
+    bindValue(10, buffer.key);
+    bindValue(11, buffer.joined);
     return exec();
 }
 
@@ -2043,6 +2044,8 @@ bool PostgreSqlMigrationWriter::postProcess()
             return false;
     }
 
+    // Update the lastmsgid for all existing buffers.
+    resetQuery();
     newQuery(QString("SELECT populate_lastmsgid()"), db);
     if (!exec())
         return false;