MyFavMirrors/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2024-12-28 08:05:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #812 from swedishborgie/postgresql

Browse Source 
Fixes #635 - Unique constraint violation when using U2F tokens on PostgreSQL
This commit is contained in:
Daniel García 2020-01-16 16:21:57 +01:00 committed by GitHub
commit c0ba3406ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/db/models/two_factor.rs
View File

@ -73,6 +73,13 @@ impl TwoFactor {
impl TwoFactor {
#[cfg(feature = "postgresql")]
pub fn save(&self, conn: &DbConn) -> EmptyResult {
// We need to make sure we're not going to violate the unique constraint on user_uuid and atype.
// This happens automatically on other DBMS backends due to replace_into(). PostgreSQL does
// not support multiple constraints on ON CONFLICT clauses.
diesel::delete(twofactor::table.filter(twofactor::user_uuid.eq(&self.user_uuid)).filter(twofactor::atype.eq(&self.atype)))
.execute(&**conn)
.map_res("Error deleting twofactor for insert")?;
diesel::insert_into(twofactor::table)
.values(self)
.on_conflict(twofactor::uuid)