RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-21 22:53:15 +03:00
Code Issues Projects Releases Wiki Activity

Fixed identifier quoting in functional tests.

Browse Source
This commit is contained in:
Guilherme Blanco 2015-01-15 03:50:18 +00:00
parent 5bd921139e
commit 8a0989aa50
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/Doctrine/Tests/OrmFunctionalTestCase.php
View File

@ -218,7 +218,8 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
*/ */
protected function tearDown() protected function tearDown()
{ {
$conn = static::$_sharedConn; $conn = static::$_sharedConn;
$platform = $this->_em->getConnection()->getDatabasePlatform();
$this->_sqlLoggerStack->enabled = false; $this->_sqlLoggerStack->enabled = false;
@ -285,7 +286,7 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
$conn->executeUpdate('DELETE FROM navigation_countries'); $conn->executeUpdate('DELETE FROM navigation_countries');
} }
if (isset($this->_usedModelSets['directorytree'])) { if (isset($this->_usedModelSets['directorytree'])) {
$conn->executeUpdate('DELETE FROM ' . $this->_em->getConnection()->getDatabasePlatform()->quoteIdentifier("file")); $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("file"));
// MySQL doesn't know deferred deletions therefore only executing the second query gives errors. // MySQL doesn't know deferred deletions therefore only executing the second query gives errors.
$conn->executeUpdate('DELETE FROM Directory WHERE parentDirectory_id IS NOT NULL'); $conn->executeUpdate('DELETE FROM Directory WHERE parentDirectory_id IS NOT NULL');
$conn->executeUpdate('DELETE FROM Directory'); $conn->executeUpdate('DELETE FROM Directory');
@ -351,10 +352,10 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
} }
if (isset($this->_usedModelSets['quote'])) { if (isset($this->_usedModelSets['quote'])) {
$conn->executeUpdate('DELETE FROM "quote-address"'); $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-address"));
$conn->executeUpdate('DELETE FROM "quote-group"'); $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-group"));
$conn->executeUpdate('DELETE FROM "quote-phone"'); $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-phone"));
$conn->executeUpdate('DELETE FROM "quote-user"'); $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-user"));
} }
$this->_em->clear(); $this->_em->clear();