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

show-user: add `--json` flag

This commit is contained in:
Oystein Kristoffer Tveit 2024-08-07 17:21:26 +02:00
parent a9b8f7cee7
commit 3d7d001f65
Signed by: oysteikt
GPG Key ID: 9F2F7D8250F35146
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/cli/user_command.rs
View File

@ -62,6 +62,9 @@ pub struct UserPasswdArgs {
pub struct UserShowArgs { pub struct UserShowArgs {
#[arg(num_args = 0..)] #[arg(num_args = 0..)]
username: Vec<String>, username: Vec<String>,
#[clap(short, long)]
json: bool,
} }
pub async fn handle_command(command: UserCommand, mut conn: MySqlConnection) -> anyhow::Result<()> { pub async fn handle_command(command: UserCommand, mut conn: MySqlConnection) -> anyhow::Result<()> {
@ -193,6 +196,9 @@ async fn show_users(args: UserShowArgs, conn: &mut MySqlConnection) -> anyhow::R
result result
}; };
if args.json {
println!("{}", serde_json::to_string_pretty(&users)?);
} else {
for user in users { for user in users {
println!( println!(
"User '{}': {}", "User '{}': {}",
@ -204,6 +210,7 @@ async fn show_users(args: UserShowArgs, conn: &mut MySqlConnection) -> anyhow::R
} }
); );
} }
}
Ok(()) Ok(())
} }

1
src/core/user_operations.rs
View File

@ -100,6 +100,7 @@ pub struct DatabaseUser {
#[sqlx(rename = "User")] #[sqlx(rename = "User")]
pub user: String, pub user: String,
#[serde(skip)]
#[sqlx(rename = "Host")] #[sqlx(rename = "Host")]
pub host: String, pub host: String,