Removed various version and inspection methods. They include:

* database_version
* database_year
* product_level
* product_version
* edition

Author: metaskills

CHANGELOG.md

@@ -22,18 +22,23 @@
 
 * SQL Server versions < 2012 which do not support OFFSET and FETCH. http://bit.ly/1B5Bwsd
 * The `enable_default_unicode_types` option. Default to national types all the time. Use SQL type name in migrations if needed.
-* Native type configs for older DB support. Includes the following with new default value.
+* Native type configs for older DB support. Includes the following with new default value:
   * native_string_database_type => `nvarchar`
   * native_text_database_type   => `nvarchar(max)`
   * native_binary_database_type => `varbinary(max)`
-
+* Various version and inspection methods removed. These include:
+  * database_version
+  * database_year
+  * product_level
+  * product_version
+  * edition
 
 #### Fixed
 
 * n/a
 
 #### Security
 
-* n/a
+* The connection's `inspect` method no longer returns sensitive connection info. Very basic now.
 
 

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -35,7 +35,7 @@ class SQLServerAdapter < AbstractAdapter
 
       ADAPTER_NAME = 'SQLServer'.freeze
 
-      attr_reader :database_version, :database_year, :spid, :product_level, :product_version, :edition
+      attr_reader :spid
 
       cattr_accessor :auto_connect, :cs_equality_operator,
                      :lowercase_schema_reflection, :auto_connect_duration, :showplan_option
@@ -50,27 +50,9 @@ def initialize(connection, logger, pool, config)
         @config = config
         @connection_options = config
         connect
-        @database_version = select_value 'SELECT @@version', 'SCHEMA'
-        @database_year = begin
-                           if @database_version =~ /Azure/i
-                             @sqlserver_azure = true
-                             @database_version.match(/\s-\s([0-9.]+)/)[1]
-                             year = 2012
-                           else
-                             year = DATABASE_VERSION_REGEXP.match(@database_version)[1]
-                             year == 'Denali' ? 2011 : year.to_i
-                           end
-                         rescue
-                           0
-                         end
-        @product_level    = select_value "SELECT CAST(SERVERPROPERTY('productlevel') AS VARCHAR(128))", 'SCHEMA'
-        @product_version  = select_value "SELECT CAST(SERVERPROPERTY('productversion') AS VARCHAR(128))", 'SCHEMA'
-        @edition          = select_value "SELECT CAST(SERVERPROPERTY('edition') AS VARCHAR(128))", 'SCHEMA'
+        @sqlserver_azure = !!(select_value('SELECT @@version', 'SCHEMA') =~ /Azure/i)
         initialize_dateformatter
         use_database
-        unless @sqlserver_azure == true || SUPPORTED_VERSIONS.include?(@database_year)
-          raise NotImplementedError, "Currently, only #{SUPPORTED_VERSIONS.to_sentence} are supported. We got back #{@database_version}."
-        end
       end
 
       # === Abstract Adapter ========================================== #
@@ -108,7 +90,7 @@ def supports_index_sort_order?
       end
 
       def supports_partial_index?
-        @database_year >= 2008
+        true
       end
 
       def supports_explain?
@@ -178,26 +160,6 @@ def sqlserver?
         true
       end
 
-      def sqlserver_2005?
-        @database_year == 2005
-      end
-
-      def sqlserver_2008?
-        @database_year == 2008
-      end
-
-      def sqlserver_2011?
-        @database_year == 2011
-      end
-
-      def sqlserver_2012?
-        @database_year == 2012
-      end
-
-      def sqlserver_2014?
-        @database_year == 2014
-      end
-
       def sqlserver_azure?
         @sqlserver_azure
       end
@@ -207,7 +169,7 @@ def version
       end
 
       def inspect
-        "#<#{self.class} version: #{version}, year: #{@database_year}, product_level: #{@product_level.inspect}, product_version: #{@product_version.inspect}, edition: #{@edition.inspect}, connection_options: #{@connection_options.inspect}>"
+        "#<#{self.class} version: #{version}, mode: #{@connection_options[:mode]}, azure: #{sqlserver_azure?.inspect}>"
       end
 
       def auto_connect

test/cases/adapter_test_sqlserver.rb

@@ -28,6 +28,18 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
     @basic_select_sql = "SELECT * FROM [customers] WHERE ([customers].[id] = 1)"
   end
 
+  it 'has basic and non-senstive information in the adpaters inspect method' do
+    string = connection.inspect
+    string.must_match %r{ActiveRecord::ConnectionAdapters::SQLServerAdapter}
+    string.must_match %r{version\: \d.\d}
+    string.must_match %r{mode: (dblib|odbc)}
+    string.must_match %r{azure: (true|false)}
+    string.wont_match %r{host}
+    string.wont_match %r{password}
+    string.wont_match %r{username}
+    string.wont_match %r{port}
+  end
+
   it 'has a 128 max #table_alias_length' do
     assert connection.table_alias_length <= 128
   end
@@ -40,34 +52,6 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
     assert_equal 'SQLServer', connection.adapter_name
   end
 
-  it 'include version in inspect' do
-    assert_match(/version\: \d.\d/, )
-  end
-
-  it 'include database product level in inspect' do
-    assert_match(/product_level\: "\w+/, connection.inspect)
-  end
-
-  it 'include database product version in inspect' do
-    assert_match(/product_version\: "\d+/, connection.inspect)
-  end
-
-  it 'include database edition in inspect' do
-    assert_match(/edition\: "\w+/, connection.inspect)
-  end
-
-  it 'set database product level' do
-    assert_match(/\w+/, connection.product_level)
-  end
-
-  it 'set database product version' do
-    assert_match(/\d+/, connection.product_version)
-  end
-
-  it 'set database edition' do
-    assert_match(/\w+/, connection.edition)
-  end
-
   it 'support migrations' do
     assert connection.supports_migrations?
   end
@@ -87,31 +71,6 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
     end
   end
 
-  describe 'for database version' do
-
-    before do
-      @version_regexp = ActiveRecord::ConnectionAdapters::SQLServerAdapter::DATABASE_VERSION_REGEXP
-      @supported_versions = 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
-
-    it 'return a string from #database_version that matches class regexp' do
-      assert_match @version_regexp, connection.database_version
-    end unless sqlserver_azure?
-
-    it 'return a 4 digit year fixnum for #database_year' do
-      assert_instance_of Fixnum, connection.database_year
-      @supported_versions.must_include connection.database_year
-    end
-
-    it 'return a code name if year not available' do
-      assert_equal "Denali", @version_regexp.match(@sqlserver_2011_string1)[1]
-    end
-
-  end
-
   it 'return true to #insert_sql? for inserts only' do
     assert connection.send(:insert_sql?,'INSERT...')
     assert connection.send(:insert_sql?, "EXEC sp_executesql N'INSERT INTO [fk_test_has_fks] ([fk_id]) VALUES (@0); SELECT CAST(SCOPE_IDENTITY() AS bigint) AS Ident', N'@0 int', @0 = 0")