diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-06 16:14:39 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-06 16:14:39 +0000 |
| commit | aedb36c320c456c74aad07910749b02363d14131 (patch) | |
| tree | 3c780cef9ce198440cb1e87a964f85e19236e3d1 /res/res_config_odbc.c | |
| parent | 3baf66061293ce8c17f9d25a9671f1ddfdbaa98a (diff) | |
Merged revisions 73696 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r73696 | russell | 2007-07-06 11:12:51 -0500 (Fri, 06 Jul 2007) | 16 lines
Merged revisions 73684 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r73684 | russell | 2007-07-06 11:06:27 -0500 (Fri, 06 Jul 2007) | 8 lines
(closes issue #10075)
Reported by: apsaras
Patches submitted by: Corydon76
Tested by: apsaras
Fix a problem with MSSQL 2005 by explicitly stating that '\' is being used as
an escape character.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@73701 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/res_config_odbc.c')
| -rw-r--r-- | res/res_config_odbc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c index 7715166b4..cf23d4300 100644 --- a/res/res_config_odbc.c +++ b/res/res_config_odbc.c @@ -109,6 +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 '\\'"); + res = SQLPrepare(stmt, (unsigned char *)sql, SQL_NTS); if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) { ast_log(LOG_WARNING, "SQL Prepare failed![%s]\n", sql); @@ -264,6 +266,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 '\\'"); + res = SQLPrepare(stmt, (unsigned char *)sql, SQL_NTS); if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) { ast_log(LOG_WARNING, "SQL Prepare failed![%s]\n", sql); |