Revert error checks since it has become clear that a number of people

depend on these "features" (#311).

Author: anthony-tuininga

doc/src/release_notes.rst

@@ -45,14 +45,6 @@ Common Changes
 #)  Added support for iterating over :ref:`DbObject <dbobject>` instances that
     are collections
     (`issue 314 <https://github.com/oracle/python-oracledb/issues/314>`__).
-#)  Error ``DPY-4031: connect string for network service name
-    '{network_service_name}' found in file '{new_file_name}' differs from
-    the same entry in '{orig_file_name}'`` is now raised when parsing
-    :ref:`tnsnames.ora <optnetfiles>` files that contain a network service name
-    defined more than once but with different connect strings.
-#)  Error ``DPY-4032: invalid network service definition detected at line
-    {line_no} of file '{file_name}'`` is now raised when an invalid network
-    service definition is found in a :ref:`tnsnames.ora <optnetfiles>` file.
 #)  Error ``ORA-24545: invalid value of POOL_BOUNDARY specified in connect
     string`` is now raised consistently for both Thick and Thin modes.
     Previously, Thin mode was raising the error

src/oracledb/errors.py

@@ -299,8 +299,6 @@ def _raise_err(
 ERR_INVALID_SERVER_TYPE = 4028
 ERR_TOO_MANY_BATCH_ERRORS = 4029
 ERR_IFILE_CYCLE_DETECTED = 4030
-ERR_NETWORK_SERVICE_NAME_DIFFERS = 4031
-ERR_NETWORK_SERVICE_NAME_INVALID = 4032
 
 # error numbers that result in InternalError
 ERR_MESSAGE_TYPE_UNKNOWN = 5000
@@ -598,15 +596,6 @@ def _raise_err(
         "national character set id {charset_id} is not supported by "
         "python-oracledb in thin mode"
     ),
-    ERR_NETWORK_SERVICE_NAME_DIFFERS: (
-        "connect string for network service name '{network_service_name}' "
-        "found in file '{new_file_name}' differs from the same entry in "
-        "'{orig_file_name}'"
-    ),
-    ERR_NETWORK_SERVICE_NAME_INVALID: (
-        "invalid network service definition detected at line {line_no} of "
-        "file '{file_name}'"
-    ),
     ERR_NO_CONFIG_DIR: "no configuration directory to search for tnsnames.ora",
     ERR_NO_CREDENTIALS: "no credentials specified",
     ERR_NO_CRYPTOGRAPHY_PACKAGE: (

src/oracledb/impl/base/connect_params.pyx

@@ -1058,13 +1058,6 @@ cdef class TnsnamesFileReader:
         duplicated. An entry is always made in the primary file as well.
         """
         cdef TnsnamesFile orig_file
-        if name in self.entries and value != self.primary_file.entries[name]:
-            orig_file = self.entries[name]
-            errors._raise_err(errors.ERR_NETWORK_SERVICE_NAME_DIFFERS,
-                              network_service_name=name,
-                              new_file_name=tnsnames_file.file_name,
-                              orig_file_name=orig_file.file_name)
-        self.entries[name] = tnsnames_file
         self.primary_file.entries[name] = value
         if tnsnames_file is not self.primary_file:
             tnsnames_file.entries[name] = value
@@ -1114,10 +1107,7 @@ cdef class TnsnamesFileReader:
                 if entry_names is None:
                     pos = line.find("=")
                     if pos < 0:
-                        errors._raise_err(
-                            errors.ERR_NETWORK_SERVICE_NAME_INVALID,
-                            line_no=line_no,
-                            file_name=tnsnames_file.file_name)
+                        continue
                     name = line[:pos].strip().upper()
                     if name == "IFILE":
                         file_name = line[pos + 1:].strip()
@@ -1147,7 +1137,6 @@ cdef class TnsnamesFileReader:
         """
         self.primary_file = None
         self.files_in_progress = []
-        self.entries = {}
         if dir_name is None:
             errors._raise_err(errors.ERR_NO_CONFIG_DIR)
         file_name = os.path.join(dir_name, "tnsnames.ora")

tests/test_7200_tnsnames.py

@@ -90,8 +90,10 @@ def test_7203(self):
                 f.write("some garbage data which is not a valid entry\n")
                 f.write(f"{network_service_name} = {connect_string}\n")
             params = oracledb.ConnectParams(config_dir=temp_dir)
-            with self.assertRaisesFullCode("DPY-4032"):
-                params.parse_connect_string(network_service_name)
+            params.parse_connect_string(network_service_name)
+            self.assertEqual(params.host, host)
+            self.assertEqual(params.port, port)
+            self.assertEqual(params.service_name, service_name)
 
     def test_7204(self):
         "7204 - test tnsnames.ora with multiple aliases on one line"
@@ -308,20 +310,25 @@ def test_7212(self):
 
     def test_7213(self):
         "7213 - duplicate entry in same file, but different connect strings"
-        host = "host_7213"
+        host_a = "host_7213a"
         port = 7213
-        service_name = "service_7213"
-        connect_string = f"{host}:{port}/{service_name}"
+        service_name_a = "service_7213a"
+        host_b = "host_7213b"
+        service_name_b = "service_7213b"
+        connect_string_a = f"{host_a}:{port}/{service_name_a}"
+        connect_string_b = f"{host_b}:{port}/{service_name_b}"
         network_service_name = "nsn_7213"
         with tempfile.TemporaryDirectory() as temp_dir:
             file_name = os.path.join(temp_dir, "tnsnames.ora")
             with open(file_name, "w") as f:
-                f.write(f"{network_service_name} = {connect_string}\n")
+                f.write(f"{network_service_name} = {connect_string_a}\n")
                 f.write("some_other_nsn = some_host/some_service\n")
-                f.write(f"{network_service_name} = x{connect_string}\n")
+                f.write(f"{network_service_name} = {connect_string_b}\n")
             params = oracledb.ConnectParams(config_dir=temp_dir)
-            with self.assertRaisesFullCode("DPY-4031"):
-                params.parse_connect_string(network_service_name)
+            params.parse_connect_string(network_service_name)
+            self.assertEqual(params.host, host_b)
+            self.assertEqual(params.port, port)
+            self.assertEqual(params.service_name, service_name_b)
 
     def test_7214(self):
         "7214 - duplicate entry in other file, but identical connect strings"
@@ -346,24 +353,29 @@ def test_7214(self):
             self.assertEqual(params.service_name, service_name)
 
     def test_7215(self):
-        "7215 - duplicate entry in other file, but identical connect strings"
-        host = "host_7215"
+        "7215 - duplicate entry in other file, but different connect strings"
+        host_a = "host_7215a"
         port = 7215
-        service_name = "service_7215"
-        connect_string = f"{host}:{port}/{service_name}"
+        service_name_a = "service_7215a"
+        host_b = "host_7215b"
+        service_name_b = "service_7215b"
+        connect_string_a = f"{host_a}:{port}/{service_name_a}"
+        connect_string_b = f"{host_b}:{port}/{service_name_b}"
         network_service_name = "nsn_7215"
         include_name = "inc_7215.ora"
         with tempfile.TemporaryDirectory() as temp_dir:
             file_name = os.path.join(temp_dir, "tnsnames.ora")
             include_file_name = os.path.join(temp_dir, include_name)
             with open(file_name, "w") as f:
-                f.write(f"{network_service_name} = {connect_string}\n")
+                f.write(f"{network_service_name} = {connect_string_a}\n")
                 f.write(f"IFILE = {include_name}")
             with open(include_file_name, "w") as f:
-                f.write(f"{network_service_name} = x{connect_string}\n")
+                f.write(f"{network_service_name} = {connect_string_b}\n")
             params = oracledb.ConnectParams(config_dir=temp_dir)
-            with self.assertRaisesFullCode("DPY-4031"):
-                params.parse_connect_string(network_service_name)
+            params.parse_connect_string(network_service_name)
+            self.assertEqual(params.host, host_b)
+            self.assertEqual(params.port, port)
+            self.assertEqual(params.service_name, service_name_b)
 
     def test_7216(self):
         "7216 - test missing IFILE in tnsnames.ora"