diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-03-10 19:28:26 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-03-10 19:28:26 +0000 |
| commit | 2d3d9e3531d0d49a94ded10b993640053bd76c03 (patch) | |
| tree | a5bd6b5e212f6b6863fbdd59dca43d58cdd110e7 /activerecord/lib/active_record/associations/through_association.rb | |
| parent | 6490d65234b89d4d28308b72b13d4834fd44bbb3 (diff) | |
| download | rails-2d3d9e3531d0d49a94ded10b993640053bd76c03.tar.gz rails-2d3d9e3531d0d49a94ded10b993640053bd76c03.tar.bz2 rails-2d3d9e3531d0d49a94ded10b993640053bd76c03.zip | |
Rename Reflection#through_reflection_chain and #through_options to Reflection#chain and Reflection#options as they now no longer relate solely to through associations.
Diffstat (limited to 'activerecord/lib/active_record/associations/through_association.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/through_association.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/associations/through_association.rb b/activerecord/lib/active_record/associations/through_association.rb index 408237c689..c0c92e8d72 100644 --- a/activerecord/lib/active_record/associations/through_association.rb +++ b/activerecord/lib/active_record/associations/through_association.rb @@ -3,8 +3,7 @@ module ActiveRecord module Associations module ThroughAssociation #:nodoc: - delegate :source_options, :through_options, :source_reflection, :through_reflection, - :through_reflection_chain, :through_conditions, :to => :reflection + delegate :source_reflection, :through_reflection, :chain, :to => :reflection protected @@ -18,7 +17,7 @@ module ActiveRecord # itself. def target_scope scope = super - through_reflection_chain[1..-1].each do |reflection| + chain[1..-1].each do |reflection| scope = scope.merge(reflection.klass.scoped) end scope |