diff options
| author | Bryan Newbold <bnewbold@robocracy.org> | 2018-08-14 21:04:56 -0700 |
|---|---|---|
| committer | Bryan Newbold <bnewbold@robocracy.org> | 2018-08-14 21:04:56 -0700 |
| commit | ede30fef3e572b142dfde3b77b9642ccee841587 (patch) | |
| tree | e6fe5553b7e148d9e00687cf9c0b76e1ef6a7d6d /rust/src | |
| parent | 602d0ff2598b6ac15766689c925aff818c029615 (diff) | |
| download | fatcat-ede30fef3e572b142dfde3b77b9642ccee841587.tar.gz fatcat-ede30fef3e572b142dfde3b77b9642ccee841587.zip | |
revert role_val change
Diffstat (limited to 'rust/src')
| -rw-r--r-- | rust/src/api_server.rs | 6 | ||||
| -rw-r--r-- | rust/src/database_models.rs | 4 | ||||
| -rw-r--r-- | rust/src/database_schema.rs | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/rust/src/api_server.rs b/rust/src/api_server.rs index 10587d08..de776238 100644 --- a/rust/src/api_server.rs +++ b/rust/src/api_server.rs @@ -216,14 +216,14 @@ fn release_row2entity( let contribs: Vec<ReleaseContrib> = release_contrib::table .filter(release_contrib::release_rev.eq(rev.id)) - .order((release_contrib::role_val.asc(), release_contrib::index_val.asc())) + .order((release_contrib::role.asc(), release_contrib::index_val.asc())) .get_results(conn) .expect("fetch release refs") .into_iter() .map(|c: ReleaseContribRow| ReleaseContrib { index: c.index_val, raw_name: c.raw_name, - role: c.role_val, + role: c.role, extra: c.extra_json, creator_id: c.creator_ident_id.map(|v| uuid2fcid(&v)), creator: None, @@ -762,7 +762,7 @@ impl Server { .map(|v| fcid2uuid(&v).expect("valid fatcat identifier")), raw_name: c.raw_name.clone(), index_val: c.index, - role_val: c.role.clone(), + role: c.role.clone(), extra_json: c.extra.clone(), }) .collect(); diff --git a/rust/src/database_models.rs b/rust/src/database_models.rs index c7da4de7..47e00bcf 100644 --- a/rust/src/database_models.rs +++ b/rust/src/database_models.rs @@ -227,7 +227,7 @@ pub struct ReleaseContribRow { pub release_rev: Uuid, pub creator_ident_id: Option<Uuid>, pub raw_name: Option<String>, - pub role_val: Option<String>, + pub role: Option<String>, pub index_val: Option<i64>, pub extra_json: Option<serde_json::Value>, } @@ -238,7 +238,7 @@ pub struct ReleaseContribNewRow { pub release_rev: Uuid, pub creator_ident_id: Option<Uuid>, pub raw_name: Option<String>, - pub role_val: Option<String>, + pub role: Option<String>, pub index_val: Option<i64>, pub extra_json: Option<serde_json::Value>, } diff --git a/rust/src/database_schema.rs b/rust/src/database_schema.rs index d6084ab9..a6605d81 100644 --- a/rust/src/database_schema.rs +++ b/rust/src/database_schema.rs @@ -158,7 +158,7 @@ table! { release_rev -> Uuid, creator_ident_id -> Nullable<Uuid>, raw_name -> Nullable<Text>, - role_val -> Nullable<Text>, + role -> Nullable<Text>, index_val -> Nullable<Int8>, extra_json -> Nullable<Json>, } |