RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

[DDC-1964] Fix issue with refresh and and object hydrator not setting field to null explicitly to override possible previous values.

Browse source
This commit is contained in:
Benjamin Eberlei 2012-07-29 11:25:45 +02:00
parent fc4a07c2b3
commit 7c1235dedb
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
View file

@ -448,6 +448,7 @@ class ObjectHydrator extends AbstractHydrator
$this->_resultPointers[$dqlAlias] = $element; $this->_resultPointers[$dqlAlias] = $element;
} else { } else {
$this->_uow->setOriginalEntityProperty($oid, $relationField, null); $this->_uow->setOriginalEntityProperty($oid, $relationField, null);
$reflField->setValue($parentObject, null);
} }
// else leave $reflFieldValue null for single-valued associations // else leave $reflFieldValue null for single-valued associations
} else { } else {

15
tests/Doctrine/Tests/ORM/Functional/OneToOneEagerLoadingTest.php
View file

@ -182,7 +182,10 @@ class OneToOneEagerLoadingTest extends \Doctrine\Tests\OrmFunctionalTestCase
$this->_sqlLoggerStack->queries[$this->_sqlLoggerStack->currentQuery]['sql'] $this->_sqlLoggerStack->queries[$this->_sqlLoggerStack->currentQuery]['sql']
); );
} }
/**
* @group DDC-1946
*/
public function testEagerLoadingDoesNotBreakRefresh() public function testEagerLoadingDoesNotBreakRefresh()
{ {
$train = new Train(new TrainOwner('Johannes')); $train = new Train(new TrainOwner('Johannes'));
@ -190,12 +193,12 @@ class OneToOneEagerLoadingTest extends \Doctrine\Tests\OrmFunctionalTestCase
$this->_em->persist($train); $this->_em->persist($train);
$this->_em->persist($order); $this->_em->persist($order);
$this->_em->flush(); $this->_em->flush();
$this->_em->getConnection()->exec("UPDATE TrainOrder SET train_id = NULL"); $this->_em->getConnection()->exec("UPDATE TrainOrder SET train_id = NULL");
$this->assertSame($train, $order->train); $this->assertSame($train, $order->train);
$this->_em->refresh($order); $this->_em->refresh($order);
$this->assertNull($order->train); $this->assertTrue($order->train === null, "Train reference was not refreshed to NULL.");
} }
} }
@ -332,9 +335,9 @@ class TrainOrder
/** @OneToOne(targetEntity = "Train", fetch = "EAGER") */ /** @OneToOne(targetEntity = "Train", fetch = "EAGER") */
public $train; public $train;
public function __construct(Train $train) public function __construct(Train $train)
{ {
$this->train = $train; $this->train = $train;
} }
} }

3
tests/Doctrine/Tests/ORM/Functional/Ticket/DDC371Test.php
View file

@ -5,6 +5,9 @@ use Doctrine\ORM\Query;
require_once __DIR__ . '/../../../TestInit.php'; require_once __DIR__ . '/../../../TestInit.php';
/**
* @group DDC-371
*/
class DDC371Test extends \Doctrine\Tests\OrmFunctionalTestCase class DDC371Test extends \Doctrine\Tests\OrmFunctionalTestCase
{ {
protected function setUp() protected function setUp()