RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-18 22:41:43 +03:00
Code Issues Projects Releases Wiki Activity

Only create lazy collection for EXTRA_LAZY

Browse Source
This commit is contained in:
Michaël Gallego 2014-02-17 21:23:11 +01:00 committed by Marco Pivetta
parent 50832fd3bc
commit 11de4c2e72
2 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/ORM/PersistentCollection.php
View File

@ -883,7 +883,7 @@ final class PersistentCollection implements Collection, Selectable
$persister = $this->em->getUnitOfWork()->getEntityPersister($this->association['targetEntity']);
if ($this->association['fetch'] !== ClassMetadataInfo::FETCH_EAGER) {
if ($this->association['fetch'] === ClassMetadataInfo::FETCH_EXTRA_LAZY) {
return new LazyCriteriaCollection($persister, $criteria);
} else {
return new ArrayCollection($persister->loadCriteria($criteria));

62
tests/Doctrine/Tests/ORM/Functional/PersistentCollectionCriteriaTest.php
View File

@ -21,6 +21,10 @@ namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Common\Collections\Criteria;
use Doctrine\Tests\Models\CMS\CmsArticle;
use Doctrine\Tests\Models\CMS\CmsComment;
use Doctrine\Tests\Models\Company\CompanyAuction;
use Doctrine\Tests\Models\Company\CompanyEmployee;
use Doctrine\Tests\Models\Company\CompanyFlexUltraContract;
use Doctrine\Tests\Models\Company\CompanyOrganization;
/**
* @author Michaël Gallego <mic.gallego@gmail.com>
@ -29,7 +33,7 @@ class PersistentCollectionCriteriaTest extends \Doctrine\Tests\OrmFunctionalTest
{
protected function setUp()
{
$this->useModelSet('cms');
$this->useModelSet('company');
parent::setUp();
}
@ -43,28 +47,24 @@ class PersistentCollectionCriteriaTest extends \Doctrine\Tests\OrmFunctionalTest
public function loadFixture()
{
$article = new CmsArticle();
$article->topic = 'Criteria is awesome';
$article->text = 'foo';
$this->_em->persist($article);
$companyOrganization = new CompanyOrganization();
$this->_em->persist($companyOrganization);
$comment1 = new CmsComment();
$comment1->topic = 'I agree';
$comment1->text = 'bar';
$this->_em->persist($comment1);
$article->addComment($comment1);
$event1 = new CompanyAuction();
$event1->setData('Foo');
$this->_em->persist($event1);
$companyOrganization->addEvent($event1);
$comment2 = new CmsComment();
$comment2->topic = 'I disagree';
$comment2->text = 'baz';
$this->_em->persist($comment2);
$article->addComment($comment2);
$event2 = new CompanyAuction();
$event2->setData('Bar');
$this->_em->persist($event2);
$companyOrganization->addEvent($event2);
$this->_em->flush();
unset($article);
unset($comment1);
unset($comment2);
unset($companyOrganization);
unset($event1);
unset($event2);
$this->_em->clear();
}
@ -72,24 +72,24 @@ class PersistentCollectionCriteriaTest extends \Doctrine\Tests\OrmFunctionalTest
public function testCanCountWithoutLoadingPersistentCollection()
{
$this->loadFixture();
$repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsArticle');
$repository = $this->_em->getRepository('Doctrine\Tests\Models\Company\CompanyOrganization');
$article = $repository->findOneBy(array('topic' => 'Criteria is awesome'));
$comments = $article->comments->matching(new Criteria());
$organization = $repository->find(1);
$events = $organization->events->matching(new Criteria());
$this->assertInstanceOf('Doctrine\ORM\LazyCriteriaCollection', $comments);
$this->assertFalse($comments->isInitialized());
$this->assertCount(2, $comments);
$this->assertFalse($comments->isInitialized());
$this->assertInstanceOf('Doctrine\ORM\LazyCriteriaCollection', $events);
$this->assertFalse($events->isInitialized());
$this->assertCount(2, $events);
$this->assertFalse($events->isInitialized());
// Make sure it works with constraints
$comments = $article->comments->matching(new Criteria(
Criteria::expr()->eq('text', 'bar')
$events = $organization->events->matching(new Criteria(
Criteria::expr()->eq('id', 2)
));
$this->assertInstanceOf('Doctrine\ORM\LazyCriteriaCollection', $comments);
$this->assertFalse($comments->isInitialized());
$this->assertCount(1, $comments);
$this->assertFalse($comments->isInitialized());
$this->assertInstanceOf('Doctrine\ORM\LazyCriteriaCollection', $events);
$this->assertFalse($events->isInitialized());
$this->assertCount(1, $events);
$this->assertFalse($events->isInitialized());
}
}