aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorJohn Hawthorn <john@hawthorn.email>2019-02-07 15:36:08 -0800
committerJohn Hawthorn <john@hawthorn.email>2019-02-07 15:41:43 -0800
commit3302d2c2e6154470647eab1df3ea3048ca17139a (patch)
tree9eeb2fd945040666c2aae65a049c86f32842ccdd /activerecord
parentac0dcbdc77895c856ca18c584f6068a93cff1109 (diff)
downloadrails-3302d2c2e6154470647eab1df3ea3048ca17139a.tar.gz
rails-3302d2c2e6154470647eab1df3ea3048ca17139a.tar.bz2
rails-3302d2c2e6154470647eab1df3ea3048ca17139a.zip
Rename database_operations config to *_context
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/railtie.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb
index aac49a92b4..a1d7c893bf 100644
--- a/activerecord/lib/active_record/railtie.rb
+++ b/activerecord/lib/active_record/railtie.rb
@@ -91,7 +91,7 @@ module ActiveRecord
initializer "active_record.database_selector" do
if options = config.active_record.delete(:database_selector)
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
end
end