Fixed bug with incorrect values of Cursor.rowcount when fetching data

(#147).

Author: anthony-tuininga

doc/src/release_notes.rst

@@ -27,6 +27,9 @@ Thin Mode Changes
     (`issue 132 <https://github.com/oracle/python-oracledb/issues/132>`__).
 #)  Fixed bug when binding data of type TIMESTAMP WITH TIME ZONE but with
     zero fractional seconds.
+#)  Fixed bug with incorrect values of :data:`Cursor.rowcount` when fetching
+    data
+    (`issue 147 <https://github.com/oracle/python-oracledb/issues/147>`__).
 
 Thick Mode Changes
 ++++++++++++++++++

src/oracledb/impl/thin/messages.pyx

@@ -729,7 +729,7 @@ cdef class MessageWithData(Message):
             object exc_type
         Message._process_error_info(self, buf)
         cursor_impl._statement._cursor_id = self.error_info.cursor_id
-        if not cursor_impl._statement._is_plsql:
+        if not cursor_impl._statement._is_plsql and not self.in_fetch:
             cursor_impl.rowcount = self.error_info.rowcount
         cursor_impl._lastrowid = self.error_info.rowid
         cursor_impl._batcherrors = self.error_info.batcherrors

tests/test_4300_cursor_other.py

@@ -870,5 +870,23 @@ def test_4367_plsql_with_executemany_and_increasing_sizes(self):
                                 [(var, "five"), (var, "six"), (var, "end")])
         self.assertEqual(var.values, [4, 3, 3])
 
+    def test_4368_cursor_rowcount_for_queries(self):
+        "4368 - test cursor.rowcount values for queries"
+        max_rows = 93
+        sql = f"select rownum as id from dual connect by rownum <= {max_rows}"
+        self.cursor.arraysize = 10
+        self.cursor.execute(sql)
+        self.assertEqual(self.cursor.rowcount, 0)
+        batch_num = 1
+        while True:
+            rows = self.cursor.fetchmany()
+            if not rows:
+                break
+            expected_value = min(max_rows, batch_num * self.cursor.arraysize)
+            self.assertEqual(self.cursor.rowcount, expected_value)
+            batch_num += 1
+        self.cursor.fetchall()
+        self.assertEqual(self.cursor.rowcount, max_rows)
+
 if __name__ == "__main__":
     test_env.run_test_cases()