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

Merge pull request #1092 from birko/pagination-count-walker

Browse source 
[DDC-2794] Arbitrary Join count walkers solution
This commit is contained in:
Marco Pivetta 2014-09-23 00:30:30 +02:00
commit 3f8865c6fb
8 changed files with 117 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/Doctrine/ORM/Tools/Pagination/CountOutputWalker.php
View file

@ -96,7 +96,8 @@ class CountOutputWalker extends SqlWalker
throw new \RuntimeException("Cannot count query which selects two FROM components, cannot make distinction"); throw new \RuntimeException("Cannot count query which selects two FROM components, cannot make distinction");
} }
$rootAlias = $from[0]->rangeVariableDeclaration->aliasIdentificationVariable; $fromRoot = reset($from);
$rootAlias = $fromRoot->rangeVariableDeclaration->aliasIdentificationVariable;
$rootClass = $this->queryComponents[$rootAlias]['metadata']; $rootClass = $this->queryComponents[$rootAlias]['metadata'];
$rootIdentifier = $rootClass->identifier; $rootIdentifier = $rootClass->identifier;

29
lib/Doctrine/ORM/Tools/Pagination/CountWalker.php
View file

@ -50,31 +50,26 @@ class CountWalker extends TreeWalkerAdapter
throw new \RuntimeException('Cannot count query that uses a HAVING clause. Use the output walkers for pagination'); throw new \RuntimeException('Cannot count query that uses a HAVING clause. Use the output walkers for pagination');
} }
$rootComponents = array(); $queryComponents = $this->_getQueryComponents();
foreach ($this->_getQueryComponents() as $dqlAlias => $qComp) { // Get the root entity and alias from the AST fromClause
$isParent = array_key_exists('parent', $qComp) $from = $AST->fromClause->identificationVariableDeclarations;
&& $qComp['parent'] === null
&& $qComp['nestingLevel'] == 0 if (count($from) > 1) {
;
if ($isParent) {
$rootComponents[] = array($dqlAlias => $qComp);
}
}
if (count($rootComponents) > 1) {
throw new \RuntimeException("Cannot count query which selects two FROM components, cannot make distinction"); throw new \RuntimeException("Cannot count query which selects two FROM components, cannot make distinction");
} }
$root = reset($rootComponents);
$parentName = key($root); $fromRoot = reset($from);
$parent = current($root); $rootAlias = $fromRoot->rangeVariableDeclaration->aliasIdentificationVariable;
$identifierFieldName = $parent['metadata']->getSingleIdentifierFieldName(); $rootClass = $queryComponents[$rootAlias]['metadata'];
$identifierFieldName = $rootClass->getSingleIdentifierFieldName();
$pathType = PathExpression::TYPE_STATE_FIELD; $pathType = PathExpression::TYPE_STATE_FIELD;
if (isset($parent['metadata']->associationMappings[$identifierFieldName])) { if (isset($rootClass->associationMappings[$identifierFieldName])) {
$pathType = PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION; $pathType = PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION;
} }
$pathExpression = new PathExpression( $pathExpression = new PathExpression(
PathExpression::TYPE_STATE_FIELD | PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION, $parentName, PathExpression::TYPE_STATE_FIELD | PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION, $rootAlias,
$identifierFieldName $identifierFieldName
); );
$pathExpression->type = $pathType; $pathExpression->type = $pathType;

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

@ -122,7 +122,8 @@ class LimitSubqueryOutputWalker extends SqlWalker
throw new \RuntimeException("Cannot count query which selects two FROM components, cannot make distinction"); throw new \RuntimeException("Cannot count query which selects two FROM components, cannot make distinction");
} }
$rootAlias = $from[0]->rangeVariableDeclaration->aliasIdentificationVariable; $fromRoot = reset($from);
$rootAlias = $fromRoot->rangeVariableDeclaration->aliasIdentificationVariable;
$rootClass = $this->queryComponents[$rootAlias]['metadata']; $rootClass = $this->queryComponents[$rootAlias]['metadata'];
$rootIdentifier = $rootClass->identifier; $rootIdentifier = $rootClass->identifier;

27
lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryWalker.php
View file

