Added SQLite support and updated the Handbook. (0.32.0)
This commit is contained in:
parent
3411a4d846
commit
9416ec3457
17 changed files with 631 additions and 388 deletions
32
src/vm/sqlite/close.c
Normal file
32
src/vm/sqlite/close.c
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
/*
|
||||
* This file is part of the Fun programming language.
|
||||
* https://fun-lang.xyz/
|
||||
*
|
||||
* Copyright 2025 Johannes Findeisen <you@hanez.org>
|
||||
* Licensed under the terms of the Apache-2.0 license.
|
||||
* https://opensource.org/license/apache-2-0
|
||||
*
|
||||
* Added: 2025-11-26
|
||||
*/
|
||||
|
||||
/**
|
||||
* OP_SQLITE_CLOSE: (handle:int) -> Nil
|
||||
*/
|
||||
case OP_SQLITE_CLOSE: {
|
||||
#ifdef FUN_WITH_SQLITE
|
||||
Value vh = pop_value(vm);
|
||||
int hid = (int)vh.i;
|
||||
free_value(vh);
|
||||
SqlHandle *h = sql_reg_get(hid);
|
||||
if (h && h->db) {
|
||||
sqlite3_close(h->db);
|
||||
h->db = NULL;
|
||||
sql_reg_del(hid);
|
||||
}
|
||||
push_value(vm, make_nil());
|
||||
#else
|
||||
Value v = pop_value(vm); free_value(v);
|
||||
push_value(vm, make_nil());
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
49
src/vm/sqlite/common.c
Normal file
49
src/vm/sqlite/common.c
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
/*
|
||||
* This file is part of the Fun programming language.
|
||||
* https://fun-lang.xyz/
|
||||
*
|
||||
* Copyright 2025 Johannes Findeisen <you@hanez.org>
|
||||
* Licensed under the terms of the Apache-2.0 license.
|
||||
* https://opensource.org/license/apache-2-0
|
||||
*
|
||||
* Added: 2025-11-26
|
||||
*/
|
||||
|
||||
/**
|
||||
* SQLite handle registry and helpers
|
||||
*/
|
||||
#ifdef FUN_WITH_SQLITE
|
||||
#include <sqlite3.h>
|
||||
|
||||
typedef struct SqlHandle {
|
||||
int id;
|
||||
sqlite3 *db;
|
||||
struct SqlHandle *next;
|
||||
} SqlHandle;
|
||||
|
||||
static SqlHandle *g_sql_handles = NULL;
|
||||
static int g_sql_next_id = 1;
|
||||
|
||||
static SqlHandle* sql_reg_add(sqlite3 *db) {
|
||||
SqlHandle *h = (SqlHandle*)calloc(1, sizeof(SqlHandle));
|
||||
if (!h) return NULL;
|
||||
h->id = g_sql_next_id++;
|
||||
h->db = db;
|
||||
h->next = g_sql_handles;
|
||||
g_sql_handles = h;
|
||||
return h;
|
||||
}
|
||||
|
||||
static SqlHandle* sql_reg_get(int id) {
|
||||
for (SqlHandle *p = g_sql_handles; p; p = p->next) if (p->id == id) return p;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static void sql_reg_del(int id) {
|
||||
SqlHandle **pp = &g_sql_handles;
|
||||
while (*pp) {
|
||||
if ((*pp)->id == id) { SqlHandle *d = *pp; *pp = d->next; free(d); return; }
|
||||
pp = &(*pp)->next;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
36
src/vm/sqlite/exec.c
Normal file
36
src/vm/sqlite/exec.c
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
/*
|
||||
* This file is part of the Fun programming language.
|
||||
* https://fun-lang.xyz/
|
||||
*
|
||||
* Copyright 2025 Johannes Findeisen <you@hanez.org>
|
||||
* Licensed under the terms of the Apache-2.0 license.
|
||||
* https://opensource.org/license/apache-2-0
|
||||
*
|
||||
* Added: 2025-11-26
|
||||
*/
|
||||
|
||||
/**
|
||||
* OP_SQLITE_EXEC: (handle:int, sql:string) -> int rc (0=OK)
|
||||
*/
|
||||
case OP_SQLITE_EXEC: {
|
||||
#ifdef FUN_WITH_SQLITE
|
||||
Value vsql = pop_value(vm);
|
||||
Value vh = pop_value(vm);
|
||||
int hid = (int)vh.i;
|
||||
char *sql = value_to_string_alloc(&vsql);
|
||||
free_value(vh);
|
||||
free_value(vsql);
|
||||
SqlHandle *h = sql_reg_get(hid);
|
||||
if (!h || !h->db || !sql) { if (sql) free(sql); push_value(vm, make_int(SQLITE_MISUSE)); break; }
|
||||
char *errmsg = NULL;
|
||||
int rc = sqlite3_exec(h->db, sql, NULL, NULL, &errmsg);
|
||||
if (errmsg) sqlite3_free(errmsg);
|
||||
free(sql);
|
||||
push_value(vm, make_int(rc));
|
||||
#else
|
||||
Value v1 = pop_value(vm); free_value(v1);
|
||||
Value v2 = pop_value(vm); free_value(v2);
|
||||
push_value(vm, make_int(-1));
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
37
src/vm/sqlite/open.c
Normal file
37
src/vm/sqlite/open.c
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
/*
|
||||
* This file is part of the Fun programming language.
|
||||
* https://fun-lang.xyz/
|
||||
*
|
||||
* Copyright 2025 Johannes Findeisen <you@hanez.org>
|
||||
* Licensed under the terms of the Apache-2.0 license.
|
||||
* https://opensource.org/license/apache-2-0
|
||||
*
|
||||
* Added: 2025-11-26
|
||||
*/
|
||||
|
||||
/**
|
||||
* OP_SQLITE_OPEN: (path:string) -> handle:int (>0) or 0 on error
|
||||
*/
|
||||
case OP_SQLITE_OPEN: {
|
||||
#ifdef FUN_WITH_SQLITE
|
||||
Value vpath = pop_value(vm);
|
||||
char *path = value_to_string_alloc(&vpath);
|
||||
free_value(vpath);
|
||||
if (!path) { push_value(vm, make_int(0)); break; }
|
||||
sqlite3 *db = NULL;
|
||||
int rc = sqlite3_open(path, &db);
|
||||
free(path);
|
||||
if (rc != SQLITE_OK || !db) {
|
||||
if (db) sqlite3_close(db);
|
||||
push_value(vm, make_int(0));
|
||||
break;
|
||||
}
|
||||
SqlHandle *h = sql_reg_add(db);
|
||||
if (!h) { sqlite3_close(db); push_value(vm, make_int(0)); break; }
|
||||
push_value(vm, make_int(h->id));
|
||||
#else
|
||||
Value v = pop_value(vm); free_value(v);
|
||||
push_value(vm, make_int(0));
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
62
src/vm/sqlite/query.c
Normal file
62
src/vm/sqlite/query.c
Normal file
|
|
@ -0,0 +1,62 @@
|
|||
/*
|
||||
* This file is part of the Fun programming language.
|
||||
* https://fun-lang.xyz/
|
||||
*
|
||||
* Copyright 2025 Johannes Findeisen <you@hanez.org>
|
||||
* Licensed under the terms of the Apache-2.0 license.
|
||||
* https://opensource.org/license/apache-2-0
|
||||
*
|
||||
* Added: 2025-11-26
|
||||
*/
|
||||
|
||||
/**
|
||||
* OP_SQLITE_QUERY: (handle:int, sql:string) -> array<map<string,any>>
|
||||
*/
|
||||
case OP_SQLITE_QUERY: {
|
||||
#ifdef FUN_WITH_SQLITE
|
||||
Value vsql = pop_value(vm);
|
||||
Value vh = pop_value(vm);
|
||||
int hid = (int)vh.i;
|
||||
char *sql = value_to_string_alloc(&vsql);
|
||||
free_value(vh);
|
||||
free_value(vsql);
|
||||
SqlHandle *h = sql_reg_get(hid);
|
||||
if (!h || !h->db || !sql) { if (sql) free(sql); push_value(vm, make_array_from_values(NULL, 0)); break; }
|
||||
sqlite3_stmt *stmt = NULL;
|
||||
if (sqlite3_prepare_v2(h->db, sql, -1, &stmt, NULL) != SQLITE_OK) {
|
||||
free(sql);
|
||||
push_value(vm, make_array_from_values(NULL, 0));
|
||||
break;
|
||||
}
|
||||
free(sql);
|
||||
Value rows = make_array_from_values(NULL, 0);
|
||||
int ncols = sqlite3_column_count(stmt);
|
||||
while (sqlite3_step(stmt) == SQLITE_ROW) {
|
||||
Value row = make_map_empty();
|
||||
for (int i = 0; i < ncols; i++) {
|
||||
const char *name = sqlite3_column_name(stmt, i);
|
||||
int type = sqlite3_column_type(stmt, i);
|
||||
Value kv;
|
||||
switch (type) {
|
||||
case SQLITE_INTEGER: kv = make_int((int64_t)sqlite3_column_int64(stmt, i)); break;
|
||||
case SQLITE_FLOAT: kv = make_float(sqlite3_column_double(stmt, i)); break;
|
||||
case SQLITE_TEXT: kv = make_string((const char*)sqlite3_column_text(stmt, i)); break;
|
||||
case SQLITE_NULL: kv = make_nil(); break;
|
||||
default: kv = make_nil(); break; /* ignore blobs for now */
|
||||
}
|
||||
(void)map_set(&row, name ? name : "", kv);
|
||||
}
|
||||
(void)array_push(&rows, row);
|
||||
/* Do NOT free 'row' here: rows array now owns it. Freeing would
|
||||
destroy the map and leave a dangling pointer causing segfaults
|
||||
when accessing fields like row["done"]. */
|
||||
}
|
||||
sqlite3_finalize(stmt);
|
||||
push_value(vm, rows);
|
||||
#else
|
||||
Value v1 = pop_value(vm); free_value(v1);
|
||||
Value v2 = pop_value(vm); free_value(v2);
|
||||
push_value(vm, make_array_from_values(NULL, 0));
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue