Merge pull request #6036 from iRedds/fix-sqlsrv-port

Bug: The SQLSRV driver ignores the port value from the config.
codeigniter4 · May 27, 2022 · 7b42a12 · 7b42a12
2 parents 5395498 + a6d9eef
commit 7b42a12
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/system/Database/SQLSRV/Connection.php b/system/Database/SQLSRV/Connection.php
@@ -120,6 +120,10 @@ public function connect(bool $persistent = false)
             unset($connection['UID'], $connection['PWD']);
         }
 
+        if (strpos($this->hostname, ',') === false && $this->port !== '') {
+            $this->hostname .= ', ' . $this->port;
+        }
+
         sqlsrv_configure('WarningsReturnAsErrors', 0);
         $this->connID = sqlsrv_connect($this->hostname, $connection);
 

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -119,5 +119,6 @@ Deprecations
 
 Bugs Fixed
 **********
+- The SQLSRV driver ignores the port value from the config.
 
 See the repo's `CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_ for a complete list of bugs fixed.