api-foundry-query-engine 0.8.7__tar.gz → 0.8.9__tar.gz

{api_foundry_query_engine-0.8.7 → api_foundry_query_engine-0.8.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: api-foundry-query-engine
-Version: 0.8.7
+Version: 0.8.9
 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.7 → api_foundry_query_engine-0.8.9}/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.quailified_name or ""
 
     @property
     def selection_results(self) -> Dict:

{api_foundry_query_engine-0.8.7 → api_foundry_query_engine-0.8.9}/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.quailified_name)
                     + " AS "
                     + child_prefix
                     + " ON "
@@ -113,7 +113,7 @@ class SQLSelectSchemaQueryHandler(SQLSchemaQueryHandler):
                 )
 
         return (
-            str(self.schema_object.table_name)
+            str(self.schema_object.quailified_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.7 → api_foundry_query_engine-0.8.9}/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.quailified_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.7 → api_foundry_query_engine-0.8.9}/api_foundry_query_engine/utils/api_model.py

@@ -171,9 +171,10 @@ class SchemaObject:
         )
         self._primary_key: str = str(data.get("primary_key"))
         self.permissions = data.get("permissions")
+        self.quailified_name = f"{self.database}.{self.table_name}" if self.database else self.table_name
 
     def __repr__(self):
-        return f"SchemaObject(table_name={self.table_name}, primary_key={self.primary_key})"
+        return f"SchemaObject(table_name={self.quailified_name}, primary_key={self.primary_key})"
 
     @property
     def primary_key(self):
@@ -239,5 +240,5 @@ def set_api_model(engine_config: Mapping[str, str]):
             with open(
                 os.environ.get("API_SPEC", "/var/task/api_spec.yaml"), "r"
             ) as file:
-                log.info("Loaded API model from file: " + yaml.safe_load(file))
                 api_model = APIModel(yaml.safe_load(file))
+        log.info(f"Loaded API model: {api_model}")

{api_foundry_query_engine-0.8.7 → api_foundry_query_engine-0.8.9}/pyproject.toml

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