diff options
| author | Robert Pankowecki (Gavdi) <rpa@gavdi.com> | 2010-12-31 21:17:07 +0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-01-04 01:21:26 +0800 |
| commit | b9ce3419e5a9bdc4ade20f21a6c93e76a3b69caf (patch) | |
| tree | f4f9aea2d290db5ebee19912df8f44738c4a2f3b /activerecord/lib/active_record/relation/predicate_builder.rb | |
| parent | febdf5a5a91ac04fad2c7996f7f55fa19f0ff7d7 (diff) | |
| download | rails-b9ce3419e5a9bdc4ade20f21a6c93e76a3b69caf.tar.gz rails-b9ce3419e5a9bdc4ade20f21a6c93e76a3b69caf.tar.bz2 rails-b9ce3419e5a9bdc4ade20f21a6c93e76a3b69caf.zip | |
User id instead of quoted_id to prevent double quoting. Fixes failing test for bug #6036.
Diffstat (limited to 'activerecord/lib/active_record/relation/predicate_builder.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/predicate_builder.rb | 2 |
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 b3f1b9e36a..61d9974570 100644 --- a/activerecord/lib/active_record/relation/predicate_builder.rb +++ b/activerecord/lib/active_record/relation/predicate_builder.rb @@ -20,7 +20,7 @@ module ActiveRecord case value when Array, ActiveRecord::Associations::AssociationCollection, ActiveRecord::Relation values = value.to_a.map { |x| - x.respond_to?(:quoted_id) ? x.quoted_id : x + x.is_a?(ActiveRecord::Base) ? x.id : x } attribute.in(values) when Range, Arel::Relation |