RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

#1353 #1347 #1351 - s/inSubselect/inSubSelect (with docblock documentation)

Browse source
This commit is contained in:
Marco Pivetta 2015-03-31 21:51:56 +01:00
parent 6c5dbd8d4c
commit ba00fc1e90
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php
View file

@ -88,8 +88,11 @@ class LimitSubqueryOutputWalker extends SqlWalker
*/ */
private $orderByPathExpressions = []; private $orderByPathExpressions = [];
/** @var bool $inSubselect */ /**
private $inSubselect = false; * @var bool We don't want to add path expressions from sub-selects into the select clause of the containing query.
* This state flag simply keeps track on whether we are walking on a subquery or not
*/
private $inSubSelect = false;
/** /**
* Constructor. * Constructor.
@ -479,7 +482,7 @@ class LimitSubqueryOutputWalker extends SqlWalker
// Set every select expression as visible(hidden = false) to // Set every select expression as visible(hidden = false) to
// make $AST have scalar mappings properly - this is relevant for referencing selected // make $AST have scalar mappings properly - this is relevant for referencing selected
// fields from outside the subquery, for example in the ORDER BY segment // fields from outside the subquery, for example in the ORDER BY segment
$hiddens = array(); $hiddens = [];
foreach ($AST->selectClause->selectExpressions as $idx => $expr) { foreach ($AST->selectClause->selectExpressions as $idx => $expr) {
$hiddens[$idx] = $expr->hiddenAliasResultVariable; $hiddens[$idx] = $expr->hiddenAliasResultVariable;
@ -520,7 +523,7 @@ class LimitSubqueryOutputWalker extends SqlWalker
$rootIdentifier = $rootClass->identifier; $rootIdentifier = $rootClass->identifier;
// For every identifier, find out the SQL alias by combing through the ResultSetMapping // For every identifier, find out the SQL alias by combing through the ResultSetMapping
$sqlIdentifier = array(); $sqlIdentifier = [];
foreach ($rootIdentifier as $property) { foreach ($rootIdentifier as $property) {
if (isset($rootClass->fieldMappings[$property])) { if (isset($rootClass->fieldMappings[$property])) {
foreach (array_keys($this->rsm->fieldMappings, $property) as $alias) { foreach (array_keys($this->rsm->fieldMappings, $property) as $alias) {
@ -560,7 +563,7 @@ class LimitSubqueryOutputWalker extends SqlWalker
*/ */
public function walkPathExpression($pathExpr) public function walkPathExpression($pathExpr)
{ {
if (!$this->inSubselect && !$this->platformSupportsRowNumber() && !in_array($pathExpr, $this->orderByPathExpressions)) { if (!$this->inSubSelect && !$this->platformSupportsRowNumber() && !in_array($pathExpr, $this->orderByPathExpressions)) {
$this->orderByPathExpressions[] = $pathExpr; $this->orderByPathExpressions[] = $pathExpr;
} }
@ -572,12 +575,11 @@ class LimitSubqueryOutputWalker extends SqlWalker
*/ */
public function walkSubSelect($subselect) public function walkSubSelect($subselect)
{ {
// We don't want to add path expressions from subselects into the select clause of the containing query. $this->inSubSelect = true;
$this->inSubselect = true;
$sql = parent::walkSubselect($subselect); $sql = parent::walkSubselect($subselect);
$this->inSubselect = false; $this->inSubSelect = false;
return $sql; return $sql;
} }