From 365003a444b1b8c710b991d5dfec6fb6f49dc7c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Tue, 19 Sep 2017 07:22:50 -0300 Subject: [PATCH] res_config_pgsql: Fix removed support to previous for versions PostgreSQL 9.1 In PostgreSQL 9.1 the backslash are string literals and not the escape of characters. In previous issue ASTERISK_26057 was fixed the use of escape LIKE but the support for old version of Postgresql than 9.1 was dropped. The sentence before make was "ESCAPE '\'" but in version before than 9.1 need it to be as follow "ESCAPE '\\'". ASTERISK-27283 Change-Id: I96d9ee1ed7693ab17503cb36a9cd72847165f949 --- res/res_config_pgsql.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c index 7a2c9dbf82..abd00ca3a8 100644 --- a/res/res_config_pgsql.c +++ b/res/res_config_pgsql.c @@ -52,6 +52,7 @@ AST_THREADSTORAGE(semibuf_buf); static PGconn *pgsqlConn = NULL; static int version; #define has_schema_support (version > 70300 ? 1 : 0) +#define USE_BACKSLASH_AS_STRING (version >= 90100 ? 1 : 0) #define MAX_DB_OPTION_SIZE 64 @@ -384,7 +385,7 @@ static struct columns *find_column(struct tables *t, const char *colname) } #define IS_SQL_LIKE_CLAUSE(x) ((x) && ast_ends_with(x, " LIKE")) -static char *ESCAPE_CLAUSE = " ESCAPE '\\'"; +#define ESCAPE_CLAUSE (USE_BACKSLASH_AS_STRING ? " ESCAPE '\\'" : " ESCAPE '\\\\'") static struct ast_variable *realtime_pgsql(const char *database, const char *tablename, const struct ast_variable *fields) {