Fix more bugs
This commit is contained in:
1 parent
60dae212ec
commit
42c38d55e1
9 files changed
+24
-18
No files matched your search
@@ -3,7 +3,7 @@ use crate::data::entities::{EntityData};
|
||||
use crate::data::repositories::{BatchedDbLayer, DbLayer};
|
||||
use crate::notification::MaybeError;
|
||||
use crate::notification::NotificationData::{DbLoadError, DbSaveError};
|
||||
use log::debug;
|
||||
use log::{debug, error};
|
||||
use rusqlite::{Connection, Error, Params, Row};
|
||||
use std::marker::PhantomData;
|
||||
use std::time::Instant;
|
||||
@@ -51,8 +51,8 @@ impl<T: EntityData, Q: TableAccessQuerySet<T>> DbLayer<T> for SqliteDbLayer<T, Q
|
||||
let time = Instant::now();
|
||||
|
||||
connection
|
||||
.execute(Q::load(), Q::update_params(entity))
|
||||
.map_err(|_| DbSaveError)?;
|
||||
.execute(Q::save(), Q::update_params(entity))
|
||||
.map_err(|e| {error!("{}", e); DbSaveError})?;
|
||||
debug!("Updated in {} for {:?}", Q::name(), time.elapsed());
|
||||
Ok(())
|
||||
}
|
||||
@@ -62,7 +62,7 @@ impl<T: EntityData, Q: TableAccessQuerySet<T>> DbLayer<T> for SqliteDbLayer<T, Q
|
||||
|
||||
let index: u32 = connection
|
||||
.query_row(Q::add(), Q::insert_params(entity), |row| row.get(0))
|
||||
.map_err(|_| DbSaveError)?;
|
||||
.map_err(|e| {error!("{}", e); DbSaveError})?;
|
||||
|
||||
entity.set_id(index.into());
|
||||
debug!("Added into {} for {:?}", Q::name(), time.elapsed());
|
||||
@@ -80,7 +80,7 @@ impl<T: EntityData, Q: TableAccessQuerySet<T>> DbLayer<T> for SqliteDbLayer<T, Q
|
||||
format!("DELETE FROM {} WHERE id = ?1", Q::name()).as_str(),
|
||||
(&id,),
|
||||
)
|
||||
.map_err(|_| DbSaveError)?;
|
||||
.map_err(|e| {error!("{}", e); DbSaveError})?;
|
||||
debug!("Deleted from {} for {:?}", Q::name(), time.elapsed());
|
||||
Ok(())
|
||||
}
|
||||
@@ -93,7 +93,7 @@ impl<T: EntityData, Q: TableAccessQuerySet<T>> DbLayer<T> for SqliteDbLayer<T, Q
|
||||
.expect("Failed to prepare state query");
|
||||
let iter = stmt
|
||||
.query_map([], |row| Ok(Q::from_sql(row)?))
|
||||
.map_err(|_| DbLoadError)?;
|
||||
.map_err(|e| {error!("{}", e); DbSaveError})?;
|
||||
|
||||
iter.filter_map(|res| res.ok())
|
||||
.for_each(|i| storage.push(i));
|
||||
|
||||
Reference in new issue
Block a user