activerecord-sqlserver-adapter 3.1.0.rc5 → 3.1.0.rc6

data/CHANGELOG

@@ -1,6 +1,8 @@
 
 * 3.1.0 *
 
+* Make auto reconnect duration configurable. Fixes #109 [David Chelimsky]
+
 * Quote most time objects to use ISO8601 format to be multi-language dateformat compatible. The [datetime] data type is
   automatically limited to milliseconds while [time] & [datetimeoffset] have full support. Even included a Date/Time 
   ActiveSupport formatter that is used per the language settings of the connection.

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

@@ -38,7 +38,7 @@ module ActiveRecord
 
         def quote_column_name(name)
           @sqlserver_quoted_column_and_table_names[name] ||= 
-            name.to_s.split('.').map{ |n| n =~ /^\[.*\]$/ ? n : "[#{n}]" }.join('.')
+            name.to_s.split('.').map{ |n| n =~ /^\[.*\]$/ ? n : "[#{n.to_s.gsub(']', ']]')}]" }.join('.')
         end
 
         def quote_table_name(name)

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -159,7 +159,7 @@ module ActiveRecord
       include Sqlserver::Errors
       
       ADAPTER_NAME                = 'SQLServer'.freeze
-      VERSION                     = '3.1.0.rc5'.freeze
+      VERSION                     = '3.1.0.rc6'.freeze
       DATABASE_VERSION_REGEXP     = /Microsoft SQL Server\s+"?(\d{4}|\w+)"?/
       SUPPORTED_VERSIONS          = [2005,2008,2010,2011].freeze
       
@@ -167,10 +167,17 @@ module ActiveRecord
       
       cattr_accessor :native_text_database_type, :native_binary_database_type, :native_string_database_type,
                      :log_info_schema_queries, :enable_default_unicode_types, :auto_connect,
-                     :cs_equality_operator, :lowercase_schema_reflection
+                     :cs_equality_operator, :lowercase_schema_reflection, :auto_connect_duration
       
       self.enable_default_unicode_types = true
       
+      class << self
+        
+        def visitor_for(pool)
+          Arel::Visitors::SQLServer.new(pool)
+        end
+        
+      end
       
       def initialize(logger,config)
         @connection_options = config
@@ -310,6 +317,10 @@ module ActiveRecord
         @@auto_connect.is_a?(FalseClass) ? false : true
       end
       
+      def auto_connect_duration
+        @@auto_connect_duration ||= 10
+      end
+      
       def native_string_database_type
         @@native_string_database_type || (enable_default_unicode_types ? 'nvarchar' : 'varchar') 
       end
@@ -443,7 +454,7 @@ module ActiveRecord
         return false unless auto_connect
         @auto_connecting = true
         count = 0
-        while count <= 5
+        while count <= (auto_connect_duration / 2)
           sleep 2** count
           ActiveRecord::Base.did_retry_sqlserver_connection(self,count)
           return true if reconnect!

data/lib/arel/visitors/sqlserver.rb

@@ -21,14 +21,16 @@ module Arel
   end
 
   class SelectManager < Arel::TreeManager
-
+    
+    AR_CA_SQLSA_NAME = 'ActiveRecord::ConnectionAdapters::SQLServerAdapter'.freeze
+    
     # Getting real Ordering objects is very important for us. We need to be able to call #uniq on
     # a colleciton of them reliably as well as using their true object attributes to mutate them
     # to grouping objects for the inner sql during a select statment with an offset/rownumber. So this
     # is here till ActiveRecord & ARel does this for us instead of using SqlLiteral objects.
     alias :order_without_sqlserver :order
     def order(*expr)
-      return order_without_sqlserver(*expr) unless Arel::Visitors::SQLServer === @visitor
+      return order_without_sqlserver(*expr) unless engine_activerecord_sqlserver_adapter?
       @ast.orders.concat(expr.map{ |x|
         case x
         when Arel::Attributes::Attribute
@@ -55,7 +57,7 @@ module Arel
     # custom string hints down. See the visit_Arel_Nodes_LockWithSQLServer delegation method.
     alias :lock_without_sqlserver :lock
     def lock(locking=true)
-      if Arel::Visitors::SQLServer === @visitor
+      if engine_activerecord_sqlserver_adapter?
         case locking
         when true
           locking = Arel.sql('WITH(HOLDLOCK, ROWLOCK)')
@@ -69,7 +71,13 @@ module Arel
         lock_without_sqlserver(locking)
       end
     end
-
+    
+    private
+    
+    def engine_activerecord_sqlserver_adapter?
+      @engine.connection && @engine.connection.class.name == AR_CA_SQLSA_NAME
+    end
+    
   end
 
   module Visitors
@@ -117,7 +125,7 @@ module Arel
       end
       
       def visit_Arel_Nodes_Bin(o)
-        "#{visit o.expr} #{@engine.connection.cs_equality_operator}"
+        "#{visit o.expr} #{@connection.cs_equality_operator}"
       end
 
       # SQLServer ToSql/Visitor (Additions)
@@ -189,7 +197,7 @@ module Arel
 
       def source_with_lock_for_select_statement(o)
         core = o.cores.first
-        source = visit(core.source).strip if core.source
+        source = "FROM #{visit(core.source).strip}" if core.source
         if source && o.lock
           lock = visit o.lock
           index = source.match(/FROM [\w\[\]\.]+/)[0].length
@@ -272,6 +280,14 @@ module Arel
           o.limit &&
           !join_in_select_statement?(o)
       end
+      
+      def select_primary_key_sql?(o)
+        core = o.cores.first
+        return false if core.projections.size != 1
+        p = core.projections.first
+        t = table_from_select_statement(o)
+        Arel::Attributes::Attribute === p && t.primary_key && t.primary_key.name == p.name
+      end
 
       def find_and_fix_uncorrelated_joins_in_select_statement(o)
         core = o.cores.first
@@ -315,6 +331,8 @@ module Arel
           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)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version 
-  hash: 15424111
+  hash: 15424105
   prerelease: 6
   segments: 
   - 3
   - 1
   - 0
   - rc
-  - 5
-  version: 3.1.0.rc5
+  - 6
+  version: 3.1.0.rc6
 platform: ruby
 authors: 
 - Ken Collins
@@ -21,7 +21,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-26 00:00:00 -04:00
+date: 2011-08-17 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,14 +32,14 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15424111
+        hash: 15424105
         segments: 
         - 3
         - 1
         - 0
         - rc
-        - 5
-        version: 3.1.0.rc5
+        - 6
+        version: 3.1.0.rc6
   type: :runtime
   version_requirements: *id001
 description: SQL Server 2005 and 2008 Adapter For ActiveRecord