diff --git a/src/pg.ml b/src/pg.ml index 0553bbe7..29e8f73f 100644 --- a/src/pg.ml +++ b/src/pg.ml @@ -73,15 +73,14 @@ let insert_signkey = in fun (module Conn : CONN) v -> Conn.exec insert_signkey v +(* TODO revokation master_sig *) let find_denom = let find_denom = Caqti_type.(denomination_hash ->? denom_data) "SELECT denom_pub, (coin).*, valid_from, expire_withdraw, \ expire_deposit, expire_legal, (fee_withdraw).*, (fee_deposit).*, \ - (fee_refresh).*, (fee_refund).*, age_mask, denom_pub_hash, \ - denominations.master_sig, denomination_revocations.master_sig FROM \ - denominations WHERE denom_pub_hash=$1 LEFT JOIN \ - denomination_revocations USING (denominations_serial)" + (fee_refresh).*, (fee_refund).*, age_mask, denom_pub_hash, master_sig, \ + NULL FROM denominations WHERE denom_pub_hash=$1" in fun (module Conn : CONN) h_denom_pub -> Conn.find_opt find_denom h_denom_pub @@ -90,10 +89,8 @@ let get_denominations = Caqti_type.(unit ->* denom_data) "SELECT denom_pub, (coin).*, valid_from, expire_withdraw, \ expire_deposit, expire_legal, (fee_withdraw).*, (fee_deposit).*, \ - (fee_refresh).*, (fee_refund).*, age_mask, denom_pub_hash, \ - denominations.master_sig, denomination_revocations.master_sig FROM \ - denominations LEFT JOIN denomination_revocations USING \ - (denominations_serial)" + (fee_refresh).*, (fee_refund).*, age_mask, denom_pub_hash, master_sig, \ + NULL FROM denominations" in fun (module Conn : CONN) -> Conn.collect_list get_denominations ()