Merge branch 'DDC-2645'

lib/Doctrine/ORM/UnitOfWork.php

@@ -1735,6 +1735,8 @@ class UnitOfWork implements PropertyChangedListener
                 $associatedId        = $this->getEntityIdentifier($idValue);
 
                 $flatId[$idField] = $associatedId[$targetClassMetadata->identifier[0]];
+            } else {
+                $flatId[$idField] = $idValue;
             }
         }
 

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2645Test.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+require_once __DIR__ . '/../../../TestInit.php';
+
+/**
+ * @group DDC-2645
+ */
+class DDC2645Test extends \Doctrine\Tests\OrmFunctionalTestCase
+{
+    public function testIssue()
+    {
+        $bar = new DDC2645Bar;
+        $bar->id = 123;
+
+        $foo = new DDC2645Foo(1, $bar, 'Foo');
+        $foo2 = new DDC2645Foo(1, $bar, 'Bar');
+
+        $this->_em->persist($bar);
+        $this->_em->persist($foo);
+
+        $foo3 = $this->_em->merge($foo2);
+
+        $this->assertSame($foo, $foo3);
+        $this->assertEquals('Bar', $foo->name);
+    }
+}
+
+/** @Entity */
+class DDC2645Foo
+{
+    /** @Id @Column(type="integer") */
+    private $id;
+
+    /** @Id @ManyToOne(targetEntity="DDC2645Bar") */
+    private $bar;
+
+    /** @Column */
+    public $name;
+
+    public function __construct($id, $bar, $name)
+    {
+        $this->id = $id;
+        $this->bar = $bar;
+        $this->name = $name;
+    }
+}
+
+/** @Entity */
+class DDC2645Bar
+{
+    /** @Id @Column(type="integer") @GeneratedValue(strategy="NONE") */
+    public $id;
+}