From 9041a0bb98650f0d3b8954eb667bd408067f7e2a Mon Sep 17 00:00:00 2001 From: Alexey Romanov Date: Tue, 23 Nov 2010 15:08:09 +0300 Subject: [PATCH] Use rowid as tag for 'write's return value --- c_src/sqlite3_drv.c | 4 ++-- c_src/sqlite3_drv.h | 2 +- test/sqlite3_test.erl | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/c_src/sqlite3_drv.c b/c_src/sqlite3_drv.c index 69be19a..b405383 100644 --- a/c_src/sqlite3_drv.c +++ b/c_src/sqlite3_drv.c @@ -82,7 +82,7 @@ static ErlDrvData start(ErlDrvPort port, char* cmd) { retval->atom_columns = driver_mk_atom("columns"); retval->atom_rows = driver_mk_atom("rows"); 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_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[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 - 3] = rowid; dataset[term_count - 2] = ERL_DRV_TUPLE; diff --git a/c_src/sqlite3_drv.h b/c_src/sqlite3_drv.h index bf825c0..a6b9ec8 100644 --- a/c_src/sqlite3_drv.h +++ b/c_src/sqlite3_drv.h @@ -41,7 +41,7 @@ typedef struct sqlite3_drv_t { ErlDrvTermData atom_columns; ErlDrvTermData atom_rows; ErlDrvTermData atom_null; - ErlDrvTermData atom_id; + ErlDrvTermData atom_rowid; ErlDrvTermData atom_ok; ErlDrvTermData atom_unknown_cmd; } sqlite3_drv_t; diff --git a/test/sqlite3_test.erl b/test/sqlite3_test.erl index 73c4606..24997c8 100644 --- a/test/sqlite3_test.erl +++ b/test/sqlite3_test.erl @@ -72,10 +72,10 @@ basic_functionality() -> TableInfo, sqlite3:table_info(ct, user)), ?assertEqual( - {id, 1}, + {rowid, 1}, sqlite3:write(ct, user, [{name, "abby"}, {age, 20}, {wage, 2000}])), ?assertEqual( - {id, 2}, + {rowid, 2}, sqlite3:write(ct, user, [{name, "marge"}, {age, 30}, {wage, 2000}])), ?assertEqual( {error, "constraint failed"},