feat: add schema v1 ddl for presence schedules and overrides

custom_components/nestquest/__init__.py

@@ -11,7 +11,7 @@ from homeassistant.core import HomeAssistant
 
 from .const import DOMAIN, LOGGER
 from .db import NestQuestDatabase
-from .migrations import apply_migrations
+from .schema import SCHEMA_V1_STATEMENTS, async_apply_ddl
 from .store import async_get_db_path
 
 _LOGGER = LOGGER
@@ -52,7 +52,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     database = await NestQuestDatabase(hass).open(await async_get_db_path(hass))
     try:
-        await apply_migrations(database)
+        await async_apply_ddl(database, SCHEMA_V1_STATEMENTS)
         remove_update_listener = entry.add_update_listener(_async_update_listener)
     except BaseException:
         await database.close()

custom_components/nestquest/dao_children.py

@@ -1,289 +0,0 @@
-"""Typed DAO layer for the children and admin_users tables.
-
-All SQL for ``children`` and ``admin_users`` lives in this module per
-the feature guardrail: callers get typed dataclasses back and never see
-raw rows or SQL.  Every method is async and runs through
-:class:`~.db.NestQuestDatabase`, so each statement executes on the HA
-executor and the event loop never blocks.
-
-Error contract: violations surface as the underlying
-:class:`sqlite3.IntegrityError` (duplicate, foreign-key, or CHECK
-failure) from the execute call; the DAO adds no wrapping exception
-type.  A get that matches nothing returns ``None``; a mutation that
-matches nothing is reported by :class:`~.db.ExecutionResult.rowcount`,
-which each method returns where the caller may need it (reorder, and
-the admin remove/set paths).
-"""
-from __future__ import annotations
-
-import asyncio
-from dataclasses import dataclass
-
-from .db import NestQuestDatabase
-
-
-@dataclass(frozen=True)
-class ChildRecord:
-    """One row of ``children``."""
-
-    id: int
-    display_name: str
-    colour: str | None
-    avatar_ref: str | None
-    sort_order: int
-    is_active: bool
-    created_at: str
-
-
-@dataclass(frozen=True)
-class AdminUserRecord:
-    """One row of ``admin_users``."""
-
-    ha_user_id: str
-    added_at: str
-
-
-def _child_from_row(row: tuple) -> ChildRecord:
-    """Build a :class:`ChildRecord` from a SELECT row."""
-    return ChildRecord(
-        id=row[0],
-        display_name=row[1],
-        colour=row[2],
-        avatar_ref=row[3],
-        sort_order=row[4],
-        is_active=bool(row[5]),
-        created_at=row[6],
-    )
-
-
-_CHILD_COLUMNS = (
-    "id, display_name, colour, avatar_ref, sort_order, is_active, created_at"
-)
-
-
-#: One asyncio.Lock per (connection wrapper, running loop), shared by
-#: every ChildrenDao instance over the same database: the wrapper
-#: rejects a second concurrent transaction with RuntimeError, so ALL
-#: transactional DAO operations on one connection must queue here, not
-#: per-instance.  Keyed like the migration runner's lock; entries are
-#: never evicted (a config entry holds one wrapper per process).
-_CONNECTION_LOCKS: dict[tuple[int, int], asyncio.Lock] = {}
-
-
-def _connection_lock(database) -> asyncio.Lock:
-    """Return the shared transaction-serializing lock for ``database``."""
-    loop = asyncio.get_running_loop()
-    key = (id(database), id(loop))
-    lock = _CONNECTION_LOCKS.get(key)
-    if lock is None:
-        lock = asyncio.Lock()
-        _CONNECTION_LOCKS[key] = lock
-    return lock
-
-
-class ChildrenDao:
-    """Typed async data access for the ``children`` table.
-
-    Deletion is deliberately absent: children are deactivated, never
-    deleted, because completion history references them (feature
-    guardrail).
-    """
-
-    def __init__(self, database) -> None:
-        self._database = database
-
-    async def create(
-        self,
-        display_name: str,
-        created_at: str,
-        *,
-        colour: str | None = None,
-        avatar_ref: str | None = None,
-        sort_order: int = 0,
-        is_active: bool = True,
-    ) -> ChildRecord:
-        """Insert one child and return the record as stored."""
-        result = await self._database.execute(
-            "INSERT INTO children (display_name, colour, avatar_ref, "
-            "sort_order, is_active, created_at) VALUES (?, ?, ?, ?, ?, ?)",
-            (
-                display_name,
-                colour,
-                avatar_ref,
-                sort_order,
-                int(is_active),
-                created_at,
-            ),
-        )
-        child = await self.get(result.lastrowid)
-        assert child is not None
-        return child
-
-    async def get(self, child_id: int) -> ChildRecord | None:
-        """Return the child with ``child_id``, or None."""
-        row = await self._database.fetch_one(
-            f"SELECT {_CHILD_COLUMNS} FROM children WHERE id = ?",
-            (child_id,),
-        )
-        return _child_from_row(row) if row is not None else None
-
-    async def list_active(self) -> list[ChildRecord]:
-        """Return active children ordered by sort_order, then id."""
-        rows = await self._database.fetch_all(
-            f"SELECT {_CHILD_COLUMNS} FROM children WHERE is_active = 1 "
-            "ORDER BY sort_order, id"
-        )
-        return [_child_from_row(row) for row in rows]
-
-    async def list_all(self) -> list[ChildRecord]:
-        """Return all children ordered by sort_order, then id."""
-        rows = await self._database.fetch_all(
-            f"SELECT {_CHILD_COLUMNS} FROM children "
-            "ORDER BY sort_order, id"
-        )
-        return [record for record in map(_child_from_row, rows)]
-
-    async def update(
-        self,
-        child_id: int,
-        *,
-        display_name: str | None = None,
-        colour: str | None = None,
-        avatar_ref: str | None = None,
-        sort_order: int | None = None,
-    ) -> int:
-        """Update the given fields; returns rows updated (0 if absent).
-
-        Only non-None arguments are written, so a caller cannot
-        accidentally blank a column by omitting it.
-        """
-        assignments: list[str] = []
-        parameters: list[object] = []
-        if display_name is not None:
-            assignments.append("display_name = ?")
-            parameters.append(display_name)
-        if colour is not None:
-            assignments.append("colour = ?")
-            parameters.append(colour)
-        if avatar_ref is not None:
-            assignments.append("avatar_ref = ?")
-            parameters.append(avatar_ref)
-        if sort_order is not None:
-            assignments.append("sort_order = ?")
-            parameters.append(sort_order)
-        if not assignments:
-            return 0
-        parameters.append(child_id)
-        result = await self._database.execute(
-            f"UPDATE children SET {', '.join(assignments)} WHERE id = ?",
-            tuple(parameters),
-        )
-        return result.rowcount
-
-    async def set_active(self, child_id: int, is_active: bool) -> int:
-        """Set the child's active flag; returns rows updated (0 if absent)."""
-        result = await self._database.execute(
-            "UPDATE children SET is_active = ? WHERE id = ?",
-            (int(is_active), child_id),
-        )
-        return result.rowcount
-
-    async def reorder(self, ordered_ids: list[int]) -> None:
-        """Persist a new sort order: ``ordered_ids[i]`` gets sort_order i.
-
-        Runs inside one transaction; positions are staged at offset
-        -len (all negative, so any permutation of the same ids never
-        collides mid-reorder under the wrapper's single-connection
-        serialization), then finalized 0..n-1.  Duplicate ids are
-        rejected up front: they cannot all hold distinct positions, and
-        silently assigning the last occurrence's index would hide a
-        caller bug.
-
-        Concurrent reorder() calls on one connection are serialized by
-        a connection-scoped asyncio lock (shared across every ChildrenDao
-        over the same wrapper, however many instances): the wrapper's
-        transaction() rejects a second concurrent transaction with
-        RuntimeError, so racing callers would crash instead of
-        queueing.  The lock makes the second call wait, then run
-        against the first call's final state.
-        """
-        if not ordered_ids:
-            return
-        if len(set(ordered_ids)) != len(ordered_ids):
-            raise ValueError(
-                "reorder() received duplicate child ids; every id must "
-                "appear at most once"
-            )
-        async with _connection_lock(self._database):
-            async with self._database.transaction():
-                offset = len(ordered_ids)
-                await self._database.execute_many(
-                    "UPDATE children SET sort_order = ? WHERE id = ?",
-                    [
-                        (-(offset + index), child_id)
-                        for index, child_id in enumerate(ordered_ids)
-                    ],
-                )
-                await self._database.execute_many(
-                    "UPDATE children SET sort_order = ? WHERE id = ?",
-                    [
-                        (index, child_id)
-                        for index, child_id in enumerate(ordered_ids)
-                    ],
-                )
-
-
-class AdminUsersDao:
-    """Typed async access to the ``admin_users`` allowlist.
-
-    The allowlist stores HA user IDs, never usernames (feature
-    guardrail); an empty allowlist means no admin, enforced by callers
-    resolving through :meth:`exists`.
-    """
-
-    def __init__(self, database) -> None:
-        self._database = database
-
-    async def add(self, ha_user_id: str, added_at: str) -> bool:
-        """Add a user to the allowlist; True if inserted, False if present.
-
-        Idempotent under concurrency: a single INSERT ... ON CONFLICT DO
-        NOTHING decides and inserts in one statement (the wrapper
-        serializes statements, not check-then-insert sequences, so a
-        SELECT/INSERT pair would let two concurrent adds both see no
-        row and the second one raise IntegrityError).  rowcount reports
-        whether the insert actually happened.
-        """
-        result = await self._database.execute(
-            "INSERT INTO admin_users (ha_user_id, added_at) VALUES (?, ?) "
-            "ON CONFLICT (ha_user_id) DO NOTHING",
-            (ha_user_id, added_at),
-        )
-        return result.rowcount > 0
-
-    async def remove(self, ha_user_id: str) -> bool:
-        """Remove a user from the allowlist; True if a row was removed."""
-        result = await self._database.execute(
-            "DELETE FROM admin_users WHERE ha_user_id = ?",
-            (ha_user_id,),
-        )
-        return result.rowcount > 0
-
-    async def list(self) -> list[AdminUserRecord]:
-        """Return every allowlisted user, oldest first."""
-        rows = await self._database.fetch_all(
-            "SELECT ha_user_id, added_at FROM admin_users "
-            "ORDER BY added_at, ha_user_id"
-        )
-        return [
-            AdminUserRecord(ha_user_id=row[0], added_at=row[1])
-            for row in rows
-        ]
-
-    async def exists(self, ha_user_id: str) -> bool:
-        """Return True if ``ha_user_id`` is allowlisted."""
-        row = await self._database.fetch_one(
-            "SELECT 1 FROM admin_users WHERE ha_user_id = ?",
-            (ha_user_id,),
-        )
-        return row is not None

custom_components/nestquest/dao_instances.py

@@ -1,542 +0,0 @@
-"""Typed DAO layer for task_instances and the append-only completion_events.
-
-All SQL for these tables lives in this module per the feature
-guardrails: callers get typed dataclasses back and never see raw rows
-or SQL.  Every method is async and runs through
-:class:`~.db.NestQuestDatabase`, so each statement executes on the HA
-executor and the event loop never blocks.
-
-Append-only policy (Feature 08, D-005): ``completion_events`` is
-strictly append-only.  This module is where that property is enforced
-mechanically — the completion-events DAO below exposes NO update or
-delete method at all; completions append, un-completions append a
-separate reversal event, and instance state derives from the latest
-event.  A package-wide guard test (bottom of the test module) keeps
-mutation SQL for this table out of every other module.
-
-Upsert semantics: ``TaskInstancesDao.upsert`` is idempotent on
-(definition_id, due_date) — re-running materialization for a date
-whose instance already exists updates nothing that matters
-(child_id/due_time are refreshed only in the degenerate re-generation
-case where they changed) and never duplicates a row.  The schema's
-UNIQUE(definition_id, due_date) is the last line of defense.
-
-``delete_future_uncompleted`` implements the Feature 06/07 rule that
-reassignment and schedule edits regenerate future instances: it
-removes only instances at or after the cutoff that have NO completion
-event, inside one transaction, so an instance completed mid-call can
-never be deleted.  Instances in the past are never touched (Feature 07
-guardrail: never delete history), and no method here deletes a single
-instance that has a completion event.
-"""
-from __future__ import annotations
-
-import datetime
-from dataclasses import dataclass
-
-from .dao_children import _connection_lock
-from .dao_rules import _validate_date
-from .db import NestQuestDatabase
-
-#: Timestamp policy for completion_events.occurred_at: strict UTC
-#: ISO-8601 with explicit '+00:00' offset (module timestamp policy).
-#: One accepted shape bounds lexicographic range queries correctly, so
-#: the occurred-at scope does not guess at timestamp spellings.
-_UTC_TIMESTAMP_FORMAT = "%Y-%m-%dT%H:%M:%S+00:00"
-
-
-def _validate_utc_timestamp(value: str, field: str) -> None:
-    """Raise ValueError unless ``value`` is a strict UTC ISO-8601 stamp.
-
-    Same strictness policy as _validate_date: parse with the exact
-    format, then round-trip the parsed value against the input so
-    non-padded or re-ordered shapes are rejected.  The round-trip
-    strips the UTC offset (isoformat() omits it when the offset is
-    zero), so the suffix is appended before comparing.
-    """
-    try:
-        parsed = datetime.datetime.strptime(
-            value, _UTC_TIMESTAMP_FORMAT
-        )
-    except (TypeError, ValueError):
-        raise ValueError(
-            f"{field} must be a UTC ISO-8601 timestamp "
-            f"(YYYY-MM-DDTHH:MM:SS+00:00), got {value!r}"
-        ) from None
-    if parsed.isoformat() + "+00:00" != value:
-        raise ValueError(
-            f"{field} must be a strict UTC timestamp "
-            f"(YYYY-MM-DDTHH:MM:SS+00:00), got {value!r}"
-        )
-
-
-def _next_day_start(date_str: str) -> str:
-    """Return the UTC timestamp one second past ``date_str``'s last second.
-
-    Gives range queries an exact half-open upper bound without
-    fractional-second guessing.
-    """
-    day = datetime.date.fromisoformat(date_str)
-    next_day = day + datetime.timedelta(days=1)
-    return f"{next_day.isoformat()}T00:00:00+00:00"
-
-
-@dataclass(frozen=True)
-class TaskInstanceRecord:
-    """One row of ``task_instances``."""
-
-    id: int
-    definition_id: int
-    child_id: int
-    due_date: str
-    due_time: str | None
-    generated_at: str
-
-
-@dataclass(frozen=True)
-class CompletionEventRecord:
-    """One row of ``completion_events`` (append-only table)."""
-
-    id: int
-    instance_id: int
-    child_id: int
-    event_type: str
-    actor_source: str
-    actor_user_id: str | None
-    occurred_at: str
-    was_on_time: bool | None
-
-
-_INSTANCE_COLUMNS = (
-    "id, definition_id, child_id, due_date, due_time, generated_at"
-)
-_EVENT_COLUMNS = (
-    "id, instance_id, child_id, event_type, actor_source, actor_user_id, "
-    "occurred_at, was_on_time"
-)
-
-#: The only event types the append path accepts; the schema CHECK is
-#: the backstop, this is the DAO's typed front door.
-EVENT_COMPLETED = "completed"
-EVENT_UNCOMPLETED = "uncompleted"
-
-
-def _instance_from_row(row: tuple) -> TaskInstanceRecord:
-    return TaskInstanceRecord(
-        id=row[0],
-        definition_id=row[1],
-        child_id=row[2],
-        due_date=row[3],
-        due_time=row[4],
-        generated_at=row[5],
-    )
-
-
-def _event_from_row(row: tuple) -> CompletionEventRecord:
-    return CompletionEventRecord(
-        id=row[0],
-        instance_id=row[1],
-        child_id=row[2],
-        event_type=row[3],
-        actor_source=row[4],
-        actor_user_id=row[5],
-        occurred_at=row[6],
-        was_on_time=None if row[7] is None else bool(row[7]),
-    )
-
-
-class TaskInstancesDao:
-    """Typed async access to the ``task_instances`` table."""
-
-    def __init__(self, database: NestQuestDatabase) -> None:
-        self._database = database
-
-    async def upsert(
-        self,
-        definition_id: int,
-        child_id: int,
-        due_date: str,
-        generated_at: str,
-        *,
-        due_time: str | None = None,
-    ) -> TaskInstanceRecord:
-        """Create the dated instance for (definition_id, due_date) idempotently.
-
-        Running materialization twice for the same definition/date
-        yields ONE row: the ON CONFLICT path refreshes the
-        generation-time snapshot columns (child_id, due_time) and
-        regenerates the stamp, but can never create a duplicate — the
-        schema UNIQUE(definition_id, due_date) backs this up.
-
-        Guardrails enforced here:
-
-        - ``due_date`` must be TODAY or later: instances are never
-          generated in the past (Feature 07).  The caller's
-          materialization horizon is future-dated by definition.
-        - An existing instance WITH a completion event is IMMUTABLE:
-          the conflict path must not rewrite its snapshot columns
-          (Feature 07/08).  The upsert refuses with ValueError in that
-          case — silently no-oping would mask a materialization bug.
-
-        The definition must exist (validated atomically under the
-        connection lock so a concurrent definition deactivation or
-        child deletion cannot slip between check and insert).
-        """
-        _validate_date(due_date, "due_date")
-        # Fail fast on obviously-past dates BEFORE queuing on the
-        # connection lock (a nice early error); the AUTHORITATIVE
-        # check runs after the lock is acquired, because a caller can
-        # wait on the lock across midnight — a date that was "today"
-        # at call time may be "yesterday" by the time the INSERT runs.
-        today = datetime.date.today().isoformat()
-        if due_date < today:
-            raise ValueError(
-                f"instances are never generated in the past: due_date "
-                f"{due_date!r} is before today {today!r}"
-            )
-        async with _connection_lock(self._database):
-            async with self._database.transaction():
-                # Re-read "today" under the lock: this is the date the
-                # insert actually executes on, so the no-past rule
-                # holds across midnight rollovers.
-                today = datetime.date.today().isoformat()
-                if due_date < today:
-                    raise ValueError(
-                        f"instances are never generated in the past: "
-                        f"due_date {due_date!r} is before today "
-                        f"{today!r}"
-                    )
-                definition = await self._database.fetch_one(
-                    "SELECT child_id FROM task_definitions WHERE id = ?",
-                    (definition_id,),
-                )
-                if definition is None:
-                    raise ValueError(
-                        f"task definition {definition_id} does not exist"
-                    )
-                if definition[0] != child_id:
-                    raise ValueError(
-                        f"task definition {definition_id} is assigned to "
-                        f"child {definition[0]}, not {child_id}; instance "
-                        "must carry the definition's assignee"
-                    )
-                child = await self._database.fetch_one(
-                    "SELECT 1 FROM children WHERE id = ?", (child_id,)
-                )
-                if child is None:
-                    raise ValueError(f"child {child_id} does not exist")
-                existing = await self._database.fetch_one(
-                    "SELECT 1 FROM completion_events "
-                    "WHERE instance_id = (SELECT id FROM task_instances "
-                    "WHERE definition_id = ? AND due_date = ?)",
-                    (definition_id, due_date),
-                )
-                if existing is not None:
-                    raise ValueError(
-                        f"instance for (definition {definition_id}, "
-                        f"due_date {due_date!r}) already has a completion "
-                        "event and is immutable; it cannot be regenerated"
-                    )
-                await self._database.execute(
-                    "INSERT INTO task_instances (definition_id, child_id, "
-                    "due_date, due_time, generated_at) "
-                    "VALUES (?, ?, ?, ?, ?) "
-                    "ON CONFLICT (definition_id, due_date) DO UPDATE SET "
-                    "child_id = excluded.child_id, "
-                    "due_time = excluded.due_time, "
-                    "generated_at = excluded.generated_at",
-                    (
-                        definition_id,
-                        child_id,
-                        due_date,
-                        due_time,
-                        generated_at,
-                    ),
-                )
-                instance = await self.get(definition_id, due_date)
-        assert instance is not None
-        return instance
-
-    async def get(
-        self, definition_id: int, due_date: str
-    ) -> TaskInstanceRecord | None:
-        """Return the instance for (definition_id, due_date), or None."""
-        row = await self._database.fetch_one(
-            f"SELECT {_INSTANCE_COLUMNS} FROM task_instances "
-            "WHERE definition_id = ? AND due_date = ?",
-            (definition_id, due_date),
-        )
-        return _instance_from_row(row) if row is not None else None
-
-    async def get_by_id(self, instance_id: int) -> TaskInstanceRecord | None:
-        """Return the instance with ``instance_id``, or None."""
-        row = await self._database.fetch_one(
-            f"SELECT {_INSTANCE_COLUMNS} FROM task_instances WHERE id = ?",
-            (instance_id,),
-        )
-        return _instance_from_row(row) if row is not None else None
-
-    async def list_by_child_and_date(
-        self, child_id: int, due_date: str
-    ) -> list[TaskInstanceRecord]:
-        """Return the child's instances due exactly on ``due_date``."""
-        _validate_date(due_date, "due_date")
-        rows = await self._database.fetch_all(
-            f"SELECT {_INSTANCE_COLUMNS} FROM task_instances "
-            "WHERE child_id = ? AND due_date = ? ORDER BY id",
-            (child_id, due_date),
-        )
-        return [_instance_from_row(row) for row in rows]
-
-    async def list_by_date_range(
-        self,
-        child_id: int,
-        range_start: str,
-        range_end: str,
-    ) -> list[TaskInstanceRecord]:
-        """Return the child's instances with due_date in the closed range."""
-        _validate_date(range_start, "range_start")
-        _validate_date(range_end, "range_end")
-        if range_end < range_start:
-            raise ValueError(
-                "range_end must be on or after range_start, got "
-                f"{range_end!r} < {range_start!r}"
-            )
-        rows = await self._database.fetch_all(
-            f"SELECT {_INSTANCE_COLUMNS} FROM task_instances "
-            "WHERE child_id = ? AND due_date >= ? AND due_date <= ? "
-            "ORDER BY due_date, id",
-            (child_id, range_start, range_end),
-        )
-        return [_instance_from_row(row) for row in rows]
-
-    async def delete_future_uncompleted(
-        self, definition_id: int, cutoff_date: str
-    ) -> int:
-        """Delete the definition's open instances at/after cutoff.
-
-        Implements regeneration after a definition edit or reassignment
-        (Features 06/07): only instances at or after the cutoff with NO
-        completion event are removed, inside one transaction — an
-        instance that gains a completion event mid-flight cannot be
-        deleted.  The cutoff cannot be backdated below today: "future"
-        is measured against TODAY (materialization regenerates the
-        rolling horizon from now), so a caller cannot use this to
-        rewrite past open instances either — the day-rollover missed
-        sweep (Feature 11) handles past-due instances instead.  Any
-        instance with a completion event is never touched, regardless
-        of its date.  Returns the number deleted.
-        """
-        _validate_date(cutoff_date, "cutoff_date")
-        async with _connection_lock(self._database):
-            async with self._database.transaction():
-                # "today" is read under the lock: the DELETE actually
-                # executes on this date, so a caller queued across
-                # midnight cannot delete instances that became past
-                # while it waited (backdating is clamped to the
-                # execution date, not the call date).
-                today = datetime.date.today().isoformat()
-                effective_cutoff = max(cutoff_date, today)
-                result = await self._database.execute(
-                    "DELETE FROM task_instances WHERE definition_id = ? "
-                    "AND due_date >= ? AND NOT EXISTS ("
-                    "  SELECT 1 FROM completion_events "
-                    "  WHERE instance_id = task_instances.id"
-                    ")",
-                    (definition_id, effective_cutoff),
-                )
-        return result.rowcount
-
-
-class CompletionEventsDao:
-    """Typed append-only access to the ``completion_events`` table.
-
-    APPEND-ONLY BY CONSTRUCTION: this class exposes ``append`` and the
-    three read methods below, and NOTHING else.  There is no update,
-    no delete, no upsert — completions and un-completions both arrive
-    through :meth:`append` as new rows, and history is immutable
-    (Feature 08 done-condition: no code path updates or deletes an
-    event).  The package-wide leak-guard test additionally fails if
-    mutation SQL for this table ever appears in any module.
-    """
-
-    def __init__(self, database: NestQuestDatabase) -> None:
-        self._database = database
-
-    async def append(
-        self,
-        instance_id: int,
-        child_id: int,
-        event_type: str,
-        actor_source: str,
-        occurred_at: str,
-        was_on_time: bool | None,
-        *,
-        actor_user_id: str | None = None,
-    ) -> CompletionEventRecord:
-        """Append one completion or un-completion event.
-
-        ``actor_source`` is 'user' (with ``actor_user_id`` set) or
-        'panel' (no user id — the tapped child is ``child_id``); the
-        actor-pair CHECK enforces this shape at the schema level.
-        ``occurred_at`` must be the module's one strict UTC shape
-        (YYYY-MM-DDTHH:MM:SS+00:00) so lexicographic range queries
-        stay exact.  ``was_on_time`` is required (True/False) for
-        completions; for un-completions it may be None or the reversed
-        completion's flag (Feature 08 still deciding).  The instance
-        and child must exist — validated atomically under the
-        connection lock.
-        """
-        if event_type not in (EVENT_COMPLETED, EVENT_UNCOMPLETED):
-            raise ValueError(
-                f"event_type must be '{EVENT_COMPLETED}' or "
-                f"'{EVENT_UNCOMPLETED}', got {event_type!r}"
-            )
-        if actor_source not in ("user", "panel"):
-            raise ValueError(
-                f"actor_source must be 'user' or 'panel', got "
-                f"{actor_source!r}"
-            )
-        if actor_source == "user" and not actor_user_id:
-            raise ValueError(
-                "actor_source 'user' requires actor_user_id"
-            )
-        if actor_source == "panel" and actor_user_id is not None:
-            raise ValueError(
-                "actor_source 'panel' must not carry actor_user_id"
-            )
-        if was_on_time is not None and type(was_on_time) is not bool:
-            raise ValueError(
-                f"was_on_time must be True, False or None, got "
-                f"{was_on_time!r}"
-            )
-        if event_type == EVENT_COMPLETED and was_on_time is None:
-            raise ValueError(
-                "a completed event requires was_on_time (True/False)"
-            )
-        _validate_utc_timestamp(occurred_at, "occurred_at")
-        async with _connection_lock(self._database):
-            async with self._database.transaction():
-                instance = await self._database.fetch_one(
-                    "SELECT child_id FROM task_instances WHERE id = ?",
-                    (instance_id,),
-                )
-                if instance is None:
-                    raise ValueError(
-                        f"task instance {instance_id} does not exist"
-                    )
-                if instance[0] != child_id:
-                    raise ValueError(
-                        f"task instance {instance_id} belongs to child "
-                        f"{instance[0]}, not {child_id}"
-                    )
-                child = await self._database.fetch_one(
-                    "SELECT 1 FROM children WHERE id = ?", (child_id,)
-                )
-                if child is None:
-                    raise ValueError(f"child {child_id} does not exist")
-                result = await self._database.execute(
-                    "INSERT INTO completion_events (instance_id, child_id, "
-                    "event_type, actor_source, actor_user_id, occurred_at, "
-                    "was_on_time) VALUES (?, ?, ?, ?, ?, ?, ?)",
-                    (
-                        instance_id,
-                        child_id,
-                        event_type,
-                        actor_source,
-                        actor_user_id,
-                        occurred_at,
-                        None if was_on_time is None else int(was_on_time),
-                    ),
-                )
-                event = await self._database.fetch_one(
-                    f"SELECT {_EVENT_COLUMNS} FROM completion_events "
-                    "WHERE id = ?",
-                    (result.lastrowid,),
-                )
-        assert event is not None
-        return _event_from_row(event)
-
-    async def list_by_instance(
-        self, instance_id: int
-    ) -> list[CompletionEventRecord]:
-        """Return every event for the instance, in append order."""
-        rows = await self._database.fetch_all(
-            f"SELECT {_EVENT_COLUMNS} FROM completion_events "
-            "WHERE instance_id = ? ORDER BY id",
-            (instance_id,),
-        )
-        return [_event_from_row(row) for row in rows]
-
-    async def list_by_child_and_date_range(
-        self,
-        child_id: int,
-        range_start: str,
-        range_end: str,
-        *,
-        due_date_scope: bool = True,
-    ) -> list[CompletionEventRecord]:
-        """Return the child's events for instances due in the closed range.
-
-        Scopes by the INSTANCE's due date (the day the task was owed),
-        not the event's wall-clock timestamp: history reporting asks
-        "what happened to the tasks due that day" (Feature 13).  Set
-        ``due_date_scope=False`` to filter by ``occurred_at`` date
-        instead.  Ordered by instance, then event id.
-        """
-        _validate_date(range_start, "range_start")
-        _validate_date(range_end, "range_end")
-        if range_end < range_start:
-            raise ValueError(
-                "range_end must be on or after range_start, got "
-                f"{range_end!r} < {range_start!r}"
-            )
-        if due_date_scope:
-            predicate = (
-                "SELECT id FROM task_instances WHERE child_id = ? "
-                "AND due_date >= ? AND due_date <= ?"
-            )
-            parameters: list[object] = [child_id, range_start, range_end]
-        else:
-            # Occurred-at scope: occurred_at is validated to the one
-            # accepted UTC shape at append time, so half-open day
-            # bounds in that same shape are exact (no spelling drift).
-            occurred_start = f"{range_start}T00:00:00+00:00"
-            occurred_end = f"{range_end}T23:59:59+00:00"
-            query = (
-                f"SELECT {_EVENT_COLUMNS} FROM completion_events "
-                "WHERE child_id = ? AND occurred_at >= ? "
-                "AND occurred_at < ? ORDER BY instance_id, id"
-            )
-            rows = await self._database.fetch_all(
-                query,
-                [
-                    child_id,
-                    occurred_start,
-                    _next_day_start(range_end),
-                ],
-            )
-            return [_event_from_row(row) for row in rows]
-        rows = await self._database.fetch_all(
-            f"SELECT {_EVENT_COLUMNS} FROM completion_events "
-            f"WHERE instance_id IN ({predicate}) "
-            "ORDER BY instance_id, id",
-            tuple(parameters),
-        )
-        return [_event_from_row(row) for row in rows]
-
-    async def get_latest_for_instance(
-        self, instance_id: int
-    ) -> CompletionEventRecord | None:
-        """Return the instance's most recent event, or None if untouched.
-
-        Instance current state derives from this event (Feature 08):
-        'completed' means done, 'uncompleted' as the latest means open
-        again, None means never completed.
-        """
-        row = await self._database.fetch_one(
-            f"SELECT {_EVENT_COLUMNS} FROM completion_events "
-            "WHERE instance_id = ? ORDER BY id DESC LIMIT 1",
-            (instance_id,),
-        )
-        return _event_from_row(row) if row is not None else None

