diff --git a/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php index c16d31011..a3f35f440 100644 --- a/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php +++ b/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php @@ -1180,7 +1180,6 @@ class BasicEntityPersister implements EntityPersister */ protected function getSelectColumnsSQL() { - //if ( ! $hasLimitClause && $this->selectColumnListSql !== null) { if ($this->currentPersisterContext->selectColumnListSql !== null) { return $this->currentPersisterContext->selectColumnListSql; } @@ -1206,7 +1205,6 @@ class BasicEntityPersister implements EntityPersister $isAssocToOneInverseSide = $assoc['type'] & ClassMetadata::TO_ONE && ! $assoc['isOwningSide']; $isAssocFromOneEager = $assoc['type'] !== ClassMetadata::MANY_TO_MANY && $assoc['fetch'] === ClassMetadata::FETCH_EAGER; - //if ($hasLimitClause || ! ($isAssocFromOneEager || $isAssocToOneInverseSide)) { if ( ! ($isAssocFromOneEager || $isAssocToOneInverseSide)) { continue; } diff --git a/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php b/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php index 5d259e4af..a5bd84348 100644 --- a/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php +++ b/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php @@ -427,7 +427,6 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister } $columnList = array(); - //$this->currentPersisterContext->rsm = new ResultSetMapping(); $discrColumn = $this->class->discriminatorColumn['name']; $baseTableAlias = $this->getSQLTableAlias($this->class->name); $resultColumnName = $this->platform->getSQLResultCasing($discrColumn);