forks/esqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bind addition

Browse Source
This commit is contained in:
Maas-Maarten Zeeman
2011-11-03 00:58:48 +01:00
parent 93a309aab9
commit ecace408fe
2 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
c_src/esqlite_nif.c
View File

@@ -10,6 +10,7 @@
#include "queue.h" #include "queue.h"
#include "sqlite3.h" #include "sqlite3.h"
#define MAX_ATOM_LENGTH 255 /* from atom.h, not exposed in erlang include */
#define MAX_PATHNAME 512 /* unfortunately not in sqlite.h. */ #define MAX_PATHNAME 512 /* unfortunately not in sqlite.h. */
static ErlNifResourceType *esqlite_connection_type = NULL; static ErlNifResourceType *esqlite_connection_type = NULL;
@@ -232,9 +233,12 @@ bind_cell(ErlNifEnv *env, const ERL_NIF_TERM cell, sqlite3_stmt *stmt, unsigned
{ {
int the_int; int the_int;
double the_double; double the_double;
char the_atom[MAX_ATOM_LENGTH+1];
ErlNifBinary the_blob;
/* /*
erlang atom undefined -> sqlite null erlang atom undefined -> sqlite null
erlang atom (not undefined) -> sqlite text
erlang int -> sqlite int erlang int -> sqlite int
erlang double -> sqlite double erlang double -> sqlite double
erlang iolist -> sqlite blob erlang iolist -> sqlite blob
@@ -244,7 +248,6 @@ bind_cell(ErlNifEnv *env, const ERL_NIF_TERM cell, sqlite3_stmt *stmt, unsigned
/* TODO: check the error codes! */ /* TODO: check the error codes! */
/* TODO check for atom undefined */ /* TODO check for atom undefined */
if(enif_get_int(env, cell, &the_int)) { if(enif_get_int(env, cell, &the_int)) {
sqlite3_bind_int(stmt, i, the_int); sqlite3_bind_int(stmt, i, the_int);
return; return;
@@ -255,7 +258,22 @@ bind_cell(ErlNifEnv *env, const ERL_NIF_TERM cell, sqlite3_stmt *stmt, unsigned
return; return;
} }
/* if(enif_get_atom(env, cell, the_atom, sizeof(the_atom), ERL_NIF_LATIN1)) {
if(strcmp("undefined", the_atom) == 0) {
sqlite3_bind_null(stmt, i);
return;
}
sqlite3_bind_text(stmt, i, the_atom, strlen(the_atom), SQLITE_TRANSIENT);
return;
}
if(enif_inspect_iolist_as_binary(env, cell, &the_blob)) {
sqlite3_bind_blob(stmt, i, the_blob.data, the_blob.size, SQLITE_TRANSIENT);
return;
}
/* */
sqlite3_bind_int(stmt, i, i); sqlite3_bind_int(stmt, i, i);
} }
@@ -273,11 +291,13 @@ do_bind(ErlNifEnv *env, sqlite3_stmt *stmt, const ERL_NIF_TERM arg)
return make_error_tuple(env, "bad_arg_list"); return make_error_tuple(env, "bad_arg_list");
if(parameter_count != list_length) if(parameter_count != list_length)
return make_error_tuple(env, "args_wrong_length"); return make_error_tuple(env, "args_wrong_length");
sqlite3_reset(stmt);
list = arg; list = arg;
for(i = 0; i < list_length; i++) { for(i=0; i < list_length; i++) {
enif_get_list_cell(env, list, &head, &tail); enif_get_list_cell(env, list, &head, &tail);
bind_cell(env, head, stmt, i); bind_cell(env, head, stmt, i+1);
list = tail; list = tail;
} }

22
test/esqlite_test.erl
View File

@@ -59,16 +59,28 @@ bind_test() ->
ok = esqlite:exec(Db, "commit;"), ok = esqlite:exec(Db, "commit;"),
%% Create a prepared statement %% Create a prepared statement
{ok, Statement} = esqlite:prepare(Db, "insert into test_table values(?, ?)"), {ok, Statement} = esqlite:prepare(Db, "insert into test_table values(?1, ?2)"),
esqlite:bind(Statement, ["one", 2]), esqlite:bind(Statement, [one, 2]),
esqlite:step(Statement), esqlite:step(Statement),
esqlite:bind(Statement, ["three", 4]), esqlite:bind(Statement, [three, 4]),
esqlite:step(Statement), esqlite:step(Statement),
{ok, S1} = esqlite:prepare(Db, "select * from test_table where one = 'one'"), [{"one", 2}] = q(Db, "select * from test_table where two = 2"),
[{"one", 2}] = esqlite:step(S1), [{"three", 4}] = q(Db, "select * from test_table where two = 4"),
ok. ok.
%% Handy functions...
%%
q(Db, Sql) when is_list(Sql) ->
{ok, Statement} = esqlite:prepare(Db, Sql),
exec(Statement).
q(Db, Sql, Args) when is_list(Sql) ->
{ok, Statement} = esqlite:prepare(Db, Sql),
esqlite:bind(Statement, Args),
exec(Statement).
exec(Statement) -> exec(Statement) ->
exec(Statement, [], 0). exec(Statement, [], 0).