From: Sean Bright <sean.bright@gmail.com>
Date: Wed, 1 Mar 2017 13:23:55 +0000 (-0500)
Subject: res_config_pgsql: Make 'require' return consistent with other backends
X-Git-Tag: 14.4.0-rc1~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe40ccc821ad36305535cc4219b038cc789b4084;p=thirdparty%2Fasterisk.git

res_config_pgsql: Make 'require' return consistent with other backends

res_config_pgsql should match the behavior of other realtime backend
drivers so that queue_log can disable adaptive logging.

ASTERISK-25628 #close
Reported by: Dmitry Wagin

Change-Id: Ic1fb1600c7ce10fdfb1bcdc43c5576b7e0014372
---

diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c
index 3c91f9d135..def998cce7 100644
--- a/res/res_config_pgsql.c
+++ b/res/res_config_pgsql.c
@@ -1286,6 +1286,7 @@ static int require_pgsql(const char *database, const char *tablename, va_list ap
 		if (!column) {
 			if (requirements == RQ_WARN) {
 				ast_log(LOG_WARNING, "Table %s requires a column '%s' of size '%d', but no such column exists.\n", tablename, elm, size);
+				res = -1;
 			} else {
 				struct ast_str *sql = ast_str_create(100);
 				char fieldtype[15];