diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2012-12-30 01:28:10 -0800 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2012-12-30 01:28:10 -0800 |
| commit | 257b3f63c4c73e369d789c7b10653398df7390f7 (patch) | |
| tree | 8d5a1f63897c87c35f8f78f301f8ff8efec64302 /activerecord | |
| parent | 2e92a23bdf9fa84ba5f29dd70cf1bb7419e8bfbd (diff) | |
| parent | 92ab7ac9b57476eb3ce67c5689f6381ac53bcb08 (diff) | |
| download | rails-257b3f63c4c73e369d789c7b10653398df7390f7.tar.gz rails-257b3f63c4c73e369d789c7b10653398df7390f7.tar.bz2 rails-257b3f63c4c73e369d789c7b10653398df7390f7.zip | |
Merge pull request #8656 from arunagw/warning_removed_shadowing_var
warning removed: shadowing outer local variable
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/relation/calculations.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/calculations.rb b/activerecord/lib/active_record/relation/calculations.rb index 29f205450d..0b27ea730b 100644 --- a/activerecord/lib/active_record/relation/calculations.rb +++ b/activerecord/lib/active_record/relation/calculations.rb @@ -314,9 +314,9 @@ module ActiveRecord end Hash[calculated_data.map do |row| - key = group_columns.map { |aliaz, column_name| + key = group_columns.map { |aliaz, col_name| column = calculated_data.column_types.fetch(aliaz) do - column_for(column_name) + column_for(col_name) end type_cast_calculated_value(row[aliaz], column) } |