activerecord-sqlserver-adapter 3.1.4 → 3.1.5

data/CHANGELOG

@@ -1,25 +1,30 @@
 
+* 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. 
   Fixes #125. [Wüthrich Hannes @hwuethrich]
 
-* New deadlock victim retry using the #retry_deadlock_victim config.  [Joe Rafaniello]
+* New deadlock victim retry using the #retry_deadlock_victim config.  [Jason Frey, Joe Rafaniello]
 
 * Renamed #with_auto_reconnect to #with_sqlserver_error_handling now that it handles both dropped
-  connections and deadlock victim errors. Fixes #150 [Joe Rafaniello]
+  connections and deadlock victim errors. Fixes #150 [Jason Frey, Joe Rafaniello]
 
-* Add activity_stats method that mimics the SQL Server Activity Monitor. Fixes #146 [Joe Rafaniello]
+* Add activity_stats method that mimics the SQL Server Activity Monitor. Fixes #146 [Jason Frey, Joe Rafaniello]
 
 * Add methods for sqlserver's #product_version, #product_level, #edition and include them in inspect.
-  Fixes #145 [Joe Rafaniello]
+  Fixes #145 [Jason Frey, Joe Rafaniello]
   
 * Handle statements that cannot be retried on a new database connection by not reconnecting. 
-  Fixes #147 [Joe Rafaniello]
+  Fixes #147 [Jason Frey, Joe Rafaniello]
   
-* Added connection#spid for debugging. Fixes #144 [Joe Rafaniello]
+* Added connection#spid for debugging. Fixes #144 [Jason Frey, Joe Rafaniello]
 
-* Add ENV['TEST_FILES'] to Rakefile for easy single case tests. [Joe Rafaniello]
+* Add ENV['TEST_FILES'] to Rakefile for easy single case tests. [Jason Frey, Joe Rafaniello]
 
 * Pass ActiveRecord tests. Made windowed distinct pass all orders to groups.
   - test_limited_eager_with_multiple_order_columns

data/lib/active_record/connection_adapters/sqlserver/version.rb

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

data/lib/arel/visitors/sqlserver.rb

@@ -41,9 +41,12 @@ module Arel
           x
         when String
           x.split(',').map do |s|
-            e, d = s.split
+            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)\Z/i ? $1.upcase : nil
+            e = d.nil? ? s : s.mb_chars[0...-d.length].strip
             e = Arel.sql(e)
-            d =~ /desc/i ? Arel::Nodes::Descending.new(e) : Arel::Nodes::Ascending.new(e)
+            d && d == "DESC" ? Arel::Nodes::Descending.new(e) : Arel::Nodes::Ascending.new(e)
           end
         else
           e = Arel.sql(x.to_s)
@@ -202,7 +205,7 @@ module Arel
         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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 3
   - 1
-  - 4
-  version: 3.1.4
+  - 5
+  version: 3.1.5
 platform: ruby
 authors: 
 - Ken Collins
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-30 00:00:00 Z
+date: 2011-12-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: activerecord-sqlserver-adapter
-rubygems_version: 1.8.8
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: SQL Server 2005 and 2008 Adapter For ActiveRecord.