diff options
| author | Joas Schilling <coding@schilljs.com> | 2017-06-02 13:22:25 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2017-07-05 13:01:19 +0200 |
| commit | 183b1dbde3b5586e3bae0073f6f9c40414e7c6a6 (patch) | |
| tree | 57cd4acb321775ecb75a74a2b5551eb7317bece0 /lib/private | |
| parent | 15eec7b83c6198a124c2720e8ecc988605428f54 (diff) | |
| download | nextcloud-server-183b1dbde3b5586e3bae0073f6f9c40414e7c6a6.tar.gz nextcloud-server-183b1dbde3b5586e3bae0073f6f9c40414e7c6a6.zip | |
Use migrations when there is no database.xml
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/Installer.php | 6 | ||||
| -rw-r--r-- | lib/private/legacy/app.php | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/lib/private/Installer.php b/lib/private/Installer.php index 35f51b19b07..87cb262c966 100644 --- a/lib/private/Installer.php +++ b/lib/private/Installer.php @@ -139,6 +139,9 @@ class Installer { } else { OC_DB::updateDbFromStructure($basedir.'/appinfo/database.xml'); } + } else { + $ms = new \OC\DB\MigrationService($info['id'], \OC::$server->getDatabaseConnection()); + $ms->migrate(); } \OC_App::registerAutoloading($appId, $basedir); @@ -540,6 +543,9 @@ class Installer { 0, $e ); } + } else { + $ms = new \OC\DB\MigrationService($app, \OC::$server->getDatabaseConnection()); + $ms->migrate(); } //run appinfo/install.php diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php index 631738c726b..3ca05d85c22 100644 --- a/lib/private/legacy/app.php +++ b/lib/private/legacy/app.php @@ -1045,11 +1045,11 @@ class OC_App { $appData = self::getAppInfo($appId); self::executeRepairSteps($appId, $appData['repair-steps']['pre-migration']); - if (isset($appData['use-migrations']) && $appData['use-migrations'] === 'true') { + if (file_exists($appPath . '/appinfo/database.xml')) { + OC_DB::updateDbFromStructure($appPath . '/appinfo/database.xml'); + } else { $ms = new MigrationService($appId, \OC::$server->getDatabaseConnection()); $ms->migrate(); - } else if (file_exists($appPath . '/appinfo/database.xml')) { - OC_DB::updateDbFromStructure($appPath . '/appinfo/database.xml'); } self::executeRepairSteps($appId, $appData['repair-steps']['post-migration']); |