Start9/patch-db
2
0
Fork 0
mirror of https://github.com/Start9Labs/patch-db.git synced 2026-03-26 02:11:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

switch error type on lock fn

Browse Source
This commit is contained in:
Aiden McClelland
2021-12-16 12:15:21 -07:00
committed by Aiden McClelland
parent 1fbe344dd5
commit afea35995d
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patch-db/src/model.rs
View File

@@ -9,7 +9,7 @@ use json_ptr::JsonPointer;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_json::Value; use serde_json::Value;
use crate::locker::{LockError, LockType}; use crate::locker::LockType;
use crate::{DbHandle, DiffPatch, Error, Revision}; use crate::{DbHandle, DiffPatch, Error, Revision};
#[derive(Debug)] #[derive(Debug)]
@@ -65,12 +65,8 @@ impl<T> Model<T>
where where
T: Serialize + for<'de> Deserialize<'de>, T: Serialize + for<'de> Deserialize<'de>,
{ {
pub async fn lock<Db: DbHandle>( pub async fn lock<Db: DbHandle>(&self, db: &mut Db, lock_type: LockType) -> Result<(), Error> {
&self, Ok(db.lock(self.ptr.clone(), lock_type).await?)
db: &mut Db,
lock_type: LockType,
) -> Result<(), LockError> {
db.lock(self.ptr.clone(), lock_type).await
} }
pub async fn get<Db: DbHandle>(&self, db: &mut Db, lock: bool) -> Result<ModelData<T>, Error> { pub async fn get<Db: DbHandle>(&self, db: &mut Db, lock: bool) -> Result<ModelData<T>, Error> {
@@ -232,12 +228,8 @@ impl<T: HasModel + Serialize + for<'de> Deserialize<'de>> HasModel for Box<T> {
#[derive(Debug)] #[derive(Debug)]
pub struct OptionModel<T: HasModel + Serialize + for<'de> Deserialize<'de>>(T::Model); pub struct OptionModel<T: HasModel + Serialize + for<'de> Deserialize<'de>>(T::Model);
impl<T: HasModel + Serialize + for<'de> Deserialize<'de>> OptionModel<T> { impl<T: HasModel + Serialize + for<'de> Deserialize<'de>> OptionModel<T> {
pub async fn lock<Db: DbHandle>( pub async fn lock<Db: DbHandle>(&self, db: &mut Db, lock_type: LockType) -> Result<(), Error> {
&self, Ok(db.lock(self.0.as_ref().clone(), lock_type).await?)
db: &mut Db,
lock_type: LockType,
) -> Result<(), LockError> {
db.lock(self.0.as_ref().clone(), lock_type).await
} }
pub async fn get<Db: DbHandle>( pub async fn get<Db: DbHandle>(