From 8cbf5a50c8cecf7e273bb034ecc6b9a77150d041 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Thu, 23 Dec 2010 09:31:56 +0000
Subject: #1003860 follow-up by dereine, dmitrig01, chx: Fix count queries with
 aliases.

---
 includes/database/select.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'includes/database')

diff --git a/includes/database/select.inc b/includes/database/select.inc
index 16091061b..9046afbdf 100644
--- a/includes/database/select.inc
+++ b/includes/database/select.inc
@@ -1362,7 +1362,7 @@ class SelectQuery extends Query implements SelectQueryInterface {
     // 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
-- 
cgit v1.2.3