Update internal helper method #orders_and_dirs_set to cope with an order clause like "description desc". This resolves ticket #26 http://rails-sqlserver.lighthouseapp.com/projects/20277/tickets/26-cant-have-a-description-column-and-sort-desc

Author: metaskills

CHANGELOG

@@ -1,6 +1,9 @@
 
 MASTER
 
+* Update internal helper method #orders_and_dirs_set to cope with an order clause like "description desc". This 
+  resolves ticket #26 [Ken Collins]
+
 * Provide support for running queries at different isolation levels using #run_with_isolation_level method 
   that can take a block or not. Also implement a #user_options method that reflects on the current user 
   session values. Resolves #20 [Murray Steele]

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -901,12 +901,13 @@ def orders_and_dirs_set(order)
         orders = order.sub('ORDER BY','').split(',').map(&:strip).reject(&:blank?)
         orders_dirs = orders.map do |ord|
           dir = nil
-          if match_data = ord.match(/\b(asc|desc)$/i)
-            dir = match_data[1]
-            ord.sub!(dir,'').strip!
-            dir.upcase!
+          ord.sub!(/\b(asc|desc)$/i) do |match|
+            if match
+              dir = match.upcase.strip
+              ''
+            end
           end
-          [ord,dir]
+          [ord.strip, dir]
         end
       end
 

test/cases/specific_schema_test_sqlserver.rb

@@ -1,6 +1,7 @@
 require 'cases/sqlserver_helper'
 
 class StringDefault < ActiveRecord::Base; end;
+class SqlServerEdgeSchema < ActiveRecord::Base; end;
 
 class SpecificSchemaTestSqlserver < ActiveRecord::TestCase
 
@@ -23,4 +24,34 @@ class SpecificSchemaTestSqlserver < ActiveRecord::TestCase
     assert_equal '(NULL)', default.string_with_pretend_null_four
   end
 
+  context 'Testing edge case schemas' do
+    
+    setup do
+      @edge_class = SqlServerEdgeSchema
+    end
+    
+    context 'with description column' do
+
+      setup do
+        @da = @edge_class.create! :description => 'A'
+        @db = @edge_class.create! :description => 'B'
+        @dc = @edge_class.create! :description => 'C'
+      end
+      
+      teardown { @edge_class.delete_all }
+
+      should 'allow all sorts of ordering without adapter munging it up' do
+        assert_equal ['A','B','C'], @edge_class.all(:order => 'description').map(&:description)
+        assert_equal ['A','B','C'], @edge_class.all(:order => 'description asc').map(&:description)
+        assert_equal ['A','B','C'], @edge_class.all(:order => 'description ASC').map(&:description)
+        assert_equal ['C','B','A'], @edge_class.all(:order => 'description desc').map(&:description)
+        assert_equal ['C','B','A'], @edge_class.all(:order => 'description DESC').map(&:description)
+      end
+
+    end
+    
+
+  end
+  
+  
 end

test/schema/sqlserver_specific_schema.rb

@@ -63,6 +63,10 @@
     # TODO: Add some different native binary types and test.
   end
 
+  create_table :sql_server_edge_schemas, :force => true do |t|
+    t.string :description
+  end
+  
   execute "IF EXISTS (SELECT TABLE_NAME FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME = 'customers_view') DROP VIEW customers_view"
   execute <<-CUSTOMERSVIEW
     CREATE VIEW customers_view AS