Skip to content

[stable16] Fix occ maintenance:install database connect failure #19328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 5 commits into from
Apr 14, 2020
Merged

[stable16] Fix occ maintenance:install database connect failure #19328

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
07e7f79
Only provide the auth method for MySQL 8.0+ to not break MariaDB
nickvergessen Feb 5, 2020
b48daab
Check the new connection on setup like with PostgreSQL and Oracle
nickvergessen Feb 5, 2020
6e892c0
Split the exception handling so install errors don't log as setup errors
nickvergessen Feb 5, 2020
6cdc63f
Correctly append the port to the host so it's written to the config c…
nickvergessen Feb 5, 2020
f36ba8b
Do not allow installing on MySQL 8.0+ and MariaDB 10.4+
nickvergessen Mar 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Correctly append the port to the host so it's written to the config c… 
…orrectly

Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen @skjnldsv
nickvergessen authored and skjnldsv committed Apr 14, 2020
commit 6cdc63ff69fc4e0f82c8bb4e124e8c9f96ef3da2
5 changes: 4 additions & 1 deletion core/Command/Maintenance/Install.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,10 @@ protected function validateInput(InputInterface $input, OutputInterface $output,
} else {
$dbHost = $input->getOption('database-host');
}
if ($dbPort) {
// 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');
Expand Down Expand Up @@ -181,7 +185,6 @@ protected function validateInput(InputInterface $input, OutputInterface $output,
'dbpass' => $dbPass,
'dbname' => $dbName,
'dbhost' => $dbHost,
'dbport' => $dbPort,
'dbtableprefix' => $dbTablePrefix,
'adminlogin' => $adminLogin,
'adminpass' => $adminPassword,
Expand Down