makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-olympus' into develop

Browse source 
* develop-olympus:
  [ticket/10213] Update install schema with shorter index names.
This commit is contained in:
Andreas Fischer 2011-06-13 02:20:35 +02:00
commit 5c010250ee
8 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/develop/create_schema_files.php
View file

@ -643,7 +643,7 @@ foreach ($supported_dbms as $dbms)
if (strlen($table_name . $key_name) > 30) if (strlen($table_name . $key_name) > 30)
{ {
trigger_error("Index name '$key_name' on table '$table_name' is too long. The maximum is 30 characters.", E_USER_ERROR); trigger_error("Index name '${table_name}_$key_name' on table '$table_name' is too long. The maximum is 30 characters.", E_USER_ERROR);
} }
switch ($dbms) switch ($dbms)
@ -1236,9 +1236,9 @@ function get_schema_struct()
), ),
'PRIMARY_KEY' => 'attempt_id', 'PRIMARY_KEY' => 'attempt_id',
'KEYS' => array( 'KEYS' => array(
'attempt_ip' => array('INDEX', array('attempt_ip', 'attempt_time')), 'att_ip' => array('INDEX', array('attempt_ip', 'attempt_time')),
'attempt_forwarded_for' => array('INDEX', array('attempt_forwarded_for', 'attempt_time')), 'att_for' => array('INDEX', array('attempt_forwarded_for', 'attempt_time')),
'attempt_time' => array('INDEX', array('attempt_time')), 'att_time' => array('INDEX', array('attempt_time')),
'user_id' => array('INDEX', 'user_id'), 'user_id' => array('INDEX', 'user_id'),
), ),
); );

6
phpBB/install/schemas/firebird_schema.sql
View file

@ -561,9 +561,9 @@ CREATE TABLE phpbb_login_attempts (
ALTER TABLE phpbb_login_attempts ADD PRIMARY KEY (attempt_id);; 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_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);; CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts(user_id);;
CREATE GENERATOR phpbb_login_attempts_gen;; CREATE GENERATOR phpbb_login_attempts_gen;;

6
phpBB/install/schemas/mssql_schema.sql
View file

@ -675,13 +675,13 @@ ALTER TABLE [phpbb_login_attempts] WITH NOCHECK ADD
) ON [PRIMARY] ) ON [PRIMARY]
GO 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 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 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 GO
CREATE INDEX [user_id] ON [phpbb_login_attempts]([user_id]) ON [PRIMARY] CREATE INDEX [user_id] ON [phpbb_login_attempts]([user_id]) ON [PRIMARY]

6
phpBB/install/schemas/mysql_40_schema.sql
View file

@ -382,9 +382,9 @@ CREATE TABLE phpbb_login_attempts (
username blob NOT NULL, username blob NOT NULL,
username_clean blob NOT NULL, username_clean blob NOT NULL,
PRIMARY KEY (attempt_id), PRIMARY KEY (attempt_id),
KEY attempt_ip (attempt_ip, attempt_time), KEY att_ip (attempt_ip, attempt_time),
KEY attempt_forwarded_for (attempt_forwarded_for, attempt_time), KEY att_for (attempt_forwarded_for, attempt_time),
KEY attempt_time (attempt_time), KEY att_time (attempt_time),
KEY user_id (user_id) KEY user_id (user_id)
); );

6
phpBB/install/schemas/mysql_41_schema.sql
View file

@ -382,9 +382,9 @@ CREATE TABLE phpbb_login_attempts (
username varchar(255) DEFAULT '0' NOT NULL, username varchar(255) DEFAULT '0' NOT NULL,
username_clean varchar(255) DEFAULT '0' NOT NULL, username_clean varchar(255) DEFAULT '0' NOT NULL,
PRIMARY KEY (attempt_id), PRIMARY KEY (attempt_id),
KEY attempt_ip (attempt_ip, attempt_time), KEY att_ip (attempt_ip, attempt_time),
KEY attempt_forwarded_for (attempt_forwarded_for, attempt_time), KEY att_for (attempt_forwarded_for, attempt_time),
KEY attempt_time (attempt_time), KEY att_time (attempt_time),
KEY user_id (user_id) KEY user_id (user_id)
) CHARACTER SET `utf8` COLLATE `utf8_bin`; ) CHARACTER SET `utf8` COLLATE `utf8_bin`;

6
phpBB/install/schemas/oracle_schema.sql
View file

@ -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) CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts (user_id)
/ /

6
phpBB/install/schemas/postgres_schema.sql
View file

@ -543,9 +543,9 @@ CREATE TABLE phpbb_login_attempts (
PRIMARY KEY (attempt_id) PRIMARY KEY (attempt_id)
); );
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); CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts (user_id);
/* /*

6
phpBB/install/schemas/sqlite_schema.sql
View file

@ -371,9 +371,9 @@ CREATE TABLE phpbb_login_attempts (
username_clean varchar(255) NOT NULL DEFAULT '0' 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_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); CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts (user_id);
# Table: 'phpbb_moderator_cache' # Table: 'phpbb_moderator_cache'