Skip to content

fix(db): join the two migration branches left on main - #2567

Merged
Makisuo merged 1 commit into
mainfrom
fix/merge-migration-heads
Nov 13, 2026
Merged

Makisuo merged 1 commit into
mainfrom
fix/merge-migration-heads

fix(db): join the two migration branches left on main

ee2d5f4
Select commit
Loading
Failed to load commit list.
Maple Review Bot / Maple / review succeeded Nov 13, 2026 in 39s

Confidence 10/10 · No issues found

🟢 Confidence 10/10 · safe to merge. Empty-body merge migration whose snapshot I diffed as the exact union of both parents, restoring the existing parity test.
no findings · tests covered · risk high

Adds a custom merge migration (20261113150230_merge_cost_connections_audit_detection) with no SQL that joins the cost_connections and alert_rules_audit_detection heads, restoring the single-head invariant parity.test.ts enforces. The snapshot is the exact union of both parent snapshots, so it is safe to merge.

  • 20261113150230_merge_cost_connections_audit_detection has both prior heads as prevIds and an empty migration body

Before merge

What was checked
  • prevIds are exactly the ids of 20261112221939_cost_connections and 20261113122938_alert_rules_audit_detection, both of which descend from 67bf09ed83
  • Entity-by-entity diff of the three snapshots: the merge adds nothing beyond the union and drops nothing (only alert_rules column position shifts from the two new audit columns)
  • alert_rules column order in the merged snapshot matches packages/db/src/tables/alerts.ts:89-95, so a fresh db:generate finds no schema change

ee2d5f4 · Reply "won't fix" to dismiss a finding, or mention @maple-review-bot to ask about one.