diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2013-04-12 12:12:37 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2013-05-10 16:39:27 +0200 |
| commit | 32a5cad1e46027cf8234cdb8d556f307b86d4c17 (patch) | |
| tree | 859490701024b7896a1443ac150562aaffcbf6ea /activerecord | |
| parent | 1b022990c7acf6f003255f9fa9a57d3d0f07e378 (diff) | |
| download | rails-32a5cad1e46027cf8234cdb8d556f307b86d4c17.tar.gz rails-32a5cad1e46027cf8234cdb8d556f307b86d4c17.tar.bz2 rails-32a5cad1e46027cf8234cdb8d556f307b86d4c17.zip | |
Move #proxy_association method to AssociationRelation
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/association_relation.rb | 4 | ||||
| -rw-r--r-- | activerecord/lib/active_record/associations/collection_proxy.rb | 4 | ||||
| -rw-r--r-- | activerecord/lib/active_record/relation.rb | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/association_relation.rb b/activerecord/lib/active_record/association_relation.rb index e2976577f6..20516bba0c 100644 --- a/activerecord/lib/active_record/association_relation.rb +++ b/activerecord/lib/active_record/association_relation.rb @@ -5,6 +5,10 @@ module ActiveRecord @association = association end + def proxy_association + @association + end + private def exec_queries diff --git a/activerecord/lib/active_record/associations/collection_proxy.rb b/activerecord/lib/active_record/associations/collection_proxy.rb index 56e57cc36e..71b64de5ea 100644 --- a/activerecord/lib/active_record/associations/collection_proxy.rb +++ b/activerecord/lib/active_record/associations/collection_proxy.rb @@ -847,9 +847,7 @@ module ActiveRecord # Returns a <tt>Relation</tt> object for the records in this association def scope - @association.scope.tap do |scope| - scope.proxy_association = @association - end + @association.scope end # :nodoc: diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb index 913f6f88f2..ae3fa85da9 100644 --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -17,7 +17,7 @@ module ActiveRecord include FinderMethods, Calculations, SpawnMethods, QueryMethods, Batches, Explain, Delegation attr_reader :table, :klass, :loaded - attr_accessor :default_scoped, :proxy_association + attr_accessor :default_scoped alias :model :klass alias :loaded? :loaded alias :default_scoped? :default_scoped |