Merge pull request #2175 from Pistos/postgresql-fix-fb_connected_distribution_sql

Postgresql: Fix fb_connected_distribution_sql

lib/statistics.rb

@@ -79,10 +79,20 @@ SQL
           LEFT OUTER JOIN services on services.user_id = users.id
             AND services.type = 'Services::Facebook'
           #{self.where_clause_sql}
-          GROUP BY users.id
+          GROUP BY users.id, users.sign_in_count
 SQL
   end
 
+  def fb_connected_distribution
+    User.connection.select_all(fb_connected_distribution_sql).map { |row|
+      Hash[
+        row.map { |k,v|
+          [k, v.to_i]
+        }
+      ]
+    }
+  end
+
   def sign_in_count_sql
     <<SQL
       SELECT users.id AS id, users.sign_in_count AS count

spec/lib/statistics_spec.rb

@@ -99,7 +99,7 @@ describe Statistics do
                  {"id" => local_luke.id , "count" => 0, "connected" => 0 },
                  {"id" => local_leia.id , "count" => 0, "connected" => 0 }]
 
-      User.connection.select_all(@stats.fb_connected_distribution_sql).should =~ @result
+      @stats.fb_connected_distribution.should =~ @result
     end
   end