dovecot-2.0: lib-sql: Added sql_update_get_rows().
dovecot at dovecot.org
dovecot at dovecot.org
Mon Sep 7 03:55:59 EEST 2009
details: http://hg.dovecot.org/dovecot-2.0/rev/551c273f4844
changeset: 9888:551c273f4844
user: Timo Sirainen <tss at iki.fi>
date: Sun Sep 06 20:42:42 2009 -0400
description:
lib-sql: Added sql_update_get_rows().
diffstat:
6 files changed, 72 insertions(+), 23 deletions(-)
src/lib-sql/driver-mysql.c | 12 +++++++
src/lib-sql/driver-pgsql.c | 63 ++++++++++++++++++++++++++++-------------
src/lib-sql/driver-sqlite.c | 5 ++-
src/lib-sql/sql-api-private.h | 3 +
src/lib-sql/sql-api.c | 8 ++++-
src/lib-sql/sql-api.h | 4 ++
diffs (253 lines):
diff -r 69152c0d40a1 -r 551c273f4844 src/lib-sql/driver-mysql.c
--- a/src/lib-sql/driver-mysql.c Sun Sep 06 19:06:54 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 {
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
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
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
}
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_transacti
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 -r 69152c0d40a1 -r 551c273f4844 src/lib-sql/driver-pgsql.c
--- a/src/lib-sql/driver-pgsql.c Sun Sep 06 19:06:54 2009 -0400
+++ b/src/lib-sql/driver-pgsql.c Sun Sep 06 20:42:42 2009 -0400
@@ -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 pg
}
static void
-transaction_commit_callback(struct sql_result *result, void *context)
-{
- struct pgsql_transaction_context *ctx =
- (struct pgsql_transaction_context *)context;
-
+transaction_begin_callback(struct sql_result *result,
+ struct pgsql_transaction_context *ctx)
+{
+ 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_r
}
static void
-transaction_update_callback(struct sql_result *result, void *context)
-{
- struct pgsql_transaction_context *ctx = context;
+transaction_update_callback(struct sql_result *result,
+ struct pgsql_query_list *list)
+{
+ 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 s
} 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
} 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
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
}
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 -r 69152c0d40a1 -r 551c273f4844 src/lib-sql/driver-sqlite.c
--- a/src/lib-sql/driver-sqlite.c Sun Sep 06 19:06:54 2009 -0400
+++ b/src/lib-sql/driver-sqlite.c Sun Sep 06 20:42:42 2009 -0400
@@ -369,7 +369,8 @@ driver_sqlite_transaction_commit_s(struc
}
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_transact
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 -r 69152c0d40a1 -r 551c273f4844 src/lib-sql/sql-api-private.h
--- a/src/lib-sql/sql-api-private.h Sun Sep 06 19:06:54 2009 -0400
+++ b/src/lib-sql/sql-api-private.h Sun Sep 06 20:42:42 2009 -0400
@@ -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 -r 69152c0d40a1 -r 551c273f4844 src/lib-sql/sql-api.c
--- a/src/lib-sql/sql-api.c Sun Sep 06 19:06:54 2009 -0400
+++ b/src/lib-sql/sql-api.c Sun Sep 06 20:42:42 2009 -0400
@@ -325,7 +325,13 @@ void sql_transaction_rollback(struct sql
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 -r 69152c0d40a1 -r 551c273f4844 src/lib-sql/sql-api.h
--- a/src/lib-sql/sql-api.h Sun Sep 06 19:06:54 2009 -0400
+++ b/src/lib-sql/sql-api.h Sun Sep 06 20:42:42 2009 -0400
@@ -144,5 +144,9 @@ void sql_transaction_rollback(struct sql
/* 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
More information about the dovecot-cvs
mailing list