mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-19 06:51:33 +02:00
Merge branch 'develop' of https://github.com/phpbb/phpbb into feature/passwords
Conflicts: phpBB/config/services.yml
This commit is contained in:
@@ -166,43 +166,6 @@ CREATE INDEX [auth_role_id] ON [phpbb_acl_users]([auth_role_id]) ON [PRIMARY]
|
||||
GO
|
||||
|
||||
|
||||
/*
|
||||
Table: 'phpbb_oauth_tokens'
|
||||
*/
|
||||
CREATE TABLE [phpbb_oauth_tokens] (
|
||||
[user_id] [int] DEFAULT (0) NOT NULL ,
|
||||
[session_id] [char] (32) DEFAULT ('') NOT NULL ,
|
||||
[provider] [varchar] (255) DEFAULT ('') NOT NULL ,
|
||||
[oauth_token] [text] DEFAULT ('') NOT NULL
|
||||
) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
|
||||
GO
|
||||
|
||||
CREATE INDEX [user_id] ON [phpbb_oauth_tokens]([user_id]) ON [PRIMARY]
|
||||
GO
|
||||
|
||||
CREATE INDEX [provider] ON [phpbb_oauth_tokens]([provider]) ON [PRIMARY]
|
||||
GO
|
||||
|
||||
|
||||
/*
|
||||
Table: 'phpbb_oauth_accounts'
|
||||
*/
|
||||
CREATE TABLE [phpbb_oauth_accounts] (
|
||||
[user_id] [int] DEFAULT (0) NOT NULL ,
|
||||
[provider] [varchar] (255) DEFAULT ('') NOT NULL ,
|
||||
[oauth_provider_id] [varchar] (4000) DEFAULT ('') NOT NULL
|
||||
) ON [PRIMARY]
|
||||
GO
|
||||
|
||||
ALTER TABLE [phpbb_oauth_accounts] WITH NOCHECK ADD
|
||||
CONSTRAINT [PK_phpbb_oauth_accounts] PRIMARY KEY CLUSTERED
|
||||
(
|
||||
[user_id],
|
||||
[provider]
|
||||
) ON [PRIMARY]
|
||||
GO
|
||||
|
||||
|
||||
/*
|
||||
Table: 'phpbb_banlist'
|
||||
*/
|
||||
@@ -879,6 +842,43 @@ CREATE INDEX [user] ON [phpbb_notifications]([user_id], [notification_read]) ON
|
||||
GO
|
||||
|
||||
|
||||
/*
|
||||
Table: 'phpbb_oauth_accounts'
|
||||
*/
|
||||
CREATE TABLE [phpbb_oauth_accounts] (
|
||||
[user_id] [int] DEFAULT (0) NOT NULL ,
|
||||
[provider] [varchar] (255) DEFAULT ('') NOT NULL ,
|
||||
[oauth_provider_id] [varchar] (4000) DEFAULT ('') NOT NULL
|
||||
) ON [PRIMARY]
|
||||
GO
|
||||
|
||||
ALTER TABLE [phpbb_oauth_accounts] WITH NOCHECK ADD
|
||||
CONSTRAINT [PK_phpbb_oauth_accounts] PRIMARY KEY CLUSTERED
|
||||
(
|
||||
[user_id],
|
||||
[provider]
|
||||
) ON [PRIMARY]
|
||||
GO
|
||||
|
||||
|
||||
/*
|
||||
Table: 'phpbb_oauth_tokens'
|
||||
*/
|
||||
CREATE TABLE [phpbb_oauth_tokens] (
|
||||
[user_id] [int] DEFAULT (0) NOT NULL ,
|
||||
[session_id] [char] (32) DEFAULT ('') NOT NULL ,
|
||||
[provider] [varchar] (255) DEFAULT ('') NOT NULL ,
|
||||
[oauth_token] [text] DEFAULT ('') NOT NULL
|
||||
) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
|
||||
GO
|
||||
|
||||
CREATE INDEX [user_id] ON [phpbb_oauth_tokens]([user_id]) ON [PRIMARY]
|
||||
GO
|
||||
|
||||
CREATE INDEX [provider] ON [phpbb_oauth_tokens]([provider]) ON [PRIMARY]
|
||||
GO
|
||||
|
||||
|
||||
/*
|
||||
Table: 'phpbb_poll_options'
|
||||
*/
|
||||
|
Reference in New Issue
Block a user