rust/sqlight
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump sqlite-wasm-rs to 0.4.4

Browse Source
This commit is contained in:
Spxg
2025-09-24 23:55:30 +08:00
parent 9cf27bf27a
commit 4f86a2f647
3 changed files with 26 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
Cargo.lock generated
View File

@@ -856,9 +856,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
[[package]] [[package]]
name = "js-sys" name = "js-sys"
version = "0.3.77" version = "0.3.81"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305"
dependencies = [ dependencies = [
"once_cell", "once_cell",
"wasm-bindgen", "wasm-bindgen",
@@ -1717,7 +1717,6 @@ dependencies = [
"sqlite-wasm-rs", "sqlite-wasm-rs",
"thiserror 2.0.12", "thiserror 2.0.12",
"tokio", "tokio",
"wasm-array-cp",
"wasm-bindgen", "wasm-bindgen",
"wasm-bindgen-futures", "wasm-bindgen-futures",
"web-sys", "web-sys",
@@ -1725,18 +1724,15 @@ dependencies = [
[[package]] [[package]]
name = "sqlite-wasm-rs" name = "sqlite-wasm-rs"
version = "0.4.3" version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0894a1b91dc660fbf1e6ea6f287562708e01ca1a18fa4e2c6dae0df5a05199c5" checksum = "1fc56823ea86c9f3d241c1c47491572f59fcc2bca18213112b3bfe6cac531d85"
dependencies = [ dependencies = [
"cc", "cc",
"fragile",
"js-sys", "js-sys",
"once_cell", "once_cell",
"parking_lot",
"thiserror 2.0.12", "thiserror 2.0.12",
"tokio", "tokio",
"wasm-array-cp",
"wasm-bindgen", "wasm-bindgen",
"wasm-bindgen-futures", "wasm-bindgen-futures",
"web-sys", "web-sys",
@@ -2048,33 +2044,24 @@ dependencies = [
"wit-bindgen-rt", "wit-bindgen-rt",
] ]
[[package]]
name = "wasm-array-cp"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb633b3e235f0ebe0a35162adc1e0293fc4b7e3f3a6fc7b5374d80464267ff84"
dependencies = [
"js-sys",
"wasm-bindgen",
]
[[package]] [[package]]
name = "wasm-bindgen" name = "wasm-bindgen"
version = "0.2.100" version = "0.2.104"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"once_cell", "once_cell",
"rustversion", "rustversion",
"wasm-bindgen-macro", "wasm-bindgen-macro",
"wasm-bindgen-shared",
] ]
[[package]] [[package]]
name = "wasm-bindgen-backend" name = "wasm-bindgen-backend"
version = "0.2.100" version = "0.2.104"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19"
dependencies = [ dependencies = [
"bumpalo", "bumpalo",
"log", "log",
@@ -2086,9 +2073,9 @@ dependencies = [
[[package]] [[package]]
name = "wasm-bindgen-futures" name = "wasm-bindgen-futures"
version = "0.4.50" version = "0.4.54"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" checksum = "7e038d41e478cc73bae0ff9b36c60cff1c98b8f38f8d7e8061e79ee63608ac5c"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"js-sys", "js-sys",
@@ -2099,9 +2086,9 @@ dependencies = [
[[package]] [[package]]
name = "wasm-bindgen-macro" name = "wasm-bindgen-macro"
version = "0.2.100" version = "0.2.104"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119"
dependencies = [ dependencies = [
"quote", "quote",
"wasm-bindgen-macro-support", "wasm-bindgen-macro-support",
@@ -2109,9 +2096,9 @@ dependencies = [
[[package]] [[package]]
name = "wasm-bindgen-macro-support" name = "wasm-bindgen-macro-support"
version = "0.2.100" version = "0.2.104"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@@ -2122,9 +2109,9 @@ dependencies = [
[[package]] [[package]]
name = "wasm-bindgen-shared" name = "wasm-bindgen-shared"
version = "0.2.100" version = "0.2.104"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1"
dependencies = [ dependencies = [
"unicode-ident", "unicode-ident",
] ]
@@ -2144,9 +2131,9 @@ dependencies = [
[[package]] [[package]]
name = "web-sys" name = "web-sys"
version = "0.3.77" version = "0.3.81"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" checksum = "9367c417a924a74cae129e6a2ae3b47fabb1f8995595ab474029da749a8be120"
dependencies = [ dependencies = [
"js-sys", "js-sys",
"wasm-bindgen", "wasm-bindgen",

9
Cargo.toml
View File

@@ -18,7 +18,7 @@ aceditor = { path = "crates/aceditor" }
split-grid = { path = "crates/split-grid" } split-grid = { path = "crates/split-grid" }
floating-ui = { path = "crates/floating-ui" } floating-ui = { path = "crates/floating-ui" }
sqlite-wasm-rs = { version = "0.4.3", default-features = false, optional = true } sqlite-wasm-rs = { version = "0.4.4", default-features = false, optional = true }
console_error_panic_hook = "0.1.7" console_error_panic_hook = "0.1.7"
leptos = { version = "0.8.2", features = ["csr"] } leptos = { version = "0.8.2", features = ["csr"] }
reactive_stores = "0.2.2" reactive_stores = "0.2.2"
@@ -30,16 +30,15 @@ serde-wasm-bindgen = "0.6.5"
parking_lot = "0.12.3" parking_lot = "0.12.3"
once_cell = "1.21.3" once_cell = "1.21.3"
tokio = { version = "1.45.0", features = ["sync"] } tokio = { version = "1.45.0", features = ["sync"] }
wasm-bindgen = "0.2.100" wasm-bindgen = "0.2.104"
js-sys = "0.3.77" js-sys = "0.3.81"
wasm-bindgen-futures = "0.4.50" wasm-bindgen-futures = "0.4.54"
console_log = "1.0.0" console_log = "1.0.0"
log = "0.4.27" log = "0.4.27"
fragile = "2.0.1" fragile = "2.0.1"
hex = "0.4.3" hex = "0.4.3"
prettytable-rs = "0.10.0" prettytable-rs = "0.10.0"
sqlformat = "0.3.5" sqlformat = "0.3.5"
wasm-array-cp = "0.1.1"
[features] [features]
default = ["sqlite3"] default = ["sqlite3"]

6
src/worker/mod.rs
View File

@@ -4,6 +4,7 @@ use crate::{
DownloadDbResponse, LoadDbOptions, OpenOptions, RunOptions, SQLiteRunResult, WorkerError, DownloadDbResponse, LoadDbOptions, OpenOptions, RunOptions, SQLiteRunResult, WorkerError,
WorkerRequest, WorkerResponse, WorkerRequest, WorkerResponse,
}; };
use js_sys::Uint8Array;
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use sqlite_wasm_rs::{ use sqlite_wasm_rs::{
mem_vfs::MemVfsUtil, mem_vfs::MemVfsUtil,
@@ -14,7 +15,6 @@ use std::sync::Arc;
use tokio::sync::Mutex; use tokio::sync::Mutex;
use tokio::sync::OnceCell; use tokio::sync::OnceCell;
use tokio::sync::mpsc::UnboundedReceiver; use tokio::sync::mpsc::UnboundedReceiver;
use wasm_array_cp::ArrayBufferCopy;
use wasm_bindgen::{JsCast, JsValue, prelude::Closure}; use wasm_bindgen::{JsCast, JsValue, prelude::Closure};
use wasm_bindgen_futures::spawn_local; use wasm_bindgen_futures::spawn_local;
use web_sys::{DedicatedWorkerGlobalScope, MessageEvent}; use web_sys::{DedicatedWorkerGlobalScope, MessageEvent};
@@ -109,14 +109,14 @@ async fn download_db() -> Result<DownloadDbResponse> {
}; };
Ok(DownloadDbResponse { Ok(DownloadDbResponse {
filename: worker.open_options.filename.clone(), filename: worker.open_options.filename.clone(),
data: ArrayBufferCopy::from_slice(&db), data: Uint8Array::new_from_slice(&db),
}) })
}) })
.await .await
} }
async fn load_db(options: LoadDbOptions) -> Result<()> { async fn load_db(options: LoadDbOptions) -> Result<()> {
let db = ArrayBufferCopy::to_vec(&options.data); let db = options.data.to_vec();
#[cfg(feature = "sqlite3")] #[cfg(feature = "sqlite3")]
let page_size = sqlite_wasm_rs::utils::check_import_db(&db) let page_size = sqlite_wasm_rs::utils::check_import_db(&db)