activerecord-sqlserver-adapter 3.0.18 → 3.0.19

data/CHANGELOG

@@ -1,4 +1,17 @@
 
+* 3.0.19 *
+
+* Create a #configure_connection method that can be overridden. Think "SET TEXTSIZE...".
+
+* Create a #configure_application_name method that can be overridden for unique TinyTDS app names
+  to show up in SQL Server's activity monitor.
+
+* Fixed the #finish_statement_handle to cancel the TinyTDS connection if needed.
+
+* Fix the #indexes method to fail gracefully if sp_helptext permissions fail.
+
+
+
 * 3.0.18 *
 
 * Make #rollback_db_transaction smarter.

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

@@ -398,7 +398,8 @@ module ActiveRecord
         
         def finish_statement_handle(handle)
           case @connection_options[:mode]
-          when :dblib  
+          when :dblib
+            handle.cancel if handle
           when :odbc
             handle.drop if handle && handle.respond_to?(:drop) && !handle.finished?
           when :adonet

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

@@ -20,7 +20,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

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -164,7 +164,7 @@ module ActiveRecord
       include Sqlserver::Errors
       
       ADAPTER_NAME                = 'SQLServer'.freeze
-      VERSION                     = '3.0.18'.freeze
+      VERSION                     = '3.0.19'.freeze
       DATABASE_VERSION_REGEXP     = /Microsoft SQL Server\s+"?(\d{4}|\w+)"?/
       SUPPORTED_VERSIONS          = [2005,2008,2010,2011].freeze
       
@@ -358,7 +358,7 @@ module ActiveRecord
         config = @connection_options
         @connection = case @connection_options[:mode]
                       when :dblib
-                        appname = config[:appname] || Rails.application.class.name.split('::').first rescue nil
+                        appname = config[:appname] || configure_application_name || Rails.application.class.name.split('::').first rescue nil
                         login_timeout = config[:login_timeout].present? ? config[:login_timeout].to_i : nil
                         timeout = config[:timeout].present? ? config[:timeout].to_i/1000 : nil
                         encoding = config[:encoding].present? ? config[:encoding] : nil
@@ -423,10 +423,24 @@ 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
+      
+      # Override this method so every connection can have a unique name. Max 30 characters. Used by TinyTDS only.
+      # For example:
+      #    "myapp_#{$$}_#{Thread.current.object_id}".to(29)
+      def configure_application_name
+      end
+      
       def remove_database_connections_and_rollback(database=nil)
         database ||= current_database
         do_execute "ALTER DATABASE #{quote_table_name(database)} SET SINGLE_USER WITH ROLLBACK IMMEDIATE"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version 
-  hash: 35
+  hash: 33
   prerelease: 
   segments: 
   - 3
   - 0
-  - 18
-  version: 3.0.18
+  - 19
+  version: 3.0.19
 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