jaaql-middleware-python 4.24.5__tar.gz → 4.24.6__tar.gz

{jaaql-middleware-python-4.24.5/jaaql_middleware_python.egg-info → jaaql-middleware-python-4.24.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jaaql-middleware-python
-Version: 4.24.5
+Version: 4.24.6
 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.24.5 → jaaql-middleware-python-4.24.6}/jaaql/constants.py

@@ -180,5 +180,5 @@ ROLE__postgres = "postgres"
 
 PROTOCOL__postgres = "postgresql://"
 
-VERSION = "4.24.5"
+VERSION = "4.24.6"
 

{jaaql-middleware-python-4.24.5 → jaaql-middleware-python-4.24.6}/jaaql/documentation/documentation_internal.py

@@ -207,6 +207,22 @@ DOCUMENTATION__prepare = SwaggerDocumentation(
     )
 )
 
+DOCUMENTATION__domains = SwaggerDocumentation(
+    tags="Prepare",
+    methods=SwaggerMethod(
+        name="Fetches domains",
+        description="Fetches database level domains",
+        method=REST__POST,
+        body=SwaggerArgumentResponse(
+            name=KEY__database,
+            description="The database against which to fetch the domains",
+            arg_type=str,
+            example=["database"]
+        ),
+        response=RES__allow_all
+    )
+)
+
 DOCUMENTATION__set_web_config = SwaggerDocumentation(
     tags="Web Config",
     methods=SwaggerMethod(

{jaaql-middleware-python-4.24.5 → jaaql-middleware-python-4.24.6}/jaaql/interpreter/interpret_jaaql.py

@@ -1,4 +1,6 @@
+import string
 import traceback
+import random
 
 from jaaql.exceptions.http_status_exception import *
 from datetime import datetime
@@ -327,10 +329,41 @@ class InterpretJAAQL:
                     found_params = {**found_parameter_dictionary, **enc_parameter_dictionary}
 
                     if attempt_fetch_domain_types:
-                        last_query = "CREATE TEMP VIEW temp_view AS (" + last_query + ")"
+                        temp_view_name = ''.join(random.choices(string.ascii_letters + string.digits, k=10))
+                        last_query = "CREATE TEMP VIEW \"temp_view__" + temp_view_name + "\" AS (" + last_query + ")"
                         self.db_interface.execute_query_fetching_results(conn, last_query, found_params, wait_hook=wait_hook,
                                                                          requires_dba_check=check_required and canned_query_service is not None)
-                        last_query = "SELECT column_name, data_type, udt_name, domain_name FROM information_schema.columns WHERE table_name = 'temp_view' ORDER BY ordinal_position;"
+                        last_query = """
+WITH RECURSIVE column_hierarchy AS (
+    -- Base case: Select columns from 'managed_service'
+    SELECT
+        C.column_name, C.data_type, C.udt_name, C.domain_name,
+        VC.table_catalog, VC.table_schema, VC.table_name,
+        true as is_nullable,
+        1 as level
+    FROM information_schema.columns C
+    LEFT JOIN information_schema.view_column_usage VC on VC.view_name = C.table_name AND VC.column_name = C.column_name
+    WHERE C.table_name = 'temp_view__""" + temp_view_name + """'
+
+    UNION ALL
+
+    SELECT
+        C.column_name, C.data_type, C.udt_name, C.domain_name,
+        VC.table_catalog, VC.table_schema, VC.table_name,
+        CASE WHEN C.is_nullable = 'NO' then false else true end as is_nullable,
+        CH.level + 1 as level
+    FROM information_schema.columns C
+    JOIN column_hierarchy CH ON C.column_name = CH.column_name
+    LEFT JOIN information_schema.view_column_usage VC on VC.view_name = C.table_name AND VC.column_name = C.column_name
+    WHERE C.table_name = CH.table_name AND C.table_schema = CH.table_schema AND C.table_catalog = CH.table_catalog
+)SELECT
+    MAX(CH.column_name) as column_name,
+    MAX(CH.data_type) as data_type,
+    MAX(CH.udt_name) as udt_name,
+    MAX(CH.domain_name) as domain_name,
+    NOT(bool_or(NOT(CH.is_nullable))) as is_nullable
+FROM column_hierarchy CH
+GROUP BY CH.column_name, CH.data_type, CH.udt_name, CH.domain_name;"""
                         found_params = {}
                     elif do_prepare_only and not psql:
                         arg_open = "(" if len(found_params) != 0 else ""

{jaaql-middleware-python-4.24.5 → jaaql-middleware-python-4.24.6}/jaaql/mvc/controller.py

@@ -80,6 +80,10 @@ class JAAQLController(BaseJAAQLController):
         def prepare(http_inputs: dict, account_id: str):
             return self.model.prepare_queries(http_inputs, account_id)
 
+        @self.publish_route('/domains', DOCUMENTATION__domains)
+        def prepare(http_inputs: dict, account_id: str):
+            return self.model.fetch_domains(http_inputs, account_id)
+
         @self.publish_route('/account/password', DOCUMENTATION__password)
         def password(account_id: str, username: str, ip_address: str, is_the_anonymous_user: bool, http_inputs: dict):
             return self.model.add_my_account_password(account_id, username, ip_address, is_the_anonymous_user, **http_inputs)

{jaaql-middleware-python-4.24.5 → jaaql-middleware-python-4.24.6}/jaaql/mvc/model.py

@@ -189,10 +189,42 @@ class JAAQLModel(BaseJAAQLModel):
                 if len(parts) >= 2:
                     column_name = parts[0]
                     column_type = parts[1]
-                    columns[column_name] = column_type
+                    columns[column_name] = {
+                        "type": column_type,
+                        "nullable": True  # We can't figure this out with gdesc
+                    }
         return columns
 
-    def prepare_queries(self, inputs: dict, account_id: str, cost_only: bool = False):
+    def fetch_domains(self, inputs: dict, account_id: str):
+        db_connection = create_interface_for_db(self.vault, self.config, account_id, inputs[KEY__database], None)
+        self.is_dba(db_connection)
+
+        domains_query = """
+SELECT
+    t.typname AS type_name,
+    CASE
+        WHEN t.typtype = 'd' THEN bt.typname
+        ELSE t.typname
+    END AS base_type,
+    t.typtype
+FROM
+    pg_type t
+    JOIN pg_namespace n ON n.oid = t.typnamespace
+    LEFT JOIN pg_type bt ON bt.oid = t.typbasetype
+WHERE
+    t.typtype IN ('b', 'd')
+    AND n.nspname NOT IN ('information_schema')
+    AND left(t.typname, 1) <> '_'
+    AND left(t.typname, 3) <> 'pg_'
+ORDER BY
+    n.nspname,
+    t.typname;
+"""
+
+        return execute_supplied_statement(db_connection, domains_query, as_objects=True)
+
+    def prepare_queries(self, inputs: dict, account_id: str):
+        cost_only = inputs.get("cost_only", False)
         db_connection = create_interface_for_db(self.vault, self.config, account_id, inputs[KEY__database], None)
 
         self.is_dba(db_connection)
@@ -203,7 +235,6 @@ class JAAQLModel(BaseJAAQLModel):
             my_uuid = str(uuid.uuid4()).replace("-", "_")
             exc = None
             cost = None
-            domain_types = None
             type_resolution_method = None
             columns = None
             try:
@@ -218,9 +249,13 @@ class JAAQLModel(BaseJAAQLModel):
                     domain_types = execute_supplied_statement(db_connection, query["query"].strip(), do_prepare_only=my_uuid, attempt_fetch_domain_types=True)
                     type_resolution_method = "temp_view"
                     temp_columns = [row[0] for row in domain_types['rows']]
+                    nullable = [row[4] for row in domain_types['rows']]
                     temp_types = [row[3] if row[3] is not None else row[2] for row in domain_types['rows']]
                     columns = {
-                        col: temp_types[idx]
+                        col: {
+                            "type": temp_types[idx],
+                            "nullable": nullable[idx]
+                        }
                         for col, idx in zip(temp_columns, range(len(temp_columns)))
                     }
                 except Exception as ex:

{jaaql-middleware-python-4.24.5 → jaaql-middleware-python-4.24.6/jaaql_middleware_python.egg-info}/PKG-INFO

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