diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-10-11 14:15:46 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-10-11 14:15:46 +0200 |
| commit | cab660f9097e7753bf9bc80c1cd1a0004adc421c (patch) | |
| tree | eab8767acec379d7d69ab9623ecc8f7c4e6a8d30 /phpBB/install/schemas/mysql_41_schema.sql | |
| parent | a30f1729d8cb36d9d52167c08a139c99c63c4fdf (diff) | |
| parent | 2198c29c205ba3a98e66746b9527c50c50f7c1e2 (diff) | |
| download | forums-cab660f9097e7753bf9bc80c1cd1a0004adc421c.tar forums-cab660f9097e7753bf9bc80c1cd1a0004adc421c.tar.gz forums-cab660f9097e7753bf9bc80c1cd1a0004adc421c.tar.bz2 forums-cab660f9097e7753bf9bc80c1cd1a0004adc421c.tar.xz forums-cab660f9097e7753bf9bc80c1cd1a0004adc421c.zip | |
Merge remote-tracking branch 'phpbb/develop' into ticket/11621
* phpbb/develop:
[ticket/11867] Schema files are not created by create_schema_files.php
[ticket/11905] 3.1.0-a1 Migration
[ticket/11903] Speed up paging test
[ticket/11703] Extend the correct migration class.
[ticket/11874] Correct when $phpbb_root_path is appended to build_url()
[ticket/11703] Also use empty() for T_JQUERY_LINK.
[ticket/11703] Add effectively_installed().
[ticket/11703] Make jQuery CDN switch more generic.
[ticket/11874] Fix tests
[ticket/11874] Do not always prepend the web path; only replace phpbb_root_path
[ticket/11345] Don't include scheme, so HTTPS is used where necessary.
[ticket/11345] Wrap remote webfonts in S_ALLOW_CDN.
[ticket/11345] Move css import to template
[ticket/11345] Add Droid Sans as fallback font
[ticket/11345] Change font for buttons
Diffstat (limited to 'phpBB/install/schemas/mysql_41_schema.sql')
| -rw-r--r-- | phpBB/install/schemas/mysql_41_schema.sql | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql index d3ed1ee15e..870fbd05e4 100644 --- a/phpBB/install/schemas/mysql_41_schema.sql +++ b/phpBB/install/schemas/mysql_41_schema.sql @@ -90,26 +90,6 @@ CREATE TABLE phpbb_acl_users ( ) CHARACTER SET `utf8` COLLATE `utf8_bin`; -# Table: 'phpbb_oauth_tokens' -CREATE TABLE phpbb_oauth_tokens ( - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - session_id char(32) DEFAULT '' NOT NULL, - provider varchar(255) DEFAULT '' NOT NULL, - oauth_token mediumtext NOT NULL, - KEY user_id (user_id), - KEY provider (provider) -) CHARACTER SET `utf8` COLLATE `utf8_bin`; - - -# Table: 'phpbb_oauth_accounts' -CREATE TABLE phpbb_oauth_accounts ( - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - provider varchar(255) DEFAULT '' NOT NULL, - oauth_provider_id text NOT NULL, - PRIMARY KEY (user_id, provider) -) CHARACTER SET `utf8` COLLATE `utf8_bin`; - - # Table: 'phpbb_banlist' CREATE TABLE phpbb_banlist ( ban_id mediumint(8) UNSIGNED NOT NULL auto_increment, @@ -499,6 +479,26 @@ CREATE TABLE phpbb_notifications ( ) CHARACTER SET `utf8` COLLATE `utf8_bin`; +# Table: 'phpbb_oauth_accounts' +CREATE TABLE phpbb_oauth_accounts ( + user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + provider varchar(255) DEFAULT '' NOT NULL, + oauth_provider_id text NOT NULL, + PRIMARY KEY (user_id, provider) +) CHARACTER SET `utf8` COLLATE `utf8_bin`; + + +# Table: 'phpbb_oauth_tokens' +CREATE TABLE phpbb_oauth_tokens ( + user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + session_id char(32) DEFAULT '' NOT NULL, + provider varchar(255) DEFAULT '' NOT NULL, + oauth_token mediumtext NOT NULL, + KEY user_id (user_id), + KEY provider (provider) +) CHARACTER SET `utf8` COLLATE `utf8_bin`; + + # Table: 'phpbb_poll_options' CREATE TABLE phpbb_poll_options ( poll_option_id tinyint(4) DEFAULT '0' NOT NULL, |