[DB-12019] ResultSet will be closed with cursor.close()

Author: VDuda

pynuodb/cursor.py

@@ -69,6 +69,8 @@ def close(self):
         """Closes the cursor into the database."""
         self._check_closed()
         self._statement_cache.shutdown()
+        if self._result_set:
+            self._result_set.close(self.session)
         self.closed = True
 
     def _check_closed(self):
@@ -79,10 +81,7 @@ def _check_closed(self):
             raise Error("connection is closed")
 
     def _reset(self):
-        """Resets SQL transaction variables.
-        
-        Also closes any open statements and result sets.
-        """
+        """Resets SQL transaction variables."""
         self.description = None
         self.rowcount = -1
         self.colcount = -1

pynuodb/encodedsession.py

@@ -271,6 +271,13 @@ def close_statement(self, statement):
         self._putMessageId(protocol.CLOSESTATEMENT).putInt(statement.handle)
         self._exchangeMessages(False)
 
+    def close_result_set(self, result_set):
+        """
+        :type result_set: ResultSet
+        """
+        self._putMessageId(protocol.CLOSERESULTSET).putInt(result_set.handle)
+        self._exchangeMessages(False)
+
     def create_prepared_statement(self, query):
         """
         :type query: str

pynuodb/result_set.py

@@ -35,3 +35,9 @@ def fetchone(self, session):
         res = self.results[self.results_idx]
         self.results_idx += 1
         return res
+
+    def close(self, session):
+        """
+        :type session EncodedSession
+        """
+        session.close_result_set(self)