Projects/mysqladm-rs
Projects
/
mysqladm-rs
12
2
Fork 0
Code Issues 36 Pull Requests Releases Activity

Misc #35

Merged
oysteikt merged 13 commits from misc into main 2024-08-07 17:29:15 +02:00
Conversation 0 Commits 13 Files Changed 9 +17 -13
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d0b750cd33 - Show all commits

12
src/cli/database_command.rs
View File

@ -149,14 +149,14 @@ pub async fn handle_command(
mut conn: MySqlConnection, mut conn: MySqlConnection,
) -> anyhow::Result<()> { ) -> anyhow::Result<()> {
let result = conn let result = conn
.transaction(|mut txn| { .transaction(|txn| {
Box::pin(async move { Box::pin(async move {
match command { match command {
DatabaseCommand::CreateDb(args) => create_databases(args, &mut txn).await, DatabaseCommand::CreateDb(args) => create_databases(args, txn).await,
DatabaseCommand::DropDb(args) => drop_databases(args, &mut txn).await, DatabaseCommand::DropDb(args) => drop_databases(args, txn).await,
DatabaseCommand::ListDb(args) => list_databases(args, &mut txn).await, DatabaseCommand::ListDb(args) => list_databases(args, txn).await,
DatabaseCommand::ShowDbPerm(args) => show_databases(args, &mut txn).await, DatabaseCommand::ShowDbPerm(args) => show_databases(args, txn).await,
DatabaseCommand::EditDbPerm(args) => edit_permissions(args, &mut txn).await, DatabaseCommand::EditDbPerm(args) => edit_permissions(args, txn).await,
} }
}) })
}) })

12
src/cli/user_command.rs
View File

@ -66,13 +66,13 @@ pub struct UserShowArgs {
pub async fn handle_command(command: UserCommand, mut conn: MySqlConnection) -> anyhow::Result<()> { pub async fn handle_command(command: UserCommand, mut conn: MySqlConnection) -> anyhow::Result<()> {
let result = conn let result = conn
.transaction(|mut txn| { .transaction(|txn| {
Box::pin(async move { Box::pin(async move {
match command { match command {
UserCommand::CreateUser(args) => create_users(args, &mut txn).await, UserCommand::CreateUser(args) => create_users(args, txn).await,
UserCommand::DropUser(args) => drop_users(args, &mut txn).await, UserCommand::DropUser(args) => drop_users(args, txn).await,
UserCommand::PasswdUser(args) => change_password_for_user(args, &mut txn).await, UserCommand::PasswdUser(args) => change_password_for_user(args, txn).await,
UserCommand::ShowUser(args) => show_users(args, &mut txn).await, UserCommand::ShowUser(args) => show_users(args, txn).await,
} }
}) })
}) })
@ -114,7 +114,7 @@ async fn create_users(args: UserCreateArgs, conn: &mut MySqlConnection) -> anyho
) )
.await?; .await?;
} }
println!(""); println!();
} }
Ok(()) Ok(())
} }

6
src/core/common.rs
View File

@ -142,7 +142,11 @@ pub fn validate_ownership_by_user_prefix<'a>(
} }
pub async fn close_database_connection(conn: MySqlConnection) { pub async fn close_database_connection(conn: MySqlConnection) {
if let Err(e) = conn.close().await.context("Failed to close connection properly") { if let Err(e) = conn
.close()
.await
.context("Failed to close connection properly")
{
eprintln!("{}", e); eprintln!("{}", e);
eprintln!("Ignoring..."); eprintln!("Ignoring...");
} }