Ticket #2162: active_record_connection_pooling2.diff

activerecord/test/fixtures/db_definitions/mysql.sql

@@ -188 +188 @@
-CREATE TABLE `fk_test_has_fk` (
-  `id`    INTEGER NOT NULL PRIMARY KEY,
-  `fk_id` INTEGER NOT NULL,
-
+
-  FOREIGN KEY (`fk_id`) REFERENCES `fk_test_has_pk`(`id`)
-) TYPE=InnoDB;
-

activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb

@@ -106 +106 @@
-    # can be used as argument for establish_connection, for easy
-    # re-establishing of the connection.
-    def self.remove_connection(klass=self)
-
+      
-      @@defined_connections.delete(klass)
-      active_connections[klass] = nil
-      @connection = nil
@@ -115 +115 @@
-
-    # Set the connection for the class.
-    def self.connection=(spec)
-
+ or spec.kind_of?(ActiveRecord::ConnectionPool::Wrapper)
-        active_connections[self] = spec
-      elsif spec.kind_of?(ConnectionSpecification)
-        self.connection = self.send(spec.adapter_method, spec.config)

activerecord/lib/active_record/connection_adapters/abstract_adapter.rb

@@ -44 +44 @@
-        @runtime = 0
-        return rt
-      end
+      
+      def close
+        begin
+          @connection.close
+        rescue Exception => e
+          log_info("error while closing connection: #{e.message}")
+          raise ActiveRecord::ActiveRecordError
+        end
+      end
-
-      protected  
-        def log(sql, name)

activerecord/lib/active_record/base.rb

@@ -325 +325 @@
-    cattr_accessor :allow_concurrency
-    @@allow_concurrency = true
-    
+    # Determines whether or not to use a connection pool to manage the actual connections.  
+    # Is tested and applied on a class by class basis.  When set to true, @@allow_concurrency is 
+    # effectively disregarded
+    cattr_accessor :pool_connections
+    @@pool_connections = false
+
+    cattr_accessor :connection_pool
+    @@connection_pool=nil
+    
+    # Initial and minimum size of the connection pool.  Meaningful only when @@pool_connections is true
+    cattr_accessor :pool_connections_min
+    @@pool_connections_min = 0
+
+    # Maximum size of the connection pool.  Meaningful only when @@pool_connections is true
+    cattr_accessor :pool_connections_max
+    @@pool_connections_max = 0
+
+    # Whether or not a thread will wait for a pool connection to become available, 
+    # or if ConnectionNotEstablished is thrown
+    cattr_accessor :pool_connections_wait
+    @@pool_connections_wait = true
+   
+    # Period in seconds between sweeping for unused connections in the pool
+    cattr_accessor :pool_connections_reaper_period
+    @@pool_connections_reaper_period = 30
+
-    # Determines whether to speed up access by generating optimized reader
-    # methods to avoid expensive calls to method_missing when accessing
-    # attributes by name. You might want to set this to false in development

activerecord/lib/active_record.rb

@@ -73 +73 @@
-  require "active_record/connection_adapters/#{adapter}_adapter"
-end
-
+require 'active_record/connection_pool'
-require 'active_record/query_cache'