Set default db to sqlsrv connection

diff --git a/adminer/drivers/mssql.inc.php b/adminer/drivers/mssql.inc.php
index a6b9e4f9552e6158298e1c7522a63c5b2507c848..481ddd20ab5a269f66bc4bc2a19a44cadd89e969 100644 (file)
--- a/adminer/drivers/mssql.inc.php
+++ b/adminer/drivers/mssql.inc.php
@@ -24,7 +24,13 @@ if (isset($_GET["mssql"])) {
                        }
 
                        function connect($server, $username, $password) {
-                               $this->_link = @sqlsrv_connect(preg_replace('~:~', ',', $server), array("UID" => $username, "PWD" => $password, "CharacterSet" => "UTF-8"));
+                               global $adminer;
+                               $db = $adminer->database();
+                               $connection_info = array("UID" => $username, "PWD" => $password, "CharacterSet" => "UTF-8");
+                               if ($db != "") {
+                                       $connection_info["Database"] = $db;
+                               }
+                               $this->_link = @sqlsrv_connect(preg_replace('~:~', ',', $server), $connection_info);
                                if ($this->_link) {
                                        $info = sqlsrv_server_info($this->_link);
                                        $this->server_info = $info['SQLServerVersion'];

diff --git a/changes.txt b/changes.txt
index 82f0c2428d90d6408e578ee320179bd2bb58284e..08614c399786011651dd420fc58eb632f3676e6a 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -6,6 +6,7 @@ Fix function change with set data type
 Increase username maxlength to 80 (bug #623)
 Make maxlength in all fields a soft limit
 MySQL: Support foreign keys created with ANSI quotes (bug #620)
+MSSQL: Pass database when connecting
 
 Adminer 4.6.3 (released 2018-06-28):
 Disallow using password-less databases