Update database version methods with tests. Also add mocha.

Author: metaskills

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -268,16 +268,15 @@ def new_time(year, mon, mday, hour, min, sec, microsec = 0)
     # [Linux strongmad 2.6.11-1.1369_FC4 #1 Thu Jun 2 22:55:56 EDT 2005 i686 i686 i386 GNU/Linux]
     class SQLServerAdapter < AbstractAdapter
 
-      ADAPTER_NAME = 'SQLServer'.freeze
+      ADAPTER_NAME            = 'SQLServer'.freeze
+      DATABASE_VERSION_REGEXP = /Microsoft SQL Server\s+(\d{4})/
+      SUPPORTED_VERSIONS      = [2000,2005].freeze
 
       def initialize(connection, logger, connection_options=nil)
         super(connection, logger)
         @connection_options = connection_options
-        if database_version =~ /(2000|2005) - (\d+)\./  
-          @database_version_year = $1.to_i
-          @database_version_major = $2.to_i
-        else
-          raise "Currently, only 2000 and 2005 are supported versions"
+        unless SUPPORTED_VERSIONS.include?(database_year)
+          raise NotImplementedError, "Currently, only #{SUPPORTED_VERSIONS.to_sentence} are supported."
         end
       end
 
@@ -295,16 +294,32 @@ def supports_ddl_transactions?
         true
       end
 
+      def database_version
+        select_value "SELECT @@version"
+      end
 
+      def database_year
+        DATABASE_VERSION_REGEXP.match(database_version)[1].to_i
+      end
 
+      def sqlserver_2000?
+        database_year == 2000
+      end
+      
+      def sqlserver_2005?
+        database_year == 2005
+      end
+      
+      # QUOTING ==================================================#
+      
+      
+      
+      
+      # SCHEMA STATEMENTS ========================================#
 
-
       def native_database_types
-        # support for varchar(max) and varbinary(max) for text and binary cols if our version is 9 (2005)
-        txt = @database_version_major >= 9 ? "varchar(max)"   : "text"
-        
-        # TODO:  Need to verify image column works correctly with 2000 if string_to_binary stores a hex string
-        bin = @database_version_major >= 9 ? "varbinary(max)" : "image"
+        txt = sqlserver_2005? ? "varchar(max)"   : "text"
+        bin = sqlserver_2005? ? "varbinary(max)" : "image"
         {
           :primary_key => "int NOT NULL IDENTITY(1, 1) PRIMARY KEY",
           :string      => { :name => "varchar", :limit => 255  },
@@ -321,12 +336,7 @@ def native_database_types
         }
       end
 
-      def database_version
-        # returns string such as:
-        # "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
+
 
 
 

test/cases/adapter_test_sqlserver.rb

@@ -8,7 +8,6 @@ def setup
     @connection = ActiveRecord::Base.connection
   end
 
-  
   context 'For abstract behavior' do
 
     should 'be our adapter_name' do
@@ -23,6 +22,36 @@ def setup
       assert @connection.supports_ddl_transactions?
     end
 
+    context 'for database version' do
+      
+      setup do
+        @version_regexp = ActiveRecord::ConnectionAdapters::SQLServerAdapter::DATABASE_VERSION_REGEXP
+        @supported_version = ActiveRecord::ConnectionAdapters::SQLServerAdapter::SUPPORTED_VERSIONS
+        @sqlserver_2000_string = "Microsoft SQL Server  2000 - 8.00.2039 (Intel X86)"
+        @sqlserver_2005_string = "Microsoft SQL Server 2005 - 9.00.3215.00 (Intel X86)"
+      end
+      
+      should 'return a string from #database_version that matches class regexp' do
+        assert_match @version_regexp, @connection.database_version
+      end
+      
+      should 'return a 4 digit year fixnum for #database_year' do
+        assert_instance_of Fixnum, @connection.database_year
+        assert_contains @supported_version, @connection.database_year
+      end
+      
+      should 'return true to #sqlserver_2000?' do
+        @connection.stubs(:database_version).returns(@sqlserver_2000_string)
+        assert @connection.sqlserver_2000?
+      end
+      
+      should 'return true to #sqlserver_2005?' do
+        @connection.stubs(:database_version).returns(@sqlserver_2005_string)
+        assert @connection.sqlserver_2005?
+      end
+      
+    end
+    
   end
 
   context 'For Quoting' do
@@ -38,9 +67,7 @@ def setup
   end
 
 
-  
-  
-  
+    
   should 'raise invalid statement error' do
     assert_raise(ActiveRecord::StatementInvalid) { Topic.connection.update_sql("UPDATE XXX") }
   end

test/cases/sqlserver_helper.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'shoulda'
+require 'mocha'
 require 'cases/helper'
 
 SQLSERVER_TEST_ROOT       = File.expand_path(File.join('..',File.dirname(__FILE__)))