diff options
| author | Joas Schilling <coding@schilljs.com> | 2020-06-30 21:47:31 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2021-03-24 20:04:12 +0100 |
| commit | bb0c50717cd604ffeafacafe901a70c894ed29f3 (patch) | |
| tree | 76263e3e6108b3e67541a68d1782c42b100f506f /lib/private/legacy/OC_App.php | |
| parent | 6e40c2fb52976e268821ae365c52dbb5253430a9 (diff) | |
| download | nextcloud-server-bb0c50717cd604ffeafacafe901a70c894ed29f3.tar.gz nextcloud-server-bb0c50717cd604ffeafacafe901a70c894ed29f3.zip | |
Bye bye database.xml
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib/private/legacy/OC_App.php')
| -rw-r--r-- | lib/private/legacy/OC_App.php | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/private/legacy/OC_App.php b/lib/private/legacy/OC_App.php index aeaaf3bf1ea..65365c85e36 100644 --- a/lib/private/legacy/OC_App.php +++ b/lib/private/legacy/OC_App.php @@ -972,6 +972,11 @@ class OC_App { return false; } + if (is_file($appPath . '/appinfo/database.xml')) { + \OC::$server->getLogger()->error('The appinfo/database.xml file is not longer supported. Used in ' . $appId); + return false; + } + \OC::$server->getAppManager()->clearAppsCache(); $appData = self::getAppInfo($appId); @@ -987,12 +992,8 @@ class OC_App { self::registerAutoloading($appId, $appPath, true); self::executeRepairSteps($appId, $appData['repair-steps']['pre-migration']); - if (file_exists($appPath . '/appinfo/database.xml')) { - OC_DB::updateDbFromStructure($appPath . '/appinfo/database.xml'); - } else { - $ms = new MigrationService($appId, \OC::$server->get(\OC\DB\Connection::class)); - $ms->migrate(); - } + $ms = new MigrationService($appId, \OC::$server->get(\OC\DB\Connection::class)); + $ms->migrate(); self::executeRepairSteps($appId, $appData['repair-steps']['post-migration']); self::setupLiveMigrations($appId, $appData['repair-steps']['live-migration']); |