forks/erlang-sqlite3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use rowid as tag for 'write's return value

Browse Source
This commit is contained in:
Alexey Romanov
2010-11-23 15:08:09 +03:00
parent 7cb0ab538e
commit 9041a0bb98
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
c_src/sqlite3_drv.c
View File

@@ -82,7 +82,7 @@ static ErlDrvData start(ErlDrvPort port, char* cmd) {
retval->atom_columns = driver_mk_atom("columns"); retval->atom_columns = driver_mk_atom("columns");
retval->atom_rows = driver_mk_atom("rows"); retval->atom_rows = driver_mk_atom("rows");
retval->atom_null = driver_mk_atom("null"); retval->atom_null = driver_mk_atom("null");
retval->atom_id = driver_mk_atom("id"); retval->atom_rowid = driver_mk_atom("rowid");
retval->atom_ok = driver_mk_atom("ok"); retval->atom_ok = driver_mk_atom("ok");
retval->atom_unknown_cmd = driver_mk_atom("unknown_command"); retval->atom_unknown_cmd = driver_mk_atom("unknown_command");
@@ -587,7 +587,7 @@ static void sql_exec_async(void *_async_command) {
dataset = realloc(dataset, sizeof(*dataset) * term_allocated); dataset = realloc(dataset, sizeof(*dataset) * term_allocated);
} }
dataset[term_count - 6] = ERL_DRV_ATOM; dataset[term_count - 6] = ERL_DRV_ATOM;
dataset[term_count - 5] = drv->atom_id; dataset[term_count - 5] = drv->atom_rowid;
dataset[term_count - 4] = ERL_DRV_INT; dataset[term_count - 4] = ERL_DRV_INT;
dataset[term_count - 3] = rowid; dataset[term_count - 3] = rowid;
dataset[term_count - 2] = ERL_DRV_TUPLE; dataset[term_count - 2] = ERL_DRV_TUPLE;

2
c_src/sqlite3_drv.h
View File

@@ -41,7 +41,7 @@ typedef struct sqlite3_drv_t {
ErlDrvTermData atom_columns; ErlDrvTermData atom_columns;
ErlDrvTermData atom_rows; ErlDrvTermData atom_rows;
ErlDrvTermData atom_null; ErlDrvTermData atom_null;
ErlDrvTermData atom_id; ErlDrvTermData atom_rowid;
ErlDrvTermData atom_ok; ErlDrvTermData atom_ok;
ErlDrvTermData atom_unknown_cmd; ErlDrvTermData atom_unknown_cmd;
} sqlite3_drv_t; } sqlite3_drv_t;

4
test/sqlite3_test.erl
View File

@@ -72,10 +72,10 @@ basic_functionality() ->
TableInfo, TableInfo,
sqlite3:table_info(ct, user)), sqlite3:table_info(ct, user)),
?assertEqual( ?assertEqual(
{id, 1}, {rowid, 1},
sqlite3:write(ct, user, [{name, "abby"}, {age, 20}, {wage, 2000}])), sqlite3:write(ct, user, [{name, "abby"}, {age, 20}, {wage, 2000}])),
?assertEqual( ?assertEqual(
{id, 2}, {rowid, 2},
sqlite3:write(ct, user, [{name, "marge"}, {age, 30}, {wage, 2000}])), sqlite3:write(ct, user, [{name, "marge"}, {age, 30}, {wage, 2000}])),
?assertEqual( ?assertEqual(
{error, "constraint failed"}, {error, "constraint failed"},