diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-11-12 17:24:10 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-11-12 17:24:10 -0800 |
| commit | 85cc7122bab1cfec661fdfe3bf4738d9fba55399 (patch) | |
| tree | fd656b85f1096cdeb5d38ed70db3496a862e4ef9 | |
| parent | 5287d3678d66f8d4d660ea685160665167cb3d86 (diff) | |
| download | rails-85cc7122bab1cfec661fdfe3bf4738d9fba55399.tar.gz rails-85cc7122bab1cfec661fdfe3bf4738d9fba55399.tar.bz2 rails-85cc7122bab1cfec661fdfe3bf4738d9fba55399.zip | |
only clear caches if we are actually connected to the database
| -rw-r--r-- | activerecord/lib/active_record/railtie.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb index 4ba35fe513..5464ca6066 100644 --- a/activerecord/lib/active_record/railtie.rb +++ b/activerecord/lib/active_record/railtie.rb @@ -149,8 +149,10 @@ module ActiveRecord ActiveSupport.on_load(:active_record) do ActionDispatch::Reloader.send(hook) do - ActiveRecord::Base.clear_reloadable_connections! - ActiveRecord::Base.clear_cache! + if ActiveRecord::Base.connected? + ActiveRecord::Base.clear_reloadable_connections! + ActiveRecord::Base.clear_cache! + end end end end |