Improve calculation of default configuration directory.

Author: anthony-tuininga

doc/src/release_notes.rst

@@ -72,6 +72,12 @@ Thin Mode Changes
 Thick Mode Changes
 ++++++++++++++++++
 
+#)  The value of :attr:`defaults.config_dir` is now calculated from the
+    location of the Oracle Client shared library on some platforms. If a value
+    is supplied to the ``config_dir`` parameter of
+    :meth:`oracledb.init_oracle_client()`, then the value of
+    :attr:`defaults.config_dir` is set to that value after the call completes
+    successfully.
 #)  Fixed bug that caused :attr:`oracledb._Error.isrecoverable` to always be
     `False`.
 
@@ -88,6 +94,9 @@ Common Changes
 #)  Added :meth:`oracledb.register_password_type()` to allow users to register
     a function that will be called when a password is supplied as a dictionary
     containing the key "type".
+#)  Set the default value of :attr:`defaults.config_dir` to
+    ``$ORACLE_HOME/network/admin`` if the environment variable ``ORACLE_HOME``
+    is set.
 #)  All connect strings are parsed by the driver if the new parameter
     ``thick_mode_dsn_passthrough`` is set to *True*. Previously, only Thin
     mode parsed all connect strings and Thick mode passed the connect string

src/oracledb/impl/base/defaults.pyx

@@ -33,6 +33,10 @@ cdef class DefaultsImpl:
     def __init__(self):
         self.arraysize = 100
         self.config_dir = os.environ.get("TNS_ADMIN")
+        if self.config_dir is None:
+            oracle_home = os.environ.get("ORACLE_HOME")
+            if oracle_home is not None:
+                self.config_dir = os.path.join(oracle_home, "network", "admin")
         self.fetch_lobs = True
         self.fetch_decimals = False
         self.prefetchrows = 2

src/oracledb/impl/thick/utils.pyx

@@ -1,5 +1,5 @@
 #------------------------------------------------------------------------------
-# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
 #
 # This software is dual-licensed to you under the Universal Permissive License
 # (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
@@ -531,6 +531,8 @@ def init_oracle_client(lib_dir=None, config_dir=None, error_url=None,
         params.useJsonId = True
         if config_dir is None:
             config_dir = C_DEFAULTS.config_dir
+        else:
+            C_DEFAULTS.config_dir = config_dir
         if lib_dir is not None:
             if isinstance(lib_dir, bytes):
                 lib_dir_bytes = lib_dir
@@ -558,6 +560,8 @@ def init_oracle_client(lib_dir=None, config_dir=None, error_url=None,
                                        &params, &driver_info.context,
                                        &error_info) < 0:
             _raise_from_info(&error_info)
+        if config_dir is None and params.oracleClientConfigDir != NULL:
+            C_DEFAULTS.config_dir = params.oracleClientConfigDir.decode()
         if dpiContext_getClientVersion(driver_info.context,
                                        &driver_info.client_version_info) < 0:
             _raise_from_odpi()