Merge pull request #9801 from annando/protocol-worker

[friendica.git] / update.php

diff --git a/update.php b/update.php
index 285252770a36090e3930655a299db8f43b2507d0..d8a28173736e370706846ef7b02f3eca6eef0623 100644 (file)
--- a/update.php
+++ b/update.php
@@ -52,6 +52,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\Notify;
 use Friendica\Model\Photo;
+use Friendica\Model\Post;
 use Friendica\Model\User;
 use Friendica\Model\Storage;
 use Friendica\Util\DateTimeFormat;
@@ -336,7 +337,7 @@ function update_1309()
                        continue;
                }
 
-               $item = Item::selectFirst(['id', 'gravity'], ['uid' => $contact['uid'], 'guid' => $entry['guid']]);
+               $item = Post::selectFirst(['id', 'gravity'], ['uid' => $contact['uid'], 'guid' => $entry['guid']]);
                if (!DBA::isResult($item)) {
                        continue;
                }
@@ -831,6 +832,18 @@ function pre_update_1377()
                return Update::FAILED;
        }
 
+       if (DBStructure::existsTable('diaspora-interaction') && !DBA::e("DELETE FROM `diaspora-interaction` WHERE `uri-id` NOT IN (SELECT `id` FROM `item-uri`)")) {
+               return Update::FAILED;
+       }
+
+       if (DBStructure::existsTable('item-activity') && !DBA::e("DELETE FROM `item-activity` WHERE `uri-id` NOT IN (SELECT `id` FROM `item-uri`)")) {
+               return Update::FAILED;
+       }
+
+       if (DBStructure::existsTable('item-content') && !DBA::e("DELETE FROM `item-content` WHERE `uri-id` NOT IN (SELECT `id` FROM `item-uri`)")) {
+               return Update::FAILED;
+       }
+
        if (!DBA::e("DELETE FROM `notify` WHERE `uri-id` NOT IN (SELECT `id` FROM `item-uri`)")) {
                return Update::FAILED;
        }
@@ -838,7 +851,6 @@ function pre_update_1377()
        if (!DBA::e("UPDATE `notify` SET `parent-uri-id` = NULL WHERE `parent-uri-id` = 0")) {
                return Update::FAILED;
        }
-
        if (!DBA::e("DELETE FROM `notify` WHERE `parent-uri-id` NOT IN (SELECT `id` FROM `item-uri`)")) {
                return Update::FAILED;
        }