Ensure that the database object type cache is retained for pooled

connections but destroyed whenever a connection is destroyed.

Author: anthony-tuininga

src/oracledb/impl/thin/connection.pyx

@@ -220,6 +220,9 @@ cdef class ThinConnImpl(BaseConnImpl):
 
     cdef int _force_close(self) except -1:
         self._pool = None
+        if self._dbobject_type_cache_num > 0:
+            remove_dbobject_type_cache(self._dbobject_type_cache_num)
+            self._dbobject_type_cache_num = 0
         self._protocol._force_close()
 
     cdef Statement _get_statement(self, str sql, bint cache_statement):
@@ -301,9 +304,6 @@ cdef class ThinConnImpl(BaseConnImpl):
 
     def close(self, bint in_del=False):
         try:
-            if self._dbobject_type_cache_num > 0:
-                remove_dbobject_type_cache(self._dbobject_type_cache_num)
-                self._dbobject_type_cache_num = 0
             self._protocol._close(self)
         except (ssl.SSLError, exceptions.DatabaseError):
             pass

src/oracledb/impl/thin/protocol.pyx

@@ -107,10 +107,14 @@ cdef class Protocol:
 
             # if the connection is part of a pool, return it to the pool
             if conn_impl._pool is not None:
-                conn_impl._pool._return_connection(conn_impl)
+                return conn_impl._pool._return_connection(conn_impl)
 
-            # otherwise, send the logoff message and final close
-            elif self._socket is not None:
+            # otherwise, destroy the database object type cache, send the
+            # logoff message and final close packet
+            if conn_impl._dbobject_type_cache_num > 0:
+                remove_dbobject_type_cache(conn_impl._dbobject_type_cache_num)
+                conn_impl._dbobject_type_cache_num = 0
+            if self._socket is not None:
                 if not conn_impl._drcp_enabled:
                     message = conn_impl._create_message(LogoffMessage)
                     self._process_message(message)