Ensure that the type cache metadata cursor is closed when a connection

is returned to the pool (since it can no longer be used).

Author: anthony-tuininga

src/oracledb/impl/thin/dbobject.pyx

@@ -591,6 +591,25 @@ cdef class ThinDbObjectTypeCache:
         dict types_by_name
         list partial_types
 
+    cdef int _clear_meta_cursor(self) except -1:
+        """
+        Clears the cursor used for searching metadata. This is needed when
+        returning a connection to the pool since user-level objects are
+        retained.
+        """
+        if self.meta_cursor is not None:
+            self.meta_cursor.close()
+            self.meta_cursor = None
+            self.return_value_var = None
+            self.full_name_var = None
+            self.oid_var = None
+            self.tds_var = None
+            self.attrs_ref_cursor_var = None
+            self.version_var = None
+            self.schema_var = None
+            self.package_name_var = None
+            self.name_var = None
+
     cdef int _determine_element_type_csfrm(self, ThinDbObjectTypeImpl typ_impl,
                                            uint8_t* csfrm) except -1:
         """

src/oracledb/impl/thin/pool.pyx

@@ -296,7 +296,14 @@ cdef class ThinPoolImpl(BasePoolImpl):
         some reason it will be dropped; otherwise, it will be returned to the
         list of connections available for further use.
         """
+        cdef:
+            ThinDbObjectTypeCache type_cache
+            int cache_num
         with self._condition:
+            if conn_impl._dbobject_type_cache_num > 0:
+                cache_num = conn_impl._dbobject_type_cache_num
+                type_cache = get_dbobject_type_cache(cache_num)
+                type_cache._clear_meta_cursor()
             if conn_impl._protocol._socket is not None:
                 self._free_used_conn_impls.append(conn_impl)
                 conn_impl._time_in_pool = time.monotonic()

tests/test_2400_pool.py

@@ -707,5 +707,15 @@ def test_2429_soda_metadata_cache(self):
         pool.soda_metadata_cache = False
         self.assertEqual(pool.soda_metadata_cache, False)
 
+    def test_2430_get_different_types_from_pooled_connections(self):
+        "2430 - get different object types from different connections"
+        pool = test_env.get_pool(min=1, max=2, increment=1)
+        with pool.acquire() as conn:
+            typ = conn.gettype("UDT_SUBOBJECT")
+            self.assertEqual(typ.name, "UDT_SUBOBJECT")
+        with pool.acquire() as conn:
+            typ = conn.gettype("UDT_OBJECTARRAY")
+            self.assertEqual(typ.name, "UDT_OBJECTARRAY")
+
 if __name__ == "__main__":
     test_env.run_test_cases()