Included participant_id in email writes

gratipay · Jan 17, 2016 · 7210b23 · 7210b23
1 parent a30be4a
commit 7210b23
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/gratipay/models/participant.py b/gratipay/models/participant.py
@@ -409,9 +409,9 @@ def add_email(self, email, resend_threshold='3 minutes'):
                 add_event(c, 'participant', dict(id=self.id, action='add', values=dict(email=email)))
                 c.run("""
                     INSERT INTO emails
-                                (address, nonce, verification_start, participant)
-                         VALUES (%s, %s, %s, %s)
-                """, (email, nonce, verification_start, self.username))
+                                (address, nonce, verification_start, participant, participant_id)
+                         VALUES (%s, %s, %s, %s, %s)
+                """, (email, nonce, verification_start, self.username, self.id))
         except IntegrityError:
             nonce = self.db.one("""
                 UPDATE emails

diff --git a/sql/branch.sql b/sql/branch.sql
@@ -1,2 +1,4 @@
 ALTER TABLE emails ADD COLUMN participant_id bigint DEFAULT NULL
-	REFERENCES participants(id) ON UPDATE RESTRICT ON DELETE RESTRICT;
+	REFERENCES participants(id) ON UPDATE RESTRICT ON DELETE RESTRICT;
+
+ALTER TABLE emails ADD UNIQUE (participant_id, address);