diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-10 15:31:41 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-10 15:31:41 +0000 |
| commit | 52af1e631d919ad466e234f5ac1e3c5bf5ea28f4 (patch) | |
| tree | 0e0f3019763e37faf07115f5c7254f5fde98db5d | |
| parent | 50cc15b160de2fb4c3abb447574cc5cc0992aed8 (diff) | |
Merged revisions 74313 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r74313 | russell | 2007-07-10 10:30:20 -0500 (Tue, 10 Jul 2007) | 3 lines
Only use ESCAPE when LIKE is used.
(issue #10075, this part reported by jmls on IRC, patch by me)
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@74314 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | res/res_config_odbc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c index a1284d849..642e6b075 100644 --- a/res/res_config_odbc.c +++ b/res/res_config_odbc.c @@ -109,7 +109,8 @@ static struct ast_variable *realtime_odbc(const char *database, const char *tabl newval = va_arg(aq, const char *); } va_end(aq); - snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), " ESCAPE '\\'"); + if (strcasestr(sql, "LIKE")) + snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), " ESCAPE '\\'"); res = SQLPrepare(stmt, (unsigned char *)sql, SQL_NTS); if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) { @@ -267,7 +268,8 @@ static struct ast_config *realtime_multi_odbc(const char *database, const char * if (initfield) snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), " ORDER BY %s", initfield); va_end(aq); - snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), " ESCAPE '\\'"); + if (strcasestr(sql, "LIKE")) + snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), " ESCAPE '\\'"); res = SQLPrepare(stmt, (unsigned char *)sql, SQL_NTS); if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) { |