refac: rename variables in migration structure

This commit is contained in:
Dmitriy Pleshevskiy 2021-02-23 18:55:12 +03:00
parent eb0775e35d
commit e06d1c0a49
1 changed files with 9 additions and 9 deletions

View File

@ -7,8 +7,8 @@ use std::path::{Path, PathBuf};
#[derive(Debug)] #[derive(Debug)]
pub struct Migration { pub struct Migration {
upgrade_sql: PathBuf, upgrade_sql_file_path: PathBuf,
downgrade_sql: PathBuf, downgrade_sql_file_path: PathBuf,
name: String, name: String,
} }
@ -19,13 +19,13 @@ impl Migration {
.file_name() .file_name()
.and_then(|name| name.to_str()) .and_then(|name| name.to_str())
.unwrap_or_default(); .unwrap_or_default();
let upgrade_sql = directory.join("up.sql"); let upgrade_sql_file_path = directory.join("up.sql");
let downgrade_sql = directory.join("down.sql"); let downgrade_sql_file_path = directory.join("down.sql");
if upgrade_sql.exists() && downgrade_sql.exists() { if upgrade_sql_file_path.exists() && downgrade_sql_file_path.exists() {
return Some(Migration { return Some(Migration {
upgrade_sql, upgrade_sql_file_path,
downgrade_sql, downgrade_sql_file_path,
name: String::from(name), name: String::from(name),
}); });
} }
@ -41,12 +41,12 @@ impl Migration {
} }
fn upgrade_sql_content(&self) -> StdResult<String> { fn upgrade_sql_content(&self) -> StdResult<String> {
let content = fs::read_to_string(&self.upgrade_sql)?; let content = fs::read_to_string(&self.upgrade_sql_file_path)?;
Ok(content) Ok(content)
} }
fn downgrade_sql_content(&self) -> StdResult<String> { fn downgrade_sql_content(&self) -> StdResult<String> {
let content = fs::read_to_string(&self.downgrade_sql)?; let content = fs::read_to_string(&self.downgrade_sql_file_path)?;
Ok(content) Ok(content)
} }
} }