From 6aaf01385e95376938275f484852b88fe84088b8 Mon Sep 17 00:00:00 2001 From: John Hawthorn Date: Wed, 6 Feb 2019 11:55:53 -0800 Subject: Rename Session.build to Session.call This is more consistent with Resolver, which has build called. This allows using a Proc instead of a class, which could be nice if you need to vary switching logic based on the request in a more ad-hoc way (ie. check if it is an API request). --- activerecord/lib/active_record/middleware/database_selector.rb | 2 +- .../lib/active_record/middleware/database_selector/resolver/session.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'activerecord') diff --git a/activerecord/lib/active_record/middleware/database_selector.rb b/activerecord/lib/active_record/middleware/database_selector.rb index 3ab50f5f6b..b95d8d6cb6 100644 --- a/activerecord/lib/active_record/middleware/database_selector.rb +++ b/activerecord/lib/active_record/middleware/database_selector.rb @@ -57,7 +57,7 @@ module ActiveRecord private def select_database(request, &blk) - operations = operations_klass.build(request) + operations = operations_klass.call(request) database_resolver = resolver_klass.call(operations, options) if reading_request?(request) diff --git a/activerecord/lib/active_record/middleware/database_selector/resolver/session.rb b/activerecord/lib/active_record/middleware/database_selector/resolver/session.rb index 33e0af5ee4..df7af054b7 100644 --- a/activerecord/lib/active_record/middleware/database_selector/resolver/session.rb +++ b/activerecord/lib/active_record/middleware/database_selector/resolver/session.rb @@ -10,7 +10,7 @@ module ActiveRecord # The last_write is used to determine whether it's safe to read # from the replica or the request needs to be sent to the primary. class Session # :nodoc: - def self.build(request) + def self.call(request) new(request.session) end -- cgit v1.2.3