feat(persistence): PR6 T5.11 — ORM workspace_id nullable=False
Flip the 4 business ORM models (ThreadMetaRow, RunRow, FeedbackRow, RunEventRow) to ``workspace_id: Mapped[str]`` with ``nullable=False``. PR5's alembic 0003 already enforces NOT NULL at the DB layer; this aligns the ORM-driven ``create_all()`` path (dev / tests) with the same invariant so a new install ends up at the post-0003 schema without running alembic. Test fallout absorbed: - `tests/conftest.py` autouse seed now produces a fully consistent pair: user row (default_workspace_id = test-workspace-autouse) plus the workspace itself. The PR5 backfill script's "users without default_workspace_id" query no longer picks the fixture up. Insert order is user → workspace → UPDATE user, walking around the chicken- and-egg FK between `workspaces.owner_id` and `users.default_workspace_id`. - `tests/test_backfill_workspace_id.py` adds a file-scoped autouse fixture that temporarily flips `column.nullable = True` for the four business tables (production correctness comes from alembic 0003; the script's own job is exactly to fill rows between 0002 and 0003 so its tests need that transient state to be representable). Its `_init_engine` also deletes the autouse seed rows to match the "fresh DB" model the tests assume. - `test_thread_meta_workspace_filter::test_create_workspace_none_bypasses` renamed to `test_create_workspace_none_rejected_by_orm` and asserts the new IntegrityError on explicit None — write paths can no longer bypass workspace scope. - 5 `test_workspace_context` tests + the auth-middleware reset test get `@pytest.mark.no_auto_workspace` so they keep testing the unset-contextvar path. - `test_workspace_repo::test_list_by_user_bypass_returns_all` switches to membership assertions instead of strict equality since the autouse fixture surfaces under `user_id=None`. 3214 passed, 30 skipped; the remaining 17 are the documented pre-existing caplog ordering flakes (all pass in isolation).
This commit is contained in:
@@ -66,7 +66,7 @@ sys.modules["deerflow.subagents.executor"] = _executor_mock
|
||||
def _register_test_seed_listener() -> None:
|
||||
"""Attach an after_create hook that seeds the autouse user + workspace."""
|
||||
try:
|
||||
from sqlalchemy import event
|
||||
from sqlalchemy import event, update
|
||||
from sqlalchemy.dialects.postgresql import insert as pg_insert
|
||||
from sqlalchemy.dialects.sqlite import insert as sqlite_insert
|
||||
|
||||
@@ -86,6 +86,13 @@ def _register_test_seed_listener() -> None:
|
||||
dialect = connection.dialect.name
|
||||
now = datetime.now(UTC)
|
||||
|
||||
# Seed both rows with a consistent ``default_workspace_id`` so the
|
||||
# PR5 backfill script (which scans ``users.default_workspace_id IS
|
||||
# NULL``) does not pick up the test fixtures as candidates.
|
||||
# Insert user first with NULL default_workspace_id (chicken-and-egg
|
||||
# with workspaces.owner_id FK), then workspace, then UPDATE the user
|
||||
# row to point at the workspace so the PR5 backfill script does not
|
||||
# pick up the autouse user as a candidate.
|
||||
user_values = {
|
||||
"id": "test-user-autouse",
|
||||
"email": "test-user-autouse@local",
|
||||
@@ -119,6 +126,7 @@ def _register_test_seed_listener() -> None:
|
||||
|
||||
connection.execute(user_stmt)
|
||||
connection.execute(ws_stmt)
|
||||
connection.execute(update(UserRow.__table__).where(UserRow.__table__.c.id == "test-user-autouse").where(UserRow.__table__.c.default_workspace_id.is_(None)).values(default_workspace_id="test-workspace-autouse"))
|
||||
|
||||
event.listen(Base.metadata, "after_create", _seed)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user