Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move instance/VMM table schema upgrade to version 7.0.0 #4270

Merged
merged 1 commit into from
Oct 12, 2023

Conversation

gjcolombo
Copy link
Contributor

The instance/VMM table schema change was slated to be 6.0.0 in the original version of its pull request. That version was then added by a separate PR, but this didn't cause a merge conflict because the instance/VMM upgrade used an extra "0" in its schema upgrade files (for fear that there might be more than nine of them and that the leading 0 would be necessary to ensure they had the correct lexographical ordering).

The schema changes don't conflict with each other, so everything (probably) works fine, but having two logically separate updates in one version is at the very least aesthetically displeasing.

Move the instance schema upgrade to version 7.0.0. Rename the files to remove the leading 0 in their numbers, since that turned out not to be needed.

Tested via cargo tests (there are no other functional or schema changes beyond renaming and updating version constants).

The instance/VMM table schema change was slated to be 6.0.0 in the original
version of its pull request. That version was then added by a separate PR, but
this didn't cause a merge conflict because the instance/VMM upgrade used an
extra "0" in its schema upgrade files (for fear that there might be more than
nine of them and that the leading 0 would be necessary to ensure they had the
correct lexographical ordering).

The schema changes don't conflict with each other, so everything actually works
fine, but having two logically separate updates in one version is at the very
least aesthetically displeasing.

Move the instance schema upgrade to version 7.0.0. Rename the files to remove
the leading 0 in their numbers, since that turned out not to be needed.

Tested via cargo tests (there are no other functional or schema changes beyond
renaming and updating version constants).
@gjcolombo gjcolombo marked this pull request as ready for review October 12, 2023 16:55
@gjcolombo gjcolombo enabled auto-merge (squash) October 12, 2023 16:59
@gjcolombo gjcolombo merged commit 7e88bdf into main Oct 12, 2023
@gjcolombo gjcolombo deleted the gjcolombo/schema-fix branch October 12, 2023 18:06
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.

2 participants