Update replaceOne() API method to current specs.

Author: silvakid

devapi/collection_crud.cc

@@ -647,7 +647,7 @@ class Op_collection_modify
   }
 
   friend mysqlx::CollectionModify;
-  friend mysqlx::CollectionReplace;
+  friend mysqlx::internal::CollectionReplace;
 };
 
 
@@ -662,8 +662,9 @@ CollectionModify::CollectionModify(
   CATCH_AND_WRAP
 }
 
-CollectionReplace::CollectionReplace(Collection &coll, const mysqlx::string &id
-, mysqlx::internal::ExprValue &&val)
+internal::CollectionReplace::CollectionReplace(Collection &coll,
+                                               const mysqlx::string &id,
+                                               mysqlx::internal::ExprValue &&val)
 {
   try
   {
@@ -686,3 +687,4 @@ CollectionReplace::CollectionReplace(Collection &coll, const mysqlx::string &id
   }
   CATCH_AND_WRAP
 }
+

devapi/tests/crud-t.cc

@@ -2236,28 +2236,22 @@ TEST_F(Crud, single_document)
   EXPECT_TRUE(coll.getOne("id1").isNull());
 
   // Replace existing document
-  CollectionReplace replace = coll.replaceOne("id3", expr("{\"name\": :name }"))
-                              .bind("name", "qux");
-  EXPECT_EQ(1, replace.execute().getAffectedItemsCount()
-            );
+  EXPECT_TRUE(coll.replaceOne("id3", expr("{\"name\": \"qux\" }")));
   EXPECT_EQ(string("qux"), coll.getOne("id3")["name"].get<string>());
 
   // Ignore _id field on document and replace existing docment
   // Document passed as string
-  replace = coll.replaceOne("id3", "{\"_id\": \"id4\", \"name\": \"baz\" }");
-  EXPECT_EQ(1, replace.execute().getAffectedItemsCount());
+  EXPECT_EQ(1, coll.replaceOne("id3", "{\"_id\": \"id4\", \"name\": \"baz\" }"));
   EXPECT_EQ(string("baz"), coll.getOne("id3")["name"].get<string>());
   EXPECT_EQ(string("id3"), coll.getOne("id3")["_id"].get<string>());
 
   // should not affect none
-  replace = coll.replaceOne("id4", expr("{\"_id\":\"id4\", \"name\": :name }"));
-  EXPECT_EQ(0, replace.bind("name", "baz").execute().getAffectedItemsCount());
+  EXPECT_FALSE(coll.replaceOne("id4", expr("{\"_id\":\"id4\", \"name\": \"baz\" }")));
 
   // Using DbDoc
   DbDoc doc("{\"_id\":\"id4\", \"name\": \"quux\" }");
 
-  replace = coll.replaceOne("id3", doc);
-  EXPECT_EQ(1,  replace.execute().getAffectedItemsCount());
+  EXPECT_TRUE(coll.replaceOne("id3", doc));
   EXPECT_EQ(string("quux"), coll.getOne("id3")["name"].get<string>());
 }
 

devapi/tests/first-t.cc

@@ -232,14 +232,6 @@ TEST_F(First, api)
     CollectionModify modify2 = x;
   }
 
-  {
-    CollectionReplace replace = c.replaceOne("...", "...");
-    replace = replace.bind("...", 0);
-    auto x = replace.bind("...", 0);
-    CollectionReplace replace1 = replace;
-    CollectionReplace replace2 = x;
-  }
-
   // Test copy semantics for table operations
 
   {

include/devapi/collection_crud.h

@@ -393,10 +393,11 @@ DLL_WARNINGS_POP
 */
 
 class CollectionModify;
-class CollectionReplace;
 
 namespace internal {
 
+class CollectionReplace;
+
 struct Collection_modify_cmd
   : public Executable<Result, CollectionModify>
 {};
@@ -413,6 +414,43 @@ struct Collection_replace_base
     : public Bind_parameters< Collection_replace_cmd >
 {};
 
+/*
+  Operation which replaces a document, using the id by a new one
+*/
+
+class PUBLIC_API CollectionReplace
+  : public internal::Collection_replace_base
+{
+
+public:
+
+  /*
+    Create operation which replaces document with specified _id in a collection.
+  */
+  CollectionReplace(Collection &base,
+                    const string &id,
+                    internal::ExprValue &&val);
+
+  CollectionReplace(const internal::Collection_replace_cmd &other)
+  {
+    internal::Collection_replace_cmd::operator=(other);
+  }
+
+  CollectionReplace(internal::Collection_replace_cmd &&other)
+  {
+    internal::Collection_replace_cmd::operator=(std::move(other));
+  }
+
+protected:
+
+  using Impl = Collection_modify_impl;
+
+  Impl* get_impl()
+  {
+    return static_cast<Impl*>(internal::Collection_replace_base::get_impl());
+  }
+};
+
 }  // internal namespace
 
 
@@ -537,44 +575,7 @@ class PUBLIC_API CollectionModify
 };
 
 
-/**
-  Operation which replaces a document, using the id by a new one
-
-  @ingroup devapi_op
-*/
 
-class PUBLIC_API CollectionReplace
-  : public internal::Collection_replace_base
-{
-
-public:
-
-  /**
-    Create operation which replaces document with specified _id in a collection.
-  */
-  CollectionReplace(Collection &base,
-                    const string &id,
-                    internal::ExprValue &&val);
-
-  CollectionReplace(const internal::Collection_replace_cmd &other)
-  {
-    internal::Collection_replace_cmd::operator=(other);
-  }
-
-  CollectionReplace(internal::Collection_replace_cmd &&other)
-  {
-    internal::Collection_replace_cmd::operator=(std::move(other));
-  }
-
-protected:
-
-  using Impl = internal::Collection_modify_impl;
-
-  Impl* get_impl()
-  {
-    return static_cast<Impl*>(internal::Collection_replace_base::get_impl());
-  }
-};
 
 }  // mysqlx namespace
 

include/mysql_devapi.h

@@ -427,9 +427,10 @@ class PUBLIC_API Collection
     parameters with .bind() before executing the statement.
   */
 
-  CollectionReplace replaceOne(string id, internal::ExprValue &&document)
+  bool replaceOne(string id, internal::ExprValue &&document)
   {
-      return CollectionReplace(*this, id, std::move(document));
+      return
+          internal::CollectionReplace(*this, id, std::move(document)).execute().getAffectedItemsCount() == 1;
   }
 
 };