mirror of
https://github.com/dani-garcia/vaultwarden.wiki.git
synced 2026-10-25 05:56:50 +02:00
Use insert_into when possible (#6437)
Co-authored-by: Timshel <timshel@users.noreply.github.com>
This commit is contained in:
1 parent
e992cbb4f5
commit
25dfedafd7
14 files changed
+188
-333
No files matched your search
@@ -146,24 +146,16 @@ impl EmergencyAccess {
|
||||
self.updated_at = Utc::now().naive_utc();
|
||||
|
||||
db_run! { conn:
|
||||
sqlite, mysql {
|
||||
match diesel::replace_into(emergency_access::table)
|
||||
mysql {
|
||||
diesel::insert_into(emergency_access::table)
|
||||
.values(&*self)
|
||||
.on_conflict(diesel::dsl::DuplicatedKeys)
|
||||
.do_update()
|
||||
.set(&*self)
|
||||
.execute(conn)
|
||||
{
|
||||
Ok(_) => Ok(()),
|
||||
// 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(emergency_access::table)
|
||||
.filter(emergency_access::uuid.eq(&self.uuid))
|
||||
.set(&*self)
|
||||
.execute(conn)
|
||||
.map_res("Error updating emergency access")
|
||||
}
|
||||
Err(e) => Err(e.into()),
|
||||
}.map_res("Error saving emergency access")
|
||||
.map_res("Error saving emergency access")
|
||||
}
|
||||
postgresql {
|
||||
postgresql, sqlite {
|
||||
diesel::insert_into(emergency_access::table)
|
||||
.values(&*self)
|
||||
.on_conflict(emergency_access::uuid)
|
||||
|
||||
Reference in new issue
Block a user