From c1a2cbf12821508b2db12d98fa327fd1ea7561bc Mon Sep 17 00:00:00 2001 From: Ryuta Kamizono Date: Sat, 15 Apr 2017 18:33:47 +0900 Subject: Early return in `PredicateBuilder::ArrayHandler` Partitioning to `values` and `nils` is unneeded before early return. --- .../lib/active_record/relation/predicate_builder/array_handler.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'activerecord') 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 54e9910598..1068e700e2 100644 --- a/activerecord/lib/active_record/relation/predicate_builder/array_handler.rb +++ b/activerecord/lib/active_record/relation/predicate_builder/array_handler.rb @@ -6,12 +6,11 @@ module ActiveRecord end 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?) - - return attribute.in([]) if values.empty? && nils.empty? - return queries_predicates(values) if nils.empty? && values.all? { |v| v.is_a?(Hash) } - ranges, values = values.partition { |v| v.is_a?(Range) } values_predicate = -- cgit v1.2.3