mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Better variable names for table arrays.

This commit is contained in:
Andreas Fischer 2014-04-11 21:46:02 +02:00
parent 731571491f
commit 94522586c1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/command/db/converttype.php
View File

@ -129,10 +129,10 @@ class ConvertType extends Command {
$fromTables = $this->getTables($fromDB); $fromTables = $this->getTables($fromDB);
// warn/fail if there are more tables in 'from' database // warn/fail if there are more tables in 'from' database
$tables = array_diff($fromTables, $toTables); $extraFromTables = array_diff($fromTables, $toTables);
if (!empty($tables)) { if (!empty($extraFromTables)) {
$output->writeln('<comment>The following tables will not be converted:</comment>'); $output->writeln('<comment>The following tables will not be converted:</comment>');
$output->writeln($tables); $output->writeln($extraFromTables);
if (!$input->getOption('all-apps')) { if (!$input->getOption('all-apps')) {
$output->writeln('<comment>Please note that tables belonging to available but currently not installed apps</comment>'); $output->writeln('<comment>Please note that tables belonging to available but currently not installed apps</comment>');
$output->writeln('<comment>can be included by specifying the --all-apps option.</comment>'); $output->writeln('<comment>can be included by specifying the --all-apps option.</comment>');
@ -147,8 +147,8 @@ class ConvertType extends Command {
return; return;
} }
} }
$tables = array_intersect($toTables, $fromTables); $intersectingTables = array_intersect($toTables, $fromTables);
$this->convertDB($fromDB, $toDB, $tables, $input, $output); $this->convertDB($fromDB, $toDB, $intersectingTables, $input, $output);
} }
protected function createSchema(Connection $toDB, InputInterface $input, OutputInterface $output) { protected function createSchema(Connection $toDB, InputInterface $input, OutputInterface $output) {