1
0
Fork 1
Spiegel von https://github.com/dani-garcia/vaultwarden.git synchronisiert 2024-11-26 05:50:29 +01:00

Merge pull request #1055 from jjlin/pg

Fix error in PostgreSQL build
Dieser Commit ist enthalten in:
Daniel García 2020-07-11 11:17:45 +02:00 committet von GitHub
Commit 6e6e34ff18
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 4AEE18F83AFDEB23

Datei anzeigen

@ -227,8 +227,10 @@ impl CollectionUser {
)) ))
.on_conflict((users_collections::user_uuid, users_collections::collection_uuid)) .on_conflict((users_collections::user_uuid, users_collections::collection_uuid))
.do_update() .do_update()
.set(users_collections::read_only.eq(read_only)) .set((
.set(users_collections::hide_passwords.eq(hide_passwords)) users_collections::read_only.eq(read_only),
users_collections::hide_passwords.eq(hide_passwords),
))
.execute(&**conn) .execute(&**conn)
.map_res("Error adding user to collection") .map_res("Error adding user to collection")
} }