From 1a2565118240c25389645ef8b0108869241bcfb5 Mon Sep 17 00:00:00 2001 From: niftynei Date: Mon, 15 Aug 2022 14:41:21 -0500 Subject: [PATCH] bkpr-recorder: fatal if there's an error with a database statement We were silently failing when NULLS FIRST wasn't found on older boxes (running sqlite3 < v3.30.1) --- plugins/bkpr/recorder.c | 2 ++ plugins/bkpr/test/run-recorder.c | 1 + 2 files changed, 3 insertions(+) diff --git a/plugins/bkpr/recorder.c b/plugins/bkpr/recorder.c index 79a70f8b6..0d8ab5b47 100644 --- a/plugins/bkpr/recorder.c +++ b/plugins/bkpr/recorder.c @@ -72,6 +72,8 @@ static struct chain_event **find_chain_events(const tal_t *ctx, struct chain_event **results; db_query_prepared(stmt); + if (stmt->error) + db_fatal("find_chain_events err: %s", stmt->error); results = tal_arr(ctx, struct chain_event *, 0); while (db_step(stmt)) { struct chain_event *e = stmt2chain_event(results, stmt); diff --git a/plugins/bkpr/test/run-recorder.c b/plugins/bkpr/test/run-recorder.c index 393c052a1..01b33af1c 100644 --- a/plugins/bkpr/test/run-recorder.c +++ b/plugins/bkpr/test/run-recorder.c @@ -697,6 +697,7 @@ static bool test_onchain_fee_chan_close(const tal_t *ctx, struct plugin *p) CHECK(acct->onchain_resolved_block == 0); db_begin_transaction(db); maybe_mark_account_onchain(db, acct); + CHECK_MSG(!db_err, db_err); CHECK(acct->onchain_resolved_block == blockheight + 2); err = update_channel_onchain_fees(ctx, db, acct); CHECK_MSG(!err, err);