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/reflection.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/reflection.rb')
| -rw-r--r-- | activerecord/lib/active_record/reflection.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb index 0a0e8d650c..4093a1a209 100644 --- a/activerecord/lib/active_record/reflection.rb +++ b/activerecord/lib/active_record/reflection.rb @@ -313,7 +313,7 @@ module ActiveRecord macro == :belongs_to end - def proxy_class + def association_class case macro when :belongs_to if options[:polymorphic] |