@ -60,37 +60,36 @@ class LimitSubqueryWalker extends TreeWalkerAdapter
*/ */
public function walkSelectStatement(SelectStatement $AST) public function walkSelectStatement(SelectStatement $AST)
{ {
$parent = null; $queryComponents = $this->_getQueryComponents();
$parentName = null; // Get the root entity and alias from the AST fromClause
$from = $AST->fromClause->identificationVariableDeclarations;
$fromRoot = reset($from);
$rootAlias = $fromRoot->rangeVariableDeclaration->aliasIdentificationVariable;
$rootClass = $queryComponents[$rootAlias]['metadata'];
$selectExpressions = array(); $selectExpressions = array();
foreach ($this->_getQueryComponents() as $dqlAlias => $qComp) { foreach ($queryComponents as $dqlAlias => $qComp) {
// Preserve mixed data in query for ordering. // Preserve mixed data in query for ordering.
if (isset($qComp['resultVariable'])) { if (isset($qComp['resultVariable'])) {
$selectExpressions[] = new SelectExpression($qComp['resultVariable'], $dqlAlias); $selectExpressions[] = new SelectExpression($qComp['resultVariable'], $dqlAlias);
continue; continue;
} }
if ($qComp['parent'] === null && $qComp['nestingLevel'] == 0) {
$parent = $qComp;
$parentName = $dqlAlias;
continue;
}
} }
$identifier = $parent['metadata']->getSingleIdentifierFieldName(); $identifier = $rootClass->getSingleIdentifierFieldName();
if (isset($parent['metadata']->associationMappings[$identifier])) {
if (isset($rootClass->associationMappings[$identifier])) {
throw new \RuntimeException("Paginating an entity with foreign key as identifier only works when using the Output Walkers. Call Paginator#setUseOutputWalkers(true) before iterating the paginator."); throw new \RuntimeException("Paginating an entity with foreign key as identifier only works when using the Output Walkers. Call Paginator#setUseOutputWalkers(true) before iterating the paginator.");
} }
$this->_getQuery()->setHint( $this->_getQuery()->setHint(
self::IDENTIFIER_TYPE, self::IDENTIFIER_TYPE,
Type::getType($parent['metadata']->getTypeOfField($identifier)) Type::getType($rootClass->getTypeOfField($identifier))
); );
$pathExpression = new PathExpression( $pathExpression = new PathExpression(
PathExpression::TYPE_STATE_FIELD | PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION, PathExpression::TYPE_STATE_FIELD | PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION,
$parentName, $rootAlias,
$identifier $identifier
); );
$pathExpression->type = PathExpression::TYPE_STATE_FIELD; $pathExpression->type = PathExpression::TYPE_STATE_FIELD;

29
lib/Doctrine/ORM/Tools/Pagination/WhereInWalker.php
View file

@ -71,30 +71,25 @@ class WhereInWalker extends TreeWalkerAdapter
*/ */
public function walkSelectStatement(SelectStatement $AST) public function walkSelectStatement(SelectStatement $AST)
{ {
$rootComponents = array(); $queryComponents = $this->_getQueryComponents();
foreach ($this->_getQueryComponents() as $dqlAlias => $qComp) { // Get the root entity and alias from the AST fromClause
$isParent = array_key_exists('parent', $qComp) $from = $AST->fromClause->identificationVariableDeclarations;
&& $qComp['parent'] === null
&& $qComp['nestingLevel'] == 0 if (count($from) > 1) {
;
if ($isParent) {
$rootComponents[] = array($dqlAlias => $qComp);
}
}
if (count($rootComponents) > 1) {
throw new \RuntimeException("Cannot count query which selects two FROM components, cannot make distinction"); throw new \RuntimeException("Cannot count query which selects two FROM components, cannot make distinction");
} }
$root = reset($rootComponents);
$parentName = key($root); $fromRoot = reset($from);
$parent = current($root); $rootAlias = $fromRoot->rangeVariableDeclaration->aliasIdentificationVariable;
$identifierFieldName = $parent['metadata']->getSingleIdentifierFieldName(); $rootClass = $queryComponents[$rootAlias]['metadata'];
$identifierFieldName = $rootClass->getSingleIdentifierFieldName();
$pathType = PathExpression::TYPE_STATE_FIELD; $pathType = PathExpression::TYPE_STATE_FIELD;
if (isset($parent['metadata']->associationMappings[$identifierFieldName])) { if (isset($rootClass->associationMappings[$identifierFieldName])) {
$pathType = PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION; $pathType = PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION;
} }
$pathExpression = new PathExpression(PathExpression::TYPE_STATE_FIELD | PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION, $parentName, $identifierFieldName); $pathExpression = new PathExpression(PathExpression::TYPE_STATE_FIELD | PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION, $rootAlias, $identifierFieldName);
$pathExpression->type = $pathType; $pathExpression->type = $pathType;
$count = $this->_getQuery()->getHint(self::HINT_PAGINATOR_ID_COUNT); $count = $this->_getQuery()->getHint(self::HINT_PAGINATOR_ID_COUNT);

16
tests/Doctrine/Tests/ORM/Tools/Pagination/CountWalkerTest.php
View file

@ -90,5 +90,21 @@ class CountWalkerTest extends PaginationTestCase
$query->getSql(); $query->getSql();
} }
/**
* Arbitrary Join
*/
public function testCountQueryWithArbitraryJoin()
{
$query = $this->entityManager->createQuery(
'SELECT p FROM Doctrine\Tests\ORM\Tools\Pagination\BlogPost p LEFT JOIN Doctrine\Tests\ORM\Tools\Pagination\Category c WITH p.category = c');
$query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\CountWalker'));
$query->setHint(CountWalker::HINT_DISTINCT, true);
$query->setFirstResult(null)->setMaxResults(null);
$this->assertEquals(
"SELECT count(DISTINCT b0_.id) AS sclr_0 FROM BlogPost b0_ LEFT JOIN Category c1_ ON (b0_.category_id = c1_.id)", $query->getSql()
);
}
} }

