diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-02 18:17:54 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-02 18:17:54 -0300 |
commit | f625b6879df4d8710c0226007dc0929ed98355d2 (patch) | |
tree | 1a58598f6f6333852509247032cc37ca7a5c2719 /activerecord/lib/active_record/attribute_set.rb | |
parent | c8f017682e507ba6cb4183c29cf9398a20211d15 (diff) | |
parent | b79593f84d0bc601a49e9f7470e862251b7bc145 (diff) | |
download | rails-f625b6879df4d8710c0226007dc0929ed98355d2.tar.gz rails-f625b6879df4d8710c0226007dc0929ed98355d2.tar.bz2 rails-f625b6879df4d8710c0226007dc0929ed98355d2.zip |
Merge pull request #16015 from sgrif/sg-ensure-initialized
Move pk initialization logic onto `AttributeSet`
Conflicts:
activerecord/lib/active_record/attribute_set.rb
Diffstat (limited to 'activerecord/lib/active_record/attribute_set.rb')
-rw-r--r-- | activerecord/lib/active_record/attribute_set.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/attribute_set.rb b/activerecord/lib/active_record/attribute_set.rb index df4fd31e08..64df6f6358 100644 --- a/activerecord/lib/active_record/attribute_set.rb +++ b/activerecord/lib/active_record/attribute_set.rb @@ -58,6 +58,12 @@ module ActiveRecord end end + def ensure_initialized(key) + unless self[key].initialized? + write_from_database(key, nil) + end + end + protected attr_reader :attributes |