From: Boris P. Korzun <drtr0jan@yandex.ru>
Date: Fri, 18 Feb 2022 09:19:37 +0000 (+0300)
Subject: res_config_pgsql: Add text-type column check in require_pgsql()
X-Git-Tag: 19.3.0-rc1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00a7fa985e75df8cd139d50f42a86410b81f7ac2;p=thirdparty%2Fasterisk.git

res_config_pgsql: Add text-type column check in require_pgsql()

Omit "unsupported column type 'text'" warning in logs while
using text-type column in the PgSQL backend.

ASTERISK-29924 #close

Change-Id: I48061a7d469426859670db07f1ed8af1eb814712
---

diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c
index 81c165bfda..dbcd9e77b6 100644
--- a/res/res_config_pgsql.c
+++ b/res/res_config_pgsql.c
@@ -1234,8 +1234,8 @@ static int require_pgsql(const char *database, const char *tablename, va_list ap
 		AST_LIST_TRAVERSE(&table->columns, column, list) {
 			if (strcmp(column->name, elm) == 0) {
 				/* Char can hold anything, as long as it is large enough */
-				if ((strncmp(column->type, "char", 4) == 0 || strncmp(column->type, "varchar", 7) == 0 || strcmp(column->type, "bpchar") == 0)) {
-					if ((size > column->len) && column->len != -1) {
+				if ((strncmp(column->type, "char", 4) == 0 || strncmp(column->type, "varchar", 7) == 0 || strcmp(column->type, "bpchar") == 0 || strncmp(column->type, "text", 4) == 0)) {
+					if (column->len != -1 && (size > column->len)) {
 						ast_log(LOG_WARNING, "Column '%s' should be at least %d long, but is only %d long.\n", column->name, size, column->len);
 						res = -1;
 					}