From bd0fb574e3ac0a578202b171b83775b9a3bbf953 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Sun, 11 Dec 2011 16:07:35 +0100
Subject: [PATCH] DDC-1515 - Merge from 2.1.x

---
 .../Internal/Hydration/AbstractHydrator.php   |  1 +
 .../ORM/Internal/Hydration/ObjectHydrator.php |  4 +-
 .../ORM/Functional/Ticket/DDC1515Test.php     | 64 +++++++++++++++++++
 3 files changed, 67 insertions(+), 2 deletions(-)
 create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1515Test.php

diff --git a/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php
index 146dfb5c5..436a93666 100644
--- a/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php
+++ b/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php
@@ -244,6 +244,7 @@ abstract class AbstractHydrator
 
             if (isset($cache[$key]['isMetaColumn'])) {
                 if ( ! isset($rowData[$dqlAlias][$cache[$key]['fieldName']]) || $value !== null) {
+                    $nonemptyComponents[$dqlAlias] = true;
                     $rowData[$dqlAlias][$cache[$key]['fieldName']] = $value;
                 }
 
diff --git a/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
index 36dbfa46a..49737ac58 100644
--- a/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
+++ b/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
@@ -332,9 +332,9 @@ class ObjectHydrator extends AbstractHydrator
         // Hydrate the data chunks
         foreach ($rowData as $dqlAlias => $data) {
             $entityName = $this->_rsm->aliasMap[$dqlAlias];
-
+ 
             if (isset($this->_rsm->parentAliasMap[$dqlAlias])) {
-                // It's a joined result
+               // It's a joined result
 
                 $parentAlias = $this->_rsm->parentAliasMap[$dqlAlias];
                 // we need the $path to save into the identifier map which entities were already
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1515Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1515Test.php
new file mode 100644
index 000000000..9bd3360b8
--- /dev/null
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1515Test.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+
+/**
+ * @group DDC-1515
+ */
+class DDC1515Test extends \Doctrine\Tests\OrmFunctionalTestCase
+{
+    public function setUp()
+    {
+        parent::setUp();
+        $this->_schemaTool->createSchema(array(
+            $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1515Foo'),
+            $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1515Bar'),
+        ));
+    }
+
+    public function testIssue()
+    {
+        $bar = new DDC1515Bar();
+        $this->_em->persist($bar);
+        $this->_em->flush();
+
+        $foo = new DDC1515Foo();
+        $foo->bar = $bar;
+        $this->_em->persist($foo);
+        $this->_em->flush();
+        $this->_em->clear();
+
+        $bar = $this->_em->find(__NAMESPACE__ . '\DDC1515Bar', $bar->id);
+        $this->assertInstanceOf(__NAMESPACE__.'\DDC1515Foo', $bar->foo);
+    }
+}
+
+/**
+ * @Entity
+ */
+class DDC1515Foo
+{
+    /**
+     * @OneToOne(targetEntity="DDC1515Bar", inversedBy="foo") @Id
+     */
+    public $bar;
+}
+
+/**
+ * @Entity
+ */
+class DDC1515Bar
+{
+    /**
+     * @Id @Column(type="integer") @GeneratedValue
+     */
+    public $id;
+
+    /**
+     * @OneToOne(targetEntity="DDC1515Foo", mappedBy="bar")
+     */
+    public $foo;
+}
+
+