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

DDC-748 - Fix bug in EntityManager::refresh() when entity has an owning side many-to-one bi-directional association

Browse Source
This commit is contained in:
Benjamin Eberlei 2010-09-12 21:41:22 +02:00
parent 24c6bb3f46
commit 13da816f4e
2 changed files with 65 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
View File

@ -653,7 +653,7 @@ class BasicEntityPersister
if ($found = $this->_em->getUnitOfWork()->tryGetById($joinColumnValues, $targetClass->rootEntityName)) {
$this->_class->reflFields[$field]->setValue($entity, $found);
// Complete inverse side, if necessary.
if ($assoc['inversedBy']) {
if ($assoc['inversedBy'] && $assoc['type'] & ClassMetadata::ONE_TO_ONE) {
$inverseAssoc = $targetClass->associationMappings[$assoc['inversedBy']];
$targetClass->reflFields[$inverseAssoc['fieldName']]->setValue($found, $entity);
}

64
tests/Doctrine/Tests/ORM/Functional/Ticket/DDC748Test.php Normal file
View File

@ -0,0 +1,64 @@
<?php
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Tests\Models\CMS\CmsUser;
use Doctrine\Tests\Models\CMS\CmsArticle;
use Doctrine\Tests\Models\CMS\CmsAddress;
require_once __DIR__ . '/../../../TestInit.php';
class DDC748Test extends \Doctrine\Tests\OrmFunctionalTestCase
{
protected function setUp()
{
$this->useModelSet('cms');
parent::setUp();
}
public function testRefreshWithManyToOne()
{
$user = new CmsUser();
$user->name = "beberlei";
$user->status = "active";
$user->username = "beberlei";
$article = new CmsArticle();
$article->setAuthor($user);
$article->text = "foo";
$article->topic = "bar";
$this->_em->persist($user);
$this->_em->persist($article);
$this->_em->flush();
$this->assertType('Doctrine\Common\Collections\Collection', $user->articles);
$this->_em->refresh($article);
$this->assertTrue($article !== $user->articles, "The article should not be replaced on the inverse side of the relation.");
$this->assertType('Doctrine\Common\Collections\Collection', $user->articles);
}
public function testRefreshOneToOne()
{
$user = new CmsUser();
$user->name = "beberlei";
$user->status = "active";
$user->username = "beberlei";
$address = new CmsAddress();
$address->city = "Bonn";
$address->country = "Germany";
$address->street = "A street";
$address->zip = 12345;
$address->setUser($user);
$this->_em->persist($user);
$this->_em->persist($address);
$this->_em->flush();
$this->_em->refresh($address);
$this->assertSame($user, $address->user);
$this->assertSame($user->address, $address);
}
}