Fixed a few sqlserver test case errors. Closes #2486

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2666 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 6 insertions, 4 deletions

diff --git a/activerecord/test/base_test.rb b/activerecord/test/base_test.rb
index ef65b9859c..016a7c781e 100755
--- a/activerecord/test/base_test.rb
+++ b/activerecord/test/base_test.rb
@@ -1,5 +1,3 @@
-require 'abstract_unit'
-require 'fixtures/topic'
 require 'fixtures/reply'
 require 'fixtures/company'
 require 'fixtures/developer'
@@ -464,8 +462,8 @@ class BasicsTest < Test::Unit::TestCase
     assert_nil topic.last_read
   end
 
-  # Oracle does not have a TIME datatype.
-  unless 'OCI' == ActiveRecord::Base.connection.adapter_name
+  # Oracle and SQLServer do not have a TIME datatype.
+  unless 'OCI' == ActiveRecord::Base.connection.adapter_name or ActiveRecord::ConnectionAdapters.const_defined?(:SQLServerAdapter)
     def test_utc_as_time_zone
       Topic.default_timezone = :utc
       attributes = { "bonus_time" => "5:42:00AM" }
@@ -643,6 +641,10 @@ class BasicsTest < Test::Unit::TestCase
     if ActiveRecord::ConnectionAdapters.const_defined? :OracleAdapter
       return true if ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters::OracleAdapter)
     end
+    # Sqlserver doesn't either .
+    if ActiveRecord::ConnectionAdapters.const_defined? :SQLServerAdapter
+      return true if ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters::SQLServerAdapter)
+    end
 
     attributes = {
       "bonus_time" => "5:42:00AM"