From: Ben Rosser <rosser.bjr@gmail.com>
Date: Sat, 2 Jan 2016 20:18:04 +0000 (-0500)
Subject: Add authenticator column to quasseluser migration table
X-Git-Tag: travis-deploy-test~281
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=691fb8bc92d1d72c10ef5ffc4535ab913eefc1ac;ds=sidebyside

Add authenticator column to quasseluser migration table

Commit these too.
---

diff --git a/src/core/SQL/PostgreSQL/migrate_write_quasseluser.sql b/src/core/SQL/PostgreSQL/migrate_write_quasseluser.sql
index 6b2f75c4..a196fecb 100644
--- a/src/core/SQL/PostgreSQL/migrate_write_quasseluser.sql
+++ b/src/core/SQL/PostgreSQL/migrate_write_quasseluser.sql
@@ -1,2 +1,2 @@
-INSERT INTO quasseluser (userid, username, password, hashversion)
-VALUES (?, ?, ?, ?)
+INSERT INTO quasseluser (userid, username, password, hashversion, authenticator)
+VALUES (?, ?, ?, ?, ?)
diff --git a/src/core/SQL/PostgreSQL/select_authuser.sql b/src/core/SQL/PostgreSQL/select_authuser.sql
index 1991281e..94a616f5 100644
--- a/src/core/SQL/PostgreSQL/select_authuser.sql
+++ b/src/core/SQL/PostgreSQL/select_authuser.sql
@@ -1,3 +1,3 @@
-SELECT userid, password, hashversion
+SELECT userid, password, hashversion, authenticator
 FROM quasseluser
 WHERE username = :username
diff --git a/src/core/SQL/PostgreSQL/setup_000_quasseluser.sql b/src/core/SQL/PostgreSQL/setup_000_quasseluser.sql
index 0f4c782a..c668e69b 100644
--- a/src/core/SQL/PostgreSQL/setup_000_quasseluser.sql
+++ b/src/core/SQL/PostgreSQL/setup_000_quasseluser.sql
@@ -3,5 +3,5 @@ CREATE TABLE quasseluser (
        username varchar(64) UNIQUE NOT NULL,
        password TEXT NOT NULL,
        hashversion integer NOT NULL DEFAULT 0,
-       authenticator varchar(64) UNIQUE NOT NULL
+       authenticator varchar(64) NOT NULL DEFAULT "Database"
 )
diff --git a/src/core/SQL/SQLite/migrate_read_quasseluser.sql b/src/core/SQL/SQLite/migrate_read_quasseluser.sql
index 210620e3..e520120c 100644
--- a/src/core/SQL/SQLite/migrate_read_quasseluser.sql
+++ b/src/core/SQL/SQLite/migrate_read_quasseluser.sql
@@ -1,2 +1,2 @@
-SELECT userid, username, password, hashversion
+SELECT userid, username, password, hashversion, authenticator
 FROM quasseluser
diff --git a/src/core/SQL/SQLite/select_authuser.sql b/src/core/SQL/SQLite/select_authuser.sql
index 1991281e..94a616f5 100644
--- a/src/core/SQL/SQLite/select_authuser.sql
+++ b/src/core/SQL/SQLite/select_authuser.sql
@@ -1,3 +1,3 @@
-SELECT userid, password, hashversion
+SELECT userid, password, hashversion, authenticator
 FROM quasseluser
 WHERE username = :username
diff --git a/src/core/abstractsqlstorage.h b/src/core/abstractsqlstorage.h
index 7f8e38f4..6c469dfd 100644
--- a/src/core/abstractsqlstorage.h
+++ b/src/core/abstractsqlstorage.h
@@ -148,6 +148,7 @@ public:
         QString username;
         QString password;
         int hashversion;
+        QString authenticator;
     };
 
     struct SenderMO {
diff --git a/src/core/postgresqlstorage.cpp b/src/core/postgresqlstorage.cpp
index 6a7f788a..ce543ae0 100644
--- a/src/core/postgresqlstorage.cpp
+++ b/src/core/postgresqlstorage.cpp
@@ -1869,6 +1869,7 @@ bool PostgreSqlMigrationWriter::writeMo(const QuasselUserMO &user)
     bindValue(1, user.username);
     bindValue(2, user.password);
     bindValue(3, user.hashversion);
+    bindValue(4, user.authenticator);
     return exec();
 }
 
diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp
index 3457c1ef..6a8965b5 100644
--- a/src/core/sqlitestorage.cpp
+++ b/src/core/sqlitestorage.cpp
@@ -1841,6 +1841,7 @@ bool SqliteMigrationReader::readMo(QuasselUserMO &user)
     user.username = value(1).toString();
     user.password = value(2).toString();
     user.hashversion = value(3).toInt();
+    user.authenticator = value(4).toString();
     return true;
 }