activerecord-sqlserver-adapter 3.0.4 → 3.0.5

data/CHANGELOG

@@ -1,4 +1,14 @@
 
+* master * 
+
+
+* 3.0.5 *
+
+* Fixed native database type memoization, now at connection instance level. Fix #execute_procedure for :dblib mode to return indifferent access rows too.
+
+* Make login timeout and query timeout backward database.yml friendly for :dblib mode.
+
+
 * 3.0.4 *
 
 * Add multiple results set support with #execute_procedure for :dblib mode. [Ken Collins]

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

@@ -80,7 +80,7 @@ module ActiveRecord
                 r = row.with_indifferent_access
                 yield(r) if block_given?
               end
-              result.each
+              result.each.map{ |row| row.is_a?(Hash) ? row.with_indifferent_access : row }
             when :odbc
               results = []
               raw_connection_run(sql) do |handle|

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

@@ -4,7 +4,7 @@ module ActiveRecord
       module SchemaStatements
         
         def native_database_types
-          ActiveRecord::ConnectionAdapters::SQLServerAdapter::NATIVE_DATABASE_TYPES
+          @native_database_types ||= initialize_native_database_types.freeze
         end
 
         def tables(name = nil)
@@ -148,8 +148,7 @@ module ActiveRecord
         # === SQLServer Specific ======================================== #
         
         def initialize_native_database_types
-          return if defined?(ActiveRecord::ConnectionAdapters::SQLServerAdapter::NATIVE_DATABASE_TYPES)
-          ActiveRecord::ConnectionAdapters::SQLServerAdapter.const_set(:NATIVE_DATABASE_TYPES,{
+          {
             :primary_key  => "int NOT NULL IDENTITY(1,1) PRIMARY KEY",
             :string       => { :name => native_string_database_type, :limit => 255  },
             :text         => { :name => native_text_database_type },
@@ -170,7 +169,7 @@ module ActiveRecord
             :nvarchar_max => { :name => "nvarchar(max)" },
             :ntext        => { :name => "ntext" },
             :ss_timestamp => { :name => 'timestamp' }
-          })
+          }
         end
         
         def column_definitions(table_name)

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -163,7 +163,7 @@ module ActiveRecord
       include Sqlserver::Errors
       
       ADAPTER_NAME                = 'SQLServer'.freeze
-      VERSION                     = '3.0.4'.freeze
+      VERSION                     = '3.0.5'.freeze
       DATABASE_VERSION_REGEXP     = /Microsoft SQL Server\s+(\d{4})/
       SUPPORTED_VERSIONS          = [2005,2008].freeze
       
@@ -180,7 +180,6 @@ module ActiveRecord
         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
-        initialize_native_database_types
         initialize_sqlserver_caches
         use_database
         unless SUPPORTED_VERSIONS.include?(@database_year)
@@ -346,6 +345,8 @@ module ActiveRecord
         @connection = case @connection_options[:mode]
                       when :dblib
                         appname = config[:appname] || 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
                         TinyTds::Client.new({ 
                           :dataserver    => config[:dataserver],
@@ -353,8 +354,8 @@ module ActiveRecord
                           :password      => config[:password],
                           :database      => config[:database],
                           :appname       => appname,
-                          :login_timeout => config[:dblib_login_timeout],
-                          :timeout       => config[:dblib_timeout],
+                          :login_timeout => login_timeout,
+                          :timeout       => timeout,
                           :encoding      => encoding
                         }).tap do |client|
                           client.execute("SET ANSI_DEFAULTS ON").do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 3
   - 0
-  - 4
-  version: 3.0.4
+  - 5
+  version: 3.0.5
 platform: ruby
 authors: 
 - Ken Collins
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 -04:00
+date: 2010-10-31 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency