From b0963d91c74d08ad573cea52b9598c447383b54c Mon Sep 17 00:00:00 2001 From: guilhermeblanco Date: Wed, 31 Mar 2010 20:47:35 +0000 Subject: [PATCH] [2.0][DDC-274] Moved Sql to SQL loggers. Also implemented some todos. --- lib/Doctrine/DBAL/Configuration.php | 10 ++--- lib/Doctrine/DBAL/Logging/DebugStack.php | 21 +++++++++- lib/Doctrine/DBAL/Logging/EchoSqlLogger.php | 42 +++++++++++++++---- lib/Doctrine/DBAL/Logging/SqlLogger.php | 40 +++++++++++++++--- .../ORM/Functional/BasicFunctionalTest.php | 14 +++---- .../Functional/ClassTableInheritanceTest.php | 2 +- .../Tests/ORM/Functional/FlushEventTest.php | 2 +- .../ORM/Functional/LifecycleCallbackTest.php | 2 +- ...ManyToManyBidirectionalAssociationTest.php | 4 +- .../OneToManyBidirectionalAssociationTest.php | 4 +- .../Functional/SingleTableInheritanceTest.php | 2 +- .../ORM/Functional/Ticket/DDC144Test.php | 2 +- .../ORM/Functional/Ticket/DDC168Test.php | 2 +- .../ORM/Functional/Ticket/DDC211Test.php | 2 +- .../ORM/Functional/Ticket/DDC258Test.php | 2 +- .../ORM/Functional/Ticket/DDC345Test.php | 2 +- .../ORM/Functional/Ticket/DDC371Test.php | 2 +- .../ORM/Functional/Ticket/DDC422Test.php | 2 +- .../ORM/Functional/Ticket/DDC425Test.php | 2 +- .../ORM/Functional/Ticket/DDC444Test.php | 2 +- .../Doctrine/Tests/OrmFunctionalTestCase.php | 2 +- 21 files changed, 118 insertions(+), 45 deletions(-) diff --git a/lib/Doctrine/DBAL/Configuration.php b/lib/Doctrine/DBAL/Configuration.php index c0793e893..3ad9e36a0 100644 --- a/lib/Doctrine/DBAL/Configuration.php +++ b/lib/Doctrine/DBAL/Configuration.php @@ -59,10 +59,9 @@ class Configuration /** * Sets the SQL logger to use. Defaults to NULL which means SQL logging is disabled. * - * @param SqlLogger $logger - * @todo Rename to setSQLLogger() + * @param SQLLogger $logger */ - public function setSqlLogger($logger) + public function setSQLLogger($logger) { $this->_attributes['sqlLogger'] = $logger; } @@ -70,10 +69,9 @@ class Configuration /** * Gets the SQL logger that is used. * - * @return SqlLogger - * @todo Rename to getSQLLogger() + * @return SQLLogger */ - public function getSqlLogger() + public function getSQLLogger() { return $this->_attributes['sqlLogger']; } diff --git a/lib/Doctrine/DBAL/Logging/DebugStack.php b/lib/Doctrine/DBAL/Logging/DebugStack.php index 7a1bf1fd3..5ed20db55 100644 --- a/lib/Doctrine/DBAL/Logging/DebugStack.php +++ b/lib/Doctrine/DBAL/Logging/DebugStack.php @@ -21,13 +21,30 @@ namespace Doctrine\DBAL\Logging; -class DebugStack implements SqlLogger +/** + * Includes executed SQLs in a Debug Stack + * + * @license http://www.opensource.org/licenses/lgpl-license.php LGPL + * @link www.doctrine-project.org + * @since 2.0 + * @version $Revision$ + * @author Benjamin Eberlei + * @author Guilherme Blanco + * @author Jonathan Wage + * @author Roman Borschel + */ +class DebugStack implements SQLLogger { + /** @var array $queries Executed SQL queries. */ public $queries = array(); + /** @var boolean $enabled If Debug Stack is enabled (log queries) or not. */ public $enabled = true; - public function logSql($sql, array $params = null) + /** + * {@inheritdoc} + */ + public function logSQL($sql, array $params = null) { if ($this->enabled) { $this->queries[] = array('sql' => $sql, 'params' => $params); diff --git a/lib/Doctrine/DBAL/Logging/EchoSqlLogger.php b/lib/Doctrine/DBAL/Logging/EchoSqlLogger.php index 5e081ddd6..9541547d9 100644 --- a/lib/Doctrine/DBAL/Logging/EchoSqlLogger.php +++ b/lib/Doctrine/DBAL/Logging/EchoSqlLogger.php @@ -1,21 +1,49 @@ . + */ namespace Doctrine\DBAL\Logging; /** * A SQL logger that logs to the standard output using echo/var_dump. * - * @author Roman Borschel - * @since 2.0 - * @todo Rename: EchoSQLLogger + * @license http://www.opensource.org/licenses/lgpl-license.php LGPL + * @link www.doctrine-project.org + * @since 2.0 + * @version $Revision$ + * @author Benjamin Eberlei + * @author Guilherme Blanco + * @author Jonathan Wage + * @author Roman Borschel */ -class EchoSqlLogger implements SqlLogger +class EchoSQLLogger implements SQLLogger { - public function logSql($sql, array $params = null) + /** + * {@inheritdoc} + */ + public function logSQL($sql, array $params = null) { echo $sql . PHP_EOL; - if ($params) { - var_dump($params); + + if ($params) { + var_dump($params); } } } \ No newline at end of file diff --git a/lib/Doctrine/DBAL/Logging/SqlLogger.php b/lib/Doctrine/DBAL/Logging/SqlLogger.php index fe32a0d4b..a8b01a3bd 100644 --- a/lib/Doctrine/DBAL/Logging/SqlLogger.php +++ b/lib/Doctrine/DBAL/Logging/SqlLogger.php @@ -1,15 +1,45 @@ . + */ namespace Doctrine\DBAL\Logging; /** * Interface for SQL loggers. * - * @author Roman Borschel - * @since 2.0 - * @todo Rename: SQLLogger + * @license http://www.opensource.org/licenses/lgpl-license.php LGPL + * @link www.doctrine-project.org + * @since 2.0 + * @version $Revision$ + * @author Benjamin Eberlei + * @author Guilherme Blanco + * @author Jonathan Wage + * @author Roman Borschel */ -interface SqlLogger +interface SQLLogger { - function logSql($sql, array $params = null); + /** + * Logs a SQL statement somewhere. + * + * @param string $sql The SQL to be executed. + * @param array $params The SQL parameters. + */ + function logSQL($sql, array $params = null); } \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php b/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php index e31164858..385b72a95 100644 --- a/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php @@ -578,7 +578,7 @@ class BasicFunctionalTest extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->persist($article); $this->_em->persist($user); - //$this->_em->getConnection()->getConfiguration()->setSqlLogger(new \Doctrine\DBAL\Logging\EchoSqlLogger); + //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); $this->_em->flush(); $this->_em->clear(); @@ -589,14 +589,14 @@ class BasicFunctionalTest extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertEquals(1, count($user2->articles)); $this->assertTrue($user2->address instanceof CmsAddress); - $oldLogger = $this->_em->getConnection()->getConfiguration()->getSqlLogger(); + $oldLogger = $this->_em->getConnection()->getConfiguration()->getSQLLogger(); $debugStack = new \Doctrine\DBAL\Logging\DebugStack; - $this->_em->getConnection()->getConfiguration()->setSqlLogger($debugStack); + $this->_em->getConnection()->getConfiguration()->setSQLLogger($debugStack); $this->_em->flush(); $this->assertEquals(0, count($debugStack->queries)); - $this->_em->getConnection()->getConfiguration()->setSqlLogger($oldLogger); + $this->_em->getConnection()->getConfiguration()->setSQLLogger($oldLogger); } public function testRemoveEntityByReference() @@ -606,7 +606,7 @@ class BasicFunctionalTest extends \Doctrine\Tests\OrmFunctionalTestCase $user->username = 'gblanco'; $user->status = 'developer'; - //$this->_em->getConnection()->getConfiguration()->setSqlLogger(new \Doctrine\DBAL\Logging\EchoSqlLogger); + //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); $this->_em->persist($user); $this->_em->flush(); @@ -619,7 +619,7 @@ class BasicFunctionalTest extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertEquals(0, $this->_em->getConnection()->fetchColumn("select count(*) from cms_users")); - //$this->_em->getConnection()->getConfiguration()->setSqlLogger(null); + //$this->_em->getConnection()->getConfiguration()->setSQLLogger(null); } /** @@ -643,7 +643,7 @@ class BasicFunctionalTest extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - //$this->_em->getConnection()->getConfiguration()->setSqlLogger(new \Doctrine\DBAL\Logging\EchoSqlLogger); + //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); $userRef = $this->_em->getReference('Doctrine\Tests\Models\CMS\CmsUser', $user->getId()); $address2 = $this->_em->createQuery('select a from Doctrine\Tests\Models\CMS\CmsAddress a where a.user = :user') diff --git a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php index eb2d9e67f..206a567b6 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php @@ -23,7 +23,7 @@ class ClassTableInheritanceTest extends \Doctrine\Tests\OrmFunctionalTestCase protected function setUp() { $this->useModelSet('company'); parent::setUp(); - //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSqlLogger); + //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); } public function testCRUD() diff --git a/tests/Doctrine/Tests/ORM/Functional/FlushEventTest.php b/tests/Doctrine/Tests/ORM/Functional/FlushEventTest.php index bea8570d3..2b1d7260c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/FlushEventTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/FlushEventTest.php @@ -23,7 +23,7 @@ class FlushEventTest extends \Doctrine\Tests\OrmFunctionalTestCase public function testPersistNewEntitiesOnPreFlush() { - //$this->_em->getConnection()->getConfiguration()->setSqlLogger(new \Doctrine\DBAL\Logging\EchoSqlLogger); + //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); $this->_em->getEventManager()->addEventListener(Events::onFlush, new OnFlushListener); $user = new CmsUser; diff --git a/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php b/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php index 74d36bcfd..36a9fca4c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php @@ -87,7 +87,7 @@ class LifecycleCallbackTest extends \Doctrine\Tests\OrmFunctionalTestCase */ public function testCascadedEntitiesCallsPrePersist() { - //$this->_em->getConnection()->getConfiguration()->setSqlLogger(new \Doctrine\DBAL\Logging\EchoSqlLogger); + //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); $e1 = new LifecycleCallbackTestEntity; $e2 = new LifecycleCallbackTestEntity; diff --git a/tests/Doctrine/Tests/ORM/Functional/ManyToManyBidirectionalAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/ManyToManyBidirectionalAssociationTest.php index 0bb5ae7d8..5a6a2dd50 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ManyToManyBidirectionalAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ManyToManyBidirectionalAssociationTest.php @@ -68,7 +68,7 @@ class ManyToManyBidirectionalAssociationTest extends AbstractManyToManyAssociati public function testEagerLoadFromInverseSideAndLazyLoadFromOwningSide() { - //$this->_em->getConnection()->getConfiguration()->setSqlLogger(new \Doctrine\DBAL\Logging\EchoSqlLogger); + //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); $this->_createLoadingFixture(); $categories = $this->_findCategories(); $this->assertLazyLoadFromOwningSide($categories); @@ -76,7 +76,7 @@ class ManyToManyBidirectionalAssociationTest extends AbstractManyToManyAssociati public function testEagerLoadFromOwningSideAndLazyLoadFromInverseSide() { - //$this->_em->getConnection()->getConfiguration()->setSqlLogger(new \Doctrine\DBAL\Logging\EchoSqlLogger); + //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); $this->_createLoadingFixture(); $products = $this->_findProducts(); $this->assertLazyLoadFromInverseSide($products); diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php index 2cdd3011a..29ae93e57 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php @@ -123,7 +123,7 @@ class OneToManyBidirectionalAssociationTest extends \Doctrine\Tests\OrmFunctiona public function testLazyLoadsObjectsOnTheInverseSide2() { - //$this->_em->getConnection()->getConfiguration()->setSqlLogger(new \Doctrine\DBAL\Logging\EchoSqlLogger); + //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); $this->_createFixture(); $query = $this->_em->createQuery('select f,p from Doctrine\Tests\Models\ECommerce\ECommerceFeature f join f.product p'); @@ -141,7 +141,7 @@ class OneToManyBidirectionalAssociationTest extends \Doctrine\Tests\OrmFunctiona //$this->assertTrue($product->getFeatures()->contains($features[0])); //$this->assertTrue($product->getFeatures()->contains($features[1])); - //$this->_em->getConnection()->getConfiguration()->setSqlLogger(null); + //$this->_em->getConnection()->getConfiguration()->setSQLLogger(null); } public function testJoinFromOwningSide() diff --git a/tests/Doctrine/Tests/ORM/Functional/SingleTableInheritanceTest.php b/tests/Doctrine/Tests/ORM/Functional/SingleTableInheritanceTest.php index fc6a408f6..01583d1e0 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SingleTableInheritanceTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SingleTableInheritanceTest.php @@ -167,7 +167,7 @@ class SingleTableInheritanceTest extends \Doctrine\Tests\OrmFunctionalTestCase $parentRelated->setParent($child2); $this->_em->persist($parentRelated); - //$this->_em->getConnection()->getConfiguration()->setSqlLogger(new \Doctrine\DBAL\Logging\EchoSqlLogger); + //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); $this->_em->flush(); $this->_em->clear(); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php index 63f2ee4e8..6c248676b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php @@ -9,7 +9,7 @@ class DDC144Test extends \Doctrine\Tests\OrmFunctionalTestCase protected function setUp() { parent::setUp(); - //$this->_em->getConnection()->getConfiguration()->setSqlLogger(new \Doctrine\DBAL\Logging\EchoSqlLogger); + //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); $this->_schemaTool->createSchema(array( $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC144FlowElement'), diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC168Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC168Test.php index b9ec0c406..ac06d5b38 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC168Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC168Test.php @@ -18,7 +18,7 @@ class DDC168Test extends \Doctrine\Tests\OrmFunctionalTestCase */ public function testJoinedSubclassPersisterRequiresSpecificOrderOfMetadataReflFieldsArray() { - //$this->_em->getConnection()->getConfiguration()->setSqlLogger(new \Doctrine\DBAL\Logging\EchoSqlLogger); + //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); $metadata = $this->_em->getClassMetadata('Doctrine\Tests\Models\Company\CompanyEmployee'); ksort($metadata->reflFields); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC211Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC211Test.php index 6aa2dc6b7..56a3ddcc8 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC211Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC211Test.php @@ -17,7 +17,7 @@ class DDC211Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testIssue() { - //$this->_em->getConnection()->getConfiguration()->setSqlLogger(new \Doctrine\DBAL\Logging\EchoSqlLogger); + //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); $user = new DDC211User; $user->setName('John Doe'); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC258Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC258Test.php index fb3f4a8bb..29a35dada 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC258Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC258Test.php @@ -21,7 +21,7 @@ class DDC258Test extends \Doctrine\Tests\OrmFunctionalTestCase */ public function testIssue() { - //$this->_em->getConnection()->getConfiguration()->setSqlLogger(new \Doctrine\DBAL\Logging\EchoSqlLogger); + //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); $c1 = new DDC258Class1(); $c1->title = "Foo"; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC345Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC345Test.php index 92a984525..6ae373229 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC345Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC345Test.php @@ -9,7 +9,7 @@ class DDC345Test extends \Doctrine\Tests\OrmFunctionalTestCase protected function setUp() { parent::setUp(); - //$this->_em->getConnection()->getConfiguration()->setSqlLogger(new \Doctrine\DBAL\Logging\EchoSqlLogger); + //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); $this->_schemaTool->createSchema(array( $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC345User'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC345Group'), diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC371Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC371Test.php index 9bffd96c5..8f18a1fc6 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC371Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC371Test.php @@ -10,7 +10,7 @@ class DDC371Test extends \Doctrine\Tests\OrmFunctionalTestCase protected function setUp() { parent::setUp(); - //$this->_em->getConnection()->getConfiguration()->setSqlLogger(new \Doctrine\DBAL\Logging\EchoSqlLogger); + //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); $this->_schemaTool->createSchema(array( $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC371Parent'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC371Child') diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC422Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC422Test.php index e21dbf92f..bec65acae 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC422Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC422Test.php @@ -8,7 +8,7 @@ class DDC422Test extends \Doctrine\Tests\OrmFunctionalTestCase protected function setUp() { parent::setUp(); - //$this->_em->getConnection()->getConfiguration()->setSqlLogger(new \Doctrine\DBAL\Logging\EchoSqlLogger); + //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); $this->_schemaTool->createSchema(array( $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC422Guest'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC422Customer'), diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC425Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC425Test.php index 7624f27ad..1fbc8ff46 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC425Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC425Test.php @@ -21,7 +21,7 @@ class DDC425Test extends \Doctrine\Tests\OrmFunctionalTestCase */ public function testIssue() { - //$this->_em->getConnection()->getConfiguration()->setSqlLogger(new \Doctrine\DBAL\Logging\EchoSqlLogger); + //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); $num = $this->_em->createQuery('DELETE '.__NAMESPACE__.'\DDC425Entity e WHERE e.someDatetimeField > ?1') ->setParameter(1, new DateTime, Type::DATETIME) diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC444Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC444Test.php index da059eb1e..e0ce88aa2 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC444Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC444Test.php @@ -9,7 +9,7 @@ class DDC444Test extends \Doctrine\Tests\OrmFunctionalTestCase public function setUp() { parent::setUp(); - //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSqlLogger); + //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); $this->_schemaTool->createSchema(array( $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC444User'), )); diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php index 3723a31d0..fad546ddc 100644 --- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php +++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php @@ -222,7 +222,7 @@ abstract class OrmFunctionalTestCase extends OrmTestCase $config->setProxyNamespace('Doctrine\Tests\Proxies'); $conn = $this->sharedFixture['conn']; - $conn->getConfiguration()->setSqlLogger($this->_sqlLoggerStack); + $conn->getConfiguration()->setSQLLogger($this->_sqlLoggerStack); return \Doctrine\ORM\EntityManager::create($conn, $config); }