From d444f0e06b6d588d62bdf3493a282cf61bfcd956 Mon Sep 17 00:00:00 2001 From: Guilherme Blanco Date: Sun, 30 Oct 2011 16:22:45 -0200 Subject: [PATCH] Micro optimization in SqlWalker. --- lib/Doctrine/ORM/Query/SqlWalker.php | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php index 45837bf1f..d90dc28f2 100644 --- a/lib/Doctrine/ORM/Query/SqlWalker.php +++ b/lib/Doctrine/ORM/Query/SqlWalker.php @@ -980,17 +980,13 @@ class SqlWalker implements TreeWalker $qComp = $this->_queryComponents[$dqlAlias]; $class = $qComp['metadata']; - if ( ! $selectExpression->fieldIdentificationVariable) { - $resultAlias = $fieldName; - } else { - $resultAlias = $selectExpression->fieldIdentificationVariable; - } + $resultAlias = ( ! $selectExpression->fieldIdentificationVariable) + ? $fieldName + : $selectExpression->fieldIdentificationVariable; - if ($class->isInheritanceTypeJoined()) { - $tableName = $this->_em->getUnitOfWork()->getEntityPersister($class->name)->getOwningTable($fieldName); - } else { - $tableName = $class->getTableName(); - } + $tableName = ($class->isInheritanceTypeJoined()) + ? $this->_em->getUnitOfWork()->getEntityPersister($class->name)->getOwningTable($fieldName) + : $class->getTableName(); $sqlTableAlias = $this->getSQLTableAlias($tableName, $dqlAlias); $columnName = $class->getQuotedColumnName($fieldName, $this->_platform);