From 68b5a2b6b29ee87c47d0404b63ebe98aaefe8267 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Mon, 3 Feb 2014 18:09:34 -0600 Subject: [ticket/11716] Rename migration files and add note that it's converting a MOD PHPBB3-11716 --- .../db/migration/data/v310/soft_delete_convert.php | 126 -------------------- .../migration/data/v310/soft_delete_convert2.php | 60 ---------- .../data/v310/soft_delete_mod_convert.php | 128 +++++++++++++++++++++ .../data/v310/soft_delete_mod_convert2.php | 62 ++++++++++ 4 files changed, 190 insertions(+), 186 deletions(-) delete mode 100644 phpBB/phpbb/db/migration/data/v310/soft_delete_convert.php delete mode 100644 phpBB/phpbb/db/migration/data/v310/soft_delete_convert2.php create mode 100644 phpBB/phpbb/db/migration/data/v310/soft_delete_mod_convert.php create mode 100644 phpBB/phpbb/db/migration/data/v310/soft_delete_mod_convert2.php (limited to 'phpBB/phpbb/db/migration') diff --git a/phpBB/phpbb/db/migration/data/v310/soft_delete_convert.php b/phpBB/phpbb/db/migration/data/v310/soft_delete_convert.php deleted file mode 100644 index 5edcfed052..0000000000 --- a/phpBB/phpbb/db/migration/data/v310/soft_delete_convert.php +++ /dev/null @@ -1,126 +0,0 @@ -db_tools->sql_column_exists($this->table_prefix . 'posts', 'post_deleted'); - } - - public function update_data() - { - return array( - array('permission.remove', array('m_harddelete', true)), - array('permission.remove', array('m_harddelete', false)), - - array('custom', array(array($this, 'convert_posts'))), - array('custom', array(array($this, 'convert_topics'))), - ); - } - - public function convert_posts($start) - { - $content_visibility = $this->get_content_visibility(); - - $limit = 250; - $i = 0; - - $sql = 'SELECT p.*, t.topic_first_post_id, t.topic_last_post_id - FROM ' . $this->table_prefix . 'posts p, ' . $this->table_prefix . 'topics t - WHERE p.post_deleted > 0 - AND t.topic_id = p.topic_id'; - $result = $this->db->sql_query_limit($sql, $limit, $start); - - while ($row = $this->db->sql_fetchrow($result)) - { - $content_visibility->set_post_visibility( - ITEM_DELETED, - $row['post_id'], - $row['topic_id'], - $row['forum_id'], - $row['post_deleted'], - $row['post_deleted_time'], - '', - ($row['post_id'] == $row['topic_first_post_id']) ? true : false, - ($row['post_id'] == $row['topic_last_post_id']) ? true : false - ); - - $i++; - } - - $this->db->sql_freeresult($result); - - if ($i == $limit) - { - return $start + $i; - } - } - - public function convert_topics($start) - { - $content_visibility = $this->get_content_visibility(); - - $limit = 100; - $i = 0; - - $sql = 'SELECT * - FROM ' . $this->table_prefix . 'topics - WHERE topic_deleted > 0'; - $result = $this->db->sql_query_limit($sql, $limit, $start); - - while ($row = $this->db->sql_fetchrow($result)) - { - $content_visibility->set_topic_visibility( - ITEM_DELETED, - $row['topic_id'], - $row['forum_id'], - $row['topic_deleted'], - $row['topic_deleted_time'], - '' - ); - - $i++; - } - - $this->db->sql_freeresult($result); - - if ($i == $limit) - { - return $start + $i; - } - } - - protected function get_content_visibility() - { - return new \phpbb\content_visibility( - new \phpbb\auth\auth(), - $this->db, - new \phpbb\user(), - $this->phpbb_root_path, - $this->php_ext, - $this->table_prefix . 'forums', - $this->table_prefix . 'posts', - $this->table_prefix . 'topics', - $this->table_prefix . 'users' - ); - } -} diff --git a/phpBB/phpbb/db/migration/data/v310/soft_delete_convert2.php b/phpBB/phpbb/db/migration/data/v310/soft_delete_convert2.php deleted file mode 100644 index 57327f2536..0000000000 --- a/phpBB/phpbb/db/migration/data/v310/soft_delete_convert2.php +++ /dev/null @@ -1,60 +0,0 @@ -db_tools->sql_column_exists($this->table_prefix . 'posts', 'post_deleted'); - } - - public function update_schema() - { - return array( - 'drop_columns' => array( - $this->table_prefix . 'forums' => array('forum_deleted_topic_count', 'forum_deleted_reply_count'), - $this->table_prefix . 'posts' => array('post_deleted', 'post_deleted_time'), - $this->table_prefix . 'topics' => array('topic_deleted', 'topic_deleted_time', 'topic_deleted_reply_count'), - ), - ); - } - - public function revert_schema() - { - return array( - 'add_columns' => array( - $this->table_prefix . 'forums' => array( - 'forum_deleted_topic_count' => array('UINT', 0), - 'forum_deleted_reply_count' => array('UINT', 0), - ), - $this->table_prefix . 'posts' => array( - 'post_deleted' => array('UINT', 0), - 'post_deleted_time' => array('TIMESTAMP', 0), - ), - $this->table_prefix . 'topics' => array( - 'topic_deleted' => array('UINT', 0), - 'topic_deleted_time' => array('TIMESTAMP', 0), - 'topic_deleted_reply_count' => array('UINT', 0), - ), - ), - ); - } -} diff --git a/phpBB/phpbb/db/migration/data/v310/soft_delete_mod_convert.php b/phpBB/phpbb/db/migration/data/v310/soft_delete_mod_convert.php new file mode 100644 index 0000000000..3aac8d84f5 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v310/soft_delete_mod_convert.php @@ -0,0 +1,128 @@ +db_tools->sql_column_exists($this->table_prefix . 'posts', 'post_deleted'); + } + + public function update_data() + { + return array( + array('permission.remove', array('m_harddelete', true)), + array('permission.remove', array('m_harddelete', false)), + + array('custom', array(array($this, 'convert_posts'))), + array('custom', array(array($this, 'convert_topics'))), + ); + } + + public function convert_posts($start) + { + $content_visibility = $this->get_content_visibility(); + + $limit = 250; + $i = 0; + + $sql = 'SELECT p.*, t.topic_first_post_id, t.topic_last_post_id + FROM ' . $this->table_prefix . 'posts p, ' . $this->table_prefix . 'topics t + WHERE p.post_deleted > 0 + AND t.topic_id = p.topic_id'; + $result = $this->db->sql_query_limit($sql, $limit, $start); + + while ($row = $this->db->sql_fetchrow($result)) + { + $content_visibility->set_post_visibility( + ITEM_DELETED, + $row['post_id'], + $row['topic_id'], + $row['forum_id'], + $row['post_deleted'], + $row['post_deleted_time'], + '', + ($row['post_id'] == $row['topic_first_post_id']) ? true : false, + ($row['post_id'] == $row['topic_last_post_id']) ? true : false + ); + + $i++; + } + + $this->db->sql_freeresult($result); + + if ($i == $limit) + { + return $start + $i; + } + } + + public function convert_topics($start) + { + $content_visibility = $this->get_content_visibility(); + + $limit = 100; + $i = 0; + + $sql = 'SELECT * + FROM ' . $this->table_prefix . 'topics + WHERE topic_deleted > 0'; + $result = $this->db->sql_query_limit($sql, $limit, $start); + + while ($row = $this->db->sql_fetchrow($result)) + { + $content_visibility->set_topic_visibility( + ITEM_DELETED, + $row['topic_id'], + $row['forum_id'], + $row['topic_deleted'], + $row['topic_deleted_time'], + '' + ); + + $i++; + } + + $this->db->sql_freeresult($result); + + if ($i == $limit) + { + return $start + $i; + } + } + + protected function get_content_visibility() + { + return new \phpbb\content_visibility( + new \phpbb\auth\auth(), + $this->db, + new \phpbb\user(), + $this->phpbb_root_path, + $this->php_ext, + $this->table_prefix . 'forums', + $this->table_prefix . 'posts', + $this->table_prefix . 'topics', + $this->table_prefix . 'users' + ); + } +} diff --git a/phpBB/phpbb/db/migration/data/v310/soft_delete_mod_convert2.php b/phpBB/phpbb/db/migration/data/v310/soft_delete_mod_convert2.php new file mode 100644 index 0000000000..cc8feb7525 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v310/soft_delete_mod_convert2.php @@ -0,0 +1,62 @@ +db_tools->sql_column_exists($this->table_prefix . 'posts', 'post_deleted'); + } + + public function update_schema() + { + return array( + 'drop_columns' => array( + $this->table_prefix . 'forums' => array('forum_deleted_topic_count', 'forum_deleted_reply_count'), + $this->table_prefix . 'posts' => array('post_deleted', 'post_deleted_time'), + $this->table_prefix . 'topics' => array('topic_deleted', 'topic_deleted_time', 'topic_deleted_reply_count'), + ), + ); + } + + public function revert_schema() + { + return array( + 'add_columns' => array( + $this->table_prefix . 'forums' => array( + 'forum_deleted_topic_count' => array('UINT', 0), + 'forum_deleted_reply_count' => array('UINT', 0), + ), + $this->table_prefix . 'posts' => array( + 'post_deleted' => array('UINT', 0), + 'post_deleted_time' => array('TIMESTAMP', 0), + ), + $this->table_prefix . 'topics' => array( + 'topic_deleted' => array('UINT', 0), + 'topic_deleted_time' => array('TIMESTAMP', 0), + 'topic_deleted_reply_count' => array('UINT', 0), + ), + ), + ); + } +} -- cgit v1.2.1