diff options
| author | James Williams <jamesw@instructure.com> | 2018-04-19 09:27:31 -0600 |
|---|---|---|
| committer | James Williams <jamesw@instructure.com> | 2018-04-19 09:42:55 -0600 |
| commit | 28ef2de2292695815eace5f2645fe4e305768403 (patch) | |
| tree | 1c966731dfe0a5480907e49702dfb495ffa7db2a /activerecord/test | |
| parent | 92bb3f6aaaa80fa7add94debbda6373a15f55b64 (diff) | |
| download | rails-28ef2de2292695815eace5f2645fe4e305768403.tar.gz rails-28ef2de2292695815eace5f2645fe4e305768403.tar.bz2 rails-28ef2de2292695815eace5f2645fe4e305768403.zip | |
Fix relation merging with skip_query_cache!
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/relation/merging_test.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/test/cases/relation/merging_test.rb b/activerecord/test/cases/relation/merging_test.rb index 074ce9454f..f53ef1fe35 100644 --- a/activerecord/test/cases/relation/merging_test.rb +++ b/activerecord/test/cases/relation/merging_test.rb @@ -78,6 +78,10 @@ class RelationMergingTest < ActiveRecord::TestCase assert_equal 1, comments.count end + def test_relation_merging_with_skip_query_cache + assert_equal Post.all.merge(Post.all.skip_query_cache!).skip_query_cache_value, true + end + def test_relation_merging_with_association assert_queries(2) do # one for loading post, and another one merged query post = Post.where(body: "Such a lovely day").first |