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/develop/create_schema_files.php | |
| 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/develop/create_schema_files.php')
| -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 bc7ef30962..c0803f0f5c 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) @@ -1236,9 +1236,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'), ), ); |