From f9c8d98b776083525a41f37ebfd86a4a4a288c43 Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Wed, 22 Mar 2023 15:23:36 -0400 Subject: Revert "refactor: rename Deno.openKv() to Deno.kv() (#18349)" (#18362) This reverts commit 50b793c9ed866ee29e8f04b4fa24b485b01a2b74. --- ext/kv/01_db.ts | 4 ++-- ext/kv/lib.rs | 4 +++- ext/kv/sqlite.rs | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) (limited to 'ext') diff --git a/ext/kv/01_db.ts b/ext/kv/01_db.ts index 4f1f9bc5a..571a1b3cd 100644 --- a/ext/kv/01_db.ts +++ b/ext/kv/01_db.ts @@ -14,7 +14,7 @@ const encodeCursor: ( ) => string = (selector, boundaryKey) => ops.op_kv_encode_cursor(selector, boundaryKey); -async function kv(path: string) { +async function openKv(path: string) { const rid = await core.opAsync("op_kv_database_open", path); return new Kv(rid); } @@ -466,4 +466,4 @@ class KvListIterator extends AsyncIterator } } -export { Kv, kv, KvListIterator, KvU64 }; +export { Kv, KvListIterator, KvU64, openKv }; diff --git a/ext/kv/lib.rs b/ext/kv/lib.rs index b0b629e33..49a59af74 100644 --- a/ext/kv/lib.rs +++ b/ext/kv/lib.rs @@ -84,7 +84,9 @@ where { let handler = { let state = state.borrow(); - state.borrow::().check_unstable("Deno.kv"); + state + .borrow::() + .check_unstable("Deno.openKv"); state.borrow::>().clone() }; let db = handler.open(state.clone(), path).await?; diff --git a/ext/kv/sqlite.rs b/ext/kv/sqlite.rs index 7c6fc73a6..17634127f 100644 --- a/ext/kv/sqlite.rs +++ b/ext/kv/sqlite.rs @@ -128,8 +128,8 @@ impl DatabaseHandler for SqliteDbHandler

{ { let mut state = state.borrow_mut(); let permissions = state.borrow_mut::

(); - permissions.check_read(path, "Deno.kv")?; - permissions.check_write(path, "Deno.kv")?; + permissions.check_read(path, "Deno.openKv")?; + permissions.check_write(path, "Deno.openKv")?; } let flags = OpenFlags::default().difference(OpenFlags::SQLITE_OPEN_URI); rusqlite::Connection::open_with_flags(path, flags)? -- cgit v1.2.3