diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-08-31 02:13:03 +0930 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-31 02:13:03 +0930 |
| commit | e912915a006140350e411f1d0234fa2597491e37 (patch) | |
| tree | aa52e8a940978ad6e4768a3d36fa11a80c8f1592 /activerecord/lib | |
| parent | f4418c9a1a2f44d49521cee9881617d163ad729d (diff) | |
| parent | a94fe2971b24d2a7827e205e7898e1b22771ed72 (diff) | |
| download | rails-e912915a006140350e411f1d0234fa2597491e37.tar.gz rails-e912915a006140350e411f1d0234fa2597491e37.tar.bz2 rails-e912915a006140350e411f1d0234fa2597491e37.zip | |
Merge pull request #23498 from jcoleman/remove-unnecessary-belongs-to-load
Don't unnecessarily load a belongs_to when saving.
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/autosave_association.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/autosave_association.rb b/activerecord/lib/active_record/autosave_association.rb index 6e6620aad5..db84876b0a 100644 --- a/activerecord/lib/active_record/autosave_association.rb +++ b/activerecord/lib/active_record/autosave_association.rb @@ -457,7 +457,9 @@ module ActiveRecord # In addition, it will destroy the association if it was marked for destruction. def save_belongs_to_association(reflection) association = association_instance_get(reflection.name) - record = association && association.load_target + return unless association && association.loaded? && !association.stale_target? + + record = association.load_target if record && !record.destroyed? autosave = reflection.options[:autosave] |