Wed, 26 Nov 2008 10:43:45 +0000
Clean up error messages for consistency.
#include "dbd_sqlite3.h" int dbd_sqlite3_statement_create(lua_State *L, connection_t *conn, const char *sql_query); /* * connection,err = DBD.SQLite3.New(dbfile) */ static int connection_new(lua_State *L) { int n = lua_gettop(L); const char *db = NULL; connection_t *conn = NULL; /* db */ switch (n) { case 1: if (lua_isnil(L, 1) == 0) db = luaL_checkstring(L, 1); } conn = (connection_t *)lua_newuserdata(L, sizeof(connection_t)); if (sqlite3_open(db, &conn->sqlite) != SQLITE_OK) { lua_pushnil(L); lua_pushfstring(L, DBI_ERR_CONNECTION_FAILED, sqlite3_errmsg(conn->sqlite)); return 2; } luaL_getmetatable(L, DBD_SQLITE_CONNECTION); lua_setmetatable(L, -2); return 1; } /* * success = connection:close() */ static int connection_close(lua_State *L) { connection_t *conn = (connection_t *)luaL_checkudata(L, 1, DBD_SQLITE_CONNECTION); int disconnect = 0; if (conn->sqlite) { sqlite3_close(conn->sqlite); disconnect = 1; conn->sqlite = NULL; } lua_pushboolean(L, disconnect); return 1; } /* * ok = connection:ping() */ static int connection_ping(lua_State *L) { connection_t *conn = (connection_t *)luaL_checkudata(L, 1, DBD_SQLITE_CONNECTION); int ok = 0; if (conn->sqlite) { ok = 1; } lua_pushboolean(L, ok); return 1; } /* * statement,err = connection:prepare(sql_str) */ static int connection_prepare(lua_State *L) { connection_t *conn = (connection_t *)luaL_checkudata(L, 1, DBD_SQLITE_CONNECTION); if (conn->sqlite) { return dbd_sqlite3_statement_create(L, conn, luaL_checkstring(L, 2)); } lua_pushnil(L); lua_pushstring(L, DBI_ERR_DB_UNAVAILABLE); return 2; } /* * __gc */ static int connection_gc(lua_State *L) { /* always close the connection */ connection_close(L); return 0; } int dbd_sqlite3_connection(lua_State *L) { /* * instance methods */ static const luaL_Reg connection_methods[] = { {"close", connection_close}, {"ping", connection_ping}, {"prepare", connection_prepare}, {NULL, NULL} }; /* * class methods */ static const luaL_Reg connection_class_methods[] = { {"New", connection_new}, {NULL, NULL} }; luaL_newmetatable(L, DBD_SQLITE_CONNECTION); luaL_register(L, 0, connection_methods); lua_pushvalue(L,-1); lua_setfield(L, -2, "__index"); lua_pushcfunction(L, connection_gc); lua_setfield(L, -2, "__gc"); luaL_register(L, DBD_SQLITE_CONNECTION, connection_class_methods); return 1; }