BUG29833590: Calling execute() should fetch active results

nmariz · nmariz · commit f270d5933fdb · 2019-05-27T17:04:03.000+01:00
An exception is raised, when executing statements consecutively without
fetching the results.

This patch fix this issue by fetching any active result.
diff --git a/lib/mysqlx/connection.py b/lib/mysqlx/connection.py
@@ -576,6 +576,7 @@ def _prepare_statement(self, msg_type, msg, statement):
             statement (Statement): A `Statement` based type object.
         """
         try:
+            self.fetch_active_result()
             self.protocol.send_prepare_prepare(msg_type, msg, statement)
         except NotSupportedError:
             self._prepared_stmt_supported = False
@@ -845,17 +846,17 @@ def close_session(self):
         if not self.is_open():
             return
 
-        # Deallocate all prepared statements
-        if self._prepared_stmt_supported:
-            for stmt_id in self._prepared_stmt_ids:
-                self.protocol.send_prepare_deallocate(stmt_id)
-            self._stmt_counter = 0
-
         try:
-            if self._active_result is not None:
-                self._active_result.fetch_all()
-                self.protocol.send_close()
-                self.protocol.read_ok()
+            # Fetch any active result
+            self.fetch_active_result()
+            # Deallocate all prepared statements
+            if self._prepared_stmt_supported:
+                for stmt_id in self._prepared_stmt_ids:
+                    self.protocol.send_prepare_deallocate(stmt_id)
+                self._stmt_counter = 0
+            # Send session close
+            self.protocol.send_close()
+            self.protocol.read_ok()
         except (InterfaceError, OperationalError) as err:
             _LOGGER.warning("Warning: An error occurred while attempting to "
                             "close the connection: {}".format(err))
diff --git a/lib/mysqlx/protocol.py b/lib/mysqlx/protocol.py
@@ -824,17 +824,13 @@ def read_ok(self):
 
         Raises:
             :class:`mysqlx.InterfaceError`: If unexpected message.
-            :class:`mysqlx.ProgrammingError`: If unread result found.
         """
         msg = self._reader.read_message()
         if msg.type == "Mysqlx.Error":
             raise InterfaceError("Mysqlx.Error: {}".format(msg["msg"]),
                                  errno=msg["code"])
-        if msg.type == "Mysqlx.Resultset.Row":
-            raise ProgrammingError("Unread result found")
         if msg.type != "Mysqlx.Ok":
-            raise InterfaceError("Unexpected message encountered: {}"
-                                 "".format(msg["msg"]))
+            raise InterfaceError("Unexpected message encountered")
 
     def send_connection_close(self):
         """Send connection close."""
diff --git a/tests/test_mysqlx_crud.py b/tests/test_mysqlx_crud.py
@@ -1397,7 +1397,10 @@ def test_find(self):
         # test unread result found
         find = collection.find()
         find.execute()
-        self.assertRaises(mysqlx.ProgrammingError, find.execute)
+        find.execute()
+        result = find.execute()
+        docs = result.fetch_all()
+        self.assertEqual(4, len(docs))
 
         self.schema.drop_collection(collection_name)
 
