Added support for multiple aliases in one entry in tnsnames.ora (as

discovered in issue #3).

Author: anthony-tuininga

doc/src/release_notes.rst

@@ -11,6 +11,8 @@ For deprecations, see :ref:`Deprecations <deprecations>`.
 oracledb 1.0.1 (TBD)
 --------------------
 
+#)  Added support for multiple aliases in one entry in tnsnames.ora
+    (`issue 3 <https://github.com/oracle/python-oracledb/issues/3>`__).
 #)  Ensured the name of wrapped functions are the same as the function being
     wrapped in order to improve error messages that reference them.
 

src/oracledb/impl/base/connect_params.pyx

@@ -729,25 +729,27 @@ cdef class TnsnamesFile:
         the file.
         """
         with open(self.file_name) as f:
-            entry_name = None
+            entry_names = None
             for line in f:
                 line = line.strip()
                 pos = line.find("#")
                 if pos >= 0:
                     line = line[:pos]
                 if not line:
                     continue
-                if entry_name is None:
+                if entry_names is None:
                     pos = line.find("=")
                     if pos < 0:
                         continue
-                    entry_name = line[:pos].strip().upper()
+                    entry_names = [s.strip() for s in line[:pos].split(",")]
                     entry_lines = []
                     num_parens = 0
                     line = line[pos+1:].strip()
                 if line:
                     num_parens += line.count("(") - line.count(")")
                     entry_lines.append(line)
                 if entry_lines and num_parens <= 0:
-                    self.entries[entry_name.upper()] = "".join(entry_lines)
-                    entry_name = None
+                    descriptor = "".join(entry_lines)
+                    for name in entry_names:
+                        self.entries[name.upper()] = descriptor
+                    entry_names = None

tests/test_4500_connect_params.py

@@ -483,5 +483,22 @@ def test_4531_build_connect_string_with_tcp_connect_timeout(self):
                              f"(SECURITY=(SSL_SERVER_DN_MATCH=True)))"
             self.assertEqual(params.get_connect_string(), connect_string)
 
+    def test_4532_multiple_alias_entry_tnsnames(self):
+        "4532 - test tnsnames.ora with multiple aliases on one line"
+        connect_string = \
+            "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=my_host32)(PORT=1132))" \
+            "(CONNECT_DATA=(SERVICE_NAME=my_service_name32)))"
+        aliases = f"tns_alias32a,tns_alias32b = {connect_string}"
+        with tempfile.TemporaryDirectory() as temp_dir:
+            file_name = os.path.join(temp_dir, "tnsnames.ora")
+            with open(file_name, "w") as f:
+                print(aliases, file=f)
+            params = oracledb.ConnectParams(config_dir=temp_dir)
+            for name in ("tns_alias32a", "tns_alias32b"):
+                params.parse_connect_string(name)
+                self.assertEqual(params.host, "my_host32")
+                self.assertEqual(params.port, 1132)
+                self.assertEqual(params.service_name, "my_service_name32")
+
 if __name__ == "__main__":
     test_env.run_test_cases()