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

Suitable error message for empty statements

Browse Source
This commit is contained in:
Alexey Romanov
2011-01-24 12:38:38 +03:00
parent 7134209896
commit 9d138346cd
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
c_src/sqlite3_drv.c
View File

@@ -250,8 +250,10 @@ static int sql_exec(sqlite3_drv_t *drv, char *command, int command_size) {
fflush(drv->log); fflush(drv->log);
#endif #endif
result = sqlite3_prepare_v2(drv->db, command, command_size, &statement, &rest); result = sqlite3_prepare_v2(drv->db, command, command_size, &statement, &rest);
if ((result != SQLITE_OK) || (statement == NULL)) { if (result != SQLITE_OK) {
return output_db_error(drv); return output_db_error(drv);
} else if (statement == NULL) {
return output_error(drv, SQLITE_MISUSE, "empty statement");
} }
return sql_exec_statement(drv, statement); return sql_exec_statement(drv, statement);
@@ -471,8 +473,10 @@ static int sql_bind_and_exec(sqlite3_drv_t *drv, char *buffer, int buffer_size)
result = sqlite3_prepare_v2(drv->db, command, size, &statement, &rest); result = sqlite3_prepare_v2(drv->db, command, size, &statement, &rest);
driver_free(command); driver_free(command);
if ((result != SQLITE_OK) || (statement == NULL)) { if (result != SQLITE_OK) {
return output_db_error(drv); return output_db_error(drv);
} else if (statement == NULL) {
return output_error(drv, SQLITE_MISUSE, "empty statement");
} }
result = bind_parameters(drv, buffer, buffer_size, &index, statement, &type, &size); result = bind_parameters(drv, buffer, buffer_size, &index, statement, &type, &size);
@@ -924,8 +928,10 @@ static int prepare(sqlite3_drv_t *drv, char *command, int command_size) {
fflush(drv->log); fflush(drv->log);
#endif #endif
result = sqlite3_prepare_v2(drv->db, command, command_size, &statement, &rest); result = sqlite3_prepare_v2(drv->db, command, command_size, &statement, &rest);
if ((result != SQLITE_OK) || (statement == NULL)) { if (result != SQLITE_OK) {
return output_db_error(drv); return output_db_error(drv);
} else if (statement == NULL) {
return output_error(drv, SQLITE_MISUSE, "empty statement");
} }
if (drv->prepared_count >= drv->prepared_alloc) { if (drv->prepared_count >= drv->prepared_alloc) {

4
test/sqlite3_test.erl
View File

@@ -61,6 +61,10 @@ basic_functionality() ->
AbbyOnly = [{1, <<"abby">>, 20, 2000}], AbbyOnly = [{1, <<"abby">>, 20, 2000}],
TableInfo = [{id, integer, [primary_key]}, {name, text, [not_null, unique]}, {age, integer}, {wage, integer}], TableInfo = [{id, integer, [primary_key]}, {name, text, [not_null, unique]}, {age, integer}, {wage, integer}],
drop_all_tables(ct), drop_all_tables(ct),
?debugMsg("Error message \"sqlite3 driver error: empty statement\" should be shown..."),
?assertEqual(
{error, 21, "empty statement"},
sqlite3:sql_exec(ct, "-- Comment")),
?assertEqual( ?assertEqual(
[], [],
sqlite3:list_tables(ct)), sqlite3:list_tables(ct)),