diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-06-01 03:26:51 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-06-01 03:26:51 +0000 |
| commit | b05fc40b5d096695dad5b3282664512d7509a529 (patch) | |
| tree | e6e9ceec2d693df0f952947c05f63e24022137db /activerecord/lib/active_record/calculations.rb | |
| parent | 6435ecc68ab76ed73b5a0ae84bb325e7d7cd486d (diff) | |
| download | rails-b05fc40b5d096695dad5b3282664512d7509a529.tar.gz rails-b05fc40b5d096695dad5b3282664512d7509a529.tar.bz2 rails-b05fc40b5d096695dad5b3282664512d7509a529.zip | |
Calculations support non-numeric foreign keys. Closes #8154.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6919 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/calculations.rb')
| -rw-r--r-- | activerecord/lib/active_record/calculations.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/calculations.rb b/activerecord/lib/active_record/calculations.rb index 09c0c979e6..ef59db915a 100644 --- a/activerecord/lib/active_record/calculations.rb +++ b/activerecord/lib/active_record/calculations.rb @@ -235,7 +235,8 @@ module ActiveRecord end 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) + key = type_cast_calculated_value(row[group_alias], group_column) + key = key_records[key] if associated value = row[aggregate_alias] all << [key, type_cast_calculated_value(value, column, operation)] end |