BUG27589450: Remove upsert functionality from WriteStatement class

nmariz · nmariz · commit a26d6652c0ea · 2018-03-16T12:10:52.000Z
Currently the upsert() method is part of the WriteStatement class which
is inherited by both the AddStatement and InsertStatement classes.
However, upserts are currently only supported for add statements, and
it will cause an assertion to attempt to execute an insert statement
that has enabled upserts.

This patch removes the upsert functionality from WriteStatement and adds
it to AddStatement class.
diff --git a/lib/mysqlx/protocol.py b/lib/mysqlx/protocol.py
@@ -511,7 +511,8 @@ def send_insert(self, stmt):
                 row["field"].extend([build_expr(value).get_message()])
             msg["row"].extend([row.get_message()])
 
-        msg["upsert"] = stmt.is_upsert()
+        if hasattr(stmt, "is_upsert"):
+            msg["upsert"] = stmt.is_upsert()
         self._writer.write_message(
             mysqlxpb_enum("Mysqlx.ClientMessages.Type.CRUD_INSERT"), msg)
 
diff --git a/lib/mysqlx/statement.py b/lib/mysqlx/statement.py
@@ -445,7 +445,6 @@ class WriteStatement(Statement):
     def __init__(self, target, doc_based):
         super(WriteStatement, self).__init__(target, doc_based)
         self._values = []
-        self._upsert = False
 
     def get_values(self):
         """Returns the list of values.
@@ -455,25 +454,6 @@ def get_values(self):
         """
         return self._values
 
-    def is_upsert(self):
-        """Returns `True` if it's an upsert.
-
-        Returns:
-            bool: `True` if it's an upsert.
-        """
-        return self._upsert
-
-    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:
-            value (optional[bool]): Set or unset the upsert flag.
-        """
-        self._upsert = value
-        return self
-
     def execute(self):
         """Execute the statement.
 
@@ -491,8 +471,28 @@ class AddStatement(WriteStatement):
     """
     def __init__(self, collection):
         super(AddStatement, self).__init__(collection, True)
+        self._upsert = False
         self.ids = []
 
+    def is_upsert(self):
+        """Returns `True` if it's an upsert.
+
+        Returns:
+            bool: `True` if it's an upsert.
+        """
+        return self._upsert
+
+    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:
+            value (optional[bool]): Set or unset the upsert flag.
+        """
+        self._upsert = value
+        return self
+
     def add(self, *values):
         """Adds a list of documents into a collection.
 
