BUG26161838: Dropping an non-existing index should succeed silently

nmariz · nmariz · commit c1d4a6f40c2d · 2017-05-31T11:14:39.000+01:00
diff --git a/lib/mysqlx/connection.py b/lib/mysqlx/connection.py
@@ -275,9 +275,13 @@ def update(self, statement):
         return Result(self)
 
     @catch_network_exception
-    def execute_nonquery(self, namespace, cmd, raise_on_fail=True, *args):
-        self.protocol.send_execute_statement(namespace, cmd, args)
-        return Result(self)
+    def execute_nonquery(self, namespace, cmd, raise_on_fail=False, *args):
+        try:
+            self.protocol.send_execute_statement(namespace, cmd, args)
+            return Result(self)
+        except OperationalError:
+            if raise_on_fail:
+                raise
 
     @catch_network_exception
     def execute_sql_scalar(self, sql, *args):
diff --git a/lib/mysqlx/crud.py b/lib/mysqlx/crud.py
@@ -407,7 +407,7 @@ def drop_index(self, index_name):
             index_name (str): Index name.
         """
         self._connection.execute_nonquery("xplugin", "drop_collection_index",
-            True, self._schema.name, self._name, index_name)
+            False, self._schema.name, self._name, index_name)
 
 
 class Table(DatabaseObject):
diff --git a/tests/test_mysqlx_crud.py b/tests/test_mysqlx_crud.py
@@ -998,6 +998,9 @@ def test_drop_index(self):
         rows = result.fetch_all()
         self.assertEqual(0, len(rows))
 
+        # dropping an non-existing index should succeed silently
+        collection.drop_index(index_name)
+
         self.schema.drop_collection(collection_name)
 
     def test_parameter_binding(self):
