]> git.joonet.de Git - adminer.git/commitdiff
MS SQL: Add support for PDO_SQLSRV extension
authorJakub Vrana <jakub@vrana.cz>
Wed, 26 Feb 2025 16:55:53 +0000 (17:55 +0100)
committerJakub Vrana <jakub@vrana.cz>
Wed, 26 Feb 2025 17:08:18 +0000 (18:08 +0100)
adminer/drivers/mssql.inc.php
changes.txt

index bd176102608e694fccef30217fa166a7eefbe25c..33e5d6304eb8959978e7f3d0f95270da8f2b7e0a 100644 (file)
@@ -152,6 +152,21 @@ if (isset($_GET["mssql"])) {
                        }
                }
 
+       } elseif (extension_loaded("pdo_sqlsrv")) {
+               class Min_DB extends Min_PDO {
+                       var $extension = "PDO_SQLSRV";
+
+                       function connect($server, $username, $password) {
+                               $this->dsn("sqlsrv:Server=" . str_replace(":", ",", $server), $username, $password);
+                               return true;
+                       }
+
+                       function select_db($database) {
+                               // database selection is separated from the connection so dbname in DSN can't be used
+                               return $this->query("USE " . idf_escape($database));
+                       }
+               }
+
        } elseif (extension_loaded("pdo_dblib")) {
                class Min_DB extends Min_PDO {
                        var $extension = "PDO_DBLIB";
@@ -162,7 +177,6 @@ if (isset($_GET["mssql"])) {
                        }
 
                        function select_db($database) {
-                               // database selection is separated from the connection so dbname in DSN can't be used
                                return $this->query("USE " . idf_escape($database));
                        }
                }
@@ -637,7 +651,7 @@ WHERE sys1.xtype = 'TR' AND sys2.name = " . q($table)
                        $structured_types[$key] = array_keys($val);
                }
                return array(
-                       'possible_drivers' => array("SQLSRV", "PDO_DBLIB"),
+                       'possible_drivers' => array("SQLSRV", "PDO_SQLSRV", "PDO_DBLIB"),
                        'jush' => "mssql",
                        'types' => $types,
                        'structured_types' => $structured_types,
index c1b5bfd89f1e9e3ab73bc51eca0e9565c9da3237..c4338c873e3de7c14c2c66390a35b3568855efe0 100644 (file)
@@ -8,6 +8,7 @@ MS SQL: Display foreign keys ON UPDATE and ON DELETE
 MS SQL: Fix altering foreign key
 MS SQL PDO: Support offset
 MS SQL: Remove support for MSSQL extension
+MS SQL: Add support for PDO_SQLSRV extension
 MongoDB: Remove support for deprecated extension mongo
 
 Adminer 4.17.1 (released 2025-02-25):