Changeset 3045

Timestamp:

11/15/05 15:58:36 (3 years ago)

Author:

bitsweat

Message:

SQLServer: active? and reconnect! methods for handling stale connections. References #428.

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
-
-
+, Tom Ward <tom@popdog.net>
-
-* Associations handle case-equality more consistently: item.parts.is_a?(Array) and item.parts === Array.  #1345 [MarkusQ@reality.com]

trunk/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -208 +208 @@
-      # Returns true if the connection is active.
-      def active?
-|sth|
+ 
-        true
+      rescue DBI::DatabaseError, DBI::InterfaceError
+        false
+      end
+
+      # Reconnects to the database, returns false if no connection could be made.
+      def reconnect!
+        @connection.disconnect rescue nil
+        @connection = DBI.connect(*@connection_options)
-      rescue DBI::DatabaseError => e
+        @logger.warn "#{adapter_name} reconnection failed: #{e.message}" if @logger
-        false
-      end
-
-      # Reconnects to the database.
-      def reconnect!
-        begin
-          @connection.disconnect
-          @connection = DBI.connect(*@connection_options)
-        rescue DBI::DatabaseError => e
-          @logger.warn "#{adapter_name} automatic reconnection failed: #{e.message}"
-        end
-      end
-
-
-
-      def select_all(sql, name = nil)