Merge pull request #846 from deeky666/DBAL-1217

[DBAL-1217] Fix retrieving the database name connected to for SQL Server

lib/Doctrine/DBAL/Driver/AbstractSQLServerDriver.php

@@ -78,9 +78,13 @@ abstract class AbstractSQLServerDriver implements Driver, VersionAwarePlatformDr
     {
         $params = $conn->getParams();
 
+        if (isset($params['dbname'])) {
             return $params['dbname'];
         }
 
+        return $conn->query('SELECT DB_NAME()')->fetchColumn();
+    }
+
     /**
      * {@inheritdoc}
      */

tests/Doctrine/Tests/DBAL/Functional/Driver/PDOSqlsrv/Driver.php

+<?php
+
+namespace Doctrine\Tests\DBAL\Functional\Driver\PDOSqlsrv;
+
+use Doctrine\DBAL\Driver\PDOSqlsrv\Driver;
+use Doctrine\Tests\DBAL\Functional\Driver\AbstractDriverTest;
+
+class DriverTest extends AbstractDriverTest
+{
+    protected function setUp()
+    {
+        if (! extension_loaded('pdo_sqlsrv')) {
+            $this->markTestSkipped('pdo_sqlsrv is not installed.');
+        }
+
+        parent::setUp();
+
+        if (! $this->_conn->getDriver() instanceof Driver) {
+            $this->markTestSkipped('pdo_sqlsrv only test.');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function createDriver()
+    {
+        return new Driver();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getDatabaseNameForConnectionWithoutDatabaseNameParameter()
+    {
+        return 'master';
+    }
+}

tests/Doctrine/Tests/DBAL/Functional/Driver/SQLSrv/Driver.php

+<?php
+
+namespace Doctrine\Tests\DBAL\Functional\Driver\SQLSrv;
+
+use Doctrine\DBAL\Driver\SQLSrv\Driver;
+use Doctrine\Tests\DBAL\Functional\Driver\AbstractDriverTest;
+
+class DriverTest extends AbstractDriverTest
+{
+    protected function setUp()
+    {
+        if (! extension_loaded('sqlsrv')) {
+            $this->markTestSkipped('sqlsrv is not installed.');
+        }
+
+        parent::setUp();
+
+        if (! $this->_conn->getDriver() instanceof Driver) {
+            $this->markTestSkipped('sqlsrv only test.');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function createDriver()
+    {
+        return new Driver();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getDatabaseNameForConnectionWithoutDatabaseNameParameter()
+    {
+        return 'master';
+    }
+}