From f6615887c01876c32a9caed10e6239f77f58ffbc Mon Sep 17 00:00:00 2001
From: Zyrakq <serg.shehov@tutanota.com>
Date: Wed, 10 Jun 2026 08:48:27 +0000
Subject: [PATCH 1/2] Replace serde_rusqlite git dep with crates.io

Replaced ignatz/serde_rusqlite git dependency with
crates.io v0.43.0
Reverted sqlite-vec and pgrow2serde to branch refs
instead of pinned commits

Allow consuming trailbase as a path dep from external
workspaces without workspace context
The ignatz fork uses workspace = true for rusqlite which
makes it unusable as a standalone dependency; crates.io
0.43.0 provides explicit rusqlite ^0.40 and works
standalone
---
 Cargo.lock | 19 ++++---------------
 Cargo.toml | 17 ++++++++++++++---
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2113d102..e0c0af6e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6779,16 +6779,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "serde_bytes"
-version = "0.11.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5d440709e79d88e51ac01c4b72fc6cb7314017bb7da9eeff678aa94c10e3ea8"
-dependencies = [
- "serde",
- "serde_core",
-]
-
 [[package]]
 name = "serde_core"
 version = "1.0.228"
@@ -6869,12 +6859,12 @@ dependencies = [
 
 [[package]]
 name = "serde_rusqlite"
-version = "0.38.0"
+version = "0.43.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44f51ff08953caf83bbd0d9be7ee58d41f1d1adc19a2e84c43f83ca50258571e"
 dependencies = [
  "rusqlite",
- "serde",
- "serde_bytes",
- "serde_derive",
+ "serde_core",
 ]
 
 [[package]]
@@ -7147,7 +7137,6 @@ name = "sqlite-vec"
 version = "0.1.10-alpha.4"
 dependencies = [
  "cc",
- "rusqlite",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 8f56c145..5220039d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -71,8 +71,8 @@ rust-embed = { version = "8.4.0", default-features = false, features = ["mime-gu
 serde = { version = "^1.0.203", features = ["derive", "rc"] }
 serde_json = { version = "^1.0.117" }
 serde_qs = { version = "1.0.0", default-features = false, features = [] }
-serde_rusqlite = { path = "vendor/serde_rusqlite" }
-sqlite-vec = { path = "vendor/sqlite-vec/bindings/rust", default-features = false }
+serde_rusqlite = "0.43.0"
+sqlite-vec = { git = "https://github.com/ignatz/sqlite-vec", rev = "main", default-features = false }
 sqlite3-parser = "0.16.0"
 tokio = { version = "^1.38.0", default-features = false, features = ["fs", "io-std", "macros", "net", "rt-multi-thread", "signal", "sync", "time"] }
 tokio-rustls = { version = "0.26.1", default-features = false }
@@ -84,7 +84,7 @@ trailbase-build = { path = "crates/build", version = "0.1.1" }
 trailbase-client = { path = "crates/client", version = "0.8.0" }
 trailbase-extension = { path = "crates/extension", version = "0.3.0" }
 trailbase-pg-schema = { path = "crates/pg-schema", version = "0.0.1" }
-trailbase-pgrow2serde = { path = "vendor/pgrow2serde" }
+trailbase-pgrow2serde = { git = "https://github.com/ignatz/pgrow2serde", rev = "main" }
 trailbase-qs = { path = "crates/qs", version = "0.1.0" }
 trailbase-reactive = { path = "crates/reactive", version = "0.1.0" }
 trailbase-refinery = { path = "crates/refinery", version = "0.1.0" }
@@ -101,3 +101,14 @@ wasmtime = { version = "45.0.0", features = ["winch"] }
 wasmtime-wasi = { version = "45.0.0", default-features = false, features = [] }
 wasmtime-wasi-http = { version = "45.0.0", features = [] }
 wasmtime-wasi-io = { version = "45.0.0", features = [] }
+
+# When building TrailBase as a standalone workspace, use local submodule paths.
+# These [patch] sections are ignored when TrailBase is consumed as a dependency
+# by an external workspace (e.g. via git subtree without submodules populated),
+# which falls back to the git sources declared above.
+
+[patch."https://github.com/ignatz/sqlite-vec"]
+sqlite-vec = { path = "vendor/sqlite-vec/bindings/rust" }
+
+[patch."https://github.com/ignatz/pgrow2serde"]
+trailbase-pgrow2serde = { path = "vendor/pgrow2serde" }
\ No newline at end of file

From ce84cee439f3b5526810f462822e2f7e8a4c8b2d Mon Sep 17 00:00:00 2001
From: Zyrakq <serg.shehov@tutanota.com>
Date: Wed, 10 Jun 2026 09:15:45 +0000
Subject: [PATCH 2/2] Remove vendor/serde_rusqlite submodule

---
 .gitmodules           | 3 ---
 vendor/serde_rusqlite | 1 -
 2 files changed, 4 deletions(-)
 delete mode 160000 vendor/serde_rusqlite

diff --git a/.gitmodules b/.gitmodules
index a7744107..526f91ba 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "vendor/sqlite-vec"]
 	path = vendor/sqlite-vec
 	url = https://github.com/ignatz/sqlite-vec.git
-[submodule "vendor/serde_rusqlite"]
-	path = vendor/serde_rusqlite
-	url = https://github.com/ignatz/serde_rusqlite.git
 [submodule "vendor/pgrow2serde"]
 	path = vendor/pgrow2serde
 	url = https://github.com/ignatz/pgrow2serde.git
diff --git a/vendor/serde_rusqlite b/vendor/serde_rusqlite
deleted file mode 160000
index ec15ec4f..00000000
--- a/vendor/serde_rusqlite
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ec15ec4f4bef473c604862e17a571be90b799c56