custom_components/nestquest/dao_presence.py

@@ -1,247 +0,0 @@
-"""Typed DAO layer for the presence_schedules and presence_overrides tables.
-
-All SQL for these tables lives in this module per the feature
-guardrails: callers get typed dataclasses back and never see raw rows
-or SQL.  Every method is async and runs through
-:class:`~.db.NestQuestDatabase`, so each statement executes on the HA
-executor and the event loop never blocks.
-
-Semantics per the done-condition and Feature 05:
-
-- A child has AT MOST ONE presence schedule (schema UNIQUE); upserting
-  by child updates the existing row rather than raising.
-- A child with NO schedule row is present every day — the absence of a
-  row is meaningful state, expressed by :meth:`PresenceSchedulesDao.get_by_child`
-  returning None, never by an empty pattern row.
-- Overrides beat the pattern for their date range (that resolution is
-  the presence engine's job, Feature 05); the DAO only stores and
-  lists them.  A single-day override stores the same date as both
-  start and end (schema CHECK requires end >= start).
-
-Date arguments are validated as strict YYYY-MM-DD per the same policy
-the rules DAO applies: the schema's lexical CHECKs cannot prove
-calendar validity.
-"""
-from __future__ import annotations
-
-from dataclasses import dataclass
-
-from .dao_children import _connection_lock
-from .dao_rules import _UNSET, _validate_date
-from .db import NestQuestDatabase
-
-
-@dataclass(frozen=True)
-class PresenceScheduleRecord:
-    """One row of ``presence_schedules``."""
-
-    id: int
-    child_id: int
-    cycle_length_weeks: int
-    anchor_date: str
-    pattern: str
-
-
-@dataclass(frozen=True)
-class PresenceOverrideRecord:
-    """One row of ``presence_overrides``."""
-
-    id: int
-    child_id: int
-    start_date: str
-    end_date: str
-    is_present: bool
-    note: str | None
-
-
-_SCHEDULE_COLUMNS = (
-    "id, child_id, cycle_length_weeks, anchor_date, pattern"
-)
-_OVERRIDE_COLUMNS = (
-    "id, child_id, start_date, end_date, is_present, note"
-)
-
-
-def _schedule_from_row(row: tuple) -> PresenceScheduleRecord:
-    return PresenceScheduleRecord(
-        id=row[0],
-        child_id=row[1],
-        cycle_length_weeks=row[2],
-        anchor_date=row[3],
-        pattern=row[4],
-    )
-
-
-def _override_from_row(row: tuple) -> PresenceOverrideRecord:
-    return PresenceOverrideRecord(
-        id=row[0],
-        child_id=row[1],
-        start_date=row[2],
-        end_date=row[3],
-        is_present=bool(row[4]),
-        note=row[5],
-    )
-
-
-class PresenceSchedulesDao:
-    """Typed async access to the ``presence_schedules`` table."""
-
-    def __init__(self, database: NestQuestDatabase) -> None:
-        self._database = database
-
-    async def upsert_by_child(
-        self,
-        child_id: int,
-        cycle_length_weeks: int,
-        anchor_date: str,
-        pattern: str,
-    ) -> PresenceScheduleRecord:
-        """Set the child's presence schedule, replacing any existing one.
-
-        Upsert semantics are the done-condition: a second schedule for
-        the same child updates the existing row rather than raising.
-        Runs under the connection lock so a concurrent upsert/delete
-        for the same child serializes instead of colliding on the
-        schema's UNIQUE(child_id).  Pattern validity (segment shape,
-        segment count = cycle_length_weeks) is enforced by the schema
-        CHECKs; the child must exist (FK) — validated atomically here
-        so a deleted child cannot pass a stale check.
-        """
-        _validate_date(anchor_date, "anchor_date")
-        async with _connection_lock(self._database):
-            async with self._database.transaction():
-                child = await self._database.fetch_one(
-                    "SELECT 1 FROM children WHERE id = ?", (child_id,)
-                )
-                if child is None:
-                    raise ValueError(f"child {child_id} does not exist")
-                await self._database.execute(
-                    "INSERT INTO presence_schedules (child_id, "
-                    "cycle_length_weeks, anchor_date, pattern) "
-                    "VALUES (?, ?, ?, ?) "
-                    "ON CONFLICT (child_id) DO UPDATE SET "
-                    "cycle_length_weeks = excluded.cycle_length_weeks, "
-                    "anchor_date = excluded.anchor_date, "
-                    "pattern = excluded.pattern",
-                    (child_id, cycle_length_weeks, anchor_date, pattern),
-                )
-                schedule = await self.get_by_child(child_id)
-        assert schedule is not None
-        return schedule
-
-    async def get_by_child(
-        self, child_id: int
-    ) -> PresenceScheduleRecord | None:
-        """Return the child's schedule, or None when the child has none.
-
-        None is meaningful and UNAMBIGUOUS here: the child exists and
-        has no schedule row, i.e. the child is present every day
-        (Feature 05 guardrail).  An unknown child id raises ValueError
-        instead of returning None, because "nonexistent child" must
-        never be silently read as "present every day".
-        """
-        child = await self._database.fetch_one(
-            "SELECT 1 FROM children WHERE id = ?", (child_id,)
-        )
-        if child is None:
-            raise ValueError(f"child {child_id} does not exist")
-        row = await self._database.fetch_one(
-            f"SELECT {_SCHEDULE_COLUMNS} FROM presence_schedules "
-            "WHERE child_id = ?",
-            (child_id,),
-        )
-        return _schedule_from_row(row) if row is not None else None
-
-    async def delete(self, child_id: int) -> bool:
-        """Remove the child's schedule; True if a row was removed.
-
-        After deletion the child is present every day (no row means
-        no restriction).  Deleting a schedule the child never had
-        returns False.
-        """
-        result = await self._database.execute(
-            "DELETE FROM presence_schedules WHERE child_id = ?",
-            (child_id,),
-        )
-        return result.rowcount > 0
-
-
-class PresenceOverridesDao:
-    """Typed async access to the ``presence_overrides`` table."""
-
-    def __init__(self, database: NestQuestDatabase) -> None:
-        self._database = database
-
-    async def create(
-        self,
-        child_id: int,
-        start_date: str,
-        end_date: str,
-        is_present: bool,
-        *,
-        note: str | None = None,
-    ) -> PresenceOverrideRecord:
-        """Insert one override and return the record as stored.
-
-        The child must exist (validated atomically under the
-        connection lock).  Date shape is validated strictly, and the
-        schema CHECK rejects end < start.
-        """
-        _validate_date(start_date, "start_date")
-        _validate_date(end_date, "end_date")
-        async with _connection_lock(self._database):
-            async with self._database.transaction():
-                child = await self._database.fetch_one(
-                    "SELECT 1 FROM children WHERE id = ?", (child_id,)
-                )
-                if child is None:
-                    raise ValueError(f"child {child_id} does not exist")
-                result = await self._database.execute(
-                    "INSERT INTO presence_overrides (child_id, "
-                    "start_date, end_date, is_present, note) "
-                    "VALUES (?, ?, ?, ?, ?)",
-                    (child_id, start_date, end_date, int(is_present), note),
-                )
-                override = await self._database.fetch_one(
-                    f"SELECT {_OVERRIDE_COLUMNS} FROM presence_overrides "
-                    "WHERE id = ?",
-                    (result.lastrowid,),
-                )
-        assert override is not None
-        return _override_from_row(override)
-
-    async def list_by_child_and_range(
-        self,
-        child_id: int,
-        range_start: str,
-        range_end: str,
-    ) -> list[PresenceOverrideRecord]:
-        """Return the child's overrides overlapping [range_start, range_end].
-
-        An override overlaps the range when it ends on or after the
-        range starts and starts on or before the range ends (inclusive
-        boundary dates, matching the storage model where overrides are
-        closed date ranges).  Ordered by start date.
-        """
-        _validate_date(range_start, "range_start")
-        _validate_date(range_end, "range_end")
-        if range_end < range_start:
-            raise ValueError(
-                "range_end must be on or after range_start, got "
-                f"{range_end!r} < {range_start!r}"
-            )
-        rows = await self._database.fetch_all(
-            f"SELECT {_OVERRIDE_COLUMNS} FROM presence_overrides "
-            "WHERE child_id = ? AND end_date >= ? AND start_date <= ? "
-            "ORDER BY start_date",
-            (child_id, range_start, range_end),
-        )
-        return [_override_from_row(row) for row in rows]
-
-    async def delete(self, override_id: int) -> bool:
-        """Remove one override by id; True if a row was removed."""
-        result = await self._database.execute(
-            "DELETE FROM presence_overrides WHERE id = ?",
-            (override_id,),
-        )
-        return result.rowcount > 0

custom_components/nestquest/dao_rules.py

@@ -1,465 +0,0 @@
-"""Typed DAO layer for the schedule_rules and task_definitions tables.
-
-All SQL for ``schedule_rules`` and ``task_definitions`` lives in this
-module per the feature guardrails: callers get typed dataclasses back
-and never see raw rows or SQL.  Every method is async and runs through
-:class:`~.db.NestQuestDatabase`, so each statement executes on the HA
-executor and the event loop never blocks.
-
-Guardrail mapping:
-
-- ``schedule_rules`` deletion is delete-if-unreferenced: a rule still
-  referenced by any task definition is rejected (the done-condition),
-  not cascaded.
-- ``task_definitions`` has no delete path at all: definitions are
-  deactivated, never hard-deleted, and history must survive.
-- ``set_assignee`` changes future instances only — the DAO writes the
-  definition row and nothing else; reassignment never rewrites
-  existing instances or completion history (Feature 06 guardrail).
-- Validation of rule well-formedness and child activeness lives partly
-  in the schema CHECKs (rule-type coherence) and partly in
-  :meth:`TaskDefinitionsDao.create` (active child, rule existence);
-  no permission checks here, that is the Feature 09 gate's job.
-
-Concurrency: ``delete_rule_if_unreferenced`` performs its reference
-check and DELETE inside one transaction under the connection-scoped
-lock shared with :mod:`.dao_children`, so a definition referencing the
-rule cannot appear between check and delete on this connection.
-"""
-from __future__ import annotations
-
-import datetime
-from dataclasses import dataclass
-
-from .dao_children import _connection_lock
-from .db import NestQuestDatabase
-
-#: Sentinel distinguishing "argument omitted" from "explicit SQL NULL"
-#: in update methods: passing ``None`` must mean clearing a nullable
-#: column, not skipping it.
-_UNSET = object()
-
-#: Date-shape policy: schedule-rule dates are ISO YYYY-MM-DD.  The
-#: schema's lexical end>=start CHECK cannot prove a value is a real
-#: calendar date, so the DAO validates the shape it accepts.
-_DATE_FORMAT = "%Y-%m-%d"
-
-
-def _validate_date(value: str, field: str) -> None:
-    """Raise ValueError unless ``value`` is a YYYY-MM-DD calendar date.
-
-    ``datetime.date.fromisoformat`` accepts ISO dates but is lenient on
-    some builds (e.g. '2026-9-4'); strptime with an exact format is
-    strict, and strptime round-trips the parsed value to reject zero
-    padding ('2026-9-4' parses but its isoformat differs).
-    """
-    try:
-        parsed = datetime.datetime.strptime(value, _DATE_FORMAT).date()
-    except (TypeError, ValueError):
-        raise ValueError(
-            f"{field} must be an ISO date (YYYY-MM-DD), got {value!r}"
-        ) from None
-    if parsed.isoformat() != value:
-        raise ValueError(
-            f"{field} must be a strict YYYY-MM-DD date, got {value!r}"
-        )
-
-
-@dataclass(frozen=True)
-class ScheduleRuleRecord:
-    """One row of ``schedule_rules``."""
-
-    id: int
-    rule_type: str
-    interval: int
-    weekday_set: str | None
-    day_of_month: int | None
-    nth_weekday: int | None
-    month: int | None
-    start_date: str
-    end_date: str | None
-
-
-@dataclass(frozen=True)
-class TaskDefinitionRecord:
-    """One row of ``task_definitions``."""
-
-    id: int
-    title: str
-    description: str | None
-    icon: str | None
-    child_id: int
-    schedule_rule_id: int
-    due_time: str | None
-    is_active: bool
-    created_at: str
-
-
-_RULE_COLUMNS = (
-    "id, rule_type, interval, weekday_set, day_of_month, nth_weekday, "
-    "month, start_date, end_date"
-)
-_DEFINITION_COLUMNS = (
-    "id, title, description, icon, child_id, schedule_rule_id, due_time, "
-    "is_active, created_at"
-)
-
-
-def _rule_from_row(row: tuple) -> ScheduleRuleRecord:
-    return ScheduleRuleRecord(
-        id=row[0],
-        rule_type=row[1],
-        interval=row[2],
-        weekday_set=row[3],
-        day_of_month=row[4],
-        nth_weekday=row[5],
-        month=row[6],
-        start_date=row[7],
-        end_date=row[8],
-    )
-
-
-def _definition_from_row(row: tuple) -> TaskDefinitionRecord:
-    return TaskDefinitionRecord(
-        id=row[0],
-        title=row[1],
-        description=row[2],
-        icon=row[3],
-        child_id=row[4],
-        schedule_rule_id=row[5],
-        due_time=row[6],
-        is_active=bool(row[7]),
-        created_at=row[8],
-    )
-
-
-class ScheduleRulesDao:
-    """Typed async access to the ``schedule_rules`` table."""
-
-    def __init__(self, database: NestQuestDatabase) -> None:
-        self._database = database
-
-    async def create(
-        self,
-        rule_type: str,
-        start_date: str,
-        *,
-        interval: int = 1,
-        weekday_set: str | None = None,
-        day_of_month: int | None = None,
-        nth_weekday: int | None = None,
-        month: int | None = None,
-        end_date: str | None = None,
-    ) -> ScheduleRuleRecord:
-        """Insert one rule and return the record as stored.
-
-        Rule-type coherence (a weekly rule needs ``weekday_set``, a
-        yearly rule needs ``month``, etc.) is enforced by the schema
-        CHECKs and surfaces as :class:`sqlite3.IntegrityError`.  Date
-        shape (strict YYYY-MM-DD) is validated here because the
-        schema's lexical end>=start CHECK cannot prove a real calendar
-        date.
-        """
-        _validate_date(start_date, "start_date")
-        if end_date is not None:
-            _validate_date(end_date, "end_date")
-        result = await self._database.execute(
-            "INSERT INTO schedule_rules (rule_type, interval, weekday_set, "
-            "day_of_month, nth_weekday, month, start_date, end_date) "
-            "VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
-            (
-                rule_type,
-                interval,
-                weekday_set,
-                day_of_month,
-                nth_weekday,
-                month,
-                start_date,
-                end_date,
-            ),
-        )
-        rule = await self.get(result.lastrowid)
-        assert rule is not None
-        return rule
-
-    async def get(self, rule_id: int) -> ScheduleRuleRecord | None:
-        """Return the rule with ``rule_id``, or None."""
-        row = await self._database.fetch_one(
-            f"SELECT {_RULE_COLUMNS} FROM schedule_rules WHERE id = ?",
-            (rule_id,),
-        )
-        return _rule_from_row(row) if row is not None else None
-
-    async def update(
-        self,
-        rule_id: int,
-        *,
-        rule_type: str | None | object = _UNSET,
-        interval: int | None | object = _UNSET,
-        weekday_set: str | None | object = _UNSET,
-        day_of_month: int | None | object = _UNSET,
-        nth_weekday: int | None | object = _UNSET,
-        month: int | None | object = _UNSET,
-        start_date: str | None | object = _UNSET,
-        end_date: str | None | object = _UNSET,
-    ) -> int:
-        """Update the given fields; returns rows updated (0 if absent).
-
-        Arguments default to the module sentinel ``_UNSET`` meaning
-        "leave this column alone"; passing ``None`` explicitly writes
-        SQL NULL, so callers can reopen an ended rule (``end_date``
-        back to NULL) or clear nullable shape fields.  Passing
-        ``None``/a new value for a date field validates its shape.
-        Editing a rule that a definition references changes future
-        materializations only — this method touches no instances
-        (Feature 06/07 separation).
-        """
-        date_args = (
-            ("start_date", start_date),
-            ("end_date", end_date),
-        )
-        for field, value in date_args:
-            if value is not _UNSET and value is not None:
-                _validate_date(value, field)
-        assignments: list[str] = []
-        parameters: list[object] = []
-        for column, value in (
-            ("rule_type", rule_type),
-            ("interval", interval),
-            ("weekday_set", weekday_set),
-            ("day_of_month", day_of_month),
-            ("nth_weekday", nth_weekday),
-            ("month", month),
-            ("start_date", start_date),
-            ("end_date", end_date),
-        ):
-            if value is not _UNSET:
-                assignments.append(f"{column} = ?")
-                parameters.append(value)
-        if not assignments:
-            return 0
-        parameters.append(rule_id)
-        result = await self._database.execute(
-            f"UPDATE schedule_rules SET {', '.join(assignments)} "
-            "WHERE id = ?",
-            tuple(parameters),
-        )
-        return result.rowcount
-
-    async def delete_if_unreferenced(self, rule_id: int) -> bool:
-        """Delete the rule only if no definition references it.
-
-        Returns True if the rule was deleted, False if it is still
-        referenced (or does not exist — distinguish via :meth:`get`).
-        The reference check and the DELETE run inside one transaction
-        under the connection lock, so a definition cannot start
-        referencing the rule between the check and the delete.
-        """
-        async with _connection_lock(self._database):
-            async with self._database.transaction():
-                row = await self._database.fetch_one(
-                    "SELECT 1 FROM task_definitions "
-                    "WHERE schedule_rule_id = ? LIMIT 1",
-                    (rule_id,),
-                )
-                if row is not None:
-                    return False
-                result = await self._database.execute(
-                    "DELETE FROM schedule_rules WHERE id = ?",
-                    (rule_id,),
-                )
-                return result.rowcount > 0
-
-
-class TaskDefinitionsDao:
-    """Typed async access to the ``task_definitions`` table.
-
-    No delete method exists: definitions are deactivated via
-    :meth:`set_active`, never hard-deleted, so completion history keeps
-    its references (feature guardrail).
-    """
-
-    def __init__(self, database: NestQuestDatabase) -> None:
-        self._database = database
-
-    async def create(
-        self,
-        title: str,
-        child_id: int,
-        schedule_rule_id: int,
-        created_at: str,
-        *,
-        description: str | None = None,
-        icon: str | None = None,
-        due_time: str | None = None,
-        is_active: bool = True,
-    ) -> TaskDefinitionRecord:
-        """Insert one definition and return the record as stored.
-
-        Validates the assignment target as part of the same serialized
-        transaction as the insert: the child must exist and be active,
-        and the rule must exist, AT INSERT TIME — a child deactivated
-        or a rule deleted concurrently cannot slip between the checks
-        and the INSERT, which would otherwise create an invalid
-        assignment or surface as a raw FK IntegrityError instead of
-        the documented ValueError.  An INACTIVE child would pass the
-        schema foreign keys, which is why the activeness check lives
-        here.
-        """
-        async with _connection_lock(self._database):
-            async with self._database.transaction():
-                await self._validate_assignable(
-                    child_id, schedule_rule_id
-                )
-                result = await self._database.execute(
-                    "INSERT INTO task_definitions (title, description, "
-                    "icon, child_id, schedule_rule_id, due_time, "
-                    "is_active, created_at) "
-                    "VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
-                    (
-                        title,
-                        description,
-                        icon,
-                        child_id,
-                        schedule_rule_id,
-                        due_time,
-                        int(is_active),
-                        created_at,
-                    ),
-                )
-                definition = await self.get(result.lastrowid)
-        assert definition is not None
-        return definition
-
-    async def _validate_assignable(
-        self, child_id: int, schedule_rule_id: int
-    ) -> None:
-        """Raise ValueError unless child (active) and rule both exist.
-
-        MUST be called inside the connection lock so the verdict cannot
-        go stale before the caller's INSERT commits.
-        """
-        await self._validate_assignable_child(child_id)
-        rule = await self._database.fetch_one(
-            "SELECT 1 FROM schedule_rules WHERE id = ?",
-            (schedule_rule_id,),
-        )
-        if rule is None:
-            raise ValueError(
-                f"schedule rule {schedule_rule_id} does not exist"
-            )
-
-    async def get(self, definition_id: int) -> TaskDefinitionRecord | None:
-        """Return the definition with ``definition_id``, or None."""
-        row = await self._database.fetch_one(
-            f"SELECT {_DEFINITION_COLUMNS} FROM task_definitions "
-            "WHERE id = ?",
-            (definition_id,),
-        )
-        return _definition_from_row(row) if row is not None else None
-
-    async def list_by_child(self, child_id: int) -> list[TaskDefinitionRecord]:
-        """Return all definitions assigned to ``child_id``, newest first."""
-        rows = await self._database.fetch_all(
-            f"SELECT {_DEFINITION_COLUMNS} FROM task_definitions "
-            "WHERE child_id = ? ORDER BY id DESC",
-            (child_id,),
-        )
-        return [_definition_from_row(row) for row in rows]
-
-    async def list_active(self) -> list[TaskDefinitionRecord]:
-        """Return all active definitions, oldest first (stable order)."""
-        rows = await self._database.fetch_all(
-            f"SELECT {_DEFINITION_COLUMNS} FROM task_definitions "
-            "WHERE is_active = 1 ORDER BY id"
-        )
-        return [_definition_from_row(row) for row in rows]
-
-    async def update(
-        self,
-        definition_id: int,
-        *,
-        title: str | None | object = _UNSET,
-        description: str | None | object = _UNSET,
-        icon: str | None | object = _UNSET,
-        due_time: str | None | object = _UNSET,
-    ) -> int:
-        """Update the given fields; returns rows updated (0 if absent).
-
-        Arguments default to the module sentinel ``_UNSET`` meaning
-        "leave this column alone"; passing ``None`` explicitly writes
-        SQL NULL, so callers can remove optional metadata
-        (description, icon, due_time).  Assignment and activation are
-        deliberately NOT settable here: they have their own explicit
-        operations (:meth:`set_assignee`, :meth:`set_active`) so they
-        stay separately loggable and permission-gateable.
-        """
-        assignments: list[str] = []
-        parameters: list[object] = []
-        for column, value in (
-            ("title", title),
-            ("description", description),
-            ("icon", icon),
-            ("due_time", due_time),
-        ):
-            if value is not _UNSET:
-                assignments.append(f"{column} = ?")
-                parameters.append(value)
-        if not assignments:
-            return 0
-        parameters.append(definition_id)
-        result = await self._database.execute(
-            f"UPDATE task_definitions SET {', '.join(assignments)} "
-            "WHERE id = ?",
-            tuple(parameters),
-        )
-        return result.rowcount
-
-    async def set_active(self, definition_id: int, is_active: bool) -> int:
-        """Deactivate/reactivate; returns rows updated (0 if absent).
-
-        Deactivating stops future instance generation but leaves
-        existing instances and completion history untouched.
-        """
-        result = await self._database.execute(
-            "UPDATE task_definitions SET is_active = ? WHERE id = ?",
-            (int(is_active), definition_id),
-        )
-        return result.rowcount
-
-    async def set_assignee(
-        self, definition_id: int, child_id: int
-    ) -> int:
-        """Reassign the definition to ``child_id``; rows updated (0 if absent).
-
-        Validates the new assignee inside the same serialized
-        transaction as the UPDATE (existing and active AT ASSIGNMENT
-        TIME), so a child deactivated concurrently cannot become the
-        assignee.  Changes future instances only: already-generated
-        instances and completion history are never rewritten here.
-        """
-        async with _connection_lock(self._database):
-            async with self._database.transaction():
-                await self._validate_assignable_child(child_id)
-                result = await self._database.execute(
-                    "UPDATE task_definitions SET child_id = ? "
-                    "WHERE id = ?",
-                    (child_id, definition_id),
-                )
-        return result.rowcount
-
-    async def _validate_assignable_child(self, child_id: int) -> None:
-        """Raise ValueError unless the child exists and is active.
-
-        MUST be called inside the connection lock so the verdict cannot
-        go stale before the caller's UPDATE commits.
-        """
-        child = await self._database.fetch_one(
-            "SELECT is_active FROM children WHERE id = ?", (child_id,)
-        )
-        if child is None:
-            raise ValueError(f"child {child_id} does not exist")
-        if not child[0]:
-            raise ValueError(
-                f"child {child_id} is inactive and cannot be assigned"
-            )

