diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-06-13 02:15:35 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-06-13 02:15:35 +0200 |
| commit | 7cc45ee0d5606ddd9143a8a80b6974d027916a89 (patch) | |
| tree | 4fedc3e0f417f78cedc39a621e6e71023658cc03 /phpBB/develop | |
| parent | 25bd58d2f9755c9c434c6163af1368004fabb2c9 (diff) | |
| parent | 47edadfc9e1b4788975910ad474cc2b806024ce3 (diff) | |
| download | forums-7cc45ee0d5606ddd9143a8a80b6974d027916a89.tar forums-7cc45ee0d5606ddd9143a8a80b6974d027916a89.tar.gz forums-7cc45ee0d5606ddd9143a8a80b6974d027916a89.tar.bz2 forums-7cc45ee0d5606ddd9143a8a80b6974d027916a89.tar.xz forums-7cc45ee0d5606ddd9143a8a80b6974d027916a89.zip | |
Merge remote-tracking branch 'naderman/ticket/10213' into develop-olympus
* naderman/ticket/10213:
[ticket/10213] Update install schema with shorter index names.
Diffstat (limited to 'phpBB/develop')
| -rw-r--r-- | phpBB/develop/create_schema_files.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index c153f3e1e8..f4d89e5562 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -643,7 +643,7 @@ foreach ($supported_dbms as $dbms) 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) @@ -1234,9 +1234,9 @@ function get_schema_struct() ), 'PRIMARY_KEY' => 'attempt_id', 'KEYS' => array( - 'attempt_ip' => array('INDEX', array('attempt_ip', 'attempt_time')), - 'attempt_forwarded_for' => array('INDEX', array('attempt_forwarded_for', 'attempt_time')), - 'attempt_time' => array('INDEX', array('attempt_time')), + 'att_ip' => array('INDEX', array('attempt_ip', 'attempt_time')), + 'att_for' => array('INDEX', array('attempt_forwarded_for', 'attempt_time')), + 'att_time' => array('INDEX', array('attempt_time')), 'user_id' => array('INDEX', 'user_id'), ), ); |