dovecot/original-hg/dovecot-1.2: src/lib-sql/driver-sqlite.c annotate

annotate src/lib-sql/driver-sqlite.c @ 6420:a8b515e1a26f HEAD

Removed _ prefixes from function names.

author	Timo Sirainen <tss@iki.fi>
date	Sun, 16 Sep 2007 13:25:23 +0300
parents	6a64e64fa3a3
children	7cad076906eb

rev	line source
3923 e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	1 /* Copyright (C) 2006 Jakob Hirsch */
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	2
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	3 #include "lib.h"
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	4 #include "str.h"
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	5 #include "sql-api-private.h"
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	6
3943 cbe5c6772e0d Added support for dynamically building SQL drivers. Timo Sirainen <tss@iki.fi> parents: 3936 diff changeset	7 #ifdef BUILD_SQLITE
3923 e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	8 #include <sqlite3.h>
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	9
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	10 /* retry time if db is busy (in ms) */
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	11 const int sqlite_busy_timeout = 1000;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	12
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	13 struct sqlite_db {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	14 struct sql_db api;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	15
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	16 pool_t pool;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	17 const char *dbfile;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	18 sqlite3 *sqlite;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	19 unsigned int connected:1;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	20 int rc;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	21 };
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	22
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	23 struct sqlite_result {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	24 struct sql_result api;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	25 sqlite3_stmt *stmt;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	26 unsigned int cols;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	27 const char **row;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	28 };
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	29
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	30 struct sqlite_transaction_context {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	31 struct sql_transaction_context ctx;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	32 unsigned int failed:1;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	33 };
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	34
3943 cbe5c6772e0d Added support for dynamically building SQL drivers. Timo Sirainen <tss@iki.fi> parents: 3936 diff changeset	35 extern struct sql_db driver_sqlite_db;
3923 e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	36 extern struct sql_result driver_sqlite_result;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	37 extern struct sql_result driver_sqlite_error_result;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	38
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	39 static int driver_sqlite_connect(struct sql_db *_db)
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	40 {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	41 struct sqlite_db db = (struct sqlite_db )_db;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	42
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	43 if (db->connected)
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	44 return 1;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	45
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	46 db->rc = sqlite3_open(db->dbfile, &db->sqlite);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	47
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	48 if (db->rc == SQLITE_OK) {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	49 db->connected = TRUE;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	50 sqlite3_busy_timeout(db->sqlite, sqlite_busy_timeout);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	51 return 1;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	52 } else {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	53 i_error("sqlite: open(%s) failed: %s", db->dbfile,
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	54 sqlite3_errmsg(db->sqlite));
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	55 sqlite3_close(db->sqlite);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	56 return -1;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	57 }
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	58 }
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	59
6420 a8b515e1a26f Removed _ prefixes from function names. Timo Sirainen <tss@iki.fi> parents: 6411 diff changeset	60 static struct sql_db driver_sqlite_init_v(const char connect_string)
3923 e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	61 {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	62 struct sqlite_db *db;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	63 pool_t pool;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	64
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	65 i_assert(connect_string != NULL);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	66
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	67 pool = pool_alloconly_create("sqlite driver", 512);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	68 db = p_new(pool, struct sqlite_db, 1);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	69 db->pool = pool;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	70 db->api = driver_sqlite_db;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	71 db->dbfile = p_strdup(db->pool, connect_string);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	72 db->connected = FALSE;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	73
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	74 return &db->api;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	75 }
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	76
6420 a8b515e1a26f Removed _ prefixes from function names. Timo Sirainen <tss@iki.fi> parents: 6411 diff changeset	77 static void driver_sqlite_deinit_v(struct sql_db *_db)
3923 e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	78 {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	79 struct sqlite_db db = (struct sqlite_db )_db;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	80
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	81 sqlite3_close(db->sqlite);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	82 pool_unref(db->pool);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	83 }
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	84
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	85 static enum sql_db_flags
6411 6a64e64fa3a3 Renamed __attr___ to ATTR_. Renamed __attrs_used__ to ATTRS_DEFINED. Timo Sirainen <tss@iki.fi> parents: 5496 diff changeset	86 driver_sqlite_get_flags(struct sql_db *db ATTR_UNUSED)
3923 e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	87 {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	88 return SQL_DB_FLAG_BLOCKING;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	89 }
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	90
4458 3e196acd60b7 sql_escape_string() should return const char , not char . Timo Sirainen <tss@iki.fi> parents: 4444 diff changeset	91 static const char *
6411 6a64e64fa3a3 Renamed __attr___ to ATTR_. Renamed __attrs_used__ to ATTRS_DEFINED. Timo Sirainen <tss@iki.fi> parents: 5496 diff changeset	92 driver_sqlite_escape_string(struct sql_db *_db ATTR_UNUSED,
4458 3e196acd60b7 sql_escape_string() should return const char , not char . Timo Sirainen <tss@iki.fi> parents: 4444 diff changeset	93 const char *string)
4294 1a98cb709395 Added sql_escape_string() Timo Sirainen <tss@iki.fi> parents: 3947 diff changeset	94 {
4444 d0d04db8e7a6 Escape ' with '' instead of with \'. Timo Sirainen <tss@iki.fi> parents: 4294 diff changeset	95 const char *p;
d0d04db8e7a6 Escape ' with '' instead of with \'. Timo Sirainen <tss@iki.fi> parents: 4294 diff changeset	96 char dest, destbegin;
d0d04db8e7a6 Escape ' with '' instead of with \'. Timo Sirainen <tss@iki.fi> parents: 4294 diff changeset	97
d0d04db8e7a6 Escape ' with '' instead of with \'. Timo Sirainen <tss@iki.fi> parents: 4294 diff changeset	98 /* find the first ' */
d0d04db8e7a6 Escape ' with '' instead of with \'. Timo Sirainen <tss@iki.fi> parents: 4294 diff changeset	99 for (p = string; *p != '\''; p++) {
d0d04db8e7a6 Escape ' with '' instead of with \'. Timo Sirainen <tss@iki.fi> parents: 4294 diff changeset	100 if (*p == '\0')
d0d04db8e7a6 Escape ' with '' instead of with \'. Timo Sirainen <tss@iki.fi> parents: 4294 diff changeset	101 return t_strdup_noconst(string);
d0d04db8e7a6 Escape ' with '' instead of with \'. Timo Sirainen <tss@iki.fi> parents: 4294 diff changeset	102 }
d0d04db8e7a6 Escape ' with '' instead of with \'. Timo Sirainen <tss@iki.fi> parents: 4294 diff changeset	103
d0d04db8e7a6 Escape ' with '' instead of with \'. Timo Sirainen <tss@iki.fi> parents: 4294 diff changeset	104 /* @UNSAFE: escape ' with '' */
d0d04db8e7a6 Escape ' with '' instead of with \'. Timo Sirainen <tss@iki.fi> parents: 4294 diff changeset	105 dest = destbegin = t_buffer_get((p - string) + strlen(string) * 2 + 1);
d0d04db8e7a6 Escape ' with '' instead of with \'. Timo Sirainen <tss@iki.fi> parents: 4294 diff changeset	106
d0d04db8e7a6 Escape ' with '' instead of with \'. Timo Sirainen <tss@iki.fi> parents: 4294 diff changeset	107 memcpy(dest, string, p - string);
d0d04db8e7a6 Escape ' with '' instead of with \'. Timo Sirainen <tss@iki.fi> parents: 4294 diff changeset	108 dest += p - string;
d0d04db8e7a6 Escape ' with '' instead of with \'. Timo Sirainen <tss@iki.fi> parents: 4294 diff changeset	109
d0d04db8e7a6 Escape ' with '' instead of with \'. Timo Sirainen <tss@iki.fi> parents: 4294 diff changeset	110 for (; *p != '\0'; p++) {
d0d04db8e7a6 Escape ' with '' instead of with \'. Timo Sirainen <tss@iki.fi> parents: 4294 diff changeset	111 dest++ = p;
d0d04db8e7a6 Escape ' with '' instead of with \'. Timo Sirainen <tss@iki.fi> parents: 4294 diff changeset	112 if (*p == '\'')
d0d04db8e7a6 Escape ' with '' instead of with \'. Timo Sirainen <tss@iki.fi> parents: 4294 diff changeset	113 dest++ = p;
d0d04db8e7a6 Escape ' with '' instead of with \'. Timo Sirainen <tss@iki.fi> parents: 4294 diff changeset	114 }
d0d04db8e7a6 Escape ' with '' instead of with \'. Timo Sirainen <tss@iki.fi> parents: 4294 diff changeset	115 *dest++ = '\0';
d0d04db8e7a6 Escape ' with '' instead of with \'. Timo Sirainen <tss@iki.fi> parents: 4294 diff changeset	116 t_buffer_alloc(dest - destbegin);
d0d04db8e7a6 Escape ' with '' instead of with \'. Timo Sirainen <tss@iki.fi> parents: 4294 diff changeset	117
d0d04db8e7a6 Escape ' with '' instead of with \'. Timo Sirainen <tss@iki.fi> parents: 4294 diff changeset	118 return destbegin;
4294 1a98cb709395 Added sql_escape_string() Timo Sirainen <tss@iki.fi> parents: 3947 diff changeset	119 }
1a98cb709395 Added sql_escape_string() Timo Sirainen <tss@iki.fi> parents: 3947 diff changeset	120
3923 e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	121 static void driver_sqlite_exec(struct sql_db _db, const char query)
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	122 {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	123 struct sqlite_db db = (struct sqlite_db )_db;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	124
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	125 db->rc = sqlite3_exec(db->sqlite, query, NULL, 0, NULL);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	126 if (db->rc != SQLITE_OK) {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	127 i_error("sqlite: exec(%s) failed: %s (%d)",
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	128 query, sqlite3_errmsg(db->sqlite), db->rc);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	129 }
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	130 }
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	131
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	132 static void driver_sqlite_query(struct sql_db db, const char query,
5496 72ee0521dfaf Added sql_result_setup_fetch() which makes it easier to fetch rows into Timo Sirainen <tss@iki.fi> parents: 4458 diff changeset	133 sql_query_callback_t callback, void context)
3923 e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	134 {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	135 struct sql_result *result;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	136
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	137 result = sql_query_s(db, query);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	138 result->callback = TRUE;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	139 callback(result, context);
3946 d7051c7a0200 Fixed memory leaks Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	140 result->callback = FALSE;
3923 e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	141 sql_result_free(result);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	142 }
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	143
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	144 static struct sql_result *
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	145 driver_sqlite_query_s(struct sql_db _db, const char query)
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	146 {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	147 struct sqlite_db db = (struct sqlite_db )_db;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	148 struct sqlite_result *result;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	149 int rc;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	150
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	151 result = i_new(struct sqlite_result, 1);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	152
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	153 rc = sqlite3_prepare(db->sqlite, query, -1, &result->stmt, NULL);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	154 if (rc == SQLITE_OK) {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	155 result->api = driver_sqlite_result;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	156 result->cols = sqlite3_column_count(result->stmt);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	157 result->row = i_new(const char *, result->cols);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	158 } else {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	159 result->api = driver_sqlite_error_result;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	160 result->stmt = NULL;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	161 result->cols = 0;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	162 }
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	163 result->api.db = _db;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	164
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	165 return &result->api;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	166 }
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	167
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	168 static void driver_sqlite_result_free(struct sql_result *_result)
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	169 {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	170 struct sqlite_result result = (struct sqlite_result )_result;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	171 struct sqlite_db db = (struct sqlite_db ) result->api.db;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	172 int rc;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	173
3947 5b21fb41d14d Cleanups. Timo Sirainen <tss@iki.fi> parents: 3946 diff changeset	174 if (_result->callback)
5b21fb41d14d Cleanups. Timo Sirainen <tss@iki.fi> parents: 3946 diff changeset	175 return;
5b21fb41d14d Cleanups. Timo Sirainen <tss@iki.fi> parents: 3946 diff changeset	176
3923 e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	177 if (result->stmt != NULL) {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	178 if ((rc = sqlite3_finalize(result->stmt)) != SQLITE_OK) {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	179 i_warning("sqlite: finalize failed: %s (%d)",
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	180 sqlite3_errmsg(db->sqlite), rc);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	181 }
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	182 i_free(result->row);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	183 }
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	184 i_free(result);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	185 }
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	186
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	187 static int driver_sqlite_result_next_row(struct sql_result *_result)
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	188 {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	189 struct sqlite_result result = (struct sqlite_result )_result;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	190
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	191 switch (sqlite3_step(result->stmt)) {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	192 case SQLITE_ROW:
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	193 return 1;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	194 case SQLITE_DONE:
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	195 return 0;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	196 default:
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	197 return -1;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	198 }
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	199 }
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	200
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	201 static unsigned int
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	202 driver_sqlite_result_get_fields_count(struct sql_result *_result)
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	203 {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	204 struct sqlite_result result = (struct sqlite_result )_result;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	205
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	206 return result->cols;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	207 }
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	208
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	209 static const char *
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	210 driver_sqlite_result_get_field_name(struct sql_result *_result,
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	211 unsigned int idx)
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	212 {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	213 struct sqlite_result result = (struct sqlite_result )_result;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	214
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	215 return sqlite3_column_name(result->stmt, idx);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	216 }
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	217
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	218 static int driver_sqlite_result_find_field(struct sql_result *_result,
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	219 const char *field_name)
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	220 {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	221 struct sqlite_result result = (struct sqlite_result )_result;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	222 unsigned int i;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	223
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	224 for (i = 0; i < result->cols; ++i) {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	225 const char *col = sqlite3_column_name(result->stmt, i);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	226
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	227 if (strcmp(col, field_name) == 0)
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	228 return i;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	229 }
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	230
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	231 return -1;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	232 }
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	233
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	234 static const char *
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	235 driver_sqlite_result_get_field_value(struct sql_result *_result,
5496 72ee0521dfaf Added sql_result_setup_fetch() which makes it easier to fetch rows into Timo Sirainen <tss@iki.fi> parents: 4458 diff changeset	236 unsigned int idx)
3923 e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	237 {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	238 struct sqlite_result result = (struct sqlite_result )_result;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	239
3936 8e827b05047b Compiler warning fix. Patch by Marcus Rueckert Timo Sirainen <tss@iki.fi> parents: 3923 diff changeset	240 return (const char*)sqlite3_column_text(result->stmt, idx);
3923 e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	241 }
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	242
5496 72ee0521dfaf Added sql_result_setup_fetch() which makes it easier to fetch rows into Timo Sirainen <tss@iki.fi> parents: 4458 diff changeset	243 static const unsigned char *
72ee0521dfaf Added sql_result_setup_fetch() which makes it easier to fetch rows into Timo Sirainen <tss@iki.fi> parents: 4458 diff changeset	244 driver_sqlite_result_get_field_value_binary(struct sql_result *_result,
72ee0521dfaf Added sql_result_setup_fetch() which makes it easier to fetch rows into Timo Sirainen <tss@iki.fi> parents: 4458 diff changeset	245 unsigned int idx, size_t *size_r)
72ee0521dfaf Added sql_result_setup_fetch() which makes it easier to fetch rows into Timo Sirainen <tss@iki.fi> parents: 4458 diff changeset	246 {
72ee0521dfaf Added sql_result_setup_fetch() which makes it easier to fetch rows into Timo Sirainen <tss@iki.fi> parents: 4458 diff changeset	247 struct sqlite_result result = (struct sqlite_result )_result;
72ee0521dfaf Added sql_result_setup_fetch() which makes it easier to fetch rows into Timo Sirainen <tss@iki.fi> parents: 4458 diff changeset	248
72ee0521dfaf Added sql_result_setup_fetch() which makes it easier to fetch rows into Timo Sirainen <tss@iki.fi> parents: 4458 diff changeset	249 *size_r = sqlite3_column_bytes(result->stmt, idx);
72ee0521dfaf Added sql_result_setup_fetch() which makes it easier to fetch rows into Timo Sirainen <tss@iki.fi> parents: 4458 diff changeset	250 return sqlite3_column_blob(result->stmt, idx);
72ee0521dfaf Added sql_result_setup_fetch() which makes it easier to fetch rows into Timo Sirainen <tss@iki.fi> parents: 4458 diff changeset	251 }
72ee0521dfaf Added sql_result_setup_fetch() which makes it easier to fetch rows into Timo Sirainen <tss@iki.fi> parents: 4458 diff changeset	252
3923 e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	253 static const char *
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	254 driver_sqlite_result_find_field_value(struct sql_result *result,
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	255 const char *field_name)
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	256 {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	257 int idx;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	258
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	259 idx = driver_sqlite_result_find_field(result, field_name);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	260 if (idx < 0)
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	261 return NULL;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	262 return driver_sqlite_result_get_field_value(result, idx);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	263 }
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	264
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	265 static const char const
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	266 driver_sqlite_result_get_values(struct sql_result *_result)
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	267 {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	268 struct sqlite_result result = (struct sqlite_result )_result;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	269 unsigned int i;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	270
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	271 for (i = 0; i < result->cols; ++i) {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	272 result->row[i] =
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	273 driver_sqlite_result_get_field_value(_result, i);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	274 }
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	275
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	276 return (const char const )result->row;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	277 }
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	278
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	279 static const char driver_sqlite_result_get_error(struct sql_result _result)
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	280 {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	281 struct sqlite_result result = (struct sqlite_result )_result;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	282 struct sqlite_db db = (struct sqlite_db )result->api.db;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	283
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	284 return sqlite3_errmsg(db->sqlite);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	285 }
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	286
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	287 static struct sql_transaction_context *
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	288 driver_sqlite_transaction_begin(struct sql_db *_db)
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	289 {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	290 struct sqlite_transaction_context *ctx;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	291 struct sqlite_db db = (struct sqlite_db )_db;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	292
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	293 ctx = i_new(struct sqlite_transaction_context, 1);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	294 ctx->ctx.db = _db;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	295
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	296 sql_exec(_db, "BEGIN TRANSACTION");
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	297 if (db->rc != SQLITE_OK)
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	298 ctx->failed = TRUE;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	299
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	300 return &ctx->ctx;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	301 }
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	302
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	303 static void
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	304 driver_sqlite_transaction_rollback(struct sql_transaction_context *_ctx)
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	305 {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	306 struct sqlite_transaction_context *ctx =
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	307 (struct sqlite_transaction_context *)_ctx;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	308
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	309 sql_exec(_ctx->db, "ROLLBACK");
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	310 i_free(ctx);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	311 }
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	312
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	313 static void
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	314 driver_sqlite_transaction_commit(struct sql_transaction_context *_ctx,
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	315 sql_commit_callback_t callback, void context)
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	316 {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	317 struct sqlite_transaction_context *ctx =
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	318 (struct sqlite_transaction_context *)_ctx;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	319 struct sqlite_db db = (struct sqlite_db )ctx->ctx.db;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	320 const char *errmsg;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	321
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	322 if (!ctx->failed) {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	323 sql_exec(_ctx->db, "COMMIT");
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	324 if (db->rc != SQLITE_OK)
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	325 ctx->failed = TRUE;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	326 }
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	327
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	328 if (ctx->failed) {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	329 errmsg = sqlite3_errmsg(db->sqlite);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	330 callback(errmsg, context);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	331 /* also does i_free(ctx) */
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	332 driver_sqlite_transaction_rollback(_ctx);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	333 } else {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	334 callback(NULL, context);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	335 i_free(ctx);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	336 }
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	337 }
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	338
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	339 static int
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	340 driver_sqlite_transaction_commit_s(struct sql_transaction_context *_ctx,
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	341 const char **error_r)
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	342 {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	343 struct sqlite_transaction_context *ctx =
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	344 (struct sqlite_transaction_context *)_ctx;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	345 struct sqlite_db db = (struct sqlite_db ) ctx->ctx.db;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	346
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	347 if (ctx->failed) {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	348 /* also does i_free(ctx) */
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	349 driver_sqlite_transaction_rollback(_ctx);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	350 return -1;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	351 }
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	352
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	353 sql_exec(_ctx->db, "COMMIT");
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	354 *error_r = sqlite3_errmsg(db->sqlite);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	355 i_free(ctx);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	356 return 0;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	357 }
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	358
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	359 static void
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	360 driver_sqlite_update(struct sql_transaction_context _ctx, const char query)
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	361 {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	362 struct sqlite_transaction_context *ctx =
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	363 (struct sqlite_transaction_context *)_ctx;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	364 struct sqlite_db db = (struct sqlite_db )ctx->ctx.db;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	365
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	366 if (ctx->failed)
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	367 return;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	368
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	369 sql_exec(_ctx->db, query);
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	370 if (db->rc != SQLITE_OK)
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	371 ctx->failed = TRUE;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	372 }
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	373
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	374 struct sql_db driver_sqlite_db = {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	375 "sqlite",
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	376
6420 a8b515e1a26f Removed _ prefixes from function names. Timo Sirainen <tss@iki.fi> parents: 6411 diff changeset	377 driver_sqlite_init_v,
a8b515e1a26f Removed _ prefixes from function names. Timo Sirainen <tss@iki.fi> parents: 6411 diff changeset	378 driver_sqlite_deinit_v,
3923 e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	379 driver_sqlite_get_flags,
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	380 driver_sqlite_connect,
4294 1a98cb709395 Added sql_escape_string() Timo Sirainen <tss@iki.fi> parents: 3947 diff changeset	381 driver_sqlite_escape_string,
3923 e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	382 driver_sqlite_exec,
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	383 driver_sqlite_query,
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	384 driver_sqlite_query_s,
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	385
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	386 driver_sqlite_transaction_begin,
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	387 driver_sqlite_transaction_commit,
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	388 driver_sqlite_transaction_commit_s,
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	389 driver_sqlite_transaction_rollback,
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	390 driver_sqlite_update
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	391 };
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	392
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	393 struct sql_result driver_sqlite_result = {
5496 72ee0521dfaf Added sql_result_setup_fetch() which makes it easier to fetch rows into Timo Sirainen <tss@iki.fi> parents: 4458 diff changeset	394 MEMBER(v) {
72ee0521dfaf Added sql_result_setup_fetch() which makes it easier to fetch rows into Timo Sirainen <tss@iki.fi> parents: 4458 diff changeset	395 driver_sqlite_result_free,
72ee0521dfaf Added sql_result_setup_fetch() which makes it easier to fetch rows into Timo Sirainen <tss@iki.fi> parents: 4458 diff changeset	396 driver_sqlite_result_next_row,
72ee0521dfaf Added sql_result_setup_fetch() which makes it easier to fetch rows into Timo Sirainen <tss@iki.fi> parents: 4458 diff changeset	397 driver_sqlite_result_get_fields_count,
72ee0521dfaf Added sql_result_setup_fetch() which makes it easier to fetch rows into Timo Sirainen <tss@iki.fi> parents: 4458 diff changeset	398 driver_sqlite_result_get_field_name,
72ee0521dfaf Added sql_result_setup_fetch() which makes it easier to fetch rows into Timo Sirainen <tss@iki.fi> parents: 4458 diff changeset	399 driver_sqlite_result_find_field,
72ee0521dfaf Added sql_result_setup_fetch() which makes it easier to fetch rows into Timo Sirainen <tss@iki.fi> parents: 4458 diff changeset	400 driver_sqlite_result_get_field_value,
72ee0521dfaf Added sql_result_setup_fetch() which makes it easier to fetch rows into Timo Sirainen <tss@iki.fi> parents: 4458 diff changeset	401 driver_sqlite_result_get_field_value_binary,
72ee0521dfaf Added sql_result_setup_fetch() which makes it easier to fetch rows into Timo Sirainen <tss@iki.fi> parents: 4458 diff changeset	402 driver_sqlite_result_find_field_value,
72ee0521dfaf Added sql_result_setup_fetch() which makes it easier to fetch rows into Timo Sirainen <tss@iki.fi> parents: 4458 diff changeset	403 driver_sqlite_result_get_values,
72ee0521dfaf Added sql_result_setup_fetch() which makes it easier to fetch rows into Timo Sirainen <tss@iki.fi> parents: 4458 diff changeset	404 driver_sqlite_result_get_error
72ee0521dfaf Added sql_result_setup_fetch() which makes it easier to fetch rows into Timo Sirainen <tss@iki.fi> parents: 4458 diff changeset	405 }
3923 e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	406 };
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	407
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	408 static int
6411 6a64e64fa3a3 Renamed __attr___ to ATTR_. Renamed __attrs_used__ to ATTRS_DEFINED. Timo Sirainen <tss@iki.fi> parents: 5496 diff changeset	409 driver_sqlite_result_error_next_row(struct sql_result *result ATTR_UNUSED)
3923 e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	410 {
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	411 return -1;
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	412 }
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	413
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	414 struct sql_result driver_sqlite_error_result = {
5496 72ee0521dfaf Added sql_result_setup_fetch() which makes it easier to fetch rows into Timo Sirainen <tss@iki.fi> parents: 4458 diff changeset	415 MEMBER(v) {
72ee0521dfaf Added sql_result_setup_fetch() which makes it easier to fetch rows into Timo Sirainen <tss@iki.fi> parents: 4458 diff changeset	416 driver_sqlite_result_free,
72ee0521dfaf Added sql_result_setup_fetch() which makes it easier to fetch rows into Timo Sirainen <tss@iki.fi> parents: 4458 diff changeset	417 driver_sqlite_result_error_next_row,
72ee0521dfaf Added sql_result_setup_fetch() which makes it easier to fetch rows into Timo Sirainen <tss@iki.fi> parents: 4458 diff changeset	418 NULL, NULL, NULL, NULL, NULL, NULL, NULL,
72ee0521dfaf Added sql_result_setup_fetch() which makes it easier to fetch rows into Timo Sirainen <tss@iki.fi> parents: 4458 diff changeset	419 driver_sqlite_result_get_error
72ee0521dfaf Added sql_result_setup_fetch() which makes it easier to fetch rows into Timo Sirainen <tss@iki.fi> parents: 4458 diff changeset	420 }
3923 e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	421 };
e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	422
3943 cbe5c6772e0d Added support for dynamically building SQL drivers. Timo Sirainen <tss@iki.fi> parents: 3936 diff changeset	423 void driver_sqlite_init(void);
cbe5c6772e0d Added support for dynamically building SQL drivers. Timo Sirainen <tss@iki.fi> parents: 3936 diff changeset	424 void driver_sqlite_deinit(void);
cbe5c6772e0d Added support for dynamically building SQL drivers. Timo Sirainen <tss@iki.fi> parents: 3936 diff changeset	425
cbe5c6772e0d Added support for dynamically building SQL drivers. Timo Sirainen <tss@iki.fi> parents: 3936 diff changeset	426 void driver_sqlite_init(void)
cbe5c6772e0d Added support for dynamically building SQL drivers. Timo Sirainen <tss@iki.fi> parents: 3936 diff changeset	427 {
cbe5c6772e0d Added support for dynamically building SQL drivers. Timo Sirainen <tss@iki.fi> parents: 3936 diff changeset	428 sql_driver_register(&driver_sqlite_db);
cbe5c6772e0d Added support for dynamically building SQL drivers. Timo Sirainen <tss@iki.fi> parents: 3936 diff changeset	429 }
cbe5c6772e0d Added support for dynamically building SQL drivers. Timo Sirainen <tss@iki.fi> parents: 3936 diff changeset	430
cbe5c6772e0d Added support for dynamically building SQL drivers. Timo Sirainen <tss@iki.fi> parents: 3936 diff changeset	431 void driver_sqlite_deinit(void)
cbe5c6772e0d Added support for dynamically building SQL drivers. Timo Sirainen <tss@iki.fi> parents: 3936 diff changeset	432 {
cbe5c6772e0d Added support for dynamically building SQL drivers. Timo Sirainen <tss@iki.fi> parents: 3936 diff changeset	433 sql_driver_unregister(&driver_sqlite_db);
cbe5c6772e0d Added support for dynamically building SQL drivers. Timo Sirainen <tss@iki.fi> parents: 3936 diff changeset	434 }
cbe5c6772e0d Added support for dynamically building SQL drivers. Timo Sirainen <tss@iki.fi> parents: 3936 diff changeset	435
3923 e9d45ec624cb Forgot to add in sqlite patch. Timo Sirainen <tss@iki.fi> parents: diff changeset	436 #endif

Mercurial > dovecot > original-hg > dovecot-1.2

annotate src/lib-sql/driver-sqlite.c @ 6420:a8b515e1a26f HEAD