Most user-item traces removed

[friendica.git] / update.php

diff --git a/update.php b/update.php
index 3e9292f2e43a85412afb0726ccb1be3ae0129d42..05064d8e04072d482200db2f68bcaffae72bebc1 100644 (file)
--- a/update.php
+++ b/update.php
@@ -466,7 +466,7 @@ function pre_update_1364()
                return Update::FAILED;
        }
 
-       if (!DBA::e("DELETE FROM `user-item` WHERE NOT `uid` IN (SELECT `uid` FROM `user`)")) {
+       if (DBStructure::existsTable('user-item') && !DBA::e("DELETE FROM `user-item` WHERE NOT `uid` IN (SELECT `uid` FROM `user`)")) {
                return Update::FAILED;
        }
 
@@ -518,7 +518,7 @@ function pre_update_1364()
                return Update::FAILED;
        }
 
-       if (!DBA::e("DELETE FROM `user-item` WHERE NOT `iid` IN (SELECT `id` FROM `item`)")) {
+       if (DBStructure::existsTable('user-item') && !DBA::e("DELETE FROM `user-item` WHERE NOT `iid` IN (SELECT `id` FROM `item`)")) {
                return Update::FAILED;
        }
 
@@ -686,7 +686,7 @@ function update_1395()
                return Update::FAILED;
        }
 
-       if (!DBA::e("INSERT INTO `post-user`(`uri-id`, `uid`, `hidden`, `notification-type`)
+       if (DBStructure::existsTable('user-item') && !DBA::e("INSERT INTO `post-user`(`uri-id`, `uid`, `hidden`, `notification-type`)
                SELECT `uri-id`, `user-item`.`uid`, `hidden`,`notification-type` FROM `user-item`
                        INNER JOIN `item` ON `item`.`id` = `user-item`.`iid`
                ON DUPLICATE KEY UPDATE `hidden` = `user-item`.`hidden`, `notification-type` = `user-item`.`notification-type`")) {
@@ -713,4 +713,19 @@ function update_1396()
                return Update::FAILED;
        }
        return Update::SUCCESS;
-}
\ No newline at end of file
+}
+
+function update_1397()
+{
+       if (!DBStructure::existsTable('thread') || !DBStructure::existsTable('user-item')) {
+               return Update::SUCCESS;
+       }
+
+       if (!DBA::e("INSERT IGNORE INTO `post-thread-user`(`uri-id`, `uid`, `pinned`, `starred`, `ignored`, `wall`, `pubmail`, `forum_mode`)
+               SELECT `thread`.`uri-id`, `thread`.`uid`, `user-item`.`pinned`, `thread`.`starred`,
+                       `thread`.`ignored`, `thread`.`wall`, `thread`.`pubmail`, `thread`.`forum_mode`
+               FROM `thread` LEFT JOIN `user-item` ON `user-item`.`iid` = `thread`.`iid`")) {
+               return Update::FAILED;
+       }
+       return Update::SUCCESS;
+}