From 17c1ed948e3a6394b7b758b7f8f1a330cedfcdb5 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sat, 5 Feb 2011 09:31:40 +0100 Subject: [PATCH 1/4] [DDC-250] Initial untested support for @ManyToMany(indexBy) and @OneToMany(indexBy) option. --- .../ORM/Mapping/ClassMetadataInfo.php | 10 +++ .../ORM/Mapping/Driver/AnnotationDriver.php | 2 + .../Mapping/Driver/DoctrineAnnotations.php | 2 + lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php | 8 +++ .../ORM/Mapping/Driver/YamlDriver.php | 8 +++ .../ORM/Persisters/BasicEntityPersister.php | 64 +++++++++++++------ 6 files changed, 75 insertions(+), 19 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php index 353f47128..1ec61b666 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php @@ -376,6 +376,11 @@ class ClassMetadataInfo * Only valid for many-to-many mappings. Note that one-to-many associations can be mapped * through a join table by simply mapping the association as many-to-many with a unique * constraint on the join table. + * + * - indexBy (string, optional, to-many only) + * Specification of a field on target-entity that is used to index the collection by. + * This field HAS to be either the primary key or a unique column. Otherwise the collection + * does not contain all the entities that are actually related. * * A join table definition has the following structure: * 
@@ -717,6 +722,11 @@ class ClassMetadataInfo
         }
         $mapping['isOwningSide'] = true; // assume owning side until we hit mappedBy
 
+        // unset optional indexBy attribute if its empty
+        if (isset($mapping['indexBy']) && !$mapping['indexBy']) {
+            unset($mapping['indexBy']);
+        }
+
         // If targetEntity is unqualified, assume it is in the same namespace as
         // the sourceEntity.
         $mapping['sourceEntity'] = $this->name;
diff --git a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
index 81dcc90da..9eb83c2b8 100644
--- a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
+++ b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
@@ -304,6 +304,7 @@ class AnnotationDriver implements Driver
                 $mapping['mappedBy'] = $oneToManyAnnot->mappedBy;
                 $mapping['targetEntity'] = $oneToManyAnnot->targetEntity;
                 $mapping['cascade'] = $oneToManyAnnot->cascade;
+                $mapping['indexBy'] = $oneToManyAnnot->indexBy;
                 $mapping['orphanRemoval'] = $oneToManyAnnot->orphanRemoval;
                 $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $oneToManyAnnot->fetch);
 
@@ -362,6 +363,7 @@ class AnnotationDriver implements Driver
                 $mapping['mappedBy'] = $manyToManyAnnot->mappedBy;
                 $mapping['inversedBy'] = $manyToManyAnnot->inversedBy;
                 $mapping['cascade'] = $manyToManyAnnot->cascade;
+                $mapping['indexBy'] = $manyToManyAnnot->indexBy;
                 $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $manyToManyAnnot->fetch);
 
                 if ($orderByAnnot = $this->_reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\OrderBy')) {
diff --git a/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php b/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php
index 435676566..ef566a083 100644
--- a/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php
+++ b/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php
@@ -80,6 +80,7 @@ final class OneToMany extends Annotation {
     public $cascade;
     public $fetch = 'LAZY';
     public $orphanRemoval = false;
+    public $indexBy;
 }
 final class ManyToOne extends Annotation {
     public $targetEntity;
@@ -93,6 +94,7 @@ final class ManyToMany extends Annotation {
     public $inversedBy;
     public $cascade;
     public $fetch = 'LAZY';
+    public $indexBy;
 }
 final class ElementCollection extends Annotation {
     public $tableName;
diff --git a/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
index cd84849ae..3ec712b70 100644
--- a/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
+++ b/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
@@ -309,6 +309,10 @@ class XmlDriver extends AbstractFileDriver
                     $mapping['orderBy'] = $orderBy;
                 }
 
+                if (isset($oneToManyElement->{'index-by'})) {
+                    $mapping['indexBy'] = (string)$oneToManyElement->{'index-by'};
+                }
+
                 $metadata->mapOneToMany($mapping);
             }
         }
