vaultwarden
/
vaultwarden-alternativa-bitwarden
mirror of https://github.com/dani-garcia/vaultwarden.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1055 from jjlin/pg 

Fix error in PostgreSQL build
This commit is contained in:
Daniel García 2020-07-11 11:17:45 +02:00 committed by GitHub
parent af625930d6 790146bfac
commit 6e6e34ff18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/db/models/collection.rs
View File

@ -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")
} }