Commit 0c6eda3c authored by Marco Pivetta's avatar Marco Pivetta

Merge branch 'fix/#2650-skip-emulated-prepared-statements-option-on-pdo-sqlsrv' into 2.5

Backport #2650 to 2.5.x
parents 9d633dad 02e6841c
......@@ -64,6 +64,10 @@ class PDOConnectionTest extends DbalFunctionalTestCase
*/
public function testThrowsWrappedExceptionOnPrepare()
{
if ($this->_conn->getDriver()->getName() === 'pdo_sqlsrv') {
$this->markTestSkipped('pdo_sqlsrv does not allow setting PDO::ATTR_EMULATE_PREPARES at connection level.');
}
// Emulated prepared statements have to be disabled for this test
// so that PDO actually communicates with the database server to check the query.
$this->driverConnection->setAttribute(\PDO::ATTR_EMULATE_PREPARES, false);
......
......@@ -18,8 +18,6 @@ class ResultCacheTest extends \Doctrine\Tests\DbalFunctionalTestCase
{
parent::setUp();
try {
/* @var $sm \Doctrine\DBAL\Schema\AbstractSchemaManager */
$table = new \Doctrine\DBAL\Schema\Table("caching");
$table->addColumn('test_int', 'integer');
$table->addColumn('test_string', 'string', array('notnull' => false));
......@@ -27,10 +25,7 @@ class ResultCacheTest extends \Doctrine\Tests\DbalFunctionalTestCase
$sm = $this->_conn->getSchemaManager();
$sm->createTable($table);
} catch(\Exception $e) {
}
$this->_conn->executeUpdate('DELETE FROM caching');
foreach ($this->expectedResult as $row) {
$this->_conn->insert('caching', $row);
}
......@@ -42,6 +37,13 @@ class ResultCacheTest extends \Doctrine\Tests\DbalFunctionalTestCase
$config->setResultCacheImpl($cache);
}
protected function tearDown()
{
$this->_conn->getSchemaManager()->dropTable('caching');
parent::tearDown();
}
public function testCacheFetchAssoc()
{
$this->assertCacheNonCacheSelectSameFetchModeAreEqual($this->expectedResult, \PDO::FETCH_ASSOC);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment