Skip to content

[draft] fix: allow use as library dependency without git submodules #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zyrakq wants to merge 2 commits into from
+18 −22
Closed

[draft] fix: allow use as library dependency without git submodules #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f661588
Replace serde_rusqlite git dep with crates.io
zyrakq Jun 10, 2026
ce84cee
Remove vendor/serde_rusqlite submodule
zyrakq Jun 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
19 changes: 4 additions & 15 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 14 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

@ignatz ignatz Jun 12, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(No action required)

serde_rusqlite is a well-maintained crate. I merely vendored it in the past since sometimes it would take a few weeks before rusqlite updates propagate. On the flip-side my vendored version has become stale, so thank you for pointing it back at upstream.

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 }
Expand All @@ -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" }
Expand All @@ -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" }
1 change: 0 additions & 1 deletion vendor/serde_rusqlite
Open in desktop
Submodule serde_rusqlite deleted from ec15ec
Loading