New autotest behavior defaults to adapter only. Use 'autotest railssqlserver' to test everything. Also add fixes for previous checkins on move toward better organized adapter.

Author: metaskills

CHANGELOG

@@ -0,0 +1,25 @@
+
+sqlserver_adapter.rb -- ActiveRecord adapter for Microsoft SQL Server
+
+Author: Joey Gibson <joey@joeygibson.com>
+Date:   10/14/2004
+
+Modifications: DeLynn Berry <delynnb@megastarfinancial.com>
+Date: 3/22/2005
+
+Modifications (ODBC): Mark Imbriaco <mark.imbriaco@pobox.com>
+Date: 6/26/2005
+
+Modifications (Migrations): Tom Ward <tom@popdog.net>
+Date: 27/10/2005
+
+Modifications (Numerous fixes as maintainer): Ryan Tomayko <rtomayko@gmail.com>
+Date: Up to July 2006
+
+Previous maintainer: Tom Ward <tom@popdog.net>
+
+
+
+
+
+Current (interim/unofficial) maintainer: Shawn Balestracci <shawn@vegantech.com>

autotest/discover.rb

@@ -1,6 +1,4 @@
 
 Autotest.add_discovery do
-  'sqlserveradapter'
+  ARGV.first || 'sqlserver'
 end
-
-

autotest/railssqlserver.rb

@@ -0,0 +1,16 @@
+require 'autotest/sqlserver'
+
+class Autotest::Railssqlserver < Autotest::Sqlserver
+
+  def initialize
+    super
+    self.libs << "#{File::PATH_SEPARATOR}../../../rails/activerecord/test/"
+    self.extra_files = ['../../../rails/activerecord/test/']
+    self.add_mapping %r%../../../rails/activerecord/test/.*/.*_test.rb$% do |filename, _|
+      filename
+    end
+  end
+  
+
+end
+

autotest/sqlserveradapter.rb renamed to autotest/sqlserver.rb

@@ -1,7 +1,7 @@
 require 'autotest'
 require 'activesupport'
 
-class Autotest::Sqlserveradapter < Autotest
+class Autotest::Sqlserver < Autotest
 
   def initialize
     super
@@ -17,16 +17,10 @@ def initialize
       "../../../rails/activerecord/test/"
     ].join(File::PATH_SEPARATOR)
 
-    self.extra_files = ['../../../rails/activerecord/test/']
-    
     self.add_mapping %r%^test/.*/.*_test_sqlserver.rb$% do |filename, _|
       filename
     end
 
-    self.add_mapping %r%../../../rails/activerecord/test/.*/.*_test.rb$% do |filename, _|
-      filename
-    end
-    
   end
 
   # Have to use a custom reorder method since the normal :alpha for Autotest would put the 

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -265,21 +265,6 @@ class SQLServerAdapter < AbstractAdapter
 
       ADAPTER_NAME = 'SQLServer'.freeze
 
-      # NATIVE_DATABASE_TYPES = {
-      #   :primary_key => "int NOT NULL IDENTITY(1, 1) PRIMARY KEY",
-      #   :string      => { :name => "varchar", :limit => 255  },
-      #   :text        => { :name =>  txt },
-      #   :integer     => { :name => "int" },
-      #   :float       => { :name => "float", :limit => 8 },
-      #   :decimal     => { :name => "decimal" },
-      #   :datetime    => { :name => "datetime" },
-      #   :timestamp   => { :name => "datetime" },
-      #   :time        => { :name => "datetime" },
-      #   :date        => { :name => "datetime" },
-      #   :binary      => { :name =>  bin },
-      #   :boolean     => { :name => "bit"}
-      # }
-      
       def initialize(connection, logger, connection_options=nil)
         super(connection, logger)
         @connection_options = connection_options
@@ -322,7 +307,7 @@ def database_version
         # "Microsoft SQL Server  2000 - 8.00.2039 (Intel X86) \n\tMay  3 2005 23:18:38 \n\tCopyright (c) 1988-2003 Microsoft Corporation\n\tEnterprise Edition on Windows NT 5.2 (Build 3790: )\n"
         # "Microsoft SQL Server 2005 - 9.00.3215.00 (Intel X86) \n\tDec  8 2007 18:51:32 \n\tCopyright (c) 1988-2005 Microsoft Corporation\n\tStandard Edition on Windows NT 5.2 (Build 3790: Service Pack 2)\n"
         select_value("SELECT @@version")
-      end    
+      end
 
       def supports_migrations? #:nodoc:
         true