Skip to content

[stable31] fix(ConnectionFactory): Apply Oracle connection fix to primary and replica params as well #54105

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
merged 1 commit into from
Jul 29, 2025
Merged

[stable31] fix(ConnectionFactory): Apply Oracle connection fix to primary and replica params as well #54105

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 23 additions & 15 deletions lib/private/DB/ConnectionFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,21 +121,9 @@ public function getConnection(string $type, array $additionalConnectionParams):

case 'oci':
$eventManager->addEventSubscriber(new OracleSessionInit);
// the driverOptions are unused in dbal and need to be mapped to the parameters
if (isset($connectionParams['driverOptions'])) {
$connectionParams = array_merge($connectionParams, $connectionParams['driverOptions']);
}
$host = $connectionParams['host'];
$port = $connectionParams['port'] ?? null;
$dbName = $connectionParams['dbname'];

// we set the connect string as dbname and unset the host to coerce doctrine into using it as connect string
if ($host === '') {
$connectionParams['dbname'] = $dbName; // use dbname as easy connect name
} else {
$connectionParams['dbname'] = '//' . $host . (!empty($port) ? ":{$port}" : '') . '/' . $dbName;
}
unset($connectionParams['host']);
$connectionParams = $this->forceConnectionStringOracle($connectionParams);
$connectionParams['primary'] = $this->forceConnectionStringOracle($connectionParams['primary']);
$connectionParams['replica'] = array_map([$this, 'forceConnectionStringOracle'], $connectionParams['replica']);
break;

case 'sqlite3':
Expand Down Expand Up @@ -265,4 +253,24 @@ protected function splitHostFromPortAndSocket($host): array {

return $params;
}

protected function forceConnectionStringOracle(array $connectionParams): array {
// the driverOptions are unused in dbal and need to be mapped to the parameters
if (isset($connectionParams['driverOptions'])) {
$connectionParams = array_merge($connectionParams, $connectionParams['driverOptions']);
}
$host = $connectionParams['host'];
$port = $connectionParams['port'] ?? null;
$dbName = $connectionParams['dbname'];

// we set the connect string as dbname and unset the host to coerce doctrine into using it as connect string
if ($host === '') {
$connectionParams['dbname'] = $dbName; // use dbname as easy connect name
} else {
$connectionParams['dbname'] = '//' . $host . (!empty($port) ? ":{$port}" : '') . '/' . $dbName;
}
unset($connectionParams['host']);

return $connectionParams;
}
}
Loading