diff options
| author | Benedikt Deicke <benedikt@synatic.net> | 2012-04-03 16:51:36 +0200 |
|---|---|---|
| committer | Benedikt Deicke <benedikt@synatic.net> | 2012-04-03 17:00:37 +0200 |
| commit | 68677ffb8298105eb9d3efa26d928dd88cc5e006 (patch) | |
| tree | fe4a803a12f512fc12f3b890d5c0fa275eb924cb /activerecord/lib | |
| parent | 0cc6c5fec235cca6d7eb85d4f849536db8566e93 (diff) | |
| download | rails-68677ffb8298105eb9d3efa26d928dd88cc5e006.tar.gz rails-68677ffb8298105eb9d3efa26d928dd88cc5e006.tar.bz2 rails-68677ffb8298105eb9d3efa26d928dd88cc5e006.zip | |
Removes caching from ActiveRecord::Core::ClassMethods#relation
The #relation method gets called in four places and the return value was instantly cloned in three of them. The only place that did not clone was ActiveRecord::Scoping::Default::ClassMethods#unscoped. This introduced a bug described in #5667 and should really clone the relation, too. This means all four places would clone the relation, so it doesn't make a lot of sense caching it in the first place.
The four places with calls to relations are:
activerecord/lib/active_record/scoping/default.rb:110:in `block in build_default_scope'"
activerecord/lib/active_record/scoping/default.rb:42:in `unscoped'"
activerecord/lib/active_record/scoping/named.rb:38:in `scoped'"
activerecord/lib/active_record/scoping/named.rb:52:in `scope_attributes'"
Diffstat (limited to 'activerecord/lib')
| -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 |