Fixed bug that prevented the full_code attribute from being populated on

the errors returned by cursor.getbatcherrors().

Author: anthony-tuininga

doc/src/release_notes.rst

@@ -30,6 +30,8 @@ Thin Mode Changes
     when connecting to a database that the listener configuration file states
     exists but actually doesn't
     (`issue 51 <https://github.com/oracle/python-oracledb/issues/51>`__).
+#)  Fixed bug that prevented the `full_code` attribute from being populated on
+    the errors returned by :func:`Cursor.getbatcherrors()`.
 
 Thick Mode Changes
 ++++++++++++++++++

src/oracledb/errors.py

@@ -51,27 +51,35 @@ def __init__(self, message: str=None, context: str=None,
         self.offset = offset
         self.is_session_dead = False
         self.full_code = ""
-        if message is not None:
-            pos = message.find(":")
+        self._make_adjustments()
+
+    def _make_adjustments(self):
+        """
+        Make adjustments to the error, if needed, and calculate the full_code
+        attribute.
+        """
+        if self.message is not None:
+            pos = self.message.find(":")
             if pos > 0:
-                self.full_code = message[:pos]
-        if code != 0 or self.full_code.startswith("DPI-"):
+                self.full_code = self.message[:pos]
+        if self.code != 0 or self.full_code.startswith("DPI-"):
             args = {}
-            if code != 0:
-                driver_error_info = ERR_ORACLE_ERROR_XREF.get(code)
+            if self.code != 0:
+                driver_error_info = ERR_ORACLE_ERROR_XREF.get(self.code)
             else:
                 error_num = int(self.full_code[4:])
                 driver_error_info = ERR_DPI_ERROR_XREF.get(error_num)
             if driver_error_info is not None:
                 if isinstance(driver_error_info, tuple):
                     driver_error_num, pattern = driver_error_info
-                    args = re.search(pattern, message).groupdict()
+                    args = re.search(pattern, self.message).groupdict()
                 else:
                     driver_error_num = driver_error_info
                 if driver_error_num == ERR_CONNECTION_CLOSED:
                     self.is_session_dead = True
                 driver_error = _get_error_text(driver_error_num, **args)
                 self.message = f"{driver_error}\n{self.message}"
+                self.full_code = f"{ERR_PREFIX}-{driver_error_num:04}"
 
     def __str__(self):
         return self.message

src/oracledb/impl/thin/messages.pyx

@@ -152,6 +152,7 @@ cdef class Message:
                 buf.skip_ub2()              # skip chunk length
                 info.batcherrors[i].message = \
                         buf.read_str(TNS_CS_IMPLICIT).rstrip()
+                info.batcherrors[i]._make_adjustments()
                 buf.skip_raw_bytes(2)       # ignore end marker
 
         buf.read_ub4(&info.num)             # error number (extended)

tests/test_3200_features_12_1.py

@@ -448,12 +448,10 @@ def test_3222_insert_with_batch_error(self):
                                 arraydmlrowcounts=True)
         user = test_env.get_main_user()
         expected_errors = [
-            ( 4, 1438, "ORA-01438: value larger than specified " \
-                       "precision allowed for this column" ),
-            ( 2, 1, "ORA-00001: unique constraint " \
-                    "(%s.TESTARRAYDML_PK) violated" % user.upper())
+            (4, "ORA-01438"),
+            (2, "ORA-00001")
         ]
-        actual_errors = [(e.offset, e.code, e.message) \
+        actual_errors = [(e.offset, e.full_code) \
                          for e in self.cursor.getbatcherrors()]
         self.assertEqual(actual_errors, expected_errors)
         self.assertEqual(self.cursor.getarraydmlrowcounts(), [1, 1, 0, 1, 0])
@@ -488,12 +486,8 @@ def test_3224_update_with_batch_error(self):
         sql = "insert into TestArrayDML (IntCol, StringCol, IntCol2) " \
               "values (:1, :2, :3)"
         self.cursor.executemany(sql, rows, batcherrors=True)
-        user = test_env.get_main_user()
-        expected_errors = [
-            ( 6, 1, "ORA-00001: unique constraint " \
-                    "(%s.TESTARRAYDML_PK) violated" % user.upper())
-        ]
-        actual_errors = [(e.offset, e.code, e.message) \
+        expected_errors = [(6, "ORA-00001")]
+        actual_errors = [(e.offset, e.full_code) \
                          for e in self.cursor.getbatcherrors()]
         self.assertEqual(actual_errors, expected_errors)
         rows = [
@@ -506,11 +500,8 @@ def test_3224_update_with_batch_error(self):
         sql = "update TestArrayDML set IntCol2 = :1 where StringCol = :2"
         self.cursor.executemany(sql, rows, arraydmlrowcounts=True,
                                 batcherrors=True)
-        expected_errors = [
-            (2, 1438, "ORA-01438: value larger than specified " \
-                      "precision allowed for this column")
-        ]
-        actual_errors = [(e.offset, e.code, e.message) \
+        expected_errors = [(2, "ORA-01438")]
+        actual_errors = [(e.offset, e.full_code) \
                          for e in self.cursor.getbatcherrors()]
         self.assertEqual(actual_errors, expected_errors)
         self.assertEqual(self.cursor.getarraydmlrowcounts(), [1, 2, 0, 0, 1])