diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2012-04-08 11:30:18 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2012-04-08 11:30:18 -0700 |
| commit | 9f37f335f23b7e4407161d501e5f7d508e3ab7ec (patch) | |
| tree | 215f1a9e1c4f77a0ab58a016952df4cd0bff1085 /activerecord/lib/active_record | |
| parent | e4f911aa2ad22809db159087638eca2e22b40e30 (diff) | |
| parent | 402576b044ce1cb06c3e48061f62542d0908fa17 (diff) | |
| download | rails-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')
| -rw-r--r-- | activerecord/lib/active_record/core.rb | 7 | ||||
| -rw-r--r-- | activerecord/lib/active_record/scoping/named.rb | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb index 76c424e8b4..eb8f4ad669 100644 --- a/activerecord/lib/active_record/core.rb +++ b/activerecord/lib/active_record/core.rb @@ -137,12 +137,12 @@ module ActiveRecord private def relation #:nodoc: - @relation ||= Relation.new(self, arel_table) + relation = Relation.new(self, arel_table) if finder_needs_type_condition? - @relation.where(type_condition).create_with(inheritance_column.to_sym => sti_name) + relation.where(type_condition).create_with(inheritance_column.to_sym => sti_name) else - @relation + relation end end end @@ -351,7 +351,6 @@ module ActiveRecord @attributes[pk] = nil unless @attributes.key?(pk) - @relation = nil @aggregation_cache = {} @association_cache = {} @attributes_cache = {} 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 |