Merge pull request #161 from malcolmstill/master

Enable features without vendoring

3 files changed, 26 insertions, 4 deletions

diff --git a/build.zig b/build.zig
index ed064a2..55b3950 100644
--- a/build.zig
+++ b/build.zig
@@ -115,7 +115,23 @@ pub fn build(b: *std.Build) !void {
     const target = b.resolveTargetQuery(query);
     const optimize = b.standardOptimizeOption(.{});
 
-    const c_flags = &[_][]const u8{"-std=c99"};
+    var flags = std.ArrayList([]const u8).init(b.allocator);
+    defer flags.deinit();
+    try flags.append("-std=c99");
+
+    inline for (std.meta.fields(EnableOptions)) |field| {
+        const opt = b.option(bool, field.name, "Enable " ++ field.name) orelse @as(*const bool, @ptrCast(field.default_value.?)).*;
+
+        if (opt) {
+            var buf: [field.name.len]u8 = undefined;
+            const name = std.ascii.upperString(&buf, field.name);
+            const flag = try std.fmt.allocPrint(b.allocator, "-DSQLITE_ENABLE_{s}", .{name});
+
+            try flags.append(flag);
+        }
+    }
+
+    const c_flags = flags.items;
 
     const sqlite_lib = b.addStaticLibrary(.{
         .name = "sqlite",
@@ -317,3 +333,9 @@ pub fn build(b: *std.Build) !void {
     zigcrypto_compile_run.dependOn(&install_zigcrypto_loadable_ext.step);
     zigcrypto_compile_run.dependOn(&install_zigcrypto_test.step);
 }
+
+// See https://www.sqlite.org/compile.html for flags
+const EnableOptions = struct {
+    // https://www.sqlite.org/fts5.html
+    fts5: bool = false,
+};
diff --git a/sqlite.zig b/sqlite.zig
index bd11dea..0d0f81c 100644
--- a/sqlite.zig
+++ b/sqlite.zig
@@ -3743,7 +3743,7 @@ test "sqlite: create aggregate function with no aggregate context" {
     var db = try getTestDb();
     defer db.deinit();
 
-    var rand = std.rand.DefaultPrng.init(@intCast(std.time.milliTimestamp()));
+    var rand = std.Random.DefaultPrng.init(@intCast(std.time.milliTimestamp()));
 
     // Create an aggregate function working with a MyContext
 
@@ -3804,7 +3804,7 @@ test "sqlite: create aggregate function with an aggregate context" {
     var db = try getTestDb();
     defer db.deinit();
 
-    var rand = std.rand.DefaultPrng.init(@intCast(std.time.milliTimestamp()));
+    var rand = std.Random.DefaultPrng.init(@intCast(std.time.milliTimestamp()));
 
     try db.createAggregateFunction(
         "mySum",
diff --git a/vtab.zig b/vtab.zig
index 8f21cc1..eaefb9c 100644
--- a/vtab.zig
+++ b/vtab.zig
@@ -1026,7 +1026,7 @@ const TestVirtualTable = struct {
                 "Vincent", "José", "Michel",
             };
 
-            var rand = std.rand.DefaultPrng.init(204882485);
+            var rand = std.Random.DefaultPrng.init(204882485);
 
             const tmp = try allocator.alloc(Row, n);
             for (tmp) |*s| {