PyPI - jaaql-middleware-python - Versions diffs - 5.3.18__tar.gz → 5.3.19__tar.gz - Mend

@@ -14,8 +14,8 @@ import json
 from jaaql.db.db_interface import DBInterface, ECHO__none
 from psycopg.errors import OperationalError, Error
 from jaaql.constants import KEY__position, KEY__file, KEY__application, KEY__error, KEY__error_row_number, KEY__error_query, \
-    KEY__error_set, KEY__error_index, SQLStateJaaql, KEY__restrictions, REGEX__dmbs_object_name
-from jaaql.exceptions.jaaql_interpretable_handled_errors import DatabaseOperationalError, HandledProcedureError, UnhandledQueryError, UnhandledProcedureError, \
+    KEY__error_set, KEY__error_index, KEY__restrictions, REGEX__dmbs_object_name
+from jaaql.exceptions.jaaql_interpretable_handled_errors import handled_procedure_error_from_raise, DatabaseOperationalError, HandledProcedureError, UnhandledQueryError, UnhandledProcedureError, \
     SingletonExpected
 from typing import Union
 from functools import lru_cache
@@ -605,8 +605,9 @@ ORDER BY d.column_name;
                     }
                 )
             elif isinstance(ex, Error):
-                if ex.diag.sqlstate == SQLStateJaaql:
-                    err = HandledProcedureError(message=None, index=None, table_name=None, descriptor=json.loads(ex.diag.message_primary))
+                handled = handled_procedure_error_from_raise(ex)
+                if handled is not None:
+                    err = handled
                 elif query_key == "_jaaql_procedure":
                     err = UnhandledProcedureError(
                         message=str(ex),

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jaaql-middleware-python
-Version: 5.3.18
+Version: 5.3.19
 Summary: The jaaql package, allowing for rapid development and deployment of RESTful HTTP applications
 Home-page: https://github.com/JAAQL/JAAQL-middleware-python
 Author: Software Quality Measurement and Improvement bv

@@ -218,5 +218,5 @@ ROLE__dba = "dba"
 PROTOCOL__postgres = "postgresql://"
-VERSION = "5.3.18"
+VERSION = "5.3.19"

@@ -120,9 +120,18 @@ class DBInterface(ABC):
         # re-run on a fresh connection; any other commit failure is a genuine error.
         if self.is_connection_error(commit_err):
             raise ConnectionLostError(str(commit_err))
+        translated = self.translate_commit_error(commit_err)
+        if translated is not None:
+            raise translated
         raise HttpStatusException("Commit failed, transaction not persisted: " + str(commit_err),
                                   HTTPStatus.INTERNAL_SERVER_ERROR)
+    def translate_commit_error(self, commit_err):
+        # A deferred constraint trigger raises at COMMIT rather than during its statement. When what it
+        # raises is an error the statement path would have handed back as a handled error, a subclass
+        # returns that error here so the caller sees the same response either way; None keeps the 500
+        return None
     def handle_error(self, conn, err, echo=ECHO__none):
         commit_err = self.__attempt_commit_rollback(conn, err)
         if err is None and commit_err is not None:

@@ -12,7 +12,7 @@ from jaaql.constants import ERR__invalid_token
 from jaaql.db.db_interface import DBInterface, ECHO__none, CHAR__newline
 from jaaql.exceptions.http_status_exception import *
 from jaaql.exceptions.custom_http_status import CustomHTTPStatus
-from jaaql.exceptions.jaaql_interpretable_handled_errors import UserUnauthorized
+from jaaql.exceptions.jaaql_interpretable_handled_errors import UserUnauthorized, handled_procedure_error_from_raise
 from jaaql.constants import KEY__database
 ERR__connect_db = "Could not create connection to database!"
@@ -443,6 +443,11 @@ class DBPGInterface(DBInterface):
         # persisted nothing, so the operation is safe to retry on a fresh connection.
         return isinstance(ex, OperationalError)
+    def translate_commit_error(self, commit_err):
+        if not isinstance(commit_err, psycopg.Error):
+            return None
+        return handled_procedure_error_from_raise(commit_err)
     def handle_db_error(self, err, echo):
         if isinstance(err, ProgrammingError) and hasattr(err, 'pgresult'):
             err = err.pgresult.error_message.decode("UTF-8")

@@ -1,3 +1,6 @@
+import json
+from jaaql.constants import SQLStateJaaql
 from jaaql.exceptions.http_status_exception import JaaqlInterpretableHandledError
@@ -43,6 +46,19 @@ class HandledProcedureError(JaaqlInterpretableHandledError):
         )
+def handled_procedure_error_from_raise(ex):
+    # A JQ000 raise carries a JSON array of error records, whether it surfaced during its statement or at
+    # COMMIT from a deferred trigger; one that does not is left to the caller as an unhandled error
+    diag = getattr(ex, "diag", None)
+    if diag is None or diag.sqlstate != SQLStateJaaql:
+        return None
+    try:
+        descriptor = json.loads(diag.message_primary)
+    except (TypeError, ValueError):
+        return None
+    return HandledProcedureError(message=None, index=None, table_name=None, descriptor=descriptor)
 class UnhandledQueryError(JaaqlInterpretableHandledError):
     def __init__(self, message, _set, table_name=None, column_name=None, descriptor=None):
         super().__init__(

jaaql-middleware-python 5.3.18__tar.gz → 5.3.19__tar.gz

jaaql-middleware-python 5.3.18tar.gz → 5.3.19tar.gz