apexdevkit 1.17.6__tar.gz → 1.17.8__tar.gz

{apexdevkit-1.17.6 → apexdevkit-1.17.8}/PKG-INFO

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

{apexdevkit-1.17.6 → apexdevkit-1.17.8}/apexdevkit/repository/mssql.py

@@ -144,9 +144,6 @@ class MsSqlTableBuilder(Generic[ItemT]):
     table: str | None = None
     formatter: Formatter[dict[str, Any], ItemT] | None = None
     fields: list[MsSqlField] | None = None
-    ordering: list[str] | None = None
-    parent_field: str | None = None
-    parent_value: Any | None = None
 
     def with_username(self, value: str) -> MsSqlTableBuilder[ItemT]:
         return MsSqlTableBuilder[ItemT](
@@ -155,9 +152,6 @@ class MsSqlTableBuilder(Generic[ItemT]):
             self.table,
             self.formatter,
             self.fields,
-            self.ordering,
-            self.parent_field,
-            self.parent_value,
         )
 
     def with_schema(self, value: str) -> MsSqlTableBuilder[ItemT]:
@@ -167,9 +161,6 @@ class MsSqlTableBuilder(Generic[ItemT]):
             self.table,
             self.formatter,
             self.fields,
-            self.ordering,
-            self.parent_field,
-            self.parent_value,
         )
 
     def with_table(self, value: str) -> MsSqlTableBuilder[ItemT]:
@@ -179,9 +170,6 @@ class MsSqlTableBuilder(Generic[ItemT]):
             value,
             self.formatter,
             self.fields,
-            self.ordering,
-            self.parent_field,
-            self.parent_value,
         )
 
     def with_formatter(
@@ -193,73 +181,20 @@ class MsSqlTableBuilder(Generic[ItemT]):
             self.table,
             value,
             self.fields,
-            self.ordering,
-            self.parent_field,
-            self.parent_value,
         )
 
-    def with_fields(self, fields: Iterable[str]) -> MsSqlTableBuilder[ItemT]:
+    def with_fields(self, value: Iterable[MsSqlField]) -> MsSqlTableBuilder[ItemT]:
+        field_list = list(value)
+        if len([field for field in field_list if field.is_id]) != 1:
+            raise ValueError("Pass only one identifier field.")
+        if len([field for field in field_list if field.is_parent]) > 1:
+            raise ValueError("Pass only one parent field.")
         return MsSqlTableBuilder[ItemT](
             self.username,
             self.schema,
             self.table,
             self.formatter,
-            [MsSqlField(field, field == "id") for field in list(fields)],
-            self.ordering,
-            self.parent_field,
-            self.parent_value,
-        )
-
-    def with_order_fields(self, ordering: Iterable[str]) -> MsSqlTableBuilder[ItemT]:
-        ordered = list(ordering)
-        assert self.fields is not None, "Set fields first."
-
-        for key in ordered:
-            if key not in [field.name for field in self.fields]:
-                raise ValueError("Missing fields in the table.")
-        return MsSqlTableBuilder[ItemT](
-            self.username,
-            self.schema,
-            self.table,
-            self.formatter,
-            self.fields,
-            ordered,
-            self.parent_field,
-            self.parent_value,
-        )
-
-    def with_id(self, identifier: str) -> MsSqlTableBuilder[ItemT]:
-        assert self.fields is not None, "Set fields first."
-        if identifier not in [field.name for field in self.fields]:
-            raise ValueError("Missing fields in the table.")
-
-        return MsSqlTableBuilder[ItemT](
-            self.username,
-            self.schema,
-            self.table,
-            self.formatter,
-            [MsSqlField(field.name, field.name == identifier) for field in self.fields],
-            self.ordering,
-            self.parent_field,
-            self.parent_value,
-        )
-
-    def with_parent(
-        self, parent_field: str, parent_value: Any
-    ) -> MsSqlTableBuilder[ItemT]:
-        assert self.fields is not None, "Set fields first."
-        if parent_field not in [field.name for field in self.fields]:
-            raise ValueError("Missing fields in the table.")
-
-        return MsSqlTableBuilder[ItemT](
-            self.username,
-            self.schema,
-            self.table,
-            self.formatter,
-            self.fields,
-            self.ordering,
-            parent_field,
-            parent_value,
+            field_list,
         )
 
     def build(self) -> SqlTable[ItemT]:
