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 delegate Reflection#chain to ThroughAssociation

Browse source 
We shouldn't be delegating chain to ThroughAssociation since the
only place that needs to call it is `target_scope`. Instead we
can call `reflecion.chain`.
This commit is contained in:
eileencodes 2014-08-04 19:39:07 -04:00
parent cfb8d4ad3d
commit 80af2a4935
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
activerecord/lib/active_record/associations/through_association.rb
View file

@ -3,7 +3,7 @@ module ActiveRecord
module Associations
module ThroughAssociation #:nodoc:
delegate :source_reflection, :through_reflection, :chain, :to => :reflection
delegate :source_reflection, :through_reflection, :to => :reflection
protected
@ -13,7 +13,7 @@ module ActiveRecord
# 2. To get the type conditions for any STI models in the chain
def target_scope
scope = super
chain.drop(1).each do |reflection|
reflection.chain.drop(1).each do |reflection|
relation = reflection.klass.all
relation.merge!(reflection.scope) if reflection.scope