Skip to content

Support Rails 6 multiple database connections. #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Support Rails 6 multiple database connections. #10

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
18e7406
Support Rails 6 multiple db connections.
masato-hi Jun 3, 2021
b77c43c
Fixed an error when legacy_connection_handling is false.
masato-hi Jun 4, 2021
fa792c9
Fix disconnection process in Rails 6.1
masato-hi Jun 4, 2021
0ece604
Performance improvements and removal of branching of processing by le…
masato-hi Jun 4, 2021
10de61c
Fixed processing when legacy_connection_handling is true.
masato-hi Jun 4, 2021
c15b57f
Fix ActiveRecord::Base.connection_handler to disconnect when legacy_c…
masato-hi Jun 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions ...ord-refresh_connection/active_record/connection_adapters/refresh_connection_management.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,22 @@ def call(env)
private

def clear_connections
if should_clear_all_connections?
ActiveRecord::Base.clear_all_connections!
if ActiveRecord::VERSION::MAJOR >= 6
if should_clear_all_connections?
ActiveRecord::Base.connection_handlers.each_value do |connection_handler|
Copy link

@kamipo kamipo Jun 3, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

connection_handlers will raise NotImplementedError if legacy_connection_handling = false:

https://github.com/rails/rails/blob/90fe5adad06a930c2c5a2b724373cf680c8a5375/activerecord/lib/active_record/core.rb#L227-L234

rails/rails#40637

Copy link
Author

@masato-hi masato-hi Jun 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for your review.
Probably fixed to work with Rails 6.1.

Do you know a better way to get a list of roles?

Copy link

@kamipo kamipo Jun 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can refer to the original connection management code:

https://github.com/rails/rails/blob/v6.1.0/activerecord/lib/active_record/query_cache.rb#L42-L56

connection_handler.clear_all_connections!
end
else
ActiveRecord::Base.connection_handlers.each_value do |connection_handler|
connection_handler.clear_active_connections!
end
end
else
ActiveRecord::Base.clear_active_connections!
if should_clear_all_connections?
ActiveRecord::Base.clear_all_connections!
else
ActiveRecord::Base.clear_active_connections!
end
end
end

Expand Down