remove email field from dump

- `do_nothing` on `emails` insertion violates unique
constraint on `user_id`

Author: mugoh

migrations/20161115111957_dumped_migration_119/up.sql

@@ -1 +1 @@
-CREATE FUNCTION update_categories_crates_cnt() RETURNS trigger AS $$ BEGIN IF (TG_OP = 'INSERT') THEN UPDATE categories SET crates_cnt = crates_cnt + 1 WHERE id = NEW.category_id; return NEW; ELSIF (TG_OP = 'DELETE') THEN UPDATE categories SET crates_cnt = crates_cnt - 1 WHERE id = OLD.category_id; return OLD; END IF; END $$ LANGUAGE plpgsql; CREATE TRIGGER trigger_update_categories_crates_cnt BEFORE INSERT OR DELETE ON crates_categories FOR EACH ROW EXECUTE PROCEDURE update_categories_crates_cnt(); CREATE TRIGGER touch_crate_on_modify_categories AFTER INSERT OR DELETE ON crates_categories FOR EACH ROW EXECUTE PROCEDURE touch_crate();
+CREATE FUNCTION update_categories_crates_cnt() RETURNS trigger AS $$ BEGIN IF (TG_OP = 'INSERT') THEN UPDATE categories SET crates_cnt = crates_cnt + 1 WHERE id = NEW.category_id; return NEW; ELSIF (TG_OP = 'DELETE') THEN UPDATE categories SET crates_cnt = crates_cnt - 1 WHERE id = OLD.category_id; return OLD; END IF; END $$ LANGUAGE plpgsql; CREATE TRIGGER trigger_update_categories_crates_cnt BEFORE INSERT OR DELETE ON crates_categories FOR EACH ROW EXECUTE PROCEDURE update_categories_crates_cnt(); CREATE TRIGGER touch_crate_on_modify_categories AFTER INSERT OR DELETE ON crates_categories FOR EACH ROW EXECUTE PROCEDURE touch_crate();

src/models/user.rs

@@ -54,6 +54,7 @@ impl<'a> NewUser<'a> {
         email: Option<&'a str>,
         conn: &PgConnection,
     ) -> QueryResult<User> {
+        use crate::schema::emails::columns::user_id;
         use crate::schema::users::dsl::*;
         use diesel::dsl::sql;
         use diesel::insert_into;
@@ -90,7 +91,9 @@ impl<'a> NewUser<'a> {
 
                 let token = insert_into(emails::table)
                     .values(&new_email)
-                    .on_conflict_do_nothing()
+                    .on_conflict(user_id)
+                    .do_update()
+                    .set(&new_email)
                     .returning(emails::token)
                     .get_result::<String>(conn)
                     .optional()?;

src/tasks/dump_db/dump-db.toml

@@ -165,7 +165,6 @@ id in (
 )"""
 [users.columns]
 id = "public"
-email = "private"
 gh_access_token = "private"
 gh_login = "public"
 name = "public"