mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
[ticket/8944] Add index length to CREATE INDEX for MySQL4 in database_update
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:
parent
ebb4a50d9b
commit
bb191a1d69
1 changed files with 18 additions and 2 deletions
|
@ -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;
|
||||
|
|
Loading…
Add table
Reference in a new issue