1 files changed, 25 insertions, 16 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index 97f4bcde7f..7290f2e87e 100755
--- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -47,25 +47,24 @@ module ActiveRecord
 
       protected  
         def log(sql, name)
-          begin
-            if block_given?
-              if @logger and @logger.level <= Logger::INFO
-                result = nil
-                seconds = Benchmark.realtime { result = yield }
-                @runtime += seconds
-                log_info(sql, name, seconds)
-                result
-              else
-                yield
-              end
+          if block_given?
+            if @logger and @logger.level <= Logger::INFO
+              result = nil
+              seconds = Benchmark.realtime { result = yield }
+              @runtime += seconds
+              log_info(sql, name, seconds)
+              result
             else
-              log_info(sql, name, 0)
-              nil
+              yield
             end
-          rescue Exception => e
-            log_info("#{e.message}: #{sql}", name, 0)
-            raise ActiveRecord::StatementInvalid, "#{e.message}: #{sql}"
+          else
+            log_info(sql, name, 0)
+            nil
           end
+        rescue Exception => e
+          log_info("#{e.message}: #{sql}", name, 0)
+          reconnect_if_inactive!
+          raise ActiveRecord::StatementInvalid, "#{e.message}: #{sql}"
         end
 
         def log_info(sql, name, runtime)
@@ -96,6 +95,16 @@ module ActiveRecord
             "%s  %s" % [message, dump]
           end
         end
+
+      private
+        def reconnect_if_inactive!
+          if respond_to?(:active?) and respond_to?(:reconnect!)
+            reconnect! unless active?
+            raise ActiveRecord::ConnectionFailed unless active?
+          else
+            @logger.warn "#{adapter_name} does not yet support automatic reconnection." if @logger
+          end
+        end
     end
   end
 end