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

[2.0] Fixed _doMerge not to use hydrateAdd.

Browse source
This commit is contained in:
romanb 2009-12-11 10:38:21 +00:00
parent 731c9718aa
commit 097d1d6bee
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Doctrine/ORM/Persisters/StandardEntityPersister.php
View file

@ -157,7 +157,7 @@ class StandardEntityPersister
} }
} }
} }
$stmt->execute(); $stmt->execute();
if ($isPostInsertId) { if ($isPostInsertId) {

10
lib/Doctrine/ORM/UnitOfWork.php
View file

@ -1376,11 +1376,11 @@ class UnitOfWork implements PropertyChangedListener
} }
} }
if ($class->isChangeTrackingNotify()) { if ($class->isChangeTrackingNotify()) {
//TODO //TODO: put changed fields in changeset...?
} }
} }
if ($class->isChangeTrackingDeferredExplicit()) { if ($class->isChangeTrackingDeferredExplicit()) {
//TODO //TODO: Mark $managedCopy for dirty check...? ($this->_scheduledForDirtyCheck)
} }
} }
@ -1389,8 +1389,12 @@ class UnitOfWork implements PropertyChangedListener
$prevClass = $this->_em->getClassMetadata(get_class($prevManagedCopy)); $prevClass = $this->_em->getClassMetadata(get_class($prevManagedCopy));
if ($assoc->isOneToOne()) { if ($assoc->isOneToOne()) {
$prevClass->reflFields[$assocField]->setValue($prevManagedCopy, $managedCopy); $prevClass->reflFields[$assocField]->setValue($prevManagedCopy, $managedCopy);
//TODO: What about back-reference if bidirectional?
} else { } else {
$prevClass->reflFields[$assocField]->getValue($prevManagedCopy)->hydrateAdd($managedCopy); $prevClass->reflFields[$assocField]->getValue($prevManagedCopy)->unwrap()->add($managedCopy);
if ($assoc->isOneToMany()) {
$class->reflFields[$assoc->mappedByFieldName]->setValue($managedCopy, $prevManagedCopy);
}
} }
} }