Merge branch 'DBAL-238' into 2.2

Hounddog · Mar 19, 2012 · 0b0736f · 0b0736f
2 parents 0bbb36e + 6320037
commit 0b0736f
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/Doctrine/DBAL/Driver/PDOSqlsrv/Driver.php b/lib/Doctrine/DBAL/Driver/PDOSqlsrv/Driver.php
@@ -53,9 +53,13 @@ private function _constructPdoDsn(array $params)
             $dsn .= ',' . $params['port'];
         }
 
-		if (isset($params['dbname'])) {
+        if (isset($params['dbname'])) {;
-			$dsn .= ';Database=' .  $params['dbname'];
+            $dsn .= ';Database=' .  $params['dbname'];
-		}
+        }
+
+        if (isset($params['MultipleActiveResultSets'])) {
+            $dsn .= '; MultipleActiveResultSets=' . ($params['MultipleActiveResultSets'] ? 'true' : 'false');
+        }
 
         return $dsn;
     }