Made sure that connections are only removed for SQLite

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5955 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
rails · Jan 15, 2007 · 6d37c63 · 6d37c63
1 parent 312e6ed
commit 6d37c63
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
@@ -90,8 +90,10 @@ def clear_active_connections!
       # Clears the cache which maps classes 
       def clear_reloadable_connections!
         @@active_connections.each do |name, conn|
-          conn.disconnect! if conn.supports_reloading?
+          if conn.requires_reloading?
-          @@active_connections.delete(name)
+            conn.disconnect!
+            @@active_connections.delete(name)
+          end
         end
       end
 

diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -81,7 +81,7 @@ def disconnect!
 
       # 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?
+      def requires_reloading?
         false
       end
 

diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -102,7 +102,7 @@ def supports_migrations? #:nodoc:
         true
       end
 
-      def supports_reloading?
+      def requires_reloading?
         true
       end