From: stephan <stephan@noemail.net>
Date: Mon, 3 Oct 2022 13:46:20 +0000 (+0000)
Subject: Resolve/remove a TODO.
X-Git-Tag: version-3.40.0~169^2~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=57956a9c86d19aa9728d58e015fa87b0acd5a99a;p=thirdparty%2Fsqlite.git

Resolve/remove a TODO.

FossilOrigin-Name: 2ea35fea3bac2637e935643edfa7913b792e529de3a8980dbb8678d98ed5bcf9
---

diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index 37c2928406..b78c9b68ef 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -242,20 +242,20 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        is ignored.
 
      - "t": enable tracing of SQL executed on this database handle,
-       sending it to `console.log()`. Once enabled, it cannot
-       currently be easily switched off (TODO).
+       sending it to `console.log()`. To disable it later, call
+       `sqlite3.capi.sqlite3_trace_v2(thisDb.pointer, 0, 0, 0)`.
 
-     If "w" is not provided, the db is implicitly read-only, noting that
-     "rc" is meaningless
+     If "w" is not provided, the db is implicitly read-only, noting
+     that "rc" is meaningless
 
      Any other letters are currently ignored. The default is
      "c". These modes are ignored for the special ":memory:" and ""
-     names.
+     names and _may_ be ignored altogether for certain VFSes.
 
      The final argument is analogous to the final argument of
      sqlite3_open_v2(): the name of an sqlite3 VFS. Pass a falsy value,
      or none at all, to use the default. If passed a value, it must
-     be the string name of a VFS
+     be the string name of a VFS.
 
      The constructor optionally (and preferably) takes its arguments
      in the form of a single configuration object with the following
@@ -266,17 +266,20 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
      - `.vfs`: the VFS fname
 
      The `filename` and `vfs` arguments may be either JS strings or
-     C-strings allocated via WASM.
+     C-strings allocated via WASM. `flags` is required to be a JS
+     string (because it's specific to this API, which is specific
+     to JS).
 
      For purposes of passing a DB instance to C-style sqlite3
      functions, the DB object's read-only `pointer` property holds its
      `sqlite3*` pointer value. That property can also be used to check
      whether this DB instance is still open.
 
-     In the main window thread, the filenames ":localStorage:" and
-     ":sessionStorage:" are special: they cause the db to use either
+     In the main window thread, the filenames `":localStorage:"` and
+     `":sessionStorage:"` are special: they cause the db to use either
      localStorage or sessionStorage for storing the database using
-     the kvvfs.
+     the kvvfs. If one of these names are used, they trump
+     any vfs name set in the arguments.
   */
   const DB = function(...args){
     dbCtorHelper.apply(this, args);
diff --git a/manifest b/manifest
index 5a7dbf25a4..3cbe51eb84 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Export\ssqlite3_trace_v2()\sto\swasm\sand\suse\sit\sto\sensure\sthat\sthe\snew\sper-VFS\spost-open\sSQL\ssupport\sin\sthe\sDB\sctor\sworks.\sDefault\sopfs\svfs\sto\sjournal_mode=truncate,\sas\sit's\sfaster\sin\sthat\smode.\sAdd\s't'\sDB\sopen-mode\sflag\sto\senable\sSQL\stracing\sto\sconsole.log().
-D 2022-10-03T13:03:41.207
+C Resolve/remove\sa\sTODO.
+D 2022-10-03T13:46:20.085
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -486,7 +486,7 @@ F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1
 F ext/wasm/api/pre-js.js 2db711eb637991b383fc6b5c0f3df65ec48a7201e5730e304beba8de2d3f9b0b
 F ext/wasm/api/sqlite3-api-cleanup.js 5d22d1d3818ecacb23bfa223d5970cd0617d8cdbb48c8bc4bbd463f05b021a99
 F ext/wasm/api/sqlite3-api-glue.js b6e7ae7bfe272a8623a8cae4a84830697314c743cadd14e4c167650455f0fff9
-F ext/wasm/api/sqlite3-api-oo1.js 1cf37b2b6e1fb35f9c425380aad198b66a36cdcc65e399e68085509096eca5b0
+F ext/wasm/api/sqlite3-api-oo1.js ac1e08d36bdfb5aa0a2d75b7d4c892fd51819d34c932370c3282810672bcc086
 F ext/wasm/api/sqlite3-api-opfs.js 3d17da752181d67847bd2e3d1f4662df31c5023a1bed5424ebcdeb89770046af
 F ext/wasm/api/sqlite3-api-prologue.js 915e3119d2c3cd53afb9575d1681646f3cbebbfc62cdae8bc199d08e7fd566f1
 F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
@@ -2029,8 +2029,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 18462052903bfeb037dd9af3a1fe1898d141eff5d6f527721858120553de808d
-R 362ba5dc75c0e8e6f26510dab6893d04
+P 508f7f6d63e52f61fae5abe817579a4e130fa7fbd18733d741d521a5bdabb7ce
+R 3b5fbcc1c629d848c68bef8adf981232
 U stephan
-Z 8b3cb31b700bd695aa51a5be567b8bc8
+Z f7f0cb7970f025a32d66b1e06bd3b81b
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 909d73bfff..933deb8fef 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-508f7f6d63e52f61fae5abe817579a4e130fa7fbd18733d741d521a5bdabb7ce
\ No newline at end of file
+2ea35fea3bac2637e935643edfa7913b792e529de3a8980dbb8678d98ed5bcf9
\ No newline at end of file