diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-11-21 03:30:06 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-11-21 03:30:06 +0100 |
| commit | 6af08ab6d835d1c2aa8648a0d3a4a86e678c3f52 (patch) | |
| tree | 96bd668692b62d3829322232877b70c9011ce446 /activerecord/lib/active_record/relation/predicate_builder.rb | |
| parent | f326221c701e4f9d991e3eadcc793a73795fb218 (diff) | |
| parent | 7c51d1fcf9dc504c2dfd6e7184bbe8186f09819d (diff) | |
| download | rails-6af08ab6d835d1c2aa8648a0d3a4a86e678c3f52.tar.gz rails-6af08ab6d835d1c2aa8648a0d3a4a86e678c3f52.tar.bz2 rails-6af08ab6d835d1c2aa8648a0d3a4a86e678c3f52.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'activerecord/lib/active_record/relation/predicate_builder.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/predicate_builder.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/relation/predicate_builder.rb b/activerecord/lib/active_record/relation/predicate_builder.rb index c5428dccd6..32c7d08daa 100644 --- a/activerecord/lib/active_record/relation/predicate_builder.rb +++ b/activerecord/lib/active_record/relation/predicate_builder.rb @@ -25,6 +25,11 @@ module ActiveRecord attribute.in(values) when Range, Arel::Relation attribute.in(value) + when ActiveRecord::Base + attribute.eq(value.quoted_id) + when Class + # FIXME: I think we need to deprecate this behavior + attribute.eq(value.name) else attribute.eq(value) end |