MONGOID-5379 Don't pass through the database_name to the collection options (#5339)

* MONGOID-5379 Don't pass through the database_name to the collection options

* MONGOID-5379 consider string keys as well

Author: neilshweky

lib/mongoid/persistence_context.rb

@@ -57,7 +57,9 @@ def initialize(object, opts = {})
     # @return [ Mongo::Collection ] The collection for this persistence
     #   context.
     def collection(parent = nil)
-      parent ? parent.collection.with(client_options) : client[collection_name.to_sym]
+      parent ?
+        parent.collection.with(client_options.except(:database, "database")) :
+        client[collection_name.to_sym]
     end
 
     # Get the collection name for this persistence context.

spec/mongoid/persistence_context_spec.rb

@@ -718,4 +718,28 @@
       end
     end
   end
+
+  context "when using an alternate database to update a document" do
+    let(:user) do
+      User.new(name: '1')
+    end
+
+    before do
+      user.with(database: database_id_alt) do |u|
+        u.save!
+      end
+
+      expect do
+        user.with(database: database_id_alt) do |u|
+          u.update(name:'2')
+        end
+      end.to_not raise_error
+    end
+
+    it "persists the update" do
+      User.with("database" => database_id_alt) do |klass|
+        expect(klass.find(user._id).name).to eq("2")
+      end
+    end
+  end
 end