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 6b2f75c..a196fec 100644 (file)
--- 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 1991281..94a616f 100644 (file)
--- 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
 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 0f4c782..c668e69 100644 (file)
--- 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,
        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 210620e..e520120 100644 (file)
--- 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
 FROM quasseluser

diff --git a/src/core/SQL/SQLite/select_authuser.sql b/src/core/SQL/SQLite/select_authuser.sql
index 1991281..94a616f 100644 (file)
--- 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
 FROM quasseluser
 WHERE username = :username

diff --git a/src/core/abstractsqlstorage.h b/src/core/abstractsqlstorage.h
index 7f8e38f..6c469df 100644 (file)
--- a/src/core/abstractsqlstorage.h
+++ b/src/core/abstractsqlstorage.h
@@ -148,6 +148,7 @@ public:
         QString username;
         QString password;
         int hashversion;
         QString username;
         QString password;
         int hashversion;

+        QString authenticator;

     };
 
     struct SenderMO {
     };
 
     struct SenderMO {

diff --git a/src/core/postgresqlstorage.cpp b/src/core/postgresqlstorage.cpp
index 6a7f788..ce543ae 100644 (file)
--- 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(1, user.username);
     bindValue(2, user.password);
     bindValue(3, user.hashversion);

+    bindValue(4, user.authenticator);

     return exec();
 }
 
     return exec();
 }
 

diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp
index 3457c1e..6a8965b 100644 (file)
--- 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.username = value(1).toString();
     user.password = value(2).toString();
     user.hashversion = value(3).toInt();

+    user.authenticator = value(4).toString();

     return true;
 }
 
     return true;
 }