api-foundry-query-engine 0.8.75__tar.gz → 0.8.79__tar.gz

{api_foundry_query_engine-0.8.75 → api_foundry_query_engine-0.8.79}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: api-foundry-query-engine
-Version: 0.8.75
+Version: 0.8.79
 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.79/api_foundry_query_engine/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.8.79"

{api_foundry_query_engine-0.8.75 → api_foundry_query_engine-0.8.79}/api_foundry_query_engine/connectors/connection_factory.py

@@ -35,23 +35,31 @@ class ConnectionFactory:
         log.info("database: %s", database)
         db_config = self.db_config_map.get(database)
         if not db_config:
-            # Use config dict for secrets
-            secrets_map = self.config.get("SECRETS", {})
-            if isinstance(secrets_map, str):
-                secrets_map = json.loads(secrets_map)
-            secret_name = secrets_map.get(database)
-            log.debug("secret_name: %s", secret_name)
-
-            if secret_name:
-                db_config = self.__get_secret(secret_name)
+            # A <DATABASE>_DSN config value (e.g. CONTRACT_DB_DSN) skips
+            # Secrets Manager entirely. This matters for a Lambda that's
+            # VPC-attached for private database access but has no route
+            # to the Secrets Manager API (no NAT gateway, no interface
+            # endpoint) -- the SECRETS/get_secret_value path would just
+            # hang. PostgresConnection already accepts a raw "dsn" key.
+            dsn = self.config.get(f"{database.upper()}_DSN")
+            if dsn:
+                db_config = {"engine": self.config.get(f"{database.upper()}_ENGINE", "postgres"), "dsn": dsn}
             else:
-                raise ValueError(f"Secret not found for database: {database}")
+                # Use config dict for secrets
+                secrets_map = self.config.get("SECRETS", {})
+                if isinstance(secrets_map, str):
+                    secrets_map = json.loads(secrets_map)
+                secret_name = secrets_map.get(database)
+                log.debug("secret_name: %s", secret_name)
+
+                if secret_name:
+                    db_config = self.__get_secret(secret_name)
+                else:
+                    raise ValueError(f"Secret not found for database: {database}")
 
         engine = db_config.get("engine")
         if not engine:
-            raise ApplicationException(
-                500, "Database 'engine' is not defined in the secret."
-            )
+            raise ApplicationException(500, "Database 'engine' is not defined in the secret.")
 
         if engine == "postgres":
             from .postgres_connection import PostgresConnection

{api_foundry_query_engine-0.8.75 → api_foundry_query_engine-0.8.79}/api_foundry_query_engine/dao/sql_query_handler.py

@@ -376,12 +376,21 @@ class SQLQueryHandler:
             ]
             sql = f"{column} {'NOT ' if operand == 'not-in' else ''}IN ({', '.join(assignments)})"  # noqa E501
         elif operand in ["like", "not-like"]:
-            sql = f"{column} {'NOT ' if operand == 'not-like' else ''}LIKE {self.placeholder(property, str(placeholder_name))}"
+            sql = f"{column} {'NOT ' if operand == 'not-like' else ''}LIKE {self.placeholder(property, str(placeholder_name))}"  # noqa E501
         else:
             sql = f"{column} {operand} {self.placeholder(property, str(placeholder_name))}"
         return sql
 
     def generate_placeholders(self, property: SchemaObjectProperty, value, prefix: Optional[str] = None) -> dict:
+        placeholder_name = f"{prefix}_{property.api_name}" if prefix else property.api_name
+        if value is None:
+            # An unset optional query parameter must bind an actual SQL
+            # NULL, not the string "None" -- str(None) below would
+            # otherwise produce a literal 'None' value, silently
+            # breaking every `:param IS NULL OR ...`-style optional
+            # filter (e.g. date-range parameters on a custom SQL route).
+            return {placeholder_name: None}
+
         operand = "="
 
         if isinstance(value, str):
@@ -393,7 +402,6 @@ class SQLQueryHandler:
         else:
             value_str = str(value)
 
-        placeholder_name = f"{prefix}_{property.api_name}" if prefix else property.api_name
         placeholders = {}
 
         if operand in ["between", "not-between"]:

api_foundry_query_engine-0.8.75/api_foundry_query_engine/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.8.75"