From 1d91b713a1bf44aab37ffa547dfb988353f26676 Mon Sep 17 00:00:00 2001
From: Greg Colombo <greg@oxidecomputer.com>
Date: Wed, 5 Jun 2024 15:56:23 +0000
Subject: [PATCH] fix version number post-rebase

---
 nexus/db-model/src/schema_versions.rs   | 2 +-
 nexus/tests/integration_tests/schema.rs | 6 +++---
 schema/crdb/dbinit.sql                  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nexus/db-model/src/schema_versions.rs b/nexus/db-model/src/schema_versions.rs
index 1715fecd36..09039c952b 100644
--- a/nexus/db-model/src/schema_versions.rs
+++ b/nexus/db-model/src/schema_versions.rs
@@ -17,7 +17,7 @@ use std::collections::BTreeMap;
 ///
 /// This must be updated when you change the database schema.  Refer to
 /// schema/crdb/README.adoc in the root of this repository for details.
-+pub const SCHEMA_VERSION: SemverVersion = SemverVersion::new(70, 0, 0);
+pub const SCHEMA_VERSION: SemverVersion = SemverVersion::new(70, 0, 0);
 
 /// List of all past database schema versions, in *reverse* order
 ///
diff --git a/nexus/tests/integration_tests/schema.rs b/nexus/tests/integration_tests/schema.rs
index 85d67770c9..bb067c2ed8 100644
--- a/nexus/tests/integration_tests/schema.rs
+++ b/nexus/tests/integration_tests/schema.rs
@@ -1229,7 +1229,7 @@ fn after_37_0_1(client: &Client) -> BoxFuture<'_, ()> {
     })
 }
 
-fn before_69_0_0(client: &Client) -> BoxFuture<'_, ()> {
+fn before_70_0_0(client: &Client) -> BoxFuture<'_, ()> {
     Box::pin(async move {
         client
             .batch_execute(&format!(
@@ -1270,7 +1270,7 @@ fn before_69_0_0(client: &Client) -> BoxFuture<'_, ()> {
     })
 }
 
-fn after_69_0_0(client: &Client) -> BoxFuture<'_, ()> {
+fn after_70_0_0(client: &Client) -> BoxFuture<'_, ()> {
     Box::pin(async {
         let rows = client
             .query("SELECT state FROM instance ORDER BY id", &[])
@@ -1339,7 +1339,7 @@ fn get_migration_checks() -> BTreeMap<SemverVersion, DataMigrationFns> {
     );
     map.insert(
         SemverVersion(semver::Version::parse("69.0.0").unwrap()),
-        DataMigrationFns { before: Some(before_69_0_0), after: after_69_0_0 },
+        DataMigrationFns { before: Some(before_70_0_0), after: after_70_0_0 },
     );
 
     map
diff --git a/schema/crdb/dbinit.sql b/schema/crdb/dbinit.sql
index 72ac9974d3..7bda66c5f2 100644
--- a/schema/crdb/dbinit.sql
+++ b/schema/crdb/dbinit.sql
@@ -4075,7 +4075,7 @@ INSERT INTO omicron.public.db_metadata (
     version,
     target_version
 ) VALUES
-    (TRUE, NOW(), NOW(), '69.0.0', NULL)
+    (TRUE, NOW(), NOW(), '70.0.0', NULL)
 ON CONFLICT DO NOTHING;
 
 COMMIT;