activerecord-sqlserver-adapter 3.0.9 → 3.0.10

data/CHANGELOG

@@ -1,4 +1,15 @@
 
+* 3.0.10 *
+
+* Fix #rowtable_orders visitor helper to use first column if no pk column was found.
+
+* Flatten sp_helpconstraint when looking for constraints just in case fks are present. Issue #64.
+
+* Start to support 2011 code named "Denali".
+
+* Limit and Offset can take SqlLiteral objects now.
+
+
 * 3.0.9 *
 
 * Fix array literal parsing bug for ruby 1.9.

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

@@ -1,4 +1,5 @@
 require 'active_record/version'
+require 'active_support/core_ext/class/inheritable_attributes'
 
 module ActiveRecord
   module ConnectionAdapters

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

@@ -242,7 +242,8 @@ module ActiveRecord
         end
 
         def remove_default_constraint(table_name, column_name)
-          select_all("EXEC sp_helpconstraint '#{quote_string(table_name)}','nomsg'").select do |row|
+          # If their are foreign keys in this table, we could still get back a 2D array, so flatten just in case.
+          select_all("EXEC sp_helpconstraint '#{quote_string(table_name)}','nomsg'").flatten.select do |row|
             row['constraint_type'] == "DEFAULT on column #{column_name}"
           end.each do |row|
             do_execute "ALTER TABLE #{quote_table_name(table_name)} DROP CONSTRAINT #{row['constraint_name']}"

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -164,9 +164,9 @@ module ActiveRecord
       include Sqlserver::Errors
       
       ADAPTER_NAME                = 'SQLServer'.freeze
-      VERSION                     = '3.0.9'.freeze
-      DATABASE_VERSION_REGEXP     = /Microsoft SQL Server\s+(\d{4})/
-      SUPPORTED_VERSIONS          = [2005,2008].freeze
+      VERSION                     = '3.0.10'.freeze
+      DATABASE_VERSION_REGEXP     = /Microsoft SQL Server\s+"?(\d{4}|\w+)"?/
+      SUPPORTED_VERSIONS          = [2005,2008,2011].freeze
       
       attr_reader :database_version, :database_year,
                   :connection_supports_native_types
@@ -180,11 +180,16 @@ module ActiveRecord
         connect
         super(@connection, logger)
         @database_version = info_schema_query { select_value('SELECT @@version') }
-        @database_year = DATABASE_VERSION_REGEXP.match(@database_version)[1].to_i rescue 0
+        @database_year = begin
+                           year = DATABASE_VERSION_REGEXP.match(@database_version)[1]
+                           year == "Denali" ? 2011 : year.to_i
+                         rescue
+                           0
+                         end
         initialize_sqlserver_caches
         use_database
         unless SUPPORTED_VERSIONS.include?(@database_year)
-          raise NotImplementedError, "Currently, only #{SUPPORTED_VERSIONS.to_sentence} are supported."
+          raise NotImplementedError, "Currently, only #{SUPPORTED_VERSIONS.to_sentence} are supported. We got back #{@database_version}."
         end
       end
       
@@ -285,6 +290,10 @@ module ActiveRecord
         @database_year == 2008
       end
       
+      def sqlserver_2011?
+        @database_year == 2011
+      end
+      
       def version
         self.class::VERSION
       end

data/lib/arel/visitors/sqlserver.rb

@@ -6,21 +6,6 @@ module Arel
     class LockWithSQLServer < Arel::Nodes::Unary
     end
 
-    # In versions of ActiveRecord prior to v3.0.3 limits and offset were always integers via
-    # a #to_i. Somewhere between ActiveRecord and ARel this is not happening anymore nor are they
-    # in agreement which should be responsible. Since we need to make sure that these are visited
-    # correctly and that we can do math with them, these are here to cast to integers.
-    class Limit < Arel::Nodes::Unary
-      def initialize expr
-        @expr = expr.to_i
-      end
-    end
-    class Offset < Arel::Nodes::Unary
-      def initialize expr
-        @expr = expr.to_i
-      end
-    end
-
     # Extending the Ordering class to be comparrison friendly which allows us to call #uniq on a
     # collection of them. See SelectManager#order for more details.
     class Ordering < Arel::Nodes::Binary
