diff --git a/src/Illuminate/Database/Connectors/SqlServerConnector.php b/src/Illuminate/Database/Connectors/SqlServerConnector.php index b6660752f517..d1d9a53172bc 100755 --- a/src/Illuminate/Database/Connectors/SqlServerConnector.php +++ b/src/Illuminate/Database/Connectors/SqlServerConnector.php @@ -42,13 +42,15 @@ protected function getDsn(array $config) // First we will create the basic DSN setup as well as the port if it is in // in the configuration options. This will give us the basic DSN we will // need to establish the PDO connections and return them back for use. - $port = isset($config['port']) ? ','.$port : ''; - if (in_array('dblib', $this->getAvailableDrivers())) { + $port = isset($config['port']) ? ':'.$port : ''; + return "dblib:host={$host}{$port};dbname={$database}"; } + $port = isset($config['port']) ? ','.$port : ''; + $dbName = $database != '' ? ";Database={$database}" : ''; return "sqlsrv:Server={$host}{$port}{$dbName}"; diff --git a/tests/Database/DatabaseConnectorTest.php b/tests/Database/DatabaseConnectorTest.php index f7f925f9fceb..8a8162e128a2 100755 --- a/tests/Database/DatabaseConnectorTest.php +++ b/tests/Database/DatabaseConnectorTest.php @@ -124,14 +124,14 @@ protected function getDsn(array $config) { extract($config); - $port = isset($config['port']) ? ','.$port : ''; - if (in_array('dblib', PDO::getAvailableDrivers())) { + $port = isset($config['port']) ? ':'.$port : ''; return "dblib:host={$host}{$port};dbname={$database}"; } else { + $port = isset($config['port']) ? ','.$port : ''; return "sqlsrv:Server={$host}{$port};Database={$database}"; } }