Fix tests for inheritance support

lib/Doctrine/ORM/PersistentCollection.php

@@ -19,14 +19,13 @@
 
 namespace Doctrine\ORM;
 
-use Doctrine\ORM\Mapping\ClassMetadata;
+use Closure;
-
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Selectable;
 use Doctrine\Common\Collections\Criteria;
-
+use Doctrine\ORM\Mapping\ClassMetadata;
-use Closure;
+use Doctrine\ORM\Mapping\ClassMetadataInfo;
 
 /**
  * A PersistentCollection represents a collection of elements that have persistent state.
@@ -884,6 +883,10 @@ final class PersistentCollection implements Collection, Selectable
 
         $persister = $this->em->getUnitOfWork()->getEntityPersister($this->association['targetEntity']);
 
-        return new LazyCriteriaCollection($persister, $criteria);
+        if ($this->association['fetch'] === ClassMetadataInfo::FETCH_EXTRA_LAZY) {
+            return new LazyCriteriaCollection($persister, $criteria);
+        } else {
+            return new ArrayCollection($persister->loadCriteria($criteria));
+        }
     }
 }

lib/Doctrine/ORM/Persisters/BasicEntityPersister.php

@@ -817,11 +817,11 @@ class BasicEntityPersister implements EntityPersister
     {
         $sql = $this->getCountSQL($criteria);
 
-        list($values, $types) = ($criteria instanceof Criteria)
+        list($params, $types) = ($criteria instanceof Criteria)
             ? $this->expandCriteriaParameters($criteria)
             : $this->expandParameters($criteria);
 
-        return $this->conn->fetchColumn($sql, $values);
+        return $this->conn->executeQuery($sql, $params, $types)->fetchColumn();
     }
 
     /**
@@ -857,20 +857,20 @@ class BasicEntityPersister implements EntityPersister
 
         $valueVisitor->dispatch($expression);
 
-        list($values, $types) = $valueVisitor->getParamsAndTypes();
+        list($params, $types) = $valueVisitor->getParamsAndTypes();
 
-        $sqlValues = array();
+        $sqlParams = array();
-        foreach ($values as $value) {
+        foreach ($params as $param) {
-            $sqlValues[] = $this->getValue($value);
+            $sqlParams[] = $this->getValue($param);
         }
 
         $sqlTypes = array();
         foreach ($types as $type) {
             list($field, $value) = $type;
-            $sqlTypes[] = $this->getType($field, $value);
+            $sqlTypes[]          = $this->getType($field, $value);
         }
 
-        return array($sqlValues, $sqlTypes);
+        return array($sqlParams, $sqlTypes);
     }
 
     /**
@@ -1085,8 +1085,8 @@ class BasicEntityPersister implements EntityPersister
      */
     public function getCountSQL($criteria = array())
     {
-        $tableName    = $this->quoteStrategy->getTableName($this->class, $this->platform);
+        $tableName  = $this->quoteStrategy->getTableName($this->class, $this->platform);
-        $tableAlias   = $this->getSQLTableAlias($this->class->name);
+        $tableAlias = $this->getSQLTableAlias($this->class->name);
 
         $conditionSql = ($criteria instanceof Criteria)
             ? $this->getSelectConditionCriteriaSQL($criteria)
@@ -1101,7 +1101,7 @@ class BasicEntityPersister implements EntityPersister
         }
 
         $sql = 'SELECT COUNT(*) '
-            . 'FROM ' . $tableName . ' ' . 't0'
+            . 'FROM ' . $tableName . ' ' . $tableAlias
             . (empty($conditionSql) ? '' : ' WHERE ' . $conditionSql);
 
         return $sql;

lib/Doctrine/ORM/Persisters/JoinedSubclassPersister.php

