fix: Existing soft-deleted schema can be hard-deleted

influxdb3/tests/cli/api.rs

@@ -255,27 +255,41 @@ impl ShowDatabasesQuery<'_> {
 pub struct DeleteDatabaseQuery<'a> {
     server: &'a TestServer,
     name: String,
+    hard_delete: Option<String>,
 }
 
 impl TestServer {
     pub fn delete_database(&self, name: impl Into<String>) -> DeleteDatabaseQuery<'_> {
         DeleteDatabaseQuery {
             server: self,
             name: name.into(),
+            hard_delete: None,
         }
     }
 }
 
 impl DeleteDatabaseQuery<'_> {
+    pub fn with_hard_delete(mut self, when: impl Into<String>) -> Self {
+        self.hard_delete = Some(when.into());
+        self
+    }
+
     pub fn run(self) -> Result<String> {
+        let mut args = vec![self.name.as_str()];
+
+        if let Some(hard_delete) = &self.hard_delete {
+            args.push("--hard-delete");
+            args.push(hard_delete);
+        }
+
         self.server.run_with_confirmation(
             vec![
                 "delete",
                 "database",
                 "--tls-ca",
                 "../testing-certs/rootCA.pem",
             ],
-            &[self.name.as_str()],
+            &args,
         )
     }
 }
@@ -364,6 +378,7 @@ pub struct DeleteTableQuery<'a> {
     server: &'a TestServer,
     db_name: String,
     table_name: String,
+    hard_delete: Option<String>,
 }
 
 impl TestServer {
@@ -376,20 +391,32 @@ impl TestServer {
             server: self,
             db_name: db_name.into(),
             table_name: table_name.into(),
+            hard_delete: None,
         }
     }
 }
 
 impl DeleteTableQuery<'_> {
+    pub fn with_hard_delete(mut self, when: impl Into<String>) -> Self {
+        self.hard_delete = Some(when.into());
+        self
+    }
+
     pub fn run(self) -> Result<String> {
-        let args = vec![
+        let mut args = vec![
             self.table_name.as_str(),
             "--database",
             self.db_name.as_str(),
-            "--tls-ca",
-            "../testing-certs/rootCA.pem",
         ];
 
+        if let Some(hard_delete) = &self.hard_delete {
+            args.push("--hard-delete");
+            args.push(hard_delete);
+        }
+
+        args.push("--tls-ca");
+        args.push("../testing-certs/rootCA.pem");
+
         self.server
             .run_with_confirmation(vec!["delete", "table"], &args)
     }