diff options
| author | Marcel Molina <marcel@vernix.org> | 2005-10-12 22:37:28 +0000 |
|---|---|---|
| committer | Marcel Molina <marcel@vernix.org> | 2005-10-12 22:37:28 +0000 |
| commit | b840e4ed509da433895fd2becf13f3e5656708e4 (patch) | |
| tree | 7a23931ca5d7797ac00d9f3eb29e2e537abb00b2 /activerecord/lib/active_record/connection_adapters/abstract | |
| parent | 0e0e774085c478a171894abfa95fff9475a4a826 (diff) | |
| download | rails-b840e4ed509da433895fd2becf13f3e5656708e4.tar.gz rails-b840e4ed509da433895fd2becf13f3e5656708e4.tar.bz2 rails-b840e4ed509da433895fd2becf13f3e5656708e4.zip | |
Deprecated ActiveRecord::Base.threaded_connection in favor of ActiveRecord::Base.allow_concurrency.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2542 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb index caf4ba75de..b5ddef32af 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb @@ -62,7 +62,7 @@ module ActiveRecord end def self.active_connections #:nodoc: - if threaded_connections + if allow_concurrency Thread.current['active_connections'] ||= {} else @@active_connections ||= {} |