diff options
Diffstat (limited to 'src/exchangedb')
-rw-r--r-- | src/exchangedb/pg_insert_close_request.c | 4 | ||||
-rw-r--r-- | src/exchangedb/pg_select_reserve_close_info.c | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/exchangedb/pg_insert_close_request.c b/src/exchangedb/pg_insert_close_request.c index 43ca944f4..a62c2cba7 100644 --- a/src/exchangedb/pg_insert_close_request.c +++ b/src/exchangedb/pg_insert_close_request.c @@ -54,12 +54,12 @@ TEH_PG_insert_close_request ( ",close_timestamp" ",reserve_sig" ",close_val" - ",close_frac," + ",close_frac" ",close_fee_val" ",close_fee_frac" ",payto_uri" ")" - "VALUES ($1, $2, $3, $4, $5, $6, $7)" + "VALUES ($1, $2, $3, $4, $5, $6, $7, $8)" " ON CONFLICT DO NOTHING;"); return GNUNET_PQ_eval_prepared_non_select (pg->conn, "insert_account_close", diff --git a/src/exchangedb/pg_select_reserve_close_info.c b/src/exchangedb/pg_select_reserve_close_info.c index 0b373b7bb..973f5fa51 100644 --- a/src/exchangedb/pg_select_reserve_close_info.c +++ b/src/exchangedb/pg_select_reserve_close_info.c @@ -39,7 +39,7 @@ TEH_PG_select_reserve_close_info ( GNUNET_PQ_query_param_end }; struct GNUNET_PQ_ResultSpec rs[] = { - TALER_PQ_RESULT_SPEC_AMOUNT ("close", + TALER_PQ_RESULT_SPEC_AMOUNT ("current_balance", balance), GNUNET_PQ_result_spec_string ("payto_uri", payto_uri), @@ -49,10 +49,12 @@ TEH_PG_select_reserve_close_info ( PREPARE (pg, "select_reserve_close_info", "SELECT " - " close_frac" - ",close_val" - ",payto_uri" - " FROM close_requests" + " r.current_balance_val" + ",r.current_balance_frac" + ",wt.payto_uri" + " FROM reserves r" + " LEFT JOIN reserves_in ri USING (reserve_pub)" + " LEFT JOIN wire_targets wt ON (ri.wire_source_h_payto = wt.wire_target_h_payto)" " WHERE reserve_pub=$1;"); return GNUNET_PQ_eval_prepared_singleton_select (pg->conn, "select_reserve_close_info", |