[tor-commits] [metrics-web/master] Fully qualify columns in GROUP BY statement.

[karsten at torproject.org]

commit 6987c758a13a59f2c9e28af57254fd9972d6b5ee
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Tue Jul 19 17:51:37 2016 +0200

    Fully qualify columns in GROUP BY statement.
    
    Turns out that explicit column aliases are not sufficient to make
    column references in the GROUP BY statement unambiguous.
    
    Bugfix on commit a589b95.
---
 modules/clients/init-userstats.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/clients/init-userstats.sql b/modules/clients/init-userstats.sql
index 09447f6..2380bb6 100644
--- a/modules/clients/init-userstats.sql
+++ b/modules/clients/init-userstats.sql
@@ -624,7 +624,7 @@ BEGIN
     AND country.fingerprint = transport.fingerprint
     AND country.fingerprint = total.fingerprint
     AND transport.fingerprint = total.fingerprint
-    GROUP BY date, country, transport;
+    GROUP BY country.date, country.country, transport.transport;
 
   -- We're done combining new data.
   RAISE NOTICE '% Finishing combine step.', timeofday();