From 40ce251e61fc760a200b8404aaf06587acc4d591 Mon Sep 17 00:00:00 2001
From: Vincent Rischmann
Date: Sat, 4 Sep 2021 15:33:50 +0200
Subject: fix for ziglang/zig#9618

---
 error.zig  | 268 -------------------------------------------------------------
 errors.zig | 268 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 sqlite.zig |  27 ++++---
 3 files changed, 283 insertions(+), 280 deletions(-)
 delete mode 100644 error.zig
 create mode 100644 errors.zig

diff --git a/error.zig b/error.zig
deleted file mode 100644
index cad107b..0000000
--- a/error.zig
+++ /dev/null
@@ -1,268 +0,0 @@
-const std = @import("std");
-
-const c = @cImport({
-    @cInclude("sqlite3.h");
-});
-
-pub const SQLiteExtendedIOError = error{
-    SQLiteIOErrRead,
-    SQLiteIOErrShortRead,
-    SQLiteIOErrWrite,
-    SQLiteIOErrFsync,
-    SQLiteIOErrDirFsync,
-    SQLiteIOErrTruncate,
-    SQLiteIOErrFstat,
-    SQLiteIOErrUnlock,
-    SQLiteIOErrRDLock,
-    SQLiteIOErrDelete,
-    SQLiteIOErrBlocked,
-    SQLiteIOErrNoMem,
-    SQLiteIOErrAccess,
-    SQLiteIOErrCheckReservedLock,
-    SQLiteIOErrLock,
-    SQLiteIOErrClose,
-    SQLiteIOErrDirClose,
-    SQLiteIOErrSHMOpen,
-    SQLiteIOErrSHMSize,
-    SQLiteIOErrSHMLock,
-    SQLiteIOErrSHMMap,
-    SQLiteIOErrSeek,
-    SQLiteIOErrDeleteNoEnt,
-    SQLiteIOErrMmap,
-    SQLiteIOErrGetTempPath,
-    SQLiteIOErrConvPath,
-    SQLiteIOErrVnode,
-    SQLiteIOErrAuth,
-    SQLiteIOErrBeginAtomic,
-    SQLiteIOErrCommitAtomic,
-    SQLiteIOErrRollbackAtomic,
-    SQLiteIOErrData,
-    SQLiteIOErrCorruptFS,
-};
-
-pub const SQLiteExtendedCantOpenError = error{
-    SQLiteCantOpenNoTempDir,
-    SQLiteCantOpenIsDir,
-    SQLiteCantOpenFullPath,
-    SQLiteCantOpenConvPath,
-    SQLiteCantOpenDirtyWAL,
-    SQLiteCantOpenSymlink,
-};
-
-pub const SQLiteExtendedReadOnlyError = error{
-    SQLiteReadOnlyRecovery,
-    SQLiteReadOnlyCantLock,
-    SQLiteReadOnlyRollback,
-    SQLiteReadOnlyDBMoved,
-    SQLiteReadOnlyCantInit,
-    SQLiteReadOnlyDirectory,
-};
-
-pub const SQLiteExtendedConstraintError = error{
-    SQLiteConstraintCheck,
-    SQLiteConstraintCommitHook,
-    SQLiteConstraintForeignKey,
-    SQLiteConstraintFunction,
-    SQLiteConstraintNotNull,
-    SQLiteConstraintPrimaryKey,
-    SQLiteConstraintTrigger,
-    SQLiteConstraintUnique,
-    SQLiteConstraintVTab,
-    SQLiteConstraintRowID,
-    SQLiteConstraintPinned,
-};
-
-pub const SQLiteExtendedError = error{
-    SQLiteErrorMissingCollSeq,
-    SQLiteErrorRetry,
-    SQLiteErrorSnapshot,
-
-    SQLiteLockedSharedCache,
-    SQLiteLockedVTab,
-
-    SQLiteBusyRecovery,
-    SQLiteBusySnapshot,
-    SQLiteBusyTimeout,
-
-    SQLiteCorruptVTab,
-    SQLiteCorruptSequence,
-    SQLiteCorruptIndex,
-
-    SQLiteAbortRollback,
-};
-
-pub const SQLiteError = error{
-    SQLiteError,
-    SQLiteInternal,
-    SQLitePerm,
-    SQLiteAbort,
-    SQLiteBusy,
-    SQLiteLocked,
-    SQLiteNoMem,
-    SQLiteReadOnly,
-    SQLiteInterrupt,
-    SQLiteIOErr,
-    SQLiteCorrupt,
-    SQLiteNotFound,
-    SQLiteFull,
-    SQLiteCantOpen,
-    SQLiteProtocol,
-    SQLiteEmpty,
-    SQLiteSchema,
-    SQLiteTooBig,
-    SQLiteConstraint,
-    SQLiteMismatch,
-    SQLiteMisuse,
-    SQLiteNoLFS,
-    SQLiteAuth,
-    SQLiteRange,
-    SQLiteNotADatabase,
-    SQLiteNotice,
-    SQLiteWarning,
-};
-
-pub const Error = SQLiteError ||
-    SQLiteExtendedError ||
-    SQLiteExtendedIOError ||
-    SQLiteExtendedCantOpenError ||
-    SQLiteExtendedReadOnlyError ||
-    SQLiteExtendedConstraintError;
-
-pub fn errorFromResultCode(code: c_int) Error {
-    // TODO(vincent): can we do something with comptime here ?
-    // The version number is always static and defined by sqlite.
-
-    // These errors are only available since 3.25.0.
-    if (c.SQLITE_VERSION_NUMBER >= 3025000) {
-        switch (code) {
-            c.SQLITE_ERROR_SNAPSHOT => return error.SQLiteErrorSnapshot,
-            c.SQLITE_LOCKED_VTAB => return error.SQLiteLockedVTab,
-            c.SQLITE_CANTOPEN_DIRTYWAL => return error.SQLiteCantOpenDirtyWAL,
-            c.SQLITE_CORRUPT_SEQUENCE => return error.SQLiteCorruptSequence,
-            else => {},
-        }
-    }
-    // These errors are only available since 3.31.0.
-    if (c.SQLITE_VERSION_NUMBER >= 3031000) {
-        switch (code) {
-            c.SQLITE_CANTOPEN_SYMLINK => return error.SQLiteCantOpenSymlink,
-            c.SQLITE_CONSTRAINT_PINNED => return error.SQLiteConstraintPinned,
-            else => {},
-        }
-    }
-    // These errors are only available since 3.32.0.
-    if (c.SQLITE_VERSION_NUMBER >= 3032000) {
-        switch (code) {
-            c.SQLITE_IOERR_DATA => return error.SQLiteIOErrData, // See https://sqlite.org/cksumvfs.html
-            c.SQLITE_BUSY_TIMEOUT => return error.SQLiteBusyTimeout,
-            c.SQLITE_CORRUPT_INDEX => return error.SQLiteCorruptIndex,
-            else => {},
-        }
-    }
-    // These errors are only available since 3.34.0.
-    if (c.SQLITE_VERSION_NUMBER >= 3034000) {
-        switch (code) {
-            c.SQLITE_IOERR_CORRUPTFS => return error.SQLiteIOErrCorruptFS,
-            else => {},
-        }
-    }
-
-    switch (code) {
-        c.SQLITE_ERROR => return error.SQLiteError,
-        c.SQLITE_INTERNAL => return error.SQLiteInternal,
-        c.SQLITE_PERM => return error.SQLitePerm,
-        c.SQLITE_ABORT => return error.SQLiteAbort,
-        c.SQLITE_BUSY => return error.SQLiteBusy,
-        c.SQLITE_LOCKED => return error.SQLiteLocked,
-        c.SQLITE_NOMEM => return error.SQLiteNoMem,
-        c.SQLITE_READONLY => return error.SQLiteReadOnly,
-        c.SQLITE_INTERRUPT => return error.SQLiteInterrupt,
-        c.SQLITE_IOERR => return error.SQLiteIOErr,
-        c.SQLITE_CORRUPT => return error.SQLiteCorrupt,
-        c.SQLITE_NOTFOUND => return error.SQLiteNotFound,
-        c.SQLITE_FULL => return error.SQLiteFull,
-        c.SQLITE_CANTOPEN => return error.SQLiteCantOpen,
-        c.SQLITE_PROTOCOL => return error.SQLiteProtocol,
-        c.SQLITE_EMPTY => return error.SQLiteEmpty,
-        c.SQLITE_SCHEMA => return error.SQLiteSchema,
-        c.SQLITE_TOOBIG => return error.SQLiteTooBig,
-        c.SQLITE_CONSTRAINT => return error.SQLiteConstraint,
-        c.SQLITE_MISMATCH => return error.SQLiteMismatch,
-        c.SQLITE_MISUSE => return error.SQLiteMisuse,
-        c.SQLITE_NOLFS => return error.SQLiteNoLFS,
-        c.SQLITE_AUTH => return error.SQLiteAuth,
-        c.SQLITE_RANGE => return error.SQLiteRange,
-        c.SQLITE_NOTADB => return error.SQLiteNotADatabase,
-        c.SQLITE_NOTICE => return error.SQLiteNotice,
-        c.SQLITE_WARNING => return error.SQLiteWarning,
-
-        c.SQLITE_ERROR_MISSING_COLLSEQ => return error.SQLiteErrorMissingCollSeq,
-        c.SQLITE_ERROR_RETRY => return error.SQLiteErrorRetry,
-
-        c.SQLITE_IOERR_READ => return error.SQLiteIOErrRead,
-        c.SQLITE_IOERR_SHORT_READ => return error.SQLiteIOErrShortRead,
-        c.SQLITE_IOERR_WRITE => return error.SQLiteIOErrWrite,
-        c.SQLITE_IOERR_FSYNC => return error.SQLiteIOErrFsync,
-        c.SQLITE_IOERR_DIR_FSYNC => return error.SQLiteIOErrDirFsync,
-        c.SQLITE_IOERR_TRUNCATE => return error.SQLiteIOErrTruncate,
-        c.SQLITE_IOERR_FSTAT => return error.SQLiteIOErrFstat,
-        c.SQLITE_IOERR_UNLOCK => return error.SQLiteIOErrUnlock,
-        c.SQLITE_IOERR_RDLOCK => return error.SQLiteIOErrRDLock,
-        c.SQLITE_IOERR_DELETE => return error.SQLiteIOErrDelete,
-        c.SQLITE_IOERR_BLOCKED => return error.SQLiteIOErrBlocked,
-        c.SQLITE_IOERR_NOMEM => return error.SQLiteIOErrNoMem,
-        c.SQLITE_IOERR_ACCESS => return error.SQLiteIOErrAccess,
-        c.SQLITE_IOERR_CHECKRESERVEDLOCK => return error.SQLiteIOErrCheckReservedLock,
-        c.SQLITE_IOERR_LOCK => return error.SQLiteIOErrLock,
-        c.SQLITE_IOERR_CLOSE => return error.SQLiteIOErrClose,
-        c.SQLITE_IOERR_DIR_CLOSE => return error.SQLiteIOErrDirClose,
-        c.SQLITE_IOERR_SHMOPEN => return error.SQLiteIOErrSHMOpen,
-        c.SQLITE_IOERR_SHMSIZE => return error.SQLiteIOErrSHMSize,
-        c.SQLITE_IOERR_SHMLOCK => return error.SQLiteIOErrSHMLock,
-        c.SQLITE_IOERR_SHMMAP => return error.SQLiteIOErrSHMMap,
-        c.SQLITE_IOERR_SEEK => return error.SQLiteIOErrSeek,
-        c.SQLITE_IOERR_DELETE_NOENT => return error.SQLiteIOErrDeleteNoEnt,
-        c.SQLITE_IOERR_MMAP => return error.SQLiteIOErrMmap,
-        c.SQLITE_IOERR_GETTEMPPATH => return error.SQLiteIOErrGetTempPath,
-        c.SQLITE_IOERR_CONVPATH => return error.SQLiteIOErrConvPath,
-        c.SQLITE_IOERR_VNODE => return error.SQLiteIOErrVnode,
-        c.SQLITE_IOERR_AUTH => return error.SQLiteIOErrAuth,
-        c.SQLITE_IOERR_BEGIN_ATOMIC => return error.SQLiteIOErrBeginAtomic,
-        c.SQLITE_IOERR_COMMIT_ATOMIC => return error.SQLiteIOErrCommitAtomic,
-        c.SQLITE_IOERR_ROLLBACK_ATOMIC => return error.SQLiteIOErrRollbackAtomic,
-
-        c.SQLITE_LOCKED_SHAREDCACHE => return error.SQLiteLockedSharedCache,
-
-        c.SQLITE_BUSY_RECOVERY => return error.SQLiteBusyRecovery,
-        c.SQLITE_BUSY_SNAPSHOT => return error.SQLiteBusySnapshot,
-
-        c.SQLITE_CANTOPEN_NOTEMPDIR => return error.SQLiteCantOpenNoTempDir,
-        c.SQLITE_CANTOPEN_ISDIR => return error.SQLiteCantOpenIsDir,
-        c.SQLITE_CANTOPEN_FULLPATH => return error.SQLiteCantOpenFullPath,
-        c.SQLITE_CANTOPEN_CONVPATH => return error.SQLiteCantOpenConvPath,
-
-        c.SQLITE_CORRUPT_VTAB => return error.SQLiteCorruptVTab,
-
-        c.SQLITE_READONLY_RECOVERY => return error.SQLiteReadOnlyRecovery,
-        c.SQLITE_READONLY_CANTLOCK => return error.SQLiteReadOnlyCantLock,
-        c.SQLITE_READONLY_ROLLBACK => return error.SQLiteReadOnlyRollback,
-        c.SQLITE_READONLY_DBMOVED => return error.SQLiteReadOnlyDBMoved,
-        c.SQLITE_READONLY_CANTINIT => return error.SQLiteReadOnlyCantInit,
-        c.SQLITE_READONLY_DIRECTORY => return error.SQLiteReadOnlyDirectory,
-
-        c.SQLITE_ABORT_ROLLBACK => return error.SQLiteAbortRollback,
-
-        c.SQLITE_CONSTRAINT_CHECK => return error.SQLiteConstraintCheck,
-        c.SQLITE_CONSTRAINT_COMMITHOOK => return error.SQLiteConstraintCommitHook,
-        c.SQLITE_CONSTRAINT_FOREIGNKEY => return error.SQLiteConstraintForeignKey,
-        c.SQLITE_CONSTRAINT_FUNCTION => return error.SQLiteConstraintFunction,
-        c.SQLITE_CONSTRAINT_NOTNULL => return error.SQLiteConstraintNotNull,
-        c.SQLITE_CONSTRAINT_PRIMARYKEY => return error.SQLiteConstraintPrimaryKey,
-        c.SQLITE_CONSTRAINT_TRIGGER => return error.SQLiteConstraintTrigger,
-        c.SQLITE_CONSTRAINT_UNIQUE => return error.SQLiteConstraintUnique,
-        c.SQLITE_CONSTRAINT_VTAB => return error.SQLiteConstraintVTab,
-        c.SQLITE_CONSTRAINT_ROWID => return error.SQLiteConstraintRowID,
-
-        else => std.debug.panic("invalid result code {}", .{code}),
-    }
-}
diff --git a/errors.zig b/errors.zig
new file mode 100644
index 0000000..cad107b
--- /dev/null
+++ b/errors.zig
@@ -0,0 +1,268 @@
+const std = @import("std");
+
+const c = @cImport({
+    @cInclude("sqlite3.h");
+});
+
+pub const SQLiteExtendedIOError = error{
+    SQLiteIOErrRead,
+    SQLiteIOErrShortRead,
+    SQLiteIOErrWrite,
+    SQLiteIOErrFsync,
+    SQLiteIOErrDirFsync,
+    SQLiteIOErrTruncate,
+    SQLiteIOErrFstat,
+    SQLiteIOErrUnlock,
+    SQLiteIOErrRDLock,
+    SQLiteIOErrDelete,
+    SQLiteIOErrBlocked,
+    SQLiteIOErrNoMem,
+    SQLiteIOErrAccess,
+    SQLiteIOErrCheckReservedLock,
+    SQLiteIOErrLock,
+    SQLiteIOErrClose,
+    SQLiteIOErrDirClose,
+    SQLiteIOErrSHMOpen,
+    SQLiteIOErrSHMSize,
+    SQLiteIOErrSHMLock,
+    SQLiteIOErrSHMMap,
+    SQLiteIOErrSeek,
+    SQLiteIOErrDeleteNoEnt,
+    SQLiteIOErrMmap,
+    SQLiteIOErrGetTempPath,
+    SQLiteIOErrConvPath,
+    SQLiteIOErrVnode,
+    SQLiteIOErrAuth,
+    SQLiteIOErrBeginAtomic,
+    SQLiteIOErrCommitAtomic,
+    SQLiteIOErrRollbackAtomic,
+    SQLiteIOErrData,
+    SQLiteIOErrCorruptFS,
+};
+
+pub const SQLiteExtendedCantOpenError = error{
+    SQLiteCantOpenNoTempDir,
+    SQLiteCantOpenIsDir,
+    SQLiteCantOpenFullPath,
+    SQLiteCantOpenConvPath,
+    SQLiteCantOpenDirtyWAL,
+    SQLiteCantOpenSymlink,
+};
+
+pub const SQLiteExtendedReadOnlyError = error{
+    SQLiteReadOnlyRecovery,
+    SQLiteReadOnlyCantLock,
+    SQLiteReadOnlyRollback,
+    SQLiteReadOnlyDBMoved,
+    SQLiteReadOnlyCantInit,
+    SQLiteReadOnlyDirectory,
+};
+
+pub const SQLiteExtendedConstraintError = error{
+    SQLiteConstraintCheck,
+    SQLiteConstraintCommitHook,
+    SQLiteConstraintForeignKey,
+    SQLiteConstraintFunction,
+    SQLiteConstraintNotNull,
+    SQLiteConstraintPrimaryKey,
+    SQLiteConstraintTrigger,
+    SQLiteConstraintUnique,
+    SQLiteConstraintVTab,
+    SQLiteConstraintRowID,
+    SQLiteConstraintPinned,
+};
+
+pub const SQLiteExtendedError = error{
+    SQLiteErrorMissingCollSeq,
+    SQLiteErrorRetry,
+    SQLiteErrorSnapshot,
+
+    SQLiteLockedSharedCache,
+    SQLiteLockedVTab,
+
+    SQLiteBusyRecovery,
+    SQLiteBusySnapshot,
+    SQLiteBusyTimeout,
+
+    SQLiteCorruptVTab,
+    SQLiteCorruptSequence,
+    SQLiteCorruptIndex,
+
+    SQLiteAbortRollback,
+};
+
+pub const SQLiteError = error{
+    SQLiteError,
+    SQLiteInternal,
+    SQLitePerm,
+    SQLiteAbort,
+    SQLiteBusy,
+    SQLiteLocked,
+    SQLiteNoMem,
+    SQLiteReadOnly,
+    SQLiteInterrupt,
+    SQLiteIOErr,
+    SQLiteCorrupt,
+    SQLiteNotFound,
+    SQLiteFull,
+    SQLiteCantOpen,
+    SQLiteProtocol,
+    SQLiteEmpty,
+    SQLiteSchema,
+    SQLiteTooBig,
+    SQLiteConstraint,
+    SQLiteMismatch,
+    SQLiteMisuse,
+    SQLiteNoLFS,
+    SQLiteAuth,
+    SQLiteRange,
+    SQLiteNotADatabase,
+    SQLiteNotice,
+    SQLiteWarning,
+};
+
+pub const Error = SQLiteError ||
+    SQLiteExtendedError ||
+    SQLiteExtendedIOError ||
+    SQLiteExtendedCantOpenError ||
+    SQLiteExtendedReadOnlyError ||
+    SQLiteExtendedConstraintError;
+
+pub fn errorFromResultCode(code: c_int) Error {
+    // TODO(vincent): can we do something with comptime here ?
+    // The version number is always static and defined by sqlite.
+
+    // These errors are only available since 3.25.0.
+    if (c.SQLITE_VERSION_NUMBER >= 3025000) {
+        switch (code) {
+            c.SQLITE_ERROR_SNAPSHOT => return error.SQLiteErrorSnapshot,
+            c.SQLITE_LOCKED_VTAB => return error.SQLiteLockedVTab,
+            c.SQLITE_CANTOPEN_DIRTYWAL => return error.SQLiteCantOpenDirtyWAL,
+            c.SQLITE_CORRUPT_SEQUENCE => return error.SQLiteCorruptSequence,
+            else => {},
+        }
+    }
+    // These errors are only available since 3.31.0.
+    if (c.SQLITE_VERSION_NUMBER >= 3031000) {
+        switch (code) {
+            c.SQLITE_CANTOPEN_SYMLINK => return error.SQLiteCantOpenSymlink,
+            c.SQLITE_CONSTRAINT_PINNED => return error.SQLiteConstraintPinned,
+            else => {},
+        }
+    }
+    // These errors are only available since 3.32.0.
+    if (c.SQLITE_VERSION_NUMBER >= 3032000) {
+        switch (code) {
+            c.SQLITE_IOERR_DATA => return error.SQLiteIOErrData, // See https://sqlite.org/cksumvfs.html
+            c.SQLITE_BUSY_TIMEOUT => return error.SQLiteBusyTimeout,
+            c.SQLITE_CORRUPT_INDEX => return error.SQLiteCorruptIndex,
+            else => {},
+        }
+    }
+    // These errors are only available since 3.34.0.
+    if (c.SQLITE_VERSION_NUMBER >= 3034000) {
+        switch (code) {
+            c.SQLITE_IOERR_CORRUPTFS => return error.SQLiteIOErrCorruptFS,
+            else => {},
+        }
+    }
+
+    switch (code) {
+        c.SQLITE_ERROR => return error.SQLiteError,
+        c.SQLITE_INTERNAL => return error.SQLiteInternal,
+        c.SQLITE_PERM => return error.SQLitePerm,
+        c.SQLITE_ABORT => return error.SQLiteAbort,
+        c.SQLITE_BUSY => return error.SQLiteBusy,
+        c.SQLITE_LOCKED => return error.SQLiteLocked,
+        c.SQLITE_NOMEM => return error.SQLiteNoMem,
+        c.SQLITE_READONLY => return error.SQLiteReadOnly,
+        c.SQLITE_INTERRUPT => return error.SQLiteInterrupt,
+        c.SQLITE_IOERR => return error.SQLiteIOErr,
+        c.SQLITE_CORRUPT => return error.SQLiteCorrupt,
+        c.SQLITE_NOTFOUND => return error.SQLiteNotFound,
+        c.SQLITE_FULL => return error.SQLiteFull,
+        c.SQLITE_CANTOPEN => return error.SQLiteCantOpen,
+        c.SQLITE_PROTOCOL => return error.SQLiteProtocol,
+        c.SQLITE_EMPTY => return error.SQLiteEmpty,
+        c.SQLITE_SCHEMA => return error.SQLiteSchema,
+        c.SQLITE_TOOBIG => return error.SQLiteTooBig,
+        c.SQLITE_CONSTRAINT => return error.SQLiteConstraint,
+        c.SQLITE_MISMATCH => return error.SQLiteMismatch,
+        c.SQLITE_MISUSE => return error.SQLiteMisuse,
+        c.SQLITE_NOLFS => return error.SQLiteNoLFS,
+        c.SQLITE_AUTH => return error.SQLiteAuth,
+        c.SQLITE_RANGE => return error.SQLiteRange,
+        c.SQLITE_NOTADB => return error.SQLiteNotADatabase,
+        c.SQLITE_NOTICE => return error.SQLiteNotice,
+        c.SQLITE_WARNING => return error.SQLiteWarning,
+
+        c.SQLITE_ERROR_MISSING_COLLSEQ => return error.SQLiteErrorMissingCollSeq,
+        c.SQLITE_ERROR_RETRY => return error.SQLiteErrorRetry,
+
+        c.SQLITE_IOERR_READ => return error.SQLiteIOErrRead,
+        c.SQLITE_IOERR_SHORT_READ => return error.SQLiteIOErrShortRead,
+        c.SQLITE_IOERR_WRITE => return error.SQLiteIOErrWrite,
+        c.SQLITE_IOERR_FSYNC => return error.SQLiteIOErrFsync,
+        c.SQLITE_IOERR_DIR_FSYNC => return error.SQLiteIOErrDirFsync,
+        c.SQLITE_IOERR_TRUNCATE => return error.SQLiteIOErrTruncate,
+        c.SQLITE_IOERR_FSTAT => return error.SQLiteIOErrFstat,
+        c.SQLITE_IOERR_UNLOCK => return error.SQLiteIOErrUnlock,
+        c.SQLITE_IOERR_RDLOCK => return error.SQLiteIOErrRDLock,
+        c.SQLITE_IOERR_DELETE => return error.SQLiteIOErrDelete,
+        c.SQLITE_IOERR_BLOCKED => return error.SQLiteIOErrBlocked,
+        c.SQLITE_IOERR_NOMEM => return error.SQLiteIOErrNoMem,
+        c.SQLITE_IOERR_ACCESS => return error.SQLiteIOErrAccess,
+        c.SQLITE_IOERR_CHECKRESERVEDLOCK => return error.SQLiteIOErrCheckReservedLock,
+        c.SQLITE_IOERR_LOCK => return error.SQLiteIOErrLock,
+        c.SQLITE_IOERR_CLOSE => return error.SQLiteIOErrClose,
+        c.SQLITE_IOERR_DIR_CLOSE => return error.SQLiteIOErrDirClose,
+        c.SQLITE_IOERR_SHMOPEN => return error.SQLiteIOErrSHMOpen,
+        c.SQLITE_IOERR_SHMSIZE => return error.SQLiteIOErrSHMSize,
+        c.SQLITE_IOERR_SHMLOCK => return error.SQLiteIOErrSHMLock,
+        c.SQLITE_IOERR_SHMMAP => return error.SQLiteIOErrSHMMap,
+        c.SQLITE_IOERR_SEEK => return error.SQLiteIOErrSeek,
+        c.SQLITE_IOERR_DELETE_NOENT => return error.SQLiteIOErrDeleteNoEnt,
+        c.SQLITE_IOERR_MMAP => return error.SQLiteIOErrMmap,
+        c.SQLITE_IOERR_GETTEMPPATH => return error.SQLiteIOErrGetTempPath,
+        c.SQLITE_IOERR_CONVPATH => return error.SQLiteIOErrConvPath,
+        c.SQLITE_IOERR_VNODE => return error.SQLiteIOErrVnode,
+        c.SQLITE_IOERR_AUTH => return error.SQLiteIOErrAuth,
+        c.SQLITE_IOERR_BEGIN_ATOMIC => return error.SQLiteIOErrBeginAtomic,
+        c.SQLITE_IOERR_COMMIT_ATOMIC => return error.SQLiteIOErrCommitAtomic,
+        c.SQLITE_IOERR_ROLLBACK_ATOMIC => return error.SQLiteIOErrRollbackAtomic,
+
+        c.SQLITE_LOCKED_SHAREDCACHE => return error.SQLiteLockedSharedCache,
+
+        c.SQLITE_BUSY_RECOVERY => return error.SQLiteBusyRecovery,
+        c.SQLITE_BUSY_SNAPSHOT => return error.SQLiteBusySnapshot,
+
+        c.SQLITE_CANTOPEN_NOTEMPDIR => return error.SQLiteCantOpenNoTempDir,
+        c.SQLITE_CANTOPEN_ISDIR => return error.SQLiteCantOpenIsDir,
+        c.SQLITE_CANTOPEN_FULLPATH => return error.SQLiteCantOpenFullPath,
+        c.SQLITE_CANTOPEN_CONVPATH => return error.SQLiteCantOpenConvPath,
+
+        c.SQLITE_CORRUPT_VTAB => return error.SQLiteCorruptVTab,
+
+        c.SQLITE_READONLY_RECOVERY => return error.SQLiteReadOnlyRecovery,
+        c.SQLITE_READONLY_CANTLOCK => return error.SQLiteReadOnlyCantLock,
+        c.SQLITE_READONLY_ROLLBACK => return error.SQLiteReadOnlyRollback,
+        c.SQLITE_READONLY_DBMOVED => return error.SQLiteReadOnlyDBMoved,
+        c.SQLITE_READONLY_CANTINIT => return error.SQLiteReadOnlyCantInit,
+        c.SQLITE_READONLY_DIRECTORY => return error.SQLiteReadOnlyDirectory,
+
+        c.SQLITE_ABORT_ROLLBACK => return error.SQLiteAbortRollback,
+
+        c.SQLITE_CONSTRAINT_CHECK => return error.SQLiteConstraintCheck,
+        c.SQLITE_CONSTRAINT_COMMITHOOK => return error.SQLiteConstraintCommitHook,
+        c.SQLITE_CONSTRAINT_FOREIGNKEY => return error.SQLiteConstraintForeignKey,
+        c.SQLITE_CONSTRAINT_FUNCTION => return error.SQLiteConstraintFunction,
+        c.SQLITE_CONSTRAINT_NOTNULL => return error.SQLiteConstraintNotNull,
+        c.SQLITE_CONSTRAINT_PRIMARYKEY => return error.SQLiteConstraintPrimaryKey,
+        c.SQLITE_CONSTRAINT_TRIGGER => return error.SQLiteConstraintTrigger,
+        c.SQLITE_CONSTRAINT_UNIQUE => return error.SQLiteConstraintUnique,
+        c.SQLITE_CONSTRAINT_VTAB => return error.SQLiteConstraintVTab,
+        c.SQLITE_CONSTRAINT_ROWID => return error.SQLiteConstraintRowID,
+
+        else => std.debug.panic("invalid result code {}", .{code}),
+    }
+}
diff --git a/sqlite.zig b/sqlite.zig
index d32b402..5aef124 100644
--- a/sqlite.zig
+++ b/sqlite.zig
@@ -9,8 +9,11 @@ pub const c = @cImport({
     @cInclude("sqlite3.h");
 });
 
