From 36ffad5ba7e62783f3fb4073a6eedf1c0ca645b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 9 Dec 2020 10:10:51 +0100 Subject: [PATCH] Make sure the migrations table schema is always checked MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl Revert "Make sure the migrations table schema is always checked" This reverts commit 258955ef738a52d9da2ac2fe59466e6093d7e9bc. Set current vendor during upgrade and perform migrations table change if needed Signed-off-by: Julius Härtl --- lib/private/DB/MigrationService.php | 2 +- lib/private/Updater.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/private/DB/MigrationService.php b/lib/private/DB/MigrationService.php index 27e03318d6..c1a6b82dcc 100644 --- a/lib/private/DB/MigrationService.php +++ b/lib/private/DB/MigrationService.php @@ -125,7 +125,7 @@ class MigrationService { return false; } - if ($this->connection->tableExists('migrations')) { + if ($this->connection->tableExists('migrations') && \OC::$server->getConfig()->getAppValue('core', 'vendor', '') !== 'owncloud') { $this->migrationTableCreated = true; return false; } diff --git a/lib/private/Updater.php b/lib/private/Updater.php index 44f99c9e8c..998fb4f221 100644 --- a/lib/private/Updater.php +++ b/lib/private/Updater.php @@ -197,6 +197,7 @@ class Updater extends BasicEmitter { isset($allowedPreviousVersions['owncloud'][$majorMinor]) )) { $currentVendor = 'owncloud'; + $this->config->setAppValue('core', 'vendor', $currentVendor); } if ($currentVendor === 'nextcloud') {