Fix rescue constants for optional connection gems. Fixes #475.

Author: metaskills

CHANGELOG.md

@@ -1,3 +1,10 @@
+## v4.2.14
+
+#### Fixed
+
+* Fix rescue constants for optional connection gems. Fixes #475.
+
+
 ## v4.2.13
 
 #### Fixed

VERSION

@@ -1 +1 @@
-4.2.13
+4.2.14

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -133,7 +133,7 @@ def active?
         return false unless @connection
         raw_connection_do 'SELECT 1'
         true
-      rescue TinyTds::Error, ODBC::Error
+      rescue *connection_errors
         false
       end
 
@@ -307,6 +307,13 @@ def connect
         configure_connection
       end
 
+      def connection_errors
+        @connection_errors ||= [].tap do |errors|
+          errors << TinyTds::Error if defined?(TinyTds::Error)
+          errors << ODBC::Error if defined?(ODBC::Error)
+        end
+      end
+
       def dblib_connect(config)
         TinyTds::Client.new(
           dataserver: config[:dataserver],