From bb0c50717cd604ffeafacafe901a70c894ed29f3 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 30 Jun 2020 21:47:31 +0200
Subject: Bye bye database.xml
Signed-off-by: Joas Schilling <coding@schilljs.com>
---
core/Command/Db/ConvertType.php | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
(limited to 'core/Command/Db')
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);
}
}
}
--
cgit v1.2.3