RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-01 12:26:11 +03:00
Code Issues Projects Releases Wiki Activity

Fix some of the problems with Oracle testsuite

Browse source
This commit is contained in:
Benjamin Eberlei 2011-06-26 17:20:03 +02:00
parent 69944017d2
commit 52431251cb
4 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/vendor/doctrine-dbal vendored

@ -1 +1 @@
Subproject commit f2c150d194af4ac846362ef8c6bf002402ed5f63
Subproject commit 4cfb32db00da53638bc2dca84e3e63553fdf3c5b

13
tests/Doctrine/Tests/ORM/Functional/QueryDqlFunctionTest.php
View file

@ -274,10 +274,15 @@ class QueryDqlFunctionTest extends \Doctrine\Tests\OrmFunctionalTestCase
*/
public function testDateDiff()
{
$arg = $this->_em->createQuery("SELECT DATE_DIFF(CURRENT_TIMESTAMP(), '2011-01-01') AS diff FROM Doctrine\Tests\Models\Company\CompanyManager m")
->getARrayResult();
$this->assertTrue($arg[0]['diff'] > 0);
$query = $this->_em->createQuery("SELECT DATE_DIFF(CURRENT_TIMESTAMP(), DATE_ADD(CURRENT_TIMESTAMP(), 10, 'day')) AS diff FROM Doctrine\Tests\Models\Company\CompanyManager m");
$arg = $query->getArrayResult();
$this->assertEquals(-10, $arg[0]['diff'], "Should be roughly -10 (or -9)", 1);
$query = $this->_em->createQuery("SELECT DATE_DIFF(DATE_ADD(CURRENT_TIMESTAMP(), 10, 'day'), CURRENT_TIMESTAMP()) AS diff FROM Doctrine\Tests\Models\Company\CompanyManager m");
$arg = $query->getArrayResult();
$this->assertEquals(10, $arg[0]['diff'], "Should be roughly 10 (or 9)", 1);
}
/**

7
tests/Doctrine/Tests/OrmFunctionalTestCase.php
View file

@ -297,6 +297,13 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
}
}
if (isset($GLOBALS['db_event_subscribers'])) {
foreach (explode(",", $GLOBALS['db_event_subscribers']) AS $subscriberClass) {
$subscriberInstance = new $subscriberClass();
$evm->addEventSubscriber($subscriberInstance);
}
}
return \Doctrine\ORM\EntityManager::create($conn, $config);
}

12
tests/Doctrine/Tests/TestUtil.php
View file

@ -77,17 +77,7 @@ class TestUtil
}
}
$eventManager = null;
if (isset($GLOBALS['db_event_subscribers'])) {
$eventManager = new \Doctrine\Common\EventManager();
foreach (explode(",", $GLOBALS['db_event_subscribers']) AS $subscriberClass) {
$subscriberInstance = new $subscriberClass();
$eventManager->addEventSubscriber($subscriberInstance);
}
}
$conn = \Doctrine\DBAL\DriverManager::getConnection($realDbParams, null, $eventManager);
$conn = \Doctrine\DBAL\DriverManager::getConnection($realDbParams, null, null);
} else {
$params = array(
'driver' => 'pdo_sqlite',