octoleo/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2024-06-03 09:00:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue with postgres

Browse Source
This commit is contained in:
Daniel García 2020-03-14 23:35:34 +01:00
parent afd9f4e278
commit 819f340f39
No known key found for this signature in database
GPG Key ID: FC8A7D14C3CD543A
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/db/models/org_policy.rs
View File

@ -57,14 +57,14 @@ impl OrgPolicy {
/// Database methods
impl OrgPolicy {
#[cfg(feature = "postgresql")]
pub fn save(&mut self, conn: &DbConn) -> EmptyResult {
pub fn save(&self, conn: &DbConn) -> EmptyResult {
// We need to make sure we're not going to violate the unique constraint on org_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(
org_policies::table
.filter(org_policies::org_uuid.eq(&self.org_uuid))
.filter(org_policies::atype.eq(&self.atype)),
.filter(org_policies::org_uuid.eq(self.org_uuid))
.filter(org_policies::atype.eq(self.atype)),
)
.execute(&**conn)
.map_res("Error deleting org_policy for insert")?;
@ -79,7 +79,7 @@ impl OrgPolicy {
}
#[cfg(not(feature = "postgresql"))]
pub fn save(&mut self, conn: &DbConn) -> EmptyResult {
pub fn save(&self, conn: &DbConn) -> EmptyResult {
diesel::replace_into(org_policies::table)
.values(&*self)
.execute(&**conn)