Re-timestamp migrations due to 4.79 cherry pick. - #37993
Merged
Merged
Conversation
Member
|
This looks good but would you mind dropping something into help-engineering to make devs and particularly infra aware so the qa-wolf instances can be fixed up(they'll likely need some DB surgery) |
JordanMontgomery
approved these changes
Jan 7, 2026
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #37993 +/- ##
=======================================
Coverage 64.14% 64.14%
=======================================
Files 2385 2385
Lines 190035 190064 +29
Branches 8391 8391
=======================================
+ Hits 121896 121923 +27
- Misses 56884 56885 +1
- Partials 11255 11256 +1
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
oleksandrd-flamingo
added a commit
to flamingo-stack/fleetmdm
that referenced
this pull request
Jun 17, 2026
Upstream PR fleetdm#37993 re-timestamped two migrations to round timestamps (20251229000010 AddSoftwareAutoUpdateTable, 20251229000020 AddHostMDMAppleBootstrapPackagesSkipped). The fork already carries its own copies of these under the original timestamps (20251219201524, 20251222163753) which are idempotent and already applied on existing tenants. The merge kept both, but upstream's copies did bare, non-idempotent ALTER TABLE ... ADD COLUMN, so 'fleet prepare db' aborted mid-migration with 'Duplicate column name' on any DB that already ran the fork's copies (i.e. every existing tenant). Guard both with the fork's existing columnExists() helper, matching the pattern already used by the fork-timestamped copies. No-ops on existing tenants (column present), still creates the schema on fresh DBs. Verified: dumped a real tenant DB, restored locally, ran prepare db -> all ~90 upstream + data + openframe migrations complete; server boots clean in FLEET_OPENFRAME_MODE.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Related issue: Resolves #30876