@@ -415,6 +419,10 @@ class XmlDriver extends AbstractFileDriver
                     $mapping['orderBy'] = $orderBy;
                 }
 
+                if (isset($manyToManyElement->{'index-by'})) {
+                    $mapping['indexBy'] = (string)$manyToManyElement->{'index-by'};
+                }
+
                 $metadata->mapManyToMany($mapping);
             }
         }
diff --git a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php
index 0a6c6d0bd..0f88474f1 100644
--- a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php
+++ b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php
@@ -301,6 +301,10 @@ class YamlDriver extends AbstractFileDriver
                     $mapping['orderBy'] = $oneToManyElement['orderBy'];
                 }
 
+                if (isset($oneToManyElement['indexBy'])) {
+                    $mapping['indexBy'] = $oneToManyElement['indexBy'];
+                }
+
                 $metadata->mapOneToMany($mapping);
             }
         }
@@ -404,6 +408,10 @@ class YamlDriver extends AbstractFileDriver
                     $mapping['orderBy'] = $manyToManyElement['orderBy'];
                 }
 
+                if (isset($manyToManyElement['indexBy'])) {
+                    $mapping['indexBy'] = $manyToManyElement['indexBy'];
+                }
+
                 $metadata->mapManyToMany($mapping);
             }
         }
diff --git a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
index 242a500df..0cfd5e8cd 100644
--- a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
+++ b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
@@ -750,15 +750,55 @@ class BasicEntityPersister
     public function getManyToManyCollection(array $assoc, $sourceEntity, $offset = null, $limit = null)
     {
         $stmt = $this->getManyToManyStatement($assoc, $sourceEntity, $offset, $limit);
+        return $this->loadArrayFromStatement($assoc, $stmt);
+    }
 
