aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2019-07-19 23:01:44 +0900
committerGitHub <noreply@github.com>2019-07-19 23:01:44 +0900
commit2caddbf8ae3e094b23be16af25a8b1040892f6b0 (patch)
tree4abf04d61b02e9990c98ec171fc3de456ccc918d /activerecord/lib
parent2e8c78e164d14bd5590f0ba2eabb2b9cd9780de2 (diff)
parent77931f4f52e0b95f288997caa531355afe2fc0e9 (diff)
downloadrails-2caddbf8ae3e094b23be16af25a8b1040892f6b0.tar.gz
rails-2caddbf8ae3e094b23be16af25a8b1040892f6b0.tar.bz2
rails-2caddbf8ae3e094b23be16af25a8b1040892f6b0.zip
Merge pull request #36706 from kirs/dedup-optimizer-hints
[ActiveRecord] Deduplicate optimizer hints
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/relation/query_methods.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index 87a53966e4..6a181882ae 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -952,7 +952,7 @@ module ActiveRecord
def optimizer_hints!(*args) # :nodoc:
args.flatten!
- self.optimizer_hints_values += args
+ self.optimizer_hints_values |= args
self
end