aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorArun Agrawal <arunagw@gmail.com>2012-12-30 14:55:27 +0530
committerArun Agrawal <arunagw@gmail.com>2012-12-30 14:56:28 +0530
commit92ab7ac9b57476eb3ce67c5689f6381ac53bcb08 (patch)
tree8d5a1f63897c87c35f8f78f301f8ff8efec64302 /activerecord
parent2e92a23bdf9fa84ba5f29dd70cf1bb7419e8bfbd (diff)
downloadrails-92ab7ac9b57476eb3ce67c5689f6381ac53bcb08.tar.gz
rails-92ab7ac9b57476eb3ce67c5689f6381ac53bcb08.tar.bz2
rails-92ab7ac9b57476eb3ce67c5689f6381ac53bcb08.zip
warning removed: shadowing outer local variable
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/relation/calculations.rb4
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)
}