[DDC-3346] #1277 find one with eager loads is failing

lib/Doctrine/ORM/Persisters/Entity/AbstractEntityInheritancePersister.php

@@ -66,7 +66,7 @@ protected function getSelectColumnSQL($field, ClassMetadata $class, $alias = 'r'
         $sql         = $this->getSQLTableAlias($class->name, $tableAlias) . '.'
                             . $this->quoteStrategy->getColumnName($field, $class, $this->platform);
 
-        $this->rsm->addFieldResult($alias, $columnAlias, $field, $class->name);
+        $this->currentPersisterContext->rsm->addFieldResult($alias, $columnAlias, $field, $class->name);
 
         if (isset($class->fieldMappings[$field]['requireSQLConversion'])) {
             $type   = Type::getType($class->getTypeOfField($field));
@@ -88,7 +88,7 @@ protected function getSelectJoinColumnSQL($tableAlias, $joinColumnName, $classNa
     {
         $columnAlias = $this->getSQLColumnAlias($joinColumnName);
 
-        $this->rsm->addMetaResult('r', $columnAlias, $joinColumnName, false, $type);
+        $this->currentPersisterContext->rsm->addMetaResult('r', $columnAlias, $joinColumnName, false, $type);
 
         return $tableAlias . '.' . $joinColumnName . ' AS ' . $columnAlias;
     }

lib/Doctrine/ORM/Persisters/Entity/CachedPersisterContext.php

@@ -0,0 +1,102 @@
+<?php
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+namespace Doctrine\ORM\Persisters\Entity;
+use Doctrine\Common\Persistence\Mapping\ClassMetadata;
+use Doctrine\ORM\Query\ResultSetMapping;
+
+/**
+ * A swappable persister context to use as a container for the current
+ * generated query/resultSetMapping/type binding information.
+ *
+ * This class is a utility class to be used only by the persister API
+ *
+ * This object is highly mutable due to performance reasons. Same reasoning
+ * behind its properties being public.
+ *
+ * @author Marco Pivetta <ocramius@gmail.com>
+ */
+class CachedPersisterContext
+{
+    /**
+     * Metadata object that describes the mapping of the mapped entity class.
+     *
+     * @var \Doctrine\ORM\Mapping\ClassMetadata
+     */
+    public $class;
+
+    /**
+     * ResultSetMapping that is used for all queries. Is generated lazily once per request.
+     *
+     * @var \Doctrine\ORM\Query\ResultSetMapping
+     */
+    public $rsm;
+
+    /**
+     * The SELECT column list SQL fragment used for querying entities by this persister.
+     * This SQL fragment is only generated once per request, if at all.
+     *
+     * @var string|null
+     */
+    public $selectColumnListSql;
+
+    /**
+     * The JOIN SQL fragment used to eagerly load all many-to-one and one-to-one
+     * associations configured as FETCH_EAGER, as well as all inverse one-to-one associations.
+     *
+     * @var string
+     */
+    public $selectJoinSql;
+
+    /**
+     * Counter for creating unique SQL table and column aliases.
+     *
+     * @var integer
+     */
+    public $sqlAliasCounter = 0;
+
+    /**
+     * Map from class names (FQCN) to the corresponding generated SQL table aliases.
+     *
+     * @var array
+     */
+    public $sqlTableAliases = array();
+
+    /**
+     * Whether this persistent context is considering limit operations applied to the selection queries
+     *
+     * @var bool
+     */
+    public $handlesLimits;
+
+    /**
+     * @param ClassMetadata    $class
+     * @param ResultSetMapping $rsm
+     * @param bool             $handlesLimits
+     */
+    public function __construct(
+        ClassMetadata $class,
+        ResultSetMapping $rsm,
+        $handlesLimits
+    ) {
+        $this->class         = $class;
+        $this->rsm           = $rsm;
+        $this->handlesLimits = (bool) $handlesLimits;
+    }
+}

lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php

@@ -299,6 +299,8 @@ public function delete($entity)
      */
     public function getSelectSQL($criteria, $assoc = null, $lockMode = null, $limit = null, $offset = null, array $orderBy = null)
     {
+        $this->switchPersisterContext($offset, $limit);
+
         $baseTableAlias = $this->getSQLTableAlias($this->class->name);
         $joinSql        = $this->getJoinSql($baseTableAlias);
 
@@ -420,19 +422,18 @@ protected function getLockTablesSql($lockMode)
     protected function getSelectColumnsSQL()
     {
         // Create the column list fragment only once
-        if ($this->selectColumnListSql !== null) {
-            return $this->selectColumnListSql;
+        if ($this->currentPersisterContext->selectColumnListSql !== null) {
+            return $this->currentPersisterContext->selectColumnListSql;
         }
 
         $columnList         = array();
-        $this->rsm          = new ResultSetMapping();
         $discrColumn        = $this->class->discriminatorColumn['name'];
         $baseTableAlias     = $this->getSQLTableAlias($this->class->name);
         $resultColumnName   = $this->platform->getSQLResultCasing($discrColumn);
 
-        $this->rsm->addEntityResult($this->class->name, 'r');
-        $this->rsm->setDiscriminatorColumn('r', $resultColumnName);
-        $this->rsm->addMetaResult('r', $resultColumnName, $discrColumn);
+        $this->currentPersisterContext->rsm->addEntityResult($this->class->name, 'r');
+        $this->currentPersisterContext->rsm->setDiscriminatorColumn('r', $resultColumnName);
+        $this->currentPersisterContext->rsm->addMetaResult('r', $resultColumnName, $discrColumn);
 
         // Add regular columns
         foreach ($this->class->fieldMappings as $fieldName => $mapping) {
@@ -523,9 +524,9 @@ protected function getSelectColumnsSQL()
             }
         }
 
-        $this->selectColumnListSql = implode(', ', $columnList);
+        $this->currentPersisterContext->selectColumnListSql = implode(', ', $columnList);
 
-        return $this->selectColumnListSql;
+        return $this->currentPersisterContext->selectColumnListSql;
     }
 
     /**

lib/Doctrine/ORM/Persisters/Entity/SingleTablePersister.php

@@ -48,8 +48,8 @@ protected function getDiscriminatorColumnTableName()
      */
     protected function getSelectColumnsSQL()
     {
-        if ($this->selectColumnListSql !== null) {
-            return $this->selectColumnListSql;
+        if ($this->currentPersisterContext->selectColumnListSql !== null) {
+            return $this->currentPersisterContext->selectColumnListSql;
         }
 
         $columnList[] = parent::getSelectColumnsSQL();
@@ -63,8 +63,8 @@ protected function getSelectColumnsSQL()
 
         $resultColumnName = $this->platform->getSQLResultCasing($discrColumn);
 
-        $this->rsm->setDiscriminatorColumn('r', $resultColumnName);
-        $this->rsm->addMetaResult('r', $resultColumnName, $discrColumn);
+        $this->currentPersisterContext->rsm->setDiscriminatorColumn('r', $resultColumnName);
+        $this->currentPersisterContext->rsm->addMetaResult('r', $resultColumnName, $discrColumn);
 
         // Append subclass columns
         foreach ($this->class->subClasses as $subClassName) {
@@ -106,9 +106,9 @@ protected function getSelectColumnsSQL()
             }
         }
 
-        $this->selectColumnListSql = implode(', ', $columnList);
+        $this->currentPersisterContext->selectColumnListSql = implode(', ', $columnList);
 
-        return $this->selectColumnListSql;
+        return $this->currentPersisterContext->selectColumnListSql;
     }
 
     /**

tests/Doctrine/Tests/Models/DDC3346/DDC3346Article.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Doctrine\Tests\Models\DDC3346;
+
+/**
+ * @Entity
+ * @Table(name="ddc3346_articles")
+ */
+class DDC3346Article
+{
+    const CLASSNAME = __CLASS__;
+
+    /**
+     * @Id
+     * @Column(type="integer")
+     * @GeneratedValue(strategy="AUTO")
+     */
+    public $id;
+
+    /**
+     * @var DDC3346Author
+     *
+     * @ManyToOne(targetEntity="DDC3346Author", inversedBy="articles")
+     * @JoinColumn(name="user_id", referencedColumnName="id")
+     */
+    public $user;
+}

tests/Doctrine/Tests/Models/DDC3346/DDC3346Author.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Doctrine\Tests\Models\DDC3346;
+
+/**
+ * @Entity
+ * @Table(name="ddc3346_users")
+ */
+class DDC3346Author
+{
+    const CLASSNAME = __CLASS__;
+
+    /**
+     * @Id @Column(type="integer")
+     * @GeneratedValue
+     */
+    public $id;
+
+    /**
+     * @Column(type="string", length=255, unique=true)
+     */
+    public $username;
+
+    /**
+     * @OneToMany(targetEntity="DDC3346Article", mappedBy="user", fetch="EAGER", cascade={"detach"})
+     */
+    public $articles = array();
+}

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

@@ -0,0 +1,77 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\Tests\Models\DDC3346\DDC3346Article;
+use Doctrine\Tests\Models\DDC3346\DDC3346Author;
+
+/**
+ * @group DDC-3346
+ */
+class DDC3346Test extends \Doctrine\Tests\OrmFunctionalTestCase
+{
+    public function setUp()
+    {
+        $this->useModelSet('ddc3346');
+
+        parent::setUp();
+
+        $this->loadAuthorFixture();
+    }
+
+    public function testFindOneWithEagerFetchWillNotHydrateLimitedCollection()
+    {
+        /* @var DDC3346Author $author */
+        $author = $this->_em->getRepository(DDC3346Author::CLASSNAME)->findOneBy(
+            array('username' => 'bwoogy')
+        );
+
+        $this->assertCount(2, $author->articles);
+    }
+
+    public function testFindLimitedWithEagerFetchWillNotHydrateLimitedCollection()
+    {
+        /* @var DDC3346Author[] $authors */
+        $authors = $this->_em->getRepository(DDC3346Author::CLASSNAME)->findBy(
+            array('username' => 'bwoogy'),
+            null,
+            1
+        );
+
+        $this->assertCount(1, $authors);
+        $this->assertCount(2, $authors[0]->articles);
+    }
+
+    public function testFindWithEagerFetchAndOffsetWillNotHydrateLimitedCollection()
+    {
+        /* @var DDC3346Author[] $authors */
+        $authors = $this->_em->getRepository(DDC3346Author::CLASSNAME)->findBy(
+            array('username' => 'bwoogy'),
+            null,
+            null,
+            0 // using an explicitly defined offset
+        );
+
+        $this->assertCount(1, $authors);
+        $this->assertCount(2, $authors[0]->articles);
+    }
+
+    private function loadAuthorFixture()
+    {
+        $user     = new DDC3346Author();
+        $article1 = new DDC3346Article();
+        $article2 = new DDC3346Article();
+
+        $user->username   = 'bwoogy';
+        $article1->user   = $user;
+        $article2->user   = $user;
+        $user->articles[] = $article1;
+        $user->articles[] = $article2;
+
+        $this->_em->persist($user);
+        $this->_em->persist($article1);
+        $this->_em->persist($article2);
+        $this->_em->flush();
+        $this->_em->clear();
+    }
+}

tests/Doctrine/Tests/OrmFunctionalTestCase.php

@@ -193,6 +193,10 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
             'Doctrine\Tests\Models\DDC2504\DDC2504ChildClass',
             'Doctrine\Tests\Models\DDC2504\DDC2504OtherClass',
         ),
+        'ddc3346' => array(
+            'Doctrine\Tests\Models\DDC3346\DDC3346Author',
+            'Doctrine\Tests\Models\DDC3346\DDC3346Article',
+        ),
         'quote' => array(
             'Doctrine\Tests\Models\Quote\Address',
             'Doctrine\Tests\Models\Quote\Group',
@@ -399,6 +403,11 @@ protected function tearDown()
             $conn->executeUpdate('DELETE FROM cache_country');
         }
 
+        if (isset($this->_usedModelSets['ddc3346'])) {
+            $conn->executeUpdate('DELETE FROM ddc3346_articles');
+            $conn->executeUpdate('DELETE FROM ddc3346_users');
+        }
+
         if (isset($this->_usedModelSets['quote'])) {
             $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-address"));
             $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-group"));