Fixed that each request with the WEBrick adapter would open a new database connection #1685 [Sam Stephenson]. 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]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1792 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 34 insertions, 0 deletions

diff --git a/activerecord/test/threaded_connections_test.rb b/activerecord/test/threaded_connections_test.rb
new file mode 100644
index 0000000000..29c16b1a5c
--- /dev/null
+++ b/activerecord/test/threaded_connections_test.rb
@@ -0,0 +1,34 @@
+require 'abstract_unit'
+
+class ThreadedConnectionsTest < Test::Unit::TestCase
+  self.use_transactional_fixtures = false
+
+  fixtures :topics
+
+  def setup
+    @connection = ActiveRecord::Base.remove_connection
+    @connections = []
+  end
+  
+  def gather_connections(use_threaded_connections)
+    ActiveRecord::Base.threaded_connections = use_threaded_connections
+    ActiveRecord::Base.establish_connection(@connection)
+    
+    5.times do
+      Thread.new do
+        Topic.find :first
+        @connections << ActiveRecord::Base.active_connections.values.first
+      end.join
+    end
+  end
+
+  def test_threaded_connections
+    gather_connections(true)
+    assert_equal @connections.uniq.length, 5
+  end
+
+  def test_unthreaded_connections
+    gather_connections(false)
+    assert_equal @connections.uniq.length, 1
+  end
+end