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

[ticket/8944] Add index length to CREATE INDEX for MySQL4 in database_update

Browse source 
Fixes following SQL error when updating the database to 3.0.6.

BLOB column 'post_username' used in key specification without a key length

PHPBB3-8944
This commit is contained in:
Igor Wiedler 2010-09-02 19:38:34 +02:00
parent ebb4a50d9b
commit bb191a1d69
1 changed files with 18 additions and 2 deletions
Show stats 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'), 'pm_id' => array('pm_id'),
), ),
POSTS_TABLE => array( 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 * drop_columns: Removing/Dropping columns
* add_primary_keys: adding primary keys * add_primary_keys: adding primary keys
* add_unique_index: adding an unique index * 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: * The values are in this format:
* {TABLE NAME} => array( * {TABLE NAME} => array(
@ -3520,6 +3520,12 @@ class updater_db_tools
{ {
$statements = array(); $statements = array();
// remove index length unless MySQL4
if ('mysql_40' != $this->sql_layer)
{
$column = preg_replace('#:.*$#', '', $column);
}
switch ($this->sql_layer) switch ($this->sql_layer)
{ {
case 'firebird': case 'firebird':
@ -3530,6 +3536,16 @@ class updater_db_tools
break; break;
case 'mysql_40': 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': case 'mysql_41':
$statements[] = 'CREATE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')'; $statements[] = 'CREATE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';
break; break;