activerecord-sqlserver-adapter 2.3.12 → 2.3.13

data/CHANGELOG

@@ -1,4 +1,15 @@
 
+* 2-3-stable *
+
+
+
+* 2.3.13 *
+
+* Fixed native database type memoization, now at connection instance level. Fix #execute_procedure for :dblib mode to return indifferent access rows too. Misc test case fixes for 2000 & 2005 need for using coerced Time vs Date type. Fix SQL Server 2000's lack of using TinyTds' native affected rows for UPDATE statements, revert to raw SQL. 
+
+* Make login timeout and query timeout backward database.yml friendly for :dblib mode.
+
+
 * 2.3.12 *
 
 * Add multiple results set support with #execute_procedure for :dblib mode. [Ken Collins]

data/Rakefile

@@ -31,13 +31,6 @@ namespace :test do
     end
     
   end
-
-  desc 'Test without unicode types enabled, uses ODBC mode.'
-  task :non_unicode_types do
-    ENV['ENABLE_DEFAULT_UNICODE_TYPES'] = 'false'
-    test = Rake::Task['test:odbc']
-    test.invoke
-  end
   
 end
 

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.12'.freeze
+      VERSION                     = '2.3.13'.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
@@ -182,7 +182,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)
@@ -269,7 +268,6 @@ module ActiveRecord
         when String, ActiveSupport::Multibyte::Chars
           if column && column.type == :binary
             column.class.string_to_binary(value)
-          # elsif column && column.type == :string
           elsif value.is_utf8? || (column && column.type == :string)
             "N'#{quote_string(value)}'"
           else
@@ -417,7 +415,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|
@@ -570,7 +568,7 @@ module ActiveRecord
       # SCHEMA STATEMENTS ========================================#
       
       def native_database_types
-        ActiveRecord::ConnectionAdapters::SQLServerAdapter::NATIVE_DATABASE_TYPES
+        @native_database_types ||= initialize_native_database_types.freeze
       end
       
       def table_alias_length
@@ -814,6 +812,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],
@@ -821,8 +821,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
@@ -961,7 +961,7 @@ module ActiveRecord
         @update_sql = true
         case @connection_options[:mode]
         when :dblib
-          execute(sql, name)
+          sqlserver_2000? ? execute(sql, name) && select_value('SELECT @@ROWCOUNT AS AffectedRows') : execute(sql, name)
         else
           execute(sql, name)
           select_value('SELECT @@ROWCOUNT AS AffectedRows')
@@ -1266,8 +1266,7 @@ module ActiveRecord
       end
       
       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 },
@@ -1288,7 +1287,7 @@ module ActiveRecord
           :nvarchar_max => { :name => "nvarchar(max)" },
           :ntext        => { :name => "ntext" },
           :ss_timestamp => { :name => 'timestamp'}
-        })
+        }
       end
       
       def column_definitions(table_name)

data/test/cases/basics_test_sqlserver.rb

@@ -1,12 +1,16 @@
 require 'cases/sqlserver_helper'
 require 'models/developer'
+require 'models/topic'
 
 class BasicsTestSqlserver < ActiveRecord::TestCase
 end
 
 class BasicsTest < ActiveRecord::TestCase
   
-  COERCED_TESTS = [:test_read_attributes_before_type_cast_on_datetime]
+  COERCED_TESTS = [
+    :test_read_attributes_before_type_cast_on_datetime, 
+    :test_preserving_date_objects,
+    :test_to_xml ]
   
   include SqlserverCoercedTest
   
@@ -19,5 +23,59 @@ class BasicsTest < ActiveRecord::TestCase
     end
   end
   
