0
@@ -1,5 +1,7 @@
0
 *SVN*
0
 
0
+* Added ActiveRecord::Base.threaded_connections flag to turn off 1-connection per thread (required for thread safety). By default it's on, but WEBrick in Rails need it off #1685 [Sam Stephenson]
0
+
0
 * Correct reflected table name for singular associations.  #1688 [court3nay@gmail.com]
0
 
0
 * Fixed optimistic locking with SQL Server #1660 [tom@popdog.net]

0
@@ -289,6 +289,11 @@ module ActiveRecord #:nodoc:
0
     # This is set to :local by default.
0
     cattr_accessor :default_timezone
0
     @@default_timezone = :local
0
+    
0
+    # Determines whether or not to use a connection for each thread, or a single shared connection for all threads.
0
+    # Defaults to true; Railties' WEBrick server sets this to false.
0
+    cattr_accessor :threaded_connections
0
+    @@threaded_connections = true
0
 
0
     class << self # Class methods
0
       # Find operates with three different retreval approaches:

0
@@ -86,6 +86,14 @@ module ActiveRecord
0
       end
0
     end
0
 
0
+    def self.active_connections #:nodoc:
0
+      if threaded_connections
0
+        Thread.current['active_connections'] ||= {}
0
+      else
0
+        @@active_connections ||= {}
0
+      end
0
+    end
0
+
0
     # Locate the connection of the nearest super class. This can be an
0
     # active or defined connections: if it is the latter, it will be
0
     # opened and set as the active connection for the class it was defined
0
@@ -94,7 +102,7 @@ module ActiveRecord
0
       klass = self
0
       ar_super = ActiveRecord::Base.superclass
0
       until klass == ar_super
0
-        if conn = (Thread.current['active_connections'] ||= {})[klass]
0
+        if conn = active_connections[klass]
0
           return conn
0
         elsif conn = @@defined_connections[klass]
0
           klass.connection = conn
0
@@ -109,7 +117,7 @@ module ActiveRecord
0
     def self.connected?
0
       klass = self
0
       until klass == ActiveRecord::Base.superclass
0
-        if Thread.current['active_connections'].is_a?(Hash) && Thread.current['active_connections'][klass]
0
+        if active_connections[klass]
0
           return true
0
         else
0
           klass = klass.superclass
0
@@ -125,8 +133,7 @@ module ActiveRecord
0
     def self.remove_connection(klass=self)
0
       conn = @@defined_connections[klass]
0
       @@defined_connections.delete(klass)
0
-      Thread.current['active_connections'] ||= {}
0
-      Thread.current['active_connections'][klass] = nil
0
+      active_connections[klass] = nil
0
       conn.config if conn
0
     end
0
 
0
@@ -134,8 +141,7 @@ module ActiveRecord
0
     def self.connection=(spec)
0
       raise ConnectionNotEstablished unless spec
0
       conn = self.send(spec.adapter_method, spec.config)
0
-      Thread.current['active_connections'] ||= {}
0
-      Thread.current['active_connections'][self] = conn
0
+      active_connections[self] = conn
0
     end
0
 
0
     # Converts all strings in a hash to symbols.

0
@@ -51,8 +51,7 @@ module ActiveRecord
0
         QueryCache.new(self.send(spec.adapter_method, spec.config)) :
0
         self.send(spec.adapter_method, spec.config)
0
       
0
-      Thread.current['active_connections'] ||= {}
0
-      Thread.current['active_connections'][self] = conn
0
+      active_connections[self] = conn
0
     end
0
   end
0
   

0
@@ -1,5 +1,7 @@
0
 *SVN*
0
 
0
+* Fixed that each request with the WEBrick adapter would open a new database connection #1685 [Sam Stephenson]
0
+
0
 * Added support for SQL Server in the database rake tasks #1652 [ken.barker@gmail.com] Note: osql and scptxfr may need to be installed on your development environment. This involves getting the .exes and a .rll (scptxfr) from a production SQL Server (not developer level SQL Server). Add their location to your Environment PATH and you are all set.
0
 
0
 * Added a VERSION parameter to the migrate task that allows you to do "rake migrate VERSION=34" to migrate to the 34th version traveling up or down depending on the current version

0
@@ -8,6 +8,8 @@ include WEBrick
0
 
0
 ABSOLUTE_RAILS_ROOT = File.expand_path(RAILS_ROOT)
0
 
0
+ActiveRecord::Base.threaded_connections = false
0
+
0
 class CGI
0
   def stdinput
0
     @stdin || $stdin