Fixed bug in the calculation of Cursor.rowcount under some

circumstances.

Author: anthony-tuininga

doc/src/release_notes.rst

@@ -53,6 +53,8 @@ Common Changes
     mode would raise ``DPI-1040: LOB was already closed``.
 #)  Fixed bug in :meth:`ConnectParams.get_connect_string()` when a value for
     the connection parameter ``purity`` has been specified.
+#)  Fixed bug in the calculation of :data:`Cursor.rowcount` under some
+    circumstances.
 #)  Connection parameters that are strings now treat an empty string in the
     same way as the value ``None``.
 

src/oracledb/base_impl.pxd

@@ -526,6 +526,7 @@ cdef class BaseCursorImpl:
                       bint cache_statement) except -1
     cdef int _reset_bind_vars(self, uint32_t num_rows) except -1
     cdef int _verify_var(self, object var) except -1
+    cdef int bind_many(self, object cursor, list parameters) except -1
     cdef int bind_one(self, object cursor, object parameters) except -1
 
 

src/oracledb/cursor.py

@@ -744,26 +744,10 @@ def executemany(
         None is assumed to be a string of length 1 so any values that are later
         bound as numbers or dates will raise a TypeError exception.
         """
-        # verify parameters
-        if statement is None and self._impl.statement is None:
-            errors._raise_err(errors.ERR_NO_STATEMENT)
-        if not isinstance(parameters, (list, int)):
-            errors._raise_err(errors.ERR_WRONG_EXECUTEMANY_PARAMETERS_TYPE)
-
-        # prepare statement, if necessary
         self._verify_open()
-        if statement and statement != self._impl.statement:
-            self._prepare(statement)
-
-        # perform bind and execute
-        self._impl.set_input_sizes = False
-        if isinstance(parameters, int):
-            num_execs = parameters
-        else:
-            num_execs = len(parameters)
-            if num_execs > 0:
-                self._impl.bind_many(self, parameters)
-        self._impl.warning = None
+        num_execs = self._impl._prepare_for_executemany(
+            self, statement, parameters
+        )
         self._impl.executemany(
             self, num_execs, bool(batcherrors), bool(arraydmlrowcounts)
         )
@@ -1010,26 +994,10 @@ async def executemany(
         None is assumed to be a string of length 1 so any values that are later
         bound as numbers or dates will raise a TypeError exception.
         """
-        # verify parameters
-        if statement is None and self._impl.statement is None:
-            errors._raise_err(errors.ERR_NO_STATEMENT)
-        if not isinstance(parameters, (list, int)):
-            errors._raise_err(errors.ERR_WRONG_EXECUTEMANY_PARAMETERS_TYPE)
-
-        # prepare statement, if necessary
         self._verify_open()
-        if statement and statement != self._impl.statement:
-            self._prepare(statement)
-
-        # perform bind and execute
-        self._impl.set_input_sizes = False
-        if isinstance(parameters, int):
-            num_execs = parameters
-        else:
-            num_execs = len(parameters)
-            if num_execs > 0:
-                self._impl.bind_many(self, parameters)
-        self._impl.warning = None
+        num_execs = self._impl._prepare_for_executemany(
+            self, statement, parameters
+        )
         await self._impl.executemany(
             self, num_execs, bool(batcherrors), bool(arraydmlrowcounts)
         )

src/oracledb/impl/base/cursor.pyx

@@ -391,8 +391,38 @@ cdef class BaseCursorImpl:
         if parameters is not None:
             self.bind_one(cursor, parameters)
 
-        # clear any warning
+        # clear any warning and reset rowcount
         self.warning = None
+        self.rowcount = 0
+
+    def _prepare_for_executemany(self, object cursor, str statement,
+                                 object parameters):
+        """
+        Internal method for preparing a statement for execution multiple times.
+        """
+
+        # prepare statement, if necessary
+        if statement is None and self.statement is None:
+            errors._raise_err(errors.ERR_NO_STATEMENT)
+        elif statement is not None and statement != self.statement:
+            self._prepare(statement, None, True)
+
+        # perform bind, if applicable
+        self.set_input_sizes = False
+        if isinstance(parameters, int):
+            num_execs = parameters
+        elif isinstance(parameters, list):
+            num_execs = len(parameters)
+            if parameters:
+                self.bind_many(cursor, parameters)
+        else:
+            errors._raise_err(errors.ERR_WRONG_EXECUTEMANY_PARAMETERS_TYPE)
+
+        # clear any warning and reset rowcount
+        self.warning = None
+        self.rowcount = 0
+
+        return num_execs
 
     cdef int _reset_bind_vars(self, uint32_t num_rows) except -1:
         """
@@ -427,7 +457,7 @@ cdef class BaseCursorImpl:
                               var_arraysize=var.num_elements,
                               required_arraysize=self.arraysize)
 
-    def bind_many(self, object cursor, list parameters):
+    cdef int bind_many(self, object cursor, list parameters) except -1:
         """
         Internal method used for binding multiple rows of data.
         """

src/oracledb/impl/thin/cursor.pyx

@@ -178,7 +178,6 @@ cdef class ThinCursorImpl(BaseThinCursorImpl):
         protocol._process_single_message(message)
         self.warning = message.warning
         if self._statement._is_query:
-            self.rowcount = 0
             if message.type_cache is not None:
                 message.type_cache.populate_partial_types(conn)
 
@@ -262,7 +261,6 @@ cdef class AsyncThinCursorImpl(BaseThinCursorImpl):
         await protocol._process_single_message(message)
         self.warning = message.warning
         if self._statement._is_query:
-            self.rowcount = 0
             if message.type_cache is not None:
                 await message.type_cache.populate_partial_types(conn)
 

tests/test_3900_cursor_execute.py

@@ -593,6 +593,16 @@ def test_3933(self):
         (fetch_info,) = self.cursor.description
         self.assertEqual(fetch_info[1:3], (oracledb.DB_TYPE_NUMBER, 10))
 
+    def test_3934(self):
+        "3934 - test rowcount is zero for PL/SQL"
+        self.cursor.execute("begin null; end;")
+        self.assertEqual(self.cursor.rowcount, 0)
+        self.cursor.execute("select user from dual")
+        self.cursor.fetchall()
+        self.assertEqual(self.cursor.rowcount, 1)
+        self.cursor.execute("begin null; end;")
+        self.assertEqual(self.cursor.rowcount, 0)
+
 
 if __name__ == "__main__":
     test_env.run_test_cases()