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

Add new/old/conflict iterator methods to SQLite Lua API

Browse source
This commit is contained in:
Paul Kulchenko 2022-10-26 22:55:41 -07:00
parent 90f8180c4c
commit ddbb6dbbc9
1 changed files with 48 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

52
tool/net/lsqlite3.c
View file

@ -1804,7 +1804,6 @@ static int db_deserialize(lua_State *L) {
if (db->db == NULL) /* ignore closed databases */ if (db->db == NULL) /* ignore closed databases */
return 0; return 0;
const char *buffer = luaL_checklstring(L, 2, &size); const char *buffer = luaL_checklstring(L, 2, &size);
if (buffer == NULL || size == 0) /* ignore empty database content */ if (buffer == NULL || size == 0) /* ignore empty database content */
return 0; return 0;
@ -1826,11 +1825,11 @@ typedef struct {
sqlite3_changeset_iter *itr; sqlite3_changeset_iter *itr;
} liter; } liter;
static liter *lsqlite_makeiter(lua_State *L, sqlite3_changeset_iter *iter) { static liter *lsqlite_makeiter(lua_State *L, sqlite3_changeset_iter *piter) {
liter *litr = (liter*)lua_newuserdata(L, sizeof(liter)); liter *litr = (liter*)lua_newuserdata(L, sizeof(liter));
lua_rawgeti(L, LUA_REGISTRYINDEX, sqlite_itr_meta_ref); lua_rawgeti(L, LUA_REGISTRYINDEX, sqlite_itr_meta_ref);
lua_setmetatable(L, -2); lua_setmetatable(L, -2);
litr->itr = iter; litr->itr = piter;
return litr; return litr;
} }
@ -1855,6 +1854,46 @@ static int liter_tostring(lua_State *L) {
return 1; return 1;
} }
static int liter_table(
lua_State *L,
int (*iter_func)(sqlite3_changeset_iter *pIter, int val, sqlite3_value **ppValue)
) {
const char *zTab;
int n, rc, nCol, Op, bIndirect;
sqlite3_value *pVal;
liter *litr = lsqlite_checkiter(L, 1);
sqlite3changeset_op(litr->itr, &zTab, &nCol, &Op, &bIndirect);
lua_createtable(L, nCol, 0);
for (n = 0; n < nCol; n++) {
if ((rc = (*iter_func)(litr->itr, n, &pVal)) != LUA_OK) {
lua_pushnil(L);
lua_pushinteger(L, rc);
return 2;
}
if (pVal) {
db_push_value(L, pVal);
} else {
// push `false` to indicate that the value wasn't changed
// and not included in the record and to keep table valid
lua_pushboolean(L, 0);
}
lua_rawseti(L, -2, n+1);
}
return 1;
}
static int liter_new(lua_State *L) {
return liter_table(L, sqlite3changeset_new);
}
static int liter_old(lua_State *L) {
return liter_table(L, sqlite3changeset_old);
}
static int liter_conflict(lua_State *L) {
return liter_table(L, sqlite3changeset_conflict);
}
/* /*
** ======================================================= ** =======================================================
** Rebaser functions (for session support) ** Rebaser functions (for session support)
@ -1969,11 +2008,12 @@ static int db_changeset_conflict_callback(
lua_rawgeti(L, LUA_REGISTRYINDEX, changeset_conflict_cb); /* get callback */ lua_rawgeti(L, LUA_REGISTRYINDEX, changeset_conflict_cb); /* get callback */
lua_rawgeti(L, LUA_REGISTRYINDEX, changeset_cb_udata); /* get callback user data */ lua_rawgeti(L, LUA_REGISTRYINDEX, changeset_cb_udata); /* get callback user data */
lua_pushinteger(L, eConflict); lua_pushinteger(L, eConflict);
(void)lsqlite_makeiter(L, p);
lua_pushstring(L, zTab); lua_pushstring(L, zTab);
lua_pushinteger(L, Op); lua_pushinteger(L, Op);
lua_pushboolean(L, bIndirect); lua_pushboolean(L, bIndirect);
if (lua_pcall(L, 5, 1, 0) != LUA_OK) return lua_error(L); if (lua_pcall(L, 6, 1, 0) != LUA_OK) return lua_error(L);
result = lua_tointegerx(L, -1, &isint); /* use result if there was no error */ result = lua_tointegerx(L, -1, &isint); /* use result if there was no error */
if (!isint) { if (!isint) {
@ -2608,6 +2648,10 @@ static const luaL_Reg reblib[] = {
}; };
static const luaL_Reg itrlib[] = { static const luaL_Reg itrlib[] = {
{"new", liter_new },
{"old", liter_old },
{"conflict", liter_conflict },
{"__tostring", liter_tostring }, {"__tostring", liter_tostring },
{NULL, NULL} {NULL, NULL}
}; };