makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/oauth] Actual final schema changes

Browse source 
PHPBB3-11673
This commit is contained in:
Joseph Warner 2013-07-23 22:18:41 -04:00
parent e60f4bc88b
commit 2483efe9a3
9 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/develop/create_schema_files.php
View file

@ -927,20 +927,20 @@ function get_schema_struct()
'COLUMNS' => array( 'COLUMNS' => array(
'user_id' => array('UINT', 0), // phpbb_users.user_id 'user_id' => array('UINT', 0), // phpbb_users.user_id
'session_id' => array('CHAR:32', ''), // phpbb_sessions.session_id used only when user_id not set 'session_id' => array('CHAR:32', ''), // phpbb_sessions.session_id used only when user_id not set
'provider' => array('VCHAR'), // Name of the OAuth provider 'provider' => array('VCHAR', ''), // Name of the OAuth provider
'oauth_token' => array('TEXT_UNI'), // Serialized token 'oauth_token' => array('TEXT_UNI', ''), // Serialized token
), ),
'KEYS' => array( 'KEYS' => array(
'user_id' => array('INDEX', 'user_id'), 'user_id' => array('INDEX', 'user_id'),
'provider' => array('INDEX', 'oauth_provider'), 'provider' => array('INDEX', 'oauth_provider'),
), ),
); );
$schema_data['phpbb_oauth_accounts'] = array( $schema_data['phpbb_oauth_accounts'] = array(
'COLUMNS' => array( 'COLUMNS' => array(
'user_id' => array('UINT', 0), 'user_id' => array('UINT', 0),
'provider' => array('VCHAR'), 'provider' => array('VCHAR', ''),
'oauth_provider_id' => array('TEXT_UNI'), 'oauth_provider_id' => array('TEXT_UNI', ''),
), ),
'PRIMARY_KEY' => array( 'PRIMARY_KEY' => array(
'user_id', 'user_id',

8
phpBB/install/schemas/firebird_schema.sql
View file

@ -132,8 +132,8 @@ CREATE INDEX phpbb_acl_users_auth_role_id ON phpbb_acl_users(auth_role_id);;
CREATE TABLE phpbb_oauth_tokens ( CREATE TABLE phpbb_oauth_tokens (
user_id INTEGER DEFAULT 0 NOT NULL, user_id INTEGER DEFAULT 0 NOT NULL,
session_id CHAR(32) CHARACTER SET NONE DEFAULT '' NOT NULL, session_id CHAR(32) CHARACTER SET NONE DEFAULT '' NOT NULL,
provider VARCHAR(255) CHARACTER SET NONE NOT NULL, provider VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
oauth_token BLOB SUB_TYPE TEXT CHARACTER SET UTF8 NOT NULL oauth_token BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL
);; );;
CREATE INDEX phpbb_oauth_tokens_user_id ON phpbb_oauth_tokens(user_id);; CREATE INDEX phpbb_oauth_tokens_user_id ON phpbb_oauth_tokens(user_id);;
@ -142,8 +142,8 @@ CREATE INDEX phpbb_oauth_tokens_provider ON phpbb_oauth_tokens(oauth_provider);;
# Table: 'phpbb_oauth_accounts' # Table: 'phpbb_oauth_accounts'
CREATE TABLE phpbb_oauth_accounts ( CREATE TABLE phpbb_oauth_accounts (
user_id INTEGER DEFAULT 0 NOT NULL, user_id INTEGER DEFAULT 0 NOT NULL,
provider VARCHAR(255) CHARACTER SET NONE NOT NULL, provider VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
oauth_provider_id BLOB SUB_TYPE TEXT CHARACTER SET UTF8 NOT NULL oauth_provider_id BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL
);; );;
ALTER TABLE phpbb_oauth_accounts ADD PRIMARY KEY (user_id, provider);; ALTER TABLE phpbb_oauth_accounts ADD PRIMARY KEY (user_id, provider);;

8
phpBB/install/schemas/mssql_schema.sql
View file

@ -172,8 +172,8 @@ GO
CREATE TABLE [phpbb_oauth_tokens] ( CREATE TABLE [phpbb_oauth_tokens] (
[user_id] [int] DEFAULT (0) NOT NULL , [user_id] [int] DEFAULT (0) NOT NULL ,
[session_id] [char] (32) DEFAULT ('') NOT NULL , [session_id] [char] (32) DEFAULT ('') NOT NULL ,
[provider] [varchar] (255) NOT NULL , [provider] [varchar] (255) DEFAULT ('') NOT NULL ,
[oauth_token] [varchar] (4000) NOT NULL [oauth_token] [varchar] (4000) DEFAULT ('') NOT NULL
) ON [PRIMARY] ) ON [PRIMARY]
GO GO
@ -189,8 +189,8 @@ GO
*/ */
CREATE TABLE [phpbb_oauth_accounts] ( CREATE TABLE [phpbb_oauth_accounts] (
[user_id] [int] DEFAULT (0) NOT NULL , [user_id] [int] DEFAULT (0) NOT NULL ,
[provider] [varchar] (255) NOT NULL , [provider] [varchar] (255) DEFAULT ('') NOT NULL ,
[oauth_provider_id] [varchar] (4000) NOT NULL [oauth_provider_id] [varchar] (4000) DEFAULT ('') NOT NULL
) ON [PRIMARY] ) ON [PRIMARY]
GO GO

4
phpBB/install/schemas/mysql_40_schema.sql
View file

@ -94,7 +94,7 @@ CREATE TABLE phpbb_acl_users (
CREATE TABLE phpbb_oauth_tokens ( CREATE TABLE phpbb_oauth_tokens (
user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
session_id binary(32) DEFAULT '' NOT NULL, session_id binary(32) DEFAULT '' NOT NULL,
provider varbinary(255) NOT NULL, provider varbinary(255) DEFAULT '' NOT NULL,
oauth_token blob NOT NULL, oauth_token blob NOT NULL,
KEY user_id (user_id), KEY user_id (user_id),
KEY provider (oauth_provider) KEY provider (oauth_provider)
@ -104,7 +104,7 @@ CREATE TABLE phpbb_oauth_tokens (
# Table: 'phpbb_oauth_accounts' # Table: 'phpbb_oauth_accounts'
CREATE TABLE phpbb_oauth_accounts ( CREATE TABLE phpbb_oauth_accounts (
user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
provider varbinary(255) NOT NULL, provider varbinary(255) DEFAULT '' NOT NULL,
oauth_provider_id blob NOT NULL, oauth_provider_id blob NOT NULL,
PRIMARY KEY (user_id, provider) PRIMARY KEY (user_id, provider)
); );

4
phpBB/install/schemas/mysql_41_schema.sql
View file

@ -94,7 +94,7 @@ CREATE TABLE phpbb_acl_users (
CREATE TABLE phpbb_oauth_tokens ( CREATE TABLE phpbb_oauth_tokens (
user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
session_id char(32) DEFAULT '' NOT NULL, session_id char(32) DEFAULT '' NOT NULL,
provider varchar(255) NOT NULL, provider varchar(255) DEFAULT '' NOT NULL,
oauth_token text NOT NULL, oauth_token text NOT NULL,
KEY user_id (user_id), KEY user_id (user_id),
KEY provider (oauth_provider) KEY provider (oauth_provider)
@ -104,7 +104,7 @@ CREATE TABLE phpbb_oauth_tokens (
# Table: 'phpbb_oauth_accounts' # Table: 'phpbb_oauth_accounts'
CREATE TABLE phpbb_oauth_accounts ( CREATE TABLE phpbb_oauth_accounts (
user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
provider varchar(255) NOT NULL, provider varchar(255) DEFAULT '' NOT NULL,
oauth_provider_id text NOT NULL, oauth_provider_id text NOT NULL,
PRIMARY KEY (user_id, provider) PRIMARY KEY (user_id, provider)
) CHARACTER SET `utf8` COLLATE `utf8_bin`; ) CHARACTER SET `utf8` COLLATE `utf8_bin`;

8
phpBB/install/schemas/oracle_schema.sql
View file

@ -216,8 +216,8 @@ CREATE INDEX phpbb_acl_users_auth_role_id ON phpbb_acl_users (auth_role_id)
CREATE TABLE phpbb_oauth_tokens ( CREATE TABLE phpbb_oauth_tokens (
user_id number(8) DEFAULT '0' NOT NULL, user_id number(8) DEFAULT '0' NOT NULL,
session_id char(32) DEFAULT '' , session_id char(32) DEFAULT '' ,
provider varchar2(255) NOT NULL, provider varchar2(255) DEFAULT '' ,
oauth_token clob NOT NULL oauth_token clob DEFAULT ''
) )
/ /
@ -231,8 +231,8 @@ CREATE INDEX phpbb_oauth_tokens_provider ON phpbb_oauth_tokens (oauth_provider)
*/ */
CREATE TABLE phpbb_oauth_accounts ( CREATE TABLE phpbb_oauth_accounts (
user_id number(8) DEFAULT '0' NOT NULL, user_id number(8) DEFAULT '0' NOT NULL,
provider varchar2(255) NOT NULL, provider varchar2(255) DEFAULT '' ,
oauth_provider_id clob NOT NULL, oauth_provider_id clob DEFAULT '' ,
CONSTRAINT pk_phpbb_oauth_accounts PRIMARY KEY (user_id, provider) CONSTRAINT pk_phpbb_oauth_accounts PRIMARY KEY (user_id, provider)
) )
/ /

8
phpBB/install/schemas/postgres_schema.sql
View file

@ -194,8 +194,8 @@ CREATE INDEX phpbb_acl_users_auth_role_id ON phpbb_acl_users (auth_role_id);
CREATE TABLE phpbb_oauth_tokens ( CREATE TABLE phpbb_oauth_tokens (
user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
session_id char(32) DEFAULT '' NOT NULL, session_id char(32) DEFAULT '' NOT NULL,
provider varchar(255) NOT NULL, provider varchar(255) DEFAULT '' NOT NULL,
oauth_token varchar(4000) NOT NULL oauth_token varchar(4000) DEFAULT '' NOT NULL
); );
CREATE INDEX phpbb_oauth_tokens_user_id ON phpbb_oauth_tokens (user_id); CREATE INDEX phpbb_oauth_tokens_user_id ON phpbb_oauth_tokens (user_id);
@ -206,8 +206,8 @@ CREATE INDEX phpbb_oauth_tokens_provider ON phpbb_oauth_tokens (oauth_provider);
*/ */
CREATE TABLE phpbb_oauth_accounts ( CREATE TABLE phpbb_oauth_accounts (
user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
provider varchar(255) NOT NULL, provider varchar(255) DEFAULT '' NOT NULL,
oauth_provider_id varchar(4000) NOT NULL, oauth_provider_id varchar(4000) DEFAULT '' NOT NULL,
PRIMARY KEY (user_id, provider) PRIMARY KEY (user_id, provider)
); );

8
phpBB/install/schemas/sqlite_schema.sql
View file

@ -93,8 +93,8 @@ CREATE INDEX phpbb_acl_users_auth_role_id ON phpbb_acl_users (auth_role_id);
CREATE TABLE phpbb_oauth_tokens ( CREATE TABLE phpbb_oauth_tokens (
user_id INTEGER UNSIGNED NOT NULL DEFAULT '0', user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
session_id char(32) NOT NULL DEFAULT '', session_id char(32) NOT NULL DEFAULT '',
provider varchar(255) NOT NULL , provider varchar(255) NOT NULL DEFAULT '',
oauth_token text(65535) NOT NULL oauth_token text(65535) NOT NULL DEFAULT ''
); );
CREATE INDEX phpbb_oauth_tokens_user_id ON phpbb_oauth_tokens (user_id); CREATE INDEX phpbb_oauth_tokens_user_id ON phpbb_oauth_tokens (user_id);
@ -103,8 +103,8 @@ CREATE INDEX phpbb_oauth_tokens_provider ON phpbb_oauth_tokens (oauth_provider);
# Table: 'phpbb_oauth_accounts' # Table: 'phpbb_oauth_accounts'
CREATE TABLE phpbb_oauth_accounts ( CREATE TABLE phpbb_oauth_accounts (
user_id INTEGER UNSIGNED NOT NULL DEFAULT '0', user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
provider varchar(255) NOT NULL , provider varchar(255) NOT NULL DEFAULT '',
oauth_provider_id text(65535) NOT NULL , oauth_provider_id text(65535) NOT NULL DEFAULT '',
PRIMARY KEY (user_id, provider) PRIMARY KEY (user_id, provider)
); );

10
phpBB/phpbb/db/migration/data/310/auth_provider_oauth.php
View file

@ -22,23 +22,23 @@ class phpbb_db_migration_data_310_auth_provider_oauth extends phpbb_db_migration
'COLUMNS' => array( 'COLUMNS' => array(
'user_id' => array('UINT', 0), // phpbb_users.user_id 'user_id' => array('UINT', 0), // phpbb_users.user_id
'session_id' => array('CHAR:32', ''), // phpbb_sessions.session_id used only when user_id not set 'session_id' => array('CHAR:32', ''), // phpbb_sessions.session_id used only when user_id not set
'oauth_provider' => array('VCHAR'), // Name of the OAuth provider 'provider' => array('VCHAR', ''), // Name of the OAuth provider
'oauth_token' => array('TEXT_UNI'), // Serialized token 'oauth_token' => array('TEXT_UNI'), // Serialized token
), ),
'KEYS' => array( 'KEYS' => array(
'user_id' => array('INDEX', 'user_id'), 'user_id' => array('INDEX', 'user_id'),
'oauth_provider' => array('INDEX', 'oauth_provider'), 'provider' => array('INDEX', 'oauth_provider'),
), ),
), ),
$this->table_prefix . 'oauth_accounts' => array( $this->table_prefix . 'oauth_accounts' => array(
'COLUMNS' => array( 'COLUMNS' => array(
'user_id' => array('UINT', 0), 'user_id' => array('UINT', 0),
'oauth_provider' => array('VCHAR'), 'provider' => array('VCHAR', ''),
'oauth_provider_id' => array('TEXT_UNI'), 'oauth_provider_id' => array('TEXT_UNI', ''),
), ),
'PRIMARY_KEY' => array( 'PRIMARY_KEY' => array(
'user_id', 'user_id',
'oauth_provider', 'provider',
), ),
), ),
), ),