1
0
Fork 1
Spiegel von https://github.com/dani-garcia/vaultwarden.git synchronisiert 2024-11-28 06:10:28 +01:00

Merge pull request #3678 from BlackDex/fix-org-api-creation-postgres

Fix Org API Key generation on PosgreSQL
Dieser Commit ist enthalten in:
Daniel García 2023-07-10 17:59:53 +02:00 committet von GitHub
Commit 61f9081827
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 4AEE18F83AFDEB23

Datei anzeigen

@ -804,7 +804,7 @@ impl OrganizationApiKey {
let value = OrganizationApiKeyDb::to_db(self); let value = OrganizationApiKeyDb::to_db(self);
diesel::insert_into(organization_api_key::table) diesel::insert_into(organization_api_key::table)
.values(&value) .values(&value)
.on_conflict(organization_api_key::uuid) .on_conflict((organization_api_key::uuid, organization_api_key::org_uuid))
.do_update() .do_update()
.set(&value) .set(&value)
.execute(conn) .execute(conn)