github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes issue #3483, regarding using a mixture of ranges and discrete values in find conditions. Paired with Joey Schoblaska.

Browse Source
This commit is contained in:
Ryan Naughton
2011-11-14 21:43:27 -06:00
parent e1b79c56be
commit 63a22ca616
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
activerecord/lib/active_record/relation/predicate_builder.rb
View File

@@ -22,21 +22,23 @@ module ActiveRecord
value = value.select(value.klass.arel_table[value.klass.primary_key]) if value.select_values.empty?
attribute.in(value.arel.ast)
when Array, ActiveRecord::Associations::CollectionProxy
values = value.to_a.map { |x|
x.is_a?(ActiveRecord::Base) ? x.id : x
}
values = value.to_a.map {|x| x.is_a?(ActiveRecord::Base) ? x.id : x}
ranges, values = values.partition {|value| value.is_a?(Range) || value.is_a?(Arel::Relation)}
array_predicates = ranges.map {|range| attribute.in(range)}
if values.include?(nil)
values = values.compact
if values.empty?
attribute.eq nil
array_predicates << attribute.eq(nil)
else
attribute.in(values.compact).or attribute.eq(nil)
array_predicates << attribute.in(values.compact).or(attribute.eq(nil))
end
else
attribute.in(values)
array_predicates << attribute.in(values)
end
array_predicates.inject {|composite, predicate| composite.or(predicate)}
when Range, Arel::Relation
attribute.in(value)
when ActiveRecord::Base

2
activerecord/test/cases/finder_test.rb
View File

@@ -375,7 +375,7 @@ class FinderTest < ActiveRecord::TestCase
end
def test_find_on_hash_conditions_with_array_of_integers_and_ranges
assert_equal [1,2,3], Comment.find(:all, :conditions => { :post_id => [1..2, 3, 4, 5..10]}).map(&:id).sort
assert_equal [1,2,3,5,6,7,8,9], Comment.find(:all, :conditions => {:id => [1..2, 3, 5, 6..8, 9]}).map(&:id).sort
end
def test_find_on_multiple_hash_conditions