# HG changeset patch
# User Timo Sirainen <timo.sirainen@dovecot.fi>
# Date 1491558132 -10800
# Node ID 7a87ed7c9f88f0a1b882c386b487f65787c2c696
# Parent  abfa9d47030567f349b6f73f4420fad06b166924
dict-sql: Fix setting $variables to iteration key when map had multiple values

diff -r abfa9d470305 -r 7a87ed7c9f88 src/lib-dict/dict-sql.c
--- a/src/lib-dict/dict-sql.c	Fri Apr 07 09:14:27 2017 +0300
+++ b/src/lib-dict/dict-sql.c	Fri Apr 07 12:42:12 2017 +0300
@@ -757,7 +757,8 @@
 		str_append_c(ctx->key, '/');
 
 	count = sql_result_get_fields_count(ctx->result);
-	i = (ctx->flags & DICT_ITERATE_FLAG_NO_VALUE) != 0 ? 0 : 1;
+	i = (ctx->flags & DICT_ITERATE_FLAG_NO_VALUE) != 0 ? 0 :
+		ctx->map->values_count;
 	sql_field_i = ctx->sql_fields_start_idx;
 	for (p = ctx->map->pattern + ctx->pattern_prefix_len; *p != '\0'; p++) {
 		if (*p != '$')