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

[2.0][DDC-74] Fixed.

Browse Source
This commit is contained in:
romanb 2009-11-13 16:39:28 +00:00
parent 3a282b1e9c
commit 94d771172e
2 changed files with 63 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/Doctrine/ORM/UnitOfWork.php
View File

@ -613,16 +613,23 @@ class UnitOfWork implements PropertyChangedListener
* Computes the changeset of an individual entity, independently of the
* computeChangeSets() routine that is used at the beginning of a UnitOfWork#commit().
*
* The passed entity must be a managed entity.
* The passed entity must be a managed entity. If the entity already has a change set
* because this method is invoked during a commit cycle then the change sets are added.
* whereby changes detected in this method prevail.
*
* @ignore
* @param $class
* @param $entity
* @param ClassMetadata $class The class descriptor of the entity.
* @param object $entity The entity for which to (re)calculate the change set.
* @throws InvalidArgumentException If the passed entity is not MANAGED.
*/
public function computeSingleEntityChangeSet($class, $entity)
{
$oid = spl_object_hash($entity);
if ( ! isset($this->_entityStates[$oid]) || $this->_entityStates[$oid] != self::STATE_MANAGED) {
throw new \InvalidArgumentException('Entity must be managed.');
}
if ( ! $class->isInheritanceTypeNone()) {
$class = $this->_em->getClassMetadata(get_class($entity));
}
@ -634,12 +641,6 @@ class UnitOfWork implements PropertyChangedListener
}
}
if ( ! isset($this->_originalEntityData[$oid])) {
$this->_originalEntityData[$oid] = $actualData;
$this->_entityChangeSets[$oid] = array_map(
function($e) { return array(null, $e); }, $actualData
);
} else {
$originalData = $this->_originalEntityData[$oid];
$changeSet = array();
@ -653,9 +654,10 @@ class UnitOfWork implements PropertyChangedListener
}
if ($changeSet) {
$this->_entityChangeSets[$oid] = $changeSet;
$this->_originalEntityData[$oid] = $actualData;
if (isset($this->_entityChangeSets[$oid])) {
$this->_entityChangeSets[$oid] = $changeSet + $this->_entityChangeSets[$oid];
}
$this->_originalEntityData[$oid] = $actualData;
}
}

41
tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php
View File

@ -10,7 +10,8 @@ class LifecycleCallbackTest extends \Doctrine\Tests\OrmFunctionalTestCase
parent::setUp();
try {
$this->_schemaTool->createSchema(array(
$this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\LifecycleCallbackTestEntity')
$this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\LifecycleCallbackTestEntity'),
$this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\LifecycleCallbackTestUser')
));
} catch (\Exception $e) {
// Swallow all exceptions. We do not test the schema tool here.
@ -39,6 +40,42 @@ class LifecycleCallbackTest extends \Doctrine\Tests\OrmFunctionalTestCase
$this->assertEquals('changed from preUpdate callback!', $result[0]->value);
}
public function testChangesDontGetLost()
{
$user = new LifecycleCallbackTestUser;
$user->setName('Bob');
$user->setValue('');
$this->_em->persist($user);
$this->_em->flush();
$user->setName('Alice');
$this->_em->flush(); // Triggers preUpdate
$this->_em->clear();
$user2 = $this->_em->find(get_class($user), $user->getId());
$this->assertEquals('Alice', $user2->getName());
$this->assertEquals('Hello World', $user2->getValue());
}
}
/** @Entity @HasLifecycleCallbacks */
class LifecycleCallbackTestUser {
/** @Id @Column(type="integer") @GeneratedValue(strategy="AUTO") */
private $id;
/** @Column(type="string") */
private $value;
/** @Column(type="string") */
private $name;
public function getId() {return $this->id;}
public function getValue() {return $this->value;}
public function setValue($value) {$this->value = $value;}
public function getName() {return $this->name;}
public function setName($name) {$this->name = $name;}
/** @PreUpdate */
public function testCallback() {$this->value = 'Hello World';}
}
/**
@ -59,7 +96,7 @@ class LifecycleCallbackTestEntity
*/
private $id;
/**
* @Column(type="string", length=255)
* @Column(type="string")
*/
public $value;