Skip to content
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

Jump to bottom

[5.8] Pass down the serverVersion database connection option to Doctrine DBAL connection #28964

Merged
merged 1 commit into from Jun 27, 2019
Merged

[5.8] Pass down the serverVersion database connection option to Doctrine DBAL connection #28964

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/Illuminate/Database/Connection.php
View file
Open in desktop
Expand Up @@ -897,11 +897,15 @@ public function getDoctrineConnection()
if (is_null($this->doctrineConnection)) {
$driver = $this->getDoctrineDriver();

$this->doctrineConnection = new DoctrineConnection([
$this->doctrineConnection = new DoctrineConnection(array_filter([
'pdo' => $this->getPdo(),
'dbname' => $this->getConfig('database'),
'driver' => $driver->getName(),
], $driver);
// One can manually pass the serverVersion config to the database connection
// options. This is used by Doctrine instead of going through the regular
// regular platform version detection. This config was not being used.
'serverVersion' => $this->getConfig('serverVersion'),
]), $driver);
}

return $this->doctrineConnection;
Expand Down