Fixed: MySQL Driver didn't return Database name if DBAL was initialized using existing PDO instance

5aec5359 · Max Romanovsky · f62b4a5d · 5aec5359
Commit 5aec5359 authored Jul 18, 2011 by Max Romanovsky
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

Driver.php lib/Doctrine/DBAL/Driver/PDOMySql/Driver.php +6 -2

No files found.
--- a/lib/Doctrine/DBAL/Driver/PDOMySql/Driver.php
+++ b/lib/Doctrine/DBAL/Driver/PDOMySql/Driver.php
@@ -93,6 +93,10 @@ class Driver implements \Doctrine\DBAL\Driver
    public function getDatabase(\Doctrine\DBAL\Connection $conn)
    {
        $params = $conn->getParams();
+
+        if (isset($params['dbname'])) {
            return $params['dbname'];
        }
+        return $conn->query('SELECT DATABASE()')->fetchColumn();
+    }
 }
\ No newline at end of file