activerecord-sqlserver-adapter 3.0.16 → 3.0.17

data/CHANGELOG

@@ -1,5 +1,12 @@
 
-* 3-0-stable *
+* 3.0.17 *
+
+* Allow :limit/:offset to be used with fully qualified table and column in :select.
+
+* Fix test_count_explicit_columns.
+
+
+* 3.0.16 *
 
 * Allow complex order objects to not be molested by our visitor overrides. Fixes #99
 

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -164,7 +164,7 @@ module ActiveRecord
       include Sqlserver::Errors
       
       ADAPTER_NAME                = 'SQLServer'.freeze
-      VERSION                     = '3.0.16'.freeze
+      VERSION                     = '3.0.17'.freeze
       DATABASE_VERSION_REGEXP     = /Microsoft SQL Server\s+"?(\d{4}|\w+)"?/
       SUPPORTED_VERSIONS          = [2005,2008,2010,2011].freeze
       

data/lib/arel/visitors/sqlserver.rb

@@ -249,7 +249,7 @@ module Arel
         core = o.cores.first
         core.projections.size == 1 &&
           Arel::Nodes::Count === core.projections.first &&
-          (o.limit || !core.wheres.empty?) &&
+          o.limit &&
           !join_in_select_statement?(o)
       end
 
@@ -293,12 +293,9 @@ module Arel
           core.projections.map do |x|
             Arel.sql x.split(',').map{ |y| y.split(' AS ').last.strip }.join(', ')
           end
-        elsif function_select_statement?(o)
-          # TODO: [ARel 2.2] Use Arel.star
-          [Arel.sql('*')]
         else
-          tn = table_from_select_statement(o).name
-          core.projections.map { |x| x.gsub /\[#{tn}\]\./, '[__rnt].' }
+          # TODO: [ARel 2.2] Use Arel.star
+          [Arel.sql('[__rnt].*')]
         end
       end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 37
   prerelease: 
   segments: 
   - 3
   - 0
-  - 16
-  version: 3.0.16
+  - 17
+  version: 3.0.17
 platform: ruby
 authors: 
 - Ken Collins
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-19 00:00:00 -04:00
+date: 2011-09-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency