diff --git a/src/pg.ml b/src/pg.ml index 779fca8e..8707f156 100644 --- a/src/pg.ml +++ b/src/pg.ml @@ -83,14 +83,15 @@ let find_denom = in fun (module Conn : CONN) h_denom_pub -> Conn.find_opt find_denom h_denom_pub -(* TODO revocation master_sig *) let get_denominations = 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, master_sig, \ - NULL FROM denominations" + "SELECT dn.denom_pub, (dn.coin).*, dn.valid_from, dn.expire_withdraw, \ + dn.expire_deposit, dn.expire_legal, (dn.fee_withdraw).*, \ + (dn.fee_deposit).*, (dn.fee_refresh).*, (dn.fee_refund).*, dn.age_mask, \ + dn.denom_pub_hash, dn.master_sig, dnr.master_sig FROM denominations AS \ + dn LEFT JOIN denomination_revocations AS dnr ON dn.denominations_serial \ + = dnr.denominations_serial" in fun (module Conn : CONN) -> Conn.collect_list get_denominations ()