JSONB back to JSON, and skip for container_rev while debugging

2 files changed, 21 insertions, 22 deletions

diff --git a/rust/migrations/2018-05-12-001226_init/up.sql b/rust/migrations/2018-05-12-001226_init/up.sql
index 0c62bc07..be9866f9 100644
--- a/rust/migrations/2018-05-12-001226_init/up.sql
+++ b/rust/migrations/2018-05-12-001226_init/up.sql
@@ -17,7 +17,7 @@ CREATE TABLE editor (
 
 CREATE TABLE editgroup (
     id                  BIGSERIAL PRIMARY KEY,
-    extra_json          JSONB,
+    extra_json          JSON,
     editor_id           BIGSERIAL REFERENCES editor(id) NOT NULL,
     description         TEXT
 );
@@ -35,7 +35,7 @@ CREATE TABLE changelog (
 -------------------- Creators -----------------------------------------------
 CREATE TABLE creator_rev (
     id                  BIGSERIAL PRIMARY KEY,
-    extra_json          JSONB,
+    extra_json          JSON,
 
     name                TEXT NOT NULL,
     orcid               TEXT
@@ -54,7 +54,7 @@ CREATE TABLE creator_ident (
 
 CREATE TABLE creator_edit (
     id                  BIGSERIAL PRIMARY KEY,
-    extra_json          JSONB,
+    extra_json          JSON,
     ident_id            UUID REFERENCES creator_ident(id) NOT NULL,
     rev_id              BIGINT REFERENCES creator_rev(id),
     redirect_id         UUID REFERENCES creator_ident(id),
@@ -64,7 +64,7 @@ CREATE TABLE creator_edit (
 -------------------- Containers --------------------------------------------
 CREATE TABLE container_rev (
     id                  BIGSERIAL PRIMARY KEY,
-    extra_json          JSONB,
+    -- XXX: extra_json          JSON,
 
     name                TEXT NOT NULL,
     parent_ident_id     BIGINT REFERENCES container_rev(id),
@@ -81,7 +81,7 @@ CREATE TABLE container_ident (
 
 CREATE TABLE container_edit (
     id                  BIGSERIAL PRIMARY KEY,
-    extra_json          JSONB,
+    extra_json          JSON,
     ident_id            UUID REFERENCES container_ident(id) NOT NULL,
     rev_id              BIGINT REFERENCES container_rev(id),
     redirect_id         UUID REFERENCES container_ident(id),
@@ -91,7 +91,7 @@ CREATE TABLE container_edit (
 -------------------- Files -------------------------------------------------
 CREATE TABLE file_rev (
     id                  BIGSERIAL PRIMARY KEY,
-    extra_json          JSONB,
+    extra_json          JSON,
 
     size                INTEGER, -- TODO: uint64
     sha1                TEXT, -- TODO: varchar or bytes
@@ -107,7 +107,7 @@ CREATE TABLE file_ident (
 
 CREATE TABLE file_edit (
     id                  BIGSERIAL PRIMARY KEY,
-    extra_json          JSONB,
+    extra_json          JSON,
     ident_id            UUID REFERENCES file_ident(id) NOT NULL,
     rev_id              BIGINT REFERENCES file_rev(id),
     redirect_id         UUID REFERENCES file_ident(id),
@@ -117,7 +117,7 @@ CREATE TABLE file_edit (
 -------------------- Release -----------------------------------------------
 CREATE TABLE release_rev (
     id                  BIGSERIAL PRIMARY KEY,
-    extra_json          JSONB,
+    extra_json          JSON,
 
     work_ident_id       UUID NOT NULL, -- FOREIGN KEY; see ALRTER below
     container_ident_id  UUID REFERENCES container_ident(id),
@@ -140,7 +140,7 @@ CREATE TABLE release_ident (
 
 CREATE TABLE release_edit (
     id                  BIGSERIAL PRIMARY KEY,
-    extra_json          JSONB,
+    extra_json          JSON,
     ident_id            UUID REFERENCES release_ident(id) NOT NULL,
     rev_id              BIGINT REFERENCES release_rev(id),
     redirect_id         UUID REFERENCES release_ident(id),
@@ -150,7 +150,7 @@ CREATE TABLE release_edit (
 -------------------- Works --------------------------------------------------
 CREATE TABLE work_rev (
     id                  BIGSERIAL PRIMARY KEY,
-    extra_json          JSONB,
+    extra_json          JSON,
 
     -- not even a work, for now
     work_type           TEXT, -- TODO: enum?
@@ -166,7 +166,7 @@ CREATE TABLE work_ident (
 
 CREATE TABLE work_edit (
     id                  BIGSERIAL PRIMARY KEY,
-    extra_json          JSONB,
+    extra_json          JSON,
     ident_id            UUID REFERENCES work_ident(id) NOT NULL,
     rev_id              BIGINT REFERENCES work_rev(id),
     redirect_id         UUID REFERENCES work_ident(id),
diff --git a/rust/src/database_schema.rs b/rust/src/database_schema.rs
index 80f8fb3f..1d6b46fc 100644
--- a/rust/src/database_schema.rs
+++ b/rust/src/database_schema.rs
@@ -9,7 +9,7 @@ table! {
 table! {
     container_edit (id) {
         id -> Int8,
-        extra_json -> Nullable<Jsonb>,
+        extra_json -> Nullable<Json>,
         ident_id -> Uuid,
         rev_id -> Nullable<Int8>,
         redirect_id -> Nullable<Uuid>,
@@ -29,7 +29,6 @@ table! {
 table! {
     container_rev (id) {
         id -> Int8,
-        extra_json -> Nullable<Jsonb>,
         name -> Text,
         parent_ident_id -> Nullable<Int8>,
         publisher -> Nullable<Text>,
@@ -40,7 +39,7 @@ table! {
 table! {
     creator_edit (id) {
         id -> Int8,
-        extra_json -> Nullable<Jsonb>,
+        extra_json -> Nullable<Json>,
         ident_id -> Uuid,
         rev_id -> Nullable<Int8>,
         redirect_id -> Nullable<Uuid>,
@@ -60,7 +59,7 @@ table! {
 table! {
     creator_rev (id) {
         id -> Int8,
-        extra_json -> Nullable<Jsonb>,
+        extra_json -> Nullable<Json>,
         name -> Text,
         orcid -> Nullable<Text>,
     }
@@ -69,7 +68,7 @@ table! {
 table! {
     editgroup (id) {
         id -> Int8,
-        extra_json -> Nullable<Jsonb>,
+        extra_json -> Nullable<Json>,
         editor_id -> Int8,
         description -> Nullable<Text>,
     }
@@ -87,7 +86,7 @@ table! {
 table! {
     file_edit (id) {
         id -> Int8,
-        extra_json -> Nullable<Jsonb>,
+        extra_json -> Nullable<Json>,
         ident_id -> Uuid,
         rev_id -> Nullable<Int8>,
         redirect_id -> Nullable<Uuid>,
@@ -114,7 +113,7 @@ table! {
 table! {
     file_rev (id) {
         id -> Int8,
-        extra_json -> Nullable<Jsonb>,
+        extra_json -> Nullable<Json>,
         size -> Nullable<Int4>,
         sha1 -> Nullable<Text>,
         url -> Nullable<Text>,
@@ -134,7 +133,7 @@ table! {
 table! {
     release_edit (id) {
         id -> Int8,
-        extra_json -> Nullable<Jsonb>,
+        extra_json -> Nullable<Json>,
         ident_id -> Uuid,
         rev_id -> Nullable<Int8>,
         redirect_id -> Nullable<Uuid>,
@@ -164,7 +163,7 @@ table! {
 table! {
     release_rev (id) {
         id -> Int8,
-        extra_json -> Nullable<Jsonb>,
+        extra_json -> Nullable<Json>,
         work_ident_id -> Uuid,
         container_ident_id -> Nullable<Uuid>,
         title -> Text,
@@ -181,7 +180,7 @@ table! {
 table! {
     work_edit (id) {
         id -> Int8,
-        extra_json -> Nullable<Jsonb>,
+        extra_json -> Nullable<Json>,
         ident_id -> Uuid,
         rev_id -> Nullable<Int8>,
         redirect_id -> Nullable<Uuid>,
@@ -201,7 +200,7 @@ table! {
 table! {
     work_rev (id) {
         id -> Int8,
-        extra_json -> Nullable<Jsonb>,
+        extra_json -> Nullable<Json>,
         work_type -> Nullable<Text>,
         primary_release_id -> Nullable<Uuid>,
     }