@@ -376,43 +376,43 @@ proc newSQLiteError*(db: ptr RawDatabase): ref SQLiteError =
376
376
proc newSQLiteError*(db: ptr RawStatement): ref SQLiteError =
377
377
newException(SQLiteError, $sqlite3_errmsg sqlite3_db_handle db)
378
378
379
- template check_sqlite *(res: ResultCode) =
379
+ template sqliteCheck *(res: ResultCode) =
380
380
let tmp = res
381
381
if tmp != ResultCode.sr_ok:
382
382
raise newSQLiteError tmp
383
383
384
- template check_sqlite_db *(db: ptr RawDatabase, res: ResultCode) =
384
+ template sqliteCheck *(db: ptr RawDatabase, res: ResultCode) =
385
385
let tmp = res
386
386
if tmp != ResultCode.sr_ok:
387
387
raise newSQLiteError db
388
388
389
- template check_sqlite_stmt *(st: ptr RawStatement, res: ResultCode) =
389
+ template sqliteCheck *(st: ptr RawStatement, res: ResultCode) =
390
390
let tmp = res
391
391
if tmp != ResultCode.sr_ok:
392
392
raise newSQLiteError st
393
393
394
394
proc `=destroy`*(st: var Statement) =
395
395
if st.raw != nil:
396
- check_sqlite sqlite3_finalize st.raw
396
+ sqliteCheck sqlite3_finalize st.raw
397
397
398
- disallow_copy Statement
398
+ preventCopy Statement
399
399
400
400
proc `=destroy`*(db: var Database) =
401
401
if db.raw != nil:
402
402
db.stmtcache.clear()
403
- check_sqlite sqlite3_close_v2 db.raw
403
+ sqliteCheck sqlite3_close_v2 db.raw
404
404
405
- disallow_copy Database
405
+ preventCopy Database
406
406
407
407
proc enableSharedCache*(enabled: bool = true) =
408
- check_sqlite sqlite3_enable_shared_cache(if enabled: 1 else: 0)
408
+ sqliteCheck sqlite3_enable_shared_cache(if enabled: 1 else: 0)
409
409
410
410
proc initDatabase*(
411
411
filename: string ,
412
412
flags: OpenFlags = {so_readwrite, so_create},
413
413
vfs: cstring = nil
414
414
): Database =
415
- check_sqlite sqlite3_open_v2(filename, addr result .raw, flags, vfs)
415
+ sqliteCheck sqlite3_open_v2(filename, addr result .raw, flags, vfs)
416
416
result .stmtcache = initTable[CachedHash[string ], ref Statement]()
417
417
418
418
proc changes*(st: var Database): int =
@@ -422,7 +422,7 @@ proc changes*(st: ref Statement): int =
422
422
sqlite3_changes sqlite3_db_handle st.raw
423
423
424
424
proc initStatement*(db: var Database, sql: string , flags: PrepareFlags = {}): Statement =
425
- check_sqlite_db db.raw, sqlite3_prepare_v3(db.raw, sql, sql.len, flags,
425
+ sqliteCheck db.raw, sqlite3_prepare_v3(db.raw, sql, sql.len, flags,
426
426
addr result .raw, nil)
427
427
428
428
proc fetchStatement*(db: var Database, sql: string ): ref Statement =
@@ -451,22 +451,22 @@ proc getParameterIndex*(st: ref Statement, name: string): int =
451
451
{.push inline.}
452
452
453
453
proc `[]=`*(st: ref Statement, idx: int , blob: openarray [byte ]) =
454
- st.raw.check_sqlite_stmt sqlite3_bind_blob64(st.raw, idx, blob.unsafeAddr, blob.len, TransientDestructor)
454
+ st.raw.sqliteCheck sqlite3_bind_blob64(st.raw, idx, blob.unsafeAddr, blob.len, TransientDestructor)
455
455
456
456
proc `[]=`*(st: ref Statement, idx: int , val: SomeFloat) =
457
- st.raw.check_sqlite_stmt sqlite3_bind_double(st.raw, idx, float64 val)
457
+ st.raw.sqliteCheck sqlite3_bind_double(st.raw, idx, float64 val)
458
458
459
459
proc `[]=`*(st: ref Statement, idx: int , val: SomeOrdinal) =
460
- st.raw.check_sqlite_stmt sqlite3_bind_int64(st.raw, idx, cast[int64 ](val))
460
+ st.raw.sqliteCheck sqlite3_bind_int64(st.raw, idx, cast[int64 ](val))
461
461
462
462
proc `[]=`*(st: ref Statement, idx: int , val: type (nil)) =
463
- st.raw.check_sqlite_stmt sqlite3_bind_null(st.raw, idx)
463
+ st.raw.sqliteCheck sqlite3_bind_null(st.raw, idx)
464
464
465
465
proc `[]=`*(st: ref Statement, idx: int , val: string ) =
466
- st.raw.check_sqlite_stmt sqlite3_bind_text(st.raw, idx, val, int32 val.len, TransientDestructor)
466
+ st.raw.sqliteCheck sqlite3_bind_text(st.raw, idx, val, int32 val.len, TransientDestructor)
467
467
468
468
proc reset*(st: ref Statement) =
469
- st.raw.check_sqlite_stmt sqlite3_reset(st.raw)
469
+ st.raw.sqliteCheck sqlite3_reset(st.raw)
470
470
471
471
proc step*(st: ref Statement): bool {.inline.} =
472
472
let res = sqlite3_step(st.raw)
@@ -475,7 +475,7 @@ proc step*(st: ref Statement): bool {.inline.} =
475
475
of sr_done: false
476
476
else: raise newSQLiteError(st.raw)
477
477
478
- proc last_insert_rowid *(st: var Database): int =
478
+ proc lastInsertRowid *(st: var Database): int =
479
479
sqlite3_last_insert_rowid(st.raw)
480
480
481
481
proc withColumnBlob*(st: ref Statement, idx: int , recv: proc(vm: openarray [byte ])) =
0 commit comments