zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-20 02:47:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1812 from zed-industries/fix-500-error-on-user-join

Browse Source 
Fix duplicate key error that occurs when a user joins that is already in the db
This commit is contained in:
Joseph T. Lyons 2022-10-25 16:55:25 -04:00 committed by GitHub
commit a7d86a164c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crates/collab/src/db.rs
View File

@ -567,6 +567,10 @@ impl Db for PostgresDb {
(email_address, github_login, github_user_id, admin, invite_count, invite_code)
VALUES
($1, $2, $3, 'f', $4, $5)
ON CONFLICT (github_login) DO UPDATE SET
email_address = excluded.email_address,
github_user_id = excluded.github_user_id,
admin = excluded.admin
RETURNING id, metrics_id::text
",
)
@ -616,6 +620,7 @@ impl Db for PostgresDb {
(user_id_a, user_id_b, a_to_b, should_notify, accepted)
VALUES
($1, $2, 't', 't', 't')
ON CONFLICT DO NOTHING
",
)
.bind(inviting_user_id)