aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install/schemas/sqlite_schema.sql
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2013-10-11 14:15:46 +0200
committerAndreas Fischer <bantu@phpbb.com>2013-10-11 14:15:46 +0200
commitcab660f9097e7753bf9bc80c1cd1a0004adc421c (patch)
treeeab8767acec379d7d69ab9623ecc8f7c4e6a8d30 /phpBB/install/schemas/sqlite_schema.sql
parenta30f1729d8cb36d9d52167c08a139c99c63c4fdf (diff)
parent2198c29c205ba3a98e66746b9527c50c50f7c1e2 (diff)
downloadforums-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/sqlite_schema.sql')
-rw-r--r--phpBB/install/schemas/sqlite_schema.sql40
1 files changed, 20 insertions, 20 deletions
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index de88900f06..079d48bc65 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -89,26 +89,6 @@ CREATE INDEX phpbb_acl_users_user_id ON phpbb_acl_users (user_id);
CREATE INDEX phpbb_acl_users_auth_option_id ON phpbb_acl_users (auth_option_id);
CREATE INDEX phpbb_acl_users_auth_role_id ON phpbb_acl_users (auth_role_id);
-# Table: 'phpbb_oauth_tokens'
-CREATE TABLE phpbb_oauth_tokens (
- user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
- session_id char(32) NOT NULL DEFAULT '',
- provider varchar(255) NOT NULL DEFAULT '',
- oauth_token mediumtext(16777215) NOT NULL DEFAULT ''
-);
-
-CREATE INDEX phpbb_oauth_tokens_user_id ON phpbb_oauth_tokens (user_id);
-CREATE INDEX phpbb_oauth_tokens_provider ON phpbb_oauth_tokens (provider);
-
-# Table: 'phpbb_oauth_accounts'
-CREATE TABLE phpbb_oauth_accounts (
- user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
- provider varchar(255) NOT NULL DEFAULT '',
- oauth_provider_id text(65535) NOT NULL DEFAULT '',
- PRIMARY KEY (user_id, provider)
-);
-
-
# Table: 'phpbb_banlist'
CREATE TABLE phpbb_banlist (
ban_id INTEGER PRIMARY KEY NOT NULL ,
@@ -484,6 +464,26 @@ CREATE TABLE phpbb_notifications (
CREATE INDEX phpbb_notifications_item_ident ON phpbb_notifications (notification_type_id, item_id);
CREATE INDEX phpbb_notifications_user ON phpbb_notifications (user_id, notification_read);
+# Table: 'phpbb_oauth_accounts'
+CREATE TABLE phpbb_oauth_accounts (
+ user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+ provider varchar(255) NOT NULL DEFAULT '',
+ oauth_provider_id text(65535) NOT NULL DEFAULT '',
+ PRIMARY KEY (user_id, provider)
+);
+
+
+# Table: 'phpbb_oauth_tokens'
+CREATE TABLE phpbb_oauth_tokens (
+ user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+ session_id char(32) NOT NULL DEFAULT '',
+ provider varchar(255) NOT NULL DEFAULT '',
+ oauth_token mediumtext(16777215) NOT NULL DEFAULT ''
+);
+
+CREATE INDEX phpbb_oauth_tokens_user_id ON phpbb_oauth_tokens (user_id);
+CREATE INDEX phpbb_oauth_tokens_provider ON phpbb_oauth_tokens (provider);
+
# Table: 'phpbb_poll_options'
CREATE TABLE phpbb_poll_options (
poll_option_id tinyint(4) NOT NULL DEFAULT '0',