Doctrine

Timestamp:

12/30/08 16:10:26 (6 months ago)

Author:

guilhermeblanco

Message:

[1.0, 1.1] Fixes #1259. Fixed SELECT DISTINCT query with limit being applied.

Location:

branches

Files:

• 1.0/lib/Doctrine/Connection/Mssql.php (modified) (1 diff)
• 1.1/lib/Doctrine/Connection/Mssql.php (modified) (1 diff)

branches/1.0/lib/Doctrine/Connection/Mssql.php

@@ -127 +127 @@
                 $alias = trim(end(spliti(' as ', array_shift(explode(',', stristr($query,$order))))));
             }
-    
-            $query = preg_replace('/^SELECT\s/i', 'SELECT TOP ' . ($count+$offset) . ' ', $query);    
+
+            // Ticket #1259: Fix for limit-subquery in MSSQL
+            $selectRegExp = 'SELECT\s+';
+            $selectReplace = 'SELECT ';
+
+            if (preg_match('/^SELECT(\s+)DISTINCT/i',  $query)) {
+                $selectRegExp .= 'DISTINCT\s+';
+                $selectReplace .= 'DISTINCT ';
+            }
+
+            $query = preg_replace('/^'.$selectRegExp.'\s+/i', $selectReplace . 'TOP ' . ($count+$offset) . ' ', $query);    
             $query = 'SELECT * FROM (SELECT TOP ' . $count . ' * FROM (' . $query . ') AS ' . $this->quoteIdentifier('inner_tbl');
 

branches/1.1/lib/Doctrine/Connection/Mssql.php

@@ -128 +128 @@
             }
     
-            $query = preg_replace('/^SELECT\s/i', 'SELECT TOP ' . ($count+$offset) . ' ', $query);    
+            // Ticket #1259: Fix for limit-subquery in MSSQL
+            $selectRegExp = 'SELECT\s+';
+            $selectReplace = 'SELECT ';
+
+            if (preg_match('/^SELECT(\s+)DISTINCT/i',  $query)) {
+                $selectRegExp .= 'DISTINCT\s+';
+                $selectReplace .= 'DISTINCT ';
+            }
+
+            $query = preg_replace('/^'.$selectRegExp.'\s+/i', $selectReplace . 'TOP ' . ($count+$offset) . ' ', $query);
             $query = 'SELECT * FROM (SELECT TOP ' . $count . ' * FROM (' . $query . ') AS ' . $this->quoteIdentifier('inner_tbl');