adrian/schematics
1
0
Fork 0
Code Issues Pull requests Releases Activity

Update rustfmt

Browse source
This commit is contained in:
Adrian Heine 2019-09-24 21:56:31 +02:00
parent f4f738c898
commit 64e20b371b
29 changed files with 179 additions and 206 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/symbols/postgresql/database.rs
View file

@ -21,11 +21,11 @@ impl<'a, C: CommandRunner> PostgreSQLDatabase<'a, C> {
}
fn run_sql(&self, sql: &str) -> Result<String, Box<dyn Error>> {
let b = try!(self.command_runner.get_output(
let b = self.command_runner.get_output(
"su",
&["-", "postgres", "-c", &format!("psql -t -c \"{}\"", sql)]
));
Ok(try!(String::from_utf8(b)))
&["-", "postgres", "-c", &format!("psql -t -c \"{}\"", sql)],
)?;
Ok(String::from_utf8(b)?)
}
}
@ -38,11 +38,12 @@ impl<'a, C: CommandRunner> fmt::Display for PostgreSQLDatabase<'a, C> {
impl<'a, C: CommandRunner> Symbol for PostgreSQLDatabase<'a, C> {
fn target_reached(&self) -> Result<bool, Box<dyn Error>> {
Ok(
try!(self.run_sql(&format!(
"SELECT datname FROM pg_database WHERE datname LIKE '{}'",
self.name
)))
.trim()
self
.run_sql(&format!(
"SELECT datname FROM pg_database WHERE datname LIKE '{}'",
self.name
))?
.trim()
== self.name,
)
}

10
src/symbols/postgresql/database_dump.rs
View file

@ -27,10 +27,10 @@ impl<'a, N: AsRef<str>, C: CommandRunner, S: Storage> DatabaseDump<'a, N, C, S>
}
fn run_sql(&self, sql: &str) -> Result<String, Box<dyn Error>> {
let b = try!(self
let b = self
.command_runner
.get_output("mariadb", &["--skip-column-names", "-B", "-e", sql]));
Ok(try!(String::from_utf8(b)))
.get_output("mariadb", &["--skip-column-names", "-B", "-e", sql])?;
Ok(String::from_utf8(b)?)
}
}
@ -42,12 +42,12 @@ impl<'a, N: AsRef<str>, C: CommandRunner, S: Storage> fmt::Display for DatabaseD
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 = try!(self.storage.recent_date());
let dump_date = self.storage.recent_date()?;
let modified_date = try!(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(try!(u64::from_str(modified_date.trim_end())) <= dump_date)
Ok(u64::from_str(modified_date.trim_end())? <= dump_date)
}
fn execute(&self) -> Result<(), Box<dyn Error>> {