diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-02-26 23:12:01 +0000 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-02-26 23:12:01 +0000 |
commit | 6bd8e351361a895e7ada7d7702bb099034103d62 (patch) | |
tree | 4d41455b0371146a45741dcbf10b76f0912f82c1 /activerecord/test | |
parent | 3848634a4b2be4ce911a6a7167119a627cb36327 (diff) | |
download | rails-6bd8e351361a895e7ada7d7702bb099034103d62.tar.gz rails-6bd8e351361a895e7ada7d7702bb099034103d62.tar.bz2 rails-6bd8e351361a895e7ada7d7702bb099034103d62.zip |
ActiveRecord::Base.remove_connection explicitly closes database connections and doesn't corrupt the connection cache. Introducing the disconnect! instance method for the PostgreSQL, MySQL, and SQL Server adapters; implementations for the others are welcome. References #3591.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3674 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/test')
-rwxr-xr-x | activerecord/test/unconnected_test.rb | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/activerecord/test/unconnected_test.rb b/activerecord/test/unconnected_test.rb index df656ec773..2d06410dd8 100755 --- a/activerecord/test/unconnected_test.rb +++ b/activerecord/test/unconnected_test.rb @@ -7,19 +7,26 @@ class TestUnconnectedAdaptor < Test::Unit::TestCase self.use_transactional_fixtures = false def setup - @connection = ActiveRecord::Base.remove_connection + @underlying = ActiveRecord::Base.connection + @specification = ActiveRecord::Base.remove_connection end def teardown - ActiveRecord::Base.establish_connection(@connection) + @underlying = nil + ActiveRecord::Base.establish_connection(@specification) end - def test_unconnected + def test_connection_no_longer_established assert_raise(ActiveRecord::ConnectionNotEstablished) do - TestRecord.find(1) + TestRecord.find(1) end + assert_raise(ActiveRecord::ConnectionNotEstablished) do - TestRecord.new.save + TestRecord.new.save end end + + def test_underlying_adapter_no_longer_active + assert !@underlying.active?, "Removed adapter should no longer be active" + end end |