RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-02 21:41:45 +03:00
Code Issues Projects Releases Wiki Activity

Reduce complexity of LimitSubqueryWalker#walkSelectStatement()

Browse Source 
Ensuring that the code follows our code standards.
This commit is contained in:
Luís Cobucci 2017-12-16 23:31:50 +01:00
parent aacea65519
commit 441c5d138c
No known key found for this signature in database
GPG Key ID: EC61C5F01750ED3C
2 changed files with 42 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryWalker.php
View File

@ -90,29 +90,33 @@ class LimitSubqueryWalker extends TreeWalkerAdapter
$pathExpression->type = PathExpression::TYPE_STATE_FIELD; $pathExpression->type = PathExpression::TYPE_STATE_FIELD;
$AST->selectClause->selectExpressions = array(new SelectExpression($pathExpression, '_dctrn_id')); $AST->selectClause->selectExpressions = [new SelectExpression($pathExpression, '_dctrn_id')];
$AST->selectClause->isDistinct = true;
if ( ! isset($AST->orderByClause)) {
return;
}
if (isset($AST->orderByClause)) {
foreach ($AST->orderByClause->orderByItems as $item) { foreach ($AST->orderByClause->orderByItems as $item) {
if ( ! $item->expression instanceof PathExpression) { if ($item->expression instanceof PathExpression) {
if(is_string($item->expression) && isset($queryComponents[$item->expression])) {
$qComp = $queryComponents[$item->expression];
if (isset($qComp['resultVariable'])) {
$AST->selectClause->selectExpressions[] = new SelectExpression($qComp['resultVariable'], $item->expression);
}
}
} else {
$AST->selectClause->selectExpressions[] = new SelectExpression( $AST->selectClause->selectExpressions[] = new SelectExpression(
$this->createSelectExpressionItem($item->expression), $this->createSelectExpressionItem($item->expression), '_dctrn_ord' . $this->_aliasCounter++
'_dctrn_ord' . $this->_aliasCounter++ );
continue;
}
if (is_string($item->expression) && isset($queryComponents[$item->expression])) {
$qComp = $queryComponents[$item->expression];
if (isset($qComp['resultVariable'])) {
$AST->selectClause->selectExpressions[] = new SelectExpression(
$qComp['resultVariable'],
$item->expression
); );
} }
} }
} }
$AST->selectClause->isDistinct = true;
} }
/** /**

25
tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryWalkerTest.php
View File

@ -38,21 +38,20 @@ class LimitSubqueryWalkerTest extends PaginationTestCase
); );
} }
public function testLimitSubqueryWithSortFunction() public function testLimitSubqueryWithSortFunction() : void
{ {
$dql = 'SELECT p FROM Doctrine\Tests\ORM\Tools\Pagination\MyBlogPost p JOIN p.category c GROUP BY p.id ORDER BY COUNT(c.id)'; $dql = 'SELECT p FROM Doctrine\Tests\ORM\Tools\Pagination\MyBlogPost p JOIN p.category c GROUP BY p.id ORDER BY COUNT(c.id)';
$query = $this->entityManager->createQuery($dql); $query = $this->entityManager->createQuery($dql);
$limitQuery = clone $query;
$limitQuery = clone $query;
$limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [LimitSubqueryWalker::class]); $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [LimitSubqueryWalker::class]);
$this->assertEquals( self::assertSame(
"SELECT DISTINCT m0_.id AS id_0 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON m0_.category_id = c1_.id GROUP BY m0_.id ORDER BY COUNT(c1_.id) ASC", 'SELECT DISTINCT m0_.id AS id_0 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON m0_.category_id = c1_.id GROUP BY m0_.id ORDER BY COUNT(c1_.id) ASC',
$limitQuery->getSQL() $limitQuery->getSQL()
); );
} }
public function testCountQuery_MixedResultsWithName() public function testCountQuery_MixedResultsWithName()
{ {
$dql = 'SELECT a, sum(a.name) as foo FROM Doctrine\Tests\ORM\Tools\Pagination\Author a'; $dql = 'SELECT a, sum(a.name) as foo FROM Doctrine\Tests\ORM\Tools\Pagination\Author a';
@ -67,30 +66,30 @@ class LimitSubqueryWalkerTest extends PaginationTestCase
); );
} }
public function testAggQuery_MixedResultsWithNameAndSort() public function testAggQuery_MixedResultsWithNameAndSort() : void
{ {
$dql = 'SELECT a, sum(a.name) as foo FROM Doctrine\Tests\ORM\Tools\Pagination\Author a ORDER BY foo DESC'; $dql = 'SELECT a, sum(a.name) as foo FROM Doctrine\Tests\ORM\Tools\Pagination\Author a ORDER BY foo DESC';
$query = $this->entityManager->createQuery($dql); $query = $this->entityManager->createQuery($dql);
$limitQuery = clone $query;
$limitQuery = clone $query;
$limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [LimitSubqueryWalker::class]); $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [LimitSubqueryWalker::class]);
$this->assertEquals( self::assertSame(
"SELECT DISTINCT a0_.id AS id_0, sum(a0_.name) AS sclr_1 FROM Author a0_ ORDER BY sclr_1 DESC", 'SELECT DISTINCT a0_.id AS id_0, sum(a0_.name) AS sclr_1 FROM Author a0_ ORDER BY sclr_1 DESC',
$limitQuery->getSQL() $limitQuery->getSQL()
); );
} }
public function testAggQuery_MultipleMixedResultsWithSort() public function testAggQuery_MultipleMixedResultsWithSort() : void
{ {
$dql = 'SELECT a, sum(a.name) as foo, (SELECT count(subA.id) FROM Doctrine\Tests\ORM\Tools\Pagination\Author subA WHERE subA.id = a.id ) as bar FROM Doctrine\Tests\ORM\Tools\Pagination\Author a ORDER BY foo DESC, bar ASC'; $dql = 'SELECT a, sum(a.name) as foo, (SELECT count(subA.id) FROM Doctrine\Tests\ORM\Tools\Pagination\Author subA WHERE subA.id = a.id ) as bar FROM Doctrine\Tests\ORM\Tools\Pagination\Author a ORDER BY foo DESC, bar ASC';
$query = $this->entityManager->createQuery($dql); $query = $this->entityManager->createQuery($dql);
$limitQuery = clone $query;
$limitQuery = clone $query;
$limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [LimitSubqueryWalker::class]); $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [LimitSubqueryWalker::class]);
$this->assertEquals( self::assertSame(
"SELECT DISTINCT a0_.id AS id_0, sum(a0_.name) AS sclr_1, (SELECT count(a1_.id) AS sclr_3 FROM Author a1_ WHERE a1_.id = a0_.id) AS sclr_2 FROM Author a0_ ORDER BY sclr_1 DESC, sclr_2 ASC", 'SELECT DISTINCT a0_.id AS id_0, sum(a0_.name) AS sclr_1, (SELECT count(a1_.id) AS sclr_3 FROM Author a1_ WHERE a1_.id = a0_.id) AS sclr_2 FROM Author a0_ ORDER BY sclr_1 DESC, sclr_2 ASC',
$limitQuery->getSQL() $limitQuery->getSQL()
); );
} }