data-factory-utils 2.2.0__tar.gz → 2.3.0__tar.gz

{data_factory_utils-2.2.0 → data_factory_utils-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: data-factory-utils
-Version: 2.2.0
+Version: 2.3.0
 Summary: Utility functions for interacting with data factories.
 Requires-Dist: boto3>=1.42.8
 Requires-Dist: boto3-stubs>=1.42.89

{data_factory_utils-2.2.0 → data_factory_utils-2.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "data-factory-utils"
-version = "2.2.0"
+version = "2.3.0"
 description = "Utility functions for interacting with data factories."
 readme = "README.md"
 requires-python = ">=3.12"

{data_factory_utils-2.2.0 → data_factory_utils-2.3.0}/src/data_factory_utils/query.py

@@ -89,7 +89,7 @@ class WhereSetMembership(NamedTuple):
     """Config for WHERE IN comparisons."""
 
     col: str
-    set: tuple[str]
+    set: tuple[str] | Subquery
     unquote: bool | None = False
     prefix: Literal["AND", "OR", "NOT"] | None = "AND"
     brackets: Literal["open", "close", "wrap"] | None = None
@@ -529,10 +529,14 @@ def _build_where_set_membership(config: WhereSetMembership) -> str:
         - WHERE NOT col IN (value, value)
     """
     validate_identifier(config.col)
-    for value in config.set:
-        validate_identifier(value)
+    if not isinstance(config.set, Subquery):
+        for value in config.set:
+            validate_identifier(value)
 
-    if config.unquote:
+    if isinstance(config.set, Subquery):
+        values = str(config.set)
+        query_str = f"{config.col} IN {values}"
+    elif config.unquote:
         values = ", ".join(config.set)
         query_str = f"{config.col} IN ({values})"
     else:
@@ -733,8 +737,8 @@ class Query:
                     msg = "WHERE statement has no valid conditions."
                     raise ValueError(msg)
 
-            # first condition cannot have prefix
-            if i > 0 and condition.prefix:
+            # first condition cannot have prefix - unless it's "NOT"
+            if (i == 0 and condition.prefix == "NOT") or (i > 0 and condition.prefix):
                 cond_str = f"{condition.prefix} {cond_str}"
 
             query_str.append(cond_str)