Merge pull request #14613 from kampka/no-table-prefix

Install command should not require table prefix

core/command/maintenance/install.php

@@ -31,7 +31,7 @@ class Install extends Command {
 			->addOption('database-host', null, InputOption::VALUE_REQUIRED, 'Hostname of the database', 'localhost')
 			->addOption('database-user', null, InputOption::VALUE_REQUIRED, 'User name to connect to the database')
 			->addOption('database-pass', null, InputOption::VALUE_REQUIRED, 'Password of the database user')
-			->addOption('database-table-prefix', null, InputOption::VALUE_REQUIRED, 'Prefix for all tables', 'oc_')
+			->addOption('database-table-prefix', null, InputOption::VALUE_OPTIONAL, 'Prefix for all tables (default: oc_)', null)
 			->addOption('admin-user', null, InputOption::VALUE_REQUIRED, 'User name of the admin account', 'admin')
 			->addOption('admin-pass', null, InputOption::VALUE_REQUIRED, 'Password of the admin account')
 			->addOption('data-dir', null, InputOption::VALUE_REQUIRED, 'Path to data directory', \OC::$SERVERROOT."/data");
@@ -78,7 +78,11 @@ class Install extends Command {
 		$dbPass = $input->getOption('database-pass');
 		$dbName = $input->getOption('database-name');
 		$dbHost = $input->getOption('database-host');
-		$dbTablePrefix = $input->getOption('database-table-prefix');
+		$dbTablePrefix = 'oc_';
+		if ($input->hasParameterOption('--database-table-prefix')) {
+			$dbTablePrefix = (string) $input->getOption('database-table-prefix');
+			$dbTablePrefix = trim($dbTablePrefix);
+		}
 		$adminLogin = $input->getOption('admin-user');
 		$adminPassword = $input->getOption('admin-pass');
 		$dataDir = $input->getOption('data-dir');