diff options
Diffstat (limited to 'activerecord/lib/active_record/associations')
-rw-r--r-- | activerecord/lib/active_record/associations/has_many_association.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb index a775f438f3..5b0ac25d17 100644 --- a/activerecord/lib/active_record/associations/has_many_association.rb +++ b/activerecord/lib/active_record/associations/has_many_association.rb @@ -67,7 +67,13 @@ module ActiveRecord end else options[:conditions] = @finder_sql + (options[:conditions] ? " AND #{options[:conditions]}" : "") - options[:order] = options[:order] ? "#{options[:order]}, #{@options[:order]}" : @options[:order] + + if options[:order] && @options[:order] + options[:order] = "#{options[:order]}, #{@options[:order]}" + elsif @options[:order] + options[:order] = @options[:order] + end + @association_class.find(args.size == 1 ? args.first : args, options) end end |