@@ -376,43 +376,43 @@ proc newSQLiteError*(db: ptr RawDatabase): ref SQLiteError =
376376proc newSQLiteError * (db: ptr RawStatement ): ref SQLiteError =
377377 newException (SQLiteError , $ sqlite3_errmsg sqlite3_db_handle db)
378378
379- template check_sqlite * (res: ResultCode ) =
379+ template sqliteCheck * (res: ResultCode ) =
380380 let tmp = res
381381 if tmp != ResultCode .sr_ok:
382382 raise newSQLiteError tmp
383383
384- template check_sqlite_db * (db: ptr RawDatabase , res: ResultCode ) =
384+ template sqliteCheck * (db: ptr RawDatabase , res: ResultCode ) =
385385 let tmp = res
386386 if tmp != ResultCode .sr_ok:
387387 raise newSQLiteError db
388388
389- template check_sqlite_stmt * (st: ptr RawStatement , res: ResultCode ) =
389+ template sqliteCheck * (st: ptr RawStatement , res: ResultCode ) =
390390 let tmp = res
391391 if tmp != ResultCode .sr_ok:
392392 raise newSQLiteError st
393393
394394proc `=destroy` * (st: var Statement ) =
395395 if st.raw != nil :
396- check_sqlite sqlite3_finalize st.raw
396+ sqliteCheck sqlite3_finalize st.raw
397397
398- disallow_copy Statement
398+ preventCopy Statement
399399
400400proc `=destroy` * (db: var Database ) =
401401 if db.raw != nil :
402402 db.stmtcache.clear ()
403- check_sqlite sqlite3_close_v2 db.raw
403+ sqliteCheck sqlite3_close_v2 db.raw
404404
405- disallow_copy Database
405+ preventCopy Database
406406
407407proc 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 )
409409
410410proc initDatabase * (
411411 filename: string ,
412412 flags: OpenFlags = {so_readwrite, so_create},
413413 vfs: cstring = nil
414414): Database =
415- check_sqlite sqlite3_open_v2 (filename, addr result .raw, flags, vfs)
415+ sqliteCheck sqlite3_open_v2 (filename, addr result .raw, flags, vfs)
416416 result .stmtcache = initTable [CachedHash [string ], ref Statement ]()
417417
418418proc changes * (st: var Database ): int =
@@ -422,7 +422,7 @@ proc changes*(st: ref Statement): int =
422422 sqlite3_changes sqlite3_db_handle st.raw
423423
424424proc 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,
426426 addr result .raw, nil )
427427
428428proc fetchStatement * (db: var Database , sql: string ): ref Statement =
@@ -451,22 +451,22 @@ proc getParameterIndex*(st: ref Statement, name: string): int =
451451{.push inline .}
452452
453453proc `[]=` * (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 )
455455
456456proc `[]=` * (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)
458458
459459proc `[]=` * (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))
461461
462462proc `[]=` * (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)
464464
465465proc `[]=` * (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 )
467467
468468proc reset * (st: ref Statement ) =
469- st.raw.check_sqlite_stmt sqlite3_reset (st.raw)
469+ st.raw.sqliteCheck sqlite3_reset (st.raw)
470470
471471proc step * (st: ref Statement ): bool {.inline .} =
472472 let res = sqlite3_step (st.raw)
@@ -475,7 +475,7 @@ proc step*(st: ref Statement): bool {.inline.} =
475475 of sr_done: false
476476 else : raise newSQLiteError (st.raw)
477477
478- proc last_insert_rowid * (st: var Database ): int =
478+ proc lastInsertRowid * (st: var Database ): int =
479479 sqlite3_last_insert_rowid (st.raw)
480480
481481proc withColumnBlob * (st: ref Statement , idx: int , recv: proc (vm: openarray [byte ])) =
0 commit comments