Allow complex order objects to not be molested by our visitor overrides. Fixes #99

Author: metaskills

CHANGELOG

@@ -1,6 +1,8 @@
 
 * 3.1.0 *
 
+* Allow complex order objects to not be molested by our visitor overrides. Fixes #99
+
 * Default unicode datatypes!
 
 * New #lowercase_schema_reflection configuration that allows you to downcase all tables and columns.

lib/arel/visitors/sqlserver.rb

@@ -35,6 +35,8 @@ def order(*exprs)
           table = Arel::Table.new(x.relation.table_alias || x.relation.name)
           expr = table[x.name]
           Arel::Nodes::Ordering.new expr
+        when Arel::Nodes::Ordering
+          x
         when String
           x.split(',').map do |s|
             expr, direction = s.split

test/cases/adapter_test_sqlserver.rb

@@ -4,10 +4,11 @@
 require 'models/joke'
 require 'models/subscriber'
 require 'models/minimalistic'
+require 'models/post'
 
 class AdapterTestSqlserver < ActiveRecord::TestCase
 
-  fixtures :tasks
+  fixtures :tasks, :posts
 
   def setup
     @connection = ActiveRecord::Base.connection
@@ -18,6 +19,12 @@ def setup
 
   context 'For abstract behavior' do
 
+    should 'not mangel complex order clauses' do
+      xyz_order = "CASE WHEN [title] LIKE N'XYZ%' THEN 0 ELSE 1 END"
+      xyz_post = Post.create :title => 'XYZ Post', :body => 'Test cased orders.'
+      assert_equal xyz_post, Post.order(Arel::Nodes::Ordering.new(Arel.sql(xyz_order))).first
+    end
+    
     should 'have a 128 max #table_alias_length' do
       assert @connection.table_alias_length <= 128
     end