diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2014-06-01 18:53:46 -0500 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2014-06-01 18:53:46 -0500 |
| commit | fab8d0795a4213e9210c7aa88d3b5653232bb221 (patch) | |
| tree | e61c768fa2fc42e612c17b2fb19e758d062a454d /activerecord/lib/active_record/core.rb | |
| parent | 87cc918daab39174c82b0aeb617fb8e4b4f107fb (diff) | |
| parent | e08494a912c89b1eb444c5c358e9aa880b2e4c66 (diff) | |
| download | rails-fab8d0795a4213e9210c7aa88d3b5653232bb221.tar.gz rails-fab8d0795a4213e9210c7aa88d3b5653232bb221.tar.bz2 rails-fab8d0795a4213e9210c7aa88d3b5653232bb221.zip | |
Merge pull request #15444 from sgrif/sg-yaml-new-record
New records should remain new after yaml serialization
Diffstat (limited to 'activerecord/lib/active_record/core.rb')
| -rw-r--r-- | activerecord/lib/active_record/core.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb index 205cae9b2a..88c1fc7e4c 100644 --- a/activerecord/lib/active_record/core.rb +++ b/activerecord/lib/active_record/core.rb @@ -284,7 +284,7 @@ module ActiveRecord init_internals - @new_record = false + @new_record = coder['new_record'] self.class.define_attribute_methods @@ -354,6 +354,7 @@ module ActiveRecord # coder # => {"attributes" => {"id" => nil, ... }} def encode_with(coder) coder['attributes'] = @raw_attributes + coder['new_record'] = new_record? end # Returns true if +comparison_object+ is the same exact object, or +comparison_object+ |