diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-11-08 20:33:18 -0800 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-11-08 20:33:18 -0800 |
| commit | 3b68540ceed54342dec4400495e91c797e19c44e (patch) | |
| tree | 048636a3079fcb1ce096e4b777398041bfde3699 /phpBB/phpbb/db/migration/data | |
| parent | 082a467cc8813b63bde604a3e08485d01c228acb (diff) | |
| parent | 6f33954757a05044c8700a70051ae25e3a5cc627 (diff) | |
| download | forums-3b68540ceed54342dec4400495e91c797e19c44e.tar forums-3b68540ceed54342dec4400495e91c797e19c44e.tar.gz forums-3b68540ceed54342dec4400495e91c797e19c44e.tar.bz2 forums-3b68540ceed54342dec4400495e91c797e19c44e.tar.xz forums-3b68540ceed54342dec4400495e91c797e19c44e.zip | |
Merge pull request #1857 from nickvergessen/ticket/11922
[ticket/11922] Drop all keys before trying to delete columns to avoid issues
Diffstat (limited to 'phpBB/phpbb/db/migration/data')
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v310/softdelete_p2.php | 6 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v310/style_update_p2.php | 16 |
2 files changed, 21 insertions, 1 deletions
diff --git a/phpBB/phpbb/db/migration/data/v310/softdelete_p2.php b/phpBB/phpbb/db/migration/data/v310/softdelete_p2.php index 0c32e474f4..38b190c766 100644 --- a/phpBB/phpbb/db/migration/data/v310/softdelete_p2.php +++ b/phpBB/phpbb/db/migration/data/v310/softdelete_p2.php @@ -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'), ), ), ); diff --git a/phpBB/phpbb/db/migration/data/v310/style_update_p2.php b/phpBB/phpbb/db/migration/data/v310/style_update_p2.php index c5b45d9dc9..40d6a4dbbd 100644 --- a/phpBB/phpbb/db/migration/data/v310/style_update_p2.php +++ b/phpBB/phpbb/db/migration/data/v310/style_update_p2.php @@ -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( |