rails-sqlserver-2000-2005-adapter 2.2.16 → 2.2.17

data/CHANGELOG

@@ -1,7 +1,15 @@
 
 MASTER
 
-*
+
+* 2.2.17 * (May 14th, 2009)
+
+* Add simplified type recognition for varchar(max) and nvarchar(max) under SQL Server 2005 to be a 
+  :text type. This ensures schema dumper does the right thing. Fixes ticket #30. [Ken Collins]
+
+* Tested ruby 1.9, ruby-odbc 0.9996, and DBI 0.4.1. Also added correct support for UTF-8 character 
+  encoding going in and out of the DB. See before gist http://gist.github.com/111709 and after gist 
+  http://gist.github.com/111719 [Ken Collins]
 
 
 * 2.2.16 * (April 21st, 2009)

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
 
+* Fully tested under 1.9!!! Correctly encodes/decodes UTF-8 types in ruby 1.9 too.
 * Now supports both rails 2.2 & 2.3!!!
 * An ActiveRecord::Base.execute_procedure method that can be used by classes.
 * Enabled support for DDL transactions.
@@ -119,11 +120,11 @@ It is our goal to match the adapter version with each version of rails. However
 
 == Installation
 
-First, you will need Ruby DBI and Ruby ODBC. To my knowledge the ADO DBD for DBI is no longer supported. The installation below is not a comprehensive walk thru on how to get all the required moving parts like FreeTDS installed and/or configured. It will also assume gem installations of both the dependent libraries and the adapter itself.
+First, you will need Ruby DBI and Ruby ODBC. If you are using the adapter under 1.9, then you need at least ruby-odbc version 0.9996. To my knowledge the ADO DBD for DBI is no longer supported. The installation below is not a comprehensive walk thru on how to get all the required moving parts like FreeTDS installed and/or configured. It will also assume gem installations of both the dependent libraries and the adapter itself.
 
-It should be noted that this version of the adapter was developed using both the ancient 0.0.23 version of DBI up to the current stable release of 0.4.0. Because later versions of DBI will be changing many things, IT IS HIGHLY RECOMMENDED that you max your install to version 0.4.0 which the examples below show. For the time being we are not supporting DBI versions higher than 0.4.0. The good news is that if you were using a very old DBI with ADO, technically this adapter will still work for you, but be warned your path is getting old and may not be supported for long.
+It should be noted that this version of the adapter was developed using both the ancient 0.0.23 version of DBI up to the current stable release of 0.4.1. Note that DBI 0.4.1 is the minimal for ruby 1.9 compatibility. Because later versions of DBI will be changing many things, IT IS HIGHLY RECOMMENDED that you max your install to version 0.4.0 which the examples below show. For the time being we are not supporting DBI versions higher than 0.4.0. The good news is that if you were using a very old DBI with ADO, technically this adapter will still work for you, but be warned your path is getting old and may not be supported for long.
 
-  $ gem install dbi --version 0.4.0
+  $ gem install dbi --version 0.4.1
   $ gem install dbd-odbc --version 0.2.4
   $ gem install rails-sqlserver-2000-2005-adapter -s http://gems.github.com
 

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -49,6 +49,10 @@ module ActiveRecord
       
       class << self
         
+        def string_to_utf8_encoding(value)
+          value.force_encoding('UTF-8') rescue value
+        end
+        
         def string_to_binary(value)
          "0x#{value.unpack("H*")[0]}"
         end
@@ -59,6 +63,22 @@ module ActiveRecord
         
       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
@@ -106,6 +126,7 @@ module ActiveRecord
           when /bit/i               then :boolean
           when /uniqueidentifier/i  then :string
           when /datetime/i          then simplified_datetime
+          when /varchar\(max\)/     then :text
           else super
         end
       end
@@ -158,7 +179,7 @@ module ActiveRecord
     class SQLServerAdapter < AbstractAdapter
       
       ADAPTER_NAME            = 'SQLServer'.freeze
-      VERSION                 = '2.2.16'.freeze
+      VERSION                 = '2.2.17'.freeze
       DATABASE_VERSION_REGEXP = /Microsoft SQL Server\s+(\d{4})/
       SUPPORTED_VERSIONS      = [2000,2005].freeze
       LIMITABLE_TYPES         = ['string','integer','float','char','nchar','varchar','nvarchar'].freeze

data/test/cases/column_test_sqlserver.rb

@@ -67,8 +67,8 @@ class ColumnTestSqlserver < ActiveRecord::TestCase
       assert_equal :string, @char.type
       assert_equal :string, @char10.type
       if sqlserver_2005?
-        assert_equal :string, @varcharmax.type
-        assert_equal :string, @varcharmax10.type
+        assert_equal :text, @varcharmax.type, @varcharmax.inspect
+        assert_equal :text, @varcharmax10.type, @varcharmax10.inspect
       end
     end
     
@@ -120,8 +120,8 @@ class ColumnTestSqlserver < ActiveRecord::TestCase
       assert_equal :string, @nchar10.type
       assert_equal :string, @nvarchar100.type
       if sqlserver_2005?
-        assert_equal :string, @nvarcharmax.type
-        assert_equal :string, @nvarcharmax10.type
+        assert_equal :text, @nvarcharmax.type, @nvarcharmax.inspect
+        assert_equal :text, @nvarcharmax10.type, @nvarcharmax10.inspect
       end
     end
     

data/test/cases/schema_dumper_test_sqlserver.rb

@@ -35,6 +35,17 @@ class SchemaDumperTestSqlserver < ActiveRecord::TestCase
     
   end
   
+  context 'For strings' do
+
+    should 'have varchar(max) dumped as text' do
+      table_dump('sql_server_strings') do |output|
+        assert_match %r{t.text.*varchar_max}, output
+      end
+    end
+
+  end
+  
+  
   
   
   private

data/test/cases/sqlserver_helper.rb

@@ -98,6 +98,7 @@ module ActiveRecord
       def sqlserver_2005? ; ActiveRecord::Base.connection.sqlserver_2005? ; end
       def active_record_2_point_2? ; ActiveRecord::VERSION::MAJOR == 2 && ActiveRecord::VERSION::MINOR == 2 ; end
       def active_record_2_point_3? ; ActiveRecord::VERSION::MAJOR == 2 && ActiveRecord::VERSION::MINOR == 3 ; end
+      def ruby_19? ; RUBY_VERSION >= '1.9' ; end
     end
     def assert_sql(*patterns_to_match)
       $queries_executed = []
@@ -113,6 +114,7 @@ module ActiveRecord
     def sqlserver_2005? ; self.class.sqlserver_2005? ; end
     def active_record_2_point_2? ; self.class.active_record_2_point_2? ; end
     def active_record_2_point_3? ; self.class.active_record_2_point_3? ; end
+    def ruby_19? ; self.class.ruby_19? ; end
   end
 end
 

data/test/cases/unicode_test_sqlserver.rb

@@ -29,13 +29,19 @@ class UnicodeTestSqlserver < ActiveRecord::TestCase
   context 'Testing unicode data' do
 
     setup do
-      @unicode_data = "一二34五六"
+      @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?
     end
 
     should 'insert into nvarchar field' do
       assert data = SqlServerUnicode.create!(:nvarchar => @unicode_data)
       assert_equal @unicode_data, data.reload.nvarchar
     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
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails-sqlserver-2000-2005-adapter
 version: !ruby/object:Gem::Version 
-  version: 2.2.16
+  version: 2.2.17
 platform: ruby
 authors: 
 - Ken Collins
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-21 00:00:00 -07:00
+date: 2009-05-14 00:00:00 -07:00
 default_executable: 
 dependencies: []