diff --git a/configs/res_odbc.conf.sample b/configs/res_odbc.conf.sample
index 617555fef97d35763aed30a8b3fa8eaf74b6a2a7..2fd9aa7027deae3c4a2b1c66e275519f400557ce 100644
--- a/configs/res_odbc.conf.sample
+++ b/configs/res_odbc.conf.sample
@@ -40,6 +40,9 @@ username => oscar
password => thegrouch
pre-connect => yes
sanitysql => select count(*) from systables
+; Many databases have a default of '\' to escape special characters. MS SQL
+; Server does not.
+backslash_is_escape => no
diff --git a/include/asterisk/res_odbc.h b/include/asterisk/res_odbc.h
index 821b64f283e7107213e09d8d3d6f5cedd4e560dc..fcb1581e45ac8c198ef63115300ea9851cbc6436 100644
--- a/include/asterisk/res_odbc.h
+++ b/include/asterisk/res_odbc.h
@@ -93,6 +93,12 @@ void ast_odbc_release_obj(struct odbc_obj *obj);
*/
int ast_odbc_sanity_check(struct odbc_obj *obj);
+/*! \brief Checks if the database natively supports backslash as an escape character.
+ * \param obj The ODBC object
+ * \return Returns 1 if an ESCAPE clause is needed to support '\', 0 otherwise
+ */
+int ast_odbc_backslash_is_escape(struct odbc_obj *obj);
+
/*! \brief Executes an non prepared statement and returns the resulting
* statement handle.
* \param obj The ODBC object
diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c
index 2af47209a9ce99755e0afd4948a56cf6658ea6cf..57b1ba528428ca1490332dd9fe3d76d9bad8b922 100644
--- a/res/res_config_odbc.c
+++ b/res/res_config_odbc.c
@@ -142,11 +142,12 @@ static struct ast_variable *realtime_odbc(const char *database, const char *tabl
return NULL;
newval = va_arg(aq, const char *);
op = !strchr(newparam, ' ') ? " =" : "";
- snprintf(sql, sizeof(sql), "SELECT * FROM %s WHERE %s%s ?", table, newparam, op);
+ snprintf(sql, sizeof(sql), "SELECT * FROM %s WHERE %s%s ?%s", table, newparam, op,
+ strcasestr(newparam, "LIKE") && !ast_odbc_backslash_is_escape(obj) ? " ESCAPE '\\'" : "");
while((newparam = va_arg(aq, const char *))) {
op = !strchr(newparam, ' ') ? " =" : "";
snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), " AND %s%s ?%s", newparam, op,
- strcasestr(newparam, "LIKE") ? " ESCAPE '\\'" : "");
+ strcasestr(newparam, "LIKE") && !ast_odbc_backslash_is_escape(obj) ? " ESCAPE '\\'" : "");
newval = va_arg(aq, const char *);
}
va_end(aq);
@@ -290,11 +291,11 @@ static struct ast_config *realtime_multi_odbc(const char *database, const char *
newval = va_arg(aq, const char *);
op = !strchr(newparam, ' ') ? " =" : "";
snprintf(sql, sizeof(sql), "SELECT * FROM %s WHERE %s%s ?%s", table, newparam, op,
- strcasestr(newparam, "LIKE") ? " ESCAPE '\\'" : "");
+ strcasestr(newparam, "LIKE") && !ast_odbc_backslash_is_escape(obj) ? " ESCAPE '\\'" : "");
while((newparam = va_arg(aq, const char *))) {
op = !strchr(newparam, ' ') ? " =" : "";
snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), " AND %s%s ?%s", newparam, op,
- strcasestr(newparam, "LIKE") ? " ESCAPE '\\'" : "");
+ strcasestr(newparam, "LIKE") && !ast_odbc_backslash_is_escape(obj) ? " ESCAPE '\\'" : "");
newval = va_arg(aq, const char *);
}
if (initfield)
diff --git a/res/res_odbc.c b/res/res_odbc.c
index 00a07ef10df8849b912f3cd63a1bf47673fbb971..9cd3de4712e79eec5a54cf0e213e27c87db2ecf9 100644
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -60,6 +60,7 @@ struct odbc_class
unsigned int limit:10; /* Gives a limit of 1023 maximum */
unsigned int count:10; /* Running count of pooled connections */
unsigned int delme:1; /* Purge the class */
+ unsigned int backslash_is_escape:1; /* On this database, the backslash is a native escape sequence */
AST_LIST_HEAD(, odbc_obj) odbc_obj;
};
@@ -227,7 +228,7 @@ static int load_odbc_config(void)
struct ast_variable *v;
char *cat;
const char *dsn, *username, *password, *sanitysql;
- int enabled, pooling, limit;
+ int enabled, pooling, limit, bse;
int connect = 0, res = 0;
struct ast_flags config_flags = { 0 };
@@ -251,6 +252,7 @@ static int load_odbc_config(void)
connect = 0;
pooling = 0;
limit = 0;
+ bse = 1;
for (v = ast_variable_browse(config, cat); v; v = v->next) {
if (!strcasecmp(v->name, "pooling")) {
if (ast_true(v->value))
@@ -277,6 +279,8 @@ static int load_odbc_config(void)
password = v->value;
} else if (!strcasecmp(v->name, "sanitysql")) {
sanitysql = v->value;
+ } else if (!strcasecmp(v->name, "backslash_is_escape")) {
+ bse = ast_true(v->value);
}
}
@@ -318,6 +322,8 @@ static int load_odbc_config(void)
}
}
+ new->backslash_is_escape = bse ? 1 : 0;
+
odbc_register_class(new, connect);
ast_log(LOG_NOTICE, "Registered ODBC class '%s' dsn->[%s]\n", cat, dsn);
}
@@ -422,6 +428,11 @@ void ast_odbc_release_obj(struct odbc_obj *obj)
obj->used = 0;
}
+int ast_odbc_backslash_is_escape(struct odbc_obj *obj)
+{
+ return obj->parent->backslash_is_escape;
+}
+
struct odbc_obj *ast_odbc_request_obj(const char *name, int check)
{
struct odbc_obj *obj = NULL;
@@ -577,7 +588,7 @@ static int reload(void)
struct ast_variable *v;
char *cat;
const char *dsn, *username, *password, *sanitysql;
- int enabled, pooling, limit;
+ int enabled, pooling, limit, bse;
int connect = 0, res = 0;
struct ast_flags config_flags = { CONFIG_FLAG_FILEUNCHANGED };
@@ -605,6 +616,7 @@ static int reload(void)
connect = 0;
pooling = 0;
limit = 0;
+ bse = 1;
for (v = ast_variable_browse(config, cat); v; v = v->next) {
if (!strcasecmp(v->name, "pooling")) {
pooling = 1;
@@ -630,6 +642,8 @@ static int reload(void)
password = v->value;
} else if (!strcasecmp(v->name, "sanitysql")) {
sanitysql = v->value;
+ } else if (!strcasecmp(v->name, "backslash_is_escape")) {
+ bse = ast_true(v->value);
}
}
@@ -686,6 +700,8 @@ static int reload(void)
}
}
+ new->backslash_is_escape = bse;
+
if (class) {
ast_log(LOG_NOTICE, "Refreshing ODBC class '%s' dsn->[%s]\n", cat, dsn);
} else {