tyler/fix-on-conflict

Author: cloutiertyler

crates/cli/src/subcommands/dev.rs

@@ -413,15 +413,14 @@ async fn generate_build_and_publish(
         ClearMode::OnConflict => "on-conflict",
     };
     let mut publish_args = vec![
-        "publish",
-        database_name,
-        "--project-path",
-        project_path_str,
-        "--yes",
-        "--delete-data",
-        clear_flag,
+        "publish".to_string(),
+        database_name.to_string(),
+        "--project-path".to_string(),
+        project_path_str.to_string(),
+        "--yes".to_string(),
+        format!("--delete-data={}", clear_flag),
     ];
-    publish_args.extend_from_slice(&["--server", server]);
+    publish_args.extend_from_slice(&["--server".to_string(), server.to_string()]);
 
     let publish_cmd = publish::cli();
     let publish_matches = publish_cmd

crates/cli/src/subcommands/publish.rs

@@ -175,46 +175,26 @@ pub async fn exec(mut config: Config, args: &ArgMatches) -> Result<(), anyhow::E
         let domain = percent_encoding::percent_encode(name_or_identity.as_bytes(), encode_set);
         let mut builder = client.put(format!("{database_host}/v1/database/{domain}"));
 
-        if clear_database != ClearMode::Always {
-            builder = apply_pre_publish_if_needed(
-                builder,
-                &client,
-                &database_host,
-                &domain.to_string(),
-                host_type,
-                &program_bytes,
-                &auth_header,
-                clear_database,
-                force_break_clients,
-                force,
-            )
-            .await?;
-        }
+        builder = apply_pre_publish_if_needed(
+            builder,
+            &client,
+            &database_host,
+            name_or_identity,
+            &domain.to_string(),
+            host_type,
+            &program_bytes,
+            &auth_header,
+            clear_database,
+            force_break_clients,
+            force,
+        )
+        .await?;
 
         builder
     } else {
         client.post(format!("{database_host}/v1/database"))
     };
 
-    if clear_database == ClearMode::Always || clear_database == ClearMode::OnConflict {
-        // Note: `name_or_identity` should be set, because it is `required` in the CLI arg config.
-        println!(
-            "This will DESTROY the current {} module, and ALL corresponding data.",
-            name_or_identity.unwrap()
-        );
-        if !y_or_n(
-            force,
-            format!(
-                "Are you sure you want to proceed? [deleting {}]",
-                name_or_identity.unwrap()
-            )
-            .as_str(),
-        )? {
-            println!("Aborting");
-            return Ok(());
-        }
-        builder = builder.query(&[("clear", true)]);
-    }
     if let Some(n) = num_replicas {
         eprintln!("WARNING: Use of unstable option `--num-replicas`.\n");
         builder = builder.query(&[("num_replicas", *n)]);
@@ -334,6 +314,7 @@ async fn apply_pre_publish_if_needed(
     mut builder: reqwest::RequestBuilder,
     client: &reqwest::Client,
     base_url: &str,
+    name_or_identity: &str,
     domain: &String,
     host_type: &str,
     program_bytes: &[u8],
@@ -367,6 +348,17 @@ async fn apply_pre_publish_if_needed(
                     println!("{}", manual.reason);
                     println!("Proceeding with database clear due to --delete-data=always.");
                 }
+                println!(
+                    "This will DESTROY the current {} module, and ALL corresponding data.",
+                    name_or_identity
+                );
+                if !y_or_n(
+                    force,
+                    format!("Are you sure you want to proceed? [deleting {}]", name_or_identity).as_str(),
+                )? {
+                    anyhow::bail!("Aborting");
+                }
+                builder = builder.query(&[("clear", true)]);
             }
             PrePublishResult::AutoMigrate(auto) => {
                 println!("{}", auto.migrate_plan);