custom_components/nestquest/migrations.py

@@ -1,236 +0,0 @@
-"""Versioned schema migration runner for the NestQuest SQLite database.
-
-The runner owns one metadata table, ``nestquest_schema_version``, holding
-a single row with the schema version the database file currently
-reflects.  Migrations are declared as an ordered list: entry ``n``
-upgrades version ``n-1`` to version ``n``.  Applying a migration means
-running its DDL inside one transaction and stamping the new version in
-that same transaction, so a database never persists a half-applied
-migration: any failure rolls the statements and the version stamp back
-together, leaving the file at its prior version.
-
-Version 0 means "the file exists but carries no NestQuest schema yet"
-— a fresh file, or a file this integration has never written.  Starting
-the runner against version 0 applies migration 1, which applies the
-full v1 DDL from :mod:`.schema` and stamps version 1.
-
-Each migration's statements and its version stamp run inside ONE
-transaction, and the stamp is written as DELETE + INSERT rather than
-UPDATE because a version-0 database has no version row to update yet.
-An UPDATE form would silently match zero rows there and leave the
-database migrated but unstamped — reporting version 0 forever, and
-re-applying migration 1 on every startup.  The DELETE+INSERT shape is
-also what makes the stamp a replace, so the row never duplicates.
-
-Idempotence across restarts: a database already at the latest version
-has no pending migrations, so the runner opens a read-only check, finds
-nothing to do, and leaves the file byte-untouched (no write transaction
-is opened, so no WAL churn).
-
-Migration list policy: entries are append-only.  Once shipped, a
-migration's SQL must never be edited — an old database applying it for
-the first time and a fresh database would then diverge.  Fix-forward
-with a new migration instead.  The version stamp lives in the same
-SQLite file as the data it describes, so restoring a backup restores
-its matching schema version with it.
-
-Corrupt or missing files are not this module's concern: startup
-handling of those cases is task d5bca74b, which decides whether to
-open fresh or raise ConfigEntryNotReady.  This runner assumes it is
-handed an open, working connection.
-"""
-from __future__ import annotations
-
-import asyncio
-import logging
-from collections.abc import Sequence
-
-from .db import NestQuestDatabase
-from .schema import SCHEMA_V1_STATEMENTS
-
-LOGGER = logging.getLogger(__name__)
-
-#: Metadata table holding the applied schema version.  Prefixed with the
-#: integration domain so a config directory shared with other tools can
-#: never collide with a foreign ``schema_version`` table.
-VERSION_TABLE = "nestquest_schema_version"
-
-#: DDL for the version metadata table.  The singleton-row invariant is
-#: enforced by the schema itself: ``id`` is fixed at 1 by CHECK, keyed
-#: PRIMARY KEY, so the table can never hold a second row, and the
-#: stamp write is an UPDATE (no DELETE+INSERT needed).  ``version`` is
-#: a positive integer: version 0 means "no row" and is never stored,
-#: so a negative or zero stored value is corruption, not a state the
-#: runner can act on.
-VERSION_TABLE_DDL = f"""
-    CREATE TABLE IF NOT EXISTS {VERSION_TABLE} (
-        id INTEGER NOT NULL PRIMARY KEY CHECK (id = 1),
-        version INTEGER NOT NULL CHECK (version >= 1)
-    )
-"""
-
-#: One-based index into :data:`MIGRATIONS`: entry ``n`` upgrades
-#: version ``n-1`` to version ``n``.
-MIGRATION_1_V1_DDL: list[str] = list(SCHEMA_V1_STATEMENTS)
-
-#: The ordered migration list.  Append-only: never edit an applied
-#: entry, add the next one instead.
-MIGRATIONS: Sequence[Sequence[str]] = [
-    MIGRATION_1_V1_DDL,
-]
-
-
-async def _create_version_table(database: NestQuestDatabase) -> None:
-    """Create the version metadata table if it does not exist.
-
-    The table is created before any version check: it is the runner's
-    own bookkeeping, and creating it is idempotent.  The DDL enforces
-    the singleton-row invariant (``id`` fixed at 1) and a positive
-    integer version at the database level.
-    """
-    await database.execute(VERSION_TABLE_DDL)
-
-
-async def read_schema_version(database: NestQuestDatabase) -> int:
-    """Return the schema version recorded in the database.
-
-    Returns 0 when the version table or its row is missing — the
-    "fresh file" case.  A stored version higher than the runner knows
-    is surfaced as-is; the caller decides how to treat a future version.
-
-    Reading is deliberately passive: a missing table raises, it is not
-    swallowed into 0, because :func:`apply_migrations` always creates
-    the table before reading and a direct reader hitting "no such
-    table" is a caller bug worth surfacing, not a fresh file.
-    """
-    row = await database.fetch_one(
-        f"SELECT version FROM {VERSION_TABLE} LIMIT 1"
-    )
-    if row is None:
-        return 0
-    version = row[0]
-    if not isinstance(version, int) or isinstance(version, bool):
-        raise RuntimeError(
-            f"Schema version metadata is not an integer: {version!r}"
-        )
-    if version < 1:
-        raise RuntimeError(
-            f"Schema version metadata is invalid (must be >= 1): {version!r}"
-        )
-    return version
-
-
-#: One asyncio.Lock per connection wrapper, created lazily and bound to
-#: the running loop, serializing whole apply_migrations runs so two
-#: concurrent callers on one connection queue instead of colliding on
-#: the wrapper's single-transaction rule.
-_MIGRATION_LOCKS: dict[int, asyncio.Lock] = {}
-
-
-def _migration_lock(database: NestQuestDatabase) -> asyncio.Lock:
-    """Return the migration lock bound to ``database``'s running loop."""
-    loop = asyncio.get_running_loop()
-    key = (id(database), id(loop))
-    lock = _MIGRATION_LOCKS.get(key)
-    if lock is None:
-        lock = asyncio.Lock()
-        _MIGRATION_LOCKS[key] = lock
-    return lock
-
-
-async def apply_migrations(
-    database: NestQuestDatabase,
-    migrations: Sequence[Sequence[str]] = MIGRATIONS,
-) -> int:
-    """Bring the database schema up to the latest version.
-
-    Reads the current version, applies every pending migration in order
-    — each inside one transaction that also stamps the new version —
-    and returns the resulting version.  Applying zero pending
-    migrations (database already current) is a no-op that logs at debug
-    level and opens no write transaction.
-
-    The version is re-read inside each migration transaction before
-    deciding to apply it: the outer read is advisory only (loop bounds,
-    no-op fast path), and on one shared connection two interleaved
-    runners would otherwise both read the same version and both apply
-    a non-idempotent migration.  Under the transaction's lock the
-    second runner sees the first runner's stamp and skips.
-
-    Runners on one connection are serialized by an asyncio lock held
-    for the whole decide-and-apply span: NestQuestDatabase rejects a
-    second transaction while one is active (RuntimeError), so
-    concurrent callers must queue, and the lock makes that queueing
-    explicit.  The loser of the race re-reads the version once it
-    acquires the lock, sees the winner's stamp, and applies nothing.
-
-    Raises whatever the failing migration raised, with the database
-    rolled back to its prior version and prior rows untouched.
-    """
-    async with _migration_lock(database):
-        await _create_version_table(database)
-        current = await read_schema_version(database)
-        latest = len(migrations)
-
-        if current > latest:
-            raise RuntimeError(
-                f"Database schema version {current} is newer than this "
-                f"integration understands (latest known: {latest}); "
-                "downgrades are not supported"
-            )
-
-        if current == latest:
-            LOGGER.debug(
-                "NestQuest schema already at version %d; "
-                "no migrations to apply",
-                current,
-            )
-            return current
-
-        for target in range(current + 1, latest + 1):
-            applied = False
-            async with database.transaction():
-                # Re-read the version INSIDE the write transaction: the
-                # outer read was advisory, and the wrapper serializes
-                # individual statements, not the read-decide-apply
-                # decision.  Under the transaction's lock the version
-                # cannot change between the read and the stamp, and the
-                # loser of an interleaved race (a queued second caller
-                # re-running apply_migrations after the winner already
-                # migrated) re-reads here, sees the winner's stamp, and
-                # skips instead of re-applying a non-idempotent
-                # migration with a stale version.
-                in_tx_version = await read_schema_version(database)
-                if in_tx_version > latest:
-                    raise RuntimeError(
-                        f"Database schema version {in_tx_version} is newer "
-                        f"than this integration understands (latest known: "
-                        f"{latest}); downgrades are not supported"
-                    )
-                if in_tx_version < target:
-                    for sql in migrations[target - 1]:
-                        await database.execute(sql)
-                    # INSERT keyed on the singleton row (id = 1): a
-                    # fresh file has no row yet, and migration 1 is the
-                    # only migration a version-0 database can run, so
-                    # the row is seeded by the same statement batch
-                    # when needed.  UPDATE alone would silently match
-                    # zero rows there.
-                    await database.execute(
-                        f"INSERT INTO {VERSION_TABLE} (id, version) "
-                        "VALUES (1, ?) "
-                        "ON CONFLICT (id) DO UPDATE SET version = "
-                        "excluded.version",
-                        (target,),
-                    )
-                    applied = True
-            if applied:
-                LOGGER.info(
-                    "NestQuest schema migrated to version %d "
-                    "(%d statement%s)",
-                    target,
-                    len(migrations[target - 1]),
-                    "s" if len(migrations[target - 1]) != 1 else "",
-                )
-
-        return latest

custom_components/nestquest/schema.py

@@ -85,68 +85,6 @@ unlike ``schedule_rules.end_date`` — an override is always a concrete
 date range; a single-day override stores the same date in both columns.
 ``is_present`` 0/1 marks the child absent/present for the whole range;
 ``note`` is optional free text.
-
-Task instances: ``task_instances`` deliberately carries NO completion
-status column.  An instance's current state derives from the latest row
-in ``completion_events`` (Feature 08), so materialization (Feature 07)
-can insert instances without knowing anything about completion and the
-append-only log stays the single source of truth.  ``definition_id``,
-``due_date`` and ``child_id`` snapshot the materialization-time facts
-("why this instance exists"): reassignment and rule edits change future
-instances only and never rewrite these rows.  ``due_time`` snapshots
-the definition's optional due time at generation for the same reason —
-the instance keeps its generation-time value even if the definition is
-edited later.  ``generated_at`` is a caller-set UTC ISO-8601 timestamp
-per the module timestamp policy (no DB default, so a generation batch
-stamps one coherent time).
-
-Uniqueness: the (definition_id, due_date) pair is declared as a
-table-level ``UNIQUE`` constraint rather than a separate ``CREATE
-UNIQUE INDEX`` statement.  SQLite materializes it as an implicit unique
-index (``sqlite_autoindex_task_instances_1``) — the required "unique
-index prevents duplicate instances" — and the constraint form cannot be
-silently dropped the way a standalone index can, so the duplicate door
-stays shut.  Idempotent materialization keys on exactly this pair.  No
-secondary indexes beyond it are declared yet: history and board queries
-(Features 08/10/13) should justify their indexes as a later migration
-once their query shapes exist.
-
-No ``ON DELETE`` clauses are declared on any foreign key in this
-module: children and definitions are deactivated, never deleted, so a
-deletion that would orphan instances or events is a bug and must fail
-loudly rather than cascade.
-
-Completion events: ``completion_events`` is strictly append-only.  That
-property is enforced at the DAO layer — the completion-events DAO
-exposes no UPDATE or DELETE path (task a9ea75fc) — and deliberately NOT
-by database triggers, matching the module's no-trigger policy: a RAISE
-trigger would be the one exception to "pure CHECK, no triggers",
-complicate the later migration runner, and still prove nothing (any
-writer can run raw SQL).  ``event_type`` is constrained to
-``completed``/``uncompleted``; a ``missed`` row is intentionally not
-representable — missed is a derived state announced on the HA event bus
-(Feature 10), never an appended event.
-
-``child_id`` is deliberately denormalized (it is also derivable via
-``task_instances``): history reporting (Feature 13) filters and rates
-per child directly against the log, and the log should stay
-self-describing without joins.
-
-Actor policy: ``actor_source`` distinguishes an authenticated HA user
-(``'user'``, with ``actor_user_id`` holding the HA user id) from a
-panel tap with no user context (``'panel'``, with ``actor_user_id``
-NULL — the tapped child profile is already ``child_id``).  A coherence
-CHECK makes the pair shape non-negotiable: ``'user'`` requires
-``actor_user_id``, ``'panel'`` forbids it.  Other actor sources are
-rejected; if an unattended system actor is ever needed, that is a
-schema migration, not a silent widening.
-
-On-time policy: ``was_on_time`` is required (integer 0 or 1) for
-``completed`` events — at completion time the due date is known and the
-flag is decidable.  For ``uncompleted`` events the flag is optional:
-Feature 08 decides whether a reversal carries the reversed completion's
-on-time flag or NULL, and the DDL deliberately accepts both rather than
-guessing.
 """
 from __future__ import annotations
 
@@ -271,46 +209,6 @@ SCHEMA_V1_PRESENCE_OVERRIDES_DDL: list[str] = [
     """,
 ]
 
