Permalink
Browse files

don't shadow `through_scope` method name with local var.

  • Loading branch information...
1 parent 4a9cf2e commit 162cc66864f93641610d246191ec53cd020bf545 @senny senny committed Jun 25, 2013
Showing with 7 additions and 7 deletions.
  1. +7 −7 activerecord/lib/active_record/associations/preloader/through_association.rb
@@ -41,21 +41,21 @@ def through_records_by_owner
end
def through_scope
- through_scope = through_reflection.klass.unscoped
+ scope = through_reflection.klass.unscoped
if options[:source_type]
- through_scope.where! reflection.foreign_type => options[:source_type]
+ scope.where! reflection.foreign_type => options[:source_type]
else
unless reflection_scope.where_values.empty?
- through_scope.includes_values = Array(reflection_scope.values[:includes] || options[:source])
- through_scope.where_values = reflection_scope.values[:where]
+ scope.includes_values = Array(reflection_scope.values[:includes] || options[:source])
+ scope.where_values = reflection_scope.values[:where]
end
- through_scope.references! reflection_scope.values[:references]
- through_scope.order! reflection_scope.values[:order] if through_scope.eager_loading?
+ scope.references! reflection_scope.values[:references]
+ scope.order! reflection_scope.values[:order] if scope.eager_loading?
end
- through_scope
+ scope
end
end
end

0 comments on commit 162cc66

Please sign in to comment.