Fixed bug when multiple rows containing LOBs and DbObjects are returned

in a DML RETURNING statement.

Author: anthony-tuininga

doc/src/release_notes.rst

@@ -68,6 +68,8 @@ Common Changes
 
 #)  Fixed bug when binding a variable that was previously bound as an output
     variable in a DML RETURNING statement.
+#)  Fixed bug when multiple rows containing LOBs and DbObjects are returned in
+    a DML RETURNING statement.
 #)  An error message that links to :ref:`documentation <ldapconnections>` on
     setting up a protocol hook function is now returned by default for LDAP and
     LDAPS URL connection strings in python-oracledb thin mode, or when

src/oracledb/impl/thick/var.pyx

@@ -121,7 +121,7 @@ cdef class ThickVarImpl(BaseVarImpl):
             object cursor
         cursor = self._values[pos]
         if cursor is None:
-            cursor = self._values[pos] = self._conn.cursor()
+            cursor = self._conn.cursor()
         cursor_impl = <ThickCursorImpl> cursor._impl
         if dpiStmt_addRef(dbvalue.asStmt) < 0:
             _raise_from_odpi()
@@ -138,8 +138,9 @@ cdef class ThickVarImpl(BaseVarImpl):
         """
         cdef:
             ThickDbObjectImpl obj_impl
-            object obj
-        obj = self._values[pos]
+            object obj = None
+        if not self._has_returned_data:
+            obj = self._values[pos]
         if obj is not None:
             obj_impl = <ThickDbObjectImpl> obj._impl
             if obj_impl._handle == dbvalue.asObject:
@@ -149,8 +150,7 @@ cdef class ThickVarImpl(BaseVarImpl):
         if dpiObject_addRef(dbvalue.asObject) < 0:
             _raise_from_odpi()
         obj_impl._handle = dbvalue.asObject
-        obj = self._values[pos] = PY_TYPE_DB_OBJECT._from_impl(obj_impl)
-        return obj
+        return PY_TYPE_DB_OBJECT._from_impl(obj_impl)
 
     cdef object _get_lob_value(self, dpiDataBuffer *dbvalue, uint32_t pos):
         """
@@ -160,16 +160,16 @@ cdef class ThickVarImpl(BaseVarImpl):
         """
         cdef:
             ThickLobImpl lob_impl
-            object lob
-        lob = self._values[pos]
+            object lob = None
+        if not self._has_returned_data:
+            lob = self._values[pos]
         if lob is not None:
             lob_impl = <ThickLobImpl> lob._impl
             if lob_impl._handle == dbvalue.asLOB:
                 return lob
         lob_impl = ThickLobImpl._create(self._conn_impl, self.metadata.dbtype,
                                         dbvalue.asLOB)
-        lob = self._values[pos] = PY_TYPE_LOB._from_impl(lob_impl)
-        return lob
+        return PY_TYPE_LOB._from_impl(lob_impl)
 
     cdef object _get_scalar_value(self, uint32_t pos):
         """
@@ -179,13 +179,21 @@ cdef class ThickVarImpl(BaseVarImpl):
         cdef:
             uint32_t num_returned_rows
             dpiData *returned_data
+            object value
         if self._has_returned_data:
             if dpiVar_getReturnedData(self._handle, pos, &num_returned_rows,
                                       &returned_data) < 0:
                 _raise_from_odpi()
             return self._transform_array_to_python(num_returned_rows,
                                                    returned_data)
-        return self._transform_element_to_python(pos, self._data)
+        value = self._transform_element_to_python(pos, self._data)
+        if self.metadata.dbtype._native_num in (
+            DPI_NATIVE_TYPE_LOB,
+            DPI_NATIVE_TYPE_OBJECT,
+            DPI_NATIVE_TYPE_STMT,
+        ):
+            self._values[pos] = value
+        return value
 
     cdef int _on_reset_bind(self, uint32_t num_rows) except -1:
         """

src/oracledb/impl/thin/messages/base.pyx

@@ -893,7 +893,7 @@ cdef class MessageWithData(Message):
         elif ora_type_num in (ORA_TYPE_NUM_CLOB,
                               ORA_TYPE_NUM_BLOB,
                               ORA_TYPE_NUM_BFILE):
-            if not self.in_fetch:
+            if self.cursor_impl._statement._is_plsql:
                 column_value = var_impl._values[pos]
             column_value = buf.read_lob_with_length(self.conn_impl,
                                                     metadata.dbtype,
@@ -909,7 +909,7 @@ cdef class MessageWithData(Message):
             else:
                 obj_impl = buf.read_dbobject(typ_impl)
                 if obj_impl is not None:
-                    if not self.in_fetch:
+                    if self.cursor_impl._statement._is_plsql:
                         column_value = var_impl._values[pos]
                     if column_value is not None:
                         column_value._impl = obj_impl

tests/test_1600_dml_returning.py

@@ -554,6 +554,68 @@ def test_1624(self):
         self.cursor.execute(sql, in_val=35, out_val=out_val)
         self.assertEqual(out_val.getvalue(), 70)
 
+    def test_1625(self):
+        "1625 - test DML returning with multiple LOBs returned"
+        lob_data = [
+            "Short CLOB - 1625a",
+            "Short CLOB - 1625b",
+            "Short CLOB - 1625c",
+            "Short CLOB - 1625d",
+        ]
+        all_data = [(i + 1, d) for i, d in enumerate(lob_data)]
+        self.cursor.execute("delete from TestCLOBs")
+        self.cursor.executemany(
+            "insert into TestCLOBs (IntCol, ClobCol) values (:1, :2)", all_data
+        )
+        ret_val = self.cursor.var(oracledb.DB_TYPE_CLOB)
+        self.cursor.execute(
+            """
+            update TestCLOBs set
+                ExtraNumCol1 = 1
+            where ExtraNumCol1 is null
+            returning ClobCol into :ret_val
+            """,
+            [ret_val],
+        )
+        self.conn.commit()
+        ret_lob_data = [v.read() for v in ret_val.getvalue()]
+        ret_lob_data.sort()
+        self.assertEqual(ret_lob_data, lob_data)
+
+    @unittest.skipUnless(test_env.get_is_thin(), "blocked by bug 37741324")
+    def test_1626(self):
+        "1626 - test DML returning with multiple DbObjects returned"
+        arrays = [
+            (1626, 1627, 1628),
+            (1629, 1630, 1631),
+            (1632, 1633, 1634),
+            (1635, 1636, 1637),
+        ]
+        all_data = [(i + 4, v[0], v[1], v[2]) for i, v in enumerate(arrays)]
+        self.cursor.execute("delete from TestObjects where IntCol > 3")
+        self.cursor.executemany(
+            """
+            insert into TestObjects (IntCol, ArrayCol)
+            values (:1, udt_Array(:1, :2, :3))
+            """,
+            all_data,
+        )
+        typ = self.conn.gettype("UDT_ARRAY")
+        ret_val = self.cursor.var(typ)
+        self.cursor.execute(
+            """
+            update TestObjects set
+                ObjectCol = null
+            where IntCol > 3
+            returning ArrayCol into :ret_val
+            """,
+            [ret_val],
+        )
+        self.conn.commit()
+        ret_obj_data = [tuple(v) for v in ret_val.getvalue()]
+        ret_obj_data.sort()
+        self.assertEqual(ret_obj_data, arrays)
+
 
 if __name__ == "__main__":
     test_env.run_test_cases()