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

Finalize unfinalized statements

Browse Source
This commit is contained in:
Alexey Romanov
2014-10-12 17:53:00 +04:00
parent 92daa9db89
commit d166e24359
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
c_src/sqlite3_drv.c
View File

@@ -14,7 +14,7 @@ static int DEBUG = 0;
#endif #endif
#define TRACE(x) do { if (DEBUG) debug_printf x; } while (0) #define TRACE(x) do { if (DEBUG) debug_printf x; } while (0)
#define ERROR(x) debug_printf x; #define LOG_ERROR(x) debug_printf x;
#define EXTEND_DATASET(n, term_count, term_allocated, dataset) \ #define EXTEND_DATASET(n, term_count, term_allocated, dataset) \
term_count += n; \ term_count += n; \
@@ -170,7 +170,7 @@ static void stop(ErlDrvData handle) {
if (close_result != SQLITE_OK) { if (close_result != SQLITE_OK) {
//ERROR((driver_data->log, //ERROR((driver_data->log,
// "ERROR: Failed to close DB, some resources aren't finalized!")); // "ERROR: Failed to close DB, some resources aren't finalized!"));
fprintf(stderr, "ERROR: Failed to close DB, some resources aren't finalized!"); fprintf(stderr, "ERROR: Failed to close DB, some resources aren't finalized!\n");
} }
if (driver_data->log && (driver_data->log != stderr)) { if (driver_data->log && (driver_data->log != stderr)) {
@@ -300,7 +300,7 @@ static int enable_load_extension(sqlite3_drv_t* drv, char *buf, int len) {
} }
static inline async_sqlite3_command *make_async_command_statement( static inline async_sqlite3_command *make_async_command_statement(
sqlite3_drv_t *drv, sqlite3_stmt *statement) { sqlite3_drv_t *drv, sqlite3_stmt *statement, int finalize) {
async_sqlite3_command *result = async_sqlite3_command *result =
(async_sqlite3_command *) driver_alloc(sizeof(async_sqlite3_command)); (async_sqlite3_command *) driver_alloc(sizeof(async_sqlite3_command));
memset(result, 0, sizeof(async_sqlite3_command)); memset(result, 0, sizeof(async_sqlite3_command));
@@ -308,6 +308,7 @@ static inline async_sqlite3_command *make_async_command_statement(
result->driver_data = drv; result->driver_data = drv;
result->type = t_stmt; result->type = t_stmt;
result->statement = statement; result->statement = statement;
result->finalize_statement_on_free = finalize;
return result; return result;
} }
@@ -328,7 +329,7 @@ static inline async_sqlite3_command *make_async_command_script(
static inline int sql_exec_statement( static inline int sql_exec_statement(
sqlite3_drv_t *drv, sqlite3_stmt *statement) { sqlite3_drv_t *drv, sqlite3_stmt *statement) {
async_sqlite3_command *async_command = make_async_command_statement(drv, statement); async_sqlite3_command *async_command = make_async_command_statement(drv, statement, 1);
TRACE((drv->log, "Driver async: %d %p\n", SQLITE_VERSION_NUMBER, async_command->statement)); TRACE((drv->log, "Driver async: %d %p\n", SQLITE_VERSION_NUMBER, async_command->statement));
@@ -615,6 +616,7 @@ static int sql_bind_and_exec(sqlite3_drv_t *drv, char *buffer, int buffer_size)
if (result == SQLITE_OK) { if (result == SQLITE_OK) {
return sql_exec_statement(drv, statement); return sql_exec_statement(drv, statement);
} else { } else {
sqlite3_finalize(statement);
return result; // error has already been output return result; // error has already been output
} }
} }
@@ -1103,7 +1105,7 @@ static int prepared_step(sqlite3_drv_t *drv, char *buffer, int buffer_size) {
TRACE((drv->log, "Making a step in prepared statement #%d\n", prepared_index)); TRACE((drv->log, "Making a step in prepared statement #%d\n", prepared_index));
statement = drv->prepared_stmts[prepared_index]; statement = drv->prepared_stmts[prepared_index];
async_command = make_async_command_statement(drv, statement); async_command = make_async_command_statement(drv, statement, 0);
if (sqlite3_threadsafe()) { if (sqlite3_threadsafe()) {
drv->async_handle = driver_async(drv->port, &drv->key, sql_step_async, drv->async_handle = driver_async(drv->port, &drv->key, sql_step_async,