From 75ec650f080ac66e98d8b848118dc2349ca70aa8 Mon Sep 17 00:00:00 2001 From: Igor Zinkovsky Date: Tue, 28 Nov 2023 21:04:07 -0800 Subject: chore(ext/kv): update denokv crates (#21357) --- ext/kv/sqlite.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'ext') diff --git a/ext/kv/sqlite.rs b/ext/kv/sqlite.rs index b4e251f96..2e7b97126 100644 --- a/ext/kv/sqlite.rs +++ b/ext/kv/sqlite.rs @@ -18,7 +18,7 @@ use deno_core::error::AnyError; use deno_core::unsync::spawn_blocking; use deno_core::OpState; use deno_node::PathClean; -pub use denokv_sqlite::TypeError; +pub use denokv_sqlite::SqliteBackendError; use rand::RngCore; use rand::SeedableRng; use rusqlite::OpenFlags; @@ -95,14 +95,16 @@ impl DatabaseHandler for SqliteDbHandler

{ (Some(path), _) => { let flags = OpenFlags::default().difference(OpenFlags::SQLITE_OPEN_URI); - let resolved_path = canonicalize_path(&PathBuf::from(path))?; + let resolved_path = canonicalize_path(&PathBuf::from(path)) + .map_err(|_| SqliteBackendError::DatabaseClosed)?; ( rusqlite::Connection::open_with_flags(path, flags)?, Some(resolved_path), ) } (None, Some(path)) => { - std::fs::create_dir_all(path)?; + std::fs::create_dir_all(path) + .map_err(|_| SqliteBackendError::DatabaseClosed)?; let path = path.join("kv.sqlite3"); (rusqlite::Connection::open(path.clone())?, Some(path)) } @@ -110,7 +112,7 @@ impl DatabaseHandler for SqliteDbHandler

{ conn.pragma_update(None, "journal_mode", "wal")?; - Ok::<_, AnyError>((conn, queue_waker_key)) + Ok::<_, SqliteBackendError>((conn, queue_waker_key)) }) }) .await -- cgit v1.2.3