Merge branch 'fix-migration-and-serverVersion' of https://github.com/…

…tonysm/framework into tonysm-fix-migration-and-serverVersion
laravel · Jun 27, 2019 · e163072 · e163072
2 parents effec60 + 8de4eb9
commit e163072
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/Illuminate/Database/Connection.php b/src/Illuminate/Database/Connection.php
@@ -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;