Connection tests!

Author: metaskills

lib/active_record/connection_adapters/sqlserver/database_statements.rb

@@ -2,6 +2,7 @@ module ActiveRecord
   module ConnectionAdapters
     module SQLServer
       module DatabaseStatements
+
         def select_rows(sql, name = nil, binds = [])
           do_exec_query sql, name, binds, fetch: :rows
         end
@@ -56,17 +57,19 @@ def rollback_db_transaction
           do_execute 'IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION'
         end
 
+        include Savepoints
+
         def create_savepoint(name = current_savepoint_name)
           disable_auto_reconnect { do_execute "SAVE TRANSACTION #{name}" }
         end
 
-        def release_savepoint(name = current_savepoint_name)
-        end
-
         def rollback_to_savepoint(name = current_savepoint_name)
           disable_auto_reconnect { do_execute "ROLLBACK TRANSACTION #{name}" }
         end
 
+        def release_savepoint(name = current_savepoint_name)
+        end
+
         def add_limit_offset!(_sql, _options)
           raise NotImplementedError, 'This has been moved to the SQLServerCompiler in Arel.'
         end
@@ -116,8 +119,8 @@ def execute_procedure(proc_name, *variables)
 
         def use_database(database = nil)
           return if sqlserver_azure?
-          name = SQLServer::Utils.extract_identifiers(database || @connection_options[:database])
-          do_execute "USE #{name}" unless database.blank?
+          name = SQLServer::Utils.extract_identifiers(database || @connection_options[:database]).quoted
+          do_execute "USE #{name}" unless name.blank?
         end
 
         def user_options
@@ -135,7 +138,6 @@ def user_options
           end
         end
 
-        # TODO: Rails 4 now supports isolation levels
         def user_options_dateformat
           if sqlserver_azure?
             select_value 'SELECT [dateformat] FROM [sys].[syslanguages] WHERE [langid] = @@LANGID', 'SCHEMA'
@@ -245,6 +247,7 @@ def charset
           select_value "SELECT SERVERPROPERTY('SqlCharSetName')"
         end
 
+
         protected
 
         def select(sql, name = nil, binds = [])
@@ -281,7 +284,6 @@ def do_exec_query(sql, name, binds, options = {})
           if options[:fetch] != :rows
             options[:ar_result] = true
           end
-
           explaining = name == 'EXPLAIN'
           names_and_types = []
           params = []
@@ -406,6 +408,7 @@ def finish_statement_handle(handle)
           end
           handle
         end
+
       end
     end
   end

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -37,8 +37,8 @@ class SQLServerAdapter < AbstractAdapter
 
       attr_reader :spid
 
-      cattr_accessor :auto_connect, :cs_equality_operator,
-                     :lowercase_schema_reflection, :auto_connect_duration, :showplan_option
+      cattr_accessor :auto_connect, :auto_connect_duration, instance_accessor: false
+      cattr_accessor :cs_equality_operator, :lowercase_schema_reflection, :showplan_option
 
       def initialize(connection, logger, pool, config)
         super(connection, logger, pool)
@@ -81,10 +81,6 @@ def supports_bulk_alter?
         false
       end
 
-      def supports_savepoints?
-        true
-      end
-
       def supports_index_sort_order?
         true
       end
@@ -107,6 +103,7 @@ def disable_referential_integrity
       # === Abstract Adapter (Connection Management) ================== #
 
       def active?
+        return false unless @connection
         case @connection_options[:mode]
         when :dblib
           return @connection.active?
@@ -118,21 +115,21 @@ def active?
       end
 
       def reconnect!
-        reset_transaction
+        super
         disconnect!
         connect
-        active?
       end
 
       def disconnect!
-        reset_transaction
+        super
         @spid = nil
         case @connection_options[:mode]
         when :dblib
           @connection.close rescue nil
         when :odbc
           @connection.disconnect rescue nil
         end
+        @connection = nil
       end
 
       def reset!
@@ -173,11 +170,11 @@ def inspect
       end
 
       def auto_connect
-        @@auto_connect.is_a?(FalseClass) ? false : true
+        self.class.auto_connect.is_a?(FalseClass) ? false : true
       end
 
       def auto_connect_duration
-        @@auto_connect_duration ||= 10
+        self.class.auto_connect_duration ||= 10
       end
 
       def cs_equality_operator
@@ -380,9 +377,10 @@ def auto_reconnected?
         @auto_connecting = true
         count = 0
         while count <= (auto_connect_duration / 2)
-          result = reconnect!
+          disconnect!
+          reconnect!
           ActiveRecord::Base.did_retry_sqlserver_connection(self, count)
-          return true if result
+          return true if active?
           sleep 2**count
           count += 1
         end

lib/active_record/sqlserver_base.rb

@@ -1,5 +1,6 @@
 module ActiveRecord
   class Base
+
     def self.sqlserver_connection(config) #:nodoc:
       config = config.symbolize_keys
       config.reverse_merge! mode: :dblib
@@ -24,5 +25,6 @@ def self.did_retry_sqlserver_connection(connection, count)
     def self.did_lose_sqlserver_connection(connection)
       logger.info "CONNECTION LOST: #{connection.class.name}"
     end
+
   end
 end

test/cases/adapter_test_sqlserver.rb

@@ -9,13 +9,10 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
 
   fixtures :tasks
 
-  let(:connection) { ActiveRecord::Base.connection }
-
   let(:basic_insert_sql) { "INSERT INTO [funny_jokes] ([name]) VALUES('Knock knock')" }
   let(:basic_update_sql) { "UPDATE [customers] SET [address_street] = NULL WHERE [id] = 2" }
   let(:basic_select_sql) { "SELECT * FROM [customers] WHERE ([customers].[id] = 1)" }
 
-
   it 'has basic and non-senstive information in the adpaters inspect method' do
     string = connection.inspect
     string.must_match %r{ActiveRecord::ConnectionAdapters::SQLServerAdapter}