aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-11-23 05:16:46 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-11-23 05:16:46 +0000
commita02dbe0a3dee9c5f7645de74f233c57cabbdfcac (patch)
tree3a33f0d91706cd1cce6ef9d8aaeaee90abcba325 /railties/lib
parent83dd1d8a034d7254b0d1314f9dc39a8e80e49fc7 (diff)
downloadrails-a02dbe0a3dee9c5f7645de74f233c57cabbdfcac.tar.gz
rails-a02dbe0a3dee9c5f7645de74f233c57cabbdfcac.tar.bz2
rails-a02dbe0a3dee9c5f7645de74f233c57cabbdfcac.zip
Added ActiveRecord::Base.clear_active_connections! in development mode so the database connection is not carried over from request to request. Some databases won't reread the schema if that doesn't happen (I'm looking at you SQLite), so you have to restart the server after each migration (= no fun) [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5618 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/dispatcher.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb
index 1d604bc254..3ac1b6c17a 100644
--- a/railties/lib/dispatcher.rb
+++ b/railties/lib/dispatcher.rb
@@ -55,7 +55,11 @@ class Dispatcher
# mailers, and so forth. This allows them to be loaded again without having
# to restart the server (WEBrick, FastCGI, etc.).
def reset_application!
- ActiveRecord::Base.reset_subclasses if defined?(ActiveRecord)
+ if defined?(ActiveRecord)
+ ActiveRecord::Base.reset_subclasses
+ ActiveRecord::Base.clear_active_connections!
+ end
+
Dependencies.clear
ActiveSupport::Deprecation.silence do # TODO: Remove after 1.2
Class.remove_class(*Reloadable.reloadable_classes)