mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-10 18:54:08 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [task/git-tools] Change the GNU --lines argument to the POSIX -l
  [task/git-tools] Solve dependency on the GNU wc --max-line-length option
  [ticket/8944] Patch db_tools to support index length for MySQL4
  [ticket/9039] Make mssqlnative.php non-executable
  [ticket/8944] Add index length to CREATE INDEX for MySQL4 in database_update
  [ticket/9800] Update tracker URL in docs/README.html
This commit is contained in:
Igor Wiedler
2010-09-09 00:23:33 +02:00
parent ea4d204cf6 2e891c5eba
commit 2baa8c61d1
5 changed files with 41 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
phpBB/install/database_update.php
View File

@@ -880,7 +880,7 @@ function database_update_info()
'pm_id' => array('pm_id'),
),
POSTS_TABLE => array(
'post_username' => array('post_username'),
'post_username' => array('post_username:255'),
),
),
),
@@ -2141,7 +2141,7 @@ class updater_db_tools
* drop_columns: Removing/Dropping columns
* add_primary_keys: adding primary keys
* add_unique_index: adding an unique index
* add_index: adding an index
* add_index: adding an index (can be column:index_size if you need to provide size)
*
* The values are in this format:
* {TABLE NAME} => array(
@@ -3520,6 +3520,12 @@ class updater_db_tools
{
$statements = array();
// remove index length unless MySQL4
if ('mysql_40' != $this->sql_layer)
{
$column = preg_replace('#:.*$#', '', $column);
}
switch ($this->sql_layer)
{
case 'firebird':
@@ -3530,6 +3536,16 @@ class updater_db_tools
break;
case 'mysql_40':
// add index size to definition as required by MySQL4
foreach ($column as $i => $col)
{
if (false !== strpos($col, ':'))
{
list($col, $index_size) = explode(':', $col);
$column[$i] = "$col($index_size)";
}
}
// no break
case 'mysql_41':
$statements[] = 'CREATE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';
break;