aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/collection_proxy.rb
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2011-03-28 22:36:29 +0100
committerAaron Patterson <aaron.patterson@gmail.com>2011-04-12 19:46:04 -0700
commitfc9a04b6a69d6821a6f1601e3e0dd518300fa138 (patch)
tree42e1405dd87330364edf815770f89ca76fd99945 /activerecord/lib/active_record/associations/collection_proxy.rb
parenta616e7a88cc35487b979d5f786092ba53aa47135 (diff)
downloadrails-fc9a04b6a69d6821a6f1601e3e0dd518300fa138.tar.gz
rails-fc9a04b6a69d6821a6f1601e3e0dd518300fa138.tar.bz2
rails-fc9a04b6a69d6821a6f1601e3e0dd518300fa138.zip
Removing the scope-caching which happens on association proxies, because the query is already cached by the query cacher. For formalised proof see http://www.youtube.com/watch?v=wDefXLb-FDs
Diffstat (limited to 'activerecord/lib/active_record/associations/collection_proxy.rb')
-rw-r--r--activerecord/lib/active_record/associations/collection_proxy.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/collection_proxy.rb b/activerecord/lib/active_record/associations/collection_proxy.rb
index cf77d770c9..388173c1fb 100644
--- a/activerecord/lib/active_record/associations/collection_proxy.rb
+++ b/activerecord/lib/active_record/associations/collection_proxy.rb
@@ -82,8 +82,6 @@ module ActiveRecord
end
end
- elsif @association.klass.scopes[method]
- @association.cached_scope(method, args)
else
scoped.readonly(nil).send(method, *args, &block)
end