mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-08-08 10:50:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update redbean SQLite config to handle more options

Browse source 
This requires moving sqlite3_initialize call to open, as configuration
should be allowed before initialization is done. This call is effective
only for the first time and then no-op after that.
This commit is contained in:
Paul Kulchenko 2023-02-01 17:32:56 -08:00
parent c395d16230
commit 31383de068
1 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
tool/net/lsqlite3.c
View file

@ -2416,6 +2416,7 @@ static int lsqlite_version(lua_State *L) {
} }
static int lsqlite_do_open(lua_State *L, const char *filename, int flags) { static int lsqlite_do_open(lua_State *L, const char *filename, int flags) {
sqlite3_initialize(); /* initialize the engine if hasn't been done yet */
sdb *db = newdb(L); /* create and leave in stack */ sdb *db = newdb(L); /* create and leave in stack */
if (sqlite3_open_v2(filename, &db->db, flags, 0) == SQLITE_OK) { if (sqlite3_open_v2(filename, &db->db, flags, 0) == SQLITE_OK) {
@ -2469,7 +2470,18 @@ static void log_callback(void* user, int rc, const char *msg) {
} }
static int lsqlite_config(lua_State *L) { static int lsqlite_config(lua_State *L) {
switch (luaL_checkint(L, 1)) { int rc = SQLITE_MISUSE;
int option = luaL_checkint(L, 1);
switch (option) {
case SQLITE_CONFIG_SINGLETHREAD:
case SQLITE_CONFIG_MULTITHREAD:
case SQLITE_CONFIG_SERIALIZED:
if ((rc = sqlite3_config(option)) == SQLITE_OK) {
lua_pushinteger(L, rc);
return 1;
}
break;
case SQLITE_CONFIG_LOG: case SQLITE_CONFIG_LOG:
/* make sure we have an userdata field (even if nil) */ /* make sure we have an userdata field (even if nil) */
lua_settop(L, 3); lua_settop(L, 3);
@ -2494,7 +2506,7 @@ static int lsqlite_config(lua_State *L) {
} }
return 3; // return OK and previous callback and userdata return 3; // return OK and previous callback and userdata
} }
return pusherr(L, SQLITE_MISUSE); return pusherr(L, rc);
} }
static int lsqlite_newindex(lua_State *L) { static int lsqlite_newindex(lua_State *L) {
@ -2585,6 +2597,9 @@ static const struct {
SC(OPEN_PRIVATECACHE) SC(OPEN_PRIVATECACHE)
/* config flags */ /* config flags */
SC(CONFIG_SINGLETHREAD)
SC(CONFIG_MULTITHREAD)
SC(CONFIG_SERIALIZED)
SC(CONFIG_LOG) SC(CONFIG_LOG)
/* checkpoint flags */ /* checkpoint flags */
@ -2803,7 +2818,6 @@ static void create_meta(lua_State *L, const char *name, const luaL_Reg *lib) {
LUALIB_API int luaopen_lsqlite3(lua_State *L) { LUALIB_API int luaopen_lsqlite3(lua_State *L) {
/* call config before calling initialize */ /* call config before calling initialize */
sqlite3_config(SQLITE_CONFIG_LOG, log_callback, L); sqlite3_config(SQLITE_CONFIG_LOG, log_callback, L);
sqlite3_initialize();
create_meta(L, sqlite_meta, dblib); create_meta(L, sqlite_meta, dblib);
create_meta(L, sqlite_vm_meta, vmlib); create_meta(L, sqlite_vm_meta, vmlib);