+    /**
+     * Load an array of entities from a given dbal statement.
+     * 
+     * @param array $assoc
+     * @param Doctrine\DBAL\Statement $stmt
+     * @return array
+     */
+    private function loadArrayFromStatement($assoc, $stmt)
+    {
         $entities = array();
-        while ($result = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            $entities[] = $this->_createEntity($result);
+        if ($assoc['indexBy']) {
+            while ($result = $stmt->fetch(PDO::FETCH_ASSOC)) {
+                $entity = $this->_createEntity($result);
+                $entities[$this->_class->reflFields[$assoc['indexBy']]->getValue($entity)] = $entity;
+            }
+        } else {
+            while ($result = $stmt->fetch(PDO::FETCH_ASSOC)) {
+                $entities[] = $this->_createEntity($result);
+            }
         }
         $stmt->closeCursor();
         return $entities;
     }
 
+    /**
+     * Hydrate a collection from a given dbal statement.
+     * 
+     * @param array $assoc
+     * @param Doctrine\DBAL\Statement $stmt
+     * @param PersistentCollection $coll
+     */
+    private function loadCollectionFromStatement($assoc, $stmt, $coll)
+    {
+        if ($assoc['indexBy']) {
+            while ($result = $stmt->fetch(PDO::FETCH_ASSOC)) {
+                $entity = $this->_createEntity($result);
+                $coll->hydrateSet($this->_class->reflFields[$assoc['indexBy']]->getValue($entity), $entity);
+            }
+        } else {
+            while ($result = $stmt->fetch(PDO::FETCH_ASSOC)) {
+                $coll->hydrateAdd($this->_createEntity($result));
+            }
+        }
+        $stmt->closeCursor();
+    }
+
     /**
      * Loads a collection of entities of a many-to-many association.
      *
@@ -772,11 +812,7 @@ class BasicEntityPersister
     public function loadManyToManyCollection(array $assoc, $sourceEntity, PersistentCollection $coll)
     {
         $stmt = $this->getManyToManyStatement($assoc, $sourceEntity);
-
-        while ($result = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            $coll->hydrateAdd($this->_createEntity($result));
-        }
-        $stmt->closeCursor();
+        return $this->loadCollectionFromStatement($assoc, $stmt, $coll);
     }
 
     private function getManyToManyStatement(array $assoc, $sourceEntity, $offset = null, $limit = null)
@@ -1238,13 +1274,7 @@ class BasicEntityPersister
     public function getOneToManyCollection(array $assoc, $sourceEntity, $offset = null, $limit = null)
     {
         $stmt = $this->getOneToManyStatement($assoc, $sourceEntity, $offset, $limit);
-
-        $entities = array();
-        while ($result = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            $entities[] = $this->_createEntity($result);
-        }
-        $stmt->closeCursor();
-        return $entities;
+        return $this->loadArrayFromStatement($assoc, $stmt);
     }
 
     /**
@@ -1259,11 +1289,7 @@ class BasicEntityPersister
     public function loadOneToManyCollection(array $assoc, $sourceEntity, PersistentCollection $coll)
     {
         $stmt = $this->getOneToManyStatement($assoc, $sourceEntity);
-
-        while ($result = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            $coll->hydrateAdd($this->_createEntity($result));
-        }
-        $stmt->closeCursor();
+        $this->loadCollectionFromStatement($assoc, $stmt, $coll);
     }
 
     /**

From 61e2cdc6b010f6c9bd023c0e6b7237c6e04bb356 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei 
Date: Sat, 5 Feb 2011 10:02:37 +0100
Subject: [PATCH 2/4] [DDC-1018] Bugfix: INDEX BY was not working in JOIN
 Declarations, only in FROM.

---
 lib/Doctrine/ORM/Query/SqlWalker.php          |   8 ++
 .../ORM/Functional/Ticket/DDC618Test.php      | 107 +++++++++++++++++-
 2 files changed, 113 insertions(+), 2 deletions(-)

diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php
index 827ebe4ab..ebbefbce8 100644
--- a/lib/Doctrine/ORM/Query/SqlWalker.php
+++ b/lib/Doctrine/ORM/Query/SqlWalker.php
@@ -718,6 +718,14 @@ class SqlWalker implements TreeWalker
         $join = $joinVarDecl->join;
         $joinType = $join->joinType;
 
+        if ($joinVarDecl->indexBy) {
+            // For Many-To-One or One-To-One associations this obviously makes no sense, but is ignored silently.
+            $this->_rsm->addIndexBy(
+                $joinVarDecl->indexBy->simpleStateFieldPathExpression->identificationVariable,
+                $joinVarDecl->indexBy->simpleStateFieldPathExpression->field
+            );
+        }
+
         if ($joinType == AST\Join::JOIN_TYPE_LEFT || $joinType == AST\Join::JOIN_TYPE_LEFTOUTER) {
             $sql = ' LEFT JOIN ';
         } else {
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC618Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC618Test.php
index 2d007553f..82cf765c3 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC618Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC618Test.php
@@ -6,6 +6,9 @@ use DateTime;
 
 require_once __DIR__ . '/../../../TestInit.php';
 
+/**
+ * @group DDC-618
+ */
 class DDC618Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected function setUp()
@@ -13,7 +16,8 @@ class DDC618Test extends \Doctrine\Tests\OrmFunctionalTestCase
         parent::setUp();
         try {
             $this->_schemaTool->createSchema(array(
-                $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC618Author')
+                $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC618Author'),
+                $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC618Book')
             ));
 
             // Create author 10/Joe with two books 22/JoeA and 20/JoeB
@@ -26,6 +30,10 @@ class DDC618Test extends \Doctrine\Tests\OrmFunctionalTestCase
             $author = new DDC618Author();
             $author->id = 11;
             $author->name = 'Alice';
+            $author->addBook('In Wonderland');
+            $author->addBook('Reloaded');
+            $author->addBook('Test');
+
             $this->_em->persist($author);
 
             $this->_em->flush();
@@ -58,11 +66,71 @@ class DDC618Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertArrayHasKey('Joe', $result, "INDEX BY A.name should return an index by the name of 'Joe'.");
         $this->assertArrayHasKey('Alice', $result, "INDEX BY A.name should return an index by the name of 'Alice'.");
     }
+
+    /**
+     * @group DDC-1018
+     */
+    public function testIndexByJoin()
+    {
+        $dql = 'SELECT A, B FROM Doctrine\Tests\ORM\Functional\Ticket\DDC618Author A '.
+               'INNER JOIN A.books B INDEX BY B.title ORDER BY A.name ASC';
+        $result = $this->_em->createQuery($dql)->getResult(\Doctrine\ORM\Query::HYDRATE_OBJECT);
+
+        $this->assertEquals(3, count($result[0]->books)); // Alice, Joe doesnt appear because he has no books.
+        $this->assertEquals('Alice', $result[0]->name);
+        $this->assertTrue( isset($result[0]->books["In Wonderland"] ), "Indexing by title should have books by title.");
+        $this->assertTrue( isset($result[0]->books["Reloaded"] ), "Indexing by title should have books by title.");
+        $this->assertTrue( isset($result[0]->books["Test"] ), "Indexing by title should have books by title.");
+
+        $result = $this->_em->createQuery($dql)->getResult(\Doctrine\ORM\Query::HYDRATE_ARRAY);
+
+        $this->assertEquals(3, count($result[0]['books'])); // Alice, Joe doesnt appear because he has no books.
+        $this->assertEquals('Alice', $result[0]['name']);
+        $this->assertTrue( isset($result[0]['books']["In Wonderland"] ), "Indexing by title should have books by title.");
+        $this->assertTrue( isset($result[0]['books']["Reloaded"] ), "Indexing by title should have books by title.");
+        $this->assertTrue( isset($result[0]['books']["Test"] ), "Indexing by title should have books by title.");
+    }
+
+    /**
+     * @group DDC-1018
+     */
+    public function testIndexByToOneJoinSilentlyIgnored()
+    {
+        $dql = 'SELECT B, A FROM Doctrine\Tests\ORM\Functional\Ticket\DDC618Book B '.
+               'INNER JOIN B.author A INDEX BY A.name ORDER BY A.name ASC';
+        $result = $this->_em->createQuery($dql)->getResult(\Doctrine\ORM\Query::HYDRATE_OBJECT);
+
+        $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\Ticket\DDC618Book', $result[0]);
+        $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\Ticket\DDC618Author', $result[0]->author);
+
+        $dql = 'SELECT B, A FROM Doctrine\Tests\ORM\Functional\Ticket\DDC618Book B '.
+               'INNER JOIN B.author A INDEX BY A.name ORDER BY A.name ASC';
+        $result = $this->_em->createQuery($dql)->getResult(\Doctrine\ORM\Query::HYDRATE_ARRAY);
+
+        $this->assertEquals("Alice", $result[0]['author']['name']);
+    }
+
+    /**
+     * @group DDC-1018
+     */
+    public function testCombineIndexBy()
+    {
+        $dql = 'SELECT A, B FROM Doctrine\Tests\ORM\Functional\Ticket\DDC618Author A INDEX BY A.id '.
+               'INNER JOIN A.books B INDEX BY B.title ORDER BY A.name ASC';
+        $result = $this->_em->createQuery($dql)->getResult(\Doctrine\ORM\Query::HYDRATE_OBJECT);
+
+        $this->assertArrayHasKey(11, $result); // Alice
+
+        $this->assertEquals(3, count($result[11]->books)); // Alice, Joe doesnt appear because he has no books.
+        $this->assertEquals('Alice', $result[11]->name);
+        $this->assertTrue( isset($result[11]->books["In Wonderland"] ), "Indexing by title should have books by title.");
+        $this->assertTrue( isset($result[11]->books["Reloaded"] ), "Indexing by title should have books by title.");
+        $this->assertTrue( isset($result[11]->books["Test"] ), "Indexing by title should have books by title.");
+    }
 }
 
 /**
  * @Entity
- * @Table (name="ddc618author", uniqueConstraints={ @Index (name="UQ_authorname", columns={ "name" }) })
  */
 class DDC618Author
 {
@@ -75,8 +143,43 @@ class DDC618Author
     /** @Column(type="string") */
     public $name;
 
+    /**
+     * @OneToMany(targetEntity="DDC618Book", mappedBy="author", cascade={"persist"})
+     */
+    public $books;
+
     public function __construct()
     {
         $this->books = new \Doctrine\Common\Collections\ArrayCollection;
     }
+
+    public function addBook($title)
+    {
+        $book = new DDC618Book($title, $this);
+        $this->books[] = $book;
+    }
+}
+
+/**
+ * @Entity
+ */
+class DDC618Book
+{
+    /**
+     * @Id @GeneratedValue
+     * @Column(type="integer")
+     */
+    public $id;
+
+    /** @column(type="string") */
+    public $title;
+
+    /** @ManyToOne(targetEntity="DDC618Author", inversedBy="books") */
+    public $author;
+
+    function __construct($title, $author)
+    {
+        $this->title = $title;
+        $this->author = $author;
+    }
 }
