mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-09 11:38:52 +00:00
[ticket/17525] Fix migration failure on update
PHPBB-17525
This commit is contained in:
parent
5eaabb1c39
commit
10921ebc58
2 changed files with 36 additions and 27 deletions
|
@ -22,7 +22,12 @@ class rename_duplicated_index_names extends migration
|
||||||
/**
|
/**
|
||||||
* @var array
|
* @var array
|
||||||
*/
|
*/
|
||||||
protected $table_keys = [];
|
protected static $table_keys;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var array
|
||||||
|
*/
|
||||||
|
protected static $rename_index;
|
||||||
|
|
||||||
public static function depends_on()
|
public static function depends_on()
|
||||||
{
|
{
|
||||||
|
@ -33,14 +38,15 @@ class rename_duplicated_index_names extends migration
|
||||||
|
|
||||||
public function update_schema()
|
public function update_schema()
|
||||||
{
|
{
|
||||||
$rename_index = [];
|
if (!isset(self::$rename_index))
|
||||||
if (empty($this->table_keys))
|
{
|
||||||
|
if (!isset(self::$table_keys))
|
||||||
{
|
{
|
||||||
$this->get_tables_index_names();
|
$this->get_tables_index_names();
|
||||||
}
|
}
|
||||||
$short_table_names = table_helper::map_short_table_names(array_keys($this->table_keys), $this->table_prefix);
|
$short_table_names = table_helper::map_short_table_names(array_keys(self::$table_keys), $this->table_prefix);
|
||||||
|
|
||||||
foreach ($this->table_keys as $table_name => $key_names)
|
foreach (self::$table_keys as $table_name => $key_names)
|
||||||
{
|
{
|
||||||
$prefixless_table_name = doctrine_dbtools::remove_prefix($table_name, $this->table_prefix);
|
$prefixless_table_name = doctrine_dbtools::remove_prefix($table_name, $this->table_prefix);
|
||||||
foreach ($key_names as $key_name)
|
foreach ($key_names as $key_name)
|
||||||
|
@ -60,12 +66,13 @@ class rename_duplicated_index_names extends migration
|
||||||
}
|
}
|
||||||
$key_name_new = $short_table_names[$table_name] . '_' . $cleaned_key_name;
|
$key_name_new = $short_table_names[$table_name] . '_' . $cleaned_key_name;
|
||||||
|
|
||||||
$rename_index[$table_name][$key_name] = $key_name_new;
|
self::$rename_index[$table_name][$key_name] = $key_name_new;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return [
|
return [
|
||||||
'rename_index' => $rename_index,
|
'rename_index' => self::$rename_index,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -121,7 +128,7 @@ class rename_duplicated_index_names extends migration
|
||||||
|
|
||||||
if (!empty($indices))
|
if (!empty($indices))
|
||||||
{
|
{
|
||||||
$this->table_keys[$table_name] = $indices;
|
self::$table_keys[$table_name] = $indices;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -131,7 +138,7 @@ class rename_duplicated_index_names extends migration
|
||||||
{
|
{
|
||||||
if (isset($table_data['KEYS']))
|
if (isset($table_data['KEYS']))
|
||||||
{
|
{
|
||||||
$this->table_keys[$table_name] = array_keys($table_data['KEYS']);
|
self::$table_keys[$table_name] = array_keys($table_data['KEYS']);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -72,6 +72,8 @@ abstract class migration implements migration_interface
|
||||||
$this->php_ext = $php_ext;
|
$this->php_ext = $php_ext;
|
||||||
|
|
||||||
$this->errors = array();
|
$this->errors = array();
|
||||||
|
|
||||||
|
$this->db_tools->set_table_prefix($this->table_prefix);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Add table
Reference in a new issue