From a04f5e387d74ef445db9c217f54cead1f5668cf1 Mon Sep 17 00:00:00 2001
From: Ryan Goodfellow <ryan.goodfellow@oxide.computer>
Date: Wed, 29 Nov 2023 18:23:01 -0800
Subject: [PATCH] fix schema collision (#4580)

---
 nexus/db-model/src/schema.rs            | 2 +-
 schema/crdb/{15.0.0 => 16.0.0}/up01.sql | 0
 schema/crdb/{15.0.0 => 16.0.0}/up02.sql | 0
 schema/crdb/{16.0.0 => 17.0.0}/up1.sql  | 0
 schema/crdb/dbinit.sql                  | 2 +-
 5 files changed, 2 insertions(+), 2 deletions(-)
 rename schema/crdb/{15.0.0 => 16.0.0}/up01.sql (100%)
 rename schema/crdb/{15.0.0 => 16.0.0}/up02.sql (100%)
 rename schema/crdb/{16.0.0 => 17.0.0}/up1.sql (100%)

diff --git a/nexus/db-model/src/schema.rs b/nexus/db-model/src/schema.rs
index 7d4ae241aa..be345032ac 100644
--- 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 b/schema/crdb/16.0.0/up01.sql
similarity index 100%
rename from schema/crdb/15.0.0/up01.sql
rename to schema/crdb/16.0.0/up01.sql
diff --git a/schema/crdb/15.0.0/up02.sql b/schema/crdb/16.0.0/up02.sql
similarity index 100%
rename from schema/crdb/15.0.0/up02.sql
rename to schema/crdb/16.0.0/up02.sql
diff --git a/schema/crdb/16.0.0/up1.sql b/schema/crdb/17.0.0/up1.sql
similarity index 100%
rename from schema/crdb/16.0.0/up1.sql
rename to schema/crdb/17.0.0/up1.sql
diff --git a/schema/crdb/dbinit.sql b/schema/crdb/dbinit.sql
index 8a34c09bc1..f4caa2a4e6 100644
--- 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;