diff --git a/src/client/commands.rs b/src/client/commands.rs index e2b13f0..c7538fd 100644 --- a/src/client/commands.rs +++ b/src/client/commands.rs @@ -202,7 +202,7 @@ pub async fn print_authorization_owner_hint( response => return erroneous_server_response(response), }; - println!( + eprintln!( "Note: You are allowed to manage databases and users with the following prefixes:\n{}", response.into_iter().map(|p| format!(" - {}", p)).join("\n") ); diff --git a/src/client/commands/drop_db.rs b/src/client/commands/drop_db.rs index 1ec732c..d2cd4a4 100644 --- a/src/client/commands/drop_db.rs +++ b/src/client/commands/drop_db.rs @@ -53,8 +53,11 @@ pub async fn drop_databases( )) .interact()?; + // if !confirmation { + // TODO: should we return with an error code here? println!("Aborting drop operation."); + server_connection.send(Request::Exit).await?; return Ok(()); } } diff --git a/src/client/commands/drop_user.rs b/src/client/commands/drop_user.rs index 9597920..51275b9 100644 --- a/src/client/commands/drop_user.rs +++ b/src/client/commands/drop_user.rs @@ -54,7 +54,9 @@ pub async fn drop_users( .interact()?; if !confirmation { + // TODO: should we return with an error code here? println!("Aborting drop operation."); + server_connection.send(Request::Exit).await?; return Ok(()); } } diff --git a/src/client/mysql_admutils_compatibility/mysql_useradm.rs b/src/client/mysql_admutils_compatibility/mysql_useradm.rs index d61f52c..c879873 100644 --- a/src/client/mysql_admutils_compatibility/mysql_useradm.rs +++ b/src/client/mysql_admutils_compatibility/mysql_useradm.rs @@ -292,7 +292,7 @@ async fn show_users( Some(Ok(Response::ListAllUsers(result))) => match result { Ok(users) => users, Err(err) => { - println!("Failed to list users: {:?}", err); + eprintln!("Failed to list users: {:?}", err); return Ok(()); } }, diff --git a/src/core/protocol/commands/check_authorization.rs b/src/core/protocol/commands/check_authorization.rs index 2cd7694..5524d93 100644 --- a/src/core/protocol/commands/check_authorization.rs +++ b/src/core/protocol/commands/check_authorization.rs @@ -21,7 +21,7 @@ pub fn print_check_authorization_output_status(output: &CheckAuthorizationRespon println!("'{}': OK", db_or_user.name()); } Err(err) => { - println!( + eprintln!( "'{}': {}", db_or_user.name(), err.to_error_message(db_or_user) diff --git a/src/core/protocol/commands/create_databases.rs b/src/core/protocol/commands/create_databases.rs index 1da5e8b..07c5156 100644 --- a/src/core/protocol/commands/create_databases.rs +++ b/src/core/protocol/commands/create_databases.rs @@ -32,8 +32,8 @@ pub fn print_create_databases_output_status(output: &CreateDatabasesResponse) { println!("Database '{}' created successfully.", database_name); } Err(err) => { - println!("{}", err.to_error_message(database_name)); - println!("Skipping..."); + eprintln!("{}", err.to_error_message(database_name)); + eprintln!("Skipping..."); } } println!(); diff --git a/src/core/protocol/commands/create_users.rs b/src/core/protocol/commands/create_users.rs index efe067b..7a4ea1b 100644 --- a/src/core/protocol/commands/create_users.rs +++ b/src/core/protocol/commands/create_users.rs @@ -32,8 +32,8 @@ pub fn print_create_users_output_status(output: &CreateUsersResponse) { println!("User '{}' created successfully.", username); } Err(err) => { - println!("{}", err.to_error_message(username)); - println!("Skipping..."); + eprintln!("{}", err.to_error_message(username)); + eprintln!("Skipping..."); } } println!(); diff --git a/src/core/protocol/commands/drop_databases.rs b/src/core/protocol/commands/drop_databases.rs index 824a348..302f665 100644 --- a/src/core/protocol/commands/drop_databases.rs +++ b/src/core/protocol/commands/drop_databases.rs @@ -35,8 +35,8 @@ pub fn print_drop_databases_output_status(output: &DropDatabasesResponse) { ); } Err(err) => { - println!("{}", err.to_error_message(database_name)); - println!("Skipping..."); + eprintln!("{}", err.to_error_message(database_name)); + eprintln!("Skipping..."); } } println!(); diff --git a/src/core/protocol/commands/drop_users.rs b/src/core/protocol/commands/drop_users.rs index 28aab1d..13707a0 100644 --- a/src/core/protocol/commands/drop_users.rs +++ b/src/core/protocol/commands/drop_users.rs @@ -32,8 +32,8 @@ pub fn print_drop_users_output_status(output: &DropUsersResponse) { println!("User '{}' dropped successfully.", username); } Err(err) => { - println!("{}", err.to_error_message(username)); - println!("Skipping..."); + eprintln!("{}", err.to_error_message(username)); + eprintln!("Skipping..."); } } println!(); diff --git a/src/core/protocol/commands/lock_users.rs b/src/core/protocol/commands/lock_users.rs index 75a0aa7..0bd4d6d 100644 --- a/src/core/protocol/commands/lock_users.rs +++ b/src/core/protocol/commands/lock_users.rs @@ -35,8 +35,8 @@ pub fn print_lock_users_output_status(output: &LockUsersResponse) { println!("User '{}' locked successfully.", username); } Err(err) => { - println!("{}", err.to_error_message(username)); - println!("Skipping..."); + eprintln!("{}", err.to_error_message(username)); + eprintln!("Skipping..."); } } println!(); diff --git a/src/core/protocol/commands/modify_privileges.rs b/src/core/protocol/commands/modify_privileges.rs index 22320cc..a2afe71 100644 --- a/src/core/protocol/commands/modify_privileges.rs +++ b/src/core/protocol/commands/modify_privileges.rs @@ -58,8 +58,8 @@ pub fn print_modify_database_privileges_output_status(output: &ModifyPrivilegesR ); } Err(err) => { - println!("{}", err.to_error_message(database_name, username)); - println!("Skipping..."); + eprintln!("{}", err.to_error_message(database_name, username)); + eprintln!("Skipping..."); } } println!(); diff --git a/src/core/protocol/commands/passwd_user.rs b/src/core/protocol/commands/passwd_user.rs index 1ac8948..2dcc892 100644 --- a/src/core/protocol/commands/passwd_user.rs +++ b/src/core/protocol/commands/passwd_user.rs @@ -28,8 +28,8 @@ pub fn print_set_password_output_status(output: &SetUserPasswordResponse, userna println!("Password for user '{}' set successfully.", username); } Err(err) => { - println!("{}", err.to_error_message(username)); - println!("Skipping..."); + eprintln!("{}", err.to_error_message(username)); + eprintln!("Skipping..."); } } } diff --git a/src/core/protocol/commands/unlock_users.rs b/src/core/protocol/commands/unlock_users.rs index 7583105..4a210c9 100644 --- a/src/core/protocol/commands/unlock_users.rs +++ b/src/core/protocol/commands/unlock_users.rs @@ -35,8 +35,8 @@ pub fn print_unlock_users_output_status(output: &UnlockUsersResponse) { println!("User '{}' unlocked successfully.", username); } Err(err) => { - println!("{}", err.to_error_message(username)); - println!("Skipping..."); + eprintln!("{}", err.to_error_message(username)); + eprintln!("Skipping..."); } } println!();