diff options
| author | Bryan Newbold <bnewbold@robocracy.org> | 2018-08-20 01:18:10 -0700 |
|---|---|---|
| committer | Bryan Newbold <bnewbold@robocracy.org> | 2018-08-20 01:18:10 -0700 |
| commit | b8ca8ebdae304dcc2a694e5dfbc9070003f0df8a (patch) | |
| tree | a54dfa8362341907ca38bd3e1bdd671b4e55097d /rust/src | |
| parent | 657c1e7d4d6f07762bc1f6a7b24e9512e0089987 (diff) | |
| download | fatcat-b8ca8ebdae304dcc2a694e5dfbc9070003f0df8a.tar.gz fatcat-b8ca8ebdae304dcc2a694e5dfbc9070003f0df8a.zip | |
use index_val, not index, in SQL schema
Diffstat (limited to 'rust/src')
| -rw-r--r-- | rust/src/api_server.rs | 12 | ||||
| -rw-r--r-- | rust/src/database_models.rs | 8 | ||||
| -rw-r--r-- | rust/src/database_schema.rs | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/rust/src/api_server.rs b/rust/src/api_server.rs index 66e6359a..b0dff173 100644 --- a/rust/src/api_server.rs +++ b/rust/src/api_server.rs @@ -198,12 +198,12 @@ fn release_row2entity( let refs: Vec<ReleaseRef> = release_ref::table .filter(release_ref::release_rev.eq(rev.id)) - .order(release_ref::index.asc()) + .order(release_ref::index_val.asc()) .get_results(conn) .expect("fetch release refs") .into_iter() .map(|r: ReleaseRefRow| ReleaseRef { - index: r.index, + index: r.index_val, key: r.key, extra: r.extra_json, container_title: r.container_title, @@ -216,12 +216,12 @@ fn release_row2entity( let contribs: Vec<ReleaseContrib> = release_contrib::table .filter(release_contrib::release_rev.eq(rev.id)) - .order((release_contrib::role.asc(), release_contrib::index.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, + index: c.index_val, raw_name: c.raw_name, role: c.role, extra: c.extra_json, @@ -741,7 +741,7 @@ impl Server { target_release_ident_id: r.target_release_id .clone() .map(|v| fcid2uuid(&v).expect("valid fatcat identifier")), - index: r.index, + index_val: r.index, key: r.key.clone(), container_title: r.container_title.clone(), year: r.year, @@ -773,7 +773,7 @@ impl Server { .clone() .map(|v| fcid2uuid(&v).expect("valid fatcat identifier")), raw_name: c.raw_name.clone(), - index: c.index, + index_val: c.index, role: c.role.clone(), extra_json: c.extra.clone(), }) diff --git a/rust/src/database_models.rs b/rust/src/database_models.rs index 258bcab7..47e00bcf 100644 --- a/rust/src/database_models.rs +++ b/rust/src/database_models.rs @@ -228,7 +228,7 @@ pub struct ReleaseContribRow { pub creator_ident_id: Option<Uuid>, pub raw_name: Option<String>, pub role: Option<String>, - pub index: Option<i64>, + pub index_val: Option<i64>, pub extra_json: Option<serde_json::Value>, } @@ -239,7 +239,7 @@ pub struct ReleaseContribNewRow { pub creator_ident_id: Option<Uuid>, pub raw_name: Option<String>, pub role: Option<String>, - pub index: Option<i64>, + pub index_val: Option<i64>, pub extra_json: Option<serde_json::Value>, } @@ -249,7 +249,7 @@ pub struct ReleaseRefRow { pub id: i64, pub release_rev: Uuid, pub target_release_ident_id: Option<Uuid>, - pub index: Option<i64>, + pub index_val: Option<i64>, pub key: Option<String>, pub extra_json: Option<serde_json::Value>, pub container_title: Option<String>, @@ -263,7 +263,7 @@ pub struct ReleaseRefRow { pub struct ReleaseRefNewRow { pub release_rev: Uuid, pub target_release_ident_id: Option<Uuid>, - pub index: Option<i64>, + pub index_val: Option<i64>, pub key: Option<String>, pub extra_json: Option<serde_json::Value>, pub container_title: Option<String>, diff --git a/rust/src/database_schema.rs b/rust/src/database_schema.rs index 3a8fe901..a6605d81 100644 --- a/rust/src/database_schema.rs +++ b/rust/src/database_schema.rs @@ -159,7 +159,7 @@ table! { creator_ident_id -> Nullable<Uuid>, raw_name -> Nullable<Text>, role -> Nullable<Text>, - index -> Nullable<Int8>, + index_val -> Nullable<Int8>, extra_json -> Nullable<Json>, } } @@ -191,7 +191,7 @@ table! { id -> Int8, release_rev -> Uuid, target_release_ident_id -> Nullable<Uuid>, - index -> Nullable<Int8>, + index_val -> Nullable<Int8>, key -> Nullable<Text>, extra_json -> Nullable<Json>, container_title -> Nullable<Text>, |