\ No newline at end of file

From 9768d08458f94a8496d864734fe1b188329804ca Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei 
Date: Sat, 5 Feb 2011 11:42:10 +0100
Subject: [PATCH 3/4] [DDC-250] Add tests and fix some glitches and finalized
 index-by patch.

---
 doctrine-mapping.xsd                          |   2 +
 .../ORM/Mapping/ClassMetadataInfo.php         |   2 +-
 .../ORM/Persisters/BasicEntityPersister.php   |   4 +-
 lib/Doctrine/ORM/Query/Parser.php             |   4 +
 lib/Doctrine/ORM/Query/SqlWalker.php          |  18 +--
 .../Tests/Models/StockExchange/Bond.php       |  48 ++++++++
 .../Tests/Models/StockExchange/Market.php     |  56 ++++++++++
 .../Tests/Models/StockExchange/Stock.php      |  49 ++++++++
 .../Tests/ORM/Functional/AllTests.php         |   1 +
 .../ORM/Functional/IndexByAssociationTest.php | 105 ++++++++++++++++++
 .../Doctrine/Tests/OrmFunctionalTestCase.php  |  11 ++
 11 files changed, 289 insertions(+), 11 deletions(-)
 create mode 100644 tests/Doctrine/Tests/Models/StockExchange/Bond.php
 create mode 100644 tests/Doctrine/Tests/Models/StockExchange/Market.php
 create mode 100644 tests/Doctrine/Tests/Models/StockExchange/Stock.php
 create mode 100644 tests/Doctrine/Tests/ORM/Functional/IndexByAssociationTest.php

