DDC-1632 Optimized query count for one-to-many associations with fetc…

…h eager.
doctrine · Apr 16, 2014 · b28fa9a · b28fa9a
1 parent 4029dc2
commit b28fa9a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
@@ -1159,7 +1159,10 @@ protected function getSelectColumnsSQL()
                 $columnList[] = $assocColumnSQL;
             }
 
-            if ( ! (($assoc['type'] & ClassMetadata::TO_ONE) && ($assoc['fetch'] == ClassMetadata::FETCH_EAGER || !$assoc['isOwningSide']))) {
+            $isAssocToOneInverseSide = $assoc['type'] & ClassMetadata::TO_ONE && ! $assoc['isOwningSide'];
+            $isAssocFromOneEager     = $assoc['type'] !== ClassMetadata::MANY_TO_MANY && $assoc['fetch'] === ClassMetadata::FETCH_EAGER;
+
+            if ( ! ($isAssocFromOneEager || $isAssocToOneInverseSide)) {
                 continue;
             }
 

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2350Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2350Test.php
@@ -38,11 +38,11 @@ public function testEagerCollectionsAreOnlyRetrievedOnce()
         $cnt = $this->getCurrentQueryCount();
         $user = $this->_em->find(__NAMESPACE__ . '\DDC2350User', $user->id);
 
-        $this->assertEquals($cnt + 2, $this->getCurrentQueryCount());
+        $this->assertEquals($cnt + 1, $this->getCurrentQueryCount());
 
         $this->assertEquals(2, count($user->reportedBugs));
 
-        $this->assertEquals($cnt + 2, $this->getCurrentQueryCount());
+        $this->assertEquals($cnt + 1, $this->getCurrentQueryCount());
     }
 }