Fixed bug preventing correct parsing of connect descriptors with both

ADDRESS and ADDRESS_LIST components at the same level.

Author: anthony-tuininga

doc/src/release_notes.rst

@@ -29,6 +29,8 @@ Thin Mode Changes
     REF CURSOR to a PL/SQL block that closes it.
 #)  Fixed bug preventing binding OUT data of type
     :data:`~oracledb.DB_TYPE_UROWID` that exceed 3950 bytes in length.
+#)  Fixed bug preventing correct parsing of connect descriptors with both
+    ADDRESS and ADDRESS_LIST components at the same level.
 
 Thick Mode Changes
 ++++++++++++++++++

src/oracledb/base_impl.pxd

@@ -188,6 +188,7 @@ cdef class ConnectParamsImpl:
         bytearray _token_obfuscator
         bytearray _private_key
         bytearray _private_key_obfuscator
+        bint _has_components
 
     cdef int _check_credentials(self) except -1
     cdef int _copy(self, ConnectParamsImpl other_params) except -1

src/oracledb/impl/base/connect_params.pyx

@@ -67,6 +67,19 @@ cdef uint32_t DEFAULT_PORT = 1521
 cdef double DEFAULT_TCP_CONNECT_TIMEOUT = 60
 
 
+cdef int _add_container(dict args, str name, object value) except -1:
+    """
+    Adds a container to the arguments.
+    """
+    if name == "address" and "address_list" in args:
+        value = dict(address=[value])
+        name = "address_list"
+    elif name == "address_list" and "address" in args:
+        args[name] = [dict(address=[v]) for v in args["address"]]
+        del args["address"]
+    args.setdefault(name, []).append(value)
+
+
 cdef dict _parse_connect_descriptor(str data, dict args):
     """
     Internal method which parses a connect descriptor containing name-value
@@ -104,7 +117,7 @@ cdef dict _parse_connect_descriptor(str data, dict args):
             data = data[end_pos + 1:].strip()
     name = ALTERNATIVE_PARAM_NAMES.get(name, name)
     if name in CONTAINER_PARAM_NAMES:
-        args.setdefault(name, []).append(value)
+        _add_container(args, name, value)
     else:
         args[name] = value
     return args
@@ -156,6 +169,8 @@ cdef class ConnectParamsImpl:
         self._default_address.set_from_args(args)
         _set_bool_param(args, "externalauth", &self.externalauth)
         self._set_access_token_param(args.get("access_token"))
+        if args:
+            self._has_components = True
 
     cdef int _check_credentials(self) except -1:
         """
@@ -329,6 +344,7 @@ cdef class ConnectParamsImpl:
         # to be a full connect descriptor
         if connect_string.startswith("("):
             _parse_connect_descriptor(connect_string, args)
+            self._has_components = True
             return self._process_connect_descriptor(args)
 
         # otherwise, see if the connect string is an EasyConnect string
@@ -373,6 +389,9 @@ cdef class ConnectParamsImpl:
             _parse_connect_descriptor(connect_string, args)
             self._process_connect_descriptor(args)
 
+        # mark that object has components
+        self._has_components = True
+
     cdef int _process_connect_descriptor(self, dict args) except -1:
         """
         Internal method used for processing the parsed connect descriptor into
@@ -519,7 +538,7 @@ cdef class ConnectParamsImpl:
         will be a connect string built up from the components supplied when the
         object was built.
         """
-        if self._default_address.host is not None:
+        if self._has_components:
             return self.description_list.build_connect_string()
 
     def get_full_user(self):

tests/test_4500_connect_params.py

@@ -520,5 +520,38 @@ def test_4533_easy_connect_with_pool_parameters(self):
             self.assertEqual(params.cclass, cclass)
             self.assertEqual(params.purity, purity_int)
 
+    def test_4534_connect_descriptor_small_container_first(self):
+        "4534 - test connect descriptor with different containers (small 1st)"
+        connect_string = """
+            (DESCRIPTION=
+                (ADDRESS=(PROTOCOL=tcp)(HOST=host1)(PORT=1521))
+                (ADDRESS_LIST=
+                    (ADDRESS=(PROTOCOL=tcp)(HOST=host2a)(PORT=1522))
+                    (ADDRESS=(PROTOCOL=tcp)(HOST=host2b)(PORT=1523)))
+                (ADDRESS=(PROTOCOL=tcp)(HOST=host3)(PORT=1524))
+                (CONNECT_DATA=(SERVICE_NAME=my_service_34))
+            )"""
+        params = oracledb.ConnectParams()
+        params.parse_connect_string(connect_string)
+        self.assertEqual(params.host, ["host1", "host2a", "host2b", "host3"])
+
+    def test_4535_connect_descriptor_small_container_second(self):
+        "4535 - test connect descriptor with different containers (small 2nd)"
+        connect_string = """
+            (DESCRIPTION=
+                (ADDRESS_LIST=
+                    (ADDRESS=(PROTOCOL=tcp)(HOST=host1a)(PORT=1532))
+                    (ADDRESS=(PROTOCOL=tcp)(HOST=host1b)(PORT=1533)))
+                (ADDRESS=(PROTOCOL=tcp)(HOST=host2)(PORT=1534))
+                (ADDRESS_LIST=
+                    (ADDRESS=(PROTOCOL=tcp)(HOST=host3a)(PORT=1535))
+                    (ADDRESS=(PROTOCOL=tcp)(HOST=host3b)(PORT=1536)))
+                (CONNECT_DATA=(SERVICE_NAME=my_service_34))
+            )"""
+        params = oracledb.ConnectParams()
+        params.parse_connect_string(connect_string)
+        self.assertEqual(params.host,
+                         ["host1a", "host1b", "host2", "host3a", "host3b"])
+
 if __name__ == "__main__":
     test_env.run_test_cases()