summaryrefslogtreecommitdiff
path: root/ext/kv/sqlite.rs
diff options
context:
space:
mode:
authorIgor Zinkovsky <igor@deno.com>2023-11-28 21:04:07 -0800
committerGitHub <noreply@github.com>2023-11-28 21:04:07 -0800
commit75ec650f080ac66e98d8b848118dc2349ca70aa8 (patch)
tree1024d70627165090f100d0203a5047072f99976a /ext/kv/sqlite.rs
parent32c041c8d7c5d72d4c1850f1fd6f3f38b530a16c (diff)
chore(ext/kv): update denokv crates (#21357)
Diffstat (limited to 'ext/kv/sqlite.rs')
-rw-r--r--ext/kv/sqlite.rs10
1 files changed, 6 insertions, 4 deletions
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<P: SqliteDbHandlerPermissions> DatabaseHandler for SqliteDbHandler<P> {
(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<P: SqliteDbHandlerPermissions> DatabaseHandler for SqliteDbHandler<P> {
conn.pragma_update(None, "journal_mode", "wal")?;
- Ok::<_, AnyError>((conn, queue_waker_key))
+ Ok::<_, SqliteBackendError>((conn, queue_waker_key))
})
})
.await