kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

MODLANG-10 Modify Javascript exec function to return number of changed rows, thanks Dale. 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4921 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2007-04-12 18:22:09 +00:00
parent 12c47bf96f
commit 50b5fe43a2
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/include/switch_core_db.h
View File

@ -457,6 +457,11 @@ SWITCH_DECLARE(void) switch_core_db_free_table(char **result);
*/ */
SWITCH_DECLARE(void) switch_core_db_free(char *z); SWITCH_DECLARE(void) switch_core_db_free(char *z);
/**
* Call this routine to find the number of rows changed by the last statement.
*/
SWITCH_DECLARE(int) switch_core_db_changes(switch_core_db_t *db);
/** Return values for switch_core_db_exec() and switch_core_db_step()*/ /** Return values for switch_core_db_exec() and switch_core_db_step()*/
#define SWITCH_CORE_DB_OK 0 /* Successful result */ #define SWITCH_CORE_DB_OK 0 /* Successful result */
/* beginning-of-error-codes */ /* beginning-of-error-codes */

8
src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c
View File

@ -117,7 +117,7 @@ static int db_callback(void *pArg, int argc, char **argv, char **columnNames)
static JSBool db_exec(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) static JSBool db_exec(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
{ {
struct db_obj *dbo = JS_GetPrivate(cx, obj); struct db_obj *dbo = JS_GetPrivate(cx, obj);
*rval = BOOLEAN_TO_JSVAL(JS_TRUE); *rval = INT_TO_JSVAL(0);
if (argc > 0) { if (argc > 0) {
char *sql = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); char *sql = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
@ -137,7 +137,11 @@ static JSBool db_exec(JSContext * cx, JSObject * obj, uintN argc, jsval * argv,
if (err) { if (err) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error %s\n", err); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error %s\n", err);
switch_core_db_free(err); switch_core_db_free(err);
*rval = BOOLEAN_TO_JSVAL(JS_FALSE); *rval = INT_TO_JSVAL(-1);
} else {
int count = switch_core_db_changes(dbo->db);
*rval = INT_TO_JSVAL(count);
} }
} }
return JS_TRUE; return JS_TRUE;

4
src/switch_core_db.c
View File

@ -142,6 +142,10 @@ SWITCH_DECLARE(void) switch_core_db_free(char *z)
sqlite3_free(z); sqlite3_free(z);
} }
SWITCH_DECLARE(int) switch_core_db_changes(switch_core_db_t *db) {
return sqlite3_changes(db);
}
SWITCH_DECLARE(char *) switch_mprintf(const char *zFormat, ...) SWITCH_DECLARE(char *) switch_mprintf(const char *zFormat, ...)
{ {
va_list ap; va_list ap;