Schema migrations: detect and reject conflicting schema names #4531
Comments
Merged
karencfv
pushed a commit
to karencfv/omicron
that referenced
this issue
Nov 21, 2023
This was accidentally merged in with 11.0.0 in oxidecomputer#3804 Fixes oxidecomputer#4530 (but see oxidecomputer#4531 for followup work)
sunshowers
pushed a commit
that referenced
this issue
Nov 22, 2023
Fixes #4531. If I cherry-pick these changes onto `main` just prior to #4529 (i.e., when the `11.0.0` directory contained upsql files for both 10.0.0 and 11.0.0), the `dbinit_equals_sum_of_all_up` integration test fails as desired: ``` thread 'integration_tests::schema::dbinit_equals_sum_of_all_up' panicked at nexus/tests/integration_tests/schema.rs:133:58: called `Result::unwrap()` on an `Err` value: "invalid `up*.sql` combination: /data/github/omicron/nexus/../schema/crdb/11.0.0/up01.sql, /data/github/omicron/nexus/../schema/crdb/11.0.0/up1.sql" ```
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
One symptom of #4530 was that we had a migration directory containing both
up1.sqlandup01.sql(and additional higher numbers), caused by incorrect git merge / move operations while trying to land two unrelated PRs that both added new migrations. We should detect this, ideally at CI test time, to at least catch "this directory seems to contain two different sets of migrations".The text was updated successfully, but these errors were encountered: