Lint

src/symbols/postgresql/database.rs

@@ -28,17 +28,15 @@ impl<'a, N: AsRef<str>, S: AsRef<str>, C: CommandRunner> PostgreSQLDatabase<'a,
   }
 }
 
-impl<'a, N: AsRef<str>, S: AsRef<str>, C: CommandRunner> fmt::Display
-  for PostgreSQLDatabase<'a, N, S, C>
+impl<N: AsRef<str>, S: AsRef<str>, C: CommandRunner> fmt::Display
+  for PostgreSQLDatabase<'_, N, S, C>
 {
   fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
     write!(f, "PostgreSQL Database {}", self.name.as_ref())
   }
 }
 
-impl<'a, N: AsRef<str>, S: AsRef<str>, C: CommandRunner> Symbol
-  for PostgreSQLDatabase<'a, N, S, C>
-{
+impl<N: AsRef<str>, S: AsRef<str>, C: CommandRunner> Symbol for PostgreSQLDatabase<'_, N, S, C> {
   fn target_reached(&self) -> Result<bool, Box<dyn Error>> {
     Ok(
       self

src/symbols/postgresql/database_dump.rs

@@ -1,75 +0,0 @@
-use std::error::Error;
-use std::fmt;
-use std::str::FromStr;
-
-use crate::command_runner::CommandRunner;
-use crate::storage::Storage;
-use crate::symbols::{Action, OwnedSymbolAction, Symbol, SymbolAction, SymbolRunner};
-
-pub struct DatabaseDump<'a, N: AsRef<str>, C: CommandRunner, S: Storage> {
-  db_name: N,
-  storage: S,
-  command_runner: &'a C,
-}
-
-impl<'a, N: AsRef<str>, C: CommandRunner, S: Storage> DatabaseDump<'a, N, C, S> {
-  pub fn new(db_name: N, storage: S, command_runner: &'a C) -> Self {
-    DatabaseDump {
-      db_name,
-      storage,
-      command_runner,
-    }
-  }
-
-  fn run_sql(&self, sql: &str) -> Result<String, Box<dyn Error>> {
-    let b = self
-      .command_runner
-      .get_output("mariadb", args!["--skip-column-names", "-B", "-e", sql])?;
-    Ok(String::from_utf8(b)?)
-  }
-}
-
-impl<'a, N: AsRef<str>, C: CommandRunner, S: Storage> fmt::Display for DatabaseDump<'a, N, C, S> {
-  fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-    write!(f, "Dump MariaDB Database {}", self.db_name.as_ref())
-  }
-}
-
-impl<'a, N: AsRef<str>, C: CommandRunner, S: Storage> Symbol for DatabaseDump<'a, N, C, S> {
-  fn target_reached(&self) -> Result<bool, Box<dyn Error>> {
-    let dump_date = self.storage.recent_date()?;
-    let modified_date = self.run_sql(&format!("select UNIX_TIMESTAMP(MAX(UPDATE_TIME)) from information_schema.tables WHERE table_schema = '{}'", self.db_name.as_ref()))?;
-    if modified_date.trim_end() == "NULL" {
-      return Ok(false);
-    }
-    Ok(u64::from_str(modified_date.trim_end())? <= dump_date)
-  }
-
-  fn execute(&self) -> Result<(), Box<dyn Error>> {
-    self.command_runner.run_successfully(
-      "sh",
-      args![
-        "-c",
-        format!(
-          "mysqldump '{}' > {}",
-          self.db_name.as_ref(),
-          self.storage.write_filename()
-        ),
-      ],
-    )
-  }
-
-  fn as_action<'b>(&'b self, runner: &'b dyn SymbolRunner) -> Box<dyn Action + 'b> {
-    Box::new(SymbolAction::new(runner, self))
-  }
-
-  fn into_action<'b>(self: Box<Self>, runner: &'b dyn SymbolRunner) -> Box<dyn Action + 'b>
-  where
-    Self: 'b,
-  {
-    Box::new(OwnedSymbolAction::new(runner, *self))
-  }
-}
-
-#[cfg(test)]
-mod test {}

src/symbols/postgresql/mod.rs

@@ -1,5 +1,3 @@
 mod database;
-mod database_dump;
 
 pub use self::database::PostgreSQLDatabase;
-//pub use self::database_dump::PostgreSQLDump;