Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixe Oracle Pagination bug when ordering is present (e.g. Oracle subquery ordering) #645

Closed
wants to merge 2 commits into from
Closed

Fixe Oracle Pagination bug when ordering is present (e.g. Oracle subquery ordering) #645

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8b7afe
Fix Oracle subquery ordering lost bug
raykolbe Apr 9, 2013
4bafcc5
Fix Oracle subquery ordering
raykolbe Apr 9, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
use Doctrine\ORM\Query\SqlWalker;
use Doctrine\ORM\Query\AST\SelectStatement;
use Doctrine\DBAL\Platforms\PostgreSqlPlatform;
use Doctrine\DBAL\Platforms\OraclePlatform;

/**
* Wraps the query in order to select root entity IDs for pagination.
Expand Down Expand Up @@ -137,13 +138,14 @@ public function walkSelectStatement(SelectStatement $AST)
));
}

// Build the counter query.
// Build the counter query
$sql = sprintf('SELECT DISTINCT %s FROM (%s) dctrn_result',
implode(', ', $sqlIdentifier), $innerSql);

if ($this->platform instanceof PostgreSqlPlatform) {
if ($this->platform instanceof PostgreSqlPlatform ||
$this->platform instanceof OraclePlatform) {
//http://www.doctrine-project.org/jira/browse/DDC-1958
$this->getPostgresqlSql($AST, $sqlIdentifier, $innerSql, $sql);
$this->preserveSqlOrdering($AST, $sqlIdentifier, $innerSql, $sql);
}

// Apply the limit and offset.
Expand All @@ -161,9 +163,9 @@ public function walkSelectStatement(SelectStatement $AST)

return $sql;
}

/**
* Generates new SQL for postgresql if necessary.
* Generates new SQL for Postgresql or Oracle if necessary.
*
* @param SelectStatement $AST
* @param array $sqlIdentifier
Expand All @@ -172,7 +174,7 @@ public function walkSelectStatement(SelectStatement $AST)
*
* @return void
*/
public function getPostgresqlSql(SelectStatement $AST, array $sqlIdentifier, $innerSql, &$sql)
public function preserveSqlOrdering(SelectStatement $AST, array $sqlIdentifier, $innerSql, &$sql)
{
// For every order by, find out the SQL alias by inspecting the ResultSetMapping.
$sqlOrderColumns = array();
Expand Down