From d0c0592e853637f6b4996bb22c2f409d66713354 Mon Sep 17 00:00:00 2001
From: zYne <zYne@625475ce-881a-0410-a577-b389adb331d8>
Date: Thu, 26 Oct 2006 23:20:01 +0000
Subject: [PATCH] Little fix for preserving fields on pgsql when limit subquery
 with orderby is used

---
 lib/Doctrine/Query.php | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/lib/Doctrine/Query.php b/lib/Doctrine/Query.php
index cd00c1ea9..9a0ef926d 100644
--- a/lib/Doctrine/Query.php
+++ b/lib/Doctrine/Query.php
@@ -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) {