Fix failing migration by conditionally deleting old constraint#33878
Merged
Conversation
JordanMontgomery
temporarily deployed
to
Docker Hub
GitHub Actions
Inactive
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #33878 +/- ##
==========================================
+ Coverage 64.13% 64.15% +0.01%
==========================================
Files 2052 2052
Lines 206102 206257 +155
Branches 6788 6788
==========================================
+ Hits 132183 132318 +135
- Misses 63541 63544 +3
- Partials 10378 10395 +17
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:
|
JordanMontgomery
temporarily deployed
to
Docker Hub
GitHub Actions
Inactive
JordanMontgomery
had a problem deploying
to
Docker Hub
GitHub Actions
Failure
JordanMontgomery
temporarily deployed
to
Docker Hub
GitHub Actions
Inactive
mna
reviewed
Oct 6, 2025
| } | ||
|
|
||
| // our mysql version at the time this constraint was added did not support CHECK constraints so this may or may not exist for us | ||
| // to delete, so we create the new wider constraint above then, optionally, delete the older narrow one |
Contributor
There was a problem hiding this comment.
Wow that's a great catch and something to keep in mind... I knew mysql 5 did not enforce those, I hadn't realized it didn't even create them.
mna
previously approved these changes
Oct 6, 2025
JordanMontgomery
temporarily deployed
to
Docker Hub
GitHub Actions
Inactive
mna
approved these changes
Oct 6, 2025
JordanMontgomery
added a commit
that referenced
this pull request
Oct 6, 2025
<!-- Add the related story/sub-task/bug number, like Resolves #123, or remove if NA --> **Related issue:** Resolves #33876 Modifies the migration to check for the old constraint before deleting it in case it was created on mysql 5.7 No changes file since this is an unreleased bug # Checklist for submitter If some of the following don't apply, delete the relevant line. - [x] Input data is properly validated, `SELECT *` is avoided, SQL injection is prevented (using placeholders for values in statements) ## Testing - [x] Added/updated automated tests - [x] Where appropriate, [automated tests simulate multiple hosts and test for host isolation](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/reference/patterns-backend.md#unit-testing) (updates to one hosts's records do not affect another) - [x] QA'd all new/changed functionality manually For unreleased bug fixes in a release candidate, one of: - [x] Confirmed that the fix is not expected to adversely impact load test results ## Database migrations - [x] Checked table schema to confirm autoupdate - [x] Checked schema for all modified table for columns that will auto-update timestamps during migration. - [x] Confirmed that updating the timestamps is acceptable, and will not cause unwanted side effects. - [x] Ensured the correct collation is explicitly set for character columns (`COLLATE utf8mb4_unicode_ci`).
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 #33876
Modifies the migration to check for the old constraint before deleting it in case it was created on mysql 5.7
No changes file since this is an unreleased bug
Checklist for submitter
If some of the following don't apply, delete the relevant line.
SELECT *is avoided, SQL injection is prevented (using placeholders for values in statements)Testing
Added/updated automated tests
Where appropriate, automated tests simulate multiple hosts and test for host isolation (updates to one hosts's records do not affect another)
QA'd all new/changed functionality manually
For unreleased bug fixes in a release candidate, one of:
Database migrations
COLLATE utf8mb4_unicode_ci).