RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-01 04:51:45 +03:00
Code Issues Projects Releases Wiki Activity

Fixed merging issue with sequence identifiers.

Browse Source
This commit is contained in:
Roman S. Borschel 2010-08-07 11:33:33 +02:00
parent 35af98260a
commit 29bf4adac7
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1405,7 +1405,9 @@ class UnitOfWork implements PropertyChangedListener
// Merge state of $entity into existing (managed) entity // Merge state of $entity into existing (managed) entity
foreach ($class->reflFields as $name => $prop) { foreach ($class->reflFields as $name => $prop) {
if ( ! isset($class->associationMappings[$name])) { if ( ! isset($class->associationMappings[$name])) {
$prop->setValue($managedCopy, $prop->getValue($entity)); if ( ! $class->isIdentifier($name)) {
$prop->setValue($managedCopy, $prop->getValue($entity));
}
} else { } else {
$assoc2 = $class->associationMappings[$name]; $assoc2 = $class->associationMappings[$name];
if ($assoc2->isOneToOne()) { if ($assoc2->isOneToOne()) {