diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-11-29 13:19:58 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-11-29 14:02:58 -0800 |
commit | f866f66b3073aaef4140f0c9ccbb8b3df707416e (patch) | |
tree | b70ecffaa24f6c1afd75df5f005a077db0823c75 /activerecord | |
parent | 79306de791ad69559c0806b376233d9d8803ac59 (diff) | |
download | rails-f866f66b3073aaef4140f0c9ccbb8b3df707416e.tar.gz rails-f866f66b3073aaef4140f0c9ccbb8b3df707416e.tar.bz2 rails-f866f66b3073aaef4140f0c9ccbb8b3df707416e.zip |
expire will set in_use to false
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_adapter.rb | 5 | ||||
-rw-r--r-- | activerecord/test/cases/connection_adapters/abstract_adapter_test.rb | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb index deb24fd393..ce3417ad94 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb @@ -69,6 +69,7 @@ module ActiveRecord @visitor = nil @schema_cache = SchemaCache.new self @in_use = false + @last_use = false end def lease @@ -80,6 +81,10 @@ module ActiveRecord end end + def expire + @in_use = false + end + # Returns the human-readable name of the adapter. Use mixed case - one # can always use downcase if needed. def adapter_name diff --git a/activerecord/test/cases/connection_adapters/abstract_adapter_test.rb b/activerecord/test/cases/connection_adapters/abstract_adapter_test.rb index 3e6f829194..962a5b46fd 100644 --- a/activerecord/test/cases/connection_adapters/abstract_adapter_test.rb +++ b/activerecord/test/cases/connection_adapters/abstract_adapter_test.rb @@ -26,6 +26,13 @@ module ActiveRecord adapter.lease assert adapter.last_use end + + def test_expire_mutates_in_use + assert adapter.lease, 'lease adapter' + assert adapter.in_use?, 'adapter is in use' + adapter.expire + assert !adapter.in_use?, 'adapter is in use' + end end end end |