Prepare vendored sqlean to be published as a crate.

trailbaseio · Dec 30, 2024 · d43a5fa · d43a5fa
1 parent 7e43e3b
commit d43a5fa
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 17 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/trailbase-extension/Cargo.toml b/trailbase-extension/Cargo.toml
@@ -18,7 +18,6 @@ rand = "0.8.5"
 regex = "1.11.0"
 rusqlite = { workspace = true }
 serde_json = "1.0.121"
-# sqlite-loadable = { workspace = true }
 uuid = { version = "1.7.0", default-features = false, features = ["std", "v7"] }
 validator = "0.19.0"
 

diff --git a/trailbase-sqlite/Cargo.toml b/trailbase-sqlite/Cargo.toml
@@ -15,7 +15,7 @@ schemars = "0.8.21"
 serde = { version = "^1.0.203", features = ["derive"] }
 serde_json = "1.0.122"
 serde_rusqlite = "0.36.0"
-sqlean = { path = "../vendor/sqlean" }
+trailbase-sqlean = { path = "../vendor/sqlean" }
 sqlite-vec = "0.1.6"
 thiserror = "2.0.1"
 tokio = { version = "^1.38.0", features = ["macros", "rt-multi-thread", "fs", "sync"] }

diff --git a/trailbase-sqlite/src/extension.rs b/trailbase-sqlite/src/extension.rs
@@ -15,7 +15,7 @@ extern "C" fn init_trailbase_extensions(
 
   // Init sqlean's stored procedures: "define", see:
   //   https://github.com/nalgeon/sqlean/blob/main/docs/define.md
-  let status = unsafe { sqlean::define_init(db as *mut sqlean::sqlite3) };
+  let status = unsafe { trailbase_sqlean::define_init(db as *mut trailbase_sqlean::sqlite3) };
   if status != 0 {
     log::error!("Failed to load sqlean::define",);
     return status;

diff --git a/vendor/sqlean/Cargo.toml b/vendor/sqlean/Cargo.toml
@@ -1,10 +1,18 @@
 [package]
-name = "sqlean"
+name = "trailbase-sqlean"
 version = "0.0.1"
 edition = "2021"
+license = "MIT"
+homepage = "https://trailbase.io"
+repository = "https://github.com/trailbaseio/trailbase"
+readme = "README.md"
+
+[badges]
+appveyor = { repository = "trailbaseio/trailbase" }
+maintenance = { status = "actively-developed" }
 
 [dependencies]
-libsqlite3-sys = "0.30.1"
+libsqlite3-sys = { version = "0.30.1", features = ["bundled"] }
 
 [build-dependencies]
 bindgen = "0.71.0"

diff --git a/vendor/sqlean/LICENSE b/vendor/sqlean/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024+ Sebastian Jeltsch
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/vendor/sqlean/README.md b/vendor/sqlean/README.md
@@ -0,0 +1,8 @@
+# TrailBase Sqlean
+
+A build wrapper around the wonderful
+[sqlean](https://github.com/nalgeon/sqlean) SQLite extensions.
+
+NOTE: This crates is not intended for general use, at least for now. It
+currently only builds a subset of sqlean's "define" feature to be used in
+[TrailBase](https://trailbase.io).
diff --git a/vendor/sqlean/build.rs b/vendor/sqlean/build.rs
@@ -55,7 +55,8 @@ fn build_object() {
     // Disable SQLEAN's define-eval feature
     .flag("-DDISABLE_DEFINE_EVAL");
 
-  let sqlite3_include_dir = env::var("DEP_SQLITE3_INCLUDE").expect("Set by libsqlite3-sys");
+  let sqlite3_include_dir =
+    env::var("DEP_SQLITE3_INCLUDE").expect("$DEP_SQLITE3_INCLUDE should be set by libsqlite3-sys");
 
   cfg
     .warnings(false)