Skip to content

Commit

Permalink
doctrine#1277 DDC-3346 - removing leftover comments
Browse files Browse the repository at this point in the history
  • Loading branch information
Ocramius committed Jan 25, 2015
1 parent 97ea6a7 commit d4b278c
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 3 deletions.
2 changes: 0 additions & 2 deletions lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit d4b278c

Please sign in to comment.