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

annotate src/lib-sql/driver-sqlite.c @ 9658:8ba4253adc9b HEAD tip

*-login: SSL connections didn't get closed when the client got destroyed.

author	Timo Sirainen <tss@iki.fi>
date	Thu, 08 May 2014 16:41:29 +0300
parents	4530228c8993
children

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

Mercurial > dovecot > original-hg > dovecot-1.2

annotate src/lib-sql/driver-sqlite.c @ 9658:8ba4253adc9b HEAD tip