Fix #959: SQLite -> PostgreSQL migration

[quassel.git] / src / core / sqlitestorage.cpp

diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp
index c962e8f..34852e9 100644 (file)
--- a/src/core/sqlitestorage.cpp
+++ b/src/core/sqlitestorage.cpp
@@ -42,6 +42,9 @@ bool SqliteStorage::isAvailable() const {
 }
 
 QString SqliteStorage::displayName() const {
+  // We identify the backend to use for the monolithic core by its displayname.
+  // so only change this string if you _really_ have to and make sure the core
+  // setup for the mono client still works ;)
   return QString("SQLite");
 }
 
@@ -1736,6 +1739,9 @@ bool SqliteMigrationReader::readMo(NetworkMO &network) {
   network.awaymessage = value(19).toString();
   network.attachperform = value(20).toString();
   network.detachperform = value(21).toString();
+  network.usesasl = value(22).toInt() == 1 ? true : false;
+  network.saslaccount = value(23).toString();
+  network.saslpassword = value(24).toString();
   return true;
 }
 
@@ -1752,8 +1758,8 @@ bool SqliteMigrationReader::readMo(BufferMO &buffer) {
   buffer.buffertype = value(6).toInt();
   buffer.lastseenmsgid = value(7).toInt();
   buffer.markerlinemsgid = value(8).toInt();
-  buffer.key = value(8).toString();
-  buffer.joined = value(9).toInt() == 1 ? true : false;
+  buffer.key = value(9).toString();
+  buffer.joined = value(10).toInt() == 1 ? true : false;
   return true;
 }