0
@@ -164,8 +164,7 @@ module ActiveRecord
0
 
0
       private
0
       def new_connection
0
-        config = spec.config.reverse_merge(:allow_concurrency => true)
0
-        ActiveRecord::Base.send(spec.adapter_method, config)
0
+        ActiveRecord::Base.send(spec.adapter_method, spec.config)
0
       end
0
 
0
       def current_connection_id #:nodoc:

0
@@ -43,5 +43,20 @@ module ActiveRecord
0
     def assert_no_queries(&block)
0
       assert_queries(0, &block)
0
     end
0
+
0
+    def self.use_concurrent_connections
0
+      setup :connection_allow_concurrency_setup
0
+      teardown :connection_allow_concurrency_teardown
0
+    end
0
+
0
+    def connection_allow_concurrency_setup
0
+      @connection = ActiveRecord::Base.remove_connection
0
+      ActiveRecord::Base.establish_connection(@connection.merge({:allow_concurrency => true}))
0
+    end
0
+
0
+    def connection_allow_concurrency_teardown
0
+      ActiveRecord::Base.clear_all_connections!
0
+      ActiveRecord::Base.establish_connection(@connection)
0
+    end
0
   end
0
 end

0
@@ -257,6 +257,8 @@ unless current_adapter?(:SQLServerAdapter, :SybaseAdapter, :OpenBaseAdapter)
0
     end
0
 
0
     if current_adapter?(:PostgreSQLAdapter, :OracleAdapter)
0
+      use_concurrent_connections
0
+
0
       def test_no_locks_no_wait
0
         first, second = duel { Person.find 1 }
0
         assert first.end > second.end

0
@@ -284,6 +284,8 @@ end
0
 
0
 if current_adapter?(:PostgreSQLAdapter)
0
   class ConcurrentTransactionTest < TransactionTest
0
+    use_concurrent_connections
0
+
0
     # This will cause transactions to overlap and fail unless they are performed on
0
     # separate database connections.
0
     def test_transaction_per_thread