From 0a86122a248020081722bf0c12de70c929cbcbd9 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 26 Nov 2006 22:10:55 +0000 Subject: Only reload connections in development mode that supports (and requires that) -- in other words, only do it for SQLite (closes #6687, #6700) [DHH] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5637 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- .../connection_adapters/abstract/connection_specification.rb | 8 ++++++++ .../lib/active_record/connection_adapters/abstract_adapter.rb | 6 ++++++ .../lib/active_record/connection_adapters/sqlite_adapter.rb | 4 ++++ 3 files changed, 18 insertions(+) (limited to 'activerecord/lib/active_record') diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb index ae59176fa3..31c288b932 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb @@ -86,6 +86,14 @@ module ActiveRecord conn.disconnect! end end + + # Clears the cache which maps classes + def clear_reloadable_connections! + @@active_connections.each do |name, conn| + conn.disconnect! if conn.supports_reloading? + @@active_connections.delete(name) + end + end # Verify active connections. def verify_active_connections! #:nodoc: diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb index 949b8f7951..07e3182761 100755 --- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb @@ -79,6 +79,12 @@ module ActiveRecord @active = false end + # Returns true if its safe to reload the connection between requests for development mode. + # This is not the case for Ruby/MySQL and it's not necessary for any adapters except SQLite. + def supports_reloading? + false + end + # Lazily verify this connection, calling +active?+ only if it hasn't # been called for +timeout+ seconds. def verify!(timeout) diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb index b0c86f51a5..341e546084 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb @@ -102,6 +102,10 @@ module ActiveRecord true end + def supports_reloading? + true + end + def supports_count_distinct? #:nodoc: sqlite_version >= '3.2.6' end -- cgit v1.2.3