bvandeusen
c46a4a7709
CI & Build / Build now, or wait for Android? (push) Successful in 2s
CI & Build / Python lint (push) Successful in 3s
CI & Build / TypeScript typecheck (push) Successful in 7s
CI & Build / Build & push image (push) Skipped
Desktop (Tauri) / Tauri desktop (Linux) (push) Failing after 9s
Desktop (Tauri) / Windows installer (cross-compiled) (push) Failing after 8s
Desktop (Tauri) / Update manifest (push) Skipped
CI & Build / Python tests (push) Successful in 13s
Android / Kotlin + Rust (APK) (push) Failing after 1m43s
`kind` was never a type. A plain TEXT column with no enum and no CHECK behind
it, compared against a hardcoded ("text", "list") tuple in six places;
`note_items` was always an ordinary child table keyed by note_id; serialization
already emitted `items` whatever the kind; and the Android editor already
toggled between the two losslessly, saying so in a comment. The storage has
modelled "a body plus optional checkable items" the whole time. This deletes the
gates that forbade it.
Every surface: the create/PATCH gates, the ?kind= filter and its saved-filter
facet, the three import/export branches, the column (alembic 0025); the core's
`kind` field, its SQLite column (user_version 6), the sync wire, push and pull;
the FFI records and `NoteEdit::Kind`; and on Android `NoteKind.kt`, `DraftKind`,
the compose sheet's Note/List switch, and the branches in the card, the editor
and the chrome.
The editor's note⇄list toggle becomes "Add a checklist" — on both the web and
Android. It is not a conversion any more: nothing moves, nothing is swapped, the
body stays exactly where it is and the note gains somewhere to put items. The
card renders both, in order.
Two things that fell out of the merge rather than being aimed at:
- The Keep importer was DISCARDING `textContent` whenever a note also had
`listContent`, because the target could only hold one. Both survive now, and
the test says so.
- Markdown export wrote the body OR the checklist. It writes both.
Protocol goes to v2, floor included: dropping a field a v1 client sends and
expects back is breaking. `title` leaves in step 3 and lands in the same
generation, so it needs no further bump. This is the change that will make the
0.1.227 build on the operator's phone refuse to sync — the in-app updater is
independent of the handshake and remains the recovery path.
The V1 SQLite schema deliberately KEEPS the kind column. V1 is the historical
schema and every later block alters it, so removing it there would make a fresh
database run V1 without the column and then v6's DROP COLUMN against a column
that never existed — "no such column: kind" on every new install.
36 lines
1.3 KiB
Python
36 lines
1.3 KiB
Python
"""drop notes.kind — a checklist is something a note HAS (M13 step 2)
|
|
|
|
Revision ID: 0025
|
|
Revises: 0024
|
|
Create Date: 2026-08-22
|
|
|
|
`kind` was never a type: a plain TEXT column with no enum and no CHECK, compared
|
|
against a hardcoded ("text", "list") tuple in six places. `note_items` was always an
|
|
ordinary child table keyed by note_id, serialization always emitted `items` whatever
|
|
the kind, and the Android editor already toggled between the two losslessly. The
|
|
storage has modelled "a body plus optional checkable items" the whole time; only the
|
|
gates forbade it.
|
|
|
|
Nothing is lost. Items were already rows in their own table, and a note that was
|
|
`kind = 'list'` keeps every one of them — it just stops being a different sort of
|
|
thing from the note next to it.
|
|
"""
|
|
from alembic import op
|
|
import sqlalchemy as sa
|
|
|
|
revision = "0025"
|
|
down_revision = "0024"
|
|
branch_labels = None
|
|
depends_on = None
|
|
|
|
|
|
def upgrade() -> None:
|
|
op.drop_column("notes", "kind")
|
|
|
|
|
|
def downgrade() -> None:
|
|
# server_default so existing rows get a value; every note comes back as 'text',
|
|
# which is right — a restored note with items would previously have hidden its
|
|
# body, and there is no record of which ones were once lists.
|
|
op.add_column("notes", sa.Column("kind", sa.Text(), nullable=False, server_default="text"))
|