From: Ben Rosser <rosser.bjr@gmail.com>
Date: Thu, 24 Nov 2016 23:51:11 +0000 (-0500)
Subject: Fix quasseluser table setup on PostgreSQL and sort sql.qrc
X-Git-Tag: travis-deploy-test~267
X-Git-Url: https://git.quassel-irc.org/?a=commitdiff_plain;ds=inline;h=8fd4e06a6a0ccc7d8a7ad15b492ab8311b59a0b8;hp=2be361445e95238b9de13c337bacece3e2771d0d;p=quassel.git

Fix quasseluser table setup on PostgreSQL and sort sql.qrc

It seems that at some point the DEFAULT option for a varchar()
column has become sensitive to whether or not single or double quotation
marks are used. In particular when ""s were used, core setup failed
with the message 'ERROR:  column "Database" does not exist'. Changing
to single quotation marks (''s) resolved the issue.

Also include @digitalcircuit's sorted version of sql.qrc.

Fix the upgrade script too.
---

diff --git a/src/core/SQL/PostgreSQL/setup_000_quasseluser.sql b/src/core/SQL/PostgreSQL/setup_000_quasseluser.sql
index c668e69b..57abcea6 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) NOT NULL DEFAULT "Database"
+       authenticator varchar(64) NOT NULL DEFAULT 'Database'
 )
diff --git a/src/core/SQL/PostgreSQL/version/22/upgrade_000_alter_quasseluser_add_authenticator.sql b/src/core/SQL/PostgreSQL/version/22/upgrade_000_alter_quasseluser_add_authenticator.sql
index 50a52034..55733e0e 100644
--- a/src/core/SQL/PostgreSQL/version/22/upgrade_000_alter_quasseluser_add_authenticator.sql
+++ b/src/core/SQL/PostgreSQL/version/22/upgrade_000_alter_quasseluser_add_authenticator.sql
@@ -1,2 +1,2 @@
 ALTER TABLE quasseluser
-ADD COLUMN authenticator varchar(64) NOT NULL DEFAULT "Database";
+ADD COLUMN authenticator varchar(64) NOT NULL DEFAULT 'Database';