Mercurial > dovecot > core-2.2
changeset 22517:9bb9e436a642
dict-sql: Remove dict_sql_build_query.inc
It's no longer useful with the current code.
author | Timo Sirainen <timo.sirainen@dovecot.fi> |
---|---|
date | Tue, 15 Aug 2017 16:44:27 +0300 |
parents | 16835a26b202 |
children | c9ddf11490a6 |
files | src/lib-dict/dict-sql.c |
diffstat | 1 files changed, 14 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-dict/dict-sql.c Fri May 06 12:19:21 2016 +0300 +++ b/src/lib-dict/dict-sql.c Tue Aug 15 16:44:27 2017 +0300 @@ -936,7 +936,6 @@ ARRAY(struct dict_sql_build_query_field) fields; const ARRAY_TYPE(const_string) *extra_values; char key1; - bool inc; }; static int sql_dict_set_query(struct sql_dict_transaction_context *ctx, @@ -964,16 +963,13 @@ str_append_c(suffix, ','); } str_append(prefix, t_strcut(fields[i].map->value_field, ',')); - if (build->inc) - str_append(suffix, fields[i].value); - else { - enum dict_sql_type value_type = - fields[i].map->value_types[0]; - if (sql_dict_value_escape(suffix, dict, fields[i].map, - value_type, "value", fields[i].value, - "", error_r) < 0) - return -1; - } + + enum dict_sql_type value_type = + fields[i].map->value_types[0]; + if (sql_dict_value_escape(suffix, dict, fields[i].map, + value_type, "value", fields[i].value, + "", error_r) < 0) + return -1; } if (build->key1 == DICT_PATH_PRIVATE[0]) { str_printfa(prefix, ",%s", fields[0].map->username_field); @@ -1009,18 +1005,13 @@ str_append_c(prefix, ','); str_append(prefix, first_value_field); str_append_c(prefix, '='); - if (build->inc) { - str_printfa(prefix, "%s+%s", - first_value_field, - fields[i].value); - } else { - enum dict_sql_type value_type = - fields[i].map->value_types[0]; - if (sql_dict_value_escape(prefix, dict, fields[i].map, - value_type, "value", fields[i].value, - "", error_r) < 0) - return -1; - } + + enum dict_sql_type value_type = + fields[i].map->value_types[0]; + if (sql_dict_value_escape(prefix, dict, fields[i].map, + value_type, "value", fields[i].value, + "", error_r) < 0) + return -1; } *query_r = str_c(prefix); return 0; @@ -1036,8 +1027,6 @@ unsigned int i, field_count; string_t *query; - i_assert(build->inc); - fields = array_get(&build->fields, &field_count); i_assert(field_count > 0); @@ -1185,7 +1174,6 @@ array_append(&build.fields, &field, 1); build.extra_values = &values; build.key1 = key[0]; - build.inc = TRUE; if (sql_dict_update_query(ctx, &build, &query, &error) < 0) { i_error("dict-sql: Failed to increase %s: %s", key, error); @@ -1289,7 +1277,6 @@ t_array_init(&build.fields, 1); build.extra_values = &values; build.key1 = key[0]; - build.inc = FALSE; field = array_append_space(&build.fields); field->map = ctx->prev_set_map; @@ -1349,7 +1336,6 @@ t_array_init(&build.fields, 1); build.extra_values = &values; build.key1 = key[0]; - build.inc = TRUE; field = array_append_space(&build.fields); field->map = ctx->prev_inc_map;