Convert dbapi errors into PEP 249 errors

Author: mdesmet

trino/exceptions.py

@@ -21,35 +21,57 @@
 logger = trino.logging.get_logger(__name__)
 
 
-class HttpError(Exception):
+# PEP 249 Errors
+class Error(Exception):
     pass
 
 
-class Http502Error(Exception):
+class Warning(Exception):
     pass
 
 
-class Http503Error(HttpError):
+class InterfaceError(Error):
     pass
 
 
-class Http504Error(HttpError):
+class DatabaseError(Error):
+    pass
+
+
+class InternalError(DatabaseError):
+    pass
+
+
+class OperationalError(DatabaseError):
+    pass
+
+
+class ProgrammingError(DatabaseError):
+    pass
+
+
+class IntegrityError(DatabaseError):
+    pass
+
+
+class DataError(DatabaseError):
     pass
 
 
-class TrinoError(Exception):
+class NotSupportedError(DatabaseError):
     pass
 
 
-class TrinoAuthError(Exception):
+# dbapi module errors (extending PEP 249 errors)
+class TrinoAuthError(OperationalError):
     pass
 
 
-class TrinoDataError(Exception):
+class TrinoDataError(NotSupportedError):
     pass
 
 
-class TrinoQueryError(Exception):
+class TrinoQueryError(Error):
     def __init__(self, error, query_id=None):
         self._error = error
         self._query_id = query_id
@@ -100,70 +122,46 @@ def __str__(self):
         return repr(self)
 
 
-class TrinoExternalError(TrinoQueryError):
-    pass
-
-
-class TrinoInternalError(TrinoQueryError):
-    pass
-
-
-class TrinoUserError(TrinoQueryError):
-    pass
-
-
-# PEP 249
-class Error(Exception):
+class TrinoExternalError(TrinoQueryError, OperationalError):
     pass
 
 
-class Warning(Exception):
+class TrinoInternalError(TrinoQueryError, InternalError):
     pass
 
 
-class InterfaceError(Error):
+class TrinoUserError(TrinoQueryError, ProgrammingError):
     pass
 
 
-class DatabaseError(Error):
-    pass
-
-
-class InternalError(DatabaseError):
-    pass
-
-
-class OperationalError(DatabaseError):
-    pass
-
-
-class ProgrammingError(DatabaseError):
+class FailedToObtainAddedPrepareHeader(Error):
+    """
+    Raise this exception when unable to find the 'X-Trino-Added-Prepare'
+    header in the response of a PREPARE statement request.
+    """
     pass
 
 
-class IntegrityError(DatabaseError):
+class FailedToObtainDeallocatedPrepareHeader(Error):
+    """
+    Raise this exception when unable to find the 'X-Trino-Deallocated-Prepare'
+    header in the response of a DEALLOCATED statement request.
+    """
     pass
 
 
-class DataError(DatabaseError):
+# client module errors
+class HttpError(Exception):
     pass
 
 
-class NotSupportedError(DatabaseError):
+class Http502Error(HttpError):
     pass
 
 
-class FailedToObtainAddedPrepareHeader(Error):
-    """
-    Raise this exception when unable to find the 'X-Trino-Added-Prepare'
-    header in the response of a PREPARE statement request.
-    """
+class Http503Error(HttpError):
     pass
 
 
-class FailedToObtainDeallocatedPrepareHeader(Error):
-    """
-    Raise this exception when unable to find the 'X-Trino-Deallocated-Prepare'
-    header in the response of a DEALLOCATED statement request.
-    """
+class Http504Error(HttpError):
     pass