From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Wed, 13 Mar 2024 20:38:48 +0000 (+0200)
Subject: dict-sql: Remove obsolete value_hexblob setting
X-Git-Tag: 2.4.1~836
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9456efee5bdee22cc9f757984518739dd9da8897;p=thirdparty%2Fdovecot%2Fcore.git

dict-sql: Remove obsolete value_hexblob setting

It was replaced by value_type setting long time ago.
---

diff --git a/src/lib-dict-backend/dict-sql-settings.c b/src/lib-dict-backend/dict-sql-settings.c
index 22192e36cc..c06710fb1f 100644
--- a/src/lib-dict-backend/dict-sql-settings.c
+++ b/src/lib-dict-backend/dict-sql-settings.c
@@ -39,7 +39,6 @@ static const struct setting_def dict_sql_map_setting_defs[] = {
 	DEF_STR(value_field),
 	DEF_STR(value_type),
 	DEF_STR(expire_field),
-	DEF_BOOL(value_hexblob),
 
 	{ 0, NULL, 0 }
 };
@@ -185,10 +184,8 @@ static const char *dict_sql_map_finish(struct setting_parser_ctx *ctx)
 				return t_strdup_printf("Invalid value %s in value_type", types[i]);
 		}
 	} else {
-		for (i = 0; i < ctx->cur_map.values_count; i++) {
-			value_types[i] = ctx->cur_map.value_hexblob ?
-				DICT_SQL_TYPE_HEXBLOB : DICT_SQL_TYPE_STRING;
-		}
+		for (i = 0; i < ctx->cur_map.values_count; i++)
+			value_types[i] = DICT_SQL_TYPE_STRING;
 	}
 	ctx->cur_map.value_types = value_types;
 
diff --git a/src/lib-dict-backend/dict-sql-settings.h b/src/lib-dict-backend/dict-sql-settings.h
index cff5a44b37..6e730252b9 100644
--- a/src/lib-dict-backend/dict-sql-settings.h
+++ b/src/lib-dict-backend/dict-sql-settings.h
@@ -25,7 +25,6 @@ struct dict_sql_map {
 	const char *value_field;
 	const char *value_type;
 	const char *expire_field;
-	bool value_hexblob;
 
 	/* SQL field names, one for each $ variable in the pattern */
 	ARRAY(struct dict_sql_field) pattern_fields;