aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/preloader/through_association.rb
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2013-06-25 09:44:37 +0200
committerYves Senn <yves.senn@gmail.com>2013-06-30 14:40:45 +0200
commit162cc66864f93641610d246191ec53cd020bf545 (patch)
tree5f126c8a12d81d0e3db7fabe0b64daf5efe085da /activerecord/lib/active_record/associations/preloader/through_association.rb
parent4a9cf2e382b2a3c2d064491907f7e95b3b1c4bec (diff)
downloadrails-162cc66864f93641610d246191ec53cd020bf545.tar.gz
rails-162cc66864f93641610d246191ec53cd020bf545.tar.bz2
rails-162cc66864f93641610d246191ec53cd020bf545.zip
don't shadow `through_scope` method name with local var.
Diffstat (limited to 'activerecord/lib/active_record/associations/preloader/through_association.rb')
-rw-r--r--activerecord/lib/active_record/associations/preloader/through_association.rb14
1 files changed, 7 insertions, 7 deletions
diff --git a/activerecord/lib/active_record/associations/preloader/through_association.rb b/activerecord/lib/active_record/associations/preloader/through_association.rb
index c4b50ab306..de06931845 100644
--- a/activerecord/lib/active_record/associations/preloader/through_association.rb
+++ b/activerecord/lib/active_record/associations/preloader/through_association.rb
@@ -41,21 +41,21 @@ module ActiveRecord
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