better relative time
This commit is contained in:
parent
0e46ea162a
commit
262aeaec66
8 changed files with 115 additions and 89 deletions
15
src/pg.ml
15
src/pg.ml
|
|
@ -27,6 +27,7 @@ module Caqti_type = struct
|
|||
not postgresql built-in timestamp type *)
|
||||
let ptime : Ptime.t option t = Timestamp.caqti
|
||||
let time = Timestamp.caqti
|
||||
let time_span = Timestamp.Span.caqti
|
||||
let age_mask : int t = Caqti_type.int
|
||||
let rsa_pub = RsaPublicKey.caqti
|
||||
let eddsa_pub = EddsaPublicKey.caqti
|
||||
|
|
@ -250,7 +251,9 @@ let insert_wire_fee =
|
|||
|
||||
let lookup_global_fee_by_time =
|
||||
let lookup_global_fee_by_time =
|
||||
let global_fee = Caqti_type.(t6 amount amount amount time time int32) in
|
||||
let global_fee =
|
||||
Caqti_type.(t6 amount amount amount time_span time_span int32)
|
||||
in
|
||||
Caqti_type.(t2 time time ->? global_fee)
|
||||
"SELECT (history_fee).*, (account_fee).*, (purse_fee).*, purse_timeout, \
|
||||
history_expiration, purse_account_limit FROM global_fee WHERE end_date \
|
||||
|
|
@ -263,7 +266,8 @@ let insert_global_fee =
|
|||
let insert_global_fee =
|
||||
let master_sig = Bin_sig.GlobalFees.caqti in
|
||||
Caqti_type.(
|
||||
t9 time time amount amount amount time time int32 master_sig ->. unit)
|
||||
t9 time time amount amount amount time_span time_span int32 master_sig
|
||||
->. unit)
|
||||
"INSERT INTO global_fee (start_date, end_date, history_fee, account_fee, \
|
||||
purse_fee, purse_timeout, history_expiration, purse_account_limit, \
|
||||
master_sig) VALUES ($1, $2, ($3,$4), ($5,$6), ($7,$8), $9, $10, $11, \
|
||||
|
|
@ -277,15 +281,12 @@ let insert_global_fee =
|
|||
history_fee;
|
||||
account_fee;
|
||||
purse_fee;
|
||||
history_expiration= _;
|
||||
history_expiration;
|
||||
purse_account_limit;
|
||||
purse_timeout= _;
|
||||
purse_timeout;
|
||||
master_sig;
|
||||
}
|
||||
->
|
||||
(* TODO time *)
|
||||
let purse_timeout = None in
|
||||
let history_expiration = None in
|
||||
Conn.exec insert_global_fee
|
||||
( start_date,
|
||||
end_date,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue