aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations
diff options
context:
space:
mode:
authorJames Golick <jamesgolick@gmail.com>2013-04-02 15:15:22 -0700
committerJames Golick <jamesgolick@gmail.com>2013-04-02 15:16:04 -0700
commit22417c2112336b14a21a91819537bd951c15ee60 (patch)
tree20f522c18a74c8bce8288a30e850c911811bcc9a /activerecord/lib/active_record/associations
parentc959798571b4060b19712e022f4236d75b2b7cfd (diff)
downloadrails-22417c2112336b14a21a91819537bd951c15ee60.tar.gz
rails-22417c2112336b14a21a91819537bd951c15ee60.tar.bz2
rails-22417c2112336b14a21a91819537bd951c15ee60.zip
Refactor CollectionProxy#scope to avoid calling #extend.
Diffstat (limited to 'activerecord/lib/active_record/associations')
-rw-r--r--activerecord/lib/active_record/associations/collection_proxy.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/associations/collection_proxy.rb b/activerecord/lib/active_record/associations/collection_proxy.rb
index c2add32aa6..c01ec36179 100644
--- a/activerecord/lib/active_record/associations/collection_proxy.rb
+++ b/activerecord/lib/active_record/associations/collection_proxy.rb
@@ -848,10 +848,8 @@ module ActiveRecord
# Returns a <tt>Relation</tt> object for the records in this association
def scope
- association = @association
-
- @association.scope.extending! do
- define_method(:proxy_association) { association }
+ @association.scope.tap do |scope|
+ scope.proxy_association = @association
end
end