From 2eb371dcaf83cbd3799ef6998b2e3643dd8885ad Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 30 May 2020 16:36:09 +0000 Subject: [PATCH 1/2] Fix foreign key constraint with "post-tag" table --- src/Worker/MergeContact.php | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/src/Worker/MergeContact.php b/src/Worker/MergeContact.php index 85b27ef4ac..653930f2fa 100644 --- a/src/Worker/MergeContact.php +++ b/src/Worker/MergeContact.php @@ -26,31 +26,41 @@ use Friendica\Database\DBA; class MergeContact { - public static function execute($first, $dup_id, $uid) + /** + * Replace all occurences of the given contact id and replace it + * + * @param integer $search_cid + * @param integer $replace_cid + * @param integer $uid + */ + public static function execute(int $search_cid, int $replace_cid, int $uid) { - if (empty($first) || empty($dup_id) || ($first == $dup_id)) { + if (empty($search_cid) || empty($replace_cid) || ($search_cid == $replace_cid)) { // Invalid request return; } - Logger::info('Handling duplicate', ['search' => $dup_id, 'replace' => $first]); + Logger::info('Handling duplicate', ['search' => $replace_cid, 'replace' => $search_cid]); // Search and replace - DBA::update('item', ['contact-id' => $first], ['contact-id' => $dup_id]); - DBA::update('thread', ['contact-id' => $first], ['contact-id' => $dup_id]); - DBA::update('mail', ['contact-id' => $first], ['contact-id' => $dup_id]); - DBA::update('photo', ['contact-id' => $first], ['contact-id' => $dup_id]); - DBA::update('event', ['cid' => $first], ['cid' => $dup_id]); + DBA::update('item', ['contact-id' => $search_cid], ['contact-id' => $replace_cid]); + DBA::update('thread', ['contact-id' => $search_cid], ['contact-id' => $replace_cid]); + DBA::update('mail', ['contact-id' => $search_cid], ['contact-id' => $replace_cid]); + DBA::update('photo', ['contact-id' => $search_cid], ['contact-id' => $replace_cid]); + DBA::update('event', ['cid' => $search_cid], ['cid' => $replace_cid]); + + // These fields only contain public contact entries (uid = 0) if ($uid == 0) { - DBA::update('item', ['author-id' => $first], ['author-id' => $dup_id]); - DBA::update('item', ['owner-id' => $first], ['owner-id' => $dup_id]); - DBA::update('thread', ['author-id' => $first], ['author-id' => $dup_id]); - DBA::update('thread', ['owner-id' => $first], ['owner-id' => $dup_id]); + DBA::update('post-tag', ['cid' => $search_cid], ['cid' => $replace_cid]); + DBA::update('item', ['author-id' => $search_cid], ['author-id' => $replace_cid]); + DBA::update('item', ['owner-id' => $search_cid], ['owner-id' => $replace_cid]); + DBA::update('thread', ['author-id' => $search_cid], ['author-id' => $replace_cid]); + DBA::update('thread', ['owner-id' => $search_cid], ['owner-id' => $replace_cid]); } else { /// @todo Check if some other data needs to be adjusted as well, possibly the "rel" status? } // Remove the duplicate - DBA::delete('contact', ['id' => $dup_id]); + DBA::delete('contact', ['id' => $replace_cid]); } } From 46e2423af9fcd386217f0c9ac7c670bee3e1504f Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 30 May 2020 17:06:59 +0000 Subject: [PATCH 2/2] Fix wrong variable names --- src/Worker/MergeContact.php | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Worker/MergeContact.php b/src/Worker/MergeContact.php index 653930f2fa..6fdb0140bc 100644 --- a/src/Worker/MergeContact.php +++ b/src/Worker/MergeContact.php @@ -29,38 +29,38 @@ class MergeContact /** * Replace all occurences of the given contact id and replace it * - * @param integer $search_cid - * @param integer $replace_cid + * @param integer $new_cid + * @param integer $old_cid * @param integer $uid */ - public static function execute(int $search_cid, int $replace_cid, int $uid) + public static function execute(int $new_cid, int $old_cid, int $uid) { - if (empty($search_cid) || empty($replace_cid) || ($search_cid == $replace_cid)) { + if (empty($new_cid) || empty($old_cid) || ($new_cid == $old_cid)) { // Invalid request return; } - Logger::info('Handling duplicate', ['search' => $replace_cid, 'replace' => $search_cid]); + Logger::info('Handling duplicate', ['search' => $old_cid, 'replace' => $new_cid]); // Search and replace - DBA::update('item', ['contact-id' => $search_cid], ['contact-id' => $replace_cid]); - DBA::update('thread', ['contact-id' => $search_cid], ['contact-id' => $replace_cid]); - DBA::update('mail', ['contact-id' => $search_cid], ['contact-id' => $replace_cid]); - DBA::update('photo', ['contact-id' => $search_cid], ['contact-id' => $replace_cid]); - DBA::update('event', ['cid' => $search_cid], ['cid' => $replace_cid]); + DBA::update('item', ['contact-id' => $new_cid], ['contact-id' => $old_cid]); + DBA::update('thread', ['contact-id' => $new_cid], ['contact-id' => $old_cid]); + DBA::update('mail', ['contact-id' => $new_cid], ['contact-id' => $old_cid]); + DBA::update('photo', ['contact-id' => $new_cid], ['contact-id' => $old_cid]); + DBA::update('event', ['cid' => $new_cid], ['cid' => $old_cid]); // These fields only contain public contact entries (uid = 0) if ($uid == 0) { - DBA::update('post-tag', ['cid' => $search_cid], ['cid' => $replace_cid]); - DBA::update('item', ['author-id' => $search_cid], ['author-id' => $replace_cid]); - DBA::update('item', ['owner-id' => $search_cid], ['owner-id' => $replace_cid]); - DBA::update('thread', ['author-id' => $search_cid], ['author-id' => $replace_cid]); - DBA::update('thread', ['owner-id' => $search_cid], ['owner-id' => $replace_cid]); + DBA::update('post-tag', ['cid' => $new_cid], ['cid' => $old_cid]); + DBA::update('item', ['author-id' => $new_cid], ['author-id' => $old_cid]); + DBA::update('item', ['owner-id' => $new_cid], ['owner-id' => $old_cid]); + DBA::update('thread', ['author-id' => $new_cid], ['author-id' => $old_cid]); + DBA::update('thread', ['owner-id' => $new_cid], ['owner-id' => $old_cid]); } else { /// @todo Check if some other data needs to be adjusted as well, possibly the "rel" status? } // Remove the duplicate - DBA::delete('contact', ['id' => $replace_cid]); + DBA::delete('contact', ['id' => $old_cid]); } }