mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-26 11:58:53 +00:00
[ticket/17524] Add possibility to use index key length in migrations
PHPBB-17524
This commit is contained in:
parent
2fce8aeb3e
commit
ba0282bf38
1 changed files with 36 additions and 15 deletions
|
@ -629,25 +629,16 @@ class doctrine implements tools_interface
|
||||||
foreach ($table_data['KEYS'] as $key_name => $key_data)
|
foreach ($table_data['KEYS'] as $key_name => $key_data)
|
||||||
{
|
{
|
||||||
$columns = (is_array($key_data[1])) ? $key_data[1] : [$key_data[1]];
|
$columns = (is_array($key_data[1])) ? $key_data[1] : [$key_data[1]];
|
||||||
|
$options = [];
|
||||||
// Supports key columns defined with there length
|
$this->schema_get_index_key_data($columns, $options);
|
||||||
$columns = array_map(function (string $column)
|
|
||||||
{
|
|
||||||
if (strpos($column, ':') !== false)
|
|
||||||
{
|
|
||||||
$parts = explode(':', $column, 2);
|
|
||||||
return $parts[0];
|
|
||||||
}
|
|
||||||
return $column;
|
|
||||||
}, $columns);
|
|
||||||
|
|
||||||
if ($key_data[0] === 'UNIQUE')
|
if ($key_data[0] === 'UNIQUE')
|
||||||
{
|
{
|
||||||
$table->addUniqueIndex($columns, $key_name);
|
$table->addUniqueIndex($columns, $key_name, $options);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$table->addIndex($columns, $key_name);
|
$table->addIndex($columns, $key_name, [], $options);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -830,7 +821,10 @@ class doctrine implements tools_interface
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$table->addIndex($columns, $index_name);
|
$options = [];
|
||||||
|
$this->schema_get_index_key_data($columns, $options);
|
||||||
|
|
||||||
|
$table->addIndex($columns, $index_name, [], $options);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -852,7 +846,10 @@ class doctrine implements tools_interface
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$table->addUniqueIndex($columns, $index_name);
|
$options = [];
|
||||||
|
$this->schema_get_index_key_data($columns, $options);
|
||||||
|
|
||||||
|
$table->addUniqueIndex($columns, $index_name, $options);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -891,6 +888,30 @@ class doctrine implements tools_interface
|
||||||
$table->setPrimaryKey($columns);
|
$table->setPrimaryKey($columns);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if index data contains key length
|
||||||
|
* and put it into $options['lengths'] array.
|
||||||
|
* Handles key length in formats of 'keyname:123' or 'keyname(123)'
|
||||||
|
*
|
||||||
|
* @param array $columns
|
||||||
|
* @param array $options
|
||||||
|
*/
|
||||||
|
protected function schema_get_index_key_data(array &$columns, array &$options): void
|
||||||
|
{
|
||||||
|
if (!empty($columns))
|
||||||
|
{
|
||||||
|
$columns = array_map(function (string $column) use (&$options)
|
||||||
|
{
|
||||||
|
if (preg_match('/^([a-zA-Z0-9_]+)(?:(?:\:|\()([0-9]{1,3})\)?)?$/', $column, $parts))
|
||||||
|
{
|
||||||
|
$options['lengths'][] = $parts[2] ?? null;
|
||||||
|
return $parts[1];
|
||||||
|
}
|
||||||
|
return $column;
|
||||||
|
}, $columns);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Recreate an index of a table
|
* Recreate an index of a table
|
||||||
*
|
*
|
||||||
|
|
Loading…
Add table
Reference in a new issue