wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move (extended) input validation out into validateInput() method.

Browse source
This commit is contained in:
Andreas Fischer 2014-04-15 17:19:47 +02:00
parent 5fe25868bc
commit 6b2876c64d
1 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
core/command/db/converttype.php
View file

@ -108,7 +108,7 @@ class ConvertType extends Command {
;
}
protected function execute(InputInterface $input, OutputInterface $output) {
protected function validateInput(InputInterface $input, OutputInterface $output) {
$type = $input->getArgument('type');
if ($this->connectionFactory->normalizeType($type) === 'sqlite3') {
$output->writeln(sprintf(
@ -124,22 +124,29 @@ class ConvertType extends Command {
));
return 1;
}
if ($type === 'oci' && $input->getOption('clear-schema')) {
// Doctrine unconditionally tries (at least in version 2.3)
// to drop sequence triggers when dropping a table, even though
// such triggers may not exist. This results in errors like
// "ORA-04080: trigger 'OC_STORAGES_AI_PK' does not exist".
$output->writeln(sprintf(
'<error>The --clear-schema option is not supported when converting to Oracle (oci).</error>',
$type
));
return 1;
}
}
protected function execute(InputInterface $input, OutputInterface $output) {
$inputError = $this->validateInput($input, $output);
if ($inputError) {
return $inputError;
}
$fromDB = \OC_DB::getConnection();
$toDB = $this->getToDBConnection($input, $output);
if ($input->getOption('clear-schema')) {
if ($type === 'oci') {
// Doctrine unconditionally tries (at least in version 2.3)
// to drop sequence triggers when dropping a table, even though
// such triggers may not exist. This results in errors like
// "ORA-04080: trigger 'OC_STORAGES_AI_PK' does not exist".
$output->writeln(sprintf(
'<error>The --clear-schema option is not supported when converting to Oracle (oci).</error>',
$type
));
return 1;
}
$this->clearSchema($toDB->getSchemaManager(), $input, $output);
}