emgauwa/common
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Add sql transactions"

Browse source 
This caused the error "locked database".
This reverts commit 19e2ea003b.
This commit is contained in:
Tobias Reisinger 2024-05-02 19:35:22 +02:00
parent 19e2ea003b
commit fc4c1df09a
Signed by: serguzim
GPG key ID: 13AD60C237A28DFE
17 changed files with 240 additions and 242 deletions

30
src/db/macro_action.rs
View file

@ -1,6 +1,6 @@
use std::ops::DerefMut;
use sqlx::Transaction;
use sqlx::pool::PoolConnection;
use sqlx::Sqlite;
use crate::db::{DbMacro, DbRelay, DbSchedule};
@ -17,16 +17,16 @@ pub struct DbMacroAction {
impl DbMacroAction {
pub async fn get_all(
tx: &mut Transaction<'_, Sqlite>,
conn: &mut PoolConnection<Sqlite>,
) -> Result<Vec<DbMacroAction>, DatabaseError> {
sqlx::query_as!(DbMacroAction, "SELECT * FROM macro_actions")
.fetch_all(tx.deref_mut())
.fetch_all(conn.deref_mut())
.await
.map_err(DatabaseError::from)
}
pub async fn get(
tx: &mut Transaction<'_, Sqlite>,
conn: &mut PoolConnection<Sqlite>,
id: i64,
) -> Result<Option<DbMacroAction>, DatabaseError> {
sqlx::query_as!(
@ -34,13 +34,13 @@ impl DbMacroAction {
"SELECT * FROM macro_actions WHERE id = ?",
id
)
.fetch_optional(tx.deref_mut())
.fetch_optional(conn.deref_mut())
.await
.map_err(DatabaseError::from)
}
pub async fn create(
tx: &mut Transaction<'_, Sqlite>,
conn: &mut PoolConnection<Sqlite>,
new_macro: &DbMacro,
new_relay: &DbRelay,
new_schedule: &DbSchedule,
@ -54,14 +54,14 @@ impl DbMacroAction {
new_schedule.id,
new_weekday
)
.fetch_optional(tx.deref_mut())
.fetch_optional(conn.deref_mut())
.await?
.ok_or(DatabaseError::InsertGetError)
}
pub async fn delete(&self, tx: &mut Transaction<'_, Sqlite>) -> Result<(), DatabaseError> {
pub async fn delete(&self, conn: &mut PoolConnection<Sqlite>) -> Result<(), DatabaseError> {
sqlx::query!("DELETE FROM macro_actions WHERE id = ?", self.id)
.execute(tx.deref_mut())
.execute(conn.deref_mut())
.await
.map(|res| match res.rows_affected() {
0 => Err(DatabaseError::DeleteError),
@ -71,27 +71,27 @@ impl DbMacroAction {
pub async fn get_relay(
&self,
tx: &mut Transaction<'_, Sqlite>,
conn: &mut PoolConnection<Sqlite>,
) -> Result<DbRelay, DatabaseError> {
DbRelay::get(tx, self.relay_id)
DbRelay::get(conn, self.relay_id)
.await?
.ok_or(DatabaseError::NotFound)
}
pub async fn get_schedule(
&self,
tx: &mut Transaction<'_, Sqlite>,
conn: &mut PoolConnection<Sqlite>,
) -> Result<DbSchedule, DatabaseError> {
DbSchedule::get(tx, self.schedule_id)
DbSchedule::get(conn, self.schedule_id)
.await?
.ok_or(DatabaseError::NotFound)
}
pub async fn get_macro(
&self,
tx: &mut Transaction<'_, Sqlite>,
conn: &mut PoolConnection<Sqlite>,
) -> Result<DbMacro, DatabaseError> {
DbMacro::get(tx, self.macro_id)
DbMacro::get(conn, self.macro_id)
.await?
.ok_or(DatabaseError::NotFound)
}