aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2013-10-10 10:32:52 +0200
committerYves Senn <yves.senn@gmail.com>2013-10-25 08:35:35 +0200
commitbf43b4c33fe323448a714854327fdabdcb3c7a14 (patch)
treeeb016b3765d59b80bc90ea5bc480c851b5af568f /activerecord/lib/active_record
parent557b8b69477ff6b7ac2bc6d2e76dc6a3e04fd9c3 (diff)
downloadrails-bf43b4c33fe323448a714854327fdabdcb3c7a14.tar.gz
rails-bf43b4c33fe323448a714854327fdabdcb3c7a14.tar.bz2
rails-bf43b4c33fe323448a714854327fdabdcb3c7a14.zip
`stored_attributes` need to be specific to a subclass.
Currently they are all stored globally in the same `Hash`. This commit forces the creation of a per-class variable if necessary. The behavior was exposed through the following test-case: ``` 1) Failure: StoreTest#test_all_stored_attributes_are_returned [/Users/senny/Projects/rails/activerecord/test/cases/store_test.rb:151]: --- expected +++ actual @@ -1 +1 @@ -[:color, :homepage, :favorite_food] +[:resolution, :color, :homepage, :favorite_food] ```
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/store.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/store.rb b/activerecord/lib/active_record/store.rb
index a610f479f2..5fc80cdb6d 100644
--- a/activerecord/lib/active_record/store.rb
+++ b/activerecord/lib/active_record/store.rb
@@ -86,6 +86,9 @@ module ActiveRecord
end
end
+ # assign new store attribute and create new hash to ensure that each class in the hierarchy
+ # has its own hash of stored attributes.
+ self.stored_attributes = {} if self.stored_attributes.blank?
self.stored_attributes[store_attribute] ||= []
self.stored_attributes[store_attribute] |= keys
end