Revert addition of oracledb.ConnectionError since it isn't strictly

necessary and more time is needed to consider whether it is an
improvement or not! Adjusted release notes in preparation for release of
1.0.1.

Author: anthony-tuininga

doc/src/release_notes.rst

@@ -7,39 +7,47 @@ python-oracledb Release Notes
 
 For deprecations, see :ref:`Deprecations <deprecations>`.
 
-
 oracledb 1.0.1 (TBD)
 --------------------
 
-#)  Thick: restored support for bequeath connections.
-#)  Thick: fixed issue fetching NCLOB with
-    `oracledb.defaults.fetch_lobs = False`.
-#)  Thin: added support for multiple aliases in one entry in tnsnames.ora
+Thin Mode Changes
++++++++++++++++++
+
+#)  Added support for multiple aliases in one entry in tnsnames.ora
     (`issue 3 <https://github.com/oracle/python-oracledb/issues/3>`__).
-#)  Thin: return the same value for timestamp with time zone columns as thick
-    (`issue 7 <https://github.com/oracle/python-oracledb/issues/7>`__).
-#)  Thin: fixed retry count handling to work in cases where the listener is
-    running but the service is down
+#)  Fixed connection retry count handling to work in cases where the database
+    listener is running but the service is down
     (`issue 3 <https://github.com/oracle/python-oracledb/issues/3>`__).
-#)  Thin: if an error occurs during the creation of a connection to the
-    database, the error is wrapped by DPY-6005 as an instance of
-    oracledb.ConnectionError.
-#)  Thin: fixed order in which bind data is sent to the server when LONG and
+#)  Return the same value for TIMESTAMP WITH TIME ZONE columns as thick mode
+    (`issue 7 <https://github.com/oracle/python-oracledb/issues/7>`__).
+#)  Fixed order in which bind data is sent to the server when LONG and
     non-LONG column data is interspersed
     (`issue 12 <https://github.com/oracle/python-oracledb/issues/12>`__).
-#)  Thin: ensure that errors that occur during fetch are detected consistently.
-#)  Thin: fixed issue when fetching null values in implicit results.
-#)  Thin: small optimization when sending column metadata.
+#)  If an error occurs during the creation of a connection to the database, the
+    error is wrapped by DPY-6005 (so that it can be caught with an exception
+    handler on class oracledb.DatabaseError).
+#)  Ensured that errors occurring during fetch are detected consistently.
+#)  Fixed issue when fetching null values in implicit results.
+#)  Small performance optimization when sending column metadata.
+
+Thick Mode Changes
+++++++++++++++++++
+
+#)  Restored support for bequeath connections to a local database.
+#)  Fixed issue fetching NCLOB columns with
+    `oracledb.defaults.fetch_lobs = False`.
+
+Common Changes
+++++++++++++++
+
 #)  Fixed issue where unconstrained numbers containing integer values would be
-    fetched as floats when oracledb.defaults.fetch_lobs was set to `False`
+    fetched as floats when `oracledb.defaults.fetch_lobs = False`.
     (`issue 15 <https://github.com/oracle/python-oracledb/issues/15>`__).
-#)  Ensured the name of wrapped functions are the same as the function being
-    wrapped in order to improve error messages that reference them.
-#)  Added exception class (oracledb.ConnectionError) as a subclass of
-    oracledb.DatabaseError in order to aid the handling of connection errors
-    during creation or use (where the connection is no longer usable or could
-    not be established).
-#)  Improved samples and documentation.
+#)  Ensured connection error messages contain the function name instead of
+    ``wrapped()``.
+#)  Improved samples, including adding a Dockerfile that starts a container
+    with a running database and the samples.
+#)  Improved documentation.
 
 
 oracledb 1.0.0 (May 2022)

src/oracledb/errors.py

@@ -68,7 +68,7 @@ def __init__(self, message: str=None, context: str=None,
                     args = re.search(pattern, message).groupdict()
                 else:
                     driver_error_num = driver_error_info
-                if driver_error_num in ERR_CONNECTION_ERROR_SET:
+                if driver_error_num == ERR_CONNECTION_CLOSED:
                     self.is_session_dead = True
                 driver_error = _get_error_text(driver_error_num, **args)
                 self.message = f"{driver_error}\n{self.message}"
@@ -99,10 +99,7 @@ def _raise_err(error_num: int, context_error_message: str=None,
     message = _get_error_text(error_num, **args)
     if context_error_message is not None:
         message = f"{message}\n{context_error_message}"
-    if error_num in ERR_CONNECTION_ERROR_SET:
-        exc_type = exceptions.ConnectionError
-    else:
-        exc_type = ERR_EXCEPTION_TYPES[error_num // 1000]
+    exc_type = ERR_EXCEPTION_TYPES[error_num // 1000]
     raise exc_type(_Error(message)) from cause
 
 
@@ -239,15 +236,6 @@ def _raise_from_string(exc_type: Exception, message: str) -> None:
     1080: ERR_CONNECTION_CLOSED,
 }
 
-# dead connection errors
-ERR_CONNECTION_ERROR_SET = set([
-    ERR_CONNECTION_CLOSED,
-    ERR_CONNECTION_FAILED,
-    ERR_INVALID_SERVICE_NAME,
-    ERR_INVALID_SID,
-    ERR_LISTENER_REFUSED_CONNECTION
-])
-
 # error message exception types (multiples of 1000)
 ERR_EXCEPTION_TYPES = {
     1: exceptions.InterfaceError,

src/oracledb/exceptions.py

@@ -25,10 +25,7 @@
 #------------------------------------------------------------------------------
 # exceptions.py
 #
-# Contains the exception classes mandated by the Python Database API and one
-# additional one (ConnectionError) for aiding in the handling of connection
-# failures when the connection is being created or used (and the connection is
-# no longer usable).
+# Contains the exception classes mandated by the Python Database API.
 #------------------------------------------------------------------------------
 
 class Warning(Exception):
@@ -43,10 +40,6 @@ class DatabaseError(Error):
     pass
 
 
-class ConnectionError(DatabaseError):
-    pass
-
-
 class DataError(DatabaseError):
     pass
 

src/oracledb/impl/thin/connection.pyx

@@ -230,7 +230,7 @@ cdef class ThinConnImpl(BaseConnImpl):
                                                                 address)
             if redirect_params is not None:
                 return redirect_params
-        except exceptions.ConnectionError:
+        except exceptions.DatabaseError:
             if raise_exception:
                 raise
             return