Fixed bug when calling Cursor.executemany() with the "batcherrors"

parameter set to True multiple times with each call resulting in at
least one batch error.

Author: anthony-tuininga

doc/src/release_notes.rst

@@ -39,6 +39,9 @@ Thin Mode Changes
     actual components being used. This is important for some configurations.
 #)  Fixed bug resulting in an internal protocol error when handling database
     responses.
+#)  Fixed bug when calling :meth:`Cursor.executemany()` with the `batcherrors`
+    parameter set to `True` multiple times with each call resulting in at least
+    one batch error.
 
 Thick Mode Changes
 ++++++++++++++++++

src/oracledb/impl/thin/constants.pxi

@@ -379,6 +379,7 @@ DEF TNS_ERR_INVALID_SERVICE_NAME = 12514
 DEF TNS_ERR_INVALID_SID = 12505
 DEF TNS_ERR_NO_DATA_FOUND = 1403
 DEF TNS_ERR_SESSION_SHUTDOWN = 12572
+DEF TNS_ERR_ARRAY_DML_ERRORS = 24381
 
 # message types
 DEF TNS_MSG_TYPE_PROTOCOL = 1

src/oracledb/impl/thin/messages.pyx

@@ -750,6 +750,9 @@ cdef class MessageWithData(Message):
             self.error_info.num = 0
             cursor_impl._more_rows_to_fetch = False
             self.error_occurred = False
+        elif self.error_info.num == TNS_ERR_ARRAY_DML_ERRORS:
+            self.error_info.num = 0
+            self.error_occurred = False
         elif self.error_info.num == TNS_ERR_VAR_NOT_IN_SELECT_LIST:
             conn_impl._add_cursor_to_close(cursor_impl._statement)
             cursor_impl._statement._cursor_id = 0
@@ -758,8 +761,6 @@ cdef class MessageWithData(Message):
             if exc_type is not exceptions.IntegrityError:
                 conn_impl._add_cursor_to_close(cursor_impl._statement)
                 cursor_impl._statement._cursor_id = 0
-        if self.error_info.batcherrors is not None:
-            self.error_occurred = False
 
     cdef int _process_implicit_result(self, ReadBuffer buf) except -1:
         cdef:
@@ -1950,7 +1951,8 @@ cdef class ExecuteMessage(MessageWithData):
         cdef:
             Statement stmt = self.cursor_impl._statement
         if stmt._cursor_id != 0 and not stmt._requires_full_execute \
-                and not self.parse_only and not stmt._is_ddl:
+                and not self.parse_only and not stmt._is_ddl \
+                and not self.batcherrors:
             if stmt._is_query and not stmt._requires_define \
                     and self.cursor_impl.prefetchrows > 0:
                 self.function_code = TNS_FUNC_REEXECUTE_AND_FETCH

tests/test_3200_features_12_1.py

@@ -512,5 +512,32 @@ def test_3226_batch_error_no_errors(self):
         self.cursor.executemany(sql, rows, batcherrors=True)
         self.assertEqual(self.cursor.getbatcherrors(), [])
 
+    def test_3227_batch_error_multiple_execute(self):
+        "3227 - test batcherrors mode with multiple executes"
+        self.cursor.execute("truncate table TestArrayDML")
+        rows_1 = [
+            (1, "Value 1", 100),
+            (2, "Value 2", 200),
+            (2, "Value 2", 200)
+        ]
+        rows_2 = [
+            (3, "Value 3", 300),
+            (3, "Value 3", 300),
+            (4, "Value 4", 400)
+        ]
+        sql = """
+                insert into TestArrayDML (IntCol, StringCol, IntCol2)
+                values (:1, :2, :3)"""
+        self.cursor.executemany(sql, rows_1, batcherrors=True)
+        expected_errors = [(2, "ORA-00001")]
+        actual_errors = [(e.offset, e.full_code) \
+                         for e in self.cursor.getbatcherrors()]
+        self.assertEqual(actual_errors, expected_errors)
+        self.cursor.executemany(sql, rows_2, batcherrors=True)
+        expected_errors = [(1, "ORA-00001")]
+        actual_errors = [(e.offset, e.full_code) \
+                         for e in self.cursor.getbatcherrors()]
+        self.assertEqual(actual_errors, expected_errors)
+
 if __name__ == "__main__":
     test_env.run_test_cases()