diff --git a/doctrine-mapping.xsd b/doctrine-mapping.xsd
index f1f8db814..b8e4de1a7 100644
--- a/doctrine-mapping.xsd
+++ b/doctrine-mapping.xsd
@@ -257,6 +257,7 @@
     
     
     
+    
     
     
   
@@ -269,6 +270,7 @@
     
     
     
+    
     
     
   
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
index 1ec61b666..5e96cc4c1 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
@@ -723,7 +723,7 @@ class ClassMetadataInfo
         $mapping['isOwningSide'] = true; // assume owning side until we hit mappedBy
 
         // unset optional indexBy attribute if its empty
-        if (isset($mapping['indexBy']) && !$mapping['indexBy']) {
+        if (!isset($mapping['indexBy']) || !$mapping['indexBy']) {
             unset($mapping['indexBy']);
         }
 
diff --git a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
index 0cfd5e8cd..56e91e49a 100644
--- a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
+++ b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
@@ -763,7 +763,7 @@ class BasicEntityPersister
     private function loadArrayFromStatement($assoc, $stmt)
     {
         $entities = array();
-        if ($assoc['indexBy']) {
+        if (isset($assoc['indexBy'])) {
             while ($result = $stmt->fetch(PDO::FETCH_ASSOC)) {
                 $entity = $this->_createEntity($result);
                 $entities[$this->_class->reflFields[$assoc['indexBy']]->getValue($entity)] = $entity;
@@ -786,7 +786,7 @@ class BasicEntityPersister
      */
     private function loadCollectionFromStatement($assoc, $stmt, $coll)
     {
-        if ($assoc['indexBy']) {
+        if (isset($assoc['indexBy'])) {
             while ($result = $stmt->fetch(PDO::FETCH_ASSOC)) {
                 $entity = $this->_createEntity($result);
                 $coll->hydrateSet($this->_class->reflFields[$assoc['indexBy']]->getValue($entity), $entity);
diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php
index 0c22c9fbf..63351a89a 100644
--- a/lib/Doctrine/ORM/Query/Parser.php
+++ b/lib/Doctrine/ORM/Query/Parser.php
@@ -923,6 +923,10 @@ class Parser
         $token = $this->_lexer->lookahead;
         $identVariable = $this->IdentificationVariable();
 
+        if (!isset($this->_queryComponents[$identVariable])) {
+            $this->semanticalError('Identification Variable ' . $identVariable .' used in join path expression but was not defined before.');
+        }
+
         $this->match(Lexer::T_DOT);
         $this->match(Lexer::T_IDENTIFIER);
 
diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php
index ebbefbce8..202170c23 100644
--- a/lib/Doctrine/ORM/Query/SqlWalker.php
+++ b/lib/Doctrine/ORM/Query/SqlWalker.php
@@ -718,14 +718,6 @@ class SqlWalker implements TreeWalker
         $join = $joinVarDecl->join;
         $joinType = $join->joinType;
 
-        if ($joinVarDecl->indexBy) {
-            // For Many-To-One or One-To-One associations this obviously makes no sense, but is ignored silently.
-            $this->_rsm->addIndexBy(
-                $joinVarDecl->indexBy->simpleStateFieldPathExpression->identificationVariable,
-                $joinVarDecl->indexBy->simpleStateFieldPathExpression->field
-            );
-        }
-
         if ($joinType == AST\Join::JOIN_TYPE_LEFT || $joinType == AST\Join::JOIN_TYPE_LEFTOUTER) {
             $sql = ' LEFT JOIN ';
         } else {
@@ -750,6 +742,16 @@ class SqlWalker implements TreeWalker
             }
         }
 
+        if ($joinVarDecl->indexBy) {
+            // For Many-To-One or One-To-One associations this obviously makes no sense, but is ignored silently.
+            $this->_rsm->addIndexBy(
+                $joinVarDecl->indexBy->simpleStateFieldPathExpression->identificationVariable,
+                $joinVarDecl->indexBy->simpleStateFieldPathExpression->field
+            );
+        } else if (isset($relation['indexBy'])) {
+            $this->_rsm->addIndexBy($joinedDqlAlias, $relation['indexBy']);
+        }
+
         // This condition is not checking ClassMetadata::MANY_TO_ONE, because by definition it cannot
         // be the owning side and previously we ensured that $assoc is always the owning side of the associations.
         // The owning side is necessary at this point because only it contains the JoinColumn information.
diff --git a/tests/Doctrine/Tests/Models/StockExchange/Bond.php b/tests/Doctrine/Tests/Models/StockExchange/Bond.php
new file mode 100644
index 000000000..c8d661782
--- /dev/null
+++ b/tests/Doctrine/Tests/Models/StockExchange/Bond.php
@@ -0,0 +1,48 @@
+name = $name;
+    }
+
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    public function addStock(Stock $stock)
+    {
+        $this->stocks[$stock->getSymbol()] = $stock;
+    }
+}
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/Models/StockExchange/Market.php b/tests/Doctrine/Tests/Models/StockExchange/Market.php
new file mode 100644
index 000000000..87e12cab6
--- /dev/null
+++ b/tests/Doctrine/Tests/Models/StockExchange/Market.php
@@ -0,0 +1,56 @@
+name = $name;
+        $this->stocks = new ArrayCollection();
+    }
+
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    public function addStock(Stock $stock)
+    {
+        $this->stocks[$stock->getSymbol()] = $stock;
+    }
+
+    public function getStock($symbol)
+    {
+        return $this->stocks[$symbol];
+    }
+}
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/Models/StockExchange/Stock.php b/tests/Doctrine/Tests/Models/StockExchange/Stock.php
new file mode 100644
index 000000000..d65675be9
--- /dev/null
+++ b/tests/Doctrine/Tests/Models/StockExchange/Stock.php
@@ -0,0 +1,49 @@
+symbol = $symbol;
+        $this->price = $initialOfferingPrice;
+        $this->market = $market;
+        $market->addStock($this);
+    }
+
+    public function getSymbol()
+    {
+        return $this->symbol;
+    }
+}
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/ORM/Functional/AllTests.php b/tests/Doctrine/Tests/ORM/Functional/AllTests.php
index 0759bcf7f..319d5bb50 100644
--- a/tests/Doctrine/Tests/ORM/Functional/AllTests.php
+++ b/tests/Doctrine/Tests/ORM/Functional/AllTests.php
@@ -45,6 +45,7 @@ class AllTests
         $suite->addTestSuite('Doctrine\Tests\ORM\Functional\ManyToManySelfReferentialAssociationTest');
         $suite->addTestSuite('Doctrine\Tests\ORM\Functional\OrderedCollectionTest');
         $suite->addTestSuite('Doctrine\Tests\ORM\Functional\OrderedJoinedTableInheritanceCollectionTest');
+        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\IndexByAssociationTest');
         $suite->addTestSuite('Doctrine\Tests\ORM\Functional\CompositePrimaryKeyTest');
         $suite->addTestSuite('Doctrine\Tests\ORM\Functional\ReferenceProxyTest');
         $suite->addTestSuite('Doctrine\Tests\ORM\Functional\LifecycleCallbackTest');
diff --git a/tests/Doctrine/Tests/ORM/Functional/IndexByAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/IndexByAssociationTest.php
new file mode 100644
index 000000000..bca4ea5df
--- /dev/null
+++ b/tests/Doctrine/Tests/ORM/Functional/IndexByAssociationTest.php
@@ -0,0 +1,105 @@
+useModelSet('stockexchange');
+        parent::setUp();
+        $this->loadFixture();
+    }
+
+    public function loadFixture()
+    {
+        $this->market = new Market("Some Exchange");
+        $stock1 = new Stock("AAPL", 10, $this->market);
+        $stock2 = new Stock("GOOG", 20, $this->market);
+
+        $this->bond = new Bond("MyBond");
+        $this->bond->addStock($stock1);
+        $this->bond->addStock($stock2);
+
+        $this->_em->persist($this->market);
+        $this->_em->persist($stock1);
+        $this->_em->persist($stock2);
+        $this->_em->persist($this->bond);
+        $this->_em->flush();
+        $this->_em->clear();
+    }
+
+    public function testManyToOneFinder()
+    {
+        /* @var $market Doctrine\Tests\Models\StockExchange\Market */
+        $market = $this->_em->find('Doctrine\Tests\Models\StockExchange\Market', $this->market->getId());
+
+        $this->assertEquals(2, count($market->stocks));
+        $this->assertTrue(isset($market->stocks['AAPL']), "AAPL symbol has to be key in indexed assocation.");
+        $this->assertTrue(isset($market->stocks['GOOG']), "GOOG symbol has to be key in indexed assocation.");
+        $this->assertEquals("AAPL", $market->stocks['AAPL']->getSymbol());
+        $this->assertEquals("GOOG", $market->stocks['GOOG']->getSymbol());
+    }
+
+    public function testManyToOneDQL()
+    {
+        $dql = "SELECT m, s FROM Doctrine\Tests\Models\StockExchange\Market m JOIN m.stocks s WHERE m.id = ?1";
+        $market = $this->_em->createQuery($dql)->setParameter(1, $this->market->getId())->getSingleResult();
+
+        $this->assertEquals(2, count($market->stocks));
+        $this->assertTrue(isset($market->stocks['AAPL']), "AAPL symbol has to be key in indexed assocation.");
+        $this->assertTrue(isset($market->stocks['GOOG']), "GOOG symbol has to be key in indexed assocation.");
+        $this->assertEquals("AAPL", $market->stocks['AAPL']->getSymbol());
+        $this->assertEquals("GOOG", $market->stocks['GOOG']->getSymbol());
+    }
+
+    public function testManyToMany()
+    {
+        $bond = $this->_em->find('Doctrine\Tests\Models\StockExchange\Bond', $this->bond->getId());
+
+        $this->assertEquals(2, count($bond->stocks));
+        $this->assertTrue(isset($bond->stocks['AAPL']), "AAPL symbol has to be key in indexed assocation.");
+        $this->assertTrue(isset($bond->stocks['GOOG']), "GOOG symbol has to be key in indexed assocation.");
+        $this->assertEquals("AAPL", $bond->stocks['AAPL']->getSymbol());
+        $this->assertEquals("GOOG", $bond->stocks['GOOG']->getSymbol());
+    }
+
+    public function testManytoManyDQL()
+    {
+        $dql = "SELECT b, s FROM Doctrine\Tests\Models\StockExchange\Bond b JOIN b.stocks s WHERE b.id = ?1";
+        $bond = $this->_em->createQuery($dql)->setParameter(1, $this->bond->getId())->getSingleResult();
+
+        $this->assertEquals(2, count($bond->stocks));
+        $this->assertTrue(isset($bond->stocks['AAPL']), "AAPL symbol has to be key in indexed assocation.");
+        $this->assertTrue(isset($bond->stocks['GOOG']), "GOOG symbol has to be key in indexed assocation.");
+        $this->assertEquals("AAPL", $bond->stocks['AAPL']->getSymbol());
+        $this->assertEquals("GOOG", $bond->stocks['GOOG']->getSymbol());
+    }
+
+    public function testDqlOverrideIndexBy()
+    {
+        $dql = "SELECT b, s FROM Doctrine\Tests\Models\StockExchange\Bond b JOIN b.stocks s INDEX BY s.id WHERE b.id = ?1";
+        $bond = $this->_em->createQuery($dql)->setParameter(1, $this->bond->getId())->getSingleResult();
+
+        $this->assertEquals(2, count($bond->stocks));
+        $this->assertFalse(isset($bond->stocks['AAPL']), "AAPL symbol not exists in re-indexed assocation.");
+        $this->assertFalse(isset($bond->stocks['GOOG']), "GOOG symbol not exists in re-indexed assocation.");
+    }
+}
+
diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php
index d9dd9bc77..166cdfb6a 100644
--- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php
+++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php
@@ -99,6 +99,11 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
             'Doctrine\Tests\Models\DDC117\DDC117ApproveChanges',
             'Doctrine\Tests\Models\DDC117\DDC117Editor',
         ),
