RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-06 00:57:10 +03:00
Code Issues Projects Releases Wiki Activity

Added support for order by scalar

Browse Source
This commit is contained in:
aleks 2013-01-26 21:31:45 +02:00
parent 61634950f3
commit 5e6bc0847f
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php
View File

@ -179,12 +179,16 @@ class LimitSubqueryOutputWalker extends SqlWalker
$orderBy = array(); $orderBy = array();
if (isset($AST->orderByClause)) { if (isset($AST->orderByClause)) {
foreach ($AST->orderByClause->orderByItems as $item) { foreach ($AST->orderByClause->orderByItems as $item) {
$possibleAliases = array_keys($this->rsm->fieldMappings, $item->expression->field); if (is_object($item->expression)) {
$possibleAliases = array_keys($this->rsm->fieldMappings, $item->expression->field);
} else {
$possibleAliases = array_keys($this->rsm->scalarMappings, $item->expression);
}
foreach ($possibleAliases as $alias) { foreach ($possibleAliases as $alias) {
if ($this->rsm->columnOwnerMap[$alias] == $item->expression->identificationVariable) { if (!is_object($item->expression) || $this->rsm->columnOwnerMap[$alias] == $item->expression->identificationVariable) {
$sqlOrderColumns[] = $alias; $sqlOrderColumns[] = $alias;
$orderBy[] = $alias . ' ' . $item->type; $orderBy[] = $alias . ' ' . $item->type;
break; break;
} }
} }

2
tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php
View File

@ -48,7 +48,7 @@ class LimitSubqueryOutputWalkerTest extends PaginationTestCase
$limitQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker'); $limitQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker');
$this->assertEquals( $this->assertEquals(
"SELECT DISTINCT id1, sclr0 FROM (SELECT COUNT(g0_.id) AS sclr0, u1_.id AS id1, g0_.id AS id2 FROM USER u1_ INNER JOIN user_group u2_ ON u1_.id = u2_.user_id INNER JOIN groups g0_ ON g0_.id = u2_.group_id ORDER BY sclr0 ASC) dctrn_result ORDER BY sclr0 ASC", "SELECT DISTINCT id1, sclr0 FROM (SELECT COUNT(g0_.id) AS sclr0, u1_.id AS id1, g0_.id AS id2 FROM User u1_ INNER JOIN user_group u2_ ON u1_.id = u2_.user_id INNER JOIN groups g0_ ON g0_.id = u2_.group_id ORDER BY sclr0 ASC) dctrn_result ORDER BY sclr0 ASC",
$limitQuery->getSql() $limitQuery->getSql()
); );