Merge pull request #9146 from tobiasd/2020.09-CHANGELOG

[friendica.git] / src / Database / PostUpdate.php

diff --git a/src/Database/PostUpdate.php b/src/Database/PostUpdate.php
index 6d8b197db145def8d7117cf3ed0b66d47edba589..a418a7948dd5c99d6ecbb74dcf3f1cc30573e58f 100644 (file)
--- a/src/Database/PostUpdate.php
+++ b/src/Database/PostUpdate.php
@@ -93,9 +93,6 @@ class PostUpdate
                if (!self::update1349()) {
                        return false;
                }
-               if (!self::update1350()) {
-                       return false;
-               }
 
                return true;
        }
@@ -459,6 +456,11 @@ class PostUpdate
                        return true;
                }
 
+               if (!DBStructure::existsTable('item-delivery-data')) {
+                       DI::config()->set('system', 'post_update_version', 1297);
+                       return true;
+               }
+
                $max_item_delivery_data = DBA::selectFirst('item-delivery-data', ['iid'], ['queue_count > 0 OR queue_done > 0'], ['order' => ['iid']]);
                $max_iid = $max_item_delivery_data['iid'];
 
@@ -703,6 +705,11 @@ class PostUpdate
                        return true;
                }
 
+               if (!DBStructure::existsTable('item-delivery-data')) {
+                       DI::config()->set('system', 'post_update_version', 1345);
+                       return true;
+               }
+
                $id = DI::config()->get('system', 'post_update_version_1345_id', 0);
 
                Logger::info('Start', ['item' => $id]);
@@ -997,57 +1004,4 @@ class PostUpdate
 
                return false;
        }
-
-       /**
-        * update the "gsid" (global server id) field in the gcontact table
-        *
-        * @return bool "true" when the job is done
-        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-        * @throws \ImagickException
-        */
-       private static function update1350()
-       {
-               // Was the script completed?
-               if (DI::config()->get("system", "post_update_version") >= 1350) {
-                       return true;
-               }
-
-               $id = DI::config()->get("system", "post_update_version_1350_id", 0);
-
-               Logger::info('Start', ['gcontact' => $id]);
-
-               $start_id = $id;
-               $rows = 0;
-               $condition = ["`id` > ? AND `gsid` IS NULL AND `server_url` != '' AND NOT `server_url` IS NULL", $id];
-               $params = ['order' => ['id'], 'limit' => 10000];
-               $gcontacts = DBA::select('gcontact', ['id', 'server_url'], $condition, $params);
-
-               if (DBA::errorNo() != 0) {
-                       Logger::error('Database error', ['no' => DBA::errorNo(), 'message' => DBA::errorMessage()]);
-                       return false;
-               }
-
-               while ($gcontact = DBA::fetch($gcontacts)) {
-                       $id = $gcontact['id'];
-
-                       DBA::update('gcontact',
-                               ['gsid' => GServer::getID($gcontact['server_url'], true), 'server_url' => GServer::cleanURL($gcontact['server_url'])],
-                               ['id' => $gcontact['id']]);
-
-                       ++$rows;
-               }
-               DBA::close($gcontacts);
-
-               DI::config()->set("system", "post_update_version_1350_id", $id);
-
-               Logger::info('Processed', ['rows' => $rows, 'last' => $id]);
-
-               if ($start_id == $id) {
-                       DI::config()->set("system", "post_update_version", 1350);
-                       Logger::info('Done');
-                       return true;
-               }
-
-               return false;
-       }
 }