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

Cleanup

Browse source
This commit is contained in:
Bill Schaller 2015-03-27 16:15:09 -04:00 • committed by Marco Pivetta
parent f92307d06d
commit a8342a4be2
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -121,7 +121,8 @@ class LimitSubqueryOutputWalker extends SqlWalker
* *
* @return bool * @return bool
*/ */
private function platformSupportsRowNumber() { private function platformSupportsRowNumber()
{
return $this->_platform instanceof PostgreSqlPlatform return $this->_platform instanceof PostgreSqlPlatform
|| $this->_platform instanceof SQLServerPlatform || $this->_platform instanceof SQLServerPlatform
|| $this->_platform instanceof OraclePlatform || $this->_platform instanceof OraclePlatform
@ -137,13 +138,17 @@ class LimitSubqueryOutputWalker extends SqlWalker
* *
* @param SelectStatement $AST * @param SelectStatement $AST
*/ */
private function rebuildOrderByForRowNumber(SelectStatement $AST) { private function rebuildOrderByForRowNumber(SelectStatement $AST)
{
$orderByClause = $AST->orderByClause; $orderByClause = $AST->orderByClause;
$selectAliasToExpressionMap = []; $selectAliasToExpressionMap = [];
foreach($AST->selectClause->selectExpressions as $selectExpression) { // Get any aliases that are available for select expressions.
foreach ($AST->selectClause->selectExpressions as $selectExpression) {
$selectAliasToExpressionMap[$selectExpression->fieldIdentificationVariable] = $selectExpression->expression; $selectAliasToExpressionMap[$selectExpression->fieldIdentificationVariable] = $selectExpression->expression;
} }
foreach($orderByClause->orderByItems as $orderByItem) {
// Rebuild string orderby expressions to use the select expression they're referencing
foreach ($orderByClause->orderByItems as $orderByItem) {
if (is_string($orderByItem->expression) && isset($selectAliasToExpressionMap[$orderByItem->expression])) { if (is_string($orderByItem->expression) && isset($selectAliasToExpressionMap[$orderByItem->expression])) {
$orderByItem->expression = $selectAliasToExpressionMap[$orderByItem->expression]; $orderByItem->expression = $selectAliasToExpressionMap[$orderByItem->expression];
} }
@ -203,8 +208,11 @@ class LimitSubqueryOutputWalker extends SqlWalker
} }
// Build the counter query // Build the counter query
$sql = sprintf('SELECT DISTINCT %s FROM (%s) dctrn_result', $sql = sprintf(
implode(', ', $sqlIdentifier), $innerSql); 'SELECT DISTINCT %s FROM (%s) dctrn_result',
implode(', ', $sqlIdentifier),
$innerSql
);
if ($hasOrderBy) { if ($hasOrderBy) {
$sql .= $orderGroupBy . $outerOrderBy; $sql .= $orderGroupBy . $outerOrderBy;
@ -212,7 +220,9 @@ class LimitSubqueryOutputWalker extends SqlWalker
// Apply the limit and offset. // Apply the limit and offset.
$sql = $this->_platform->modifyLimitQuery( $sql = $this->_platform->modifyLimitQuery(
$sql, $this->maxResults, $this->firstResult $sql,
$this->maxResults,
$this->firstResult
); );
// Add the columns to the ResultSetMapping. It's not really nice but // Add the columns to the ResultSetMapping. It's not really nice but