Merge pull request #3333 from odinsey/master

Allow windows (userless/passwordless) authentication for SQL Server

Merge pull request #3333 from odinsey/master
Allow windows (userless/passwordless) authentication for SQL Server
88b80bf3 · Sergei Morozov · GitHub · bef35e90 · 7cd248c3 · 88b80bf3
Unverified Commit 88b80bf3 authored Nov 04, 2018 by Sergei Morozov Committed by GitHub Nov 04, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

Driver.php lib/Doctrine/DBAL/Driver/SQLSrv/Driver.php +7 -2

No files found.
--- a/lib/Doctrine/DBAL/Driver/SQLSrv/Driver.php
+++ b/lib/Doctrine/DBAL/Driver/SQLSrv/Driver.php
@@ -31,8 +31,13 @@ class Driver extends AbstractSQLServerDriver
            $driverOptions['CharacterSet'] = $params['charset'];
        }

-        $driverOptions['UID'] = $username;
-        $driverOptions['PWD'] = $password;
+        if ($username !== null) {
+            $driverOptions['UID'] = $username;
+        }
+
+        if ($password !== null) {
+            $driverOptions['PWD'] = $password;
+        }

        if (! isset($driverOptions['ReturnDatesAsStrings'])) {
            $driverOptions['ReturnDatesAsStrings'] = 1;