aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
diff options
context:
space:
mode:
authorNick Sieger <nick@nicksieger.com>2008-09-04 15:16:29 +0200
committerJeremy Kemper <jeremy@bitsweat.net>2008-09-04 15:44:05 +0200
commita3f12f575d4bf216a15188ecab2d26a11162bc3b (patch)
tree8a6fe7a68109db3c222abf9c8186e87a437a8f60 /activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
parent2c62baf4bf221aa8aa67f4625fe7011d40c44e82 (diff)
downloadrails-a3f12f575d4bf216a15188ecab2d26a11162bc3b.tar.gz
rails-a3f12f575d4bf216a15188ecab2d26a11162bc3b.tar.bz2
rails-a3f12f575d4bf216a15188ecab2d26a11162bc3b.zip
Default connection allow_concurrency to false (for PostgreSQL)
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb3
1 files changed, 1 insertions, 2 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 6b4bc2574d..5806dea061 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -164,8 +164,7 @@ module ActiveRecord
private
def new_connection
- config = spec.config.reverse_merge(:allow_concurrency => true)
- ActiveRecord::Base.send(spec.adapter_method, config)
+ ActiveRecord::Base.send(spec.adapter_method, spec.config)
end
def current_connection_id #:nodoc: