connections can be removed from the pool

1 files changed, 9 insertions, 1 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
index 51d2f40a3f..3f54a98380 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -59,7 +59,7 @@ module ActiveRecord
     class ConnectionPool
       include MonitorMixin
 
-      attr_accessor :automatic_reconnect
+      attr_accessor :automatic_reconnect, :timeout
       attr_reader :spec, :connections
 
       # Creates a new ConnectionPool object. +spec+ is a ConnectionSpecification
@@ -217,6 +217,14 @@ module ActiveRecord
         end
       end
 
+      # Remove a connection from the connection pool.  The connection will
+      # remain open and active but will no longer be managed by this pool.
+      def remove(conn)
+        synchronize do
+          @connections.delete conn
+        end
+      end
+
       private
 
       def new_connection