Clean up tests by adding ARTest::SQLServer::ConnectionReflection.

Author: metaskills

test/cases/adapter_test_sqlserver.rb

@@ -418,8 +418,6 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
 
   describe 'database_prefix_remote_server?' do
 
-    let(:connection_options) { connection.instance_variable_get(:@connection_options) }
-
     after do
       connection_options.delete(:database_prefix)
     end

test/cases/connection_test_sqlserver.rb

@@ -29,7 +29,7 @@ class ConnectionTestSQLServer < ActiveRecord::TestCase
       connection.use_database
       assert_equal 'activerecord_unittest', connection.current_database, 'Would default back to connection options'
     end
-  end unless sqlserver_azure?
+  end unless connection_sqlserver_azure?
 
   describe 'ODBC connection management' do
 
@@ -83,7 +83,7 @@ class ConnectionTestSQLServer < ActiveRecord::TestCase
       end
     end
 
-  end if connection_mode_odbc?
+  end if connection_odbc?
 
 
   describe 'Connection management' do
@@ -115,7 +115,7 @@ class ConnectionTestSQLServer < ActiveRecord::TestCase
   private
 
   def disconnect_raw_connection!
-    case connection.instance_variable_get(:@connection_options)[:mode]
+    case connection_options[:mode]
     when :dblib
       connection.raw_connection.close rescue nil
     when :odbc

test/cases/fully_qualified_identifier_test_sqlserver.rb

@@ -2,8 +2,6 @@
 
 class FullyQualifiedIdentifierTestSQLServer < ActiveRecord::TestCase
 
-  let(:connection_options) { connection.instance_variable_get(:@connection_options) }
-
   describe 'local server' do
 
     it 'should use table name in select projections' do

test/cases/helper_sqlserver.rb

@@ -5,38 +5,32 @@
 require 'support/load_schema_sqlserver'
 require 'support/coerceable_test_sqlserver'
 require 'support/sql_counter_sqlserver'
+require 'support/connection_reflection'
 require 'mocha/mini_test'
 
 module ActiveRecord
   class TestCase < ActiveSupport::TestCase
 
     SQLServer = ActiveRecord::ConnectionAdapters::SQLServer
 
-    include ARTest::SQLServer::CoerceableTest
+    include ARTest::SQLServer::CoerceableTest,
+            ARTest::SQLServer::ConnectionReflection
 
     let(:logger) { ActiveRecord::Base.logger }
 
-    class << self
-      def connection_mode_dblib? ; ActiveRecord::Base.connection.instance_variable_get(:@connection_options)[:mode] == :dblib ; end
-      def connection_mode_odbc? ; ActiveRecord::Base.connection.instance_variable_get(:@connection_options)[:mode] == :odbc ; end
-      def sqlserver_azure? ; ActiveRecord::Base.connection.sqlserver_azure? ; end
-      def host_windows? ; RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ; end
-    end
 
-    def connection_mode_dblib? ; self.class.connection_mode_dblib? ; end
-    def connection_mode_odbc? ; self.class.connection_mode_odbc? ; end
-    def sqlserver_azure? ; self.class.sqlserver_azure? ; end
-    def host_windows? ; self.class.host_windows? ; end
+    private
 
-    def connection
-      ActiveRecord::Base.connection
+    def host_windows?
+      RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
     end
 
     def with_use_output_inserted_disabled
-      ActiveRecord::ConnectionAdapters::SQLServerAdapter.use_output_inserted = false
+      klass = ActiveRecord::ConnectionAdapters::SQLServerAdapter
+      klass.use_output_inserted = false
       yield
     ensure
-      ActiveRecord::ConnectionAdapters::SQLServerAdapter.use_output_inserted = true
+      klass.use_output_inserted = true
     end
 
   end

test/support/connection_reflection.rb

@@ -0,0 +1,37 @@
+module ARTest
+  module SQLServer
+    module ConnectionReflection
+
+      extend ActiveSupport::Concern
+
+      included { extend ConnectionReflection }
+
+      def connection
+        ActiveRecord::Base.connection
+      end
+
+      def connection_options
+        connection.instance_variable_get :@connection_options
+      end
+
+      def connection_dblib?
+        connection_options[:mode] == :dblib
+      end
+
+      def connection_dblib_73?
+        return false unless connection_dblib?
+        rc = connection.raw_connection
+        rc.respond_to?(:tds_73?) && rc.tds_73?
+      end
+
+      def connection_odbc?
+        connection_options[:mode] == :odbc
+      end
+
+      def connection_sqlserver_azure?
+        connection.sqlserver_azure?
+      end
+
+    end
+  end
+end