Fix internal query that does not work when using discriminatorMap and no targetDocument.

Author: jwage

lib/Doctrine/ODM/MongoDB/Hydrator/HydratorFactory.php

@@ -268,7 +268,7 @@ private function generateHydratorClass(ClassMetadata $class, $hydratorClassName,
         \$className = \$mapping['targetDocument'];
         \$targetClass = \$this->dm->getClassMetadata(\$mapping['targetDocument']);
         \$mappedByMapping = \$targetClass->fieldMappings[\$mapping['mappedBy']];
-        \$mappedByFieldName = isset(\$mappedByMapping['simple']) && \$mappedByMapping['simple'] ? \$mapping['mappedBy'] : \$mapping['mappedBy'].'.id';
+        \$mappedByFieldName = isset(\$mappedByMapping['simple']) && \$mappedByMapping['simple'] ? \$mapping['mappedBy'] : \$mapping['mappedBy'].'.\$id';
         \$criteria = array_merge(
             array(\$mappedByFieldName => \$data['_id']),
             isset(\$this->class->fieldMappings['%2\$s']['criteria']) ? \$this->class->fieldMappings['%2\$s']['criteria'] : array() 

lib/Doctrine/ODM/MongoDB/Persisters/DocumentPersister.php

@@ -694,7 +694,7 @@ private function loadReferenceManyCollectionInverseSide(PersistentCollection $co
         $ownerClass = $this->dm->getClassMetadata(get_class($owner));
         $targetClass = $this->dm->getClassMetadata($mapping['targetDocument']);
         $mappedByMapping = $targetClass->fieldMappings[$mapping['mappedBy']];
-        $mappedByFieldName = isset($mappedByMapping['simple']) && $mappedByMapping['simple'] ? $mapping['mappedBy'] : $mapping['mappedBy'].'.id';
+        $mappedByFieldName = isset($mappedByMapping['simple']) && $mappedByMapping['simple'] ? $mapping['mappedBy'] : $mapping['mappedBy'].'.$id';
         $criteria = array_merge(
             array($mappedByFieldName => $ownerClass->getIdentifierObject($owner)),
             isset($mapping['criteria']) ? $mapping['criteria'] : array()

tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/GH426Test.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket;
+
+use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
+
+class GH426Test extends \Doctrine\ODM\MongoDB\Tests\BaseTest
+{
+    public function testTest()
+    {
+        $form = new GH426Form();
+        $form->fields[] = new GH426Field($form);
+        $form->fields[] = new GH426Field($form);
+
+        $this->dm->persist($form);
+        $this->dm->flush();
+        $this->dm->clear();
+
+        $form = $this->dm->find('Doctrine\ODM\MongoDB\Tests\Functional\Ticket\GH426Form', $form->id);
+
+        $this->assertEquals(2, $form->fields->count());
+        $this->assertSame($form->fields[0], $form->firstField);
+        $this->assertSame($form->fields[1], $form->lastField);
+        $this->assertInstanceOf('Doctrine\ODM\MongoDB\Tests\Functional\Ticket\GH426Field', $form->firstField);
+        $this->assertInstanceOf('Doctrine\ODM\MongoDB\Tests\Functional\Ticket\GH426Field', $form->lastField);
+    }
+}
+
+/** @ODM\Document */
+class GH426Form
+{
+    /** @ODM\Id */
+    public $id;
+
+    /** @ODM\ReferenceMany(targetDocument="GH426Field", mappedBy="form", cascade={"all"}) */
+    public $fields = array();
+
+    /** @ODM\ReferenceOne(targetDocument="GH426Field", mappedBy="form", sort={"_id":1}) */
+    public $firstField;
+
+    /** @ODM\ReferenceOne(targetDocument="GH426Field", mappedBy="form", sort={"_id":-1}) */
+    public $lastField;
+}
+
+/** @ODM\Document */
+class GH426Field
+{
+    /** @ODM\Id */
+    public $id;
+
+    /** @ODM\ReferenceOne(inversedBy="fields", discriminatorMap={"f":"GH426Form"}, discriminatorField="type", cascade={"all"}) */
+    public $form;
+
+    public function __construct(GH426Form $form)
+    {
+        $this->form = $form;
+    }
+}