jaaql-middleware-python 4.23.12__tar.gz → 4.23.13__tar.gz

{jaaql-middleware-python-4.23.12/jaaql_middleware_python.egg-info → jaaql-middleware-python-4.23.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jaaql-middleware-python
-Version: 4.23.12
+Version: 4.23.13
 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

{jaaql-middleware-python-4.23.12 → jaaql-middleware-python-4.23.13}/jaaql/constants.py

@@ -179,5 +179,5 @@ ROLE__postgres = "postgres"
 
 PROTOCOL__postgres = "postgresql://"
 
-VERSION = "4.23.12"
+VERSION = "4.23.13"
 

{jaaql-middleware-python-4.23.12 → jaaql-middleware-python-4.23.13}/jaaql/exceptions/jaaql_interpretable_handled_errors.py

@@ -184,12 +184,12 @@ class InvalidSecurityEventLock(JaaqlInterpretableHandledError):
 
 
 class MissingParameterInQuery(JaaqlInterpretableHandledError):
-    def __init__(self, message, _set, descriptor=None):
+    def __init__(self, _set, descriptor=None):
         super().__init__(
             error_code=1014,
             http_response_code=422,
             table_name=None,
-            message=message,
+            message="A query has been sent that expects a parameter but this parameter has not been provided",
             column_name=None,
             _set=_set,
             index=None,
@@ -198,12 +198,12 @@ class MissingParameterInQuery(JaaqlInterpretableHandledError):
 
 
 class ExpectedParameterInQuery(JaaqlInterpretableHandledError):
-    def __init__(self, message, descriptor=None):
+    def __init__(self, descriptor=None):
         super().__init__(
             error_code=1015,
             http_response_code=422,
             table_name=None,
-            message=message,
+            message="A parameter has been sent to a query that has not been used",
             column_name=None,
             _set=None,
             index=None,

{jaaql-middleware-python-4.23.12 → jaaql-middleware-python-4.23.13}/jaaql/interpreter/interpret_jaaql.py

@@ -12,7 +12,7 @@ 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, \
-    SingletonExpected, ExpectedParameterInQuery, MissingParameterInQuery
+    SingletonExpected
 from typing import Union
 
 
@@ -220,8 +220,9 @@ class InterpretJAAQL:
         exc_state = None
 
         try:
-            check_unused = unused_orig_parameters.copy()
             if prevent_unused_parameters:
+                check_unused = unused_orig_parameters.copy()
+
                 for query_key, query_obj in query.items():
                     was_store = is_dict_query and KEY_store in query_obj
                     if was_store:
@@ -229,20 +230,21 @@ class InterpretJAAQL:
                     else:
                         cur_query = query_obj[KEY_query]
 
-                        last_query, found_parameter_dictionary = self.pre_prepare_statement(cur_query, parameters, require_presence=False,
-                                                                                            query_name=query_key)
+                        last_query, found_parameter_dictionary = self.pre_prepare_statement(cur_query, parameters, require_presence=False)
                         enc_parameter_dictionary = {}
                         encrypt_parameters = {key: val for key, val in parameters.items() if key not in found_parameter_dictionary}
                         if len(encrypt_parameters) != 0:
                             last_query, enc_parameter_dictionary = self.pre_prepare_statement(last_query, encrypt_parameters,
                                                                                               match_regex=REGEX_enc_query_argument,
                                                                                               encryption_key=encryption_key,
-                                                                                              require_presence=False,
-                                                                                              query_name=query_key)
+                                                                                              require_presence=False)
 
                         found_params = {**found_parameter_dictionary, **enc_parameter_dictionary}
                         check_unused -= set(found_params.keys())
 
+                if len(check_unused):
+                    raise HttpStatusException(ERR_unused_parameter % list(check_unused)[0], HTTPStatus.BAD_REQUEST)
+
             for query_key, query_obj in query.items():
                 exc_query_key = query_key
                 replacement_parameters = {**past_parameters, **parameters, **query_obj[KEY_parameters]}
@@ -307,7 +309,7 @@ class InterpretJAAQL:
                     exc_row_number = cur_parameters.get(KEY__row_number)
                     last_query, found_parameter_dictionary = self.pre_prepare_statement(
                         cur_query, cur_parameters, for_prepare=do_prepare_only is not False and do_prepare_only is not None,
-                        skipped_singletons=skipped_singletons, query_name=query_key)
+                        skipped_singletons=skipped_singletons)
 
                     enc_parameter_dictionary = {}
 
@@ -317,7 +319,7 @@ class InterpretJAAQL:
                         last_query, enc_parameter_dictionary = self.pre_prepare_statement(
                             last_query, encrypt_parameters, match_regex=REGEX_enc_query_argument,
                             encryption_key=encryption_key, for_prepare=do_prepare_only is not False and do_prepare_only is not None,
-                            skipped_singletons=skipped_singletons, query_name=query_key)
+                            skipped_singletons=skipped_singletons)
 
                     last_query = self.encrypt_literals(last_query, encryption_key)
                     found_params = {**found_parameter_dictionary, **enc_parameter_dictionary}
@@ -391,11 +393,6 @@ class InterpretJAAQL:
                             res["rows"] = [
                                 [decrypt_raw_ex(encryption_key, val) if col in query_obj[KEY_decrypt] and val is not None else val for val, col in
                                  zip(row, res["columns"])] for row in res["rows"]]
-
-            if len(check_unused) and prevent_unused_parameters:
-                raise ExpectedParameterInQuery(ERR_unused_parameter % list(check_unused)[0], {
-                    "parameters": list(check_unused)
-                })
         except Exception as ex:
             traceback.print_exc()
             if isinstance(ex, OperationalError):
@@ -667,8 +664,7 @@ class InterpretJAAQL:
         return new_query + query[last_end_match:]
 
     def pre_prepare_statement(self, query, parameters, match_regex: str = REGEX_query_argument, encryption_key: bytes = None,
-                              require_presence: bool = True, for_prepare: bool = False, skipped_singletons: list[str] = None,
-                              query_name: str = None):
+                              require_presence: bool = True, for_prepare: bool = False, skipped_singletons: list[str] = None):
         prepared = ""
         last_index = 0
         found_parameters = []
@@ -696,7 +692,7 @@ class InterpretJAAQL:
                         if skipped_singletons is not None and len(skipped_singletons) != 0:
                             missing_str += ". Is it possible the parameter exists in one of the following restricted singletons: " + ", ".join(
                                 missing_str) + "?"
-                        raise MissingParameterInQuery(missing_str, query_name, {"parameter": match_str})
+                        raise HttpStatusException(missing_str, HTTPStatus.BAD_REQUEST)
                     else:
                         continue
                 elif match_str not in parameters and match_str in MARKERS:

{jaaql-middleware-python-4.23.12 → jaaql-middleware-python-4.23.13}/jaaql/mvc/exception_queries.py

@@ -1,5 +1,5 @@
 """
-This script was generated from jaaql.exceptions.fxli at 2024-05-31, 19:12:21
+This script was generated from jaaql.exceptions.fxli at 2024-04-30, 13:33:05
 """
 
 from jaaql.utilities.crypt_utils import get_repeatable_salt

{jaaql-middleware-python-4.23.12 → jaaql-middleware-python-4.23.13}/jaaql/mvc/generated_queries.py

@@ -1,5 +1,5 @@
 """
-This script was generated from jaaql.fxli at 2024-05-31, 19:12:21
+This script was generated from jaaql.fxli at 2024-04-30, 13:33:05
 """
 
 from jaaql.db.db_interface import DBInterface