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/lib/active_record/relation/query_methods.rb | |
| 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/lib/active_record/relation/query_methods.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/query_methods.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index 4e60863e52..a180b0f0d3 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -894,8 +894,8 @@ module ActiveRecord self end - def skip_query_cache! # :nodoc: - self.skip_query_cache_value = true + def skip_query_cache!(value = true) # :nodoc: + self.skip_query_cache_value = value self end |