apexdevkit 1.23.8__tar.gz → 1.23.10__tar.gz

{apexdevkit-1.23.8 → apexdevkit-1.23.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: apexdevkit
-Version: 1.23.8
+Version: 1.23.10
 Summary: Apex Development Tools for python.
 Author: Apex Dev
 Author-email: dev@apex.ge

{apexdevkit-1.23.8 → apexdevkit-1.23.10}/apexdevkit/annotation/deprecate.py

@@ -23,7 +23,7 @@ def deprecated(warning: str) -> Callable[[F], F]:
 
     def decorator(obj: F) -> F:
         if inspect.isfunction(obj) or inspect.ismethod(obj):
-            return cast(F, _wrap_function(obj, warning))
+            return _wrap_function(obj, warning)
         if inspect.isclass(obj):
             return cast(F, _deprecate_class(obj, warning))
         raise TypeError(

{apexdevkit-1.23.8 → apexdevkit-1.23.10}/apexdevkit/repository/sql.py

@@ -14,6 +14,7 @@ class NotNone:
 class _SqlField:
     name: str
     is_id: bool = False
+    is_selectable: bool = False
     is_composite: bool = False
     include_in_insert: bool = True
     include_in_update: bool = True
@@ -35,6 +36,7 @@ class _SqlField:
 class SqlFieldBuilder:
     _name: str = field(init=False)
     _is_id: bool = False
+    _is_selectable: bool = False
     _is_composite: bool = False
     _include_in_insert: bool = True
     _include_in_update: bool = True
@@ -61,6 +63,11 @@ class SqlFieldBuilder:
 
         return self
 
+    def as_selectable(self) -> SqlFieldBuilder:
+        self._is_selectable = True
+
+        return self
+
     def as_composite(self) -> SqlFieldBuilder:
         self._is_composite = True
 
@@ -104,6 +111,7 @@ class SqlFieldBuilder:
         return _SqlField(
             name=self._name,
             is_id=self._is_id,
+            is_selectable=self._is_selectable,
             is_composite=self._is_composite,
             include_in_insert=self._include_in_insert,
             include_in_update=self._include_in_update,
@@ -194,21 +202,40 @@ class SqlFieldManager:
         return ""
 
     def _id_filter(self, include_id: bool, read_id: bool) -> str:
-        return (
-            self.key_formatter.replace("x", self.id)
-            + " = "
-            + (
-                self.value_formatter.replace("x", self.id)
-                if not read_id
-                or next(  # type: ignore
-                    (key for key in self.fields if key.is_id), None
-                ).include_in_insert
-                else "SCOPE_IDENTITY()"
-            )
-            if include_id
-            else ""
+        if not include_id:
+            return ""
+
+        clauses = []
+
+        id_field = next((key for key in self.fields if key.is_id), None)
+        if id_field is None:
+            raise ValueError("Id field is required.")
+
+        value_expr = (
+            self.value_formatter.replace("x", id_field.name)
+            if not read_id or id_field.include_in_insert
+            else "SCOPE_IDENTITY()"
+        )
+        clauses.append(
+            f"{self.key_formatter.replace('x', id_field.name)} = {value_expr}"
         )
 
+        if not read_id:
+            selectable_fields = [
+                selectable
+                for selectable in self.fields
+                if selectable.is_selectable and not selectable.is_id
+            ]
+            for selectable in selectable_fields:
+                key_expr = self.key_formatter.replace("x", selectable.name)
+                val_expr = self.value_formatter.replace("x", id_field.name)
+                clauses.append(f"{key_expr} = {val_expr}")
+
+        if len(clauses) == 1:
+            return clauses[0]
+
+        return "(" + " OR ".join(clauses) + ")"
+
     def _general_filters(self) -> str:
         statements: list[str] = [] + self.custom_filters
         for key in self.fields:

{apexdevkit-1.23.8 → apexdevkit-1.23.10}/apexdevkit/repository/sqlite.py

@@ -105,14 +105,25 @@ class SqliteTableBuilder(Generic[ItemT]):
     table_name: str | None = None
     formatter: Formatter[Mapping[str, Any], ItemT] | None = None
     fields: list[_SqlField] | None = None
+    custom_filters: list[str] | None = None
 
     def with_name(self, value: str) -> SqliteTableBuilder[ItemT]:
-        return SqliteTableBuilder[ItemT](value, self.formatter, self.fields)
+        return SqliteTableBuilder[ItemT](
+            value,
+            self.formatter,
+            self.fields,
+            self.custom_filters,
+        )
 
     def with_formatter(
         self, value: Formatter[Mapping[str, Any], ItemT]
     ) -> SqliteTableBuilder[ItemT]:
-        return SqliteTableBuilder[ItemT](self.table_name, value, self.fields)
+        return SqliteTableBuilder[ItemT](
+            self.table_name,
+            value,
+            self.fields,
+            self.custom_filters,
+        )
 
     def with_fields(self, value: Iterable[_SqlField]) -> SqliteTableBuilder[ItemT]:
         key_list = list(value)
@@ -135,16 +146,29 @@ class SqliteTableBuilder(Generic[ItemT]):
             self.table_name,
             self.formatter,
             key_list,
+            self.custom_filters,
+        )
+
+    def with_custom_filters(self, filters: Iterable[str]) -> SqliteTableBuilder[ItemT]:
+        return SqliteTableBuilder[ItemT](
+            self.table_name,
+            self.formatter,
+            self.fields,
+            list(filters),
         )
 
     def build(self) -> SqlTable[ItemT]:
         if not self.table_name or not self.formatter or not self.fields:
             raise ValueError("Parameter missing.")
 
+        field_manager = SqlFieldManager.Builder().with_fields(self.fields)
+        if self.custom_filters and len(self.custom_filters) > 0:
+            field_manager = field_manager.with_custom_filters(self.custom_filters)
+
         return _DefaultSqlTable(
             self.table_name,
             self.formatter,
-            SqlFieldManager.Builder().with_fields(self.fields).for_sqlite().build(),
+            field_manager.for_sqlite().build(),
         )
 
 

{apexdevkit-1.23.8 → apexdevkit-1.23.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "apexdevkit"
-version = "1.23.8"
+version = "1.23.10"
 description = "Apex Development Tools for python."
 readme = "README.md"
 authors = [