diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-03-10 11:41:55 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-03-10 11:41:55 -0300 |
| commit | 6e3ab3e15faf782f6a937ccf5574a4fb63e3e353 (patch) | |
| tree | 5a4798cd67b536acaa6e29f2234b4a12df7c1b02 /activerecord/lib/active_record | |
| parent | 39e07b64ce3f4bb55e60ba0266e677f8e4f4893a (diff) | |
| parent | f74a5616e89f03e13a025401475ac1101bb159ae (diff) | |
| download | rails-6e3ab3e15faf782f6a937ccf5574a4fb63e3e353.tar.gz rails-6e3ab3e15faf782f6a937ccf5574a4fb63e3e353.tar.bz2 rails-6e3ab3e15faf782f6a937ccf5574a4fb63e3e353.zip | |
Merge pull request #8313 from alan/only_save_changed_has_one_objects
Save has_one associations only if record has changes
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/autosave_association.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/autosave_association.rb b/activerecord/lib/active_record/autosave_association.rb index e9622ca0c1..213b72b933 100644 --- a/activerecord/lib/active_record/autosave_association.rb +++ b/activerecord/lib/active_record/autosave_association.rb @@ -377,15 +377,16 @@ module ActiveRecord def save_has_one_association(reflection) association = association_instance_get(reflection.name) record = association && association.load_target + if record && !record.destroyed? autosave = reflection.options[:autosave] if autosave && record.marked_for_destruction? record.destroy - else + elsif autosave != false key = reflection.options[:primary_key] ? send(reflection.options[:primary_key]) : id - if autosave != false && (autosave || new_record? || record_changed?(reflection, record, key)) + if (autosave && record.changed_for_autosave?) || new_record? || record_changed?(reflection, record, key) unless reflection.through_reflection record[reflection.foreign_key] = key end |