diff options
Diffstat (limited to 'rust/src')
-rw-r--r-- | rust/src/database_schema.rs | 26 | ||||
-rw-r--r-- | rust/src/lib.rs | 6 |
2 files changed, 16 insertions, 16 deletions
diff --git a/rust/src/database_schema.rs b/rust/src/database_schema.rs index a6605d81..bc3f6c3a 100644 --- a/rust/src/database_schema.rs +++ b/rust/src/database_schema.rs @@ -22,7 +22,7 @@ table! { rev_id -> Nullable<Uuid>, redirect_id -> Nullable<Uuid>, prev_rev -> Nullable<Uuid>, - extra_json -> Nullable<Json>, + extra_json -> Nullable<Jsonb>, } } @@ -38,7 +38,7 @@ table! { table! { container_rev (id) { id -> Uuid, - extra_json -> Nullable<Json>, + extra_json -> Nullable<Jsonb>, name -> Text, publisher -> Nullable<Text>, issnl -> Nullable<Bpchar>, @@ -57,7 +57,7 @@ table! { rev_id -> Nullable<Uuid>, redirect_id -> Nullable<Uuid>, prev_rev -> Nullable<Uuid>, - extra_json -> Nullable<Json>, + extra_json -> Nullable<Jsonb>, } } @@ -73,7 +73,7 @@ table! { table! { creator_rev (id) { id -> Uuid, - extra_json -> Nullable<Json>, + extra_json -> Nullable<Jsonb>, display_name -> Text, given_name -> Nullable<Text>, surname -> Nullable<Text>, @@ -87,7 +87,7 @@ table! { id -> Uuid, editor_id -> Uuid, created -> Timestamp, - extra_json -> Nullable<Json>, + extra_json -> Nullable<Jsonb>, description -> Nullable<Text>, } } @@ -111,7 +111,7 @@ table! { rev_id -> Nullable<Uuid>, redirect_id -> Nullable<Uuid>, prev_rev -> Nullable<Uuid>, - extra_json -> Nullable<Json>, + extra_json -> Nullable<Jsonb>, } } @@ -134,7 +134,7 @@ table! { table! { file_rev (id) { id -> Uuid, - extra_json -> Nullable<Json>, + extra_json -> Nullable<Jsonb>, size -> Nullable<Int8>, sha1 -> Nullable<Bpchar>, sha256 -> Nullable<Bpchar>, @@ -160,7 +160,7 @@ table! { raw_name -> Nullable<Text>, role -> Nullable<Text>, index_val -> Nullable<Int8>, - extra_json -> Nullable<Json>, + extra_json -> Nullable<Jsonb>, } } @@ -173,7 +173,7 @@ table! { rev_id -> Nullable<Uuid>, redirect_id -> Nullable<Uuid>, prev_rev -> Nullable<Uuid>, - extra_json -> Nullable<Json>, + extra_json -> Nullable<Jsonb>, } } @@ -193,7 +193,7 @@ table! { target_release_ident_id -> Nullable<Uuid>, index_val -> Nullable<Int8>, key -> Nullable<Text>, - extra_json -> Nullable<Json>, + extra_json -> Nullable<Jsonb>, container_title -> Nullable<Text>, year -> Nullable<Int8>, title -> Nullable<Text>, @@ -204,7 +204,7 @@ table! { table! { release_rev (id) { id -> Uuid, - extra_json -> Nullable<Json>, + extra_json -> Nullable<Jsonb>, work_ident_id -> Uuid, container_ident_id -> Nullable<Uuid>, title -> Text, @@ -244,7 +244,7 @@ table! { rev_id -> Nullable<Uuid>, redirect_id -> Nullable<Uuid>, prev_rev -> Nullable<Uuid>, - extra_json -> Nullable<Json>, + extra_json -> Nullable<Jsonb>, } } @@ -260,7 +260,7 @@ table! { table! { work_rev (id) { id -> Uuid, - extra_json -> Nullable<Json>, + extra_json -> Nullable<Jsonb>, } } diff --git a/rust/src/lib.rs b/rust/src/lib.rs index 38f9b343..2236d602 100644 --- a/rust/src/lib.rs +++ b/rust/src/lib.rs @@ -103,9 +103,9 @@ pub fn test_server() -> Result<api_server::Server> { let conn = server.db_pool.get().expect("db_pool error"); // run migrations; revert latest (dummy data); re-run latest - diesel_migrations::run_pending_migrations(&conn).unwrap(); - diesel_migrations::revert_latest_migration(&conn).unwrap(); - diesel_migrations::run_pending_migrations(&conn).unwrap(); + //diesel_migrations::run_pending_migrations(&conn).unwrap(); + //diesel_migrations::revert_latest_migration(&conn).unwrap(); + //diesel_migrations::run_pending_migrations(&conn).unwrap(); Ok(server) } |