From 26068a99397ea9bdd9fd07af1354fc5065fd7d00 Mon Sep 17 00:00:00 2001 From: Michael Marley Date: Mon, 30 Nov 2015 19:33:37 -0500 Subject: [PATCH] Fix migration of hashversion Previously, hashversion was not migrated. This would cause the value to default to 0, causing login failures for existing users. --- src/core/SQL/PostgreSQL/17/migrate_write_quasseluser.sql | 4 ++-- src/core/SQL/SQLite/18/migrate_read_quasseluser.sql | 2 +- src/core/abstractsqlstorage.h | 1 + src/core/postgresqlstorage.cpp | 1 + src/core/sqlitestorage.cpp | 1 + 5 files changed, 6 insertions(+), 3 deletions(-) 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; } -- 2.20.1