diff options
| author | Matthias Beyer <matthias.beyer@atos.net> | 2021-06-07 14:34:49 +0200 |
|---|---|---|
| committer | Matthias Beyer <matthias.beyer@atos.net> | 2021-06-07 15:36:54 +0200 |
| commit | 0b110db5b65297bc82ae40cd24dc07c7dce190a4 (patch) | |
| tree | fcda7e6910dc456a32989c937596be72daea89dc | |
| parent | 3f3ca1259919cb69f8915b11db9b21d9c03aadbc (diff) | |
Remove database IDs from output
The database IDs are an implementation detail and the user does not need to see
them in any case.
Signed-off-by: Matthias Beyer <matthias.beyer@atos.net>
| -rw-r--r-- | src/commands/db.rs | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/commands/db.rs b/src/commands/db.rs index 2e86954..d712e27 100644 --- a/src/commands/db.rs +++ b/src/commands/db.rs @@ -160,7 +160,7 @@ fn artifacts(conn_cfg: DbConnectionConfig<'_>, matches: &ArgMatches) -> Result<( use crate::schema::artifacts::dsl; let csv = matches.is_present("csv"); - let hdrs = crate::commands::util::mk_header(vec!["id", "path", "released", "job id"]); + let hdrs = crate::commands::util::mk_header(vec!["path", "released", "job id"]); let conn = conn_cfg.establish_connection()?; let data = matches .value_of("job_uuid") @@ -188,7 +188,6 @@ fn artifacts(conn_cfg: DbConnectionConfig<'_>, matches: &ArgMatches) -> Result<( .map(|r| r.release_date.to_string()) .unwrap_or_else(|| String::from("no")); vec![ - format!("{}", artifact.id), artifact.path, rel, job.uuid.to_string(), @@ -210,12 +209,12 @@ fn envvars(conn_cfg: DbConnectionConfig<'_>, matches: &ArgMatches) -> Result<()> use crate::schema::envvars::dsl; let csv = matches.is_present("csv"); - let hdrs = crate::commands::util::mk_header(vec!["id", "name", "value"]); + let hdrs = crate::commands::util::mk_header(vec!["name", "value"]); let conn = conn_cfg.establish_connection()?; let data = dsl::envvars .load::<models::EnvVar>(&conn)? .into_iter() - .map(|evar| vec![format!("{}", evar.id), evar.name, evar.value]) + .map(|evar| vec![evar.name, evar.value]) .collect::<Vec<_>>(); if data.is_empty() { @@ -232,12 +231,12 @@ fn images(conn_cfg: DbConnectionConfig<'_>, matches: &ArgMatches) -> Result<()> use crate::schema::images::dsl; let csv = matches.is_present("csv"); - let hdrs = crate::commands::util::mk_header(vec!["id", "name"]); + let hdrs = crate::commands::util::mk_header(vec!["name"]); let conn = conn_cfg.establish_connection()?; let data = dsl::images .load::<models::Image>(&conn)? .into_iter() - .map(|image| vec![format!("{}", image.id), image.name]) + .map(|image| vec![image.name]) .collect::<Vec<_>>(); if data.is_empty() { @@ -337,7 +336,7 @@ fn submit(conn_cfg: DbConnectionConfig<'_>, matches: &ArgMatches) -> Result<()> fn submits(conn_cfg: DbConnectionConfig<'_>, matches: &ArgMatches) -> Result<()> { let csv = matches.is_present("csv"); let limit = matches.value_of("limit").map(i64::from_str).transpose()?; - let hdrs = crate::commands::util::mk_header(vec!["id", "time", "uuid"]); + let hdrs = crate::commands::util::mk_header(vec!["time", "uuid"]); let conn = conn_cfg.establish_connection()?; let query = schema::submits::table @@ -383,7 +382,6 @@ fn submits(conn_cfg: DbConnectionConfig<'_>, matches: &ArgMatches) -> Result<()> // Helper to map Submit -> Vec<String> let submit_to_vec = |submit: models::Submit| { vec![ - format!("{}", submit.id), submit.submit_time.to_string(), submit.uuid.to_string(), ] @@ -404,7 +402,6 @@ fn submits(conn_cfg: DbConnectionConfig<'_>, matches: &ArgMatches) -> Result<()> fn jobs(conn_cfg: DbConnectionConfig<'_>, matches: &ArgMatches) -> Result<()> { let csv = matches.is_present("csv"); let hdrs = crate::commands::util::mk_header(vec![ - "id", "submit uuid", "job uuid", "time", @@ -471,7 +468,6 @@ fn jobs(conn_cfg: DbConnectionConfig<'_>, matches: &ArgMatches) -> Result<()> { .unwrap_or_else(|| String::from("unknown")); Ok(vec![ - format!("{}", job.id), submit.uuid.to_string(), job.uuid.to_string(), submit.submit_time.to_string(), |