Merge branch 'DBAL-238' into 2.2

0b0736fc · Benjamin Eberlei · 0bbb36ec · 63200374 · 0b0736fc
Commit 0b0736fc authored Mar 19, 2012 by Benjamin Eberlei
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

Driver.php lib/Doctrine/DBAL/Driver/PDOSqlsrv/Driver.php +7 -3

No files found.
--- a/lib/Doctrine/DBAL/Driver/PDOSqlsrv/Driver.php
+++ b/lib/Doctrine/DBAL/Driver/PDOSqlsrv/Driver.php
@@ -53,9 +53,13 @@ class Driver implements \Doctrine\DBAL\Driver
            $dsn .= ',' . $params['port'];
        }

-		if (isset($params['dbname'])) {
-			$dsn .= ';Database=' .  $params['dbname'];
-		}
+        if (isset($params['dbname'])) {;
+            $dsn .= ';Database=' .  $params['dbname'];
+        }
+
+        if (isset($params['MultipleActiveResultSets'])) {
+            $dsn .= '; MultipleActiveResultSets=' . ($params['MultipleActiveResultSets'] ? 'true' : 'false');
+        }

        return $dsn;
    }