From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Tue, 15 Aug 2017 12:37:01 +0000 (+0300)
Subject: dict-sql: Add signed "int" type
X-Git-Tag: 2.3.0.rc1~1063
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0e884c3e02b9dc540bdfe929a66af7476ebc860d;p=thirdparty%2Fdovecot%2Fcore.git

dict-sql: Add signed "int" type
---

diff --git a/src/lib-dict/dict-sql-settings.c b/src/lib-dict/dict-sql-settings.c
index ba6e247d68..9741adce02 100644
--- a/src/lib-dict/dict-sql-settings.c
+++ b/src/lib-dict/dict-sql-settings.c
@@ -138,6 +138,8 @@ dict_sql_value_type_parse(const char *value_type, enum dict_sql_type *type_r)
 		*type_r = DICT_SQL_TYPE_STRING;
 	else if (strcmp(value_type, "hexblob") == 0)
 		*type_r = DICT_SQL_TYPE_HEXBLOB;
+	else if (strcmp(value_type, "int") == 0)
+		*type_r = DICT_SQL_TYPE_INT;
 	else if (strcmp(value_type, "uint") == 0)
 		*type_r = DICT_SQL_TYPE_UINT;
 	else
@@ -226,6 +228,11 @@ parse_setting(const char *key, const char *value,
 			field->variable = p_strndup(ctx->pool, value + 10,
 						    value_len-10-1);
 			field->sql_field.value_type = DICT_SQL_TYPE_HEXBLOB;
+		} else if (strncmp(value, "${int:", 6) == 0 &&
+			   value[value_len-1] == '}') {
+			field->variable = p_strndup(ctx->pool, value + 6,
+						    value_len-6-1);
+			field->sql_field.value_type = DICT_SQL_TYPE_INT;
 		} else if (strncmp(value, "${uint:", 7) == 0 &&
 			   value[value_len-1] == '}') {
 			field->variable = p_strndup(ctx->pool, value + 7,
diff --git a/src/lib-dict/dict-sql-settings.h b/src/lib-dict/dict-sql-settings.h
index 5ee0977fe4..0f0a3aff78 100644
--- a/src/lib-dict/dict-sql-settings.h
+++ b/src/lib-dict/dict-sql-settings.h
@@ -3,6 +3,7 @@
 
 enum dict_sql_type {
 	DICT_SQL_TYPE_STRING = 0,
+	DICT_SQL_TYPE_INT,
 	DICT_SQL_TYPE_UINT,
 	DICT_SQL_TYPE_HEXBLOB
 };
diff --git a/src/lib-dict/dict-sql.c b/src/lib-dict/dict-sql.c
index 5adb6500ed..f4a690bfff 100644
--- a/src/lib-dict/dict-sql.c
+++ b/src/lib-dict/dict-sql.c
@@ -217,6 +217,7 @@ sql_dict_value_escape(string_t *str, struct sql_dict *dict,
 		      const char **error_r)
 {
 	buffer_t *buf;
+	int64_t snum;
 	uint64_t num;
 
 	switch (value_type) {
@@ -224,6 +225,15 @@ sql_dict_value_escape(string_t *str, struct sql_dict *dict,
 		str_printfa(str, "'%s%s'", sql_escape_string(dict->db, value),
 			    value_suffix);
 		return 0;
+	case DICT_SQL_TYPE_INT:
+		if (value_suffix[0] != '\0' || str_to_int64(value, &snum) < 0) {
+			*error_r = t_strdup_printf(
+				"%s field's value isn't 64bit signed integer: %s%s (in pattern: %s)",
+				field_name, value, value_suffix, map->pattern);
+			return -1;
+		}
+		str_printfa(str, "%"PRId64, snum);
+		return 0;
 	case DICT_SQL_TYPE_UINT:
 		if (value_suffix[0] != '\0' || str_to_uint64(value, &num) < 0) {
 			*error_r = t_strdup_printf(
@@ -371,6 +381,7 @@ sql_dict_result_unescape(enum dict_sql_type type, pool_t pool,
 
 	switch (type) {
 	case DICT_SQL_TYPE_STRING:
+	case DICT_SQL_TYPE_INT:
 	case DICT_SQL_TYPE_UINT:
 		return p_strdup(pool, sql_result_get_field_value(result, result_idx));
 	case DICT_SQL_TYPE_HEXBLOB: