diff options
| -rw-r--r-- | src/db.c | 16 | ||||
| -rw-r--r-- | src/db.h | 2 | ||||
| -rw-r--r-- | tests/db/db_test.err | 5 |
3 files changed, 4 insertions, 19 deletions
@@ -70,20 +70,10 @@ static void sql3_sql_log_cb(void *arg, sqlite3 *s3, const char *stmt, int type) } /* remove bindings and reset statement to be re-executed */ -bool db_remove_reset(sqlite3_stmt *stmt) +void db_remove_reset(sqlite3_stmt *stmt) { - int rc = sqlite3_clear_bindings(stmt); - if (rc != SQLITE_OK) { - LOGP(DDB, LOGL_ERROR, "Error clerearing bindings: %d\n", rc); - return false; - } - - rc = sqlite3_reset(stmt); - if (rc != SQLITE_OK) { - LOGP(DDB, LOGL_ERROR, "Error in sqlite3_reset: %d\n", rc); - return false; - } - return true; + sqlite3_clear_bindings(stmt); + sqlite3_reset(stmt); } /** bind text arg and do proper cleanup in case of failure. If param_name is @@ -25,7 +25,7 @@ struct db_context { sqlite3_stmt *stmt[_NUM_DB_STMT]; }; -bool db_remove_reset(sqlite3_stmt *stmt); +void db_remove_reset(sqlite3_stmt *stmt); bool db_bind_text(sqlite3_stmt *stmt, const char *param_name, const char *text); bool db_bind_int(sqlite3_stmt *stmt, const char *param_name, int nr); bool db_bind_int64(sqlite3_stmt *stmt, const char *param_name, int64_t nr); diff --git a/tests/db/db_test.err b/tests/db/db_test.err index ac0e2f1..1b08cec 100644 --- a/tests/db/db_test.err +++ b/tests/db/db_test.err @@ -29,7 +29,6 @@ struct hlr_subscriber { db_subscr_create(dbc, imsi0) --> -EIO DDB (2067) abort at 18 in [INSERT INTO subscriber (imsi) VALUES ($imsi)]: UNIQUE constraint failed: subscriber.imsi -DDB Error in sqlite3_reset: 2067 DAUC IMSI='123456789000000': Cannot create subscriber: SQL error: (2067) UNIQUE constraint failed: subscriber.imsi db_subscr_get_by_imsi(dbc, imsi0, &g_subscr) --> 0 @@ -40,12 +39,10 @@ struct hlr_subscriber { db_subscr_create(dbc, imsi1) --> -EIO DDB (2067) abort at 18 in [INSERT INTO subscriber (imsi) VALUES ($imsi)]: UNIQUE constraint failed: subscriber.imsi -DDB Error in sqlite3_reset: 2067 DAUC IMSI='123456789000001': Cannot create subscriber: SQL error: (2067) UNIQUE constraint failed: subscriber.imsi db_subscr_create(dbc, imsi1) --> -EIO DDB (2067) abort at 18 in [INSERT INTO subscriber (imsi) VALUES ($imsi)]: UNIQUE constraint failed: subscriber.imsi -DDB Error in sqlite3_reset: 2067 DAUC IMSI='123456789000001': Cannot create subscriber: SQL error: (2067) UNIQUE constraint failed: subscriber.imsi db_subscr_get_by_imsi(dbc, imsi1, &g_subscr) --> 0 @@ -56,12 +53,10 @@ struct hlr_subscriber { db_subscr_create(dbc, imsi2) --> -EIO DDB (2067) abort at 18 in [INSERT INTO subscriber (imsi) VALUES ($imsi)]: UNIQUE constraint failed: subscriber.imsi -DDB Error in sqlite3_reset: 2067 DAUC IMSI='123456789000002': Cannot create subscriber: SQL error: (2067) UNIQUE constraint failed: subscriber.imsi db_subscr_create(dbc, imsi2) --> -EIO DDB (2067) abort at 18 in [INSERT INTO subscriber (imsi) VALUES ($imsi)]: UNIQUE constraint failed: subscriber.imsi -DDB Error in sqlite3_reset: 2067 DAUC IMSI='123456789000002': Cannot create subscriber: SQL error: (2067) UNIQUE constraint failed: subscriber.imsi db_subscr_get_by_imsi(dbc, imsi2, &g_subscr) --> 0 |