makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 05:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1857 from nickvergessen/ticket/11922

Browse source 
[ticket/11922] Drop all keys before trying to delete columns to avoid issues
This commit is contained in:
Nathan Guse 2013-11-08 20:33:18 -08:00
commit 3b68540cee
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/phpbb/db/migration/data/v310/softdelete_p2.php
View file

@ -34,7 +34,10 @@ class softdelete_p2 extends \phpbb\db\migration\migration
),
'drop_keys' => array(
$this->table_prefix . 'posts' => array('post_approved'),
$this->table_prefix . 'topics' => array('forum_appr_last'),
$this->table_prefix . 'topics' => array(
'forum_appr_last',
'topic_approved',
),
),
);
}
@ -63,6 +66,7 @@ class softdelete_p2 extends \phpbb\db\migration\migration
),
$this->table_prefix . 'topics' => array(
'forum_appr_last' => array('forum_id', 'topic_approved', 'topic_last_post_id'),
'topic_approved' => array('topic_approved'),
),
),
);

16
phpBB/phpbb/db/migration/data/v310/style_update_p2.php
View file

@ -24,6 +24,14 @@ class style_update_p2 extends \phpbb\db\migration\migration
public function update_schema()
{
return array(
'drop_keys' => array(
$this->table_prefix . 'styles' => array(
'imageset_id',
'template_id',
'theme_id',
),
),
'drop_columns' => array(
$this->table_prefix . 'styles' => array(
'imageset_id',
@ -53,6 +61,14 @@ class style_update_p2 extends \phpbb\db\migration\migration
),
),
'add_index' => array(
$this->table_prefix . 'styles' => array(
'imageset_id' => array('imageset_id'),
'template_id' => array('template_id'),
'theme_id' => array('theme_id'),
),
),
'add_tables' => array(
$this->table_prefix . 'styles_imageset' => array(
'COLUMNS' => array(