lib-sql: Fix wrong sql_query_finished_event() success parameter use

diff --git a/src/lib-sql/driver-cassandra.c b/src/lib-sql/driver-cassandra.c
index 1db32061964bf2afae53666c7ddfd28aa3c43d57..c87503b17ed5a0653bff0f9007351bba1a2324a6 100644 (file)
--- a/src/lib-sql/driver-cassandra.c
+++ b/src/lib-sql/driver-cassandra.c
@@ -939,7 +939,8 @@ static void driver_cassandra_log_result(struct cassandra_result *result,
 
        struct event_passthrough *e =
                sql_query_finished_event(&db->api, result->api.event,
-                                        result->query, FALSE, NULL);
+                                        result->query, result->error == NULL,
+                                        NULL);
        if (result->error != NULL)
                e->add_str("error", result->error);
 

diff --git a/src/lib-sql/driver-sqlite.c b/src/lib-sql/driver-sqlite.c
index 25cd79c0a26b4304acaaec91ce5e65fd20e2e089..dd5a6b8bee6ddfa2bf5c3179ebfea5ba8b818b3c 100644 (file)
--- a/src/lib-sql/driver-sqlite.c
+++ b/src/lib-sql/driver-sqlite.c
@@ -141,11 +141,11 @@ driver_sqlite_escape_string(struct sql_db *_db ATTR_UNUSED,
 static void driver_sqlite_result_log(const struct sql_result *result, const char *query)
 {
        struct sqlite_db *db = (struct sqlite_db *)result->db;
-       bool failed = !db->connected || (db->rc == SQLITE_OK);
+       bool success = db->connected && db->rc == SQLITE_OK;
        int duration;
        const char *suffix = "";
        struct event_passthrough *e =
-               sql_query_finished_event(&db->api, result->event, query, failed,
+               sql_query_finished_event(&db->api, result->event, query, success,
                                         &duration);
        io_loop_time_refresh();
 

diff --git a/src/lib-sql/driver-sqlpool.c b/src/lib-sql/driver-sqlpool.c
index 2b191529699461cfe70831f5667508c20a933844..fd327131fee294153c6899d1305c6f16e551a143 100644 (file)
--- a/src/lib-sql/driver-sqlpool.c
+++ b/src/lib-sql/driver-sqlpool.c
@@ -622,7 +622,7 @@ static void driver_sqlpool_timeout(struct sqlpool_db *db)
 
                if (request->query != NULL) {
                        e_error(sql_query_finished_event(&db->api, request->event,
-                                                        request->query, TRUE,
+                                                        request->query, FALSE,
                                                         &duration)->
                                        add_str("error", "Query timed out")->
                                        event(),