diff options
author | stephan <stephan@noemail.net> | 2022-09-12 16:09:50 +0000 |
---|---|---|
committer | stephan <stephan@noemail.net> | 2022-09-12 16:09:50 +0000 |
commit | 5360f5fcff10bb4f3ff292a2686f6cfc22a1993d (patch) | |
tree | eae54f08efafeab805ca98814099a5e21c8f33c4 /ext/wasm/api/sqlite3-api-prologue.js | |
parent | 73079dba00f879be162b601d074cca978dc94604 (diff) | |
parent | 1ad51ffe21adb0924f4ad7375d94fb5e2e7cbbee (diff) | |
download | sqlite-5360f5fcff10bb4f3ff292a2686f6cfc22a1993d.tar.gz sqlite-5360f5fcff10bb4f3ff292a2686f6cfc22a1993d.zip |
Merge kv-vfs branch into fiddle-opfs branch to add kvvfs-based wasm build and demo.
FossilOrigin-Name: a7d8b26acd3c1ae344369e4d70804c0cab45272c0983cfd32d616a0a7b28acb9
Diffstat (limited to 'ext/wasm/api/sqlite3-api-prologue.js')
-rw-r--r-- | ext/wasm/api/sqlite3-api-prologue.js | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js index 7959d047c..17dcd4228 100644 --- a/ext/wasm/api/sqlite3-api-prologue.js +++ b/ext/wasm/api/sqlite3-api-prologue.js @@ -713,7 +713,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap( return __persistentDir = ""; } try{ - if(pdir && 0===this.wasm.xCallWrapped( + if(pdir && 0===capi.wasm.xCallWrapped( 'sqlite3_wasm_init_opfs', 'i32', ['string'], pdir )){ /** OPFS does not support locking and will trigger errors if @@ -736,7 +736,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap( // sqlite3_wasm_init_opfs() is not available return __persistentDir = ""; } - }.bind(capi); + }; /** Returns true if sqlite3.capi.sqlite3_web_persistent_dir() is a @@ -744,9 +744,15 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap( prefix, else returns false. */ capi.sqlite3_web_filename_is_persistent = function(name){ - const p = this.sqlite3_web_persistent_dir(); + const p = capi.sqlite3_web_persistent_dir(); return (p && name) ? name.startsWith(p) : false; - }.bind(capi); + }; + + if(0===capi.wasm.exports.sqlite3_vfs_find(0)){ + /* Assume that sqlite3_initialize() has not yet been called. + This will be the case in an SQLITE_OS_KV build. */ + capi.wasm.exports.sqlite3_initialize(); + } /* The remainder of the API will be set up in later steps. */ const sqlite3 = { |