Doctrine

Timestamp:

03/04/08 23:55:55 (16 months ago)

Author:

jwage

Message:

fixes #451

Files:

• branches/0.10/lib/Doctrine/Query.php (modified) (3 diffs)

branches/0.10/lib/Doctrine/Query.php

@@ -1765 +1765 @@
         $map = reset($this->_queryComponents);
         $componentAlias = key($this->_queryComponents);
+        $tableAlias = $this->getTableAlias($componentAlias);
         $table = $map['table'];
+        $idColumnNames = $table->getIdentifierColumnNames();
 
         // build the query base
-        $q  = 'SELECT COUNT(DISTINCT ' . $this->getTableAlias($componentAlias)
-              . '.' . implode(',', $table->getIdentifierColumnNames())
+        $q  = 'SELECT COUNT(DISTINCT ' . $tableAlias
+              . '.' . implode(', ' . $tableAlias . '.', $idColumnNames)
               . ') AS num_results';
 
@@ -1786 +1788 @@
             $where[] = $string;
         }
+
         // append conditions
         $q .= ( ! empty($where)) ?  ' WHERE '  . implode(' AND ', $where) : '';
-        $q .= ( ! empty($groupby)) ?  ' GROUP BY '  . implode(', ', $groupby) : '';
+
+        if ( ! empty($groupby)) {
+          // Maintain existing groupby
+          $q .= ' GROUP BY '  . implode(', ', $groupby);
+        } else {
+          // Default groupby to primary identifier. Database defaults to this internally
+          // This is required for situations where the user has aggregate functions in the select part
+          // Without the groupby it fails
+          $q .= ' GROUP BY ' . $tableAlias . '.' . implode(', ' . $tableAlias . '.', $idColumnNames);
+        }
+
         $q .= ( ! empty($having)) ? ' HAVING ' . implode(' AND ', $having): '';
 
@@ -1794 +1807 @@
             $params = array($params);
         }
+  
         // append parameters
         $params = array_merge($this->_params['where'], $this->_params['having'], $this->_params['join'], $params);