Fixed smoke tests

Author: cloutiertyler

crates/bindings/README.md

@@ -578,7 +578,7 @@ The following changes are forbidden without a manual migration:
 - ❌ **Changing whether a table is used for [scheduling](#scheduled-reducers).** <!-- TODO: update this if we ever actually implement it... -->
 - ❌ **Adding `#[unique]` or `#[primary_key]` constraints.** This could result in existing tables being in an invalid state.
 
-Currently, manual migration support is limited. The `spacetime publish --clear-database <DATABASE_IDENTITY>` command can be used to **COMPLETELY DELETE** and reinitialize your database, but naturally it should be used with EXTREME CAUTION.
+Currently, manual migration support is limited. The `spacetime publish --delete-data <DATABASE_IDENTITY>` command can be used to **COMPLETELY DELETE** and reinitialize your database, but naturally it should be used with EXTREME CAUTION.
 
 [macro library]: https://github.com/clockworklabs/SpacetimeDB/tree/master/crates/bindings-macro
 [module library]: https://github.com/clockworklabs/SpacetimeDB/tree/master/crates/lib

crates/cli/src/common_args.rs

@@ -48,6 +48,7 @@ pub fn confirmed() -> Arg {
 pub fn clear_database() -> Arg {
     Arg::new("clear-database")
         .long("delete-data")
+        .alias("clear-database")
         .short('c')
         .num_args(0..=1)
         .value_parser(value_parser!(ClearMode))

crates/cli/src/subcommands/dev.rs

@@ -415,7 +415,7 @@ async fn generate_build_and_publish(
         "--project-path",
         project_path_str,
         "--yes",
-        "--clear-database",
+        "--delete-data",
         clear_flag,
     ];
     publish_args.extend_from_slice(&["--server", server]);

crates/cli/src/subcommands/publish.rs

@@ -354,15 +354,19 @@ async fn apply_pre_publish_if_needed(
     {
         match pre {
             PrePublishResult::ManualMigrate(manual) => {
-                if matches!(clear_database, ClearMode::OnConflict) {
+                if clear_database == ClearMode::OnConflict {
                     println!("{}", manual.reason);
                     println!("Proceeding with database clear due to --delete-data=on-conflict.");
                 }
-                if matches!(clear_database, ClearMode::Never) {
+                if clear_database == ClearMode::Never {
                     println!("{}", manual.reason);
                     println!("Aborting publish due to required manual migration.");
                     anyhow::bail!("Aborting because publishing would require manual migration or deletion of data and --delete-data was not specified.");
                 }
+                if clear_database == ClearMode::Always {
+                    println!("{}", manual.reason);
+                    println!("Proceeding with database clear due to --delete-data=always.");
+                }
             }
             PrePublishResult::AutoMigrate(auto) => {
                 println!("{}", auto.migrate_plan);

docs/docs/06-Server Module Languages/04-csharp-reference.md

@@ -1003,7 +1003,7 @@ The following changes are forbidden without a manual migration:
 - ❌ **Changing whether a table is used for [scheduling](#scheduled-reducers).** <!-- TODO: update this if we ever actually implement it... -->
 - ❌ **Adding `[Unique]` or `[PrimaryKey]` constraints.** This could result in existing tables being in an invalid state.
 
-Currently, manual migration support is limited. The `spacetime publish --clear-database <DATABASE_IDENTITY>` command can be used to **COMPLETELY DELETE** and reinitialize your database, but naturally it should be used with EXTREME CAUTION.
+Currently, manual migration support is limited. The `spacetime publish --delete-data <DATABASE_IDENTITY>` command can be used to **COMPLETELY DELETE** and reinitialize your database, but naturally it should be used with EXTREME CAUTION.
 
 ## Other infrastructure
 

docs/docs/06-Server Module Languages/06-Typescript-reference.md

@@ -573,7 +573,7 @@ The following deletes all data stored in the database.
 To fully reset your database and clear all data, run:
 
 ```bash
-spacetime publish --clear-database <DATABASE_NAME>
+spacetime publish --delete-data <DATABASE_NAME>
 # or
 spacetime publish -c <DATABASE_NAME>
 ```

smoketests/tests/modules.py

@@ -65,7 +65,7 @@ class UpdateModule(Smoketest):
 
 
     def test_module_update(self):
-        """Test publishing a module without the --clear-database option"""
+        """Test publishing a module without the --delete-data option"""
 
         name = random_string()
 
@@ -88,7 +88,7 @@ def test_module_update(self):
         self.write_module_code(self.MODULE_CODE_B)
         with self.assertRaises(CalledProcessError) as cm:
             self.publish_module(name, clear=False)
-        self.assertIn("Error: Pre-publish check failed", cm.exception.stderr)
+        self.assertIn("Error: Aborting because publishing would require manual migration", cm.exception.stderr)
 
         # Check that the old module is still running by calling say_hello
         self.call("say_hello")

smoketests/tests/permissions.py

@@ -54,10 +54,9 @@ def test_publish(self):
         self.new_identity()
 
         with self.assertRaises(Exception):
-            # TODO: This raises for the wrong reason - `--clear-database` doesn't exist anymore!
-            self.spacetime("publish", self.database_identity, "--project-path", self.project_path, "--clear-database", "--yes")
+            self.spacetime("publish", self.database_identity, "--project-path", self.project_path, "--delete-data", "--yes")
 
-        # Check that this holds without `--clear-database`, too.
+        # Check that this holds without `--delete-data`, too.
         with self.assertRaises(Exception):
             self.spacetime("publish", self.database_identity, "--project-path", self.project_path, "--yes")