commit 5b49fe455e9e87ba6e7ddac140a860e12b3e4a7d
parent 84301e0eca8b92cd2a8d6acea447a146db9bde32
Author: triesap <tyson@radroots.org>
Date: Wed, 15 Jul 2026 02:11:31 +0000
sqlite: align SDK bundled runtime
- update SDK SQLx usage to 0.9 with sqlite-bundled features
- patch libsqlite3-sys to the shared SQLite 3.53.3 source crate
- make private-store query helpers satisfy SQLx 0.9 safe SQL bounds
- refresh the SDK lockfile against the new runtime dependency floor
Diffstat:
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/crates/sdk/Cargo.toml b/crates/sdk/Cargo.toml
@@ -163,7 +163,7 @@ serde_json = { workspace = true, optional = true, default-features = false, feat
sha2 = { workspace = true, optional = true }
sqlx = { workspace = true, optional = true, default-features = false, features = [
"runtime-tokio",
- "sqlite",
+ "sqlite-bundled",
] }
tokio = { workspace = true, optional = true, features = ["macros", "rt", "sync", "time"] }
uuid = { workspace = true, optional = true }
diff --git a/crates/sdk/src/private_store.rs b/crates/sdk/src/private_store.rs
@@ -272,7 +272,7 @@ async fn ensure_farm_location_label_column(pool: &SqlitePool) -> Result<(), Radr
Ok(())
}
-async fn query_i64(pool: &SqlitePool, sql: &str) -> Result<i64, RadrootsSdkError> {
+async fn query_i64(pool: &SqlitePool, sql: &'static str) -> Result<i64, RadrootsSdkError> {
let row = sqlx::query(sql)
.fetch_one(pool)
.await
@@ -280,7 +280,7 @@ async fn query_i64(pool: &SqlitePool, sql: &str) -> Result<i64, RadrootsSdkError
row.try_get(0).map_err(private_store_error)
}
-async fn query_string(pool: &SqlitePool, sql: &str) -> Result<String, RadrootsSdkError> {
+async fn query_string(pool: &SqlitePool, sql: &'static str) -> Result<String, RadrootsSdkError> {
let row = sqlx::query(sql)
.fetch_one(pool)
.await
diff --git a/crates/sdk/tests/unit/private_store_tests.rs b/crates/sdk/tests/unit/private_store_tests.rs
@@ -72,7 +72,7 @@ async fn private_farm_location_row_decode_reports_each_missing_column() {
.collect::<Vec<_>>()
.join(", ");
let sql = format!("SELECT {select}");
- let row = sqlx::query(sql.as_str())
+ let row = sqlx::query(sqlx::AssertSqlSafe(sql))
.fetch_one(store.pool())
.await
.expect("row");