From 9dd8d3d3e4dc1b91cf8489ea9f3fee9bb0c27c65 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 15 Apr 2005 08:32:56 +0000 Subject: Honor the order in the new finder git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1167 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record/associations/has_many_association.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'activerecord/lib/active_record/associations/has_many_association.rb') diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb index 4a9d773ac7..6ed2782b0b 100644 --- a/activerecord/lib/active_record/associations/has_many_association.rb +++ b/activerecord/lib/active_record/associations/has_many_association.rb @@ -66,6 +66,7 @@ module ActiveRecord end else options[:conditions] = @finder_sql + (options[:conditions] ? " AND #{options[:conditions]}" : "") + options[:order] = options[:order] ? "#{options[:order]}, #{@options[:order]}" : @options[:order] @association_class.find(args.size == 1 ? args.first : args, options) end end -- cgit v1.2.3