-usingnamespace @import("query.zig");
-usingnamespace @import("error.zig");
+const Text = @import("query.zig").Text;
+const ParsedQuery = @import("query.zig").ParsedQuery;
+
+const errors = @import("errors.zig");
+const Error = errors.Error;
 
 const logger = std.log.scoped(.sqlite);
 
@@ -72,11 +75,11 @@ pub const Blob = struct {
     pub fn close(self: *Self) !void {
         const result = c.sqlite3_blob_close(self.handle);
         if (result != c.SQLITE_OK) {
-            return errorFromResultCode(result);
+            return errors.errorFromResultCode(result);
         }
     }
 
-    pub const Reader = io.Reader(*Self, Error, read);
+    pub const Reader = io.Reader(*Self, errors.Error, read);
 
     /// reader returns a io.Reader.
     pub fn reader(self: *Self) Reader {
@@ -100,7 +103,7 @@ pub const Blob = struct {
             self.offset,
         );
         if (result != c.SQLITE_OK) {
-            return errorFromResultCode(result);
+            return errors.errorFromResultCode(result);
         }
 
         self.offset += @intCast(c_int, tmp_buffer.len);
@@ -123,7 +126,7 @@ pub const Blob = struct {
             self.offset,
         );
         if (result != c.SQLITE_OK) {
-            return errorFromResultCode(result);
+            return errors.errorFromResultCode(result);
         }
 
         self.offset += @intCast(c_int, data.len);
@@ -352,7 +355,7 @@ pub const Db = struct {
                     } else {
                         diags.err = getDetailedErrorFromResultCode(result);
                     }
-                    return errorFromResultCode(result);
+                    return errors.errorFromResultCode(result);
                 }
 
                 return Self{ .db = db.? };
@@ -370,7 +373,7 @@ pub const Db = struct {
                     } else {
                         diags.err = getDetailedErrorFromResultCode(result);
                     }
-                    return errorFromResultCode(result);
+                    return errors.errorFromResultCode(result);
                 }
 
                 return Self{ .db = db.? };
