spencer/envr
1
0
Fork 0
mirror of https://github.com/sbrow/envr.git synced 2026-06-27 18:48:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor(sqlite): Removed db_ prefix from db_open and db_close.

Browse Source
This commit is contained in:
Spencer Brower
2026-06-20 18:48:13 -04:00
parent 92faab2706
commit 9683216efe
4 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
TODOS.md
View File

@@ -48,6 +48,10 @@
26. Test all cmds / terminal branches. 26. Test all cmds / terminal branches.
27. Replace `fmt.tprintf("/tmp/envr-test-...-%d", os.get_pid())` + `os.mkdir_all` in test files with `os.mkdir_temp` (race-free, honors `$TMPDIR`, matches `findr/test_env.odin` pattern).
28. Adopt `core:log` across `db.odin`, `crypto.odin`, `config.odin`, `ssh.odin` — replace ~30 scattered `fmt.printf("Error ...")` calls with leveled logging for consistent stderr routing and source locations.
## Double-check AI output ## Double-check AI output
- [ ] cli.odin - [ ] cli.odin

8
db.odin
View File

@@ -65,7 +65,7 @@ db_open :: proc(cfg_path: string) -> (database: Db, ok: bool) {
data_path := data_path(database.cfg.config_path, context.temp_allocator) data_path := data_path(database.cfg.config_path, context.temp_allocator)
if os.exists(data_path) { if os.exists(data_path) {
if ok = db_restore_from_encrypted(&database, data_path); !ok { if ok = db_restore_from_encrypted(&database, data_path); !ok {
sqlite.db_close(database.db) sqlite.close(database.db)
return database, false return database, false
} }
} else { } else {
@@ -80,7 +80,7 @@ db_open :: proc(cfg_path: string) -> (database: Db, ok: bool) {
// In production, you most likely want to use `db_open`. // In production, you most likely want to use `db_open`.
db_init :: proc() -> (database: Db, ok: bool) { db_init :: proc() -> (database: Db, ok: bool) {
db: ^rawptr db: ^rawptr
rc := sqlite.db_open(":memory:", &db) rc := sqlite.open(":memory:", &db)
if rc != sqlite.OK { if rc != sqlite.OK {
fmt.printf("Error opening in-memory database: %s\n", sqlite.db_errmsg(db)) fmt.printf("Error opening in-memory database: %s\n", sqlite.db_errmsg(db))
return return
@@ -90,7 +90,7 @@ db_init :: proc() -> (database: Db, ok: bool) {
rc = sqlite.db_exec(db, create_sql, nil, nil, nil) rc = sqlite.db_exec(db, create_sql, nil, nil, nil)
if rc != sqlite.OK { if rc != sqlite.OK {
fmt.printf("Error creating table: %s\n", sqlite.db_errmsg(db)) fmt.printf("Error creating table: %s\n", sqlite.db_errmsg(db))
sqlite.db_close(db) sqlite.close(db)
return return
} }
database.db = db database.db = db
@@ -148,7 +148,7 @@ db_close :: proc(d: ^Db) {
allocator := db_allocator(d) allocator := db_allocator(d)
defer { defer {
sqlite.db_close(d.db) sqlite.close(d.db)
delete_config(&d.cfg, allocator) delete_config(&d.cfg, allocator)

4
db_integration_test.odin
View File

@@ -166,12 +166,12 @@ test_decrypt_then_deserialize_sqlite :: proc(t: ^testing.T) {
defer delete(plaintext) defer delete(plaintext)
mem_db: ^rawptr mem_db: ^rawptr
rc := sqlite.db_open(":memory:", &mem_db) rc := sqlite.open(":memory:", &mem_db)
testing.expectf(t, rc == sqlite.OK, "failed to open in-memory db") testing.expectf(t, rc == sqlite.OK, "failed to open in-memory db")
if rc != sqlite.OK { if rc != sqlite.OK {
return return
} }
defer sqlite.db_close(mem_db) defer sqlite.close(mem_db)
n := i64(len(plaintext)) n := i64(len(plaintext))
buf := sqlite.malloc64(n) buf := sqlite.malloc64(n)

61
sqlite/sqlite.odin
View File

@@ -12,34 +12,35 @@ DESERIALIZE_FREEONCLOSE :: 1
DESERIALIZE_RESIZEABLE :: 2 DESERIALIZE_RESIZEABLE :: 2
foreign lib { foreign lib {
@(link_name="sqlite3_open") @(link_name = "sqlite3_open")
db_open :: proc(filename: cstring, ppDb: ^^rawptr) -> c.int --- open :: proc(filename: cstring, ppDb: ^^rawptr) -> c.int ---
@(link_name="sqlite3_close") @(link_name = "sqlite3_close")
db_close :: proc(db: ^rawptr) -> c.int --- close :: proc(db: ^rawptr) -> c.int ---
@(link_name="sqlite3_errmsg") @(link_name = "sqlite3_errmsg")
db_errmsg :: proc(db: ^rawptr) -> cstring --- db_errmsg :: proc(db: ^rawptr) -> cstring ---
@(link_name="sqlite3_exec") @(link_name = "sqlite3_exec")
db_exec :: proc(db: ^rawptr, sql: cstring, callback: rawptr, callback_arg: rawptr, errmsg: ^cstring) -> c.int --- db_exec :: proc(db: ^rawptr, sql: cstring, callback: rawptr, callback_arg: rawptr, errmsg: ^cstring) -> c.int ---
@(link_name="sqlite3_prepare_v2") @(link_name = "sqlite3_prepare_v2")
prepare_v2 :: proc(db: ^rawptr, sql: cstring, nByte: c.int, ppStmt: ^^rawptr, pzTail: ^cstring) -> c.int --- prepare_v2 :: proc(db: ^rawptr, sql: cstring, nByte: c.int, ppStmt: ^^rawptr, pzTail: ^cstring) -> c.int ---
@(link_name="sqlite3_step") @(link_name = "sqlite3_step")
step :: proc(stmt: ^rawptr) -> c.int --- step :: proc(stmt: ^rawptr) -> c.int ---
@(link_name="sqlite3_finalize") @(link_name = "sqlite3_finalize")
finalize :: proc(stmt: ^rawptr) -> c.int --- finalize :: proc(stmt: ^rawptr) -> c.int ---
@(link_name="sqlite3_column_text") @(link_name = "sqlite3_column_text")
column_text :: proc(stmt: ^rawptr, iCol: c.int) -> cstring --- column_text :: proc(stmt: ^rawptr, iCol: c.int) -> cstring ---
@(link_name="sqlite3_column_bytes") @(link_name = "sqlite3_column_bytes")
column_bytes :: proc(stmt: ^rawptr, iCol: c.int) -> c.int --- column_bytes :: proc(stmt: ^rawptr, iCol: c.int) -> c.int ---
@(link_name="sqlite3_bind_text") @(link_name = "sqlite3_bind_text")
bind_text :: proc(stmt: ^rawptr, idx: c.int, val: cstring, n: c.int, destructor: rawptr) -> c.int --- bind_text :: proc(stmt: ^rawptr, idx: c.int, val: cstring, n: c.int, destructor: rawptr) -> c.int ---
@(link_name="sqlite3_changes") @(link_name = "sqlite3_changes")
changes :: proc(db: ^rawptr) -> c.int --- changes :: proc(db: ^rawptr) -> c.int ---
@(link_name="sqlite3_serialize") @(link_name = "sqlite3_serialize")
serialize :: proc(db: ^rawptr, zSchema: cstring, piSize: ^i64, mFlags: u32) -> [^]u8 --- serialize :: proc(db: ^rawptr, zSchema: cstring, piSize: ^i64, mFlags: u32) -> [^]u8 ---
@(link_name="sqlite3_deserialize") @(link_name = "sqlite3_deserialize")
deserialize :: proc(db: ^rawptr, zSchema: cstring, pData: [^]u8, szDb: i64, szBuf: i64, mFlags: u32) -> c.int --- deserialize :: proc(db: ^rawptr, zSchema: cstring, pData: [^]u8, szDb: i64, szBuf: i64, mFlags: u32) -> c.int ---
@(link_name="sqlite3_malloc64") @(link_name = "sqlite3_malloc64")
malloc64 :: proc(n: i64) -> [^]u8 --- malloc64 :: proc(n: i64) -> [^]u8 ---
@(link_name="sqlite3_free") @(link_name = "sqlite3_free")
free :: proc(p: rawptr) --- free :: proc(p: rawptr) ---
} }