lib-sql: Added sql_update_get_rows().

--HG--
branch : HEAD

diff --git a/src/lib-sql/driver-mysql.c b/src/lib-sql/driver-mysql.c
index 19402be89e2bb20ea8f17196c2b46e3251002b6d..6e29a6c4dc7ea3e9f8daedf4db4ca3b5668d5f0c 100644 (file)
--- a/src/lib-sql/driver-mysql.c
+++ b/src/lib-sql/driver-mysql.c
@@ -77,6 +77,7 @@ struct mysql_transaction_context {
 struct mysql_query_list {
        struct mysql_query_list *next;
        const char *query;
+       unsigned int *affected_rows;
 };
 
 extern struct sql_db driver_mysql_db;
@@ -598,6 +599,7 @@ static int transaction_send_query(struct mysql_transaction_context *ctx,
                                  const char *query)
 {
        struct sql_result *result;
+       my_ulonglong rows;
        int ret = 0;
 
        if (ctx->failed)
@@ -608,6 +610,12 @@ static int transaction_send_query(struct mysql_transaction_context *ctx,
                ctx->error = sql_result_get_error(result);
                ctx->failed = TRUE;
                ret = -1;
+       } else if (ctx->head != NULL && ctx->head->affected_rows != NULL) {
+               struct mysql_result *my_result = (struct mysql_result *)result;
+
+               rows = mysql_affected_rows(my_result->conn->mysql);
+               i_assert(rows != (my_ulonglong)-1);
+               *ctx->head->affected_rows = rows;
        }
        sql_result_unref(result);
        return ret;
@@ -650,7 +658,8 @@ driver_mysql_transaction_rollback(struct sql_transaction_context *_ctx)
 }
 
 static void
-driver_mysql_update(struct sql_transaction_context *_ctx, const char *query)
+driver_mysql_update(struct sql_transaction_context *_ctx, const char *query,
+                   unsigned int *affected_rows)
 {
        struct mysql_transaction_context *ctx =
                (struct mysql_transaction_context *)_ctx;
@@ -658,6 +667,7 @@ driver_mysql_update(struct sql_transaction_context *_ctx, const char *query)
 
        list = p_new(ctx->query_pool, struct mysql_query_list, 1);
        list->query = p_strdup(ctx->query_pool, query);
+       list->affected_rows = affected_rows;
 
        if (ctx->head == NULL)
                ctx->head = list;

diff --git a/src/lib-sql/driver-pgsql.c b/src/lib-sql/driver-pgsql.c
index 3ffa6748813d177940b0aa6619eb4a1d7057ba0a..c7eaea1db2bfd79a3460e1b4e901193e955bcde5 100644 (file)
--- a/src/lib-sql/driver-pgsql.c
+++ b/src/lib-sql/driver-pgsql.c
@@ -86,13 +86,14 @@ struct pgsql_transaction_context {
 
 struct pgsql_query_list {
        struct pgsql_query_list *next;
+       struct pgsql_transaction_context *ctx;
+
        const char *query;
+       unsigned int *affected_rows;
 };
 extern struct sql_db driver_pgsql_db;
 extern struct sql_result driver_pgsql_result;
 
-static void
-transaction_update_callback(struct sql_result *result, void *context);
 static void
 driver_pgsql_query_full(struct sql_db *db, const char *query,
                        sql_query_callback_t *callback, void *context,
@@ -900,11 +901,23 @@ driver_pgsql_transaction_unref(struct pgsql_transaction_context *ctx)
 }
 
 static void
-transaction_commit_callback(struct sql_result *result, void *context)
+transaction_begin_callback(struct sql_result *result,
+                           struct pgsql_transaction_context *ctx)
 {
-       struct pgsql_transaction_context *ctx =
-               (struct pgsql_transaction_context *)context;
+       if (sql_result_next_row(result) < 0) {
+               ctx->begin_failed = TRUE;
+               ctx->failed = TRUE;
+               ctx->error = sql_result_get_error(result);
+       } else {
+               ctx->begin_succeeded = TRUE;
+       }
+       driver_pgsql_transaction_unref(ctx);
+}
 
+static void
+transaction_commit_callback(struct sql_result *result,
+                           struct pgsql_transaction_context *ctx)
+{
        if (sql_result_next_row(result) < 0)
                ctx->callback(sql_result_get_error(result), ctx->context);
        else
@@ -913,17 +926,18 @@ transaction_commit_callback(struct sql_result *result, void *context)
 }
 
 static void
-transaction_update_callback(struct sql_result *result, void *context)
+transaction_update_callback(struct sql_result *result,
+                           struct pgsql_query_list *list)
 {
-       struct pgsql_transaction_context *ctx = context;
+       struct pgsql_transaction_context *ctx = list->ctx;
 
        if (sql_result_next_row(result) < 0) {
-               if (!ctx->begin_succeeded)
-                       ctx->begin_failed = TRUE;
                ctx->failed = TRUE;
                ctx->error = sql_result_get_error(result);
-       } else {
-               ctx->begin_succeeded = TRUE;
+       } else if (list->affected_rows != NULL) {
+               struct pgsql_result *pg_result = (struct pgsql_result *)result;
+
+               *list->affected_rows = atoi(PQcmdTuples(pg_result->pgres));
        }
        driver_pgsql_transaction_unref(ctx);
 }
@@ -948,11 +962,11 @@ driver_pgsql_transaction_commit(struct sql_transaction_context *_ctx,
        } else {
                /* multiple queries, use a transaction */
                ctx->refcount++;
-               sql_query(_ctx->db, "BEGIN", transaction_update_callback, ctx);
+               sql_query(_ctx->db, "BEGIN", transaction_begin_callback, ctx);
                while (ctx->head != NULL) {
                        ctx->refcount++;
                        sql_query(_ctx->db, ctx->head->query,
-                                 transaction_update_callback, ctx);
+                                 transaction_update_callback, ctx->head);
                        ctx->head = ctx->head->next;
                }
                sql_query(_ctx->db, "COMMIT", transaction_commit_callback, ctx);
@@ -978,11 +992,11 @@ driver_pgsql_transaction_commit_s(struct sql_transaction_context *_ctx,
        } else {
                /* multiple queries, use a transaction */
                ctx->refcount++;
-               sql_query(_ctx->db, "BEGIN", transaction_update_callback, ctx);
+               sql_query(_ctx->db, "BEGIN", transaction_begin_callback, ctx);
                while (ctx->head != NULL) {
                        ctx->refcount++;
                        sql_query(_ctx->db, ctx->head->query,
-                                 transaction_update_callback, ctx);
+                                 transaction_update_callback, ctx->head);
                        ctx->head = ctx->head->next;
                }
                if (ctx->refcount > 1) {
@@ -1004,6 +1018,14 @@ driver_pgsql_transaction_commit_s(struct sql_transaction_context *_ctx,
        else if (result != NULL) {
                if (sql_result_next_row(result) < 0)
                        *error_r = sql_result_get_error(result);
+               else if (ctx->head != NULL &&
+                        ctx->head->affected_rows != NULL) {
+                       struct pgsql_result *pg_result =
+                               (struct pgsql_result *)result;
+
+                       *ctx->head->affected_rows =
+                               atoi(PQcmdTuples(pg_result->pgres));
+               }
        }
        if (result != NULL)
                sql_result_unref(result);
@@ -1024,14 +1046,17 @@ driver_pgsql_transaction_rollback(struct sql_transaction_context *_ctx)
 }
 
 static void
-driver_pgsql_update(struct sql_transaction_context *_ctx, const char *query)
+driver_pgsql_update(struct sql_transaction_context *_ctx, const char *query,
+                   unsigned int *affected_rows)
 {
        struct pgsql_transaction_context *ctx =
                (struct pgsql_transaction_context *)_ctx;
        struct pgsql_query_list *list;
 
        list = p_new(ctx->query_pool, struct pgsql_query_list, 1);
+       list->ctx = ctx;
        list->query = p_strdup(ctx->query_pool, query);
+       list->affected_rows = affected_rows;
 
        if (ctx->head == NULL)
                ctx->head = list;

diff --git a/src/lib-sql/driver-sqlite.c b/src/lib-sql/driver-sqlite.c
index 3b590e886071a3d949c8f9debe292850b9123a7e..6a08490efb02f1dee657f78fa90e9ef918dfb313 100644 (file)
--- a/src/lib-sql/driver-sqlite.c
+++ b/src/lib-sql/driver-sqlite.c
@@ -369,7 +369,8 @@ driver_sqlite_transaction_commit_s(struct sql_transaction_context *_ctx,
 }
 
 static void
-driver_sqlite_update(struct sql_transaction_context *_ctx, const char *query)
+driver_sqlite_update(struct sql_transaction_context *_ctx, const char *query,
+                    unsigned int *affected_rows)
 {
        struct sqlite_transaction_context *ctx =
                (struct sqlite_transaction_context *)_ctx;
@@ -381,6 +382,8 @@ driver_sqlite_update(struct sql_transaction_context *_ctx, const char *query)
        sql_exec(_ctx->db, query);
        if (db->rc != SQLITE_OK)
                ctx->failed = TRUE;
+       else if (affected_rows != NULL)
+               *affected_rows = sqlite3_changes(db->sqlite);
 }
 
 struct sql_db driver_sqlite_db = {

diff --git a/src/lib-sql/sql-api-private.h b/src/lib-sql/sql-api-private.h
index d5d2cfcbbfe1348d6d0d3864c81dc5a8be8478f9..3c5b92afb11884defbe7d24319eba3eb7585ab55 100644 (file)
--- a/src/lib-sql/sql-api-private.h
+++ b/src/lib-sql/sql-api-private.h
@@ -35,7 +35,8 @@ struct sql_db_vfuncs {
                                    const char **error_r);
        void (*transaction_rollback)(struct sql_transaction_context *ctx);
 
-       void (*update)(struct sql_transaction_context *ctx, const char *query);
+       void (*update)(struct sql_transaction_context *ctx, const char *query,
+                      unsigned int *affected_rows);
 };
 
 struct sql_db {

diff --git a/src/lib-sql/sql-api.c b/src/lib-sql/sql-api.c
index 408d1aa9ac5a1bc7415c76290efafc4f1f0bc2db..42465b9b342bcfa46ec28a2bc96e839720aa2516 100644 (file)
--- a/src/lib-sql/sql-api.c
+++ b/src/lib-sql/sql-api.c
@@ -325,7 +325,13 @@ void sql_transaction_rollback(struct sql_transaction_context **_ctx)
 
 void sql_update(struct sql_transaction_context *ctx, const char *query)
 {
-       ctx->db->v.update(ctx, query);
+       sql_update_get_rows(ctx, query, NULL);
+}
+
+void sql_update_get_rows(struct sql_transaction_context *ctx, const char *query,
+                        unsigned int *affected_rows)
+{
+       ctx->db->v.update(ctx, query, affected_rows);
 }
 
 struct sql_result sql_not_connected_result = {

diff --git a/src/lib-sql/sql-api.h b/src/lib-sql/sql-api.h
index ad6a1cd66115e43ac9546ea675cab63fb89b5e98..9853ae1ca44cf9846c636844d7971f7a848082f5 100644 (file)
--- a/src/lib-sql/sql-api.h
+++ b/src/lib-sql/sql-api.h
@@ -144,5 +144,9 @@ void sql_transaction_rollback(struct sql_transaction_context **ctx);
 
 /* Execute query in given transaction. */
 void sql_update(struct sql_transaction_context *ctx, const char *query);
+/* Save the number of rows updated by this query. The value is set before
+   commit callback is called. */
+void sql_update_get_rows(struct sql_transaction_context *ctx, const char *query,
+                        unsigned int *affected_rows);
 
 #endif