Deprecate reorder in favor of except(:order).order(...)

activerecord/lib/active_record/relation/query_methods.rb

@@ -54,6 +54,7 @@ def order(*args)
     end
 
     def reorder(*args)
+      ActiveSupport::Deprecation.warn "reorder is deprecated. Please use except(:order).order(...) instead", caller
       relation = clone
       unless args.blank?
         relation.order_values = args

activerecord/test/cases/relation_scoping_test.rb

@@ -385,8 +385,16 @@ def test_named_scope_overwrites_default
   end
 
   def test_reorder_overrides_default_scope_order
+    assert_deprecated do
+      expected = Developer.order('name DESC').collect { |dev| dev.name }
+      received = DeveloperOrderedBySalary.reorder('name DESC').collect { |dev| dev.name }
+      assert_equal expected, received
+    end
+  end
+
+  def test_except_and_order_overrides_default_scope_order
     expected = Developer.order('name DESC').collect { |dev| dev.name }
-    received = DeveloperOrderedBySalary.reorder('name DESC').collect { |dev| dev.name }
+    received = DeveloperOrderedBySalary.except(:order).order('name DESC').collect { |dev| dev.name }
     assert_equal expected, received
   end
 

activerecord/test/cases/relations_test.rb

@@ -136,9 +136,11 @@ def test_finding_with_order_concatenated
   end
 
   def test_finding_with_reorder
-    topics = Topic.order('author_name').order('title').reorder('id')
-    assert_equal 4, topics.to_a.size
-    assert_equal topics(:first).title, topics.first.title
+    assert_deprecated do
+      topics = Topic.order('author_name').order('title').reorder('id')
+      assert_equal 4, topics.to_a.size
+      assert_equal topics(:first).title, topics.first.title
+    end
   end
 
   def test_finding_with_order_and_take