diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2010-03-14 15:46:03 -0700 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-03-14 17:28:27 -0600 |
| commit | 115230e6195115d6200047eb0c3247d3aad82ee7 (patch) | |
| tree | 2622fe981e1764fc6d21c8d0d40822f3644d9a85 /activerecord/lib/active_record/reflection.rb | |
| parent | d1eed89ac3b72457c0327bf1ff2a2a9cc8842910 (diff) | |
| download | rails-115230e6195115d6200047eb0c3247d3aad82ee7.tar.gz rails-115230e6195115d6200047eb0c3247d3aad82ee7.tar.bz2 rails-115230e6195115d6200047eb0c3247d3aad82ee7.zip | |
cleaning up some test warnings
Signed-off-by: wycats <wycats@gmail.com>
Diffstat (limited to 'activerecord/lib/active_record/reflection.rb')
| -rw-r--r-- | activerecord/lib/active_record/reflection.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb index 32b9a2aa87..5e8fc104cb 100644 --- a/activerecord/lib/active_record/reflection.rb +++ b/activerecord/lib/active_record/reflection.rb @@ -154,6 +154,11 @@ module ActiveRecord @klass ||= active_record.send(:compute_type, class_name) end + def initialize(macro, name, options, active_record) + super + @collection = [:has_many, :has_and_belongs_to_many].include?(macro) + end + # Returns a new, unsaved instance of the associated class. +options+ will # be passed to the class's constructor. def build_association(*options) @@ -256,9 +261,6 @@ module ActiveRecord # association. Returns +true+ if the +macro+ is one of +has_many+ or # +has_and_belongs_to_many+, +false+ otherwise. def collection? - if @collection.nil? - @collection = [:has_many, :has_and_belongs_to_many].include?(macro) - end @collection end |