Skip to content
Browse files

Replace the elaborate reloading connection checking scheme, just fix …

…the Ruby-based MySQL adapter, ye?

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5656 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 25d7ea8 commit f09c8c45298edce6a4e74ad950020bcc6b11925e @dhh dhh committed
View
8 activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
@@ -86,14 +86,6 @@ def clear_active_connections!
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:
View
6 activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -79,12 +79,6 @@ def disconnect!
@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)
View
4 activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -101,10 +101,6 @@ def adapter_name #:nodoc:
def supports_migrations? #:nodoc:
true
end
-
- def supports_reloading?
- true
- end
def supports_count_distinct? #:nodoc:
false
View
10 activerecord/lib/active_record/vendor/mysql.rb
@@ -1173,8 +1173,14 @@ def real_connect(*args)
def finalizer(net)
proc {
- net.clear
- net.write Mysql::COM_QUIT.chr
+ begin
+ net.clear
+ net.write Mysql::COM_QUIT.chr
+ net.close
+ rescue Error => error
+ # Swallow lost connection errors if connection is already closed.
+ raise unless error.errno == Error::CR_SERVER_LOST
+ end
}
end
View
7 railties/lib/dispatcher.rb
@@ -62,7 +62,7 @@ def reset_application!
Class.remove_class(*Reloadable.reloadable_classes)
end
- ActiveRecord::Base.clear_reloadable_connections! if defined?(ActiveRecord)
+ ActiveRecord::Base.clear_active_connections! if defined?(ActiveRecord)
end
# Add a preparation callback. Preparation callbacks are run before every
@@ -76,16 +76,13 @@ def reset_application!
def to_prepare(identifier = nil, &block)
unless identifier.nil?
callback = preparation_callbacks.detect { |ident, _| ident == identifier }
-
if callback # Already registered: update the existing callback
callback[-1] = block
return
end
end
-
preparation_callbacks << [identifier, block]
-
- return
+ nil
end
private

0 comments on commit f09c8c4

Please sign in to comment.
Something went wrong with that request. Please try again.