diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-09-03 14:16:29 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-09-03 14:16:29 -0700 |
| commit | 1f006cd5f10663286e70b4c3e972fba91ac8c9f9 (patch) | |
| tree | f5b44cc39be164115fba4f8df580f45027b12eda /activerecord/lib | |
| parent | c64a001dcc9eb1b066ca3ce553c5d20988458e8c (diff) | |
| download | rails-1f006cd5f10663286e70b4c3e972fba91ac8c9f9.tar.gz rails-1f006cd5f10663286e70b4c3e972fba91ac8c9f9.tar.bz2 rails-1f006cd5f10663286e70b4c3e972fba91ac8c9f9.zip | |
support anonymous classes on has_many associations
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/associations/builder/association.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/reflection.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/builder/association.rb b/activerecord/lib/active_record/associations/builder/association.rb index 34de1a1f32..1059fc032d 100644 --- a/activerecord/lib/active_record/associations/builder/association.rb +++ b/activerecord/lib/active_record/associations/builder/association.rb @@ -17,7 +17,7 @@ module ActiveRecord::Associations::Builder end self.extensions = [] - VALID_OPTIONS = [:class_name, :foreign_key, :validate] + VALID_OPTIONS = [:class_name, :class, :foreign_key, :validate] attr_reader :name, :scope, :options diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb index 5245fc130a..150a90f5db 100644 --- a/activerecord/lib/active_record/reflection.rb +++ b/activerecord/lib/active_record/reflection.rb @@ -121,6 +121,7 @@ module ActiveRecord @scope = scope @options = options @active_record = active_record + @klass = options[:class] @plural_name = active_record.pluralize_table_names ? name.to_s.pluralize : name.to_s end |