Merge pull request 'Fixes #988 Fix email_blocklist schema' (#1016) from block_list-schema into main

Reviewed-on: https://git.joinplu.me/Plume/Plume/pulls/1016

CHANGELOG.md

@@ -15,6 +15,7 @@
 ### Fixed
 
 - Add explanation of sign-up step at sign-up page when email sign-up mode
+- Add NOT NULL constraint to email_blocklist table fields
 
 ## [[0.7.1]] - 2022-01-12
 

migrations/postgres/2022-01-29-154457_add_not_null_constraint_to_email_blocklist/down.sql

@@ -0,0 +1,4 @@
+ALTER TABLE email_blocklist ALTER COLUMN notification_text DROP NOT NULL;
+ALTER TABLE email_blocklist ALTER COLUMN notify_user DROP NOT NULL;
+ALTER TABLE email_blocklist ALTER COLUMN note DROP NOT NULL;
+ALTER TABLE email_blocklist ALTER COLUMN email_address DROP NOT NULL;

migrations/postgres/2022-01-29-154457_add_not_null_constraint_to_email_blocklist/up.sql

@@ -0,0 +1,4 @@
+ALTER TABLE email_blocklist ALTER COLUMN email_address SET NOT NULL;
+ALTER TABLE email_blocklist ALTER COLUMN note SET NOT NULL;
+ALTER TABLE email_blocklist ALTER COLUMN notify_user SET NOT NULL;
+ALTER TABLE email_blocklist ALTER COLUMN notification_text SET NOT NULL;

migrations/sqlite/2022-01-29-154457_add_not_null_constraint_to_email_blocklist/down.sql

@@ -0,0 +1,9 @@
+CREATE TABLE email_blocklist2(id INTEGER PRIMARY KEY,
+                              email_address TEXT UNIQUE,
+                              note TEXT,
+                              notify_user BOOLEAN DEFAULT FALSE,
+                              notification_text TEXT);
+
+INSERT INTO email_blocklist2 SELECT * FROM email_blocklist;
+DROP TABLE email_blocklist;
+ALTER TABLE email_blocklist2 RENAME TO email_blocklist;

migrations/sqlite/2022-01-29-154457_add_not_null_constraint_to_email_blocklist/up.sql

@@ -0,0 +1,9 @@
+CREATE TABLE email_blocklist2(id INTEGER PRIMARY KEY,
+                              email_address TEXT UNIQUE NOT NULL,
+                              note TEXT NOT NULL,
+                              notify_user BOOLEAN DEFAULT FALSE NOT NULL,
+                              notification_text TEXT NOT NULL);
+
+INSERT INTO email_blocklist2 SELECT * FROM email_blocklist;
+DROP TABLE email_blocklist;
+ALTER TABLE email_blocklist2 RENAME TO email_blocklist;

plume-models/src/schema.rs

@@ -77,7 +77,7 @@ table! {
 table! {
     email_blocklist (id) {
         id -> Int4,
-        email_address -> VarChar,
+        email_address -> Text,
         note -> Text,
         notify_user -> Bool,
         notification_text -> Text,
@@ -316,6 +316,7 @@ allow_tables_to_appear_in_same_query!(
     blogs,
     comments,
     comment_seers,
+    email_blocklist,
     email_signups,
     follows,
     instances,