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

Type hinting.

This commit is contained in:
Andreas Fischer 2014-03-31 21:07:48 +02:00
parent b39a74ff6c
commit 01141e1520
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,10 @@
namespace OC\Core\Command\Db; namespace OC\Core\Command\Db;
use OC\Config;
use OC\DB\Connection;
use OC\DB\ConnectionFactory;
use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
@ -30,7 +34,7 @@ class ConvertType extends Command {
* @param \OC\Config $config * @param \OC\Config $config
* @param \OC\DB\ConnectionFactory $connectionFactory * @param \OC\DB\ConnectionFactory $connectionFactory
*/ */
public function __construct($config, $connectionFactory) { public function __construct(Config $config, ConnectionFactory $connectionFactory) {
$this->config = $config; $this->config = $config;
$this->connectionFactory = $connectionFactory; $this->connectionFactory = $connectionFactory;
parent::__construct(); parent::__construct();
@ -139,7 +143,7 @@ class ConvertType extends Command {
$this->convertDB($fromDB, $toDB, $tables, $input, $output); $this->convertDB($fromDB, $toDB, $tables, $input, $output);
} }
private function getToDBConnection($input, $output) { private function getToDBConnection(InputInterface $input, OutputInterface $output) {
$type = $input->getArgument('type'); $type = $input->getArgument('type');
$connectionParams = array( $connectionParams = array(
'host' => $input->getArgument('hostname'), 'host' => $input->getArgument('hostname'),
@ -154,12 +158,12 @@ class ConvertType extends Command {
return $this->connectionFactory->getConnection($type, $connectionParams); return $this->connectionFactory->getConnection($type, $connectionParams);
} }
private function getTables($db) { private function getTables(Connection $db) {
$schemaManager = $db->getSchemaManager(); $schemaManager = $db->getSchemaManager();
return $schemaManager->listTableNames(); return $schemaManager->listTableNames();
} }
private function copyTable($fromDB, $toDB, $table, $output) { private function copyTable(Connection $fromDB, Connection $toDB, $table, OutputInterface $output) {
$progress = $this->getHelperSet()->get('progress'); $progress = $this->getHelperSet()->get('progress');
$query = 'SELECT COUNT(*) FROM '.$table; $query = 'SELECT COUNT(*) FROM '.$table;
$count = $fromDB->fetchColumn($query); $count = $fromDB->fetchColumn($query);
@ -178,7 +182,7 @@ class ConvertType extends Command {
$progress->finish(); $progress->finish();
} }
private function convertDB($fromDB, $toDB, $tables, $input, $output) { private function convertDB(Connection $fromDB, Connection $toDB, array $tables, InputInterface $input, OutputInterface $output) {
$this->config->setValue('maintenance', true); $this->config->setValue('maintenance', true);
$type = $input->getArgument('type'); $type = $input->getArgument('type');
try { try {
@ -209,7 +213,7 @@ class ConvertType extends Command {
$this->config->setValue('maintenance', false); $this->config->setValue('maintenance', false);
} }
private function saveDBInfo($input) { private function saveDBInfo(InputInterface $input) {
$type = $input->getArgument('type'); $type = $input->getArgument('type');
$username = $input->getArgument('username'); $username = $input->getArgument('username');
$dbhost = $input->getArgument('hostname'); $dbhost = $input->getArgument('hostname');