diff options
| author | Mickael Remond <mremond@process-one.net> | 2016-04-12 10:34:24 +0200 |
|---|---|---|
| committer | Mickael Remond <mremond@process-one.net> | 2016-04-12 10:34:24 +0200 |
| commit | cd2e2b1a880f93b7198bbc17cb1d9be2c23048e8 (patch) | |
| tree | ce38fa8eac3e4540e4792d39f059f6f04a4fab9b /sql/mysql.sql | |
| parent | Allow testing user pattern directly in access rules (diff) | |
Synchronizing master changes
Diffstat (limited to 'sql/mysql.sql')
| -rw-r--r-- | sql/mysql.sql | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/mysql.sql b/sql/mysql.sql index f08b3a4b..b7a86d0e 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 ( |