Permalink
Browse files

Merge pull request #8656 from arunagw/warning_removed_shadowing_var

warning removed: shadowing outer local variable
  • Loading branch information...
2 parents 2e92a23 + 92ab7ac commit 257b3f63c4c73e369d789c7b10653398df7390f7 @guilleiguaran guilleiguaran committed Dec 30, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 activerecord/lib/active_record/relation/calculations.rb
View
4 activerecord/lib/active_record/relation/calculations.rb
@@ -314,9 +314,9 @@ def execute_grouped_calculation(operation, column_name, distinct) #:nodoc:
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)
}

0 comments on commit 257b3f6

Please sign in to comment.