From 94f6a45a2a83dfd27decf34598c5dd4572ed06cd Mon Sep 17 00:00:00 2001 From: harryxu Date: Wed, 18 Jul 2018 16:41:12 +0800 Subject: [PATCH] Set default db to sqlsrv connection --- adminer/drivers/mssql.inc.php | 8 +++++++- changes.txt | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/adminer/drivers/mssql.inc.php b/adminer/drivers/mssql.inc.php index a6b9e4f9..481ddd20 100644 --- 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 82f0c242..08614c39 100644 --- 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