BUG27697947: Collection.add_or_replace_one() ignores the doc_id provided

nmariz · nmariz · commit 08de22049df7 · 2018-03-15T11:12:31.000Z
This patch fixes Collection.add_or_replace_one() method which ignores the
doc_id provided.

It also removes the restriction of _id modification in DbDoc.

Tests were modified for regression.
diff --git a/lib/mysqlx/crud.py b/lib/mysqlx/crud.py
@@ -400,6 +400,7 @@ def add_or_replace_one(self, doc_id, doc):
         """
         if not isinstance(doc, DbDoc):
             doc = DbDoc(doc)
+        doc["_id"] = doc_id
         return self.add(doc).upsert(True).execute()
 
     def get_one(self, doc_id):
diff --git a/lib/mysqlx/dbdoc.py b/lib/mysqlx/dbdoc.py
@@ -55,8 +55,6 @@ def __str__(self):
         return json.dumps(self.__dict__)
 
     def __setitem__(self, index, value):
-        if index == "_id":
-            raise ProgrammingError("Cannot modify _id")
         self.__dict__[index] = value
 
     def __getitem__(self, index):
diff --git a/lib/mysqlx/statement.py b/lib/mysqlx/statement.py
@@ -462,15 +462,15 @@ def is_upsert(self):
         """
         return self._upsert
 
-    def upsert(self, val=True):
+    def upsert(self, value=True):
         """Sets the upset flag to the boolean of the value provided.
         Setting of this flag allows updating of the matched rows/documents
         with the provided value.
 
         Args:
-            val (optional[bool]): Set or unset the upsert flag.
+            value (optional[bool]): Set or unset the upsert flag.
         """
-        self._upsert = val
+        self._upsert = value
         return self
 
     def execute(self):
diff --git a/tests/test_mysqlx_crud.py b/tests/test_mysqlx_crud.py
@@ -1303,6 +1303,7 @@ def test_add_or_replace_one(self):
         collection.add_or_replace_one("new_id", upsert)
         result = collection.find("age = 99999").execute().fetch_one()
         self.assertEqual("Melissandre", result["name"])
+        self.assertEqual("new_id", result["_id"])
 
         self.schema.drop_collection(collection_name)
 
