diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2018-03-30 12:18:47 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-30 12:18:47 +0900 |
| commit | 7231b59004a0165afcd5496f33b60354cd45e73e (patch) | |
| tree | 94a98112801dbf2ca0a29008bcddf7b8d76e9a91 /activerecord/lib | |
| parent | eb807384c81a6e086b17a576755e992e6c4c685e (diff) | |
| parent | 0cdeda5826fc7cf26de404dcdd6d747531a32b6c (diff) | |
| download | rails-7231b59004a0165afcd5496f33b60354cd45e73e.tar.gz rails-7231b59004a0165afcd5496f33b60354cd45e73e.tar.bz2 rails-7231b59004a0165afcd5496f33b60354cd45e73e.zip | |
Merge pull request #32338 from eugeneius/dont_clobber_foreign_key
Don't unset foreign key when preloading missing record
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/associations/preloader/association.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/preloader/association.rb b/activerecord/lib/active_record/associations/preloader/association.rb index 0f38d6bbda..d6f7359055 100644 --- a/activerecord/lib/active_record/associations/preloader/association.rb +++ b/activerecord/lib/active_record/associations/preloader/association.rb @@ -42,11 +42,11 @@ module ActiveRecord def associate_records_to_owner(owner, records) association = owner.association(reflection.name) + association.loaded! if reflection.collection? - association.loaded! association.target.concat(records) else - association.target = records.first + association.target = records.first unless records.empty? end end |