+        'stockexchange' => array(
+            'Doctrine\Tests\Models\StockExchange\Bond',
+            'Doctrine\Tests\Models\StockExchange\Stock',
+            'Doctrine\Tests\Models\StockExchange\Market',
+        ),
     );
 
     protected function useModelSet($setName)
@@ -191,6 +196,12 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
             $conn->executeUpdate('DELETE FROM DDC117Translation');
             $conn->executeUpdate('DELETE FROM DDC117Article');
         }
+        if (isset($this->_usedModelSets['stockexchange'])) {
+            $conn->executeUpdate('DELETE FROM exchange_bonds_stocks');
+            $conn->executeUpdate('DELETE FROM exchange_bonds');
+            $conn->executeUpdate('DELETE FROM exchange_stocks');
+            $conn->executeUpdate('DELETE FROM exchange_markets');
+        }
 
         $this->_em->clear();
     }

From da2dee03e2865e74c440af33858f5fda20d62e34 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei 
Date: Sat, 5 Feb 2011 11:43:50 +0100
Subject: [PATCH 4/4] [DDC-250] Small typo fix in xsd

---
 doctrine-mapping.xsd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doctrine-mapping.xsd b/doctrine-mapping.xsd
index b8e4de1a7..c0dbfafcc 100644
--- a/doctrine-mapping.xsd
+++ b/doctrine-mapping.xsd
@@ -257,7 +257,7 @@
     
     
     
-    
+    
     
     
   
@@ -270,7 +270,7 @@
     
     
     
-    
+