aboutsummaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorPaweł Chmielowski <pchmielowski@process-one.net>2016-04-08 17:50:33 +0200
committerPaweł Chmielowski <pchmielowski@process-one.net>2016-04-08 17:50:59 +0200
commitb4739396ec785591feb3d029d1529e064eba5635 (patch)
tree58d289179a5878e4c800534b1f321a5e4c0595b3 /sql
parent'serverkey' and 'salt' should have empty string as default (diff)
Switch to varchar(64) in mysql user.server/salt as text can't have default values
Diffstat (limited to 'sql')
-rw-r--r--sql/mysql.sql8
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/mysql.sql b/sql/mysql.sql
index f08b3a4b9..b7a86d0e6 100644
--- a/sql/mysql.sql
+++ b/sql/mysql.sql
@@ -19,15 +19,15 @@
CREATE TABLE users (
username varchar(191) PRIMARY KEY,
password text NOT NULL,
- serverkey text NOT NULL DEFAULT '',
- salt text NOT NULL DEFAULT '',
+ serverkey varchar(64) NOT NULL DEFAULT '',
+ salt varchar(64) NOT NULL DEFAULT '',
iterationcount integer NOT NULL DEFAULT 0,
created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
) ENGINE=InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
-- Add support for SCRAM auth to a database created before ejabberd 16.03:
--- ALTER TABLE users ADD COLUMN serverkey text NOT NULL DEFAULT '';
--- ALTER TABLE users ADD COLUMN salt text NOT NULL DEFAULT '';
+-- ALTER TABLE users ADD COLUMN serverkey varchar(64) NOT NULL DEFAULT '';
+-- ALTER TABLE users ADD COLUMN salt varchar(64) NOT NULL DEFAULT '';
-- ALTER TABLE users ADD COLUMN iterationcount integer NOT NULL DEFAULT 0;
CREATE TABLE last (