@@ -267,48 +202,32 @@ class MsSqlTableBuilder(Generic[ItemT]):
             raise ValueError("Cannot build sql table.")
 
         return DefaultSqlTable(
-            self.username,
             self.schema,
             self.table,
             self.formatter,
             self.fields,
-            self.ordering,
-            self.parent_field,
-            self.parent_value,
+            self.username,
         )
 
 
 @dataclass(frozen=True)
 class DefaultSqlTable(SqlTable[ItemT]):
-    username: str | None
     schema: str
     table: str
     formatter: Formatter[dict[str, Any], ItemT]
     fields: list[MsSqlField]
-    ordering: list[str] | None
-    parent_key: str | None
-    parent_value: Any | None
+    username: str | None = None
 
     def count_all(self) -> DatabaseCommand:
-        where_statement = ""
-        if self.parent_key is not None:
-            where_statement += (
-                "WHERE [" + self.parent_key + "] = " + self._parent_value_sql
-            )
-
         return DatabaseCommand(f"""
             {self._user_check}
             SELECT count(*) AS n_items
             FROM [{self.schema}].[{self.table}]
-            {where_statement}
+            {self._where_statement(include_id=False)}
             REVERT
-        """)
+        """).with_data(self._data_with_replaced_parent({}))
 
     def insert(self, item: ItemT) -> DatabaseCommand:
-        dumped = self.formatter.dump(item)
-        if self.parent_key is not None:
-            dumped[self.parent_key] = self.parent_value
-
         columns = ", ".join(["[" + field.name + "]" for field in self.fields])
         placeholders = ", ".join([f"%({key.name})s" for key in self.fields])
         output = ", ".join(["INSERTED." + field.name for field in self.fields])
@@ -323,17 +242,9 @@ class DefaultSqlTable(SqlTable[ItemT]):
                 {placeholders}
             )
             REVERT
-        """).with_data(dumped)
+        """).with_data(self._data_with_replaced_parent(self.formatter.dump(item)))
 
     def select(self, item_id: str) -> DatabaseCommand:
-        raw: dict[str, Any] = {self._id: item_id}
-        where_statement = f"WHERE [{self._id}] = %({self._id})s"
-        if self.parent_key is not None:
-            raw[self.parent_key] = self.parent_value
-            where_statement += (
-                ", [" + self.parent_key + "] = %(" + self.parent_key + ")s"
-            )
-
         columns = ", ".join(["[" + field.name + "]" for field in self.fields])
 
         return DatabaseCommand(f"""
@@ -341,44 +252,29 @@ class DefaultSqlTable(SqlTable[ItemT]):
             SELECT
                 {columns} 
             FROM [{self.schema}].[{self.table}]
-            {where_statement}
+            {self._where_statement(include_id=True)}
             REVERT
-        """).with_data(raw)
+        """).with_data(self._data_with_replaced_parent({self._id: item_id}))
 
     def select_all(self) -> DatabaseCommand:
         columns = ", ".join(["[" + field.name + "]" for field in self.fields])
