diff options
| author | Christian Grothoff <christian@grothoff.org> | 2022-11-27 22:06:59 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2022-11-27 22:06:59 +0100 |
| commit | 07b4b1aa3f2c9ac74462ff3cb2b6a32c25e13c2e (patch) | |
| tree | 4b257fafade6de845225752ac8f0047742854f98 | |
| parent | 1cdd999c960a9625e6c71e09c68f86c37f2996e5 (diff) | |
| download | exchange-07b4b1aa3f2c9ac74462ff3cb2b6a32c25e13c2e.tar.gz exchange-07b4b1aa3f2c9ac74462ff3cb2b6a32c25e13c2e.tar.bz2 exchange-07b4b1aa3f2c9ac74462ff3cb2b6a32c25e13c2e.zip | |
handle partner_serial_id being NULL
| -rw-r--r-- | src/exchangedb/pg_get_reserve_history.c | 4 | ||||
| -rw-r--r-- | src/exchangedb/procedures.sql | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/exchangedb/pg_get_reserve_history.c b/src/exchangedb/pg_get_reserve_history.c index 8b8e280a6..6042a620e 100644 --- a/src/exchangedb/pg_get_reserve_history.c +++ b/src/exchangedb/pg_get_reserve_history.c @@ -803,7 +803,7 @@ TEH_PG_get_reserve_history (void *cls, " ON (am.purse_pub = pm.purse_pub AND" " am.reserve_pub = pm.reserve_pub)" " 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;"); PREPARE (pg, "history_by_reserve", @@ -1097,7 +1097,7 @@ TEH_PG_get_reserve_status (void *cls, " am.reserve_pub = pm.reserve_pub)" " WHERE pm.reserve_pub=$1" " 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;"); PREPARE (pg, "history_by_reserve_truncated", diff --git a/src/exchangedb/procedures.sql b/src/exchangedb/procedures.sql index f0df64440..ff3ddb3f7 100644 --- a/src/exchangedb/procedures.sql +++ b/src/exchangedb/procedures.sql @@ -1519,7 +1519,7 @@ out_conflict=FALSE; out_balance_ok=TRUE; -- 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 INTO psi ,my_reserve_pub |