[Pkg-owncloud-commits] [owncloud] 29/153: Remove unnecessary and incorrect comments.
David Prévot
taffit at moszumanska.debian.org
Tue May 27 03:05:31 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit a585cec5303a7b3d361559f73bba154fcbe0c978
Author: Andreas Fischer <bantu at owncloud.com>
Date: Mon Mar 31 19:27:18 2014 +0200
Remove unnecessary and incorrect comments.
---
core/command/db/converttype.php | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/core/command/db/converttype.php b/core/command/db/converttype.php
index b445378..387f873 100644
--- a/core/command/db/converttype.php
+++ b/core/command/db/converttype.php
@@ -94,13 +94,9 @@ class ConvertType extends Command {
'mssql' => 'pdo_sqlsrv',
);
protected function execute(InputInterface $input, OutputInterface $output) {
- // connect 'from' database
$fromDB = \OC_DB::getConnection();
-
- // connect 'to' database
$toDB = $this->getToDBConnection($input, $output);
- // Clearing schema in new database
if ($input->getOption('clear-schema')) {
$schemaManager = $toDB->getSchemaManager();
$toTables = $schemaManager->listTableNames();
@@ -112,7 +108,6 @@ class ConvertType extends Command {
}
}
- // create tables in new database
$output->writeln('Creating schema in new database');
$schemaManager = new \OC\DB\MDB2SchemaManager($toDB);
$schemaManager->createDbFromStructure(\OC::$SERVERROOT.'/db_structure.xml');
@@ -123,10 +118,9 @@ class ConvertType extends Command {
}
}
- // get tables from 'to' database
$toTables = $this->getTables($toDB);
- // get tables from 'from' database
$fromTables = $this->getTables($fromDB);
+
// warn/fail if there are more tables in 'from' database
$tables = array_diff($fromTables, $toTables);
if (!empty($tables)) {
@@ -140,7 +134,6 @@ class ConvertType extends Command {
return;
}
}
- // enable maintenance mode to prevent changes
$tables = array_intersect($toTables, $fromTables);
$this->convertDB($fromDB, $toDB, $tables, $input, $output);
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list