SNOW-647539 Closing the cursor erases the last rowcount (#1229)

Author: sfc-gh-hachouraria

src/snowflake/connector/cursor.py

@@ -399,7 +399,7 @@ def close(self) -> bool | None:
                 return False
 
             with self._lock_canceling:
-                self.reset()
+                self.reset(closing=True)
                 self._connection = None
                 del self.messages[:]
                 return True
@@ -1175,15 +1175,18 @@ def scroll(self, value, mode="relative"):
             },
         )
 
-    def reset(self):
+    def reset(self, closing=False):
         """Resets the result set."""
-        self._total_rowcount = -1  # reset the rowcount
+        # SNOW-647539: Do not erase the rowcount
+        # information when closing the cursor
+        if not closing:
+            self._total_rowcount = -1
         if self._result_state != ResultState.DEFAULT:
             self._result_state = ResultState.RESET
         if self._result is not None:
             self._result = None
         if self._inner_cursor is not None:
-            self._inner_cursor.reset()
+            self._inner_cursor.reset(closing=closing)
             self._result = None
             self._inner_cursor = None
         self._prefetch_hook = None

test/integ/test_cursor.py

@@ -747,6 +747,9 @@ def test_closed_cursor(conn, db_parameters):
         with pytest.raises(InterfaceError, match="Cursor is closed in execute") as err:
             c.execute(f"select aa from {table_name}")
         assert err.value.errno == errorcode.ER_CURSOR_IS_CLOSED
+        assert (
+            c.rowcount == 5
+        ), "SNOW-647539: rowcount should remain available after cursor is closed"
 
 
 def test_fetchmany(conn, db_parameters):
@@ -1039,11 +1042,16 @@ def test_empty_execution(conn, sql):
     "reuse_results", (False, pytest.param(True, marks=pytest.mark.skipolddriver))
 )
 def test_reset_fetch(conn, reuse_results):
-    """Tests behavior after resetting the cursor."""
+    """Tests behavior after resetting an open cursor."""
     with conn(reuse_results=reuse_results) as cnx:
         with cnx.cursor() as cur:
             cur.execute("select 1")
+            assert cur.rowcount == 1
             cur.reset()
+            assert (
+                cur.rowcount is None
+            ), "calling reset on an open cursor should unset rowcount"
+            assert not cur.is_closed(), "calling reset should not close the cursor"
             if reuse_results:
                 assert cur.fetchone() == (1,)
             else: