diff options
Diffstat (limited to 'activerecord/lib')
-rwxr-xr-x | activerecord/lib/active_record/associations.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index bfa932c5b8..23ccb34cd2 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -782,14 +782,15 @@ module ActiveRecord def reflect_on_included_associations(associations) - [ associations ].flatten.collect { |association| reflect_on_association(association) } + [ associations ].flatten.collect { |association| reflect_on_association(association.to_s.intern) } end def guard_against_missing_reflections(reflections, options) reflections.each do |r| raise( ConfigurationError, - "Association was not found; perhaps you misspelled it? You specified :include => :#{options[:include].join(', :')}" + "Association was not found; perhaps you misspelled it? " + + "You specified :include => :#{[options[:include]].flatten.join(', :')}" ) if r.nil? end end |