Changeset 3154

Timestamp:

05/06/08 13:13:07 (2 months ago)

Author:

pmjones

Message:

Solar_Sql_Select: [FIX] It's not "distinct" that messes things up, it's "group", so check for that instead when counting pages.

Files:

• trunk/Solar/Sql/Select.php (modified) (3 diffs)

trunk/Solar/Sql/Select.php

@@ -1186 +1186 @@
-        }
-        
-DISTINCT
-is_distinct = $select->_parts['distinct
+GROUP
+has_grouping = (bool) $select->_parts['group
-        
-        // look in the WHERE and HAVING clauses for a `COUNT` condition
@@ -1193 +1193 @@
-                          $this->_hasCountCond($select->_parts['having']);
-        
-count condition or a distinct
-count_cond || $is_distinct
+grouping or a count condition
+grouping || $has_count_cond
-            
-            // count on a sub-select instead.
@@ -1201 +1201 @@
-        } else {
-            
-count condition in WHERE or HAVING).
-
+grouping, and no count condition in WHERE or
+HAVING).  
-            $select->_addSource(
-                'cols',         // type