From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Sat, 2 Jan 2016 15:35:01 +0000 (+0100)
Subject: Merge pull request #166 from mamarley/hashversionmigrationfix
X-Git-Tag: travis-deploy-test~536
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=e4712c3a52b8aeff334947b7d81b1a9d12b935ce;hp=866a25543c0c7ae7e4e79215cc5266acf626101b

Merge pull request #166 from mamarley/hashversionmigrationfix

Fix migration of hashversion
---

diff --git a/src/core/SQL/PostgreSQL/17/migrate_write_quasseluser.sql b/src/core/SQL/PostgreSQL/17/migrate_write_quasseluser.sql
index ae18c226..6b2f75c4 100644
--- a/src/core/SQL/PostgreSQL/17/migrate_write_quasseluser.sql
+++ b/src/core/SQL/PostgreSQL/17/migrate_write_quasseluser.sql
@@ -1,2 +1,2 @@
-INSERT INTO quasseluser (userid, username, password)
-VALUES (?, ?, ?)
+INSERT INTO quasseluser (userid, username, password, hashversion)
+VALUES (?, ?, ?, ?)
diff --git a/src/core/SQL/SQLite/18/migrate_read_quasseluser.sql b/src/core/SQL/SQLite/18/migrate_read_quasseluser.sql
index 5adf0d99..210620e3 100644
--- a/src/core/SQL/SQLite/18/migrate_read_quasseluser.sql
+++ b/src/core/SQL/SQLite/18/migrate_read_quasseluser.sql
@@ -1,2 +1,2 @@
-SELECT userid, username, password
+SELECT userid, username, password, hashversion
 FROM quasseluser
diff --git a/src/core/abstractsqlstorage.h b/src/core/abstractsqlstorage.h
index c39e826b..0637d0ef 100644
--- a/src/core/abstractsqlstorage.h
+++ b/src/core/abstractsqlstorage.h
@@ -131,6 +131,7 @@ public:
         UserId id;
         QString username;
         QString password;
+        int hashversion;
     };
 
     struct SenderMO {
diff --git a/src/core/postgresqlstorage.cpp b/src/core/postgresqlstorage.cpp
index 65460dff..acb7f37c 100644
--- a/src/core/postgresqlstorage.cpp
+++ b/src/core/postgresqlstorage.cpp
@@ -1841,6 +1841,7 @@ bool PostgreSqlMigrationWriter::writeMo(const QuasselUserMO &user)
     bindValue(0, user.id.toInt());
     bindValue(1, user.username);
     bindValue(2, user.password);
+    bindValue(3, user.hashversion);
     return exec();
 }
 
diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp
index 354b340a..e71c5375 100644
--- a/src/core/sqlitestorage.cpp
+++ b/src/core/sqlitestorage.cpp
@@ -1808,6 +1808,7 @@ bool SqliteMigrationReader::readMo(QuasselUserMO &user)
     user.id = value(0).toInt();
     user.username = value(1).toString();
     user.password = value(2).toString();
+    user.hashversion = value(3).toInt();
     return true;
 }