aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJoas Schilling <213943+nickvergessen@users.noreply.github.com>2020-05-27 16:19:38 +0200
committerGitHub <noreply@github.com>2020-05-27 16:19:38 +0200
commit675ec93e257929f4d09b63a7225b909d8e8c75b0 (patch)
treef4a7177a3e3383b3c0c29262bff6ca8c9b9b9215 /core
parent052ddc3c106bac8991c8566b0a87f94d2cc94d1c (diff)
parent027808c01966380273c619a15dc9474bab5a42bb (diff)
downloadnextcloud-server-675ec93e257929f4d09b63a7225b909d8e8c75b0.tar.gz
nextcloud-server-675ec93e257929f4d09b63a7225b909d8e8c75b0.zip
Merge pull request #21112 from nextcloud/techdebt/noid/remove-db-prefix
Remove db prefix option from cli install command
Diffstat (limited to 'core')
-rw-r--r--core/Command/Maintenance/Install.php7
1 files changed, 0 insertions, 7 deletions
diff --git a/core/Command/Maintenance/Install.php b/core/Command/Maintenance/Install.php
index 0fe9c28cf91..f726699d037 100644
--- a/core/Command/Maintenance/Install.php
+++ b/core/Command/Maintenance/Install.php
@@ -66,7 +66,6 @@ class Install extends Command {
->addOption('database-port', null, InputOption::VALUE_REQUIRED, 'Port the database is listening on')
->addOption('database-user', null, InputOption::VALUE_REQUIRED, 'User name to connect to the database')
->addOption('database-pass', null, InputOption::VALUE_OPTIONAL, 'Password of the database user', null)
- ->addOption('database-table-prefix', null, InputOption::VALUE_OPTIONAL, 'Prefix for all tables (default: oc_)', null)
->addOption('database-table-space', null, InputOption::VALUE_OPTIONAL, 'Table space of the database (oci only)', 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')
@@ -139,11 +138,6 @@ class Install extends Command {
// Append the port to the host so it is the same as in the config (there is no dbport config)
$dbHost .= ':' . $dbPort;
}
- $dbTablePrefix = 'oc_';
- if ($input->hasParameterOption('--database-table-prefix')) {
- $dbTablePrefix = (string) $input->getOption('database-table-prefix');
- $dbTablePrefix = trim($dbTablePrefix);
- }
if ($input->hasParameterOption('--database-pass')) {
$dbPass = (string) $input->getOption('database-pass');
}
@@ -188,7 +182,6 @@ class Install extends Command {
'dbpass' => $dbPass,
'dbname' => $dbName,
'dbhost' => $dbHost,
- 'dbtableprefix' => $dbTablePrefix,
'adminlogin' => $adminLogin,
'adminpass' => $adminPassword,
'adminemail' => $adminEmail,