Fix RUBY-2054 upsert option is not sent to legacy servers with w:0 due to string/symbol key mismatch (#1610)

* Fix RUBY-2054 upsert option is not sent to legacy servers with w:0 due to string/symbol key mismatch

* Remove debug print

Co-authored-by: Oleg Pudeyev <p@users.noreply.github.com>

Author: p-mongo

lib/mongo/bulk_write/transformable.rb

@@ -92,7 +92,7 @@ module Transformable
           Operation::U => doc[:replacement],
         }.tap do |d|
           if doc[:upsert]
-            d[:upsert] = true
+            d['upsert'] = true
           end
           d[Operation::COLLATION] = doc[:collation] if doc[:collation]
         end
@@ -108,7 +108,7 @@ module Transformable
           Operation::MULTI => true,
         }.tap do |d|
           if doc[:upsert]
-            d[:upsert] = true
+            d['upsert'] = true
           end
           d[Operation::COLLATION] = doc[:collation] if doc[:collation]
           d[Operation::ARRAY_FILTERS] = doc[:array_filters] if doc[:array_filters]
@@ -124,7 +124,7 @@ module Transformable
           Operation::U => doc[:update],
         }.tap do |d|
           if doc[:upsert]
-            d[:upsert] = true
+            d['upsert'] = true
           end
           d[Operation::COLLATION] = doc[:collation] if doc[:collation]
           d[Operation::ARRAY_FILTERS] = doc[:array_filters] if doc[:array_filters]

lib/mongo/collection/view/writable.rb

@@ -234,7 +234,7 @@ def replace_one(replacement, opts = {})
                          Operation::U => replacement,
                         }
           if opts[:upsert]
-            update_doc[:upsert] = true
+            update_doc['upsert'] = true
           end
           with_session(opts) do |session|
             write_concern = write_concern_with_session(session)
@@ -281,7 +281,7 @@ def update_many(spec, opts = {})
                          Operation::MULTI => true,
                          }
           if opts[:upsert]
-            update_doc[:upsert] = true
+            update_doc['upsert'] = true
           end
           with_session(opts) do |session|
             write_concern = write_concern_with_session(session)
@@ -325,7 +325,7 @@ def update_one(spec, opts = {})
                          Operation::U => spec,
                          }
           if opts[:upsert]
-            update_doc[:upsert] = true
+            update_doc['upsert'] = true
           end
           with_session(opts) do |session|
             write_concern = write_concern_with_session(session)

spec/integration/crud_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe 'CRUD operations' do
+  let(:collection) { authorized_client['crud_integration'] }
+
+  before do
+    collection.delete_many
+  end
+
+  describe 'upsert' do
+    context 'with default write concern' do
+      it 'upserts' do
+        collection.count_documents({}).should == 0
+
+        res = collection.find(_id: 'foo').update_one({'$set' => {foo: 'bar'}}, upsert: true)
+
+        res.documents.first['upserted'].length.should == 1
+
+        collection.count_documents({}).should == 1
+      end
+    end
+
+    context 'unacknowledged write' do
+      let(:unack_collection) do
+        collection.with(write_concern: {w: 0})
+      end
+
+      before do
+        unack_collection.write_concern.acknowledged?.should be false
+      end
+
+      it 'upserts' do
+        unack_collection.count_documents({}).should == 0
+
+        res = unack_collection.find(_id: 'foo').update_one({'$set' => {foo: 'bar'}}, upsert: true)
+
+        # since write concern is unacknowledged, wait for the data to be
+        # persisted (hopefully)
+        sleep 0.25
+
+        unack_collection.count_documents({}).should == 1
+      end
+    end
+  end
+end