Better support for orders with an expression. Fixes #155. [Jason Frey, Joe Rafaniello]

  * Use String#mb_chars in a few places just in case SQL is unicode and needed.
  * Added some Regexp foo (best I can) that allows functions with commas to pass
    through unmolested. Oh the days when Regexp's littered the whole adapter :)

Author: metaskills

CHANGELOG

@@ -1,4 +1,9 @@
 
+* 3.1.5 *
+
+* Better support for orders with an expression. Fixes #155. [Jason Frey, Joe Rafaniello]
+
+
 * 3.1.4 *
 
 * Use INFORMATION_SCHEMA.KEY_COLUMN_USAGE for schema reflection speed. 

lib/active_record/connection_adapters/sqlserver/version.rb

@@ -3,7 +3,7 @@ module ConnectionAdapters
     module Sqlserver
       module Version
 
-        VERSION = '3.1.4'
+        VERSION = '3.1.5'
 
       end
     end

lib/arel/visitors/sqlserver.rb

@@ -41,9 +41,10 @@ def order(*expr)
           x
         when String
           x.split(',').map do |s|
+            s = x if x.strip =~ /\A\b\w+\b\(.*,.*\)(\s+(ASC|DESC))?\Z/i # Allow functions with comma(s) to pass thru.
             s.strip!
-            d = s =~ /(asc|desc)$/i ? $1.upcase : nil
-            e = d.nil? ? s : s[0...-d.length].strip
+            d = s =~ /(ASC|DESC)\Z/i ? $1.upcase : nil
+            e = d.nil? ? s : s.mb_chars[0...-d.length].strip
             e = Arel.sql(e)
             d && d == "DESC" ? Arel::Nodes::Descending.new(e) : Arel::Nodes::Ascending.new(e)
           end
@@ -204,7 +205,7 @@ def source_with_lock_for_select_statement(o)
         source = "FROM #{visit(core.source).strip}" if core.source
         if source && o.lock
           lock = visit o.lock
-          index = source.match(/FROM [\w\[\]\.]+/)[0].length
+          index = source.match(/FROM [\w\[\]\.]+/)[0].mb_chars.length
           source.insert index, " #{lock}"
         else
           source

test/cases/order_test_sqlserver.rb

@@ -99,6 +99,12 @@ class OrderTestSqlserver < ActiveRecord::TestCase
       assert_equal post1, Post.order(order).first
     end
 
+    should 'support inline function with parameters DESC' do
+      order = "SUBSTRING(title, 1, 3) DESC"
+      post1 = Post.create :title => 'ZZZ Post', :body => 'Test cased orders.'
+      assert_equal post1, Post.order(order).first
+    end
+    
     should 'support primary: inline function, secondary: column' do
       order = "LEN(title), body"
       post1 = Post.create :title => 'A', :body => 'AAA Test cased orders.'