Fixed bug in ConnectParams.set() that would clear the "ssl_context",

"appcontext", "shardingkey" and "supershardingkey" parameters if they
were not included in the parameters. This also affected calls to
oracledb.connect() and oracledb.create_pool() that made use of the DSN
with credentials format.

Author: anthony-tuininga

doc/src/release_notes.rst

@@ -91,6 +91,11 @@ Common Changes
     ``DPI-1040: LOB was already closed``.
 #)  Fixed bug in :meth:`ConnectParams.get_connect_string()` when a value for
     the connection parameter ``purity`` has been specified.
+#)  Fixed bug in :meth:`ConnectParams.set()` that would clear the
+    ``ssl_context``, ``appcontext``, ``shardingkey`` and ``supershardingkey``
+    parameters if they were not included in the parameters. This also affected
+    calls to :meth:`oracledb.connect()` and :meth:`oracledb.create_pool()` that
+    made use of the DSN with credentials format.
 #)  Fixed bug in the calculation of :data:`Cursor.rowcount` under some
     circumstances.
 #)  Connection parameters that are strings now treat an empty string in the

src/oracledb/impl/base/connect_params.pyx

@@ -144,7 +144,7 @@ cdef class ConnectParamsImpl:
         Sets the property values based on the supplied arguments. All values
         not supplied will be left unchanged.
         """
-        self._external_handle = args.get("handle", 0)
+        self._external_handle = args.get("handle", self._external_handle)
         _set_str_param(args, "user", self)
         _set_str_param(args, "proxy_user", self)
         if self.proxy_user is None and self.user is not None:
@@ -159,12 +159,12 @@ cdef class ConnectParamsImpl:
         _set_bool_param(args, "matchanytag", &self.matchanytag)
         _set_uint_param(args, "stmtcachesize", &self.stmtcachesize)
         _set_bool_param(args, "disable_oob", &self.disable_oob)
-        self.ssl_context = args.get("ssl_context")
+        _set_obj_param(args, "ssl_context", self)
         _set_str_param(args, "debug_jdwp", self)
         _set_str_param(args, "config_dir", self)
-        self.appcontext = args.get("appcontext")
-        self.shardingkey = args.get("shardingkey")
-        self.supershardingkey = args.get("supershardingkey")
+        _set_obj_param(args, "appcontext", self)
+        _set_obj_param(args, "shardingkey", self)
+        _set_obj_param(args, "supershardingkey", self)
         self._default_description.set_from_connect_data_args(args)
         self._default_description.set_from_description_args(args)
         self._default_description.set_from_security_args(args)

src/oracledb/impl/base/utils.pyx

@@ -91,6 +91,16 @@ cdef int _set_uint_param(dict args, str name, uint32_t* out_val) except -1:
         out_val[0] = int(in_val)
 
 
+cdef int _set_obj_param(dict args, str name, object target) except -1:
+    """
+    Sets an object parameter to the value provided in the dictionary, if a
+    value is provided. This value is then set directly on the target.
+    """
+    in_val = args.get(name)
+    if in_val is not None:
+        setattr(target, name, in_val)
+
+
 cdef int _set_pool_boundary_param(dict args, str name,
                                   object target) except -1:
     """

tests/test_4500_connect_params.py

@@ -27,6 +27,7 @@
 """
 
 import os
+import ssl
 import tempfile
 import random
 
@@ -792,6 +793,30 @@ def test_4570(self):
             )
             params.parse_connect_string(connect_string)
 
+    def test_4571(self):
+        "4571 - calling set() doesn't clear object parameters"
+        sharding_key = [1, 2, 3]
+        super_sharding_key = [4, 5, 6]
+        app_context = [("NAMESPACE", "KEY", "VALUE")]
+        ssl_context = ssl.create_default_context()
+        params = oracledb.ConnectParams(
+            shardingkey=sharding_key,
+            supershardingkey=super_sharding_key,
+            appcontext=app_context,
+            ssl_context=ssl_context,
+        )
+        self.assertEqual(params.appcontext, app_context)
+        self.assertEqual(params.shardingkey, sharding_key)
+        self.assertEqual(params.supershardingkey, super_sharding_key)
+        self.assertEqual(params.ssl_context, ssl_context)
+        user = "user_4571"
+        params.set(user=user)
+        self.assertEqual(params.user, user)
+        self.assertEqual(params.appcontext, app_context)
+        self.assertEqual(params.shardingkey, sharding_key)
+        self.assertEqual(params.supershardingkey, super_sharding_key)
+        self.assertEqual(params.ssl_context, ssl_context)
+
 
 if __name__ == "__main__":
     test_env.run_test_cases()