? .DS_Store
? 1003860-fix-groupby-fields_0.patch
? 1004068-sqlite-addtable.patch
? 1005428-pragma_redundant.patch
? 850852-sqlite-concurrent-testing_1.patch
? 850852_transaction_14.patch
? 850852_transaction_16.patch
? 850852_transaction_17.patch
? 850852_transaction_18.patch
? 850852_transaction_19.patch
? 850852_transaction_23.patch
? 850852_transaction_24.patch
? asdf.patch
? databasecondition_multiple_queries.patch
? databasecondition_multiple_queries.patch.1
? flickr
? foo.patch
? foo_3.patch
? head.db
? head.db-simpletest174362
? head.db-simpletest319983
? head.db-simpletest438465
? head.db-simpletest438465-journal
? head.db-simpletest475304
? head.db-simpletest475304-journal
? head.db-simpletest510732
? head.db-simpletest572703
? head.db-simpletest58632
? head.db-simpletest58632-journal
? head.db-simpletest820036
? head.db-simpletest845048
? pragma_redundant.patch
? test_only
? includes/database/.DS_Store
? includes/database/mysqlbigint
? includes/database/sqlite/.DS_Store
? modules/.DS_Store
? modules/field/modules/.DS_Store
? modules/simpletest/.DS_Store
? modules/simpletest/tests/.DS_Store
? sites/all/.DS_Store
? sites/all/contributions
? sites/all/modules/.DS_Store
? sites/all/modules/devel
? sites/all/modules/multiple_email
? sites/all/modules/multiple_email.tgz
? sites/default/files
? sites/default/settings.php
Index: includes/database/select.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database/select.inc,v
retrieving revision 1.56
diff -u -p -r1.56 select.inc
--- includes/database/select.inc	22 Dec 2010 08:13:58 -0000	1.56
+++ includes/database/select.inc	23 Dec 2010 07:18:14 -0000
@@ -1362,7 +1362,7 @@ class SelectQuery extends Query implemen
     // Create our new query object that we will mutate into a count query.
     $count = clone($this);
 
-    $group_by = array_keys($count->getGroupBy());
+    $group_by = drupal_map_assoc(array_values($count->getGroupBy()));
 
     if (!$count->distinct) {
       // When not executing a distinct query, we can zero-out existing fields
Index: modules/simpletest/tests/database_test.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/database_test.test,v
retrieving revision 1.107
diff -u -p -r1.107 database_test.test
--- modules/simpletest/tests/database_test.test	22 Dec 2010 08:13:58 -0000	1.107
+++ modules/simpletest/tests/database_test.test	23 Dec 2010 07:18:15 -0000
@@ -2032,6 +2032,15 @@ class DatabaseSelectComplexTestCase exte
     $count = $query->countQuery()->execute()->fetchField();
 
     $this->assertEqual($count, 3, t('Counted the correct number of records.'));
+
+    // Test wth an alias.
+    $query = db_select('test_task');
+    $pid_field = $query->addField('test_task', 'pid', 'pid_alias');
+    $query->groupBy('pid_alias');
+
+    $count = $query->countQuery()->execute()->fetchField();
+
+    $this->assertEqual($count, 3, t('Counted the correct number of records.'));
   }
 
   /**