31
tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryWalkerTest.php
View file

@ -67,5 +67,36 @@ class LimitSubqueryWalkerTest extends PaginationTestCase
$limitQuery->getSql() $limitQuery->getSql()
); );
} }
/**
* Arbitrary Join
*/
public function testLimitSubqueryWithArbitraryJoin()
{
$dql = 'SELECT p, c FROM Doctrine\Tests\ORM\Tools\Pagination\MyBlogPost p JOIN Doctrine\Tests\ORM\Tools\Pagination\Category c WITH p.category = c';
$query = $this->entityManager->createQuery($dql);
$limitQuery = clone $query;
$limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\LimitSubqueryWalker'));
$this->assertEquals(
"SELECT DISTINCT m0_.id AS id_0 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON (m0_.category_id = c1_.id)",
$limitQuery->getSql()
);
}
public function testLimitSubqueryWithSortWithArbitraryJoin()
{
$dql = 'SELECT p, c FROM Doctrine\Tests\ORM\Tools\Pagination\MyBlogPost p JOIN Doctrine\Tests\ORM\Tools\Pagination\Category c WITH p.category = c ORDER BY p.title';
$query = $this->entityManager->createQuery($dql);
$limitQuery = clone $query;
$limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\LimitSubqueryWalker'));
$this->assertEquals(
"SELECT DISTINCT m0_.id AS id_0, m0_.title AS title_1 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON (m0_.category_id = c1_.id) ORDER BY m0_.title ASC",
$limitQuery->getSql()
);
}
} }

29
tests/Doctrine/Tests/ORM/Tools/Pagination/WhereInWalkerTest.php
View file

@ -121,5 +121,34 @@ class WhereInWalkerTest extends PaginationTestCase
"SELECT u0_.id AS id_0, g1_.id AS id_1 FROM User u0_ INNER JOIN user_group u2_ ON u0_.id = u2_.user_id INNER JOIN groups g1_ ON g1_.id = u2_.group_id WHERE (NOT 1 = 2) AND u0_.id IN (?)", $whereInQuery->getSql() "SELECT u0_.id AS id_0, g1_.id AS id_1 FROM User u0_ INNER JOIN user_group u2_ ON u0_.id = u2_.user_id INNER JOIN groups g1_ ON g1_.id = u2_.group_id WHERE (NOT 1 = 2) AND u0_.id IN (?)", $whereInQuery->getSql()
); );
} }
/**
* Arbitrary Join
*/
public function testWhereInQueryWithArbitraryJoin_NoWhere()
{
$whereInQuery = $this->entityManager->createQuery(
'SELECT p FROM Doctrine\Tests\ORM\Tools\Pagination\BlogPost p JOIN Doctrine\Tests\ORM\Tools\Pagination\Category c WITH p.category = c'
);
$whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\WhereInWalker'));
$whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10);
$this->assertEquals(
"SELECT b0_.id AS id_0, b0_.author_id AS author_id_1, b0_.category_id AS category_id_2 FROM BlogPost b0_ INNER JOIN Category c1_ ON (b0_.category_id = c1_.id) WHERE b0_.id IN (?)", $whereInQuery->getSql()
);
}
public function testWhereInQueryWithArbitraryJoin_SingleWhere()
{
$whereInQuery = $this->entityManager->createQuery(
'SELECT p FROM Doctrine\Tests\ORM\Tools\Pagination\BlogPost p JOIN Doctrine\Tests\ORM\Tools\Pagination\Category c WITH p.category = c WHERE 1 = 1'
);
$whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\WhereInWalker'));
$whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10);
$this->assertEquals(
"SELECT b0_.id AS id_0, b0_.author_id AS author_id_1, b0_.category_id AS category_id_2 FROM BlogPost b0_ INNER JOIN Category c1_ ON (b0_.category_id = c1_.id) WHERE 1 = 1 AND b0_.id IN (?)", $whereInQuery->getSql()
);
}
} }