-        where_statement = ""
-        if self.parent_key is not None:
-            where_statement += (
-                "WHERE [" + self.parent_key + "] = " + self._parent_value_sql
-            )
 
         return DatabaseCommand(f"""
             {self._user_check}
             SELECT
                 {columns}
             FROM [{self.schema}].[{self.table}]
-            {where_statement}
+            {self._where_statement(include_id=False)}
             {self._order}
             REVERT
-        """)
+        """).with_data(self._data_with_replaced_parent({}))
 
     def update(self, item: ItemT) -> DatabaseCommand:
-        dumped = self.formatter.dump(item)
-        if self.parent_key is not None:
-            dumped[self.parent_key] = self.parent_value
-
-        where_statement = f"WHERE [{self._id}] = %({self._id})s"
-        if self.parent_key is not None:
-            where_statement += (
-                ", [" + self.parent_key + "] = %(" + self.parent_key + ")s"
-            )
-
         updates = ", ".join(
             [
                 f"{field.name} = %({field.name})s"
                 for field in self.fields
-                if not field.is_id and field.name != self.parent_key
+                if not field.is_id and not field.is_parent
             ]
         )
 
@@ -387,41 +283,27 @@ class DefaultSqlTable(SqlTable[ItemT]):
             UPDATE [{self.schema}].[{self.table}]
             SET
                 {updates}
-            {where_statement}
+            {self._where_statement(include_id=True)}
             REVERT
-        """).with_data(dumped)
+        """).with_data(self._data_with_replaced_parent(self.formatter.dump(item)))
 
     def delete(self, item_id: str) -> DatabaseCommand:
-        raw: dict[str, Any] = {self._id: item_id}
-        where_statement = f"WHERE [{self._id}] = %({self._id})s"
-        if self.parent_key is not None:
-            raw[self.parent_key] = self.parent_value
-            where_statement += (
-                ", [" + self.parent_key + "] = %(" + self.parent_key + ")s"
-            )
-
         return DatabaseCommand(f"""
             {self._user_check}
             DELETE
             FROM [{self.schema}].[{self.table}]
-            {where_statement}
+            {self._where_statement(include_id=True)}
             REVERT
-        """).with_data(raw)
+        """).with_data(self._data_with_replaced_parent({self._id: item_id}))
 
     def delete_all(self) -> DatabaseCommand:
