7 files changed, 170 insertions, 170 deletions
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 1e47008d73..6c6aca447d 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -128,27 +128,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 DEFAULT 0 NOT NULL,
-	session_id CHAR(32) CHARACTER SET NONE DEFAULT '' NOT NULL,
-	provider VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
-	oauth_token BLOB SUB_TYPE TEXT CHARACTER SET NONE DEFAULT '' NOT NULL
-);;
-
-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 DEFAULT 0 NOT NULL,
-	provider VARCHAR(255) CHARACTER SET NONE DEFAULT '' 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);;
-
-
 # Table: 'phpbb_banlist'
 CREATE TABLE phpbb_banlist (
 	ban_id INTEGER NOT NULL,
@@ -714,6 +693,27 @@ BEGIN
 END;;
 
 
+# Table: 'phpbb_oauth_accounts'
+CREATE TABLE phpbb_oauth_accounts (
+	user_id INTEGER DEFAULT 0 NOT NULL,
+	provider VARCHAR(255) CHARACTER SET NONE DEFAULT '' 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);;
+
+
+# Table: 'phpbb_oauth_tokens'
+CREATE TABLE phpbb_oauth_tokens (
+	user_id INTEGER DEFAULT 0 NOT NULL,
+	session_id CHAR(32) CHARACTER SET NONE DEFAULT '' NOT NULL,
+	provider VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
+	oauth_token BLOB SUB_TYPE TEXT CHARACTER SET NONE DEFAULT '' NOT NULL
+);;
+
+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 INTEGER DEFAULT 0 NOT NULL,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 922313236e..49804bdcc0 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -167,43 +167,6 @@ 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'
 */
 CREATE TABLE [phpbb_banlist] (
@@ -880,6 +843,43 @@ 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'
 */
 CREATE TABLE [phpbb_poll_options] (
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index e07a768387..e287e7dde1 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -90,26 +90,6 @@ CREATE TABLE phpbb_acl_users (
 );
 
 
-# Table: 'phpbb_oauth_tokens'
-CREATE TABLE phpbb_oauth_tokens (
-	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	session_id binary(32) DEFAULT '' NOT NULL,
-	provider varbinary(255) DEFAULT '' NOT NULL,
-	oauth_token mediumblob NOT NULL,
-	KEY user_id (user_id),
-	KEY provider (provider)
-);
-
-
-# Table: 'phpbb_oauth_accounts'
-CREATE TABLE phpbb_oauth_accounts (
-	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	provider varbinary(255) DEFAULT '' NOT NULL,
-	oauth_provider_id blob NOT NULL,
-	PRIMARY KEY (user_id, provider)
-);
-
-
 # Table: 'phpbb_banlist'
 CREATE TABLE phpbb_banlist (
 	ban_id mediumint(8) UNSIGNED NOT NULL auto_increment,
@@ -499,6 +479,26 @@ CREATE TABLE phpbb_notifications (
 );
 
 
+# Table: 'phpbb_oauth_accounts'
+CREATE TABLE phpbb_oauth_accounts (
+	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+	provider varbinary(255) DEFAULT '' NOT NULL,
+	oauth_provider_id blob NOT NULL,
+	PRIMARY KEY (user_id, provider)
+);
+
+
+# Table: 'phpbb_oauth_tokens'
+CREATE TABLE phpbb_oauth_tokens (
+	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+	session_id binary(32) DEFAULT '' NOT NULL,
+	provider varbinary(255) DEFAULT '' NOT NULL,
+	oauth_token mediumblob NOT NULL,
+	KEY user_id (user_id),
+	KEY provider (provider)
+);
+
+
 # Table: 'phpbb_poll_options'
 CREATE TABLE phpbb_poll_options (
 	poll_option_id tinyint(4) DEFAULT '0' NOT NULL,
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,
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index f32980e378..5354e5b1bb 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -211,34 +211,6 @@ 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 number(8) DEFAULT '0' NOT NULL,
-	session_id char(32) DEFAULT '' ,
-	provider varchar2(255) DEFAULT '' ,
-	oauth_token clob 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 number(8) DEFAULT '0' NOT NULL,
-	provider varchar2(255) DEFAULT '' ,
-	oauth_provider_id clob DEFAULT '' ,
-	CONSTRAINT pk_phpbb_oauth_accounts PRIMARY KEY (user_id, provider)
-)
-/
-
-
-/*
 	Table: 'phpbb_banlist'
 */
 CREATE TABLE phpbb_banlist (
@@ -964,6 +936,34 @@ END;
 
 
 /*
+	Table: 'phpbb_oauth_accounts'
+*/
+CREATE TABLE phpbb_oauth_accounts (
+	user_id number(8) DEFAULT '0' NOT NULL,
+	provider varchar2(255) DEFAULT '' ,
+	oauth_provider_id clob DEFAULT '' ,
+	CONSTRAINT pk_phpbb_oauth_accounts PRIMARY KEY (user_id, provider)
+)
+/
+
+
+/*
+	Table: 'phpbb_oauth_tokens'
+*/
+CREATE TABLE phpbb_oauth_tokens (
+	user_id number(8) DEFAULT '0' NOT NULL,
+	session_id char(32) DEFAULT '' ,
+	provider varchar2(255) DEFAULT '' ,
+	oauth_token clob 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 (
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 14435898eb..7773602c16 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -189,30 +189,6 @@ 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 INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
-	session_id char(32) DEFAULT '' NOT NULL,
-	provider varchar(255) DEFAULT '' NOT NULL,
-	oauth_token TEXT DEFAULT '' NOT NULL
-);
-
-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 INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
-	provider varchar(255) DEFAULT '' NOT NULL,
-	oauth_provider_id varchar(4000) DEFAULT '' NOT NULL,
-	PRIMARY KEY (user_id, provider)
-);
-
-
-/*
 	Table: 'phpbb_banlist'
 */
 CREATE SEQUENCE phpbb_banlist_seq;
@@ -682,6 +658,30 @@ CREATE INDEX phpbb_notifications_item_ident ON phpbb_notifications (notification
 CREATE INDEX phpbb_notifications_user ON phpbb_notifications (user_id, notification_read);
 
 /*
+	Table: 'phpbb_oauth_accounts'
+*/
+CREATE TABLE phpbb_oauth_accounts (
+	user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
+	provider varchar(255) DEFAULT '' NOT NULL,
+	oauth_provider_id varchar(4000) DEFAULT '' NOT NULL,
+	PRIMARY KEY (user_id, provider)
+);
+
+
+/*
+	Table: 'phpbb_oauth_tokens'
+*/
+CREATE TABLE phpbb_oauth_tokens (
+	user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
+	session_id char(32) DEFAULT '' NOT NULL,
+	provider varchar(255) DEFAULT '' NOT NULL,
+	oauth_token TEXT DEFAULT '' NOT NULL
+);
+
+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 (
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',