fastapi-sqlalchemy-toolkit 0.7.13__tar.gz → 0.7.14__tar.gz

{fastapi_sqlalchemy_toolkit-0.7.13 → fastapi_sqlalchemy_toolkit-0.7.14}/AUTHORS

@@ -5,3 +5,4 @@ A list of project contributors:
     Egor Kondrashov <e.kondr01@gmail.com>
     Natalia Kamysheva <nataliakamysheva@mail.ru>
     Buned Kholmatov <https://github.com/sfrvn>
+    Arina Negodina <https://github.com/negodinaarina>

{fastapi_sqlalchemy_toolkit-0.7.13 → fastapi_sqlalchemy_toolkit-0.7.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi_sqlalchemy_toolkit
-Version: 0.7.13
+Version: 0.7.14
 Summary: FastAPI SQLAlchemy Toolkit
 Project-URL: Homepage, https://github.com/e-kondr01/fastapi-sqlalchemy-toolkit
 Author-email: Egor Kondrashov <e.kondr01@gmail.com>

{fastapi_sqlalchemy_toolkit-0.7.13 → fastapi_sqlalchemy_toolkit-0.7.14}/fastapi_sqlalchemy_toolkit/model_manager.py

@@ -1,6 +1,6 @@
 # ruff: noqa: UP006
 from collections.abc import Callable, Iterable
-from typing import Any, Generic, List, TypeVar, overload  # noqa: UP035
+from typing import Any, Generic, List, TypeVar  # noqa: UP035
 
 from fastapi import HTTPException, status
 from fastapi_pagination.bases import BasePage
@@ -65,13 +65,27 @@ class ModelManager(Generic[ModelT, CreateSchemaT, UpdateSchemaT]):
         self.fk_name_to_model: dict[str, type[ModelT]] = {}
 
         self.unique_constraints: List[List[str]] = []
+        self.nullable_unique_constraints: List[List[str]] = []
+
         if hasattr(self.model, "__table_args__"):
             for table_arg in self.model.__table_args__:
                 if isinstance(table_arg, UniqueConstraint):
-                    if table_arg.columns.keys():
-                        self.unique_constraints.append(table_arg.columns.keys())
+                    # Проверяем наличие атрибута postgresql_nulls_not_distinct
+                    # и его значение
+                    if table_arg.dialect_kwargs.get("postgresql_nulls_not_distinct"):
+                        if table_arg.columns.keys():
+                            self.nullable_unique_constraints.append(
+                                table_arg.columns.keys()
+                            )
+                        else:
+                            self.nullable_unique_constraints.append(
+                                table_arg._pending_colargs
+                            )
                     else:
-                        self.unique_constraints.append(table_arg._pending_colargs)
+                        if table_arg.columns.keys():
+                            self.unique_constraints.append(table_arg.columns.keys())
+                        else:
+                            self.unique_constraints.append(table_arg._pending_colargs)
 
         self.reverse_relationships: dict[str, type[ModelT]] = {}
         self.m2m_relationships: dict[str, type[ModelT]] = {}
@@ -864,6 +878,7 @@ class ModelManager(Generic[ModelT, CreateSchemaT, UpdateSchemaT]):
             await self.handle_m2m_fields(session, in_obj)
         await self.validate_unique_fields(session, in_obj, db_obj=db_obj)
         await self.validate_unique_constraints(session, in_obj)
+        await self.validate_nullable_unique_constraints(session, in_obj)
         return in_obj
 
     def get_select(self, base_stmt: Select | None = None, **_kwargs: Any) -> Select:
@@ -1092,6 +1107,34 @@ class ModelManager(Generic[ModelT, CreateSchemaT, UpdateSchemaT]):
                     ),
                 )
 
+    async def validate_nullable_unique_constraints(
+        self, session: AsyncSession, in_obj: ModelDict
+    ) -> None:
+        """
+        Проверяет, не нарушаются ли nullable UniqueConstraint модели.
+        Поля со значением NULL игнорируются при проверке и не считаются дублированием.
+        """
+        for unique_constraint in self.nullable_unique_constraints:
+            query = {}
+            if any(in_obj[field] is None for field in unique_constraint):
+                continue
+
+            for field in unique_constraint:
+                query[field] = in_obj[field]
+            object_exists = await self.exists(
+                session, **query, where=(self.model.id != in_obj.get("id"))
+            )
+            if object_exists:
+                conflicting_fields = ", ".join(unique_constraint)
+                raise HTTPException(
+                    status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                    detail=(
+                        f"{self.model.__tablename__} с такими "
+                        + conflicting_fields
+                        + " уже существует."
+                    ),
+                )
+
     async def validate_unique_fields(
         self,
         session: AsyncSession,

{fastapi_sqlalchemy_toolkit-0.7.13 → fastapi_sqlalchemy_toolkit-0.7.14}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "fastapi_sqlalchemy_toolkit"
-version = "0.7.13"
+version = "0.7.14"
 authors = [
   { name="Egor Kondrashov", email="e.kondr01@gmail.com" },
 ]