Allow port to be specified in SQLServer connections.

Refs #11544
cakephp · Dec 15, 2017 · 04bcc25 · 04bcc25
1 parent a08ae39
commit 04bcc25
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/Database/Driver/Sqlserver.php b/src/Database/Driver/Sqlserver.php
@@ -39,6 +39,7 @@ class Sqlserver extends Driver
         'username' => '',
         'password' => '',
         'database' => 'cake',
+        'port' => '',
         // PDO::SQLSRV_ENCODING_UTF8
         'encoding' => 65001,
         'flags' => [],
@@ -82,8 +83,12 @@ public function connect()
         if (!empty($config['encoding'])) {
             $config['flags'][PDO::SQLSRV_ATTR_ENCODING] = $config['encoding'];
         }
+        $port = '';
+        if (strlen($config['port'])) {
+            $port = ',' . $config['port'];
+        }
 
-        $dsn = "sqlsrv:Server={$config['host']};Database={$config['database']};MultipleActiveResultSets=false";
+        $dsn = "sqlsrv:Server={$config['host']}{$port};Database={$config['database']};MultipleActiveResultSets=false";
         if ($config['app'] !== null) {
             $dsn .= ";APP={$config['app']}";
         }

diff --git a/tests/TestCase/Database/Driver/SqlserverTest.php b/tests/TestCase/Database/Driver/SqlserverTest.php
@@ -66,7 +66,15 @@ public function dnsStringDataProvider()
                 [
                 ],
                 'sqlsrv:Server=localhost\SQLEXPRESS;Database=cake;MultipleActiveResultSets=false',
-            ]
+            ],
+            [
+                [
+                    'app' => 'CakePHP-Testapp',
+                    'host' => 'locahost',
+                    'port' => 9001,
+                ],
+                'sqlsrv:Server=localhost\SQLEXPRESS,9001;Database=cake;MultipleActiveResultSets=false;APP=CakePHP-Testapp',
+            ],
         ];
     }