make sure to evaluate client name since it might be a proc (#5906) (#…

…5907)
mongodb · Nov 27, 2024 · 838eea4 · 838eea4
1 parent fde698f
commit 838eea4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/mongoid/persistence_context.rb b/lib/mongoid/persistence_context.rb
@@ -138,7 +138,7 @@ def client
     # @return [ Symbol ] The client name for this persistence
     #   context.
     def client_name
-      @client_name ||= options[:client] ||
+      @client_name ||= __evaluate__(options[:client]) ||
                          Threaded.client_override ||
                          __evaluate__(storage_options[:client])
     end

diff --git a/spec/mongoid/persistence_context_spec.rb b/spec/mongoid/persistence_context_spec.rb
@@ -584,6 +584,14 @@
         expect(persistence_context.client).to eq(Mongoid::Clients.with_name(:alternative))
       end
 
+      context 'when the client option is a proc' do
+        let(:options) { { client: -> { :alternative } } }
+
+        it 'evaluates the proc' do
+          expect(persistence_context.client).to eq(Mongoid::Clients.with_name(:alternative))
+        end
+      end
+
       context 'when there is a client override' do
         persistence_context_override :client, :other