Merge pull request #254 from LemmyNet/main

[pull] master from LemmyNet:main

crates/db_schema/src/schema_setup.rs

@@ -20,7 +20,7 @@ use diesel::{
 use diesel_migrations::MigrationHarness;
 use lemmy_utils::{error::LemmyResult, settings::SETTINGS};
 use std::time::Instant;
-use tracing::log::debug;
+use tracing::debug;
 
 diesel::table! {
   pg_namespace (nspname) {
@@ -52,6 +52,7 @@ struct MigrationHarnessWrapper<'a> {
   conn: &'a mut PgConnection,
   #[cfg(test)]
   diff_checked_migration_name: Option<String>,
+  options: &'a Options,
 }
 
 impl MigrationHarnessWrapper<'_> {
@@ -67,7 +68,7 @@ impl MigrationHarnessWrapper<'_> {
       .map(|d| d.to_string())
       .unwrap_or_default();
     let name = migration.name();
-    debug!("{duration} run {name}");
+    self.options.print(&format!("{duration} run {name}"));
 
     result
   }
@@ -112,7 +113,7 @@ impl MigrationHarness<Pg> for MigrationHarnessWrapper<'_> {
       .map(|d| d.to_string())
       .unwrap_or_default();
     let name = migration.name();
-    debug!("{duration} revert {name}");
+    self.options.print(&format!("{duration} revert {name}"));
 
     result
   }
@@ -128,6 +129,7 @@ pub struct Options {
   enable_diff_check: bool,
   revert: bool,
   run: bool,
+  print_output: bool,
   limit: Option<u64>,
 }
 
@@ -152,6 +154,21 @@ impl Options {
     self.limit = Some(limit);
     self
   }
+
+  /// If print_output is true, use println!.
+  /// Otherwise, use debug!
+  pub fn print_output(mut self) -> Self {
+    self.print_output = true;
+    self
+  }
+
+  fn print(&self, text: &str) {
+    if self.print_output {
+      println!("{text}");
+    } else {
+      debug!("{text}");
+    }
+  }
 }
 
 /// Checked by tests
@@ -192,9 +209,9 @@ pub fn run(options: Options) -> LemmyResult<Branch> {
 
   // Block concurrent attempts to run migrations until `conn` is closed, and disable the
   // trigger that prevents the Diesel CLI from running migrations
-  debug!("Waiting for lock...");
+  options.print("Waiting for lock...");
   conn.batch_execute("SELECT pg_advisory_lock(0);")?;
-  debug!("Running Database migrations (This may take a long time)...");
+  options.print("Running Database migrations (This may take a long time)...");
 
   // Drop `r` schema, so migrations don't need to be made to work both with and without things in
   // it existing
@@ -227,7 +244,7 @@ pub fn run(options: Options) -> LemmyResult<Branch> {
     Branch::ReplaceableSchemaNotRebuilt
   };
 
-  debug!("Database migrations complete.");
+  options.print("Database migrations complete.");
 
   Ok(output)
 }
@@ -265,6 +282,7 @@ fn run_selected_migrations(
 ) -> diesel::migration::Result<()> {
   let mut wrapper = MigrationHarnessWrapper {
     conn,
+    options,
     #[cfg(test)]
     diff_checked_migration_name: options
       .enable_diff_check