In SQL files create Users table with SCRAM support by default (#956)

This commit is contained in:
Badlop 2016-03-29 12:37:49 +02:00
parent 221d8e0e5d
commit e386bf6b58
4 changed files with 14 additions and 2 deletions

View File

@ -19,6 +19,9 @@
CREATE TABLE users ( CREATE TABLE users (
username text PRIMARY KEY, username text PRIMARY KEY,
password text NOT NULL, password text NOT NULL,
serverkey text NOT NULL DEFAULT '',
salt text NOT NULL DEFAULT '',
iterationcount integer NOT NULL DEFAULT 0,
created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
); );

View File

@ -362,6 +362,9 @@ WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW
CREATE TABLE [dbo].[users] ( CREATE TABLE [dbo].[users] (
[username] [varchar] (250) NOT NULL, [username] [varchar] (250) NOT NULL,
[password] [text] NOT NULL, [password] [text] NOT NULL,
[serverkey] [text] NOT NULL,
[salt] [text] NOT NULL,
[iterationcount] [smallint] NOT NULL DEFAULT 0,
[created_at] [datetime] NOT NULL DEFAULT GETDATE(), [created_at] [datetime] NOT NULL DEFAULT GETDATE(),
CONSTRAINT [users_PRIMARY] PRIMARY KEY CLUSTERED CONSTRAINT [users_PRIMARY] PRIMARY KEY CLUSTERED
( (

View File

@ -19,10 +19,13 @@
CREATE TABLE users ( CREATE TABLE users (
username varchar(191) PRIMARY KEY, username varchar(191) PRIMARY KEY,
password text NOT NULL, password text NOT NULL,
serverkey text NOT NULL DEFAULT '',
salt text NOT NULL DEFAULT '',
iterationcount integer NOT NULL DEFAULT 0,
created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
) ENGINE=InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; ) ENGINE=InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
-- To support SCRAM auth: -- 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 serverkey text NOT NULL DEFAULT '';
-- ALTER TABLE users ADD COLUMN salt text NOT NULL DEFAULT ''; -- ALTER TABLE users ADD COLUMN salt text NOT NULL DEFAULT '';
-- ALTER TABLE users ADD COLUMN iterationcount integer NOT NULL DEFAULT 0; -- ALTER TABLE users ADD COLUMN iterationcount integer NOT NULL DEFAULT 0;

View File

@ -19,10 +19,13 @@
CREATE TABLE users ( CREATE TABLE users (
username text PRIMARY KEY, username text PRIMARY KEY,
"password" text NOT NULL, "password" text NOT NULL,
serverkey text NOT NULL DEFAULT '',
salt text NOT NULL DEFAULT '',
iterationcount integer NOT NULL DEFAULT 0,
created_at TIMESTAMP NOT NULL DEFAULT now() created_at TIMESTAMP NOT NULL DEFAULT now()
); );
-- To support SCRAM auth: -- 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 serverkey text NOT NULL DEFAULT '';
-- ALTER TABLE users ADD COLUMN salt text NOT NULL DEFAULT ''; -- ALTER TABLE users ADD COLUMN salt text NOT NULL DEFAULT '';
-- ALTER TABLE users ADD COLUMN iterationcount integer NOT NULL DEFAULT 0; -- ALTER TABLE users ADD COLUMN iterationcount integer NOT NULL DEFAULT 0;