introduce first iteration of the zig build

.envrc

@@ -0,0 +1 @@
+use flake

.gitignore

@@ -1,7 +1,9 @@
 /target
 .vscode/
 .idea/
+.direnv/
 *.sqld
+tags
 
 libsql-server/testrollbackrestore/**
 libsql-server/testbackuprestore/**
@@ -12,4 +14,4 @@ libsql-sqlite3/**.o.tmp
 
 /bindings/c/generated
 /bindings/c/**.xcframework
-/bindings/**/.DS_Store
+/bindings/**/.DS_Store

flake.nix

@@ -0,0 +1,38 @@
+{
+  description = "A very basic flake";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
+    flake-utils = {
+      url = "github:numtide/flake-utils";
+    };
+  };
+
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = import nixpkgs {
+          inherit system;
+        };
+      in {
+        devShells.default =
+          with pkgs;
+          mkShell {
+            nativeBuildInputs = with pkgs; [
+              pkg-config
+              zig
+              tcl
+              cmake
+              gnumake
+              clang
+              rustPlatform.bindgenHook
+              wasmtime
+            ];
+            buildInputs = with pkgs; [
+              icu.dev
+              zlib.dev
+            ];
+          };
+      }
+    );
+}

libsql-ffi/Cargo.toml

@@ -18,6 +18,7 @@ bindgen = "0.66.1"
 cc = "1.0"
 
 [features]
+zig-build = []
 session = []
 wasmtime-bindings = ["dep:libsql-wasmtime-bindings"]
 multiple-ciphers = []

libsql-ffi/build.rs

@@ -10,6 +10,53 @@ const BUNDLED_DIR: &str = "bundled";
 const SQLITE_DIR: &str = "../libsql-sqlite3";
 
 fn main() {
+    if cfg!(feature = "zig-build") && !cfg!(feature = "multiple-ciphers") {
+        println!("cargo:rerun-if-changed=../libsql-sqlite3/");
+
+        let out_dir_str = env::var("OUT_DIR").unwrap();
+        let out_dir = Path::new(out_dir_str.as_str());
+
+        Command::new("zig")
+            .arg("build")
+            .args([
+                "--build-file",
+                PathBuf::from("../libsql-sqlite3/build.zig")
+                    .canonicalize()
+                    .unwrap()
+                    .to_str()
+                    .unwrap(),
+            ])
+            .args([
+                "--cache-dir",
+                out_dir.join(".zig-cache").to_str().unwrap().as_ref(),
+            ])
+            .args(["--prefix", out_dir.to_str().unwrap().as_ref()])
+            .spawn()
+            .unwrap()
+            .wait()
+            .unwrap();
+
+        bindings::write_to_out_dir(
+            HeaderLocation::FromPath(
+                out_dir
+                    .join("include/sqlite3.h")
+                    .to_str()
+                    .unwrap()
+                    .to_string(),
+            ),
+            out_dir.join("bindgen.rs").as_path(),
+        );
+
+        println!("cargo:rerun-if-changed=../libsql-sqlite3/");
+        println!(
+            "cargo:rustc-link-search={}",
+            out_dir.join("lib/").to_str().unwrap()
+        );
+        println!("cargo:rustc-link-lib=static=sqlite3");
+
+        return;
+    }
+
     let target = env::var("TARGET").unwrap();
     let host = env::var("HOST").unwrap();
 

libsql-ffi/bundled/src/sqlite3.c

@@ -29,6 +29,7 @@
 **    configure
 **    configure.ac
 **    ext/fts5/fts5_tokenize.c
+**    ext/fts5/fts5_unicode2.c
 **    ext/jni/src/org/sqlite/jni/capi/CollationNeededCallback.java
 **    ext/jni/src/org/sqlite/jni/capi/CommitHookCallback.java
 **    ext/jni/src/org/sqlite/jni/capi/PreupdateHookCallback.java
@@ -538,11 +539,11 @@ extern "C" {
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
 ** [sqlite_version()] and [sqlite_source_id()].
 */
-#define SQLITE_VERSION        "3.45.1"
+#define SQLITE_VERSION "3.45.1"
 #define SQLITE_VERSION_NUMBER 3045001
-#define SQLITE_SOURCE_ID      "2024-01-30 16:01:20 e876e51a0ed5c5b3126f52e532044363a014bc594cfefa87ffb5b82257ccalt1"
+#define SQLITE_SOURCE_ID "2024-01-30 16:01:20 e876e51a0ed5c5b3126f52e532044363a014bc594cfefa87ffb5b82257ccalt1"
 
-#define LIBSQL_VERSION        "0.2.3"
+#define LIBSQL_VERSION "0.2.3"
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers
@@ -21616,6 +21617,10 @@ SQLITE_PRIVATE int sqlite3SafetyCheckSickOrOk(sqlite3*);
 SQLITE_PRIVATE void sqlite3ChangeCookie(Parse*, int);
 SQLITE_PRIVATE With *sqlite3WithDup(sqlite3 *db, With *p);
 
+/* libsql parse functions */
+void libsql_create_function(Parse *pParse, Token *pName, Token *pLang, Token *pBody, int isBlob, int noErr);
+void libsql_drop_function(Parse *pParse, Token *pName, int noErr);
+
 #if !defined(SQLITE_OMIT_VIEW) && !defined(SQLITE_OMIT_TRIGGER)
 SQLITE_PRIVATE void sqlite3MaterializeView(Parse*, Table*, Expr*, ExprList*,Expr*,int);
 #endif
@@ -116950,6 +116955,7 @@ SQLITE_PRIVATE int sqlite3NoTempsInRange(Parse *pParse, int iFirst, int iLast){
 ** that implements the ALTER TABLE command.
 */
 /* #include "sqliteInt.h" */
+/* #include "vdbeInt.h" */
 
 /*
 ** The code in this file only exists if we are not omitting the
@@ -261386,7 +261392,7 @@ static int sqlite3Fts5TokenizerInit(fts5_api *pApi){
 ** DO NOT EDIT THIS MACHINE GENERATED FILE.
 */
 
-
+/* #include "fts5Int.h" */
 /* #include <assert.h> */
 
 

libsql-ffi/bundled/src/sqlite3.h

@@ -149,11 +149,11 @@ extern "C" {
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
 ** [sqlite_version()] and [sqlite_source_id()].
 */
-#define SQLITE_VERSION        "3.45.1"
+#define SQLITE_VERSION "3.45.1"
 #define SQLITE_VERSION_NUMBER 3045001
-#define SQLITE_SOURCE_ID      "2024-01-30 16:01:20 e876e51a0ed5c5b3126f52e532044363a014bc594cfefa87ffb5b82257ccalt1"
+#define SQLITE_SOURCE_ID "2024-01-30 16:01:20 e876e51a0ed5c5b3126f52e532044363a014bc594cfefa87ffb5b82257ccalt1"
 
-#define LIBSQL_VERSION        "0.2.3"
+#define LIBSQL_VERSION "0.2.3"
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers

libsql-sqlite3/.gitignore

@@ -62,5 +62,10 @@ libsql
 /crates/target/
 /has_tclsh*
 /libsql.wasm
+zig-out/
+.zig-cache
+testdir*/
+testrunner.db
+testrunner.log
 test_libsql_f16_table.h
 test_libsql_f16