[Rails3] Revert back to using our own coerced tests. Allow case_sensitive_equality_operator to be configurable. Reorganize rake file. Quote pretty much all strings to the DB with N'...' prefix.

Author: metaskills

Rakefile

@@ -3,44 +3,37 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 
 
-desc 'Default runs tests for the adapters ODBC mode.'
-task :test do
-  test = Rake::Task['sqlserver:test:odbc']
-  test.invoke
-end
-
+task :test => ['test:odbc']
 
-namespace :sqlserver do
+namespace :test do
 
-  namespace :test do
-    
-    ['odbc','adonet'].each do |mode|
-
-      Rake::TestTask.new(mode) do |t|
-        t.libs << "test"
-        t.libs << "test/connections/native_sqlserver#{mode == 'adonet' ? '' : "_#{mode}"}"
-        t.libs << "#{ENV['RAILS_SOURCE']}/activerecord/test"
-        t.test_files = \
-          Dir.glob("test/cases/**/*_test_sqlserver.rb").sort + 
-          (Dir.glob("#{ENV['RAILS_SOURCE']}/activerecord/test/cases/**/*_test.rb") - 
-           Dir.glob("#{ENV['RAILS_SOURCE']}/activerecord/test/cases/adapters/**/*_test.rb")).sort
-        t.verbose = true
-      end
-      
-    end
+  ['odbc','adonet'].each do |mode|
 
-    desc 'Test with unicode types enabled, uses ODBC mode.'
-    task :unicode_types do
+    Rake::TestTask.new(mode) do |t|
       ENV['ENABLE_DEFAULT_UNICODE_TYPES'] = 'true'
-      test = Rake::Task['sqlserver:test:odbc']
-      test.invoke
+      t.libs << "test"
+      t.libs << "test/connections/native_sqlserver#{mode == 'adonet' ? '' : "_#{mode}"}"
+      t.libs << "#{ENV['RAILS_SOURCE']}/activerecord/test"
+      t.test_files = \
+        Dir.glob("test/cases/**/*_test_sqlserver.rb").sort + 
+        (Dir.glob("#{ENV['RAILS_SOURCE']}/activerecord/test/cases/**/*_test.rb") - 
+         Dir.glob("#{ENV['RAILS_SOURCE']}/activerecord/test/cases/adapters/**/*_test.rb")).sort
+      t.verbose = true
     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
 
 
