@@ -1,9 +1,12 @@ MASTER +* 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 + http://gist.github.com/111719 [Ken Collins] * 2.2.16 * (April 21st, 2009) CHANGELOG @@ -126,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 lib/active_record/connection_adapters/sqlserver_adapter.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 test/cases/column_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 test/cases/schema_dumper_test_sqlserver.rb d9fe27e80c1e577410ef4fe27193d98dfc68b014 Ken Collins ken@metaskills.net http://github.com/rails-sqlserver/2000-2005-adapter/commit/ea6edae5cf60a8f091fb785cac2b69fef35b7249 ea6edae5cf60a8f091fb785cac2b69fef35b7249 2009-05-14T13:06:50-07:00 2009-05-14T13:06:50-07:00 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. 75b17c5e11caa507d15677831f88ecce613f3319 Ken Collins ken@metaskills.net