diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-25 14:42:08 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-25 14:42:22 -0800 |
commit | 522c0fdb555d54ca68d1acfd1bd8e67fd0040086 (patch) | |
tree | 7b0372b379204e87c4e7a7534ad4c54ba0d23bbc /activerecord/lib/active_record | |
parent | 0920065772dc6e3094df7101e28c38a183725ac9 (diff) | |
download | rails-522c0fdb555d54ca68d1acfd1bd8e67fd0040086.tar.gz rails-522c0fdb555d54ca68d1acfd1bd8e67fd0040086.tar.bz2 rails-522c0fdb555d54ca68d1acfd1bd8e67fd0040086.zip |
The primary key is always initialized in the @attributes hash to nil (unless
another value has been specified).
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r-- | activerecord/lib/active_record/attribute_methods/read.rb | 6 | ||||
-rw-r--r-- | activerecord/lib/active_record/core.rb | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/read.rb b/activerecord/lib/active_record/attribute_methods/read.rb index 3549cbb090..c129dc8c52 100644 --- a/activerecord/lib/active_record/attribute_methods/read.rb +++ b/activerecord/lib/active_record/attribute_methods/read.rb @@ -92,11 +92,7 @@ module ActiveRecord end def internal_attribute_access_code(attr_name, cast_code) - if attr_name == primary_key - access_code = "v = @attributes[attr_name];" - else - access_code = "v = @attributes.fetch(attr_name) { missing_attribute(attr_name, caller) };" - end + access_code = "v = @attributes.fetch(attr_name) { missing_attribute(attr_name, caller) };" access_code << "v && #{cast_code};" diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb index adba3f710c..a774af6024 100644 --- a/activerecord/lib/active_record/core.rb +++ b/activerecord/lib/active_record/core.rb @@ -202,6 +202,7 @@ module ActiveRecord cloned_attributes.delete(self.class.primary_key) @attributes = cloned_attributes + @attributes[self.class.primary_key] = nil run_callbacks(:initialize) if _initialize_callbacks.any? @@ -326,6 +327,10 @@ module ActiveRecord end def init_internals + pk = self.class.primary_key + + @attributes[pk] = nil unless @attributes.key?(pk) + @relation = nil @aggregation_cache = {} @association_cache = {} |