kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Rename database_operations config to *_context

Browse source
This commit is contained in:
John Hawthorn 2019-02-07 15:36:08 -08:00
parent ac0dcbdc77
commit 3302d2c2e6
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
activerecord/lib/active_record/railtie.rb
View file

@ -91,7 +91,7 @@ module ActiveRecord
initializer "active_record.database_selector" do initializer "active_record.database_selector" do
if options = config.active_record.delete(:database_selector) if options = config.active_record.delete(:database_selector)
resolver = config.active_record.delete(:database_resolver) resolver = config.active_record.delete(:database_resolver)
operations = config.active_record.delete(:database_operations) operations = config.active_record.delete(:database_resolver_context)
config.app_middleware.use ActiveRecord::Middleware::DatabaseSelector, resolver, operations, options config.app_middleware.use ActiveRecord::Middleware::DatabaseSelector, resolver, operations, options
end end
end end

9
railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
View file

@ -107,9 +107,10 @@ Rails.application.configure do
# The `database_resolver` class is used by the middleware to determine which # The `database_resolver` class is used by the middleware to determine which
# database is appropriate to use based on the time delay. # database is appropriate to use based on the time delay.
# #
# The `database_operations` class is used by the middleware to set timestamps # The `database_resolver_context` class is used by the middleware to set
# for the last write to the primary. The resolver uses the operations class # timestamps for the last write to the primary. The resolver uses the context
# timestamps to determine how long to wait before reading from the replica. # class timestamps to determine how long to wait before reading from the
# replica.
# #
# By default Rails will store a last write timestamp in the session. The # By default Rails will store a last write timestamp in the session. The
# DatabaseSelector middleware is designed as such you can define your own # DatabaseSelector middleware is designed as such you can define your own
@ -117,5 +118,5 @@ Rails.application.configure do
# these configuration options. # these configuration options.
# config.active_record.database_selector = { delay: 2.seconds } # config.active_record.database_selector = { delay: 2.seconds }
# config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver
# config.active_record.database_operations = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session
end end