aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 07:04:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

db: catch SQL errors unless we're expecting them.

Browse Source 
I couldn't figure out why my new SQL query was returning 0 rows,
and it was because we were ignoring errors.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2023-04-05 12:30:23 +09:30
parent d2176e3385
commit 9bcf28afb3
4 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
db/exec.c
View File

@@ -25,7 +25,7 @@ int db_get_version(struct db *db)
* table that doesn't exist yet, so we need to terminate and restart
* the DB transaction.
*/
if (!db_query_prepared(stmt)) {
if (!db_query_prepared_canfail(stmt)) {
db_commit_transaction(stmt->db);
db_begin_transaction(stmt->db);
tal_free(stmt);
@@ -45,7 +45,7 @@ u32 db_data_version_get(struct db *db)
u32 version;
stmt = db_prepare_v2(db, SQL("SELECT intval FROM vars WHERE name = 'data_version'"));
/* postgres will act upset if the table doesn't exist yet. */
if (!db_query_prepared(stmt)) {
if (!db_query_prepared_canfail(stmt)) {
tal_free(stmt);
return 0;
}
@@ -85,7 +85,7 @@ s64 db_get_intvar(struct db *db, char *varname, s64 defval)
struct db_stmt *stmt = db_prepare_v2(
db, SQL("SELECT intval FROM vars WHERE name= ? LIMIT 1"));
db_bind_text(stmt, 0, varname);
if (db_query_prepared(stmt) && db_step(stmt))
if (db_query_prepared_canfail(stmt) && db_step(stmt))
res = db_col_int(stmt, "intval");
tal_free(stmt);