Leave order by alone when same column crosses two tables.

Author: metaskills

CHANGELOG

@@ -1,6 +1,8 @@
 
 MASTER
 
+* Leave order by alone when same column crosses two tables [Ransom Briggs]
+
 
 * 2.3 * (December 1st, 2009)
 

lib/active_record/connection_adapters/sqlserver_adapter/core_ext/active_record.rb

@@ -83,10 +83,11 @@ def add_order_with_sqlserver_unique_checking!(sql, order, scope = :auto)
                                                     else
                                                       [nil, ord_tn_and_cn.first]
                                                     end
-                  if (ord_table_name && ord_table_name == select_table_name && unique_order_hash[ord_column_name]) || unique_order_hash[ord_column_name]
+                  unique_key = [(ord_table_name || select_table_name), ord_column_name]
+                  if unique_order_hash[unique_key]
                     array
                   else
-                    unique_order_hash[ord_column_name] = true
+                    unique_order_hash[unique_key] = true
                     array << "#{ord} #{dir}".strip
                   end
                 end.join(', ')

test/cases/adapter_test_sqlserver.rb

@@ -218,6 +218,10 @@ def setup
         assert_equal 'MIN(comments.id) DESC, MIN(comments.post_id) ASC', order_to_min_set(@two_orders_with_desc_and_asc)
       end
 
+      should 'leave order by alone when same column crosses two tables' do
+        assert_equal ' ORDER BY developers.name, projects.name', add_order!('developers.name, projects.name')
+      end
+      
     end
 
     context 'with different language' do