diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-10-07 15:07:14 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-10-07 15:07:14 +0200 |
| commit | 9312d217d6233710b291dab2d4edde483109e136 (patch) | |
| tree | 77bf18ee5a4e15fa78f0831803d071b3ac76d3c4 /activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb | |
| parent | b1c20e37eccdfab7bb94d34f249c5e49256b9980 (diff) | |
| parent | ea341b8e043160a7ddaba9e6b2bb6044f73c31a8 (diff) | |
| download | rails-9312d217d6233710b291dab2d4edde483109e136.tar.gz rails-9312d217d6233710b291dab2d4edde483109e136.tar.bz2 rails-9312d217d6233710b291dab2d4edde483109e136.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb | 8 |
1 files changed, 8 insertions, 0 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 c08c0263b9..3d0f146fed 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb @@ -115,6 +115,14 @@ module ActiveRecord retrieve_connection end + def connection_id + Thread.current['ActiveRecord::Base.connection_id'] + end + + def connection_id=(connection_id) + Thread.current['ActiveRecord::Base.connection_id'] = connection_id + end + # Returns the configuration of the associated connection as a hash: # # ActiveRecord::Base.connection_config |