diff options
| author | Christian Grothoff <christian@grothoff.org> | 2024-01-08 14:29:21 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2024-01-08 14:29:21 +0100 |
| commit | b26bab5ed8069ac79dda032a5167363ebb4727e7 (patch) | |
| tree | c46b34b0a4db129d67ccd24e29eb937ec71b8fce /src/exchangedb/pg_select_purse_merge.c | |
| parent | 2b41bb8f388fa2b99cc9b1715cd9689bdd6b85a7 (diff) | |
| download | exchange-b26bab5ed8069ac79dda032a5167363ebb4727e7.tar.xz | |
also do not respond with 410 to the GET /purses//merge request
Diffstat (limited to 'src/exchangedb/pg_select_purse_merge.c')
| -rw-r--r-- | src/exchangedb/pg_select_purse_merge.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/exchangedb/pg_select_purse_merge.c b/src/exchangedb/pg_select_purse_merge.c index d58e8892f..ecc047cc5 100644 --- a/src/exchangedb/pg_select_purse_merge.c +++ b/src/exchangedb/pg_select_purse_merge.c @@ -41,7 +41,6 @@ TEH_PG_select_purse_merge ( GNUNET_PQ_query_param_auto_from_type (purse_pub), GNUNET_PQ_query_param_end }; - bool is_null; struct GNUNET_PQ_ResultSpec rs[] = { GNUNET_PQ_result_spec_auto_from_type ("merge_sig", merge_sig), @@ -52,7 +51,7 @@ TEH_PG_select_purse_merge ( GNUNET_PQ_result_spec_allow_null ( GNUNET_PQ_result_spec_string ("partner_base_url", partner_url), - &is_null), + NULL), GNUNET_PQ_result_spec_allow_null ( GNUNET_PQ_result_spec_bool ("refunded", refunded), @@ -61,19 +60,19 @@ TEH_PG_select_purse_merge ( }; *partner_url = NULL; - *refunded = true; + *refunded = false; PREPARE (pg, "select_purse_merge", "SELECT " - " reserve_pub" - ",merge_sig" - ",merge_timestamp" - ",partner_base_url" - ",refunded" - " FROM purse_merges" - " LEFT JOIN purse_decision USING (purse_pub)" - " LEFT JOIN partners USING (partner_serial_id)" - " WHERE purse_pub=$1;"); + " pm.reserve_pub" + ",pm.merge_sig" + ",pm.merge_timestamp" + ",pr.partner_base_url" + ",pd.refunded" + " FROM purse_merges pm" + " LEFT JOIN purse_decision pd USING (purse_pub)" + " LEFT JOIN partners pr USING (partner_serial_id)" + " WHERE pm.purse_pub=$1;"); return GNUNET_PQ_eval_prepared_singleton_select (pg->conn, "select_purse_merge", params, |