diff options
| author | Rick Olson <technoweenie@gmail.com> | 2006-04-30 20:36:37 +0000 |
|---|---|---|
| committer | Rick Olson <technoweenie@gmail.com> | 2006-04-30 20:36:37 +0000 |
| commit | 325cb1269cb2aa8e1abe7bc103db3cb47ae5eaf6 (patch) | |
| tree | 7b623489e92e99c3beae1f1624484a4aaf42e6cc /activerecord | |
| parent | 59bd6586c8e7e290187978f3868d435ee267006c (diff) | |
| download | rails-325cb1269cb2aa8e1abe7bc103db3cb47ae5eaf6.tar.gz rails-325cb1269cb2aa8e1abe7bc103db3cb47ae5eaf6.tar.bz2 rails-325cb1269cb2aa8e1abe7bc103db3cb47ae5eaf6.zip | |
Namespaced OrderedHash so the Rails implementation does not clash with any others. (fixes #4911) [Julian Tarkhanov]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4318 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/calculations.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/calculations.rb b/activerecord/lib/active_record/calculations.rb index e16bf9e6d7..409466866f 100644 --- a/activerecord/lib/active_record/calculations.rb +++ b/activerecord/lib/active_record/calculations.rb @@ -217,7 +217,7 @@ module ActiveRecord key_records = key_records.inject({}) { |hsh, r| hsh.merge(r.id => r) } end - calculated_data.inject(OrderedHash.new) do |all, row| + calculated_data.inject(ActiveSupport::OrderedHash.new) do |all, row| key = associated ? key_records[row[group_alias].to_i] : type_cast_calculated_value(row[group_alias], group_column) value = row[aggregate_alias] all << [key, type_cast_calculated_value(value, column, operation)] |