jaaql-middleware-python 5.3.13__tar.gz → 5.3.15__tar.gz

{jaaql_middleware_python-5.3.13 → jaaql_middleware_python-5.3.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jaaql-middleware-python
-Version: 5.3.13
+Version: 5.3.15
 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-5.3.13 → jaaql_middleware_python-5.3.15}/jaaql/constants.py

@@ -218,5 +218,5 @@ ROLE__dba = "dba"
 
 PROTOCOL__postgres = "postgresql://"
 
-VERSION = "5.3.13"
+VERSION = "5.3.15"
 

{jaaql_middleware_python-5.3.13 → jaaql_middleware_python-5.3.15}/jaaql/interpreter/interpret_jaaql.py

@@ -384,14 +384,21 @@ class InterpretJAAQL:
                             requires_dba_check=check_required and canned_query_service is not None)
                         wait_hook = None
                         check_required = False
-                        self.db_interface.execute_query_fetching_results(conn, "SAVEPOINT __jaaql_provenance")
+                        # In autocommit mode a failed statement cannot poison a transaction, and
+                        # SAVEPOINT itself is rejected outside a transaction block
+                        provenance_savepoint = False
                         try:
+                            if not getattr(conn, "autocommit", False):
+                                self.db_interface.execute_query_fetching_results(conn, "SAVEPOINT __jaaql_provenance")
+                                provenance_savepoint = True
                             provenance_res = self.fetch_domain_types_via_provenance(conn, last_query, described, provenance)
-                            self.db_interface.execute_query_fetching_results(conn, "RELEASE SAVEPOINT __jaaql_provenance")
+                            if provenance_savepoint:
+                                self.db_interface.execute_query_fetching_results(conn, "RELEASE SAVEPOINT __jaaql_provenance")
                         except Exception:
                             traceback.print_exc()
                             provenance_res = None
-                            self.db_interface.execute_query_fetching_results(conn, "ROLLBACK TO SAVEPOINT __jaaql_provenance")
+                            if provenance_savepoint:
+                                self.db_interface.execute_query_fetching_results(conn, "ROLLBACK TO SAVEPOINT __jaaql_provenance")
 
                     if attempt_fetch_domain_types and provenance_res is None:
                         temp_view_name = ''.join(random.choices(string.ascii_letters + string.digits, k=10))

{jaaql_middleware_python-5.3.13 → jaaql_middleware_python-5.3.15}/jaaql/mvc/model.py

@@ -1544,6 +1544,14 @@ WHERE
 
             super_interface = create_interface(self.config, address, port, DB__jaaql, username, db_password)
             conn = super_interface.get_conn()
+            # A wipe leaves a window where background services (cron, EMS poller, auth verifier)
+            # reconnect and can abandon an open transaction holding locks on the fresh jaaql tables.
+            # The install DDL below would then queue behind that lock forever (no lock_timeout),
+            # wedging /internal/clean into an nginx 504. Kill the strays and bound every lock wait so
+            # a re-raced install fails fast (and can be retried) instead of hanging
+            super_interface.execute_query(conn, "SELECT pg_terminate_backend(pid) FROM pg_stat_activity "
+                                                "WHERE datname = current_database() AND pid <> pg_backend_pid()")
+            super_interface.execute_query(conn, "SET lock_timeout TO '10s'")
             super_interface.execute_script_file(conn, join(get_jaaql_root(), DIR__scripts, "01.install_domains.generated.sql"))
             super_interface.execute_script_file(conn, join(get_jaaql_root(), DIR__scripts, "02.install_super_user.exceptions.sql"))
             super_interface.execute_script_file(conn, join(get_jaaql_root(), DIR__scripts, "03.install_super_user.handwritten.sql"))
@@ -1560,6 +1568,7 @@ WHERE
 
             self.jaaql_lookup_connection = create_interface(self.config, address, port, DB__jaaql, ROLE__jaaql, jaaql_db_password)
             conn = self.jaaql_lookup_connection.get_conn()
+            self.jaaql_lookup_connection.execute_query(conn, "SET lock_timeout TO '10s'")
             self.jaaql_lookup_connection.execute_script_file(conn, join(get_jaaql_root(), DIR__scripts,
                                                                         "04.install_jaaql_data_structures.generated.sql"))
             self.jaaql_lookup_connection.execute_script_file(conn, join(get_jaaql_root(), DIR__scripts,

{jaaql_middleware_python-5.3.13 → jaaql_middleware_python-5.3.15}/jaaql_middleware_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jaaql-middleware-python
-Version: 5.3.13
+Version: 5.3.15
 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