@@ -298,39 +298,8 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister
      */
     public function getSelectSQL($criteria, $assoc = null, $lockMode = null, $limit = null, $offset = null, array $orderBy = null)
     {
-        $joinSql            = '';
+        $baseTableAlias = $this->getSQLTableAlias($this->class->name);
-        $identifierColumn   = $this->class->getIdentifierColumnNames();
+        $joinSql        = $this->getJoinSql($baseTableAlias);
-        $baseTableAlias     = $this->getSQLTableAlias($this->class->name);
-
-
-        // INNER JOIN parent tables
-        foreach ($this->class->parentClasses as $parentClassName) {
-            $conditions     = array();
-            $parentClass    = $this->em->getClassMetadata($parentClassName);
-            $tableAlias     = $this->getSQLTableAlias($parentClassName);
-            $joinSql       .= ' INNER JOIN ' . $this->quoteStrategy->getTableName($parentClass, $this->platform) . ' ' . $tableAlias . ' ON ';
-
-
-            foreach ($identifierColumn as $idColumn) {
-                $conditions[] = $baseTableAlias . '.' . $idColumn . ' = ' . $tableAlias . '.' . $idColumn;
-            }
-
-            $joinSql .= implode(' AND ', $conditions);
-        }
-
-        // OUTER JOIN sub tables
-        foreach ($this->class->subClasses as $subClassName) {
-            $conditions  = array();
-            $subClass    = $this->em->getClassMetadata($subClassName);
-            $tableAlias  = $this->getSQLTableAlias($subClassName);
-            $joinSql    .= ' LEFT JOIN ' . $this->quoteStrategy->getTableName($subClass, $this->platform) . ' ' . $tableAlias . ' ON ';
-
-            foreach ($identifierColumn as $idColumn) {
-                $conditions[] = $baseTableAlias . '.' . $idColumn . ' = ' . $tableAlias . '.' . $idColumn;
-            }
-
-            $joinSql .= implode(' AND ', $conditions);
-        }
 
         if ($assoc != null && $assoc['type'] == ClassMetadata::MANY_TO_MANY) {
             $joinSql .= $this->getSelectManyToManyJoinSQL($assoc);
@@ -387,6 +356,35 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister
         return $this->platform->modifyLimitQuery($query, $limit, $offset) . $lockSql;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public function getCountSQL($criteria = array())
+    {
+        $tableName      = $this->quoteStrategy->getTableName($this->class, $this->platform);
+        $baseTableAlias = $this->getSQLTableAlias($this->class->name);
+        $joinSql        = $this->getJoinSql($baseTableAlias);
+
+        $conditionSql = ($criteria instanceof Criteria)
+            ? $this->getSelectConditionCriteriaSQL($criteria)
+            : $this->getSelectConditionSQL($criteria);
+
+        $filterSql = $this->generateFilterConditionSQL($this->em->getClassMetadata($this->class->rootEntityName), $this->getSQLTableAlias($this->class->rootEntityName));
+
+        if ('' !== $filterSql) {
+            $conditionSql = $conditionSql
+                ? $conditionSql . ' AND ' . $filterSql
+                : $filterSql;
+        }
+
+        $sql = 'SELECT COUNT(*) '
+            . 'FROM ' . $tableName . ' ' . $baseTableAlias
+            . $joinSql
+            . (empty($conditionSql) ? '' : ' WHERE ' . $conditionSql);
+
+        return $sql;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -555,4 +553,45 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister
         $value = $this->fetchVersionValue($this->getVersionedClassMetadata(), $id);
         $this->class->setFieldValue($entity, $this->class->versionField, $value);
     }
+
+    /**
+     * @param  string $baseTableAlias
+     * @return string
+     */
+    private function getJoinSql($baseTableAlias)
+    {
+        $joinSql            = '';
+        $identifierColumn   = $this->class->getIdentifierColumnNames();
+
+        // INNER JOIN parent tables
+        foreach ($this->class->parentClasses as $parentClassName) {
+            $conditions     = array();
+            $parentClass    = $this->em->getClassMetadata($parentClassName);
+            $tableAlias     = $this->getSQLTableAlias($parentClassName);
+            $joinSql       .= ' INNER JOIN ' . $this->quoteStrategy->getTableName($parentClass, $this->platform) . ' ' . $tableAlias . ' ON ';
+
+
+            foreach ($identifierColumn as $idColumn) {
+                $conditions[] = $baseTableAlias . '.' . $idColumn . ' = ' . $tableAlias . '.' . $idColumn;
+            }
+
+            $joinSql .= implode(' AND ', $conditions);
+        }
+
+        // OUTER JOIN sub tables
+        foreach ($this->class->subClasses as $subClassName) {
+            $conditions  = array();
+            $subClass    = $this->em->getClassMetadata($subClassName);
+            $tableAlias  = $this->getSQLTableAlias($subClassName);
+            $joinSql    .= ' LEFT JOIN ' . $this->quoteStrategy->getTableName($subClass, $this->platform) . ' ' . $tableAlias . ' ON ';
+
+            foreach ($identifierColumn as $idColumn) {
+                $conditions[] = $baseTableAlias . '.' . $idColumn . ' = ' . $tableAlias . '.' . $idColumn;
+            }
+
+            $joinSql .= implode(' AND ', $conditions);
+        }
+
+        return $joinSql;
+    }
 }

lib/Doctrine/ORM/Persisters/SingleTablePersister.php

@@ -43,7 +43,7 @@ class SingleTablePersister extends AbstractEntityInheritancePersister
     }
 
     /**
-     * {@inheritdoc} 
+     * {@inheritdoc}
      */
     protected function getSelectColumnsSQL()
     {
@@ -80,7 +80,7 @@ class SingleTablePersister extends AbstractEntityInheritancePersister
 
             // Foreign key columns
             foreach ($subClass->associationMappings as $assoc) {
-                if ( ! $assoc['isOwningSide'] 
+                if ( ! $assoc['isOwningSide']
                         || ! ($assoc['type'] & ClassMetadata::TO_ONE)
                         || isset($assoc['inherited'])) {
                     continue;

tests/Doctrine/Tests/ORM/Functional/SingleTableInheritanceTest.php

@@ -370,6 +370,9 @@ class SingleTableInheritanceTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $contracts = $repository->matching(new Criteria(
             Criteria::expr()->eq('salesPerson', $this->salesPerson->getId())
         ));
+
+        // Load the association because it's wrapped in a lazy collection
+        $contracts->toArray();
     }
 
     /**