From 3697633c6b48e431403b1dfe8996f5b4ebd93abe Mon Sep 17 00:00:00 2001 From: Maas-Maarten Zeeman Date: Wed, 26 Dec 2012 16:51:20 +0100 Subject: [PATCH] Changed plain 'error' to 'sqlite_error' --- c_src/esqlite3_nif.c | 2 +- test/esqlite_test.erl | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/c_src/esqlite3_nif.c b/c_src/esqlite3_nif.c index b3f8463..767500c 100644 --- a/c_src/esqlite3_nif.c +++ b/c_src/esqlite3_nif.c @@ -106,7 +106,7 @@ get_sqlite3_return_code_msg(int r) { switch(r) { case SQLITE_OK: return "ok"; - case SQLITE_ERROR : return "error"; + case SQLITE_ERROR : return "sqlite_error"; case SQLITE_INTERNAL: return "internal"; case SQLITE_PERM: return "perm"; case SQLITE_ABORT: return "abort"; diff --git a/test/esqlite_test.erl b/test/esqlite_test.erl index 57c83d8..452a5d2 100644 --- a/test/esqlite_test.erl +++ b/test/esqlite_test.erl @@ -143,8 +143,15 @@ map_test() -> error1_msg_test() -> {ok, Db} = esqlite3:open(":memory:"), - {error, {error, _Msg1}} = esqlite3:exec("dit is geen sql", Db), - {error, {cantopen, _Msg2}} = esqlite3:open("/dit/bestaat/niet"), + + %% Not sql. + {error, {sqlite_error, _Msg1}} = esqlite3:exec("dit is geen sql", Db), + + %% Database test does not exist. + {error, {sqlite_error, _Msg2}} = esqlite3:exec("select * from test;", Db), + + %% Opening non-existant database. + {error, {cantopen, _Msg3}} = esqlite3:open("/dit/bestaat/niet"), ok.