Skip to content

Commit

Permalink
Merging PR zendframework#4304
Browse files Browse the repository at this point in the history
Merge branch 'master' of git://github.com/fmarquis/zf2 into fmarquis-master
  • Loading branch information
Ralph Schindler committed May 9, 2013
2 parents 5119e83 + 0d09dbf commit 0903d51
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions library/Zend/Db/Adapter/Platform/SqlServer.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ public function __construct($driver = null)
public function setDriver($driver)
{
// handle Zend_Db drivers
if (($driver instanceof Pdo\Pdo && $driver->getDatabasePlatformName() == 'Sqlsrv')
|| (($driver instanceof \PDO && $driver->getAttribute(\PDO::ATTR_DRIVER_NAME) == 'sqlsrv'))
if (($driver instanceof Pdo\Pdo && in_array($driver->getDatabasePlatformName(), array('Sqlsrv', 'Dblib')))
|| (($driver instanceof \PDO && in_array($driver->getAttribute(\PDO::ATTR_DRIVER_NAME), array('sqlsrv', 'dblib'))))
) {
$this->resource = $driver;
return $this;
Expand Down

0 comments on commit 0903d51

Please sign in to comment.