plain.postgres 0.110.0__tar.gz → 0.110.2__tar.gz

{plain_postgres-0.110.0 → plain_postgres-0.110.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plain.postgres
-Version: 0.110.0
+Version: 0.110.2
 Summary: Model your data and store it in a database.
 Author-email: Dave Gaeddert <dave.gaeddert@dropseed.dev>
 License-Expression: BSD-3-Clause

{plain_postgres-0.110.0 → plain_postgres-0.110.2}/plain/postgres/CHANGELOG.md

@@ -1,5 +1,25 @@
 # plain-postgres changelog
 
+## [0.110.2](https://github.com/dropseed/plain/releases/plain-postgres@0.110.2) (2026-06-26)
+
+### What's changed
+
+- Internal type-annotation cleanups (`Func` expression attributes, enum choices) and a dev-dependency bump (pytest 9.1.1) to clear a security advisory. No public API changes. ([288bbf0bb1](https://github.com/dropseed/plain/commit/288bbf0bb1))
+
+### Upgrade instructions
+
+- No changes required.
+
+## [0.110.1](https://github.com/dropseed/plain/releases/plain-postgres@0.110.1) (2026-06-22)
+
+### What's changed
+
+- Internal: the ordering infinite-loop guard builds its join signature with `isinstance(alias, Join)` instead of `getattr(alias, "join_col", None)`, keeping `.join_col` greppable and type-checked. No behavior change. ([c813405f](https://github.com/dropseed/plain/commit/c813405f))
+
+### Upgrade instructions
+
+- No changes required.
+
 ## [0.110.0](https://github.com/dropseed/plain/releases/plain-postgres@0.110.0) (2026-06-17)
 
 ### What's changed

{plain_postgres-0.110.0 → plain_postgres-0.110.2}/plain/postgres/agents/.claude/rules/plain-postgres.md

@@ -39,16 +39,7 @@ Do NOT import field classes directly from `plain.postgres` or `plain.postgres.fi
 
 ## Schema Changes
 
-When creating new models or modifying existing model fields/relationships, always enter plan mode first. Database schema is hard to change after the fact, so get the design right before writing code.
-
-In your plan, present:
-
-- Proposed schema as a table (model, field, type, constraints)
-- Relationship cardinality (1:1, 1:N, M:N)
-- Key decisions: nullable vs default, indexing, cascade behavior
-- Whether the data could live on an existing model instead of a new one
-
-Get approval before writing any model code or generating migrations.
+Migrations are annoying to revise after the fact; convergence is cheap. So before making a batch of migration-generating changes — new models, new columns, or column-type changes — think the design through first. Nullability, defaults, indexes, constraints, `on_delete`, and `choices` aren't migrations; they're convergence (edit the model and re-sync), so they stay cheap to revise. For a large set of migration-dependent changes, surfacing the design first (plan mode fits) is worth it.
 
 ## Migrations vs Convergence
 

{plain_postgres-0.110.0 → plain_postgres-0.110.2}/plain/postgres/enums.py

@@ -58,7 +58,7 @@ class ChoicesMeta(enum.EnumMeta):
     @property
     def choices(cls) -> list[tuple[Any, str]]:
         empty = [(None, cls.__empty__)] if hasattr(cls, "__empty__") else []
-        return empty + [(member.value, member.label) for member in cls]  # ty: ignore[unresolved-attribute, invalid-return-type]
+        return empty + [(member.value, member.label) for member in cls]  # ty: ignore[unresolved-attribute]
 
     @property
     def labels(cls) -> list[str]:

{plain_postgres-0.110.0 → plain_postgres-0.110.2}/plain/postgres/expressions.py

@@ -8,7 +8,7 @@ from collections import defaultdict
 from decimal import Decimal
 from functools import cached_property
 from types import NoneType
-from typing import TYPE_CHECKING, Any, Protocol, Self, runtime_checkable
+from typing import TYPE_CHECKING, Any, Protocol, Self, cast, runtime_checkable
 from uuid import UUID
 
 import psycopg
@@ -911,10 +911,10 @@ class OuterRef(F):
 class Func(Expression):
     """An SQL function call."""
 
-    function = None
-    template = "%(function)s(%(expressions)s)"
-    arg_joiner = ", "
-    arity = None  # The number of arguments the function accepts.
+    function: str | None = None
+    template: str = "%(function)s(%(expressions)s)"
+    arg_joiner: str = ", "
+    arity: int | None = None  # The number of arguments the function accepts.
 
     def __init__(
         self, *expressions: Any, output_field: Field | None = None, **extra: Any
@@ -1001,10 +1001,14 @@ class Func(Expression):
             data["function"] = function
         else:
             data.setdefault("function", self.function)
-        template = template or data.get("template", self.template)
-        arg_joiner = arg_joiner or data.get("arg_joiner", self.arg_joiner)
-        data["expressions"] = data["field"] = arg_joiner.join(sql_parts)
-        return template % data, params
+        # `data` is typed dict[str, Any], so the override values come back as
+        # Any; they are always strings, so cast to keep the `or` fallback typed.
+        resolved_template = template or cast(str, data.get("template", self.template))
+        resolved_joiner = arg_joiner or cast(
+            str, data.get("arg_joiner", self.arg_joiner)
+        )
+        data["expressions"] = data["field"] = resolved_joiner.join(sql_parts)
+        return resolved_template % data, params
 
     def copy(self) -> Self:
         clone = super().copy()

{plain_postgres-0.110.0 → plain_postgres-0.110.2}/plain/postgres/sql/compiler.py

@@ -42,6 +42,7 @@ from plain.postgres.sql.constants import (
     ORDER_DIR,
     SINGLE,
 )
+from plain.postgres.sql.datastructures import Join
 from plain.postgres.sql.query import Query, get_order_dir
 from plain.postgres.transaction import TransactionManagementError
 from plain.utils.hashable import make_hashable
@@ -343,7 +344,7 @@ class SQLCompiler:
         if self.query.select_related:
             related_klass_infos = self.get_related_selections(select, select_mask)
             if klass_info is not None:
-                klass_info["related_klass_infos"] = related_klass_infos  # ty: ignore[invalid-assignment] (heterogeneous klass_info dict)
+                klass_info["related_klass_infos"] = related_klass_infos
 
         ret = []
         col_idx = 1
@@ -903,10 +904,14 @@ class SQLCompiler:
             and field.name != pieces[-1]
             and not getattr(transform_function, "has_transforms", False)
         ):
-            # Firstly, avoid infinite loops.
+            # Firstly, avoid infinite loops. Each join contributes its column
+            # pair to the signature; the base table (no join_col) contributes
+            # None. isinstance keeps `.join_col` greppable and type-checked.
             already_seen = already_seen or set()
+            alias_map = self.query.alias_map
             join_tuple = tuple(
-                getattr(self.query.alias_map[j], "join_col", None) for j in joins
+                alias_map[j].join_col if isinstance(alias_map[j], Join) else None
+                for j in joins
             )
             if join_tuple in already_seen:
                 raise FieldError("Infinite loop caused by ordering.")

{plain_postgres-0.110.0 → plain_postgres-0.110.2}/plain/postgres/test/pytest.py

@@ -24,7 +24,7 @@ def _db_disabled() -> Generator[None]:
     """
 
     def cursor_disabled(self: Any) -> None:
-        pytest.fail("Database access not allowed without the `db` fixture")  # ty: ignore[invalid-argument-type]
+        pytest.fail("Database access not allowed without the `db` fixture")
 
     # Save original cursor method and replace with disabled version
     setattr(DatabaseConnection, "_enabled_cursor", DatabaseConnection.cursor)
@@ -63,7 +63,7 @@ def setup_db(request: Any) -> Generator[None]:
 @pytest.fixture
 def db(setup_db: Any, request: Any) -> Generator[None]:
     if "isolated_db" in request.fixturenames:
-        pytest.fail("The 'db' and 'isolated_db' fixtures cannot be used together")  # ty: ignore[invalid-argument-type]
+        pytest.fail("The 'db' and 'isolated_db' fixtures cannot be used together")
 
     # Set .cursor() back to the original implementation to unblock it
     DatabaseConnection.cursor = getattr(DatabaseConnection, "_enabled_cursor")
@@ -101,7 +101,7 @@ def isolated_db(request: Any) -> Generator[None]:
     test database.
     """
     if "db" in request.fixturenames:
-        pytest.fail("The 'db' and 'isolated_db' fixtures cannot be used together")  # ty: ignore[invalid-argument-type]
+        pytest.fail("The 'db' and 'isolated_db' fixtures cannot be used together")
     # Set .cursor() back to the original implementation to unblock it
     DatabaseConnection.cursor = getattr(DatabaseConnection, "_enabled_cursor")
 

{plain_postgres-0.110.0 → plain_postgres-0.110.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "plain.postgres"
-version = "0.110.0"
+version = "0.110.2"
 description = "Model your data and store it in a database."
 authors = [{ name = "Dave Gaeddert", email = "dave.gaeddert@dropseed.dev" }]
 readme = "README.md"

{plain_postgres-0.110.0 → plain_postgres-0.110.2}/tests/public/test_exceptions.py

@@ -62,11 +62,11 @@ def test_base_exceptions_from_plain_exceptions():
     except ObjectDoesNotExist:
         pass  # Should work due to inheritance
     except Exception:
-        pytest.fail("Should have caught with base ObjectDoesNotExist")  # ty: ignore[invalid-argument-type]
+        pytest.fail("Should have caught with base ObjectDoesNotExist")
 
     try:
         raise IterationExample.MultipleObjectsReturned("model-specific exception")
     except MultipleObjectsReturned:
         pass  # Should work due to inheritance
     except Exception:
-        pytest.fail("Should have caught with base MultipleObjectsReturned")  # ty: ignore[invalid-argument-type]
+        pytest.fail("Should have caught with base MultipleObjectsReturned")

{plain_postgres-0.110.0 → plain_postgres-0.110.2}/tests/public/test_related.py

@@ -55,7 +55,7 @@ class TestForwardForeignKeyDescriptor:
         except Exception as e:
             # For now, accept that nullable FK behavior might need adjustment
             # The core relationship functionality works
-            pytest.skip(f"Nullable FK handling needs refinement: {e}")  # ty: ignore[too-many-positional-arguments]
+            pytest.skip(f"Nullable FK handling needs refinement: {e}")
 
 
 class TestReverseForeignKey: