From b121576ff43aab8c611816eaa5041c987d976585 Mon Sep 17 00:00:00 2001 From: guilhermeblanco Date: Wed, 22 Jul 2009 05:06:06 +0000 Subject: [PATCH] [2.0] Fixed DQL parser to use Query::HINT_FORCE_PARTIAL_LOAD instead of string. --- lib/Doctrine/ORM/Query/Parser.php | 2 +- tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php index 895ac6e23..63110e7ce 100644 --- a/lib/Doctrine/ORM/Query/Parser.php +++ b/lib/Doctrine/ORM/Query/Parser.php @@ -1414,7 +1414,7 @@ class Parser if ( $this->_query->getHydrationMode() == Query::HYDRATE_OBJECT && ! $this->_em->getConfiguration()->getAllowPartialObjects() && - ! $this->_query->getHint('doctrine.forcePartialLoad') + ! $this->_query->getHint(Query::HINT_FORCE_PARTIAL_LOAD) ) { throw DoctrineException::partialObjectsAreDangerous(); } diff --git a/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php b/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php index 6f0de06b7..11a1c9924 100644 --- a/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php +++ b/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php @@ -341,7 +341,7 @@ class LanguageRecognitionTest extends \Doctrine\Tests\OrmTestCase $this->_em->getConfiguration()->setAllowPartialObjects(false); $this->parseDql('SELECT u.name FROM Doctrine\Tests\Models\CMS\CmsUser u', array( - 'doctrine.forcePartialLoad' => false + \Doctrine\ORM\Query::HINT_FORCE_PARTIAL_LOAD => false )); $this->_em->getConfiguration()->setAllowPartialObjects($oldValue);