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/test | |
| 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/test')
| -rw-r--r-- | activerecord/test/cases/associations/eager_test.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb index f18c6177ac..6e0cf30092 100644 --- a/activerecord/test/cases/associations/eager_test.rb +++ b/activerecord/test/cases/associations/eager_test.rb @@ -1218,6 +1218,7 @@ class EagerAssociationTest < ActiveRecord::TestCase client = assert_queries(2) { Client.preload(:firm).find(c.id) } assert_no_queries { assert_nil client.firm } + assert_equal c.client_of, client.client_of end def test_preloading_empty_belongs_to_polymorphic @@ -1225,6 +1226,7 @@ class EagerAssociationTest < ActiveRecord::TestCase tagging = assert_queries(2) { Tagging.preload(:taggable).find(t.id) } assert_no_queries { assert_nil tagging.taggable } + assert_equal t.taggable_id, tagging.taggable_id end def test_preloading_through_empty_belongs_to |