activerecord-sqlserver-adapter 2.3.15 → 2.3.16

data/CHANGELOG

@@ -1,4 +1,9 @@
 
+* 2.3.16 *
+
+* TinyTDS enhancements for lost connections. Default connection mode.
+
+
 * 2.3.15 *
 
 * Version bump due to bad 2.3.14 release.

data/Rakefile

@@ -17,7 +17,7 @@ def test_files
 end
 
 
-task :test => ['test:odbc']
+task :test => ['test:dblib']
 
 
 namespace :test do

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -9,12 +9,13 @@ module ActiveRecord
     
     def self.sqlserver_connection(config) #:nodoc:
       config = config.dup.symbolize_keys!
-      config.reverse_merge! :mode => :odbc, :host => 'localhost', :username => 'sa', :password => ''
+      config.reverse_merge! :mode => :dblib, :host => 'localhost', :username => 'sa', :password => ''
       mode = config[:mode].to_s.downcase.underscore.to_sym
       case mode
       when :dblib
         raise ArgumentError, 'Missing :dataserver configuration.' unless config.has_key?(:dataserver)
         require_library_or_gem 'tiny_tds'
+        warn("TinyTds v0.4.3 or higher required. Using #{TinyTds::VERSION}") unless TinyTds::Client.instance_methods.include?("active?")
       when :odbc
         require_library_or_gem 'odbc' unless defined?(ODBC)
         require 'active_record/connection_adapters/sqlserver_adapter/core_ext/odbc'
@@ -147,7 +148,7 @@ module ActiveRecord
     class SQLServerAdapter < AbstractAdapter
       
       ADAPTER_NAME                = 'SQLServer'.freeze
-      VERSION                     = '2.3.15'.freeze
+      VERSION                     = '2.3.16'.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
@@ -158,7 +159,7 @@ module ActiveRecord
         :adonet => ['TypeError','System::Data::SqlClient::SqlException']
       }
       LOST_CONNECTION_MESSAGES    = {
-        :dblib  => [/closed connection/, /dead or not enabled/],
+        :dblib  => [/closed connection/, /dead or not enabled/, /server failed/i],
         :odbc   => [/link failure/, /server failed/, /connection was already closed/, /invalid handle/i],
         :adonet => [/current state is closed/, /network-related/]
       }
@@ -319,15 +320,10 @@ module ActiveRecord
       # CONNECTION MANAGEMENT ====================================#
       
       def active?
-        connected = case @connection_options[:mode]
-                    when :dblib
-                      !@connection.closed?
-                    when :odbc
-                      true
-                    else :adonet
-                      true
-                    end
-        return false if !connected
+        case @connection_options[:mode]
+        when :dblib
+          @connection.active?
+        end
         raw_connection_do("SELECT 1")
         true
       rescue *lost_connection_exceptions

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 35
   prerelease: 
   segments: 
   - 2
   - 3
-  - 15
-  version: 2.3.15
+  - 16
+  version: 2.3.16
 platform: ruby
 authors: 
 - Ken Collins
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 -05:00
+date: 2011-04-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: SQL Server 2000, 2005 and 2008 Adapter For Rails.