activerecord-sqlserver-adapter 2.3.22 → 2.3.23

data/CHANGELOG

@@ -1,4 +1,13 @@
 
+* 2.3.23 *
+
+* Create a #configure_connection method that can be overridden. Think "SET TEXTSIZE...".
+
+* Fixed the #finish_statement_handle to cancel the TinyTDS connection if needed.
+
+* Fix the #indexes method to fail gracefully if sp_helptext permissions fail.
+
+
 * 2.3.22 *
 
 * Make #rollback_db_transaction smarter.

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -147,7 +147,7 @@ module ActiveRecord
     class SQLServerAdapter < AbstractAdapter
       
       ADAPTER_NAME                = 'SQLServer'.freeze
-      VERSION                     = '2.3.22'.freeze
+      VERSION                     = '2.3.23'.freeze
       DATABASE_VERSION_REGEXP     = /Microsoft SQL Server\s+(\d{4})/
       SUPPORTED_VERSIONS          = [2000,2005,2008].freeze
       LIMITABLE_TYPES             = ['string','integer','float','char','nchar','varchar','nvarchar'].to_set.freeze
@@ -612,7 +612,8 @@ module ActiveRecord
       
       def indexes(table_name, name = nil)
         unquoted_table_name = unqualify_table_name(table_name)
-        select("EXEC sp_helpindex #{quote_table_name(unquoted_table_name)}",name).inject([]) do |indexes,index|
+        data = select("EXEC sp_helpindex #{quote_table_name(unquoted_table_name)}",name) rescue []
+        data.inject([]) do |indexes,index|
           index = index.with_indifferent_access
           if index[:index_description] =~ /primary key/
             indexes
@@ -867,10 +868,18 @@ module ActiveRecord
                           connection.open
                         end
                       end
+        configure_connection
       rescue
         raise unless @auto_connecting
       end
       
+      # Override this method so every connection can be configured to your needs.
+      # For example: 
+      #    do_execute "SET TEXTSIZE #{64.megabytes}"
+      #    do_execute "SET CONCAT_NULL_YIELDS_NULL ON"
+      def configure_connection
+      end
+      
       def lost_connection_exceptions
         exceptions = LOST_CONNECTION_EXCEPTIONS[@connection_options[:mode]]
         @lost_connection_exceptions ||= exceptions ? exceptions.map(&:constantize) : []
@@ -934,6 +943,7 @@ module ActiveRecord
       def finish_statement_handle(handle)
         case @connection_options[:mode]
         when :dblib
+          handle.cancel if handle
         when :odbc
           handle.drop if handle && handle.respond_to?(:drop) && !handle.finished?
         when :adonet

data/test/cases/sqlserver_helper.rb

@@ -23,6 +23,7 @@ require 'active_record/version'
 GC.copy_on_write_friendly = true if GC.respond_to?(:copy_on_write_friendly?)
 
 ActiveRecord::Migration.verbose = false
+ActiveRecord::ConnectionAdapters::SQLServerAdapter.log_info_schema_queries = true
 
 # Defining our classes in one place as well as soem core tests that need coercing date/time types.
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: 
   segments: 
   - 2
   - 3
-  - 22
-  version: 2.3.22
+  - 23
+  version: 2.3.23
 platform: ruby
 authors: 
 - Ken Collins
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-04 00:00:00 -04:00
+date: 2011-10-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency