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

annotate src/lib-dict/dict-sql.c @ 7086:7ed926ed7aa4 HEAD

Updated copyright notices to include year 2008.

author	Timo Sirainen <tss@iki.fi>
date	Tue, 01 Jan 2008 22:05:21 +0200
parents	414c9d631a81
children	e6693a0ec8e1

rev	line source
7086 7ed926ed7aa4 Updated copyright notices to include year 2008. Timo Sirainen <tss@iki.fi> parents: 6940 diff changeset	1 /* Copyright (c) 2005-2008 Dovecot authors, see the included COPYING file */
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	2
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	3 #include "lib.h"
3943 cbe5c6772e0d Added support for dynamically building SQL drivers. Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	4 #include "array.h"
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	5 #include "istream.h"
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	6 #include "str.h"
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	7 #include "sql-api-private.h"
6480 7596339a9452 Use SQL connection pools. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	8 #include "sql-pool.h"
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	9 #include "dict-private.h"
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	10 #include "dict-sql.h"
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	11
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	12 #include <unistd.h>
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	13 #include <fcntl.h>
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	14
6480 7596339a9452 Use SQL connection pools. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	15 #define DICT_SQL_MAX_UNUSED_CONNECTIONS 10
7596339a9452 Use SQL connection pools. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	16
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	17 struct sql_dict {
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	18 struct dict dict;
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	19
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	20 pool_t pool;
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	21 struct sql_db *db;
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	22
3967 6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	23 const char connect_string, username;
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	24 const char table, select_field, where_field, username_field;
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	25 };
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	26
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	27 struct sql_dict_iterate_context {
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	28 struct dict_iterate_context ctx;
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	29
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	30 struct sql_result *result;
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	31 };
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	32
3787 40600601502e Added dictinary lookup server and a "proxy" dict implementation to talk to Timo Sirainen <tss@iki.fi> parents: 3737 diff changeset	33 struct sql_dict_transaction_context {
40600601502e Added dictinary lookup server and a "proxy" dict implementation to talk to Timo Sirainen <tss@iki.fi> parents: 3737 diff changeset	34 struct dict_transaction_context ctx;
40600601502e Added dictinary lookup server and a "proxy" dict implementation to talk to Timo Sirainen <tss@iki.fi> parents: 3737 diff changeset	35
40600601502e Added dictinary lookup server and a "proxy" dict implementation to talk to Timo Sirainen <tss@iki.fi> parents: 3737 diff changeset	36 struct sql_transaction_context *sql_ctx;
4511 3f808dd8f568 If invalid key is given to dict_set() or dict_atomic_inc() fail the whole Timo Sirainen <tss@iki.fi> parents: 4371 diff changeset	37
3f808dd8f568 If invalid key is given to dict_set() or dict_atomic_inc() fail the whole Timo Sirainen <tss@iki.fi> parents: 4371 diff changeset	38 unsigned int failed:1;
3f808dd8f568 If invalid key is given to dict_set() or dict_atomic_inc() fail the whole Timo Sirainen <tss@iki.fi> parents: 4371 diff changeset	39 unsigned int changed:1;
3787 40600601502e Added dictinary lookup server and a "proxy" dict implementation to talk to Timo Sirainen <tss@iki.fi> parents: 3737 diff changeset	40 };
40600601502e Added dictinary lookup server and a "proxy" dict implementation to talk to Timo Sirainen <tss@iki.fi> parents: 3737 diff changeset	41
6480 7596339a9452 Use SQL connection pools. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	42 static struct sql_pool *dict_sql_pool;
7596339a9452 Use SQL connection pools. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	43
6940 414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	44 static void sql_dict_config_parse_line(struct sql_dict dict, const char line)
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	45 {
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	46 const char p, value;
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	47
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	48 while (*line == ' ') line++;
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	49 value = strchr(line, '=');
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	50 if (value == NULL)
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	51 return;
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	52
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	53 for (p = value; p[-1] == ' ' && p != line; p--) ;
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	54 line = t_strdup_until(line, p);
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	55 value++;
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	56 while (*value == ' ') value++;
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	57
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	58 if (strcmp(line, "connect") == 0)
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	59 dict->connect_string = p_strdup(dict->pool, value);
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	60 else if (strcmp(line, "table") == 0)
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	61 dict->table = p_strdup(dict->pool, value);
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	62 else if (strcmp(line, "select_field") == 0)
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	63 dict->select_field = p_strdup(dict->pool, value);
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	64 else if (strcmp(line, "where_field") == 0)
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	65 dict->where_field = p_strdup(dict->pool, value);
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	66 else if (strcmp(line, "username_field") == 0)
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	67 dict->username_field = p_strdup(dict->pool, value);
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	68 }
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	69
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	70 static int sql_dict_read_config(struct sql_dict dict, const char path)
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	71 {
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	72 struct istream *input;
6940 414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	73 const char *line;
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	74 int fd;
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	75
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	76 fd = open(path, O_RDONLY);
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	77 if (fd == -1) {
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	78 i_error("open(%s) failed: %m", path);
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	79 return -1;
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	80 }
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	81
6162 896cc473c1f0 Renamed i_stream_create_file() to i_stream_create_fd(). Timo Sirainen <tss@iki.fi> parents: 6142 diff changeset	82 input = i_stream_create_fd(fd, (size_t)-1, FALSE);
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	83 while ((line = i_stream_read_next_line(input)) != NULL) {
6940 414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	84 T_FRAME(
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	85 sql_dict_config_parse_line(dict, line);
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	86 );
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	87 }
4070 71b8faa84ec6 Added i_stream_destroy() and o_stream_destroy() and used them instead of Timo Sirainen <tss@iki.fi> parents: 3967 diff changeset	88 i_stream_destroy(&input);
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	89 (void)close(fd);
3849 8d2028705702 Fixed parsing configuration file. Timo Sirainen <tss@iki.fi> parents: 3787 diff changeset	90
8d2028705702 Fixed parsing configuration file. Timo Sirainen <tss@iki.fi> parents: 3787 diff changeset	91 if (dict->connect_string == NULL) {
8d2028705702 Fixed parsing configuration file. Timo Sirainen <tss@iki.fi> parents: 3787 diff changeset	92 i_error("%s: 'connect' missing", path);
8d2028705702 Fixed parsing configuration file. Timo Sirainen <tss@iki.fi> parents: 3787 diff changeset	93 return -1;
8d2028705702 Fixed parsing configuration file. Timo Sirainen <tss@iki.fi> parents: 3787 diff changeset	94 }
8d2028705702 Fixed parsing configuration file. Timo Sirainen <tss@iki.fi> parents: 3787 diff changeset	95 if (dict->table == NULL) {
8d2028705702 Fixed parsing configuration file. Timo Sirainen <tss@iki.fi> parents: 3787 diff changeset	96 i_error("%s: 'table' missing", path);
8d2028705702 Fixed parsing configuration file. Timo Sirainen <tss@iki.fi> parents: 3787 diff changeset	97 return -1;
8d2028705702 Fixed parsing configuration file. Timo Sirainen <tss@iki.fi> parents: 3787 diff changeset	98 }
8d2028705702 Fixed parsing configuration file. Timo Sirainen <tss@iki.fi> parents: 3787 diff changeset	99 if (dict->select_field == NULL) {
8d2028705702 Fixed parsing configuration file. Timo Sirainen <tss@iki.fi> parents: 3787 diff changeset	100 i_error("%s: 'select_field' missing", path);
8d2028705702 Fixed parsing configuration file. Timo Sirainen <tss@iki.fi> parents: 3787 diff changeset	101 return -1;
8d2028705702 Fixed parsing configuration file. Timo Sirainen <tss@iki.fi> parents: 3787 diff changeset	102 }
8d2028705702 Fixed parsing configuration file. Timo Sirainen <tss@iki.fi> parents: 3787 diff changeset	103 if (dict->where_field == NULL) {
8d2028705702 Fixed parsing configuration file. Timo Sirainen <tss@iki.fi> parents: 3787 diff changeset	104 i_error("%s: 'where_field' missing", path);
8d2028705702 Fixed parsing configuration file. Timo Sirainen <tss@iki.fi> parents: 3787 diff changeset	105 return -1;
8d2028705702 Fixed parsing configuration file. Timo Sirainen <tss@iki.fi> parents: 3787 diff changeset	106 }
3967 6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	107 if (dict->username_field == NULL) {
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	108 i_error("%s: 'username_field' missing", path);
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	109 return -1;
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	110 }
3849 8d2028705702 Fixed parsing configuration file. Timo Sirainen <tss@iki.fi> parents: 3787 diff changeset	111
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	112 return 0;
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	113 }
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	114
4516 aa2f73a4df26 Dictionary changes: Added support for defining value's type. Key is still always a string. Added support for sorting the iteration replies. Added dict_unset(). Added Berkeley DB support. Most of the code written by Tianyan Liu. Timo Sirainen <timo.sirainen@movial.fi> parents: 4511 diff changeset	115 static struct dict *
4517 e661182eab75 Berkeley DB dict support is now enabled only when using --with-db configure option. Timo Sirainen <timo.sirainen@movial.fi> parents: 4516 diff changeset	116 sql_dict_init(struct dict driver, const char uri,
6411 6a64e64fa3a3 Renamed __attr___ to ATTR_. Renamed __attrs_used__ to ATTRS_DEFINED. Timo Sirainen <tss@iki.fi> parents: 6162 diff changeset	117 enum dict_data_type value_type ATTR_UNUSED,
4516 aa2f73a4df26 Dictionary changes: Added support for defining value's type. Key is still always a string. Added support for sorting the iteration replies. Added dict_unset(). Added Berkeley DB support. Most of the code written by Tianyan Liu. Timo Sirainen <timo.sirainen@movial.fi> parents: 4511 diff changeset	118 const char *username)
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	119 {
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	120 struct sql_dict *dict;
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	121 pool_t pool;
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	122
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	123 pool = pool_alloconly_create("sql dict", 1024);
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	124 dict = p_new(pool, struct sql_dict, 1);
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	125 dict->pool = pool;
4517 e661182eab75 Berkeley DB dict support is now enabled only when using --with-db configure option. Timo Sirainen <timo.sirainen@movial.fi> parents: 4516 diff changeset	126 dict->dict = *driver;
3967 6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	127 dict->username = p_strdup(pool, username);
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	128
3849 8d2028705702 Fixed parsing configuration file. Timo Sirainen <tss@iki.fi> parents: 3787 diff changeset	129 if (sql_dict_read_config(dict, uri) < 0) {
6428 7cad076906eb pool_unref() now takes ** pointer. Timo Sirainen <tss@iki.fi> parents: 6411 diff changeset	130 pool_unref(&pool);
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	131 return NULL;
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	132 }
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	133
6480 7596339a9452 Use SQL connection pools. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	134 dict->db = sql_pool_new(dict_sql_pool, driver->name,
7596339a9452 Use SQL connection pools. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	135 dict->connect_string);
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	136 return &dict->dict;
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	137 }
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	138
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	139 static void sql_dict_deinit(struct dict *_dict)
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	140 {
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	141 struct sql_dict dict = (struct sql_dict )_dict;
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	142
3879 928229f8b3e6 deinit, unref, destroy, close, free, etc. functions now take a pointer to Timo Sirainen <tss@iki.fi> parents: 3863 diff changeset	143 sql_deinit(&dict->db);
6428 7cad076906eb pool_unref() now takes ** pointer. Timo Sirainen <tss@iki.fi> parents: 6411 diff changeset	144 pool_unref(&dict->pool);
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	145 }
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	146
3967 6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	147 static int sql_path_fix(const char *path, bool private_r)
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	148 {
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	149 const char *p;
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	150 size_t len;
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	151
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	152 p = strchr(*path, '/');
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	153 if (p == NULL)
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	154 return -1;
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	155 len = p - *path;
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	156
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	157 if (strncmp(*path, DICT_PATH_PRIVATE, len) == 0)
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	158 *private_r = TRUE;
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	159 else if (strncmp(*path, DICT_PATH_SHARED, len) == 0)
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	160 *private_r = FALSE;
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	161 else
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	162 return -1;
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	163
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	164 *path += len + 1;
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	165 return 0;
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	166 }
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	167
3787 40600601502e Added dictinary lookup server and a "proxy" dict implementation to talk to Timo Sirainen <tss@iki.fi> parents: 3737 diff changeset	168 static int sql_dict_lookup(struct dict *_dict, pool_t pool,
40600601502e Added dictinary lookup server and a "proxy" dict implementation to talk to Timo Sirainen <tss@iki.fi> parents: 3737 diff changeset	169 const char key, const char *value_r)
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	170 {
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	171 struct sql_dict dict = (struct sql_dict )_dict;
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	172 struct sql_result *result;
3787 40600601502e Added dictinary lookup server and a "proxy" dict implementation to talk to Timo Sirainen <tss@iki.fi> parents: 3737 diff changeset	173 int ret;
3967 6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	174 bool priv;
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	175
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	176 if (sql_path_fix(&key, &priv) < 0) {
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	177 *value_r = NULL;
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	178 return -1;
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	179 }
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	180
6940 414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	181 T_FRAME(
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	182 string_t *query = t_str_new(256);
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	183 str_printfa(query, "SELECT %s FROM %s WHERE %s = '%s'",
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	184 dict->select_field, dict->table,
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	185 dict->where_field,
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	186 sql_escape_string(dict->db, key));
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	187 if (priv) {
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	188 str_printfa(query, " AND %s = '%s'",
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	189 dict->username_field,
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	190 sql_escape_string(dict->db, dict->username));
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	191 }
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	192 result = sql_query_s(dict->db, str_c(query));
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	193 );
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	194
3787 40600601502e Added dictinary lookup server and a "proxy" dict implementation to talk to Timo Sirainen <tss@iki.fi> parents: 3737 diff changeset	195 ret = sql_result_next_row(result);
40600601502e Added dictinary lookup server and a "proxy" dict implementation to talk to Timo Sirainen <tss@iki.fi> parents: 3737 diff changeset	196 if (ret <= 0)
40600601502e Added dictinary lookup server and a "proxy" dict implementation to talk to Timo Sirainen <tss@iki.fi> parents: 3737 diff changeset	197 *value_r = NULL;
40600601502e Added dictinary lookup server and a "proxy" dict implementation to talk to Timo Sirainen <tss@iki.fi> parents: 3737 diff changeset	198 else {
40600601502e Added dictinary lookup server and a "proxy" dict implementation to talk to Timo Sirainen <tss@iki.fi> parents: 3737 diff changeset	199 *value_r =
40600601502e Added dictinary lookup server and a "proxy" dict implementation to talk to Timo Sirainen <tss@iki.fi> parents: 3737 diff changeset	200 p_strdup(pool, sql_result_get_field_value(result, 0));
40600601502e Added dictinary lookup server and a "proxy" dict implementation to talk to Timo Sirainen <tss@iki.fi> parents: 3737 diff changeset	201 }
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	202
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	203 sql_result_free(result);
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	204 return ret;
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	205 }
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	206
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	207 static struct dict_iterate_context *
4516 aa2f73a4df26 Dictionary changes: Added support for defining value's type. Key is still always a string. Added support for sorting the iteration replies. Added dict_unset(). Added Berkeley DB support. Most of the code written by Tianyan Liu. Timo Sirainen <timo.sirainen@movial.fi> parents: 4511 diff changeset	208 sql_dict_iterate_init(struct dict _dict, const char path,
aa2f73a4df26 Dictionary changes: Added support for defining value's type. Key is still always a string. Added support for sorting the iteration replies. Added dict_unset(). Added Berkeley DB support. Most of the code written by Tianyan Liu. Timo Sirainen <timo.sirainen@movial.fi> parents: 4511 diff changeset	209 enum dict_iterate_flags flags)
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	210 {
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	211 struct sql_dict dict = (struct sql_dict )_dict;
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	212 struct sql_dict_iterate_context *ctx;
3967 6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	213 bool priv;
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	214
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	215 ctx = i_new(struct sql_dict_iterate_context, 1);
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	216 ctx->ctx.dict = _dict;
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	217
6940 414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	218 if (sql_path_fix(&path, &priv) < 0) {
3967 6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	219 ctx->result = NULL;
6940 414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	220 return &ctx->ctx;
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	221 }
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	222 T_FRAME(
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	223 string_t *query = t_str_new(256);
3967 6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	224 str_printfa(query, "SELECT %s, %s FROM %s "
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	225 "WHERE %s LIKE '%s/%%'",
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	226 dict->where_field, dict->select_field,
4335 6dba897351bb Use sql_escape_string() instead of str_escape() Timo Sirainen <tss@iki.fi> parents: 4070 diff changeset	227 dict->table, dict->where_field,
6dba897351bb Use sql_escape_string() instead of str_escape() Timo Sirainen <tss@iki.fi> parents: 4070 diff changeset	228 sql_escape_string(dict->db, path));
3967 6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	229 if (priv) {
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	230 str_printfa(query, " AND %s = '%s'",
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	231 dict->username_field,
4335 6dba897351bb Use sql_escape_string() instead of str_escape() Timo Sirainen <tss@iki.fi> parents: 4070 diff changeset	232 sql_escape_string(dict->db,
6dba897351bb Use sql_escape_string() instead of str_escape() Timo Sirainen <tss@iki.fi> parents: 4070 diff changeset	233 dict->username));
3967 6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	234 }
4516 aa2f73a4df26 Dictionary changes: Added support for defining value's type. Key is still always a string. Added support for sorting the iteration replies. Added dict_unset(). Added Berkeley DB support. Most of the code written by Tianyan Liu. Timo Sirainen <timo.sirainen@movial.fi> parents: 4511 diff changeset	235 if ((flags & DICT_ITERATE_FLAG_RECURSE) == 0) {
3967 6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	236 str_printfa(query, " AND %s NOT LIKE '%s/%%/%%'",
4335 6dba897351bb Use sql_escape_string() instead of str_escape() Timo Sirainen <tss@iki.fi> parents: 4070 diff changeset	237 dict->where_field,
6dba897351bb Use sql_escape_string() instead of str_escape() Timo Sirainen <tss@iki.fi> parents: 4070 diff changeset	238 sql_escape_string(dict->db, path));
3967 6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	239 }
4516 aa2f73a4df26 Dictionary changes: Added support for defining value's type. Key is still always a string. Added support for sorting the iteration replies. Added dict_unset(). Added Berkeley DB support. Most of the code written by Tianyan Liu. Timo Sirainen <timo.sirainen@movial.fi> parents: 4511 diff changeset	240 if ((flags & DICT_ITERATE_FLAG_SORT_BY_KEY) != 0)
aa2f73a4df26 Dictionary changes: Added support for defining value's type. Key is still always a string. Added support for sorting the iteration replies. Added dict_unset(). Added Berkeley DB support. Most of the code written by Tianyan Liu. Timo Sirainen <timo.sirainen@movial.fi> parents: 4511 diff changeset	241 str_printfa(query, " ORDER BY %s", dict->where_field);
aa2f73a4df26 Dictionary changes: Added support for defining value's type. Key is still always a string. Added support for sorting the iteration replies. Added dict_unset(). Added Berkeley DB support. Most of the code written by Tianyan Liu. Timo Sirainen <timo.sirainen@movial.fi> parents: 4511 diff changeset	242 else if ((flags & DICT_ITERATE_FLAG_SORT_BY_VALUE) != 0)
aa2f73a4df26 Dictionary changes: Added support for defining value's type. Key is still always a string. Added support for sorting the iteration replies. Added dict_unset(). Added Berkeley DB support. Most of the code written by Tianyan Liu. Timo Sirainen <timo.sirainen@movial.fi> parents: 4511 diff changeset	243 str_printfa(query, " ORDER BY %s", dict->select_field);
3967 6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	244 ctx->result = sql_query_s(dict->db, str_c(query));
6940 414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	245 );
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	246
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	247 return &ctx->ctx;
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	248 }
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	249
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	250 static int sql_dict_iterate(struct dict_iterate_context *_ctx,
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	251 const char key_r, const char value_r)
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	252 {
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	253 struct sql_dict_iterate_context *ctx =
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	254 (struct sql_dict_iterate_context *)_ctx;
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	255 int ret;
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	256
3967 6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	257 if (ctx->result == NULL)
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	258 return -1;
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	259
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	260 if ((ret = sql_result_next_row(ctx->result)) <= 0)
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	261 return ret;
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	262
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	263 *key_r = sql_result_get_field_value(ctx->result, 0);
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	264 *value_r = sql_result_get_field_value(ctx->result, 1);
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	265 return 1;
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	266 }
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	267
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	268 static void sql_dict_iterate_deinit(struct dict_iterate_context *_ctx)
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	269 {
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	270 struct sql_dict_iterate_context *ctx =
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	271 (struct sql_dict_iterate_context *)_ctx;
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	272
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	273 sql_result_free(ctx->result);
3787 40600601502e Added dictinary lookup server and a "proxy" dict implementation to talk to Timo Sirainen <tss@iki.fi> parents: 3737 diff changeset	274 i_free(ctx);
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	275 }
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	276
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	277 static struct dict_transaction_context *
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	278 sql_dict_transaction_init(struct dict *_dict)
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	279 {
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	280 struct sql_dict dict = (struct sql_dict )_dict;
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	281 struct sql_dict_transaction_context *ctx;
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	282
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	283 ctx = i_new(struct sql_dict_transaction_context, 1);
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	284 ctx->ctx.dict = _dict;
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	285 ctx->sql_ctx = sql_transaction_begin(dict->db);
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	286
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	287 return &ctx->ctx;
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	288 }
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	289
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	290 static int sql_dict_transaction_commit(struct dict_transaction_context *_ctx)
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	291 {
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	292 struct sql_dict_transaction_context *ctx =
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	293 (struct sql_dict_transaction_context *)_ctx;
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	294 const char *error;
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	295 int ret;
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	296
4511 3f808dd8f568 If invalid key is given to dict_set() or dict_atomic_inc() fail the whole Timo Sirainen <tss@iki.fi> parents: 4371 diff changeset	297 if (ctx->failed) {
3f808dd8f568 If invalid key is given to dict_set() or dict_atomic_inc() fail the whole Timo Sirainen <tss@iki.fi> parents: 4371 diff changeset	298 sql_transaction_rollback(&ctx->sql_ctx);
3f808dd8f568 If invalid key is given to dict_set() or dict_atomic_inc() fail the whole Timo Sirainen <tss@iki.fi> parents: 4371 diff changeset	299 ret = -1;
3f808dd8f568 If invalid key is given to dict_set() or dict_atomic_inc() fail the whole Timo Sirainen <tss@iki.fi> parents: 4371 diff changeset	300 } else if (_ctx->changed) {
3f808dd8f568 If invalid key is given to dict_set() or dict_atomic_inc() fail the whole Timo Sirainen <tss@iki.fi> parents: 4371 diff changeset	301 ret = sql_transaction_commit_s(&ctx->sql_ctx, &error);
3f808dd8f568 If invalid key is given to dict_set() or dict_atomic_inc() fail the whole Timo Sirainen <tss@iki.fi> parents: 4371 diff changeset	302 if (ret < 0)
3f808dd8f568 If invalid key is given to dict_set() or dict_atomic_inc() fail the whole Timo Sirainen <tss@iki.fi> parents: 4371 diff changeset	303 i_error("sql dict: commit failed: %s", error);
3f808dd8f568 If invalid key is given to dict_set() or dict_atomic_inc() fail the whole Timo Sirainen <tss@iki.fi> parents: 4371 diff changeset	304 } else {
3f808dd8f568 If invalid key is given to dict_set() or dict_atomic_inc() fail the whole Timo Sirainen <tss@iki.fi> parents: 4371 diff changeset	305 /* nothing to be done */
3f808dd8f568 If invalid key is given to dict_set() or dict_atomic_inc() fail the whole Timo Sirainen <tss@iki.fi> parents: 4371 diff changeset	306 ret = 0;
3f808dd8f568 If invalid key is given to dict_set() or dict_atomic_inc() fail the whole Timo Sirainen <tss@iki.fi> parents: 4371 diff changeset	307 }
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	308 i_free(ctx);
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	309 return ret;
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	310 }
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	311
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	312 static void sql_dict_transaction_rollback(struct dict_transaction_context *_ctx)
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	313 {
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	314 struct sql_dict_transaction_context *ctx =
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	315 (struct sql_dict_transaction_context *)_ctx;
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	316
4511 3f808dd8f568 If invalid key is given to dict_set() or dict_atomic_inc() fail the whole Timo Sirainen <tss@iki.fi> parents: 4371 diff changeset	317 if (_ctx->changed)
3f808dd8f568 If invalid key is given to dict_set() or dict_atomic_inc() fail the whole Timo Sirainen <tss@iki.fi> parents: 4371 diff changeset	318 sql_transaction_rollback(&ctx->sql_ctx);
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	319 i_free(ctx);
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	320 }
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	321
6940 414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	322 static const char *
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	323 sql_dict_set_query(struct sql_dict dict, const char key, const char *value,
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	324 bool priv)
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	325 {
3967 6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	326 if (priv) {
6940 414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	327 return t_strdup_printf(
4371 b931db01be6c Fixes to SQL update statements Timo Sirainen <tss@iki.fi> parents: 4335 diff changeset	328 "INSERT INTO %s (%s, %s, %s) VALUES ('%s', '%s', '%s') "
3967 6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	329 "ON DUPLICATE KEY UPDATE %s = '%s'",
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	330 dict->table, dict->select_field, dict->where_field,
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	331 dict->username_field,
4592 98991f3699c6 Fixes. select/where fields were used in wrong order Timo Sirainen <tss@iki.fi> parents: 4517 diff changeset	332 sql_escape_string(dict->db, value),
4335 6dba897351bb Use sql_escape_string() instead of str_escape() Timo Sirainen <tss@iki.fi> parents: 4070 diff changeset	333 sql_escape_string(dict->db, key),
6dba897351bb Use sql_escape_string() instead of str_escape() Timo Sirainen <tss@iki.fi> parents: 4070 diff changeset	334 sql_escape_string(dict->db, dict->username),
4371 b931db01be6c Fixes to SQL update statements Timo Sirainen <tss@iki.fi> parents: 4335 diff changeset	335 dict->select_field,
4335 6dba897351bb Use sql_escape_string() instead of str_escape() Timo Sirainen <tss@iki.fi> parents: 4070 diff changeset	336 sql_escape_string(dict->db, value));
3967 6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	337 } else {
6940 414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	338 return t_strdup_printf(
4371 b931db01be6c Fixes to SQL update statements Timo Sirainen <tss@iki.fi> parents: 4335 diff changeset	339 "INSERT INTO %s (%s, %s) VALUES ('%s', '%s') "
3967 6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	340 "ON DUPLICATE KEY UPDATE %s = '%s'",
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	341 dict->table, dict->select_field, dict->where_field,
4592 98991f3699c6 Fixes. select/where fields were used in wrong order Timo Sirainen <tss@iki.fi> parents: 4517 diff changeset	342 sql_escape_string(dict->db, value),
4335 6dba897351bb Use sql_escape_string() instead of str_escape() Timo Sirainen <tss@iki.fi> parents: 4070 diff changeset	343 sql_escape_string(dict->db, key),
4371 b931db01be6c Fixes to SQL update statements Timo Sirainen <tss@iki.fi> parents: 4335 diff changeset	344 dict->select_field,
4335 6dba897351bb Use sql_escape_string() instead of str_escape() Timo Sirainen <tss@iki.fi> parents: 4070 diff changeset	345 sql_escape_string(dict->db, value));
3967 6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	346 }
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	347 }
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	348
6940 414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	349 static void sql_dict_set(struct dict_transaction_context *_ctx,
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	350 const char key, const char value)
4516 aa2f73a4df26 Dictionary changes: Added support for defining value's type. Key is still always a string. Added support for sorting the iteration replies. Added dict_unset(). Added Berkeley DB support. Most of the code written by Tianyan Liu. Timo Sirainen <timo.sirainen@movial.fi> parents: 4511 diff changeset	351 {
aa2f73a4df26 Dictionary changes: Added support for defining value's type. Key is still always a string. Added support for sorting the iteration replies. Added dict_unset(). Added Berkeley DB support. Most of the code written by Tianyan Liu. Timo Sirainen <timo.sirainen@movial.fi> parents: 4511 diff changeset	352 struct sql_dict_transaction_context *ctx =
aa2f73a4df26 Dictionary changes: Added support for defining value's type. Key is still always a string. Added support for sorting the iteration replies. Added dict_unset(). Added Berkeley DB support. Most of the code written by Tianyan Liu. Timo Sirainen <timo.sirainen@movial.fi> parents: 4511 diff changeset	353 (struct sql_dict_transaction_context *)_ctx;
aa2f73a4df26 Dictionary changes: Added support for defining value's type. Key is still always a string. Added support for sorting the iteration replies. Added dict_unset(). Added Berkeley DB support. Most of the code written by Tianyan Liu. Timo Sirainen <timo.sirainen@movial.fi> parents: 4511 diff changeset	354 struct sql_dict dict = (struct sql_dict )_ctx->dict;
aa2f73a4df26 Dictionary changes: Added support for defining value's type. Key is still always a string. Added support for sorting the iteration replies. Added dict_unset(). Added Berkeley DB support. Most of the code written by Tianyan Liu. Timo Sirainen <timo.sirainen@movial.fi> parents: 4511 diff changeset	355 bool priv;
aa2f73a4df26 Dictionary changes: Added support for defining value's type. Key is still always a string. Added support for sorting the iteration replies. Added dict_unset(). Added Berkeley DB support. Most of the code written by Tianyan Liu. Timo Sirainen <timo.sirainen@movial.fi> parents: 4511 diff changeset	356
aa2f73a4df26 Dictionary changes: Added support for defining value's type. Key is still always a string. Added support for sorting the iteration replies. Added dict_unset(). Added Berkeley DB support. Most of the code written by Tianyan Liu. Timo Sirainen <timo.sirainen@movial.fi> parents: 4511 diff changeset	357 if (sql_path_fix(&key, &priv) < 0) {
aa2f73a4df26 Dictionary changes: Added support for defining value's type. Key is still always a string. Added support for sorting the iteration replies. Added dict_unset(). Added Berkeley DB support. Most of the code written by Tianyan Liu. Timo Sirainen <timo.sirainen@movial.fi> parents: 4511 diff changeset	358 i_error("sql dict: Invalid key: %s", key);
aa2f73a4df26 Dictionary changes: Added support for defining value's type. Key is still always a string. Added support for sorting the iteration replies. Added dict_unset(). Added Berkeley DB support. Most of the code written by Tianyan Liu. Timo Sirainen <timo.sirainen@movial.fi> parents: 4511 diff changeset	359 ctx->failed = TRUE;
aa2f73a4df26 Dictionary changes: Added support for defining value's type. Key is still always a string. Added support for sorting the iteration replies. Added dict_unset(). Added Berkeley DB support. Most of the code written by Tianyan Liu. Timo Sirainen <timo.sirainen@movial.fi> parents: 4511 diff changeset	360 return;
aa2f73a4df26 Dictionary changes: Added support for defining value's type. Key is still always a string. Added support for sorting the iteration replies. Added dict_unset(). Added Berkeley DB support. Most of the code written by Tianyan Liu. Timo Sirainen <timo.sirainen@movial.fi> parents: 4511 diff changeset	361 }
aa2f73a4df26 Dictionary changes: Added support for defining value's type. Key is still always a string. Added support for sorting the iteration replies. Added dict_unset(). Added Berkeley DB support. Most of the code written by Tianyan Liu. Timo Sirainen <timo.sirainen@movial.fi> parents: 4511 diff changeset	362
6940 414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	363 T_FRAME(
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	364 const char *query;
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	365
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	366 query = sql_dict_set_query(dict, key, value, priv);
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	367 sql_update(ctx->sql_ctx, query);
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	368 );
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	369 }
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	370
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	371 static const char *
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	372 sql_dict_unset_query(struct sql_dict dict, const char key, bool priv)
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	373 {
4516 aa2f73a4df26 Dictionary changes: Added support for defining value's type. Key is still always a string. Added support for sorting the iteration replies. Added dict_unset(). Added Berkeley DB support. Most of the code written by Tianyan Liu. Timo Sirainen <timo.sirainen@movial.fi> parents: 4511 diff changeset	374 if (priv) {
6940 414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	375 return t_strdup_printf(
4516 aa2f73a4df26 Dictionary changes: Added support for defining value's type. Key is still always a string. Added support for sorting the iteration replies. Added dict_unset(). Added Berkeley DB support. Most of the code written by Tianyan Liu. Timo Sirainen <timo.sirainen@movial.fi> parents: 4511 diff changeset	376 "DELETE FROM %s WHERE %s = '%s' AND %s = '%s'",
aa2f73a4df26 Dictionary changes: Added support for defining value's type. Key is still always a string. Added support for sorting the iteration replies. Added dict_unset(). Added Berkeley DB support. Most of the code written by Tianyan Liu. Timo Sirainen <timo.sirainen@movial.fi> parents: 4511 diff changeset	377 dict->table, dict->where_field,
aa2f73a4df26 Dictionary changes: Added support for defining value's type. Key is still always a string. Added support for sorting the iteration replies. Added dict_unset(). Added Berkeley DB support. Most of the code written by Tianyan Liu. Timo Sirainen <timo.sirainen@movial.fi> parents: 4511 diff changeset	378 sql_escape_string(dict->db, key),
aa2f73a4df26 Dictionary changes: Added support for defining value's type. Key is still always a string. Added support for sorting the iteration replies. Added dict_unset(). Added Berkeley DB support. Most of the code written by Tianyan Liu. Timo Sirainen <timo.sirainen@movial.fi> parents: 4511 diff changeset	379 dict->username_field,
aa2f73a4df26 Dictionary changes: Added support for defining value's type. Key is still always a string. Added support for sorting the iteration replies. Added dict_unset(). Added Berkeley DB support. Most of the code written by Tianyan Liu. Timo Sirainen <timo.sirainen@movial.fi> parents: 4511 diff changeset	380 sql_escape_string(dict->db, dict->username));
aa2f73a4df26 Dictionary changes: Added support for defining value's type. Key is still always a string. Added support for sorting the iteration replies. Added dict_unset(). Added Berkeley DB support. Most of the code written by Tianyan Liu. Timo Sirainen <timo.sirainen@movial.fi> parents: 4511 diff changeset	381 } else {
6940 414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	382 return t_strdup_printf(
4516 aa2f73a4df26 Dictionary changes: Added support for defining value's type. Key is still always a string. Added support for sorting the iteration replies. Added dict_unset(). Added Berkeley DB support. Most of the code written by Tianyan Liu. Timo Sirainen <timo.sirainen@movial.fi> parents: 4511 diff changeset	383 "DELETE FROM %s WHERE %s = '%s'",
aa2f73a4df26 Dictionary changes: Added support for defining value's type. Key is still always a string. Added support for sorting the iteration replies. Added dict_unset(). Added Berkeley DB support. Most of the code written by Tianyan Liu. Timo Sirainen <timo.sirainen@movial.fi> parents: 4511 diff changeset	384 dict->table, dict->where_field,
aa2f73a4df26 Dictionary changes: Added support for defining value's type. Key is still always a string. Added support for sorting the iteration replies. Added dict_unset(). Added Berkeley DB support. Most of the code written by Tianyan Liu. Timo Sirainen <timo.sirainen@movial.fi> parents: 4511 diff changeset	385 sql_escape_string(dict->db, key));
aa2f73a4df26 Dictionary changes: Added support for defining value's type. Key is still always a string. Added support for sorting the iteration replies. Added dict_unset(). Added Berkeley DB support. Most of the code written by Tianyan Liu. Timo Sirainen <timo.sirainen@movial.fi> parents: 4511 diff changeset	386 }
6940 414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	387 }
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	388
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	389 static void sql_dict_unset(struct dict_transaction_context *_ctx,
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	390 const char *key)
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	391 {
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	392 struct sql_dict_transaction_context *ctx =
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	393 (struct sql_dict_transaction_context *)_ctx;
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	394 struct sql_dict dict = (struct sql_dict )_ctx->dict;
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	395 bool priv;
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	396
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	397 if (sql_path_fix(&key, &priv) < 0) {
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	398 i_error("sql dict: Invalid key: %s", key);
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	399 ctx->failed = TRUE;
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	400 return;
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	401 }
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	402
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	403 T_FRAME(
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	404 const char *query;
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	405
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	406 query = sql_dict_unset_query(dict, key, priv);
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	407 sql_update(ctx->sql_ctx, query);
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	408 );
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	409 }
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	410
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	411 static const char *
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	412 sql_dict_atomic_inc_query(struct sql_dict dict, const char key,
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	413 long long diff, bool priv)
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	414 {
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	415 if (priv) {
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	416 return t_strdup_printf(
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	417 "INSERT INTO %s (%s, %s, %s) VALUES (%lld, '%s', '%s') "
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	418 "ON DUPLICATE KEY UPDATE %s = %s + %lld",
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	419 dict->table, dict->select_field, dict->where_field,
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	420 dict->username_field,
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	421 diff, sql_escape_string(dict->db, key),
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	422 sql_escape_string(dict->db, dict->username),
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	423 dict->select_field, dict->select_field, diff);
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	424 } else {
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	425 return t_strdup_printf(
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	426 "INSERT INTO %s (%s, %s) VALUES (%lld, '%s') "
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	427 "ON DUPLICATE KEY UPDATE %s = %s + %lld",
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	428 dict->table, dict->select_field, dict->where_field,
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	429 diff, sql_escape_string(dict->db, key),
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	430 dict->select_field, dict->select_field, diff);
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	431 }
4516 aa2f73a4df26 Dictionary changes: Added support for defining value's type. Key is still always a string. Added support for sorting the iteration replies. Added dict_unset(). Added Berkeley DB support. Most of the code written by Tianyan Liu. Timo Sirainen <timo.sirainen@movial.fi> parents: 4511 diff changeset	432 }
aa2f73a4df26 Dictionary changes: Added support for defining value's type. Key is still always a string. Added support for sorting the iteration replies. Added dict_unset(). Added Berkeley DB support. Most of the code written by Tianyan Liu. Timo Sirainen <timo.sirainen@movial.fi> parents: 4511 diff changeset	433
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	434 static void sql_dict_atomic_inc(struct dict_transaction_context *_ctx,
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	435 const char *key, long long diff)
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	436 {
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	437 struct sql_dict_transaction_context *ctx =
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	438 (struct sql_dict_transaction_context *)_ctx;
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	439 struct sql_dict dict = (struct sql_dict )_ctx->dict;
3967 6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	440 bool priv;
6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	441
4511 3f808dd8f568 If invalid key is given to dict_set() or dict_atomic_inc() fail the whole Timo Sirainen <tss@iki.fi> parents: 4371 diff changeset	442 if (sql_path_fix(&key, &priv) < 0) {
3f808dd8f568 If invalid key is given to dict_set() or dict_atomic_inc() fail the whole Timo Sirainen <tss@iki.fi> parents: 4371 diff changeset	443 i_error("sql dict: Invalid key: %s", key);
3f808dd8f568 If invalid key is given to dict_set() or dict_atomic_inc() fail the whole Timo Sirainen <tss@iki.fi> parents: 4371 diff changeset	444 ctx->failed = TRUE;
3967 6fabe878c46d Dictionary takes now a username parameter, which is used for private Timo Sirainen <tss@iki.fi> parents: 3943 diff changeset	445 return;
4511 3f808dd8f568 If invalid key is given to dict_set() or dict_atomic_inc() fail the whole Timo Sirainen <tss@iki.fi> parents: 4371 diff changeset	446 }
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	447
6940 414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	448 T_FRAME(
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	449 const char *query;
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	450
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	451 query = sql_dict_atomic_inc_query(dict, key, diff, priv);
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	452 sql_update(ctx->sql_ctx, query);
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6480 diff changeset	453 );
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	454 }
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	455
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	456 static struct dict sql_dict = {
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	457 MEMBER(name) "sql",
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	458
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	459 {
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	460 sql_dict_init,
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	461 sql_dict_deinit,
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	462 sql_dict_lookup,
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	463 sql_dict_iterate_init,
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	464 sql_dict_iterate,
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	465 sql_dict_iterate_deinit,
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	466 sql_dict_transaction_init,
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	467 sql_dict_transaction_commit,
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	468 sql_dict_transaction_rollback,
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	469 sql_dict_set,
4516 aa2f73a4df26 Dictionary changes: Added support for defining value's type. Key is still always a string. Added support for sorting the iteration replies. Added dict_unset(). Added Berkeley DB support. Most of the code written by Tianyan Liu. Timo Sirainen <timo.sirainen@movial.fi> parents: 4511 diff changeset	470 sql_dict_unset,
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	471 sql_dict_atomic_inc
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	472 }
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	473 };
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	474
4517 e661182eab75 Berkeley DB dict support is now enabled only when using --with-db configure option. Timo Sirainen <timo.sirainen@movial.fi> parents: 4516 diff changeset	475 static struct dict *dict_sql_drivers;
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	476
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	477 void dict_sql_register(void)
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	478 {
3943 cbe5c6772e0d Added support for dynamically building SQL drivers. Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	479 const struct sql_db const drivers;
cbe5c6772e0d Added support for dynamically building SQL drivers. Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	480 unsigned int i, count;
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	481
6480 7596339a9452 Use SQL connection pools. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	482 dict_sql_pool = sql_pool_init(DICT_SQL_MAX_UNUSED_CONNECTIONS);
7596339a9452 Use SQL connection pools. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	483
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	484 /* @UNSAFE */
3943 cbe5c6772e0d Added support for dynamically building SQL drivers. Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	485 drivers = array_get(&sql_drivers, &count);
4517 e661182eab75 Berkeley DB dict support is now enabled only when using --with-db configure option. Timo Sirainen <timo.sirainen@movial.fi> parents: 4516 diff changeset	486 dict_sql_drivers = i_new(struct dict, count + 1);
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	487
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	488 for (i = 0; i < count; i++) {
4517 e661182eab75 Berkeley DB dict support is now enabled only when using --with-db configure option. Timo Sirainen <timo.sirainen@movial.fi> parents: 4516 diff changeset	489 dict_sql_drivers[i] = sql_dict;
e661182eab75 Berkeley DB dict support is now enabled only when using --with-db configure option. Timo Sirainen <timo.sirainen@movial.fi> parents: 4516 diff changeset	490 dict_sql_drivers[i].name = drivers[i]->name;
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	491
4517 e661182eab75 Berkeley DB dict support is now enabled only when using --with-db configure option. Timo Sirainen <timo.sirainen@movial.fi> parents: 4516 diff changeset	492 dict_driver_register(&dict_sql_drivers[i]);
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	493 }
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	494 }
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	495
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	496 void dict_sql_unregister(void)
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	497 {
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	498 int i;
d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	499
4517 e661182eab75 Berkeley DB dict support is now enabled only when using --with-db configure option. Timo Sirainen <timo.sirainen@movial.fi> parents: 4516 diff changeset	500 for (i = 0; dict_sql_drivers[i].name != NULL; i++)
e661182eab75 Berkeley DB dict support is now enabled only when using --with-db configure option. Timo Sirainen <timo.sirainen@movial.fi> parents: 4516 diff changeset	501 dict_driver_unregister(&dict_sql_drivers[i]);
e661182eab75 Berkeley DB dict support is now enabled only when using --with-db configure option. Timo Sirainen <timo.sirainen@movial.fi> parents: 4516 diff changeset	502 i_free(dict_sql_drivers);
6480 7596339a9452 Use SQL connection pools. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	503 sql_pool_deinit(&dict_sql_pool);
3737 d67092398377 Added dictionary API and implementation for SQL. It's meant for looking and Timo Sirainen <tss@iki.fi> parents: diff changeset	504 }

Mercurial > dovecot > original-hg > dovecot-1.2

annotate src/lib-dict/dict-sql.c @ 7086:7ed926ed7aa4 HEAD