BUG26160876: Fix issue when using empty condition in Collection.remove() and Table.delete()

nmariz · nmariz · commit 6b82c4bd3c01 · 2017-05-31T11:12:01.000+01:00
diff --git a/lib/mysqlx/statement.py b/lib/mysqlx/statement.py
@@ -178,8 +178,11 @@ def where(self, condition):
         """
         self._has_where = True
         self._where = condition
-        expr = ExprParser(condition, not self._doc_based)
-        self._where_expr = expr.expr()
+        try:
+            expr = ExprParser(condition, not self._doc_based)
+            self._where_expr = expr.expr()
+        except ValueError:
+            raise ProgrammingError("Invalid condition")
         self._binding_map = expr.placeholder_name_to_position
         return self
 
@@ -463,7 +466,7 @@ def execute(self):
             mysqlx.Result: Result object.
         """
         if not self._has_where:
-            raise ProgrammingError("No condition was found for modify.")
+            raise ProgrammingError("No condition was found for modify")
         return self._connection.update(self)
 
 
@@ -667,7 +670,7 @@ def execute(self):
             mysqlx.Result: Result object
         """
         if not self._has_where:
-            raise ProgrammingError("No condition was found for update.")
+            raise ProgrammingError("No condition was found for update")
         return self._connection.update(self)
 
 
@@ -687,7 +690,7 @@ def execute(self):
             mysqlx.Result: Result object.
         """
         if not self._has_where:
-            raise ProgrammingError("No condition was found for remove.")
+            raise ProgrammingError("No condition was found for remove")
         return self._connection.delete(self)
 
 
@@ -711,7 +714,7 @@ def execute(self):
             mysqlx.Result: Result object.
         """
         if not self._has_where:
-            raise ProgrammingError("No condition was found for delete.")
+            raise ProgrammingError("No condition was found for delete")
         return self._connection.delete(self)
 
 
@@ -875,7 +878,7 @@ def defined_as(self, statement):
         if not isinstance(statement, SelectStatement) and \
            not isinstance(statement, STRING_TYPES):
             raise ProgrammingError("The statement must be an instance of "
-                                   "SelectStatement or a SQL string.")
+                                   "SelectStatement or a SQL string")
         self._defined_as = copy.copy(statement)  # Prevent modifications
         return self
 
diff --git a/tests/test_mysqlx_crud.py b/tests/test_mysqlx_crud.py
@@ -826,6 +826,9 @@ def test_remove(self):
         # Collection.remove() is not allowed without a condition
         result = collection.remove()
         self.assertRaises(mysqlx.ProgrammingError, result.execute)
+        result = collection.remove("")
+        self.assertRaises(mysqlx.ProgrammingError, result.execute)
+        self.assertRaises(mysqlx.ProgrammingError, collection.remove, " ")
 
         self.schema.drop_collection(collection_name)
 
@@ -1294,6 +1297,10 @@ def test_delete(self):
         # Table.delete() is not allowed without a condition
         result = table.delete()
         self.assertRaises(mysqlx.ProgrammingError, result.execute)
+        result = table.delete("")
+        self.assertRaises(mysqlx.ProgrammingError, result.execute)
+        self.assertRaises(mysqlx.ProgrammingError, table.delete, " ")
+
         self.schema.drop_table(table_name)
 
     def test_count(self):
