diff options
author | Will Bryant <will.bryant@gmail.com> | 2009-03-12 02:13:26 +1300 |
---|---|---|
committer | Pratik Naik <pratiknaik@gmail.com> | 2009-03-12 13:26:21 +0000 |
commit | 92dadf6d7927fde1482ba1d96d0916093bfb83ca (patch) | |
tree | 172216767adf80f62aea3a358cab1bc9ce675937 /activerecord/lib | |
parent | be7b64b35aac1c9e9063d1d8317f8b1be2a3411c (diff) | |
download | rails-92dadf6d7927fde1482ba1d96d0916093bfb83ca.tar.gz rails-92dadf6d7927fde1482ba1d96d0916093bfb83ca.tar.bz2 rails-92dadf6d7927fde1482ba1d96d0916093bfb83ca.zip |
Fixed autosave checks on objects with hm:t in :include [#2213 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record/autosave_association.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/autosave_association.rb b/activerecord/lib/active_record/autosave_association.rb index 1c3d0567c1..6dcc5005d1 100644 --- a/activerecord/lib/active_record/autosave_association.rb +++ b/activerecord/lib/active_record/autosave_association.rb @@ -310,7 +310,7 @@ module ActiveRecord # This all happens inside a transaction, _if_ the Transactions module is included into # ActiveRecord::Base after the AutosaveAssociation module, which it does by default. def save_has_one_association(reflection) - if association = association_instance_get(reflection.name) + if (association = association_instance_get(reflection.name)) && !association.target.nil? if reflection.options[:autosave] && association.marked_for_destruction? association.destroy elsif new_record? || association.new_record? || association[reflection.primary_key_name] != id || reflection.options[:autosave] |