Merge branch 'master' into 3.1-dev

Author: acmorrow

src/mongocxx/collection.cpp

@@ -66,17 +66,22 @@ mongocxx::stdx::optional<bsoncxx::document::value> find_and_modify(
  const ::mongoc_find_and_modify_opts_t* opts) {
  mongocxx::libbson::scoped_bson_t bson_filter{filter};
  mongocxx::libbson::scoped_bson_t reply;
- reply.flag_init();
+
+ // TODO: There is a bug in the 1.3 vintage C driver where collection_find_and_modify_with_opts
+ // does not always initialize its 'reply' parameter in the event of errors. So, explicitly init
+ // the underlying bson_t here. This can be changed to ''flag_init' once the C driver minimum is
+ // bumped to or past 1.4.0.
+ reply.init();
 
  ::bson_error_t error;
 
  bool r = mongocxx::libmongoc::collection_find_and_modify_with_opts(
  collection, bson_filter.bson(), opts, reply.bson(), &error);
 
  if (!r) {
- auto gle = mongocxx::libmongoc::collection_get_last_error(collection);
- mongocxx::throw_exception<mongocxx::write_exception>(
-  bsoncxx::helpers::value_from_bson_t(gle), error);
+ if (!reply.view().empty())
+  mongocxx::throw_exception<mongocxx::write_exception>(reply.steal(), error);
+ mongocxx::throw_exception<mongocxx::write_exception>(error);
  }
 
  bsoncxx::document::view result = reply.view();

src/mongocxx/test/collection.cpp

@@ -702,3 +702,11 @@ TEST_CASE("create_index returns index name", "[collection]") {
  auto response2 = coll.create_index(index2.view(), options::index{});
  REQUIRE(response2.view()["name"].get_utf8().value == stdx::string_view{"b_1_c_-1"});
 }
+
+TEST_CASE("regressions", "CXX-986") {
+ instance::current();
+ mongocxx::uri mongo_uri{"mongodb://non-existent-host.invalid/"};
+ mongocxx::client client{mongo_uri};
+ REQUIRE_THROWS(client.database("irrelevant")["irrelevant"].find_one_and_update(
+ document{} << "irrelevant" << 1 << finalize, document{} << "irrelevant" << 2 << finalize));
+}