aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Harton <jamesotron@gmail.com>2010-06-21 14:21:54 +1200
committerJosé Valim <jose.valim@gmail.com>2010-06-22 18:05:27 +0200
commitd0df7f1196ee633a0cea7b5b8cf8b65a8269df19 (patch)
tree43d507eae0ccbe1d478864e5654ba2a2b3d9d42c
parent7033be5f72a2b68223eff5d3946aba51e80b4c0c (diff)
downloadrails-d0df7f1196ee633a0cea7b5b8cf8b65a8269df19.tar.gz
rails-d0df7f1196ee633a0cea7b5b8cf8b65a8269df19.tar.bz2
rails-d0df7f1196ee633a0cea7b5b8cf8b65a8269df19.zip
Fix small bug where ActiveRecord::PredicateBuilder#build_from_hash didn't test for Arel::Relation as right hand value. [#4917 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
-rw-r--r--activerecord/lib/active_record/relation/predicate_builder.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/predicate_builder.rb b/activerecord/lib/active_record/relation/predicate_builder.rb
index d0efa2189d..d853fd63d1 100644
--- a/activerecord/lib/active_record/relation/predicate_builder.rb
+++ b/activerecord/lib/active_record/relation/predicate_builder.rb
@@ -28,7 +28,7 @@ module ActiveRecord
when Array, ActiveRecord::Associations::AssociationCollection, ActiveRecord::Relation
values = value.to_a
attribute.in(values)
- when Range
+ when Range, Arel::Relation
attribute.in(value)
else
attribute.eq(value)