Mercurial > dovecot > original-hg > dovecot-1.2
changeset 9360:4530228c8993 HEAD
lib-sql: Added sql_update_get_rows().
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Sun, 06 Sep 2009 20:42:42 -0400 |
parents | 6debbb31df39 |
children | a1b92a251bb9 |
files | src/lib-sql/driver-mysql.c src/lib-sql/driver-pgsql.c src/lib-sql/driver-sqlite.c src/lib-sql/sql-api-private.h src/lib-sql/sql-api.c src/lib-sql/sql-api.h |
diffstat | 6 files changed, 69 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-sql/driver-mysql.c Sun Sep 06 19:06:52 2009 -0400 +++ b/src/lib-sql/driver-mysql.c Sun Sep 06 20:42:42 2009 -0400 @@ -77,6 +77,7 @@ struct mysql_query_list { struct mysql_query_list *next; const char *query; + unsigned int *affected_rows; }; extern struct sql_db driver_mysql_db; @@ -596,6 +597,7 @@ const char *query) { struct sql_result *result; + my_ulonglong rows; int ret = 0; if (ctx->failed) @@ -606,6 +608,12 @@ 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_free(result); return ret; @@ -648,7 +656,8 @@ } 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; @@ -656,6 +665,7 @@ 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;
--- a/src/lib-sql/driver-pgsql.c Sun Sep 06 19:06:52 2009 -0400 +++ b/src/lib-sql/driver-pgsql.c Sun Sep 06 20:42:42 2009 -0400 @@ -86,14 +86,15 @@ 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, bool retry_query); @@ -889,11 +890,23 @@ } 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 @@ -902,17 +915,18 @@ } 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); } @@ -937,11 +951,11 @@ } 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); @@ -967,11 +981,11 @@ } 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) { @@ -993,6 +1007,14 @@ 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_free(result); @@ -1013,14 +1035,17 @@ } 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;
--- a/src/lib-sql/driver-sqlite.c Sun Sep 06 19:06:52 2009 -0400 +++ b/src/lib-sql/driver-sqlite.c Sun Sep 06 20:42:42 2009 -0400 @@ -368,7 +368,8 @@ } 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; @@ -380,6 +381,8 @@ 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 = {
--- a/src/lib-sql/sql-api-private.h Sun Sep 06 19:06:52 2009 -0400 +++ b/src/lib-sql/sql-api-private.h Sun Sep 06 20:42:42 2009 -0400 @@ -35,7 +35,8 @@ 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 {
--- a/src/lib-sql/sql-api.c Sun Sep 06 19:06:52 2009 -0400 +++ b/src/lib-sql/sql-api.c Sun Sep 06 20:42:42 2009 -0400 @@ -316,7 +316,13 @@ 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 = {
--- a/src/lib-sql/sql-api.h Sun Sep 06 19:06:52 2009 -0400 +++ b/src/lib-sql/sql-api.h Sun Sep 06 20:42:42 2009 -0400 @@ -142,5 +142,9 @@ /* 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