diff options
| -rw-r--r-- | fatcat-openapi2.yml | 2 | ||||
| -rw-r--r-- | rust/fatcat-api/README.md | 2 | ||||
| -rw-r--r-- | rust/fatcat-api/api.yaml | 2 | ||||
| -rw-r--r-- | rust/fatcat-api/api/swagger.yaml | 12 | ||||
| -rw-r--r-- | rust/fatcat-api/src/models.rs | 6 | ||||
| -rw-r--r-- | rust/migrations/2018-05-12-001226_init/up.sql | 6 |
6 files changed, 15 insertions, 15 deletions
diff --git a/fatcat-openapi2.yml b/fatcat-openapi2.yml index d3d0717b..350e25c8 100644 --- a/fatcat-openapi2.yml +++ b/fatcat-openapi2.yml @@ -365,7 +365,7 @@ definitions: creator_id: type: string #format: ident - raw: + raw_name: type: string extra: type: object diff --git a/rust/fatcat-api/README.md b/rust/fatcat-api/README.md index 888462df..8695e15f 100644 --- a/rust/fatcat-api/README.md +++ b/rust/fatcat-api/README.md @@ -13,7 +13,7 @@ To see how to make this your own, look here: [README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md) - API version: 0.1.0 -- Build date: 2018-07-25T18:31:47.194Z +- Build date: 2018-07-25T21:32:18.916Z This autogenerated project defines an API crate `fatcat` which contains: * An `Api` trait defining the API in Rust. diff --git a/rust/fatcat-api/api.yaml b/rust/fatcat-api/api.yaml index d3d0717b..350e25c8 100644 --- a/rust/fatcat-api/api.yaml +++ b/rust/fatcat-api/api.yaml @@ -365,7 +365,7 @@ definitions: creator_id: type: string #format: ident - raw: + raw_name: type: string extra: type: object diff --git a/rust/fatcat-api/api/swagger.yaml b/rust/fatcat-api/api/swagger.yaml index bb7361d8..be23cdd6 100644 --- a/rust/fatcat-api/api/swagger.yaml +++ b/rust/fatcat-api/api/swagger.yaml @@ -2179,16 +2179,16 @@ definitions: language: "language" title: "title" contribs: - - role: "role" + - raw_name: "raw_name" + role: "role" extra: "{}" creator_id: "creator_id" index: 1 - raw: "raw" - - role: "role" + - raw_name: "raw_name" + role: "role" extra: "{}" creator_id: "creator_id" index: 1 - raw: "raw" pages: "pages" extra: "{}" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -2751,18 +2751,18 @@ definitions: format: "int64" creator_id: type: "string" - raw: + raw_name: type: "string" extra: type: "object" role: type: "string" example: + raw_name: "raw_name" role: "role" extra: "{}" creator_id: "creator_id" index: 1 - raw: "raw" upperCaseName: "RELEASE_CONTRIB" stats_response: type: "object" diff --git a/rust/fatcat-api/src/models.rs b/rust/fatcat-api/src/models.rs index 3ae9b1fa..d85a1bbd 100644 --- a/rust/fatcat-api/src/models.rs +++ b/rust/fatcat-api/src/models.rs @@ -433,9 +433,9 @@ pub struct ReleaseContrib { #[serde(skip_serializing_if = "Option::is_none")] pub creator_id: Option<String>, - #[serde(rename = "raw")] + #[serde(rename = "raw_name")] #[serde(skip_serializing_if = "Option::is_none")] - pub raw: Option<String>, + pub raw_name: Option<String>, #[serde(rename = "extra")] #[serde(skip_serializing_if = "Option::is_none")] @@ -451,7 +451,7 @@ impl ReleaseContrib { ReleaseContrib { index: None, creator_id: None, - raw: None, + raw_name: None, extra: None, role: None, } diff --git a/rust/migrations/2018-05-12-001226_init/up.sql b/rust/migrations/2018-05-12-001226_init/up.sql index 7b344dc0..f96df38a 100644 --- a/rust/migrations/2018-05-12-001226_init/up.sql +++ b/rust/migrations/2018-05-12-001226_init/up.sql @@ -267,7 +267,7 @@ CREATE TABLE release_contrib ( id BIGSERIAL PRIMARY KEY, release_rev UUID REFERENCES release_rev(id) NOT NULL, creator_ident_id UUID REFERENCES creator_ident(id), - raw TEXT, + raw_name TEXT, role TEXT, -- TODO: enum? index BIGINT, extra_json JSON @@ -282,7 +282,7 @@ CREATE TABLE release_ref ( target_release_ident_id UUID REFERENCES release_ident(id), -- or work? index BIGINT, key TEXT, - extra_json JSON, -- title, year, container_title, locator (aka, page) + extra_json JSON, -- title, year, container_title, locator (aka, page), oci_id container_title TEXT, year BIGINT, title TEXT, @@ -425,7 +425,7 @@ INSERT INTO release_rev_abstract (release_rev, abstract_sha1, mimetype, lang) VA ('00000000-0000-0000-4444-FFF000000001', '1ba86bf8c2979a62d29b18b537e50b2b093be27e', 'text/plain', 'en'), ('00000000-0000-0000-4444-FFF000000002', '0da908ab584b5e445a06beb172e3fab8cb5169e3', 'application/xml+jats', 'en'); -INSERT INTO release_contrib (release_rev, creator_ident_id, raw, role, index) VALUES +INSERT INTO release_contrib (release_rev, creator_ident_id, raw_name, role, index) VALUES ('00000000-0000-0000-4444-FFF000000002', null, null, null, null), ('00000000-0000-0000-4444-FFF000000002', '00000000-0000-0000-2222-000000000002', 'some contrib', 'editor', 4), ('00000000-0000-0000-4444-FFF000000003', '00000000-0000-0000-2222-000000000003', 'John P. A. Ioannidis', 'author', 0); |