summaryrefslogtreecommitdiffstats
path: root/core/Command
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2020-06-30 21:47:31 +0200
committerMorris Jobke <hey@morrisjobke.de>2021-03-24 20:04:12 +0100
commitbb0c50717cd604ffeafacafe901a70c894ed29f3 (patch)
tree76263e3e6108b3e67541a68d1782c42b100f506f /core/Command
parent6e40c2fb52976e268821ae365c52dbb5253430a9 (diff)
downloadnextcloud-server-bb0c50717cd604ffeafacafe901a70c894ed29f3.tar.gz
nextcloud-server-bb0c50717cd604ffeafacafe901a70c894ed29f3.zip
Bye bye database.xml
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'core/Command')
-rw-r--r--core/Command/Db/ConvertType.php18
1 files changed, 7 insertions, 11 deletions
diff --git a/core/Command/Db/ConvertType.php b/core/Command/Db/ConvertType.php
index d826b6a6c50..907cfc7d331 100644
--- a/core/Command/Db/ConvertType.php
+++ b/core/Command/Db/ConvertType.php
@@ -247,17 +247,13 @@ class ConvertType extends Command implements CompletionAwareInterface {
$apps = $input->getOption('all-apps') ? \OC_App::getAllApps() : \OC_App::getEnabledApps();
foreach ($apps as $app) {
$output->writeln('<info> - '.$app.'</info>');
- if (file_exists(\OC_App::getAppPath($app).'/appinfo/database.xml')) {
- $schemaManager->createDbFromStructure(\OC_App::getAppPath($app).'/appinfo/database.xml');
- } else {
- // Make sure autoloading works...
- \OC_App::loadApp($app);
- $fromMS = new MigrationService($app, $fromDB);
- $currentMigration = $fromMS->getMigration('current');
- if ($currentMigration !== '0') {
- $toMS = new MigrationService($app, $toDB);
- $toMS->migrate($currentMigration, true);
- }
+ // Make sure autoloading works...
+ \OC_App::loadApp($app);
+ $fromMS = new MigrationService($app, $fromDB);
+ $currentMigration = $fromMS->getMigration('current');
+ if ($currentMigration !== '0') {
+ $toMS = new MigrationService($app, $toDB);
+ $toMS->migrate($currentMigration, true);
}
}
}