aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/scoping/named.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2012-04-08 11:30:18 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2012-04-08 11:30:18 -0700
commit9f37f335f23b7e4407161d501e5f7d508e3ab7ec (patch)
tree215f1a9e1c4f77a0ab58a016952df4cd0bff1085 /activerecord/lib/active_record/scoping/named.rb
parente4f911aa2ad22809db159087638eca2e22b40e30 (diff)
parent402576b044ce1cb06c3e48061f62542d0908fa17 (diff)
downloadrails-9f37f335f23b7e4407161d501e5f7d508e3ab7ec.tar.gz
rails-9f37f335f23b7e4407161d501e5f7d508e3ab7ec.tar.bz2
rails-9f37f335f23b7e4407161d501e5f7d508e3ab7ec.zip
Merge pull request #5718 from benedikt/master
Removes caching from ActiveRecord::Core::ClassMethods#relation
Diffstat (limited to 'activerecord/lib/active_record/scoping/named.rb')
-rw-r--r--activerecord/lib/active_record/scoping/named.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/scoping/named.rb b/activerecord/lib/active_record/scoping/named.rb
index 077e2d067e..b43e08157a 100644
--- a/activerecord/lib/active_record/scoping/named.rb
+++ b/activerecord/lib/active_record/scoping/named.rb
@@ -35,7 +35,7 @@ module ActiveRecord
if current_scope
current_scope.clone
else
- scope = relation.clone
+ scope = relation
scope.default_scoped = true
scope
end
@@ -49,7 +49,7 @@ module ActiveRecord
if current_scope
current_scope.scope_for_create
else
- scope = relation.clone
+ scope = relation
scope.default_scoped = true
scope.scope_for_create
end