From 360aa15e4d9c6b98f852305845402467ea32014c Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 1 Nov 2017 11:40:48 +1030 Subject: [PATCH] db_query: don't remove transaction or set error if query fails. We return NULL in this case. Signed-off-by: Rusty Russell --- wallet/db.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/wallet/db.c b/wallet/db.c index 8151241a4..88a63de92 100644 --- a/wallet/db.c +++ b/wallet/db.c @@ -203,7 +203,6 @@ sqlite3_stmt *PRINTF_FMT(3, 4) va_list ap; char *query; sqlite3_stmt *stmt; - int err; if (db->in_transaction && db->err) return NULL; @@ -214,12 +213,8 @@ sqlite3_stmt *PRINTF_FMT(3, 4) query = tal_vfmt(db, fmt, ap); va_end(ap); - err = sqlite3_prepare_v2(db->sql, query, -1, &stmt, NULL); - if (err != SQLITE_OK) { - db->in_transaction = false; - db->err = tal_fmt(db, "%s:%s:%s:%s", caller, - sqlite3_errstr(err), query, sqlite3_errmsg(db->sql)); - } + /* Sets stmt to NULL if not SQLITE_OK */ + sqlite3_prepare_v2(db->sql, query, -1, &stmt, NULL); return stmt; }