@@ -49,19 +34,18 @@ module Arel
       @ast.orders.concat(exprs.map{ |x|
         case x
         when Arel::Attributes::Attribute
-          c = engine.connection
-          tn = x.relation.table_alias || x.relation.name
-          expr = Arel::Nodes::SqlLiteral.new "#{c.quote_table_name(tn)}.#{c.quote_column_name(x.name)}"
+          table = Arel::Table.new(x.relation.table_alias || x.relation.name)
+          expr = table[x.name]
           Arel::Nodes::Ordering.new expr
         when String
           x.split(',').map do |s|
             expr, direction = s.split
-            expr = Arel::Nodes::SqlLiteral.new(expr)
+            expr = Arel.sql(expr)
             direction = direction =~ /desc/i ? :desc : :asc
             Arel::Nodes::Ordering.new expr, direction
           end
         else
-          expr = Arel::Nodes::SqlLiteral.new x.to_s
+          expr = Arel.sql(x.to_s)
           Arel::Nodes::Ordering.new expr
         end
       }.flatten)
@@ -99,7 +83,7 @@ module Arel
       end
 
       def visit_Arel_Nodes_Offset(o)
-        "WHERE [__rnt].[__rn] > #{visit o.expr}"
+        "WHERE [__rnt].[__rn] > (#{visit o.expr})"
       end
 
       def visit_Arel_Nodes_Limit(o)
@@ -136,7 +120,7 @@ module Arel
           groups = projections.map { |x| projection_without_expression(x) }
           projections = projections.map { |x| projection_without_expression(x) }
           orders = orders.map do |x|
-            expr = Arel::Nodes::SqlLiteral.new projection_without_expression(x.expr)
+            expr = Arel.sql projection_without_expression(x.expr)
             x.descending? ? Arel::Nodes::Max.new([expr]) : Arel::Nodes::Min.new([expr])
           end
         end
@@ -166,7 +150,7 @@ module Arel
 
       def visit_Arel_Nodes_SelectStatementForComplexCount(o)
         core = o.cores.first
-        o.limit.expr = o.limit.expr + (o.offset ? o.offset.expr : 0) if o.limit
+        o.limit.expr = Arel.sql("#{o.limit.expr} + #{o.offset ? o.offset.expr : 0}") if o.limit
         orders = rowtable_orders(o)
         [ "SELECT COUNT([count]) AS [count_id]",
           "FROM (",
@@ -301,11 +285,11 @@ module Arel
           end
         elsif join_in_select_statement?(o) && all_projections_aliased_in_select_statement?(o)
           core.projections.map do |x|
-            Arel::Nodes::SqlLiteral.new x.split(',').map{ |y| y.split(' AS ').last.strip }.join(', ')
+            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::Nodes::SqlLiteral.new('*')]
+          [Arel.sql('*')]
         else
           tn = table_from_select_statement(o).name
           core.projections.map { |x| x.gsub /\[#{tn}\]\./, '[__rnt].' }
@@ -316,16 +300,16 @@ module Arel
         core = o.cores.first
         if !o.orders.empty?
           o.orders
-        elsif join_in_select_statement?(o)
-          [table_from_select_statement(o).primary_key.asc]
         else
-          [table_from_select_statement(o).primary_key.asc]
+          t = table_from_select_statement(o)
+          c = t.primary_key || t.columns.first
+          [c.asc]
         end.uniq
       end
 
       # TODO: We use this for grouping too, maybe make Grouping objects vs SqlLiteral.
       def projection_without_expression(projection)
-        Arel::Nodes::SqlLiteral.new(projection.split(',').map do |x|
+        Arel.sql(projection.split(',').map do |x|
           x.strip!
           x.sub!(/^(COUNT|SUM|MAX|MIN|AVG)\s*(\((.*)\))?/,'\3')
           x.sub!(/^DISTINCT\s*/,'')

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 3
   - 0
-  - 9
-  version: 3.0.9
+  - 10
+  version: 3.0.10
 platform: ruby
 authors: 
 - Ken Collins
@@ -18,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-17 00:00:00 -05:00
+date: 2011-03-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,6 +30,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 3
         - 0
@@ -44,6 +46,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 2
         - 0
@@ -89,6 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -97,13 +101,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: activerecord-sqlserver-adapter
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: SQL Server 2005 and 2008 Adapter For ActiveRecord.