<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][15632] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=15632">15632</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2009-11-23 16:05:59 -0600 (Mon, 23 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>mod_spidermonkey_core_db: Allow to bind value to parameters in prepared statements (<a href="http://jira.freeswitch.org/browse/MODLANG-139">MODLANG-139</a>)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_spidermonkey_core_dbmod_spidermonkey_core_dbc">freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodlanguagesmod_spidermonkey_core_dbmod_spidermonkey_core_dbc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c (15631 => 15632)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c 2009-11-23 21:37:42 UTC (rev 15631)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c 2009-11-23 22:05:59 UTC (rev 15632)
</span><span class="lines">@@ -168,7 +168,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-static JSBool db_next(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
</del><ins>+/* Evaluate a prepared statement
+ stepSuccessCode expected success code from switch_core_db_step()
+ return true if step return expected success code, false otherwise
+*/
+static JSBool db_step_ex(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval, int stepSuccessCode)
</ins><span class="cx"> {
</span><span class="cx"> struct db_obj *dbo = JS_GetPrivate(cx, obj);
</span><span class="cx"> *rval = BOOLEAN_TO_JSVAL(JS_FALSE);
</span><span class="lines">@@ -181,14 +185,17 @@
</span><span class="cx"> int running = 1;
</span><span class="cx"> while (running < 5000) {
</span><span class="cx"> int result = switch_core_db_step(dbo->stmt);
</span><del>- if (result == SWITCH_CORE_DB_ROW) {
</del><ins>+ if (result == stepSuccessCode) {
</ins><span class="cx"> *rval = BOOLEAN_TO_JSVAL(JS_TRUE);
</span><span class="cx"> break;
</span><span class="cx"> } else if (result == SWITCH_CORE_DB_BUSY) {
</span><span class="cx"> running++;
</span><ins>+ switch_cond_next(); /* wait a bit before retrying */
</ins><span class="cx"> continue;
</span><ins>+ }
+ if (switch_core_db_finalize(dbo->stmt) != SWITCH_CORE_DB_OK) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error %s\n", switch_core_db_errmsg(dbo->db));
</ins><span class="cx"> }
</span><del>- switch_core_db_finalize(dbo->stmt);
</del><span class="cx"> dbo->stmt = NULL;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -197,6 +204,25 @@
</span><span class="cx"> return JS_TRUE;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/* Evaluate a prepared statement, to be used with statements that return data
+ return true while data is available, false when done or error
+*/
+static JSBool db_next(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
+{
+ /* return true until no more rows available */
+ return db_step_ex(cx, obj, argc, argv, rval, SWITCH_CORE_DB_ROW);
+}
+
+/* Evaluate a prepared statement, to be used with statements that return no data
+ return true if statement has finished executing successfully, false otherwise
+*/
+static JSBool db_step(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
+{
+ /* return true when the statement has finished executing successfully */
+ return db_step_ex(cx, obj, argc, argv, rval, SWITCH_CORE_DB_DONE);
+}
+
+
</ins><span class="cx"> static JSBool db_fetch(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
</span><span class="cx"> {
</span><span class="cx"> struct db_obj *dbo = JS_GetPrivate(cx, obj);
</span><span class="lines">@@ -258,6 +284,100 @@
</span><span class="cx"> return JS_TRUE;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static JSBool db_bind_text(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
+{
+ struct db_obj *dbo = JS_GetPrivate(cx, obj);
+ JSBool status;
+
+ *rval = BOOLEAN_TO_JSVAL(JS_FALSE);
+
+ if (!dbo->db) {
+ return JS_FALSE;
+ }
+
+ /* db_prepare() must be called first */
+ if (!dbo->stmt) {
+ return JS_FALSE;
+ }
+
+ /* argv[0] = parameter index
+ argv[1] = parameter value
+ */
+ if (argc < 2) {
+ return JS_FALSE;
+ }
+
+ uint32 param_index = -1;
+ char *param_value = NULL;
+
+
+ /* convert args */
+ status = JS_ValueToECMAUint32(cx, argv[0], &param_index);
+ switch_assert(status == JS_TRUE);
+ param_value = JS_GetStringBytes(JS_ValueToString(cx, argv[1]));
+ if ((param_index < 1) || (NULL == param_value)) {
+ return JS_FALSE;
+ }
+
+ /* bind param */
+ if (switch_core_db_bind_text(dbo->stmt, param_index, param_value, -1, SWITCH_CORE_DB_STATIC)) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error %s\n", switch_core_db_errmsg(dbo->db));
+ return JS_FALSE;
+ } else {
+ *rval = BOOLEAN_TO_JSVAL(JS_TRUE);
+ }
+
+ return JS_TRUE;
+}
+
+static JSBool db_bind_int(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
+{
+ struct db_obj *dbo = JS_GetPrivate(cx, obj);
+ JSBool status;
+
+ *rval = BOOLEAN_TO_JSVAL(JS_FALSE);
+
+ if (!dbo->db) {
+ return JS_FALSE;
+ }
+
+ /* db_prepare() must be called first */
+ if (!dbo->stmt) {
+ return JS_FALSE;
+ }
+
+ /* argv[0] = parameter index
+ argv[1] = parameter value
+ */
+ if (argc < 2) {
+ return JS_FALSE;
+ }
+
+ uint32 param_index = -1;
+ uint32 param_value = -1;
+
+
+ /* convert args */
+ status = JS_ValueToECMAUint32(cx, argv[0], &param_index);
+ switch_assert(status == JS_TRUE);
+ status = JS_ValueToECMAUint32(cx, argv[1], &param_value);
+ switch_assert(status == JS_TRUE);
+
+ if (param_index < 1) {
+ return JS_FALSE;
+ }
+
+ /* bind param */
+ if (switch_core_db_bind_int(dbo->stmt, param_index, param_value)) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error %s\n", switch_core_db_errmsg(dbo->db));
+ return JS_FALSE;
+ } else {
+ *rval = BOOLEAN_TO_JSVAL(JS_TRUE);
+ }
+
+ return JS_TRUE;
+}
+
</ins><span class="cx"> enum db_tinyid {
</span><span class="cx"> DB_NAME
</span><span class="cx"> };
</span><span class="lines">@@ -266,8 +386,11 @@
</span><span class="cx"> {"exec", db_exec, 1},
</span><span class="cx"> {"close", db_close, 0},
</span><span class="cx"> {"next", db_next, 0},
</span><ins>+ {"step", db_step, 0},
</ins><span class="cx"> {"fetch", db_fetch, 1},
</span><span class="cx"> {"prepare", db_prepare, 0},
</span><ins>+ {"bindText", db_bind_text, 2},
+ {"bindInt", db_bind_int, 2},
</ins><span class="cx"> {0}
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>