fastapi-sqlalchemy-toolkit 0.8.2.4__tar.gz → 0.8.3.1__tar.gz

fastapi_sqlalchemy_toolkit-0.8.3.1/.github/workflows/python-publish.yml

@@ -0,0 +1,33 @@
+# This workflow will upload a Python Package using Twine when a release is created
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python#publishing-to-package-registries
+
+name: Upload Python Package
+
+on:
+  release:
+    types: [published]
+
+permissions:
+  contents: read
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v3
+        with:
+          python-version: "3.x"
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install build
+      - name: Build package
+        run: python -m build
+      - name: Publish package
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          user: __token__
+          password: ${{ secrets.PYPI_API_TOKEN }}

{fastapi_sqlalchemy_toolkit-0.8.2.4 → fastapi_sqlalchemy_toolkit-0.8.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: fastapi_sqlalchemy_toolkit
-Version: 0.8.2.4
+Version: 0.8.3.1
 Summary: FastAPI SQLAlchemy Toolkit
 Project-URL: Homepage, https://github.com/e-kondr01/fastapi-sqlalchemy-toolkit
 Author-email: Egor Kondrashov <e.kondr01@gmail.com>
@@ -11,6 +11,7 @@ Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.11
 Requires-Dist: fastapi-pagination>=0.12.12
 Requires-Dist: fastapi>=0.100.0
+Requires-Dist: greenlet>=3.0.0
 Requires-Dist: pydantic>=2.0.0
 Requires-Dist: sqlalchemy>=2.0.0
 Description-Content-Type: text/markdown

{fastapi_sqlalchemy_toolkit-0.8.2.4 → fastapi_sqlalchemy_toolkit-0.8.3.1}/fastapi_sqlalchemy_toolkit/model_manager.py

@@ -1,4 +1,5 @@
 # ruff: noqa: UP006
+import re
 from collections.abc import Callable, Iterable
 from enum import Enum
 from typing import Any, Generic, List, TypeVar, overload  # noqa: UP035
@@ -1504,6 +1505,11 @@ class ModelManager(Generic[ModelT, CreateSchemaT, UpdateSchemaT]):
             return True
         return str(actual_normalized) == str(expected_normalized)
 
+    _NULL_CHECK_RE = re.compile(
+        r"^\s*(?P<column>[A-Za-z_][A-Za-z0-9_]*)\s+IS\s+(?P<not>NOT\s+)?NULL\s*$",
+        re.IGNORECASE,
+    )
+
     @classmethod
     def _matches_partial_index_where(cls, condition: Any, in_obj: ModelDict) -> bool:
         """
@@ -1520,6 +1526,14 @@ class ModelManager(Generic[ModelT, CreateSchemaT, UpdateSchemaT]):
         column_name: str | None = None
         expected: Any = None
         if isinstance(condition, TextClause):
+            null_match = cls._NULL_CHECK_RE.match(condition.text)
+            if null_match:
+                column_name = null_match.group("column")
+                if column_name not in in_obj:
+                    return True
+                is_null = in_obj[column_name] is None
+                return not is_null if null_match.group("not") else is_null
+
             raw_column, separator, raw_expected = condition.text.partition("=")
             column_name = raw_column.strip()
             raw_expected = raw_expected.strip()
@@ -1537,18 +1551,28 @@ class ModelManager(Generic[ModelT, CreateSchemaT, UpdateSchemaT]):
                 expected = raw_expected
             else:
                 column_name = None
-        elif (
-            isinstance(condition, BinaryExpression)
-            and condition.operator is operators.eq
+        elif isinstance(condition, BinaryExpression) and condition.operator in (
+            operators.eq,
+            operators.is_,
+            operators.isnot,
         ):
             column_name = getattr(condition.left, "name", None) or getattr(
                 condition.left, "key", None
             )
-            expected = getattr(
-                condition.right,
-                "value",
-                getattr(condition.right, "effective_value", condition.right),
-            )
+            if condition.operator in (operators.is_, operators.isnot):
+                if not isinstance(column_name, str) or not isinstance(
+                    condition.right, Null
+                ):
+                    column_name = None
+                elif column_name in in_obj:
+                    is_null = in_obj[column_name] is None
+                    return not is_null if condition.operator is operators.isnot else is_null
+            else:
+                expected = getattr(
+                    condition.right,
+                    "value",
+                    getattr(condition.right, "effective_value", condition.right),
+                )
 
         if not isinstance(column_name, str) or column_name not in in_obj:
             return True

{fastapi_sqlalchemy_toolkit-0.8.2.4 → fastapi_sqlalchemy_toolkit-0.8.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "fastapi_sqlalchemy_toolkit"
-version = "0.8.2.4"
+version = "0.8.3.1"
 authors = [
   { name="Egor Kondrashov", email="e.kondr01@gmail.com" },
 ]
@@ -18,6 +18,7 @@ classifiers = [
 dependencies = [
     "fastapi>=0.100.0",
     "sqlalchemy>=2.0.0",
+    "greenlet>=3.0.0",
     "fastapi_pagination>=0.12.12",
     "pydantic>=2.0.0",
 ]

{fastapi_sqlalchemy_toolkit-0.8.2.4 → fastapi_sqlalchemy_toolkit-0.8.3.1}/requirements/base.txt

@@ -1,4 +1,5 @@
 fastapi>=0.100.0
 sqlalchemy>=2.0.0
+greenlet>=3.0.0
 fastapi_pagination>=0.12.12
 pydantic>=2.0.0

{fastapi_sqlalchemy_toolkit-0.8.2.4 → fastapi_sqlalchemy_toolkit-0.8.3.1}/tests/test_partial_where.py

@@ -113,3 +113,59 @@ def test_unsupported_text_fail_safe() -> None:
     assert (
         ModelManager._matches_partial_index_where(condition, {"kind": "extra"}) is True
     )
+
+
+def test_text_clause_is_null_matches() -> None:
+    condition = text("group_id IS NULL")
+    assert (
+        ModelManager._matches_partial_index_where(condition, {"group_id": None})
+        is True
+    )
+    assert (
+        ModelManager._matches_partial_index_where(condition, {"group_id": 1}) is False
+    )
+    # column missing from the object being validated: fail safe to "matches"
+    assert ModelManager._matches_partial_index_where(condition, {}) is True
+
+
+def test_text_clause_is_not_null_matches() -> None:
+    condition = text("  group_id   is   not   null  ")
+    assert (
+        ModelManager._matches_partial_index_where(condition, {"group_id": None})
+        is False
+    )
+    assert (
+        ModelManager._matches_partial_index_where(condition, {"group_id": 1}) is True
+    )
+
+
+def test_binary_expression_is_null_matches() -> None:
+    index = Index(
+        "ix_is_null",
+        _Model.group_id,
+        unique=True,
+        postgresql_where=(_Model.kind.is_(None)),
+    )
+    condition = index.dialect_options["postgresql"]["where"]
+    assert (
+        ModelManager._matches_partial_index_where(condition, {"kind": None}) is True
+    )
+    assert (
+        ModelManager._matches_partial_index_where(condition, {"kind": "main"}) is False
+    )
+
+
+def test_binary_expression_is_not_null_matches() -> None:
+    index = Index(
+        "ix_is_not_null",
+        _Model.group_id,
+        unique=True,
+        postgresql_where=(_Model.kind.isnot(None)),
+    )
+    condition = index.dialect_options["postgresql"]["where"]
+    assert (
+        ModelManager._matches_partial_index_where(condition, {"kind": None}) is False
+    )
+    assert (
+        ModelManager._matches_partial_index_where(condition, {"kind": "main"}) is True
+    )

fastapi_sqlalchemy_toolkit-0.8.2.4/.github/workflows/python-publish.yml

@@ -1,34 +0,0 @@
-# This workflow will upload a Python Package using Twine when a release is created
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python#publishing-to-package-registries
-
-name: Upload Python Package
-
-on:
-  release:
-    types: [published]
-
-permissions:
-  contents: read
-
-jobs:
-  deploy:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python
-      uses: actions/setup-python@v3
-      with:
-        python-version: '3.x'
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install build
-    - name: Build package
-      run: python -m build
-    - name: Publish package
-      uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29
-      with:
-        user: __token__
-        password: ${{ secrets.PYPI_API_TOKEN }}