aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorJoseph Warner <hardolaf@hardolaf.com>2013-07-23 22:26:22 -0400
committerJoseph Warner <hardolaf@hardolaf.com>2013-07-23 22:26:34 -0400
commitda6a8787f8443ea02f405a913aa5d0721034f819 (patch)
treef825081ff35ff6ea270f1aafe487cb2605f8f669 /phpBB
parentdc050e7ece74979b093d5249e4283e3959172b43 (diff)
downloadforums-da6a8787f8443ea02f405a913aa5d0721034f819.tar
forums-da6a8787f8443ea02f405a913aa5d0721034f819.tar.gz
forums-da6a8787f8443ea02f405a913aa5d0721034f819.tar.bz2
forums-da6a8787f8443ea02f405a913aa5d0721034f819.tar.xz
forums-da6a8787f8443ea02f405a913aa5d0721034f819.zip
[feature/oauth] Fix SQL error found in install
PHPBB3-11673
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/develop/create_schema_files.php2
-rw-r--r--phpBB/install/schemas/firebird_schema.sql2
-rw-r--r--phpBB/install/schemas/mssql_schema.sql2
-rw-r--r--phpBB/install/schemas/mysql_40_schema.sql2
-rw-r--r--phpBB/install/schemas/mysql_41_schema.sql2
-rw-r--r--phpBB/install/schemas/oracle_schema.sql2
-rw-r--r--phpBB/install/schemas/postgres_schema.sql2
-rw-r--r--phpBB/install/schemas/sqlite_schema.sql2
-rw-r--r--phpBB/phpbb/db/migration/data/310/auth_provider_oauth.php2
9 files changed, 9 insertions, 9 deletions
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 6f88b28140..a722a88ff3 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -932,7 +932,7 @@ function get_schema_struct()
),
'KEYS' => array(
'user_id' => array('INDEX', 'user_id'),
- 'provider' => array('INDEX', 'oauth_provider'),
+ 'provider' => array('INDEX', 'provider'),
),
);
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 55ddd00d7d..ce9be26e68 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -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_provider ON phpbb_oauth_tokens(oauth_provider);;
+CREATE INDEX phpbb_oauth_tokens_provider ON phpbb_oauth_tokens(provider);;
# Table: 'phpbb_oauth_accounts'
CREATE TABLE phpbb_oauth_accounts (
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index b2fe8d1710..94cfa98784 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -180,7 +180,7 @@ GO
CREATE INDEX [user_id] ON [phpbb_oauth_tokens]([user_id]) ON [PRIMARY]
GO
-CREATE INDEX [provider] ON [phpbb_oauth_tokens]([oauth_provider]) ON [PRIMARY]
+CREATE INDEX [provider] ON [phpbb_oauth_tokens]([provider]) ON [PRIMARY]
GO
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 9eb2e10e96..fe09756b1e 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -97,7 +97,7 @@ CREATE TABLE phpbb_oauth_tokens (
provider varbinary(255) DEFAULT '' NOT NULL,
oauth_token blob NOT NULL,
KEY user_id (user_id),
- KEY provider (oauth_provider)
+ KEY provider (provider)
);
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index a4237acb8a..a385010f43 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -97,7 +97,7 @@ CREATE TABLE phpbb_oauth_tokens (
provider varchar(255) DEFAULT '' NOT NULL,
oauth_token text NOT NULL,
KEY user_id (user_id),
- KEY provider (oauth_provider)
+ KEY provider (provider)
) CHARACTER SET `utf8` COLLATE `utf8_bin`;
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 6a6d691190..f32980e378 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -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_provider ON phpbb_oauth_tokens (oauth_provider)
+CREATE INDEX phpbb_oauth_tokens_provider ON phpbb_oauth_tokens (provider)
/
/*
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 135cd23fb8..f64f4981d5 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -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_provider ON phpbb_oauth_tokens (oauth_provider);
+CREATE INDEX phpbb_oauth_tokens_provider ON phpbb_oauth_tokens (provider);
/*
Table: 'phpbb_oauth_accounts'
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 625e19eb98..54f3a132ef 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -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_provider ON phpbb_oauth_tokens (oauth_provider);
+CREATE INDEX phpbb_oauth_tokens_provider ON phpbb_oauth_tokens (provider);
# Table: 'phpbb_oauth_accounts'
CREATE TABLE phpbb_oauth_accounts (
diff --git a/phpBB/phpbb/db/migration/data/310/auth_provider_oauth.php b/phpBB/phpbb/db/migration/data/310/auth_provider_oauth.php
index 0d8e8858bb..febd399c98 100644
--- a/phpBB/phpbb/db/migration/data/310/auth_provider_oauth.php
+++ b/phpBB/phpbb/db/migration/data/310/auth_provider_oauth.php
@@ -27,7 +27,7 @@ class phpbb_db_migration_data_310_auth_provider_oauth extends phpbb_db_migration
),
'KEYS' => array(
'user_id' => array('INDEX', 'user_id'),
- 'provider' => array('INDEX', 'oauth_provider'),
+ 'provider' => array('INDEX', 'provider'),
),
),
$this->table_prefix . 'oauth_accounts' => array(
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-27 02:40:08 +0000