Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions refinery_cli/src/migrate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::path::Path;
use anyhow::Context;
use refinery_core::{
config::{Config, ConfigDbType},
find_migration_files, Migration, MigrationType, Runner, SchemaVersion, Target,
find_migration_files, Migration, MigrationType, SchemaVersion, Target,
};

use crate::cli::MigrateArgs;
Expand All @@ -19,8 +19,7 @@ pub fn handle_migration_command(args: MigrateArgs) -> anyhow::Result<()> {
args.env_var.as_deref(),
&args.path,
&args.table_name,
)?;
Ok(())
)
}

#[allow(clippy::too_many_arguments)]
Expand Down Expand Up @@ -73,7 +72,7 @@ fn run_migrations(
.context("Can't start tokio runtime")?;

runtime.block_on(async {
Runner::new(&migrations)
refinery_core::Runner::new(&migrations)
.set_grouped(grouped)
.set_target(target)
.set_abort_divergent(divergent)
Expand All @@ -90,7 +89,7 @@ fn run_migrations(
_db_type @ (ConfigDbType::Mysql | ConfigDbType::Postgres | ConfigDbType::Sqlite) => {
cfg_if::cfg_if! {
if #[cfg(any(feature = "mysql", feature = "postgresql", feature = "sqlite"))] {
Runner::new(&migrations)
refinery_core::Runner::new(&migrations)
.set_grouped(grouped)
.set_abort_divergent(divergent)
.set_abort_missing(missing)
Expand All @@ -103,7 +102,6 @@ fn run_migrations(
}
}
};

Ok(())
}

Expand Down
62 changes: 36 additions & 26 deletions refinery_cli/src/setup.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,35 +59,45 @@ fn get_config_from_input() -> Result<Config> {
}
}

print!("Enter database host: ");
io::stdout().flush()?;
let mut db_host = String::new();
io::stdin().read_line(&mut db_host)?;
config = config.set_db_host(db_host.trim());
cfg_if::cfg_if! {
if #[cfg(any(
feature = "mysql",
feature = "mssql",
feature = "postgresql",
))]{
print!("Enter database host: ");
io::stdout().flush()?;
let mut db_host = String::new();
io::stdin().read_line(&mut db_host)?;
config = config.set_db_host(db_host.trim());

print!("Enter database port: ");
io::stdout().flush()?;
let mut db_port = String::new();
io::stdin().read_line(&mut db_port)?;
config = config.set_db_port(db_port.trim());
print!("Enter database port: ");
io::stdout().flush()?;
let mut db_port = String::new();
io::stdin().read_line(&mut db_port)?;
config = config.set_db_port(db_port.trim());

print!("Enter database username: ");
io::stdout().flush()?;
let mut db_user = String::new();
io::stdin().read_line(&mut db_user)?;
config = config.set_db_user(db_user.trim());
print!("Enter database username: ");
io::stdout().flush()?;
let mut db_user = String::new();
io::stdin().read_line(&mut db_user)?;
config = config.set_db_user(db_user.trim());

print!("Enter database password: ");
io::stdout().flush()?;
let mut db_pass = String::new();
io::stdin().read_line(&mut db_pass)?;
config = config.set_db_pass(db_pass.trim());
print!("Enter database password: ");
io::stdout().flush()?;
let mut db_pass = String::new();
io::stdin().read_line(&mut db_pass)?;
config = config.set_db_pass(db_pass.trim());

print!("Enter database name: ");
io::stdout().flush()?;
let mut db_name = String::new();
io::stdin().read_line(&mut db_name)?;
config = config.set_db_name(db_name.trim());
print!("Enter database name: ");
io::stdout().flush()?;
let mut db_name = String::new();
io::stdin().read_line(&mut db_name)?;
config = config.set_db_name(db_name.trim());

Ok(config)
Ok(config)
} else {
Ok(config)
}
}
}
Loading
Loading