diff options
Diffstat (limited to 'src/backenddb/pg_lookup_deposits.c')
| -rw-r--r-- | src/backenddb/pg_lookup_deposits.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/src/backenddb/pg_lookup_deposits.c b/src/backenddb/pg_lookup_deposits.c index 242d7bbb..2440f62c 100644 --- a/src/backenddb/pg_lookup_deposits.c +++ b/src/backenddb/pg_lookup_deposits.c @@ -73,7 +73,6 @@ lookup_deposits_cb (void *cls, struct TALER_Amount amount_with_fee; struct TALER_Amount deposit_fee; struct TALER_Amount refund_fee; - struct TALER_Amount wire_fee; char *exchange_url; struct GNUNET_PQ_ResultSpec rs[] = { GNUNET_PQ_result_spec_string ("exchange_url", @@ -86,8 +85,6 @@ lookup_deposits_cb (void *cls, &deposit_fee), TALER_PQ_result_spec_amount_with_currency ("refund_fee", &refund_fee), - TALER_PQ_result_spec_amount_with_currency ("wire_fee", - &wire_fee), GNUNET_PQ_result_spec_end }; @@ -105,8 +102,7 @@ lookup_deposits_cb (void *cls, &coin_pub, &amount_with_fee, &deposit_fee, - &refund_fee, - &wire_fee); + &refund_fee); GNUNET_PQ_cleanup_result (rs); } ldc->qs = num_results; @@ -142,14 +138,15 @@ TMH_PG_lookup_deposits ( PREPARE (pg, "lookup_deposits", "SELECT" - " exchange_url" - ",coin_pub" - ",amount_with_fee" - ",deposit_fee" - ",refund_fee" - ",wire_fee" - " FROM merchant_deposits" - " WHERE order_serial=" + " dcom.exchange_url" + ",dep.coin_pub" + ",dep.amount_with_fee" + ",dep.deposit_fee" + ",dep.refund_fee" + " FROM merchant_deposits dep" + " JOIN merchant_deposit_confirmations dcom" + " USING (deposit_confirmation_serial)" + " WHERE dcom.order_serial=" " (SELECT order_serial" " FROM merchant_contract_terms" " WHERE h_contract_terms=$2" |