Allow :limit/:offset to be used with fully qualified table and column in :select.

Author: metaskills

CHANGELOG

@@ -1,4 +1,9 @@
 
+* 3.1.1 *
+
+* Allow :limit/:offset to be used with fully qualified table and column in :select.
+
+
 * 3.1.0 *
 
 * Add support/test around handling of float/real column types [Lucas Maxwell]

activerecord-sqlserver-adapter.gemspec

@@ -1,8 +1,11 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "active_record/connection_adapters/sqlserver/version"
 
 Gem::Specification.new do |s|
   s.platform      = Gem::Platform::RUBY
   s.name          = "activerecord-sqlserver-adapter"
-  s.version       = "3.1.0"
+  s.version       = ActiveRecord::ConnectionAdapters::Sqlserver::Version::VERSION
   s.summary       = "SQL Server 2005 and 2008 Adapter For ActiveRecord."
   s.description   = "SQL Server 2005 and 2008 Adapter For ActiveRecord"
 

lib/active_record/connection_adapters/sqlserver/version.rb

@@ -0,0 +1,11 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module Sqlserver
+      module Version
+        
+        VERSION = '3.1.1'.freeze
+        
+      end
+    end
+  end
+end

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -7,6 +7,7 @@
 require 'active_record/connection_adapters/sqlserver/errors'
 require 'active_record/connection_adapters/sqlserver/schema_statements'
 require 'active_record/connection_adapters/sqlserver/quoting'
+require 'active_record/connection_adapters/sqlserver/version'
 require 'active_support/core_ext/kernel/requires'
 require 'active_support/core_ext/string'
 require 'base64'
@@ -165,9 +166,9 @@ class SQLServerAdapter < AbstractAdapter
       include Sqlserver::SchemaStatements
       include Sqlserver::DatabaseLimits
       include Sqlserver::Errors
+      include Sqlserver::Version
 
       ADAPTER_NAME                = 'SQLServer'.freeze
-      VERSION                     = '3.1.0'.freeze
       DATABASE_VERSION_REGEXP     = /Microsoft SQL Server\s+"?(\d{4}|\w+)"?/
       SUPPORTED_VERSIONS          = [2005,2008,2010,2011].freeze
 

lib/arel/visitors/sqlserver.rb

@@ -329,20 +329,10 @@ def rowtable_projections(o)
           core.projections.map do |x|
             Arel.sql visit(x).split(',').map{ |y| y.split(' AS ').last.strip }.join(', ')
           end
-        elsif function_select_statement?(o)
-          [Arel.star]
         elsif select_primary_key_sql?(o)
           [Arel.sql("[__rnt].#{quote_column_name(core.projections.first.name)}")]
         else
-          core.projections.map do |x|
-            if x.respond_to?(:relation)
-              x = x.dup
-              x.relation = x.relation.dup
-              x.relation.instance_variable_set :@table_alias, Arel.sql('[__rnt].*')
-            else
-              x
-            end
-          end
+          [Arel.sql('[__rnt].*')]
         end
       end
 

test/cases/offset_and_limit_test_sqlserver.rb

@@ -28,6 +28,11 @@ class OffsetAndLimitTestSqlserver < ActiveRecord::TestCase
 
   context 'When selecting with limit and offset' do
 
+    should 'work with fully qualified table and columns in select' do 
+      books = Book.all :select => 'books.id, books.name', :limit => 3, :offset => 5
+      assert_equal Book.all[5,3].map(&:id), books.map(&:id)
+    end
+    
     should 'allow sql literal for offset' do
       assert_sql(/WHERE \[__rnt\]\.\[__rn\] > \(3-2\)/) { Book.limit(10).offset(Arel.sql('3-2')).all }
       assert_sql(/WHERE \[__rnt\]\.\[__rn\] > \(SELECT 8 AS \[count\]\)/) do