From 6f4eee516b2f1c1607c9a7e2d100a08f611f8ea4 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Mon, 6 Jan 2020 22:46:22 +0100 Subject: [PATCH] optimize update script --- update.php | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/update.php b/update.php index 180cd96ecb..7d25c6ac0e 100644 --- a/update.php +++ b/update.php @@ -413,27 +413,20 @@ function update_1330() { $currStorage = Config::get('storage', 'class', ''); + // set the name of the storage instead of the classpath as config if (!empty($currStorage)) { - $storageName = array_key_first(\Friendica\Core\StorageManager::DEFAULT_BACKENDS, $currStorage); - if (!Config::set('storage', 'name', $storageName) || + /** @var Storage\IStorage $currStorage */ + if (!Config::set('storage', 'name', $currStorage::getName()) || !Config::delete('storage', 'class')) { return Update::FAILED; }; } - // Update photos - if (!DBA::update('photo', ['backend-class' => Storage\Filesystem::NAME], ['backend-class' => 'Friendica\Model\Storage\Filesystem']) || - !DBA::update('photo', ['backend-class' => Storage\Database::NAME], ['backend-class' => 'Friendica\Model\Storage\Database']) || - !DBA::update('photo', ['backend-class' => Storage\SystemResource::NAME], ['backend-class' => 'Friendica\Model\Storage\SystemResource'])) { + // Update attachments and photos + if (!DBA::p("UPDATE `photo` SET `photo`.`backend-class` = SUBSTR(`photo`.`backend-class`, 22) WHERE `photo`.`backend-class` LIKE 'Friendica\\Model\\Storage\\%'") || + !DBA::p("UPDATE `attach` SET `attach`.`backend-class` = SUBSTR(`attach`.`backend-class`, 22) WHERE `attach`.`backend-class` LIKE 'Friendica\\Model\\Storage\\%'")) { return Update::FAILED; }; - // update attachments - if (!DBA::update('attach', ['backend-class' => Storage\Filesystem::NAME], ['backend-class' => 'Friendica\Model\Storage\Filesystem']) || - !DBA::update('attach', ['backend-class' => Storage\Database::NAME], ['backend-class' => 'Friendica\Model\Storage\Database']) || - !DBA::update('attach', ['backend-class' => Storage\SystemResource::NAME], ['backend-class' => 'Friendica\Model\Storage\SystemResource'])) { - return Update::FAILED; - } - return Update::SUCCESS; }