pleshevskiy/migra
Archived
1
0
Fork 0
Code Activity

refac: rename method

Browse source 
... to open database connection
This commit is contained in:
Dmitriy Pleshevskiy 2021-02-13 23:46:19 +03:00
parent 8f834264d8
commit 1d8993d1f0
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
migra-cli/src/commands/list.rs
View file

@ -7,7 +7,7 @@ const EM_DASH: char = '—';
pub(crate) fn print_migration_lists(config: Config) -> StdResult<()> { pub(crate) fn print_migration_lists(config: Config) -> StdResult<()> {
let applied_migrations = match config.database_connection_string() { let applied_migrations = match config.database_connection_string() {
Ok(ref database_connection_string) => { Ok(ref database_connection_string) => {
let mut connection = DatabaseConnection::connect(database_connection_string)?; let mut connection = DatabaseConnection::open(database_connection_string)?;
let applied_migrations = connection.applied_migration_names()?; let applied_migrations = connection.applied_migration_names()?;
println!("Applied migrations:"); println!("Applied migrations:");

11
migra-cli/src/commands/upgrade.rs
View file

@ -1,14 +1,13 @@
use crate::database; use crate::database::DatabaseConnection;
use crate::migration::Migration; use crate::migration::Migration;
use crate::Config; use crate::Config;
use crate::StdResult; use crate::StdResult;
use std::convert::TryFrom;
pub(crate) fn upgrade_pending_migrations(config: Config) -> StdResult<()> { pub(crate) fn upgrade_pending_migrations(config: Config) -> StdResult<()> {
let database_connection_string = &config.database_connection_string()?; let mut connection = DatabaseConnection::try_from(&config)?;
let mut client = database::connect(database_connection_string)?;
let applied_migration_names = database::applied_migration_names(&mut client)?;
let applied_migration_names = connection.applied_migration_names()?;
let migrations = config.migrations()?; let migrations = config.migrations()?;
if is_up_to_date_migrations(&migrations, &applied_migration_names) { if is_up_to_date_migrations(&migrations, &applied_migration_names) {
@ -18,7 +17,7 @@ pub(crate) fn upgrade_pending_migrations(config: Config) -> StdResult<()> {
for migration in pending_migrations.iter() { for migration in pending_migrations.iter() {
println!("upgrade {}...", migration.name()); println!("upgrade {}...", migration.name());
migration.upgrade(&mut client)?; migration.upgrade(&mut connection)?;
} }
} }

4
migra-cli/src/database.rs
View file

@ -11,12 +11,12 @@ impl TryFrom<&Config> for DatabaseConnection {
type Error = Box<dyn std::error::Error>; type Error = Box<dyn std::error::Error>;
fn try_from(config: &Config) -> Result<Self, Self::Error> { fn try_from(config: &Config) -> Result<Self, Self::Error> {
DatabaseConnection::connect(&config.database_connection_string()?) DatabaseConnection::open(&config.database_connection_string()?)
} }
} }
impl DatabaseConnection { impl DatabaseConnection {
pub fn connect(connection_string: &str) -> StdResult<DatabaseConnection> { pub fn open(connection_string: &str) -> StdResult<DatabaseConnection> {
let client = Client::connect(connection_string, NoTls)?; let client = Client::connect(connection_string, NoTls)?;
Ok(DatabaseConnection { client }) Ok(DatabaseConnection { client })
} }