From d4b278c80989854a65f80d0730970464e067bdc4 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Sun, 25 Jan 2015 05:03:19 +0100 Subject: [PATCH] #1277 DDC-3346 - removing leftover comments --- lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php | 2 -- lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php | 1 - 2 files changed, 3 deletions(-) diff --git a/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php index c16d3101176..a3f35f4404e 100644 --- a/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php +++ b/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php @@ -1180,7 +1180,6 @@ protected final function getOrderBySQL(array $orderBy, $baseTableAlias) */ protected function getSelectColumnsSQL() { - //if ( ! $hasLimitClause && $this->selectColumnListSql !== null) { if ($this->currentPersisterContext->selectColumnListSql !== null) { return $this->currentPersisterContext->selectColumnListSql; } @@ -1206,7 +1205,6 @@ protected function getSelectColumnsSQL() $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 5d259e4af73..a5bd84348cf 100644 --- a/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php +++ b/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php @@ -427,7 +427,6 @@ protected function getSelectColumnsSQL() } $columnList = array(); - //$this->currentPersisterContext->rsm = new ResultSetMapping(); $discrColumn = $this->class->discriminatorColumn['name']; $baseTableAlias = $this->getSQLTableAlias($this->class->name); $resultColumnName = $this->platform->getSQLResultCasing($discrColumn);