[asterisk-commits] russell: trunk r73701 - in /trunk: ./ res/res_config_odbc.c

[SVN commits to the Asterisk project]

Author: russell
Date: Fri Jul  6 11:14:39 2007
New Revision: 73701

URL: http://svn.digium.com/view/asterisk?view=rev&rev=73701
Log:
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.

........

................

Modified:
    trunk/   (props changed)
    trunk/res/res_config_odbc.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/res/res_config_odbc.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_config_odbc.c?view=diff&rev=73701&r1=73700&r2=73701
==============================================================================
--- trunk/res/res_config_odbc.c (original)
+++ trunk/res/res_config_odbc.c Fri Jul  6 11:14:39 2007
@@ -109,6 +109,8 @@
 		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 @@
 	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);