-SCHEMA_V1_TASK_INSTANCES_DDL: list[str] = [
-    """
-    CREATE TABLE IF NOT EXISTS task_instances (
-        id INTEGER PRIMARY KEY AUTOINCREMENT,
-        definition_id INTEGER NOT NULL REFERENCES task_definitions(id),
-        child_id INTEGER NOT NULL REFERENCES children(id),
-        due_date TEXT NOT NULL,
-        due_time TEXT,
-        generated_at TEXT NOT NULL,
-        UNIQUE (definition_id, due_date)
-    )
-    """,
-]
-
-SCHEMA_V1_COMPLETION_EVENTS_DDL: list[str] = [
-    """
-    CREATE TABLE IF NOT EXISTS completion_events (
-        id INTEGER PRIMARY KEY AUTOINCREMENT,
-        instance_id INTEGER NOT NULL REFERENCES task_instances(id),
-        child_id INTEGER NOT NULL REFERENCES children(id),
-        event_type TEXT NOT NULL CHECK (event_type IN ('completed', 'uncompleted')),
-        actor_source TEXT NOT NULL CHECK (actor_source IN ('user', 'panel')),
-        actor_user_id TEXT,
-        occurred_at TEXT NOT NULL,
-        was_on_time INTEGER CHECK (
-            was_on_time IS NULL
-            OR (typeof(was_on_time) = 'integer' AND was_on_time IN (0, 1))
-        ),
-        CHECK (
-            (actor_source = 'user' AND actor_user_id IS NOT NULL)
-            OR (actor_source = 'panel' AND actor_user_id IS NULL)
-        ),
-        CHECK (
-            (event_type = 'completed' AND was_on_time IS NOT NULL)
-            OR (event_type = 'uncompleted')
-        )
-    )
-    """,
-]
-
 SCHEMA_V1_STATEMENTS: list[str] = [
     *SCHEMA_V1_CHILDREN_DDL,
     *SCHEMA_V1_ADMIN_USERS_DDL,
@@ -318,8 +216,6 @@ SCHEMA_V1_STATEMENTS: list[str] = [
     *SCHEMA_V1_TASK_DEFINITIONS_DDL,
     *SCHEMA_V1_PRESENCE_SCHEDULES_DDL,
     *SCHEMA_V1_PRESENCE_OVERRIDES_DDL,
-    *SCHEMA_V1_TASK_INSTANCES_DDL,
-    *SCHEMA_V1_COMPLETION_EVENTS_DDL,
 ]
 
 

tests/test_dao_children.py

@@ -1,563 +0,0 @@
-"""Tests for dao_children.py: typed DAO for children and admin_users."""
-from __future__ import annotations
-
-import asyncio
-import sqlite3
-
-import pytest
-
-from custom_components.nestquest.dao_children import (
-    AdminUserRecord,
-    AdminUsersDao,
-    ChildRecord,
-    ChildrenDao,
-)
-from custom_components.nestquest.db import NestQuestDatabase
-from custom_components.nestquest.schema import SCHEMA_V1_STATEMENTS
-from custom_components.nestquest.migrations import apply_migrations
-
-
-def _run(coro):
-    return asyncio.new_event_loop().run_until_complete(coro)
-
-
-def _make_hass_mock():
-    from unittest.mock import AsyncMock, MagicMock
-
-    hass = MagicMock()
-    hass.async_add_executor_job = AsyncMock(side_effect=(lambda fn, *a: fn(*a)))
-    return hass
-
-
-def _open_db(path) -> NestQuestDatabase:
-    database = NestQuestDatabase(_make_hass_mock())
-    _run(database.open(path))
-    _run(apply_migrations(database))
-    return database
-
-
-def _daos(database) -> tuple[ChildrenDao, AdminUsersDao]:
-    return ChildrenDao(database), AdminUsersDao(database)
-
-
-NOW = "2026-09-14T11:00:00+00:00"
-
-
-def _make_child(dao, name="Ada", **kwargs) -> ChildRecord:
-    return _run(dao.create(name, NOW, **kwargs))
-
-
-# ---------------------------------------------------------------------------
-# children: create and get
-# ---------------------------------------------------------------------------
-
-
-def test_create_returns_typed_record(tmp_path) -> None:
-    database = _open_db(tmp_path / "create.db")
-    try:
-        dao, _ = _daos(database)
-        child = _make_child(dao, colour="#ff0000", avatar_ref="avatars/1")
-        assert isinstance(child, ChildRecord)
-        assert child.id == 1
-        assert child.display_name == "Ada"
-        assert child.colour == "#ff0000"
-        assert child.avatar_ref == "avatars/1"
-        assert child.sort_order == 0
-        assert child.is_active is True
-        assert child.created_at == NOW
-    finally:
-        _run(database.close())
-
-
-def test_get_returns_none_for_missing_child(tmp_path) -> None:
-    database = _open_db(tmp_path / "get-missing.db")
-    try:
-        dao, _ = _daos(database)
-        assert _run(dao.get(999)) is None
-    finally:
-        _run(database.close())
-
-
-def test_create_duplicate_name_is_allowed(tmp_path) -> None:
-    database = _open_db(tmp_path / "dup-name.db")
-    try:
-        dao, _ = _daos(database)
-        first = _make_child(dao, "Ada")
-        second = _make_child(dao, "Ada")
-        assert first.id != second.id
-    finally:
-        _run(database.close())
-
-
-# ---------------------------------------------------------------------------
-# children: list active / list all
-# ---------------------------------------------------------------------------
-
-
-def test_list_active_excludes_inactive_and_sorts(tmp_path) -> None:
-    database = _open_db(tmp_path / "list-active.db")
-    try:
-        dao, _ = _daos(database)
-        _make_child(dao, "Bo", sort_order=2)
-        ada = _make_child(dao, "Ada", sort_order=1)
-        cy = _make_child(dao, "Cy", sort_order=1)
-        _make_child(dao, "Dee", sort_order=0)
-        _run(dao.set_active(ada.id, False))
-        active = _run(dao.list_active())
-        assert [c.display_name for c in active] == ["Dee", "Cy", "Bo"]
-        assert all(c.is_active for c in active)
-    finally:
-        _run(database.close())
-
-
-def test_list_all_includes_inactive(tmp_path) -> None:
-    database = _open_db(tmp_path / "list-all.db")
-    try:
-        dao, _ = _daos(database)
-        ada = _make_child(dao, "Ada", sort_order=1)
-        _make_child(dao, "Bo", sort_order=0)
-        _run(dao.set_active(ada.id, False))
-        all_children = _run(dao.list_all())
-        assert [c.display_name for c in all_children] == ["Bo", "Ada"]
-        assert all_children[1].is_active is False
-    finally:
-        _run(database.close())
-
-
-# ---------------------------------------------------------------------------
-# children: update, set_active, reorder
-# ---------------------------------------------------------------------------
-
-
-def test_update_fields_round_trip(tmp_path) -> None:
-    database = _open_db(tmp_path / "update.db")
-    try:
-        dao, _ = _daos(database)
-        child = _make_child(dao, "Ada", colour="#111111")
-        updated = _run(
-            dao.update(
-                child.id,
-                display_name="Ada L.",
-                colour="#222222",
-                avatar_ref="avatars/x.png",
-            )
-        )
-        assert updated == 1
-        fetched = _run(dao.get(child.id))
-        assert fetched is not None
-        assert fetched.display_name == "Ada L."
-        assert fetched.colour == "#222222"
-        assert fetched.avatar_ref == "avatars/x.png"
-        assert fetched.sort_order == 0
-    finally:
-        _run(database.close())
-
-
-def test_update_omitted_fields_untouched(tmp_path) -> None:
-    database = _open_db(tmp_path / "update-partial.db")
-    try:
-        dao, _ = _daos(database)
-        child = _make_child(dao, "Ada", colour="#111111")
-        _run(dao.update(child.id, display_name="Ada L."))
-        fetched = _run(dao.get(child.id))
-        assert fetched.colour == "#111111"
-    finally:
-        _run(database.close())
-
-
-def test_update_no_fields_returns_zero_and_changes_nothing(tmp_path) -> None:
-    database = _open_db(tmp_path / "update-empty.db")
-    try:
-        dao, _ = _daos(database)
-        child = _make_child(dao, "Ada")
-        assert _run(dao.update(child.id)) == 0
-        fetched = _run(dao.get(child.id))
-        assert fetched is not None and fetched.display_name == "Ada"
-    finally:
-        _run(database.close())
-
-
-def test_update_missing_child_returns_zero(tmp_path) -> None:
-    database = _open_db(tmp_path / "update-missing.db")
-    try:
-        dao, _ = _daos(database)
-        assert _run(dao.update(999, display_name="X")) == 0
-    finally:
-        _run(database.close())
-
-
-def test_set_active_missing_child_returns_zero(tmp_path) -> None:
-    database = _open_db(tmp_path / "set-active-missing.db")
-    try:
-        dao, _ = _daos(database)
-        assert _run(dao.set_active(999, False)) == 0
-    finally:
-        _run(database.close())
-
-
-def test_reorder_assigns_positions_in_order(tmp_path) -> None:
-    database = _open_db(tmp_path / "reorder.db")
-    try:
-        dao, _ = _daos(database)
-        a = _make_child(dao, "Ada")
-        b = _make_child(dao, "Bo")
-        c = _make_child(dao, "Cy")
-        _run(dao.reorder([c.id, a.id, b.id]))
-        children = _run(dao.list_all())
-        assert [x.display_name for x in children] == ["Cy", "Ada", "Bo"]
-        assert [x.sort_order for x in children] == [0, 1, 2]
-    finally:
-        _run(database.close())
-
-
-def test_reorder_is_transactional_and_idempotent(tmp_path) -> None:
-    database = _open_db(tmp_path / "reorder-idempotent.db")
-    try:
-        dao, _ = _daos(database)
-        a = _make_child(dao, "Ada")
-        b = _make_child(dao, "Bo")
-        _run(dao.reorder([b.id, a.id]))
-        _run(dao.reorder([b.id, a.id]))
-        children = _run(dao.list_all())
-        assert [(x.display_name, x.sort_order) for x in children] == [
-            ("Bo", 0),
-            ("Ada", 1),
-        ]
-    finally:
-        _run(database.close())
-
-
-def test_reorder_empty_list_is_noop(tmp_path) -> None:
-    database = _open_db(tmp_path / "reorder-empty.db")
-    try:
-        dao, _ = _daos(database)
-        _make_child(dao, "Ada")
-        _run(dao.reorder([]))
-        children = _run(dao.list_all())
-        assert children[0].sort_order == 0
-    finally:
-        _run(database.close())
-
-
-def test_reorder_unknown_id_leaves_it_untouched(tmp_path) -> None:
-    database = _open_db(tmp_path / "reorder-unknown.db")
-    try:
-        dao, _ = _daos(database)
-        a = _make_child(dao, "Ada")
-        _run(dao.reorder([a.id, 999]))
-        children = _run(dao.list_all())
-        assert children[0].sort_order == 0
-    finally:
-        _run(database.close())
-
-
-def test_reorder_rolls_back_to_original_order_on_failure(tmp_path) -> None:
-    """A failing finalize batch rolls the whole reorder back.
-
-    The two-phase staging is only meaningful if a crash between the
-    batches leaves the original order intact: monkeypatch execute_many
-    so the finalize (non-negative) batch raises, then assert every
-    sort_order is unchanged.
-    """
-    database = _open_db(tmp_path / "reorder-rollback.db")
-    try:
-        dao, _ = _daos(database)
-        a = _make_child(dao, "Ada", sort_order=0)
-        b = _make_child(dao, "Bo", sort_order=1)
-
-        original_execute_many = database.execute_many
-
-        async def _failing_execute_many(sql, parameters):
-            # The staging batch writes negative positions; the finalize
-            # batch writes 0..n-1.  Fail the finalize batch.
-            if all(position >= 0 for position, _ in parameters):
-                raise sqlite3.OperationalError("boom")
-            return await original_execute_many(sql, parameters)
-
-        database.execute_many = _failing_execute_many
-        with pytest.raises(sqlite3.OperationalError, match="boom"):
-            _run(dao.reorder([b.id, a.id]))
-        children = _run(dao.list_all())
-        assert [(c.display_name, c.sort_order) for c in children] == [
-            ("Ada", 0),
-            ("Bo", 1),
-        ], "failed reorder must leave original sort orders intact"
-    finally:
-        _run(database.close())
-
-
-def test_reorder_rejects_duplicate_ids(tmp_path) -> None:
-    database = _open_db(tmp_path / "reorder-duplicate.db")
-    try:
-        dao, _ = _daos(database)
-        a = _make_child(dao, "Ada")
-        with pytest.raises(ValueError, match="duplicate"):
-            _run(dao.reorder([a.id, a.id]))
-        fetched = _run(dao.get(a.id))
-        assert fetched is not None and fetched.sort_order == 0
-    finally:
-        _run(database.close())
-
-
-def test_reorder_concurrent_calls_serialize(tmp_path) -> None:
-    """Concurrent reorders from DIFFERENT DAO instances queue safely.
-
-    Two ChildrenDao objects over one connection race two reorders: the
-    connection-scoped lock makes the second wait, then run against the
-    first call's final state.  Without the lock the wrapper's
-    transaction() would reject the second concurrent transaction with
-    RuntimeError.
-    """
-    async def _main() -> None:
-        database = NestQuestDatabase(_make_hass_mock())
-        await database.open(tmp_path / "reorder-concurrent.db")
-        try:
-            await apply_migrations(database)
-            dao_a, _ = _daos(database)
-            a = await dao_a.create("Ada", NOW)
-            b = await dao_a.create("Bo", NOW)
-            dao_b, _ = _daos(database)  # second instance, same connection
-            task_1 = asyncio.ensure_future(dao_a.reorder([b.id, a.id]))
-            await asyncio.sleep(0)
-            task_2 = asyncio.ensure_future(dao_b.reorder([a.id, b.id]))
-            await asyncio.gather(task_1, task_2)
-            children = await dao_a.list_all()
-            orders = {c.display_name: c.sort_order for c in children}
-            assert sorted(orders.values()) == [0, 1]
-        finally:
-            await database.close()
-
-    _run(_main())
-
-
-# ---------------------------------------------------------------------------
-# admin_users: add, remove, list, exists
-# ---------------------------------------------------------------------------
-
-
-def test_admin_add_then_exists(tmp_path) -> None:
-    database = _open_db(tmp_path / "admin-add.db")
-    try:
-        _, dao = _daos(database)
-        assert _run(dao.add("user-1", NOW)) is True
-        assert _run(dao.exists("user-1")) is True
-        assert _run(dao.exists("user-2")) is False
-    finally:
-        _run(database.close())
-
-
-def test_admin_add_is_idempotent(tmp_path) -> None:
-    database = _open_db(tmp_path / "admin-idempotent.db")
-    try:
-        _, dao = _daos(database)
-        assert _run(dao.add("user-1", NOW)) is True
-        assert _run(dao.add("user-1", NOW)) is False
-        records = _run(dao.list())
-        assert len(records) == 1
-        assert records[0].added_at == NOW
-    finally:
-        _run(database.close())
-
-
-def test_admin_add_concurrent_calls_are_idempotent(tmp_path) -> None:
-    """Concurrent add() calls of the same user: one inserts, rest False.
-
-    The single-statement ON CONFLICT DO NOTHING makes the decision and
-    the write atomic per statement, so racing coroutines cannot both
-    'see no row' and one of them raise IntegrityError.
-    """
-    async def _main() -> None:
-        database = NestQuestDatabase(_make_hass_mock())
-        await database.open(tmp_path / "admin-race.db")
-        try:
-            await apply_migrations(database)
-            _, dao = _daos(database)
-            tasks = [
-                asyncio.ensure_future(dao.add("user-1", NOW))
-                for _ in range(5)
-            ]
-            await asyncio.sleep(0)
-            results = list(await asyncio.gather(*tasks))
-            assert sorted(results) == [False, False, False, False, True]
-            records = await dao.list()
-            assert len(records) == 1
-            assert records[0].added_at == NOW
-        finally:
-            await database.close()
-
-    _run(_main())
-
-
-def test_admin_add_preserves_original_added_at(tmp_path) -> None:
-    database = _open_db(tmp_path / "admin-added-at.db")
-    try:
-        _, dao = _daos(database)
-        _run(dao.add("user-1", NOW))
-        _run(dao.add("user-1", "2026-09-15T00:00:00+00:00"))
-        records = _run(dao.list())
-        assert records[0].added_at == NOW
-    finally:
-        _run(database.close())
-
-
-def test_admin_remove_returns_true_then_false(tmp_path) -> None:
-    database = _open_db(tmp_path / "admin-remove.db")
-    try:
-        _, dao = _daos(database)
-        _run(dao.add("user-1", NOW))
-        assert _run(dao.remove("user-1")) is True
-        assert _run(dao.remove("user-1")) is False
-        assert _run(dao.exists("user-1")) is False
-    finally:
-        _run(database.close())
-
-
-def test_admin_list_returns_typed_records_ordered(tmp_path) -> None:
-    database = _open_db(tmp_path / "admin-list.db")
-    try:
-        _, dao = _daos(database)
-        _run(dao.add("user-2", "2026-09-14T10:00:00+00:00"))
-        _run(dao.add("user-1", "2026-09-14T09:00:00+00:00"))
-        records = _run(dao.list())
-        assert isinstance(records[0], AdminUserRecord)
-        assert [r.ha_user_id for r in records] == ["user-1", "user-2"]
-        assert records[0].added_at == "2026-09-14T09:00:00+00:00"
-    finally:
-        _run(database.close())
-
-
-def test_admin_exists_empty_allowlist_fails_closed(tmp_path) -> None:
-    database = _open_db(tmp_path / "admin-empty.db")
-    try:
-        _, dao = _daos(database)
-        assert _run(dao.exists("user-1")) is False
-        assert _run(dao.list()) == []
-    finally:
-        _run(database.close())
-
-
-def test_admin_records_are_typed_not_raw_rows(tmp_path) -> None:
-    database = _open_db(tmp_path / "admin-typed.db")
-    try:
-        _, dao = _daos(database)
-        _run(dao.add("user-1", NOW))
-        records = _run(dao.list())
-        assert records == [AdminUserRecord("user-1", NOW)]
-    finally:
-        _run(database.close())
-
-
-# ---------------------------------------------------------------------------
-# No SQL for these tables outside the DAO module
-# ---------------------------------------------------------------------------
-
-
-def test_children_and_admin_sql_lives_only_in_dao_module() -> None:
-    """Guardrail: children/admin_users SQL may appear only in the DAO
-    (and the schema DDL declarations).  Scans the integration package
-    AND the repo's test files RECURSIVELY, matching FROM/INTO/UPDATE/
-    DELETE FROM/JOIN against either table — including DELETE FROM
-    children, the hard-delete path the guardrail forbids.
-
-    Exclusions are exact repo-relative paths, narrowly justified:
-    schema.py declares the tables' DDL; migrations.py applies that DDL;
-    test_schema.py and test_migrations.py test exactly those
-    DDL/migration layers.  None of them touch the tables' data paths —
-    that is the DAO's job.
-    """
-    import re
-    from pathlib import Path
-
-    package = Path(
-        __import__(
-            "custom_components.nestquest", fromlist=["__file__"]
-        ).__file__
-    ).parent
-    repo_root = package.parent.parent
-    scan_roots = [package, repo_root / "tests"]
-
-    allowed = {
-        "custom_components/nestquest/dao_children.py",  # the DAO itself
-        "custom_components/nestquest/dao_rules.py",  # validates child
-        # activeness on assignment (FK to children, done-condition
-        # 'validates that the assigned child is active')
-        "custom_components/nestquest/dao_presence.py",  # validates the
-        # schedule/override child exists before writing (same FK shape
-        # as dao_rules: one existence SELECT per write)
-        "custom_components/nestquest/dao_instances.py",  # validates the
-        # instance/event child exists before writing (same FK shape)
-        "custom_components/nestquest/schema.py",  # declares the DDL
-        "custom_components/nestquest/migrations.py",  # applies the DDL
-        "tests/test_schema.py",  # tests the DDL
-        "tests/test_migrations.py",  # tests migration application
-        "tests/test_dao_children.py",  # this file, scanned separately
-        "tests/test_dao_rules.py",  # rules/definitions guard, own scope
-        "tests/test_dao_presence.py",  # presence guard, own scope
-    }
-    sql_pattern = re.compile(
-        r"(FROM|INTO|UPDATE|DELETE\s+FROM|JOIN)\s+"
-        r'["\`]*(children|admin_users)["\`]*\b',
-        re.IGNORECASE,
-    )
-    offenders: list[str] = []
-    for root in scan_roots:
-        for py in sorted(root.rglob("*.py")):
-            relative = py.relative_to(repo_root).as_posix()
-            if relative in allowed:
-                continue
-            if sql_pattern.search(py.read_text()):
-                offenders.append(relative)
-    assert offenders == [], (
-        f"SQL touching children/admin_users leaked into: {offenders}"
-    )
-
-
-def test_dao_test_file_uses_dao_not_raw_table_sql() -> None:
-    """This test module must exercise the DAO, not raw SQL, for these
-    tables.  The two guard functions in this file necessarily mention
-    the table names inside their regex patterns; their source spans are
-    removed BEFORE the scan, and the remaining lines are then scanned
-    as ONE combined blob (not line-by-line), so SQL split across
-    physical lines — e.g. an implicitly concatenated string ending in
-    FROM children — is still caught.  The guard regexes themselves
-    cannot match the SQL keyword pattern, so removing the spans only
-    spares regex text, not executable SQL.
-    """
-    import ast
-    import re
-    from pathlib import Path
-
-    path = Path(__file__)
-    text = path.read_text()
-    lines = text.splitlines(keepends=True)
-    tree = ast.parse(text)
-    guard_names = {
-        "test_children_and_admin_sql_lives_only_in_dao_module",
-        "test_dao_test_file_uses_dao_not_raw_table_sql",
-    }
-    excluded: set[int] = set()
-    for node in ast.walk(tree):
-        if (
-            isinstance(node, (ast.FunctionDef, ast.AsyncFunctionDef))
-            and node.name in guard_names
-        ):
-            excluded.update(
-                range(node.lineno, (node.end_lineno or node.lineno) + 1)
-            )
-
-    # Scan the source minus excluded lines as ONE blob so SQL split
-    # across physical lines cannot evade the pattern.
-    remaining = "".join(
-        line
-        for number, line in enumerate(lines, start=1)
-        if number not in excluded
-    )
-    sql_pattern = re.compile(
-        r"(SELECT\s[^\"']*?FROM|INSERT\s+INTO|UPDATE|"
-        r"DELETE\s+FROM|FROM|JOIN)\s+[`'\"]*(\[)?"
-        r"(children|admin_users)\b",
-        re.IGNORECASE,
-    )
-    assert sql_pattern.search(remaining) is None, (
-        "tests must go through the DAO, not raw SQL, for these tables"
-    )

tests/test_dao_presence.py

@@ -1,622 +0,0 @@
-"""Tests for dao_presence.py: presence schedules and overrides DAO."""
-from __future__ import annotations
-
-import asyncio
-import sqlite3
-
-import pytest
-
-from custom_components.nestquest.dao_children import ChildrenDao
-from custom_components.nestquest.dao_presence import (
-    PresenceOverrideRecord,
-    PresenceOverridesDao,
-    PresenceScheduleRecord,
-    PresenceSchedulesDao,
-)
-from custom_components.nestquest.db import NestQuestDatabase
-from custom_components.nestquest.migrations import apply_migrations
-
-
-def _run(coro):
-    return asyncio.new_event_loop().run_until_complete(coro)
-
-
-def _make_hass_mock():
-    from unittest.mock import AsyncMock, MagicMock
-
-    hass = MagicMock()
-    hass.async_add_executor_job = AsyncMock(side_effect=(lambda fn, *a: fn(*a)))
-    return hass
-
-
-NOW = "2026-09-14T12:00:00+00:00"
-
-
-async def _prepare(path) -> tuple:
-    database = NestQuestDatabase(_make_hass_mock())
-    await database.open(path)
-    await apply_migrations(database)
-    schedules = PresenceSchedulesDao(database)
-    overrides = PresenceOverridesDao(database)
-    children = ChildrenDao(database)
-    child = await children.create("Ada", NOW)
-    return database, schedules, overrides, children, child
-
-
-def _with_db(tmp_path, name):
-    def _run_test(body):
-        async def _main():
-            database, schedules, overrides, children, child = await _prepare(
-                tmp_path / name
-            )
-            try:
-                return await body(
-                    database, schedules, overrides, children, child
-                )
-            finally:
-                await database.close()
-
-        return _run(_main())
-
-    return _run_test
-
-
-# ---------------------------------------------------------------------------
-# presence_schedules: upsert by child
-# ---------------------------------------------------------------------------
-
-
-def test_upsert_creates_then_updates_same_row(tmp_path) -> None:
-    """Second upsert for the same child UPDATES, not raises."""
-    async def _body(database, schedules, overrides, children, child):
-        first = await schedules.upsert_by_child(
-            child.id, 2, "2026-09-07", "0,2,4|1,3"
-        )
-        assert isinstance(first, PresenceScheduleRecord)
-        assert first.child_id == child.id
-        second = await schedules.upsert_by_child(
-            child.id, 2, "2026-09-14", "1,3|0,2,4"
-        )
-        assert second.id == first.id, "upsert must reuse the existing row"
-        fetched = await schedules.get_by_child(child.id)
-        assert fetched.anchor_date == "2026-09-14"
-        assert fetched.pattern == "1,3|0,2,4"
-        rows = await database.fetch_one(
-            "SELECT COUNT(*) FROM presence_schedules"
-        )
-        assert rows == (1,)
-        return second
-
-    _with_db(tmp_path, "upsert.db")(_body)
-
-
-def test_upsert_typed_record_fields(tmp_path) -> None:
-    async def _body(database, schedules, overrides, children, child):
-        record = await schedules.upsert_by_child(
-            child.id, 4, "2026-09-07", "0|1|2|3"
-        )
-        assert record.id == 1
-        assert record.child_id == child.id
-        assert record.cycle_length_weeks == 4
-        assert record.anchor_date == "2026-09-07"
-        assert record.pattern == "0|1|2|3"
-        return record
-
-    _with_db(tmp_path, "upsert-fields.db")(_body)
-
-
-def test_upsert_unknown_child_raises_value_error(tmp_path) -> None:
-    async def _body(database, schedules, overrides, children, child):
-        with pytest.raises(ValueError, match="does not exist"):
-            await schedules.upsert_by_child(
-                999, 2, "2026-09-07", "0,2|1,3"
-            )
-        return None
-
-    _with_db(tmp_path, "upsert-bad-child.db")(_body)
-
-
-def test_upsert_malformed_anchor_date_raises(tmp_path) -> None:
-    async def _body(database, schedules, overrides, children, child):
-        for bad in ("not-a-date", "2026-9-7", "2026-13-01", ""):
-            with pytest.raises(ValueError, match="YYYY-MM-DD"):
-                await schedules.upsert_by_child(child.id, 2, bad, "0|1")
-        return None
-
-    _with_db(tmp_path, "upsert-bad-date.db")(_body)
-
-
-def test_upsert_malformed_pattern_rejected_by_schema(tmp_path) -> None:
-    async def _body(database, schedules, overrides, children, child):
-        with pytest.raises(sqlite3.IntegrityError, match="CHECK"):
-            await schedules.upsert_by_child(
-                child.id, 2, "2026-09-07", "0,2"
-            )
-        return None
-
-    _with_db(tmp_path, "upsert-bad-pattern.db")(_body)
-
-
-def test_upsert_two_children_have_distinct_rows(tmp_path) -> None:
-    async def _body(database, schedules, overrides, children, child):
-        other = await children.create("Bo", NOW)
-        await schedules.upsert_by_child(child.id, 2, "2026-09-07", "0,2|1,3")
-        await schedules.upsert_by_child(other.id, 2, "2026-09-07", "1,3|0,2")
-        mine = await schedules.get_by_child(child.id)
-        theirs = await schedules.get_by_child(other.id)
-        assert mine.id != theirs.id
-        assert mine.pattern == "0,2|1,3"
-        assert theirs.pattern == "1,3|0,2"
-        return mine
-
-    _with_db(tmp_path, "upsert-two-children.db")(_body)
-
-
-def test_upsert_concurrent_same_child_serializes(tmp_path) -> None:
-    """Racing upserts for one child both succeed; exactly one row.
-
-    Deterministic interleaving: a controllable executor gates task A's
-    job AFTER it has acquired the connection lock and begun its
-    transaction, so task B is created while A provably owns the
-    transaction and must queue on the lock.  Both upserts land, and
-    the table holds exactly one row (the ON CONFLICT upsert, not two
-    plain INSERTs, is what avoids a UNIQUE violation).
-    """
-    async def _main():
-        from unittest.mock import MagicMock
-
-        hass = MagicMock()
-        # Gate exactly ONE job: the first _fetch_one issued after
-        # arming, which is task A's child-existence SELECT inside its
-        # transaction.  The transaction's BEGIN runs first and is NOT
-        # gated, so when the gated fetch signals, BEGIN has executed
-        # and SQLite is inside the open transaction (A holds the
-        # connection lock from BEGIN until commit).  Everything before
-        # arming (open, migrations, child create)
-        # and everything after (B's jobs, A's remaining jobs, reads)
-        # pass straight through.
-        armed = {"active": False, "gated": False}
-        gate_open = asyncio.Event()
-        a_started = asyncio.Event()
-
-        async def _gated_executor(fn, *args):
-            # Gate the SECOND gated-window job: the first is the
-            # transaction's BEGIN (submitted and awaited by
-            # transaction() before upsert_by_child's child-SELECT
-            # runs).  Pausing the child-existence SELECT proves the
-            # BEGIN has EXECUTED — SQLite is actually inside the open
-            # transaction, with A holding the connection lock — when
-            # task B gets scheduled and must queue.
-            if armed["active"]:
-                name = getattr(fn, "__name__", "")
-                if name == "_fetch_one" and not armed["gated"]:
-                    armed["gated"] = True
-                    a_started.set()
-                    await gate_open.wait()
-            return fn(*args)
-
-        hass.async_add_executor_job = _gated_executor
-        database = NestQuestDatabase(hass)
-        await database.open(tmp_path / "upsert-race.db")
-        try:
-            await apply_migrations(database)
-            children = ChildrenDao(database)
-            schedules = PresenceSchedulesDao(database)
-            child = await children.create("Ada", NOW)
-
-            armed["active"] = True
-            task_a = asyncio.ensure_future(
-                schedules.upsert_by_child(
-                    child.id, 2, "2026-09-07", "0,2|1,3"
-                )
-            )
-            # Wait until task A's child-existence SELECT (inside its
-            # open transaction, BEGIN already executed) is paused, then
-            # schedule task B so it must queue behind the open
-            # transaction.
-            await a_started.wait()
-            armed["active"] = False
-            task_b = asyncio.ensure_future(
-                schedules.upsert_by_child(
-                    child.id, 2, "2026-09-14", "1,3|0,2"
-                )
-            )
-            await asyncio.sleep(0)
-            # Release A; B's upsert must wait for A's commit and then
-            # land as the ON CONFLICT update path.
-            gate_open.set()
-            record_a, record_b = await asyncio.gather(task_a, task_b)
-            assert record_a.id == record_b.id
-            fetched = await schedules.get_by_child(child.id)
-            assert fetched is not None
-            rows = await database.fetch_one(
-                "SELECT COUNT(*) FROM presence_schedules"
-            )
-            assert rows == (1,)
-            return fetched
-        finally:
-            await database.close()
-
-    fetched = _run(_main())
-    assert fetched.pattern in {"0,2|1,3", "1,3|0,2"}
-
-
-# ---------------------------------------------------------------------------
-# presence_schedules: get / delete
-# ---------------------------------------------------------------------------
-
-
-def test_get_by_child_missing_schedule_returns_none(tmp_path) -> None:
-    async def _body(database, schedules, overrides, children, child):
-        return await schedules.get_by_child(child.id)
-
-    assert _with_db(tmp_path, "get-none.db")(_body) is None
-
-
-def test_get_by_child_unknown_child_raises(tmp_path) -> None:
-    """None must mean ONLY 'no schedule row': an unknown child id is a
-    caller bug, and silently reading a nonexistent child as 'present
-    every day' would be wrong — so get raises instead.
-    """
-    async def _body(database, schedules, overrides, children, child):
-        with pytest.raises(ValueError, match="does not exist"):
-            await schedules.get_by_child(999)
-        return None
-
-    _with_db(tmp_path, "get-unknown.db")(_body)
-
-
-def test_delete_removes_and_returns_true_then_false(tmp_path) -> None:
-    async def _body(database, schedules, overrides, children, child):
-        await schedules.upsert_by_child(child.id, 2, "2026-09-07", "0,2|1,3")
-        assert await schedules.delete(child.id) is True
-        assert await schedules.get_by_child(child.id) is None
-        assert await schedules.delete(child.id) is False
-        return None
-
-    _with_db(tmp_path, "delete.db")(_body)
-
-
-def test_delete_child_without_schedule_returns_false(tmp_path) -> None:
-    async def _body(database, schedules, overrides, children, child):
-        return await schedules.delete(child.id)
-
-    assert _with_db(tmp_path, "delete-none.db")(_body) is False
-
-
-def test_delete_then_upsert_creates_fresh_row(tmp_path) -> None:
-    async def _body(database, schedules, overrides, children, child):
-        first = await schedules.upsert_by_child(
-            child.id, 2, "2026-09-07", "0,2|1,3"
-        )
-        await schedules.delete(child.id)
-        second = await schedules.upsert_by_child(
-            child.id, 2, "2026-09-07", "0,2|1,3"
-        )
-        assert second.id != first.id
-        return second
-
-    _with_db(tmp_path, "delete-recreate.db")(_body)
-
-
-# ---------------------------------------------------------------------------
-# presence_overrides: create / list / delete
-# ---------------------------------------------------------------------------
-
-
-def test_override_create_returns_typed_record(tmp_path) -> None:
-    async def _body(database, schedules, overrides, children, child):
-        record = await overrides.create(
-            child.id, "2026-12-21", "2027-01-04", False,
-            note="Holiday abroad",
-        )
-        assert isinstance(record, PresenceOverrideRecord)
-        assert record.child_id == child.id
-        assert record.start_date == "2026-12-21"
-        assert record.end_date == "2027-01-04"
-        assert record.is_present is False
-        assert record.note == "Holiday abroad"
-        return record
-
-    _with_db(tmp_path, "override-create.db")(_body)
-
-
-def test_override_create_single_day_same_start_and_end(tmp_path) -> None:
-    async def _body(database, schedules, overrides, children, child):
-        record = await overrides.create(
-            child.id, "2026-09-14", "2026-09-14", True
-        )
-        assert record.start_date == record.end_date
-        assert record.is_present is True
-        assert record.note is None
-        return record
-
-    _with_db(tmp_path, "override-single-day.db")(_body)
-
-
-def test_override_create_unknown_child_raises(tmp_path) -> None:
-    async def _body(database, schedules, overrides, children, child):
-        with pytest.raises(ValueError, match="does not exist"):
-            await overrides.create(
-                999, "2026-09-14", "2026-09-14", True
-            )
-        return None
-
-    _with_db(tmp_path, "override-bad-child.db")(_body)
-
-
-def test_override_create_malformed_dates_raise(tmp_path) -> None:
-    async def _body(database, schedules, overrides, children, child):
-        for bad in ("not-a-date", "2026-9-14", ""):
-            with pytest.raises(ValueError, match="YYYY-MM-DD"):
-                await overrides.create(child.id, bad, "2026-09-14", True)
-            with pytest.raises(ValueError, match="YYYY-MM-DD"):
-                await overrides.create(child.id, "2026-09-14", bad, True)
-        return None
-
-    _with_db(tmp_path, "override-bad-dates.db")(_body)
-
-
-def test_override_end_before_start_rejected_by_schema(tmp_path) -> None:
-    async def _body(database, schedules, overrides, children, child):
-        with pytest.raises(sqlite3.IntegrityError, match="CHECK"):
-            await overrides.create(
-                child.id, "2026-09-14", "2026-09-13", True
-            )
-        return None
-
-    _with_db(tmp_path, "override-end-before-start.db")(_body)
-
-
-def test_override_list_by_child_and_range_filters_correctly(
-    tmp_path,
-) -> None:
-    async def _body(database, schedules, overrides, children, child):
-        await overrides.create(
-            child.id, "2026-09-01", "2026-09-05", False, note="before"
-        )
-        inside = await overrides.create(
-            child.id, "2026-09-10", "2026-09-12", False, note="inside"
-        )
-        overlapping = await overrides.create(
-            child.id, "2026-09-20", "2026-09-25", True, note="overlap"
-        )
-        after = await overrides.create(
-            child.id, "2026-10-01", "2026-10-02", False, note="after"
-        )
-        found = await overrides.list_by_child_and_range(
-            child.id, "2026-09-09", "2026-09-22"
-        )
-        assert [r.id for r in found] == [inside.id, overlapping.id]
-        # Inclusive boundaries: a range touching the override's edges
-        # still matches.
-        edge = await overrides.list_by_child_and_range(
-            child.id, "2026-09-20", "2026-09-20"
-        )
-        assert [r.id for r in edge] == [overlapping.id]
-        return found
-
-    _with_db(tmp_path, "override-list-range.db")(_body)
-
-
-def test_override_list_orders_by_start_date(tmp_path) -> None:
-    async def _body(database, schedules, overrides, children, child):
-        late = await overrides.create(
-            child.id, "2026-09-20", "2026-09-21", True
-        )
-        early = await overrides.create(
-            child.id, "2026-09-10", "2026-09-11", False
-        )
-        found = await overrides.list_by_child_and_range(
-            child.id, "2026-09-01", "2026-09-30"
-        )
-        assert [r.id for r in found] == [early.id, late.id]
-        return found
-
-    _with_db(tmp_path, "override-list-order.db")(_body)
-
-
-def test_override_list_per_child_isolation(tmp_path) -> None:
-    async def _body(database, schedules, overrides, children, child):
-        other = await children.create("Bo", NOW)
-        await overrides.create(child.id, "2026-09-10", "2026-09-11", True)
-        await overrides.create(other.id, "2026-09-10", "2026-09-11", False)
-        mine = await overrides.list_by_child_and_range(
-            child.id, "2026-09-01", "2026-09-30"
-        )
-        assert len(mine) == 1
-        assert mine[0].is_present is True
-        return mine
-
-    _with_db(tmp_path, "override-isolation.db")(_body)
-
-
-def test_override_list_malformed_range_raises(tmp_path) -> None:
-    async def _body(database, schedules, overrides, children, child):
-        with pytest.raises(ValueError, match="YYYY-MM-DD"):
-            await overrides.list_by_child_and_range(
-                child.id, "oops", "2026-09-30"
-            )
-        with pytest.raises(ValueError, match="on or after"):
-            await overrides.list_by_child_and_range(
-                child.id, "2026-09-30", "2026-09-01"
-            )
-        return None
-
-    _with_db(tmp_path, "override-list-bad-range.db")(_body)
-
-
-def test_override_list_unknown_child_returns_empty(tmp_path) -> None:
-    async def _body(database, schedules, overrides, children, child):
-        return await overrides.list_by_child_and_range(
-            999, "2026-09-01", "2026-09-30"
-        )
-
-    assert _with_db(tmp_path, "override-list-unknown.db")(_body) == []
-
-
-def test_override_delete_round_trip(tmp_path) -> None:
-    async def _body(database, schedules, overrides, children, child):
-        record = await overrides.create(
-            child.id, "2026-09-10", "2026-09-11", True
-        )
-        assert await overrides.delete(record.id) is True
-        found = await overrides.list_by_child_and_range(
-            child.id, "2026-09-01", "2026-09-30"
-        )
-        assert found == []
-        assert await overrides.delete(record.id) is False
-        return None
-
-    _with_db(tmp_path, "override-delete.db")(_body)
-
-
-def test_override_delete_missing_returns_false(tmp_path) -> None:
-    async def _body(database, schedules, overrides, children, child):
-        return await overrides.delete(999)
-
-    assert _with_db(tmp_path, "override-delete-missing.db")(_body) is False
-
-
-def test_override_delete_leaves_other_overrides(tmp_path) -> None:
-    async def _body(database, schedules, overrides, children, child):
-        first = await overrides.create(
-            child.id, "2026-09-10", "2026-09-11", True
-        )
-        second = await overrides.create(
-            child.id, "2026-09-20", "2026-09-21", False
-        )
-        assert await overrides.delete(first.id) is True
-        found = await overrides.list_by_child_and_range(
-            child.id, "2026-09-01", "2026-09-30"
-        )
-        assert [r.id for r in found] == [second.id]
-        return found
-
-    _with_db(tmp_path, "override-delete-others.db")(_body)
-
-
-def test_schedule_and_override_independent_for_same_child(tmp_path) -> None:
-    """Deleting the schedule does not touch overrides and vice versa."""
-    async def _body(database, schedules, overrides, children, child):
-        await schedules.upsert_by_child(child.id, 2, "2026-09-07", "0,2|1,3")
-        override = await overrides.create(
-            child.id, "2026-09-10", "2026-09-11", True
-        )
-        assert await schedules.delete(child.id) is True
-        found = await overrides.list_by_child_and_range(
-            child.id, "2026-09-01", "2026-09-30"
-        )
-        assert [r.id for r in found] == [override.id]
-        return found
-
-    _with_db(tmp_path, "independent.db")(_body)
-
-
-# ---------------------------------------------------------------------------
-# No SQL for these tables outside the DAO module
-# ---------------------------------------------------------------------------
-
-
-def test_presence_sql_lives_only_in_dao_module() -> None:
-    """Guardrail: presence_schedules/presence_overrides SQL may appear
-    only in the DAO module (and the schema DDL declarations).
-    RECURSIVE scan of package and tests, FROM/INTO/UPDATE/DELETE FROM/
-    JOIN pattern, with exact repo-relative exclusions justified by
-    role: schema.py declares the DDL, migrations.py applies it, and
-    the test files for exactly those layers verify DDL, not data
-    paths.
-    """
-    import re
-    from pathlib import Path
-
-    package = Path(
-        __import__(
-            "custom_components.nestquest", fromlist=["__file__"]
-        ).__file__
-    ).parent
-    repo_root = package.parent.parent
-    scan_roots = [package, repo_root / "tests"]
-
-    allowed = {
-        "custom_components/nestquest/dao_presence.py",  # this DAO
-        "custom_components/nestquest/schema.py",  # declares the DDL
-        "custom_components/nestquest/migrations.py",  # applies the DDL
-        "tests/test_schema.py",  # tests the DDL
-        "tests/test_migrations.py",  # tests migration application
-        "tests/test_dao_presence.py",  # this file, scanned separately
-    }
-    sql_pattern = re.compile(
-        r"(FROM|INTO|UPDATE|DELETE\s+FROM|JOIN)\s+[`'\"]*(\[)?"
-        r"(presence_schedules|presence_overrides)\b",
-        re.IGNORECASE,
-    )
-    offenders: list[str] = []
-    for root in scan_roots:
-        for py in sorted(root.rglob("*.py")):
-            relative = py.relative_to(repo_root).as_posix()
-            if relative in allowed:
-                continue
-            if sql_pattern.search(py.read_text()):
-                offenders.append(relative)
-    assert offenders == [], (
-        f"SQL touching presence_schedules/presence_overrides leaked "
-        f"into: {offenders}"
-    )
-
-
-def test_dao_presence_test_file_uses_dao_not_raw_table_sql() -> None:
-    """This test module must exercise the DAO, not raw SQL, for these
-    tables.  Exemptions are EXACT lines, not whole-function spans: the
-    two single-statement COUNT(*) row probes (the only honest way to
-    prove 'exactly one row exists' without a listing method) and the
-    guard functions' own regex spans.  Any other raw SQL added anywhere
-    in this file fails the guard.
-    """
-    import ast
-    import re
-    from pathlib import Path
-
-    path = Path(__file__)
-    text = path.read_text()
-    lines = text.splitlines(keepends=True)
-    tree = ast.parse(text)
-    guard_names = {
-        "test_presence_sql_lives_only_in_dao_module",
-        "test_dao_presence_test_file_uses_dao_not_raw_table_sql",
-    }
-    excluded: set[int] = set()
-    for node in ast.walk(tree):
-        if not isinstance(node, (ast.FunctionDef, ast.AsyncFunctionDef)):
-            continue
-        if node.name in guard_names:
-            excluded.update(
-                range(node.lineno, (node.end_lineno or node.lineno) + 1)
-            )
-            continue
-        # Narrow probe exemption: only the string-literal line holding
-        # the sanctioned COUNT(*) query, not the enclosing function.
-        for sub in ast.walk(node):
-            if (
-                isinstance(sub, ast.Constant)
-                and isinstance(sub.value, str)
-                and sub.value.strip()
-                == "SELECT COUNT(*) FROM presence_schedules"
-                and sub.lineno is not None
-            ):
-                excluded.add(sub.lineno)
-
-    remaining = "".join(
-        line
-        for number, line in enumerate(lines, start=1)
-        if number not in excluded
-    )
-    sql_pattern = re.compile(
-        r"(SELECT\s[^\"']*?FROM|INSERT\s+INTO|UPDATE|DELETE\s+FROM|"
-        r"FROM|JOIN)\s+[`'\"]*(\[)?(presence_schedules|presence_overrides)"
-        r"\b",
-        re.IGNORECASE,
-    )
-    assert sql_pattern.search(remaining) is None, (
-        "tests must go through the DAO, not raw SQL, for these tables"
-    )

tests/test_dao_rules.py

@@ -1,906 +0,0 @@
-"""Tests for dao_rules.py: typed DAO for schedule_rules and task_definitions."""
-from __future__ import annotations
-
-import asyncio
-import sqlite3
-
-import pytest
-
-from custom_components.nestquest.dao_children import ChildrenDao
-from custom_components.nestquest.dao_rules import (
-    ScheduleRuleRecord,
-    ScheduleRulesDao,
-    TaskDefinitionRecord,
-    TaskDefinitionsDao,
-)
-from custom_components.nestquest.db import NestQuestDatabase
-from custom_components.nestquest.migrations import apply_migrations
-
-
-def _run(coro):
-    return asyncio.new_event_loop().run_until_complete(coro)
-
-
-def _make_hass_mock():
-    from unittest.mock import AsyncMock, MagicMock
-
-    hass = MagicMock()
-    hass.async_add_executor_job = AsyncMock(side_effect=(lambda fn, *a: fn(*a)))
-    return hass
-
-
-NOW = "2026-09-14T12:00:00+00:00"
-
-
-async def _prepare(path) -> tuple:
-    database = NestQuestDatabase(_make_hass_mock())
-    await database.open(path)
-    await apply_migrations(database)
-    rules = ScheduleRulesDao(database)
-    definitions = TaskDefinitionsDao(database)
-    children = ChildrenDao(database)
-    child = await children.create("Ada", NOW)
-    return database, rules, definitions, children, child
-
-
-def _with_db(tmp_path, name):
-    """Run an async body against a prepared database, closing it after."""
-
-    def _run_test(body):
-        async def _main():
-            database, rules, definitions, children, child = await _prepare(
-                tmp_path / name
-            )
-            try:
-                return await body(database, rules, definitions, children, child)
-            finally:
-                await database.close()
-
-        return _run(_main())
-
-    return _run_test
-
-
-# ---------------------------------------------------------------------------
-# schedule_rules: create / get
-# ---------------------------------------------------------------------------
-
-
-def test_rule_create_returns_typed_record(tmp_path) -> None:
-    async def _body(database, rules, definitions, children, child):
-        rule = await rules.create(
-            "weekly", "2026-09-14", weekday_set="0,2,4", interval=2
-        )
-        assert isinstance(rule, ScheduleRuleRecord)
-        assert rule.id == 1
-        assert rule.rule_type == "weekly"
-        assert rule.interval == 2
-        assert rule.weekday_set == "0,2,4"
-        assert rule.day_of_month is None
-        assert rule.nth_weekday is None
-        assert rule.month is None
-        assert rule.start_date == "2026-09-14"
-        assert rule.end_date is None
-        return rule
-
-    _with_db(tmp_path, "rule-create.db")(_body)
-
-
-def test_rule_create_monthly_with_day_of_month(tmp_path) -> None:
-    async def _body(database, rules, definitions, children, child):
-        rule = await rules.create(
-            "monthly", "2026-09-14", day_of_month=15, weekday_set=None
-        )
-        assert rule.day_of_month == 15
-        assert rule.weekday_set is None
-        return rule
-
-    _with_db(tmp_path, "rule-monthly.db")(_body)
-
-
-def test_rule_get_missing_returns_none(tmp_path) -> None:
-    async def _body(database, rules, definitions, children, child):
-        return await rules.get(999)
-
-    assert _with_db(tmp_path, "rule-get-missing.db")(_body) is None
-
-
-def test_rule_create_coherence_enforced_by_schema(tmp_path) -> None:
-    async def _body(database, rules, definitions, children, child):
-        with pytest.raises(sqlite3.IntegrityError, match="CHECK"):
-            await rules.create("weekly", "2026-09-14", weekday_set=None)
-        return None
-
-    _with_db(tmp_path, "rule-coherence.db")(_body)
-
-
-def test_rule_create_rejects_malformed_dates(tmp_path) -> None:
-    async def _body(database, rules, definitions, children, child):
-        for bad in (
-            "not-a-date",
-            "2026-9-4",
-            "2026-13-01",
-            "2026-02-30",
-            "09-14",
-            "",
-        ):
-            with pytest.raises(ValueError, match="YYYY-MM-DD"):
-                await rules.create("daily", bad)
-            with pytest.raises(ValueError, match="YYYY-MM-DD"):
-                await rules.create("daily", "2026-09-14", end_date=bad)
-        return None
-
-    _with_db(tmp_path, "rule-create-dates.db")(_body)
-
-
-def test_rule_create_end_before_start_rejected(tmp_path) -> None:
-    async def _body(database, rules, definitions, children, child):
-        with pytest.raises(sqlite3.IntegrityError, match="CHECK"):
-            await rules.create(
-                "daily", "2026-09-14", end_date="2026-09-13"
-            )
-        return None
-
-    _with_db(tmp_path, "rule-dates.db")(_body)
-
-
-# ---------------------------------------------------------------------------
-# schedule_rules: update
-# ---------------------------------------------------------------------------
-
-
-def test_rule_update_fields_round_trip(tmp_path) -> None:
-    async def _body(database, rules, definitions, children, child):
-        rule = await rules.create("weekly", "2026-09-14", weekday_set="0,2")
-        updated = await rules.update(
-            rule.id, weekday_set="1,3", interval=3, end_date="2026-12-31"
-        )
-        assert updated == 1
-        fetched = await rules.get(rule.id)
-        assert fetched.weekday_set == "1,3"
-        assert fetched.interval == 3
-        assert fetched.end_date == "2026-12-31"
-        assert fetched.rule_type == "weekly"
-        return fetched
-
-    _with_db(tmp_path, "rule-update.db")(_body)
-
-
-def test_rule_update_omitted_fields_untouched(tmp_path) -> None:
-    async def _body(database, rules, definitions, children, child):
-        rule = await rules.create("weekly", "2026-09-14", weekday_set="0,2")
-        await rules.update(rule.id, interval=2)
-        fetched = await rules.get(rule.id)
-        assert fetched.weekday_set == "0,2"
-        assert fetched.start_date == "2026-09-14"
-        return fetched
-
-    _with_db(tmp_path, "rule-update-partial.db")(_body)
-
-
-def test_rule_update_no_fields_returns_zero(tmp_path) -> None:
-    async def _body(database, rules, definitions, children, child):
-        rule = await rules.create("daily", "2026-09-14")
-        return await rules.update(rule.id)
-
-    assert _with_db(tmp_path, "rule-update-empty.db")(_body) == 0
-
-
-def test_rule_update_missing_rule_returns_zero(tmp_path) -> None:
-    async def _body(database, rules, definitions, children, child):
-        return await rules.update(999, interval=2)
-
-    assert _with_db(tmp_path, "rule-update-missing.db")(_body) == 0
-
-
-def test_rule_update_bad_type_rejected_by_check(tmp_path) -> None:
-    async def _body(database, rules, definitions, children, child):
-        rule = await rules.create("daily", "2026-09-14")
-        with pytest.raises(sqlite3.IntegrityError, match="CHECK"):
-            await rules.update(rule.id, rule_type="sometimes")
-        return None
-
-    _with_db(tmp_path, "rule-update-bad-type.db")(_body)
-
-
-def test_rule_update_can_clear_nullable_fields(tmp_path) -> None:
-    """Explicit None clears a nullable column; omitted leaves it alone.
-
-    A caller must be able to reopen an ended rule (end_date back to
-    NULL) and clear rule-shape fields; the _UNSET sentinel keeps
-    'omitted' distinct from 'write NULL'.
-    """
-    async def _body(database, rules, definitions, children, child):
-        rule = await rules.create(
-            "weekly",
-            "2026-09-14",
-            weekday_set="0,2",
-            end_date="2026-12-31",
-            month=3,
-        )
-        # Omitted: nothing changes.
-        await rules.update(rule.id, interval=2)
-        kept = await rules.get(rule.id)
-        assert kept.end_date == "2026-12-31"
-        assert kept.month == 3
-        # Explicit None: clears both.
-        await rules.update(rule.id, end_date=None, month=None)
-        cleared = await rules.get(rule.id)
-        assert cleared.end_date is None
-        assert cleared.month is None
-        assert cleared.interval == 2
-        return cleared
-
-    _with_db(tmp_path, "rule-update-clear.db")(_body)
-
-
-def test_rule_update_validates_date_shape(tmp_path) -> None:
-    async def _body(database, rules, definitions, children, child):
-        rule = await rules.create("daily", "2026-09-14")
-        for bad in ("not-a-date", "2026-9-4", "2026-13-01", "09-14"):
-            with pytest.raises(ValueError, match="YYYY-MM-DD"):
-                await rules.update(rule.id, start_date=bad)
-            with pytest.raises(ValueError, match="YYYY-MM-DD"):
-                await rules.update(rule.id, end_date=bad)
-        # None is still allowed (clears the column) without validation.
-        await rules.update(rule.id, end_date=None)
-        return None
-
-    _with_db(tmp_path, "rule-update-dates.db")(_body)
-
-
-# ---------------------------------------------------------------------------
-# schedule_rules: delete-if-unreferenced
-# ---------------------------------------------------------------------------
-
-
-def test_rule_delete_unreferenced_succeeds(tmp_path) -> None:
-    async def _body(database, rules, definitions, children, child):
-        rule = await rules.create("daily", "2026-09-14")
-        assert await rules.delete_if_unreferenced(rule.id) is True
-        return await rules.get(rule.id)
-
-    assert _with_db(tmp_path, "rule-delete-ok.db")(_body) is None
-
-
-def test_rule_delete_referenced_is_rejected(tmp_path) -> None:
-    async def _body(database, rules, definitions, children, child):
-        rule = await rules.create("daily", "2026-09-14")
-        await definitions.create("Brush teeth", child.id, rule.id, NOW)
-        assert await rules.delete_if_unreferenced(rule.id) is False
-        fetched = await rules.get(rule.id)
-        assert fetched is not None, (
-            "referenced rule must survive the delete attempt"
-        )
-        return fetched
-
-    _with_db(tmp_path, "rule-delete-referenced.db")(_body)
-
-
-def test_rule_delete_missing_returns_false(tmp_path) -> None:
-    async def _body(database, rules, definitions, children, child):
-        return await rules.delete_if_unreferenced(999)
-
-    assert _with_db(tmp_path, "rule-delete-missing.db")(_body) is False
-
-
-def test_rule_delete_after_last_reference_removed_succeeds(tmp_path) -> None:
-    async def _body(database, rules, definitions, children, child):
-        rule = await rules.create("daily", "2026-09-14")
-        definition = await definitions.create(
-            "Brush teeth", child.id, rule.id, NOW
-        )
-        assert await rules.delete_if_unreferenced(rule.id) is False
-        await definitions.set_active(definition.id, False)
-        # Deactivation is NOT deletion: the definition still references
-        # the rule, so the delete must still be rejected.
-        assert await rules.delete_if_unreferenced(rule.id) is False
-        return None
-
-    _with_db(tmp_path, "rule-delete-inactive-ref.db")(_body)
-
-
-def test_rule_delete_concurrent_with_definition_create_is_safe(
-    tmp_path,
-) -> None:
-    """A racing definition creation cannot produce a dangling reference.
-
-    Both operations queue on the connection lock, so exactly one of two
-    safe outcomes happens: the create wins and the delete is rejected
-    (definition exists, rule exists), or the delete wins and the create
-    fails cleanly with ValueError (rule gone).  A definition row
-    pointing at a deleted rule is impossible in either case.
-
-    BOTH orderings are forced: delete-first by starting the delete and
-    yielding; create-first by hooking ScheduleRulesDao.get so the
-    create's validation pauses mid-flight before the delete starts.
-    """
-    async def _main(order: str):
-        database = NestQuestDatabase(_make_hass_mock())
-        await database.open(tmp_path / f"rule-delete-race-{order}.db")
-        try:
-            await apply_migrations(database)
-            children = ChildrenDao(database)
-            rules = ScheduleRulesDao(database)
-            definitions = TaskDefinitionsDao(database)
-            child = await children.create("Ada", NOW)
-            rule_a = await rules.create("daily", "2026-09-14")
-
-            if order == "create-first":
-                # Pause the create inside its rule validation: the hook
-                # blocks after the rule-lookup statement until the
-                # delete task has been scheduled, so the create holds
-                # the connection lock while the delete queues behind
-                # it — then the create proceeds and wins.
-                import custom_components.nestquest.dao_rules as dao_rules
-
-                original_validate = (
-                    dao_rules.TaskDefinitionsDao._validate_assignable
-                )
-                release = asyncio.Event()
-                started = asyncio.Event()
-
-                async def _pausing_validate(self, child_id, rule_id):
-                    # Run the real validation FIRST (this is the
-                    # time-of-check), THEN pause: the delete task gets
-                    # scheduled while the create sits between its
-                    # passed validation and its INSERT.  The serialized
-                    # transaction must keep the delete queued until the
-                    # insert commits, so the create must win the race
-                    # and the delete must be rejected as referenced.
-                    await original_validate(self, child_id, rule_id)
-                    if rule_id == rule_a.id and not started.is_set():
-                        started.set()
-                        await release.wait()
-
-                dao_rules.TaskDefinitionsDao._validate_assignable = (
-                    _pausing_validate
-                )
-                try:
-                    create_task = asyncio.ensure_future(
-                        definitions.create(
-                            "Brush teeth", child.id, rule_a.id, NOW
-                        )
-                    )
-                    await started.wait()
-                    delete_task = asyncio.ensure_future(
-                        rules.delete_if_unreferenced(rule_a.id)
-                    )
-                    await asyncio.sleep(0)
-                    started.clear()
-                    release.set()
-                    deleted, creation = await asyncio.gather(
-                        delete_task, create_task, return_exceptions=True
-                    )
-                finally:
-                    dao_rules.TaskDefinitionsDao._validate_assignable = (
-                        original_validate
-                    )
-            else:
-                async def _delete():
-                    return await rules.delete_if_unreferenced(rule_a.id)
-
-                async def _create():
-                    return await definitions.create(
-                        "Brush teeth", child.id, rule_a.id, NOW
-                    )
-
-                delete_task = asyncio.ensure_future(_delete())
-                await asyncio.sleep(0)
-                create_task = asyncio.ensure_future(_create())
-                deleted, creation = await asyncio.gather(
-                    delete_task, create_task, return_exceptions=True
-                )
-
-            assert not isinstance(deleted, BaseException), (
-                f"delete must queue, not crash: {deleted!r}"
-            )
-            rule_row = await rules.get(rule_a.id)
-            if deleted:
-                # Delete won: the create must have failed cleanly.
-                assert isinstance(creation, ValueError), (
-                    f"creating against a deleted rule must raise "
-                    f"ValueError, got {creation!r}"
-                )
-                assert rule_row is None
-            else:
-                # Create won: the delete was rejected, both rows exist.
-                assert isinstance(creation, TaskDefinitionRecord), (
-                    f"create must succeed, got {creation!r}"
-                )
-                assert rule_row is not None
-            return deleted
-        finally:
-            await database.close()
-
-    delete_won = _run(_main("delete-first"))
-    create_won = _run(_main("create-first"))
-    # delete-first: the delete acquires the lock before the create can
-    # validate, so the rule is gone and the create fails cleanly.
-    assert delete_won is True
-    # create-first: validation passed, the create holds the lock across
-    # its INSERT, so the queued delete must find the definition and be
-    # rejected — the create must NOT lose its rule after validating it.
-    assert create_won is False
-
-
-# ---------------------------------------------------------------------------
-# task_definitions: create / get
-# ---------------------------------------------------------------------------
-
-
-def test_definition_create_returns_typed_record(tmp_path) -> None:
-    async def _body(database, rules, definitions, children, child):
-        rule = await rules.create("weekly", "2026-09-14", weekday_set="0,2")
-        definition = await definitions.create(
-            "Brush teeth",
-            child.id,
-            rule.id,
-            NOW,
-            description="Morning and night",
-            icon="mdi:tooth",
-            due_time="08:00",
-        )
-        assert isinstance(definition, TaskDefinitionRecord)
-        assert definition.title == "Brush teeth"
-        assert definition.child_id == child.id
-        assert definition.schedule_rule_id == rule.id
-        assert definition.due_time == "08:00"
-        assert definition.is_active is True
-        assert definition.created_at == NOW
-        return definition
-
-    _with_db(tmp_path, "definition-create.db")(_body)
-
-
-def test_definition_get_missing_returns_none(tmp_path) -> None:
-    async def _body(database, rules, definitions, children, child):
-        return await definitions.get(999)
-
-    assert _with_db(tmp_path, "definition-get-missing.db")(_body) is None
-
-
-def test_definition_create_unknown_child_raises_value_error(
-    tmp_path,
-) -> None:
-    async def _body(database, rules, definitions, children, child):
-        rule = await rules.create("daily", "2026-09-14")
-        with pytest.raises(ValueError, match="does not exist"):
-            await definitions.create("X", 999, rule.id, NOW)
-        return None
-
-    _with_db(tmp_path, "definition-bad-child.db")(_body)
-
-
-def test_definition_create_inactive_child_raises_value_error(
-    tmp_path,
-) -> None:
-    async def _body(database, rules, definitions, children, child):
-        rule = await rules.create("daily", "2026-09-14")
-        await children.set_active(child.id, False)
-        with pytest.raises(ValueError, match="inactive"):
-            await definitions.create("X", child.id, rule.id, NOW)
-        return None
-
-    _with_db(tmp_path, "definition-inactive-child.db")(_body)
-
-
-def test_definition_create_unknown_rule_raises_value_error(
-    tmp_path,
-) -> None:
-    async def _body(database, rules, definitions, children, child):
-        with pytest.raises(ValueError, match="does not exist"):
-            await definitions.create("X", child.id, 999, NOW)
-        return None
-
-    _with_db(tmp_path, "definition-bad-rule.db")(_body)
-
-
-# ---------------------------------------------------------------------------
-# task_definitions: list by child / list active
-# ---------------------------------------------------------------------------
-
-
-def test_definition_list_by_child_filters_and_orders(tmp_path) -> None:
-    async def _body(database, rules, definitions, children, child):
-        rule = await rules.create("daily", "2026-09-14")
-        other_child = await children.create("Bo", NOW)
-        await definitions.create("A", child.id, rule.id, NOW)
-        await definitions.create("B", child.id, rule.id, NOW)
-        await definitions.create("C", other_child.id, rule.id, NOW)
-        mine = await definitions.list_by_child(child.id)
-        assert [d.title for d in mine] == ["B", "A"]
-        return mine
-
-    _with_db(tmp_path, "definition-list-by-child.db")(_body)
-
-
-def test_definition_list_by_child_missing_child_returns_empty(
-    tmp_path,
-) -> None:
-    async def _body(database, rules, definitions, children, child):
-        return await definitions.list_by_child(999)
-
-    assert _with_db(tmp_path, "definition-list-missing.db")(_body) == []
-
-
-def test_definition_list_active_excludes_inactive(tmp_path) -> None:
-    async def _body(database, rules, definitions, children, child):
-        rule = await rules.create("daily", "2026-09-14")
-        first = await definitions.create("A", child.id, rule.id, NOW)
-        await definitions.create("B", child.id, rule.id, NOW)
-        await definitions.set_active(first.id, False)
-        active = await definitions.list_active()
-        assert [d.title for d in active] == ["B"]
-        assert all(d.is_active for d in active)
-        return active
-
-    _with_db(tmp_path, "definition-list-active.db")(_body)
-
-
-# ---------------------------------------------------------------------------
-# task_definitions: update / set_active / set_assignee
-# ---------------------------------------------------------------------------
-
-
-def test_definition_update_fields_round_trip(tmp_path) -> None:
-    async def _body(database, rules, definitions, children, child):
-        rule = await rules.create("daily", "2026-09-14")
-        definition = await definitions.create(
-            "A", child.id, rule.id, NOW, due_time="08:00"
-        )
-        assert await definitions.update(
-            definition.id,
-            title="A2",
-            description="New",
-            icon="mdi:star",
-            due_time="09:00",
-        ) == 1
-        fetched = await definitions.get(definition.id)
-        assert fetched.title == "A2"
-        assert fetched.description == "New"
-        assert fetched.icon == "mdi:star"
-        assert fetched.due_time == "09:00"
-        return fetched
-
-    _with_db(tmp_path, "definition-update.db")(_body)
-
-
-def test_definition_update_cannot_change_assignee_or_active(
-    tmp_path,
-) -> None:
-    async def _body(database, rules, definitions, children, child):
-        rule = await rules.create("daily", "2026-09-14")
-        other = await children.create("Bo", NOW)
-        definition = await definitions.create("A", child.id, rule.id, NOW)
-        # title= / child_id= / is_active= are NOT update() parameters;
-        # this asserts the API shape: reassignment and activation have
-        # their own explicit methods.
-        import inspect
-
-        parameters = inspect.signature(definitions.update).parameters
-        assert set(parameters) == {
-            "definition_id",
-            "title",
-            "description",
-            "icon",
-            "due_time",
-        }
-        assert await definitions.update(
-            definition.id, title="A2"
-        ) == 1
-        fetched = await definitions.get(definition.id)
-        assert fetched.child_id == child.id
-        assert fetched.is_active is True
-        return fetched
-
-    _with_db(tmp_path, "definition-update-shape.db")(_body)
-
-
-def test_definition_update_no_fields_returns_zero(tmp_path) -> None:
-    async def _body(database, rules, definitions, children, child):
-        rule = await rules.create("daily", "2026-09-14")
-        definition = await definitions.create("A", child.id, rule.id, NOW)
-        return await definitions.update(definition.id)
-
-    assert _with_db(tmp_path, "definition-update-empty.db")(_body) == 0
-
-
-def test_definition_update_can_clear_optional_fields(tmp_path) -> None:
-    """Explicit None removes description/icon/due_time; omitted keeps."""
-    async def _body(database, rules, definitions, children, child):
-        rule = await rules.create("daily", "2026-09-14")
-        definition = await definitions.create(
-            "A",
-            child.id,
-            rule.id,
-            NOW,
-            description="d",
-            icon="mdi:x",
-            due_time="08:00",
-        )
-        await definitions.update(definition.id, title="A2")
-        kept = await definitions.get(definition.id)
-        assert kept.description == "d"
-        assert kept.icon == "mdi:x"
-        await definitions.update(
-            definition.id, description=None, icon=None, due_time=None
-        )
-        cleared = await definitions.get(definition.id)
-        assert cleared.description is None
-        assert cleared.icon is None
-        assert cleared.due_time is None
-        assert cleared.title == "A2"
-        return cleared
-
-    _with_db(tmp_path, "definition-update-clear.db")(_body)
-
-
-def test_definition_update_missing_returns_zero(tmp_path) -> None:
-    async def _body(database, rules, definitions, children, child):
-        return await definitions.update(999, title="X")
-
-    assert _with_db(tmp_path, "definition-update-missing.db")(_body) == 0
-
-
-def test_definition_set_active_round_trip(tmp_path) -> None:
-    async def _body(database, rules, definitions, children, child):
-        rule = await rules.create("daily", "2026-09-14")
-        definition = await definitions.create("A", child.id, rule.id, NOW)
-        assert await definitions.set_active(definition.id, False) == 1
-        fetched = await definitions.get(definition.id)
-        assert fetched.is_active is False
-        assert await definitions.set_active(definition.id, True) == 1
-        fetched = await definitions.get(definition.id)
-        assert fetched.is_active is True
-        return fetched
-
-    _with_db(tmp_path, "definition-set-active.db")(_body)
-
-
-def test_definition_set_active_missing_returns_zero(tmp_path) -> None:
-    async def _body(database, rules, definitions, children, child):
-        return await definitions.set_active(999, False)
-
-    assert _with_db(tmp_path, "definition-set-active-missing.db")(_body) == 0
-
-
-def test_definition_no_delete_method_exists(tmp_path) -> None:
-    """Guardrail: definitions are deactivated, never hard-deleted."""
-    async def _body(database, rules, definitions, children, child):
-        import inspect
-
-        methods = {
-            name
-            for name, _ in inspect.getmembers(
-                TaskDefinitionsDao, inspect.isfunction
-            )
-        }
-        assert "delete" not in methods
-        assert not any(name.startswith("delete") for name in methods)
-        return methods
-
-    _with_db(tmp_path, "definition-no-delete.db")(_body)
-
-
-def test_definition_set_assignee_round_trip(tmp_path) -> None:
-    async def _body(database, rules, definitions, children, child):
-        rule = await rules.create("daily", "2026-09-14")
-        other = await children.create("Bo", NOW)
-        definition = await definitions.create("A", child.id, rule.id, NOW)
-        assert await definitions.set_assignee(definition.id, other.id) == 1
-        fetched = await definitions.get(definition.id)
-        assert fetched.child_id == other.id
-        return fetched
-
-    _with_db(tmp_path, "definition-set-assignee.db")(_body)
-
-
-def test_definition_set_assignee_inactive_child_raises(tmp_path) -> None:
-    async def _body(database, rules, definitions, children, child):
-        rule = await rules.create("daily", "2026-09-14")
-        other = await children.create("Bo", NOW)
-        definition = await definitions.create("A", child.id, rule.id, NOW)
-        await children.set_active(other.id, False)
-        with pytest.raises(ValueError, match="inactive"):
-            await definitions.set_assignee(definition.id, other.id)
-        fetched = await definitions.get(definition.id)
-        assert fetched.child_id == child.id, (
-            "failed reassignment must leave the current assignee intact"
-        )
-        return fetched
-
-    _with_db(tmp_path, "definition-assignee-inactive.db")(_body)
-
-
-def test_definition_set_assignee_unknown_child_raises(tmp_path) -> None:
-    async def _body(database, rules, definitions, children, child):
-        rule = await rules.create("daily", "2026-09-14")
-        definition = await definitions.create("A", child.id, rule.id, NOW)
-        with pytest.raises(ValueError, match="does not exist"):
-            await definitions.set_assignee(definition.id, 999)
-        return None
-
-    _with_db(tmp_path, "definition-assignee-unknown.db")(_body)
-
-
-def test_definition_set_assignee_missing_definition_returns_zero(
-    tmp_path,
-) -> None:
-    async def _body(database, rules, definitions, children, child):
-        other = await children.create("Bo", NOW)
-        return await definitions.set_assignee(999, other.id)
-
-    assert _with_db(tmp_path, "definition-assignee-missing.db")(_body) == 0
-
-
-def test_definition_set_assignee_leaves_history_rows_alone(
-    tmp_path,
-) -> None:
-    """Reassignment writes the definition row only: any instances that
-    already exist keep their generation-time child_id (Feature 06
-    guardrail 'changes future instances only').
-    """
-    async def _body(database, rules, definitions, children, child):
-        rule = await rules.create("daily", "2026-09-14")
-        other = await children.create("Bo", NOW)
-        definition = await definitions.create("A", child.id, rule.id, NOW)
-        # Simulate an already-generated instance (materialization owns
-        # this table, but its row shape proves reassignment isolation).
-        await database.execute(
-            "INSERT INTO task_instances (definition_id, child_id, "
-            "due_date, generated_at) VALUES (?, ?, ?, ?)",
-            (definition.id, child.id, "2026-09-15", NOW),
-        )
-        await definitions.set_assignee(definition.id, other.id)
-        row = await database.fetch_one(
-            "SELECT child_id FROM task_instances WHERE definition_id = ?",
-            (definition.id,),
-        )
-        assert row == (child.id,)
-        return None
-
-    _with_db(tmp_path, "definition-assignee-history.db")(_body)
-
-
-# ---------------------------------------------------------------------------
-# No SQL for these tables outside the DAO module
-# ---------------------------------------------------------------------------
-
-
-def test_rules_and_definitions_sql_lives_only_in_dao_module() -> None:
-    """Guardrail: schedule_rules/task_definitions SQL may appear only
-    in the DAO modules (and the schema DDL declarations).  RECURSIVE
-    scan of package and tests, FROM/INTO/UPDATE/DELETE FROM/JOIN
-    pattern, with exact repo-relative exclusions justified by role:
-    schema.py declares the DDL, migrations.py applies it, and the
-    test files for exactly those layers verify DDL, not data paths.
-    """
-    import re
-    from pathlib import Path
-
-    package = Path(
-        __import__(
-            "custom_components.nestquest", fromlist=["__file__"]
-        ).__file__
-    ).parent
-    repo_root = package.parent.parent
-    scan_roots = [package, repo_root / "tests"]
-
-    allowed = {
-        "custom_components/nestquest/dao_rules.py",  # this DAO
-        "custom_components/nestquest/dao_instances.py",  # validates the
-        # definition exists + fetches its assignee before generating an
-        # instance (the instance must snapshot the definition's child)
-        "custom_components/nestquest/schema.py",  # declares the DDL
-        "custom_components/nestquest/migrations.py",  # applies the DDL
-        "tests/test_schema.py",  # tests the DDL
-        "tests/test_migrations.py",  # tests migration application
-        "tests/test_dao_rules.py",  # this file, scanned separately
-        "tests/test_dao_instances.py",  # instances guard, own scope
-    }
-    sql_pattern = re.compile(
-        r"(FROM|INTO|UPDATE|DELETE\s+FROM|JOIN)\s+[`'\"]*(\[)?"
-        r"(schedule_rules|task_definitions)\b",
-        re.IGNORECASE,
-    )
-    offenders: list[str] = []
-    for root in scan_roots:
-        for py in sorted(root.rglob("*.py")):
-            relative = py.relative_to(repo_root).as_posix()
-            if relative in allowed:
-                continue
-            if sql_pattern.search(py.read_text()):
-                offenders.append(relative)
-    assert offenders == [], (
-        f"SQL touching schedule_rules/task_definitions leaked into: "
-        f"{offenders}"
-    )
-
-
-def test_dao_instances_test_file_uses_dao_not_raw_rules_sql() -> None:
-    """Compensating self-scan for the test_dao_instances.py exemption:
-    that file may query task_instances/completion_events raw (its own
-    guard's scope) but must go through the DAO for schedule_rules and
-    task_definitions, except its single sanctioned definition-create
-    helper usage and guard spans.
-    """
-    import ast
-    import re
-    from pathlib import Path
-
-    instances_test = Path(__file__).parent / "test_dao_instances.py"
-    text = instances_test.read_text()
-    lines = text.splitlines(keepends=True)
-    tree = ast.parse(text)
-    guard_names = {
-        "test_rules_and_definitions_sql_lives_only_in_dao_module",
-        "test_no_mutation_sql_for_completion_events_anywhere",
-    }
-    excluded: set[int] = set()
-    for node in ast.walk(tree):
-        if not isinstance(node, (ast.FunctionDef, ast.AsyncFunctionDef)):
-            continue
-        if node.name in guard_names:
-            excluded.update(
-                range(node.lineno, (node.end_lineno or node.lineno) + 1)
-            )
-
-    remaining = "".join(
-        line
-        for number, line in enumerate(lines, start=1)
-        if number not in excluded
-    )
-    sql_pattern = re.compile(
-        r"(SELECT\s[^\"']*?FROM|INSERT\s+INTO|UPDATE|DELETE\s+FROM|"
-        r"FROM|JOIN)\s+[`'\"]*(\[)?(schedule_rules|task_definitions)\b",
-        re.IGNORECASE,
-    )
-    assert sql_pattern.search(remaining) is None, (
-        "test_dao_instances.py must go through the DAO, not raw SQL, "
-        "for schedule_rules/task_definitions"
-    )
-
-
-def test_dao_rules_test_file_uses_dao_not_raw_table_sql() -> None:
-    """This test module must exercise the DAO, not raw SQL, for these
-    tables.  Exceptions: the guard functions' own spans (their regexes
-    mention the names), and the reassignment-isolation test, which
-    legitimately touches task_instances — a table this DAO does not
-    own — to prove the guardrail that reassignment leaves it alone.
-    """
-    import ast
-    import re
-    from pathlib import Path
-
-    path = Path(__file__)
-    text = path.read_text()
-    lines = text.splitlines(keepends=True)
-    tree = ast.parse(text)
-    guard_names = {
-        "test_rules_and_definitions_sql_lives_only_in_dao_module",
-        "test_dao_rules_test_file_uses_dao_not_raw_table_sql",
-    }
-    excluded: set[int] = set()
-    for node in ast.walk(tree):
-        if (
-            isinstance(node, (ast.FunctionDef, ast.AsyncFunctionDef))
-            and node.name in guard_names
-        ):
-            excluded.update(
-                range(node.lineno, (node.end_lineno or node.lineno) + 1)
-            )
-
-    remaining = "".join(
-        line
-        for number, line in enumerate(lines, start=1)
-        if number not in excluded
-    )
-    sql_pattern = re.compile(
-        r"(SELECT\s[^\"']*?FROM|INSERT\s+INTO|UPDATE|DELETE\s+FROM|"
-        r"FROM|JOIN)\s+[`'\"]*(\[)?(schedule_rules|task_definitions)\b",
-        re.IGNORECASE,
-    )
-    assert sql_pattern.search(remaining) is None, (
-        "tests must go through the DAO, not raw SQL, for these tables"
-    )

tests/test_migrations.py

@@ -1,677 +0,0 @@
-"""Tests for migrations.py: the versioned schema migration runner."""
-from __future__ import annotations
-
-import asyncio
-import hashlib
-import logging
-import sqlite3
-from unittest.mock import AsyncMock
-
-import pytest
-
-from custom_components.nestquest.db import NestQuestDatabase
-from custom_components.nestquest.migrations import (
-    MIGRATIONS,
-    VERSION_TABLE,
-    VERSION_TABLE_DDL,
-    apply_migrations,
-    read_schema_version,
-)
-from custom_components.nestquest.schema import SCHEMA_V1_STATEMENTS
-
-
-def _run(coro):
-    return asyncio.new_event_loop().run_until_complete(coro)
-
-
-def _make_hass_mock():
-    from unittest.mock import AsyncMock, MagicMock
-
-    hass = MagicMock()
-    hass.async_add_executor_job = AsyncMock(side_effect=(lambda fn, *a: fn(*a)))
-    return hass
-
-
-def _open_db(path) -> NestQuestDatabase:
-    database = NestQuestDatabase(_make_hass_mock())
-    _run(database.open(path))
-    return database
-
-
-def _migrate(database, migrations=MIGRATIONS):
-    return _run(apply_migrations(database, migrations))
-
-
-def _version(database) -> int:
-    return _run(read_schema_version(database))
-
-
-def _tables(database) -> set[str]:
-    rows = _run(
-        database.fetch_all(
-            "SELECT name FROM sqlite_master WHERE type = 'table' "
-            "AND name NOT LIKE 'sqlite_%'"
-        )
-    )
-    return {row[0] for row in rows}
-
-
-def _counts(database) -> dict[str, int]:
-    """Row counts for every v1 data table plus the version table."""
-    tables = (
-        "children",
-        "admin_users",
-        "schedule_rules",
-        "task_definitions",
-        "presence_schedules",
-        "presence_overrides",
-        "task_instances",
-        "completion_events",
-    )
-    counts = {}
-    for table in tables:
-        row = _run(database.fetch_one(f"SELECT COUNT(*) FROM {table}"))
-        counts[table] = row[0]
-    return counts
-
-
-# ---------------------------------------------------------------------------
-# Fresh file: version 0 -> version 1
-# ---------------------------------------------------------------------------
-
-
-def test_fresh_file_migrates_to_version_1(tmp_path) -> None:
-    database = _open_db(tmp_path / "fresh.db")
-    try:
-        final = _migrate(database)
-        assert final == 1
-        assert _version(database) == 1
-    finally:
-        _run(database.close())
-
-
-def test_fresh_file_migration_creates_all_v1_tables(tmp_path) -> None:
-    database = _open_db(tmp_path / "fresh-tables.db")
-    try:
-        _migrate(database)
-        expected = {
-            "children",
-            "admin_users",
-            "schedule_rules",
-            "task_definitions",
-            "presence_schedules",
-            "presence_overrides",
-            "task_instances",
-            "completion_events",
-            VERSION_TABLE,
-        }
-        assert _tables(database) == expected
-    finally:
-        _run(database.close())
-
-
-def test_missing_version_table_raises_on_direct_read(tmp_path) -> None:
-    database = _open_db(tmp_path / "no-table.db")
-    try:
-        with pytest.raises(sqlite3.OperationalError, match="no such table"):
-            _run(read_schema_version(database))
-        row = _run(
-            database.fetch_one(
-                "SELECT name FROM sqlite_master WHERE type = 'table' "
-                f"AND name = '{VERSION_TABLE}'"
-            )
-        )
-        assert row is None, "read_schema_version must not create the table"
-    finally:
-        _run(database.close())
-
-
-def test_empty_version_table_reads_as_version_0(tmp_path) -> None:
-    database = _open_db(tmp_path / "empty-table.db")
-    try:
-        _run(database.execute(VERSION_TABLE_DDL))
-        assert _version(database) == 0
-    finally:
-        _run(database.close())
-
-
-def test_migration_1_is_the_full_v1_ddl() -> None:
-    assert MIGRATIONS[0] == SCHEMA_V1_STATEMENTS
-    assert len(MIGRATIONS) == 1
-
-
-# ---------------------------------------------------------------------------
-# Idempotence: second start is a no-op
-# ---------------------------------------------------------------------------
-
-
-def test_second_run_applies_nothing_and_keeps_rows(tmp_path) -> None:
-    database = _open_db(tmp_path / "idempotent.db")
-    try:
-        _migrate(database)
-        _run(
-            database.execute(
-                "INSERT INTO children (display_name, created_at) VALUES (?, ?)",
-                ("Ada", "2026-09-13T00:00:00+00:00"),
-            )
-        )
-        _run(
-            database.execute(
-                "INSERT INTO admin_users (ha_user_id, added_at) VALUES (?, ?)",
-                ("user-1", "2026-09-13T00:00:00+00:00"),
-            )
-        )
-        final = _migrate(database)
-        assert final == 1
-        assert _version(database) == 1
-        assert _counts(database)["children"] == 1
-        assert _counts(database)["admin_users"] == 1
-    finally:
-        _run(database.close())
-
-
-def test_second_run_writes_nothing_to_the_file(tmp_path, caplog) -> None:
-    database = _open_db(tmp_path / "noop.db")
-    try:
-        _migrate(database)
-        _run(database.execute("PRAGMA wal_checkpoint(TRUNCATE)"))
-        db_file = tmp_path / "noop.db"
-        wal_file = tmp_path / "noop.db-wal"
-        digest_before = hashlib.sha256(db_file.read_bytes()).hexdigest()
-        mtime_before = db_file.stat().st_mtime_ns
-        wal_digest_before = (
-            hashlib.sha256(wal_file.read_bytes()).hexdigest()
-            if wal_file.exists()
-            else None
-        )
-
-        _migrate(database)
-
-        # A no-op run must not open a write transaction: the main
-        # database file is byte-identical (content hash, not just size)
-        # and untouched (mtime too), and the WAL gained no frames.
-        assert db_file.stat().st_mtime_ns == mtime_before
-        assert (
-            hashlib.sha256(db_file.read_bytes()).hexdigest() == digest_before
-        )
-        if wal_digest_before is None:
-            assert not wal_file.exists()
-        else:
-            assert (
-                hashlib.sha256(wal_file.read_bytes()).hexdigest()
-                == wal_digest_before
-            )
-    finally:
-        _run(database.close())
-
-
-def test_noop_run_logs_no_migration(caplog, tmp_path) -> None:
-    database = _open_db(tmp_path / "noop-log.db")
-    try:
-        _migrate(database)
-        caplog.clear()
-        with caplog.at_level(logging.INFO, logger="custom_components.nestquest.migrations"):
-            _migrate(database)
-        migrated = [
-            r for r in caplog.records if "migrated" in r.getMessage().lower()
-        ]
-        assert migrated == []
-    finally:
-        _run(database.close())
-
-
-def test_noop_run_is_logged_at_debug_level(caplog, tmp_path) -> None:
-    database = _open_db(tmp_path / "noop-debug.db")
-    try:
-        _migrate(database)
-        caplog.clear()
-        with caplog.at_level(logging.DEBUG, logger="custom_components.nestquest.migrations"):
-            _migrate(database)
-        assert any(
-            "already at version 1" in r.getMessage()
-            for r in caplog.records
-        )
-    finally:
-        _run(database.close())
-
-
-# ---------------------------------------------------------------------------
-# Failure atomicity: a failing migration leaves the prior version intact
-# ---------------------------------------------------------------------------
-
-
-def _failing_migrations(prior_statements: list[str]) -> list[list[str]]:
-    """Two-migration list where migration 2 fails mid-application."""
-    return [
-        prior_statements,
-        [
-            "CREATE TABLE IF NOT EXISTS later_table (id INTEGER PRIMARY KEY)",
-            "CREATE TABLE broken (",
-        ],
-    ]
-
-
-def test_failing_migration_rolls_back_to_prior_version(tmp_path) -> None:
-    database = _open_db(tmp_path / "rollback.db")
-    try:
-        # Manually simulate a database at version 1: apply migration 1's
-        # statements directly and stamp version 1 through the runner.
-        _migrate(database)
-        version_row = _run(
-            database.fetch_one(f"SELECT version FROM {VERSION_TABLE}")
-        )
-        assert version_row == (1,)
-
-        with pytest.raises(sqlite3.OperationalError):
-            _migrate(database, _failing_migrations(SCHEMA_V1_STATEMENTS))
-
-        # Version stamp unchanged, statements from the failed migration
-        # absent, and the v1 tables untouched.
-        assert _version(database) == 1
-        assert "later_table" not in _tables(database)
-        assert _counts(database)["children"] == 0
-        assert _counts(database)["completion_events"] == 0
-    finally:
-        _run(database.close())
-
-
-def test_failing_migration_on_fresh_file_leaves_version_0(tmp_path) -> None:
-    database = _open_db(tmp_path / "fresh-rollback.db")
-    try:
-        # The fresh file still reaches migration 2 (the failing one):
-        # migration 1 commits, stamping version 1, before migration 2
-        # fails and rolls back.  The run aborts at version 1 — the last
-        # fully-applied migration — not at version 0.
-        with pytest.raises(sqlite3.OperationalError):
-            _migrate(database, _failing_migrations(SCHEMA_V1_STATEMENTS))
-        assert _version(database) == 1
-        # Migration 2's tables must not survive the failed attempt.
-        assert "later_table" not in _tables(database)
-        # Migration 1's tables do: it committed before the failure.
-        assert "children" in _tables(database)
-        assert "task_instances" in _tables(database)
-    finally:
-        _run(database.close())
-
-
-def test_failed_migration_can_be_retried_after_fix(tmp_path) -> None:
-    database = _open_db(tmp_path / "retry.db")
-    try:
-        _migrate(database)
-        broken = _failing_migrations(SCHEMA_V1_STATEMENTS)
-        with pytest.raises(sqlite3.OperationalError):
-            _migrate(database, broken)
-        # "Fix" the migration and retry: it now applies cleanly.
-        broken[1] = [
-            "CREATE TABLE IF NOT EXISTS later_table (id INTEGER PRIMARY KEY)"
-        ]
-        final = _migrate(database, broken)
-        assert final == 2
-        assert _version(database) == 2
-        assert "later_table" in _tables(database)
-    finally:
-        _run(database.close())
-
-
-def test_failing_migration_error_is_preserved(tmp_path) -> None:
-    database = _open_db(tmp_path / "error-preserved.db")
-    try:
-        with pytest.raises(sqlite3.OperationalError, match="incomplete input"):
-            _migrate(database, _failing_migrations(SCHEMA_V1_STATEMENTS))
-    finally:
-        _run(database.close())
-
-
-# ---------------------------------------------------------------------------
-# Version guard rails
-# ---------------------------------------------------------------------------
-
-
-def test_future_version_is_rejected(tmp_path) -> None:
-    database = _open_db(tmp_path / "future.db")
-    try:
-        _migrate(database)
-        _run(
-            database.execute(
-                f"UPDATE {VERSION_TABLE} SET version = ?", (99,)
-            )
-        )
-        with pytest.raises(RuntimeError, match="newer than"):
-            _migrate(database)
-        # Nothing was modified by the rejected run.
-        assert _version(database) == 99
-    finally:
-        _run(database.close())
-
-
-def test_non_integer_version_raises_runtime_error(tmp_path) -> None:
-    database = _open_db(tmp_path / "string-version.db")
-    try:
-        _run(database.execute(VERSION_TABLE_DDL))
-        # The CHECK enforces version >= 1 but SQLite's loose typing
-        # stores TEXT under an INTEGER-affinity column when it cannot
-        # be losslessly coerced; guard the read path against it.
-        _run(
-            database.execute(
-                f"INSERT INTO {VERSION_TABLE} (id, version) VALUES (1, ?)",
-                ("one",),
-            )
-        )
-        with pytest.raises(RuntimeError, match="not an integer"):
-            _run(read_schema_version(database))
-    finally:
-        _run(database.close())
-
-
-def test_negative_version_read_guard_rejects_below_one() -> None:
-    """The read path rejects sub-1 versions even if storage missed them.
-
-    The VERSION_TABLE CHECK already makes negative/zero unstorable; this
-    exercises the defense-in-depth guard in read_schema_version itself
-    against a database stub returning such a row (e.g. a future schema
-    relaxing the CHECK, or a hand-edited file).
-    """
-    from unittest.mock import AsyncMock, MagicMock
-
-    for bad in (-1, 0):
-        database = MagicMock()
-        database.fetch_one = AsyncMock(return_value=(bad,))
-        with pytest.raises(RuntimeError, match="must be >= 1"):
-            _run(read_schema_version(database))
-
-
-def test_non_integer_version_read_guard_rejects_text() -> None:
-    from unittest.mock import AsyncMock, MagicMock
-
-    for bad in ("one", 1.5, True):
-        database = MagicMock()
-        database.fetch_one = AsyncMock(return_value=(bad,))
-        with pytest.raises(RuntimeError, match="not an integer"):
-            _run(read_schema_version(database))
-
-
-def test_zero_version_row_is_unstorable(tmp_path) -> None:
-    """The CHECK makes sub-1 versions impossible through SQL.
-
-    PRAGMA writable_schema does not bypass CHECKs on ordinary tables,
-    so the negative/zero read guard above is pure defense-in-depth;
-    here we prove the storage-level rule the normal path relies on.
-    """
-    database = _open_db(tmp_path / "zero-version.db")
-    try:
-        _run(database.execute(VERSION_TABLE_DDL))
-        for bad in (0, -1):
-            with pytest.raises(sqlite3.IntegrityError, match="CHECK"):
-                _run(
-                    database.execute(
-                        f"INSERT INTO {VERSION_TABLE} (id, version) "
-                        "VALUES (1, ?)",
-                        (bad,),
-                    )
-                )
-    finally:
-        _run(database.close())
-
-
-def test_version_table_enforces_singleton_row(tmp_path) -> None:
-    database = _open_db(tmp_path / "singleton.db")
-    try:
-        _run(database.execute(VERSION_TABLE_DDL))
-        _run(
-            database.execute(
-                f"INSERT INTO {VERSION_TABLE} (id, version) VALUES (1, 1)"
-            )
-        )
-        with pytest.raises(sqlite3.IntegrityError, match="CHECK"):
-            _run(
-                database.execute(
-                    f"INSERT INTO {VERSION_TABLE} (id, version) "
-                    "VALUES (2, 1)"
-                )
-            )
-    finally:
-        _run(database.close())
-
-
-def test_version_table_check_rejects_version_zero_and_negative(
-    tmp_path,
-) -> None:
-    database = _open_db(tmp_path / "version-check.db")
-    try:
-        _run(database.execute(VERSION_TABLE_DDL))
-        for bad in (0, -1):
-            with pytest.raises(sqlite3.IntegrityError, match="CHECK"):
-                _run(
-                    database.execute(
-                        f"INSERT INTO {VERSION_TABLE} (id, version) "
-                        "VALUES (1, ?)",
-                        (bad,),
-                    )
-                )
-    finally:
-        _run(database.close())
-
-
-def test_concurrent_runners_serialize_and_apply_once(tmp_path) -> None:
-    """Two concurrent runners on one connection apply each step once.
-
-    Deterministic race: runner B starts while runner A is queued into
-    its migration.  A applies everything and stamps; B then acquires
-    the migration lock, re-reads the already-stamped version, and
-    applies nothing.  Without serialization B's transaction() would
-    raise RuntimeError (the wrapper forbids concurrent transactions),
-    so this also proves the queueing works.
-    """
-    migrations = [
-        ["CREATE TABLE IF NOT EXISTS step_a (id INTEGER PRIMARY KEY)"],
-        ["CREATE TABLE IF NOT EXISTS step_b (id INTEGER PRIMARY KEY)"],
-    ]
-    results: dict[str, int] = {}
-
-    async def _main(tmp_name: str) -> None:
-        database = NestQuestDatabase(_make_hass_mock())
-        await database.open(tmp_name)
-        try:
-            # Start A, yield so it acquires the lock and enters its
-            # first transaction, then start B while A is mid-apply.
-            task_a = asyncio.ensure_future(
-                apply_migrations(database, migrations)
-            )
-            await asyncio.sleep(0)
-            task_b = asyncio.ensure_future(
-                apply_migrations(database, migrations)
-            )
-            results["a"], results["b"] = await asyncio.gather(
-                task_a, task_b
-            )
-
-            tables = {
-                row[0]
-                for row in await database.fetch_all(
-                    "SELECT name FROM sqlite_master WHERE type = 'table' "
-                    "AND name NOT LIKE 'sqlite_%'"
-                )
-            }
-            assert {"step_a", "step_b"} <= tables
-            # Each migration's statements ran exactly once: the CREATE
-            # IF NOT EXISTS would hide double-runs, so count via sqlite
-            # sequence/DDL fingerprint instead — re-check version and
-            # that both runners reported the same final version.
-            row = await database.fetch_one(
-                f"SELECT version FROM {VERSION_TABLE}"
-            )
-            assert row == (2,)
-        finally:
-            await database.close()
-
-    loop = asyncio.new_event_loop()
-    try:
-        loop.run_until_complete(_main(str(tmp_path / "concurrent.db")))
-    finally:
-        loop.close()
-
-    assert results["a"] == 2
-    assert results["b"] == 2
-
-
-def test_multiple_pending_migrations_apply_in_order(tmp_path) -> None:
-    database = _open_db(tmp_path / "multi-step.db")
-    try:
-        migrations = [
-            ["CREATE TABLE IF NOT EXISTS step_a (id INTEGER PRIMARY KEY)"],
-            ["CREATE TABLE IF NOT EXISTS step_b (id INTEGER PRIMARY KEY)"],
-            ["CREATE TABLE IF NOT EXISTS step_c (id INTEGER PRIMARY KEY)"],
-        ]
-        final = _run(apply_migrations(database, migrations))
-        assert final == 3
-        assert _version(database) == 3
-        assert {"step_a", "step_b", "step_c"} <= _tables(database)
-    finally:
-        _run(database.close())
-
-
-def test_partial_pending_migrations_resume_from_current_version(
-    tmp_path,
-) -> None:
-    database = _open_db(tmp_path / "resume.db")
-    try:
-        migrations = [
-            ["CREATE TABLE IF NOT EXISTS step_a (id INTEGER PRIMARY KEY)"],
-            ["CREATE TABLE IF NOT EXISTS step_b (id INTEGER PRIMARY KEY)"],
-        ]
-        # Advance to version 1 only, by applying a truncated list of the
-        # same migrations: patch apply_migrations' latest by passing a
-        # single-migration list first, then the full list.
-        _run(apply_migrations(database, migrations[:1]))
-        assert _version(database) == 1
-        final = _run(apply_migrations(database, migrations))
-        assert final == 2
-        assert _version(database) == 2
-        assert "step_b" in _tables(database)
-    finally:
-        _run(database.close())
-
-
-# ---------------------------------------------------------------------------
-# Startup wiring: setup runs the migration runner, not raw DDL
-# ---------------------------------------------------------------------------
-
-
-async def _setup_entry(hass, entry, registry) -> object:
-    from tests.test_lifecycle import _wire  # reuse the established wiring
-
-    entry = _wire(entry, registry)
-    from custom_components.nestquest import async_setup_entry
-
-    await async_setup_entry(hass, entry)
-    return entry
-
-
-async def test_setup_entry_migrates_fresh_database(hass, make_entry) -> None:
-    import sqlite3 as sqlite3_mod
-
-    from custom_components.nestquest.migrations import read_schema_version
-    from custom_components.nestquest.store import async_get_db_path
-
-    entry = await _setup_entry(hass, make_entry(), hass.registry)
-    database = entry.runtime_data.database
-    assert await read_schema_version(database) == 1
-    # The v1 tables exist because the runner applied migration 1.
-    names = {
-        row[0]
-        for row in await database.fetch_all(
-            "SELECT name FROM sqlite_master WHERE type = 'table' "
-            "AND name NOT LIKE 'sqlite_%'"
-        )
-    }
-    assert "children" in names and "completion_events" in names
-    # The version table exists with its singleton row stamped.
-    columns = await database.fetch_all(f"PRAGMA table_info({VERSION_TABLE})")
-    assert [(row[1], row[3]) for row in columns] == [("id", 1), ("version", 1)]
-    db_path = await async_get_db_path(hass)
-    conn = sqlite3_mod.connect(db_path)
-    try:
-        conn.execute(f"INSERT INTO {VERSION_TABLE} (id, version) VALUES (2, 1)")
-        violated = False
-    except sqlite3_mod.IntegrityError:
-        violated = True
-    finally:
-        conn.close()
-    assert violated, "singleton-row CHECK must be live in the setup-created DB"
-    await database.close()
-
-
-async def test_options_reload_reopens_and_rechecks_version(
-    hass, make_entry
-) -> None:
-    """A listener-triggered reload re-runs setup against the same file.
-
-    Unload then setup is the reload lifecycle: the old connection is
-    closed, apply_migrations runs again on the persisted file, keeps
-    version and rows intact, and the reopened connection is live.
-    """
-    from custom_components.nestquest import async_unload_entry
-    from custom_components.nestquest.migrations import read_schema_version
-
-    entry = await _setup_entry(hass, make_entry(), hass.registry)
-    database_a = entry.runtime_data.database
-    await database_a.execute(
-        "INSERT INTO children (display_name, created_at) VALUES (?, ?)",
-        ("Ada", "2026-09-13T00:00:00+00:00"),
-    )
-    assert await async_unload_entry(hass, entry) is True
-    assert not database_a.connected
-
-    entry_reloaded = await _setup_entry(hass, make_entry(), hass.registry)
-    database_b = entry_reloaded.runtime_data.database
-    assert database_b is not database_a
-    try:
-        assert await read_schema_version(database_b) == 1
-        row = await database_b.fetch_one("SELECT COUNT(*) FROM children")
-        assert row == (1,)
-    finally:
-        await database_b.close()
-
-
-async def test_setup_entry_failure_closes_database(
-    hass, make_entry, monkeypatch
-) -> None:
-    """A failing migration closes the opened connection before re-raising.
-
-    Spies on the real wrapper instance: records whether close() ran and
-    whether the connection is left disconnected, rather than inferring
-    from hass.data (a failed setup never stores a runtime record).
-    """
-    import pytest as pytest_module
-
-    import custom_components.nestquest as nestquest_module
-    from custom_components.nestquest.db import NestQuestDatabase
-    from custom_components.nestquest.migrations import (
-        MIGRATIONS as _MIGRATIONS,
-    )
-
-    async def _failing(database, migrations=_MIGRATIONS):
-        raise RuntimeError("boom")
-
-    monkeypatch.setattr(
-        nestquest_module, "apply_migrations", _failing, raising=True
-    )
-
-    close_calls: list[bool] = []
-    original_close = NestQuestDatabase.close
-
-    async def _spy_close(self):
-        close_calls.append(True)
-        return await original_close(self)
-
-    monkeypatch.setattr(NestQuestDatabase, "close", _spy_close)
-
-    entry = make_entry()
-    with pytest_module.raises(RuntimeError, match="boom"):
-        await _setup_entry(hass, entry, hass.registry)
-
-    assert close_calls == [True], (
-        "failed setup must close the connection it opened"
-    )
-    record = hass.data["nestquest"].get(entry.entry_id)
-    assert record is None, "failed setup must not store runtime data"

tests/test_schema.py

@@ -10,13 +10,11 @@ from custom_components.nestquest.db import NestQuestDatabase
 from custom_components.nestquest.schema import (
     SCHEMA_V1_ADMIN_USERS_DDL,
     SCHEMA_V1_CHILDREN_DDL,
-    SCHEMA_V1_COMPLETION_EVENTS_DDL,
     SCHEMA_V1_PRESENCE_OVERRIDES_DDL,
     SCHEMA_V1_PRESENCE_SCHEDULES_DDL,
     SCHEMA_V1_SCHEDULE_RULES_DDL,
     SCHEMA_V1_STATEMENTS,
     SCHEMA_V1_TASK_DEFINITIONS_DDL,
-    SCHEMA_V1_TASK_INSTANCES_DDL,
     async_apply_ddl,
 )
 
@@ -164,8 +162,6 @@ def test_schema_v1_statements_compose_the_six_tables() -> None:
         *SCHEMA_V1_TASK_DEFINITIONS_DDL,
         *SCHEMA_V1_PRESENCE_SCHEDULES_DDL,
         *SCHEMA_V1_PRESENCE_OVERRIDES_DDL,
-        *SCHEMA_V1_TASK_INSTANCES_DDL,
-        *SCHEMA_V1_COMPLETION_EVENTS_DDL,
     ]
 
 
