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

101 isn't table id, it's SQLITE_DONE code

Browse Source
This commit is contained in:
Alexey Romanov
2010-11-18 18:02:01 +03:00
parent 2c54ea4930
commit 1f45ee05f5
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
c_src/sqlite3_drv.c
View File

@@ -382,18 +382,14 @@ static void sql_exec_async(void *_async_command) {
dataset[term_count - 2] = ERL_DRV_TUPLE; dataset[term_count - 2] = ERL_DRV_TUPLE;
dataset[term_count - 1] = 2; dataset[term_count - 1] = 2;
} else { } else {
term_count += 6; term_count += 2;
if (term_count > term_allocated) { if (term_count > term_allocated) {
term_allocated = term_allocated =
(term_count >= term_allocated*2) ? term_count : term_allocated*2; (term_count >= term_allocated*2) ? term_count : term_allocated*2;
dataset = realloc(dataset, sizeof(*dataset) * term_allocated); dataset = realloc(dataset, sizeof(*dataset) * term_allocated);
} }
dataset[term_count - 6] = ERL_DRV_ATOM; dataset[term_count - 2] = ERL_DRV_ATOM;
dataset[term_count - 5] = drv->atom_ok; dataset[term_count - 1] = drv->atom_ok;
dataset[term_count - 4] = ERL_DRV_INT;
dataset[term_count - 3] = next_row;
dataset[term_count - 2] = ERL_DRV_TUPLE;
dataset[term_count - 1] = 2;
} }
term_count += 2; term_count += 2;

6
test/sqlite3_test.erl
View File

@@ -61,7 +61,7 @@ basic_functionality() ->
?assertEqual( ?assertEqual(
[], [],
sqlite3:list_tables(ct)), sqlite3:list_tables(ct)),
{ok, TableId} = sqlite3:create_table(ct, user, TableInfo), ok = sqlite3:create_table(ct, user, TableInfo),
?assertEqual( ?assertEqual(
[user], [user],
sqlite3:list_tables(ct)), sqlite3:list_tables(ct)),
@@ -93,13 +93,13 @@ basic_functionality() ->
[{columns, Columns}, {rows, AllRows}], [{columns, Columns}, {rows, AllRows}],
sqlite3:read(ct, user, {wage, 2000})), sqlite3:read(ct, user, {wage, 2000})),
?assertEqual( ?assertEqual(
{ok, TableId}, ok,
sqlite3:delete(ct, user, {name, "marge"})), sqlite3:delete(ct, user, {name, "marge"})),
?assertEqual( ?assertEqual(
[{columns, Columns}, {rows, AbbyOnly}], [{columns, Columns}, {rows, AbbyOnly}],
sqlite3:sql_exec(ct, "select * from user;")), sqlite3:sql_exec(ct, "select * from user;")),
?assertEqual( ?assertEqual(
{ok, TableId}, ok,
sqlite3:drop_table(ct, user)). sqlite3:drop_table(ct, user)).
blob() -> blob() ->