kubaninc / groupdate

Download as
Browse Code ยป

Commit 84a12f9ed25f49a280e6e32a7e7e21e98189d005

Authored by Andrew Kane
2 parents 2aefbbfb 486b617b
Exists in master and in 8 other branches auto_calculations, debug_time_zone_support, infinite_loop_fix, jruby, mysql_adapter, sqlite, travis_sqlite, v2

Merge branch 'leonelgalan-fix/multiple_group_by'

Showing 3 changed files with 11 additions and 4 deletions   Show diff stats
lib/groupdate/magic.rb
  Diff comments   View file @84a12f9
... ... @@ -222,7 +222,7 @@ module Groupdate
222 222 series =
223 223 if multiple_groups
224 224 keys = count.keys.map { |k| k[0...@group_index] + k[(@group_index + 1)..-1] }.uniq
225   - series = series.reverse if reverse
  225 + series = series.to_a.reverse if reverse
226 226 keys.flat_map do |k|
227 227 series.map { |s| k[0...@group_index] + [s] + k[@group_index..-1] }
228 228 end
... ...
lib/groupdate/series.rb
  Diff comments   View file @84a12f9
... ... @@ -22,5 +22,9 @@ module Groupdate
22 22 def respond_to?(method, include_all = false)
23 23 ActiveRecord::Calculations.method_defined?(method) || relation.respond_to?(method) || super
24 24 end
  25 +
  26 + def reverse_order_value
  27 + nil
  28 + end
25 29 end
26 30 end
... ...
test/test_helper.rb
  Diff comments   View file @84a12f9
... ... @@ -154,9 +154,12 @@ module TestDatabase
154 154  
155 155 def test_groupdate_multiple_hour_of_day_day_of_week
156 156 create_user "2013-05-01 00:00:00 UTC", 1
157   - expected = {
158   - [0, 3] => 1
159   - }
  157 + expected = {}
  158 + 24.times do |i|
  159 + 7.times do |j|
  160 + expected[[i, j]] = i == 0 && j == 3 ? 1 : 0
  161 + end
  162 + end
160 163 assert_equal expected, User.group_by_hour_of_day(:created_at).group_by_day_of_week(:created_at).count
161 164 end
162 165  
... ...