diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-06-13 02:20:35 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-06-13 02:20:35 +0200 |
| commit | 5c010250ee18a8999e7b8e8139585d330138b1ed (patch) | |
| tree | e711f50d511c38b38f467eefd8cc1f9303a4fc3f /phpBB/install/schemas | |
| parent | ddea203492dce035677ca5125179c8c2907a2021 (diff) | |
| parent | 7cc45ee0d5606ddd9143a8a80b6974d027916a89 (diff) | |
| download | forums-5c010250ee18a8999e7b8e8139585d330138b1ed.tar forums-5c010250ee18a8999e7b8e8139585d330138b1ed.tar.gz forums-5c010250ee18a8999e7b8e8139585d330138b1ed.tar.bz2 forums-5c010250ee18a8999e7b8e8139585d330138b1ed.tar.xz forums-5c010250ee18a8999e7b8e8139585d330138b1ed.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10213] Update install schema with shorter index names.
Diffstat (limited to 'phpBB/install/schemas')
| -rw-r--r-- | phpBB/install/schemas/firebird_schema.sql | 6 | ||||
| -rw-r--r-- | phpBB/install/schemas/mssql_schema.sql | 6 | ||||
| -rw-r--r-- | phpBB/install/schemas/mysql_40_schema.sql | 6 | ||||
| -rw-r--r-- | phpBB/install/schemas/mysql_41_schema.sql | 6 | ||||
| -rw-r--r-- | phpBB/install/schemas/oracle_schema.sql | 6 | ||||
| -rw-r--r-- | phpBB/install/schemas/postgres_schema.sql | 6 | ||||
| -rw-r--r-- | phpBB/install/schemas/sqlite_schema.sql | 6 |
7 files changed, 21 insertions, 21 deletions
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql index 42feadd4bb..9e18ed3dc3 100644 --- a/phpBB/install/schemas/firebird_schema.sql +++ b/phpBB/install/schemas/firebird_schema.sql @@ -561,9 +561,9 @@ CREATE TABLE phpbb_login_attempts ( ALTER TABLE phpbb_login_attempts ADD PRIMARY KEY (attempt_id);; -CREATE INDEX phpbb_login_attempts_attempt_ip ON phpbb_login_attempts(attempt_ip, attempt_time);; -CREATE INDEX phpbb_login_attempts_attempt_forwarded_for ON phpbb_login_attempts(attempt_forwarded_for, attempt_time);; -CREATE INDEX phpbb_login_attempts_attempt_time ON phpbb_login_attempts(attempt_time);; +CREATE INDEX phpbb_login_attempts_att_ip ON phpbb_login_attempts(attempt_ip, attempt_time);; +CREATE INDEX phpbb_login_attempts_att_for ON phpbb_login_attempts(attempt_forwarded_for, attempt_time);; +CREATE INDEX phpbb_login_attempts_att_time ON phpbb_login_attempts(attempt_time);; CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts(user_id);; CREATE GENERATOR phpbb_login_attempts_gen;; diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql index bbbfc8fdc0..76ce740507 100644 --- a/phpBB/install/schemas/mssql_schema.sql +++ b/phpBB/install/schemas/mssql_schema.sql @@ -675,13 +675,13 @@ ALTER TABLE [phpbb_login_attempts] WITH NOCHECK ADD ) ON [PRIMARY] GO -CREATE INDEX [attempt_ip] ON [phpbb_login_attempts]([attempt_ip], [attempt_time]) ON [PRIMARY] +CREATE INDEX [att_ip] ON [phpbb_login_attempts]([attempt_ip], [attempt_time]) ON [PRIMARY] GO -CREATE INDEX [attempt_forwarded_for] ON [phpbb_login_attempts]([attempt_forwarded_for], [attempt_time]) ON [PRIMARY] +CREATE INDEX [att_for] ON [phpbb_login_attempts]([attempt_forwarded_for], [attempt_time]) ON [PRIMARY] GO -CREATE INDEX [attempt_time] ON [phpbb_login_attempts]([attempt_time]) ON [PRIMARY] +CREATE INDEX [att_time] ON [phpbb_login_attempts]([attempt_time]) ON [PRIMARY] GO CREATE INDEX [user_id] ON [phpbb_login_attempts]([user_id]) ON [PRIMARY] diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql index 14d7c620af..24fa69ac73 100644 --- a/phpBB/install/schemas/mysql_40_schema.sql +++ b/phpBB/install/schemas/mysql_40_schema.sql @@ -382,9 +382,9 @@ CREATE TABLE phpbb_login_attempts ( username blob NOT NULL, username_clean blob NOT NULL, PRIMARY KEY (attempt_id), - KEY attempt_ip (attempt_ip, attempt_time), - KEY attempt_forwarded_for (attempt_forwarded_for, attempt_time), - KEY attempt_time (attempt_time), + KEY att_ip (attempt_ip, attempt_time), + KEY att_for (attempt_forwarded_for, attempt_time), + KEY att_time (attempt_time), KEY user_id (user_id) ); diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql index 9a0ada8029..cf08bb61c6 100644 --- a/phpBB/install/schemas/mysql_41_schema.sql +++ b/phpBB/install/schemas/mysql_41_schema.sql @@ -382,9 +382,9 @@ CREATE TABLE phpbb_login_attempts ( username varchar(255) DEFAULT '0' NOT NULL, username_clean varchar(255) DEFAULT '0' NOT NULL, PRIMARY KEY (attempt_id), - KEY attempt_ip (attempt_ip, attempt_time), - KEY attempt_forwarded_for (attempt_forwarded_for, attempt_time), - KEY attempt_time (attempt_time), + KEY att_ip (attempt_ip, attempt_time), + KEY att_for (attempt_forwarded_for, attempt_time), + KEY att_time (attempt_time), KEY user_id (user_id) ) CHARACTER SET `utf8` COLLATE `utf8_bin`; diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql index 5e142d01d6..84d59a956d 100644 --- a/phpBB/install/schemas/oracle_schema.sql +++ b/phpBB/install/schemas/oracle_schema.sql @@ -759,11 +759,11 @@ CREATE TABLE phpbb_login_attempts ( ) / -CREATE INDEX phpbb_login_attempts_attempt_ip ON phpbb_login_attempts (attempt_ip, attempt_time) +CREATE INDEX phpbb_login_attempts_att_ip ON phpbb_login_attempts (attempt_ip, attempt_time) / -CREATE INDEX phpbb_login_attempts_attempt_forwarded_for ON phpbb_login_attempts (attempt_forwarded_for, attempt_time) +CREATE INDEX phpbb_login_attempts_att_for ON phpbb_login_attempts (attempt_forwarded_for, attempt_time) / -CREATE INDEX phpbb_login_attempts_attempt_time ON phpbb_login_attempts (attempt_time) +CREATE INDEX phpbb_login_attempts_att_time ON phpbb_login_attempts (attempt_time) / CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts (user_id) / diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql index 7fba805a6b..6fff09a5a2 100644 --- a/phpBB/install/schemas/postgres_schema.sql +++ b/phpBB/install/schemas/postgres_schema.sql @@ -543,9 +543,9 @@ CREATE TABLE phpbb_login_attempts ( PRIMARY KEY (attempt_id) ); -CREATE INDEX phpbb_login_attempts_attempt_ip ON phpbb_login_attempts (attempt_ip, attempt_time); -CREATE INDEX phpbb_login_attempts_attempt_forwarded_for ON phpbb_login_attempts (attempt_forwarded_for, attempt_time); -CREATE INDEX phpbb_login_attempts_attempt_time ON phpbb_login_attempts (attempt_time); +CREATE INDEX phpbb_login_attempts_att_ip ON phpbb_login_attempts (attempt_ip, attempt_time); +CREATE INDEX phpbb_login_attempts_att_for ON phpbb_login_attempts (attempt_forwarded_for, attempt_time); +CREATE INDEX phpbb_login_attempts_att_time ON phpbb_login_attempts (attempt_time); CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts (user_id); /* diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql index 4614ad6b06..38333503e1 100644 --- a/phpBB/install/schemas/sqlite_schema.sql +++ b/phpBB/install/schemas/sqlite_schema.sql @@ -371,9 +371,9 @@ CREATE TABLE phpbb_login_attempts ( username_clean varchar(255) NOT NULL DEFAULT '0' ); -CREATE INDEX phpbb_login_attempts_attempt_ip ON phpbb_login_attempts (attempt_ip, attempt_time); -CREATE INDEX phpbb_login_attempts_attempt_forwarded_for ON phpbb_login_attempts (attempt_forwarded_for, attempt_time); -CREATE INDEX phpbb_login_attempts_attempt_time ON phpbb_login_attempts (attempt_time); +CREATE INDEX phpbb_login_attempts_att_ip ON phpbb_login_attempts (attempt_ip, attempt_time); +CREATE INDEX phpbb_login_attempts_att_for ON phpbb_login_attempts (attempt_forwarded_for, attempt_time); +CREATE INDEX phpbb_login_attempts_att_time ON phpbb_login_attempts (attempt_time); CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts (user_id); # Table: 'phpbb_moderator_cache' |