aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2017-04-04 04:12:56 +0930
committerGitHub <noreply@github.com>2017-04-04 04:12:56 +0930
commit3ecffab324fc03df76eba91e4c2a7cb89a0580b9 (patch)
treebdd0c432bcccc6e1aff60d7d3b9efa476a6bc7ba /railties
parent67d210f7d76a2fa96ff41560fed2910147787ad4 (diff)
parentb66b5378baf3804e9985a7cb9630f6d5a3ddcf97 (diff)
downloadrails-3ecffab324fc03df76eba91e4c2a7cb89a0580b9.tar.gz
rails-3ecffab324fc03df76eba91e4c2a7cb89a0580b9.tar.bz2
rails-3ecffab324fc03df76eba91e4c2a7cb89a0580b9.zip
Merge pull request #28057 from eugeneius/clear_active_connections
Clear active connections after initialization
Diffstat (limited to 'railties')
-rw-r--r--railties/test/application/initializers/frameworks_test.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/railties/test/application/initializers/frameworks_test.rb b/railties/test/application/initializers/frameworks_test.rb
index 90927159dd..eb2c578f91 100644
--- a/railties/test/application/initializers/frameworks_test.rb
+++ b/railties/test/application/initializers/frameworks_test.rb
@@ -262,5 +262,13 @@ module ApplicationTests
Rails.env = orig_rails_env if orig_rails_env
end
end
+
+ test "connections checked out during initialization are returned to the pool" do
+ app_file "config/initializers/active_record.rb", <<-RUBY
+ ActiveRecord::Base.connection
+ RUBY
+ require "#{app_path}/config/environment"
+ assert !ActiveRecord::Base.connection_pool.active_connection?
+ end
end
end