mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge pull request #2474 from PayBas/ticket/12561

Browse Source 
[ticket/12561] Add "after" check to schema_generator for columns_add

* PayBas/ticket/12561:
  [ticket/12561] Reworked tests by nickvergessen
  [ticket/12561] Added tests for "after last", "after missing" and "empty"
  [ticket/12561] Add check to see if "after" column actually exists
  [ticket/12561] Added test for "after"
  [ticket/12561] Add "after" check to schema_generator for columns_add
This commit is contained in:
Joas Schilling
2014-05-28 23:33:25 +02:00
parent 1b2238a6b1 9f37d414be
commit 033df350d9
9 changed files with 264 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
phpBB/phpbb/db/migration/schema_generator.php
View File

@@ -109,7 +109,25 @@ class schema_generator
{
foreach ($add_columns as $column => $column_data)
{
$this->tables[$table]['COLUMNS'][$column] = $column_data;
if (isset($column_data['after']))
{
$columns = $this->tables[$table]['COLUMNS'];
$offset = array_search($column_data['after'], array_keys($columns));
unset($column_data['after']);
if ($offset === false)
{
$this->tables[$table]['COLUMNS'][$column] = array_values($column_data);
}
else
{
$this->tables[$table]['COLUMNS'] = array_merge(array_slice($columns, 0, $offset + 1, true), array($column => array_values($column_data)), array_slice($columns, $offset));
}
}
else
{
$this->tables[$table]['COLUMNS'][$column] = $column_data;
}
}
}
}