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

resolve nitpicks from @Ocramius and @deeky666

Browse source
This commit is contained in:
Bill Schaller 2015-03-17 18:44:03 -04:00
parent d710555265
commit 5c4b6a2140
1 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -291,24 +291,26 @@ class LimitSubqueryOutputWalker extends SqlWalker
{ {
// If the sql statement has an order by clause, we need to wrap it in a new select distinct // If the sql statement has an order by clause, we need to wrap it in a new select distinct
// statement // statement
if ($orderByClause instanceof OrderByClause) { if (!$orderByClause instanceof OrderByClause) {
// Rebuild the order by clause to work in the scope of the new select statement return $sql;
/** @var array $sqlOrderColumns an array of items that need to be included in the select list */
/** @var array $orderBy an array of rebuilt order by items */
list($sqlOrderColumns, $orderBy) = $this->rebuildOrderByClauseForOuterScope($orderByClause);
// Identifiers are always included in the select list, so there's no need to include them twice
$sqlOrderColumns = array_diff($sqlOrderColumns, $sqlIdentifier);
// Build the select distinct statement
$sql = sprintf(
'SELECT DISTINCT %s FROM (%s) dctrn_result ORDER BY %s',
implode(', ', array_merge($sqlIdentifier, $sqlOrderColumns)),
$innerSql,
implode(', ', $orderBy)
);
} }
// Rebuild the order by clause to work in the scope of the new select statement
/* @var array $sqlOrderColumns an array of items that need to be included in the select list */
/* @var array $orderBy an array of rebuilt order by items */
list($sqlOrderColumns, $orderBy) = $this->rebuildOrderByClauseForOuterScope($orderByClause);
// Identifiers are always included in the select list, so there's no need to include them twice
$sqlOrderColumns = array_diff($sqlOrderColumns, $sqlIdentifier);
// Build the select distinct statement
$sql = sprintf(
'SELECT DISTINCT %s FROM (%s) dctrn_result ORDER BY %s',
implode(', ', array_merge($sqlIdentifier, $sqlOrderColumns)),
$innerSql,
implode(', ', $orderBy)
);
return $sql; return $sql;
} }
@ -318,14 +320,14 @@ class LimitSubqueryOutputWalker extends SqlWalker
* @param OrderByClause $orderByClause * @param OrderByClause $orderByClause
* @return array * @return array
*/ */
protected function rebuildOrderByClauseForOuterScope(OrderByClause $orderByClause) { private function rebuildOrderByClauseForOuterScope(OrderByClause $orderByClause) {
$dqlAliasToSqlTableAliasMap $dqlAliasToSqlTableAliasMap
= $searchPatterns = $searchPatterns
= $replacements = $replacements
= $dqlAliasToClassMap = $dqlAliasToClassMap
= $selectListAdditions = $selectListAdditions
= $orderByItems = $orderByItems
= array(); = [];
// Generate DQL alias -> SQL table alias mapping // Generate DQL alias -> SQL table alias mapping
foreach(array_keys($this->rsm->aliasMap) as $dqlAlias) { foreach(array_keys($this->rsm->aliasMap) as $dqlAlias) {
@ -334,7 +336,7 @@ class LimitSubqueryOutputWalker extends SqlWalker
} }
// Pattern to find table path expressions in the order by clause // Pattern to find table path expressions in the order by clause
$fieldSearchPattern = "/(?<![a-z0-9_])%s\.%s(?![a-z0-9_])/i"; $fieldSearchPattern = '/(?<![a-z0-9_])%s\.%s(?![a-z0-9_])/i';
// Generate search patterns for each field's path expression in the order by clause // Generate search patterns for each field's path expression in the order by clause
foreach($this->rsm->fieldMappings as $fieldAlias => $columnName) { foreach($this->rsm->fieldMappings as $fieldAlias => $columnName) {