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

handle partner_serial_id being NULL

Browse Source
This commit is contained in:
Christian Grothoff 2022-11-27 22:06:59 +01:00
parent 1cdd999c96
commit 07b4b1aa3f
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/exchangedb/pg_get_reserve_history.c
View File

@ -803,7 +803,7 @@ TEH_PG_get_reserve_history (void *cls,
" ON (am.purse_pub = pm.purse_pub AND" " ON (am.purse_pub = pm.purse_pub AND"
" am.reserve_pub = pm.reserve_pub)" " am.reserve_pub = pm.reserve_pub)"
" WHERE pm.reserve_pub=$1" " WHERE pm.reserve_pub=$1"
" AND pm.partner_serial_id=0" /* must be local! */ " AND COALESCE(pm.partner_serial_id,0)=0" /* must be local! */
" AND NOT pdes.refunded;"); " AND NOT pdes.refunded;");
PREPARE (pg, PREPARE (pg,
"history_by_reserve", "history_by_reserve",
@ -1097,7 +1097,7 @@ TEH_PG_get_reserve_status (void *cls,
" am.reserve_pub = pm.reserve_pub)" " am.reserve_pub = pm.reserve_pub)"
" WHERE pm.reserve_pub=$1" " WHERE pm.reserve_pub=$1"
" AND pm.merge_timestamp >= $2" " AND pm.merge_timestamp >= $2"
" AND pm.partner_serial_id=0" /* must be local! */ " AND COALESCE(pm.partner_serial_id,0)=0" /* must be local! */
" AND NOT pdes.refunded;"); " AND NOT pdes.refunded;");
PREPARE (pg, PREPARE (pg,
"history_by_reserve_truncated", "history_by_reserve_truncated",

2
src/exchangedb/procedures.sql
View File

@ -1519,7 +1519,7 @@ out_conflict=FALSE;
out_balance_ok=TRUE; out_balance_ok=TRUE;
-- See if we can finish the merge or need to update the trigger time and partner. -- See if we can finish the merge or need to update the trigger time and partner.
SELECT partner_serial_id SELECT COALESCE(partner_serial_id,0)
,reserve_pub ,reserve_pub
INTO psi INTO psi
,my_reserve_pub ,my_reserve_pub