activerecord-sqlserver-adapter 2.3.11 → 2.3.12

data/CHANGELOG

@@ -1,4 +1,15 @@
 
+* 2.3.12 *
+
+* Add multiple results set support with #execute_procedure for :dblib mode. [Ken Collins]
+
+* Allow unicode conditions strings to be quoted correctly. Like 3.0 branch. [Ken Collins]
+
+* Simplify encoding support. [Ken Collins]
+
+* Add binary timestamp datatype handling. [Erik Bryn]
+
+
 * 2.3.11
 
 * Add TinyTds/dblib connection mode. [Ken Collins]

data/README.rdoc

@@ -6,6 +6,7 @@ The SQL Server adapter for rails is back for ActiveRecord 2.2 and up! We are cur
 
 == What's New
 
+* New dblib connection mode using TinyTds!
 * Integration with rails :db namespaced rake tasks.
 * IronRuby support using ADONET connection mode.
 * Direct ODBC mode. No DBI anymore, means around 20% faster!

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -54,38 +54,16 @@ module ActiveRecord
       
       class << self
         
-        def string_to_utf8_encoding(value)
-          value.force_encoding('UTF-8') rescue value
-        end
-        
         def string_to_binary(value)
-          value = value.dup.force_encoding(Encoding::BINARY) if value.respond_to?(:force_encoding)
          "0x#{value.unpack("H*")[0]}"
         end
         
         def binary_to_string(value)
-          value = value.dup.force_encoding(Encoding::BINARY) if value.respond_to?(:force_encoding)
           value =~ /[^[:xdigit:]]/ ? value : [value].pack('H*')
         end
         
       end
       
-      def type_cast(value)
-        if value && type == :string && is_utf8?
-          self.class.string_to_utf8_encoding(value)
-        else
-          super
-        end
-      end
-      
-      def type_cast_code(var_name)
-        if type == :string && is_utf8?
-          "#{self.class.name}.string_to_utf8_encoding(#{var_name})"
-        else
-          super
-        end
-      end
-      
       def is_identity?
         @sqlserver_options[:is_identity]
       end
@@ -146,6 +124,7 @@ module ActiveRecord
           when /uniqueidentifier/i  then :string
           when /datetime/i          then simplified_datetime
           when /varchar\(max\)/     then :text
+          when /timestamp/          then :binary
           else super
         end
       end
@@ -164,19 +143,11 @@ module ActiveRecord
       
     end #SQLServerColumn
     
-    # In ODBC mode, the adapter requires Ruby ODBC and requires that you specify 
-    # a :dsn option. Ruby ODBC is available at http://www.ch-werner.de/rubyodbc/
-    #
-    # Options:
-    #
-    # * <tt>:username</tt>      -- Defaults to sa.
-    # * <tt>:password</tt>      -- Defaults to blank string.
-    # * <tt>:dsn</tt>           -- An ODBC DSN. (required)
-    # 
+
     class SQLServerAdapter < AbstractAdapter
       
       ADAPTER_NAME                = 'SQLServer'.freeze
-      VERSION                     = '2.3.11'.freeze
+      VERSION                     = '2.3.12'.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
@@ -298,8 +269,9 @@ module ActiveRecord
         when String, ActiveSupport::Multibyte::Chars
           if column && column.type == :binary
             column.class.string_to_binary(value)
-          elsif column && column.respond_to?(:is_utf8?) && column.is_utf8?
-            quoted_utf8_value(value)
+          # elsif column && column.type == :string
+          elsif value.is_utf8? || (column && column.type == :string)
+            "N'#{quote_string(value)}'"
           else
             super
           end
@@ -337,10 +309,6 @@ module ActiveRecord
         end
       end
       
-      def quoted_utf8_value(value)
-        "N'#{quote_string(value)}'"
-      end
-      
       # REFERENTIAL INTEGRITY ====================================#
       
       def disable_referential_integrity
@@ -441,12 +409,17 @@ module ActiveRecord
         vars = variables.map{ |v| quote(v) }.join(', ')
         sql = "EXEC #{proc_name} #{vars}".strip
         name = 'Execute Procedure'
