retain original email

- retain email registered with when github email is modified

Author: mugoh

src/models/user.rs

@@ -54,7 +54,6 @@ 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;
@@ -91,9 +90,7 @@ impl<'a> NewUser<'a> {
 
                 let token = insert_into(emails::table)
                     .values(&new_email)
-                    .on_conflict(user_id)
-                    .do_update()
-                    .set(&new_email)
+                    .on_conflict_do_nothing()
                     .returning(emails::token)
                     .get_result::<String>(conn)
                     .optional()?;

src/tests/util.rs

@@ -135,7 +135,7 @@ impl TestApp {
         use diesel::prelude::*;
 
         let user = self.db(|conn| {
-            let email = "[email protected]";
+            let email = "[email protected]";
 
             let user = crate::new_user(username)
                 .create_or_update(None, conn)