diff options
| author | Emilio Tagua <miloops@gmail.com> | 2010-09-22 15:03:59 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2010-09-27 11:19:19 -0300 |
| commit | eff68d86adce12f8c850fcd810f18a81ef53c0eb (patch) | |
| tree | ee92ee3d40f2f143f4c9b6439929ced490761d2d | |
| parent | 7918a5c96604b6c2d8a60542b7afc9e445c43fba (diff) | |
| download | rails-eff68d86adce12f8c850fcd810f18a81ef53c0eb.tar.gz rails-eff68d86adce12f8c850fcd810f18a81ef53c0eb.tar.bz2 rails-eff68d86adce12f8c850fcd810f18a81ef53c0eb.zip | |
Prevent shadowing outer local variable.
| -rw-r--r-- | activerecord/lib/active_record/association_preload.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/association_preload.rb b/activerecord/lib/active_record/association_preload.rb index 715c868598..e6b367790b 100644 --- a/activerecord/lib/active_record/association_preload.rb +++ b/activerecord/lib/active_record/association_preload.rb @@ -321,14 +321,14 @@ module ActiveRecord klasses_and_ids[reflection.klass.name] = id_map unless id_map.empty? end - klasses_and_ids.each do |klass_name, id_map| + klasses_and_ids.each do |klass_name, _id_map| klass = klass_name.constantize table_name = klass.quoted_table_name primary_key = reflection.options[:primary_key] || klass.primary_key column_type = klass.columns.detect{|c| c.name == primary_key}.type - ids = id_map.keys.map do |id| + ids = _id_map.keys.map do |id| if column_type == :integer id.to_i elsif column_type == :float @@ -343,7 +343,7 @@ module ActiveRecord associated_records = klass.unscoped.where([conditions, ids]).apply_finder_options(options.slice(:include, :select, :joins, :order)).to_a - set_association_single_records(id_map, reflection.name, associated_records, primary_key) + set_association_single_records(_id_map, reflection.name, associated_records, primary_key) end end |