+  def test_coerced_test_preserving_date_objects
+    klass = sqlserver_2008? ? Date : (connection_mode_dblib? ? Time : Date)
+    assert_kind_of klass, Topic.find(1).last_read, "The last_read attribute should be of the #{klass.name} class"
+  end
+  
+  def test_coerced_test_to_xml
+    xml = REXML::Document.new(topics(:first).to_xml(:indent => 0))
+    bonus_time_in_current_timezone = topics(:first).bonus_time.xmlschema
+    written_on_in_current_timezone = topics(:first).written_on.xmlschema
+    
+    assert_equal "topic", xml.root.name
+    assert_equal "The First Topic" , xml.elements["//title"].text
+    assert_equal "David" , xml.elements["//author-name"].text
+
+    assert_equal "1", xml.elements["//id"].text
+    assert_equal "integer" , xml.elements["//id"].attributes['type']
+
+    assert_equal "1", xml.elements["//replies-count"].text
+    assert_equal "integer" , xml.elements["//replies-count"].attributes['type']
+
+    assert_equal written_on_in_current_timezone, xml.elements["//written-on"].text
+    assert_equal "datetime" , xml.elements["//written-on"].attributes['type']
+
+    assert_equal "--- Have a nice day\n" , xml.elements["//content"].text
+    assert_equal "yaml" , xml.elements["//content"].attributes['type']
+
+    assert_equal "david@loudthinking.com", xml.elements["//author-email-address"].text
+
+    assert_equal nil, xml.elements["//parent-id"].text
+    assert_equal "integer", xml.elements["//parent-id"].attributes['type']
+    assert_equal "true", xml.elements["//parent-id"].attributes['nil']
+
+    if sqlserver_2000? || sqlserver_2005?
+      last_read_in_current_timezone, last_read_type = if connection_mode_odbc?
+          ["2004-04-15", "date"]
+        elsif connection_mode_dblib?
+          ["2004-04-15 00:00:00", "date"]
+        else
+          [topics(:first).last_read.xmlschema, "datetime"]
+        end
+      assert_equal last_read_in_current_timezone, xml.elements["//last-read"].text
+      assert_equal last_read_type , xml.elements["//last-read"].attributes['type']
+    else
+      assert_equal "2004-04-15", xml.elements["//last-read"].text
+      assert_equal "date" , xml.elements["//last-read"].attributes['type']
+    end
+
+    assert_equal "false", xml.elements["//approved"].text
+    assert_equal "boolean" , xml.elements["//approved"].attributes['type']
+
+    assert_equal bonus_time_in_current_timezone, xml.elements["//bonus-time"].text
+    assert_equal "datetime" , xml.elements["//bonus-time"].attributes['type']
+  end
+  
   
 end

data/test/cases/column_test_sqlserver.rb

@@ -237,7 +237,8 @@ class ColumnTestSqlserver < ActiveRecord::TestCase
       
       should 'have column and objects cast to date' do
         assert_equal :date, @date.type, "This column: \n#{@date.inspect}"
-        assert_instance_of Date, @chronic_date.date
+        klass = sqlserver_2008? ? Date : (connection_mode_dblib? ? Time : Date)
+        assert_instance_of klass, @chronic_date.date
       end
       
       should 'have column objects cast to time' do

data/test/cases/migration_test_sqlserver.rb

@@ -84,3 +84,25 @@ class MigrationTest < ActiveRecord::TestCase
   
 end
 
+
+class ChangeTableMigrationsTest < ActiveRecord::TestCase
+  
+  COERCED_TESTS = [:test_string_creates_string_column]
+  
+  include SqlserverCoercedTest
+  
+  def test_coerced_string_creates_string_column
+    with_change_table do |t|
+      @connection.expects(:add_column).with(:delete_me, :foo, coerced_string_column, {})
+      @connection.expects(:add_column).with(:delete_me, :bar, coerced_string_column, {})
+      t.string :foo, :bar
+    end
+  end
+  
+  def coerced_string_column
+    "#{Person.connection.native_string_database_type}(255)"
+  end
+  
+end
+
+

data/test/connections/native_sqlserver_odbc/connection.rb

@@ -1,4 +1,4 @@
-print "Using SQLServer via ODBC\n"
+print "Using SQLServer via ODBC to #{ENV['ACTIVERECORD_UNITTEST_DSN'] || 'activerecord_unittest'}\n"
 require_dependency 'models/course'
 require 'logger'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 2
   - 3
-  - 12
-  version: 2.3.12
+  - 13
+  version: 2.3.13
 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