activerecord-sqlserver-adapter 3.2.5 → 3.2.6

data/CHANGELOG

@@ -1,4 +1,9 @@
 
+* 3.2.6 *
+
+* Unique has_many associations with pagination now work. Fixes #209
+
+
 * 3.2.5 *
 
 * Fix a few test from ActiveRecord 3.2.6 upgrade.

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

@@ -3,7 +3,7 @@ module ActiveRecord
     module Sqlserver
       module Version
         
-        VERSION = '3.2.5'
+        VERSION = '3.2.6'
         
       end
     end

data/lib/arel/visitors/sqlserver.rb

@@ -154,7 +154,7 @@ module Arel
           projections = projections.map { |x| projection_without_expression(x) }
         end
         [ ("SELECT" if !windowed),
-          (visit(core.set_quantifier) if core.set_quantifier),
+          (visit(core.set_quantifier) if core.set_quantifier && !windowed),
           (visit(o.limit) if o.limit && !windowed),
           (projections.map{ |x| v = visit(x); v == "1" ? "1 AS [__wrp]" : v }.join(', ')),
           (source_with_lock_for_select_statement(o)),
@@ -166,13 +166,14 @@ module Arel
       end
 
       def visit_Arel_Nodes_SelectStatementWithOffset(o)
+        core = o.cores.first
         o.limit ||= Arel::Nodes::Limit.new(9223372036854775807)
         orders = rowtable_orders(o)
         [ "SELECT",
           (visit(o.limit) if o.limit && !windowed_single_distinct_select_statement?(o)),
           (rowtable_projections(o).map{ |x| visit(x) }.join(', ')),
           "FROM (",
-            "SELECT ROW_NUMBER() OVER (ORDER BY #{orders.map{ |x| visit(x) }.join(', ')}) AS [__rn],",
+            "SELECT #{core.set_quantifier ? 'DISTINCT DENSE_RANK()' : 'ROW_NUMBER()'} OVER (ORDER BY #{orders.map{ |x| visit(x) }.join(', ')}) AS [__rn],",
             visit_Arel_Nodes_SelectStatementWithOutOffset(o,true),
           ") AS [__rnt]",
           (visit(o.offset) if o.offset),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 3.2.5
+  version: 3.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,11 +13,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2012-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70190121497380 !ruby/object:Gem::Requirement
+  requirement: &70121348787340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -25,7 +25,7 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70190121497380
+  version_requirements: *70121348787340
 description: SQL Server 2005 and 2008 Adapter For ActiveRecord
 email: ken@metaskills.net
 executables: []