diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-02-17 23:55:05 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-02-18 00:00:13 +0000 |
| commit | 1644663ba7f678d178deab2bf1629dc05626f85b (patch) | |
| tree | 27495a6b68feca350ba39e6f58522fa867f27197 /activerecord/lib/active_record/relation/predicate_builder.rb | |
| parent | 1d9f26ed47ccb0a142551ebda5df263e51ad9774 (diff) | |
| download | rails-1644663ba7f678d178deab2bf1629dc05626f85b.tar.gz rails-1644663ba7f678d178deab2bf1629dc05626f85b.tar.bz2 rails-1644663ba7f678d178deab2bf1629dc05626f85b.zip | |
Split AssociationProxy into an Association class (and subclasses) which manages the association, and a CollectionProxy class which is *only* a proxy. Singular associations no longer have a proxy. See CHANGELOG for more.
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 65852cb281..9633fd3d82 100644 --- a/activerecord/lib/active_record/relation/predicate_builder.rb +++ b/activerecord/lib/active_record/relation/predicate_builder.rb @@ -21,7 +21,7 @@ module ActiveRecord when ActiveRecord::Relation value.select_values = [value.klass.arel_table['id']] if value.select_values.empty? attribute.in(value.arel.ast) - when Array, ActiveRecord::Associations::AssociationCollection + when Array, ActiveRecord::Associations::CollectionProxy values = value.to_a.map { |x| x.is_a?(ActiveRecord::Base) ? x.id : x } |