aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-05-26 19:25:16 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-05-26 19:25:16 -0300
commit9a6ed049144de5b91b521b79c373f7cd90cc430c (patch)
tree2ef63759efd7a845242249405ab7520d91c923e8 /activerecord
parent178448ae9d10a27773f548e4b71390391882480f (diff)
parentf2135aceeb679a14f017cd677eeaf67b84a76582 (diff)
downloadrails-9a6ed049144de5b91b521b79c373f7cd90cc430c.tar.gz
rails-9a6ed049144de5b91b521b79c373f7cd90cc430c.tar.bz2
rails-9a6ed049144de5b91b521b79c373f7cd90cc430c.zip
Merge pull request #15352 from sgrif/sg-allow-empty-array-where
Allow empty arrays in where predicates
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/relation/predicate_builder/array_handler.rb2
1 files changed, 2 insertions, 0 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 7f937e1875..78dba8be06 100644
--- a/activerecord/lib/active_record/relation/predicate_builder/array_handler.rb
+++ b/activerecord/lib/active_record/relation/predicate_builder/array_handler.rb
@@ -2,6 +2,8 @@ module ActiveRecord
class PredicateBuilder
class ArrayHandler # :nodoc:
def call(attribute, value)
+ return attribute.in([]) if value.empty?
+
values = value.map { |x| x.is_a?(Base) ? x.id : x }
ranges, values = values.partition { |v| v.is_a?(Range) }
nils, values = values.partition(&:nil?)