From 8f06b69f5d13270f69db73388393ee87df3c360f Mon Sep 17 00:00:00 2001 From: Dmitriy Pleshevskiy Date: Fri, 9 Apr 2021 01:09:49 +0300 Subject: [PATCH 1/2] feat: apply multiply files Closes #3 --- migra-cli/src/commands/apply.rs | 26 ++++--- migra-cli/src/config.rs | 2 +- migra-cli/src/opts.rs | 4 +- migra-cli/tests/commands.rs | 117 ++++++++++++++++++++++++++++++++ 4 files changed, 137 insertions(+), 12 deletions(-) diff --git a/migra-cli/src/commands/apply.rs b/migra-cli/src/commands/apply.rs index b71c314..54152e4 100644 --- a/migra-cli/src/commands/apply.rs +++ b/migra-cli/src/commands/apply.rs @@ -12,17 +12,25 @@ pub(crate) fn apply_sql(app: &App, cmd_opts: ApplyCommandOpt) -> StdResult<()> { let migration_manager = MigrationManager::new(); - let file_path = { - let mut file_path = config.directory_path().join(cmd_opts.file_name); - if file_path.extension().is_none() { - file_path.set_extension("sql"); - } - file_path - }; + let file_contents = cmd_opts + .file_paths + .into_iter() + .map(|file_path| { + let mut file_path = config.directory_path().join(file_path); + if file_path.extension().is_none() { + file_path.set_extension("sql"); + } + dbg!(&file_path); + file_path + }) + .map(std::fs::read_to_string) + .collect::, _>>()?; - let content = std::fs::read_to_string(file_path)?; with_transaction(conn, &mut |conn| { - migration_manager.apply_sql(conn, &content) + file_contents + .iter() + .try_for_each(|content| migration_manager.apply_sql(conn, content))?; + Ok(()) })?; Ok(()) diff --git a/migra-cli/src/config.rs b/migra-cli/src/config.rs index 2f3c609..c5e534d 100644 --- a/migra-cli/src/config.rs +++ b/migra-cli/src/config.rs @@ -176,7 +176,7 @@ impl Config { Err(e) if e.kind() == io::ErrorKind::NotFound => return Ok(Vec::new()), entries => entries? .map(|res| res.map(|e| e.path())) - .collect::, io::Error>>()?, + .collect::, _>>()?, }; if entries.is_empty() { diff --git a/migra-cli/src/opts.rs b/migra-cli/src/opts.rs index 8652099..53b13ed 100644 --- a/migra-cli/src/opts.rs +++ b/migra-cli/src/opts.rs @@ -34,8 +34,8 @@ pub(crate) enum Command { #[derive(Debug, StructOpt, Clone)] pub(crate) struct ApplyCommandOpt { - #[structopt(parse(from_str))] - pub file_name: String, + #[structopt(parse(from_os_str), required = true)] + pub file_paths: Vec, } #[derive(Debug, StructOpt, Clone)] diff --git a/migra-cli/tests/commands.rs b/migra-cli/tests/commands.rs index 4e39b23..b2d0399 100644 --- a/migra-cli/tests/commands.rs +++ b/migra-cli/tests/commands.rs @@ -448,3 +448,120 @@ mod upgrade { Ok(()) } } + +mod apply { + use super::*; + + #[test] + fn apply_files() -> TestResult { + fn inner( + database_name: &'static str, + file_paths: Vec<&'static str>, + validate: ValidateFn, + ) -> TestResult + where + ValidateFn: Fn() -> TestResult, + { + let manifest_path = database_manifest_path(database_name); + + Command::cargo_bin("migra")? + .arg("-c") + .arg(&manifest_path) + .arg("apply") + .args(file_paths) + .assert() + .success(); + + validate()?; + + Ok(()) + } + + cfg_if! { + if #[cfg(feature = "postgres")] { + inner( + "postgres", + vec![ + "migrations/210218232851_create_articles/up", + "migrations/210218233414_create_persons/up", + ], + || { + let mut conn = postgres::Client::connect(POSTGRES_URL, postgres::NoTls)?; + let res = conn.query("SELECT p.id, a.id FROM persons AS p, articles AS a", &[])?; + + assert_eq!( + res.into_iter() + .map(|row| (row.get(0), row.get(1))) + .collect::>(), + Vec::new() + ); + + Ok(()) + }, + )?; + + inner( + "postgres", + vec![ + "migrations/210218233414_create_persons/down", + "migrations/210218232851_create_articles/down", + ], + || { + let mut conn = postgres::Client::connect(POSTGRES_URL, postgres::NoTls)?; + let res = conn.query("SELECT p.id, a.id FROM persons AS p, articles AS a", &[]); + + assert!(res.is_err()); + + Ok(()) + }, + )?; + } + } + + cfg_if! { + if #[cfg(feature = "mysql")] { + inner( + "mysql", + vec![ + "migrations/210218232851_create_articles/up", + "migrations/210218233414_create_persons/up", + ], + || { + use mysql::prelude::*; + + let pool = mysql::Pool::new(MYSQL_URL)?; + let mut conn = pool.get_conn()?; + + let res = conn.query_drop("SELECT p.id, a.id FROM persons AS p, articles AS a")?; + + assert_eq!(res, ()); + + Ok(()) + }, + )?; + + inner( + "mysql", + vec![ + "migrations/210218233414_create_persons/down", + "migrations/210218232851_create_articles/down", + ], + || { + use mysql::prelude::*; + + let pool = mysql::Pool::new(MYSQL_URL)?; + let mut conn = pool.get_conn()?; + + let res = conn.query_drop("SELECT p.id, a.id FROM persons AS p, articles AS a"); + + assert!(res.is_err()); + + Ok(()) + } + )?; + } + } + + Ok(()) + } +} From 244a758154a8ffb3553756f1f79a1d896e8bfa45 Mon Sep 17 00:00:00 2001 From: Dmitriy Pleshevskiy Date: Fri, 9 Apr 2021 23:08:16 +0300 Subject: [PATCH 2/2] chore: remove dbg --- migra-cli/src/commands/apply.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/migra-cli/src/commands/apply.rs b/migra-cli/src/commands/apply.rs index 54152e4..538cc6d 100644 --- a/migra-cli/src/commands/apply.rs +++ b/migra-cli/src/commands/apply.rs @@ -20,7 +20,6 @@ pub(crate) fn apply_sql(app: &App, cmd_opts: ApplyCommandOpt) -> StdResult<()> { if file_path.extension().is_none() { file_path.set_extension("sql"); } - dbg!(&file_path); file_path }) .map(std::fs::read_to_string)