mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(postgres): Minor changes to match actual table schema

Browse source
This commit is contained in:
Vincent Ambo 2018-09-26 18:20:04 +02:00
parent cbb58fa6c2
commit 6e35c083bf
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
finito-postgres/src/lib.rs
View file

@ -1,6 +1,8 @@
//! PostgreSQL-backed persistence for Finito state machines //! PostgreSQL-backed persistence for Finito state machines
//! //!
//! This module implements ... TODO when I can write again. //! This module implements ... TODO when I can write again.
//!
//! TODO: events & actions should have `SERIAL` keys
#[macro_use] extern crate postgres; #[macro_use] extern crate postgres;
#[macro_use] extern crate postgres_derive; #[macro_use] extern crate postgres_derive;
@ -97,6 +99,7 @@ struct ActionT {
event_id: Uuid, event_id: Uuid,
/// Serialised content of the action. /// Serialised content of the action.
#[postgres(name = "content")] // renamed because 'action' is a keyword in PG
action: Value, action: Value,
/// Current status of the action. /// Current status of the action.
@ -105,7 +108,7 @@ struct ActionT {
/// Serialised error representation, if an error occured during /// Serialised error representation, if an error occured during
/// processing. TODO: Use some actual error type. Maybe failure /// processing. TODO: Use some actual error type. Maybe failure
/// has serialisation support? /// has serialisation support?
error: Option<String>, error: Option<Value>,
} }
// The following functions implement the public interface of // The following functions implement the public interface of
@ -149,8 +152,8 @@ pub fn insert_machine<C, S>(conn: &C, initial: S) -> Result<MachineId<S>> where
C: GenericConnection, C: GenericConnection,
S: FSM + Serialize { S: FSM + Serialize {
let query = r#" let query = r#"
INSERT INTO machines (id, created, fsm, state) INSERT INTO machines (id, fsm, state)
VALUES ($1, NOW(), $2, $3) VALUES ($1, $2, $3)
"#; "#;
let id = Uuid::new_v4(); let id = Uuid::new_v4();
@ -171,8 +174,8 @@ where
S: FSM, S: FSM,
S::Event: Serialize { S::Event: Serialize {
let query = r#" let query = r#"
INSERT INTO events (id, created, fsm, fsm_id, event) INSERT INTO events (id, fsm, fsm_id, event)
VALUES ($1, NOW(), $2, $3, $4) VALUES ($1, $2, $3, $4)
"#; "#;
let id = Uuid::new_v4(); let id = Uuid::new_v4();
@ -192,8 +195,8 @@ fn insert_action<C, S>(conn: &C,
S: FSM, S: FSM,
S::Action: Serialize { S::Action: Serialize {
let query = r#" let query = r#"
INSERT INTO actions (id, created, fsm, fsm_id, event_id, action, status) INSERT INTO actions (id, fsm, fsm_id, event_id, action, status)
VALUES ($1, NOW(), $2, $3, $4, $5, $6) VALUES ($1, $2, $3, $4, $5, $6)
"#; "#;
let id = Uuid::new_v4(); let id = Uuid::new_v4();