Start to support 2011 code named "Denali".

Author: metaskills

CHANGELOG

@@ -1,6 +1,8 @@
 
 * master *
 
+* Start to support 2011 code named "Denali".
+
 * Limit and Offset can take SqlLiteral objects now.
 
 

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -165,8 +165,8 @@ class SQLServerAdapter < AbstractAdapter
 
       ADAPTER_NAME                = 'SQLServer'.freeze
       VERSION                     = '3.0.9'.freeze
-      DATABASE_VERSION_REGEXP     = /Microsoft SQL Server\s+(\d{4})/
-      SUPPORTED_VERSIONS          = [2005,2008].freeze
+      DATABASE_VERSION_REGEXP     = /Microsoft SQL Server\s+"?(\d{4}|\w+)"?/
+      SUPPORTED_VERSIONS          = [2005,2008,2011].freeze
 
       attr_reader :database_version, :database_year,
                   :connection_supports_native_types
@@ -180,11 +180,16 @@ def initialize(logger,config)
         connect
         super(@connection, logger)
         @database_version = info_schema_query { select_value('SELECT @@version') }
-        @database_year = DATABASE_VERSION_REGEXP.match(@database_version)[1].to_i rescue 0
+        @database_year = begin
+                           year = DATABASE_VERSION_REGEXP.match(@database_version)[1]
+                           year == "Denali" ? 2011 : year.to_i
+                         rescue
+                           0
+                         end
         initialize_sqlserver_caches
         use_database
         unless SUPPORTED_VERSIONS.include?(@database_year)
-          raise NotImplementedError, "Currently, only #{SUPPORTED_VERSIONS.to_sentence} are supported."
+          raise NotImplementedError, "Currently, only #{SUPPORTED_VERSIONS.to_sentence} are supported. We got back #{@database_version}."
         end
       end
 
@@ -285,6 +290,10 @@ def sqlserver_2008?
         @database_year == 2008
       end
 
+      def sqlserver_2011?
+        @database_year == 2011
+      end
+      
       def version
         self.class::VERSION
       end

test/cases/adapter_test_sqlserver.rb

@@ -59,6 +59,7 @@ def setup
         @supported_version = ActiveRecord::ConnectionAdapters::SQLServerAdapter::SUPPORTED_VERSIONS
         @sqlserver_2005_string = "Microsoft SQL Server 2005 - 9.00.3215.00 (Intel X86)"
         @sqlserver_2008_string = "Microsoft SQL Server 2008 (RTM) - 10.0.1600.22 (Intel X86)"
+        @sqlserver_2011_string1 = %|Microsoft SQL Server "Denali" (CTP1) - 11.0.1103.9 (Intel X86) Sep 24 2010 22:02:43 Copyright (c) Microsoft Corporation Enterprise Evaluation Edition on Windows NT 6.0 (Build 6002: Service Pack 2)|
       end
 
       should 'return a string from #database_version that matches class regexp' do
@@ -70,6 +71,10 @@ def setup
         assert_contains @supported_version, @connection.database_year
       end
 
+      should 'return a code name if year not available' do
+        assert_equal "Denali", @version_regexp.match(@sqlserver_2011_string1)[1]
+      end
+      
     end
 
     context 'for #unqualify_table_name and #unqualify_db_name' do