-        results = []
-        case @connection_options[:mode]
-        when :dblib
-          results << select(sql, name).map { |r| r.with_indifferent_access }
-        when :odbc
-          log(sql, name) do
+        log(sql, name) do
+          case @connection_options[:mode]
+          when :dblib
+            result = @connection.execute(sql)
+            result.each(:as => :hash, :cache_rows => true) do |row|
+              r = row.with_indifferent_access
+              yield(r) if block_given?
+            end
+            result.each
+          when :odbc
+            results = []
             raw_connection_run(sql) do |handle|
               get_rows = lambda {
                 rows = handle_to_names_and_values handle, :fetch => :all
@@ -458,11 +431,13 @@ module ActiveRecord
                 get_rows.call
               end
             end
+            results.many? ? results : results.first
+          when :adonet
+            results = []
+            results << select(sql, name).map { |r| r.with_indifferent_access }
+            results.many? ? results : results.first
           end
-        when :adonet
-          results << select(sql, name).map { |r| r.with_indifferent_access }
         end
-        results.many? ? results : results.first
       end
       
       def use_database(database=nil)
@@ -1311,7 +1286,8 @@ module ActiveRecord
           :nchar        => { :name => "nchar" },
           :nvarchar     => { :name => "nvarchar", :limit => 255 },
           :nvarchar_max => { :name => "nvarchar(max)" },
-          :ntext        => { :name => "ntext" }
+          :ntext        => { :name => "ntext" },
+          :ss_timestamp => { :name => 'timestamp'}
         })
       end
       

data/test/cases/column_test_sqlserver.rb

@@ -161,6 +161,8 @@ class ColumnTestSqlserver < ActiveRecord::TestCase
       @time = SqlServerChronic.columns_hash['time']
       @datetime = SqlServerChronic.columns_hash['datetime']
       @smalldatetime = SqlServerChronic.columns_hash['smalldatetime']
+      @timestamp = SqlServerChronic.columns_hash['timestamp']
+      @ss_timestamp = SqlServerChronic.columns_hash['ss_timestamp']
     end
 
     should 'have correct simplified type for uncast datetime' do
@@ -184,6 +186,25 @@ class ColumnTestSqlserver < ActiveRecord::TestCase
       assert_equal nil, @datetime.limit
     end
     
+    context 'with timestamps' do
+
+      should 'use datetime sql type when using :timestamp in schema statements' do
+        assert_equal :datetime, @timestamp.type
+        assert_equal 'datetime', @timestamp.sql_type
+      end
+      
+      should 'be able to use real sql server timestamp if you really want to' do
+        assert_equal :binary, @ss_timestamp.type
+        assert_equal 'timestamp', @ss_timestamp.sql_type
+      end
+      
+      should 'return :timestamp as a binaryish string' do
+        chronic = SqlServerChronic.create!.reload
+        assert_match %r|\000|, chronic.ss_timestamp
+      end
+
+    end
+    
     context 'For smalldatetime types' do
       
       should 'have created that type using rails migrations' do

data/test/cases/execute_procedure_test_sqlserver.rb

@@ -9,34 +9,26 @@ class ExecuteProcedureTestSqlserver < ActiveRecord::TestCase
   should 'execute a simple procedure' do
     tables = @klass.execute_procedure :sp_tables
     assert_instance_of Array, tables
-    assert_instance_of HashWithIndifferentAccess, tables.first
+    assert tables.first.respond_to?(:keys)
   end
   
   should 'take parameter arguments' do
     tables = @klass.execute_procedure :sp_tables, 'sql_server_chronics'
     table_info = tables.first
     assert_equal 1, tables.size
-    assert_equal (ENV['ARUNIT_DB_NAME'] || 'activerecord_unittest'), table_info[:TABLE_QUALIFIER], "Table Info: #{table_info.inspect}"
-    assert_equal 'TABLE', table_info[:TABLE_TYPE], "Table Info: #{table_info.inspect}"
+    assert_equal (ENV['ARUNIT_DB_NAME'] || 'activerecord_unittest'), table_info['TABLE_QUALIFIER'], "Table Info: #{table_info.inspect}"
+    assert_equal 'TABLE', table_info['TABLE_TYPE'], "Table Info: #{table_info.inspect}"
   end
   
-  if connection_mode_odbc?
-    
-    should 'allow multiple result sets to be returned' do
-      results1, results2 = @klass.execute_procedure('sp_helpconstraint','accounts')
-      assert_instance_of Array, results1
-      assert_instance_of HashWithIndifferentAccess, results1.first
-      assert results1.first['Object Name']
-      assert_instance_of Array, results2
-      assert_instance_of HashWithIndifferentAccess, results2.first
-      assert results2.first['constraint_name']
-      assert results2.first['constraint_type']
-    end
-    
-  else
-    
-    should 'allow multiple result sets to be returned'
-    
+  should 'allow multiple result sets to be returned' do
+    results1, results2 = @klass.execute_procedure('sp_helpconstraint','accounts')
+    assert_instance_of Array, results1
+    assert results1.first.respond_to?(:keys)
+    assert results1.first['Object Name']
+    assert_instance_of Array, results2
+    assert results2.first.respond_to?(:keys)
+    assert results2.first['constraint_name']
+    assert results2.first['constraint_type']
   end
   
   

data/test/cases/sqlserver_helper.rb

@@ -106,6 +106,7 @@ module ActiveRecord
     class << self
       def connection_mode_dblib? ; ActiveRecord::Base.connection.instance_variable_get(:@connection_options)[:mode] == :dblib ; end
       def connection_mode_odbc? ; ActiveRecord::Base.connection.instance_variable_get(:@connection_options)[:mode] == :odbc ; end
