upgrade smoketests

crates/core/src/config.rs

@@ -54,39 +54,56 @@ impl MetadataFile {
         path.write(self.to_string())
     }
 
-    /// Check if this meta file is compatible with the default meta
-    /// file of a just-started database, and if so return the metadata
-    /// to write back to the file.
-    ///
-    /// `self` is the metadata file read from a database, and current is
-    /// the default metadata file that the active database version would
-    /// right to a new database.
-    pub fn check_compatibility_and_update(mut self, current: Self) -> anyhow::Result<Self> {
+    fn check_compatibility(previous: &Self, current: &Self) -> anyhow::Result<()> {
         anyhow::ensure!(
-            self.edition == current.edition,
+            previous.edition == current.edition,
             "metadata.toml indicates that this database is from a different \
-             edition of SpacetimeDB (running {:?}, but this database is {:?})",
+            edition of SpacetimeDB (running {:?}, but this database is {:?})",
             current.edition,
-            self.edition,
+            previous.edition,
         );
+
+        // Special-case: SpacetimeDB 2.x can run 1.x databases.
+        if previous.version.major == 1 && current.version.major == 2 {
+            return Ok(());
+        }
+
         let cmp = semver::Comparator {
             op: semver::Op::Caret,
-            major: self.version.major,
-            minor: Some(self.version.minor),
+            major: previous.version.major,
+            minor: Some(previous.version.minor),
             patch: None,
-            pre: self.version.pre.clone(),
+            pre: previous.version.pre.clone(),
         };
-        anyhow::ensure!(
-            cmp.matches(&current.version),
-            "metadata.toml indicates that this database is from a newer, \
-             incompatible version of SpacetimeDB (running {:?}, but this \
-             database is from {:?})",
+
+        if cmp.matches(&current.version) {
+            return Ok(());
+        }
+
+        let relation = if previous.version > current.version {
+            "a newer, incompatible"
+        } else if previous.version < current.version {
+            "an older, incompatible"
+        } else {
+            "an incompatible"
+        };
+        anyhow::bail!(
+            "metadata.toml indicates that you are running {relation} database. Your running version is {:?}, but the database on disk is from {:?}.",
             current.version,
-            self.version,
+            previous.version,
         );
-        // bump the version in the file only if it's being run in a newer
-        // database -- this won't do anything until we release v1.1.0, since we
-        // set current.version.patch to 0 in Self::new() due to a bug in v1.0.0
+    }
+
+    /// Check if this meta file is compatible with the default meta
+    /// file of a just-started database, and if so return the metadata
+    /// to write back to the file.
+    ///
+    /// `self` is the metadata file read from a database, and current is
+    /// the default metadata file that the active database version would
+    /// right to a new database.
+    pub fn check_compatibility_and_update(mut self, current: Self) -> anyhow::Result<Self> {
+        Self::check_compatibility(&self, &current)?;
+        // bump the version in the file only if it's being run in a newer database.
         self.version = std::cmp::max(self.version, current.version);
         Ok(self)
     }
@@ -184,5 +201,15 @@ mod tests {
         mkmeta(2, 0, 0)
             .check_compatibility_and_update(mkmeta(1, 3, 5))
             .unwrap_err();
+        assert_eq!(
+            mkmeta(1, 12, 0)
+                .check_compatibility_and_update(mkmeta(2, 0, 0))
+                .unwrap()
+                .version,
+            mkver(2, 0, 0)
+        );
+        mkmeta(2, 0, 0)
+            .check_compatibility_and_update(mkmeta(3, 0, 0))
+            .unwrap_err();
     }
 }