api-foundry-query-engine 0.8.8__tar.gz → 0.8.10__tar.gz

{api_foundry_query_engine-0.8.8 → api_foundry_query_engine-0.8.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: api-foundry-query-engine
-Version: 0.8.8
+Version: 0.8.10
 Summary: The AWS lambda service handler use by the `api_foundry` project is a powerful tool designed to automate the deployment of REST APIs on AWS using Lambda services to access and interact with relational databases (RDBMS). This project leverages the OpenAPI specification to define and manage the APIs
 Project-URL: Documentation, https://github.com/DanRepik/api-foundry
 Project-URL: Source, https://github.com/DanRepik/api-foundry

{api_foundry_query_engine-0.8.8 → api_foundry_query_engine-0.8.10}/api_foundry_query_engine/dao/sql_query_handler.py

@@ -346,7 +346,7 @@ class SQLSchemaQueryHandler(SQLQueryHandler):
 
     @property
     def table_expression(self) -> str:
-        return self.schema_object.table_name or ""
+        return self.schema_object.qualified_name or ""
 
     @property
     def selection_results(self) -> Dict:

{api_foundry_query_engine-0.8.8 → api_foundry_query_engine-0.8.10}/api_foundry_query_engine/dao/sql_select_query_handler.py

@@ -99,7 +99,7 @@ class SQLSelectSchemaQueryHandler(SQLSchemaQueryHandler):
             if child_prefix in self.active_prefixes:
                 joins.append(
                     "INNER JOIN "
-                    + str(relation.child_schema_object.table_name)
+                    + str(relation.child_schema_object.qualified_name)
                     + " AS "
                     + child_prefix
                     + " ON "
@@ -113,7 +113,7 @@ class SQLSelectSchemaQueryHandler(SQLSchemaQueryHandler):
                 )
 
         return (
-            str(self.schema_object.table_name)
+            str(self.schema_object.qualified_name)
             + " AS "
             + str(self.prefix_map[str(self.schema_object.api_name)])
             + (f" {' '.join(joins)}" if len(joins) > 0 else "")

{api_foundry_query_engine-0.8.8 → api_foundry_query_engine-0.8.10}/api_foundry_query_engine/dao/sql_subselect_query_handler.py

@@ -53,7 +53,7 @@ class SQLSubselectSchemaQueryHandler(SQLSelectSchemaQueryHandler):
 
         sql = (
             f"SELECT {self.select_list} "
-            + f"FROM {self.relation.child_schema_object.table_name} "
+            + f"FROM {self.relation.child_schema_object.qualified_name} "
             + f"WHERE {self.relation.child_property} "
             + f"IN ( SELECT {self.relation.parent_property} "
             + f"FROM {self.parent_generator.table_expression}"

{api_foundry_query_engine-0.8.8 → api_foundry_query_engine-0.8.10}/api_foundry_query_engine/lambda_handler.py

@@ -9,6 +9,7 @@ from api_foundry_query_engine.adapters.gateway_adapter import GatewayAdapter
 
 log = logging.getLogger(__name__)
 
+
 class QueryEngine:
     def __init__(self, config: Mapping[str, str]):
         self.adapter = GatewayAdapter(config)
@@ -42,9 +43,11 @@ class QueryEngine:
                 "body": json.dumps({"message": f"exception: {e}"}),
             }
 
+
 engine_config: Optional[Mapping[str, str]] = None
 query_engine: Optional[QueryEngine] = None
 
+
 def handler(event, _):
     global engine_config, query_engine
     log.info(f"engine_config: {engine_config}")

{api_foundry_query_engine-0.8.8 → api_foundry_query_engine-0.8.10}/api_foundry_query_engine/utils/api_model.py

@@ -153,7 +153,9 @@ class SchemaObject:
     def __init__(self, data: Dict[str, Any]):
         self.api_name: str = str(data.get("api_name"))
         self.database: str = str(data.get("database"))
+        self.schema: Optional[str] = data.get("schema")
         self.table_name: str = str(data.get("table_name"))
+        self.qualified_name: str = f"{self.schema}.{self.table_name}" if self.schema else self.table_name
         self.properties: Dict[str, SchemaObjectProperty] = {
             name: SchemaObjectProperty(prop_data)
             for name, prop_data in data.get("properties", {}).items()
@@ -235,7 +237,7 @@ def set_api_model(engine_config: Mapping[str, str]):
         if engine_config.get("API_SPEC"):
             api_model = APIModel(yaml.safe_load(engine_config["API_SPEC"]))
         else:
-            log.info("Loading API model from file") 
+            log.info("Loading API model from file")
             with open(
                 os.environ.get("API_SPEC", "/var/task/api_spec.yaml"), "r"
             ) as file:

{api_foundry_query_engine-0.8.8 → api_foundry_query_engine-0.8.10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "api-foundry-query-engine"
-version = "0.8.8"
+version = "0.8.10"
 authors = [
     { name="Daniel Repik", email="danrepik@icloud.com" },
 ]