aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2017-07-25 11:47:48 -0400
committerGitHub <noreply@github.com>2017-07-25 11:47:48 -0400
commit2a2349699dcfc69295f0868bfe29b129a84dab7a (patch)
treeb98c492c1251d5c88fa5967071c9946281067ffa /activerecord
parenta1fa2fbaf13ee125dbfd6a85d203c57e964fec85 (diff)
parent049034c34d9b884f27c23cea5204cd5186baf059 (diff)
downloadrails-2a2349699dcfc69295f0868bfe29b129a84dab7a.tar.gz
rails-2a2349699dcfc69295f0868bfe29b129a84dab7a.tar.bz2
rails-2a2349699dcfc69295f0868bfe29b129a84dab7a.zip
Merge pull request #29935 from kamipo/remove_unused_queries_predicates
Remove unused `queries_predicates`
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/relation/predicate_builder/array_handler.rb12
1 files changed, 0 insertions, 12 deletions
diff --git a/activerecord/lib/active_record/relation/predicate_builder/array_handler.rb b/activerecord/lib/active_record/relation/predicate_builder/array_handler.rb
index ad617365fc..2fd75c8958 100644
--- a/activerecord/lib/active_record/relation/predicate_builder/array_handler.rb
+++ b/activerecord/lib/active_record/relation/predicate_builder/array_handler.rb
@@ -9,7 +9,6 @@ module ActiveRecord
def call(attribute, value)
return attribute.in([]) if value.empty?
- return queries_predicates(value) if value.all? { |v| v.is_a?(Hash) }
values = value.map { |x| x.is_a?(Base) ? x.id : x }
nils, values = values.partition(&:nil?)
@@ -44,17 +43,6 @@ module ActiveRecord
other
end
end
-
- private
- def queries_predicates(queries)
- if queries.size > 1
- queries.map do |query|
- Arel::Nodes::And.new(predicate_builder.build_from_hash(query))
- end.inject(&:or)
- else
- predicate_builder.build_from_hash(queries.first)
- end
- end
end
end
end