RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-13 14:56:01 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zYne 2006-10-26 23:20:01 +00:00
parent dd73f6de4a
commit d0c0592e85
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/Doctrine/Query.php
View File

@ -498,7 +498,7 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable {
break;
}
$field = $table->getTableName().'.'.$table->getIdentifier();
$field = $table->getTableName() . '.' . $table->getIdentifier();
array_unshift($this->parts['where'], $field. ' IN (' . $subquery . ')');
$modifyLimit = false;
}
@ -533,9 +533,18 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable {
$k = array_keys($this->tables);
$table = $this->tables[$k[0]];
$subquery = 'SELECT DISTINCT ' . $table->getTableName()
. '.' . $table->getIdentifier()
. ' FROM '.$table->getTableName();
$subquery = 'SELECT DISTINCT ' . $table->getTableName()
. '.' . $table->getIdentifier();
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($parts as $part) {