WL12412: Standardize count method

nmariz · nmariz · commit 75fbe291882d · 2018-11-28T10:26:24.000Z
This task standardizes the count method for both collections and tables
across all connectors.

For Connector/Python only the appropriated exception message was changed.

Tests were added for regression.
diff --git a/lib/mysqlx/crud.py b/lib/mysqlx/crud.py
@@ -29,7 +29,8 @@
 """Implementation of the CRUD database objects."""
 
 from .dbdoc import DbDoc
-from .errors import ProgrammingError
+from .errorcode import ER_NO_SUCH_TABLE
+from .errors import OperationalError, ProgrammingError
 from .helpers import deprecated, escape, quote_identifier
 from .statement import (FindStatement, AddStatement, RemoveStatement,
                         ModifyStatement, SelectStatement, InsertStatement,
@@ -366,7 +367,15 @@ def count(self):
         """
         sql = _COUNT_QUERY.format(quote_identifier(self._schema.name),
                                   quote_identifier(self._name))
-        return self._connection.execute_sql_scalar(sql)
+        try:
+            res = self._connection.execute_sql_scalar(sql)
+        except OperationalError as err:
+            if err.errno == ER_NO_SUCH_TABLE:
+                raise OperationalError(
+                    "Collection '{}' does not exist in schema '{}'"
+                    "".format(self._name, self._schema.name))
+            raise
+        return res
 
     def create_index(self, index_name, fields_desc):
         """Creates a collection index.
@@ -514,7 +523,15 @@ def count(self):
         """
         sql = _COUNT_QUERY.format(quote_identifier(self._schema.name),
                                   quote_identifier(self._name))
-        return self._connection.execute_sql_scalar(sql)
+        try:
+            res = self._connection.execute_sql_scalar(sql)
+        except OperationalError as err:
+            if err.errno == ER_NO_SUCH_TABLE:
+                raise OperationalError(
+                    "Table '{}' does not exist in schema '{}'"
+                    "".format(self._name, self._schema.name))
+            raise
+        return res
 
     def is_view(self):
         """Determine if the underlying object is a view or not.
diff --git a/tests/test_mysqlx_crud.py b/tests/test_mysqlx_crud.py
@@ -1907,6 +1907,19 @@ def test_array_append(self):
 
         self.schema.drop_collection(collection_name)
 
+    def test_count(self):
+        collection_name = "collection_test"
+        collection = self.schema.create_collection(collection_name)
+        collection.add(
+            {"_id": "1", "name": "Fred", "age": 21},
+            {"_id": "2", "name": "Barney", "age": 28},
+            {"_id": "3", "name": "Wilma", "age": 42},
+            {"_id": "4", "name": "Betty", "age": 67},
+        ).execute()
+        self.assertEqual(4, collection.count())
+        self.schema.drop_collection(collection_name)
+        self.assertRaises(mysqlx.OperationalError, collection.count)
+
 
 @unittest.skipIf(tests.MYSQL_VERSION < (5, 7, 12), "XPlugin not compatible")
 class MySQLxTableTests(tests.MySQLxTests):
@@ -2152,6 +2165,7 @@ def test_count(self):
         self.assertTrue(table.exists_in_database())
         self.assertEqual(table.count(), 1)
         drop_table(self.schema, table_name)
+        self.assertRaises(mysqlx.OperationalError, table.count)
 
     def test_results(self):
         table_name = "{0}.test".format(self.schema_name)
@@ -2474,6 +2488,8 @@ def test_count(self):
                                                      self.table_name)
         view = create_view(self.schema, self.view_name, defined_as)
         self.assertEqual(view.count(), 1)
+        drop_view(self.schema, self.view_name)
+        self.assertRaises(mysqlx.OperationalError, view.count)
 
     def test_results(self):
         table_name = "{0}.{1}".format(self.schema_name, self.table_name)