-        where_statement = ""
-        if self.parent_key is not None:
-            where_statement += (
-                "WHERE [" + self.parent_key + "] = " + self._parent_value_sql
-            )
-
         return DatabaseCommand(f"""
             {self._user_check}
             DELETE
             FROM [{self.schema}].[{self.table}]
-            {where_statement}
+            {self._where_statement(include_id=False)}
             REVERT
-        """)
+        """).with_data(self._data_with_replaced_parent({}))
 
     def load(self, data: dict[str, Any]) -> ItemT:
         return self.formatter.load(data)
@@ -432,6 +314,22 @@ class DefaultSqlTable(SqlTable[ItemT]):
             lambda i: f"{self._id}<{raw[self._id]}>"
         )
 
+    def _where_statement(self, include_id: bool = False) -> str:
+        result = next((field for field in self.fields if field.is_parent), None)
+        if result is None:
+            return f"WHERE [{self._id}] = %({self._id})s" if include_id else ""
+        else:
+            statement = "WHERE [" + result.name + "] = %(" + result.name + ")s"
+            if include_id:
+                statement += f" AND [{self._id}] = %({self._id})s"
+            return statement
+
+    def _data_with_replaced_parent(self, data: dict[str, Any]) -> dict[str, Any]:
+        result = next((field for field in self.fields if field.is_parent), None)
+        if result is not None:
+            data[result.name] = result.fixed_value
+        return data
+
     @property
     def _id(self) -> str:
         result = next((field for field in self.fields if field.is_id), None)
@@ -448,20 +346,18 @@ class DefaultSqlTable(SqlTable[ItemT]):
 
     @property
     def _order(self) -> str:
-        if self.ordering is not None and len(self.ordering) > 0:
-            return "ORDER BY " + ", ".join(self.ordering)
+        ordering = [field.name for field in self.fields if field.is_ordered]
+        if len(ordering) > 0:
+            return "ORDER BY " + ", ".join(ordering)
         else:
             return ""
 
-    @property
-    def _parent_value_sql(self) -> str:
-        if isinstance(self.parent_value, str):
-            return "'" + self.parent_value + "'"
-        else:
-            return str(self.parent_value)
-
 
 @dataclass(frozen=True)
 class MsSqlField:
     name: str
-    is_id: bool
+    is_id: bool = False
+    is_ordered: bool = False
+
+    is_parent: bool = False
+    fixed_value: Any | None = None

{apexdevkit-1.17.6 → apexdevkit-1.17.8}/apexdevkit/repository/sqlite.py

@@ -112,51 +112,28 @@ class SqliteTableBuilder(Generic[ItemT]):
     ) -> SqliteTableBuilder[ItemT]:
         return SqliteTableBuilder[ItemT](self.table_name, value, self.fields)
 
-    def with_fields(self, fields: Iterable[str]) -> SqliteTableBuilder[ItemT]:
+    def with_fields(self, value: Iterable[SqliteField]) -> SqliteTableBuilder[ItemT]:
+        field_list = list(value)
+        if len([field for field in field_list if field.is_id]) != 1:
+            raise ValueError("Pass only one identifier field.")
+        if len([field for field in field_list if field.is_parent]) > 1:
+            raise ValueError("Pass only one parent field.")
         return SqliteTableBuilder[ItemT](
             self.table_name,
             self.formatter,
-            [SqliteField(field, field == "id", False) for field in list(fields)],
+            field_list,
         )
 
-    def with_id(self, identifier: str) -> SqliteTableBuilder[ItemT]:
-        assert self.fields is not None, "Set fields first."
-        if identifier not in [field.name for field in self.fields]:
-            raise ValueError("Missing fields in the table.")
-
-        return SqliteTableBuilder[ItemT](
-            self.table_name,
-            self.formatter,
-            [
-                SqliteField(field.name, field.name == identifier, field.is_composite)
-                for field in self.fields
-            ],
-        )
-
-    def with_composite_key(
-        self, composites: Iterable[str]
-    ) -> SqliteTableBuilder[ItemT]:
-        assert self.fields is not None, "Set fields first."
-
-        names = [field.name for field in self.fields]
-        if not all(field in names for field in list(composites)):
-            raise ValueError("Missing fields in the table.")
+    def build(self) -> SqlTable[ItemT]:
+        if not self.table_name or not self.formatter or not self.fields:
+            raise ValueError("Parameter missing.")
 
-        return SqliteTableBuilder[ItemT](
+        return _DefaultSqlTable(
             self.table_name,
             self.formatter,
-            [
-                SqliteField(field.name, field.is_id, field.name in list(composites))
-                for field in self.fields
-            ],
+            self.fields,
         )
 
-    def build(self) -> SqlTable[ItemT]:
-        if not self.table_name or not self.formatter or not self.fields:
-            raise ValueError("Cannot build sql table.")
-
-        return _DefaultSqlTable(self.table_name, self.formatter, self.fields)
-
 
 @dataclass(frozen=True)
 class _DefaultSqlTable(SqlTable[ItemT]):
@@ -167,21 +144,22 @@ class _DefaultSqlTable(SqlTable[ItemT]):
     def count_all(self) -> DatabaseCommand:
         return DatabaseCommand(f"""
             SELECT count(*) as n_items
-            FROM {self.table_name.capitalize()};
-        """)
+            FROM {self.table_name.upper()}
+            {self._where_statement(include_id=False)};
+        """).with_data(self._data_with_replaced_parent({}))
 
     def insert(self, item: ItemT) -> DatabaseCommand:
         columns = ", ".join([field.name for field in self.fields])
         placeholders = ", ".join([f":{key.name}" for key in self.fields])
 
         return DatabaseCommand(f"""
-            INSERT INTO {self.table_name.capitalize()} (
+            INSERT INTO {self.table_name.upper()} (
                 {columns}
             ) VALUES (
                 {placeholders}
             )
             RETURNING {columns};
-        """).with_data(self.formatter.dump(item))
+        """).with_data(self._data_with_replaced_parent(self.formatter.dump(item)))
 
     def select(self, item_id: str) -> DatabaseCommand:
         columns = ", ".join([field.name for field in self.fields])
@@ -189,9 +167,9 @@ class _DefaultSqlTable(SqlTable[ItemT]):
         return DatabaseCommand(f"""
             SELECT
                 {columns} 
