kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

don't shadow through_scope method name with local var.

Browse source
This commit is contained in:
Yves Senn 2013-06-25 09:44:37 +02:00
parent 4a9cf2e382
commit 162cc66864
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
activerecord/lib/active_record/associations/preloader/through_association.rb
View file

@ -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