Skip to content

fix(migrations): merge the two Alembic heads#3

Merged
mxatmx merged 1 commit into
mainfrom
fix/alembic-merge-heads
Jun 14, 2026
Merged

fix(migrations): merge the two Alembic heads#3
mxatmx merged 1 commit into
mainfrom
fix/alembic-merge-heads

Conversation

@mxatmx

@mxatmx mxatmx commented Jun 14, 2026

Copy link
Copy Markdown
Owner

The fork has two Alembic migration heads:

  • 2b8f88aa610f (reconcile_squash_schema_with_legacy) — the branch that also carries a1bc96e68661, which adds person.is_guest
  • a2b3c4d5e6f7 (add_person_links_for_software_and_hardware) — the fork feature branch

With two heads, alembic upgrade head fails (Multiple head revisions are present). The upgrade aborts, so the reconcile branch never applies and the app crashes at runtime with column person.is_guest does not exist.

This adds an empty merge migration (d4e5f6a7b8c9) whose down_revision is both heads, collapsing the graph to a single head. It makes no schema changes itself — it just lets alembic upgrade head apply both branches (including is_guest).

After merging, redeploy / run zou upgrade-db to apply the chain.

The fork had two migration heads (2b8f88aa610f reconcile-squash and
a2b3c4d5e6f7 person software/hardware links), which makes 'alembic upgrade
head' fail with 'Multiple head revisions are present'. Because the upgrade
aborts, the schema from the reconcile branch never applies and the app crashes
at runtime with 'column person.is_guest does not exist'.

Add an empty merge migration joining both heads so the upgrade can run and
apply both branches. No schema change of its own.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@mxatmx
mxatmx merged commit 1c77ec7 into main Jun 14, 2026
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant