From 4c492de0f8fef67c41855bd503862874c6a2adce Mon Sep 17 00:00:00 2001 From: Vincent Rischmann Date: Fri, 5 Aug 2022 23:00:28 +0200 Subject: move versionGreaterThanOrEqualTo in sqlite.zig We will need it later on. --- errors.zig | 6 ++---- sqlite.zig | 5 +++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/errors.zig b/errors.zig index 654e93d..2beef5f 100644 --- a/errors.zig +++ b/errors.zig @@ -3,6 +3,8 @@ const mem = std.mem; const c = @import("c.zig").c; +const versionGreaterThanOrEqualTo = @import("sqlite.zig").versionGreaterThanOrEqualTo; + pub const SQLiteExtendedIOError = error{ SQLiteIOErrRead, SQLiteIOErrShortRead, @@ -127,10 +129,6 @@ pub const Error = SQLiteError || SQLiteExtendedReadOnlyError || SQLiteExtendedConstraintError; -fn versionGreaterThanOrEqualTo(major: u8, minor: u8, patch: u8) bool { - return c.SQLITE_VERSION_NUMBER >= @as(u32, major) * 1000000 + @as(u32, minor) * 1000 + @as(u32, patch); -} - pub fn errorFromResultCode(code: c_int) Error { // These errors are only available since 3.22.0. if (comptime versionGreaterThanOrEqualTo(3, 22, 0)) { diff --git a/sqlite.zig b/sqlite.zig index a6dc6f4..89ddd67 100644 --- a/sqlite.zig +++ b/sqlite.zig @@ -20,6 +20,11 @@ const getDetailedErrorFromResultCode = errors.getDetailedErrorFromResultCode; const logger = std.log.scoped(.sqlite); +// versionGreaterThanOrEqualTo returns true if the SQLite version is >= to the major.minor.patch provided. +pub fn versionGreaterThanOrEqualTo(major: u8, minor: u8, patch: u8) bool { + return c.SQLITE_VERSION_NUMBER >= @as(u32, major) * 1000000 + @as(u32, minor) * 1000 + @as(u32, patch); +} + /// Text is used to represent a SQLite TEXT value when binding a parameter or reading a column. pub const Text = struct { data: []const u8 }; -- cgit v1.2.3