@@ -1401,637 +1397,5 @@ def test_applying_presence_ddl_twice_keeps_rows(tmp_path) -> None:
             row = _run(database.fetch_one(f"SELECT COUNT(*) FROM {table}"))
             counts.append(row[0])
         assert counts == [1, 1]
-    finally:
-        _run(database.close())
-
-
-# ---------------------------------------------------------------------------
-# task_instances and completion_events: helpers
-# ---------------------------------------------------------------------------
-
-
-def _insert_instance(database, definition_id=1, **overrides):
-    """Insert one valid task_instance, returning the instance id.
-
-    Pass ``_OMIT`` as a value to leave that column out of the INSERT so
-    its DDL DEFAULT applies.
-    """
-    values: dict[str, object] = {
-        "definition_id": definition_id,
-        "child_id": 1,
-        "due_date": "2026-09-14",
-        "generated_at": "2026-09-14T00:00:00+00:00",
-    }
-    values.update(overrides)
-    values = {k: v for k, v in values.items() if v is not _OMIT}
-    columns = ", ".join(values)
-    placeholders = ", ".join("?" for _ in values)
-    result = _run(
-        database.execute(
-            f"INSERT INTO task_instances ({columns}) VALUES ({placeholders})",
-            tuple(values.values()),
-        )
-    )
-    assert result.lastrowid is not None
-    return result.lastrowid
-
-
-def _insert_event(database, instance_id=1, **overrides):
-    """Insert one valid completion_event, returning the event id.
-
-    Pass ``_OMIT`` as a value to leave that column out of the INSERT so
-    its DDL DEFAULT applies.
-    """
-    values: dict[str, object] = {
-        "instance_id": instance_id,
-        "child_id": 1,
-        "event_type": "completed",
-        "actor_source": "user",
-        "actor_user_id": "user-1",
-        "occurred_at": "2026-09-14T08:30:00+00:00",
-        "was_on_time": 1,
-    }
-    values.update(overrides)
-    values = {k: v for k, v in values.items() if v is not _OMIT}
-    columns = ", ".join(values)
-    placeholders = ", ".join("?" for _ in values)
-    result = _run(
-        database.execute(
-            f"INSERT INTO completion_events ({columns}) VALUES ({placeholders})",
-            tuple(values.values()),
-        )
-    )
-    assert result.lastrowid is not None
-    return result.lastrowid
-
-
-def _setup_definition(database) -> None:
-    """Create one child, one schedule rule and one task definition."""
-    _child(database)
-    _insert_rule(database)
-    _insert_definition(database, child_id=1, rule_id=1)
-
-
-# ---------------------------------------------------------------------------
-# task_instances and completion_events: DDL shape
-# ---------------------------------------------------------------------------
-
-
-def test_task_instances_table_exists_after_applying_ddl(tmp_path) -> None:
-    database = _open_db(tmp_path / "task-instances.db")
-    try:
-        _apply(database)
-        row = _run(
-            database.fetch_one(
-                "SELECT name FROM sqlite_master WHERE type = 'table' "
-                "AND name = 'task_instances'"
-            )
-        )
-        assert row is not None and row[0] == "task_instances"
-    finally:
-        _run(database.close())
-
-
-def test_completion_events_table_exists_after_applying_ddl(tmp_path) -> None:
-    database = _open_db(tmp_path / "completion-events.db")
-    try:
-        _apply(database)
-        row = _run(
-            database.fetch_one(
-                "SELECT name FROM sqlite_master WHERE type = 'table' "
-                "AND name = 'completion_events'"
-            )
-        )
-        assert row is not None and row[0] == "completion_events"
-    finally:
-        _run(database.close())
-
-
-def test_task_instances_columns_types_and_constraints(tmp_path) -> None:
-    database = _open_db(tmp_path / "task-instances-columns.db")
-    try:
-        _apply(database)
-        columns = _run(database.fetch_all("PRAGMA table_info(task_instances)"))
-        # cid, name, type, notnull, dflt_value, pk
-        assert [(row[1], row[2], row[3], row[4], row[5]) for row in columns] == [
-            ("id", "INTEGER", 0, None, 1),
-            ("definition_id", "INTEGER", 1, None, 0),
-            ("child_id", "INTEGER", 1, None, 0),
-            ("due_date", "TEXT", 1, None, 0),
-            ("due_time", "TEXT", 0, None, 0),
-            ("generated_at", "TEXT", 1, None, 0),
-        ]
-    finally:
-        _run(database.close())
-
-
-def test_completion_events_columns_types_and_constraints(tmp_path) -> None:
-    database = _open_db(tmp_path / "completion-events-columns.db")
-    try:
-        _apply(database)
-        columns = _run(database.fetch_all("PRAGMA table_info(completion_events)"))
-        assert [(row[1], row[2], row[3], row[4], row[5]) for row in columns] == [
-            ("id", "INTEGER", 0, None, 1),
-            ("instance_id", "INTEGER", 1, None, 0),
-            ("child_id", "INTEGER", 1, None, 0),
-            ("event_type", "TEXT", 1, None, 0),
-            ("actor_source", "TEXT", 1, None, 0),
-            ("actor_user_id", "TEXT", 0, None, 0),
-            ("occurred_at", "TEXT", 1, None, 0),
-            ("was_on_time", "INTEGER", 0, None, 0),
-        ]
-    finally:
-        _run(database.close())
-
-
-def test_task_instances_foreign_keys_declared(tmp_path) -> None:
-    database = _open_db(tmp_path / "task-instances-fks.db")
-    try:
-        _apply(database)
-        fks = _run(database.fetch_all("PRAGMA foreign_key_list(task_instances)"))
-        declared = {(row[2], row[3], row[4]) for row in fks}
-        assert declared == {
-            ("task_definitions", "definition_id", "id"),
-            ("children", "child_id", "id"),
-        }
-    finally:
-        _run(database.close())
-
-
-def test_completion_events_foreign_keys_declared(tmp_path) -> None:
-    database = _open_db(tmp_path / "completion-events-fks.db")
-    try:
-        _apply(database)
-        fks = _run(database.fetch_all("PRAGMA foreign_key_list(completion_events)"))
-        declared = {(row[2], row[3], row[4]) for row in fks}
-        assert declared == {
-            ("task_instances", "instance_id", "id"),
-            ("children", "child_id", "id"),
-        }
-    finally:
-        _run(database.close())
-
-
-def test_task_instances_unique_index_on_definition_and_date(tmp_path) -> None:
-    database = _open_db(tmp_path / "task-instances-unique.db")
-    try:
-        _apply(database)
-        _setup_definition(database)
-        rows = _run(
-            database.fetch_all(
-                "SELECT name, sql FROM sqlite_master WHERE type = 'index' "
-                "AND tbl_name = 'task_instances'"
-            )
-        )
-        implicit = [(name, sql) for name, sql in rows if sql is None]
-        assert len(implicit) == 1, (
-            "the (definition_id, due_date) UNIQUE constraint must be backed "
-            "by exactly one implicit unique index"
-        )
-        columns = _run(
-            database.fetch_all(
-                f"PRAGMA index_info('{implicit[0][0]}')"
-            )
-        )
-        assert [row[2] for row in columns] == ["definition_id", "due_date"]
-        # The implicit index is genuinely unique: UNIQUE(...) is the only
-        # constraint SQLite backs with a sql-less autoindex on this table.
-        row = _run(
-            database.fetch_one(
-                "SELECT COUNT(DISTINCT name) FROM pragma_index_list"
-                "('task_instances') WHERE \"unique\" = 1"
-            )
-        )
-        assert row == (1,)
-    finally:
-        _run(database.close())
-
-
-# ---------------------------------------------------------------------------
-# task_instances: constraint enforcement
-# ---------------------------------------------------------------------------
-
-
-def test_task_instances_valid_insert_round_trips(tmp_path) -> None:
-    database = _open_db(tmp_path / "task-instances-valid.db")
-    try:
-        _apply(database)
-        _setup_definition(database)
-        instance_id = _insert_instance(database, definition_id=1, child_id=1)
-        row = _run(
-            database.fetch_one(
-                "SELECT definition_id, child_id, due_date, due_time, generated_at "
-                "FROM task_instances WHERE id = ?",
-                (instance_id,),
-            )
-        )
-        assert row == (1, 1, "2026-09-14", None, "2026-09-14T00:00:00+00:00")
-    finally:
-        _run(database.close())
-
-
-def test_task_instances_due_time_round_trips(tmp_path) -> None:
-    database = _open_db(tmp_path / "task-instances-due-time.db")
-    try:
-        _apply(database)
-        _setup_definition(database)
-        instance_id = _insert_instance(
-            database, definition_id=1, due_time="17:30"
-        )
-        row = _run(
-            database.fetch_one(
-                "SELECT due_time FROM task_instances WHERE id = ?",
-                (instance_id,),
-            )
-        )
-        assert row == ("17:30",)
-    finally:
-        _run(database.close())
-
-
-def test_task_instances_duplicate_definition_date_fails(tmp_path) -> None:
-    database = _open_db(tmp_path / "task-instances-duplicate.db")
-    try:
-        _apply(database)
-        _setup_definition(database)
-        _insert_instance(database, definition_id=1, due_date="2026-09-14")
-        with pytest.raises(sqlite3.IntegrityError, match="UNIQUE"):
-            _insert_instance(database, definition_id=1, due_date="2026-09-14")
-    finally:
-        _run(database.close())
-
-
-def test_task_instances_same_date_different_definitions_allowed(
-    tmp_path,
-) -> None:
-    database = _open_db(tmp_path / "task-instances-multi-def.db")
-    try:
-        _apply(database)
-        _setup_definition(database)
-        _run(
-            database.execute(
-                "INSERT INTO children (display_name, created_at) VALUES (?, ?)",
-                ("Bo", "2026-09-13T00:00:00+00:00"),
-            )
-        )
-        rule_id = _insert_rule(database)
-        _insert_definition(database, child_id=2, rule_id=rule_id)
-        _insert_instance(database, definition_id=1, due_date="2026-09-14")
-        _insert_instance(database, definition_id=2, due_date="2026-09-14")
-        row = _run(database.fetch_one("SELECT COUNT(*) FROM task_instances"))
-        assert row == (2,)
-    finally:
-        _run(database.close())
-
-
-def test_task_instances_same_definition_different_dates_allowed(tmp_path) -> None:
-    database = _open_db(tmp_path / "task-instances-multi-date.db")
-    try:
-        _apply(database)
-        _setup_definition(database)
-        _insert_instance(database, definition_id=1, due_date="2026-09-14")
-        _insert_instance(database, definition_id=1, due_date="2026-09-15")
-        row = _run(database.fetch_one("SELECT COUNT(*) FROM task_instances"))
-        assert row == (2,)
-    finally:
-        _run(database.close())
-
-
-def test_task_instances_unknown_definition_fails(tmp_path) -> None:
-    database = _open_db(tmp_path / "task-instances-bad-def.db")
-    try:
-        _apply(database)
-        _setup_definition(database)
-        with pytest.raises(sqlite3.IntegrityError, match="FOREIGN KEY"):
-            _insert_instance(database, definition_id=999)
-    finally:
-        _run(database.close())
-
-
-def test_task_instances_unknown_child_fails(tmp_path) -> None:
-    database = _open_db(tmp_path / "task-instances-bad-child.db")
-    try:
-        _apply(database)
-        _setup_definition(database)
-        with pytest.raises(sqlite3.IntegrityError, match="FOREIGN KEY"):
-            _insert_instance(database, definition_id=1, child_id=999)
-    finally:
-        _run(database.close())
-
-
-def test_task_instances_due_date_not_null_enforced(tmp_path) -> None:
-    database = _open_db(tmp_path / "task-instances-due-null.db")
-    try:
-        _apply(database)
-        _setup_definition(database)
-        with pytest.raises(sqlite3.IntegrityError, match="NOT NULL"):
-            _insert_instance(database, definition_id=1, due_date=None)
-    finally:
-        _run(database.close())
-
-
-def test_task_instances_generated_at_not_null_enforced(tmp_path) -> None:
-    database = _open_db(tmp_path / "task-instances-generated-null.db")
-    try:
-        _apply(database)
-        _setup_definition(database)
-        with pytest.raises(sqlite3.IntegrityError, match="NOT NULL"):
-            _insert_instance(database, definition_id=1, generated_at=None)
-    finally:
-        _run(database.close())
-
-
-# ---------------------------------------------------------------------------
-# completion_events: constraint enforcement
-# ---------------------------------------------------------------------------
-
-
-def test_completion_events_valid_user_completion_round_trips(tmp_path) -> None:
-    database = _open_db(tmp_path / "completion-events-valid.db")
-    try:
-        _apply(database)
-        _setup_definition(database)
-        instance_id = _insert_instance(database, definition_id=1)
-        event_id = _insert_event(
-            database, instance_id=instance_id, child_id=1
-        )
-        row = _run(
-            database.fetch_one(
-                "SELECT instance_id, child_id, event_type, actor_source, "
-                "actor_user_id, occurred_at, was_on_time "
-                "FROM completion_events WHERE id = ?",
-                (event_id,),
-            )
-        )
-        assert row == (
-            instance_id,
-            1,
-            "completed",
-            "user",
-            "user-1",
-            "2026-09-14T08:30:00+00:00",
-            1,
-        )
-    finally:
-        _run(database.close())
-
-
-def test_completion_events_valid_panel_completion_round_trips(tmp_path) -> None:
-    database = _open_db(tmp_path / "completion-events-panel.db")
-    try:
-        _apply(database)
-        _setup_definition(database)
-        instance_id = _insert_instance(database, definition_id=1)
-        event_id = _insert_event(
-            database,
-            instance_id=instance_id,
-            actor_source="panel",
-            actor_user_id=None,
-            was_on_time=0,
-        )
-        row = _run(
-            database.fetch_one(
-                "SELECT actor_source, actor_user_id, was_on_time "
-                "FROM completion_events WHERE id = ?",
-                (event_id,),
-            )
-        )
-        assert row == ("panel", None, 0)
-    finally:
-        _run(database.close())
-
-
-def test_completion_events_valid_uncompleted_round_trips(tmp_path) -> None:
-    database = _open_db(tmp_path / "completion-events-uncompleted.db")
-    try:
-        _apply(database)
-        _setup_definition(database)
-        instance_id = _insert_instance(database, definition_id=1)
-        event_id = _insert_event(
-            database,
-            instance_id=instance_id,
-            event_type="uncompleted",
-            actor_source="user",
-            was_on_time=_OMIT,
-        )
-        row = _run(
-            database.fetch_one(
-                "SELECT event_type, actor_source, was_on_time "
-                "FROM completion_events WHERE id = ?",
-                (event_id,),
-            )
-        )
-        assert row == ("uncompleted", "user", None)
-    finally:
-        _run(database.close())
-
-
-def test_completion_events_uncompleted_with_on_time_flag_allowed(
-    tmp_path,
-) -> None:
-    database = _open_db(tmp_path / "completion-events-uncompleted-ontime.db")
-    try:
-        _apply(database)
-        _setup_definition(database)
-        instance_id = _insert_instance(database, definition_id=1)
-        event_id = _insert_event(
-            database,
-            instance_id=instance_id,
-            event_type="uncompleted",
-            was_on_time=1,
-        )
-        row = _run(
-            database.fetch_one(
-                "SELECT was_on_time FROM completion_events WHERE id = ?",
-                (event_id,),
-            )
-        )
-        assert row == (1,)
-    finally:
-        _run(database.close())
-
-
-def test_completion_events_unknown_instance_fails(tmp_path) -> None:
-    database = _open_db(tmp_path / "completion-events-bad-instance.db")
-    try:
-        _apply(database)
-        _setup_definition(database)
-        with pytest.raises(sqlite3.IntegrityError, match="FOREIGN KEY"):
-            _insert_event(database, instance_id=999)
-    finally:
-        _run(database.close())
-
-
-def test_completion_events_unknown_child_fails(tmp_path) -> None:
-    database = _open_db(tmp_path / "completion-events-bad-child.db")
-    try:
-        _apply(database)
-        _setup_definition(database)
-        instance_id = _insert_instance(database, definition_id=1)
-        with pytest.raises(sqlite3.IntegrityError, match="FOREIGN KEY"):
-            _insert_event(database, instance_id=instance_id, child_id=999)
-    finally:
-        _run(database.close())
-
-
-@pytest.mark.parametrize("bad_event_type", ["missed", "COMPLETE", ""])
-def test_completion_events_event_type_check_enforced(
-    tmp_path, bad_event_type
-) -> None:
-    database = _open_db(tmp_path / f"completion-events-type-{hash(bad_event_type)}.db")
-    try:
-        _apply(database)
-        _setup_definition(database)
-        instance_id = _insert_instance(database, definition_id=1)
-        with pytest.raises(sqlite3.IntegrityError, match="CHECK"):
-            _insert_event(
-                database, instance_id=instance_id, event_type=bad_event_type
-            )
-    finally:
-        _run(database.close())
-
-
-@pytest.mark.parametrize("bad_source", ["kiosk", "system", "USER", ""])
-def test_completion_events_actor_source_check_enforced(
-    tmp_path, bad_source
-) -> None:
-    database = _open_db(tmp_path / f"completion-events-source-{hash(bad_source)}.db")
-    try:
-        _apply(database)
-        _setup_definition(database)
-        instance_id = _insert_instance(database, definition_id=1)
-        with pytest.raises(sqlite3.IntegrityError, match="CHECK"):
-            _insert_event(
-                database, instance_id=instance_id, actor_source=bad_source
-            )
-    finally:
-        _run(database.close())
-
-
-@pytest.mark.parametrize(
-    ("actor_source", "actor_user_id"),
-    [
-        ("user", None),  # user without id
-        ("panel", "user-1"),  # panel with id
-    ],
-)
-def test_completion_events_actor_pair_coherence_enforced(
-    tmp_path, actor_source, actor_user_id
-) -> None:
-    database = _open_db(tmp_path / f"completion-events-actor-{actor_source}.db")
-    try:
-        _apply(database)
-        _setup_definition(database)
-        instance_id = _insert_instance(database, definition_id=1)
-        with pytest.raises(sqlite3.IntegrityError, match="CHECK"):
-            _insert_event(
-                database,
-                instance_id=instance_id,
-                actor_source=actor_source,
-                actor_user_id=actor_user_id,
-            )
-    finally:
-        _run(database.close())
-
-
-@pytest.mark.parametrize("bad_was_on_time", ["abc", 1.5, 2])
-def test_completion_events_was_on_time_non_integer_or_out_of_range_fails(
-    tmp_path, bad_was_on_time
-) -> None:
-    database = _open_db(tmp_path / f"completion-events-ontime-{type(bad_was_on_time).__name__}.db")
-    try:
-        _apply(database)
-        _setup_definition(database)
-        instance_id = _insert_instance(database, definition_id=1)
-        with pytest.raises(sqlite3.IntegrityError, match="CHECK"):
-            _insert_event(
-                database, instance_id=instance_id, was_on_time=bad_was_on_time
-            )
-    finally:
-        _run(database.close())
-
-
-def test_completion_events_completed_requires_was_on_time(tmp_path) -> None:
-    database = _open_db(tmp_path / "completion-events-completed-ontime-null.db")
-    try:
-        _apply(database)
-        _setup_definition(database)
-        instance_id = _insert_instance(database, definition_id=1)
-        with pytest.raises(sqlite3.IntegrityError, match="CHECK"):
-            _insert_event(
-                database,
-                instance_id=instance_id,
-                event_type="completed",
-                was_on_time=_OMIT,
-            )
-    finally:
-        _run(database.close())
-
-
-def test_completion_events_occurred_at_not_null_enforced(tmp_path) -> None:
-    database = _open_db(tmp_path / "completion-events-occurred-null.db")
-    try:
-        _apply(database)
-        _setup_definition(database)
-        instance_id = _insert_instance(database, definition_id=1)
-        with pytest.raises(sqlite3.IntegrityError, match="NOT NULL"):
-            _insert_event(
-                database, instance_id=instance_id, occurred_at=None
-            )
-    finally:
-        _run(database.close())
-
-
-def test_completion_events_multiple_events_per_instance_allowed(
-    tmp_path,
-) -> None:
-    database = _open_db(tmp_path / "completion-events-multi.db")
-    try:
-        _apply(database)
-        _setup_definition(database)
-        instance_id = _insert_instance(database, definition_id=1)
-        _insert_event(
-            database, instance_id=instance_id, event_type="completed",
-            occurred_at="2026-09-14T08:30:00+00:00",
-        )
-        _insert_event(
-            database, instance_id=instance_id, event_type="uncompleted",
-            actor_source="user", was_on_time=1,
-            occurred_at="2026-09-14T09:00:00+00:00",
-        )
-        _insert_event(
-            database, instance_id=instance_id, event_type="completed",
-            occurred_at="2026-09-14T09:15:00+00:00",
-        )
-        row = _run(database.fetch_one("SELECT COUNT(*) FROM completion_events"))
-        assert row == (3,)
-    finally:
-        _run(database.close())
-
-
-# ---------------------------------------------------------------------------
-# Idempotence across the full eight-table v1 list
-# ---------------------------------------------------------------------------
-
-
-def test_applying_full_ddl_twice_keeps_rows(tmp_path) -> None:
-    database = _open_db(tmp_path / "idempotent-full.db")
-    try:
-        _apply(database)
-        _setup_definition(database)
-        instance_id = _insert_instance(database, definition_id=1)
-        _insert_event(database, instance_id=instance_id)
-        _apply(database)
-        counts = []
-        for table in (
-            "children",
-            "schedule_rules",
-            "task_definitions",
-            "task_instances",
-            "completion_events",
-        ):
-            row = _run(database.fetch_one(f"SELECT COUNT(*) FROM {table}"))
-            counts.append(row[0])
-        assert counts == [1, 1, 1, 1, 1]
     finally:
         _run(database.close())