From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Wed, 15 Apr 2015 18:12:08 +0000 (+0200)
Subject: Merge pull request #121 from mamarley/unusedcipherfix
X-Git-Tag: 0.12.0~4
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=f8ae86894f1f1bf351a8bfd946cc2c86f2006c92;hp=60bf8c5270a523172fd4e4dd4768058af612439f

Merge pull request #121 from mamarley/unusedcipherfix

Fix compiler warning when compiling without QCA support
---

diff --git a/src/core/SQL/PostgreSQL/17/setup_000_quasseluser.sql b/src/core/SQL/PostgreSQL/17/setup_000_quasseluser.sql
index cd8292c4..9c993769 100644
--- a/src/core/SQL/PostgreSQL/17/setup_000_quasseluser.sql
+++ b/src/core/SQL/PostgreSQL/17/setup_000_quasseluser.sql
@@ -1,5 +1,6 @@
 CREATE TABLE quasseluser (
        userid serial NOT NULL PRIMARY KEY,
        username varchar(64) UNIQUE NOT NULL,
-       password char(40) NOT NULL -- hex reppresentation of sha1 hashes
+       password TEXT NOT NULL,
+       hashversion integer NOT NULL DEFAULT 0
 )
diff --git a/src/core/SQL/SQLite/18/setup_000_quasseluser.sql b/src/core/SQL/SQLite/18/setup_000_quasseluser.sql
index 0b81759e..1833f966 100644
--- a/src/core/SQL/SQLite/18/setup_000_quasseluser.sql
+++ b/src/core/SQL/SQLite/18/setup_000_quasseluser.sql
@@ -1,7 +1,6 @@
 CREATE TABLE quasseluser (
        userid INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
        username TEXT UNIQUE NOT NULL,
-       password TEXT NOT NULL
+       password TEXT NOT NULL,
+       hashversion INTEGER NOT NULL DEFAULT 0
 )
-
-