Merge pull request #583 from nextcloud/backport/441/stable26

[stable26] Added support for different mysql ports + using correct constants
nextcloud · Jan 2, 2024 · 659597e · 659597e
2 parents 743e9e8 + 3cfda0d
commit 659597e
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/lib/SqlDump/SqlDumpMySQL.php b/lib/SqlDump/SqlDumpMySQL.php
@@ -67,7 +67,10 @@ public function __construct() {
  * @throws SqlDumpException
  */
  public function export(array $params, string $filename): void {
- $connect = 'mysql:host=' . $params['dbhost'] . ';dbname=' . $params['dbname'];
+ $connect = sprintf('mysql:host=%s;dbname=%s', $params[ISqlDump::DB_HOST], $params[ISqlDump::DB_NAME]);
+ if (false === empty($params[ISqlDump::DB_PORT])) {
+ $connect .= sprintf(';port=%u', $params[ISqlDump::DB_PORT]);
+ }
  $settings = [
  'compress' => Mysqldump::NONE,
  'no-data' => false,
@@ -85,7 +88,7 @@ public function export(array $params, string $filename): void {
  ];
 
  try {
- $dump = new Mysqldump($connect, $params['dbuser'], $params['dbpassword'], $settings);
+ $dump = new Mysqldump($connect, $params[ISqlDump::DB_USER], $params[ISqlDump::DB_PASS], $settings);
  $dump->start($filename);
  } catch (Throwable $t) {
  throw new SqlDumpException($t->getMessage());