dict-sql: Rename dict_sql_map.max_field_count to max_pattern_fields_count

diff --git a/src/lib-dict-backend/dict-sql-settings.c b/src/lib-dict-backend/dict-sql-settings.c
index bf745d558dfdb9aa7fde8757a35d06c563f965d3..0d449234234a0b3299cd2ffa6b2d4252f5106505 100644 (file)
--- a/src/lib-dict-backend/dict-sql-settings.c
+++ b/src/lib-dict-backend/dict-sql-settings.c
@@ -125,8 +125,8 @@ static const char *dict_sql_fields_map(struct setting_parser_ctx *ctx)
                }
        }
 
-       if (ctx->set->max_field_count < count)
-               ctx->set->max_field_count = count;
+       if (ctx->set->max_pattern_fields_count < count)
+               ctx->set->max_pattern_fields_count = count;
        ctx->cur_map.pattern = p_strdup(ctx->pool, str_c(pattern));
        return NULL;
 }

diff --git a/src/lib-dict-backend/dict-sql-settings.h b/src/lib-dict-backend/dict-sql-settings.h
index b95bf29fb47b9a19218bfd6c5a0a1606d699f4a5..c9ee037d277f2ecfb0cb833eba449594298e8ff0 100644 (file)
--- a/src/lib-dict-backend/dict-sql-settings.h
+++ b/src/lib-dict-backend/dict-sql-settings.h
@@ -35,7 +35,7 @@ struct dict_sql_map {
 struct dict_sql_settings {
        const char *connect;
 
-       unsigned int max_field_count;
+       unsigned int max_pattern_fields_count;
        ARRAY(struct dict_sql_map) maps;
 };
 

diff --git a/src/lib-dict-backend/dict-sql.c b/src/lib-dict-backend/dict-sql.c
index 861cb1be5f3971294dafff551222496ececdde4a..7e26254c1c5de141cec5ddeed14a646e772f7ced 100644 (file)
--- a/src/lib-dict-backend/dict-sql.c
+++ b/src/lib-dict-backend/dict-sql.c
@@ -224,7 +224,7 @@ sql_dict_find_map(struct sql_dict *dict, const char *path,
        unsigned int i, count;
        size_t len;
 
-       t_array_init(values, dict->set->max_field_count);
+       t_array_init(values, dict->set->max_pattern_fields_count);
        maps = array_get(&dict->set->maps, &count);
        for (i = 0; i < count; i++) {
                if (dict_sql_map_match(&maps[i], path, values,
@@ -611,7 +611,7 @@ sql_dict_iterate_find_next_map(struct sql_dict_iterate_context *ctx,
        size_t pat_len, path_len;
        bool recurse = (ctx->flags & DICT_ITERATE_FLAG_RECURSE) != 0;
 
-       t_array_init(values, dict->set->max_field_count);
+       t_array_init(values, dict->set->max_pattern_fields_count);
        maps = array_get(&dict->set->maps, &count);
        for (i = ctx->next_map_idx; i < count; i++) {
                if (dict_sql_map_match(&maps[i], ctx->paths[ctx->path_idx],