taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

-sql fix

Browse Source
This commit is contained in:
Christian Grothoff 2022-05-23 16:15:14 +02:00
parent 2e80f51e25
commit 6ee4558b6f
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/exchange/taler-exchange-httpd_responses.c
View File

@ -406,7 +406,9 @@ TEH_RESPONSE_compile_transaction_history (
TALER_JSON_pack_amount ("amount", TALER_JSON_pack_amount ("amount",
&pd->amount), &pd->amount),
GNUNET_JSON_pack_string ("exchange_base_url", GNUNET_JSON_pack_string ("exchange_base_url",
pd->exchange_base_url), NULL == pd->exchange_base_url
? TEH_base_url
: pd->exchange_base_url),
GNUNET_JSON_pack_data_auto ("purse_pub", GNUNET_JSON_pack_data_auto ("purse_pub",
&pd->purse_pub), &pd->purse_pub),
GNUNET_JSON_pack_data_auto ("coin_sig", GNUNET_JSON_pack_data_auto ("coin_sig",

8
src/exchangedb/plugin_exchangedb_postgres.c
View File

@ -1261,7 +1261,7 @@ prepare_statements (struct PostgresClosure *pg)
GNUNET_PQ_make_prepare ( GNUNET_PQ_make_prepare (
"get_purse_deposit_by_coin_pub", "get_purse_deposit_by_coin_pub",
"SELECT" "SELECT"
" partner_url" " partner_base_url"
",amount_with_fee_val" ",amount_with_fee_val"
",amount_with_fee_frac" ",amount_with_fee_frac"
",denoms.fee_deposit_val" ",denoms.fee_deposit_val"
@ -1273,12 +1273,12 @@ prepare_statements (struct PostgresClosure *pg)
" LEFT JOIN partners" " LEFT JOIN partners"
" USING (partner_serial_id)" " USING (partner_serial_id)"
" JOIN known_coins kc" " JOIN known_coins kc"
" ON (refresh_commitments.old_coin_pub = kc.coin_pub)" " ON (pd.coin_pub = kc.coin_pub)"
" JOIN denominations denoms" " JOIN denominations denoms"
" USING (denominations_serial)" " USING (denominations_serial)"
// FIXME: use to-be-created materialized index // FIXME: use to-be-created materialized index
// on coin_pub (query crosses partitions!) // on coin_pub (query crosses partitions!)
" WHERE coin_pub=$1;", " WHERE pd.coin_pub=$1;",
1), 1),
/* Store information about the desired denominations for a /* Store information about the desired denominations for a
refresh operation, used in #postgres_insert_refresh_reveal() */ refresh operation, used in #postgres_insert_refresh_reveal() */
@ -8001,7 +8001,7 @@ add_coin_purse_deposit (void *cls,
GNUNET_PQ_result_spec_uint64 ("purse_deposit_serial_id", GNUNET_PQ_result_spec_uint64 ("purse_deposit_serial_id",
&serial_id), &serial_id),
GNUNET_PQ_result_spec_allow_null ( GNUNET_PQ_result_spec_allow_null (
GNUNET_PQ_result_spec_string ("partner_url", GNUNET_PQ_result_spec_string ("partner_base_url",
&deposit->exchange_base_url), &deposit->exchange_base_url),
NULL), NULL),
GNUNET_PQ_result_spec_auto_from_type ("coin_sig", GNUNET_PQ_result_spec_auto_from_type ("coin_sig",