diff options
Diffstat (limited to 'rust/src')
| -rw-r--r-- | rust/src/api_entity_crud.rs | 20 | ||||
| -rw-r--r-- | rust/src/database_schema.rs | 26 | ||||
| -rw-r--r-- | rust/src/lib.rs | 6 |
3 files changed, 26 insertions, 26 deletions
diff --git a/rust/src/api_entity_crud.rs b/rust/src/api_entity_crud.rs index dd0961d5..2d5ea93d 100644 --- a/rust/src/api_entity_crud.rs +++ b/rust/src/api_entity_crud.rs @@ -391,8 +391,8 @@ impl EntityCrud for ContainerEntity { generic_db_update!(container_ident, container_edit); generic_db_delete!(container_ident, container_edit); generic_db_get_history!(container_edit); - generic_db_accept_edits_batch!("container"); - //generic_db_accept_edits_each!(container_ident, container_edit); + //generic_db_accept_edits_batch!("container"); + generic_db_accept_edits_each!(container_ident, container_edit); generic_db_insert_rev!(); fn db_from_row( @@ -472,8 +472,8 @@ impl EntityCrud for CreatorEntity { generic_db_update!(creator_ident, creator_edit); generic_db_delete!(creator_ident, creator_edit); generic_db_get_history!(creator_edit); - generic_db_accept_edits_batch!("creator"); - //generic_db_accept_edits_each!(creator_ident, creator_edit); + //generic_db_accept_edits_batch!("creator"); + generic_db_accept_edits_each!(creator_ident, creator_edit); generic_db_insert_rev!(); fn db_from_row( @@ -550,8 +550,8 @@ impl EntityCrud for FileEntity { generic_db_update!(file_ident, file_edit); generic_db_delete!(file_ident, file_edit); generic_db_get_history!(file_edit); - generic_db_accept_edits_batch!("file"); - //generic_db_accept_edits_each!(file_ident, file_edit); + //generic_db_accept_edits_batch!("file"); + generic_db_accept_edits_each!(file_ident, file_edit); generic_db_insert_rev!(); fn db_from_row( @@ -688,8 +688,8 @@ impl EntityCrud for ReleaseEntity { generic_db_update!(release_ident, release_edit); generic_db_delete!(release_ident, release_edit); generic_db_get_history!(release_edit); - generic_db_accept_edits_batch!("release"); - //generic_db_accept_edits_each!(release_ident, release_edit); + //generic_db_accept_edits_batch!("release"); + generic_db_accept_edits_each!(release_ident, release_edit); generic_db_insert_rev!(); fn db_create(&self, conn: &DbConn, edit_context: &EditContext) -> Result<Self::EditRow> { @@ -1062,8 +1062,8 @@ impl EntityCrud for WorkEntity { generic_db_update!(work_ident, work_edit); generic_db_delete!(work_ident, work_edit); generic_db_get_history!(work_edit); - generic_db_accept_edits_batch!("work"); - //generic_db_accept_edits_each!(work_ident, work_edit); + //generic_db_accept_edits_batch!("work"); + generic_db_accept_edits_each!(work_ident, work_edit); generic_db_insert_rev!(); fn db_from_row( 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 57cc535c..b4b9e3c7 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) } |