[feature/oauth] Fix SQL error found in install

PHPBB3-11673
This commit is contained in:
Joseph Warner 2013-07-23 22:26:22 -04:00
parent dc050e7ece
commit da6a8787f8
9 changed files with 9 additions and 9 deletions

View file

@ -932,7 +932,7 @@ function get_schema_struct()
), ),
'KEYS' => array( 'KEYS' => array(
'user_id' => array('INDEX', 'user_id'), 'user_id' => array('INDEX', 'user_id'),
'provider' => array('INDEX', 'oauth_provider'), 'provider' => array('INDEX', 'provider'),
), ),
); );

View file

@ -137,7 +137,7 @@ CREATE TABLE phpbb_oauth_tokens (
);; );;
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);;
CREATE INDEX phpbb_oauth_tokens_provider ON phpbb_oauth_tokens(oauth_provider);; CREATE INDEX phpbb_oauth_tokens_provider ON phpbb_oauth_tokens(provider);;
# Table: 'phpbb_oauth_accounts' # Table: 'phpbb_oauth_accounts'
CREATE TABLE phpbb_oauth_accounts ( CREATE TABLE phpbb_oauth_accounts (

View file

@ -180,7 +180,7 @@ GO
CREATE INDEX [user_id] ON [phpbb_oauth_tokens]([user_id]) ON [PRIMARY] CREATE INDEX [user_id] ON [phpbb_oauth_tokens]([user_id]) ON [PRIMARY]
GO GO
CREATE INDEX [provider] ON [phpbb_oauth_tokens]([oauth_provider]) ON [PRIMARY] CREATE INDEX [provider] ON [phpbb_oauth_tokens]([provider]) ON [PRIMARY]
GO GO

View file

@ -97,7 +97,7 @@ CREATE TABLE phpbb_oauth_tokens (
provider varbinary(255) DEFAULT '' 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 (provider)
); );

View file

@ -97,7 +97,7 @@ CREATE TABLE phpbb_oauth_tokens (
provider varchar(255) DEFAULT '' 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 (provider)
) CHARACTER SET `utf8` COLLATE `utf8_bin`; ) CHARACTER SET `utf8` COLLATE `utf8_bin`;

View file

@ -223,7 +223,7 @@ CREATE TABLE phpbb_oauth_tokens (
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)
/ /
CREATE INDEX phpbb_oauth_tokens_provider ON phpbb_oauth_tokens (oauth_provider) CREATE INDEX phpbb_oauth_tokens_provider ON phpbb_oauth_tokens (provider)
/ /
/* /*

View file

@ -199,7 +199,7 @@ CREATE TABLE phpbb_oauth_tokens (
); );
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);
CREATE INDEX phpbb_oauth_tokens_provider ON phpbb_oauth_tokens (oauth_provider); CREATE INDEX phpbb_oauth_tokens_provider ON phpbb_oauth_tokens (provider);
/* /*
Table: 'phpbb_oauth_accounts' Table: 'phpbb_oauth_accounts'

View file

@ -98,7 +98,7 @@ CREATE TABLE phpbb_oauth_tokens (
); );
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);
CREATE INDEX phpbb_oauth_tokens_provider ON phpbb_oauth_tokens (oauth_provider); CREATE INDEX phpbb_oauth_tokens_provider ON phpbb_oauth_tokens (provider);
# Table: 'phpbb_oauth_accounts' # Table: 'phpbb_oauth_accounts'
CREATE TABLE phpbb_oauth_accounts ( CREATE TABLE phpbb_oauth_accounts (

View file

@ -27,7 +27,7 @@ class phpbb_db_migration_data_310_auth_provider_oauth extends phpbb_db_migration
), ),
'KEYS' => array( 'KEYS' => array(
'user_id' => array('INDEX', 'user_id'), 'user_id' => array('INDEX', 'user_id'),
'provider' => array('INDEX', 'oauth_provider'), 'provider' => array('INDEX', 'provider'),
), ),
), ),
$this->table_prefix . 'oauth_accounts' => array( $this->table_prefix . 'oauth_accounts' => array(