+
 namespace :rvm do
 
   RUBIES = {
@@ -105,7 +98,7 @@ namespace :rvm do
           RVM.run "curl -O http://www.ch-werner.de/rubyodbc/#{odbc}.tar.gz"
           puts "info: RubyODBC extracting clean work directory..."
           RVM.run "tar -xf #{odbc}.tar.gz"
-          RVM.chdir("#{odbc}/ext") do
+          RVM.chdir("#{odbc}/ext/utf8") do
             puts "info: RubyODBC configuring..."
             RVM.ruby 'extconf.rb', "--with-odbc-dir=#{rvm_odbc_dir}"
             puts "info: RubyODBC make and installing for #{rvm_current_name}..."

lib/active_record/connection_adapters/sqlserver/database_statements.rb

@@ -51,7 +51,7 @@ def empty_insert_statement_value
         end
 
         def case_sensitive_equality_operator
-          "COLLATE Latin1_General_CS_AS ="
+          cs_equality_operator
         end
 
         def limited_update_conditions(where_sql, quoted_table_name, quoted_primary_key)

lib/active_record/connection_adapters/sqlserver/quoting.rb

@@ -8,7 +8,7 @@ def quote(value, column = nil)
           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?
+            elsif quote_value_as_utf8?(value) || column && column.respond_to?(:is_utf8?) && column.is_utf8?
               quoted_utf8_value(value)
             else
               super
@@ -51,6 +51,10 @@ def quoted_utf8_value(value)
           "N'#{quote_string(value)}'"
         end
 
+        def quote_value_as_utf8?(value)
+          value.is_utf8? || enable_default_unicode_types
+        end
+        
       end
     end
   end

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -171,7 +171,8 @@ class SQLServerAdapter < AbstractAdapter
       SUPPORTED_VERSIONS          = [2005,2008].freeze
 
       cattr_accessor :native_text_database_type, :native_binary_database_type, :native_string_database_type,
-                     :log_info_schema_queries, :enable_default_unicode_types, :auto_connect
+                     :log_info_schema_queries, :enable_default_unicode_types, :auto_connect,
+                     :cs_equality_operator
 
       def initialize(logger,config)
         @connection_options = config
@@ -310,6 +311,10 @@ def native_binary_database_type
         @@native_binary_database_type || 'varbinary(max)'
       end
 
+      def cs_equality_operator
+        @@cs_equality_operator || 'COLLATE Latin1_General_CS_AS_WS ='
+      end
+      
 
       protected
 

test/cases/adapter_test_sqlserver.rb

@@ -585,24 +585,6 @@ def setup
 
   end
 
-  
-  
-  private
-  
-  def with_enable_default_unicode_types(setting)
-    old_setting = ActiveRecord::ConnectionAdapters::SQLServerAdapter.enable_default_unicode_types
-    old_text = ActiveRecord::ConnectionAdapters::SQLServerAdapter.native_text_database_type
-    old_string = ActiveRecord::ConnectionAdapters::SQLServerAdapter.native_string_database_type
-    ActiveRecord::ConnectionAdapters::SQLServerAdapter.enable_default_unicode_types = setting
-    ActiveRecord::ConnectionAdapters::SQLServerAdapter.native_text_database_type = nil
-    ActiveRecord::ConnectionAdapters::SQLServerAdapter.native_string_database_type = nil
-    yield
-  ensure
-    ActiveRecord::ConnectionAdapters::SQLServerAdapter.enable_default_unicode_types = old_setting
-    ActiveRecord::ConnectionAdapters::SQLServerAdapter.native_text_database_type = old_text
-    ActiveRecord::ConnectionAdapters::SQLServerAdapter.native_string_database_type = old_string
-  end
-  
 end
 
 

test/cases/attribute_methods_test_sqlserver.rb

@@ -1,21 +1,38 @@
 require 'cases/sqlserver_helper'
 require 'models/developer'
+require 'models/topic'
 
 class AttributeMethodsTestSqlserver < ActiveRecord::TestCase
 end
 
 class AttributeMethodsTest < ActiveRecord::TestCase
 
-  COERCED_TESTS = [:test_read_attributes_before_type_cast_on_datetime]
+  COERCED_TESTS = [
+    :test_read_attributes_before_type_cast_on_datetime,
+    :test_typecast_attribute_from_select_to_false,
+    :test_typecast_attribute_from_select_to_true
+  ]
 
   include SqlserverCoercedTest
 
   fixtures :developers
 
-  def test_coerced_test_read_attributes_before_type_cast_on_datetime
+  def test_coerced_read_attributes_before_type_cast_on_datetime
     developer = Developer.find(:first)
     assert_equal "#{developer.created_at.to_s(:db)}.000" , developer.attributes_before_type_cast["created_at"]
   end
 
+  def test_coerced_typecast_attribute_from_select_to_false
+    topic = Topic.create(:title => 'Budget')
+    topic = Topic.find(:first, :select => "topics.*, CASE WHEN 1=2 THEN 1 ELSE 0 END as is_test")
+    assert !topic.is_test?
+  end
+  
+  def test_coerced_typecast_attribute_from_select_to_true
+    topic = Topic.create(:title => 'Budget')
+    topic = Topic.find(:first, :select => "topics.*, CASE WHEN 2=2 THEN 1 ELSE 0 END as is_test")
+    assert topic.is_test?
+  end
+  
 
 end

test/cases/execute_procedure_test_sqlserver.rb

@@ -21,7 +21,12 @@ def setup
   end
 
   should 'quote bind vars correctly' do
-    assert_sql(/EXEC sp_tables '%sql_server%', NULL, NULL, NULL, 1/) do
+    regex = if quote_values_as_utf8?
+              /EXEC sp_tables N'%sql_server%', NULL, NULL, NULL, 1/
+            else
+              /EXEC sp_tables '%sql_server%', NULL, NULL, NULL, 1/
+            end
+    assert_sql(regex) do
       @klass.execute_procedure :sp_tables, '%sql_server%', nil, nil, nil, true
     end
   end

test/cases/schema_dumper_test_sqlserver.rb

@@ -1,4 +1,5 @@
 require 'cases/sqlserver_helper'
+require 'stringio'
 
 class SchemaDumperTestSqlserver < ActiveRecord::TestCase
 
@@ -46,8 +47,6 @@ class SchemaDumperTestSqlserver < ActiveRecord::TestCase
   end
 
 
-  
-  
   private
 
   def find_all_tables
@@ -70,3 +69,19 @@ def table_dump(*table_names)
   end
 
 end
+
+
+class SchemaDumperTest < ActiveRecord::TestCase
+  
+  COERCED_TESTS = [:test_schema_dump_keeps_large_precision_integer_columns_as_decimal]
+  
+  include SqlserverCoercedTest
+  
+  def test_coerced_schema_dump_keeps_large_precision_integer_columns_as_decimal
+    output = standard_dump
+    assert_match %r{t.decimal\s+"atoms_in_universe",\s+:precision => 38,\s+:scale => 0}, output
+  end
+  
+end
+
+

test/cases/sqlserver_helper.rb

@@ -58,7 +58,7 @@ def coerced_tests
     end
     def method_added(method)
       if coerced_tests && coerced_tests.include?(method)
-        undef_method(method)
+        undef_method(method) rescue nil
         STDOUT.puts("Undefined coerced test: #{self.name}##{method}")
       end
     end
@@ -94,6 +94,7 @@ class << self
       def sqlserver_2005? ; ActiveRecord::Base.connection.sqlserver_2005? ; end
       def sqlserver_2008? ; ActiveRecord::Base.connection.sqlserver_2008? ; end
       def ruby_19? ; RUBY_VERSION >= '1.9' ; end
+      def quote_values_as_utf8? ; ActiveRecord::Base.connection.quote_value_as_utf8?('') ; end
     end
     def assert_sql(*patterns_to_match)
       $queries_executed = []
@@ -108,6 +109,23 @@ def assert_sql(*patterns_to_match)
     def sqlserver_2005? ; self.class.sqlserver_2005? ; end
     def sqlserver_2008? ; self.class.sqlserver_2008? ; end
     def ruby_19? ; self.class.ruby_19? ; end
+    def quote_values_as_utf8? ; self.class.quote_values_as_utf8? ; end
+    def with_enable_default_unicode_types?
+      ActiveRecord::ConnectionAdapters::SQLServerAdapter.enable_default_unicode_types.is_a?(TrueClass)
+    end
+    def with_enable_default_unicode_types(setting)
+      old_setting = ActiveRecord::ConnectionAdapters::SQLServerAdapter.enable_default_unicode_types
+      old_text = ActiveRecord::ConnectionAdapters::SQLServerAdapter.native_text_database_type
+      old_string = ActiveRecord::ConnectionAdapters::SQLServerAdapter.native_string_database_type
+      ActiveRecord::ConnectionAdapters::SQLServerAdapter.enable_default_unicode_types = setting
+      ActiveRecord::ConnectionAdapters::SQLServerAdapter.native_text_database_type = nil
+      ActiveRecord::ConnectionAdapters::SQLServerAdapter.native_string_database_type = nil
+      yield
+    ensure
+      ActiveRecord::ConnectionAdapters::SQLServerAdapter.enable_default_unicode_types = old_setting
+      ActiveRecord::ConnectionAdapters::SQLServerAdapter.native_text_database_type = old_text
+      ActiveRecord::ConnectionAdapters::SQLServerAdapter.native_string_database_type = old_string
+    end
   end
 end
 

test/cases/uniqueness_validation_test_sqlserver.rb

@@ -1,36 +1,44 @@
 # encoding: utf-8
 require 'cases/sqlserver_helper'
+require 'models/event'
+
+class Event < ActiveRecord::Base
+  before_validation :strip_mb_chars_for_sqlserver
+  protected
+  def strip_mb_chars_for_sqlserver
+    self.title = title.mb_chars.to(4).to_s if title && title.is_utf8?
+  end
+end
 
 class UniquenessValidationTestSqlserver < ActiveRecord::TestCase
 end
 
 class UniquenessValidationTest < ActiveRecord::TestCase
 
-  # COERCED_TESTS = [:test_validate_uniqueness_with_limit_and_utf8]
+  COERCED_TESTS = [:test_validate_uniqueness_with_limit_and_utf8]
 
-  # include SqlserverCoercedTest
+  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)
+  # I guess most databases just truncate a string when inserting. To pass this test we do a few things.
+  # First, we make sure the type is unicode safe, second we extend the limit to well beyond what is 
+  # needed. At the top we make sure to auto truncate the :title string like other databases would do 
+  # automatically.
   # 
-  # 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
-  # end
+  #   "一二三四五".mb_chars.size           # => 5 
+  #   "一二三四五六七八".mb_chars.size        # => 8 
+  #   "一二三四五六七八".mb_chars.to(4).to_s  # => "一二三四五"
+  
+  def test_coerced_validate_uniqueness_with_limit_and_utf8
+    with_kcode('UTF8') do
+      Event.connection.change_column :events, :title, :nvarchar, :limit => 30
+      Event.reset_column_information
+      # Now the actual test copied from core.
+      e1 = Event.create(:title => "一二三四五")
+      assert e1.valid?, "Could not create an event with a unique, 5 character title"
+      e2 = Event.create(:title => "一二三四五六七八")
+      assert !e2.valid?, "Created an event whose title, with limit taken into account, is not unique"
+    end
+  end
 
 end