Add a direct execute method to res_odbc (closes issue #10722)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82393 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/include/asterisk/res_odbc.h b/include/asterisk/res_odbc.h
index 1018eef2d00739f8e9e8b80c0797ba6bb9f42a85..821b64f283e7107213e09d8d3d6f5cedd4e560dc 100644 (file)
--- a/include/asterisk/res_odbc.h
+++ b/include/asterisk/res_odbc.h
@@ -93,6 +93,16 @@ void ast_odbc_release_obj(struct odbc_obj *obj);
  */
 int ast_odbc_sanity_check(struct odbc_obj *obj);
 
+/*! \brief Executes an non prepared statement and returns the resulting
+ * statement handle.
+ * \param obj The ODBC object
+ * \param exec_cb A function callback, which, when called, should return a statement handle with result columns bound.
+ * \param data A parameter to be passed to the exec_cb parameter function, indicating which statement handle is to be prepared.
+ * \retval a statement handle
+ * \retval NULL on error
+ */
+SQLHSTMT ast_odbc_direct_execute(struct odbc_obj *obj, SQLHSTMT (*exec_cb)(struct odbc_obj *obj, void *data), void *data);
+
 /*! 
  * \brief Prepares, executes, and returns the resulting statement handle.
  * \param obj The ODBC object

diff --git a/res/res_odbc.c b/res/res_odbc.c
index c9d3ee700cacfbec4d136ca7c7b2085eef418e80..2fd4c02cf344d349a159113a84fbd5f4231cce99 100644 (file)
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -77,6 +77,28 @@ static odbc_status odbc_obj_disconnect(struct odbc_obj *obj);
 static int odbc_register_class(struct odbc_class *class, int connect);
 
 
+SQLHSTMT ast_odbc_direct_execute(struct odbc_obj *obj, SQLHSTMT (*exec_cb)(struct odbc_obj *obj, void *data), void *data)
+{
+       int attempt;
+       SQLHSTMT stmt;
+
+       for (attempt = 0; attempt < 2; attempt++) {
+               stmt = exec_cb(obj, data);
+
+               if (stmt) {
+                       break;
+               } else {
+                       obj->up = 0;
+                       ast_log(LOG_WARNING, "SQL Exec Direct failed.  Attempting a reconnect...\n");
+
+                       odbc_obj_disconnect(obj);
+                       odbc_obj_connect(obj);
+               }
+       }
+
+       return stmt;
+}
+
 SQLHSTMT ast_odbc_prepare_and_execute(struct odbc_obj *obj, SQLHSTMT (*prepare_cb)(struct odbc_obj *obj, void *data), void *data)
 {
        int res = 0, i, attempt;