From c5b8257b792782dee87ce3c4cd1df907ffd4126b Mon Sep 17 00:00:00 2001 From: Daniele Andrei Date: Mon, 14 Nov 2022 10:53:12 +0100 Subject: [PATCH] to_be_squashed, fix OrganizationApiKey db save call --- src/db/models/organization.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/db/models/organization.rs b/src/db/models/organization.rs index 38cdaa12..da5fc503 100644 --- a/src/db/models/organization.rs +++ b/src/db/models/organization.rs @@ -729,7 +729,8 @@ impl OrganizationApiKey { // Record already exists and causes a Foreign Key Violation because replace_into() wants to delete the record first. Err(diesel::result::Error::DatabaseError(diesel::result::DatabaseErrorKind::ForeignKeyViolation, _)) => { diesel::update(organization_api_key::table) - .filter(organization_api_key::uuid.eq(&self.uuid)) + .filter(organization_api_key::uuid.eq(&self.uuid)) + .filter(organization_api_key::org_uuid.eq(&self.org_uuid)) .set(OrganizationApiKeyDb::to_db(self)) .execute(conn) .map_res("Error saving organization") @@ -742,7 +743,7 @@ impl OrganizationApiKey { let value = OrganizationApiKeyDb::to_db(self); diesel::insert_into(organization_api_key::table) .values(&value) - .on_conflict(organization_api_key::uuid) + .on_conflict((organization_api_key::uuid, organization_api_key::org_uuid)) .do_update() .set(&value) .execute(conn)