-            FROM {self.table_name.capitalize()}
-            WHERE {self._id} = :{self._id};
-        """).with_data({self._id: item_id})
+            FROM {self.table_name.upper()}
+            {self._where_statement(include_id=True)};
+        """).with_data(self._data_with_replaced_parent({self._id: item_id}))
 
     def select_duplicate(self, item: ItemT) -> DatabaseCommand:
         raw = self.formatter.dump(item)
@@ -202,7 +180,7 @@ class _DefaultSqlTable(SqlTable[ItemT]):
         return DatabaseCommand(f"""
             SELECT
                 {columns} 
-            FROM {self.table_name.capitalize()}
+            FROM {self.table_name.upper()}
             WHERE {duplicates};
         """).with_data({key: raw[key] for key in raw if key in self._composite})
 
@@ -212,39 +190,39 @@ class _DefaultSqlTable(SqlTable[ItemT]):
         return DatabaseCommand(f"""
             SELECT
                 {columns}
-            FROM {self.table_name.capitalize()};
-        """)
+            FROM {self.table_name.capitalize()}
+            {self._where_statement(include_id=False)};
+        """).with_data(self._data_with_replaced_parent({}))
 
     def update(self, item: ItemT) -> DatabaseCommand:
         updates = ", ".join(
             [
                 f"{field.name} = :{field.name}"
                 for field in self.fields
-                if not field.is_id
+                if not field.is_id and not field.is_parent
             ]
         )
 
         return DatabaseCommand(f"""
-            UPDATE {self.table_name.capitalize()}
+            UPDATE {self.table_name.upper()}
             SET
                 {updates}
-            WHERE
-                {self._id} = :{self._id};
-        """).with_data(self.formatter.dump(item))
+            {self._where_statement(include_id=True)};
+        """).with_data(self._data_with_replaced_parent(self.formatter.dump(item)))
 
     def delete(self, item_id: str) -> DatabaseCommand:
         return DatabaseCommand(f"""
             DELETE
-            FROM {self.table_name.capitalize()}
-            WHERE
-                {self._id} = :{self._id};
-        """).with_data({self._id: item_id})
+            FROM {self.table_name.upper()}
+            {self._where_statement(include_id=True)};
+        """).with_data(self._data_with_replaced_parent({self._id: item_id}))
 
     def delete_all(self) -> DatabaseCommand:
         return DatabaseCommand(f"""
             DELETE
-            FROM {self.table_name.capitalize()};
-        """)
+            FROM {self.table_name.upper()}
+            {self._where_statement(include_id=False)};
+        """).with_data(self._data_with_replaced_parent({}))
 
     def load(self, data: dict[str, Any]) -> ItemT:
         return self.formatter.load(data)
@@ -257,6 +235,22 @@ class _DefaultSqlTable(SqlTable[ItemT]):
             )
         )
 
+    def _where_statement(self, include_id: bool = False) -> str:
+        result = next((field for field in self.fields if field.is_parent), None)
+        if result is None:
+            return f"WHERE {self._id} = :{self._id}" if include_id else ""
+        else:
+            statement = "WHERE " + result.name + " = :" + result.name
+            if include_id:
+                statement += f" AND {self._id} = :{self._id}"
+            return statement
+
+    def _data_with_replaced_parent(self, data: dict[str, Any]) -> dict[str, Any]:
+        result = next((field for field in self.fields if field.is_parent), None)
+        if result is not None:
+            data[result.name] = result.fixed_value
+        return data
+
     @property
     def _id(self) -> str:
         result = next((field for field in self.fields if field.is_id), None)
@@ -273,5 +267,8 @@ class _DefaultSqlTable(SqlTable[ItemT]):
 @dataclass(frozen=True)
 class SqliteField:
     name: str
-    is_id: bool
-    is_composite: bool
+    is_id: bool = False
+    is_composite: bool = False
+
+    is_parent: bool = False
+    fixed_value: Any | None = None

{apexdevkit-1.17.6 → apexdevkit-1.17.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "apexdevkit"
-version = "1.17.6"
+version = "1.17.8"
 description = "Apex Development Tools for python."
 authors = ["Apex Dev <dev@apex.ge>"]
 readme = "README.md"