naming fixes while reviewing

core/command/db/converttype.php

@@ -282,17 +282,17 @@ class ConvertType extends Command {
 	protected function saveDBInfo(InputInterface $input) {
 		$type = $input->getArgument('type');
 		$username = $input->getArgument('username');
-		$dbhost = $input->getArgument('hostname');
-		$dbname = $input->getArgument('database');
+		$dbHost = $input->getArgument('hostname');
+		$dbName = $input->getArgument('database');
 		$password = $input->getOption('password');
 		if ($input->getOption('port')) {
-			$dbhost .= ':'.$input->getOption('port');
+			$dbHost .= ':'.$input->getOption('port');
 		}
 
 		$this->config->setSystemValues([
 			'dbtype'		=> $type,
-			'dbname'		=> $dbname,
-			'dbhost'		=> $dbhost,
+			'dbname'		=> $dbName,
+			'dbhost'		=> $dbHost,
 			'dbuser'		=> $username,
 			'dbpassword'	=> $password,
 		]);

lib/private/setup/abstractdatabase.php

@@ -35,22 +35,24 @@ abstract class AbstractDatabase {
 	}
 
 	public function initialize($config) {
-		$dbuser = $config['dbuser'];
-		$dbpass = $config['dbpass'];
-		$dbname = $config['dbname'];
-		$dbhost = !empty($config['dbhost']) ? $config['dbhost'] : 'localhost';
-		$dbtableprefix = isset($config['dbtableprefix']) ? $config['dbtableprefix'] : 'oc_';
+		$dbUser = $config['dbuser'];
+		$dbPass = $config['dbpass'];
+		$dbName = $config['dbname'];
+		$dbHost = !empty($config['dbhost']) ? $config['dbhost'] : 'localhost';
+		$dbTablePrefix = isset($config['dbtableprefix']) ? $config['dbtableprefix'] : 'oc_';
 
 		\OC_Config::setValues([
-			'dbname'		=> $dbname,
-			'dbhost'		=> $dbhost,
-			'dbtableprefix'	=> $dbtableprefix,
+			'dbname'		=> $dbName,
+			'dbhost'		=> $dbHost,
+			'dbtableprefix'	=> $dbTablePrefix,
 		]);
 
-		$this->dbuser = $dbuser;
-		$this->dbpassword = $dbpass;
-		$this->dbname = $dbname;
-		$this->dbhost = $dbhost;
-		$this->tableprefix = $dbtableprefix;
+		$this->dbuser = $dbUser;
+		$this->dbpassword = $dbPass;
+		$this->dbname = $dbName;
+		$this->dbhost = $dbHost;
+		$this->tableprefix = $dbTablePrefix;
 	}
+
+	abstract public function setupDatabase($userName);
 }

lib/private/setup/mssql.php

@@ -5,7 +5,7 @@ namespace OC\Setup;
 class MSSQL extends AbstractDatabase {
 	public $dbprettyname = 'MS SQL Server';
 
-	public function setupDatabase() {
+	public function setupDatabase($username) {
 		//check if the database user has admin right
 		$masterConnectionInfo = array( "Database" => "master", "UID" => $this->dbuser, "PWD" => $this->dbpassword);