Skip to content

D
doctrine-dbal
Commit d0c0592e authored by zYne's avatar zYne
Browse files
Options

Little fix for preserving fields on pgsql when limit subquery with orderby is used

parent dd73f6de
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 4 deletions
lib/Doctrine/Query.php
View file @ d0c0592e
...@@ -498,7 +498,7 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable { ...@@ -498,7 +498,7 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable {
break; break;
} }
$field = $table->getTableName().'.'.$table->getIdentifier(); $field = $table->getTableName() . '.' . $table->getIdentifier();
array_unshift($this->parts['where'], $field. ' IN (' . $subquery . ')'); array_unshift($this->parts['where'], $field. ' IN (' . $subquery . ')');
$modifyLimit = false; $modifyLimit = false;
} }
...@@ -533,9 +533,18 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable { ...@@ -533,9 +533,18 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable {
$k = array_keys($this->tables); $k = array_keys($this->tables);
$table = $this->tables[$k[0]]; $table = $this->tables[$k[0]];
$subquery = 'SELECT DISTINCT ' . $table->getTableName() $subquery = 'SELECT DISTINCT ' . $table->getTableName()
. '.' . $table->getIdentifier() . '.' . $table->getIdentifier();
. ' FROM '.$table->getTableName();
if($this->connection->getDBH()->getAttribute(PDO::ATTR_DRIVER_NAME) == 'pgsql') {
foreach($this->parts['orderby'] as $part) {
$e = explode(' ', $part);
$subquery .= ', ' . $e[0];
}
}
$subquery .= ' FROM '.$table->getTableName();
foreach($this->parts['join'] as $parts) { foreach($this->parts['join'] as $parts) {
foreach($parts as $part) { foreach($parts as $part) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment