keplerproject/luasql
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adaptation to work with Lua 5.0, 5.1 and 5.2.

Browse Source 
Removing Compat-5.1
Implementing automatic cursor close when there is no more rows to iterate.
This commit is contained in:
Tomás Guisasola 2012-03-30 08:53:30 -03:00 committed by Toms Guisasola
parent 00ddabb378
commit dae41c9770
1 changed files with 97 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
src/ls_sqlite3.c
View File

@ -15,9 +15,6 @@
#include "lua.h" #include "lua.h"
#include "lauxlib.h" #include "lauxlib.h"
#if ! defined (LUA_VERSION_NUM) || LUA_VERSION_NUM < 501
#include "compat-5.1.h"
#endif
#include "luasql.h" #include "luasql.h"
@ -87,6 +84,27 @@ static cur_data *getcursor(lua_State *L) {
return cur; return cur;
} }
/*
** Closes the cursor and nullify all structure fields.
*/
static void cur_nullify(lua_State *L, cur_data *cur)
{
conn_data *conn;
/* Nullify structure fields. */
cur->closed = 1;
cur->sql_vm = NULL;
/* Decrement cursor counter on connection object */
lua_rawgeti (L, LUA_REGISTRYINDEX, cur->conn);
conn = lua_touserdata (L, -1);
conn->cur_counter--;
luaL_unref(L, LUA_REGISTRYINDEX, cur->conn);
luaL_unref(L, LUA_REGISTRYINDEX, cur->colnames);
luaL_unref(L, LUA_REGISTRYINDEX, cur->coltypes);
}
/* /*
** Finalizes the vm ** Finalizes the vm
** Return nil + errmsg or nil in case of sucess ** Return nil + errmsg or nil in case of sucess
@ -96,10 +114,10 @@ static int finalize(lua_State *L, cur_data *cur) {
if (sqlite3_finalize(cur->sql_vm) != SQLITE_OK) if (sqlite3_finalize(cur->sql_vm) != SQLITE_OK)
{ {
errmsg = sqlite3_errmsg(cur->conn_data->sql_conn); errmsg = sqlite3_errmsg(cur->conn_data->sql_conn);
cur->sql_vm = NULL; cur_nullify(L, cur);
return luasql_faildirect(L, errmsg); return luasql_faildirect(L, errmsg);
} }
cur->sql_vm = NULL; cur_nullify(L, cur);
lua_pushnil(L); lua_pushnil(L);
return 1; return 1;
} }
@ -130,6 +148,7 @@ static void push_column(lua_State *L, sqlite3_stmt *vm, int column) {
} }
} }
/* /*
** Get another row of the given cursor. ** Get another row of the given cursor.
*/ */
@ -157,24 +176,24 @@ static int cur_fetch (lua_State *L) {
if (strchr(opts, 'n') != NULL) if (strchr(opts, 'n') != NULL)
{ {
/* Copy values to numerical indices */ /* Copy values to numerical indices */
for (i = 0; i < cur->numcols;) for (i = 0; i < cur->numcols;)
{ {
push_column(L, vm, i); push_column(L, vm, i);
lua_rawseti(L, 2, ++i); lua_rawseti(L, 2, ++i);
} }
} }
if (strchr(opts, 'a') != NULL) if (strchr(opts, 'a') != NULL)
{ {
/* Copy values to alphanumerical indices */ /* Copy values to alphanumerical indices */
lua_rawgeti(L, LUA_REGISTRYINDEX, cur->colnames); lua_rawgeti(L, LUA_REGISTRYINDEX, cur->colnames);
for (i = 0; i < cur->numcols; i++) for (i = 0; i < cur->numcols; i++)
{ {
lua_rawgeti(L, -1, i+1); lua_rawgeti(L, -1, i+1);
push_column(L, vm, i); push_column(L, vm, i);
lua_rawset (L, 2); lua_rawset (L, 2);
} }
} }
lua_pushvalue(L, 2); lua_pushvalue(L, 2);
return 1; /* return table */ return 1; /* return table */
@ -184,38 +203,41 @@ static int cur_fetch (lua_State *L) {
int i; int i;
luaL_checkstack (L, cur->numcols, LUASQL_PREFIX"too many columns"); luaL_checkstack (L, cur->numcols, LUASQL_PREFIX"too many columns");
for (i = 0; i < cur->numcols; ++i) for (i = 0; i < cur->numcols; ++i)
push_column(L, vm, i); push_column(L, vm, i);
return cur->numcols; /* return #numcols values */ return cur->numcols; /* return #numcols values */
} }
} }
/*
** Cursor object collector function
*/
static int cur_gc(lua_State *L)
{
cur_data *cur = (cur_data *)luaL_checkudata(L, 1, LUASQL_CURSOR_SQLITE);
if (cur != NULL && !(cur->closed))
{
sqlite3_finalize(cur->sql_vm);
cur_nullify(L, cur);
}
return 0;
}
/* /*
** Close the cursor on top of the stack. ** Close the cursor on top of the stack.
** Return 1 ** Return 1
*/ */
static int cur_close(lua_State *L) static int cur_close(lua_State *L)
{ {
conn_data *conn;
cur_data *cur = (cur_data *)luaL_checkudata(L, 1, LUASQL_CURSOR_SQLITE); cur_data *cur = (cur_data *)luaL_checkudata(L, 1, LUASQL_CURSOR_SQLITE);
luaL_argcheck(L, cur != NULL, 1, LUASQL_PREFIX"cursor expected"); luaL_argcheck(L, cur != NULL, 1, LUASQL_PREFIX"cursor expected");
if (cur->closed) { if (cur->closed) {
lua_pushboolean(L, 0); lua_pushboolean(L, 0);
return 1; return 1;
} }
/* Nullify structure fields. */
cur->closed = 1;
sqlite3_finalize(cur->sql_vm); sqlite3_finalize(cur->sql_vm);
/* Decrement cursor counter on connection object */ cur_nullify(L, cur);
lua_rawgeti (L, LUA_REGISTRYINDEX, cur->conn);
conn = lua_touserdata (L, -1);
conn->cur_counter--;
luaL_unref(L, LUA_REGISTRYINDEX, cur->conn);
luaL_unref(L, LUA_REGISTRYINDEX, cur->colnames);
luaL_unref(L, LUA_REGISTRYINDEX, cur->coltypes);
lua_pushboolean(L, 1); lua_pushboolean(L, 1);
return 1; return 1;
} }
@ -292,6 +314,26 @@ static int create_cursor(lua_State *L, int o, conn_data *conn,
} }
/*
** Connection object collector function
*/
static int conn_gc(lua_State *L)
{
conn_data *conn = (conn_data *)luaL_checkudata(L, 1, LUASQL_CONNECTION_SQLITE);
if (conn != NULL && !(conn->closed))
{
if (conn->cur_counter > 0)
return luaL_error (L, LUASQL_PREFIX"there are open cursors");
/* Nullify structure fields. */
conn->closed = 1;
luaL_unref(L, LUA_REGISTRYINDEX, conn->env);
sqlite3_close(conn->sql_conn);
}
return 0;
}
/* /*
** Close a Connection object. ** Close a Connection object.
*/ */
@ -304,14 +346,7 @@ static int conn_close(lua_State *L)
lua_pushboolean(L, 0); lua_pushboolean(L, 0);
return 1; return 1;
} }
conn_gc(L);
if (conn->cur_counter > 0)
return luaL_error (L, LUASQL_PREFIX"there are open cursors");
/* Nullify structure fields. */
conn->closed = 1;
luaL_unref(L, LUA_REGISTRYINDEX, conn->env);
sqlite3_close(conn->sql_conn);
lua_pushboolean(L, 1); lua_pushboolean(L, 1);
return 1; return 1;
} }
@ -526,6 +561,18 @@ static int env_connect(lua_State *L)
} }
/*
** Environment object collector function.
*/
static int env_gc (lua_State *L)
{
env_data *env = (env_data *)luaL_checkudata(L, 1, LUASQL_ENVIRONMENT_SQLITE);
if (env != NULL && !(env->closed))
env->closed = 1;
return 0;
}
/* /*
** Close environment object. ** Close environment object.
*/ */
@ -537,8 +584,7 @@ static int env_close (lua_State *L)
lua_pushboolean(L, 0); lua_pushboolean(L, 0);
return 1; return 1;
} }
env_gc(L);
env->closed = 1;
lua_pushboolean(L, 1); lua_pushboolean(L, 1);
return 1; return 1;
} }
@ -560,14 +606,14 @@ static int opts_settimeout (lua_State *L)
*/ */
static void create_metatables (lua_State *L) static void create_metatables (lua_State *L)
{ {
struct luaL_reg environment_methods[] = { struct luaL_Reg environment_methods[] = {
{"__gc", env_close}, {"__gc", env_gc},
{"close", env_close}, {"close", env_close},
{"connect", env_connect}, {"connect", env_connect},
{NULL, NULL}, {NULL, NULL},
}; };
struct luaL_reg connection_methods[] = { struct luaL_Reg connection_methods[] = {
{"__gc", conn_close}, {"__gc", conn_gc},
{"close", conn_close}, {"close", conn_close},
{"escape", conn_escape}, {"escape", conn_escape},
{"execute", conn_execute}, {"execute", conn_execute},
@ -577,8 +623,8 @@ static void create_metatables (lua_State *L)
{"getlastautoid", conn_getlastautoid}, {"getlastautoid", conn_getlastautoid},
{NULL, NULL}, {NULL, NULL},
}; };
struct luaL_reg cursor_methods[] = { struct luaL_Reg cursor_methods[] = {
{"__gc", cur_close}, {"__gc", cur_gc},
{"close", cur_close}, {"close", cur_close},
{"getcolnames", cur_getcolnames}, {"getcolnames", cur_getcolnames},
{"getcoltypes", cur_getcoltypes}, {"getcoltypes", cur_getcoltypes},
@ -611,12 +657,14 @@ static int create_environment (lua_State *L)
*/ */
LUASQL_API int luaopen_luasql_sqlite3(lua_State *L) LUASQL_API int luaopen_luasql_sqlite3(lua_State *L)
{ {
struct luaL_reg driver[] = { struct luaL_Reg driver[] = {
{"sqlite3", create_environment}, {"sqlite3", create_environment},
{NULL, NULL}, {NULL, NULL},
}; };
create_metatables (L); create_metatables (L);
luaL_openlib (L, LUASQL_TABLENAME, driver, 0); /* luaL_openlib (L, LUASQL_TABLENAME, driver, 0); */
lua_newtable(L);
luaL_setfuncs(L, driver, 0);
luasql_set_info (L); luasql_set_info (L);
return 1; return 1;
} }