@@ -579,7 +582,7 @@ pub fn Iterator(comptime Type: type) type {
             }
             if (result != c.SQLITE_ROW) {
                 diags.err = getLastDetailedErrorFromDb(self.db);
-                return errorFromResultCode(result);
+                return errors.errorFromResultCode(result);
             }
 
             const columns = c.sqlite3_column_count(self.stmt);
@@ -637,7 +640,7 @@ pub fn Iterator(comptime Type: type) type {
             }
             if (result != c.SQLITE_ROW) {
                 diags.err = getLastDetailedErrorFromDb(self.db);
-                return errorFromResultCode(result);
+                return errors.errorFromResultCode(result);
             }
 
             const columns = c.sqlite3_column_count(self.stmt);
@@ -1022,7 +1025,7 @@ pub fn Statement(comptime opts: StatementOptions, comptime query: ParsedQuery) t
                 );
                 if (result != c.SQLITE_OK) {
                     diags.err = getLastDetailedErrorFromDb(db.db);
-                    return errorFromResultCode(result);
+                    return errors.errorFromResultCode(result);
                 }
                 break :blk tmp.?;
             };
@@ -1181,7 +1184,7 @@ pub fn Statement(comptime opts: StatementOptions, comptime query: ParsedQuery) t
                 c.SQLITE_DONE => {},
                 else => {
                     diags.err = getLastDetailedErrorFromDb(self.db);
-                    return errorFromResultCode(result);
+                    return errors.errorFromResultCode(result);
                 },
             }
         }
-- 
cgit v1.2.3