+      def connection_mode_adonet? ; ActiveRecord::Base.connection.instance_variable_get(:@connection_options)[:mode] == :adonet ; end
       def sqlserver_2000? ; ActiveRecord::Base.connection.sqlserver_2000? ; end
       def sqlserver_2005? ; ActiveRecord::Base.connection.sqlserver_2005? ; end
       def sqlserver_2008? ; ActiveRecord::Base.connection.sqlserver_2008? ; end
@@ -125,6 +126,7 @@ module ActiveRecord
     end
     def connection_mode_dblib? ; self.class.connection_mode_dblib? ; end
     def connection_mode_odbc? ; self.class.connection_mode_odbc? ; end
+    def connection_mode_adonet? ; self.class.connection_mode_adonet? ; end
     def sqlserver_2000? ; self.class.sqlserver_2000? ; end
     def sqlserver_2005? ; self.class.sqlserver_2005? ; end
     def sqlserver_2008? ; self.class.sqlserver_2008? ; end

data/test/cases/unicode_test_sqlserver.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'cases/sqlserver_helper'
 
 class UnicodeTestSqlserver < ActiveRecord::TestCase
@@ -29,19 +30,22 @@ class UnicodeTestSqlserver < ActiveRecord::TestCase
   context 'Testing unicode data' do
 
     setup do
-      @unicode_data = "\344\270\200\344\272\21434\344\272\224\345\205\255"
-      @encoded_unicode_data = "\344\270\200\344\272\21434\344\272\224\345\205\255".force_encoding('UTF-8') if ruby_19?
+      @unicode_data = "\344\270\200\344\272\21434\344\272\224\345\205\255" # "一二34五六"
     end
 
-    should 'insert into nvarchar field' do
+    should 'insert and retrieve unicode data' do
       assert data = SqlServerUnicode.create!(:nvarchar => @unicode_data)
-      assert_equal @unicode_data, data.reload.nvarchar
+      if connection_mode_dblib?
+        assert_equal "一二34五六", data.reload.nvarchar
+      elsif connection_mode_odbc?
+        assert_equal "一二34五六", data.reload.nvarchar, 'perhaps you are not using the utf8 odbc that does this legwork'
+      elsif connection_mode_adonet?
+        assert_equal "一二34五六", data.reload.nvarchar
+      else
+        raise 'need to add a case for this'
+      end
+      assert_equal Encoding.find('UTF-8'), data.nvarchar.encoding if ruby_19?
     end
-    
-    should 're-encode data on DB reads' do
-      assert data = SqlServerUnicode.create!(:nvarchar => @unicode_data)
-      assert_equal @encoded_unicode_data, data.reload.nvarchar
-    end if ruby_19?
 
   end
   

data/test/cases/validations_test_sqlserver.rb

@@ -9,27 +9,10 @@ class ValidationsTest < ActiveRecord::TestCase
   
   include SqlserverCoercedTest
   
-  # This test is tricky to pass. The validation SQL would generate something like this:
-  # 
-  #   SELECT TOP 1 [events].id FROM [events] WHERE ([events].[title] COLLATE Latin1_General_CS_AS = '一二三四五')
-  # 
-  # The problem is that we can not change the adapters quote method from this:
-  # 
-  #   elsif column && column.respond_to?(:is_utf8?) && column.is_utf8?
-  #     quoted_utf8_value(value)
-  # 
-  # To something like this for all quoting like blind bind vars:
-  # 
-  #   elsif value.is_utf8?
-  #     quoted_utf8_value(value)
-  # 
-  # As it would cause way more errors, sure this piggybacks on ActiveSupport's 1.8/1.9 abstract
-  # code to infer if the passed in string is indeed a national/unicde type. Perhaps in rails 3
-  # and using AREL this might get better, but I do not see a solution right now.
-  # 
   def test_coerced_test_validate_uniqueness_with_limit_and_utf8
-    assert true
+    true
   end
   
+  
 end
 

data/test/schema/sqlserver_specific_schema.rb

@@ -25,6 +25,7 @@ ActiveRecord::Schema.define do
     t.column :time,       :time
     t.column :datetime,   :datetime
     t.column :timestamp,  :timestamp
+    t.column :ss_timestamp, :ss_timestamp
     t.column :smalldatetime, :smalldatetime
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: false
   segments: 
   - 2
   - 3
-  - 11
-  version: 2.3.11
+  - 12
+  version: 2.3.12
 platform: ruby
 authors: 
 - Ken Collins
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-17 00:00:00 -04:00
+date: 2010-10-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,11 +30,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 7
         segments: 
         - 2
-        - 3
-        version: "2.3"
+        - 2
+        version: "2.2"
   type: :runtime
   version_requirements: *id001
 description: SQL Server 2000, 2005 and 2008 Adapter For Rails.