fix schema collision (#4580)

oxidecomputer · Nov 30, 2023 · a04f5e3 · a04f5e3
1 parent 3555b5d
commit a04f5e3
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 2 deletions.
diff --git a/nexus/db-model/src/schema.rs b/nexus/db-model/src/schema.rs
@@ -1301,7 +1301,7 @@ table! {
 ///
 /// This should be updated whenever the schema is changed. For more details,
 /// refer to: schema/crdb/README.adoc
-pub const SCHEMA_VERSION: SemverVersion = SemverVersion::new(16, 0, 0);
+pub const SCHEMA_VERSION: SemverVersion = SemverVersion::new(17, 0, 0);
 
 allow_tables_to_appear_in_same_query!(
     system_update,

diff --git a/schema/crdb/15.0.0/up01.sql → schema/crdb/16.0.0/up01.sql b/schema/crdb/15.0.0/up01.sql → schema/crdb/16.0.0/up01.sql
diff --git a/schema/crdb/15.0.0/up02.sql → schema/crdb/16.0.0/up02.sql b/schema/crdb/15.0.0/up02.sql → schema/crdb/16.0.0/up02.sql
diff --git a/schema/crdb/16.0.0/up1.sql → schema/crdb/17.0.0/up1.sql b/schema/crdb/16.0.0/up1.sql → schema/crdb/17.0.0/up1.sql
diff --git a/schema/crdb/dbinit.sql b/schema/crdb/dbinit.sql
@@ -3009,7 +3009,7 @@ INSERT INTO omicron.public.db_metadata (
     version,
     target_version
 ) VALUES
-    ( TRUE, NOW(), NOW(), '16.0.0', NULL)
+    ( TRUE, NOW(), NOW(), '17.0.0', NULL)
 ON CONFLICT DO NOTHING;
 
 COMMIT;