Update rusqlite to v0.35, which has more strict query validation \o/. Also update other Rust and JS deps.

This commit is contained in:
Sebastian Jeltsch
2025-05-03 11:42:59 +02:00
parent 122dd1ebb0
commit c4a4dfd575
20 changed files with 1198 additions and 1215 deletions

3
.gitmodules vendored
View File

@@ -4,3 +4,6 @@
[submodule "vendor/sqlean/bundled/sqlean"]
path = vendor/sqlean/bundled/sqlean
url = https://github.com/trailbaseio/sqlean
[submodule "vendor/serde_rusqlite"]
path = vendor/serde_rusqlite
url = https://github.com/trailbaseio/serde_rusqlite.git

276
Cargo.lock generated
View File

@@ -284,7 +284,7 @@ dependencies = [
"rustc-hash 2.1.1",
"serde",
"serde_derive",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -296,7 +296,7 @@ dependencies = [
"memchr",
"serde",
"serde_derive",
"winnow 0.7.7",
"winnow 0.7.9",
]
[[package]]
@@ -318,7 +318,7 @@ dependencies = [
"proc-macro2",
"quote",
"swc_macros_common",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -360,14 +360,15 @@ dependencies = [
[[package]]
name = "async-executor"
version = "1.13.1"
version = "1.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec"
checksum = "bb812ffb58524bdd10860d7d974e2f01cc0950c2438a74ee5ec2e2280c6c4ffa"
dependencies = [
"async-task",
"concurrent-queue",
"fastrand",
"futures-lite",
"pin-project-lite",
"slab",
]
@@ -499,7 +500,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -516,7 +517,7 @@ checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -566,9 +567,9 @@ dependencies = [
[[package]]
name = "axum"
version = "0.8.3"
version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de45108900e1f9b9242f7f2e254aa3e2c029c921c258fe9e6b4217eeebd54288"
checksum = "021e862c184ae977658b36c4500f7feac3221ca5da43e3f25bd04ab6c79a29b5"
dependencies = [
"axum-core 0.5.2",
"bytes",
@@ -605,7 +606,7 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dff8ee1869817523c8f91c20bf17fd932707f66c2e7e0b0f811b29a227289562"
dependencies = [
"axum 0.8.3",
"axum 0.8.4",
"forwarded-header-value",
"serde",
]
@@ -656,7 +657,7 @@ version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45bf463831f5131b7d3c756525b305d40f1185b688565648a92e1392ca35713d"
dependencies = [
"axum 0.8.3",
"axum 0.8.4",
"axum-core 0.5.2",
"bytes",
"futures-util",
@@ -682,7 +683,7 @@ dependencies = [
"anyhow",
"assert-json-diff",
"auto-future",
"axum 0.8.3",
"axum 0.8.4",
"bytes",
"bytesize",
"cookie",
@@ -823,7 +824,7 @@ dependencies = [
"regex",
"rustc-hash 1.1.0",
"shlex",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -843,7 +844,7 @@ dependencies = [
"regex",
"rustc-hash 2.1.1",
"shlex",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -947,7 +948,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17d4f95e880cfd28c4ca5a006cf7f6af52b4bcb7b5866f573b2faa126fb7affb"
dependencies = [
"quote",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -1024,9 +1025,9 @@ dependencies = [
[[package]]
name = "cc"
version = "1.2.20"
version = "1.2.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04da6a0d40b948dfc4fa8f5bbf402b0fc1a64a28dbf7d12ffd683550f2c1b63a"
checksum = "8691782945451c1c383942c4874dbe63814f61cb57ef773cda2972682b7bb3c0"
dependencies = [
"shlex",
]
@@ -1065,9 +1066,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
[[package]]
name = "chrono"
version = "0.4.40"
version = "0.4.41"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c"
checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
dependencies = [
"android-tzdata",
"iana-time-zone",
@@ -1167,7 +1168,7 @@ dependencies = [
"heck 0.5.0",
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -1412,14 +1413,14 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
name = "custom-binary"
version = "0.1.0"
dependencies = [
"axum 0.8.3",
"axum 0.8.4",
"env_logger",
"tokio",
"trailbase",
@@ -1473,7 +1474,7 @@ dependencies = [
"once_cell",
"percent-encoding",
"serde",
"sourcemap 9.1.2",
"sourcemap 9.2.0",
"swc_atoms",
"swc_common",
"swc_config",
@@ -1728,7 +1729,7 @@ dependencies = [
"stringcase",
"strum",
"strum_macros",
"syn 2.0.100",
"syn 2.0.101",
"thiserror 1.0.69",
]
@@ -1903,7 +1904,7 @@ checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -1932,7 +1933,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -1955,7 +1956,7 @@ checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -2100,7 +2101,7 @@ dependencies = [
"heck 0.5.0",
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -2227,7 +2228,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ce92ff622d6dadf7349484f42c93271a0d49b7cc4d466a936405bacbe10aa78"
dependencies = [
"cfg-if",
"rustix 1.0.5",
"rustix 1.0.7",
"windows-sys 0.59.0",
]
@@ -2362,7 +2363,7 @@ checksum = "32016f1242eb82af5474752d00fd8ebcd9004bd69b462b1c91de833972d08ed4"
dependencies = [
"proc-macro2",
"swc_macros_common",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -2461,7 +2462,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -2639,9 +2640,9 @@ dependencies = [
[[package]]
name = "hashbrown"
version = "0.15.2"
version = "0.15.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3"
dependencies = [
"foldhash",
]
@@ -2652,7 +2653,7 @@ version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
dependencies = [
"hashbrown 0.15.2",
"hashbrown 0.15.3",
]
[[package]]
@@ -2765,17 +2766,6 @@ dependencies = [
"windows-sys 0.59.0",
]
[[package]]
name = "hostname"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a56f203cd1c76362b69e3863fd987520ac36cf70a8c92627449b2f64a8cf7d65"
dependencies = [
"cfg-if",
"libc",
"windows-link",
]
[[package]]
name = "hstr"
version = "0.2.17"
@@ -3076,7 +3066,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -3123,7 +3113,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
dependencies = [
"equivalent",
"hashbrown 0.15.2",
"hashbrown 0.15.3",
"serde",
]
@@ -3185,7 +3175,7 @@ dependencies = [
"heck 0.5.0",
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -3240,9 +3230,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
[[package]]
name = "jiff"
version = "0.2.10"
version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a064218214dc6a10fbae5ec5fa888d80c45d611aba169222fc272072bf7aef6"
checksum = "27e77966151130221b079bcec80f1f34a9e414fa489d99152a201c07fd2182bc"
dependencies = [
"jiff-static",
"log",
@@ -3253,13 +3243,13 @@ dependencies = [
[[package]]
name = "jiff-static"
version = "0.2.10"
version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "199b7932d97e325aff3a7030e141eafe7f2c6268e1d1b24859b753a627f45254"
checksum = "97265751f8a9a4228476f2fc17874a9e7e70e96b893368e42619880fe143b48a"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -3425,9 +3415,9 @@ dependencies = [
[[package]]
name = "libsqlite3-sys"
version = "0.32.0"
version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fbb8270bb4060bd76c6e96f20c52d80620f1d82a3470885694e41e0f81ef6fe7"
checksum = "947e6816f7825b2b45027c2c32e7085da9934defa535de4a6a46b10a4d5257fa"
dependencies = [
"bindgen 0.71.1",
"cc",
@@ -3500,7 +3490,7 @@ dependencies = [
"quote",
"regex-syntax",
"rustc_version 0.4.1",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -3977,7 +3967,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -3988,9 +3978,9 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
[[package]]
name = "openssl-sys"
version = "0.9.107"
version = "0.9.108"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8288979acd84749c744a9014b4382d42b8f7b2592847b5afb2ed29e5d16ede07"
checksum = "e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847"
dependencies = [
"cc",
"libc",
@@ -4271,7 +4261,7 @@ dependencies = [
"phf_shared",
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -4301,7 +4291,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -4436,7 +4426,7 @@ version = "0.2.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
dependencies = [
"zerocopy 0.8.24",
"zerocopy 0.8.25",
]
[[package]]
@@ -4456,7 +4446,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "664ec5419c51e34154eec046ebcba56312d5a2fc3b09a06da188e1ad21afadf6"
dependencies = [
"proc-macro2",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -4476,7 +4466,7 @@ checksum = "07c277e4e643ef00c1233393c673f655e3672cf7eb3ba08a00bdd0ea59139b5f"
dependencies = [
"proc-macro-rules-macros",
"proc-macro2",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -4488,7 +4478,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -4526,7 +4516,7 @@ dependencies = [
"prost",
"prost-types",
"regex",
"syn 2.0.100",
"syn 2.0.101",
"tempfile",
]
@@ -4540,7 +4530,7 @@ dependencies = [
"itertools 0.14.0",
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -4573,7 +4563,7 @@ checksum = "ab076798900edeaf1499ed1c30097db86e6697c5d02660a63d72fe4ebdcfefd2"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -4587,9 +4577,9 @@ dependencies = [
[[package]]
name = "psm"
version = "0.1.25"
version = "0.1.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f58e5423e24c18cc840e1c98370b3993c6649cd1678b4d24318bcf0a083cbe88"
checksum = "6e944464ec8536cd1beb0bbfd96987eb5e3b72f2ecdafdc5c769a37f1fa2ae1f"
dependencies = [
"cc",
]
@@ -4616,9 +4606,9 @@ dependencies = [
[[package]]
name = "quick-xml"
version = "0.37.4"
version = "0.37.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4ce8c88de324ff838700f36fb6ab86c96df0e3c4ab6ef3a9b2044465cce1369"
checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb"
dependencies = [
"memchr",
"serde",
@@ -4666,9 +4656,9 @@ dependencies = [
[[package]]
name = "quinn-udp"
version = "0.5.11"
version = "0.5.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "541d0f57c6ec747a90738a52741d3221f7960e8ac2f0ff4b1a63680e033b4ab5"
checksum = "ee4e529991f949c5e25755532370b8af5d114acae52326361d68d47af64aa842"
dependencies = [
"cfg_aliases",
"libc",
@@ -4844,7 +4834,7 @@ checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -4953,12 +4943,9 @@ dependencies = [
[[package]]
name = "resolv-conf"
version = "0.7.1"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "48375394603e3dd4b2d64371f7148fd8c7baa2680e28741f2cb8d23b59e3d4c4"
dependencies = [
"hostname",
]
checksum = "fc7c8f7f733062b66dc1c63f9db168ac0b97a9210e247fa90fdc9ad08f51b302"
[[package]]
name = "rfc6979"
@@ -5006,9 +4993,9 @@ dependencies = [
[[package]]
name = "rusqlite"
version = "0.34.0"
version = "0.35.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37e34486da88d8e051c7c0e23c3f15fd806ea8546260aa2fec247e97242ec143"
checksum = "a22715a5d6deef63c637207afbe68d0c72c3f8d0022d7cf9714c442d6157606b"
dependencies = [
"bitflags",
"fallible-iterator",
@@ -5038,7 +5025,7 @@ dependencies = [
"proc-macro2",
"quote",
"rust-embed-utils",
"syn 2.0.100",
"syn 2.0.101",
"walkdir",
]
@@ -5125,9 +5112,9 @@ dependencies = [
[[package]]
name = "rustix"
version = "1.0.5"
version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf"
checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
dependencies = [
"bitflags",
"errno",
@@ -5346,7 +5333,7 @@ dependencies = [
"proc-macro2",
"quote",
"serde_derive_internals",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -5458,7 +5445,7 @@ checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -5469,7 +5456,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -5498,11 +5485,11 @@ dependencies = [
[[package]]
name = "serde_rusqlite"
version = "0.38.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e77d42c863496aee3253704aa621691088f718cd8800bd50bcdc19f9bd2a8ea"
dependencies = [
"rusqlite",
"serde",
"serde_bytes",
"serde_derive",
]
[[package]]
@@ -5543,9 +5530,9 @@ dependencies = [
[[package]]
name = "sha2"
version = "0.10.8"
version = "0.10.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
dependencies = [
"cfg-if",
"cpufeatures",
@@ -5682,17 +5669,16 @@ dependencies = [
[[package]]
name = "sourcemap"
version = "9.1.2"
version = "9.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "27c4ea7042fd1a155ad95335b5d505ab00d5124ea0332a06c8390d200bb1a76a"
checksum = "dd430118acc9fdd838557649b9b43fd0a78e3834d84a283b466f8e84720d6101"
dependencies = [
"base64-simd 0.7.0",
"base64-simd 0.8.0",
"bitvec",
"data-encoding",
"debugid",
"if_chain",
"rustc-hash 1.1.0",
"rustc_version 0.2.3",
"rustc-hash 2.1.1",
"serde",
"serde_json",
"unicode-id-start",
@@ -5760,9 +5746,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
[[package]]
name = "stacker"
version = "0.1.20"
version = "0.1.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "601f9201feb9b09c00266478bf459952b9ef9a6b94edb2f21eba14ab681a60a9"
checksum = "cddb07e32ddb770749da91081d8d0ac3a16f1a569a18b20348cd371f5dead06b"
dependencies = [
"cc",
"cfg-if",
@@ -5786,7 +5772,7 @@ dependencies = [
"proc-macro2",
"quote",
"swc_macros_common",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -5820,7 +5806,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustversion",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -5885,7 +5871,7 @@ dependencies = [
"rustc-hash 1.1.0",
"serde",
"siphasher 0.3.11",
"sourcemap 9.1.2",
"sourcemap 9.2.0",
"swc_allocator",
"swc_atoms",
"swc_eq_ignore_macros",
@@ -5918,7 +5904,7 @@ dependencies = [
"proc-macro2",
"quote",
"swc_macros_common",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -5949,7 +5935,7 @@ dependencies = [
"num-bigint",
"once_cell",
"serde",
"sourcemap 9.1.2",
"sourcemap 9.2.0",
"swc_allocator",
"swc_atoms",
"swc_common",
@@ -5967,7 +5953,7 @@ dependencies = [
"proc-macro2",
"quote",
"swc_macros_common",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -6052,7 +6038,7 @@ dependencies = [
"proc-macro2",
"quote",
"swc_macros_common",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -6159,7 +6145,7 @@ checksum = "63db0adcff29d220c3d151c5b25c0eabe7e32dd936212b84cdaa1392e3130497"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -6170,7 +6156,7 @@ checksum = "f486687bfb7b5c560868f69ed2d458b880cebc9babebcb67e49f31b55c5bf847"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -6193,7 +6179,7 @@ dependencies = [
"proc-macro2",
"quote",
"swc_macros_common",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -6209,9 +6195,9 @@ dependencies = [
[[package]]
name = "syn"
version = "2.0.100"
version = "2.0.101"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
dependencies = [
"proc-macro2",
"quote",
@@ -6229,13 +6215,13 @@ dependencies = [
[[package]]
name = "synstructure"
version = "0.13.1"
version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -6280,7 +6266,7 @@ dependencies = [
"fastrand",
"getrandom 0.3.2",
"once_cell",
"rustix 1.0.5",
"rustix 1.0.7",
"windows-sys 0.59.0",
]
@@ -6328,7 +6314,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -6339,7 +6325,7 @@ checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -6444,7 +6430,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -6644,7 +6630,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -6702,7 +6688,7 @@ dependencies = [
"askama",
"async-channel 2.3.1",
"async-trait",
"axum 0.8.3",
"axum 0.8.4",
"axum-client-ip",
"axum-extra",
"axum-test",
@@ -6804,7 +6790,7 @@ name = "trailbase-assets"
version = "0.1.0"
dependencies = [
"askama",
"axum 0.8.3",
"axum 0.8.4",
"log",
"rust-embed",
"tower-service",
@@ -6825,7 +6811,7 @@ dependencies = [
name = "trailbase-cli"
version = "0.2.0"
dependencies = [
"axum 0.8.3",
"axum 0.8.4",
"chrono",
"clap",
"env_logger",
@@ -6924,7 +6910,7 @@ dependencies = [
"proc-macro2",
"quote",
"regex",
"syn 2.0.100",
"syn 2.0.101",
"trailbase-refinery-core",
]
@@ -7026,7 +7012,7 @@ checksum = "0e9d8656589772eeec2cf7a8264d9cda40fb28b9bc53118ceb9e8c07f8f38730"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
"termcolor",
]
@@ -7229,7 +7215,7 @@ dependencies = [
"proc-macro2",
"quote",
"regex",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -7238,7 +7224,7 @@ version = "9.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d29519b3c485df6b13f4478ac909a491387e9ef70204487c3b64b53749aec0be"
dependencies = [
"axum 0.8.3",
"axum 0.8.4",
"base64 0.22.1",
"mime_guess",
"regex",
@@ -7389,7 +7375,7 @@ dependencies = [
"log",
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
"wasm-bindgen-shared",
]
@@ -7424,7 +7410,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -7482,9 +7468,9 @@ dependencies = [
[[package]]
name = "webpki-roots"
version = "0.26.8"
version = "0.26.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2210b291f7ea53617fbafcc4939f10914214ec15aace5ba62293a668f322c5c9"
checksum = "37493cadf42a2a939ed404698ded7fb378bf301b5011f973361779a3a74f8c93"
dependencies = [
"rustls-pki-types",
]
@@ -7571,7 +7557,7 @@ checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -7582,7 +7568,7 @@ checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -7798,9 +7784,9 @@ dependencies = [
[[package]]
name = "winnow"
version = "0.7.7"
version = "0.7.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6cb8234a863ea0e8cd7284fcdd4f145233eb00fee02bbdd9861aec44e6477bc5"
checksum = "d9fb597c990f03753e08d3c29efbfcf2019a003b4bf4ba19225c158e1549f0f3"
dependencies = [
"memchr",
]
@@ -7898,7 +7884,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
"synstructure",
]
@@ -7913,11 +7899,11 @@ dependencies = [
[[package]]
name = "zerocopy"
version = "0.8.24"
version = "0.8.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879"
checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb"
dependencies = [
"zerocopy-derive 0.8.24",
"zerocopy-derive 0.8.25",
]
[[package]]
@@ -7928,18 +7914,18 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
name = "zerocopy-derive"
version = "0.8.24"
version = "0.8.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a996a8f63c5c4448cd959ac1bab0aaa3306ccfd060472f85943ee0750f0169be"
checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -7959,7 +7945,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
"synstructure",
]
@@ -7980,7 +7966,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]
@@ -8002,7 +7988,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
"syn 2.0.101",
]
[[package]]

View File

@@ -13,6 +13,7 @@ members = [
"trailbase-js",
"trailbase-schema",
"trailbase-sqlite",
"vendor/serde_rusqlite",
"vendor/sqlean",
]
default-members = [
@@ -61,9 +62,10 @@ opt-level = 1
askama = { version = "0.14.0", default-features = false, features = ["derive", "std", "config"] }
axum = { version = "^0.8.1", features = ["multipart"] }
env_logger = { version = "^0.11.8", default-features = false, features = ["auto-color", "humantime"] }
libsqlite3-sys = { version = "0.32.0", features = ["bundled"] }
rusqlite = { version = "0.34.0", default-features = false, features = ["bundled", "column_decltype", "load_extension", "modern_sqlite", "functions", "limits", "backup", "hooks", "preupdate_hook"] }
libsqlite3-sys = { version = "0.33.0", features = ["bundled"] }
rusqlite = { version = "0.35.0", default-features = false, features = ["bundled", "column_decltype", "load_extension", "modern_sqlite", "functions", "limits", "backup", "hooks", "preupdate_hook"] }
rust-embed = { version = "8.4.0", default-features = false, features = ["mime-guess"] }
serde_rusqlite = { path = "vendor/serde_rusqlite" }
tokio = { version = "^1.38.0", features = ["macros", "rt-multi-thread", "fs", "signal", "time", "sync"] }
tracing = { version = "0.1.40", default-features = false }
tracing-subscriber = { version = "0.3.18", default-features = false, features = ["smallvec", "std", "fmt", "json"] }

View File

@@ -8,11 +8,11 @@
},
"devDependencies": {
"@eslint/js": "^9.25.1",
"@types/node": "^22.15.2",
"@types/node": "^22.15.3",
"eslint": "^9.25.1",
"prettier": "^3.5.3",
"typescript": "^5.8.3",
"typescript-eslint": "^8.31.0",
"typescript-eslint": "^8.31.1",
"vitest": "^3.1.2"
},
"dependencies": {

View File

@@ -13,26 +13,26 @@
},
"dependencies": {
"@astrojs/check": "^0.9.4",
"@astrojs/starlight": "^0.34.1",
"@astrojs/starlight": "^0.34.2",
"@astrojs/starlight-tailwind": "^4.0.1",
"@iconify-json/tabler": "^1.2.17",
"@tailwindcss/vite": "^4.1.4",
"astro": "^5.7.5",
"@tailwindcss/vite": "^4.1.5",
"astro": "^5.7.10",
"astro-icon": "^1.1.5",
"chart.js": "^4.4.9",
"chartjs-chart-error-bars": "^4.4.4",
"chartjs-plugin-deferred": "^2.0.0",
"clsx": "^2.1.1",
"sharp": "^0.34.1",
"solid-js": "^1.9.5",
"solid-js": "^1.9.6",
"starlight-links-validator": "^0.16.0",
"tailwind-merge": "^3.2.0",
"tailwindcss": "^4.1.4",
"tailwindcss": "^4.1.5",
"typescript": "^5.8.3"
},
"devDependencies": {
"@astrojs/sitemap": "^3.3.1",
"@astrojs/solid-js": "^5.0.9",
"@astrojs/solid-js": "^5.0.10",
"@eslint/js": "^9.25.1",
"astro-robots-txt": "^1.0.0",
"eslint": "^9.25.1",
@@ -43,6 +43,6 @@
"prettier": "^3.5.3",
"prettier-plugin-astro": "^0.14.1",
"prettier-plugin-tailwindcss": "^0.6.11",
"typescript-eslint": "^8.31.0"
"typescript-eslint": "^8.31.1"
}
}

View File

@@ -16,15 +16,15 @@
"@astrojs/tailwind": "^5.1.5",
"@nanostores/persistent": "^1.0.0",
"@nanostores/solid": "^0.5.0",
"astro": "^5.7.5",
"astro": "^5.7.10",
"astro-icon": "^1.1.5",
"nanostores": "^1.0.1",
"solid-icons": "^1.1.0",
"solid-js": "^1.9.5",
"solid-js": "^1.9.6",
"trailbase": "^0.3.3"
},
"devDependencies": {
"@astrojs/solid-js": "^5.0.9",
"@astrojs/solid-js": "^5.0.10",
"@eslint/js": "^9.25.1",
"@iconify-json/tabler": "^1.2.17",
"@tailwindcss/typography": "^0.5.16",
@@ -36,9 +36,9 @@
"globals": "^16.0.0",
"prettier": "^3.5.3",
"prettier-plugin-astro": "^0.14.1",
"quicktype": "^23.0.175",
"quicktype": "^23.1.3",
"sharp": "^0.34.1",
"tailwindcss": "^3.4.17",
"typescript-eslint": "^8.31.0"
"typescript-eslint": "^8.31.1"
}
}

View File

@@ -17,7 +17,7 @@
"devDependencies": {
"@eslint/js": "^9.25.1",
"@types/react": "^19.1.2",
"@types/react-dom": "^19.1.2",
"@types/react-dom": "^19.1.3",
"@vitejs/plugin-react": "^4.4.1",
"eslint": "^9.25.1",
"eslint-plugin-react-hooks": "^5.2.0",
@@ -25,7 +25,7 @@
"globals": "^16.0.0",
"prettier": "^3.5.3",
"typescript": "^5.8.3",
"typescript-eslint": "^8.31.0",
"vite": "^6.3.3"
"typescript-eslint": "^8.31.1",
"vite": "^6.3.4"
}
}

View File

@@ -13,13 +13,13 @@
"check": "tsc --noEmit --skipLibCheck && eslint"
},
"dependencies": {
"solid-js": "^1.9.5",
"solid-js": "^1.9.6",
"trailbase": "workspace:*"
},
"devDependencies": {
"@eslint/js": "^9.25.1",
"@types/express": "^5.0.1",
"@types/node": "^22.15.2",
"@types/node": "^22.15.3",
"compression": "^1.8.0",
"cross-env": "^7.0.3",
"eslint": "^9.25.1",
@@ -28,8 +28,8 @@
"prettier": "^3.5.3",
"sirv": "^3.0.1",
"tailwindcss": "^3.4.17",
"typescript-eslint": "^8.31.0",
"vite": "^6.3.3",
"typescript-eslint": "^8.31.1",
"vite": "^6.3.4",
"vite-plugin-eslint": "^1.8.1",
"vite-plugin-solid": "^2.11.6"
}

View File

@@ -12,13 +12,13 @@
},
"devDependencies": {
"@eslint/js": "^9.25.1",
"@types/node": "^22.15.2",
"@types/node": "^22.15.3",
"eslint": "^9.25.1",
"prettier": "^3.5.3",
"quicktype": "^23.0.175",
"quicktype": "^23.1.3",
"ts-node": "^10.9.2",
"typescript": "^5.8.3",
"typescript-eslint": "^8.31.0"
"typescript-eslint": "^8.31.1"
},
"dependencies": {
"csv-parse": "^5.6.0",

2015
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@@ -17,16 +17,16 @@
"@codemirror/autocomplete": "^6.18.6",
"@codemirror/lang-sql": "^6.8.0",
"@codemirror/state": "^6.5.2",
"@codemirror/view": "^6.36.6",
"@codemirror/view": "^6.36.7",
"@corvu/resizable": "^0.2.4",
"@kobalte/core": "^0.13.9",
"@kobalte/utils": "^0.9.1",
"@nanostores/persistent": "^1.0.0",
"@nanostores/solid": "^0.5.0",
"@solid-primitives/memo": "^1.4.1",
"@solid-primitives/memo": "^1.4.2",
"@solidjs/router": "^0.15.3",
"@tanstack/solid-form": "^1.7.0",
"@tanstack/solid-query": "^5.74.4",
"@tanstack/solid-form": "^1.9.0",
"@tanstack/solid-query": "^5.75.0",
"@tanstack/solid-table": "^8.21.3",
"@tanstack/table-core": "^8.21.3",
"chart.js": "^4.4.9",
@@ -40,7 +40,7 @@
"nanostores": "^1.0.1",
"protobufjs": "^7.5.0",
"solid-icons": "^1.1.0",
"solid-js": "^1.9.5",
"solid-js": "^1.9.6",
"tailwind-merge": "^3.2.0",
"tailwindcss-animate": "^1.0.7",
"trailbase": "file:../client",
@@ -68,8 +68,8 @@
"tailwindcss": "^3.4.17",
"ts-proto": "^2.7.0",
"typescript": "^5.8.3",
"typescript-eslint": "^8.31.0",
"vite": "^6.3.3",
"typescript-eslint": "^8.31.1",
"vite": "^6.3.4",
"vite-plugin-solid": "^2.11.6",
"vite-tsconfig-paths": "^5.1.4",
"vitest": "^3.1.2"

View File

@@ -13,15 +13,15 @@
},
"dependencies": {
"@astrojs/check": "^0.9.4",
"@astrojs/solid-js": "^5.0.9",
"@astrojs/solid-js": "^5.0.10",
"@astrojs/tailwind": "^5.1.5",
"@kobalte/core": "^0.13.9",
"astro": "^5.7.5",
"astro": "^5.7.10",
"astro-icon": "^1.1.5",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"solid-icons": "^1.1.0",
"solid-js": "^1.9.5",
"solid-js": "^1.9.6",
"tailwind-merge": "^3.2.0",
"tailwindcss-animate": "^1.0.7",
"trailbase": "file:../client"
@@ -41,6 +41,6 @@
"sharp": "^0.34.1",
"tailwindcss": "^3.4.17",
"typescript": "^5.8.3",
"typescript-eslint": "^8.31.0"
"typescript-eslint": "^8.31.1"
}
}

View File

@@ -40,11 +40,11 @@
"globals": "^16.0.0",
"http-status": "^2.1.0",
"jsdom": "^26.1.0",
"oauth2-mock-server": "^7.2.0",
"oauth2-mock-server": "^7.2.1",
"prettier": "^3.5.3",
"tinybench": "^4.0.1",
"typescript": "^5.8.3",
"typescript-eslint": "^8.31.0",
"typescript-eslint": "^8.31.1",
"vite-node": "^3.1.2",
"vitest": "^3.1.2"
},

View File

@@ -140,7 +140,7 @@ pub async fn init_app_state(
.unwrap_or(0);
if num_admins == 0 {
let email = "admin@localhost".to_string();
let email = "admin@localhost";
let password = generate_random_string(20);
app_state
@@ -148,14 +148,13 @@ pub async fn init_app_state(
.execute(
format!(
r#"
INSERT INTO {USER_TABLE}
(email, password_hash, verified, admin)
VALUES
('{email}', (hash_password('{password}')), TRUE, TRUE);
INSERT INTO
"#
INSERT INTO {USER_TABLE}
(email, password_hash, verified, admin)
VALUES
(?1, (hash_password(?2)), TRUE, TRUE)
"#
),
(),
trailbase_sqlite::params!(email.to_string(), password.clone()),
)
.await?;

View File

@@ -222,18 +222,16 @@ mod tests {
// Just double checking that rusqlite's query and execute ignore everything but the first
// statement.
let name: String = conn
.query_row(
r#"
let result = conn.query_row(
r#"
SELECT name FROM 'table' WHERE id = 0;
SELECT name FROM 'table' WHERE id = 1;
DROP TABLE 'table';
"#,
(),
|row| row.get(0),
)
.unwrap();
assert_eq!(name, "Alice");
(),
|row| row.get::<_, String>(0),
);
assert!(matches!(result, Err(rusqlite::Error::MultipleStatement)));
let mut recorder = TransactionRecorder::new(&mut conn).unwrap();

View File

@@ -41,6 +41,7 @@ pub fn apply_default_pragmas(conn: &rusqlite::Connection) -> Result<(), rusqlite
// NOTE: we're querying here since some pragmas return data.
for pragma in CONFIG {
// TODO: Use conn.pragma_update instead.
let mut stmt = conn.prepare(pragma)?;
let mut rows = stmt.query([])?;
let _maybe_row = rows.next()?;

View File

@@ -16,8 +16,8 @@
"eslint": "^9.25.1",
"prettier": "^3.5.3",
"typescript": "^5.8.3",
"typescript-eslint": "^8.31.0",
"vite": "^6.3.3",
"typescript-eslint": "^8.31.1",
"vite": "^6.3.4",
"vite-plugin-dts": "^4.5.3",
"vitest": "^3.1.2"
}

View File

@@ -23,7 +23,7 @@ parking_lot = { version = "0.12.3", default-features = false }
rusqlite = { workspace = true }
serde = { version = "^1.0.203", features = ["derive"] }
serde_json = "1.0.122"
serde_rusqlite = "0.38.0"
serde_rusqlite = { workspace = true }
thiserror = "2.0.1"
tokio = { workspace = true }

1
vendor/serde_rusqlite vendored Submodule

Submodule vendor/serde_rusqlite added at f58fa84281

View File

@@ -13,7 +13,7 @@ appveyor = { repository = "trailbaseio/trailbase" }
maintenance = { status = "actively-developed" }
[dependencies]
libsqlite3-sys = { version = "0.32.0", features = ["bundled"] }
libsqlite3-sys = { workspace = true }
[build-dependencies]
bindgen = "0.71.0"