Merge [5445] from trunk.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5446 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

activerecord/CHANGELOG

@@ -1,5 +1,7 @@
 *SVN*
 
+* Find with :include respects scoped :order.  #5850
+
 * Dynamically generate reader methods for serialized attributes.  #6362 [Stefan Kaes]
 
 * Deprecation: object transactions warning.  [Jeremy Kemper]

activerecord/lib/active_record/associations.rb

@@ -1169,8 +1169,8 @@ def construct_finder_sql_with_included_associations(options, join_dependency)
           add_limited_ids_condition!(sql, options, join_dependency) if !using_limitable_reflections?(join_dependency.reflections) && ((scope && scope[:limit]) || options[:limit])
 
           sql << "GROUP BY #{options[:group]} " if options[:group]
-          sql << "ORDER BY #{options[:order]} " if options[:order]
 
+          add_order!(sql, options[:order])
           add_limit!(sql, options, scope) if using_limitable_reflections?(join_dependency.reflections)
 
           return sanitize_sql(sql)

activerecord/test/base_test.rb

@@ -1310,6 +1310,16 @@ def test_scoped_find_limit_offset_including_has_many_association
     assert_equal 2, topics.first.id
   end
 
+  def test_scoped_find_order_including_has_many_association
+    developers = Developer.with_scope(:find => { :order => 'developers.salary DESC', :include => :projects }) do
+      Developer.find(:all)
+    end
+    assert developers.size >= 2
+    for i in 1...developers.size
+      assert developers[i-1].salary >= developers[i].salary
+    end
+  end
+
   def test_base_class
     assert LoosePerson.abstract_class?
     assert !LooseDescendant.abstract_class?