From a579f4400d0c9f5e8356a7b10830bc5a2caf8aa5 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Fri, 12 Aug 2022 17:57:09 +0000
Subject: [PATCH 001/428] Build fiddle with WASMFS OPFS support and attempt to
 use it if available. It does not work because of an inexplicable exception in
 Emscripten-generated code and perpetually-locked db, but it's not yet clear
 why.

FossilOrigin-Name: a16f0a46ec88c560f73d5664e4bf53fb5dd1a22e99a92c11b5c8d784816c3282
---
 Makefile.in                                 |  12 +-
 ext/wasm/EXPORTED_FUNCTIONS.fiddle          |   2 +
 ext/wasm/GNUmakefile                        |   4 +-
 ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api |   2 +
 ext/wasm/api/sqlite3-wasm.c                 |  46 +++
 ext/wasm/fiddle/fiddle-worker.js            | 433 ++++++++++----------
 ext/wasm/fiddle/fiddle.js                   |   2 +-
 manifest                                    |  27 +-
 manifest.uuid                               |   2 +-
 9 files changed, 303 insertions(+), 227 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 8fac5a52d3..6e39a5c46b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1540,25 +1540,29 @@ fiddle_module_js = $(fiddle_dir)/fiddle-module.js
 #emcc_opt = -O2
 #emcc_opt = -O3
 emcc_opt = -Oz
+emcc_flags_opfs = -sWASMFS -pthread
 emcc_flags = $(emcc_opt) \
         -sALLOW_TABLE_GROWTH \
         -sABORTING_MALLOC \
         -sSTRICT_JS \
-        -sENVIRONMENT=web \
+        -sENVIRONMENT=web,worker \
         -sMODULARIZE \
         -sEXPORTED_RUNTIME_METHODS=@$(wasm_dir_abs)/EXPORTED_RUNTIME_METHODS.fiddle \
         -sDYNAMIC_EXECUTION=0 \
         --minify 0 \
         -I. $(SHELL_OPT) \
-        -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_UTF16 -DSQLITE_OMIT_DEPRECATED
-$(fiddle_module_js): Makefile sqlite3.c shell.c \
+        -DSQLITE_THREADSAFE=0 \
+        -DSQLITE_OMIT_UTF16 \
+        -DSQLITE_OMIT_DEPRECATED \
+        $(emcc_flags_opfs)
+$(fiddle_module_js): Makefile $(wasm_dir)/api/sqlite3-wasm.c shell.c \
     $(wasm_dir)/EXPORTED_RUNTIME_METHODS.fiddle \
     $(wasm_dir)/EXPORTED_FUNCTIONS.fiddle
 	emcc -o $@ $(emcc_flags) \
         -sEXPORT_NAME=initFiddleModule \
         -sEXPORTED_FUNCTIONS=@$(wasm_dir_abs)/EXPORTED_FUNCTIONS.fiddle \
         -DSQLITE_SHELL_FIDDLE \
-        sqlite3.c shell.c
+        $(wasm_dir)/api/sqlite3-wasm.c shell.c
 	gzip < $@ > $@.gz
 	gzip < $(fiddle_dir)/fiddle-module.wasm > $(fiddle_dir)/fiddle-module.wasm.gz
 $(fiddle_dir)/fiddle.js.gz: $(fiddle_dir)/fiddle.js
diff --git a/ext/wasm/EXPORTED_FUNCTIONS.fiddle b/ext/wasm/EXPORTED_FUNCTIONS.fiddle
index b96ce4e67c..602d612548 100644
--- a/ext/wasm/EXPORTED_FUNCTIONS.fiddle
+++ b/ext/wasm/EXPORTED_FUNCTIONS.fiddle
@@ -5,3 +5,5 @@ _fiddle_the_db
 _fiddle_db_arg
 _fiddle_db_filename
 _fiddle_reset_db
+_sqlite3_wasm_init_opfs
+_sqlite3_wasm_vfs_unlink
diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index ee8ade74a3..e32febbfc3 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -168,12 +168,13 @@ emcc.cflags :=
 emcc.cflags += -std=c99 -fPIC
 # -------------^^^^^^^^ we currently need c99 for WASM-specific sqlite3 APIs.
 emcc.cflags += -I. -I$(dir.top) # $(SQLITE_OPT)
+emcc.cflags += -pthread
 
 ########################################################################
 # emcc flags specific to building the final .js/.wasm file...
 emcc.jsflags := -fPIC
 emcc.jsflags += --no-entry
-emcc.jsflags += -sENVIRONMENT=web
+emcc.jsflags += -sENVIRONMENT=web,worker
 emcc.jsflags += -sMODULARIZE
 emcc.jsflags += -sSTRICT_JS
 emcc.jsflags += -sDYNAMIC_EXECUTION=0
@@ -182,6 +183,7 @@ emcc.jsflags += -sEXPORTED_FUNCTIONS=@$(dir.wasm)/EXPORTED_FUNCTIONS.api
 emcc.jsflags += -sEXPORTED_RUNTIME_METHODS=FS,wasmMemory # wasmMemory==>for -sIMPORTED_MEMORY
 emcc.jsflags += -sUSE_CLOSURE_COMPILER=0
 emcc.jsflags += -sIMPORTED_MEMORY
+emcc.jsflags += -pthread -sWASMFS
 #emcc.jsflags += -sINITIAL_MEMORY=13107200
 #emcc.jsflags += -sTOTAL_STACK=4194304
 emcc.jsflags += -sEXPORT_NAME=sqlite3InitModule
diff --git a/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api b/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
index 8f103c7c0b..4a6b71b8ea 100644
--- a/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
+++ b/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
@@ -68,5 +68,7 @@ _sqlite3_vfs_find
 _sqlite3_vfs_register
 _sqlite3_wasm_db_error
 _sqlite3_wasm_enum_json
+_sqlite3_wasm_init_opfs
+_sqlite3_wasm_vfs_unlink
 _malloc
 _free
diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index 6a81da3e5f..30a9dafeb8 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -411,3 +411,49 @@ const char * sqlite3_wasm_enum_json(void){
 #undef outf
 #undef lenCheck
 }
+
+/*
+** This function is NOT part of the sqlite3 public API. It is strictly
+** for use by the sqlite project's own JS/WASM bindings.
+**
+** This function invokes the xDelete method of the default VFS,
+** passing on the given filename. If zName is NULL, no default VFS is
+** found, or it has no xDelete method, SQLITE_MISUSE is returned, else
+** the result of the xDelete() call is returned.
+*/
+int sqlite3_wasm_vfs_unlink(const char * zName){
+  int rc = SQLITE_MISUSE /* ??? */;
+  sqlite3_vfs * const pVfs = sqlite3_vfs_find(0);
+  if( zName && pVfs && pVfs->xDelete ){
+    rc = pVfs->xDelete(pVfs, zName, 1);
+  }
+  return rc;
+}
+
+#ifdef __EMSCRIPTEN__
+#include <emscripten/wasmfs.h>
+#include <emscripten/console.h>
+/*
+** This function is NOT part of the sqlite3 public API. It is strictly
+** for use by the sqlite project's own JS/WASM bindings.
+**
+** This function should only be called if the JS side detects the
+** existence of the Origin-Private FileSystem (OPFS) APIs in the
+** client. The first time it is called, this function instantiates a
+** WASMFS backend impl for OPFS. On success, subsequent calls are
+** no-ops.
+**
+** Returns 0 on success, SQLITE_NOMEM if intantiation of the backend
+** object fails.
+*/
+int sqlite3_wasm_init_opfs(void){
+  static backend_t pOpfs = 0;
+  if( !pOpfs ){
+    pOpfs = wasmfs_create_opfs_backend();
+    if( pOpfs ){
+      emscripten_console_log("Created OPFS WASMFS backend.");
+    }
+  }
+  return pOpfs ? 0 : SQLITE_NOMEM;
+}
+#endif /* __EMSCRIPTEN__ */
diff --git a/ext/wasm/fiddle/fiddle-worker.js b/ext/wasm/fiddle/fiddle-worker.js
index ca562323ce..fb9fd30229 100644
--- a/ext/wasm/fiddle/fiddle-worker.js
+++ b/ext/wasm/fiddle/fiddle-worker.js
@@ -89,213 +89,230 @@
 */
 "use strict";
 (function(){
-    /**
-       Posts a message in the form {type,data} unless passed more than 2
-       args, in which case it posts {type, data:[arg1...argN]}.
-    */
-    const wMsg = function(type,data){
-        postMessage({
-            type,
-            data: arguments.length<3
-                ? data
-                : Array.prototype.slice.call(arguments,1)
-        });
-    };
-
-    const stdout = function(){wMsg('stdout', Array.prototype.slice.call(arguments));};
-    const stderr = function(){wMsg('stderr', Array.prototype.slice.call(arguments));};
-
-    self.onerror = function(/*message, source, lineno, colno, error*/) {
-        const err = arguments[4];
-        if(err && 'ExitStatus'==err.name){
-            /* This is relevant for the sqlite3 shell binding but not the
-               lower-level binding. */
-            fiddleModule.isDead = true;
-            stderr("FATAL ERROR:", err.message);
-            stderr("Restarting the app requires reloading the page.");
-            wMsg('error', err);
-        }
-        console.error(err);
-        fiddleModule.setStatus('Exception thrown, see JavaScript console: '+err);
-    };
-
-    const Sqlite3Shell = {
-        /** Returns the name of the currently-opened db. */
-        dbFilename: function f(){
-            if(!f._) f._ = fiddleModule.cwrap('fiddle_db_filename', "string", ['string']);
-            return f._();
-        },
-        /**
-           Runs the given text through the shell as if it had been typed
-           in by a user. Fires a working/start event before it starts and
-           working/end event when it finishes.
-        */
-        exec: function f(sql){
-            if(!f._) f._ = fiddleModule.cwrap('fiddle_exec', null, ['string']);
-            if(fiddleModule.isDead){
-                stderr("shell module has exit()ed. Cannot run SQL.");
-                return;
-            }
-            wMsg('working','start');
-            try {
-                if(f._running){
-                    stderr('Cannot run multiple commands concurrently.');
-                }else{
-                    f._running = true;
-                    f._(sql);
-                }
-            } finally {
-                delete f._running;
-                wMsg('working','end');
-            }
-        },
-        resetDb: function f(){
-            if(!f._) f._ = fiddleModule.cwrap('fiddle_reset_db', null);
-            stdout("Resetting database.");
-            f._();
-            stdout("Reset",this.dbFilename());
-        },
-        /* Interrupt can't work: this Worker is tied up working, so won't get the
-           interrupt event which would be needed to perform the interrupt. */
-        interrupt: function f(){
-            if(!f._) f._ = fiddleModule.cwrap('fiddle_interrupt', null);
-            stdout("Requesting interrupt.");
-            f._();
-        }
-    };
-
-    self.onmessage = function f(ev){
-        ev = ev.data;
-        if(!f.cache){
-            f.cache = {
-                prevFilename: null
-            };
-        }
-        //console.debug("worker: onmessage.data",ev);
-        switch(ev.type){
-            case 'shellExec': Sqlite3Shell.exec(ev.data); return;
-            case 'db-reset': Sqlite3Shell.resetDb(); return;
-            case 'interrupt': Sqlite3Shell.interrupt(); return;
-                /** Triggers the export of the current db. Fires an
-                    event in the form:
-
-                    {type:'db-export',
-                    data:{
-                    filename: name of db,
-                    buffer: contents of the db file (Uint8Array),
-                    error: on error, a message string and no buffer property.
-                    }
-                    }
-                */
-            case 'db-export': {
-                const fn = Sqlite3Shell.dbFilename();
-                stdout("Exporting",fn+".");
-                const fn2 = fn ? fn.split(/[/\\]/).pop() : null;
-                try{
-                    if(!fn2) throw new Error("DB appears to be closed.");
-                    wMsg('db-export',{
-                        filename: fn2,
-                        buffer: fiddleModule.FS.readFile(fn, {encoding:"binary"})
-                    });
-                }catch(e){
-                    /* Post a failure message so that UI elements disabled
-                       during the export can be re-enabled. */
-                    wMsg('db-export',{
-                        filename: fn,
-                        error: e.message
-                    });
-                }
-                return;
-            }
-            case 'open': {
-                /* Expects: {
-                   buffer: ArrayBuffer | Uint8Array,
-                   filename: for logging/informational purposes only
-                   } */
-                const opt = ev.data;
-                let buffer = opt.buffer;
-                if(buffer instanceof Uint8Array){
-                }else if(buffer instanceof ArrayBuffer){
-                    buffer = new Uint8Array(buffer);
-                }else{
-                    stderr("'open' expects {buffer:Uint8Array} containing an uploaded db.");
-                    return;
-                }
-                const fn = (
-                    opt.filename
-                        ? opt.filename.split(/[/\\]/).pop().replace('"','_')
-                        : ("db-"+((Math.random() * 10000000) | 0)+
-                           "-"+((Math.random() * 10000000) | 0)+".sqlite3")
-                );
-                /* We cannot delete the existing db file until the new one
-                   is installed, which means that we risk overflowing our
-                   quota (if any) by having both the previous and current
-                   db briefly installed in the virtual filesystem. */
-                fiddleModule.FS.createDataFile("/", fn, buffer, true, true);
-                const oldName = Sqlite3Shell.dbFilename();
-                Sqlite3Shell.exec('.open "/'+fn+'"');
-                if(oldName && oldName !== fn){
-                    try{fiddleModule.FS.unlink(oldName);}
-                    catch(e){/*ignored*/}
-                }
-                stdout("Replaced DB with",fn+".");
-                return;
-            }
-        };
-        console.warn("Unknown fiddle-worker message type:",ev);
-    };
-   
-    /**
-       emscripten module for use with build mode -sMODULARIZE.
-    */
-    const fiddleModule = {
-        print: stdout,
-        printErr: stderr,
-        /**
-           Intercepts status updates from the emscripting module init
-           and fires worker events with a type of 'status' and a
-           payload of:
-
-           {
-           text: string | null, // null at end of load process
-           step: integer // starts at 1, increments 1 per call
-           }
-
-           We have no way of knowing in advance how many steps will
-           be processed/posted, so creating a "percentage done" view is
-           not really practical. One can be approximated by giving it a
-           current value of message.step and max value of message.step+1,
-           though.
-
-           When work is finished, a message with a text value of null is
-           submitted.
-
-           After a message with text==null is posted, the module may later
-           post messages about fatal problems, e.g. an exit() being
-           triggered, so it is recommended that UI elements for posting
-           status messages not be outright removed from the DOM when
-           text==null, and that they instead be hidden until/unless
-           text!=null.
-        */
-        setStatus: function f(text){
-            if(!f.last) f.last = { step: 0, text: '' };
-            else if(text === f.last.text) return;
-            f.last.text = text;
-            wMsg('module',{
-                type:'status',
-                data:{step: ++f.last.step, text: text||null}
-            });
-        }
-    };
-
-    importScripts('fiddle-module.js');
-    /**
-       initFiddleModule() is installed via fiddle-module.js due to
-       building with:
-
-       emcc ... -sMODULARIZE=1 -sEXPORT_NAME=initFiddleModule
-    */
-    initFiddleModule(fiddleModule).then(function(thisModule){
-        wMsg('fiddle-ready');
+  /**
+     Posts a message in the form {type,data} unless passed more than 2
+     args, in which case it posts {type, data:[arg1...argN]}.
+  */
+  const wMsg = function(type,data){
+    postMessage({
+      type,
+      data: arguments.length<3
+        ? data
+        : Array.prototype.slice.call(arguments,1)
     });
+  };
+
+  const stdout = function(){wMsg('stdout', Array.prototype.slice.call(arguments));};
+  const stderr = function(){wMsg('stderr', Array.prototype.slice.call(arguments));};
+  
+  self.onerror = function(/*message, source, lineno, colno, error*/) {
+    const err = arguments[4];
+    if(err && 'ExitStatus'==err.name){
+      /* This is relevant for the sqlite3 shell binding but not the
+         lower-level binding. */
+      fiddleModule.isDead = true;
+      stderr("FATAL ERROR:", err.message);
+      stderr("Restarting the app requires reloading the page.");
+      wMsg('error', err);
+    }
+    console.error(err);
+    fiddleModule.setStatus('Exception thrown, see JavaScript console: '+err);
+  };
+
+  const Sqlite3Shell = {
+    /** Returns the name of the currently-opened db. */
+    dbFilename: function f(){
+      if(!f._) f._ = fiddleModule.cwrap('fiddle_db_filename', "string", ['string']);
+      return f._();
+    },
+    /**
+       Runs the given text through the shell as if it had been typed
+       in by a user. Fires a working/start event before it starts and
+       working/end event when it finishes.
+    */
+    exec: function f(sql){
+      if(!f._) f._ = fiddleModule.cwrap('fiddle_exec', null, ['string']);
+      if(fiddleModule.isDead){
+        stderr("shell module has exit()ed. Cannot run SQL.");
+        return;
+      }
+      wMsg('working','start');
+      try {
+        if(f._running){
+          stderr('Cannot run multiple commands concurrently.');
+        }else{
+          f._running = true;
+          f._(sql);
+        }
+      } finally {
+        delete f._running;
+        wMsg('working','end');
+      }
+    },
+    resetDb: function f(){
+      if(!f._) f._ = fiddleModule.cwrap('fiddle_reset_db', null);
+      stdout("Resetting database.");
+      f._();
+      stdout("Reset",this.dbFilename());
+    },
+    /* Interrupt can't work: this Worker is tied up working, so won't get the
+       interrupt event which would be needed to perform the interrupt. */
+    interrupt: function f(){
+      if(!f._) f._ = fiddleModule.cwrap('fiddle_interrupt', null);
+      stdout("Requesting interrupt.");
+      f._();
+    }
+  };
+  
+  self.onmessage = function f(ev){
+    ev = ev.data;
+    if(!f.cache){
+      f.cache = {
+        prevFilename: null
+      };
+    }
+    //console.debug("worker: onmessage.data",ev);
+    switch(ev.type){
+        case 'shellExec': Sqlite3Shell.exec(ev.data); return;
+        case 'db-reset': Sqlite3Shell.resetDb(); return;
+        case 'interrupt': Sqlite3Shell.interrupt(); return;
+          /** Triggers the export of the current db. Fires an
+              event in the form:
+
+              {type:'db-export',
+                data:{
+                  filename: name of db,
+                  buffer: contents of the db file (Uint8Array),
+                  error: on error, a message string and no buffer property.
+                }
+              }
+          */
+        case 'db-export': {
+          const fn = Sqlite3Shell.dbFilename();
+          stdout("Exporting",fn+".");
+          const fn2 = fn ? fn.split(/[/\\]/).pop() : null;
+          try{
+            if(!fn2) throw new Error("DB appears to be closed.");
+            wMsg('db-export',{
+              filename: fn2,
+              buffer: fiddleModule.FS.readFile(fn, {encoding:"binary"})
+            });
+          }catch(e){
+            /* Post a failure message so that UI elements disabled
+               during the export can be re-enabled. */
+            wMsg('db-export',{
+              filename: fn,
+              error: e.message
+            });
+          }
+          return;
+        }
+        case 'open': {
+          /* Expects: {
+             buffer: ArrayBuffer | Uint8Array,
+             filename: for logging/informational purposes only
+             } */
+          const opt = ev.data;
+          let buffer = opt.buffer;
+          if(buffer instanceof Uint8Array){
+          }else if(buffer instanceof ArrayBuffer){
+            buffer = new Uint8Array(buffer);
+          }else{
+            stderr("'open' expects {buffer:Uint8Array} containing an uploaded db.");
+            return;
+          }
+          const fn = (
+            opt.filename
+              ? opt.filename.split(/[/\\]/).pop().replace('"','_')
+              : ("db-"+((Math.random() * 10000000) | 0)+
+                 "-"+((Math.random() * 10000000) | 0)+".sqlite3")
+          );
+          /* We cannot delete the existing db file until the new one
+             is installed, which means that we risk overflowing our
+             quota (if any) by having both the previous and current
+             db briefly installed in the virtual filesystem. */
+          fiddleModule.FS.createDataFile("/", fn, buffer, true, true);
+          const oldName = Sqlite3Shell.dbFilename();
+          Sqlite3Shell.exec('.open "/'+fn+'"');
+          if(oldName && oldName !== fn){
+            try{fiddleModule.fsUnlink(oldName);}
+            catch(e){/*ignored*/}
+          }
+          stdout("Replaced DB with",fn+".");
+          return;
+        }
+    };
+    console.warn("Unknown fiddle-worker message type:",ev);
+  };
+  
+  /**
+     emscripten module for use with build mode -sMODULARIZE.
+  */
+  const fiddleModule = {
+    print: stdout,
+    printErr: stderr,
+    /**
+       Intercepts status updates from the emscripting module init
+       and fires worker events with a type of 'status' and a
+       payload of:
+
+       {
+       text: string | null, // null at end of load process
+       step: integer // starts at 1, increments 1 per call
+       }
+
+       We have no way of knowing in advance how many steps will
+       be processed/posted, so creating a "percentage done" view is
+       not really practical. One can be approximated by giving it a
+       current value of message.step and max value of message.step+1,
+       though.
+
+       When work is finished, a message with a text value of null is
+       submitted.
+
+       After a message with text==null is posted, the module may later
+       post messages about fatal problems, e.g. an exit() being
+       triggered, so it is recommended that UI elements for posting
+       status messages not be outright removed from the DOM when
+       text==null, and that they instead be hidden until/unless
+       text!=null.
+    */
+    setStatus: function f(text){
+      if(!f.last) f.last = { step: 0, text: '' };
+      else if(text === f.last.text) return;
+      f.last.text = text;
+      wMsg('module',{
+        type:'status',
+        data:{step: ++f.last.step, text: text||null}
+      });
+    }
+  };
+
+  importScripts('fiddle-module.js');
+  /**
+     initFiddleModule() is installed via fiddle-module.js due to
+     building with:
+
+     emcc ... -sMODULARIZE=1 -sEXPORT_NAME=initFiddleModule
+  */
+  initFiddleModule(fiddleModule).then(function(thisModule){
+    fiddleModule.fsUnlink = fiddleModule.cwrap('sqlite3_wasm_vfs_unlink','number',['string']);
+    (function initOpfs(){
+      if(!self.FileSystemHandle || !self.FileSystemDirectoryHandle
+         || !self.FileSystemFileHandle){
+        stdout("OPFS unavailable. All DB state is transient.");
+        return;
+      }
+      try {
+        if(0===fiddleModule.ccall('sqlite3_wasm_init_opfs', undefined)){
+          stdout("Initialized OPFS WASMFS backend.");
+        }else{
+          stderr("Initialization of OPFS WASMFS backend failed.");
+        }
+      }catch(e){
+        stderr("Apparently missing WASMFS:",e.message);
+      }
+    })();
+    wMsg('fiddle-ready');
+  });
 })();
diff --git a/ext/wasm/fiddle/fiddle.js b/ext/wasm/fiddle/fiddle.js
index 619ce4eca8..3fd36bff86 100644
--- a/ext/wasm/fiddle/fiddle.js
+++ b/ext/wasm/fiddle/fiddle.js
@@ -775,7 +775,7 @@ SELECT group_concat(rtrim(t),x'0a') as Mandelbrot FROM a;`}
             });
         })()/* example queries */;
 
-        SF.echo(null/*clear any output generated by the init process*/);
+        //SF.echo(null/*clear any output generated by the init process*/);
         if(window.jQuery && window.jQuery.terminal){
             /* Set up the terminal-style view... */
             const eTerm = window.jQuery('#view-terminal').empty();
diff --git a/manifest b/manifest
index ef72de5c1d..10191bf4da 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Minor\swasm-related\sdoc\sclarification\sand\sremove\san\sobsolete\scode\scomment.
-D 2022-08-12T17:55:18.237
+C Build\sfiddle\swith\sWASMFS\sOPFS\ssupport\sand\sattempt\sto\suse\sit\sif\savailable.\sIt\sdoes\snot\swork\sbecause\sof\san\sinexplicable\sexception\sin\sEmscripten-generated\scode\sand\sperpetually-locked\sdb,\sbut\sit's\snot\syet\sclear\swhy.
+D 2022-08-12T17:57:09.467
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in eceb228bf7b48f961b59a508f42ffa1211bf0c4c5bc818807768cc7b187ab0c8
+F Makefile.in bada766cb44d202e405eca68e32bb3bcf11cad5b85c75f7fb16ac39e863f03f5
 F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
 F Makefile.msc d547a2fdba38a1c6cd1954977d0b0cc017f5f8fbfbc65287bf8d335808938016
 F README.md 8b8df9ca852aeac4864eb1e400002633ee6db84065bd01b78c33817f97d31f5e
@@ -472,11 +472,11 @@ F ext/session/test_session.c f433f68a8a8c64b0f5bc74dc725078f12483301ad4ae8375205
 F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
-F ext/wasm/EXPORTED_FUNCTIONS.fiddle 7fb73f7150ab79d83bb45a67d257553c905c78cd3d693101699243f36c5ae6c3
+F ext/wasm/EXPORTED_FUNCTIONS.fiddle db7a4602f043cf4a5e4135be3609a487f9f1c83f05778bfbdf93766be4541b96
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile 5359a37fc13b68fad2259228590450339a0c59687744edd0db7bb93d3b1ae2b1
+F ext/wasm/GNUmakefile c354ad5ce3ecec80c28ed4314827adc10cbbc0ef47e028b0cfbdf336c4a98fa4
 F ext/wasm/README.md 4b00ae7c7d93c4591251245f0996a319e2651361013c98d2efb0b026771b7331
-F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api c5eaceabb9e759aaae7d3101a4a3e542f96ab2c99d89a80ce20ec18c23115f33
+F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 77ef4bcf37e362b9ad61f9c175dfc0f1b3e571563fb311b96581cf422ee6a8ec
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
 F ext/wasm/api/README.md b6d0fb64bfdf7bf9ce6938ea4104228f6f5bbef600f5d910b2f8c8694195988c
 F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba81456260a713ed04900c
@@ -488,16 +488,16 @@ F ext/wasm/api/sqlite3-api-opfs.js c93cdd14f81a26b3a64990515ee05c7e29827fbc8fba4
 F ext/wasm/api/sqlite3-api-prologue.js 0fb0703d2d8ac89fa2d4dd8f9726b0ea226b8708ac34e5b482df046e147de0eb
 F ext/wasm/api/sqlite3-api-worker.js 1124f404ecdf3c14d9f829425cef778cd683911a9883f0809a463c3c7773c9fd
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c 8585793ca8311c7a0618b7e00ed2b3729799c20664a51f196258576e3d475c9e
+F ext/wasm/api/sqlite3-wasm.c 0b3f56078f3e3806fb6dfbc756198d1634d3bfdbf3677c77702cf453c4ed336a
 F ext/wasm/api/sqlite3-worker.js 1325ca8d40129a82531902a3a077b795db2eeaee81746e5a0c811a04b415fa7f
 F ext/wasm/common/SqliteTestUtil.js e41a1406f18da9224523fad0c48885caf995b56956a5b9852909c0989e687e90
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 572cf1ffae0b6eb7ca63684d3392bf350217a07b90e7a896e4fa850700c989b0
 F ext/wasm/common/whwasmutil.js 3d9deda1be718e2b10e2b6b474ba6ba857d905be314201ae5b3df5eef79f66aa
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
-F ext/wasm/fiddle/fiddle-worker.js 88bc2193a6cb6a3f04d8911bed50a4401fe6f277de7a71ba833865ab64a1b4ae
+F ext/wasm/fiddle/fiddle-worker.js c9d66230269cc26d33aa84501ae601c24f8697c3711be5d769c4c687bfcaba8f
 F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
-F ext/wasm/fiddle/fiddle.js 812f9954cc7c4b191884ad171f36fcf2d0112d0a7ecfdf6087896833a0c079a8
+F ext/wasm/fiddle/fiddle.js bef4b30e078445a7cd2255fba07acd083aa1c3cc074a73b38ea847fd340f1adc
 F ext/wasm/jaccwabyt/jaccwabyt.js 99b424b4d467d4544e82615b58e2fe07532a898540bf9de2a985f3c21e7082b2
 F ext/wasm/jaccwabyt/jaccwabyt.md 447cc02b598f7792edaa8ae6853a7847b8178a18ed356afacbdbf312b2588106
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
@@ -1999,8 +1999,11 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 4c10b9b18feca82440273f8192fef951ad051bbfd8aad4d3c840cf6375130afd
-R 3e055b525bbc2100d8c4c001b630489b
+P 1b1f650a08da93da97ed3a96b9a3e4eac567472c266188c02a9bffe1cf620e53
+R a893d12114f31061d4e8d4e31dd72df1
+T *branch * fiddle-opfs
+T *sym-fiddle-opfs *
+T -sym-trunk * Cancelled\sby\sbranch.
 U stephan
-Z 4d766400503717808861a1e631c17801
+Z e55c83b0eefdc75c613c24a829476f39
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 911760f4e7..ec39b043b1 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1b1f650a08da93da97ed3a96b9a3e4eac567472c266188c02a9bffe1cf620e53
\ No newline at end of file
+a16f0a46ec88c560f73d5664e4bf53fb5dd1a22e99a92c11b5c8d784816c3282
\ No newline at end of file

From 24ddbca8d3b9991e179d4e12507499c4e7529065 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Fri, 12 Aug 2022 18:07:22 +0000
Subject: [PATCH 002/428] Updated fiddle deps to ensure that sqlite3.c is built
 first.

FossilOrigin-Name: f0ca02611484f5031076d7fae88845e9931715e9108ec0572629200d4f6636ef
---
 Makefile.in   |  6 ++++--
 manifest      | 15 ++++++---------
 manifest.uuid |  2 +-
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 6e39a5c46b..d381b24d21 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1535,6 +1535,8 @@ wasm_dir_abs = $(TOP)/ext/wasm
 fiddle_dir = $(wasm_dir)/fiddle
 fiddle_dir_abs = $(TOP)/$(fiddle_dir)
 fiddle_module_js = $(fiddle_dir)/fiddle-module.js
+sqlite3_wasm_c = $(wasm_dir)/api/sqlite3-wasm.c
+$(sqlite3_wasm_c): sqlite3.c
 #emcc_opt = -O0
 #emcc_opt = -O1
 #emcc_opt = -O2
@@ -1555,14 +1557,14 @@ emcc_flags = $(emcc_opt) \
         -DSQLITE_OMIT_UTF16 \
         -DSQLITE_OMIT_DEPRECATED \
         $(emcc_flags_opfs)
-$(fiddle_module_js): Makefile $(wasm_dir)/api/sqlite3-wasm.c shell.c \
+$(fiddle_module_js): Makefile $(sqlite3_wasm_c) shell.c \
     $(wasm_dir)/EXPORTED_RUNTIME_METHODS.fiddle \
     $(wasm_dir)/EXPORTED_FUNCTIONS.fiddle
 	emcc -o $@ $(emcc_flags) \
         -sEXPORT_NAME=initFiddleModule \
         -sEXPORTED_FUNCTIONS=@$(wasm_dir_abs)/EXPORTED_FUNCTIONS.fiddle \
         -DSQLITE_SHELL_FIDDLE \
-        $(wasm_dir)/api/sqlite3-wasm.c shell.c
+        $(sqlite3_wasm_c) shell.c
 	gzip < $@ > $@.gz
 	gzip < $(fiddle_dir)/fiddle-module.wasm > $(fiddle_dir)/fiddle-module.wasm.gz
 $(fiddle_dir)/fiddle.js.gz: $(fiddle_dir)/fiddle.js
diff --git a/manifest b/manifest
index 10191bf4da..1082b84cf6 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Build\sfiddle\swith\sWASMFS\sOPFS\ssupport\sand\sattempt\sto\suse\sit\sif\savailable.\sIt\sdoes\snot\swork\sbecause\sof\san\sinexplicable\sexception\sin\sEmscripten-generated\scode\sand\sperpetually-locked\sdb,\sbut\sit's\snot\syet\sclear\swhy.
-D 2022-08-12T17:57:09.467
+C Updated\sfiddle\sdeps\sto\sensure\sthat\ssqlite3.c\sis\sbuilt\sfirst.
+D 2022-08-12T18:07:22.516
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in bada766cb44d202e405eca68e32bb3bcf11cad5b85c75f7fb16ac39e863f03f5
+F Makefile.in a4002278db76f5f959d73bf3fedfd1b1c24ca198e150eadb327a7daa597cce6a
 F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
 F Makefile.msc d547a2fdba38a1c6cd1954977d0b0cc017f5f8fbfbc65287bf8d335808938016
 F README.md 8b8df9ca852aeac4864eb1e400002633ee6db84065bd01b78c33817f97d31f5e
@@ -1999,11 +1999,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 1b1f650a08da93da97ed3a96b9a3e4eac567472c266188c02a9bffe1cf620e53
-R a893d12114f31061d4e8d4e31dd72df1
-T *branch * fiddle-opfs
-T *sym-fiddle-opfs *
-T -sym-trunk * Cancelled\sby\sbranch.
+P a16f0a46ec88c560f73d5664e4bf53fb5dd1a22e99a92c11b5c8d784816c3282
+R 68c3995263b343f69486af69573b8b41
 U stephan
-Z e55c83b0eefdc75c613c24a829476f39
+Z 571a8d3aad5e0e97b4f122d411b8daa9
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index ec39b043b1..01bd43411b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a16f0a46ec88c560f73d5664e4bf53fb5dd1a22e99a92c11b5c8d784816c3282
\ No newline at end of file
+f0ca02611484f5031076d7fae88845e9931715e9108ec0572629200d4f6636ef
\ No newline at end of file

From 2cf599cff887bee309e0ac12eb68b487346474a3 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sat, 13 Aug 2022 13:42:07 +0000
Subject: [PATCH 003/428] Corrected TextDecoder.decode() usage to run when its
 input references a SharedArrayBuffer.

FossilOrigin-Name: d4d773405c579e7efd95be8d81fe14d71218e62e44c523d38e02f89424ba6ce8
---
 ext/wasm/common/whwasmutil.js   | 24 ++++++++++++++++--------
 ext/wasm/jaccwabyt/jaccwabyt.js | 15 ++++++++++++---
 manifest                        | 14 +++++++-------
 manifest.uuid                   |  2 +-
 4 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/ext/wasm/common/whwasmutil.js b/ext/wasm/common/whwasmutil.js
index 5a1d425caf..e51f690e29 100644
--- a/ext/wasm/common/whwasmutil.js
+++ b/ext/wasm/common/whwasmutil.js
@@ -669,6 +669,18 @@ self.WhWasmUtilInstaller = function(target){
     return pos - ptr;
   };
 
+  /** Internal helper to use in operations which need to distinguish
+      between SharedArrayBuffer heap memory and non-shared heap. */
+  const __SAB = ('undefined'===typeof SharedArrayBuffer)
+        ? function(){} : SharedArrayBuffer;
+  const __utf8Decode = function(arrayBuffer, begin, end){
+    return cache.utf8Decoder.decode(
+      (arrayBuffer.buffer instanceof __SAB)
+        ? arrayBuffer.slice(begin, end)
+        : arrayBuffer.subarray(begin, end)
+    );
+  };
+
   /**
      Expects ptr to be a pointer into the WASM heap memory which
      refers to a NUL-terminated C-style string encoded as UTF-8. This
@@ -678,11 +690,7 @@ self.WhWasmUtilInstaller = function(target){
   */
   target.cstringToJs = function(ptr){
     const n = this.cstrlen(ptr);
-    if(null===n) return n;
-    return n
-      ? cache.utf8Decoder.decode(
-        new Uint8Array(heapWrappers().HEAP8U.buffer, ptr, n)
-      ) : "";
+    return n ? __utf8Decode(heapWrappers().HEAP8U, ptr, ptr+n) : (null===n ? n : "");
   }.bind(target);
 
   /**
@@ -1070,11 +1078,11 @@ self.WhWasmUtilInstaller = function(target){
   
   /**
      Looks up a WASM-exported function named fname from
-     target.exports.  If found, it is called, passed all remaining
+     target.exports. If found, it is called, passed all remaining
      arguments, and its return value is returned to xCall's caller. If
      not found, an exception is thrown. This function does no
-     conversion of argument or return types, but see xWrap()
-     and xCallWrapped() for variants which do.
+     conversion of argument or return types, but see xWrap() and
+     xCallWrapped() for variants which do.
 
      As a special case, if passed only 1 argument after the name and
      that argument in an Array, that array's entries become the
diff --git a/ext/wasm/jaccwabyt/jaccwabyt.js b/ext/wasm/jaccwabyt/jaccwabyt.js
index a018658579..14c93b3a2e 100644
--- a/ext/wasm/jaccwabyt/jaccwabyt.js
+++ b/ext/wasm/jaccwabyt/jaccwabyt.js
@@ -394,7 +394,17 @@ self.Jaccwabyt = function StructBinderFactory(config){
 
   const __utf8Decoder = new TextDecoder('utf-8');
   const __utf8Encoder = new TextEncoder();
-
+  /** Internal helper to use in operations which need to distinguish
+      between SharedArrayBuffer heap memory and non-shared heap. */
+  const __SAB = ('undefined'===typeof SharedArrayBuffer)
+        ? function(){} : SharedArrayBuffer;
+  const __utf8Decode = function(arrayBuffer, begin, end){
+    return __utf8Decoder.decode(
+      (arrayBuffer.buffer instanceof __SAB)
+        ? arrayBuffer.slice(begin, end)
+        : arrayBuffer.subarray(begin, end)
+    );
+  };
   /**
      Uses __lookupMember() to find the given obj.structInfo key.
      Returns that member if it is a string, else returns false. If the
@@ -437,8 +447,7 @@ self.Jaccwabyt = function StructBinderFactory(config){
       //log("mem[",pos,"]",mem[pos]);
     };
     //log("addr =",addr,"pos =",pos);
-    if(addr===pos) return "";
-    return __utf8Decoder.decode(new Uint8Array(mem.buffer, addr, pos-addr));
+    return (addr===pos) ? "" : __utf8Decode(mem, addr, pos);
   };
 
   /**
diff --git a/manifest b/manifest
index 83bed6954d..1c235509d7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Use\snew\s-DSQLITE_DEFAULT_UNIX_VFS="unix-none"\sfor\sfiddle\sbuild\sto\sbypass\sOPFS\slocking\serrors.
-D 2022-08-12T18:54:08.424
+C Corrected\sTextDecoder.decode()\susage\sto\srun\swhen\sits\sinput\sreferences\sa\sSharedArrayBuffer.
+D 2022-08-13T13:42:07.359
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -493,12 +493,12 @@ F ext/wasm/api/sqlite3-worker.js 1325ca8d40129a82531902a3a077b795db2eeaee81746e5
 F ext/wasm/common/SqliteTestUtil.js e41a1406f18da9224523fad0c48885caf995b56956a5b9852909c0989e687e90
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 572cf1ffae0b6eb7ca63684d3392bf350217a07b90e7a896e4fa850700c989b0
-F ext/wasm/common/whwasmutil.js 3d9deda1be718e2b10e2b6b474ba6ba857d905be314201ae5b3df5eef79f66aa
+F ext/wasm/common/whwasmutil.js 41b8e097e0a9cb07c24c0ede3c81b72470a63f4a4efb07f75586dc131569f5ae
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js c9d66230269cc26d33aa84501ae601c24f8697c3711be5d769c4c687bfcaba8f
 F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
 F ext/wasm/fiddle/fiddle.js bef4b30e078445a7cd2255fba07acd083aa1c3cc074a73b38ea847fd340f1adc
-F ext/wasm/jaccwabyt/jaccwabyt.js 99b424b4d467d4544e82615b58e2fe07532a898540bf9de2a985f3c21e7082b2
+F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 447cc02b598f7792edaa8ae6853a7847b8178a18ed356afacbdbf312b2588106
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
 F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e568d2c2307c416902059339c06f19
@@ -1999,8 +1999,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 f0ca02611484f5031076d7fae88845e9931715e9108ec0572629200d4f6636ef 49828bdec5f926cd18a069d39a5db0b1e1f3528a2affcfbaa1cf7b98aca51b3b
-R cdc00c7ef64a776b22c16fe2546768af
+P b3a93ec75acb38535691d6eaceb5a1a218a5ee3f755a1e12c9255b90567fc795
+R 243b6e88d1ed7db99fd955f733548f1c
 U stephan
-Z abf4f77a1cc7fc6241b9153ec6b252c6
+Z ddf468f7ec78d048a46e361913445144
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index fd28b4f82d..ab645ba532 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b3a93ec75acb38535691d6eaceb5a1a218a5ee3f755a1e12c9255b90567fc795
\ No newline at end of file
+d4d773405c579e7efd95be8d81fe14d71218e62e44c523d38e02f89424ba6ce8
\ No newline at end of file

From f79451eea7a9c28ddb9ec0074d31dc9c83d7c83f Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sat, 13 Aug 2022 13:46:19 +0000
Subject: [PATCH 004/428] wasm OO API #1: added DB.callInTransaction() and
 Stmt.stepFinalize().

FossilOrigin-Name: e37dddc1dd9c0530e4b1c6cb0ca7cba7451caa37734d383c9b47f378d7222242
---
 ext/wasm/api/sqlite3-api-oo1.js | 67 +++++++++++++++++++++++++++++----
 manifest                        | 12 +++---
 manifest.uuid                   |  2 +-
 3 files changed, 67 insertions(+), 14 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index 9e54733966..b6e63d540a 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -575,8 +575,8 @@
             while(stmt.step()){
               stmt._isLocked = true;
               const row = arg.cbArg(stmt);
-              if(callback) callback(row, stmt);
               if(resultRows) resultRows.push(row);
+              if(callback) callback(row, stmt);
               stmt._isLocked = false;
             }
             rowMode = undefined;
@@ -819,6 +819,28 @@
       return this.pointer ? Object.keys(__stmtMap.get(this)).length : 0;
     },
 
+    /**
+       Starts a transaction, calls the given callback, and then either
+       rolls back or commits the transaction, depending on whether the
+       callback throw. The callback is pass this db object as its only
+       argument.  On success, returns the result of the callback.
+       Throws on error.
+     */
+    callInTransaction: function(callback){
+      affirmDbOpen(this);
+      let err, rc;
+      this.exec("BEGIN");
+      try { rc = callback(this); }
+      catch(e){
+        err = e;
+        throw e;
+      }finally{
+        if(err) this.exec("ROLLBACK");
+        else this.exec("COMMIT");
+      }
+      return rc;
+    },
+
     /**
        This function currently does nothing and always throws.  It
        WILL BE REMOVED pending other refactoring, to eliminate a hard
@@ -1042,7 +1064,7 @@
           console.warn("Unsupported bind() argument type:",val);
           toss3("Unsupported bind() argument type: "+(typeof val));
     }
-    if(rc) checkDbRc(stmt.db.pointer, rc);
+    if(rc) DB.checkRc(stmt.db.pointer, rc);
     return stmt;
   };
 
@@ -1228,9 +1250,10 @@
       return this;
     },
     /**
-       Steps the statement one time. If the result indicates that
-       a row of data is available, true is returned.  If no row of
-       data is available, false is returned.  Throws on error.
+       Steps the statement one time. If the result indicates that a
+       row of data is available, a truthy value is returned.
+       If no row of data is available, a falsy
+       value is returned.  Throws on error.
     */
     step: function(){
       affirmUnlocked(this, 'step()');
@@ -1242,8 +1265,38 @@
             this._mayGet = false;
             console.warn("sqlite3_step() rc=",rc,"SQL =",
                          capi.sqlite3_sql(this.pointer));
-            checkDbRc(this.db.pointer, rc);
-      };
+            DB.checkRc(this.db.pointer, rc);
+      }
+    },
+    /**
+       Functions like step() except that
+       it finalizes this statement immediately after stepping unless
+       the step cannot be performed because the statement is
+       locked. Throws on error, but any error other than the
+       statement-is-locked case will also trigger finalization of this
+       statement.
+
+       On success, it returns true if the step indicated that a row of
+       data was available, else it returns false.
+
+       This is intended to simplify use cases such as:
+
+       ```
+       aDb.prepare("insert in foo(a) values(?)").bind(123).stepFinalize();
+       ```
+    */
+    stepFinalize: function(){
+      affirmUnlocked(this, 'step()');
+      const rc = capi.sqlite3_step(affirmStmtOpen(this).pointer);
+      switch(rc){
+          case capi.SQLITE_DONE: this.finalize(); return false;
+          case capi.SQLITE_ROW: this.finalize(); return true;
+          default:
+            this.finalize();
+            console.warn("sqlite3_step() rc=",rc,"SQL =",
+                         capi.sqlite3_sql(this.pointer));
+            DB.checkRc(this.db.pointer, rc);
+      }
     },
     /**
        Fetches the value from the given 0-based column index of
diff --git a/manifest b/manifest
index 1c235509d7..e90ec6ca06 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Corrected\sTextDecoder.decode()\susage\sto\srun\swhen\sits\sinput\sreferences\sa\sSharedArrayBuffer.
-D 2022-08-13T13:42:07.359
+C wasm\sOO\sAPI\s#1:\sadded\sDB.callInTransaction()\sand\sStmt.stepFinalize().
+D 2022-08-13T13:46:19.722
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -483,7 +483,7 @@ F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba814
 F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a4a06cb776c003880b
 F ext/wasm/api/sqlite3-api-cleanup.js 149fd63a0400cd1d69548887ffde2ed89c13283384a63c2e9fcfc695e38a9e11
 F ext/wasm/api/sqlite3-api-glue.js 82c09f49c69984009ba5af2b628e67cc26c5dd203d383cd3091d40dab4e6514b
-F ext/wasm/api/sqlite3-api-oo1.js e9612cb704c0563c5d71ed2a8dccd95bf6394fa4de3115d1b978dc269c49ab02
+F ext/wasm/api/sqlite3-api-oo1.js a3469bbb217b9787ba9aa6216423ec55cf9457fecefb9698e433d0e1cc4cc918
 F ext/wasm/api/sqlite3-api-opfs.js c93cdd14f81a26b3a64990515ee05c7e29827fbc8fba4e4c2fef3a37a984db89
 F ext/wasm/api/sqlite3-api-prologue.js 0fb0703d2d8ac89fa2d4dd8f9726b0ea226b8708ac34e5b482df046e147de0eb
 F ext/wasm/api/sqlite3-api-worker.js 1124f404ecdf3c14d9f829425cef778cd683911a9883f0809a463c3c7773c9fd
@@ -1999,8 +1999,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 b3a93ec75acb38535691d6eaceb5a1a218a5ee3f755a1e12c9255b90567fc795
-R 243b6e88d1ed7db99fd955f733548f1c
+P d4d773405c579e7efd95be8d81fe14d71218e62e44c523d38e02f89424ba6ce8
+R d6004d575cfc0551ba9a0fec437e8b0f
 U stephan
-Z ddf468f7ec78d048a46e361913445144
+Z 111c1d0636763c3347de9dc9f9b9e9af
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index ab645ba532..d1493580ab 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d4d773405c579e7efd95be8d81fe14d71218e62e44c523d38e02f89424ba6ce8
\ No newline at end of file
+e37dddc1dd9c0530e4b1c6cb0ca7cba7451caa37734d383c9b47f378d7222242
\ No newline at end of file

From 90218aec7a0991199b3e06faf723dd482bf970f6 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sat, 13 Aug 2022 13:51:56 +0000
Subject: [PATCH 005/428] Remove OPFS from the fiddle build for the time being
 - will re-enable once the breakage is figured out via testing with the core
 API.

FossilOrigin-Name: 3bc510a614973eafa60960a99bedb063594a693bdbfd80d7eb480b293b4ab811
---
 Makefile.in                      | 13 +++++++++++--
 ext/wasm/fiddle/fiddle-worker.js | 18 +-----------------
 manifest                         | 14 +++++++-------
 manifest.uuid                    |  2 +-
 4 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 00ea77f045..c9de1403f4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1542,12 +1542,21 @@ $(sqlite3_wasm_c): sqlite3.c
 #emcc_opt = -O2
 #emcc_opt = -O3
 emcc_opt = -Oz
-emcc_flags_opfs = -sWASMFS -pthread '-DSQLITE_DEFAULT_UNIX_VFS="unix-none"'
+emcc_environment = web
+# WASMFS OPFS is currently completely broken under fiddle but the
+# root cause has not yet been determined.
+emcc_flags_opfs =
+#emcc_flags_opfs += -sWASMFS -pthread
+#emcc_environment = web,worker
+#emcc_flags_opfs += -DSQLITE_WASM_OPFS
+#emcc_flags_opfs += '-DSQLITE_DEFAULT_UNIX_VFS="unix-none"'
+#emcc_flags_opfs += -sPTHREAD_POOL_SIZE=2
+#emcc_flags_opfs += -sPTHREAD_POOL_SIZE_STRICT=2
 emcc_flags = $(emcc_opt) \
         -sALLOW_TABLE_GROWTH \
         -sABORTING_MALLOC \
         -sSTRICT_JS \
-        -sENVIRONMENT=web,worker \
+        -sENVIRONMENT=$(emcc_environment) \
         -sMODULARIZE \
         -sEXPORTED_RUNTIME_METHODS=@$(wasm_dir_abs)/EXPORTED_RUNTIME_METHODS.fiddle \
         -sDYNAMIC_EXECUTION=0 \
diff --git a/ext/wasm/fiddle/fiddle-worker.js b/ext/wasm/fiddle/fiddle-worker.js
index fb9fd30229..5bc1391753 100644
--- a/ext/wasm/fiddle/fiddle-worker.js
+++ b/ext/wasm/fiddle/fiddle-worker.js
@@ -296,23 +296,7 @@
      emcc ... -sMODULARIZE=1 -sEXPORT_NAME=initFiddleModule
   */
   initFiddleModule(fiddleModule).then(function(thisModule){
-    fiddleModule.fsUnlink = fiddleModule.cwrap('sqlite3_wasm_vfs_unlink','number',['string']);
-    (function initOpfs(){
-      if(!self.FileSystemHandle || !self.FileSystemDirectoryHandle
-         || !self.FileSystemFileHandle){
-        stdout("OPFS unavailable. All DB state is transient.");
-        return;
-      }
-      try {
-        if(0===fiddleModule.ccall('sqlite3_wasm_init_opfs', undefined)){
-          stdout("Initialized OPFS WASMFS backend.");
-        }else{
-          stderr("Initialization of OPFS WASMFS backend failed.");
-        }
-      }catch(e){
-        stderr("Apparently missing WASMFS:",e.message);
-      }
-    })();
+    thisModule.fsUnlink = thisModule.cwrap('sqlite3_wasm_vfs_unlink','number',['string']);
     wMsg('fiddle-ready');
   });
 })();
diff --git a/manifest b/manifest
index e90ec6ca06..73a423621e 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C wasm\sOO\sAPI\s#1:\sadded\sDB.callInTransaction()\sand\sStmt.stepFinalize().
-D 2022-08-13T13:46:19.722
+C Remove\sOPFS\sfrom\sthe\sfiddle\sbuild\sfor\sthe\stime\sbeing\s-\swill\sre-enable\sonce\sthe\sbreakage\sis\sfigured\sout\svia\stesting\swith\sthe\score\sAPI.
+D 2022-08-13T13:51:56.967
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in 5d0dfceebf19ccbce323181fa14fe15c3bc470293420a6b680fc76a1b1779087
+F Makefile.in 419791c8e6f5fda6bf33977680e8f3bf782f5f6ec56b5c22567912c7f8fef353
 F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
 F Makefile.msc d547a2fdba38a1c6cd1954977d0b0cc017f5f8fbfbc65287bf8d335808938016
 F README.md 8b8df9ca852aeac4864eb1e400002633ee6db84065bd01b78c33817f97d31f5e
@@ -495,7 +495,7 @@ F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d695
 F ext/wasm/common/testing.css 572cf1ffae0b6eb7ca63684d3392bf350217a07b90e7a896e4fa850700c989b0
 F ext/wasm/common/whwasmutil.js 41b8e097e0a9cb07c24c0ede3c81b72470a63f4a4efb07f75586dc131569f5ae
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
-F ext/wasm/fiddle/fiddle-worker.js c9d66230269cc26d33aa84501ae601c24f8697c3711be5d769c4c687bfcaba8f
+F ext/wasm/fiddle/fiddle-worker.js bccf46045be8824752876f3eec01c223be0616ccac184bffd0024cfe7a3262b8
 F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
 F ext/wasm/fiddle/fiddle.js bef4b30e078445a7cd2255fba07acd083aa1c3cc074a73b38ea847fd340f1adc
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
@@ -1999,8 +1999,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 d4d773405c579e7efd95be8d81fe14d71218e62e44c523d38e02f89424ba6ce8
-R d6004d575cfc0551ba9a0fec437e8b0f
+P e37dddc1dd9c0530e4b1c6cb0ca7cba7451caa37734d383c9b47f378d7222242
+R 988d3478699d43ef2ce9b5c2bc8119e6
 U stephan
-Z 111c1d0636763c3347de9dc9f9b9e9af
+Z c96da5568e2699a3b63963443a07c191
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index d1493580ab..f61125d960 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e37dddc1dd9c0530e4b1c6cb0ca7cba7451caa37734d383c9b47f378d7222242
\ No newline at end of file
+3bc510a614973eafa60960a99bedb063594a693bdbfd80d7eb480b293b4ab811
\ No newline at end of file

From 9a4c63b0fc85a019d3183abbd7939b081f45d025 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sat, 13 Aug 2022 13:56:00 +0000
Subject: [PATCH 006/428] Cleanups in the wasmfs/opfs integration but disable
 it in order to get the build into a known-working state before continuing
 with experimentation.

FossilOrigin-Name: 41045be752a5bd7966849638f3ca56f4905308df70f79f2cb6196ca7dce9d525
---
 ext/wasm/GNUmakefile                 | 27 +++++++++------
 ext/wasm/api/sqlite3-api-prologue.js | 49 ++++++++++++++++++++++++++++
 ext/wasm/api/sqlite3-wasm.c          | 27 ++++++++++++---
 ext/wasm/testing1.js                 |  5 +--
 ext/wasm/testing2.js                 |  2 +-
 manifest                             | 20 ++++++------
 manifest.uuid                        |  2 +-
 7 files changed, 103 insertions(+), 29 deletions(-)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index e32febbfc3..dad77dba0a 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -127,9 +127,9 @@ sqlite3-api.jses := \
   $(dir.jacc)/jaccwabyt.js \
   $(dir.api)/sqlite3-api-glue.js \
   $(dir.api)/sqlite3-api-oo1.js \
-  $(dir.api)/sqlite3-api-worker.js \
-  $(dir.api)/sqlite3-api-opfs.js \
-  $(dir.api)/sqlite3-api-cleanup.js
+  $(dir.api)/sqlite3-api-worker.js
+#sqlite3-api.jses += $(dir.api)/sqlite3-api-opfs.js 
+sqlite3-api.jses += $(dir.api)/sqlite3-api-cleanup.js
 
 sqlite3-api.js := $(dir.api)/sqlite3-api.js
 CLEAN_FILES += $(sqlite3-api.js)
@@ -174,7 +174,6 @@ emcc.cflags += -pthread
 # emcc flags specific to building the final .js/.wasm file...
 emcc.jsflags := -fPIC
 emcc.jsflags += --no-entry
-emcc.jsflags += -sENVIRONMENT=web,worker
 emcc.jsflags += -sMODULARIZE
 emcc.jsflags += -sSTRICT_JS
 emcc.jsflags += -sDYNAMIC_EXECUTION=0
@@ -183,7 +182,12 @@ emcc.jsflags += -sEXPORTED_FUNCTIONS=@$(dir.wasm)/EXPORTED_FUNCTIONS.api
 emcc.jsflags += -sEXPORTED_RUNTIME_METHODS=FS,wasmMemory # wasmMemory==>for -sIMPORTED_MEMORY
 emcc.jsflags += -sUSE_CLOSURE_COMPILER=0
 emcc.jsflags += -sIMPORTED_MEMORY
-emcc.jsflags += -pthread -sWASMFS
+emcc.environment := -sENVIRONMENT=web
+ifeq (0,1)
+  emcc.jsflags += -pthread -sWASMFS -sPTHREAD_POOL_SIZE=2
+  emcc.environment := $(emcc.environment),worker
+endif
+emcc.jsflags += $(emcc.environment)
 #emcc.jsflags += -sINITIAL_MEMORY=13107200
 #emcc.jsflags += -sTOTAL_STACK=4194304
 emcc.jsflags += -sEXPORT_NAME=sqlite3InitModule
@@ -235,11 +239,14 @@ $(dir.api)/sqlite3-wasm.o: $(dir.top)/sqlite3.c
 $(dir.api)/wasm_util.o: emcc.cflags += $(SQLITE_OPT)
 sqlite3.wasm.c := $(dir.api)/sqlite3-wasm.c \
     $(dir.jacc)/jaccwabyt_test.c
-# ^^^ FIXME (how?): jaccwabyt_test.c is only needed for the test
-# apps. However, we want to test the release builds with those apps,
-# so we cannot simply elide that file in release builds. That
-# component is critical to the VFS bindings so needs to be tested
-# along with the core APIs.
+# ^^^ FIXME (how?): jaccwabyt_test.c is only needed for the test apps,
+# so we don't really want to include it in release builds. However, we
+# want to test the release builds with those apps, so we cannot simply
+# elide that file in release builds. That component is critical to the
+# VFS bindings so needs to be tested along with the core APIs.
+ifneq (,$(filter -sWASMFS,$(emcc.jsflags)))
+  $(dir.api)/sqlite3-wasm.o: emcc.cflags+=-DSQLITE_WASM_OPFS
+endif
 define WASM_C_COMPILE
 $(1).o := $$(subst .c,.o,$(1))
 sqlite3.wasm.obj += $$($(1).o)
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 60ed61477e..08e3ebf6ed 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -576,6 +576,55 @@ self.sqlite3ApiBootstrap = function(config){
       ["sqlite3_total_changes64", "i64", ["sqlite3*"]]
   ];
 
+  /** State for sqlite3_web_persistent_dir(). */
+  let __persistentDir;
+  /**
+     An experiment. Do not use.
+
+     If the wasm environment has a persistent storage directory,
+     its path is returned by this function. If it does not then
+     it returns one of:
+
+     - `undefined` if initIfNeeded is false and this function has
+       never been called before.
+
+     - `""` if no persistent storage is available.
+
+     Note that in both cases the return value is falsy.
+  */
+  capi.sqlite3_web_persistent_dir = function(initIfNeeded=true){
+    if(undefined !== __persistentDir) return __persistentDir;
+    else if(!initIfNeeded) return;
+    // If we have no OPFS, there is no persistent dir
+    if(!self.FileSystemHandle || !self.FileSystemDirectoryHandle
+       || !self.FileSystemFileHandle){
+      return __persistentDir = "";
+    }
+    try{
+      if(0===this.wasm.xCall('sqlite3_wasm_init_opfs')){
+        /** OPFS does not support locking and will trigger errors if
+            we try to lock. We don't _really_ want to
+            _unconditionally_ install a non-locking sqlite3 VFS as the
+            default, but we do so here for simplicy's sake for the
+            time being. That said: locking is a no-op on all of the
+            current WASM storage, so this isn't (currently) as bad as
+            it may initially seem. */
+        const pVfs = this.sqlite3_vfs_find("unix-none");
+        if(pVfs){
+          this.sqlite3_vfs_register(pVfs,1);
+          //warn("Installed 'unix-none' as the default sqlite3 VFS.");
+        }
+        return __persistentDir =
+          "/persistent" /* name is hard-coded in sqlite3_wasm_init_opfs()!*/;
+      }else{
+        return __persistentDir = "";
+      }
+    }catch(e){
+      // sqlite3_wasm_init_opfs() is not available
+      return __persistentDir = "";
+    }
+  }.bind(capi);
+
   /* The remainder of the API will be set up in later steps. */
   return {
     capi,
diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index 30a9dafeb8..487baecf10 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -430,7 +430,7 @@ int sqlite3_wasm_vfs_unlink(const char * zName){
   return rc;
 }
 
-#ifdef __EMSCRIPTEN__
+#if defined(__EMSCRIPTEN__) && defined(SQLITE_WASM_OPFS)
 #include <emscripten/wasmfs.h>
 #include <emscripten/console.h>
 /*
@@ -443,17 +443,34 @@ int sqlite3_wasm_vfs_unlink(const char * zName){
 ** WASMFS backend impl for OPFS. On success, subsequent calls are
 ** no-ops.
 **
-** Returns 0 on success, SQLITE_NOMEM if intantiation of the backend
-** object fails.
+** Returns 0 on success, SQLITE_NOMEM if instantiation of the backend
+** object fails, SQLITE_IOERR if mkdir() of the "/persistent" dir in
+** the virtual FS fails. In builds compiled without SQLITE_WASM_OPFS
+** defined, SQLITE_NOTFOUND is returned without side effects.
 */
 int sqlite3_wasm_init_opfs(void){
   static backend_t pOpfs = 0;
+  static const char * zDir = "/persistent";
   if( !pOpfs ){
     pOpfs = wasmfs_create_opfs_backend();
     if( pOpfs ){
-      emscripten_console_log("Created OPFS WASMFS backend.");
+      emscripten_console_log("Created WASMFS OPFS backend.");
     }
   }
+  /** It's not enough to instantiate the backend. We have to create a
+      mountpoint in the VFS and attach the backend to it. */
+  if( pOpfs && 0!=access(zDir, F_OK) ){
+    /* mkdir() simply hangs when called from fiddle app. Cause is
+       not yet determined but the hypothesis is an init-order
+       issue. */
+    const int rc = wasmfs_create_directory(zDir, 0777, pOpfs);
+    emscripten_console_log(rc ? "OPFS mkdir failed." : "OPFS mkdir ok.");
+    if(rc) return SQLITE_IOERR;
+  }
   return pOpfs ? 0 : SQLITE_NOMEM;
 }
-#endif /* __EMSCRIPTEN__ */
+#else
+int sqlite3_wasm_init_opfs(void){
+  return SQLITE_NOTFOUND;
+}
+#endif /* __EMSCRIPTEN__ && SQLITE_WASM_OPFS */
diff --git a/ext/wasm/testing1.js b/ext/wasm/testing1.js
index a733156e7a..779e0bd72f 100644
--- a/ext/wasm/testing1.js
+++ b/ext/wasm/testing1.js
@@ -19,7 +19,8 @@
   const toss = function(...args){throw new Error(args.join(' '))};
   const debug = console.debug.bind(console);
   const eOutput = document.querySelector('#test-output');
-  const log = console.log.bind(console)
+  const log = console.log.bind(console),
+        warn = console.warn.bind(console);
   const logHtml = function(...args){
     log.apply(this, args);
     const ln = document.createElement('div');
@@ -1012,7 +1013,7 @@
           wasm = capi.wasm;
     log("Loaded module:",capi.sqlite3_libversion(), capi.sqlite3_sourceid());
     log("Build options:",wasm.compileOptionUsed());
-
+    capi.sqlite3_web_persistent_dir()/*will install OPFS if available, plus a and non-locking VFS*/;
     if(1){
       /* Let's grab those last few lines of test coverage for
          sqlite3-api.js... */
diff --git a/ext/wasm/testing2.js b/ext/wasm/testing2.js
index 3a279513f8..f6792955f8 100644
--- a/ext/wasm/testing2.js
+++ b/ext/wasm/testing2.js
@@ -20,7 +20,7 @@
     id: undefined
   };
   const eOutput = document.querySelector('#test-output');
-  const log = console.log.bind(console)
+  const log = console.log.bind(console);
   const logHtml = function(cssClass,...args){
     log.apply(this, args);
     const ln = document.createElement('div');
diff --git a/manifest b/manifest
index 73a423621e..f1d2fe4641 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sOPFS\sfrom\sthe\sfiddle\sbuild\sfor\sthe\stime\sbeing\s-\swill\sre-enable\sonce\sthe\sbreakage\sis\sfigured\sout\svia\stesting\swith\sthe\score\sAPI.
-D 2022-08-13T13:51:56.967
+C Cleanups\sin\sthe\swasmfs/opfs\sintegration\sbut\sdisable\sit\sin\sorder\sto\sget\sthe\sbuild\sinto\sa\sknown-working\sstate\sbefore\scontinuing\swith\sexperimentation.
+D 2022-08-13T13:56:00.886
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle db7a4602f043cf4a5e4135be3609a487f9f1c83f05778bfbdf93766be4541b96
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile c354ad5ce3ecec80c28ed4314827adc10cbbc0ef47e028b0cfbdf336c4a98fa4
+F ext/wasm/GNUmakefile 15ee5d1e182bcee23f0a5fa8062697f4135606c642efe600fa2d5e794ad71588
 F ext/wasm/README.md 4b00ae7c7d93c4591251245f0996a319e2651361013c98d2efb0b026771b7331
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 77ef4bcf37e362b9ad61f9c175dfc0f1b3e571563fb311b96581cf422ee6a8ec
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -485,10 +485,10 @@ F ext/wasm/api/sqlite3-api-cleanup.js 149fd63a0400cd1d69548887ffde2ed89c13283384
 F ext/wasm/api/sqlite3-api-glue.js 82c09f49c69984009ba5af2b628e67cc26c5dd203d383cd3091d40dab4e6514b
 F ext/wasm/api/sqlite3-api-oo1.js a3469bbb217b9787ba9aa6216423ec55cf9457fecefb9698e433d0e1cc4cc918
 F ext/wasm/api/sqlite3-api-opfs.js c93cdd14f81a26b3a64990515ee05c7e29827fbc8fba4e4c2fef3a37a984db89
-F ext/wasm/api/sqlite3-api-prologue.js 0fb0703d2d8ac89fa2d4dd8f9726b0ea226b8708ac34e5b482df046e147de0eb
+F ext/wasm/api/sqlite3-api-prologue.js c0f335bf8b44071da0204b8fa95ce78fd737033b155e7bcfdaee6ae64600802f
 F ext/wasm/api/sqlite3-api-worker.js 1124f404ecdf3c14d9f829425cef778cd683911a9883f0809a463c3c7773c9fd
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c 0b3f56078f3e3806fb6dfbc756198d1634d3bfdbf3677c77702cf453c4ed336a
+F ext/wasm/api/sqlite3-wasm.c 0e78035045e3328fb050ec9580c6bfb714c756a1d3b917259e58baf9b0332c98
 F ext/wasm/api/sqlite3-worker.js 1325ca8d40129a82531902a3a077b795db2eeaee81746e5a0c811a04b415fa7f
 F ext/wasm/common/SqliteTestUtil.js e41a1406f18da9224523fad0c48885caf995b56956a5b9852909c0989e687e90
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
@@ -503,9 +503,9 @@ F ext/wasm/jaccwabyt/jaccwabyt.md 447cc02b598f7792edaa8ae6853a7847b8178a18ed356a
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
 F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e568d2c2307c416902059339c06f19
 F ext/wasm/testing1.html 0bf3ff224628c1f1e3ed22a2dc1837c6c73722ad8c0ad9c8e6fb9e6047667231
-F ext/wasm/testing1.js cba7134901a965743fa9289d82447ab71de4690b1ee5d06f6cb83e8b569d7943
+F ext/wasm/testing1.js a25069e20d5f8dc548cc98bcf7002cec812084421a1f7f70ffae2c706d1167b2
 F ext/wasm/testing2.html 73e5048e666fd6fb28b6e635677a9810e1e139c599ddcf28d687c982134b92b8
-F ext/wasm/testing2.js d37433c601f88ed275712c1cfc92d3fb36c7c22e1ed8c7396fb2359e42238ebc
+F ext/wasm/testing2.js 1cd14be666e40da41d7eea5723b1953ce54f1077c199887a73d3d5cfb71dbd05
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
@@ -1999,8 +1999,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 e37dddc1dd9c0530e4b1c6cb0ca7cba7451caa37734d383c9b47f378d7222242
-R 988d3478699d43ef2ce9b5c2bc8119e6
+P 3bc510a614973eafa60960a99bedb063594a693bdbfd80d7eb480b293b4ab811
+R a2b4eef7c61958031f6931d9df602912
 U stephan
-Z c96da5568e2699a3b63963443a07c191
+Z 3b291cb3c0f3e97625538cf3bb7fa23a
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f61125d960..91690836df 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3bc510a614973eafa60960a99bedb063594a693bdbfd80d7eb480b293b4ab811
\ No newline at end of file
+41045be752a5bd7966849638f3ca56f4905308df70f79f2cb6196ca7dce9d525
\ No newline at end of file

From 1025227272ac7a16d0869d7cacde54603f5e2148 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sat, 13 Aug 2022 16:11:38 +0000
Subject: [PATCH 007/428] Add scratchpad/test app for WASMFS/OPFS running in
 the main window thread. Enable WASMFS by default in the library build.

FossilOrigin-Name: ae24ac0f7dd9e12a40de0f6ccd61a16f010804da454085f886c217cc600cdba4
---
 ext/wasm/GNUmakefile               | 21 +++++----
 ext/wasm/scratchpad-opfs-main.html | 40 ++++++++++++++++
 ext/wasm/scratchpad-opfs-main.js   | 73 ++++++++++++++++++++++++++++++
 manifest                           | 14 +++---
 manifest.uuid                      |  2 +-
 5 files changed, 133 insertions(+), 17 deletions(-)
 create mode 100644 ext/wasm/scratchpad-opfs-main.html
 create mode 100644 ext/wasm/scratchpad-opfs-main.js

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index dad77dba0a..1fc2a57652 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -168,7 +168,6 @@ emcc.cflags :=
 emcc.cflags += -std=c99 -fPIC
 # -------------^^^^^^^^ we currently need c99 for WASM-specific sqlite3 APIs.
 emcc.cflags += -I. -I$(dir.top) # $(SQLITE_OPT)
-emcc.cflags += -pthread
 
 ########################################################################
 # emcc flags specific to building the final .js/.wasm file...
@@ -183,36 +182,38 @@ emcc.jsflags += -sEXPORTED_RUNTIME_METHODS=FS,wasmMemory # wasmMemory==>for -sIM
 emcc.jsflags += -sUSE_CLOSURE_COMPILER=0
 emcc.jsflags += -sIMPORTED_MEMORY
 emcc.environment := -sENVIRONMENT=web
-ifeq (0,1)
+ENABLE_WASMFS := 1
+ifneq (0,$(ENABLE_WASMFS))
+  emcc.cflags += -pthread
   emcc.jsflags += -pthread -sWASMFS -sPTHREAD_POOL_SIZE=2
   emcc.environment := $(emcc.environment),worker
+else
+  emcc.jsflags += -sALLOW_MEMORY_GROWTH
+  # emcc: warning: USE_PTHREADS + ALLOW_MEMORY_GROWTH may run non-wasm code
+  #       slowly, see https://github.com/WebAssembly/design/issues/1271
+  #       [-Wpthreads-mem-growth]
 endif
 emcc.jsflags += $(emcc.environment)
 #emcc.jsflags += -sINITIAL_MEMORY=13107200
 #emcc.jsflags += -sTOTAL_STACK=4194304
 emcc.jsflags += -sEXPORT_NAME=sqlite3InitModule
 emcc.jsflags += -sGLOBAL_BASE=4096 # HYPOTHETICALLY keep func table indexes from overlapping w/ heap addr.
-emcc.jsflags +=--post-js=$(post-js.js)
+emcc.jsflags += --post-js=$(post-js.js)
 #emcc.jsflags += -sSTRICT # fails due to missing __syscall_...()
 #emcc.jsflags += -sALLOW_UNIMPLEMENTED_SYSCALLS
 #emcc.jsflags += -sFILESYSTEM=0 # only for experimentation. sqlite3 needs the FS API
 #emcc.jsflags += -sABORTING_MALLOC
-emcc.jsflags += -sALLOW_MEMORY_GROWTH
 emcc.jsflags += -sALLOW_TABLE_GROWTH
 emcc.jsflags += -Wno-limited-postlink-optimizations
 # ^^^^^ it likes to warn when we have "limited optimizations" via the -g3 flag.
-#emcc.jsflags += -sMALLOC=emmalloc
-#emcc.jsflags += -sMALLOC=dlmalloc # a good 8k larger than emmalloc
 #emcc.jsflags += -sSTANDALONE_WASM # causes OOM errors, not sure why
-#emcc.jsflags += --import=foo_bar
-#emcc.jsflags += --no-gc-sections
 # https://lld.llvm.org/WebAssembly.html
 emcc.jsflags += -sERROR_ON_UNDEFINED_SYMBOLS=0
 emcc.jsflags += -sLLD_REPORT_UNDEFINED
 #emcc.jsflags += --allow-undefined
 emcc.jsflags += --import-undefined
 #emcc.jsflags += --unresolved-symbols=import-dynamic --experimental-pic
-#emcc.jsflags +=  --experimental-pic --unresolved-symbols=ingore-all --import-undefined
+#emcc.jsflags += --experimental-pic --unresolved-symbols=ingore-all --import-undefined
 #emcc.jsflags += --unresolved-symbols=ignore-all
 enable_bigint ?= 1
 ifneq (0,$(enable_bigint))
@@ -228,7 +229,7 @@ emcc.jsflags += -sMEMORY64=0
 #  new Uint8Array(heapWrappers().HEAP8U.buffer, ptr, n)
 #
 # because ptr is now a BigInt, so is invalid for passing to arguments
-# which have strict must-be-a-number requirements.
+# which have strict must-be-a-Number requirements.
 ########################################################################
 
 
diff --git a/ext/wasm/scratchpad-opfs-main.html b/ext/wasm/scratchpad-opfs-main.html
new file mode 100644
index 0000000000..36ae55c147
--- /dev/null
+++ b/ext/wasm/scratchpad-opfs-main.html
@@ -0,0 +1,40 @@
+<!doctype html>
+<html lang="en-us">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
+    <link rel="stylesheet" href="common/emscripten.css"/>
+    <link rel="stylesheet" href="common/testing.css"/>
+    <title>sqlite3 WASMFS/OPFS Main-thread Scratchpad</title>
+  </head>
+  <body>
+    <header id='titlebar'><span>sqlite3 WASMFS/OPFS Main-thread Scratchpad</span></header>
+    <!-- emscripten bits -->
+    <figure id="module-spinner">
+      <div class="spinner"></div>
+      <div class='center'><strong>Initializing app...</strong></div>
+      <div class='center'>
+        On a slow internet connection this may take a moment.  If this
+        message displays for "a long time", intialization may have
+        failed and the JavaScript console may contain clues as to why.
+      </div>
+    </figure>
+    <div class="emscripten" id="module-status">Downloading...</div>
+    <div class="emscripten">
+      <progress value="0" max="100" id="module-progress" hidden='1'></progress>  
+    </div><!-- /emscripten bits -->
+    <p>Scratchpad/test app for the WASMF/OPFS integration in the
+      main window thread. This page requires that the sqlite3 API have
+      been built with WASMFS support. If OPFS support is available then
+      it "should" persist a database across reloads (watch the dev console
+      output), otherwise it will not.
+    </p>
+    <p>All stuff on this page happens in the dev console.</p>
+    <hr>
+    <div id='test-output'></div>
+    <script src="api/sqlite3.js"></script>
+    <script src="common/SqliteTestUtil.js"></script>
+    <script src="scratchpad-opfs-main.js"></script>
+  </body>
+</html>
diff --git a/ext/wasm/scratchpad-opfs-main.js b/ext/wasm/scratchpad-opfs-main.js
new file mode 100644
index 0000000000..f0e38fc86e
--- /dev/null
+++ b/ext/wasm/scratchpad-opfs-main.js
@@ -0,0 +1,73 @@
+/*
+  2022-05-22
+
+  The author disclaims copyright to this source code.  In place of a
+  legal notice, here is a blessing:
+
+  *   May you do good and not evil.
+  *   May you find forgiveness for yourself and forgive others.
+  *   May you share freely, never taking more than you give.
+
+  ***********************************************************************
+
+  A basic test script for sqlite3-api.js. This file must be run in
+  main JS thread and sqlite3.js must have been loaded before it.
+*/
+'use strict';
+(function(){
+  const toss = function(...args){throw new Error(args.join(' '))};
+  const log = console.log.bind(console),
+        warn = console.warn.bind(console),
+        error = console.error.bind(console);
+
+  const stdout = log;
+  const stderr = error;
+
+  const test1 = function(db){
+    db.execMulti("create table if not exists t(a);")
+      .callInTransaction(function(db){
+        db.prepare("insert into t(a) values(?)")
+          .bind(new Date().getTime())
+          .stepFinalize();
+        stdout("Number of values in table t:",
+            db.selectValue("select count(*) from t"));
+      });
+  };
+
+  const runTests = function(Module){
+    //stdout("Module",Module);
+    self._MODULE = Module /* this is only to facilitate testing from the console */;
+    const sqlite3 = Module.sqlite3,
+          capi = sqlite3.capi,
+          oo = sqlite3.oo1,
+          wasm = capi.wasm;
+    stdout("Loaded sqlite3:",capi.sqlite3_libversion(), capi.sqlite3_sourceid());
+    const persistentDir = capi.sqlite3_web_persistent_dir();
+    if(persistentDir){
+      stdout("Persistent storage dir:",persistentDir);
+    }else{
+      stderr("No persistent storage available.");
+    }
+    const startTime = performance.now();
+    let db;
+    try {
+      db = new oo.DB(persistentDir+'/foo.db');
+      stdout("DB filename:",db.filename,db.fileName());
+      const banner1 = '>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>',
+            banner2 = '<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<';
+      [
+        test1
+      ].forEach((f)=>{
+        const n = performance.now();
+        stdout(banner1,"Running",f.name+"()...");
+        f(db, sqlite3, Module);
+        stdout(banner2,f.name+"() took ",(performance.now() - n),"ms");
+      });
+    }finally{
+      if(db) db.close();
+    }
+    stdout("Total test time:",(performance.now() - startTime),"ms");
+  };
+
+  sqlite3InitModule(self.sqlite3TestModule).then(runTests);
+})();
diff --git a/manifest b/manifest
index f1d2fe4641..a573cd64fc 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Cleanups\sin\sthe\swasmfs/opfs\sintegration\sbut\sdisable\sit\sin\sorder\sto\sget\sthe\sbuild\sinto\sa\sknown-working\sstate\sbefore\scontinuing\swith\sexperimentation.
-D 2022-08-13T13:56:00.886
+C Add\sscratchpad/test\sapp\sfor\sWASMFS/OPFS\srunning\sin\sthe\smain\swindow\sthread.\sEnable\sWASMFS\sby\sdefault\sin\sthe\slibrary\sbuild.
+D 2022-08-13T16:11:38.873
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle db7a4602f043cf4a5e4135be3609a487f9f1c83f05778bfbdf93766be4541b96
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile 15ee5d1e182bcee23f0a5fa8062697f4135606c642efe600fa2d5e794ad71588
+F ext/wasm/GNUmakefile 1bcfcde973bfbf1ea59acc551728aaf0fc74fcb52ddcd219a9b0f93e42c744f0
 F ext/wasm/README.md 4b00ae7c7d93c4591251245f0996a319e2651361013c98d2efb0b026771b7331
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 77ef4bcf37e362b9ad61f9c175dfc0f1b3e571563fb311b96581cf422ee6a8ec
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -502,6 +502,8 @@ F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab26
 F ext/wasm/jaccwabyt/jaccwabyt.md 447cc02b598f7792edaa8ae6853a7847b8178a18ed356afacbdbf312b2588106
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
 F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e568d2c2307c416902059339c06f19
+F ext/wasm/scratchpad-opfs-main.html 079b6ec0b3a6c35c9ac92e639ede1b253b901c52ec6a793e5411babb708ace40
+F ext/wasm/scratchpad-opfs-main.js 55ac5a0841d6436ac2990a4c26fea7f7fb98b0cfbb02ac169dc91f3c9ed5303d
 F ext/wasm/testing1.html 0bf3ff224628c1f1e3ed22a2dc1837c6c73722ad8c0ad9c8e6fb9e6047667231
 F ext/wasm/testing1.js a25069e20d5f8dc548cc98bcf7002cec812084421a1f7f70ffae2c706d1167b2
 F ext/wasm/testing2.html 73e5048e666fd6fb28b6e635677a9810e1e139c599ddcf28d687c982134b92b8
@@ -1999,8 +2001,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 3bc510a614973eafa60960a99bedb063594a693bdbfd80d7eb480b293b4ab811
-R a2b4eef7c61958031f6931d9df602912
+P 41045be752a5bd7966849638f3ca56f4905308df70f79f2cb6196ca7dce9d525
+R 767e1ce7730172518cd5acb6e01d575b
 U stephan
-Z 3b291cb3c0f3e97625538cf3bb7fa23a
+Z 6b8d7c0e41c798b0afb745ee9b8f505a
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 91690836df..7336ee31ab 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-41045be752a5bd7966849638f3ca56f4905308df70f79f2cb6196ca7dce9d525
\ No newline at end of file
+ae24ac0f7dd9e12a40de0f6ccd61a16f010804da454085f886c217cc600cdba4
\ No newline at end of file

From a7234901b22f95f6079249f0acdce97646760a28 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sat, 13 Aug 2022 16:36:06 +0000
Subject: [PATCH 008/428] wasmfs: use unix-none VFS by default to avoid locking
 errors in non-OPFS mode.

FossilOrigin-Name: 75561dea1a1afe9cb0a7d58dd82fa519e51cf42e330922cfd8e9ccdf6db4dc0f
---
 ext/wasm/GNUmakefile             |  3 ++-
 ext/wasm/scratchpad-opfs-main.js |  2 +-
 manifest                         | 14 +++++++-------
 manifest.uuid                    |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 1fc2a57652..1b058b342b 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -182,9 +182,10 @@ emcc.jsflags += -sEXPORTED_RUNTIME_METHODS=FS,wasmMemory # wasmMemory==>for -sIM
 emcc.jsflags += -sUSE_CLOSURE_COMPILER=0
 emcc.jsflags += -sIMPORTED_MEMORY
 emcc.environment := -sENVIRONMENT=web
-ENABLE_WASMFS := 1
+ENABLE_WASMFS ?= 1
 ifneq (0,$(ENABLE_WASMFS))
   emcc.cflags += -pthread
+  emcc.cflags += '-DSQLITE_DEFAULT_UNIX_VFS="unix-none"'
   emcc.jsflags += -pthread -sWASMFS -sPTHREAD_POOL_SIZE=2
   emcc.environment := $(emcc.environment),worker
 else
diff --git a/ext/wasm/scratchpad-opfs-main.js b/ext/wasm/scratchpad-opfs-main.js
index f0e38fc86e..8e9d123584 100644
--- a/ext/wasm/scratchpad-opfs-main.js
+++ b/ext/wasm/scratchpad-opfs-main.js
@@ -24,7 +24,7 @@
   const stderr = error;
 
   const test1 = function(db){
-    db.execMulti("create table if not exists t(a);")
+    db.exec("create table if not exists t(a);")
       .callInTransaction(function(db){
         db.prepare("insert into t(a) values(?)")
           .bind(new Date().getTime())
diff --git a/manifest b/manifest
index a573cd64fc..8a59e270a3 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sscratchpad/test\sapp\sfor\sWASMFS/OPFS\srunning\sin\sthe\smain\swindow\sthread.\sEnable\sWASMFS\sby\sdefault\sin\sthe\slibrary\sbuild.
-D 2022-08-13T16:11:38.873
+C wasmfs:\suse\sunix-none\sVFS\sby\sdefault\sto\savoid\slocking\serrors\sin\snon-OPFS\smode.
+D 2022-08-13T16:36:06.930
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle db7a4602f043cf4a5e4135be3609a487f9f1c83f05778bfbdf93766be4541b96
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile 1bcfcde973bfbf1ea59acc551728aaf0fc74fcb52ddcd219a9b0f93e42c744f0
+F ext/wasm/GNUmakefile 5c9b08139739819fc6223954c1b832d90398e9115789189ab39e5fbc6c764269
 F ext/wasm/README.md 4b00ae7c7d93c4591251245f0996a319e2651361013c98d2efb0b026771b7331
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 77ef4bcf37e362b9ad61f9c175dfc0f1b3e571563fb311b96581cf422ee6a8ec
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -503,7 +503,7 @@ F ext/wasm/jaccwabyt/jaccwabyt.md 447cc02b598f7792edaa8ae6853a7847b8178a18ed356a
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
 F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e568d2c2307c416902059339c06f19
 F ext/wasm/scratchpad-opfs-main.html 079b6ec0b3a6c35c9ac92e639ede1b253b901c52ec6a793e5411babb708ace40
-F ext/wasm/scratchpad-opfs-main.js 55ac5a0841d6436ac2990a4c26fea7f7fb98b0cfbb02ac169dc91f3c9ed5303d
+F ext/wasm/scratchpad-opfs-main.js a819ed26047c5539630cea59add6a5082ba04cdf82da2df2e0707d4d69af6cb1
 F ext/wasm/testing1.html 0bf3ff224628c1f1e3ed22a2dc1837c6c73722ad8c0ad9c8e6fb9e6047667231
 F ext/wasm/testing1.js a25069e20d5f8dc548cc98bcf7002cec812084421a1f7f70ffae2c706d1167b2
 F ext/wasm/testing2.html 73e5048e666fd6fb28b6e635677a9810e1e139c599ddcf28d687c982134b92b8
@@ -2001,8 +2001,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 41045be752a5bd7966849638f3ca56f4905308df70f79f2cb6196ca7dce9d525
-R 767e1ce7730172518cd5acb6e01d575b
+P ae24ac0f7dd9e12a40de0f6ccd61a16f010804da454085f886c217cc600cdba4
+R 04c2d08427afe72dca8dfa59a558b201
 U stephan
-Z 6b8d7c0e41c798b0afb745ee9b8f505a
+Z 16beafa09646f238ac043a3e648d875d
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 7336ee31ab..280b9edc80 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ae24ac0f7dd9e12a40de0f6ccd61a16f010804da454085f886c217cc600cdba4
\ No newline at end of file
+75561dea1a1afe9cb0a7d58dd82fa519e51cf42e330922cfd8e9ccdf6db4dc0f
\ No newline at end of file

From 0761780bc48753ed85c7d3513535496b36a015a9 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sat, 13 Aug 2022 17:13:16 +0000
Subject: [PATCH 009/428] Add worker-style variant of the tests added in
 [ae24ac0f7dd9], but building this with wasmfs causes them to throw
 inexplicable exceptions from the Emscripten glue (without wasmfs it builds
 and runs fine, but storage is not persistent).

FossilOrigin-Name: 6401595e59179c5c0f6e51c5362cf4391787e7a55b9c6ca655746e30d3251f2b
---
 ext/wasm/api/scratchpad-opfs-worker.js | 86 ++++++++++++++++++++++++++
 ext/wasm/scratchpad-opfs-worker.html   | 39 ++++++++++++
 ext/wasm/scratchpad-opfs-worker.js     | 33 ++++++++++
 manifest                               | 13 ++--
 manifest.uuid                          |  2 +-
 5 files changed, 167 insertions(+), 6 deletions(-)
 create mode 100644 ext/wasm/api/scratchpad-opfs-worker.js
 create mode 100644 ext/wasm/scratchpad-opfs-worker.html
 create mode 100644 ext/wasm/scratchpad-opfs-worker.js

diff --git a/ext/wasm/api/scratchpad-opfs-worker.js b/ext/wasm/api/scratchpad-opfs-worker.js
new file mode 100644
index 0000000000..5bc63c7966
--- /dev/null
+++ b/ext/wasm/api/scratchpad-opfs-worker.js
@@ -0,0 +1,86 @@
+/*
+  2022-05-22
+
+  The author disclaims copyright to this source code.  In place of a
+  legal notice, here is a blessing:
+
+  *   May you do good and not evil.
+  *   May you find forgiveness for yourself and forgive others.
+  *   May you share freely, never taking more than you give.
+
+  ***********************************************************************
+
+  An experiment for wasmfs/opfs. This file MUST be in the same dir as
+  the sqlite3.js emscripten module or that module won't be able to
+  resolve the relative URIs (importScript()'s relative URI handling
+  is, quite frankly, broken).
+*/
+'use strict';
+(function(){
+  const toss = function(...args){throw new Error(args.join(' '))};
+  importScripts('sqlite3.js');
+
+  /**
+     Posts a message in the form {type,data} unless passed more than 2
+     args, in which case it posts {type, data:[arg1...argN]}.
+  */
+  const wMsg = function(type,data){
+    postMessage({
+      type,
+      data: arguments.length<3
+        ? data
+        : Array.prototype.slice.call(arguments,1)
+    });
+  };
+
+  const stdout = console.log.bind(console);
+  const stderr = function(...args){wMsg('stderr', args);};
+
+  const test1 = function(db){
+    db.execMulti("create table if not exists t(a);")
+      .callInTransaction(function(db){
+        db.prepare("insert into t(a) values(?)")
+          .bind(new Date().getTime())
+          .stepFinalize();
+        stdout("Number of values in table t:",
+            db.selectValue("select count(*) from t"));
+      });
+  };
+
+  const runTests = function(Module){
+    //stdout("Module",Module);
+    self._MODULE = Module /* this is only to facilitate testing from the console */;
+    const sqlite3 = Module.sqlite3,
+          capi = sqlite3.capi,
+          oo = sqlite3.oo1,
+          wasm = capi.wasm;
+    stdout("Loaded sqlite3:",capi.sqlite3_libversion(), capi.sqlite3_sourceid());
+    const persistentDir = capi.sqlite3_web_persistent_dir();
+    if(persistentDir){
+      stderr("Persistent storage dir:",persistentDir);
+    }else{
+      stderr("No persistent storage available.");
+    }
+    const startTime = performance.now();
+    let db;
+    try {
+      db = new oo.DB(persistentDir+'/foo.db');
+      stdout("DB filename:",db.filename,db.fileName());
+      const banner1 = '>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>',
+            banner2 = '<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<';
+      [
+        test1
+      ].forEach((f)=>{
+        const n = performance.now();
+        stdout(banner1,"Running",f.name+"()...");
+        f(db, sqlite3, Module);
+        stdout(banner2,f.name+"() took ",(performance.now() - n),"ms");
+      });
+    }finally{
+      if(db) db.close();
+    }
+    stdout("Total test time:",(performance.now() - startTime),"ms");
+  };
+
+  sqlite3InitModule(self.sqlite3TestModule).then(runTests);
+})();
diff --git a/ext/wasm/scratchpad-opfs-worker.html b/ext/wasm/scratchpad-opfs-worker.html
new file mode 100644
index 0000000000..2f3e5b1de6
--- /dev/null
+++ b/ext/wasm/scratchpad-opfs-worker.html
@@ -0,0 +1,39 @@
+<!doctype html>
+<html lang="en-us">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
+    <link rel="stylesheet" href="common/emscripten.css"/>
+    <link rel="stylesheet" href="common/testing.css"/>
+    <title>sqlite3 WASMFS/OPFS Worker-thread Scratchpad</title>
+  </head>
+  <body>
+    <header id='titlebar'><span>sqlite3 WASMFS/OPFS Worker-thread Scratchpad</span></header>
+    <!-- emscripten bits -->
+    <!--figure id="module-spinner">
+      <div class="spinner"></div>
+      <div class='center'><strong>Initializing app...</strong></div>
+      <div class='center'>
+        On a slow internet connection this may take a moment.  If this
+        message displays for "a long time", intialization may have
+        failed and the JavaScript console may contain clues as to why.
+      </div>
+    </figure>
+    <div class="emscripten" id="module-status">Downloading...</div>
+    <div class="emscripten">
+      <progress value="0" max="100" id="module-progress" hidden='1'></progress>  
+    </div--><!-- /emscripten bits -->
+    <p><strong>This test is known, as of 2022-08-13, to not work.</strong></p>
+    <p>Scratchpad/test app for the WASMF/OPFS integration in a
+      WORKER thread. This page requires that the sqlite3 API have
+      been built with WASMFS support. If OPFS support is available then
+      it "should" persist a database across reloads (watch the dev console
+      output), otherwise it will not.
+    </p>
+    <p>All stuff on this page happens in the dev console.</p>
+    <hr>
+    <div id='test-output'></div>
+    <script src="scratchpad-opfs-worker.js"></script>
+  </body>
+</html>
diff --git a/ext/wasm/scratchpad-opfs-worker.js b/ext/wasm/scratchpad-opfs-worker.js
new file mode 100644
index 0000000000..5590a5a44a
--- /dev/null
+++ b/ext/wasm/scratchpad-opfs-worker.js
@@ -0,0 +1,33 @@
+/*
+  2022-05-22
+
+  The author disclaims copyright to this source code.  In place of a
+  legal notice, here is a blessing:
+
+  *   May you do good and not evil.
+  *   May you find forgiveness for yourself and forgive others.
+  *   May you share freely, never taking more than you give.
+
+  ***********************************************************************
+
+  A basic test script for sqlite3-api.js. This file must be run in
+  main JS thread and sqlite3.js must have been loaded before it.
+*/
+'use strict';
+(function(){
+  const toss = function(...args){throw new Error(args.join(' '))};
+  const log = console.log.bind(console),
+        warn = console.warn.bind(console),
+        error = console.error.bind(console);
+
+  const W = new Worker("api/scratchpad-opfs-worker.js");
+  self.onmessage = function(ev){
+    ev = ev.data;
+    const d = ev.data;
+    switch(ev.type){
+        case 'stdout': log(d); break;
+        case 'stderr': error(d); break;
+        default: warn("Unhandled message type:",ev); break;
+    }
+  };
+})();
diff --git a/manifest b/manifest
index 8a59e270a3..1949713dc1 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C wasmfs:\suse\sunix-none\sVFS\sby\sdefault\sto\savoid\slocking\serrors\sin\snon-OPFS\smode.
-D 2022-08-13T16:36:06.930
+C Add\sworker-style\svariant\sof\sthe\stests\sadded\sin\s[ae24ac0f7dd9],\sbut\sbuilding\sthis\swith\swasmfs\scauses\sthem\sto\sthrow\sinexplicable\sexceptions\sfrom\sthe\sEmscripten\sglue\s(without\swasmfs\sit\sbuilds\sand\sruns\sfine,\sbut\sstorage\sis\snot\spersistent).
+D 2022-08-13T17:13:16.407
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -481,6 +481,7 @@ F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de
 F ext/wasm/api/README.md b6d0fb64bfdf7bf9ce6938ea4104228f6f5bbef600f5d910b2f8c8694195988c
 F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba81456260a713ed04900c
 F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a4a06cb776c003880b
+F ext/wasm/api/scratchpad-opfs-worker.js ccafcbc548f8ead91e5151c26ea7fb4ded705fd6b65c4557c6c2bcd6a8922d85
 F ext/wasm/api/sqlite3-api-cleanup.js 149fd63a0400cd1d69548887ffde2ed89c13283384a63c2e9fcfc695e38a9e11
 F ext/wasm/api/sqlite3-api-glue.js 82c09f49c69984009ba5af2b628e67cc26c5dd203d383cd3091d40dab4e6514b
 F ext/wasm/api/sqlite3-api-oo1.js a3469bbb217b9787ba9aa6216423ec55cf9457fecefb9698e433d0e1cc4cc918
@@ -504,6 +505,8 @@ F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5
 F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e568d2c2307c416902059339c06f19
 F ext/wasm/scratchpad-opfs-main.html 079b6ec0b3a6c35c9ac92e639ede1b253b901c52ec6a793e5411babb708ace40
 F ext/wasm/scratchpad-opfs-main.js a819ed26047c5539630cea59add6a5082ba04cdf82da2df2e0707d4d69af6cb1
+F ext/wasm/scratchpad-opfs-worker.html 66c1d15d678f3bd306373d76b61c6c8aef988f61f4a8dd40185d452f9c6d2bf5
+F ext/wasm/scratchpad-opfs-worker.js c42a10db96e1c313175e2817766789aa4ce175c9574532e76082e69ba7d08f05
 F ext/wasm/testing1.html 0bf3ff224628c1f1e3ed22a2dc1837c6c73722ad8c0ad9c8e6fb9e6047667231
 F ext/wasm/testing1.js a25069e20d5f8dc548cc98bcf7002cec812084421a1f7f70ffae2c706d1167b2
 F ext/wasm/testing2.html 73e5048e666fd6fb28b6e635677a9810e1e139c599ddcf28d687c982134b92b8
@@ -2001,8 +2004,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 ae24ac0f7dd9e12a40de0f6ccd61a16f010804da454085f886c217cc600cdba4
-R 04c2d08427afe72dca8dfa59a558b201
+P 75561dea1a1afe9cb0a7d58dd82fa519e51cf42e330922cfd8e9ccdf6db4dc0f
+R 2cbf5edf37d119630242142baab50d57
 U stephan
-Z 16beafa09646f238ac043a3e648d875d
+Z 4aeebb4853d4fddddabda504cb5e02f4
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 280b9edc80..28b38af321 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-75561dea1a1afe9cb0a7d58dd82fa519e51cf42e330922cfd8e9ccdf6db4dc0f
\ No newline at end of file
+6401595e59179c5c0f6e51c5362cf4391787e7a55b9c6ca655746e30d3251f2b
\ No newline at end of file

From ab7de45084bab63f506a9a5750414190ea30ebd7 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 16 Aug 2022 16:06:12 +0000
Subject: [PATCH 010/428] wasm: disable shared cache mode by default.
 Experimentally move wasm-build generated files up one dir to rule the extra
 dir out as a problem for Emscripten-related worker-loading failures.

FossilOrigin-Name: e38d00c2b82d7e51ec04cd739514f255edde679b8ddab31fa944b3517d45c3ea
---
 Makefile.in          |  1 +
 ext/wasm/GNUmakefile | 18 ++++++++++++------
 manifest             | 14 +++++++-------
 manifest.uuid        |  2 +-
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index c9de1403f4..56ab4c88a1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1565,6 +1565,7 @@ emcc_flags = $(emcc_opt) \
         -DSQLITE_THREADSAFE=0 \
         -DSQLITE_OMIT_UTF16 \
         -DSQLITE_OMIT_DEPRECATED \
+        -DSQLITE_OMIT_SHARED_CACHE \
         $(emcc_flags_opfs)
 $(fiddle_module_js): Makefile $(sqlite3_wasm_c) shell.c \
     $(wasm_dir)/EXPORTED_RUNTIME_METHODS.fiddle \
diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 1b058b342b..9522ab72a5 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -45,6 +45,7 @@ SQLITE_OPT = \
   -DSQLITE_OMIT_LOAD_EXTENSION \
   -DSQLITE_OMIT_DEPRECATED \
   -DSQLITE_OMIT_UTF16 \
+  -DSQLITE_OMIT_SHARED_CACHE \
   -DSQLITE_THREADSAFE=0
 #SQLITE_OPT += -DSQLITE_ENABLE_MEMSYS5
 $(dir.top)/sqlite3.c:
@@ -131,7 +132,7 @@ sqlite3-api.jses := \
 #sqlite3-api.jses += $(dir.api)/sqlite3-api-opfs.js 
 sqlite3-api.jses += $(dir.api)/sqlite3-api-cleanup.js
 
-sqlite3-api.js := $(dir.api)/sqlite3-api.js
+sqlite3-api.js := sqlite3-api.js
 CLEAN_FILES += $(sqlite3-api.js)
 $(sqlite3-api.js): $(sqlite3-api.jses) $(MAKEFILE)
 	@echo "Making $@..."
@@ -141,7 +142,7 @@ $(sqlite3-api.js): $(sqlite3-api.jses) $(MAKEFILE)
 		echo "/* END FILE: $$i */"; \
 	done > $@
 
-post-js.js := $(dir.api)/post-js.js
+post-js.js := post-js.js
 CLEAN_FILES += $(post-js.js)
 post-jses := \
   $(dir.api)/post-js-header.js \
@@ -185,8 +186,8 @@ emcc.environment := -sENVIRONMENT=web
 ENABLE_WASMFS ?= 1
 ifneq (0,$(ENABLE_WASMFS))
   emcc.cflags += -pthread
-  emcc.cflags += '-DSQLITE_DEFAULT_UNIX_VFS="unix-none"'
   emcc.jsflags += -pthread -sWASMFS -sPTHREAD_POOL_SIZE=2
+  emcc.cflags += '-DSQLITE_DEFAULT_UNIX_VFS="unix-none"'
   emcc.environment := $(emcc.environment),worker
 else
   emcc.jsflags += -sALLOW_MEMORY_GROWTH
@@ -234,8 +235,13 @@ emcc.jsflags += -sMEMORY64=0
 ########################################################################
 
 
-sqlite3.js := $(dir.api)/sqlite3.js
-sqlite3.wasm := $(dir.api)/sqlite3.wasm
+########################################################################
+# Maintenance reminder: the output .js and .wasm files of emcc must be
+# in _this_ dir, rather than a subdir, or else parts of the generated
+# code get confused and cannot load property (namely, the
+# sqlite3.worker.js generated in conjunction with -sWASMFS).
+sqlite3.js := sqlite3.js
+sqlite3.wasm := sqlite3.wasm
 $(dir.api)/sqlite3-wasm.o: emcc.cflags += $(SQLITE_OPT)
 $(dir.api)/sqlite3-wasm.o: $(dir.top)/sqlite3.c
 $(dir.api)/wasm_util.o: emcc.cflags += $(SQLITE_OPT)
@@ -261,7 +267,7 @@ $(sqlite3.js):
 $(sqlite3.js): $(MAKEFILE) $(sqlite3.wasm.obj) \
     EXPORTED_FUNCTIONS.api \
     $(post-js.js)
-	$(emcc.bin) -o $@ $(emcc_opt) $(emcc.flags) $(emcc.jsflags) $(sqlite3.wasm.obj)
+	$(emcc.bin) -o $(sqlite3.js) $(emcc_opt) $(emcc.flags) $(emcc.jsflags) $(sqlite3.wasm.obj)
 	chmod -x $(sqlite3.wasm)
 ifneq (,$(wasm-strip))
 	$(wasm-strip) $(sqlite3.wasm)
diff --git a/manifest b/manifest
index 1949713dc1..9f7ff290a0 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Add\sworker-style\svariant\sof\sthe\stests\sadded\sin\s[ae24ac0f7dd9],\sbut\sbuilding\sthis\swith\swasmfs\scauses\sthem\sto\sthrow\sinexplicable\sexceptions\sfrom\sthe\sEmscripten\sglue\s(without\swasmfs\sit\sbuilds\sand\sruns\sfine,\sbut\sstorage\sis\snot\spersistent).
-D 2022-08-13T17:13:16.407
+C wasm:\sdisable\sshared\scache\smode\sby\sdefault.\sExperimentally\smove\swasm-build\sgenerated\sfiles\sup\sone\sdir\sto\srule\sthe\sextra\sdir\sout\sas\sa\sproblem\sfor\sEmscripten-related\sworker-loading\sfailures.
+D 2022-08-16T16:06:12.337
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in 419791c8e6f5fda6bf33977680e8f3bf782f5f6ec56b5c22567912c7f8fef353
+F Makefile.in 7d19258e83981c69dcdc63c46dfa83de907fc1c1c0472a6dc0d31b2fae376764
 F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
 F Makefile.msc d547a2fdba38a1c6cd1954977d0b0cc017f5f8fbfbc65287bf8d335808938016
 F README.md 8b8df9ca852aeac4864eb1e400002633ee6db84065bd01b78c33817f97d31f5e
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle db7a4602f043cf4a5e4135be3609a487f9f1c83f05778bfbdf93766be4541b96
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile 5c9b08139739819fc6223954c1b832d90398e9115789189ab39e5fbc6c764269
+F ext/wasm/GNUmakefile e3f2a8ce484eea0f087b31f5580b83c136fb6237da26f33f2c1d69f0f31ab94b
 F ext/wasm/README.md 4b00ae7c7d93c4591251245f0996a319e2651361013c98d2efb0b026771b7331
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 77ef4bcf37e362b9ad61f9c175dfc0f1b3e571563fb311b96581cf422ee6a8ec
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -2004,8 +2004,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 75561dea1a1afe9cb0a7d58dd82fa519e51cf42e330922cfd8e9ccdf6db4dc0f
-R 2cbf5edf37d119630242142baab50d57
+P 6401595e59179c5c0f6e51c5362cf4391787e7a55b9c6ca655746e30d3251f2b
+R 658c31cfb5b14194f7082d626102688f
 U stephan
-Z 4aeebb4853d4fddddabda504cb5e02f4
+Z ece080cb3d48a7dbb6a6c937a212c0a6
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 28b38af321..4f1a6b33e5 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6401595e59179c5c0f6e51c5362cf4391787e7a55b9c6ca655746e30d3251f2b
\ No newline at end of file
+e38d00c2b82d7e51ec04cd739514f255edde679b8ddab31fa944b3517d45c3ea
\ No newline at end of file

From 8ac2d8510efb2ac3aad2a11bb1acbd16ae420cf5 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 16 Aug 2022 16:11:20 +0000
Subject: [PATCH 011/428] wasm: accommodate moving generated sqlite3.js in the
 previous checkin.

FossilOrigin-Name: 41762f9518bb51b8b23ae6507628d6d3256044e1f2aca6e7251dc57722062c42
---
 ext/wasm/scratchpad-opfs-main.html               |  2 +-
 ext/wasm/scratchpad-opfs-worker.js               |  5 ++---
 ...opfs-worker.js => scratchpad-opfs-worker2.js} |  2 +-
 manifest                                         | 16 ++++++++--------
 manifest.uuid                                    |  2 +-
 5 files changed, 13 insertions(+), 14 deletions(-)
 rename ext/wasm/{api/scratchpad-opfs-worker.js => scratchpad-opfs-worker2.js} (96%)

diff --git a/ext/wasm/scratchpad-opfs-main.html b/ext/wasm/scratchpad-opfs-main.html
index 36ae55c147..8edd15a671 100644
--- a/ext/wasm/scratchpad-opfs-main.html
+++ b/ext/wasm/scratchpad-opfs-main.html
@@ -33,7 +33,7 @@
     <p>All stuff on this page happens in the dev console.</p>
     <hr>
     <div id='test-output'></div>
-    <script src="api/sqlite3.js"></script>
+    <script src="sqlite3.js"></script>
     <script src="common/SqliteTestUtil.js"></script>
     <script src="scratchpad-opfs-main.js"></script>
   </body>
diff --git a/ext/wasm/scratchpad-opfs-worker.js b/ext/wasm/scratchpad-opfs-worker.js
index 5590a5a44a..debd0245e0 100644
--- a/ext/wasm/scratchpad-opfs-worker.js
+++ b/ext/wasm/scratchpad-opfs-worker.js
@@ -11,7 +11,7 @@
   ***********************************************************************
 
   A basic test script for sqlite3-api.js. This file must be run in
-  main JS thread and sqlite3.js must have been loaded before it.
+  main JS thread. It will load sqlite3.js in a worker thread.
 */
 'use strict';
 (function(){
@@ -19,8 +19,7 @@
   const log = console.log.bind(console),
         warn = console.warn.bind(console),
         error = console.error.bind(console);
-
-  const W = new Worker("api/scratchpad-opfs-worker.js");
+  const W = new Worker("scratchpad-opfs-worker2.js");
   self.onmessage = function(ev){
     ev = ev.data;
     const d = ev.data;
diff --git a/ext/wasm/api/scratchpad-opfs-worker.js b/ext/wasm/scratchpad-opfs-worker2.js
similarity index 96%
rename from ext/wasm/api/scratchpad-opfs-worker.js
rename to ext/wasm/scratchpad-opfs-worker2.js
index 5bc63c7966..2e7527adc7 100644
--- a/ext/wasm/api/scratchpad-opfs-worker.js
+++ b/ext/wasm/scratchpad-opfs-worker2.js
@@ -34,7 +34,7 @@
   };
 
   const stdout = console.log.bind(console);
-  const stderr = function(...args){wMsg('stderr', args);};
+  const stderr = console.error.bind(console);//function(...args){wMsg('stderr', args);};
 
   const test1 = function(db){
     db.execMulti("create table if not exists t(a);")
diff --git a/manifest b/manifest
index 9f7ff290a0..24170d04b4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C wasm:\sdisable\sshared\scache\smode\sby\sdefault.\sExperimentally\smove\swasm-build\sgenerated\sfiles\sup\sone\sdir\sto\srule\sthe\sextra\sdir\sout\sas\sa\sproblem\sfor\sEmscripten-related\sworker-loading\sfailures.
-D 2022-08-16T16:06:12.337
+C wasm:\saccommodate\smoving\sgenerated\ssqlite3.js\sin\sthe\sprevious\scheckin.
+D 2022-08-16T16:11:20.050
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -481,7 +481,6 @@ F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de
 F ext/wasm/api/README.md b6d0fb64bfdf7bf9ce6938ea4104228f6f5bbef600f5d910b2f8c8694195988c
 F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba81456260a713ed04900c
 F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a4a06cb776c003880b
-F ext/wasm/api/scratchpad-opfs-worker.js ccafcbc548f8ead91e5151c26ea7fb4ded705fd6b65c4557c6c2bcd6a8922d85
 F ext/wasm/api/sqlite3-api-cleanup.js 149fd63a0400cd1d69548887ffde2ed89c13283384a63c2e9fcfc695e38a9e11
 F ext/wasm/api/sqlite3-api-glue.js 82c09f49c69984009ba5af2b628e67cc26c5dd203d383cd3091d40dab4e6514b
 F ext/wasm/api/sqlite3-api-oo1.js a3469bbb217b9787ba9aa6216423ec55cf9457fecefb9698e433d0e1cc4cc918
@@ -503,10 +502,11 @@ F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab26
 F ext/wasm/jaccwabyt/jaccwabyt.md 447cc02b598f7792edaa8ae6853a7847b8178a18ed356afacbdbf312b2588106
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
 F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e568d2c2307c416902059339c06f19
-F ext/wasm/scratchpad-opfs-main.html 079b6ec0b3a6c35c9ac92e639ede1b253b901c52ec6a793e5411babb708ace40
+F ext/wasm/scratchpad-opfs-main.html 4565cf194e66188190d35f70e82553e2e2d72b9809b73c94ab67b8cfd14d2e0c
 F ext/wasm/scratchpad-opfs-main.js a819ed26047c5539630cea59add6a5082ba04cdf82da2df2e0707d4d69af6cb1
 F ext/wasm/scratchpad-opfs-worker.html 66c1d15d678f3bd306373d76b61c6c8aef988f61f4a8dd40185d452f9c6d2bf5
-F ext/wasm/scratchpad-opfs-worker.js c42a10db96e1c313175e2817766789aa4ce175c9574532e76082e69ba7d08f05
+F ext/wasm/scratchpad-opfs-worker.js 3ec2868c669713145c76eb5877c64a1b20741f741817b87c907a154b676283a9
+F ext/wasm/scratchpad-opfs-worker2.js de3ea77548243a638c8426b7e43cc1dbfc511013228ab98436eb102923ed6689 w ext/wasm/api/scratchpad-opfs-worker.js
 F ext/wasm/testing1.html 0bf3ff224628c1f1e3ed22a2dc1837c6c73722ad8c0ad9c8e6fb9e6047667231
 F ext/wasm/testing1.js a25069e20d5f8dc548cc98bcf7002cec812084421a1f7f70ffae2c706d1167b2
 F ext/wasm/testing2.html 73e5048e666fd6fb28b6e635677a9810e1e139c599ddcf28d687c982134b92b8
@@ -2004,8 +2004,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 6401595e59179c5c0f6e51c5362cf4391787e7a55b9c6ca655746e30d3251f2b
-R 658c31cfb5b14194f7082d626102688f
+P e38d00c2b82d7e51ec04cd739514f255edde679b8ddab31fa944b3517d45c3ea
+R 9311647d4bd948f09c1d1ad00326a894
 U stephan
-Z ece080cb3d48a7dbb6a6c937a212c0a6
+Z a8a2ceb6325a77f43310bbc5ef685064
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 4f1a6b33e5..f535932813 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e38d00c2b82d7e51ec04cd739514f255edde679b8ddab31fa944b3517d45c3ea
\ No newline at end of file
+41762f9518bb51b8b23ae6507628d6d3256044e1f2aca6e7251dc57722062c42
\ No newline at end of file

From ba851ae72e88960256e1e944e9523f909ea5e500 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 16 Aug 2022 16:16:25 +0000
Subject: [PATCH 012/428] wasm: move another file and update testing1/testing2
 to account for [e38d00c2b82d]. Disable wasmfs by default as it breaks the
 worker-based module loader (reason as yet unknown).

FossilOrigin-Name: 6dad5e0573ee866657ee10b43e55b86fc9caac7a66c13bdbd35c3625a4783f14
---
 ext/wasm/GNUmakefile                 |  2 +-
 ext/wasm/{api => }/sqlite3-worker.js |  0
 ext/wasm/testing2.js                 |  2 +-
 manifest                             | 18 +++++++++---------
 manifest.uuid                        |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)
 rename ext/wasm/{api => }/sqlite3-worker.js (100%)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 9522ab72a5..8a9adb75f5 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -183,7 +183,7 @@ emcc.jsflags += -sEXPORTED_RUNTIME_METHODS=FS,wasmMemory # wasmMemory==>for -sIM
 emcc.jsflags += -sUSE_CLOSURE_COMPILER=0
 emcc.jsflags += -sIMPORTED_MEMORY
 emcc.environment := -sENVIRONMENT=web
-ENABLE_WASMFS ?= 1
+ENABLE_WASMFS ?= 0
 ifneq (0,$(ENABLE_WASMFS))
   emcc.cflags += -pthread
   emcc.jsflags += -pthread -sWASMFS -sPTHREAD_POOL_SIZE=2
diff --git a/ext/wasm/api/sqlite3-worker.js b/ext/wasm/sqlite3-worker.js
similarity index 100%
rename from ext/wasm/api/sqlite3-worker.js
rename to ext/wasm/sqlite3-worker.js
diff --git a/ext/wasm/testing2.js b/ext/wasm/testing2.js
index f6792955f8..bc578bb792 100644
--- a/ext/wasm/testing2.js
+++ b/ext/wasm/testing2.js
@@ -15,7 +15,7 @@
 'use strict';
 (function(){
   const T = self.SqliteTestUtil;
-  const SW = new Worker("api/sqlite3-worker.js");
+  const SW = new Worker("sqlite3-worker.js");
   const DbState = {
     id: undefined
   };
diff --git a/manifest b/manifest
index 24170d04b4..c19c285c0d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C wasm:\saccommodate\smoving\sgenerated\ssqlite3.js\sin\sthe\sprevious\scheckin.
-D 2022-08-16T16:11:20.050
+C wasm:\smove\sanother\sfile\sand\supdate\stesting1/testing2\sto\saccount\sfor\s[e38d00c2b82d].\sDisable\swasmfs\sby\sdefault\sas\sit\sbreaks\sthe\sworker-based\smodule\sloader\s(reason\sas\syet\sunknown).
+D 2022-08-16T16:16:25.326
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle db7a4602f043cf4a5e4135be3609a487f9f1c83f05778bfbdf93766be4541b96
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile e3f2a8ce484eea0f087b31f5580b83c136fb6237da26f33f2c1d69f0f31ab94b
+F ext/wasm/GNUmakefile b5b34ee01efcf7c3d6c53d54a332545f2670e7a5a0c63d6de847d3726e5bc521
 F ext/wasm/README.md 4b00ae7c7d93c4591251245f0996a319e2651361013c98d2efb0b026771b7331
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 77ef4bcf37e362b9ad61f9c175dfc0f1b3e571563fb311b96581cf422ee6a8ec
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -489,7 +489,6 @@ F ext/wasm/api/sqlite3-api-prologue.js c0f335bf8b44071da0204b8fa95ce78fd737033b1
 F ext/wasm/api/sqlite3-api-worker.js 1124f404ecdf3c14d9f829425cef778cd683911a9883f0809a463c3c7773c9fd
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 0e78035045e3328fb050ec9580c6bfb714c756a1d3b917259e58baf9b0332c98
-F ext/wasm/api/sqlite3-worker.js 1325ca8d40129a82531902a3a077b795db2eeaee81746e5a0c811a04b415fa7f
 F ext/wasm/common/SqliteTestUtil.js e41a1406f18da9224523fad0c48885caf995b56956a5b9852909c0989e687e90
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 572cf1ffae0b6eb7ca63684d3392bf350217a07b90e7a896e4fa850700c989b0
@@ -506,11 +505,12 @@ F ext/wasm/scratchpad-opfs-main.html 4565cf194e66188190d35f70e82553e2e2d72b9809b
 F ext/wasm/scratchpad-opfs-main.js a819ed26047c5539630cea59add6a5082ba04cdf82da2df2e0707d4d69af6cb1
 F ext/wasm/scratchpad-opfs-worker.html 66c1d15d678f3bd306373d76b61c6c8aef988f61f4a8dd40185d452f9c6d2bf5
 F ext/wasm/scratchpad-opfs-worker.js 3ec2868c669713145c76eb5877c64a1b20741f741817b87c907a154b676283a9
-F ext/wasm/scratchpad-opfs-worker2.js de3ea77548243a638c8426b7e43cc1dbfc511013228ab98436eb102923ed6689 w ext/wasm/api/scratchpad-opfs-worker.js
+F ext/wasm/scratchpad-opfs-worker2.js de3ea77548243a638c8426b7e43cc1dbfc511013228ab98436eb102923ed6689
+F ext/wasm/sqlite3-worker.js 1325ca8d40129a82531902a3a077b795db2eeaee81746e5a0c811a04b415fa7f w ext/wasm/api/sqlite3-worker.js
 F ext/wasm/testing1.html 0bf3ff224628c1f1e3ed22a2dc1837c6c73722ad8c0ad9c8e6fb9e6047667231
 F ext/wasm/testing1.js a25069e20d5f8dc548cc98bcf7002cec812084421a1f7f70ffae2c706d1167b2
 F ext/wasm/testing2.html 73e5048e666fd6fb28b6e635677a9810e1e139c599ddcf28d687c982134b92b8
-F ext/wasm/testing2.js 1cd14be666e40da41d7eea5723b1953ce54f1077c199887a73d3d5cfb71dbd05
+F ext/wasm/testing2.js dbb825174878716fab42c340962c0c1b32bfbe26dd16c7b082d30d35f510466c
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
@@ -2004,8 +2004,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 e38d00c2b82d7e51ec04cd739514f255edde679b8ddab31fa944b3517d45c3ea
-R 9311647d4bd948f09c1d1ad00326a894
+P 41762f9518bb51b8b23ae6507628d6d3256044e1f2aca6e7251dc57722062c42
+R 8ceb5e9180bc147ed0af56485cecdca6
 U stephan
-Z a8a2ceb6325a77f43310bbc5ef685064
+Z 7a0a645037fbcb33d5a75b781a0d284d
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f535932813..3e6aa5a962 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-41762f9518bb51b8b23ae6507628d6d3256044e1f2aca6e7251dc57722062c42
\ No newline at end of file
+6dad5e0573ee866657ee10b43e55b86fc9caac7a66c13bdbd35c3625a4783f14
\ No newline at end of file

From e0c582850eedf80d6c03f2cfa1b82b998825464a Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 16 Aug 2022 16:36:19 +0000
Subject: [PATCH 013/428] wasm: add a small demo/presentation app for JS OO API
 #1 and make a few minor additions to that API.

FossilOrigin-Name: d6d79b661a1c6137d4693393e02416da4858d58dc84d144081a48d523655b483
---
 ext/wasm/api/sqlite3-api-oo1.js | 126 +++++++++++-------
 ext/wasm/demo-oo1.html          |  34 +++++
 ext/wasm/demo-oo1.js            | 218 ++++++++++++++++++++++++++++++++
 ext/wasm/testing1.html          |   2 +-
 manifest                        |  18 +--
 manifest.uuid                   |   2 +-
 6 files changed, 345 insertions(+), 55 deletions(-)
 create mode 100644 ext/wasm/demo-oo1.html
 create mode 100644 ext/wasm/demo-oo1.js

diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index b6e63d540a..e54e27ec2b 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -80,35 +80,57 @@
      not resolve to real filenames, but "" uses an on-storage
      temporary database and requires that the VFS support that.
 
-     The db is currently opened with a fixed set of flags:
-     (SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE |
-     SQLITE_OPEN_EXRESCODE).  This API will change in the future
-     permit the caller to provide those flags via an additional
-     argument.
+     The second argument specifies the open/create mode for the
+     database. It must be string containing a sequence of letters (in
+     any order, but case sensitive) specifying the mode:
+
+     - "c" => create if it does not exist, else fail if it does not
+       exist. Implies the "w" flag.
+
+     - "w" => write. Implies "r": a db cannot be write-only.
+
+     - "r" => read-only if neither "w" nor "c" are provided, else it
+       is ignored.
+
+     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.
+
+     The final argument is currently unimplemented but will eventually
+     be used to specify an optional sqlite3 VFS implementation name,
+     as for the final argument to sqlite3_open_v2().
 
      For purposes of passing a DB instance to C-style sqlite3
-     functions, its read-only `pointer` property holds its `sqlite3*`
-     pointer value. That property can also be used to check whether
-     this DB instance is still open.
+     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.
   */
-  const DB = function ctor(fn=':memory:'){
+  const DB = function ctor(fn=':memory:', flags='c', vtab="not yet implemented"){
     if('string'!==typeof fn){
       toss3("Invalid filename for DB constructor.");
     }
+    let ptr, oflags = 0;
+    if( flags.indexOf('c')>=0 ){
+      oflags |= capi.SQLITE_OPEN_CREATE | capi.SQLITE_OPEN_READWRITE;
+    }
+    if( flags.indexOf('w')>=0 ) oflags |= capi.SQLITE_OPEN_READWRITE;
+    if( 0===oflags ) oflags |= capi.SQLITE_OPEN_READONLY;
+    oflags |= capi.SQLITE_OPEN_EXRESCODE;
     const stack = capi.wasm.scopedAllocPush();
-    let ptr;
     try {
       const ppDb = capi.wasm.scopedAllocPtr() /* output (sqlite3**) arg */;
-      const rc = capi.sqlite3_open_v2(fn, ppDb, capi.SQLITE_OPEN_READWRITE
-                                      | capi.SQLITE_OPEN_CREATE
-                                      | capi.SQLITE_OPEN_EXRESCODE, null);
+      const rc = capi.sqlite3_open_v2(fn, ppDb, oflags, null);
       ptr = capi.wasm.getMemValue(ppDb, '*');
       ctor.checkRc(ptr, rc);
-    }catch(e){
-      if(ptr) capi.sqlite3_close_v2(ptr);
+    }catch( e ){
+      if( ptr ) capi.sqlite3_close_v2(ptr);
       throw e;
+    }finally{
+      capi.wasm.scopedAllocPop(stack);
     }
-    finally{capi.wasm.scopedAllocPop(stack);}
     this.filename = fn;
     __ptrMap.set(this, ptr);
     __stmtMap.set(this, Object.create(null));
@@ -315,11 +337,10 @@
        file. If the name is "" or ":memory:", it resolves to false.
        Note that it is not aware of the peculiarities of URI-style
        names and a URI-style name for a ":memory:" db will fool it.
+       Returns false if this db is closed.
     */
     hasFilename: function(){
-      const fn = this.filename;
-      if(!fn || ':memory'===fn) return false;
-      return true;
+      return this.filename && ':memory'!==this.filename;
     },
     /**
        Returns the name of the given 0-based db number, as documented
@@ -451,14 +472,14 @@
        statement in the SQL which has any bindable
        parameters. (Empty statements are skipped entirely.)
 
-       - .callback = a function which gets called for each row of
-       the FIRST statement in the SQL which has result
-       _columns_, but only if that statement has any result
-       _rows_. The second argument passed to the callback is
-       always the current Stmt object (so that the caller may
-       collect column names, or similar). The first argument
-       passed to the callback defaults to the current Stmt
-       object but may be changed with ...
+       - .callback = a function which gets called for each row of the
+       FIRST statement in the SQL which has result _columns_, but only
+       if that statement has any result _rows_. The callback's "this"
+       is the options object. The second argument passed to the
+       callback is always the current Stmt object (so that the caller
+       may collect column names, or similar). The first argument
+       passed to the callback defaults to the current Stmt object but
+       may be changed with ...
 
        - .rowMode = either a string describing what type of argument
        should be passed as the first argument to the callback or an
@@ -479,12 +500,13 @@
        the FIRST first statement which has result _columns_ is
        appended to the array in the format specified for the `rowMode`
        option, with the exception that the only legal values for
-       `rowMode` in this case are 'array' or 'object', neither of
-       which is the default. It is legal to use both `resultRows` and
-       `callback`, but `resultRows` is likely much simpler to use for
-       small data sets and can be used over a WebWorker-style message
-       interface.  execMulti() throws if `resultRows` is set and
-       `rowMode` is 'stmt' (which is the default!).
+       `rowMode` in this case are 'array', 'object', or an integer,
+       none of which are the default for `rowMode`. It is legal to use
+       both `resultRows` and `callback`, but `resultRows` is likely
+       much simpler to use for small data sets and can be used over a
+       WebWorker-style message interface.  execMulti() throws if
+       `resultRows` is set and `rowMode` is 'stmt' (which is the
+       default!).
 
        - saveSql = an optional array. If set, the SQL of each
        executed statement is appended to this array before the
@@ -1081,6 +1103,7 @@
         delete __stmtMap.get(this.db)[this.pointer];
         capi.sqlite3_finalize(this.pointer);
         __ptrMap.delete(this);
+        delete this._mayGet;
         delete this.columnCount;
         delete this.parameterCount;
         delete this.db;
@@ -1268,6 +1291,27 @@
             DB.checkRc(this.db.pointer, rc);
       }
     },
+    /**
+       Functions exactly like step() except that...
+
+       1) On success, it calls this.reset() and returns this object.
+       2) On error, it throws and does not call reset().
+
+       This is intended to simplify constructs like:
+
+       ```
+       for(...) {
+         stmt.bind(...).stepReset();
+       }
+       ```
+
+       Note that the reset() call makes it illegal to call this.get()
+       after the step.
+    */
+    stepReset: function(){
+      this.step();
+      return this.reset();
+    },
     /**
        Functions like step() except that
        it finalizes this statement immediately after stepping unless
@@ -1286,17 +1330,9 @@
        ```
     */
     stepFinalize: function(){
-      affirmUnlocked(this, 'step()');
-      const rc = capi.sqlite3_step(affirmStmtOpen(this).pointer);
-      switch(rc){
-          case capi.SQLITE_DONE: this.finalize(); return false;
-          case capi.SQLITE_ROW: this.finalize(); return true;
-          default:
-            this.finalize();
-            console.warn("sqlite3_step() rc=",rc,"SQL =",
-                         capi.sqlite3_sql(this.pointer));
-            DB.checkRc(this.db.pointer, rc);
-      }
+      const rc = this.step();
+      this.finalize();
+      return rc;
     },
     /**
        Fetches the value from the given 0-based column index of
@@ -1400,7 +1436,7 @@
           default: toss3("Don't know how to translate",
                          "type of result column #"+ndx+".");
       }
-      abort("Not reached.");
+      toss3("Not reached.");
     },
     /** Equivalent to get(ndx) but coerces the result to an
         integer. */
diff --git a/ext/wasm/demo-oo1.html b/ext/wasm/demo-oo1.html
new file mode 100644
index 0000000000..9b6e8cbfa3
--- /dev/null
+++ b/ext/wasm/demo-oo1.html
@@ -0,0 +1,34 @@
+<!doctype html>
+<html lang="en-us">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
+    <link rel="stylesheet" href="common/emscripten.css"/>
+    <link rel="stylesheet" href="common/testing.css"/>
+    <title>sqlite3-api OO #1 Demo</title>
+  </head>
+  <body>
+    <header id='titlebar'><span>sqlite3-api OO #1 Demo</span></header>
+    <!-- emscripten bits -->
+    <figure id="module-spinner">
+      <div class="spinner"></div>
+      <div class='center'><strong>Initializing app...</strong></div>
+      <div class='center'>
+        On a slow internet connection this may take a moment.  If this
+        message displays for "a long time", intialization may have
+        failed and the JavaScript console may contain clues as to why.
+      </div>
+    </figure>
+    <div class="emscripten" id="module-status">Downloading...</div>
+    <div class="emscripten">
+      <progress value="0" max="100" id="module-progress" hidden='1'></progress>  
+    </div><!-- /emscripten bits -->
+    <div>Most stuff on this page happens in the dev console.</div>
+    <hr>
+    <div id='test-output'></div>
+    <script src="sqlite3.js"></script>
+    <script src="common/SqliteTestUtil.js"></script>
+    <script src="demo-oo1.js"></script>
+  </body>
+</html>
diff --git a/ext/wasm/demo-oo1.js b/ext/wasm/demo-oo1.js
new file mode 100644
index 0000000000..2792b50920
--- /dev/null
+++ b/ext/wasm/demo-oo1.js
@@ -0,0 +1,218 @@
+/*
+  2022-08-16
+
+  The author disclaims copyright to this source code.  In place of a
+  legal notice, here is a blessing:
+
+  *   May you do good and not evil.
+  *   May you find forgiveness for yourself and forgive others.
+  *   May you share freely, never taking more than you give.
+
+  ***********************************************************************
+
+  A basic demonstration of the SQLite3 OO API #1, shorn of assertions
+  and the like to improve readability.
+*/
+'use strict';
+(function(){
+  const T = self.SqliteTestUtil;
+  const toss = function(...args){throw new Error(args.join(' '))};
+  const debug = console.debug.bind(console),
+        log = console.log.bind(console),
+        warn = console.warn.bind(console),
+        error = console.error.bind(console);
+
+  const demo1 = function(sqlite3,EmModule){
+    const capi = sqlite3.capi,
+          oo = sqlite3.oo1,
+          wasm = capi.wasm;
+
+    // If we have persistent storage, maybe init and mount it:
+    const dbDir = true
+          ? "" // this demo works better without persistent storage.
+          : capi.sqlite3_web_persistent_dir();
+            // ^^^ returns name of persistent mount point or "" if we have none
+
+    const db = new oo.DB(dbDir+"/mydb.sqlite3");
+    /**
+       Never(!) rely on garbage collection to clean up DBs and
+       (especially) statements. Always wrap their lifetimes in
+       try/finally construct...
+    */
+    try {
+      log("Create a table...");
+      db.exec("CREATE TABLE IF NOT EXISTS t(a,b)");
+      //Equivalent:
+      db.exec({
+        sql:"CREATE TABLE IF NOT EXISTS t(a,b)"
+        // ... numerous other options ... 
+      });
+      // SQL can be either a string or a byte array
+
+      log("Insert some data using exec()...");
+      let i;
+      for( i = 1; i <= 5; ++i ){
+        db.exec({
+          sql: "insert into t(a,b) values (?,?)",
+          // bind by parameter index...
+          bind: [i, i*2]
+        });
+        db.exec({
+          sql: "insert into t(a,b) values ($a,$b)",
+          // bind by parameter name...
+          bind: {$a: i * 3, $b: i * 4}
+        });
+      }    
+
+      log("Insert using a prepared statement...");
+      let q = db.prepare("insert into t(a,b) values(?,?)");
+      try {
+        for( i = 100; i < 103; ++i ){
+          q.bind( [i, i*2] ).step();
+          q.reset();
+        }
+        // Equivalent...
+        for( i = 103; i <= 105; ++i ){
+          q.bind(1, i).bind(2, i*2).stepReset();
+        }
+      }finally{
+        q.finalize();
+      }
+
+      log("Query data with exec() using rowMode 'array'...");
+      db.exec({
+        sql: "select a from t order by a limit 3",
+        rowMode: 'array', // 'array', 'object', or 'stmt' (default)
+        callback: function(row){
+          log("row ",++this.counter,"=",row);
+        }.bind({counter: 0})
+      });
+
+      log("Query data with exec() using rowMode 'object'...");
+      db.exec({
+        sql: "select a as aa, b as bb from t order by aa limit 3",
+        rowMode: 'object',
+        callback: function(row){
+          log("row ",++this.counter,"=",row);
+        }.bind({counter: 0})
+      });
+
+      log("Query data with exec() using rowMode 'stmt'...");
+      db.exec({
+        sql: "select a from t order by a limit 3",
+        rowMode: 'stmt', // stmt === the default
+        callback: function(row){
+          log("row ",++this.counter,"get(0) =",row.get(0));
+        }.bind({counter: 0})
+      });
+
+      log("Query data with exec() using rowMode INTEGER (result column index)...");
+      db.exec({
+        sql: "select a, b from t order by a limit 3",
+        rowMode: 1, // === result column 1
+        callback: function(row){
+          log("row ",++this.counter,"b =",row);
+        }.bind({counter: 0})
+      });
+
+      log("Query data with exec() without a callback...");
+      let resultRows = [];
+      db.exec({
+        sql: "select a, b from t order by a limit 3",
+        rowMode: 'object',
+        resultRows: resultRows
+      });
+      log("Result rows:",resultRows);
+
+      log("Create a scalar UDF...");
+      db.createFunction({
+        name: 'twice',
+        callback: function(arg){ // note the call arg count
+          return arg + arg;
+        }
+      });
+      log("Run scalar UDF and collect result column names...");
+      let columnNames = [];
+      db.exec({
+        sql: "select a, twice(a), twice(''||a) from t order by a desc limit 3",
+        columnNames: columnNames,
+        callback: function(row){
+          log("a =",row.get(0), "twice(a) =", row.get(1), "twice(''||a) =",row.get(2));
+        }
+      });
+      log("Result column names:",columnNames);
+
+      /**
+         Main differences between exec() and execMulti():
+
+         - execMulti() traverses all statements in the input SQL
+
+         - exec() supports a couple options not supported by execMulti(),
+           and vice versa.
+
+         - execMulti() result callback/array only activates for the
+           first statement which has result columns. It is arguable
+           whether it should support a callback at all, and that
+           feature may be removed.
+
+         - execMulti() column-bind data only activates for the first statement
+           with bindable columns. This feature is arguable and may be removed.
+       */
+      
+      if(0){
+        warn("UDF will throw because of incorrect arg count...");
+        db.exec("select twice(1,2,3)");
+      }
+
+      try {
+        db.callInTransaction( function(D) {
+          D.exec("delete from t");
+          log("In transaction: count(*) from t =",db.selectValue("select count(*) from t"));
+          throw new sqlite3.SQLite3Error("Demonstrating callInTransaction() rollback");
+        });
+      }catch(e){
+        log("Got expected exception:",e.message);
+        log("count(*) from t =",db.selectValue("select count(*) from t"));
+      }
+
+    }finally{
+      db.close();
+    }
+
+    /**
+       Misc. DB features:
+
+       - get change count (total or statement-local, 32- or 64-bit)
+       - get its file name
+       - selectValue() takes SQL and returns first column of first row.
+    
+       Misc. Stmt features:
+
+       - Various forms of bind() 
+       - clearBindings()
+       - reset()
+       - Various forms of step()
+       - Variants of get() for explicit type treatment/conversion,
+         e.g. getInt(), getFloat(), getBlob(), getJSON()
+       - getColumnName(ndx), getColumnNames()
+       - getParamIndex(name)
+    */
+  }/*demo1()*/;
+
+  const runDemos = function(Module){
+    //log("Module",Module);
+    const sqlite3 = Module.sqlite3,
+          capi = sqlite3.capi,
+          oo = sqlite3.oo1,
+          wasm = capi.wasm;
+    log("Loaded module:",capi.sqlite3_libversion(), capi.sqlite3_sourceid());
+    try {
+      [ demo1 ].forEach((f)=>f(sqlite3, Module))
+    }catch(e){
+      error("Exception:",e.message);
+      throw e;
+    }
+  };
+
+  sqlite3InitModule(self.sqlite3TestModule).then(runDemos);
+})();
diff --git a/ext/wasm/testing1.html b/ext/wasm/testing1.html
index 0c64470221..24c1e82360 100644
--- a/ext/wasm/testing1.html
+++ b/ext/wasm/testing1.html
@@ -27,7 +27,7 @@
     <div>Most stuff on this page happens in the dev console.</div>
     <hr>
     <div id='test-output'></div>
-    <script src="api/sqlite3.js"></script>
+    <script src="sqlite3.js"></script>
     <script src="common/SqliteTestUtil.js"></script>
     <script src="testing1.js"></script>
   </body>
diff --git a/manifest b/manifest
index c19c285c0d..df72b2cc8a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C wasm:\smove\sanother\sfile\sand\supdate\stesting1/testing2\sto\saccount\sfor\s[e38d00c2b82d].\sDisable\swasmfs\sby\sdefault\sas\sit\sbreaks\sthe\sworker-based\smodule\sloader\s(reason\sas\syet\sunknown).
-D 2022-08-16T16:16:25.326
+C wasm:\sadd\sa\ssmall\sdemo/presentation\sapp\sfor\sJS\sOO\sAPI\s#1\sand\smake\sa\sfew\sminor\sadditions\sto\sthat\sAPI.
+D 2022-08-16T16:36:19.533
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -483,7 +483,7 @@ F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba814
 F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a4a06cb776c003880b
 F ext/wasm/api/sqlite3-api-cleanup.js 149fd63a0400cd1d69548887ffde2ed89c13283384a63c2e9fcfc695e38a9e11
 F ext/wasm/api/sqlite3-api-glue.js 82c09f49c69984009ba5af2b628e67cc26c5dd203d383cd3091d40dab4e6514b
-F ext/wasm/api/sqlite3-api-oo1.js a3469bbb217b9787ba9aa6216423ec55cf9457fecefb9698e433d0e1cc4cc918
+F ext/wasm/api/sqlite3-api-oo1.js 1d63e7e453e38ff2ad0c5e8bf68345f6fc5fe99fbc4a893cc982b4c50d904ca0
 F ext/wasm/api/sqlite3-api-opfs.js c93cdd14f81a26b3a64990515ee05c7e29827fbc8fba4e4c2fef3a37a984db89
 F ext/wasm/api/sqlite3-api-prologue.js c0f335bf8b44071da0204b8fa95ce78fd737033b155e7bcfdaee6ae64600802f
 F ext/wasm/api/sqlite3-api-worker.js 1124f404ecdf3c14d9f829425cef778cd683911a9883f0809a463c3c7773c9fd
@@ -493,6 +493,8 @@ F ext/wasm/common/SqliteTestUtil.js e41a1406f18da9224523fad0c48885caf995b56956a5
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 572cf1ffae0b6eb7ca63684d3392bf350217a07b90e7a896e4fa850700c989b0
 F ext/wasm/common/whwasmutil.js 41b8e097e0a9cb07c24c0ede3c81b72470a63f4a4efb07f75586dc131569f5ae
+F ext/wasm/demo-oo1.html 75646855b38405d82781246fd08c852a2b3bee05dd9f0fe10ab655a8cffb79aa
+F ext/wasm/demo-oo1.js 0b1f85ee622b8f0ffe133ed88584bfc6b1ef1dcbe5b605278073e4694ebd0a2f
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js bccf46045be8824752876f3eec01c223be0616ccac184bffd0024cfe7a3262b8
 F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
@@ -506,8 +508,8 @@ F ext/wasm/scratchpad-opfs-main.js a819ed26047c5539630cea59add6a5082ba04cdf82da2
 F ext/wasm/scratchpad-opfs-worker.html 66c1d15d678f3bd306373d76b61c6c8aef988f61f4a8dd40185d452f9c6d2bf5
 F ext/wasm/scratchpad-opfs-worker.js 3ec2868c669713145c76eb5877c64a1b20741f741817b87c907a154b676283a9
 F ext/wasm/scratchpad-opfs-worker2.js de3ea77548243a638c8426b7e43cc1dbfc511013228ab98436eb102923ed6689
-F ext/wasm/sqlite3-worker.js 1325ca8d40129a82531902a3a077b795db2eeaee81746e5a0c811a04b415fa7f w ext/wasm/api/sqlite3-worker.js
-F ext/wasm/testing1.html 0bf3ff224628c1f1e3ed22a2dc1837c6c73722ad8c0ad9c8e6fb9e6047667231
+F ext/wasm/sqlite3-worker.js 1325ca8d40129a82531902a3a077b795db2eeaee81746e5a0c811a04b415fa7f
+F ext/wasm/testing1.html 528001c7e32ee567abc195aa071fd9820cc3c8ffc9c8a39a75e680db05f0c409
 F ext/wasm/testing1.js a25069e20d5f8dc548cc98bcf7002cec812084421a1f7f70ffae2c706d1167b2
 F ext/wasm/testing2.html 73e5048e666fd6fb28b6e635677a9810e1e139c599ddcf28d687c982134b92b8
 F ext/wasm/testing2.js dbb825174878716fab42c340962c0c1b32bfbe26dd16c7b082d30d35f510466c
@@ -2004,8 +2006,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 41762f9518bb51b8b23ae6507628d6d3256044e1f2aca6e7251dc57722062c42
-R 8ceb5e9180bc147ed0af56485cecdca6
+P 6dad5e0573ee866657ee10b43e55b86fc9caac7a66c13bdbd35c3625a4783f14
+R 21ffe0bceeaf14b3e3d3b64b375f9eb8
 U stephan
-Z 7a0a645037fbcb33d5a75b781a0d284d
+Z cfe198e466da02226e0ffe831d5c4056
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 3e6aa5a962..bbadb22b44 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6dad5e0573ee866657ee10b43e55b86fc9caac7a66c13bdbd35c3625a4783f14
\ No newline at end of file
+d6d79b661a1c6137d4693393e02416da4858d58dc84d144081a48d523655b483
\ No newline at end of file

From 6e901b07a3611d6b865e390f117aa4c116d47192 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 16 Aug 2022 17:29:59 +0000
Subject: [PATCH 014/428] wasm: minor cleanups in the OO API #1 demo.

FossilOrigin-Name: b9cdcc06a8f70694d10ee5b1a0fd9f08f4c705ce576e5103bbafb36fc9cc2122
---
 ext/wasm/demo-oo1.js |  4 ++--
 manifest             | 12 ++++++------
 manifest.uuid        |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ext/wasm/demo-oo1.js b/ext/wasm/demo-oo1.js
index 2792b50920..bb5e9fd267 100644
--- a/ext/wasm/demo-oo1.js
+++ b/ext/wasm/demo-oo1.js
@@ -15,14 +15,13 @@
 */
 'use strict';
 (function(){
-  const T = self.SqliteTestUtil;
   const toss = function(...args){throw new Error(args.join(' '))};
   const debug = console.debug.bind(console),
         log = console.log.bind(console),
         warn = console.warn.bind(console),
         error = console.error.bind(console);
 
-  const demo1 = function(sqlite3,EmModule){
+  const demo1 = function(sqlite3){
     const capi = sqlite3.capi,
           oo = sqlite3.oo1,
           wasm = capi.wasm;
@@ -206,6 +205,7 @@
           oo = sqlite3.oo1,
           wasm = capi.wasm;
     log("Loaded module:",capi.sqlite3_libversion(), capi.sqlite3_sourceid());
+    log("sqlite3 namespace:",sqlite3);
     try {
       [ demo1 ].forEach((f)=>f(sqlite3, Module))
     }catch(e){
diff --git a/manifest b/manifest
index df72b2cc8a..ccd0bb633d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C wasm:\sadd\sa\ssmall\sdemo/presentation\sapp\sfor\sJS\sOO\sAPI\s#1\sand\smake\sa\sfew\sminor\sadditions\sto\sthat\sAPI.
-D 2022-08-16T16:36:19.533
+C wasm:\sminor\scleanups\sin\sthe\sOO\sAPI\s#1\sdemo.
+D 2022-08-16T17:29:59.160
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -494,7 +494,7 @@ F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d695
 F ext/wasm/common/testing.css 572cf1ffae0b6eb7ca63684d3392bf350217a07b90e7a896e4fa850700c989b0
 F ext/wasm/common/whwasmutil.js 41b8e097e0a9cb07c24c0ede3c81b72470a63f4a4efb07f75586dc131569f5ae
 F ext/wasm/demo-oo1.html 75646855b38405d82781246fd08c852a2b3bee05dd9f0fe10ab655a8cffb79aa
-F ext/wasm/demo-oo1.js 0b1f85ee622b8f0ffe133ed88584bfc6b1ef1dcbe5b605278073e4694ebd0a2f
+F ext/wasm/demo-oo1.js a036f93a41815063cca77e896a19bdd3b9771cd9dc93aa34b308245e1c9405a5
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js bccf46045be8824752876f3eec01c223be0616ccac184bffd0024cfe7a3262b8
 F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
@@ -2006,8 +2006,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 6dad5e0573ee866657ee10b43e55b86fc9caac7a66c13bdbd35c3625a4783f14
-R 21ffe0bceeaf14b3e3d3b64b375f9eb8
+P d6d79b661a1c6137d4693393e02416da4858d58dc84d144081a48d523655b483
+R 495d381dcb72f9436340c5a0c3371031
 U stephan
-Z cfe198e466da02226e0ffe831d5c4056
+Z f43bcfbf56838f97d3048cbeb389d31b
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index bbadb22b44..8536e5e333 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d6d79b661a1c6137d4693393e02416da4858d58dc84d144081a48d523655b483
\ No newline at end of file
+b9cdcc06a8f70694d10ee5b1a0fd9f08f4c705ce576e5103bbafb36fc9cc2122
\ No newline at end of file

From 453af2f6ccd617b0bed30a958e94919097393876 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 17 Aug 2022 16:44:05 +0000
Subject: [PATCH 015/428] Minor cleanups, reorgs, and doc updates for the JS
 APIs. Renamed sqlite3(-api)-worker.js to sqlite3(-api)-worker1.js, for
 symmetry with sqlite3-api-oo1.js.

FossilOrigin-Name: f5059ee6f9fc55a381cbf08a30dfb9a5636c0b44341e42f4e9f12a3b109b5507
---
 ext/wasm/GNUmakefile                          |   2 +-
 ext/wasm/api/README.md                        |   8 +-
 ext/wasm/api/sqlite3-api-glue.js              |  13 +-
 ext/wasm/api/sqlite3-api-oo1.js               |  19 +-
 ext/wasm/api/sqlite3-api-prologue.js          | 102 ++++----
 ...3-api-worker.js => sqlite3-api-worker1.js} | 217 +++++++++---------
 .../{sqlite3-worker.js => sqlite3-worker1.js} |   4 +-
 ext/wasm/testing1.js                          |   4 +-
 ext/wasm/testing2.html                        |   4 +-
 ext/wasm/testing2.js                          |  20 +-
 manifest                                      |  30 +--
 manifest.uuid                                 |   2 +-
 12 files changed, 214 insertions(+), 211 deletions(-)
 rename ext/wasm/api/{sqlite3-api-worker.js => sqlite3-api-worker1.js} (80%)
 rename ext/wasm/{sqlite3-worker.js => sqlite3-worker1.js} (94%)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 8a9adb75f5..467034f9e8 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -128,7 +128,7 @@ sqlite3-api.jses := \
   $(dir.jacc)/jaccwabyt.js \
   $(dir.api)/sqlite3-api-glue.js \
   $(dir.api)/sqlite3-api-oo1.js \
-  $(dir.api)/sqlite3-api-worker.js
+  $(dir.api)/sqlite3-api-worker1.js
 #sqlite3-api.jses += $(dir.api)/sqlite3-api-opfs.js 
 sqlite3-api.jses += $(dir.api)/sqlite3-api-cleanup.js
 
diff --git a/ext/wasm/api/README.md b/ext/wasm/api/README.md
index 43d2b0dd5d..9000697b26 100644
--- a/ext/wasm/api/README.md
+++ b/ext/wasm/api/README.md
@@ -60,17 +60,17 @@ browser client:
   high-level sqlite3 JS wrappers and should feel relatively familiar
   to anyone familiar with such APIs. That said, it is not a "required
   component" and can be elided from builds which do not want it.
-- `sqlite3-api-worker.js`\  
+- `sqlite3-api-worker1.js`\  
   A Worker-thread-based API which uses OO API #1 to provide an
   interface to a database which can be driven from the main Window
   thread via the Worker message-passing interface. Like OO API #1,
   this is an optional component, offering one of any number of
   potential implementations for such an API.
-    - `sqlite3-worker.js`\  
+    - `sqlite3-worker1.js`\  
       Is not part of the amalgamated sources and is intended to be
       loaded by a client Worker thread. It loads the sqlite3 module
-      and runs the Worker API which is implemented in
-      `sqlite3-api-worker.js`.
+      and runs the Worker #1 API which is implemented in
+      `sqlite3-api-worker1.js`.
 - `sqlite3-api-opfs.js`\  
   is an in-development/experimental sqlite3 VFS wrapper, the goal of
   which being to use Google Chrome's Origin-Private FileSystem (OPFS)
diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index e962c93b64..efcd6fea9b 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -128,7 +128,7 @@
   */
   __prepare.basic = wasm.xWrap('sqlite3_prepare_v3',
                                "int", ["sqlite3*", "string",
-                                       "int"/*MUST always be negative*/,
+                                       "int"/*ignored for this impl!*/,
                                        "int", "**",
                                        "**"/*MUST be 0 or null or undefined!*/]);
   /**
@@ -148,19 +148,10 @@
 
   /* Documented in the api object's initializer. */
   capi.sqlite3_prepare_v3 = function f(pDb, sql, sqlLen, prepFlags, ppStmt, pzTail){
-    /* 2022-07-08: xWrap() 'string' arg handling may be able do this
-       special-case handling for us. It needs to be tested. Or maybe
-       not: we always want to treat pzTail as null when passed a
-       non-pointer SQL string and the argument adapters don't have
-       enough state to know that. Maybe they could/should, by passing
-       the currently-collected args as an array as the 2nd arg to the
-       argument adapters? Or maybe we collect all args in an array,
-       pass that to an optional post-args-collected callback, and give
-       it a chance to manipulate the args before we pass them on? */
     if(util.isSQLableTypedArray(sql)) sql = util.typedArrayToString(sql);
     switch(typeof sql){
         case 'string': return __prepare.basic(pDb, sql, -1, prepFlags, ppStmt, null);
-        case 'number': return __prepare.full(pDb, sql, sqlLen||-1, prepFlags, ppStmt, pzTail);
+        case 'number': return __prepare.full(pDb, sql, sqlLen, prepFlags, ppStmt, pzTail);
         default:
           return util.sqlite3_wasm_db_error(
             pDb, capi.SQLITE_MISUSE,
diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index e54e27ec2b..9efc38b915 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -322,15 +322,14 @@
       }
     },
     /**
-       Similar to this.filename but will return NULL for
-       special names like ":memory:". Not of much use until
-       we have filesystem support. Throws if the DB has
-       been closed. If passed an argument it then it will return
-       the filename of the ATTACHEd db with that name, else it assumes
-       a name of `main`.
+       Similar to this.filename but will return NULL for special names
+       like ":memory:". Not of much use until we have filesystem
+       support. Throws if the DB has been closed. If passed an
+       argument it then it will return the filename of the ATTACHEd db
+       with that name, else it assumes a name of `main`.
     */
-    fileName: function(dbName){
-      return capi.sqlite3_db_filename(affirmDbOpen(this).pointer, dbName||"main");
+    fileName: function(dbName='main'){
+      return capi.sqlite3_db_filename(affirmDbOpen(this).pointer, dbName);
     },
     /**
        Returns true if this db instance has a name which resolves to a
@@ -759,7 +758,7 @@
                   capi.sqlite3_result_null(pCx);
                   break;
                 }else if(util.isBindableTypedArray(val)){
-                  const pBlob = capi.wasm.mallocFromTypedArray(val);
+                  const pBlob = capi.wasm.allocFromTypedArray(val);
                   capi.sqlite3_result_blob(pCx, pBlob, val.byteLength,
                                           capi.SQLITE_TRANSIENT);
                   capi.wasm.dealloc(pBlob);
@@ -1072,7 +1071,7 @@
               capi.wasm.scopedAllocPop(stack);
             }
           }else{
-            const pBlob = capi.wasm.mallocFromTypedArray(val);
+            const pBlob = capi.wasm.allocFromTypedArray(val);
             try{
               rc = capi.sqlite3_bind_blob(stmt.pointer, ndx, pBlob, val.byteLength,
                                          capi.SQLITE_TRANSIENT);
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 08e3ebf6ed..cf9fd896a6 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -172,36 +172,6 @@ self.sqlite3ApiBootstrap = function(config){
       counterparts.
   */
   const capi = {
-    /**
-       An Error subclass which is thrown by this object's alloc() method
-       on OOM.
-    */
-    WasmAllocError: WasmAllocError,
-    /**
-       The API's one single point of access to the WASM-side memory
-       allocator. Works like malloc(3) (and is likely bound to
-       malloc()) but throws an WasmAllocError if allocation fails. It is
-       important that any code which might pass through the sqlite3 C
-       API NOT throw and must instead return SQLITE_NOMEM (or
-       equivalent, depending on the context).
-
-       That said, very few cases in the API can result in
-       client-defined functions propagating exceptions via the C-style
-       API. Most notably, this applies ot User-defined SQL Functions
-       (UDFs) registered via sqlite3_create_function_v2(). For that
-       specific case it is recommended that all UDF creation be
-       funneled through a utility function and that a wrapper function
-       be added around the UDF which catches any exception and sets
-       the error state to OOM. (The overall complexity of registering
-       UDFs essentially requires a helper for doing so!)
-    */
-    alloc: undefined/*installed later*/,
-    /**
-       The API's one single point of access to the WASM-side memory
-       deallocator. Works like free(3) (and is likely bound to
-       free()).
-    */
-    dealloc: undefined/*installed later*/,
     /**
        When using sqlite3_open_v2() it is important to keep the following
        in mind:
@@ -365,6 +335,33 @@ self.sqlite3ApiBootstrap = function(config){
         || toss("API config object requires a WebAssembly.Memory object",
                 "in either config.exports.memory (exported)",
                 "or config.memory (imported)."),
+
+      /**
+         The API's one single point of access to the WASM-side memory
+         allocator. Works like malloc(3) (and is likely bound to
+         malloc()) but throws an WasmAllocError if allocation fails. It is
+         important that any code which might pass through the sqlite3 C
+         API NOT throw and must instead return SQLITE_NOMEM (or
+         equivalent, depending on the context).
+
+         That said, very few cases in the API can result in
+         client-defined functions propagating exceptions via the C-style
+         API. Most notably, this applies ot User-defined SQL Functions
+         (UDFs) registered via sqlite3_create_function_v2(). For that
+         specific case it is recommended that all UDF creation be
+         funneled through a utility function and that a wrapper function
+         be added around the UDF which catches any exception and sets
+         the error state to OOM. (The overall complexity of registering
+         UDFs essentially requires a helper for doing so!)
+      */
+      alloc: undefined/*installed later*/,
+      /**
+         The API's one single point of access to the WASM-side memory
+         deallocator. Works like free(3) (and is likely bound to
+         free()).
+      */
+      dealloc: undefined/*installed later*/
+
       /* Many more wasm-related APIs get installed later on. */
     }/*wasm*/
   }/*capi*/;
@@ -387,7 +384,7 @@ self.sqlite3ApiBootstrap = function(config){
      Int8Array types and will throw if srcTypedArray is of
      any other type.
   */
-  capi.wasm.mallocFromTypedArray = function(srcTypedArray){
+  capi.wasm.allocFromTypedArray = function(srcTypedArray){
     affirmBindableTypedArray(srcTypedArray);
     const pRet = this.alloc(srcTypedArray.byteLength || 1);
     this.heapForSize(srcTypedArray.constructor).set(srcTypedArray.byteLength ? srcTypedArray : [0], pRet);
@@ -400,11 +397,13 @@ self.sqlite3ApiBootstrap = function(config){
     const f = capi.wasm.exports[key];
     if(!(f instanceof Function)) toss("Missing required exports[",key,"] function.");
   }
+
   capi.wasm.alloc = function(n){
     const m = this.exports[keyAlloc](n);
     if(!m) throw new WasmAllocError("Failed to allocate "+n+" bytes.");
     return m;
   }.bind(capi.wasm)
+
   capi.wasm.dealloc = (m)=>capi.wasm.exports[keyDealloc](m);
 
   /**
@@ -554,7 +553,8 @@ self.sqlite3ApiBootstrap = function(config){
     ["sqlite3_value_text", "string", "*"],
     ["sqlite3_value_type", "int", "*"],
     ["sqlite3_vfs_find", "*", "string"],
-    ["sqlite3_vfs_register", "int", "*", "int"]
+    ["sqlite3_vfs_register", "int", "*", "int"],
+    ["sqlite3_wasm_vfs_unlink", "int", "string"]
   ]/*capi.wasm.bindingSignatures*/;
 
   if(false && capi.wasm.compileOptionUsed('SQLITE_ENABLE_NORMALIZE')){
@@ -583,18 +583,26 @@ self.sqlite3ApiBootstrap = function(config){
 
      If the wasm environment has a persistent storage directory,
      its path is returned by this function. If it does not then
-     it returns one of:
+     it returns "" (noting that "" is a falsy value).
 
-     - `undefined` if initIfNeeded is false and this function has
-       never been called before.
+     The first time this is called, this function inspects the current
+     environment to determine whether persistence filesystem support
+     is available and, if it is, enables it (if needed).
 
-     - `""` if no persistent storage is available.
+     TODOs and caveats:
 
-     Note that in both cases the return value is falsy.
+     - The directory name (mount point) for persistent storage is
+       currently hard-coded. It needs to be configurable.
+
+     - If persistent storage is available at the root of the virtual
+       filesystem, this interface cannot currently distinguish that
+       from the lack of persistence. That case cannot currently (with
+       WASMFS/OPFS) happen, but it is conceivably possible in future
+       environments or non-browser runtimes (none of which are yet
+       supported targets).
   */
-  capi.sqlite3_web_persistent_dir = function(initIfNeeded=true){
+  capi.sqlite3_web_persistent_dir = function(){
     if(undefined !== __persistentDir) return __persistentDir;
-    else if(!initIfNeeded) return;
     // If we have no OPFS, there is no persistent dir
     if(!self.FileSystemHandle || !self.FileSystemDirectoryHandle
        || !self.FileSystemFileHandle){
@@ -625,8 +633,22 @@ self.sqlite3ApiBootstrap = function(config){
     }
   }.bind(capi);
 
+  /**
+     Returns true if sqlite3.capi.sqlite3_web_persistent_dir() is a
+     non-empty string and the given name has that string as its
+     prefix, else returns false.
+  */
+  capi.sqlite3_web_filename_is_persistent = function(name){
+    const p = this.sqlite3_web_persistent_dir();
+    return (p && name) ? name.startsWith(p) : false;
+  }.bind(capi);
+
   /* The remainder of the API will be set up in later steps. */
   return {
+    /**
+       An Error subclass which is thrown by this.wasm.alloc() on OOM.
+    */
+    WasmAllocError: WasmAllocError,
     capi,
     postInit: [
       /* some pieces of the API may install functions into this array,
@@ -635,8 +657,6 @@ self.sqlite3ApiBootstrap = function(config){
          the current global object and sqlite3 is the object returned
          from sqlite3ApiBootstrap(). This array will be removed at the
          end of the API setup process. */],
-    /** Config is needed downstream for gluing pieces together. It
-        will be removed at the end of the API setup process. */
     config
   };
 }/*sqlite3ApiBootstrap()*/;
diff --git a/ext/wasm/api/sqlite3-api-worker.js b/ext/wasm/api/sqlite3-api-worker1.js
similarity index 80%
rename from ext/wasm/api/sqlite3-api-worker.js
rename to ext/wasm/api/sqlite3-api-worker1.js
index 95b27b21ec..565946bbc6 100644
--- a/ext/wasm/api/sqlite3-api-worker.js
+++ b/ext/wasm/api/sqlite3-api-worker1.js
@@ -10,26 +10,40 @@
 
   ***********************************************************************
 
-  This file implements a Worker-based wrapper around SQLite3 OO API
-  #1.
+  This file implements the initializer for the sqlite3 "Worker API
+  #1", a very basic DB access API intended to be scripted from a main
+  window thread via Worker-style messages. Because of limitations in
+  that type of communication, this API is minimalistic and only
+  capable of serving relatively basic DB requests (e.g. it cannot
+  process nested query loops concurrently).
+
+  This file requires that the core C-style sqlite3 API and OO API #1
+  have been loaded.
+*/
+
+/**
+  This function implements a Worker-based wrapper around SQLite3 OO
+  API #1, colloquially known as "Worker API #1".
 
   In order to permit this API to be loaded in worker threads without
   automatically registering onmessage handlers, initializing the
-  worker API requires calling initWorkerAPI(). If this function
+  worker API requires calling initWorker1API(). If this function
   is called from a non-worker thread then it throws an exception.
 
-  When initialized, it installs message listeners to receive messages
-  from the main thread and then it posts a message in the form:
+  When initialized, it installs message listeners to receive Worker
+  messages and then it posts a message in the form:
 
   ```
-  {type:'sqlite3-api',data:'worker-ready'}
+  {type:'sqlite3-api',data:'worker1-ready'}
   ```
 
-  This file requires that the core C-style sqlite3 API and OO API #1
-  have been loaded and that self.sqlite3 contains both,
-  as documented for those APIs.
+  to let the client know that it has been initialized. Clients may
+  optionally depend on this function not returning until
+  initialization is complete, as the initialization is synchronous.
+  In some contexts, however, listening for the above message is
+  a better fit.
 */
-self.sqlite3.initWorkerAPI = function(){
+self.sqlite3.initWorker1API = function(){
   'use strict';
   /**
      UNDER CONSTRUCTION
@@ -39,39 +53,12 @@ self.sqlite3.initWorkerAPI = function(){
      cannot pass callback functions between the window thread and a
      worker thread, so we have to receive all db results via
      asynchronous message-passing. That requires an asychronous API
-     with a distinctly different shape that the main OO API.
+     with a distinctly different shape than OO API #1.
 
-     Certain important considerations here include:
+     TODOs include, but are not necessarily limited to:
 
-     - Support only one db connection or multiple? The former is far
-     easier, but there's always going to be a user out there who wants
-     to juggle six database handles at once. Do we add that complexity
-     or tell such users to write their own code using the provided
-     lower-level APIs?
-
-     - Fetching multiple results: do we pass them on as a series of
-     messages, with start/end messages on either end, or do we collect
-     all results and bundle them back in a single message?  The former
-     is, generically speaking, more memory-efficient but the latter
-     far easier to implement in this environment. The latter is
-     untennable for large data sets. Despite a web page hypothetically
-     being a relatively limited environment, there will always be
-     those users who feel that they should/need to be able to work
-     with multi-hundred-meg (or larger) blobs, and passing around
-     arrays of those may quickly exhaust the JS engine's memory.
-
-     TODOs include, but are not limited to:
-
-     - The ability to manage multiple DB handles. This can
-     potentially be done via a simple mapping of DB.filename or
-     DB.pointer (`sqlite3*` handle) to DB objects. The open()
-     interface would need to provide an ID (probably DB.pointer) back
-     to the user which can optionally be passed as an argument to
-     the other APIs (they'd default to the first-opened DB, for
-     ease of use). Client-side usability of this feature would
-     benefit from making another wrapper class (or a singleton)
-     available to the main thread, with that object proxying all(?)
-     communication with the worker.
+     - Support for handling multiple DBs via this interface is under
+     development.
 
      - Revisit how virtual files are managed. We currently delete DBs
      from the virtual filesystem when we close them, for the sake of
@@ -79,6 +66,8 @@ self.sqlite3.initWorkerAPI = function(){
      require that we give up that habit. Similarly, fully supporting
      ATTACH, where a user can upload multiple DBs and ATTACH them,
      also requires the that we manage the VFS entries better.
+     Related: we most definitely do not want to delete persistent DBs
+     (e.g. stored on OPFS) when they're closed.
   */
   const toss = (...args)=>{throw new Error(args.join(' '))};
   if('function' !== typeof importScripts){
@@ -116,8 +105,7 @@ self.sqlite3.initWorkerAPI = function(){
       // same filename and close/reopen it (or just pass it back as is?).
       if(!arg && this.defaultDb) return this.defaultDb;
       //???if(this.defaultDb) this.defaultDb.close();
-      let db;
-      db = (Array.isArray(arg) ? new DB(...arg) : new DB(arg));
+      const db = (Array.isArray(arg) ? new DB(...arg) : new DB(arg));
       this.dbs[getDbId(db)] = db;
       if(!this.defaultDb) this.defaultDb = db;
       return db;
@@ -125,13 +113,17 @@ self.sqlite3.initWorkerAPI = function(){
     close: function(db,alsoUnlink){
       if(db){
         delete this.dbs[getDbId(db)];
-        db.close(alsoUnlink);
+        const filename = db.fileName();
+        db.close();
         if(db===this.defaultDb) this.defaultDb = undefined;
+        if(alsoUnlink && filename){
+          sqlite3.capi.sqlite3_wasm_vfs_unlink(filename);
+        }
       }
     },
     post: function(type,data,xferList){
       if(xferList){
-        self.postMessage({type, data},xferList);
+        self.postMessage( {type, data}, xferList );
         xferList.length = 0;
       }else{
         self.postMessage({type, data});
@@ -172,6 +164,68 @@ self.sqlite3.initWorkerAPI = function(){
   */
   const wMsgHandler = {
     xfer: [/*Temp holder for "transferable" postMessage() state.*/],
+    /**
+       Proxy for the DB constructor. Expects to be passed a single
+       object or a falsy value to use defaults. The object may
+       have a filename property to name the db file (see the DB
+       constructor for peculiarities and transformations) and/or a
+       buffer property (a Uint8Array holding a complete database
+       file's contents). The response is an object:
+
+       {
+         filename: db filename (possibly differing from the input),
+
+         dbId: an opaque ID value which must be passed to other calls
+               in this API to tell them which db to use. If it is not
+               provided to future calls, they will default to
+               operating on the first-opened db.
+
+          messageId: if the client-sent message included this field,
+              it is mirrored in the response.
+       }
+    */
+    open: function(ev){
+      const args = [], data = (ev.data || {});
+      if(data.simulateError){ // undocumented internal testing option
+        toss("Throwing because of simulateError flag.");
+      }
+      if(data.filename) args.push(data.filename);
+      const db = wState.open(args);
+      return {
+        filename: db.filename,
+        dbId: getDbId(db)
+      };
+    },
+    /**
+       Proxy for DB.close(). If ev.data may either be a boolean or
+       an object with an `unlink` property. If that value is
+       truthy then the db file (if the db is currently open) will
+       be unlinked from the virtual filesystem, else it will be
+       kept intact. The response object is:
+
+       {
+         filename: db filename _if_ the db is opened when this
+                   is called, else the undefined value,
+         unlink: boolean. If true, unlink() (delete) the db file
+                 after closing int. Any error while deleting it is
+                 ignored.
+       }
+
+       It does not error if the given db is already closed or no db is
+       provided. It is simply does nothing useful in that case.
+    */
+    close: function(ev){
+      const db = getMsgDb(ev,false);
+      const response = {
+        filename: db && db.filename,
+        dbId: db ? getDbId(db) : undefined
+      };
+      if(db){
+        wState.close(db, !!((ev.data && 'object'===typeof ev.data)
+                            ? ev.data.unlink : false));
+      }
+      return response;
+    },
     /**
        Proxy for DB.exec() which expects a single argument of type
        string (SQL to execute) or an options object in the form
@@ -266,10 +320,16 @@ self.sqlite3.initWorkerAPI = function(){
        exports of ":memory:" and "" (temp file) DBs. The latter is
        ostensibly easy because the file is (potentially) on disk, but
        the former does not have a structure which maps directly to a
-       db file image.
+       db file image. We can VACUUM INTO a :memory:/temp db into a
+       file for that purpose, though.
     */
     export: function(ev){
       toss("export() requires reimplementing for portability reasons.");
+      /**
+         We need to reimplement this to use the Emscripten FS
+         interface. That part used to be in the OO#1 API but that
+         dependency was removed from that level of the API.
+      */
       /**const db = getMsgDb(ev);
       const response = {
         buffer: db.exportBinaryImage(),
@@ -279,66 +339,6 @@ self.sqlite3.initWorkerAPI = function(){
       this.xfer.push(response.buffer.buffer);
       return response;**/
     }/*export()*/,
-    /**
-       Proxy for the DB constructor. Expects to be passed a single
-       object or a falsy value to use defaults. The object may
-       have a filename property to name the db file (see the DB
-       constructor for peculiarities and transformations) and/or a
-       buffer property (a Uint8Array holding a complete database
-       file's contents). The response is an object:
-
-       {
-         filename: db filename (possibly differing from the input),
-
-         id: an opaque ID value intended for future distinction
-             between multiple db handles. Messages including a specific
-             ID will use the DB for that ID.
-
-       }
-
-       If the Worker's db is currently opened, this call closes it
-       before proceeding.
-    */
-    open: function(ev){
-      wState.close(/*true???*/);
-      const args = [], data = (ev.data || {});
-      if(data.simulateError){
-        toss("Throwing because of open.simulateError flag.");
-      }
-      if(data.filename) args.push(data.filename);
-      if(data.buffer){
-        args.push(data.buffer);
-        this.xfer.push(data.buffer.buffer);
-      }
-      const db = wState.open(args);
-      return {
-        filename: db.filename,
-        dbId: getDbId(db)
-      };
-    },
-    /**
-       Proxy for DB.close(). If ev.data may either be a boolean or
-       an object with an `unlink` property. If that value is
-       truthy then the db file (if the db is currently open) will
-       be unlinked from the virtual filesystem, else it will be
-       kept intact. The response object is:
-
-       {
-         filename: db filename _if_ the db is opened when this
-                   is called, else the undefined value
-       }
-    */
-    close: function(ev){
-      const db = getMsgDb(ev,false);
-      const response = {
-        filename: db && db.filename
-      };
-      if(db){
-        wState.close(db, !!((ev.data && 'object'===typeof ev.data)
-                            ? ev.data.unlink : ev.data));
-      }
-      return response;
-    },
     toss: function(ev){
       toss("Testing worker exception");
     }
@@ -352,7 +352,8 @@ self.sqlite3.initWorkerAPI = function(){
 
      { type: apiCommand,
        dbId: optional DB ID value (else uses a default db handle)
-       data: apiArguments
+       data: apiArguments,
+       messageId: optional client-specific value
      }
 
      As a rule, these commands respond with a postMessage() of their
@@ -416,5 +417,5 @@ self.sqlite3.initWorkerAPI = function(){
     response.departureTime = ev.departureTime;
     wState.post(evType, response, wMsgHandler.xfer);
   };
-  setTimeout(()=>self.postMessage({type:'sqlite3-api',data:'worker-ready'}), 0);
+  setTimeout(()=>self.postMessage({type:'sqlite3-api',data:'worker1-ready'}), 0);
 }.bind({self, sqlite3: self.sqlite3});
diff --git a/ext/wasm/sqlite3-worker.js b/ext/wasm/sqlite3-worker1.js
similarity index 94%
rename from ext/wasm/sqlite3-worker.js
rename to ext/wasm/sqlite3-worker1.js
index 48797de8ab..3982ddaa2b 100644
--- a/ext/wasm/sqlite3-worker.js
+++ b/ext/wasm/sqlite3-worker1.js
@@ -14,7 +14,7 @@
   sqlite3.js, initializes the module, and postMessage()'s a message
   after the module is initialized:
 
-  {type: 'sqlite3-api', data: 'worker-ready'}
+  {type: 'sqlite3-api', data: 'worker1-ready'}
 
   This seemingly superfluous level of indirection is necessary when
   loading sqlite3.js via a Worker. Instantiating a worker with new
@@ -28,4 +28,4 @@
 */
 "use strict";
 importScripts('sqlite3.js');
-sqlite3InitModule().then((EmscriptenModule)=>EmscriptenModule.sqlite3.initWorkerAPI());
+sqlite3InitModule().then((EmscriptenModule)=>EmscriptenModule.sqlite3.initWorker1API());
diff --git a/ext/wasm/testing1.js b/ext/wasm/testing1.js
index 779e0bd72f..28f2b604b4 100644
--- a/ext/wasm/testing1.js
+++ b/ext/wasm/testing1.js
@@ -163,10 +163,10 @@
     }
 
     try {
-      throw new capi.WasmAllocError;
+      throw new sqlite3.WasmAllocError;
     }catch(e){
       T.assert(e instanceof Error)
-        .assert(e instanceof capi.WasmAllocError);
+        .assert(e instanceof sqlite3.WasmAllocError);
     }
 
     try {
diff --git a/ext/wasm/testing2.html b/ext/wasm/testing2.html
index 739c7f66be..25d5a9f5d8 100644
--- a/ext/wasm/testing2.html
+++ b/ext/wasm/testing2.html
@@ -6,10 +6,10 @@
     <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
     <link rel="stylesheet" href="common/emscripten.css"/>
     <link rel="stylesheet" href="common/testing.css"/>
-    <title>sqlite3-worker.js tests</title>
+    <title>sqlite3-worker1.js tests</title>
   </head>
   <body>
-    <header id='titlebar'><span>sqlite3-worker.js tests</span></header>
+    <header id='titlebar'><span>sqlite3-worker1.js tests</span></header>
     <!-- emscripten bits -->
     <figure id="module-spinner">
       <div class="spinner"></div>
diff --git a/ext/wasm/testing2.js b/ext/wasm/testing2.js
index bc578bb792..bcbe7b50de 100644
--- a/ext/wasm/testing2.js
+++ b/ext/wasm/testing2.js
@@ -10,12 +10,12 @@
 
   ***********************************************************************
 
-  A basic test script for sqlite3-worker.js.
+  A basic test script for sqlite3-worker1.js.
 */
 'use strict';
 (function(){
   const T = self.SqliteTestUtil;
-  const SW = new Worker("sqlite3-worker.js");
+  const SW = new Worker("sqlite3-worker1.js");
   const DbState = {
     id: undefined
   };
@@ -48,7 +48,7 @@
   };
 
   let startTime;
-  
+
   /**
      A queue for callbacks which are to be run in response to async
      DB commands. See the notes in runTests() for why we need
@@ -261,16 +261,8 @@
        will fail and we have no way of cancelling them once they've
        been posted to the worker.
 
-       We currently do (2) because (A) it's certainly the most
-       client-friendly thing to do and (B) it seems likely that most
-       apps using this API will only have a single db to work with so
-       won't need to juggle multiple DB ids. If we revert to (1) then
-       the following call to runTests2() needs to be moved into the
-       callback function of the runOneTest() check for the 'open'
-       command. Note, also, that using approach (2) does not keep the
-       user from instead using approach (1), noting that doing so
-       requires explicit handling of the 'open' message to account for
-       it.
+       Which approach we use below depends on the boolean value of
+       waitForOpen.
     */
     const waitForOpen = 1,
           simulateOpenError = 0 /* if true, the remaining tests will
@@ -315,7 +307,7 @@
     switch(ev.type){
         case 'sqlite3-api':
           switch(ev.data){
-              case 'worker-ready':
+              case 'worker1-ready':
                 log("Message:",ev);
                 self.sqlite3TestModule.setStatus(null);
                 runTests();
diff --git a/manifest b/manifest
index ccd0bb633d..b1aff51e1e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C wasm:\sminor\scleanups\sin\sthe\sOO\sAPI\s#1\sdemo.
-D 2022-08-16T17:29:59.160
+C Minor\scleanups,\sreorgs,\sand\sdoc\supdates\sfor\sthe\sJS\sAPIs.\sRenamed\ssqlite3(-api)-worker.js\sto\ssqlite3(-api)-worker1.js,\sfor\ssymmetry\swith\ssqlite3-api-oo1.js.
+D 2022-08-17T16:44:05.090
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,19 +474,19 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle db7a4602f043cf4a5e4135be3609a487f9f1c83f05778bfbdf93766be4541b96
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile b5b34ee01efcf7c3d6c53d54a332545f2670e7a5a0c63d6de847d3726e5bc521
+F ext/wasm/GNUmakefile 19c21ce4df5583278cc495bffbe03c69dc64af60fa9dac01766d0192bd191ac6
 F ext/wasm/README.md 4b00ae7c7d93c4591251245f0996a319e2651361013c98d2efb0b026771b7331
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 77ef4bcf37e362b9ad61f9c175dfc0f1b3e571563fb311b96581cf422ee6a8ec
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
-F ext/wasm/api/README.md b6d0fb64bfdf7bf9ce6938ea4104228f6f5bbef600f5d910b2f8c8694195988c
+F ext/wasm/api/README.md d876597edd2b9542b6ea031adaaff1c042076fde7b670b1dc6d8a87b28a6631b
 F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba81456260a713ed04900c
 F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a4a06cb776c003880b
 F ext/wasm/api/sqlite3-api-cleanup.js 149fd63a0400cd1d69548887ffde2ed89c13283384a63c2e9fcfc695e38a9e11
-F ext/wasm/api/sqlite3-api-glue.js 82c09f49c69984009ba5af2b628e67cc26c5dd203d383cd3091d40dab4e6514b
-F ext/wasm/api/sqlite3-api-oo1.js 1d63e7e453e38ff2ad0c5e8bf68345f6fc5fe99fbc4a893cc982b4c50d904ca0
+F ext/wasm/api/sqlite3-api-glue.js 4a09dd1153874f7a716cf953329bc1e78bf24e0870a9aad15214ffd51ac913bc
+F ext/wasm/api/sqlite3-api-oo1.js d68dc7a692bc54385d9b851e914b386a146dc6c86624bfeb4672280a2d822082
 F ext/wasm/api/sqlite3-api-opfs.js c93cdd14f81a26b3a64990515ee05c7e29827fbc8fba4e4c2fef3a37a984db89
-F ext/wasm/api/sqlite3-api-prologue.js c0f335bf8b44071da0204b8fa95ce78fd737033b155e7bcfdaee6ae64600802f
-F ext/wasm/api/sqlite3-api-worker.js 1124f404ecdf3c14d9f829425cef778cd683911a9883f0809a463c3c7773c9fd
+F ext/wasm/api/sqlite3-api-prologue.js 96997e411b41ff3d4024c2ad625c5cdb7b6a619ba8beece4662ad190191b1119
+F ext/wasm/api/sqlite3-api-worker1.js 74130ec4979baeaf3e909c7619b99e9f466e2d816cd07370987ff639d168ef45 w ext/wasm/api/sqlite3-api-worker.js
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 0e78035045e3328fb050ec9580c6bfb714c756a1d3b917259e58baf9b0332c98
 F ext/wasm/common/SqliteTestUtil.js e41a1406f18da9224523fad0c48885caf995b56956a5b9852909c0989e687e90
@@ -508,11 +508,11 @@ F ext/wasm/scratchpad-opfs-main.js a819ed26047c5539630cea59add6a5082ba04cdf82da2
 F ext/wasm/scratchpad-opfs-worker.html 66c1d15d678f3bd306373d76b61c6c8aef988f61f4a8dd40185d452f9c6d2bf5
 F ext/wasm/scratchpad-opfs-worker.js 3ec2868c669713145c76eb5877c64a1b20741f741817b87c907a154b676283a9
 F ext/wasm/scratchpad-opfs-worker2.js de3ea77548243a638c8426b7e43cc1dbfc511013228ab98436eb102923ed6689
-F ext/wasm/sqlite3-worker.js 1325ca8d40129a82531902a3a077b795db2eeaee81746e5a0c811a04b415fa7f
+F ext/wasm/sqlite3-worker1.js e93fe8e5da7cb56dcf4d1bb0aa44bf681b509e1c56f2a75885c0f408f034c42b w ext/wasm/sqlite3-worker.js
 F ext/wasm/testing1.html 528001c7e32ee567abc195aa071fd9820cc3c8ffc9c8a39a75e680db05f0c409
-F ext/wasm/testing1.js a25069e20d5f8dc548cc98bcf7002cec812084421a1f7f70ffae2c706d1167b2
-F ext/wasm/testing2.html 73e5048e666fd6fb28b6e635677a9810e1e139c599ddcf28d687c982134b92b8
-F ext/wasm/testing2.js dbb825174878716fab42c340962c0c1b32bfbe26dd16c7b082d30d35f510466c
+F ext/wasm/testing1.js 9a97a7e45ce122b479b4a706ae1024abded67fd5f34a5764e41ff5efde8dfa17
+F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
+F ext/wasm/testing2.js e16ae385cd24c4a4ec5de6f1c02e621d243e1f179204ac8df31068faa9e31b1a
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
@@ -2006,8 +2006,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 d6d79b661a1c6137d4693393e02416da4858d58dc84d144081a48d523655b483
-R 495d381dcb72f9436340c5a0c3371031
+P b9cdcc06a8f70694d10ee5b1a0fd9f08f4c705ce576e5103bbafb36fc9cc2122
+R 0f6a8177d32b201ea7bdd0eb1ddeff9b
 U stephan
-Z f43bcfbf56838f97d3048cbeb389d31b
+Z 89af6a2fddda724fc088d602c326bc26
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 8536e5e333..a341ff9cfa 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b9cdcc06a8f70694d10ee5b1a0fd9f08f4c705ce576e5103bbafb36fc9cc2122
\ No newline at end of file
+f5059ee6f9fc55a381cbf08a30dfb9a5636c0b44341e42f4e9f12a3b109b5507
\ No newline at end of file

From fed91737f5ddeaee86b2f282fea22beebad161f7 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Thu, 18 Aug 2022 11:16:27 +0000
Subject: [PATCH 016/428] Improve an exception check in demo-oo1.js.

FossilOrigin-Name: 55e1b775fa7ec492817cc847036df7794c3c22b78558e9e9c513f24c775dedab
---
 ext/wasm/demo-oo1.js |  8 ++++++--
 manifest             | 16 ++++++++--------
 manifest.uuid        |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/ext/wasm/demo-oo1.js b/ext/wasm/demo-oo1.js
index bb5e9fd267..480ea4938f 100644
--- a/ext/wasm/demo-oo1.js
+++ b/ext/wasm/demo-oo1.js
@@ -170,8 +170,12 @@
           throw new sqlite3.SQLite3Error("Demonstrating callInTransaction() rollback");
         });
       }catch(e){
-        log("Got expected exception:",e.message);
-        log("count(*) from t =",db.selectValue("select count(*) from t"));
+        if(e instanceof sqlite3.SQLite3Error){
+          log("Got expected exception:",e.message);
+          log("count(*) from t =",db.selectValue("select count(*) from t"));
+        }else{
+          throw e;
+        }
       }
 
     }finally{
diff --git a/manifest b/manifest
index b1aff51e1e..9601cb65da 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\scleanups,\sreorgs,\sand\sdoc\supdates\sfor\sthe\sJS\sAPIs.\sRenamed\ssqlite3(-api)-worker.js\sto\ssqlite3(-api)-worker1.js,\sfor\ssymmetry\swith\ssqlite3-api-oo1.js.
-D 2022-08-17T16:44:05.090
+C Improve\san\sexception\scheck\sin\sdemo-oo1.js.
+D 2022-08-18T11:16:27.283
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -486,7 +486,7 @@ F ext/wasm/api/sqlite3-api-glue.js 4a09dd1153874f7a716cf953329bc1e78bf24e0870a9a
 F ext/wasm/api/sqlite3-api-oo1.js d68dc7a692bc54385d9b851e914b386a146dc6c86624bfeb4672280a2d822082
 F ext/wasm/api/sqlite3-api-opfs.js c93cdd14f81a26b3a64990515ee05c7e29827fbc8fba4e4c2fef3a37a984db89
 F ext/wasm/api/sqlite3-api-prologue.js 96997e411b41ff3d4024c2ad625c5cdb7b6a619ba8beece4662ad190191b1119
-F ext/wasm/api/sqlite3-api-worker1.js 74130ec4979baeaf3e909c7619b99e9f466e2d816cd07370987ff639d168ef45 w ext/wasm/api/sqlite3-api-worker.js
+F ext/wasm/api/sqlite3-api-worker1.js 74130ec4979baeaf3e909c7619b99e9f466e2d816cd07370987ff639d168ef45
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 0e78035045e3328fb050ec9580c6bfb714c756a1d3b917259e58baf9b0332c98
 F ext/wasm/common/SqliteTestUtil.js e41a1406f18da9224523fad0c48885caf995b56956a5b9852909c0989e687e90
@@ -494,7 +494,7 @@ F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d695
 F ext/wasm/common/testing.css 572cf1ffae0b6eb7ca63684d3392bf350217a07b90e7a896e4fa850700c989b0
 F ext/wasm/common/whwasmutil.js 41b8e097e0a9cb07c24c0ede3c81b72470a63f4a4efb07f75586dc131569f5ae
 F ext/wasm/demo-oo1.html 75646855b38405d82781246fd08c852a2b3bee05dd9f0fe10ab655a8cffb79aa
-F ext/wasm/demo-oo1.js a036f93a41815063cca77e896a19bdd3b9771cd9dc93aa34b308245e1c9405a5
+F ext/wasm/demo-oo1.js 09c2e3f8dab87308d945da51eef4dae206f1e0a4edc6d2207096b5617a64b651
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js bccf46045be8824752876f3eec01c223be0616ccac184bffd0024cfe7a3262b8
 F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
@@ -508,7 +508,7 @@ F ext/wasm/scratchpad-opfs-main.js a819ed26047c5539630cea59add6a5082ba04cdf82da2
 F ext/wasm/scratchpad-opfs-worker.html 66c1d15d678f3bd306373d76b61c6c8aef988f61f4a8dd40185d452f9c6d2bf5
 F ext/wasm/scratchpad-opfs-worker.js 3ec2868c669713145c76eb5877c64a1b20741f741817b87c907a154b676283a9
 F ext/wasm/scratchpad-opfs-worker2.js de3ea77548243a638c8426b7e43cc1dbfc511013228ab98436eb102923ed6689
-F ext/wasm/sqlite3-worker1.js e93fe8e5da7cb56dcf4d1bb0aa44bf681b509e1c56f2a75885c0f408f034c42b w ext/wasm/sqlite3-worker.js
+F ext/wasm/sqlite3-worker1.js e93fe8e5da7cb56dcf4d1bb0aa44bf681b509e1c56f2a75885c0f408f034c42b
 F ext/wasm/testing1.html 528001c7e32ee567abc195aa071fd9820cc3c8ffc9c8a39a75e680db05f0c409
 F ext/wasm/testing1.js 9a97a7e45ce122b479b4a706ae1024abded67fd5f34a5764e41ff5efde8dfa17
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
@@ -2006,8 +2006,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 b9cdcc06a8f70694d10ee5b1a0fd9f08f4c705ce576e5103bbafb36fc9cc2122
-R 0f6a8177d32b201ea7bdd0eb1ddeff9b
+P f5059ee6f9fc55a381cbf08a30dfb9a5636c0b44341e42f4e9f12a3b109b5507
+R 26de05b21625601bc9d1934cb0717538
 U stephan
-Z 89af6a2fddda724fc088d602c326bc26
+Z 631a9c2307319184f6094a1100613815
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index a341ff9cfa..9d14975f11 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f5059ee6f9fc55a381cbf08a30dfb9a5636c0b44341e42f4e9f12a3b109b5507
\ No newline at end of file
+55e1b775fa7ec492817cc847036df7794c3c22b78558e9e9c513f24c775dedab
\ No newline at end of file

From d869a21d132f69653eb73a50afc00b8690a669fd Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Thu, 18 Aug 2022 12:21:58 +0000
Subject: [PATCH 017/428] javascript: rename and simplify
 DB.callInTransaction() as DB.transaction(). Add DB.savepoint(), which works
 the same as transaction() but uses savepoints. Correct concatenation of
 arguments to SQLite3Error to use spaces instead of commas. Test that
 demo-oo1.js works with persistent OPFS storage (output differs due to
 persistent rows, but the demo works).

FossilOrigin-Name: e8c323f12b6223bc9dcbbec40698969c7917128aa50cf599c247df23f607ae61
---
 ext/wasm/api/sqlite3-api-oo1.js | 61 +++++++++++++++++++++++----------
 ext/wasm/demo-oo1.js            | 45 +++++++++++++++++-------
 manifest                        | 14 ++++----
 manifest.uuid                   |  2 +-
 4 files changed, 83 insertions(+), 39 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index 9efc38b915..0e04b63ebf 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -59,12 +59,16 @@
      enabling clients to unambiguously identify such exceptions.
   */
   class SQLite3Error extends Error {
+    /**
+       Constructs this object with a message equal to all arguments
+       concatenated with a space between each one.
+    */
     constructor(...args){
-      super(...args);
+      super(args.join(' '));
       this.name = 'SQLite3Error';
     }
   };
-  const toss3 = (...args)=>{throw new SQLite3Error(args)};
+  const toss3 = (...args)=>{throw new SQLite3Error(...args)};
   sqlite3.SQLite3Error = SQLite3Error;
 
   /**
@@ -195,7 +199,7 @@
   };
 
   /**
-     Expects to be passed (arguments) from DB.exec() and
+     Expects to be passed the `arguments` object from DB.exec() and
      DB.execMulti(). Does the argument processing/validation, throws
      on error, and returns a new object on success:
 
@@ -842,26 +846,47 @@
 
     /**
        Starts a transaction, calls the given callback, and then either
-       rolls back or commits the transaction, depending on whether the
-       callback throw. The callback is pass this db object as its only
-       argument.  On success, returns the result of the callback.
-       Throws on error.
+       rolls back or commits the savepoint, depending on whether the
+       callback throws. The callback is passed this db object as its
+       only argument. On success, returns the result of the
+       callback. Throws on error.
+
+       Note that transactions may not be nested, so this will throw if
+       it is called recursively. For nested transactions, use the
+       savepoint() method or manually manage SAVEPOINTs using exec().
      */
-    callInTransaction: function(callback){
-      affirmDbOpen(this);
-      let err, rc;
-      this.exec("BEGIN");
-      try { rc = callback(this); }
-      catch(e){
-        err = e;
+    transaction: function(callback){
+      affirmDbOpen(this).exec("BEGIN");
+      try {
+        const rc = callback(this);
+        this.exec("COMMIT");
+        return rc;
+      }catch(e){
+        this.exec("ROLLBACK");
         throw e;
-      }finally{
-        if(err) this.exec("ROLLBACK");
-        else this.exec("COMMIT");
       }
-      return rc;
     },
 
+    /**
+       This works similarly to transaction() but uses sqlite3's SAVEPOINT
+       feature. This function starts a savepoint (with an unspecified name)
+       and calls the given callback function, passing it this db object.
+       If the callback returns, the savepoint is released (committed). If
+       the callback throws, the savepoint is rolled back. If it does not
+       throw, it returns the result of the callback.
+    */
+    savepoint: function(callback){
+      affirmDbOpen(this).exec("SAVEPOINT oo1");
+      try {
+        const rc = callback(this);
+        this.exec("RELEASE oo1");
+        return rc;
+      }catch(e){
+        this.execMulti("ROLLBACK to SAVEPOINT oo1; RELEASE SAVEPOINT oo1");
+        throw e;
+      }
+    },
+    
     /**
        This function currently does nothing and always throws.  It
        WILL BE REMOVED pending other refactoring, to eliminate a hard
diff --git a/ext/wasm/demo-oo1.js b/ext/wasm/demo-oo1.js
index 480ea4938f..1ea7e05c64 100644
--- a/ext/wasm/demo-oo1.js
+++ b/ext/wasm/demo-oo1.js
@@ -26,13 +26,9 @@
           oo = sqlite3.oo1,
           wasm = capi.wasm;
 
-    // If we have persistent storage, maybe init and mount it:
-    const dbDir = true
-          ? "" // this demo works better without persistent storage.
-          : capi.sqlite3_web_persistent_dir();
-            // ^^^ returns name of persistent mount point or "" if we have none
-
+    const dbDir = 1 ? "" : capi.sqlite3_web_persistent_dir();
     const db = new oo.DB(dbDir+"/mydb.sqlite3");
+    log("db =",db.filename);
     /**
        Never(!) rely on garbage collection to clean up DBs and
        (especially) statements. Always wrap their lifetimes in
@@ -164,14 +160,39 @@
       }
 
       try {
-        db.callInTransaction( function(D) {
+        db.transaction( function(D) {
           D.exec("delete from t");
           log("In transaction: count(*) from t =",db.selectValue("select count(*) from t"));
-          throw new sqlite3.SQLite3Error("Demonstrating callInTransaction() rollback");
+          throw new sqlite3.SQLite3Error("Demonstrating transaction() rollback");
         });
       }catch(e){
         if(e instanceof sqlite3.SQLite3Error){
-          log("Got expected exception:",e.message);
+          log("Got expected exception from db.transaction():",e.message);
+          log("count(*) from t =",db.selectValue("select count(*) from t"));
+        }else{
+          throw e;
+        }
+      }
+
+      try {
+        db.savepoint( function(D) {
+          D.exec("delete from t");
+          log("In savepoint: count(*) from t =",db.selectValue("select count(*) from t"));
+          D.savepoint(function(DD){
+            const rows = [];
+            D.execMulti({
+              sql: ["insert into t(a,b) values(99,100);",
+                    "select count(*) from t"],
+              rowMode: 0,
+              resultRows: rows
+            });
+            log("In nested savepoint. Row count =",rows[0]);
+            throw new sqlite3.SQLite3Error("Demonstrating nested savepoint() rollback");
+          })
+        });
+      }catch(e){
+        if(e instanceof sqlite3.SQLite3Error){
+          log("Got expected exception from nested db.savepoint():",e.message);
           log("count(*) from t =",db.selectValue("select count(*) from t"));
         }else{
           throw e;
@@ -205,13 +226,11 @@
   const runDemos = function(Module){
     //log("Module",Module);
     const sqlite3 = Module.sqlite3,
-          capi = sqlite3.capi,
-          oo = sqlite3.oo1,
-          wasm = capi.wasm;
+          capi = sqlite3.capi;
     log("Loaded module:",capi.sqlite3_libversion(), capi.sqlite3_sourceid());
     log("sqlite3 namespace:",sqlite3);
     try {
-      [ demo1 ].forEach((f)=>f(sqlite3, Module))
+      demo1(sqlite3);
     }catch(e){
       error("Exception:",e.message);
       throw e;
diff --git a/manifest b/manifest
index 9601cb65da..c93efa4806 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improve\san\sexception\scheck\sin\sdemo-oo1.js.
-D 2022-08-18T11:16:27.283
+C javascript:\srename\sand\ssimplify\sDB.callInTransaction()\sas\sDB.transaction().\sAdd\sDB.savepoint(),\swhich\sworks\sthe\ssame\sas\stransaction()\sbut\suses\ssavepoints.\sCorrect\sconcatenation\sof\sarguments\sto\sSQLite3Error\sto\suse\sspaces\sinstead\sof\scommas.\sTest\sthat\sdemo-oo1.js\sworks\swith\spersistent\sOPFS\sstorage\s(output\sdiffers\sdue\sto\spersistent\srows,\sbut\sthe\sdemo\sworks).
+D 2022-08-18T12:21:58.613
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -483,7 +483,7 @@ F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba814
 F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a4a06cb776c003880b
 F ext/wasm/api/sqlite3-api-cleanup.js 149fd63a0400cd1d69548887ffde2ed89c13283384a63c2e9fcfc695e38a9e11
 F ext/wasm/api/sqlite3-api-glue.js 4a09dd1153874f7a716cf953329bc1e78bf24e0870a9aad15214ffd51ac913bc
-F ext/wasm/api/sqlite3-api-oo1.js d68dc7a692bc54385d9b851e914b386a146dc6c86624bfeb4672280a2d822082
+F ext/wasm/api/sqlite3-api-oo1.js 6c14e97987fafdd5f63ffa8a086e5316d49c115743add4dabfacb302a7c76b45
 F ext/wasm/api/sqlite3-api-opfs.js c93cdd14f81a26b3a64990515ee05c7e29827fbc8fba4e4c2fef3a37a984db89
 F ext/wasm/api/sqlite3-api-prologue.js 96997e411b41ff3d4024c2ad625c5cdb7b6a619ba8beece4662ad190191b1119
 F ext/wasm/api/sqlite3-api-worker1.js 74130ec4979baeaf3e909c7619b99e9f466e2d816cd07370987ff639d168ef45
@@ -494,7 +494,7 @@ F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d695
 F ext/wasm/common/testing.css 572cf1ffae0b6eb7ca63684d3392bf350217a07b90e7a896e4fa850700c989b0
 F ext/wasm/common/whwasmutil.js 41b8e097e0a9cb07c24c0ede3c81b72470a63f4a4efb07f75586dc131569f5ae
 F ext/wasm/demo-oo1.html 75646855b38405d82781246fd08c852a2b3bee05dd9f0fe10ab655a8cffb79aa
-F ext/wasm/demo-oo1.js 09c2e3f8dab87308d945da51eef4dae206f1e0a4edc6d2207096b5617a64b651
+F ext/wasm/demo-oo1.js 8be9c6be3c8e579eab4e7a5ee720ed122e38275a1f105169c6826193e42cf102
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js bccf46045be8824752876f3eec01c223be0616ccac184bffd0024cfe7a3262b8
 F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
@@ -2006,8 +2006,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 f5059ee6f9fc55a381cbf08a30dfb9a5636c0b44341e42f4e9f12a3b109b5507
-R 26de05b21625601bc9d1934cb0717538
+P 55e1b775fa7ec492817cc847036df7794c3c22b78558e9e9c513f24c775dedab
+R c7dd436c51b79816d21badfd7965a0c6
 U stephan
-Z 631a9c2307319184f6094a1100613815
+Z 56fa2cd60f3999351a57836a87a9c295
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 9d14975f11..6c09520662 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-55e1b775fa7ec492817cc847036df7794c3c22b78558e9e9c513f24c775dedab
\ No newline at end of file
+e8c323f12b6223bc9dcbbec40698969c7917128aa50cf599c247df23f607ae61
\ No newline at end of file

From 4ff42a82f79ac8224ec7946714ee0c199869915c Mon Sep 17 00:00:00 2001
From: drh <>
Date: Thu, 18 Aug 2022 15:53:27 +0000
Subject: [PATCH 018/428] Add notes to ext/wasm/README.md explaining how to run
 tests on a remote machine.

FossilOrigin-Name: 7a3c444fb515413254b426908e4d3528ccc664a629628c23b7b85bd21c060d0e
---
 ext/wasm/README.md | 27 +++++++++++++++++++++++++++
 manifest           | 14 +++++++-------
 manifest.uuid      |  2 +-
 3 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/ext/wasm/README.md b/ext/wasm/README.md
index 1702e1f427..f950013597 100644
--- a/ext/wasm/README.md
+++ b/ext/wasm/README.md
@@ -10,6 +10,7 @@ below for Linux environments:
 
 ```
 # Clone the emscripten repository:
+$ sudo apt install git
 $ git clone https://github.com/emscripten-core/emsdk.git
 $ cd emsdk
 
@@ -74,6 +75,32 @@ from 2022-05-17 or newer so that it recognizes the `.wasm` file
 extension and responds with the mimetype `application/wasm`, as the
 WASM loader is pedantic about that detail.
 
+# Testing on a remote machine that is accessed via SSH
+
+*NB: The following are developer notes, last validated on 2022-08-18*
+
+  *  Remote: Install git, emsdk, and althttpd
+     *  Use a [version of althttpd](https://sqlite.org/althttpd/timeline?r=enable-atomics)
+        that adds HTTP reply header lines to enable SharedArrayBuffers.  These header
+        lines are required:
+```
+            Cross-Origin-Opener-Policy: same-origin
+            Cross-Origin-Embedder-Policy: require-corp
+```
+  *  Remote: Install the SQLite source tree.  CD to ext/wasm
+  *  Remote: "`make`" to build WASM
+  *  Remote: althttpd --port 8080 --popup
+  *  Local:  ssh -L 8180:localhost:8080 remote
+  *  Local:  Point your web-browser at http://localhost:8180/testing1.html
+
+In order to enable [SharedArrayBuffers](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/SharedArrayBuffer),
+the web-browser requires that the two extra Cross-Origin lines be present
+in HTTP reply headers and that the request must come from "localhost".
+Since the web-server is on a different machine from
+the web-broser, the localhost requirement means that the connection must be tunneled
+using SSH.
+
+
 
 # Known Quirks and Limitations
 
diff --git a/manifest b/manifest
index c93efa4806..6b9cdd5783 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C javascript:\srename\sand\ssimplify\sDB.callInTransaction()\sas\sDB.transaction().\sAdd\sDB.savepoint(),\swhich\sworks\sthe\ssame\sas\stransaction()\sbut\suses\ssavepoints.\sCorrect\sconcatenation\sof\sarguments\sto\sSQLite3Error\sto\suse\sspaces\sinstead\sof\scommas.\sTest\sthat\sdemo-oo1.js\sworks\swith\spersistent\sOPFS\sstorage\s(output\sdiffers\sdue\sto\spersistent\srows,\sbut\sthe\sdemo\sworks).
-D 2022-08-18T12:21:58.613
+C Add\snotes\sto\sext/wasm/README.md\sexplaining\show\sto\srun\stests\son\sa\sremote\nmachine.
+D 2022-08-18T15:53:27.160
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -475,7 +475,7 @@ F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle db7a4602f043cf4a5e4135be3609a487f9f1c83f05778bfbdf93766be4541b96
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
 F ext/wasm/GNUmakefile 19c21ce4df5583278cc495bffbe03c69dc64af60fa9dac01766d0192bd191ac6
-F ext/wasm/README.md 4b00ae7c7d93c4591251245f0996a319e2651361013c98d2efb0b026771b7331
+F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 77ef4bcf37e362b9ad61f9c175dfc0f1b3e571563fb311b96581cf422ee6a8ec
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
 F ext/wasm/api/README.md d876597edd2b9542b6ea031adaaff1c042076fde7b670b1dc6d8a87b28a6631b
@@ -2006,8 +2006,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 55e1b775fa7ec492817cc847036df7794c3c22b78558e9e9c513f24c775dedab
-R c7dd436c51b79816d21badfd7965a0c6
-U stephan
-Z 56fa2cd60f3999351a57836a87a9c295
+P e8c323f12b6223bc9dcbbec40698969c7917128aa50cf599c247df23f607ae61
+R 391fcad47fcff47ace5e5b589a55467a
+U drh
+Z 306b6860fc24abe35b9649e8ac4acacb
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 6c09520662..0d42128ad7 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e8c323f12b6223bc9dcbbec40698969c7917128aa50cf599c247df23f607ae61
\ No newline at end of file
+7a3c444fb515413254b426908e4d3528ccc664a629628c23b7b85bd21c060d0e
\ No newline at end of file

From 64d04a8d9fc15496ebab111972f4b3ae1578148a Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 22 Aug 2022 08:55:10 +0000
Subject: [PATCH 019/428] wasm: accommodated a JS API rename.

FossilOrigin-Name: 00991335c4dae56232e999398e5e82d8161903ba7d084b16a73a150e83f1f782
---
 ext/wasm/scratchpad-opfs-main.js    |  2 +-
 ext/wasm/scratchpad-opfs-worker2.js |  2 +-
 manifest                            | 16 ++++++++--------
 manifest.uuid                       |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ext/wasm/scratchpad-opfs-main.js b/ext/wasm/scratchpad-opfs-main.js
index 8e9d123584..9f7d3fb1d8 100644
--- a/ext/wasm/scratchpad-opfs-main.js
+++ b/ext/wasm/scratchpad-opfs-main.js
@@ -25,7 +25,7 @@
 
   const test1 = function(db){
     db.exec("create table if not exists t(a);")
-      .callInTransaction(function(db){
+      .transaction(function(db){
         db.prepare("insert into t(a) values(?)")
           .bind(new Date().getTime())
           .stepFinalize();
diff --git a/ext/wasm/scratchpad-opfs-worker2.js b/ext/wasm/scratchpad-opfs-worker2.js
index 2e7527adc7..e27fe2b372 100644
--- a/ext/wasm/scratchpad-opfs-worker2.js
+++ b/ext/wasm/scratchpad-opfs-worker2.js
@@ -38,7 +38,7 @@
 
   const test1 = function(db){
     db.execMulti("create table if not exists t(a);")
-      .callInTransaction(function(db){
+      .transaction(function(db){
         db.prepare("insert into t(a) values(?)")
           .bind(new Date().getTime())
           .stepFinalize();
diff --git a/manifest b/manifest
index 6b9cdd5783..9faf2e216e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\snotes\sto\sext/wasm/README.md\sexplaining\show\sto\srun\stests\son\sa\sremote\nmachine.
-D 2022-08-18T15:53:27.160
+C wasm:\saccommodated\sa\sJS\sAPI\srename.
+D 2022-08-22T08:55:10.642
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -504,10 +504,10 @@ F ext/wasm/jaccwabyt/jaccwabyt.md 447cc02b598f7792edaa8ae6853a7847b8178a18ed356a
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
 F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e568d2c2307c416902059339c06f19
 F ext/wasm/scratchpad-opfs-main.html 4565cf194e66188190d35f70e82553e2e2d72b9809b73c94ab67b8cfd14d2e0c
-F ext/wasm/scratchpad-opfs-main.js a819ed26047c5539630cea59add6a5082ba04cdf82da2df2e0707d4d69af6cb1
+F ext/wasm/scratchpad-opfs-main.js 69e960e9161f6412fd0c30f355d4112f1894d6609eb431e2d16d207d1380518e
 F ext/wasm/scratchpad-opfs-worker.html 66c1d15d678f3bd306373d76b61c6c8aef988f61f4a8dd40185d452f9c6d2bf5
 F ext/wasm/scratchpad-opfs-worker.js 3ec2868c669713145c76eb5877c64a1b20741f741817b87c907a154b676283a9
-F ext/wasm/scratchpad-opfs-worker2.js de3ea77548243a638c8426b7e43cc1dbfc511013228ab98436eb102923ed6689
+F ext/wasm/scratchpad-opfs-worker2.js 5f2237427ac537b8580b1c659ff14ad2621d1694043eaaf41ae18dbfef2e48c0
 F ext/wasm/sqlite3-worker1.js e93fe8e5da7cb56dcf4d1bb0aa44bf681b509e1c56f2a75885c0f408f034c42b
 F ext/wasm/testing1.html 528001c7e32ee567abc195aa071fd9820cc3c8ffc9c8a39a75e680db05f0c409
 F ext/wasm/testing1.js 9a97a7e45ce122b479b4a706ae1024abded67fd5f34a5764e41ff5efde8dfa17
@@ -2006,8 +2006,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 e8c323f12b6223bc9dcbbec40698969c7917128aa50cf599c247df23f607ae61
-R 391fcad47fcff47ace5e5b589a55467a
-U drh
-Z 306b6860fc24abe35b9649e8ac4acacb
+P 7a3c444fb515413254b426908e4d3528ccc664a629628c23b7b85bd21c060d0e
+R 763c38437f86fddfab452c17546273d5
+U stephan
+Z 9e445c1e5e3ac9504605b874a5870c61
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 0d42128ad7..f81e130264 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7a3c444fb515413254b426908e4d3528ccc664a629628c23b7b85bd21c060d0e
\ No newline at end of file
+00991335c4dae56232e999398e5e82d8161903ba7d084b16a73a150e83f1f782
\ No newline at end of file

From e3cd67603dc30d00e998bc9fb3183d49f43b830b Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 22 Aug 2022 13:34:13 +0000
Subject: [PATCH 020/428] Refactor JS API amalgamation such that the
 bootstrapping/configuration is deferred until the whole amalgamation is
 available, to facilitate providing clients with a way to initialize the API
 with their own config (noting that we're still one small level of refactoring
 away from being able to actually do that).

FossilOrigin-Name: 9dbe9a6aecec43b51057375ef1d2d632db0d17eac8b7552c20cc91fc2f1a55d1
---
 ext/wasm/api/sqlite3-api-cleanup.js  |  68 +++++++-----
 ext/wasm/api/sqlite3-api-glue.js     |  23 +----
 ext/wasm/api/sqlite3-api-oo1.js      |   8 +-
 ext/wasm/api/sqlite3-api-opfs.js     |   9 +-
 ext/wasm/api/sqlite3-api-prologue.js | 149 +++++++++++++++++++++------
 ext/wasm/api/sqlite3-api-worker1.js  |   7 +-
 ext/wasm/api/sqlite3-wasm.c          |  23 +++--
 manifest                             |  24 ++---
 manifest.uuid                        |   2 +-
 9 files changed, 206 insertions(+), 107 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-cleanup.js b/ext/wasm/api/sqlite3-api-cleanup.js
index a2f921a5d7..ce24ad0137 100644
--- a/ext/wasm/api/sqlite3-api-cleanup.js
+++ b/ext/wasm/api/sqlite3-api-cleanup.js
@@ -16,29 +16,45 @@
   various subsystems.
 */
 'use strict';
-self.sqlite3.postInit.forEach(
-  self.importScripts/*global is a Worker*/
-    ? function(f){
-      /** We try/catch/report for the sake of failures which happen in
-          a Worker, as those exceptions can otherwise get completely
-          swallowed, leading to confusing downstream errors which have
-          nothing to do with this failure. */
-      try{ f(self, self.sqlite3) }
-      catch(e){
-        console.error("Error in postInit() function:",e);
-        throw e;
-      }
-    }
-  : (f)=>f(self, self.sqlite3)
-);
-delete self.sqlite3.postInit;
-if(self.location && +self.location.port > 1024){
-  console.warn("Installing sqlite3 bits as global S for dev-testing purposes.");
-  self.S = self.sqlite3;
-}
-/* Clean up temporary global-scope references to our APIs... */
-self.sqlite3.config.Module.sqlite3 = self.sqlite3
-/* ^^^^ Currently needed by test code and Worker API setup */;
-delete self.sqlite3.capi.util /* arguable, but these are (currently) internal-use APIs */;
-delete self.sqlite3 /* clean up our global-scope reference */;
-//console.warn("Module.sqlite3 =",Module.sqlite3);
+(function(){
+  /**
+     Replace sqlite3ApiBootstrap() with a variant which plugs in the
+     Emscripten-based config for all config options which the client
+     does not provide.
+  */
+  const SAB = self.sqlite3ApiBootstrap;
+  self.sqlite3ApiBootstrap = function(apiConfig){
+    apiConfig = apiConfig||{};
+    const configDefaults = {
+      Module: Module /* ==> Emscripten-style Module object. Currently
+                        needs to be exposed here for test code. NOT part
+                        of the public API. */,
+      exports: Module['asm'],
+      memory: Module.wasmMemory /* gets set if built with -sIMPORT_MEMORY */
+    };
+    const config = {};
+    Object.keys(configDefaults).forEach(function(k){
+      config[k] = Object.prototype.hasOwnProperty.call(apiConfig, k)
+        ? apiConfig[k] : configDefaults[k];
+    });
+    return SAB(config);
+  };
+
+  /**
+     For current (2022-08-22) purposes, automatically call sqlite3ApiBootstrap().
+     That decision will be revisited at some point, as we really want client code
+     to be able to call this to configure certain parts.
+   */
+  const sqlite3 = self.sqlite3ApiBootstrap();
+
+  if(self.location && +self.location.port > 1024){
+    console.warn("Installing sqlite3 bits as global S for dev-testing purposes.");
+    self.S = sqlite3;
+  }
+
+  /* Clean up temporary references to our APIs... */
+  delete self.sqlite3ApiBootstrap;
+  Module.sqlite3 = sqlite3 /* Currently needed by test code */;
+  delete sqlite3.capi.util /* arguable, but these are (currently) internal-use APIs */;
+  //console.warn("Module.sqlite3 =",Module.sqlite3);
+})();
diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index efcd6fea9b..84bbdb10ac 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -16,23 +16,9 @@
   initializes the main API pieces so that the downstream components
   (e.g. sqlite3-api-oo1.js) have all that they need.
 */
-(function(self){
+self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
   'use strict';
   const toss = (...args)=>{throw new Error(args.join(' '))};
-
-  self.sqlite3 = self.sqlite3ApiBootstrap({
-    Module: Module /* ==> Emscripten-style Module object. Currently
-                      needs to be exposed here for test code. NOT part
-                      of the public API. */,
-    exports: Module['asm'],
-    memory: Module.wasmMemory /* gets set if built with -sIMPORT_MEMORY */,
-    bigIntEnabled: !!self.BigInt64Array,
-    allocExportName: 'malloc',
-    deallocExportName: 'free'
-  });
-  delete self.sqlite3ApiBootstrap;
-
-  const sqlite3 = self.sqlite3;
   const capi = sqlite3.capi, wasm = capi.wasm, util = capi.util;
   self.WhWasmUtilInstaller(capi.wasm);
   delete self.WhWasmUtilInstaller;
@@ -57,7 +43,7 @@
       return oldP(v);
     };
     wasm.xWrap.argAdapter('.pointer', adapter);
-  }
+  } /* ".pointer" xWrap() argument adapter */
 
   // WhWasmUtil.xWrap() bindings...
   {
@@ -78,7 +64,7 @@
       capi[e[0]] = wasm.xWrap.apply(null, e);
     }
 
-    /* For functions which cannot work properly unless
+    /* For C API functions which cannot work properly unless
        wasm.bigIntEnabled is true, install a bogus impl which
        throws if called when bigIntEnabled is false. */
     const fI64Disabled = function(fname){
@@ -198,5 +184,4 @@
       capi[s.name] = sqlite3.StructBinder(s);
     }
   }
-
-})(self);
+});
diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index 0e04b63ebf..be9d8af5a8 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -14,10 +14,9 @@
   WASM build. It requires that sqlite3-api-glue.js has already run
   and it installs its deliverable as self.sqlite3.oo1.
 */
-(function(self){
+self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
   const toss = (...args)=>{throw new Error(args.join(' '))};
 
-  const sqlite3 = self.sqlite3 || toss("Missing main sqlite3 object.");
   const capi = sqlite3.capi, util = capi.util;
   /* What follows is colloquially known as "OO API #1". It is a
      binding of the sqlite3 API which is designed to be run within
@@ -1547,5 +1546,6 @@
     },
     DB,
     Stmt
-  }/*SQLite3 object*/;
-})(self);
+  }/*oo1 object*/;
+});
+
diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index 4acab7770a..693432b35a 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -31,12 +31,13 @@
 // FileSystemDirectoryHandle
 // FileSystemFileHandle
 // FileSystemFileHandle.prototype.createSyncAccessHandle
-self.sqlite3.postInit.push(function(self, sqlite3){
+self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
   const warn = console.warn.bind(console),
         error = console.error.bind(console);
-  if(!self.importScripts || !self.FileSystemFileHandle
-     || !self.FileSystemFileHandle.prototype.createSyncAccessHandle){
-    warn("OPFS not found or its sync API is not available in this environment.");
+  if(!self.importScripts || !self.FileSystemFileHandle){
+    //|| !self.FileSystemFileHandle.prototype.createSyncAccessHandle){
+    // ^^^ sync API is not required with WASMFS/OPFS backend.
+    warn("OPFS is not available in this environment.");
     return;
   }else if(!sqlite3.capi.wasm.bigIntEnabled){
     error("OPFS requires BigInt support but sqlite3.capi.wasm.bigIntEnabled is false.");
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index cf9fd896a6..87cc40b410 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -78,25 +78,88 @@
 */
 
 /**
-   This global symbol is is only a temporary measure: the JS-side
-   post-processing will remove that object from the global scope when
-   setup is complete. We require it there temporarily in order to glue
-   disparate parts together during the loading of the API (which spans
-   several components).
+   sqlite3ApiBootstrap() is the only global symbol exposed by this
+   API. It is intended to be called one time at the end of the API
+   amalgamation process, passed configuration details for the current
+   environment, and then optionally be removed from the global object
+   using `delete self.sqlite3ApiBootstrap`.
 
-   This function requires a configuration object intended to abstract
+   This function expects a configuration object, intended to abstract
    away details specific to any given WASM environment, primarily so
-   that it can be used without any _direct_ dependency on Emscripten.
-   (That said, OO API #1 requires, as of this writing, Emscripten's
-   virtual filesystem API. Baby steps.)
+   that it can be used without any _direct_ dependency on
+   Emscripten. The config object is only honored the first time this
+   is called. Subsequent calls ignore the argument and return the same
+   (configured) object which gets initialized by the first call.
+
+   The config object properties include:
+
+   - `Module`: Emscripten-style module object. Currently only required
+     by certain test code and is _not_ part of the public interface.
+     (TODO: rename this to EmscriptenModule to be more explicit.)
+
+   - `exports`: the "exports" object for the current WASM
+     environment. In an Emscripten build, this should be set to
+     `Module['asm']`.
+
+   - `memory`: optional WebAssembly.Memory object, defaulting to
+     `exports.memory`.  In Emscripten environments this should be set
+     to `Module.wasmMemory` if the build uses `-sIMPORT_MEMORY`, or be
+     left undefined/falsy to default to `exports.memory` when using
+     WASM-exported memory.
+
+   - `bigIntEnabled`: true if BigInt support is enabled. Defaults to
+     true if self.BigInt64Array is available, else false. Some APIs
+     will throw exceptions if called without BigInt support, as BigInt
+     is required for marshalling C-side int64 into and out of JS.
+
+   - `allocExportName`: the name of the function, in `exports`, of the
+     `malloc(3)`-compatible routine for the WASM environment. Defaults
+     to `"malloc"`.
+
+   - `deallocExportName`: the name of the function, in `exports`, of
+     the `free(3)`-compatible routine for the WASM
+     environment. Defaults to `"free"`.
+
+   - `persistentDirName`: if the environment supports persistent storage, this
+     directory names the "mount point" for that directory. It must be prefixed
+     by `/` and may currently contain only a single directory-name part. Using
+     the root directory name is not supported by any current persistent backend.
 */
-self.sqlite3ApiBootstrap = function(config){
+self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(apiConfig){
   'use strict';
+  
+  if(sqlite3ApiBootstrap.sqlite3){ /* already initalized */
+    console.warn("sqlite3ApiBootstrap() called multiple times.",
+                 "Config and external initializers are ignored on calls after the first.");
+    return sqlite3ApiBootstrap.sqlite3;
+  }
+
+  apiConfig = apiConfig||{};
+  const config = Object.create(null);
+  {
+    const configDefaults = {
+      Module: undefined/*needed for some test code, not part of the public API*/,
+      exports: undefined,
+      memory: undefined,
+      bigIntEnabled: !!self.BigInt64Array,
+      allocExportName: 'malloc',
+      deallocExportName: 'free',
+      persistentDirName: '/persistent'
+    };
+    Object.keys(configDefaults).forEach(function(k){
+      config[k] = Object.prototype.hasOwnProperty.call(apiConfig, k)
+        ? apiConfig[k] : configDefaults[k];
+    });
+  }
 
   /** Throws a new Error, the message of which is the concatenation
       all args with a space between each. */
   const toss = (...args)=>{throw new Error(args.join(' '))};
 
+  if(config.persistentDirName && !/^\/[^/]+$/.test(config.persistentDirName)){
+    toss("config.persistentDirName must be falsy or in the form '/dir-name'.");
+  }
+
   /**
      Returns true if n is a 32-bit (signed) integer, else
      false. This is used for determining when we need to switch to
@@ -143,7 +206,18 @@ self.sqlite3ApiBootstrap = function(config){
   };
 
   const utf8Decoder = new TextDecoder('utf-8');
-  const typedArrayToString = (str)=>utf8Decoder.decode(str);
+
+  /** Internal helper to use in operations which need to distinguish
+      between SharedArrayBuffer heap memory and non-shared heap. */
+  const __SAB = ('undefined'===typeof SharedArrayBuffer)
+        ? function(){} : SharedArrayBuffer;
+  const typedArrayToString = function(arrayBuffer, begin, end){
+    return utf8Decoder.decode(
+      (arrayBuffer.buffer instanceof __SAB)
+        ? arrayBuffer.slice(begin, end)
+        : arrayBuffer.subarray(begin, end)
+    );
+  };
 
   /**
      An Error subclass specifically for reporting Wasm-level malloc()
@@ -591,9 +665,6 @@ self.sqlite3ApiBootstrap = function(config){
 
      TODOs and caveats:
 
-     - The directory name (mount point) for persistent storage is
-       currently hard-coded. It needs to be configurable.
-
      - If persistent storage is available at the root of the virtual
        filesystem, this interface cannot currently distinguish that
        from the lack of persistence. That case cannot currently (with
@@ -604,12 +675,17 @@ self.sqlite3ApiBootstrap = function(config){
   capi.sqlite3_web_persistent_dir = function(){
     if(undefined !== __persistentDir) return __persistentDir;
     // If we have no OPFS, there is no persistent dir
-    if(!self.FileSystemHandle || !self.FileSystemDirectoryHandle
+    const pdir = config.persistentDirName;
+    if(!pdir
+       || !self.FileSystemHandle
+       || !self.FileSystemDirectoryHandle
        || !self.FileSystemFileHandle){
       return __persistentDir = "";
     }
     try{
-      if(0===this.wasm.xCall('sqlite3_wasm_init_opfs')){
+      if(pdir && 0===this.wasm.xCallWrapped(
+        'sqlite3_wasm_init_opfs', 'i32', ['string'], pdir
+      )){
         /** OPFS does not support locking and will trigger errors if
             we try to lock. We don't _really_ want to
             _unconditionally_ install a non-locking sqlite3 VFS as the
@@ -617,13 +693,12 @@ self.sqlite3ApiBootstrap = function(config){
             time being. That said: locking is a no-op on all of the
             current WASM storage, so this isn't (currently) as bad as
             it may initially seem. */
-        const pVfs = this.sqlite3_vfs_find("unix-none");
+        const pVfs = sqlite3.capi.sqlite3_vfs_find("unix-none");
         if(pVfs){
-          this.sqlite3_vfs_register(pVfs,1);
-          //warn("Installed 'unix-none' as the default sqlite3 VFS.");
+          capi.sqlite3_vfs_register(pVfs,1);
+          console.warn("Installed 'unix-none' as the default sqlite3 VFS.");
         }
-        return __persistentDir =
-          "/persistent" /* name is hard-coded in sqlite3_wasm_init_opfs()!*/;
+        return __persistentDir = pdir;
       }else{
         return __persistentDir = "";
       }
@@ -644,19 +719,29 @@ self.sqlite3ApiBootstrap = function(config){
   }.bind(capi);
 
   /* The remainder of the API will be set up in later steps. */
-  return {
-    /**
-       An Error subclass which is thrown by this.wasm.alloc() on OOM.
-    */
+  const sqlite3 = {
     WasmAllocError: WasmAllocError,
     capi,
-    postInit: [
-      /* some pieces of the API may install functions into this array,
-         and each such function will be called, passed (self,sqlite3),
-         at the very end of the API load/init process, where self is
-         the current global object and sqlite3 is the object returned
-         from sqlite3ApiBootstrap(). This array will be removed at the
-         end of the API setup process. */],
     config
   };
+  sqlite3ApiBootstrap.initializers.forEach((f)=>f(sqlite3));
+  delete sqlite3ApiBootstrap.initializers;
+  sqlite3ApiBootstrap.sqlite3 = sqlite3;
+  return sqlite3;
 }/*sqlite3ApiBootstrap()*/;
+/**
+  self.sqlite3ApiBootstrap.initializers is an internal detail used by
+  the various pieces of the sqlite3 API's amalgamation process. It
+  must not be modified by client code except when plugging such code
+  into the amalgamation process.
+
+  Each component of the amalgamation is expected to append a function
+  to this array. When sqlite3ApiBootstrap() is called for the first
+  time, each such function will be called (in their appended order)
+  and passed the sqlite3 namespace object, into which they can install
+  their features (noting that most will also require that certain
+  features alread have been installed).  At the end of that process,
+  this array is deleted.
+*/
+self.sqlite3ApiBootstrap.initializers = [];
+self.sqlite3ApiBootstrap.sqlite3 = undefined /* installed at first call */;
diff --git a/ext/wasm/api/sqlite3-api-worker1.js b/ext/wasm/api/sqlite3-api-worker1.js
index 565946bbc6..a7b759851f 100644
--- a/ext/wasm/api/sqlite3-api-worker1.js
+++ b/ext/wasm/api/sqlite3-api-worker1.js
@@ -43,7 +43,8 @@
   In some contexts, however, listening for the above message is
   a better fit.
 */
-self.sqlite3.initWorker1API = function(){
+self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
+sqlite3.initWorker1API = function(){
   'use strict';
   /**
      UNDER CONSTRUCTION
@@ -418,4 +419,6 @@ self.sqlite3.initWorker1API = function(){
     wState.post(evType, response, wMsgHandler.xfer);
   };
   setTimeout(()=>self.postMessage({type:'sqlite3-api',data:'worker1-ready'}), 0);
-}.bind({self, sqlite3: self.sqlite3});
+}.bind({self, sqlite3});
+});
+
diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index 487baecf10..070282b8ee 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -435,7 +435,8 @@ int sqlite3_wasm_vfs_unlink(const char * zName){
 #include <emscripten/console.h>
 /*
 ** This function is NOT part of the sqlite3 public API. It is strictly
-** for use by the sqlite project's own JS/WASM bindings.
+** for use by the sqlite project's own JS/WASM bindings, specifically
+** only when building with Emscripten's WASMFS support.
 **
 ** This function should only be called if the JS side detects the
 ** existence of the Origin-Private FileSystem (OPFS) APIs in the
@@ -443,14 +444,19 @@ int sqlite3_wasm_vfs_unlink(const char * zName){
 ** WASMFS backend impl for OPFS. On success, subsequent calls are
 ** no-ops.
 **
+** This function may be passed a "mount point" name, which must have a
+** leading "/" and is currently restricted to a single path component,
+** e.g. "/foo" is legal but "/foo/" and "/foo/bar" are not. If it is
+** NULL or empty, it defaults to "/persistent".
+**
 ** Returns 0 on success, SQLITE_NOMEM if instantiation of the backend
-** object fails, SQLITE_IOERR if mkdir() of the "/persistent" dir in
+** object fails, SQLITE_IOERR if mkdir() of the zMountPoint dir in
 ** the virtual FS fails. In builds compiled without SQLITE_WASM_OPFS
 ** defined, SQLITE_NOTFOUND is returned without side effects.
 */
-int sqlite3_wasm_init_opfs(void){
+int sqlite3_wasm_init_opfs(const char *zMountPoint){
   static backend_t pOpfs = 0;
-  static const char * zDir = "/persistent";
+  if( !zMountPoint || !*zMountPoint ) zMountPoint = "/persistent";
   if( !pOpfs ){
     pOpfs = wasmfs_create_opfs_backend();
     if( pOpfs ){
@@ -459,12 +465,15 @@ int sqlite3_wasm_init_opfs(void){
   }
   /** It's not enough to instantiate the backend. We have to create a
       mountpoint in the VFS and attach the backend to it. */
-  if( pOpfs && 0!=access(zDir, F_OK) ){
+  if( pOpfs && 0!=access(zMountPoint, F_OK) ){
     /* mkdir() simply hangs when called from fiddle app. Cause is
        not yet determined but the hypothesis is an init-order
        issue. */
-    const int rc = wasmfs_create_directory(zDir, 0777, pOpfs);
-    emscripten_console_log(rc ? "OPFS mkdir failed." : "OPFS mkdir ok.");
+    /* Note that this check and is not robust but it will
+       hypothetically suffice for the transient wasm-based virtual
+       filesystem we're currently running in. */
+    const int rc = wasmfs_create_directory(zMountPoint, 0777, pOpfs);
+    emscripten_console_logf("OPFS mkdir rc=%d", rc);
     if(rc) return SQLITE_IOERR;
   }
   return pOpfs ? 0 : SQLITE_NOMEM;
diff --git a/manifest b/manifest
index 9faf2e216e..8ae71848be 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C wasm:\saccommodated\sa\sJS\sAPI\srename.
-D 2022-08-22T08:55:10.642
+C Refactor\sJS\sAPI\samalgamation\ssuch\sthat\sthe\sbootstrapping/configuration\sis\sdeferred\suntil\sthe\swhole\samalgamation\sis\savailable,\sto\sfacilitate\sproviding\sclients\swith\sa\sway\sto\sinitialize\sthe\sAPI\swith\stheir\sown\sconfig\s(noting\sthat\swe're\sstill\sone\ssmall\slevel\sof\srefactoring\saway\sfrom\sbeing\sable\sto\sactually\sdo\sthat).
+D 2022-08-22T13:34:13.519
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -481,14 +481,14 @@ F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de
 F ext/wasm/api/README.md d876597edd2b9542b6ea031adaaff1c042076fde7b670b1dc6d8a87b28a6631b
 F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba81456260a713ed04900c
 F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a4a06cb776c003880b
-F ext/wasm/api/sqlite3-api-cleanup.js 149fd63a0400cd1d69548887ffde2ed89c13283384a63c2e9fcfc695e38a9e11
-F ext/wasm/api/sqlite3-api-glue.js 4a09dd1153874f7a716cf953329bc1e78bf24e0870a9aad15214ffd51ac913bc
-F ext/wasm/api/sqlite3-api-oo1.js 6c14e97987fafdd5f63ffa8a086e5316d49c115743add4dabfacb302a7c76b45
-F ext/wasm/api/sqlite3-api-opfs.js c93cdd14f81a26b3a64990515ee05c7e29827fbc8fba4e4c2fef3a37a984db89
-F ext/wasm/api/sqlite3-api-prologue.js 96997e411b41ff3d4024c2ad625c5cdb7b6a619ba8beece4662ad190191b1119
-F ext/wasm/api/sqlite3-api-worker1.js 74130ec4979baeaf3e909c7619b99e9f466e2d816cd07370987ff639d168ef45
+F ext/wasm/api/sqlite3-api-cleanup.js eee5ac931fa0aee2cace52a0dff0cf22ae56a1993a88d911bd0dd384fb380c9a
+F ext/wasm/api/sqlite3-api-glue.js 67ca83974410961953eeaa1dfed3518530d68381729ed1d27f95122f5baeabd3
+F ext/wasm/api/sqlite3-api-oo1.js f6dcaac3270182471f97efcfda25bd4a4ac1777b8ec52ebd1c6846721160e54c
+F ext/wasm/api/sqlite3-api-opfs.js 011799db398157cbd254264b6ebae00d7234b93d0e9e810345f213a5774993c0
+F ext/wasm/api/sqlite3-api-prologue.js 5d1b13b23af48ce952e30a0f2d6dff4bc4b33f2dc36fdcaf69c164fd9a72b60f
+F ext/wasm/api/sqlite3-api-worker1.js ceb1fc88d8a3742c069632e88fd05c14d5a79eb86bdb9e12969ec37f64fbf42b
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c 0e78035045e3328fb050ec9580c6bfb714c756a1d3b917259e58baf9b0332c98
+F ext/wasm/api/sqlite3-wasm.c 0d81282eaeff2a6e9fc5c28a388c5c5b45cf25a9393992fa511ac009b27df982
 F ext/wasm/common/SqliteTestUtil.js e41a1406f18da9224523fad0c48885caf995b56956a5b9852909c0989e687e90
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 572cf1ffae0b6eb7ca63684d3392bf350217a07b90e7a896e4fa850700c989b0
@@ -2006,8 +2006,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 7a3c444fb515413254b426908e4d3528ccc664a629628c23b7b85bd21c060d0e
-R 763c38437f86fddfab452c17546273d5
+P 00991335c4dae56232e999398e5e82d8161903ba7d084b16a73a150e83f1f782
+R d8e7cfc53479bc2a5e5d34dd2cc26aa3
 U stephan
-Z 9e445c1e5e3ac9504605b874a5870c61
+Z dd954bd42edcc1a06b3b31bdffb215a4
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f81e130264..174e4d0afc 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-00991335c4dae56232e999398e5e82d8161903ba7d084b16a73a150e83f1f782
\ No newline at end of file
+9dbe9a6aecec43b51057375ef1d2d632db0d17eac8b7552c20cc91fc2f1a55d1
\ No newline at end of file

From ae708b2b018ac558b2f5c7626269415c86e85382 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 22 Aug 2022 21:37:17 +0000
Subject: [PATCH 021/428] More experimentation with how client-side config
 state can be passed on to initialize the JS-side sqlite3 API.

FossilOrigin-Name: ea2acc454c012a62556f6d0623d6eff60736d24aa214a64462b423623ef44d47
---
 ext/wasm/api/sqlite3-api-cleanup.js  | 38 ++++++++++++++++++----------
 ext/wasm/api/sqlite3-api-prologue.js | 10 ++++++--
 ext/wasm/common/SqliteTestUtil.js    | 27 ++++++++++++++++++++
 ext/wasm/demo-oo1.js                 | 14 +++++++---
 ext/wasm/testing1.js                 |  8 +-----
 manifest                             | 20 +++++++--------
 manifest.uuid                        |  2 +-
 7 files changed, 81 insertions(+), 38 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-cleanup.js b/ext/wasm/api/sqlite3-api-cleanup.js
index ce24ad0137..d989faccaf 100644
--- a/ext/wasm/api/sqlite3-api-cleanup.js
+++ b/ext/wasm/api/sqlite3-api-cleanup.js
@@ -11,12 +11,12 @@
   ***********************************************************************
 
   This file is the tail end of the sqlite3-api.js constellation,
-  intended to be appended after all other files so that it can clean
-  up any global systems temporarily used for setting up the API's
-  various subsystems.
+  intended to be appended after all other sqlite3-api-*.js files so
+  that it can finalize any setup and clean up any global symbols
+  temporarily used for setting up the API's various subsystems.
 */
 'use strict';
-(function(){
+if('undefined' !== typeof Module){ // presumably an Emscripten build
   /**
      Replace sqlite3ApiBootstrap() with a variant which plugs in the
      Emscripten-based config for all config options which the client
@@ -24,7 +24,7 @@
   */
   const SAB = self.sqlite3ApiBootstrap;
   self.sqlite3ApiBootstrap = function(apiConfig){
-    apiConfig = apiConfig||{};
+    apiConfig = apiConfig || {};
     const configDefaults = {
       Module: Module /* ==> Emscripten-style Module object. Currently
                         needs to be exposed here for test code. NOT part
@@ -34,18 +34,29 @@
     };
     const config = {};
     Object.keys(configDefaults).forEach(function(k){
-      config[k] = Object.prototype.hasOwnProperty.call(apiConfig, k)
+      config[k] = Object.getOwnPropertyDescriptor(apiConfig, k)
         ? apiConfig[k] : configDefaults[k];
     });
+    // Copy over any properties apiConfig defines but configDefaults does not...
+    Object.keys(apiConfig).forEach(function(k){
+      if(!Object.getOwnPropertyDescriptor(config, k)){
+        config[k] = apiConfig[k];
+      }
+    });
     return SAB(config);
   };
 
   /**
-     For current (2022-08-22) purposes, automatically call sqlite3ApiBootstrap().
-     That decision will be revisited at some point, as we really want client code
-     to be able to call this to configure certain parts.
-   */
-  const sqlite3 = self.sqlite3ApiBootstrap();
+     For current (2022-08-22) purposes, automatically call
+     sqlite3ApiBootstrap().  That decision will be revisited at some
+     point, as we really want client code to be able to call this to
+     configure certain parts. If the global sqliteApiConfig property
+     is available, it is assumed to be a config object for
+     sqlite3ApiBootstrap().
+  */
+  //console.warn("self.sqlite3ApiConfig = ",self.sqlite3ApiConfig);
+  const sqlite3 = self.sqlite3ApiBootstrap(self.sqlite3ApiConfig || Object.create(null));
+  delete self.sqlite3ApiBootstrap;
 
   if(self.location && +self.location.port > 1024){
     console.warn("Installing sqlite3 bits as global S for dev-testing purposes.");
@@ -53,8 +64,7 @@
   }
 
   /* Clean up temporary references to our APIs... */
-  delete self.sqlite3ApiBootstrap;
-  Module.sqlite3 = sqlite3 /* Currently needed by test code */;
   delete sqlite3.capi.util /* arguable, but these are (currently) internal-use APIs */;
   //console.warn("Module.sqlite3 =",Module.sqlite3);
-})();
+  Module.sqlite3 = sqlite3 /* Currently needed by test code and sqlite3-worker1.js */;
+}
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 87cc40b410..1a38f0343a 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -134,7 +134,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(apiConfig){
     return sqlite3ApiBootstrap.sqlite3;
   }
 
-  apiConfig = apiConfig||{};
+  apiConfig = apiConfig || {};
   const config = Object.create(null);
   {
     const configDefaults = {
@@ -147,9 +147,15 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(apiConfig){
       persistentDirName: '/persistent'
     };
     Object.keys(configDefaults).forEach(function(k){
-      config[k] = Object.prototype.hasOwnProperty.call(apiConfig, k)
+      config[k] = Object.getOwnPropertyDescriptor(apiConfig, k)
         ? apiConfig[k] : configDefaults[k];
     });
+    // Copy over any properties apiConfig defines but configDefaults does not...
+    Object.keys(apiConfig).forEach(function(k){
+      if(!Object.getOwnPropertyDescriptor(config, k)){
+        config[k] = apiConfig[k];
+      }
+    });
   }
 
   /** Throws a new Error, the message of which is the concatenation
diff --git a/ext/wasm/common/SqliteTestUtil.js b/ext/wasm/common/SqliteTestUtil.js
index c7c99240e6..4b4cefbf0c 100644
--- a/ext/wasm/common/SqliteTestUtil.js
+++ b/ext/wasm/common/SqliteTestUtil.js
@@ -168,6 +168,33 @@
         }
         f.ui.status.classList.add('hidden');
       }
+    },
+    /**
+       Config options used by the Emscripten-dependent initialization
+       which happens via this.initSqlite3(). This object gets
+       (indirectly) passed to sqlite3ApiBootstrap() to configure the
+       sqlite3 API.
+    */
+    sqlite3ApiConfig: {
+      persistentDirName: "/persistent"
+    },
+    /**
+       Intended to be called by apps which need to call the
+       Emscripten-installed sqlite3InitModule() routine. This function
+       temporarily installs this.sqlite3ApiConfig into the self
+       object, calls it sqlite3InitModule(), and removes
+       self.sqlite3ApiConfig after initialization is done. Returns the
+       promise from sqlite3InitModule(), and the next then() handler
+       will get the Emscripten module object as its argument. That
+       module has the sqlite3's main namespace object installed as its
+       `sqlite3` property.
+    */
+    initSqlite3: function(){
+      self.sqlite3ApiConfig = this.sqlite3ApiConfig;
+      return self.sqlite3InitModule(this).then(function(M){
+        delete self.sqlite3ApiConfig;
+        return M;
+      });
     }
   };
 })(self/*window or worker*/);
diff --git a/ext/wasm/demo-oo1.js b/ext/wasm/demo-oo1.js
index 1ea7e05c64..4eff51b8e8 100644
--- a/ext/wasm/demo-oo1.js
+++ b/ext/wasm/demo-oo1.js
@@ -26,8 +26,13 @@
           oo = sqlite3.oo1,
           wasm = capi.wasm;
 
-    const dbDir = 1 ? "" : capi.sqlite3_web_persistent_dir();
-    const db = new oo.DB(dbDir+"/mydb.sqlite3");
+    const dbName = (
+      0 ? "" : capi.sqlite3_web_persistent_dir()
+    )+"/mydb.sqlite3"
+    if(0 && capi.sqlite3_web_persistent_dir()){
+      capi.sqlite3_wasm_vfs_unlink(dbName);
+    }
+    const db = new oo.DB(dbName);
     log("db =",db.filename);
     /**
        Never(!) rely on garbage collection to clean up DBs and
@@ -224,7 +229,7 @@
   }/*demo1()*/;
 
   const runDemos = function(Module){
-    //log("Module",Module);
+    //log("Module.sqlite3",Module);
     const sqlite3 = Module.sqlite3,
           capi = sqlite3.capi;
     log("Loaded module:",capi.sqlite3_libversion(), capi.sqlite3_sourceid());
@@ -237,5 +242,6 @@
     }
   };
 
-  sqlite3InitModule(self.sqlite3TestModule).then(runDemos);
+  //self.sqlite3TestModule.sqlite3ApiConfig.persistentDirName = "/hi";
+  self.sqlite3TestModule.initSqlite3().then(runDemos);
 })();
diff --git a/ext/wasm/testing1.js b/ext/wasm/testing1.js
index 28f2b604b4..4144219527 100644
--- a/ext/wasm/testing1.js
+++ b/ext/wasm/testing1.js
@@ -1068,13 +1068,7 @@
     log('capi.wasm.exports',capi.wasm.exports);
   };
 
-  sqlite3InitModule(self.sqlite3TestModule).then(function(theModule){
-    /** Use a timeout so that we are (hopefully) out from under
-        the module init stack when our setup gets run. Just on
-        principle, not because we _need_ to be. */
-    //console.debug("theModule =",theModule);
-    //setTimeout(()=>runTests(theModule), 0);
-    // ^^^ Chrome warns: "VIOLATION: setTimeout() handler took A WHOLE 50ms!"
+  self.sqlite3TestModule.initSqlite3().then(function(theModule){
     self._MODULE = theModule /* this is only to facilitate testing from the console */
     runTests(theModule);
   });
diff --git a/manifest b/manifest
index bab5e7c63d..b297210960 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sin\strunk.
-D 2022-08-22T14:03:11.661
+C More\sexperimentation\swith\show\sclient-side\sconfig\sstate\scan\sbe\spassed\son\sto\sinitialize\sthe\sJS-side\ssqlite3\sAPI.
+D 2022-08-22T21:37:17.339
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -481,20 +481,20 @@ F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de
 F ext/wasm/api/README.md d876597edd2b9542b6ea031adaaff1c042076fde7b670b1dc6d8a87b28a6631b
 F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba81456260a713ed04900c
 F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a4a06cb776c003880b
-F ext/wasm/api/sqlite3-api-cleanup.js eee5ac931fa0aee2cace52a0dff0cf22ae56a1993a88d911bd0dd384fb380c9a
+F ext/wasm/api/sqlite3-api-cleanup.js acf798ce96285c0d52738466a96c9deb9d66647f711a40caecab90b5ce66ac3c
 F ext/wasm/api/sqlite3-api-glue.js 67ca83974410961953eeaa1dfed3518530d68381729ed1d27f95122f5baeabd3
 F ext/wasm/api/sqlite3-api-oo1.js f6dcaac3270182471f97efcfda25bd4a4ac1777b8ec52ebd1c6846721160e54c
 F ext/wasm/api/sqlite3-api-opfs.js 011799db398157cbd254264b6ebae00d7234b93d0e9e810345f213a5774993c0
-F ext/wasm/api/sqlite3-api-prologue.js 5d1b13b23af48ce952e30a0f2d6dff4bc4b33f2dc36fdcaf69c164fd9a72b60f
+F ext/wasm/api/sqlite3-api-prologue.js 6e0e7787ed955ea2b6158e0bb7608f63b54236847700d183e49e1f10d0525b8f
 F ext/wasm/api/sqlite3-api-worker1.js ceb1fc88d8a3742c069632e88fd05c14d5a79eb86bdb9e12969ec37f64fbf42b
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 0d81282eaeff2a6e9fc5c28a388c5c5b45cf25a9393992fa511ac009b27df982
-F ext/wasm/common/SqliteTestUtil.js e41a1406f18da9224523fad0c48885caf995b56956a5b9852909c0989e687e90
+F ext/wasm/common/SqliteTestUtil.js 04156a3b714b1b17a7261d21dd51341a8aeb9880a223e1e7519de98c2cceb414
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 572cf1ffae0b6eb7ca63684d3392bf350217a07b90e7a896e4fa850700c989b0
 F ext/wasm/common/whwasmutil.js 41b8e097e0a9cb07c24c0ede3c81b72470a63f4a4efb07f75586dc131569f5ae
 F ext/wasm/demo-oo1.html 75646855b38405d82781246fd08c852a2b3bee05dd9f0fe10ab655a8cffb79aa
-F ext/wasm/demo-oo1.js 8be9c6be3c8e579eab4e7a5ee720ed122e38275a1f105169c6826193e42cf102
+F ext/wasm/demo-oo1.js 04e947b64a36ed8d6fe6d5e3ccee16ffc8b4461dd186e84f4baf44d53cc3aa72
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js bccf46045be8824752876f3eec01c223be0616ccac184bffd0024cfe7a3262b8
 F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
@@ -510,7 +510,7 @@ F ext/wasm/scratchpad-opfs-worker.js 3ec2868c669713145c76eb5877c64a1b20741f74181
 F ext/wasm/scratchpad-opfs-worker2.js 5f2237427ac537b8580b1c659ff14ad2621d1694043eaaf41ae18dbfef2e48c0
 F ext/wasm/sqlite3-worker1.js e93fe8e5da7cb56dcf4d1bb0aa44bf681b509e1c56f2a75885c0f408f034c42b
 F ext/wasm/testing1.html 528001c7e32ee567abc195aa071fd9820cc3c8ffc9c8a39a75e680db05f0c409
-F ext/wasm/testing1.js 9a97a7e45ce122b479b4a706ae1024abded67fd5f34a5764e41ff5efde8dfa17
+F ext/wasm/testing1.js 2def7a86c52ff28b145cb86188d5c7a49d5993f9b78c50d140e1c31551220955
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
 F ext/wasm/testing2.js e16ae385cd24c4a4ec5de6f1c02e621d243e1f179204ac8df31068faa9e31b1a
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
@@ -2006,8 +2006,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 9dbe9a6aecec43b51057375ef1d2d632db0d17eac8b7552c20cc91fc2f1a55d1 e5eaa80e81fdf86f2875a912b880272b8d099b82b08e945a7988c5dd0fe9d6b5
-R 98198d4c07340458e933c1601dce5a74
+P e215d55a97e1ccbca3101621374444d2381d87ef8e8fde5271e31c8b714e43e9
+R 46e3280ce6b3dabfd5a5df8623d5cf20
 U stephan
-Z cff3826d5874cd44103730340fc5de2d
+Z e9aff16acc00367edea41a90ce619433
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 31636b0764..bb6efe14bd 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e215d55a97e1ccbca3101621374444d2381d87ef8e8fde5271e31c8b714e43e9
\ No newline at end of file
+ea2acc454c012a62556f6d0623d6eff60736d24aa214a64462b423623ef44d47
\ No newline at end of file

From 8c45a9f952bed5b3d459bd04005b8afabc9c52a2 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 23 Aug 2022 17:02:46 +0000
Subject: [PATCH 022/428] Wasm build flag tweaks and documentation.

FossilOrigin-Name: c8eb3aa8e0f487f14791214caf70d1aa03866e01345c7fa1d5607c24c39dde1d
---
 Makefile.in          | 25 ++++++++++++++++---------
 ext/wasm/GNUmakefile |  7 ++++++-
 manifest             | 14 +++++++-------
 manifest.uuid        |  2 +-
 4 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 56ab4c88a1..31cb05f4cc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1543,15 +1543,20 @@ $(sqlite3_wasm_c): sqlite3.c
 #emcc_opt = -O3
 emcc_opt = -Oz
 emcc_environment = web
-# WASMFS OPFS is currently completely broken under fiddle but the
-# root cause has not yet been determined.
-emcc_flags_opfs =
-#emcc_flags_opfs += -sWASMFS -pthread
+# WASMFS/OPFS currently (2022-08-23) does not work with fiddle
+# because (A) fiddle is primarily implemented as a Worker and (B) the
+# Emscripten-based Worker loading process does not properly handle the
+# case of nested Workers (necessary for it to load the WASMFS-specific
+# Worker thread).
+emcc_flags_wasmfs =
+# To enable WASMFS/OPFS, uncomment these options:
+#emcc_flags_wasmfs += -sWASMFS -pthread
 #emcc_environment = web,worker
-#emcc_flags_opfs += -DSQLITE_WASM_OPFS
-#emcc_flags_opfs += '-DSQLITE_DEFAULT_UNIX_VFS="unix-none"'
-#emcc_flags_opfs += -sPTHREAD_POOL_SIZE=2
-#emcc_flags_opfs += -sPTHREAD_POOL_SIZE_STRICT=2
+#emcc_flags_wasmfs += -DSQLITE_WASM_OPFS
+#emcc_flags_wasmfs += -sPTHREAD_POOL_SIZE=2
+#emcc_flags_wasmfs += -sPTHREAD_POOL_SIZE_STRICT=2
+# (Thread pool settings may require tweaking.)
+#/end of WASMFS/OPFS options.
 emcc_flags = $(emcc_opt) \
         -sALLOW_TABLE_GROWTH \
         -sABORTING_MALLOC \
@@ -1563,10 +1568,12 @@ emcc_flags = $(emcc_opt) \
         --minify 0 \
         -I. $(SHELL_OPT) \
         -DSQLITE_THREADSAFE=0 \
+        -DSQLITE_TEMP_STORE=3 \
         -DSQLITE_OMIT_UTF16 \
         -DSQLITE_OMIT_DEPRECATED \
         -DSQLITE_OMIT_SHARED_CACHE \
-        $(emcc_flags_opfs)
+        '-DSQLITE_DEFAULT_UNIX_VFS="unix-none"' \
+        $(emcc_flags_wasmfs)
 $(fiddle_module_js): Makefile $(sqlite3_wasm_c) shell.c \
     $(wasm_dir)/EXPORTED_RUNTIME_METHODS.fiddle \
     $(wasm_dir)/EXPORTED_FUNCTIONS.fiddle
diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 467034f9e8..db96a42ffc 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -18,6 +18,7 @@ else
 endif
 fiddle:
 	$(MAKE) -C ../.. fiddle -e emcc_opt=$(fiddle_opt)
+all: fiddle
 
 clean:
 	$(MAKE) -C ../../ clean-fiddle
@@ -46,8 +47,12 @@ SQLITE_OPT = \
   -DSQLITE_OMIT_DEPRECATED \
   -DSQLITE_OMIT_UTF16 \
   -DSQLITE_OMIT_SHARED_CACHE \
-  -DSQLITE_THREADSAFE=0
+  -DSQLITE_THREADSAFE=0 \
+  -DSQLITE_TEMP_STORE=3
 #SQLITE_OPT += -DSQLITE_ENABLE_MEMSYS5
+# ^^^ MEMSYS5 is hypothetically useful for non-Emscripten builds but
+# requires adding more infrastructure and fixing one spot in the
+# sqlite3 internals which calls malloc() early on.
 $(dir.top)/sqlite3.c:
 	$(MAKE) -C $(dir.top) sqlite3.c
 
diff --git a/manifest b/manifest
index b297210960..ef10d9657a 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C More\sexperimentation\swith\show\sclient-side\sconfig\sstate\scan\sbe\spassed\son\sto\sinitialize\sthe\sJS-side\ssqlite3\sAPI.
-D 2022-08-22T21:37:17.339
+C Wasm\sbuild\sflag\stweaks\sand\sdocumentation.
+D 2022-08-23T17:02:46.959
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in 7d19258e83981c69dcdc63c46dfa83de907fc1c1c0472a6dc0d31b2fae376764
+F Makefile.in 544e93e4a996b7a1cd98ce8c2381cc487068a516e84243a6251fc3ba9638fe6c
 F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
 F Makefile.msc d547a2fdba38a1c6cd1954977d0b0cc017f5f8fbfbc65287bf8d335808938016
 F README.md 8b8df9ca852aeac4864eb1e400002633ee6db84065bd01b78c33817f97d31f5e
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle db7a4602f043cf4a5e4135be3609a487f9f1c83f05778bfbdf93766be4541b96
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile 19c21ce4df5583278cc495bffbe03c69dc64af60fa9dac01766d0192bd191ac6
+F ext/wasm/GNUmakefile 79f0ddba6b6b474fad46a927aa9cd0fdbeb372c5332c84e8096d6b490df0f9db
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 77ef4bcf37e362b9ad61f9c175dfc0f1b3e571563fb311b96581cf422ee6a8ec
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -2006,8 +2006,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 e215d55a97e1ccbca3101621374444d2381d87ef8e8fde5271e31c8b714e43e9
-R 46e3280ce6b3dabfd5a5df8623d5cf20
+P ea2acc454c012a62556f6d0623d6eff60736d24aa214a64462b423623ef44d47
+R 72b1967923c17320161370eaaa7aa1c3
 U stephan
-Z e9aff16acc00367edea41a90ce619433
+Z 64cee0eefa2cd9236a38fc28a7dddd9f
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index bb6efe14bd..5d826619c0 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ea2acc454c012a62556f6d0623d6eff60736d24aa214a64462b423623ef44d47
\ No newline at end of file
+c8eb3aa8e0f487f14791214caf70d1aa03866e01345c7fa1d5607c24c39dde1d
\ No newline at end of file

From a9ac2ed069da67cfd540f5a35cbd15acabc9a00e Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 24 Aug 2022 00:10:45 +0000
Subject: [PATCH 023/428] Significant restructuring of the Worker #1
 request/response object structures to improve readability and clarity.

FossilOrigin-Name: 03b9db9b98cb36faa7de5a8a64d2e13c4aeaadfefb33ac92bb41056f6be3f121
---
 ext/wasm/api/sqlite3-api-worker1.js | 143 +++++++++++++---------------
 ext/wasm/sqlite3-worker1.js         |   2 +-
 ext/wasm/testing2.js                |  88 +++++++++--------
 manifest                            |  16 ++--
 manifest.uuid                       |   2 +-
 5 files changed, 118 insertions(+), 133 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-worker1.js b/ext/wasm/api/sqlite3-api-worker1.js
index a7b759851f..2e8d5a25d0 100644
--- a/ext/wasm/api/sqlite3-api-worker1.js
+++ b/ext/wasm/api/sqlite3-api-worker1.js
@@ -34,7 +34,7 @@
   messages and then it posts a message in the form:
 
   ```
-  {type:'sqlite3-api',data:'worker1-ready'}
+  {type:'sqlite3-api',result:'worker1-ready'}
   ```
 
   to let the client know that it has been initialized. Clients may
@@ -60,15 +60,6 @@ sqlite3.initWorker1API = function(){
 
      - Support for handling multiple DBs via this interface is under
      development.
-
-     - Revisit how virtual files are managed. We currently delete DBs
-     from the virtual filesystem when we close them, for the sake of
-     saving memory (the VFS lives in RAM). Supporting multiple DBs may
-     require that we give up that habit. Similarly, fully supporting
-     ATTACH, where a user can upload multiple DBs and ATTACH them,
-     also requires the that we manage the VFS entries better.
-     Related: we most definitely do not want to delete persistent DBs
-     (e.g. stored on OPFS) when they're closed.
   */
   const toss = (...args)=>{throw new Error(args.join(' '))};
   if('function' !== typeof importScripts){
@@ -102,10 +93,9 @@ sqlite3.initWorker1API = function(){
     idSeq: 0,
     idMap: new WeakMap,
     open: function(arg){
-      // TODO: if arg is a filename, look for a db in this.dbs with the
+      // TODO? if arg is a filename, look for a db in this.dbs with the
       // same filename and close/reopen it (or just pass it back as is?).
       if(!arg && this.defaultDb) return this.defaultDb;
-      //???if(this.defaultDb) this.defaultDb.close();
       const db = (Array.isArray(arg) ? new DB(...arg) : new DB(arg));
       this.dbs[getDbId(db)] = db;
       if(!this.defaultDb) this.defaultDb = db;
@@ -122,12 +112,12 @@ sqlite3.initWorker1API = function(){
         }
       }
     },
-    post: function(type,data,xferList){
+    post: function(msg,xferList){
       if(xferList){
-        self.postMessage( {type, data}, xferList );
+        self.postMessage( msg, xferList );
         xferList.length = 0;
       }else{
-        self.postMessage({type, data});
+        self.postMessage(msg);
       }
     },
     /** Map of DB IDs to DBs. */
@@ -167,49 +157,42 @@ sqlite3.initWorker1API = function(){
     xfer: [/*Temp holder for "transferable" postMessage() state.*/],
     /**
        Proxy for the DB constructor. Expects to be passed a single
-       object or a falsy value to use defaults. The object may
-       have a filename property to name the db file (see the DB
-       constructor for peculiarities and transformations) and/or a
-       buffer property (a Uint8Array holding a complete database
-       file's contents). The response is an object:
+       object or a falsy value to use defaults. The object may have a
+       filename property to name the db file (see the DB constructor
+       for peculiarities and transformations). The response is an
+       object:
 
        {
          filename: db filename (possibly differing from the input),
 
-         dbId: an opaque ID value which must be passed to other calls
-               in this API to tell them which db to use. If it is not
-               provided to future calls, they will default to
-               operating on the first-opened db.
-
-          messageId: if the client-sent message included this field,
-              it is mirrored in the response.
+         dbId: an opaque ID value which must be passed in the message
+               envelope to other calls in this API to tell them which
+               db to use. If it is not provided to future calls, they
+               will default to operating on the first-opened db.
        }
     */
     open: function(ev){
-      const args = [], data = (ev.data || {});
-      if(data.simulateError){ // undocumented internal testing option
+      const oargs = [], args = (ev.args || {});
+      if(args.simulateError){ // undocumented internal testing option
         toss("Throwing because of simulateError flag.");
       }
-      if(data.filename) args.push(data.filename);
-      const db = wState.open(args);
+      if(args.filename) oargs.push(args.filename);
+      const db = wState.open(oargs);
       return {
         filename: db.filename,
         dbId: getDbId(db)
       };
     },
     /**
-       Proxy for DB.close(). If ev.data may either be a boolean or
-       an object with an `unlink` property. If that value is
-       truthy then the db file (if the db is currently open) will
-       be unlinked from the virtual filesystem, else it will be
-       kept intact. The response object is:
+       Proxy for DB.close(). ev.args may either be a boolean or an
+       object with an `unlink` property. If that value is truthy then
+       the db file (if the db is currently open) will be unlinked from
+       the virtual filesystem, else it will be kept intact. The
+       result object is:
 
        {
          filename: db filename _if_ the db is opened when this
-                   is called, else the undefined value,
-         unlink: boolean. If true, unlink() (delete) the db file
-                 after closing int. Any error while deleting it is
-                 ignored.
+                   is called, else the undefined value
        }
 
        It does not error if the given db is already closed or no db is
@@ -222,8 +205,8 @@ sqlite3.initWorker1API = function(){
         dbId: db ? getDbId(db) : undefined
       };
       if(db){
-        wState.close(db, !!((ev.data && 'object'===typeof ev.data)
-                            ? ev.data.unlink : false));
+        wState.close(db, ((ev.args && 'object'===typeof ev.args)
+                          ? !!ev.args.unlink : false));
       }
       return response;
     },
@@ -242,11 +225,11 @@ sqlite3.initWorker1API = function(){
        message type key, in which case a callback function will be
        applied which posts each row result via:
 
-       postMessage({type: thatKeyType, data: theRow})
+       postMessage({type: thatKeyType, row: theRow})
 
        And, at the end of the result set (whether or not any
        result rows were produced), it will post an identical
-       message with data:null to alert the caller than the result
+       message with row:null to alert the caller than the result
        set is completed.
 
        The callback proxy must not recurse into this interface, or
@@ -264,8 +247,8 @@ sqlite3.initWorker1API = function(){
     */
     exec: function(ev){
       const opt = (
-        'string'===typeof ev.data
-      ) ? {sql: ev.data} : (ev.data || Object.create(null));
+        'string'===typeof ev.args
+      ) ? {sql: ev.args} : (ev.args || Object.create(null));
       if(undefined===opt.rowMode){
         /* Since the default rowMode of 'stmt' is not useful
            for the Worker interface, we'll default to
@@ -286,13 +269,13 @@ sqlite3.initWorker1API = function(){
            row as a message of that type. */
         const that = this;
         opt.callback =
-          (row)=>wState.post(callbackMsgType,row,this.xfer);
+          (row)=>wState.post({type: callbackMsgType, row:row}, this.xfer);
       }
       try {
         db.exec(opt);
         if(opt.callback instanceof Function){
           opt.callback = callbackMsgType;
-          wState.post(callbackMsgType, null);
+          wState.post({type: callbackMsgType, row: null});
         }
       }/*catch(e){
          console.warn("Worker is propagating:",e);throw e;
@@ -305,7 +288,7 @@ sqlite3.initWorker1API = function(){
       return opt;
     }/*exec()*/,
     /**
-       TO(re)DO, once we can abstract away access to the
+       TO(RE)DO, once we can abstract away access to the
        JS environment's virtual filesystem. Currently this
        always throws.
 
@@ -352,73 +335,77 @@ sqlite3.initWorker1API = function(){
      form:
 
      { type: apiCommand,
-       dbId: optional DB ID value (else uses a default db handle)
-       data: apiArguments,
+       dbId: optional DB ID value (else uses a default db handle),
+       args: apiArguments,
        messageId: optional client-specific value
      }
 
      As a rule, these commands respond with a postMessage() of their
-     own in the same form, but will, if needed, transform the `data`
-     member to an object and may add state to it. The responses
-     always have an object-format `data` part. If the inbound `data`
-     is an object which has a `messageId` property, that property is
+     own in the form:
+
+     TODO: refactoring is underway.
+
+     The responses always have an object-format `result` part. If the
+     inbound object has a `messageId` property, that property is
      always mirrored in the result object, for use in client-side
      dispatching of these asynchronous results. Exceptions thrown
-     during processing result in an `error`-type event with a
-     payload in the form:
+     during processing result in an `error`-type event with a payload
+     in the form:
 
-     {
-       message: error string,
-       errorClass: class name of the error type,
+     { type: 'error',
        dbId: DB handle ID,
-       input: ev.data,
-       [messageId: if set in the inbound message]
+       [messageId: if set in the inbound message],
+       result: {
+         message: error string,
+         errorClass: class name of the error type,
+         input: ev.data
+       }
      }
 
      The individual APIs are documented in the wMsgHandler object.
   */
   self.onmessage = function(ev){
     ev = ev.data;
-    let response, dbId = ev.dbId, evType = ev.type;
+    let result, dbId = ev.dbId, evType = ev.type;
     const arrivalTime = performance.now();
     try {
       if(wMsgHandler.hasOwnProperty(evType) &&
          wMsgHandler[evType] instanceof Function){
-        response = wMsgHandler[evType](ev);
+        result = wMsgHandler[evType](ev);
       }else{
         toss("Unknown db worker message type:",ev.type);
       }
     }catch(err){
       evType = 'error';
-      response = {
+      result = {
         message: err.message,
         errorClass: err.name,
         input: ev
       };
       if(err.stack){
-        response.stack = ('string'===typeof err.stack)
+        result.stack = ('string'===typeof err.stack)
           ? err.stack.split('\n') : err.stack;
       }
       if(0) console.warn("Worker is propagating an exception to main thread.",
-                         "Reporting it _here_ for the stack trace:",err,response);
-    }
-    if(!response.messageId && ev.data
-       && 'object'===typeof ev.data && ev.data.messageId){
-      response.messageId = ev.data.messageId;
+                         "Reporting it _here_ for the stack trace:",err,result);
     }
     if(!dbId){
-      dbId = response.dbId/*from 'open' cmd*/
+      dbId = result.dbId/*from 'open' cmd*/
         || getDefaultDbId();
     }
-    if(!response.dbId) response.dbId = dbId;
     // Timing info is primarily for use in testing this API. It's not part of
     // the public API. arrivalTime = when the worker got the message.
-    response.workerReceivedTime = arrivalTime;
-    response.workerRespondTime = performance.now();
-    response.departureTime = ev.departureTime;
-    wState.post(evType, response, wMsgHandler.xfer);
+    wState.post({
+      type: evType,
+      dbId: dbId,
+      messageId: ev.messageId,
+      workerReceivedTime: arrivalTime,
+      workerRespondTime: performance.now(),
+      departureTime: ev.departureTime,
+      result: result
+    }, wMsgHandler.xfer);
   };
-  setTimeout(()=>self.postMessage({type:'sqlite3-api',data:'worker1-ready'}), 0);
+  setTimeout(()=>self.postMessage({type:'sqlite3-api',result:'worker1-ready'}), 0);
 }.bind({self, sqlite3});
 });
 
diff --git a/ext/wasm/sqlite3-worker1.js b/ext/wasm/sqlite3-worker1.js
index 3982ddaa2b..ff024d8215 100644
--- a/ext/wasm/sqlite3-worker1.js
+++ b/ext/wasm/sqlite3-worker1.js
@@ -14,7 +14,7 @@
   sqlite3.js, initializes the module, and postMessage()'s a message
   after the module is initialized:
 
-  {type: 'sqlite3-api', data: 'worker1-ready'}
+  {type: 'sqlite3-api', result: 'worker1-ready'}
 
   This seemingly superfluous level of indirection is necessary when
   loading sqlite3.js via a Worker. Instantiating a worker with new
diff --git a/ext/wasm/testing2.js b/ext/wasm/testing2.js
index bcbe7b50de..b051cc04cc 100644
--- a/ext/wasm/testing2.js
+++ b/ext/wasm/testing2.js
@@ -31,17 +31,6 @@
   const warn = console.warn.bind(console);
   const error = console.error.bind(console);
   const toss = (...args)=>{throw new Error(args.join(' '))};
-  /** Posts a worker message as {type:type, data:data}. */
-  const wMsg = function(type,data){
-    log("Posting message to worker dbId="+(DbState.id||'default')+':',data);
-    SW.postMessage({
-      type,
-      dbId: DbState.id,
-      data,
-      departureTime: performance.now()
-    });
-    return SW;
-  };
 
   SW.onerror = function(event){
     error("onerror",event);
@@ -74,28 +63,37 @@
     logHtml("","Total test count:",T.counter+". Total time =",(performance.now() - startTime),"ms");
   };
 
-  const logEventResult = function(evd){
+  const logEventResult = function(ev){
+    const evd = ev.result;
     logHtml(evd.errorClass ? 'error' : '',
-            "runOneTest",evd.messageId,"Worker time =",
-            (evd.workerRespondTime - evd.workerReceivedTime),"ms.",
+            "runOneTest",ev.messageId,"Worker time =",
+            (ev.workerRespondTime - ev.workerReceivedTime),"ms.",
             "Round-trip event time =",
-            (performance.now() - evd.departureTime),"ms.",
-            (evd.errorClass ? evd.message : "")
+            (performance.now() - ev.departureTime),"ms.",
+            (evd.errorClass ? ev.message : ""), evd
            );
   };
 
-  const runOneTest = function(eventType, eventData, callback){
-    T.assert(eventData && 'object'===typeof eventData);
+  const runOneTest = function(eventType, eventArgs, callback){
+    T.assert(eventArgs && 'object'===typeof eventArgs);
     /* ^^^ that is for the testing and messageId-related code, not
        a hard requirement of all of the Worker-exposed APIs. */
-    eventData.messageId = MsgHandlerQueue.push(eventType,function(ev){
-      logEventResult(ev.data);
+    const messageId = MsgHandlerQueue.push(eventType,function(ev){
+      logEventResult(ev);
       if(callback instanceof Function){
         callback(ev);
         testCount();
       }
     });
-    wMsg(eventType, eventData);
+    const msg = {
+      type: eventType,
+      args: eventArgs,
+      dbId: DbState.id,
+      messageId: messageId,
+      departureTime: performance.now()
+    };
+    log("Posting",eventType,"message to worker dbId="+(DbState.id||'default')+':',msg);
+    SW.postMessage(msg);
   };
 
   /** Methods which map directly to onmessage() event.type keys.
@@ -103,23 +101,23 @@
   const dbMsgHandler = {
     open: function(ev){
       DbState.id = ev.dbId;
-      log("open result",ev.data);
+      log("open result",ev);
     },
     exec: function(ev){
-      log("exec result",ev.data);
+      log("exec result",ev);
     },
     export: function(ev){
-      log("export result",ev.data);
+      log("export result",ev);
     },
     error: function(ev){
-      error("ERROR from the worker:",ev.data);
-      logEventResult(ev.data);
+      error("ERROR from the worker:",ev);
+      logEventResult(ev);
     },
     resultRowTest1: function f(ev){
       if(undefined === f.counter) f.counter = 0;
-      if(ev.data) ++f.counter;
-      //log("exec() result row:",ev.data);
-      T.assert(null===ev.data || 'number' === typeof ev.data.b);
+      if(ev.row) ++f.counter;
+      //log("exec() result row:",ev.row);
+      T.assert(null===ev.row || 'number' === typeof ev.row.b);
     }
   };
 
@@ -149,7 +147,7 @@
       multi: true,
       resultRows: [], columnNames: []
     }, function(ev){
-      ev = ev.data;
+      ev = ev.result;
       T.assert(0===ev.resultRows.length)
         .assert(0===ev.columnNames.length);
     });
@@ -157,7 +155,7 @@
       sql: 'select a a, b b from t order by a',
       resultRows: [], columnNames: [],
     }, function(ev){
-      ev = ev.data;
+      ev = ev.result;
       T.assert(3===ev.resultRows.length)
         .assert(1===ev.resultRows[0][0])
         .assert(6===ev.resultRows[2][1])
@@ -169,7 +167,7 @@
       resultRows: [], columnNames: [],
       rowMode: 'object'
     }, function(ev){
-      ev = ev.data;
+      ev = ev.result;
       T.assert(3===ev.resultRows.length)
         .assert(1===ev.resultRows[0].a)
         .assert(6===ev.resultRows[2].b)
@@ -181,7 +179,7 @@
       resultRows: [],
       //rowMode: 'array', // array is the default in the Worker interface
     }, function(ev){
-      ev = ev.data;
+      ev = ev.result;
       T.assert(1 === ev.resultRows.length)
         .assert(1 === ev.resultRows[0][0]);
     });
@@ -206,7 +204,7 @@
       rowMode: 1,
       resultRows: []
     },function(ev){
-      const rows = ev.data.resultRows;
+      const rows = ev.result.resultRows;
       T.assert(3===rows.length).
         assert(6===rows[0]);
     });
@@ -215,14 +213,14 @@
       sql: 'select count(a) from t',
       resultRows: []
     },function(ev){
-      ev = ev.data;
+      ev = ev.result;
       T.assert(1===ev.resultRows.length)
         .assert(2===ev.resultRows[0][0]);
     });
     if(0){
       // export requires reimpl. for portability reasons.
       runOneTest('export',{}, function(ev){
-        ev = ev.data;
+        ev = ev.result;
         T.assert('string' === typeof ev.filename)
           .assert(ev.buffer instanceof Uint8Array)
           .assert(ev.buffer.length > 1024)
@@ -231,11 +229,11 @@
     }
     /***** close() tests must come last. *****/
     runOneTest('close',{unlink:true},function(ev){
-      ev = ev.data;
+      ev = ev.result;
       T.assert('string' === typeof ev.filename);
     });
     runOneTest('close',{unlink:true},function(ev){
-      ev = ev.data;
+      ev = ev.result;
       T.assert(undefined === ev.filename);
     });
   };
@@ -276,11 +274,11 @@
       filename:'testing2.sqlite3',
       simulateError: simulateOpenError
     }, function(ev){
-      //log("open result",ev);
-      T.assert('testing2.sqlite3'===ev.data.filename)
-        .assert(ev.data.dbId)
-        .assert(ev.data.messageId);
-      DbState.id = ev.data.dbId;
+      log("open result",ev);
+      T.assert('testing2.sqlite3'===ev.result.filename)
+        .assert(ev.dbId)
+        .assert(ev.messageId);
+      DbState.id = ev.dbId;
       if(waitForOpen) setTimeout(runTests2, 0);
     });
     if(!waitForOpen) runTests2();
@@ -293,7 +291,7 @@
     }
     ev = ev.data/*expecting a nested object*/;
     //log("main window onmessage:",ev);
-    if(ev.data && ev.data.messageId){
+    if(ev.result && ev.messageId){
       /* We're expecting a queued-up callback handler. */
       const f = MsgHandlerQueue.shift();
       if('error'===ev.type){
@@ -306,7 +304,7 @@
     }
     switch(ev.type){
         case 'sqlite3-api':
-          switch(ev.data){
+          switch(ev.result){
               case 'worker1-ready':
                 log("Message:",ev);
                 self.sqlite3TestModule.setStatus(null);
diff --git a/manifest b/manifest
index ef10d9657a..fc1e6d40bd 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Wasm\sbuild\sflag\stweaks\sand\sdocumentation.
-D 2022-08-23T17:02:46.959
+C Significant\srestructuring\sof\sthe\sWorker\s#1\srequest/response\sobject\sstructures\sto\simprove\sreadability\sand\sclarity.
+D 2022-08-24T00:10:45.121
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -486,7 +486,7 @@ F ext/wasm/api/sqlite3-api-glue.js 67ca83974410961953eeaa1dfed3518530d68381729ed
 F ext/wasm/api/sqlite3-api-oo1.js f6dcaac3270182471f97efcfda25bd4a4ac1777b8ec52ebd1c6846721160e54c
 F ext/wasm/api/sqlite3-api-opfs.js 011799db398157cbd254264b6ebae00d7234b93d0e9e810345f213a5774993c0
 F ext/wasm/api/sqlite3-api-prologue.js 6e0e7787ed955ea2b6158e0bb7608f63b54236847700d183e49e1f10d0525b8f
-F ext/wasm/api/sqlite3-api-worker1.js ceb1fc88d8a3742c069632e88fd05c14d5a79eb86bdb9e12969ec37f64fbf42b
+F ext/wasm/api/sqlite3-api-worker1.js c9e4edb89f41a4fa65d136ae180c1bc0beb694eb95f7d9e6936fbb702914c160
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 0d81282eaeff2a6e9fc5c28a388c5c5b45cf25a9393992fa511ac009b27df982
 F ext/wasm/common/SqliteTestUtil.js 04156a3b714b1b17a7261d21dd51341a8aeb9880a223e1e7519de98c2cceb414
@@ -508,11 +508,11 @@ F ext/wasm/scratchpad-opfs-main.js 69e960e9161f6412fd0c30f355d4112f1894d6609eb43
 F ext/wasm/scratchpad-opfs-worker.html 66c1d15d678f3bd306373d76b61c6c8aef988f61f4a8dd40185d452f9c6d2bf5
 F ext/wasm/scratchpad-opfs-worker.js 3ec2868c669713145c76eb5877c64a1b20741f741817b87c907a154b676283a9
 F ext/wasm/scratchpad-opfs-worker2.js 5f2237427ac537b8580b1c659ff14ad2621d1694043eaaf41ae18dbfef2e48c0
-F ext/wasm/sqlite3-worker1.js e93fe8e5da7cb56dcf4d1bb0aa44bf681b509e1c56f2a75885c0f408f034c42b
+F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
 F ext/wasm/testing1.html 528001c7e32ee567abc195aa071fd9820cc3c8ffc9c8a39a75e680db05f0c409
 F ext/wasm/testing1.js 2def7a86c52ff28b145cb86188d5c7a49d5993f9b78c50d140e1c31551220955
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
-F ext/wasm/testing2.js e16ae385cd24c4a4ec5de6f1c02e621d243e1f179204ac8df31068faa9e31b1a
+F ext/wasm/testing2.js f01e8d7b32f6d4790f8352bf8dc17d2b860afa58f6c8ea1f824ef1c0d2068138
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
@@ -2006,8 +2006,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 ea2acc454c012a62556f6d0623d6eff60736d24aa214a64462b423623ef44d47
-R 72b1967923c17320161370eaaa7aa1c3
+P c8eb3aa8e0f487f14791214caf70d1aa03866e01345c7fa1d5607c24c39dde1d
+R ea27eb9ac1a6ed815943946a889ca949
 U stephan
-Z 64cee0eefa2cd9236a38fc28a7dddd9f
+Z 3af622548a101a1182c5d00aa6a9dd08
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 5d826619c0..9b2d03d93c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c8eb3aa8e0f487f14791214caf70d1aa03866e01345c7fa1d5607c24c39dde1d
\ No newline at end of file
+03b9db9b98cb36faa7de5a8a64d2e13c4aeaadfefb33ac92bb41056f6be3f121
\ No newline at end of file

From efeee19a958b905cc8e939e54b2959089bb89108 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 24 Aug 2022 00:51:39 +0000
Subject: [PATCH 024/428] The very basics of a Promise-based proxy for the
 Worker #1 API. Still requires considerable cleanup, testing, and a solution
 for the exec-callback-via-event-type-name problem.

FossilOrigin-Name: 1e447849fb65887e806e3348a8a68f70ea6802bc0a1e56c385a279f27cc0cdda
---
 ext/wasm/common/SqliteTestUtil.js    |   5 +-
 ext/wasm/testing-worker-promise.html |  33 +++++++
 ext/wasm/testing-worker-promise.js   | 139 +++++++++++++++++++++++++++
 manifest                             |  14 +--
 manifest.uuid                        |   2 +-
 5 files changed, 182 insertions(+), 11 deletions(-)
 create mode 100644 ext/wasm/testing-worker-promise.html
 create mode 100644 ext/wasm/testing-worker-promise.js

diff --git a/ext/wasm/common/SqliteTestUtil.js b/ext/wasm/common/SqliteTestUtil.js
index 4b4cefbf0c..c21469c9b0 100644
--- a/ext/wasm/common/SqliteTestUtil.js
+++ b/ext/wasm/common/SqliteTestUtil.js
@@ -191,10 +191,7 @@
     */
     initSqlite3: function(){
       self.sqlite3ApiConfig = this.sqlite3ApiConfig;
-      return self.sqlite3InitModule(this).then(function(M){
-        delete self.sqlite3ApiConfig;
-        return M;
-      });
+      return self.sqlite3InitModule(this).finally(()=>delete self.sqlite3ApiConfig);
     }
   };
 })(self/*window or worker*/);
diff --git a/ext/wasm/testing-worker-promise.html b/ext/wasm/testing-worker-promise.html
new file mode 100644
index 0000000000..eab30c301f
--- /dev/null
+++ b/ext/wasm/testing-worker-promise.html
@@ -0,0 +1,33 @@
+<!doctype html>
+<html lang="en-us">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
+    <link rel="stylesheet" href="common/emscripten.css"/>
+    <link rel="stylesheet" href="common/testing.css"/>
+    <title>worker-promise tests</title>
+  </head>
+  <body>
+    <header id='titlebar'><span>worker-promise tests</span></header>
+    <!-- emscripten bits -->
+    <figure id="module-spinner">
+      <div class="spinner"></div>
+      <div class='center'><strong>Initializing app...</strong></div>
+      <div class='center'>
+        On a slow internet connection this may take a moment.  If this
+        message displays for "a long time", intialization may have
+        failed and the JavaScript console may contain clues as to why.
+      </div>
+    </figure>
+    <div class="emscripten" id="module-status">Downloading...</div>
+    <div class="emscripten">
+      <progress value="0" max="100" id="module-progress" hidden='1'></progress>  
+    </div><!-- /emscripten bits -->
+    <div>Most stuff on this page happens in the dev console.</div>
+    <hr>
+    <div id='test-output'></div>
+    <script src="common/SqliteTestUtil.js"></script>
+    <script src="testing-worker-promise.js"></script>
+  </body>
+</html>
diff --git a/ext/wasm/testing-worker-promise.js b/ext/wasm/testing-worker-promise.js
new file mode 100644
index 0000000000..c60c6c2882
--- /dev/null
+++ b/ext/wasm/testing-worker-promise.js
@@ -0,0 +1,139 @@
+/*
+  2022-08-23
+
+  The author disclaims copyright to this source code.  In place of a
+  legal notice, here is a blessing:
+
+  *   May you do good and not evil.
+  *   May you find forgiveness for yourself and forgive others.
+  *   May you share freely, never taking more than you give.
+
+  ***********************************************************************
+
+  
+  UNDER CONSTRUCTION: a Promise-based proxy for for the sqlite3 Worker
+  #1 API.
+*/
+'use strict';
+(function(){
+  const T = self.SqliteTestUtil;
+  const DbState = {
+    id: undefined
+  };
+  const eOutput = document.querySelector('#test-output');
+  const log = console.log.bind(console);
+  const logHtml = async function(cssClass,...args){
+    log.apply(this, args);
+    const ln = document.createElement('div');
+    if(cssClass) ln.classList.add(cssClass);
+    ln.append(document.createTextNode(args.join(' ')));
+    eOutput.append(ln);
+  };
+  const warn = console.warn.bind(console);
+  const error = console.error.bind(console);
+
+  let startTime;
+  const logEventResult = async function(evd){
+    logHtml(evd.errorClass ? 'error' : '',
+            "response to",evd.messageId,"Worker time =",
+            (evd.workerRespondTime - evd.workerReceivedTime),"ms.",
+            "Round-trip event time =",
+            (performance.now() - evd.departureTime),"ms.",
+            (evd.errorClass ? evd.message : "")
+           );
+  };
+
+  const testCount = async ()=>{
+    logHtml("","Total test count:",T.counter+". Total time =",(performance.now() - startTime),"ms");
+  };
+
+  // Inspiration: https://stackoverflow.com/a/52439530
+  const worker = new Worker("sqlite3-worker1.js");
+  worker.onerror = function(event){
+    error("worker.onerror",event);
+  };
+  const WorkerPromiseHandler = Object.create(null);
+  WorkerPromiseHandler.nextId = function f(){
+    return 'msg#'+(f._ = (f._ || 0) + 1);
+  };
+
+  /** Posts a worker message as {type:eventType, data:eventData}. */
+  const requestWork = async function(eventType, eventData){
+    //log("requestWork", eventType, eventData);
+    T.assert(eventData && 'object'===typeof eventData);
+    /* ^^^ that is for the testing and messageId-related code, not
+       a hard requirement of all of the Worker-exposed APIs. */
+    const wph = WorkerPromiseHandler;
+    const msgId = wph.nextId();
+    const proxy = wph[msgId] = Object.create(null);
+    proxy.promise = new Promise(function(resolve, reject){
+      proxy.resolve = resolve;
+      proxy.reject = reject;
+      const msg = {
+        type: eventType,
+        args: eventData,
+        dbId: DbState.id,
+        messageId: msgId,
+        departureTime: performance.now()
+      };
+      log("Posting",eventType,"message to worker dbId="+(DbState.id||'default')+':',msg);
+      worker.postMessage(msg);
+    });
+    log("Set up promise",proxy);
+    return proxy.promise;
+  };
+
+
+  const runOneTest = async function(eventType, eventData, callback){
+    T.assert(eventData && 'object'===typeof eventData);
+    /* ^^^ that is for the testing and messageId-related code, not
+       a hard requirement of all of the Worker-exposed APIs. */
+    let p = requestWork(eventType, eventData);
+    if(callback) p.then(callback).finally(testCount);
+    return p;
+  };
+
+  const runTests = async function(){
+    logHtml('',
+            "Sending 'open' message and waiting for its response before continuing.");
+    startTime = performance.now();
+    runOneTest('open', {
+      filename:'testing2.sqlite3',
+      simulateError: 0 /* if true, fail the 'open' */
+    }, function(ev){
+      log("then open result",ev);
+      T.assert('testing2.sqlite3'===ev.result.filename)
+        .assert(ev.dbId)
+        .assert(ev.messageId)
+        .assert(DbState.id === ev.dbId);
+    }).catch((err)=>error("error response:",err));
+  };
+
+  worker.onmessage = function(ev){
+    ev = ev.data;
+    (('error'===ev.type) ? error : log)('worker.onmessage',ev);
+    const msgHandler = WorkerPromiseHandler[ev.messageId];
+    if(!msgHandler){
+      if('worker1-ready'===ev.result) {
+        /*sqlite3-api/worker1-ready is fired when the Worker1 API initializes*/
+        self.sqlite3TestModule.setStatus(null)/*hide the HTML-side is-loading spinner*/;
+        runTests();
+        return;
+      }
+      error("Unhandled worker message:",ev);
+      return;
+    }
+    logEventResult(ev);
+    delete WorkerPromiseHandler[ev.messageId];
+    if('error'===ev.type){
+      msgHandler.reject(ev);
+    }
+    else{
+      if(!DbState.id && ev.dbId) DbState.id = ev.dbId;
+      msgHandler.resolve(ev); // async, so testCount() results on next line are out of order
+      //testCount();
+    }
+  };
+  
+  log("Init complete, but async init bits may still be running.");
+})();
diff --git a/manifest b/manifest
index fc1e6d40bd..d26d33dea6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Significant\srestructuring\sof\sthe\sWorker\s#1\srequest/response\sobject\sstructures\sto\simprove\sreadability\sand\sclarity.
-D 2022-08-24T00:10:45.121
+C The\svery\sbasics\sof\sa\sPromise-based\sproxy\sfor\sthe\sWorker\s#1\sAPI.\sStill\srequires\sconsiderable\scleanup,\stesting,\sand\sa\ssolution\sfor\sthe\sexec-callback-via-event-type-name\sproblem.
+D 2022-08-24T00:51:39.887
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -489,7 +489,7 @@ F ext/wasm/api/sqlite3-api-prologue.js 6e0e7787ed955ea2b6158e0bb7608f63b54236847
 F ext/wasm/api/sqlite3-api-worker1.js c9e4edb89f41a4fa65d136ae180c1bc0beb694eb95f7d9e6936fbb702914c160
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 0d81282eaeff2a6e9fc5c28a388c5c5b45cf25a9393992fa511ac009b27df982
-F ext/wasm/common/SqliteTestUtil.js 04156a3b714b1b17a7261d21dd51341a8aeb9880a223e1e7519de98c2cceb414
+F ext/wasm/common/SqliteTestUtil.js eb96275bed43fdb364b7d65bcded0ca5e22aaacff120d593d1385f852f486247
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 572cf1ffae0b6eb7ca63684d3392bf350217a07b90e7a896e4fa850700c989b0
 F ext/wasm/common/whwasmutil.js 41b8e097e0a9cb07c24c0ede3c81b72470a63f4a4efb07f75586dc131569f5ae
@@ -509,6 +509,8 @@ F ext/wasm/scratchpad-opfs-worker.html 66c1d15d678f3bd306373d76b61c6c8aef988f61f
 F ext/wasm/scratchpad-opfs-worker.js 3ec2868c669713145c76eb5877c64a1b20741f741817b87c907a154b676283a9
 F ext/wasm/scratchpad-opfs-worker2.js 5f2237427ac537b8580b1c659ff14ad2621d1694043eaaf41ae18dbfef2e48c0
 F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
+F ext/wasm/testing-worker-promise.html ba3d5423cfbdc96c332af3632dfcb61527ba8fd7e487b3bf3f07542f890c3e08
+F ext/wasm/testing-worker-promise.js c05c46a3a22b1910f6a1db11f3da6df701259eaa1277ddba085247b7f9059423
 F ext/wasm/testing1.html 528001c7e32ee567abc195aa071fd9820cc3c8ffc9c8a39a75e680db05f0c409
 F ext/wasm/testing1.js 2def7a86c52ff28b145cb86188d5c7a49d5993f9b78c50d140e1c31551220955
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
@@ -2006,8 +2008,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 c8eb3aa8e0f487f14791214caf70d1aa03866e01345c7fa1d5607c24c39dde1d
-R ea27eb9ac1a6ed815943946a889ca949
+P 03b9db9b98cb36faa7de5a8a64d2e13c4aeaadfefb33ac92bb41056f6be3f121
+R 5b16a785d8c414a8eb9d618c8d9d8cea
 U stephan
-Z 3af622548a101a1182c5d00aa6a9dd08
+Z fdaa5cf9f1bfd4215c6ebf07223819c1
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 9b2d03d93c..1b823c2233 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-03b9db9b98cb36faa7de5a8a64d2e13c4aeaadfefb33ac92bb41056f6be3f121
\ No newline at end of file
+1e447849fb65887e806e3348a8a68f70ea6802bc0a1e56c385a279f27cc0cdda
\ No newline at end of file

From 9a34509a06ad893ae3ac786363ebf8d29b3e3a7c Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 24 Aug 2022 05:59:23 +0000
Subject: [PATCH 025/428] More work on how to configure the sqlite3 JS API
 bootstrapping process from higher-level code. Initial version of
 sqlite3-worker1-promiser, a Promise-based proxy for the Worker API #1.

FossilOrigin-Name: b030f321bd5a38cdd5d6f6735f201afa62d30d2b0ba02e67f055b4895553a878
---
 ext/wasm/api/sqlite3-api-cleanup.js           |  45 ++--
 ext/wasm/api/sqlite3-api-prologue.js          |  48 +++-
 ext/wasm/api/sqlite3-api-worker1.js           |  37 ++-
 ext/wasm/sqlite3-worker1-promiser.js          | 232 ++++++++++++++++++
 ext/wasm/testing-worker-promise.js            | 139 -----------
 ...ise.html => testing-worker1-promiser.html} |   3 +-
 ext/wasm/testing-worker1-promiser.js          | 214 ++++++++++++++++
 manifest                                      |  21 +-
 manifest.uuid                                 |   2 +-
 9 files changed, 537 insertions(+), 204 deletions(-)
 create mode 100644 ext/wasm/sqlite3-worker1-promiser.js
 delete mode 100644 ext/wasm/testing-worker-promise.js
 rename ext/wasm/{testing-worker-promise.html => testing-worker1-promiser.html} (91%)
 create mode 100644 ext/wasm/testing-worker1-promiser.js

diff --git a/ext/wasm/api/sqlite3-api-cleanup.js b/ext/wasm/api/sqlite3-api-cleanup.js
index d989faccaf..ed6b8c40ea 100644
--- a/ext/wasm/api/sqlite3-api-cleanup.js
+++ b/ext/wasm/api/sqlite3-api-cleanup.js
@@ -18,44 +18,24 @@
 'use strict';
 if('undefined' !== typeof Module){ // presumably an Emscripten build
   /**
-     Replace sqlite3ApiBootstrap() with a variant which plugs in the
-     Emscripten-based config for all config options which the client
-     does not provide.
+     Install a suitable default configuration for sqlite3ApiBootstrap().
   */
-  const SAB = self.sqlite3ApiBootstrap;
-  self.sqlite3ApiBootstrap = function(apiConfig){
-    apiConfig = apiConfig || {};
-    const configDefaults = {
-      Module: Module /* ==> Emscripten-style Module object. Currently
-                        needs to be exposed here for test code. NOT part
-                        of the public API. */,
-      exports: Module['asm'],
-      memory: Module.wasmMemory /* gets set if built with -sIMPORT_MEMORY */
-    };
-    const config = {};
-    Object.keys(configDefaults).forEach(function(k){
-      config[k] = Object.getOwnPropertyDescriptor(apiConfig, k)
-        ? apiConfig[k] : configDefaults[k];
-    });
-    // Copy over any properties apiConfig defines but configDefaults does not...
-    Object.keys(apiConfig).forEach(function(k){
-      if(!Object.getOwnPropertyDescriptor(config, k)){
-        config[k] = apiConfig[k];
-      }
-    });
-    return SAB(config);
-  };
+  const SABC = self.sqlite3ApiBootstrap.defaultConfig;
+  SABC.Module = Module /* ==>  Current needs to be exposed here for test code. NOT part
+                          of the public API. */;
+  SABC.exports = Module['asm'];
+  SABC.memory = Module.wasmMemory /* gets set if built with -sIMPORT_MEMORY */;
 
   /**
      For current (2022-08-22) purposes, automatically call
      sqlite3ApiBootstrap().  That decision will be revisited at some
      point, as we really want client code to be able to call this to
-     configure certain parts. If the global sqliteApiConfig property
-     is available, it is assumed to be a config object for
-     sqlite3ApiBootstrap().
+     configure certain parts. Clients may modify
+     self.sqlite3ApiBootstrap.defaultConfig to tweak the default
+     configuration used by a no-args call to sqlite3ApiBootstrap().
   */
   //console.warn("self.sqlite3ApiConfig = ",self.sqlite3ApiConfig);
-  const sqlite3 = self.sqlite3ApiBootstrap(self.sqlite3ApiConfig || Object.create(null));
+  const sqlite3 = self.sqlite3ApiBootstrap();
   delete self.sqlite3ApiBootstrap;
 
   if(self.location && +self.location.port > 1024){
@@ -67,4 +47,9 @@ if('undefined' !== typeof Module){ // presumably an Emscripten build
   delete sqlite3.capi.util /* arguable, but these are (currently) internal-use APIs */;
   //console.warn("Module.sqlite3 =",Module.sqlite3);
   Module.sqlite3 = sqlite3 /* Currently needed by test code and sqlite3-worker1.js */;
+}else{
+  console.warn("This is not running in an Emscripten module context, so",
+               "self.sqlite3ApiBootstrap() is _not_ being called due to lack",
+               "of config info for the WASM environment.",
+               "It must be called manually.");
 }
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 1a38f0343a..d92b948fce 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -93,16 +93,16 @@
 
    The config object properties include:
 
-   - `Module`: Emscripten-style module object. Currently only required
+   - `Module`[^1]: Emscripten-style module object. Currently only required
      by certain test code and is _not_ part of the public interface.
      (TODO: rename this to EmscriptenModule to be more explicit.)
 
-   - `exports`: the "exports" object for the current WASM
+   - `exports`[^1]: the "exports" object for the current WASM
      environment. In an Emscripten build, this should be set to
      `Module['asm']`.
 
-   - `memory`: optional WebAssembly.Memory object, defaulting to
-     `exports.memory`.  In Emscripten environments this should be set
+   - `memory`[^1]: optional WebAssembly.Memory object, defaulting to
+     `exports.memory`. In Emscripten environments this should be set
      to `Module.wasmMemory` if the build uses `-sIMPORT_MEMORY`, or be
      left undefined/falsy to default to `exports.memory` when using
      WASM-exported memory.
@@ -120,20 +120,26 @@
      the `free(3)`-compatible routine for the WASM
      environment. Defaults to `"free"`.
 
-   - `persistentDirName`: if the environment supports persistent storage, this
+   - `persistentDirName`[^1]: if the environment supports persistent storage, this
      directory names the "mount point" for that directory. It must be prefixed
      by `/` and may currently contain only a single directory-name part. Using
      the root directory name is not supported by any current persistent backend.
+
+
+   [^1] = This property may optionally be a function, in which case this
+          function re-assigns it to the value returned from that function,
+          enabling delayed evaluation.
+
 */
-self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(apiConfig){
-  'use strict';
-  
+'use strict';
+self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
+  apiConfig = (sqlite3ApiBootstrap.defaultConfig || self.sqlite3ApiConfig)
+){
   if(sqlite3ApiBootstrap.sqlite3){ /* already initalized */
     console.warn("sqlite3ApiBootstrap() called multiple times.",
                  "Config and external initializers are ignored on calls after the first.");
     return sqlite3ApiBootstrap.sqlite3;
   }
-
   apiConfig = apiConfig || {};
   const config = Object.create(null);
   {
@@ -158,6 +164,16 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(apiConfig){
     });
   }
 
+  [
+    // If any of these config options are functions, replace them with
+    // the result of calling that function...
+    'Module', 'exports', 'memory', 'persistentDirName'
+  ].forEach((k)=>{
+    if('function' === typeof config[k]){
+      config[k] = config[k]();
+    }
+  });
+  
   /** Throws a new Error, the message of which is the concatenation
       all args with a space between each. */
   const toss = (...args)=>{throw new Error(args.join(' '))};
@@ -750,4 +766,16 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(apiConfig){
   this array is deleted.
 */
 self.sqlite3ApiBootstrap.initializers = [];
-self.sqlite3ApiBootstrap.sqlite3 = undefined /* installed at first call */;
+/**
+   Client code may assign sqlite3ApiBootstrap.defaultConfig an
+   object-type value before calling sqlite3ApiBootstrap() (without
+   arguments) in order to tell that call to use this object as its
+   default config value. The intention of this is to provide
+   downstream clients with a reasonably flexible approach for plugging in
+   an environment-suitable configuration without having to define a new
+   global-scope symbol.
+*/
+self.sqlite3ApiBootstrap.defaultConfig = Object.create(null);
+/** Placeholder: gets installed by the first call to
+    self.sqlite3ApiBootstrap(). */
+self.sqlite3ApiBootstrap.sqlite3 = undefined;
diff --git a/ext/wasm/api/sqlite3-api-worker1.js b/ext/wasm/api/sqlite3-api-worker1.js
index 2e8d5a25d0..39263a4abe 100644
--- a/ext/wasm/api/sqlite3-api-worker1.js
+++ b/ext/wasm/api/sqlite3-api-worker1.js
@@ -92,11 +92,8 @@ sqlite3.initWorker1API = function(){
     defaultDb: undefined,
     idSeq: 0,
     idMap: new WeakMap,
-    open: function(arg){
-      // TODO? if arg is a filename, look for a db in this.dbs with the
-      // same filename and close/reopen it (or just pass it back as is?).
-      if(!arg && this.defaultDb) return this.defaultDb;
-      const db = (Array.isArray(arg) ? new DB(...arg) : new DB(arg));
+    open: function(opt){
+      const db = new DB(opt.filename);
       this.dbs[getDbId(db)] = db;
       if(!this.defaultDb) this.defaultDb = db;
       return db;
@@ -169,14 +166,26 @@ sqlite3.initWorker1API = function(){
                envelope to other calls in this API to tell them which
                db to use. If it is not provided to future calls, they
                will default to operating on the first-opened db.
+
+          persistent: prepend sqlite3.capi.sqlite3_web_persistent_dir()
+                      to the given filename so that it is stored
+                      in persistent storage _if_ the environment supports it.
+                      If persistent storage is not supported, the filename
+                      is used as-is.
        }
     */
     open: function(ev){
-      const oargs = [], args = (ev.args || {});
+      const oargs = Object.create(null), args = (ev.args || Object.create(null));
       if(args.simulateError){ // undocumented internal testing option
         toss("Throwing because of simulateError flag.");
       }
-      if(args.filename) oargs.push(args.filename);
+      if(args.persistent && args.filename){
+        oargs.filaname = sqlite3.capi.sqlite3_web_persistent_dir() + args.filename;
+      }else if('' === args.filename){
+        oargs.filename = args.filename;
+      }else{
+        oargs.filename = args.filename || ':memory:';
+      }      
       const db = wState.open(oargs);
       return {
         filename: db.filename,
@@ -184,15 +193,15 @@ sqlite3.initWorker1API = function(){
       };
     },
     /**
-       Proxy for DB.close(). ev.args may either be a boolean or an
-       object with an `unlink` property. If that value is truthy then
-       the db file (if the db is currently open) will be unlinked from
-       the virtual filesystem, else it will be kept intact. The
-       result object is:
+       Proxy for DB.close(). ev.args may be elided or an object with
+       an `unlink` property. If that value is truthy then the db file
+       (if the db is currently open) will be unlinked from the virtual
+       filesystem, else it will be kept intact. The result object is:
 
        {
          filename: db filename _if_ the db is opened when this
                    is called, else the undefined value
+         dbId: the ID of the closed b, or undefined if none is closed
        }
 
        It does not error if the given db is already closed or no db is
@@ -356,6 +365,7 @@ sqlite3.initWorker1API = function(){
        dbId: DB handle ID,
        [messageId: if set in the inbound message],
        result: {
+         operation: "inbound message's 'type' value",
          message: error string,
          errorClass: class name of the error type,
          input: ev.data
@@ -378,6 +388,7 @@ sqlite3.initWorker1API = function(){
     }catch(err){
       evType = 'error';
       result = {
+        operation: ev.type,
         message: err.message,
         errorClass: err.name,
         input: ev
@@ -405,7 +416,7 @@ sqlite3.initWorker1API = function(){
       result: result
     }, wMsgHandler.xfer);
   };
-  setTimeout(()=>self.postMessage({type:'sqlite3-api',result:'worker1-ready'}), 0);
+  self.postMessage({type:'sqlite3-api',result:'worker1-ready'});
 }.bind({self, sqlite3});
 });
 
diff --git a/ext/wasm/sqlite3-worker1-promiser.js b/ext/wasm/sqlite3-worker1-promiser.js
new file mode 100644
index 0000000000..c01ed9a5c6
--- /dev/null
+++ b/ext/wasm/sqlite3-worker1-promiser.js
@@ -0,0 +1,232 @@
+/*
+  2022-08-24
+
+  The author disclaims copyright to this source code.  In place of a
+  legal notice, here is a blessing:
+
+  *   May you do good and not evil.
+  *   May you find forgiveness for yourself and forgive others.
+  *   May you share freely, never taking more than you give.
+
+  ***********************************************************************
+
+  This file implements a Promise-based proxy for the sqlite3 Worker
+  API #1. It is intended to be included either from the main thread or
+  a Worker, but only if (A) the environment supports nested Workers
+  and (B) it's _not_ a Worker which loads the sqlite3 WASM/JS
+  module. This file's features will load that module and provide a
+  slightly simpler client-side interface than the slightly-lower-level
+  Worker API does.
+
+  This script necessarily exposes on global symbol, but clients may
+  freely `delete` that symbol after calling it.
+*/
+'use strict';
+/**
+   Configures an sqlite3 Worker API #1 Worker such that it can be
+   manipulated via a Promise-based interface and returns a factory
+   function which returns Promises for communicating with the worker.
+   This proxy has an _almost_ identical interface to the normal
+   worker API, with any exceptions noted below.
+
+   It requires a configuration object with the following properties:
+
+   - `worker` (required): a Worker instance which loads
+   `sqlite3-worker1.js` or a functional equivalent. Note that this
+   function replaces the worker.onmessage property. This property
+   may alternately be a function, in which case this function
+   re-assigns this property with the result of calling that
+   function, enabling delayed instantiation of a Worker.
+
+   - `onready` (optional, but...): this callback is called with no
+   arguments when the worker fires its initial
+   'sqlite3-api'/'worker1-ready' message, which it does when
+   sqlite3.initWorker1API() completes its initialization. This is
+   the simplest way to tell the worker to kick of work at the
+   earliest opportunity.
+
+   - `onerror` (optional): a callback to pass error-type events from
+   the worker. The object passed to it will be the error message
+   payload from the worker. This is _not_ the same as the
+   worker.onerror property!
+
+   - `onunhandled` (optional): a callback which gets passed the
+   message event object for any worker.onmessage() events which
+   are not handled by this proxy. Ideally that "should" never
+   happen, as this proxy aims to handle all known message types.
+
+   - `generateMessageId` (optional): a function which, when passed
+   an about-to-be-posted message object, generates a _unique_
+   message ID for the message, which this API then assigns as the
+   messageId property of the message. It _must_ generate unique
+   IDs so that dispatching can work. If not defined, a default
+   generator is used.
+
+   - `dbId` (optional): is the database ID to be used by the
+   worker. This must initially be unset or a falsy value. The
+   first `open` message sent to the worker will cause this config
+   entry to be assigned to the ID of the opened database. That ID
+   "should" be set as the `dbId` property of the message sent in
+   future requests, so that the worker uses that database.
+   However, if the worker is not given an explicit dbId, it will
+   use the first-opened database by default. If client code needs
+   to work with multiple database IDs, the client-level code will
+   need to juggle those themselves. A `close` message will clear
+   this property if it matches the ID of the closed db. Potential
+   TODO: add a config callback specifically for reporting `open`
+   and `close` message results, so that clients may track those
+   values.
+
+   - `debug` (optional): a console.debug()-style function for logging
+   information about messages.
+
+
+   This function returns a stateful factory function with the following
+   interfaces:
+
+   - Promise function(messageType, messageArgs)
+   - Promise function({message object})
+
+   The first form expects the "type" and "args" values for a Worker
+   message. The second expects an object in the form {type:...,
+   args:...}  plus any other properties the client cares to set. This
+   function will always set the messageId property on the object,
+   even if it's already set, and will set the dbId property to
+   config.dbId if it is _not_ set in the message object.
+
+   The function throws on error.
+
+   The function installs a temporarily message listener, posts a
+   message to the configured Worker, and handles the message's
+   response via the temporary message listener. The then() callback
+   of the returned Promise is passed the `message.data` property from
+   the resulting message, i.e. the payload from the worker, stripped
+   of the lower-level event state which the onmessage() handler
+   receives.
+
+   Example usage:
+
+   ```
+   const config = {...};
+   const eventPromiser = sqlite3Worker1Promiser(config);
+   eventPromiser('open', {filename:"/foo.db"}).then(function(msg){
+     console.log("open response",msg); // => {type:'open', result: {filename:'/foo.db'}, ...}
+     // Recall that config.dbId will be set for the first 'open'
+     // call and cleared for a matching 'close' call.
+   });
+   eventPromiser({type:'close'}).then((msg)=>{
+     console.log("open response",msg); // => {type:'open', result: {filename:'/foo.db'}, ...}
+     // Recall that config.dbId will be used by default for the message's dbId if
+     // none is explicitly provided, and a 'close' op will clear config.dbId if it
+     // closes that exact db.
+   });
+   ```
+
+   Differences from Worker API #1:
+
+   - exec's {callback: STRING} option does not work via this
+   interface (it triggers an exception), but {callback: function}
+   does and works exactly like the STRING form does in the Worker:
+   the callback is called one time for each row of the result set
+   and once more, at the end, passed only `null`, to indicate that
+   the end of the result set has been reached. Note that the rows
+   arrive via worker-posted messages, with all the implications
+   of that.
+
+
+   TODO?: a config option which causes it to queue up events to fire
+   one at a time and flush the event queue on the first error. The
+   main use for this is test runs which must fail at the first error.
+*/
+self.sqlite3Worker1Promiser = function callee(config = callee.defaultConfig){
+  // Inspired by: https://stackoverflow.com/a/52439530
+  let idNumber = 0;
+  const handlerMap = Object.create(null);
+  const noop = function(){};
+  const err = config.onerror || noop;
+  const debug = config.debug || noop;
+  const genMsgId = config.generateMessageId || function(msg){
+    return msg.type+'#'+(++idNumber);
+  };
+  const toss = (...args)=>{throw new Error(args.join(' '))};
+  if('function'===typeof config.worker) config.worker = config.worker();
+  config.worker.onmessage = function(ev){
+    ev = ev.data;
+    debug('worker1.onmessage',ev);
+    let msgHandler = handlerMap[ev.messageId];
+    if(!msgHandler){
+      if(ev && 'sqlite3-api'===ev.type && 'worker1-ready'===ev.result) {
+        /*fired one time when the Worker1 API initializes*/
+        if(config.onready) config.onready();
+        return;
+      }
+      msgHandler = handlerMap[ev.type] /* check for exec per-row callback */;
+      if(msgHandler && msgHandler.onrow){
+        msgHandler.onrow(ev.row);
+        return;
+      }        
+      if(config.onunhandled) config.onunhandled(arguments[0]);
+      else err("sqlite3Worker1Promiser() unhandled worker message:",ev);
+      return;
+    }
+    delete handlerMap[ev.messageId];
+    switch(ev.type){
+        case 'error':
+          msgHandler.reject(ev);
+          return;
+        case 'open':
+          if(!config.dbId) config.dbId = ev.dbId;
+          break;
+        case 'close':
+          if(config.dbId === ev.dbId) config.dbId = undefined;
+          break;
+        default:
+          break;
+    }
+    msgHandler.resolve(ev);
+  }/*worker.onmessage()*/;
+  return function(/*(msgType, msgArgs) || (msg)*/){
+    let msg;
+    if(1===arguments.length){
+      msg = arguments[0];
+    }else if(2===arguments.length){
+      msg = {
+        type: arguments[0],
+        args: arguments[1]
+      };
+    }else{
+      toss("Invalid arugments for sqlite3Worker1Promiser()-created factory.");
+    }
+    if(!msg.dbId) msg.dbId = config.dbId;
+    msg.messageId = genMsgId(msg);
+    msg.departureTime = performance.now();
+    const proxy = Object.create(null);
+    proxy.message = msg;
+    let cbId /* message handler ID for exec on-row callback proxy */;
+    if('exec'===msg.type && msg.args){
+      if('function'===typeof msg.args.callback){
+        cbId = genMsgId(msg)+':row';
+        proxy.onrow = msg.args.callback;
+        msg.args.callback = cbId;
+        handlerMap[cbId] = proxy;
+      }else if('string' === typeof msg.args.callback){
+        toss("exec callback may not be a string when using the Promise interface.");
+      }
+    }
+    //debug("requestWork", msg);
+    const p = new Promise(function(resolve, reject){
+      proxy.resolve = resolve;
+      proxy.reject = reject;
+      handlerMap[msg.messageId] = proxy;
+      debug("Posting",msg.type,"message to Worker dbId="+(config.dbId||'default')+':',msg);
+      config.worker.postMessage(msg);
+    });
+    if(cbId) p.finally(()=>delete handlerMap[cbId]);
+    return p;
+  };
+}/*sqlite3Worker1Promiser()*/;
+self.sqlite3Worker1Promiser.defaultConfig = {
+  worker: ()=>new Worker('sqlite3-worker1.js'),
+  onerror: console.error.bind(console),
+  dbId: undefined
+};
diff --git a/ext/wasm/testing-worker-promise.js b/ext/wasm/testing-worker-promise.js
deleted file mode 100644
index c60c6c2882..0000000000
--- a/ext/wasm/testing-worker-promise.js
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
-  2022-08-23
-
-  The author disclaims copyright to this source code.  In place of a
-  legal notice, here is a blessing:
-
-  *   May you do good and not evil.
-  *   May you find forgiveness for yourself and forgive others.
-  *   May you share freely, never taking more than you give.
-
-  ***********************************************************************
-
-  
-  UNDER CONSTRUCTION: a Promise-based proxy for for the sqlite3 Worker
-  #1 API.
-*/
-'use strict';
-(function(){
-  const T = self.SqliteTestUtil;
-  const DbState = {
-    id: undefined
-  };
-  const eOutput = document.querySelector('#test-output');
-  const log = console.log.bind(console);
-  const logHtml = async function(cssClass,...args){
-    log.apply(this, args);
-    const ln = document.createElement('div');
-    if(cssClass) ln.classList.add(cssClass);
-    ln.append(document.createTextNode(args.join(' ')));
-    eOutput.append(ln);
-  };
-  const warn = console.warn.bind(console);
-  const error = console.error.bind(console);
-
-  let startTime;
-  const logEventResult = async function(evd){
-    logHtml(evd.errorClass ? 'error' : '',
-            "response to",evd.messageId,"Worker time =",
-            (evd.workerRespondTime - evd.workerReceivedTime),"ms.",
-            "Round-trip event time =",
-            (performance.now() - evd.departureTime),"ms.",
-            (evd.errorClass ? evd.message : "")
-           );
-  };
-
-  const testCount = async ()=>{
-    logHtml("","Total test count:",T.counter+". Total time =",(performance.now() - startTime),"ms");
-  };
-
-  // Inspiration: https://stackoverflow.com/a/52439530
-  const worker = new Worker("sqlite3-worker1.js");
-  worker.onerror = function(event){
-    error("worker.onerror",event);
-  };
-  const WorkerPromiseHandler = Object.create(null);
-  WorkerPromiseHandler.nextId = function f(){
-    return 'msg#'+(f._ = (f._ || 0) + 1);
-  };
-
-  /** Posts a worker message as {type:eventType, data:eventData}. */
-  const requestWork = async function(eventType, eventData){
-    //log("requestWork", eventType, eventData);
-    T.assert(eventData && 'object'===typeof eventData);
-    /* ^^^ that is for the testing and messageId-related code, not
-       a hard requirement of all of the Worker-exposed APIs. */
-    const wph = WorkerPromiseHandler;
-    const msgId = wph.nextId();
-    const proxy = wph[msgId] = Object.create(null);
-    proxy.promise = new Promise(function(resolve, reject){
-      proxy.resolve = resolve;
-      proxy.reject = reject;
-      const msg = {
-        type: eventType,
-        args: eventData,
-        dbId: DbState.id,
-        messageId: msgId,
-        departureTime: performance.now()
-      };
-      log("Posting",eventType,"message to worker dbId="+(DbState.id||'default')+':',msg);
-      worker.postMessage(msg);
-    });
-    log("Set up promise",proxy);
-    return proxy.promise;
-  };
-
-
-  const runOneTest = async function(eventType, eventData, callback){
-    T.assert(eventData && 'object'===typeof eventData);
-    /* ^^^ that is for the testing and messageId-related code, not
-       a hard requirement of all of the Worker-exposed APIs. */
-    let p = requestWork(eventType, eventData);
-    if(callback) p.then(callback).finally(testCount);
-    return p;
-  };
-
-  const runTests = async function(){
-    logHtml('',
-            "Sending 'open' message and waiting for its response before continuing.");
-    startTime = performance.now();
-    runOneTest('open', {
-      filename:'testing2.sqlite3',
-      simulateError: 0 /* if true, fail the 'open' */
-    }, function(ev){
-      log("then open result",ev);
-      T.assert('testing2.sqlite3'===ev.result.filename)
-        .assert(ev.dbId)
-        .assert(ev.messageId)
-        .assert(DbState.id === ev.dbId);
-    }).catch((err)=>error("error response:",err));
-  };
-
-  worker.onmessage = function(ev){
-    ev = ev.data;
-    (('error'===ev.type) ? error : log)('worker.onmessage',ev);
-    const msgHandler = WorkerPromiseHandler[ev.messageId];
-    if(!msgHandler){
-      if('worker1-ready'===ev.result) {
-        /*sqlite3-api/worker1-ready is fired when the Worker1 API initializes*/
-        self.sqlite3TestModule.setStatus(null)/*hide the HTML-side is-loading spinner*/;
-        runTests();
-        return;
-      }
-      error("Unhandled worker message:",ev);
-      return;
-    }
-    logEventResult(ev);
-    delete WorkerPromiseHandler[ev.messageId];
-    if('error'===ev.type){
-      msgHandler.reject(ev);
-    }
-    else{
-      if(!DbState.id && ev.dbId) DbState.id = ev.dbId;
-      msgHandler.resolve(ev); // async, so testCount() results on next line are out of order
-      //testCount();
-    }
-  };
-  
-  log("Init complete, but async init bits may still be running.");
-})();
diff --git a/ext/wasm/testing-worker-promise.html b/ext/wasm/testing-worker1-promiser.html
similarity index 91%
rename from ext/wasm/testing-worker-promise.html
rename to ext/wasm/testing-worker1-promiser.html
index eab30c301f..9af809d9ed 100644
--- a/ext/wasm/testing-worker-promise.html
+++ b/ext/wasm/testing-worker1-promiser.html
@@ -28,6 +28,7 @@
     <hr>
     <div id='test-output'></div>
     <script src="common/SqliteTestUtil.js"></script>
-    <script src="testing-worker-promise.js"></script>
+    <script src="sqlite3-worker1-promiser.js"></script>
+    <script src="testing-worker1-promiser.js"></script>
   </body>
 </html>
diff --git a/ext/wasm/testing-worker1-promiser.js b/ext/wasm/testing-worker1-promiser.js
new file mode 100644
index 0000000000..9475df411a
--- /dev/null
+++ b/ext/wasm/testing-worker1-promiser.js
@@ -0,0 +1,214 @@
+/*
+  2022-08-23
+
+  The author disclaims copyright to this source code.  In place of a
+  legal notice, here is a blessing:
+
+  *   May you do good and not evil.
+  *   May you find forgiveness for yourself and forgive others.
+  *   May you share freely, never taking more than you give.
+
+  ***********************************************************************
+  
+  Demonstration of the sqlite3 Worker API #1 Promiser: a Promise-based
+  proxy for for the sqlite3 Worker #1 API.
+*/
+'use strict';
+(function(){
+  const T = self.SqliteTestUtil;
+  const eOutput = document.querySelector('#test-output');
+  const warn = console.warn.bind(console);
+  const error = console.error.bind(console);
+  const log = console.log.bind(console);
+  const logHtml = async function(cssClass,...args){
+    log.apply(this, args);
+    const ln = document.createElement('div');
+    if(cssClass) ln.classList.add(cssClass);
+    ln.append(document.createTextNode(args.join(' ')));
+    eOutput.append(ln);
+  };
+
+  let startTime;
+  const logEventResult = async function(evd){
+    logHtml(evd.errorClass ? 'error' : '',
+            "response to",evd.messageId,"Worker time =",
+            (evd.workerRespondTime - evd.workerReceivedTime),"ms.",
+            "Round-trip event time =",
+            (performance.now() - evd.departureTime),"ms.",
+            (evd.errorClass ? evd.message : "")
+           );
+  };
+
+  const testCount = async ()=>{
+    logHtml("","Total test count:",T.counter+". Total time =",(performance.now() - startTime),"ms");
+  };
+
+  //why is this triggered even when we catch() a Promise?
+  //window.addEventListener('unhandledrejection', function(event) {
+  //  warn('unhandledrejection',event);
+  //});
+
+  const promiserConfig = {
+    worker: ()=>{
+      const w = new Worker("sqlite3-worker1.js");
+      w.onerror = (event)=>error("worker.onerror",event);
+      return w;
+    },
+    //debug: (...args)=>console.debug('worker debug',...args),
+    onunhandled: function(ev){
+      error("Unhandled worker message:",ev.data);
+    },
+    onready: function(){
+      self.sqlite3TestModule.setStatus(null)/*hide the HTML-side is-loading spinner*/;
+      runTests();
+    },
+    onerror: function(ev){
+      error("worker1 error:",ev);
+    }
+  };
+  const workerPromise = self.sqlite3Worker1Promiser(promiserConfig);
+  delete self.sqlite3Worker1Promiser;
+
+  const wtest = async function(msgType, msgArgs, callback){
+    let p = workerPromise({type: msgType, args:msgArgs});
+    if(callback) p.then(callback).finally(testCount);
+    return p;
+  };
+
+  const runTests = async function(){
+    logHtml('',
+            "Sending 'open' message and waiting for its response before continuing.");
+    startTime = performance.now();
+    wtest('open', {
+      filename:'testing2.sqlite3',
+      simulateError: 0 /* if true, fail the 'open' */
+    }, function(ev){
+      log("then open result",ev);
+      T.assert('testing2.sqlite3'===ev.result.filename)
+        .assert(ev.dbId)
+        .assert(ev.messageId)
+        .assert(promiserConfig.dbId === ev.dbId);
+    }).then(runTests2)
+      .catch((err)=>error("error response:",err));
+  };
+
+  const runTests2 = async function(){
+    const mustNotReach = ()=>toss("This is not supposed to be reached.");
+
+    await wtest('exec',{
+      sql: ["create table t(a,b)",
+            "insert into t(a,b) values(1,2),(3,4),(5,6)"
+           ].join(';'),
+      multi: true,
+      resultRows: [], columnNames: []
+    }, function(ev){
+      ev = ev.result;
+      T.assert(0===ev.resultRows.length)
+        .assert(0===ev.columnNames.length);
+    });
+
+    await wtest('exec',{
+      sql: 'select a a, b b from t order by a',
+      resultRows: [], columnNames: [],
+    }, function(ev){
+      ev = ev.result;
+      T.assert(3===ev.resultRows.length)
+        .assert(1===ev.resultRows[0][0])
+        .assert(6===ev.resultRows[2][1])
+        .assert(2===ev.columnNames.length)
+        .assert('b'===ev.columnNames[1]);
+    });
+
+    await wtest('exec',{
+      sql: 'select a a, b b from t order by a',
+      resultRows: [], columnNames: [],
+      rowMode: 'object'
+    }, function(ev){
+      ev = ev.result;
+      T.assert(3===ev.resultRows.length)
+        .assert(1===ev.resultRows[0].a)
+        .assert(6===ev.resultRows[2].b)
+    });
+
+    await wtest(
+      'exec',
+      {sql:'intentional_error'},
+      mustNotReach
+    ).catch((e)=>{
+      warn("Intentional error:",e);
+      // Why does the browser report console.error "Uncaught (in
+      // promise)" when we catch(), and does so _twice_ if we don't
+      // catch()? According to all docs, that error must be supressed
+      // if we explicitly catch().
+    });
+
+    await wtest('exec',{
+      sql:'select 1 union all select 3',
+      resultRows: [],
+      //rowMode: 'array', // array is the default in the Worker interface
+    }, function(ev){
+      ev = ev.result;
+      T.assert(2 === ev.resultRows.length)
+        .assert(1 === ev.resultRows[0][0])
+        .assert(3 === ev.resultRows[1][0]);
+    });
+
+    const resultRowTest1 = function f(row){
+      if(undefined === f.counter) f.counter = 0;
+      if(row) ++f.counter;
+      //log("exec() result row:",row);
+      T.assert(null===row || 'number' === typeof row.b);
+    };
+    await wtest('exec',{
+      sql: 'select a a, b b from t order by a',
+      callback: resultRowTest1,
+      rowMode: 'object'
+    }, function(ev){
+      T.assert(3===resultRowTest1.counter);
+      resultRowTest1.counter = 0;
+    });
+
+    await wtest('exec',{
+      multi: true,
+      sql:[
+        'pragma foreign_keys=0;',
+        // ^^^ arbitrary query with no result columns
+        'select a, b from t order by a desc; select a from t;'
+        // multi-exec only honors results from the first
+        // statement with result columns (regardless of whether)
+        // it has any rows).
+      ],
+      rowMode: 1,
+      resultRows: []
+    },function(ev){
+      const rows = ev.result.resultRows;
+      T.assert(3===rows.length).
+        assert(6===rows[0]);
+    });
+
+    await wtest('exec',{sql: 'delete from t where a>3'});
+
+    await wtest('exec',{
+      sql: 'select count(a) from t',
+      resultRows: []
+    },function(ev){
+      ev = ev.result;
+      T.assert(1===ev.resultRows.length)
+        .assert(2===ev.resultRows[0][0]);
+    });
+
+    /***** close() tests must come last. *****/
+    await wtest('close',{unlink:true},function(ev){
+      T.assert(!promiserConfig.dbId);
+      T.assert('string' === typeof ev.result.filename);
+    });
+
+    await wtest('close').then((ev)=>{
+      T.assert(undefined === ev.result.filename);
+      log("That's all, folks!");
+    });
+  }/*runTests2()*/;
+
+  
+  log("Init complete, but async init bits may still be running.");
+})();
diff --git a/manifest b/manifest
index d26d33dea6..05095d6b81 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\svery\sbasics\sof\sa\sPromise-based\sproxy\sfor\sthe\sWorker\s#1\sAPI.\sStill\srequires\sconsiderable\scleanup,\stesting,\sand\sa\ssolution\sfor\sthe\sexec-callback-via-event-type-name\sproblem.
-D 2022-08-24T00:51:39.887
+C More\swork\son\show\sto\sconfigure\sthe\ssqlite3\sJS\sAPI\sbootstrapping\sprocess\sfrom\shigher-level\scode.\sInitial\sversion\sof\ssqlite3-worker1-promiser,\sa\sPromise-based\sproxy\sfor\sthe\sWorker\sAPI\s#1.
+D 2022-08-24T05:59:23.851
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -481,12 +481,12 @@ F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de
 F ext/wasm/api/README.md d876597edd2b9542b6ea031adaaff1c042076fde7b670b1dc6d8a87b28a6631b
 F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba81456260a713ed04900c
 F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a4a06cb776c003880b
-F ext/wasm/api/sqlite3-api-cleanup.js acf798ce96285c0d52738466a96c9deb9d66647f711a40caecab90b5ce66ac3c
+F ext/wasm/api/sqlite3-api-cleanup.js 4c353bdc2452623f0c1c1e55ae1a0589db9cbaed9756760bb15179ef9b58bc98
 F ext/wasm/api/sqlite3-api-glue.js 67ca83974410961953eeaa1dfed3518530d68381729ed1d27f95122f5baeabd3
 F ext/wasm/api/sqlite3-api-oo1.js f6dcaac3270182471f97efcfda25bd4a4ac1777b8ec52ebd1c6846721160e54c
 F ext/wasm/api/sqlite3-api-opfs.js 011799db398157cbd254264b6ebae00d7234b93d0e9e810345f213a5774993c0
-F ext/wasm/api/sqlite3-api-prologue.js 6e0e7787ed955ea2b6158e0bb7608f63b54236847700d183e49e1f10d0525b8f
-F ext/wasm/api/sqlite3-api-worker1.js c9e4edb89f41a4fa65d136ae180c1bc0beb694eb95f7d9e6936fbb702914c160
+F ext/wasm/api/sqlite3-api-prologue.js 4a279604272851696975837534739597206c0800c8ea78810fe8e211ee101374
+F ext/wasm/api/sqlite3-api-worker1.js 9691e144a77490f482caa2c0f0bd38a8f955c6dc9c10b2f39c6491e817aefd8c
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 0d81282eaeff2a6e9fc5c28a388c5c5b45cf25a9393992fa511ac009b27df982
 F ext/wasm/common/SqliteTestUtil.js eb96275bed43fdb364b7d65bcded0ca5e22aaacff120d593d1385f852f486247
@@ -508,9 +508,10 @@ F ext/wasm/scratchpad-opfs-main.js 69e960e9161f6412fd0c30f355d4112f1894d6609eb43
 F ext/wasm/scratchpad-opfs-worker.html 66c1d15d678f3bd306373d76b61c6c8aef988f61f4a8dd40185d452f9c6d2bf5
 F ext/wasm/scratchpad-opfs-worker.js 3ec2868c669713145c76eb5877c64a1b20741f741817b87c907a154b676283a9
 F ext/wasm/scratchpad-opfs-worker2.js 5f2237427ac537b8580b1c659ff14ad2621d1694043eaaf41ae18dbfef2e48c0
+F ext/wasm/sqlite3-worker1-promiser.js 291f89330bc856e7ef8a321b4891554633c6407b52efc69c9b1d1b3e7c69d4a6
 F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
-F ext/wasm/testing-worker-promise.html ba3d5423cfbdc96c332af3632dfcb61527ba8fd7e487b3bf3f07542f890c3e08
-F ext/wasm/testing-worker-promise.js c05c46a3a22b1910f6a1db11f3da6df701259eaa1277ddba085247b7f9059423
+F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893 w ext/wasm/testing-worker-promise.html
+F ext/wasm/testing-worker1-promiser.js 3c13fda53cc8b5d148ae34f621eba99aff393d66718b216bfd9d3f9075dd83bc w ext/wasm/testing-worker-promise.js
 F ext/wasm/testing1.html 528001c7e32ee567abc195aa071fd9820cc3c8ffc9c8a39a75e680db05f0c409
 F ext/wasm/testing1.js 2def7a86c52ff28b145cb86188d5c7a49d5993f9b78c50d140e1c31551220955
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
@@ -2008,8 +2009,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 03b9db9b98cb36faa7de5a8a64d2e13c4aeaadfefb33ac92bb41056f6be3f121
-R 5b16a785d8c414a8eb9d618c8d9d8cea
+P 1e447849fb65887e806e3348a8a68f70ea6802bc0a1e56c385a279f27cc0cdda
+R 20d6ad983c84af7c7f2e33fe283b134d
 U stephan
-Z fdaa5cf9f1bfd4215c6ebf07223819c1
+Z 996279c2387a16066b296229c9c99a7d
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 1b823c2233..26a4257f52 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1e447849fb65887e806e3348a8a68f70ea6802bc0a1e56c385a279f27cc0cdda
\ No newline at end of file
+b030f321bd5a38cdd5d6f6735f201afa62d30d2b0ba02e67f055b4895553a878
\ No newline at end of file

From 9c765e7945bfe79ac724e8eaf9103914f0557271 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 24 Aug 2022 14:50:10 +0000
Subject: [PATCH 026/428] js: resolve the mysterious "extra" unhandled
 exception notification, caused by inadvertently forking one promise into two
 separate ones (failing to properly reassign a then() result). Fix a typo in
 new Worker 1 code which caused the DB(filename) name to be incorrect.

FossilOrigin-Name: 7467ac88801224089b51c6ba7924f93283dd87beca602a186c83632df26cfc85
---
 ext/wasm/api/sqlite3-api-cleanup.js  |  2 +-
 ext/wasm/api/sqlite3-api-prologue.js |  2 +-
 ext/wasm/api/sqlite3-api-worker1.js  |  2 +-
 ext/wasm/sqlite3-worker1-promiser.js | 18 ++++++++++-------
 ext/wasm/testing-worker1-promiser.js | 30 ++++++++++------------------
 manifest                             | 22 ++++++++++----------
 manifest.uuid                        |  2 +-
 7 files changed, 37 insertions(+), 41 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-cleanup.js b/ext/wasm/api/sqlite3-api-cleanup.js
index ed6b8c40ea..01aba213ed 100644
--- a/ext/wasm/api/sqlite3-api-cleanup.js
+++ b/ext/wasm/api/sqlite3-api-cleanup.js
@@ -21,7 +21,7 @@ if('undefined' !== typeof Module){ // presumably an Emscripten build
      Install a suitable default configuration for sqlite3ApiBootstrap().
   */
   const SABC = self.sqlite3ApiBootstrap.defaultConfig;
-  SABC.Module = Module /* ==>  Current needs to be exposed here for test code. NOT part
+  SABC.Module = Module /* ==>  Currently needs to be exposed here for test code. NOT part
                           of the public API. */;
   SABC.exports = Module['asm'];
   SABC.memory = Module.wasmMemory /* gets set if built with -sIMPORT_MEMORY */;
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index d92b948fce..5217cfcde3 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -173,7 +173,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
       config[k] = config[k]();
     }
   });
-  
+
   /** Throws a new Error, the message of which is the concatenation
       all args with a space between each. */
   const toss = (...args)=>{throw new Error(args.join(' '))};
diff --git a/ext/wasm/api/sqlite3-api-worker1.js b/ext/wasm/api/sqlite3-api-worker1.js
index 39263a4abe..c63ab1117e 100644
--- a/ext/wasm/api/sqlite3-api-worker1.js
+++ b/ext/wasm/api/sqlite3-api-worker1.js
@@ -180,7 +180,7 @@ sqlite3.initWorker1API = function(){
         toss("Throwing because of simulateError flag.");
       }
       if(args.persistent && args.filename){
-        oargs.filaname = sqlite3.capi.sqlite3_web_persistent_dir() + args.filename;
+        oargs.filename = sqlite3.capi.sqlite3_web_persistent_dir() + args.filename;
       }else if('' === args.filename){
         oargs.filename = args.filename;
       }else{
diff --git a/ext/wasm/sqlite3-worker1-promiser.js b/ext/wasm/sqlite3-worker1-promiser.js
index c01ed9a5c6..d023f86366 100644
--- a/ext/wasm/sqlite3-worker1-promiser.js
+++ b/ext/wasm/sqlite3-worker1-promiser.js
@@ -18,7 +18,7 @@
   slightly simpler client-side interface than the slightly-lower-level
   Worker API does.
 
-  This script necessarily exposes on global symbol, but clients may
+  This script necessarily exposes one global symbol, but clients may
   freely `delete` that symbol after calling it.
 */
 'use strict';
@@ -81,8 +81,8 @@
    information about messages.
 
 
-   This function returns a stateful factory function with the following
-   interfaces:
+   This function returns a stateful factory function with the
+   following interfaces:
 
    - Promise function(messageType, messageArgs)
    - Promise function({message object})
@@ -183,7 +183,11 @@ self.sqlite3Worker1Promiser = function callee(config = callee.defaultConfig){
         default:
           break;
     }
-    msgHandler.resolve(ev);
+    try {
+      msgHandler.resolve(ev);
+    }catch(e){
+      msgHandler.reject(e);
+    }
   }/*worker.onmessage()*/;
   return function(/*(msgType, msgArgs) || (msg)*/){
     let msg;
@@ -214,19 +218,19 @@ self.sqlite3Worker1Promiser = function callee(config = callee.defaultConfig){
       }
     }
     //debug("requestWork", msg);
-    const p = new Promise(function(resolve, reject){
+    let p = new Promise(function(resolve, reject){
       proxy.resolve = resolve;
       proxy.reject = reject;
       handlerMap[msg.messageId] = proxy;
       debug("Posting",msg.type,"message to Worker dbId="+(config.dbId||'default')+':',msg);
       config.worker.postMessage(msg);
     });
-    if(cbId) p.finally(()=>delete handlerMap[cbId]);
+    if(cbId) p = p.finally(()=>delete handlerMap[cbId]);
     return p;
   };
 }/*sqlite3Worker1Promiser()*/;
 self.sqlite3Worker1Promiser.defaultConfig = {
   worker: ()=>new Worker('sqlite3-worker1.js'),
-  onerror: console.error.bind(console),
+  onerror: (...args)=>console.error('worker1 error',...args),
   dbId: undefined
 };
diff --git a/ext/wasm/testing-worker1-promiser.js b/ext/wasm/testing-worker1-promiser.js
index 9475df411a..cfae443d06 100644
--- a/ext/wasm/testing-worker1-promiser.js
+++ b/ext/wasm/testing-worker1-promiser.js
@@ -29,16 +29,6 @@
   };
 
   let startTime;
-  const logEventResult = async function(evd){
-    logHtml(evd.errorClass ? 'error' : '',
-            "response to",evd.messageId,"Worker time =",
-            (evd.workerRespondTime - evd.workerReceivedTime),"ms.",
-            "Round-trip event time =",
-            (performance.now() - evd.departureTime),"ms.",
-            (evd.errorClass ? evd.message : "")
-           );
-  };
-
   const testCount = async ()=>{
     logHtml("","Total test count:",T.counter+". Total time =",(performance.now() - startTime),"ms");
   };
@@ -70,26 +60,28 @@
   delete self.sqlite3Worker1Promiser;
 
   const wtest = async function(msgType, msgArgs, callback){
-    let p = workerPromise({type: msgType, args:msgArgs});
-    if(callback) p.then(callback).finally(testCount);
-    return p;
+    const p = workerPromise({type: msgType, args:msgArgs});
+    return callback ? p.then(callback).finally(testCount) : p;
   };
 
   const runTests = async function(){
+    const dbFilename = '/testing2.sqlite3';
     logHtml('',
             "Sending 'open' message and waiting for its response before continuing.");
     startTime = performance.now();
-    wtest('open', {
-      filename:'testing2.sqlite3',
-      simulateError: 0 /* if true, fail the 'open' */
+    await wtest('open', {
+      filename: dbFilename,
+      persistent: true,
+      simulateError: 0 /* if true, fail the 'open' */,
     }, function(ev){
       log("then open result",ev);
-      T.assert('testing2.sqlite3'===ev.result.filename)
+      T.assert(1 && (dbFilename===ev.result.filename
+               || (sqlite3TestModule.sqlite3ApiConfig.persistentDirName
+                   + dbFilename)==ev.result.filename))
         .assert(ev.dbId)
         .assert(ev.messageId)
         .assert(promiserConfig.dbId === ev.dbId);
-    }).then(runTests2)
-      .catch((err)=>error("error response:",err));
+    }).then(runTests2);
   };
 
   const runTests2 = async function(){
diff --git a/manifest b/manifest
index 05095d6b81..ca5ed7147e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C More\swork\son\show\sto\sconfigure\sthe\ssqlite3\sJS\sAPI\sbootstrapping\sprocess\sfrom\shigher-level\scode.\sInitial\sversion\sof\ssqlite3-worker1-promiser,\sa\sPromise-based\sproxy\sfor\sthe\sWorker\sAPI\s#1.
-D 2022-08-24T05:59:23.851
+C js:\sresolve\sthe\smysterious\s"extra"\sunhandled\sexception\snotification,\scaused\sby\sinadvertently\sforking\sone\spromise\sinto\stwo\sseparate\sones\s(failing\sto\sproperly\sreassign\sa\sthen()\sresult).\sFix\sa\stypo\sin\snew\sWorker\s1\scode\swhich\scaused\sthe\sDB(filename)\sname\sto\sbe\sincorrect.
+D 2022-08-24T14:50:10.920
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -481,12 +481,12 @@ F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de
 F ext/wasm/api/README.md d876597edd2b9542b6ea031adaaff1c042076fde7b670b1dc6d8a87b28a6631b
 F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba81456260a713ed04900c
 F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a4a06cb776c003880b
-F ext/wasm/api/sqlite3-api-cleanup.js 4c353bdc2452623f0c1c1e55ae1a0589db9cbaed9756760bb15179ef9b58bc98
+F ext/wasm/api/sqlite3-api-cleanup.js 1a12e64060c2cb0defd34656a76a9b1d7ed58459c290249bb31567c806fd44de
 F ext/wasm/api/sqlite3-api-glue.js 67ca83974410961953eeaa1dfed3518530d68381729ed1d27f95122f5baeabd3
 F ext/wasm/api/sqlite3-api-oo1.js f6dcaac3270182471f97efcfda25bd4a4ac1777b8ec52ebd1c6846721160e54c
 F ext/wasm/api/sqlite3-api-opfs.js 011799db398157cbd254264b6ebae00d7234b93d0e9e810345f213a5774993c0
-F ext/wasm/api/sqlite3-api-prologue.js 4a279604272851696975837534739597206c0800c8ea78810fe8e211ee101374
-F ext/wasm/api/sqlite3-api-worker1.js 9691e144a77490f482caa2c0f0bd38a8f955c6dc9c10b2f39c6491e817aefd8c
+F ext/wasm/api/sqlite3-api-prologue.js 2d5c5d3355f55eefe51922cec5bfedbec0f8300db98a17685ab7a34a03953c7a
+F ext/wasm/api/sqlite3-api-worker1.js b23f66ef5afd350a17fbadb795007098e518a40e5c7c439cd83ef34aa55a45af
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 0d81282eaeff2a6e9fc5c28a388c5c5b45cf25a9393992fa511ac009b27df982
 F ext/wasm/common/SqliteTestUtil.js eb96275bed43fdb364b7d65bcded0ca5e22aaacff120d593d1385f852f486247
@@ -508,10 +508,10 @@ F ext/wasm/scratchpad-opfs-main.js 69e960e9161f6412fd0c30f355d4112f1894d6609eb43
 F ext/wasm/scratchpad-opfs-worker.html 66c1d15d678f3bd306373d76b61c6c8aef988f61f4a8dd40185d452f9c6d2bf5
 F ext/wasm/scratchpad-opfs-worker.js 3ec2868c669713145c76eb5877c64a1b20741f741817b87c907a154b676283a9
 F ext/wasm/scratchpad-opfs-worker2.js 5f2237427ac537b8580b1c659ff14ad2621d1694043eaaf41ae18dbfef2e48c0
-F ext/wasm/sqlite3-worker1-promiser.js 291f89330bc856e7ef8a321b4891554633c6407b52efc69c9b1d1b3e7c69d4a6
+F ext/wasm/sqlite3-worker1-promiser.js 9638b0ced7f02806c3220b616f08729dde9eb13fb56e125cd4759f40bfa81210
 F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
-F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893 w ext/wasm/testing-worker-promise.html
-F ext/wasm/testing-worker1-promiser.js 3c13fda53cc8b5d148ae34f621eba99aff393d66718b216bfd9d3f9075dd83bc w ext/wasm/testing-worker-promise.js
+F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
+F ext/wasm/testing-worker1-promiser.js 931d909c769c57292f1cafdf10c7dab402d17cd16a6d0ec32089f67b559b058f
 F ext/wasm/testing1.html 528001c7e32ee567abc195aa071fd9820cc3c8ffc9c8a39a75e680db05f0c409
 F ext/wasm/testing1.js 2def7a86c52ff28b145cb86188d5c7a49d5993f9b78c50d140e1c31551220955
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
@@ -2009,8 +2009,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 1e447849fb65887e806e3348a8a68f70ea6802bc0a1e56c385a279f27cc0cdda
-R 20d6ad983c84af7c7f2e33fe283b134d
+P b030f321bd5a38cdd5d6f6735f201afa62d30d2b0ba02e67f055b4895553a878
+R a11ec2b23afafa9cff8838dfde907f0c
 U stephan
-Z 996279c2387a16066b296229c9c99a7d
+Z 64f88270da37ddd3ce54e6e07b8ab1af
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 26a4257f52..521621a6a1 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b030f321bd5a38cdd5d6f6735f201afa62d30d2b0ba02e67f055b4895553a878
\ No newline at end of file
+7467ac88801224089b51c6ba7924f93283dd87beca602a186c83632df26cfc85
\ No newline at end of file

From 3734401a95dc92f7cb7c3a86875370f1598213aa Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 24 Aug 2022 18:39:46 +0000
Subject: [PATCH 027/428] Expand the worker1 'exec' op handling for per-row
 callbacks for API-level consistency and smooth some edges between worker1
 core and worker1-promiser. Add worker1 'config-get' message to fetch the
 serializable parts of the sqlite3.config state. Improve the 'open' op's
 handling of the 'persistent' option (noting that we cannot yet test that case
 from a worker).

FossilOrigin-Name: 509f8839201ec1ea4863bd31493e6c29a0721ca6340755bb96656b828758fea7
---
 ext/wasm/api/sqlite3-api-oo1.js      |  15 ++
 ext/wasm/api/sqlite3-api-worker1.js  | 244 +++++++++++++++++----------
 ext/wasm/sqlite3-worker1-promiser.js |  63 ++++---
 ext/wasm/testing-worker1-promiser.js |  50 ++++--
 ext/wasm/testing2.js                 |  12 +-
 manifest                             |  20 +--
 manifest.uuid                        |   2 +-
 7 files changed, 264 insertions(+), 142 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index be9d8af5a8..e16b45bb5e 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -252,6 +252,21 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
               out.cbArg = (stmt)=>stmt.get(out.opt.rowMode);
               break;
             }
+            /*
+              TODO?: how can we define rowMode such that it uses
+              rowMode of 'object' and returns a given named field from
+              the object. Something like:
+
+              if(?what goes here?){
+                out.cbArg = function f(stmt){return stmt.get(this.obj)[this.colName]}
+                  .bind({obj:{}, colName: ???what goes here???}});
+                break;
+              }
+
+              Maybe rowMode:['colName1',... 'colNameN']? That could be
+              ambiguous: might mean "return an object with just these
+              columns".
+            */
             toss3("Invalid rowMode:",out.opt.rowMode);
       }
     }
diff --git a/ext/wasm/api/sqlite3-api-worker1.js b/ext/wasm/api/sqlite3-api-worker1.js
index c63ab1117e..afb2e78124 100644
--- a/ext/wasm/api/sqlite3-api-worker1.js
+++ b/ext/wasm/api/sqlite3-api-worker1.js
@@ -42,25 +42,21 @@
   initialization is complete, as the initialization is synchronous.
   In some contexts, however, listening for the above message is
   a better fit.
+
+  Note that the worker-based interface can be slightly quirky because
+  of its async nature. In particular, any number of messages may be posted
+  to the worker before it starts handling any of them. If, e.g., an
+  "open" operation fails, any subsequent messages will fail. The
+  Promise-based wrapper for this API (`sqlite3-worker1-promiser.js`)
+  is more comfortable to use in that regard.
+
+
+  TODO: hoist the message API docs from deep in this code to here.
+
 */
 self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
 sqlite3.initWorker1API = function(){
   'use strict';
-  /**
-     UNDER CONSTRUCTION
-
-     We need an API which can proxy the DB API via a Worker message
-     interface. The primary quirky factor in such an API is that we
-     cannot pass callback functions between the window thread and a
-     worker thread, so we have to receive all db results via
-     asynchronous message-passing. That requires an asychronous API
-     with a distinctly different shape than OO API #1.
-
-     TODOs include, but are not necessarily limited to:
-
-     - Support for handling multiple DBs via this interface is under
-     development.
-  */
   const toss = (...args)=>{throw new Error(args.join(' '))};
   if('function' !== typeof importScripts){
     toss("Cannot initalize the sqlite3 worker API in the main thread.");
@@ -86,12 +82,13 @@ sqlite3.initWorker1API = function(){
   };
 
   /**
-     Helper for managing Worker-level state.
+     Internal helper for managing Worker-level state.
   */
   const wState = {
     defaultDb: undefined,
     idSeq: 0,
     idMap: new WeakMap,
+    xfer: [/*Temp holder for "transferable" postMessage() state.*/],
     open: function(opt){
       const db = new DB(opt.filename);
       this.dbs[getDbId(db)] = db;
@@ -109,9 +106,15 @@ sqlite3.initWorker1API = function(){
         }
       }
     },
+    /**
+       Posts the given worker message value. If xferList is provided,
+       it must be an array, in which case a copy of it passed as
+       postMessage()'s second argument and xferList.length is set to
+       0.
+    */
     post: function(msg,xferList){
-      if(xferList){
-        self.postMessage( msg, xferList );
+      if(xferList && xferList.length){
+        self.postMessage( msg, Array.from(xferList) );
         xferList.length = 0;
       }else{
         self.postMessage(msg);
@@ -146,32 +149,40 @@ sqlite3.initWorker1API = function(){
      message type key. The onmessage() dispatcher attempts to
      dispatch all inbound messages to a method of this object,
      passing it the event.data part of the inbound event object. All
-     methods must return a plain Object containing any response
+     methods must return a plain Object containing any result
      state, which the dispatcher may amend. All methods must throw
      on error.
   */
   const wMsgHandler = {
-    xfer: [/*Temp holder for "transferable" postMessage() state.*/],
     /**
        Proxy for the DB constructor. Expects to be passed a single
-       object or a falsy value to use defaults. The object may have a
-       filename property to name the db file (see the DB constructor
-       for peculiarities and transformations). The response is an
-       object:
+       object or a falsy value to use defaults:
 
        {
-         filename: db filename (possibly differing from the input),
+         filename [=":memory:" or "" (unspecified)]: the db filename.
+         See the sqlite3.oo1.DB constructor for peculiarities and transformations,
+
+         persistent [=false]: if true and filename is not one of ("",
+         ":memory:"), prepend
+         sqlite3.capi.sqlite3_web_persistent_dir() to the given
+         filename so that it is stored in persistent storage _if_ the
+         environment supports it.  If persistent storage is not
+         supported, the filename is used as-is.
+       }
+
+       The response object looks like:
+
+       {
+         filename: db filename, possibly differing from the input.
 
          dbId: an opaque ID value which must be passed in the message
-               envelope to other calls in this API to tell them which
-               db to use. If it is not provided to future calls, they
-               will default to operating on the first-opened db.
+         envelope to other calls in this API to tell them which db to
+         use. If it is not provided to future calls, they will default
+         to operating on the first-opened db.
 
-          persistent: prepend sqlite3.capi.sqlite3_web_persistent_dir()
-                      to the given filename so that it is stored
-                      in persistent storage _if_ the environment supports it.
-                      If persistent storage is not supported, the filename
-                      is used as-is.
+         persistent: true if the given filename resides in the
+         known-persistent storage, else false. This determination is
+         independent of the `persistent` input argument.
        }
     */
     open: function(ev){
@@ -179,28 +190,32 @@ sqlite3.initWorker1API = function(){
       if(args.simulateError){ // undocumented internal testing option
         toss("Throwing because of simulateError flag.");
       }
-      if(args.persistent && args.filename){
-        oargs.filename = sqlite3.capi.sqlite3_web_persistent_dir() + args.filename;
-      }else if('' === args.filename){
-        oargs.filename = args.filename;
+      const rc = Object.create(null);
+      const pDir = sqlite3.capi.sqlite3_web_persistent_dir();
+      if(!args.filename || ':memory:'===args.filename){
+        oargs.filename = args.filename || '';
+      }else if(pDir){
+        oargs.filename = pDir + ('/'===args.filename[0] ? args.filename : ('/'+args.filename));
       }else{
-        oargs.filename = args.filename || ':memory:';
-      }      
+        oargs.filename = args.filename;
+      }
       const db = wState.open(oargs);
-      return {
-        filename: db.filename,
-        dbId: getDbId(db)
-      };
+      rc.filename = db.filename;
+      rc.persistent = !!pDir && db.filename.startsWith(pDir);
+      rc.dbId = getDbId(db);
+      return rc;
     },
     /**
        Proxy for DB.close(). ev.args may be elided or an object with
        an `unlink` property. If that value is truthy then the db file
        (if the db is currently open) will be unlinked from the virtual
-       filesystem, else it will be kept intact. The result object is:
+       filesystem, else it will be kept intact, noting that unlink
+       failure is ignored. The result object is:
 
        {
          filename: db filename _if_ the db is opened when this
-                   is called, else the undefined value
+         is called, else the undefined value
+
          dbId: the ID of the closed b, or undefined if none is closed
        }
 
@@ -211,7 +226,7 @@ sqlite3.initWorker1API = function(){
       const db = getMsgDb(ev,false);
       const response = {
         filename: db && db.filename,
-        dbId: db ? getDbId(db) : undefined
+        dbId: db && getDbId(db)
       };
       if(db){
         wState.close(db, ((ev.args && 'object'===typeof ev.args)
@@ -220,7 +235,7 @@ sqlite3.initWorker1API = function(){
       return response;
     },
     /**
-       Proxy for DB.exec() which expects a single argument of type
+       Proxy for oo1.DB.exec() which expects a single argument of type
        string (SQL to execute) or an options object in the form
        expected by exec(). The notable differences from exec()
        include:
@@ -234,12 +249,21 @@ sqlite3.initWorker1API = function(){
        message type key, in which case a callback function will be
        applied which posts each row result via:
 
-       postMessage({type: thatKeyType, row: theRow})
+       postMessage({type: thatKeyType, rowNumber: 1-based-#, row: theRow})
 
-       And, at the end of the result set (whether or not any
-       result rows were produced), it will post an identical
-       message with row:null to alert the caller than the result
-       set is completed.
+       And, at the end of the result set (whether or not any result
+       rows were produced), it will post an identical message with
+       (row=undefined, rowNumber=null) to alert the caller than the
+       result set is completed. Note that a row value of `null` is
+       a legal row result for certain `rowMode` values.
+
+       (Design note: we don't use (row=undefined, rowNumber=undefined)
+       to indicate end-of-results because fetching those would be
+       indistinguishable from fetching from an empty object unless the
+       client used hasOwnProperty() (or similar) to distinguish
+       "missing property" from "property with the undefined value".
+       Similarly, `null` is a legal value for `row` in some case ,
+       whereas the db layer won't emit a result value of `undefined`.)
 
        The callback proxy must not recurse into this interface, or
        results are undefined. (It hypothetically cannot recurse
@@ -250,52 +274,73 @@ sqlite3.initWorker1API = function(){
        The response is the input options object (or a synthesized
        one if passed only a string), noting that
        options.resultRows and options.columnNames may be populated
-       by the call to exec().
-
-       This opens/creates the Worker's db if needed.
+       by the call to db.exec().
     */
     exec: function(ev){
-      const opt = (
+      const rc = (
         'string'===typeof ev.args
       ) ? {sql: ev.args} : (ev.args || Object.create(null));
-      if(undefined===opt.rowMode){
+      if(undefined===rc.rowMode){
         /* Since the default rowMode of 'stmt' is not useful
            for the Worker interface, we'll default to
            something else. */
-        opt.rowMode = 'array';
-      }else if('stmt'===opt.rowMode){
-        toss("Invalid rowMode for exec(): stmt mode",
+        rc.rowMode = 'array';
+      }else if('stmt'===rc.rowMode){
+        toss("Invalid rowMode for 'exec': stmt mode",
              "does not work in the Worker API.");
       }
       const db = getMsgDb(ev);
-      if(opt.callback || Array.isArray(opt.resultRows)){
+      if(rc.callback || Array.isArray(rc.resultRows)){
         // Part of a copy-avoidance optimization for blobs
-        db._blobXfer = this.xfer;
+        db._blobXfer = wState.xfer;
       }
-      const callbackMsgType = opt.callback;
+      const callbackMsgType = rc.callback;
+      let rowNumber = 0;
       if('string' === typeof callbackMsgType){
         /* Treat this as a worker message type and post each
            row as a message of that type. */
-        const that = this;
-        opt.callback =
-          (row)=>wState.post({type: callbackMsgType, row:row}, this.xfer);
+        rc.callback =
+          (row)=>wState.post({type: callbackMsgType, rowNumber:++rowNumber, row:row}, wState.xfer);
       }
       try {
-        db.exec(opt);
-        if(opt.callback instanceof Function){
-          opt.callback = callbackMsgType;
-          wState.post({type: callbackMsgType, row: null});
+        db.exec(rc);
+        if(rc.callback instanceof Function){
+          rc.callback = callbackMsgType;
+          wState.post({type: callbackMsgType, rowNumber: null, row: undefined});
         }
-      }/*catch(e){
-         console.warn("Worker is propagating:",e);throw e;
-         }*/finally{
-           delete db._blobXfer;
-           if(opt.callback){
-             opt.callback = callbackMsgType;
-           }
-         }
-      return opt;
+      }finally{
+        delete db._blobXfer;
+        if(rc.callback){
+          rc.callback = callbackMsgType;
+        }
+      }
+      return rc;
     }/*exec()*/,
+    /**
+       Returns a JSON-friendly form of a _subset_ of sqlite3.config,
+       sans any parts which cannot be serialized. Because we cannot,
+       from here, distingush whether or not certain objects can be
+       serialized, this routine selectively copies certain properties
+       rather than trying JSON.stringify() and seeing what happens
+       (the results are horrid if the config object contains an
+       Emscripten module object).
+
+       In addition to the "real" config properties, it sythesizes
+       the following:
+
+       - persistenceEnabled: true if persistent dir support is available,
+       else false.
+    */
+    'config-get': function(){
+      const rc = Object.create(null), src = sqlite3.config;
+      [
+        'persistentDirName', 'bigIntEnabled'
+      ].forEach(function(k){
+        if(Object.getOwnPropertyDescriptor(src, k)) rc[k] = src[k];
+      });
+      rc.persistenceEnabled = !!sqlite3.capi.sqlite3_web_persistent_dir();
+      return rc;
+    },
     /**
        TO(RE)DO, once we can abstract away access to the
        JS environment's virtual filesystem. Currently this
@@ -329,7 +374,7 @@ sqlite3.initWorker1API = function(){
         filename: db.filename,
         mimetype: 'application/x-sqlite3'
       };
-      this.xfer.push(response.buffer.buffer);
+      wState.xfer.push(response.buffer.buffer);
       return response;**/
     }/*export()*/,
     toss: function(ev){
@@ -344,22 +389,32 @@ sqlite3.initWorker1API = function(){
      form:
 
      { type: apiCommand,
-       dbId: optional DB ID value (else uses a default db handle),
        args: apiArguments,
+       dbId: optional DB ID value (else uses a default db handle),
        messageId: optional client-specific value
      }
 
      As a rule, these commands respond with a postMessage() of their
-     own in the form:
-
-     TODO: refactoring is underway.
-
-     The responses always have an object-format `result` part. If the
-     inbound object has a `messageId` property, that property is
+     own. The responses always have a `type` property equal to the
+     input message's type and an object-format `result` part. If
+     the inbound object has a `messageId` property, that property is
      always mirrored in the result object, for use in client-side
-     dispatching of these asynchronous results. Exceptions thrown
-     during processing result in an `error`-type event with a payload
-     in the form:
+     dispatching of these asynchronous results. For example:
+
+     {
+       type: 'open',
+       messageId: ...copied from inbound message...,
+       dbId: ID of db which was opened,
+       result: {
+         dbId: repeat of ^^^, for API consistency's sake,
+         filename: ...,
+         persistent: false
+       },
+       ...possibly other framework-internal/testing/debugging info...
+     }
+
+     Exceptions thrown during processing result in an `error`-type
+     event with a payload in the form:
 
      { type: 'error',
        dbId: DB handle ID,
@@ -413,10 +468,15 @@ sqlite3.initWorker1API = function(){
       workerReceivedTime: arrivalTime,
       workerRespondTime: performance.now(),
       departureTime: ev.departureTime,
+      // TODO: move the timing bits into...
+      //timing:{
+      //  departure: ev.departureTime,
+      //  workerReceived: arrivalTime,
+      //  workerResponse: performance.now();
+      //},
       result: result
-    }, wMsgHandler.xfer);
+    }, wState.xfer);
   };
   self.postMessage({type:'sqlite3-api',result:'worker1-ready'});
 }.bind({self, sqlite3});
 });
-
diff --git a/ext/wasm/sqlite3-worker1-promiser.js b/ext/wasm/sqlite3-worker1-promiser.js
index d023f86366..7327e14c70 100644
--- a/ext/wasm/sqlite3-worker1-promiser.js
+++ b/ext/wasm/sqlite3-worker1-promiser.js
@@ -27,7 +27,7 @@
    manipulated via a Promise-based interface and returns a factory
    function which returns Promises for communicating with the worker.
    This proxy has an _almost_ identical interface to the normal
-   worker API, with any exceptions noted below.
+   worker API, with any exceptions documented below.
 
    It requires a configuration object with the following properties:
 
@@ -127,26 +127,34 @@
    - exec's {callback: STRING} option does not work via this
    interface (it triggers an exception), but {callback: function}
    does and works exactly like the STRING form does in the Worker:
-   the callback is called one time for each row of the result set
-   and once more, at the end, passed only `null`, to indicate that
+   the callback is called one time for each row of the result set,
+   passed the same worker message format as the worker API emits:
+
+     {type:typeString, row:VALUE, rowNumber:1-based-#}
+
+   Where `typeString` is an internally-synthesized message type string
+   used temporarily for worker message dispatching. It can be ignored
+   by all client code except that which tests this API. The `row`
+   property contains the row result in the form implied by the
+   `rowMode` option (defaulting to `'array'`). The `rowNumber` is a
+   1-based integer value incremented by 1 on each call into th 
+   callback.
+
+   At the end of the result set, the same event is fired with
+   (row=undefined, rowNumber=null) to indicate that
    the end of the result set has been reached. Note that the rows
    arrive via worker-posted messages, with all the implications
    of that.
-
-
-   TODO?: a config option which causes it to queue up events to fire
-   one at a time and flush the event queue on the first error. The
-   main use for this is test runs which must fail at the first error.
 */
 self.sqlite3Worker1Promiser = function callee(config = callee.defaultConfig){
   // Inspired by: https://stackoverflow.com/a/52439530
-  let idNumber = 0;
   const handlerMap = Object.create(null);
   const noop = function(){};
   const err = config.onerror || noop;
   const debug = config.debug || noop;
+  const idTypeMap = config.generateMessageId ? undefined : Object.create(null);
   const genMsgId = config.generateMessageId || function(msg){
-    return msg.type+'#'+(++idNumber);
+    return msg.type+'#'+(idTypeMap[msg.type] = (idTypeMap[msg.type]||0) + 1);
   };
   const toss = (...args)=>{throw new Error(args.join(' '))};
   if('function'===typeof config.worker) config.worker = config.worker();
@@ -162,7 +170,7 @@ self.sqlite3Worker1Promiser = function callee(config = callee.defaultConfig){
       }
       msgHandler = handlerMap[ev.type] /* check for exec per-row callback */;
       if(msgHandler && msgHandler.onrow){
-        msgHandler.onrow(ev.row);
+        msgHandler.onrow(ev);
         return;
       }        
       if(config.onunhandled) config.onunhandled(arguments[0]);
@@ -183,13 +191,10 @@ self.sqlite3Worker1Promiser = function callee(config = callee.defaultConfig){
         default:
           break;
     }
-    try {
-      msgHandler.resolve(ev);
-    }catch(e){
-      msgHandler.reject(e);
-    }
+    try {msgHandler.resolve(ev)}
+    catch(e){msgHandler.reject(e)}
   }/*worker.onmessage()*/;
-  return function(/*(msgType, msgArgs) || (msg)*/){
+  return function(/*(msgType, msgArgs) || (msgEnvelope)*/){
     let msg;
     if(1===arguments.length){
       msg = arguments[0];
@@ -206,15 +211,29 @@ self.sqlite3Worker1Promiser = function callee(config = callee.defaultConfig){
     msg.departureTime = performance.now();
     const proxy = Object.create(null);
     proxy.message = msg;
-    let cbId /* message handler ID for exec on-row callback proxy */;
+    let rowCallbackId /* message handler ID for exec on-row callback proxy */;
     if('exec'===msg.type && msg.args){
       if('function'===typeof msg.args.callback){
-        cbId = genMsgId(msg)+':row';
+        rowCallbackId = msg.messageId+':row';
         proxy.onrow = msg.args.callback;
-        msg.args.callback = cbId;
-        handlerMap[cbId] = proxy;
+        msg.args.callback = rowCallbackId;
+        handlerMap[rowCallbackId] = proxy;
       }else if('string' === typeof msg.args.callback){
         toss("exec callback may not be a string when using the Promise interface.");
+        /**
+           Design note: the reason for this limitation is that this
+           API takes over worker.onmessage() and the client has no way
+           of adding their own message-type handlers to it. Per-row
+           callbacks are implemented as short-lived message.type
+           mappings for worker.onmessage().
+
+           We "could" work around this by providing a new
+           config.fallbackMessageHandler (or some such) which contains
+           a map of event type names to callbacks. Seems like overkill
+           for now, seeing as the client can pass callback functions
+           to this interface (whereas the string-form "callback" is
+           needed for the over-the-Worker interface).
+        */
       }
     }
     //debug("requestWork", msg);
@@ -225,7 +244,7 @@ self.sqlite3Worker1Promiser = function callee(config = callee.defaultConfig){
       debug("Posting",msg.type,"message to Worker dbId="+(config.dbId||'default')+':',msg);
       config.worker.postMessage(msg);
     });
-    if(cbId) p = p.finally(()=>delete handlerMap[cbId]);
+    if(rowCallbackId) p = p.finally(()=>delete handlerMap[rowCallbackId]);
     return p;
   };
 }/*sqlite3Worker1Promiser()*/;
diff --git a/ext/wasm/testing-worker1-promiser.js b/ext/wasm/testing-worker1-promiser.js
index cfae443d06..a2f3a2523d 100644
--- a/ext/wasm/testing-worker1-promiser.js
+++ b/ext/wasm/testing-worker1-promiser.js
@@ -60,24 +60,41 @@
   delete self.sqlite3Worker1Promiser;
 
   const wtest = async function(msgType, msgArgs, callback){
+    if(2===arguments.length && 'function'===typeof msgArgs){
+      callback = msgArgs;
+      msgArgs = undefined;
+    }
     const p = workerPromise({type: msgType, args:msgArgs});
     return callback ? p.then(callback).finally(testCount) : p;
   };
 
   const runTests = async function(){
     const dbFilename = '/testing2.sqlite3';
-    logHtml('',
-            "Sending 'open' message and waiting for its response before continuing.");
     startTime = performance.now();
+
+    let sqConfig;
+    await wtest('config-get', (ev)=>{
+      const r = ev.result;
+      log('sqlite3.config subset:', r);
+      T.assert('boolean' === typeof r.bigIntEnabled)
+        .assert('string'===typeof r.persistentDirName)
+        .assert('boolean' === typeof r.persistenceEnabled);
+      sqConfig = r;
+    });
+    logHtml('',
+            "Sending 'open' message and waiting for its response before continuing...");
+    
     await wtest('open', {
       filename: dbFilename,
-      persistent: true,
+      persistent: sqConfig.persistenceEnabled,
       simulateError: 0 /* if true, fail the 'open' */,
     }, function(ev){
-      log("then open result",ev);
-      T.assert(1 && (dbFilename===ev.result.filename
-               || (sqlite3TestModule.sqlite3ApiConfig.persistentDirName
-                   + dbFilename)==ev.result.filename))
+      const r = ev.result;
+      log("then open result",r);
+      T.assert(r.persistent === sqConfig.persistenceEnabled)
+        .assert(r.persistent
+               ? (dbFilename!==r.filename)
+               : (dbFilename==r.filename))
         .assert(ev.dbId)
         .assert(ev.messageId)
         .assert(promiserConfig.dbId === ev.dbId);
@@ -145,11 +162,17 @@
         .assert(3 === ev.resultRows[1][0]);
     });
 
-    const resultRowTest1 = function f(row){
+    const resultRowTest1 = function f(ev){
       if(undefined === f.counter) f.counter = 0;
-      if(row) ++f.counter;
-      //log("exec() result row:",row);
-      T.assert(null===row || 'number' === typeof row.b);
+      if(null === ev.rowNumber){
+        /* End of result set. */
+        T.assert(undefined === ev.row);
+      }else{
+        T.assert(ev.rowNumber > 0);
+        ++f.counter;
+      }
+      log("exec() result row:",ev);
+      T.assert(null === ev.rowNumber || 'number' === typeof ev.row.b);
     };
     await wtest('exec',{
       sql: 'select a a, b b from t order by a',
@@ -195,10 +218,9 @@
       T.assert('string' === typeof ev.result.filename);
     });
 
-    await wtest('close').then((ev)=>{
+    await wtest('close', (ev)=>{
       T.assert(undefined === ev.result.filename);
-      log("That's all, folks!");
-    });
+    }).finally(()=>log("That's all, folks!"));
   }/*runTests2()*/;
 
   
diff --git a/ext/wasm/testing2.js b/ext/wasm/testing2.js
index b051cc04cc..d64fd6e89a 100644
--- a/ext/wasm/testing2.js
+++ b/ext/wasm/testing2.js
@@ -115,9 +115,15 @@
     },
     resultRowTest1: function f(ev){
       if(undefined === f.counter) f.counter = 0;
-      if(ev.row) ++f.counter;
-      //log("exec() result row:",ev.row);
-      T.assert(null===ev.row || 'number' === typeof ev.row.b);
+      if(null === ev.rowNumber){
+        /* End of result set. */
+        T.assert(undefined === ev.row);
+      }else{
+        T.assert(ev.rowNumber > 0);
+        ++f.counter;
+      }
+      //log("exec() result row:",ev);
+      T.assert(null === ev.rowNumber || 'number' === typeof ev.row.b);
     }
   };
 
diff --git a/manifest b/manifest
index ca5ed7147e..2b3fc24b37 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C js:\sresolve\sthe\smysterious\s"extra"\sunhandled\sexception\snotification,\scaused\sby\sinadvertently\sforking\sone\spromise\sinto\stwo\sseparate\sones\s(failing\sto\sproperly\sreassign\sa\sthen()\sresult).\sFix\sa\stypo\sin\snew\sWorker\s1\scode\swhich\scaused\sthe\sDB(filename)\sname\sto\sbe\sincorrect.
-D 2022-08-24T14:50:10.920
+C Expand\sthe\sworker1\s'exec'\sop\shandling\sfor\sper-row\scallbacks\sfor\sAPI-level\sconsistency\sand\ssmooth\ssome\sedges\sbetween\sworker1\score\sand\sworker1-promiser.\sAdd\sworker1\s'config-get'\smessage\sto\sfetch\sthe\sserializable\sparts\sof\sthe\ssqlite3.config\sstate.\sImprove\sthe\s'open'\sop's\shandling\sof\sthe\s'persistent'\soption\s(noting\sthat\swe\scannot\syet\stest\sthat\scase\sfrom\sa\sworker).
+D 2022-08-24T18:39:46.246
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -483,10 +483,10 @@ F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba814
 F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a4a06cb776c003880b
 F ext/wasm/api/sqlite3-api-cleanup.js 1a12e64060c2cb0defd34656a76a9b1d7ed58459c290249bb31567c806fd44de
 F ext/wasm/api/sqlite3-api-glue.js 67ca83974410961953eeaa1dfed3518530d68381729ed1d27f95122f5baeabd3
-F ext/wasm/api/sqlite3-api-oo1.js f6dcaac3270182471f97efcfda25bd4a4ac1777b8ec52ebd1c6846721160e54c
+F ext/wasm/api/sqlite3-api-oo1.js 5ce93b89165e1eb6ef26ba67ae9d3c25379df74eea82edb7b46255f86db21cfc
 F ext/wasm/api/sqlite3-api-opfs.js 011799db398157cbd254264b6ebae00d7234b93d0e9e810345f213a5774993c0
 F ext/wasm/api/sqlite3-api-prologue.js 2d5c5d3355f55eefe51922cec5bfedbec0f8300db98a17685ab7a34a03953c7a
-F ext/wasm/api/sqlite3-api-worker1.js b23f66ef5afd350a17fbadb795007098e518a40e5c7c439cd83ef34aa55a45af
+F ext/wasm/api/sqlite3-api-worker1.js f7372b84b6d71ebdc0d2a9e7944ce571b4f18e0dd4c1be78282c68b4582558ca
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 0d81282eaeff2a6e9fc5c28a388c5c5b45cf25a9393992fa511ac009b27df982
 F ext/wasm/common/SqliteTestUtil.js eb96275bed43fdb364b7d65bcded0ca5e22aaacff120d593d1385f852f486247
@@ -508,14 +508,14 @@ F ext/wasm/scratchpad-opfs-main.js 69e960e9161f6412fd0c30f355d4112f1894d6609eb43
 F ext/wasm/scratchpad-opfs-worker.html 66c1d15d678f3bd306373d76b61c6c8aef988f61f4a8dd40185d452f9c6d2bf5
 F ext/wasm/scratchpad-opfs-worker.js 3ec2868c669713145c76eb5877c64a1b20741f741817b87c907a154b676283a9
 F ext/wasm/scratchpad-opfs-worker2.js 5f2237427ac537b8580b1c659ff14ad2621d1694043eaaf41ae18dbfef2e48c0
-F ext/wasm/sqlite3-worker1-promiser.js 9638b0ced7f02806c3220b616f08729dde9eb13fb56e125cd4759f40bfa81210
+F ext/wasm/sqlite3-worker1-promiser.js 92b8da5f38439ffec459a8215775d30fa498bc0f1ab929ff341fc3dd479660b9
 F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
-F ext/wasm/testing-worker1-promiser.js 931d909c769c57292f1cafdf10c7dab402d17cd16a6d0ec32089f67b559b058f
+F ext/wasm/testing-worker1-promiser.js 81d81eda77c9d4a3e43cfeee91df6c3b039782cc998020d72fe1fdf91790242d
 F ext/wasm/testing1.html 528001c7e32ee567abc195aa071fd9820cc3c8ffc9c8a39a75e680db05f0c409
 F ext/wasm/testing1.js 2def7a86c52ff28b145cb86188d5c7a49d5993f9b78c50d140e1c31551220955
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
-F ext/wasm/testing2.js f01e8d7b32f6d4790f8352bf8dc17d2b860afa58f6c8ea1f824ef1c0d2068138
+F ext/wasm/testing2.js 04a4194188d54856027eb4cad7239223a8f7a60e64b0aac81fc1a5a70363b98e
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
@@ -2009,8 +2009,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 b030f321bd5a38cdd5d6f6735f201afa62d30d2b0ba02e67f055b4895553a878
-R a11ec2b23afafa9cff8838dfde907f0c
+P 7467ac88801224089b51c6ba7924f93283dd87beca602a186c83632df26cfc85
+R 4d53a1266e528a954f73a792c3648256
 U stephan
-Z 64f88270da37ddd3ce54e6e07b8ab1af
+Z cffa6daad399e2d401f0fd69f4f04b4f
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 521621a6a1..7400cbe177 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7467ac88801224089b51c6ba7924f93283dd87beca602a186c83632df26cfc85
\ No newline at end of file
+509f8839201ec1ea4863bd31493e6c29a0721ca6340755bb96656b828758fea7
\ No newline at end of file

From 407f75378e2bfebfd21ca56b6986154f0c35d1ac Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 24 Aug 2022 20:57:37 +0000
Subject: [PATCH 028/428] Change DB.exec() rowMode default from 'stmt' to
 'array', per /chat discussion. Add DB.exec() rowMode option for fetching a
 specific column by name. Add result column names to worker1 exec() callback
 interface, as there's otherwise no way to get that info from a worker.

FossilOrigin-Name: 1bb37e5c477b9eb098362f74a45a55be23d450fe45cdff58c1cbff08b5b3998f
---
 ext/wasm/api/sqlite3-api-oo1.js      | 83 ++++++++++++++++------------
 ext/wasm/api/sqlite3-api-worker1.js  | 46 +++++++++------
 ext/wasm/testing-worker1-promiser.js | 53 ++++++++++++++++--
 ext/wasm/testing2.js                 |  4 +-
 manifest                             | 18 +++---
 manifest.uuid                        |  2 +-
 6 files changed, 139 insertions(+), 67 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index e16b45bb5e..ea42e6bf8d 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -236,14 +236,14 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     }
     if(out.opt.callback || out.opt.resultRows){
       switch((undefined===out.opt.rowMode)
-             ? 'stmt' : out.opt.rowMode) {
+             ? 'array' : out.opt.rowMode) {
           case 'object': out.cbArg = (stmt)=>stmt.get({}); break;
           case 'array': out.cbArg = (stmt)=>stmt.get([]); break;
           case 'stmt':
             if(Array.isArray(out.opt.resultRows)){
-              toss3("Invalid rowMode for resultRows array: must",
+              toss3("Invalid rowMode for a resultRows array: must",
                     "be one of 'array', 'object',",
-                    "or a result column number.");
+                    "a result column number, or column name reference.");
             }
             out.cbArg = (stmt)=>stmt;
             break;
@@ -251,22 +251,16 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
             if(util.isInt32(out.opt.rowMode)){
               out.cbArg = (stmt)=>stmt.get(out.opt.rowMode);
               break;
-            }
-            /*
-              TODO?: how can we define rowMode such that it uses
-              rowMode of 'object' and returns a given named field from
-              the object. Something like:
-
-              if(?what goes here?){
-                out.cbArg = function f(stmt){return stmt.get(this.obj)[this.colName]}
-                  .bind({obj:{}, colName: ???what goes here???}});
+            }else if('string'===typeof out.opt.rowMode && out.opt.rowMode.length>1){
+              /* "$X", ":X", and "@X" fetch column named "X" (case-sensitive!) */
+              const prefix = out.opt.rowMode[0];
+              if(':'===prefix || '@'===prefix || '$'===prefix){
+                out.cbArg = function(stmt){
+                  return stmt.get(this.obj)[this.colName];
+                }.bind({obj:{}, colName: out.opt.rowMode.substr(1)})
                 break;
               }
-
-              Maybe rowMode:['colName1',... 'colNameN']? That could be
-              ambiguous: might mean "return an object with just these
-              columns".
-            */
+            }
             toss3("Invalid rowMode:",out.opt.rowMode);
       }
     }
@@ -449,7 +443,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
             if(rowTarget) rowTarget.push(row);
             if(opt.callback){
               stmt._isLocked = true;
-              opt.callback(row, stmt);
+              opt.callback(row,stmt);
               stmt._isLocked = false;
             }
           }
@@ -494,23 +488,40 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        if that statement has any result _rows_. The callback's "this"
        is the options object. The second argument passed to the
        callback is always the current Stmt object (so that the caller
-       may collect column names, or similar). The first argument
-       passed to the callback defaults to the current Stmt object but
-       may be changed with ...
+       may collect column names, or similar). The 2nd argument to the
+       callback is always the Stmt instance, as it's needed if the
+       caller wants to fetch the column names or some such. The first
+       argument passed to the callback defaults to the current Stmt
+       object but may be changed with ...
 
-       - .rowMode = either a string describing what type of argument
-       should be passed as the first argument to the callback or an
-       integer representing a result column index. A `rowMode` of
-       'object' causes the results of `stmt.get({})` to be passed to
-       the `callback` and/or appended to `resultRows`. A value of
-       'array' causes the results of `stmt.get([])` to be passed to
-       passed on.  A value of 'stmt' is equivalent to the default,
-       passing the current Stmt to the callback (noting that it's
-       always passed as the 2nd argument), but this mode will trigger
-       an exception if `resultRows` is an array. If `rowMode` is an
-       integer, only the single value from that result column will be
-       passed on. Any other value for the option triggers an
-       exception.
+       - .rowMode = may take one of several forms:
+
+       A) If `rowMode` is an integer, only the single value from that
+       result column (0-based) will be passed on.
+
+       B) A string describing what type of argument should be passed
+       as the first argument to the callback:
+
+         B.1) 'array' (the default) causes the results of
+         `stmt.get([])` to be passed to passed on and/or appended to
+         `resultRows`.
+
+         B.2) 'object' causes the results of `stmt.get({})` to be
+         passed to the `callback` and/or appended to `resultRows`.
+
+         B.3) 'stmt' causes the current Stmt to be passed to the
+         callback, but this mode will trigger an exception if
+         `resultRows` is an array because appending the statement to
+         the array would be unhelpful.
+
+       C) A string with a minimum length of 2 and leading character of
+       ':', '$', or '@' will fetch the row as an object, extract that
+       one field, and pass that field's value to the callback. Note
+       that these keys are case-sensitive so must match the case used
+       in the SQL. e.g. `"select a A from t"` with a `rowMode` of '$A'
+       would work but '$a' would not (it would result in `undefined`).
+
+       Any other `rowMode` value triggers an exception.
 
        - .resultRows: if this is an array, it functions similarly to
        the `callback` option: each row of the result set (if any) of
@@ -584,7 +595,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
         else wasm.jstrcpy(arg.sql, wasm.heap8(), pSql, sqlByteLen, false);
         wasm.setMemValue(pSql + sqlByteLen, 0/*NUL terminator*/);
         while(wasm.getMemValue(pSql, 'i8')
-              /* Maintenance reminder:   ^^^^ _must_ be i8 or else we
+              /* Maintenance reminder:^^^ _must_ be 'i8' or else we
                  will very likely cause an endless loop. What that's
                  doing is checking for a terminating NUL byte. If we
                  use i32 or similar then we read 4 bytes, read stuff
@@ -615,7 +626,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
               stmt._isLocked = true;
               const row = arg.cbArg(stmt);
               if(resultRows) resultRows.push(row);
-              if(callback) callback(row, stmt);
+              if(callback) callback(row,stmt);
               stmt._isLocked = false;
             }
             rowMode = undefined;
diff --git a/ext/wasm/api/sqlite3-api-worker1.js b/ext/wasm/api/sqlite3-api-worker1.js
index afb2e78124..90c8f0de19 100644
--- a/ext/wasm/api/sqlite3-api-worker1.js
+++ b/ext/wasm/api/sqlite3-api-worker1.js
@@ -249,7 +249,11 @@ sqlite3.initWorker1API = function(){
        message type key, in which case a callback function will be
        applied which posts each row result via:
 
-       postMessage({type: thatKeyType, rowNumber: 1-based-#, row: theRow})
+       postMessage({type: thatKeyType,
+                    rowNumber: 1-based-#,
+                    row: theRow,
+                    columnNames: anArray
+                    })
 
        And, at the end of the result set (whether or not any result
        rows were produced), it will post an identical message with
@@ -280,12 +284,7 @@ sqlite3.initWorker1API = function(){
       const rc = (
         'string'===typeof ev.args
       ) ? {sql: ev.args} : (ev.args || Object.create(null));
-      if(undefined===rc.rowMode){
-        /* Since the default rowMode of 'stmt' is not useful
-           for the Worker interface, we'll default to
-           something else. */
-        rc.rowMode = 'array';
-      }else if('stmt'===rc.rowMode){
+      if('stmt'===rc.rowMode){
         toss("Invalid rowMode for 'exec': stmt mode",
              "does not work in the Worker API.");
       }
@@ -294,25 +293,40 @@ sqlite3.initWorker1API = function(){
         // Part of a copy-avoidance optimization for blobs
         db._blobXfer = wState.xfer;
       }
-      const callbackMsgType = rc.callback;
+      const theCallback = rc.callback;
       let rowNumber = 0;
-      if('string' === typeof callbackMsgType){
+      const hadColNames = !!rc.columnNames;
+      if('string' === typeof theCallback){
+        if(!hadColNames) rc.columnNames = [];
         /* Treat this as a worker message type and post each
            row as a message of that type. */
-        rc.callback =
-          (row)=>wState.post({type: callbackMsgType, rowNumber:++rowNumber, row:row}, wState.xfer);
+        rc.callback = function(row,stmt){
+          wState.post({
+            type: theCallback,
+            columnNames: rc.columnNames,
+            rowNumber: ++rowNumber,
+            row: row
+          }, wState.xfer);
+        }
       }
       try {
         db.exec(rc);
         if(rc.callback instanceof Function){
-          rc.callback = callbackMsgType;
-          wState.post({type: callbackMsgType, rowNumber: null, row: undefined});
+          rc.callback = theCallback;
+          /* Post a sentinel message to tell the client that the end
+             of the result set has been reached (possibly with zero
+             rows). */
+          wState.post({
+            type: theCallback,
+            columnNames: rc.columnNames,
+            rowNumber: null /*null to distinguish from "property not set"*/,
+            row: undefined /*undefined because null is a legal row value
+                             for some rowType values, but undefined is not*/
+          });
         }
       }finally{
         delete db._blobXfer;
-        if(rc.callback){
-          rc.callback = callbackMsgType;
-        }
+        if(rc.callback) rc.callback = theCallback;
       }
       return rc;
     }/*exec()*/,
diff --git a/ext/wasm/testing-worker1-promiser.js b/ext/wasm/testing-worker1-promiser.js
index a2f3a2523d..63401033c0 100644
--- a/ext/wasm/testing-worker1-promiser.js
+++ b/ext/wasm/testing-worker1-promiser.js
@@ -166,16 +166,19 @@
       if(undefined === f.counter) f.counter = 0;
       if(null === ev.rowNumber){
         /* End of result set. */
-        T.assert(undefined === ev.row);
+        T.assert(undefined === ev.row)
+          .assert(2===ev.columnNames.length)
+          .assert('a'===ev.columnNames[0])
+          .assert('B'===ev.columnNames[1]);
       }else{
         T.assert(ev.rowNumber > 0);
         ++f.counter;
       }
       log("exec() result row:",ev);
-      T.assert(null === ev.rowNumber || 'number' === typeof ev.row.b);
+      T.assert(null === ev.rowNumber || 'number' === typeof ev.row.B);
     };
     await wtest('exec',{
-      sql: 'select a a, b b from t order by a',
+      sql: 'select a a, b B from t order by a limit 3',
       callback: resultRowTest1,
       rowMode: 'object'
     }, function(ev){
@@ -183,6 +186,48 @@
       resultRowTest1.counter = 0;
     });
 
+    const resultRowTest2 = function f(ev){
+      if(null === ev.rowNumber){
+        /* End of result set. */
+        T.assert(undefined === ev.row)
+          .assert(1===ev.columnNames.length)
+          .assert('a'===ev.columnNames[0])
+      }else{
+        T.assert(ev.rowNumber > 0);
+        f.counter = ev.rowNumber;
+      }
+      log("exec() result row:",ev);
+      T.assert(null === ev.rowNumber || 'number' === typeof ev.row);
+    };
+    await wtest('exec',{
+      sql: 'select a a from t limit 3',
+      callback: resultRowTest2,
+      rowMode: 0
+    }, function(ev){
+      T.assert(3===resultRowTest2.counter);
+    });
+
+    const resultRowTest3 = function f(ev){
+      if(null === ev.rowNumber){
+        T.assert(3===ev.columnNames.length)
+          .assert('foo'===ev.columnNames[0])
+          .assert('bar'===ev.columnNames[1])
+          .assert('baz'===ev.columnNames[2]);
+      }else{
+        f.counter = ev.rowNumber;
+        T.assert('number' === typeof ev.row);
+      }
+    };
+    await wtest('exec',{
+      sql: "select 'foo' foo, a bar, 'baz' baz  from t limit 2",
+      callback: resultRowTest3,
+      columnNames: [],
+      rowMode: ':bar'
+    }, function(ev){
+      log("exec() result row:",ev);
+      T.assert(2===resultRowTest3.counter);
+    });
+
     await wtest('exec',{
       multi: true,
       sql:[
@@ -220,7 +265,7 @@
 
     await wtest('close', (ev)=>{
       T.assert(undefined === ev.result.filename);
-    }).finally(()=>log("That's all, folks!"));
+    }).finally(()=>logHtml('',"That's all, folks!"));
   }/*runTests2()*/;
 
   
diff --git a/ext/wasm/testing2.js b/ext/wasm/testing2.js
index d64fd6e89a..8d9e66dc1f 100644
--- a/ext/wasm/testing2.js
+++ b/ext/wasm/testing2.js
@@ -117,7 +117,9 @@
       if(undefined === f.counter) f.counter = 0;
       if(null === ev.rowNumber){
         /* End of result set. */
-        T.assert(undefined === ev.row);
+        T.assert(undefined === ev.row)
+          .assert(Array.isArray(ev.columnNames))
+          .assert(ev.columnNames.length);
       }else{
         T.assert(ev.rowNumber > 0);
         ++f.counter;
diff --git a/manifest b/manifest
index 2b3fc24b37..dd1b396898 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Expand\sthe\sworker1\s'exec'\sop\shandling\sfor\sper-row\scallbacks\sfor\sAPI-level\sconsistency\sand\ssmooth\ssome\sedges\sbetween\sworker1\score\sand\sworker1-promiser.\sAdd\sworker1\s'config-get'\smessage\sto\sfetch\sthe\sserializable\sparts\sof\sthe\ssqlite3.config\sstate.\sImprove\sthe\s'open'\sop's\shandling\sof\sthe\s'persistent'\soption\s(noting\sthat\swe\scannot\syet\stest\sthat\scase\sfrom\sa\sworker).
-D 2022-08-24T18:39:46.246
+C Change\sDB.exec()\srowMode\sdefault\sfrom\s'stmt'\sto\s'array',\sper\s/chat\sdiscussion.\sAdd\sDB.exec()\srowMode\soption\sfor\sfetching\sa\sspecific\scolumn\sby\sname.\sAdd\sresult\scolumn\snames\sto\sworker1\sexec()\scallback\sinterface,\sas\sthere's\sotherwise\sno\sway\sto\sget\sthat\sinfo\sfrom\sa\sworker.
+D 2022-08-24T20:57:37.430
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -483,10 +483,10 @@ F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba814
 F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a4a06cb776c003880b
 F ext/wasm/api/sqlite3-api-cleanup.js 1a12e64060c2cb0defd34656a76a9b1d7ed58459c290249bb31567c806fd44de
 F ext/wasm/api/sqlite3-api-glue.js 67ca83974410961953eeaa1dfed3518530d68381729ed1d27f95122f5baeabd3
-F ext/wasm/api/sqlite3-api-oo1.js 5ce93b89165e1eb6ef26ba67ae9d3c25379df74eea82edb7b46255f86db21cfc
+F ext/wasm/api/sqlite3-api-oo1.js 324b2f6817ff3711b59bd9505157f7a91fe319249d3b8b525c8254427c10504a
 F ext/wasm/api/sqlite3-api-opfs.js 011799db398157cbd254264b6ebae00d7234b93d0e9e810345f213a5774993c0
 F ext/wasm/api/sqlite3-api-prologue.js 2d5c5d3355f55eefe51922cec5bfedbec0f8300db98a17685ab7a34a03953c7a
-F ext/wasm/api/sqlite3-api-worker1.js f7372b84b6d71ebdc0d2a9e7944ce571b4f18e0dd4c1be78282c68b4582558ca
+F ext/wasm/api/sqlite3-api-worker1.js 11a9e8b22147d948e338b25d21697178b4414dc0578fc9613aa5fc4bfe62f208
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 0d81282eaeff2a6e9fc5c28a388c5c5b45cf25a9393992fa511ac009b27df982
 F ext/wasm/common/SqliteTestUtil.js eb96275bed43fdb364b7d65bcded0ca5e22aaacff120d593d1385f852f486247
@@ -511,11 +511,11 @@ F ext/wasm/scratchpad-opfs-worker2.js 5f2237427ac537b8580b1c659ff14ad2621d169404
 F ext/wasm/sqlite3-worker1-promiser.js 92b8da5f38439ffec459a8215775d30fa498bc0f1ab929ff341fc3dd479660b9
 F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
-F ext/wasm/testing-worker1-promiser.js 81d81eda77c9d4a3e43cfeee91df6c3b039782cc998020d72fe1fdf91790242d
+F ext/wasm/testing-worker1-promiser.js f4b0895b612606d04ae371d03a9ffe9ffa94a2a840da6e92742b2adf86f0783c
 F ext/wasm/testing1.html 528001c7e32ee567abc195aa071fd9820cc3c8ffc9c8a39a75e680db05f0c409
 F ext/wasm/testing1.js 2def7a86c52ff28b145cb86188d5c7a49d5993f9b78c50d140e1c31551220955
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
-F ext/wasm/testing2.js 04a4194188d54856027eb4cad7239223a8f7a60e64b0aac81fc1a5a70363b98e
+F ext/wasm/testing2.js ab4ae24cd3ffe814370b35515aea426647a6f9d271c6542cf18e580470540615
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
@@ -2009,8 +2009,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 7467ac88801224089b51c6ba7924f93283dd87beca602a186c83632df26cfc85
-R 4d53a1266e528a954f73a792c3648256
+P 509f8839201ec1ea4863bd31493e6c29a0721ca6340755bb96656b828758fea7
+R 4d9ca8433788ec1804950abdc80ba467
 U stephan
-Z cffa6daad399e2d401f0fd69f4f04b4f
+Z aac659391ac05e725777e807ed0e05f4
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 7400cbe177..c547adbe4a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-509f8839201ec1ea4863bd31493e6c29a0721ca6340755bb96656b828758fea7
\ No newline at end of file
+1bb37e5c477b9eb098362f74a45a55be23d450fe45cdff58c1cbff08b5b3998f
\ No newline at end of file

From 9afff9f3c539516c29ce0752b5b84adf8f6ebc19 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Thu, 25 Aug 2022 11:39:12 +0000
Subject: [PATCH 029/428] Refactor and expand the worker1 docs, consolidating
 them into the top of their file instead of scattered around the internals.
 Accommodate an API change from yesterday in demo-oo1.js.

FossilOrigin-Name: 0a65747047322b7b585e281ac275e437ce3f46e1d06105c19117213929a906ad
---
 ext/wasm/api/sqlite3-api-oo1.js      |   2 +-
 ext/wasm/api/sqlite3-api-worker1.js  | 449 +++++++++++++++++----------
 ext/wasm/demo-oo1.js                 |   4 +-
 ext/wasm/testing-worker1-promiser.js |   4 +-
 manifest                             |  18 +-
 manifest.uuid                        |   2 +-
 6 files changed, 303 insertions(+), 176 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index ea42e6bf8d..0d2416a282 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -412,7 +412,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        Stmt.getColumnNames() to append the column names to it
        (regardless of whether the query produces any result
        rows). If the query has no result columns, this value is
-       unchanged.
+       unchanged. (TODO: support this in execMulti() as well.)
 
        The following options to execMulti() are _not_ supported by
        this method (they are simply ignored):
diff --git a/ext/wasm/api/sqlite3-api-worker1.js b/ext/wasm/api/sqlite3-api-worker1.js
index 90c8f0de19..f882f6d76a 100644
--- a/ext/wasm/api/sqlite3-api-worker1.js
+++ b/ext/wasm/api/sqlite3-api-worker1.js
@@ -22,19 +22,20 @@
 */
 
 /**
-  This function implements a Worker-based wrapper around SQLite3 OO
-  API #1, colloquially known as "Worker API #1".
+  sqlite3.initWorker1API() implements a Worker-based wrapper around
+  SQLite3 OO API #1, colloquially known as "Worker API #1".
 
   In order to permit this API to be loaded in worker threads without
   automatically registering onmessage handlers, initializing the
-  worker API requires calling initWorker1API(). If this function
-  is called from a non-worker thread then it throws an exception.
+  worker API requires calling initWorker1API(). If this function is
+  called from a non-worker thread then it throws an exception.  It
+  must only be called once per Worker.
 
   When initialized, it installs message listeners to receive Worker
   messages and then it posts a message in the form:
 
   ```
-  {type:'sqlite3-api',result:'worker1-ready'}
+  {type:'sqlite3-api', result:'worker1-ready'}
   ```
 
   to let the client know that it has been initialized. Clients may
@@ -50,8 +51,275 @@
   Promise-based wrapper for this API (`sqlite3-worker1-promiser.js`)
   is more comfortable to use in that regard.
 
+  The documentation for the input and output worker messages for
+  this API follows...
 
-  TODO: hoist the message API docs from deep in this code to here.
+  ====================================================================
+  Common message format...
+
+  Each message posted to the worker has an operation-independent
+  envelope and operation-dependent arguments:
+
+  ```
+  {
+    type: string, // one of: 'open', 'close', 'exec', 'config-get'
+
+    messageId: OPTIONAL arbitrary value. The worker will copy it as-is
+    into response messages to assist in client-side dispatching.
+
+    dbId: a db identifier string (returned by 'open') which tells the
+    operation which database instance to work on. If not provided, the
+    first-opened db is used. This is an "opaque" value, with no
+    inherently useful syntax or information. Its value is subject to
+    change with any given build of this API and cannot be used as a
+    basis for anything useful beyond its one intended purpose.
+
+    args: ...operation-dependent arguments...
+
+    // the framework may add other properties for testing or debugging
+    // purposes.
+
+  }
+  ```
+
+  Response messages, posted back to the main thread, look like:
+
+  ```
+  {
+    type: string. Same as above except for error responses, which have the type
+    'error',
+
+    messageId: same value, if any, provided by the inbound message
+
+    dbId: the id of the db which was operated on, if any, as returned
+    by the corresponding 'open' operation.
+
+    result: ...operation-dependent result...
+
+  }
+  ```
+
+  ====================================================================
+  Error responses
+
+  Errors are reported messages in an operation-independent format:
+
+  ```
+  {
+    type: 'error',
+
+    messageId: ...as above...,
+
+    dbId: ...as above...
+
+    result: {
+
+      operation: type of the triggering operation: 'open', 'close', ...
+
+      message: ...error message text...
+
+      errorClass: string. The ErrorClass.name property from the thrown exception.
+
+      input: the message object which triggered the error.
+
+      stack: _if available_, a stack trace array.
+
+    }
+
+  }
+  ```
+
+
+  ====================================================================
+  "config-get"
+
+  This operation fetches the serializable parts of the sqlite3 API
+  configuration.
+
+  Message format:
+
+  ```
+  {
+    type: "config-get",
+    messageId: ...as above...,
+    args: currently ignored and may be elided.
+  }
+  ```
+
+  Response:
+
+  ```
+  {
+    type: 'config',
+    messageId: ...as above...,
+    result: {
+
+      persistentDirName: path prefix, if any, of persistent storage.
+      An empty string denotes that no persistent storage is available.
+
+      bigIntEnabled: bool. True if BigInt support is enabled.
+
+      persistenceEnabled: true if persistent storage is enabled in the
+      current environment. Only files stored under persistentDirName
+      will persist, however.
+
+   }
+  }
+  ```
+
+
+  ====================================================================
+  "open" a database
+
+  Message format:
+
+  ```
+  {
+    type: "open",
+    messageId: ...as above...,
+    args:{
+
+      filename [=":memory:" or "" (unspecified)]: the db filename.
+      See the sqlite3.oo1.DB constructor for peculiarities and transformations,
+
+      persistent [=false]: if true and filename is not one of ("",
+      ":memory:"), prepend sqlite3.capi.sqlite3_web_persistent_dir()
+      to the given filename so that it is stored in persistent storage
+      _if_ the environment supports it.  If persistent storage is not
+      supported, the filename is used as-is.
+
+    }
+  }
+  ```
+
+  Response:
+
+  ```
+  {
+    type: 'open',
+    messageId: ...as above...,
+    result: {
+      filename: db filename, possibly differing from the input.
+
+      dbId: an opaque ID value which must be passed in the message
+      envelope to other calls in this API to tell them which db to
+      use. If it is not provided to future calls, they will default to
+      operating on the first-opened db. This property is, for API
+      consistency's sake, also part of the contaning message envelope.
+      Only the `open` operation includes it in the `result` property.
+
+      persistent: true if the given filename resides in the
+      known-persistent storage, else false. This determination is
+      independent of the `persistent` input argument.
+   }
+  }
+  ```
+
+  ====================================================================
+  "close" a database
+
+  Message format:
+
+  ```
+  {
+    type: "close",
+    messageId: ...as above...
+    dbId: ...as above...
+    args: OPTIONAL: {
+
+      unlink: if truthy, the associated db will be unlinked (removed)
+      from the virtual filesystems. Failure to unlink is silently
+      ignored.
+
+    }
+  }
+  ```
+
+  If the dbId does not refer to an opened ID, this is a no-op. The
+  inability to close a db (because it's not opened) or delete its
+  file does not trigger an error.
+
+  Response:
+
+  ```
+  {
+    type: 'close',
+    messageId: ...as above...,
+    result: {
+
+      filename: filename of closed db, or undefined if no db was closed
+
+    }
+  }
+  ```
+
+  ====================================================================
+  "exec" SQL
+
+  All SQL execution is processed through the exec operation. It offers
+  most of the features of the oo1.DB.exec() method, with a few limitations
+  imposed by the state having to cross thread boundaries.
+
+  Message format:
+
+  ```
+  {
+    type: "exec",
+    messageId: ...as above...
+    dbId: ...as above...
+    args: string (SQL) or {... see below ...}
+  }
+  ```
+
+  Response:
+
+  ```
+  {
+    type: 'exec',
+    messageId: ...as above...,
+    dbId: ...as above...
+    result: {
+      input arguments, possibly modified. See below.
+    }
+  }
+  ```
+
+  The arguments are in the same form accepted by oo1.DB.exec(), with
+  the exceptions noted below.
+
+  A function-type args.callback property cannot cross
+  the window/Worker boundary, so is not useful here. If
+  args.callback is a string then it is assumed to be a
+  message type key, in which case a callback function will be
+  applied which posts each row result via:
+
+  postMessage({type: thatKeyType,
+               rowNumber: 1-based-#,
+               row: theRow,
+               columnNames: anArray
+               })
+
+  And, at the end of the result set (whether or not any result rows
+  were produced), it will post an identical message with
+  (row=undefined, rowNumber=null) to alert the caller than the result
+  set is completed. Note that a row value of `null` is a legal row
+  result for certain arg.rowMode values.
+
+    (Design note: we don't use (row=undefined, rowNumber=undefined) to
+    indicate end-of-results because fetching those would be
+    indistinguishable from fetching from an empty object unless the
+    client used hasOwnProperty() (or similar) to distinguish "missing
+    property" from "property with the undefined value".  Similarly,
+    `null` is a legal value for `row` in some case , whereas the db
+    layer won't emit a result value of `undefined`.)
+
+  The callback proxy must not recurse into this interface. An exec()
+  call will type up the Worker thread, causing any recursion attempt
+  to wait until the first exec() is completed.
+
+  The response is the input options object (or a synthesized one if
+  passed only a string), noting that options.resultRows and
+  options.columnNames may be populated by the call to db.exec().
 
 */
 self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
@@ -85,10 +353,15 @@ sqlite3.initWorker1API = function(){
      Internal helper for managing Worker-level state.
   */
   const wState = {
+    /** First-opened db is the default for future operations when no
+        dbId is provided by the client. */
     defaultDb: undefined,
+    /** Sequence number of dbId generation. */
     idSeq: 0,
+    /** Map of DB instances to dbId. */
     idMap: new WeakMap,
-    xfer: [/*Temp holder for "transferable" postMessage() state.*/],
+    /** Temp holder for "transferable" postMessage() state. */
+    xfer: [],
     open: function(opt){
       const db = new DB(opt.filename);
       this.dbs[getDbId(db)] = db;
@@ -122,6 +395,8 @@ sqlite3.initWorker1API = function(){
     },
     /** Map of DB IDs to DBs. */
     dbs: Object.create(null),
+    /** Fetch the DB for the given id. Throw if require=true and the
+        id is not valid, else return the db or undefined. */
     getDb: function(id,require=true){
       return this.dbs[id]
         || (require ? toss("Unknown (or closed) DB ID:",id) : undefined);
@@ -154,37 +429,6 @@ sqlite3.initWorker1API = function(){
      on error.
   */
   const wMsgHandler = {
-    /**
-       Proxy for the DB constructor. Expects to be passed a single
-       object or a falsy value to use defaults:
-
-       {
-         filename [=":memory:" or "" (unspecified)]: the db filename.
-         See the sqlite3.oo1.DB constructor for peculiarities and transformations,
-
-         persistent [=false]: if true and filename is not one of ("",
-         ":memory:"), prepend
-         sqlite3.capi.sqlite3_web_persistent_dir() to the given
-         filename so that it is stored in persistent storage _if_ the
-         environment supports it.  If persistent storage is not
-         supported, the filename is used as-is.
-       }
-
-       The response object looks like:
-
-       {
-         filename: db filename, possibly differing from the input.
-
-         dbId: an opaque ID value which must be passed in the message
-         envelope to other calls in this API to tell them which db to
-         use. If it is not provided to future calls, they will default
-         to operating on the first-opened db.
-
-         persistent: true if the given filename resides in the
-         known-persistent storage, else false. This determination is
-         independent of the `persistent` input argument.
-       }
-    */
     open: function(ev){
       const oargs = Object.create(null), args = (ev.args || Object.create(null));
       if(args.simulateError){ // undocumented internal testing option
@@ -205,28 +449,11 @@ sqlite3.initWorker1API = function(){
       rc.dbId = getDbId(db);
       return rc;
     },
-    /**
-       Proxy for DB.close(). ev.args may be elided or an object with
-       an `unlink` property. If that value is truthy then the db file
-       (if the db is currently open) will be unlinked from the virtual
-       filesystem, else it will be kept intact, noting that unlink
-       failure is ignored. The result object is:
 
-       {
-         filename: db filename _if_ the db is opened when this
-         is called, else the undefined value
-
-         dbId: the ID of the closed b, or undefined if none is closed
-       }
-
-       It does not error if the given db is already closed or no db is
-       provided. It is simply does nothing useful in that case.
-    */
     close: function(ev){
       const db = getMsgDb(ev,false);
       const response = {
-        filename: db && db.filename,
-        dbId: db && getDbId(db)
+        filename: db && db.filename
       };
       if(db){
         wState.close(db, ((ev.args && 'object'===typeof ev.args)
@@ -234,52 +461,7 @@ sqlite3.initWorker1API = function(){
       }
       return response;
     },
-    /**
-       Proxy for oo1.DB.exec() which expects a single argument of type
-       string (SQL to execute) or an options object in the form
-       expected by exec(). The notable differences from exec()
-       include:
 
-       - The default value for options.rowMode is 'array' because
-       the normal default cannot cross the window/Worker boundary.
-
-       - A function-type options.callback property cannot cross
-       the window/Worker boundary, so is not useful here. If
-       options.callback is a string then it is assumed to be a
-       message type key, in which case a callback function will be
-       applied which posts each row result via:
-
-       postMessage({type: thatKeyType,
-                    rowNumber: 1-based-#,
-                    row: theRow,
-                    columnNames: anArray
-                    })
-
-       And, at the end of the result set (whether or not any result
-       rows were produced), it will post an identical message with
-       (row=undefined, rowNumber=null) to alert the caller than the
-       result set is completed. Note that a row value of `null` is
-       a legal row result for certain `rowMode` values.
-
-       (Design note: we don't use (row=undefined, rowNumber=undefined)
-       to indicate end-of-results because fetching those would be
-       indistinguishable from fetching from an empty object unless the
-       client used hasOwnProperty() (or similar) to distinguish
-       "missing property" from "property with the undefined value".
-       Similarly, `null` is a legal value for `row` in some case ,
-       whereas the db layer won't emit a result value of `undefined`.)
-
-       The callback proxy must not recurse into this interface, or
-       results are undefined. (It hypothetically cannot recurse
-       because an exec() call will be tying up the Worker thread,
-       causing any recursion attempt to wait until the first
-       exec() is completed.)
-
-       The response is the input options object (or a synthesized
-       one if passed only a string), noting that
-       options.resultRows and options.columnNames may be populated
-       by the call to db.exec().
-    */
     exec: function(ev){
       const rc = (
         'string'===typeof ev.args
@@ -287,6 +469,8 @@ sqlite3.initWorker1API = function(){
       if('stmt'===rc.rowMode){
         toss("Invalid rowMode for 'exec': stmt mode",
              "does not work in the Worker API.");
+      }else if(!rc.sql){
+        toss("'exec' requires input SQL.");
       }
       const db = getMsgDb(ev);
       if(rc.callback || Array.isArray(rc.resultRows)){
@@ -330,21 +514,7 @@ sqlite3.initWorker1API = function(){
       }
       return rc;
     }/*exec()*/,
-    /**
-       Returns a JSON-friendly form of a _subset_ of sqlite3.config,
-       sans any parts which cannot be serialized. Because we cannot,
-       from here, distingush whether or not certain objects can be
-       serialized, this routine selectively copies certain properties
-       rather than trying JSON.stringify() and seeing what happens
-       (the results are horrid if the config object contains an
-       Emscripten module object).
 
-       In addition to the "real" config properties, it sythesizes
-       the following:
-
-       - persistenceEnabled: true if persistent dir support is available,
-       else false.
-    */
     'config-get': function(){
       const rc = Object.create(null), src = sqlite3.config;
       [
@@ -355,6 +525,7 @@ sqlite3.initWorker1API = function(){
       rc.persistenceEnabled = !!sqlite3.capi.sqlite3_web_persistent_dir();
       return rc;
     },
+
     /**
        TO(RE)DO, once we can abstract away access to the
        JS environment's virtual filesystem. Currently this
@@ -391,58 +562,12 @@ sqlite3.initWorker1API = function(){
       wState.xfer.push(response.buffer.buffer);
       return response;**/
     }/*export()*/,
+
     toss: function(ev){
       toss("Testing worker exception");
     }
   }/*wMsgHandler*/;
 
-  /**
-     UNDER CONSTRUCTION!
-
-     A subset of the DB API is accessible via Worker messages in the
-     form:
-
-     { type: apiCommand,
-       args: apiArguments,
-       dbId: optional DB ID value (else uses a default db handle),
-       messageId: optional client-specific value
-     }
-
-     As a rule, these commands respond with a postMessage() of their
-     own. The responses always have a `type` property equal to the
-     input message's type and an object-format `result` part. If
-     the inbound object has a `messageId` property, that property is
-     always mirrored in the result object, for use in client-side
-     dispatching of these asynchronous results. For example:
-
-     {
-       type: 'open',
-       messageId: ...copied from inbound message...,
-       dbId: ID of db which was opened,
-       result: {
-         dbId: repeat of ^^^, for API consistency's sake,
-         filename: ...,
-         persistent: false
-       },
-       ...possibly other framework-internal/testing/debugging info...
-     }
-
-     Exceptions thrown during processing result in an `error`-type
-     event with a payload in the form:
-
-     { type: 'error',
-       dbId: DB handle ID,
-       [messageId: if set in the inbound message],
-       result: {
-         operation: "inbound message's 'type' value",
-         message: error string,
-         errorClass: class name of the error type,
-         input: ev.data
-       }
-     }
-
-     The individual APIs are documented in the wMsgHandler object.
-  */
   self.onmessage = function(ev){
     ev = ev.data;
     let result, dbId = ev.dbId, evType = ev.type;
diff --git a/ext/wasm/demo-oo1.js b/ext/wasm/demo-oo1.js
index 4eff51b8e8..333d3c204c 100644
--- a/ext/wasm/demo-oo1.js
+++ b/ext/wasm/demo-oo1.js
@@ -136,8 +136,10 @@
       db.exec({
         sql: "select a, twice(a), twice(''||a) from t order by a desc limit 3",
         columnNames: columnNames,
+        rowMode: 'stmt',
         callback: function(row){
-          log("a =",row.get(0), "twice(a) =", row.get(1), "twice(''||a) =",row.get(2));
+          log("a =",row.get(0), "twice(a) =", row.get(1),
+              "twice(''||a) =",row.get(2));
         }
       });
       log("Result column names:",columnNames);
diff --git a/ext/wasm/testing-worker1-promiser.js b/ext/wasm/testing-worker1-promiser.js
index 63401033c0..4cc6547882 100644
--- a/ext/wasm/testing-worker1-promiser.js
+++ b/ext/wasm/testing-worker1-promiser.js
@@ -44,7 +44,7 @@
       w.onerror = (event)=>error("worker.onerror",event);
       return w;
     },
-    //debug: (...args)=>console.debug('worker debug',...args),
+    debug: 1 ? undefined : (...args)=>console.debug('worker debug',...args),
     onunhandled: function(ev){
       error("Unhandled worker message:",ev.data);
     },
@@ -95,7 +95,7 @@
         .assert(r.persistent
                ? (dbFilename!==r.filename)
                : (dbFilename==r.filename))
-        .assert(ev.dbId)
+        .assert(ev.dbId === r.dbId)
         .assert(ev.messageId)
         .assert(promiserConfig.dbId === ev.dbId);
     }).then(runTests2);
diff --git a/manifest b/manifest
index dd1b396898..feef45cc58 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sDB.exec()\srowMode\sdefault\sfrom\s'stmt'\sto\s'array',\sper\s/chat\sdiscussion.\sAdd\sDB.exec()\srowMode\soption\sfor\sfetching\sa\sspecific\scolumn\sby\sname.\sAdd\sresult\scolumn\snames\sto\sworker1\sexec()\scallback\sinterface,\sas\sthere's\sotherwise\sno\sway\sto\sget\sthat\sinfo\sfrom\sa\sworker.
-D 2022-08-24T20:57:37.430
+C Refactor\sand\sexpand\sthe\sworker1\sdocs,\sconsolidating\sthem\sinto\sthe\stop\sof\stheir\sfile\sinstead\sof\sscattered\saround\sthe\sinternals.\sAccommodate\san\sAPI\schange\sfrom\syesterday\sin\sdemo-oo1.js.
+D 2022-08-25T11:39:12.535
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -483,10 +483,10 @@ F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba814
 F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a4a06cb776c003880b
 F ext/wasm/api/sqlite3-api-cleanup.js 1a12e64060c2cb0defd34656a76a9b1d7ed58459c290249bb31567c806fd44de
 F ext/wasm/api/sqlite3-api-glue.js 67ca83974410961953eeaa1dfed3518530d68381729ed1d27f95122f5baeabd3
-F ext/wasm/api/sqlite3-api-oo1.js 324b2f6817ff3711b59bd9505157f7a91fe319249d3b8b525c8254427c10504a
+F ext/wasm/api/sqlite3-api-oo1.js a207d53bcc11955cc8f844aa59b30caaba8f57573222f62010628cfa4b1f4444
 F ext/wasm/api/sqlite3-api-opfs.js 011799db398157cbd254264b6ebae00d7234b93d0e9e810345f213a5774993c0
 F ext/wasm/api/sqlite3-api-prologue.js 2d5c5d3355f55eefe51922cec5bfedbec0f8300db98a17685ab7a34a03953c7a
-F ext/wasm/api/sqlite3-api-worker1.js 11a9e8b22147d948e338b25d21697178b4414dc0578fc9613aa5fc4bfe62f208
+F ext/wasm/api/sqlite3-api-worker1.js 38db6c3d77798a0ef8be78ae6d421ef144e2e9602cdabdd7a93c7fcb7a2d449f
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 0d81282eaeff2a6e9fc5c28a388c5c5b45cf25a9393992fa511ac009b27df982
 F ext/wasm/common/SqliteTestUtil.js eb96275bed43fdb364b7d65bcded0ca5e22aaacff120d593d1385f852f486247
@@ -494,7 +494,7 @@ F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d695
 F ext/wasm/common/testing.css 572cf1ffae0b6eb7ca63684d3392bf350217a07b90e7a896e4fa850700c989b0
 F ext/wasm/common/whwasmutil.js 41b8e097e0a9cb07c24c0ede3c81b72470a63f4a4efb07f75586dc131569f5ae
 F ext/wasm/demo-oo1.html 75646855b38405d82781246fd08c852a2b3bee05dd9f0fe10ab655a8cffb79aa
-F ext/wasm/demo-oo1.js 04e947b64a36ed8d6fe6d5e3ccee16ffc8b4461dd186e84f4baf44d53cc3aa72
+F ext/wasm/demo-oo1.js 77b837b0fe13b542cee893c8caf84009482986bd43cf775197dfeb1e62ec0a2b
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js bccf46045be8824752876f3eec01c223be0616ccac184bffd0024cfe7a3262b8
 F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
@@ -511,7 +511,7 @@ F ext/wasm/scratchpad-opfs-worker2.js 5f2237427ac537b8580b1c659ff14ad2621d169404
 F ext/wasm/sqlite3-worker1-promiser.js 92b8da5f38439ffec459a8215775d30fa498bc0f1ab929ff341fc3dd479660b9
 F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
-F ext/wasm/testing-worker1-promiser.js f4b0895b612606d04ae371d03a9ffe9ffa94a2a840da6e92742b2adf86f0783c
+F ext/wasm/testing-worker1-promiser.js c62b5879339eef0b21aebd9d75bc125c86530edc17470afff18077f931cb704a
 F ext/wasm/testing1.html 528001c7e32ee567abc195aa071fd9820cc3c8ffc9c8a39a75e680db05f0c409
 F ext/wasm/testing1.js 2def7a86c52ff28b145cb86188d5c7a49d5993f9b78c50d140e1c31551220955
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
@@ -2009,8 +2009,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 509f8839201ec1ea4863bd31493e6c29a0721ca6340755bb96656b828758fea7
-R 4d9ca8433788ec1804950abdc80ba467
+P 1bb37e5c477b9eb098362f74a45a55be23d450fe45cdff58c1cbff08b5b3998f
+R 317eb3fcfe686c9323e52473ace36982
 U stephan
-Z aac659391ac05e725777e807ed0e05f4
+Z 2516659ac708c3f3e5c0bf51001da2da
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index c547adbe4a..31227d768b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1bb37e5c477b9eb098362f74a45a55be23d450fe45cdff58c1cbff08b5b3998f
\ No newline at end of file
+0a65747047322b7b585e281ac275e437ce3f46e1d06105c19117213929a906ad
\ No newline at end of file

From 335ad5264f497a680a5529884de419b54809089f Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Thu, 25 Aug 2022 13:27:52 +0000
Subject: [PATCH 030/428] Consolidate oo1.DB.exec() and oo1.DB.execMulti() into
 oo1.DB.exec(). This is a bit less efficient but certainly easier for a client
 to deal with and lightens the maintenance burden.

FossilOrigin-Name: 7eff7213dff553b76d7ce45063e3c4a19544716611a0b609593d704076b38d0b
---
 ext/wasm/api/sqlite3-api-oo1.js     | 243 +++++++++++-----------------
 ext/wasm/api/sqlite3-api-worker1.js |   2 +-
 ext/wasm/demo-oo1.js                |  19 +--
 ext/wasm/testing2.js                |  18 +--
 manifest                            |  18 +--
 manifest.uuid                       |   2 +-
 6 files changed, 117 insertions(+), 185 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index 0d2416a282..c2b0601374 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -198,9 +198,9 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
   };
 
   /**
-     Expects to be passed the `arguments` object from DB.exec() and
-     DB.execMulti(). Does the argument processing/validation, throws
-     on error, and returns a new object on success:
+     Expects to be passed the `arguments` object from DB.exec(). Does
+     the argument processing/validation, throws on error, and returns
+     a new object on success:
 
      { sql: the SQL, opt: optionsObj, cbArg: function}
 
@@ -237,11 +237,11 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     if(out.opt.callback || out.opt.resultRows){
       switch((undefined===out.opt.rowMode)
              ? 'array' : out.opt.rowMode) {
-          case 'object': out.cbArg = (stmt)=>stmt.get({}); break;
+          case 'object': out.cbArg = (stmt)=>stmt.get(Object.create(null)); break;
           case 'array': out.cbArg = (stmt)=>stmt.get([]); break;
           case 'stmt':
             if(Array.isArray(out.opt.resultRows)){
-              toss3("Invalid rowMode for a resultRows array: must",
+              toss3("exec(): invalid rowMode for a resultRows array: must",
                     "be one of 'array', 'object',",
                     "a result column number, or column name reference.");
             }
@@ -256,8 +256,12 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
               const prefix = out.opt.rowMode[0];
               if(':'===prefix || '@'===prefix || '$'===prefix){
                 out.cbArg = function(stmt){
-                  return stmt.get(this.obj)[this.colName];
-                }.bind({obj:{}, colName: out.opt.rowMode.substr(1)})
+                  const rc = stmt.get(this.obj)[this.colName];
+                  return (undefined===rc) ? toss3("exec(): unknown result column:",this.colName) : rc;
+                }.bind({
+                  obj:Object.create(null),
+                  colName: out.opt.rowMode.substr(1)
+                });
                 break;
               }
             }
@@ -394,70 +398,6 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
       __stmtMap.get(this)[pStmt] = stmt;
       return stmt;
     },
-    /**
-       This function works like execMulti(), and takes most of the
-       same arguments, but is more efficient (performs much less
-       work) when the input SQL is only a single statement. If
-       passed a multi-statement SQL, it only processes the first
-       one.
-
-       This function supports the following additional options not
-       supported by execMulti():
-
-       - .multi: if true, this function acts as a proxy for
-       execMulti() and behaves identically to that function.
-
-       - .columnNames: if this is an array and the query has
-       result columns, the array is passed to
-       Stmt.getColumnNames() to append the column names to it
-       (regardless of whether the query produces any result
-       rows). If the query has no result columns, this value is
-       unchanged. (TODO: support this in execMulti() as well.)
-
-       The following options to execMulti() are _not_ supported by
-       this method (they are simply ignored):
-
-       - .saveSql
-    */
-    exec: function(/*(sql [,optionsObj]) or (optionsObj)*/){
-      affirmDbOpen(this);
-      const arg = parseExecArgs(arguments);
-      if(!arg.sql) return this;
-      else if(arg.opt.multi){
-        return this.execMulti(arg, undefined, BindTypes);
-      }
-      const opt = arg.opt;
-      let stmt, rowTarget;
-      try {
-        if(Array.isArray(opt.resultRows)){
-          rowTarget = opt.resultRows;
-        }
-        stmt = this.prepare(arg.sql);
-        if(stmt.columnCount && Array.isArray(opt.columnNames)){
-          stmt.getColumnNames(opt.columnNames);
-        }
-        if(opt.bind) stmt.bind(opt.bind);
-        if(opt.callback || rowTarget){
-          while(stmt.step()){
-            const row = arg.cbArg(stmt);
-            if(rowTarget) rowTarget.push(row);
-            if(opt.callback){
-              stmt._isLocked = true;
-              opt.callback(row,stmt);
-              stmt._isLocked = false;
-            }
-          }
-        }else{
-          stmt.step();
-        }
-      }finally{
-        if(stmt){
-          delete stmt._isLocked;
-          stmt.finalize();
-        }
-      }
-      return this;
-    }/*exec()*/,
     /**
        Executes one or more SQL statements in the form of a single
        string. Its arguments must be either (sql,optionsObject) or
@@ -473,109 +413,115 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        properties:
 
        - .sql = the SQL to run (unless it's provided as the first
-       argument). This must be of type string, Uint8Array, or an
-       array of strings (in which case they're concatenated
-       together as-is, with no separator between elements,
-       before evaluation).
+       argument). This must be of type string, Uint8Array, or an array
+       of strings. In the latter case they're concatenated together
+       as-is, _with no separator_ between elements, before evaluation.
+       The array form is often simpler for long hand-written queries.
 
        - .bind = a single value valid as an argument for
-       Stmt.bind(). This is ONLY applied to the FIRST non-empty
-       statement in the SQL which has any bindable
-       parameters. (Empty statements are skipped entirely.)
+       Stmt.bind(). This is _only_ applied to the _first_ non-empty
+       statement in the SQL which has any bindable parameters. (Empty
+       statements are skipped entirely.)
+
+       - .saveSql = an optional array. If set, the SQL of each
+       executed statement is appended to this array before the
+       statement is executed (but after it is prepared - we
+       don't have the string until after that). Empty SQL
+       statements are elided.
+
+       ==================================================================
+       The following options apply _only_ to the _first_ statement
+       which has a non-zero result column count, regardless of whether
+       the statement actually produces any result rows.
+       ==================================================================
 
        - .callback = a function which gets called for each row of the
-       FIRST statement in the SQL which has result _columns_, but only
-       if that statement has any result _rows_. The callback's "this"
-       is the options object. The second argument passed to the
-       callback is always the current Stmt object (so that the caller
-       may collect column names, or similar). The 2nd argument to the
-       callback is always the Stmt instance, as it's needed if the
-       caller wants to fetch the column names or some such. The first
-       argument passed to the callback defaults to the current Stmt
-       object but may be changed with ...
+       result set, but only if that statement has any result
+       _rows_. The callback's "this" is the options object. The second
+       argument passed to the callback is always the current Stmt
+       object (so that the caller may collect column names, or
+       similar). The 2nd argument to the callback is always the Stmt
+       instance, as it's needed if the caller wants to fetch the
+       column names or some such (noting that they could also be
+       fetched via `this.columnNames`, if the client provides the
+       `columnNames` option).
 
-       - .rowMode = may take one of several forms:
+       ACHTUNG: The callback MUST NOT modify the Stmt object. Calling
+       any of the Stmt.get() variants, Stmt.getColumnName(), or
+       similar, is legal, but calling step() or finalize() is
+       not. Routines which are illegal in this context will trigger an
+       exception.
 
-       A) If `rowMode` is an integer, only the single value from that
-       result column (0-based) will be passed on.
+       The first argument passed to the callback defaults to an array of
+       values from the current result row but may be changed with ...
 
-       B) A string describing what type of argument should be passed
+       - .rowMode = specifies the type of he callback's first argument.
+       It may be any of...
+
+       A) A string describing what type of argument should be passed
        as the first argument to the callback:
 
-         B.1) 'array' (the default) causes the results of
+         A.1) 'array' (the default) causes the results of
          `stmt.get([])` to be passed to passed on and/or appended to
          `resultRows`.
 
-         B.2) 'object' causes the results of `stmt.get({})` to be
-         passed to the `callback` and/or appended to `resultRows`.
+         A.2) 'object' causes the results of
+         `stmt.get(Object.create(null))` to be passed to the
+         `callback` and/or appended to `resultRows`.  Achtung: an SQL
+         result may have multiple columns with identical names. In
+         that case, the right-most column will be the one set in this
+         object!
 
-         B.3) 'stmt' causes the current Stmt to be passed to the
+         A.3) 'stmt' causes the current Stmt to be passed to the
          callback, but this mode will trigger an exception if
          `resultRows` is an array because appending the statement to
          the array would be unhelpful.
 
+       B) An integer, indicating a zero-based column in the result
+       row. Only that one single value will be passed on.
+
        C) A string with a minimum length of 2 and leading character of
        ':', '$', or '@' will fetch the row as an object, extract that
        one field, and pass that field's value to the callback. Note
        that these keys are case-sensitive so must match the case used
        in the SQL. e.g. `"select a A from t"` with a `rowMode` of '$A'
-       would work but '$a' would not (it would result in `undefined`).
+       would work but '$a' would not. A reference to a column not in
+       the result set will trigger an exception on the first row (as
+       the check is not performed until rows are fetched).
 
        Any other `rowMode` value triggers an exception.
 
        - .resultRows: if this is an array, it functions similarly to
-       the `callback` option: each row of the result set (if any) of
-       the FIRST first statement which has result _columns_ is
-       appended to the array in the format specified for the `rowMode`
-       option, with the exception that the only legal values for
-       `rowMode` in this case are 'array', 'object', or an integer,
-       none of which are the default for `rowMode`. It is legal to use
-       both `resultRows` and `callback`, but `resultRows` is likely
-       much simpler to use for small data sets and can be used over a
-       WebWorker-style message interface.  execMulti() throws if
-       `resultRows` is set and `rowMode` is 'stmt' (which is the
-       default!).
+       the `callback` option: each row of the result set (if any),
+       with the exception that the `rowMode` 'stmt' is not legal. It
+       is legal to use both `resultRows` and `callback`, but
+       `resultRows` is likely much simpler to use for small data sets
+       and can be used over a WebWorker-style message interface.
+       exec() throws if `resultRows` is set and `rowMode` is 'stmt'.
 
-       - saveSql = an optional array. If set, the SQL of each
-       executed statement is appended to this array before the
-       statement is executed (but after it is prepared - we
-       don't have the string until after that). Empty SQL
-       statements are elided.
-
-       See also the exec() method, which is a close cousin of this
-       one.
-
-       ACHTUNG #1: The callback MUST NOT modify the Stmt
-       object. Calling any of the Stmt.get() variants,
-       Stmt.getColumnName(), or similar, is legal, but calling
-       step() or finalize() is not. Routines which are illegal
-       in this context will trigger an exception.
-
-       ACHTUNG #2: The semantics of the `bind` and `callback`
-       options may well change or those options may be removed
-       altogether for this function (but retained for exec()).
-       Generally speaking, neither bind parameters nor a callback
-       are generically useful when executing multi-statement SQL.
+       - .columnNames: if this is an array, the column names of the
+       result set are stored in this array before the callback (if
+       any) is triggered (regardless of whether the query produces any
+       result rows). If no statement has result columns, this value is
+       unchanged. Achtung: an SQL result may have multiple columns with
+       identical names.
     */
-    execMulti: function(/*(sql [,obj]) || (obj)*/){
+    exec: function(/*(sql [,obj]) || (obj)*/){
       affirmDbOpen(this);
       const wasm = capi.wasm;
-      const arg = (BindTypes===arguments[2]
-                   /* ^^^ Being passed on from exec() */
-                   ? arguments[0] : parseExecArgs(arguments));
-      if(!arg.sql) return this;
+      const arg = parseExecArgs(arguments);
+      if(!arg.sql){
+        return (''===arg.sql) ? this : toss3("exec() requires an SQL string.");
+      }
       const opt = arg.opt;
       const callback = opt.callback;
-      const resultRows = (Array.isArray(opt.resultRows)
+      let resultRows = (Array.isArray(opt.resultRows)
                           ? opt.resultRows : undefined);
-      if(resultRows && 'stmt'===opt.rowMode){
-        toss3("rowMode 'stmt' is not valid in combination",
-              "with a resultRows array.");
-      }
       let rowMode = (((callback||resultRows) && (undefined!==opt.rowMode))
                      ? opt.rowMode : undefined);
       let stmt;
       let bind = opt.bind;
+      let doneFirstQuery = false/*true once we handle a result-returning query*/;
       const stack = wasm.scopedAllocPush();
       try{
         const isTA = util.isSQLableTypedArray(arg.sql)
@@ -604,8 +550,8 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
                  re-preparing an empty statement. */ ){
           wasm.setMemValue(ppStmt, 0, wasm.ptrIR);
           wasm.setMemValue(pzTail, 0, wasm.ptrIR);
-          DB.checkRc(this, capi.sqlite3_prepare_v2(
-            this.pointer, pSql, sqlByteLen, ppStmt, pzTail
+          DB.checkRc(this, capi.sqlite3_prepare_v3(
+            this.pointer, pSql, sqlByteLen, 0, ppStmt, pzTail
           ));
           const pStmt = wasm.getMemValue(ppStmt, wasm.ptrIR);
           pSql = wasm.getMemValue(pzTail, wasm.ptrIR);
@@ -619,17 +565,20 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
             stmt.bind(bind);
             bind = null;
           }
-          if(stmt.columnCount && undefined!==rowMode){
+          if(!doneFirstQuery && stmt.columnCount){
             /* Only forward SELECT results for the FIRST query
                in the SQL which potentially has them. */
+            doneFirstQuery = true;
+            if(Array.isArray(opt.columnNames)){
+              stmt.getColumnNames(opt.columnNames);
+            }
             while(stmt.step()){
               stmt._isLocked = true;
               const row = arg.cbArg(stmt);
               if(resultRows) resultRows.push(row);
-              if(callback) callback(row,stmt);
+              if(callback) callback.apply(opt,[row,stmt]);
               stmt._isLocked = false;
             }
-            rowMode = undefined;
           }else{
             // Do we need to while(stmt.step()){} here?
             stmt.step();
@@ -637,10 +586,10 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
           stmt.finalize();
           stmt = null;
         }
-      }catch(e){
-        console.warn("DB.execMulti() is propagating exception",opt,e);
+      }/*catch(e){
+        console.warn("DB.exec() is propagating exception",opt,e);
         throw e;
-      }finally{
+      }*/finally{
         if(stmt){
           delete stmt._isLocked;
           stmt.finalize();
@@ -648,7 +597,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
         wasm.scopedAllocPop(stack);
       }
       return this;
-    }/*execMulti()*/,
+    }/*exec()*/,
     /**
        Creates a new scalar UDF (User-Defined Function) which is
        accessible via SQL code. This function may be called in any
@@ -907,7 +856,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
         this.exec("RELEASE oo1");
         return rc;
       }catch(e){
-        this.execMulti("ROLLBACK to SAVEPOINT oo1; RELEASE SAVEPOINT oo1");
+        this.exec("ROLLBACK to SAVEPOINT oo1; RELEASE SAVEPOINT oo1");
         throw e;
       }
     },
diff --git a/ext/wasm/api/sqlite3-api-worker1.js b/ext/wasm/api/sqlite3-api-worker1.js
index f882f6d76a..6ca337df1d 100644
--- a/ext/wasm/api/sqlite3-api-worker1.js
+++ b/ext/wasm/api/sqlite3-api-worker1.js
@@ -589,7 +589,7 @@ sqlite3.initWorker1API = function(){
       };
       if(err.stack){
         result.stack = ('string'===typeof err.stack)
-          ? err.stack.split('\n') : err.stack;
+          ? err.stack.split(/\n\s*/) : err.stack;
       }
       if(0) console.warn("Worker is propagating an exception to main thread.",
                          "Reporting it _here_ for the stack trace:",err,result);
diff --git a/ext/wasm/demo-oo1.js b/ext/wasm/demo-oo1.js
index 333d3c204c..353ed50a64 100644
--- a/ext/wasm/demo-oo1.js
+++ b/ext/wasm/demo-oo1.js
@@ -144,23 +144,6 @@
       });
       log("Result column names:",columnNames);
 
-      /**
-         Main differences between exec() and execMulti():
-
-         - execMulti() traverses all statements in the input SQL
-
-         - exec() supports a couple options not supported by execMulti(),
-           and vice versa.
-
-         - execMulti() result callback/array only activates for the
-           first statement which has result columns. It is arguable
-           whether it should support a callback at all, and that
-           feature may be removed.
-
-         - execMulti() column-bind data only activates for the first statement
-           with bindable columns. This feature is arguable and may be removed.
-       */
-      
       if(0){
         warn("UDF will throw because of incorrect arg count...");
         db.exec("select twice(1,2,3)");
@@ -187,7 +170,7 @@
           log("In savepoint: count(*) from t =",db.selectValue("select count(*) from t"));
           D.savepoint(function(DD){
             const rows = [];
-            D.execMulti({
+            D.exec({
               sql: ["insert into t(a,b) values(99,100);",
                     "select count(*) from t"],
               rowMode: 0,
diff --git a/ext/wasm/testing2.js b/ext/wasm/testing2.js
index 8d9e66dc1f..0a31c470a6 100644
--- a/ext/wasm/testing2.js
+++ b/ext/wasm/testing2.js
@@ -70,7 +70,7 @@
             (ev.workerRespondTime - ev.workerReceivedTime),"ms.",
             "Round-trip event time =",
             (performance.now() - ev.departureTime),"ms.",
-            (evd.errorClass ? ev.message : ""), evd
+            (evd.errorClass ? ev.message : "")//, JSON.stringify(evd)
            );
   };
 
@@ -149,10 +149,9 @@
       throw new Error("This is not supposed to be reached.");
     };
     runOneTest('exec',{
-      sql: ["create table t(a,b)",
+      sql: ["create table t(a,b);",
             "insert into t(a,b) values(1,2),(3,4),(5,6)"
-           ].join(';'),
-      multi: true,
+           ],
       resultRows: [], columnNames: []
     }, function(ev){
       ev = ev.result;
@@ -161,7 +160,7 @@
     });
     runOneTest('exec',{
       sql: 'select a a, b b from t order by a',
-      resultRows: [], columnNames: [],
+      resultRows: [], columnNames: [], saveSql:[]
     }, function(ev){
       ev = ev.result;
       T.assert(3===ev.resultRows.length)
@@ -170,6 +169,7 @@
         .assert(2===ev.columnNames.length)
         .assert('b'===ev.columnNames[1]);
     });
+    //if(1){ error("Returning prematurely for testing."); return; }
     runOneTest('exec',{
       sql: 'select a a, b b from t order by a',
       resultRows: [], columnNames: [],
@@ -200,12 +200,12 @@
       dbMsgHandler.resultRowTest1.counter = 0;
     });
     runOneTest('exec',{
-      multi: true,
       sql:[
-        'pragma foreign_keys=0;',
+        "pragma foreign_keys=0;",
         // ^^^ arbitrary query with no result columns
-        'select a, b from t order by a desc; select a from t;'
-        // multi-exec only honors results from the first
+        "select a, b from t order by a desc;",
+        "select a from t;"
+        // multi-statement exec only honors results from the first
         // statement with result columns (regardless of whether)
         // it has any rows).
       ],
diff --git a/manifest b/manifest
index feef45cc58..3f6cea0347 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Refactor\sand\sexpand\sthe\sworker1\sdocs,\sconsolidating\sthem\sinto\sthe\stop\sof\stheir\sfile\sinstead\sof\sscattered\saround\sthe\sinternals.\sAccommodate\san\sAPI\schange\sfrom\syesterday\sin\sdemo-oo1.js.
-D 2022-08-25T11:39:12.535
+C Consolidate\soo1.DB.exec()\sand\soo1.DB.execMulti()\sinto\soo1.DB.exec().\sThis\sis\sa\sbit\sless\sefficient\sbut\scertainly\seasier\sfor\sa\sclient\sto\sdeal\swith\sand\slightens\sthe\smaintenance\sburden.
+D 2022-08-25T13:27:52.079
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -483,10 +483,10 @@ F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba814
 F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a4a06cb776c003880b
 F ext/wasm/api/sqlite3-api-cleanup.js 1a12e64060c2cb0defd34656a76a9b1d7ed58459c290249bb31567c806fd44de
 F ext/wasm/api/sqlite3-api-glue.js 67ca83974410961953eeaa1dfed3518530d68381729ed1d27f95122f5baeabd3
-F ext/wasm/api/sqlite3-api-oo1.js a207d53bcc11955cc8f844aa59b30caaba8f57573222f62010628cfa4b1f4444
+F ext/wasm/api/sqlite3-api-oo1.js 329f07524e4a5d12960a0d17845443a4495b3e34b53b0182b1b944c626864974
 F ext/wasm/api/sqlite3-api-opfs.js 011799db398157cbd254264b6ebae00d7234b93d0e9e810345f213a5774993c0
 F ext/wasm/api/sqlite3-api-prologue.js 2d5c5d3355f55eefe51922cec5bfedbec0f8300db98a17685ab7a34a03953c7a
-F ext/wasm/api/sqlite3-api-worker1.js 38db6c3d77798a0ef8be78ae6d421ef144e2e9602cdabdd7a93c7fcb7a2d449f
+F ext/wasm/api/sqlite3-api-worker1.js 73579555563b789785ae83724014eaf31811073aad9be6596c8336ffb51edd71
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 0d81282eaeff2a6e9fc5c28a388c5c5b45cf25a9393992fa511ac009b27df982
 F ext/wasm/common/SqliteTestUtil.js eb96275bed43fdb364b7d65bcded0ca5e22aaacff120d593d1385f852f486247
@@ -494,7 +494,7 @@ F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d695
 F ext/wasm/common/testing.css 572cf1ffae0b6eb7ca63684d3392bf350217a07b90e7a896e4fa850700c989b0
 F ext/wasm/common/whwasmutil.js 41b8e097e0a9cb07c24c0ede3c81b72470a63f4a4efb07f75586dc131569f5ae
 F ext/wasm/demo-oo1.html 75646855b38405d82781246fd08c852a2b3bee05dd9f0fe10ab655a8cffb79aa
-F ext/wasm/demo-oo1.js 77b837b0fe13b542cee893c8caf84009482986bd43cf775197dfeb1e62ec0a2b
+F ext/wasm/demo-oo1.js aad38cb90b6fa7fd4d1184e759b25056fb4ed45c4957c458896354281259515f
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js bccf46045be8824752876f3eec01c223be0616ccac184bffd0024cfe7a3262b8
 F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
@@ -515,7 +515,7 @@ F ext/wasm/testing-worker1-promiser.js c62b5879339eef0b21aebd9d75bc125c86530edc1
 F ext/wasm/testing1.html 528001c7e32ee567abc195aa071fd9820cc3c8ffc9c8a39a75e680db05f0c409
 F ext/wasm/testing1.js 2def7a86c52ff28b145cb86188d5c7a49d5993f9b78c50d140e1c31551220955
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
-F ext/wasm/testing2.js ab4ae24cd3ffe814370b35515aea426647a6f9d271c6542cf18e580470540615
+F ext/wasm/testing2.js 25584bcc30f19673ce13a6f301f89f8820a59dfe044e0c4f2913941f4097fe3c
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
@@ -2009,8 +2009,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 1bb37e5c477b9eb098362f74a45a55be23d450fe45cdff58c1cbff08b5b3998f
-R 317eb3fcfe686c9323e52473ace36982
+P 0a65747047322b7b585e281ac275e437ce3f46e1d06105c19117213929a906ad
+R 14238254f8c2a9ecda72692d6551fb99
 U stephan
-Z 2516659ac708c3f3e5c0bf51001da2da
+Z 0ceace5a4ad7c624466e4c9b471faa7f
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 31227d768b..7080e62c57 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0a65747047322b7b585e281ac275e437ce3f46e1d06105c19117213929a906ad
\ No newline at end of file
+7eff7213dff553b76d7ce45063e3c4a19544716611a0b609593d704076b38d0b
\ No newline at end of file

From d7d1098baa959ac5c24f69fa57299f161891b59f Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 29 Aug 2022 08:04:55 +0000
Subject: [PATCH 031/428] oo #1 api: correct a case where a null callback is
 called. Rename some vars for clarity. Increase wasm-side memory in order to
 be able to load the speedtest1 output.

FossilOrigin-Name: b5058f14fadbc8a1886f27cff08593dd2c8e2b2cb6d7bed3b8733a55f031989f
---
 ext/wasm/GNUmakefile            |  1 +
 ext/wasm/api/sqlite3-api-oo1.js |  8 ++++----
 manifest                        | 14 +++++++-------
 manifest.uuid                   |  2 +-
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index db96a42ffc..40a69b200c 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -202,6 +202,7 @@ else
 endif
 emcc.jsflags += $(emcc.environment)
 #emcc.jsflags += -sINITIAL_MEMORY=13107200
+emcc.jsflags += -sINITIAL_MEMORY=64225280
 #emcc.jsflags += -sTOTAL_STACK=4194304
 emcc.jsflags += -sEXPORT_NAME=sqlite3InitModule
 emcc.jsflags += -sGLOBAL_BASE=4096 # HYPOTHETICALLY keep func table indexes from overlapping w/ heap addr.
diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index c2b0601374..6317f97f51 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -521,7 +521,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
                      ? opt.rowMode : undefined);
       let stmt;
       let bind = opt.bind;
-      let doneFirstQuery = false/*true once we handle a result-returning query*/;
+      let runFirstQuery = !!(arg.cbArg || opt.columnNames) /* true to evaluate the first result-returning query */;
       const stack = wasm.scopedAllocPush();
       try{
         const isTA = util.isSQLableTypedArray(arg.sql)
@@ -565,14 +565,14 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
             stmt.bind(bind);
             bind = null;
           }
-          if(!doneFirstQuery && stmt.columnCount){
+          if(runFirstQuery && stmt.columnCount){
             /* Only forward SELECT results for the FIRST query
                in the SQL which potentially has them. */
-            doneFirstQuery = true;
+            runFirstQuery = false;
             if(Array.isArray(opt.columnNames)){
               stmt.getColumnNames(opt.columnNames);
             }
-            while(stmt.step()){
+            while(!!arg.cbArg && stmt.step()){
               stmt._isLocked = true;
               const row = arg.cbArg(stmt);
               if(resultRows) resultRows.push(row);
diff --git a/manifest b/manifest
index 738a1b98a5..532fe66a0e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\schanges\sfrom\strunk\sinto\sthe\sfiddle-opfs\sbranch.
-D 2022-08-25T19:38:54.407
+C oo\s#1\sapi:\scorrect\sa\scase\swhere\sa\snull\scallback\sis\scalled.\sRename\ssome\svars\sfor\sclarity.\sIncrease\swasm-side\smemory\sin\sorder\sto\sbe\sable\sto\sload\sthe\sspeedtest1\soutput.
+D 2022-08-29T08:04:55.473
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle db7a4602f043cf4a5e4135be3609a487f9f1c83f05778bfbdf93766be4541b96
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile 79f0ddba6b6b474fad46a927aa9cd0fdbeb372c5332c84e8096d6b490df0f9db
+F ext/wasm/GNUmakefile 12b4cefa1653df172ac54400f83b626b4969b4007da2ce523ebc27c8726656b0
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 77ef4bcf37e362b9ad61f9c175dfc0f1b3e571563fb311b96581cf422ee6a8ec
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -483,7 +483,7 @@ F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba814
 F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a4a06cb776c003880b
 F ext/wasm/api/sqlite3-api-cleanup.js 1a12e64060c2cb0defd34656a76a9b1d7ed58459c290249bb31567c806fd44de
 F ext/wasm/api/sqlite3-api-glue.js 67ca83974410961953eeaa1dfed3518530d68381729ed1d27f95122f5baeabd3
-F ext/wasm/api/sqlite3-api-oo1.js 329f07524e4a5d12960a0d17845443a4495b3e34b53b0182b1b944c626864974
+F ext/wasm/api/sqlite3-api-oo1.js ae7b07445b47cd3b875a8f926abad6c1b836aaba0c9e16c090051f5c8461949d
 F ext/wasm/api/sqlite3-api-opfs.js 011799db398157cbd254264b6ebae00d7234b93d0e9e810345f213a5774993c0
 F ext/wasm/api/sqlite3-api-prologue.js 2d5c5d3355f55eefe51922cec5bfedbec0f8300db98a17685ab7a34a03953c7a
 F ext/wasm/api/sqlite3-api-worker1.js 73579555563b789785ae83724014eaf31811073aad9be6596c8336ffb51edd71
@@ -2009,8 +2009,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 7eff7213dff553b76d7ce45063e3c4a19544716611a0b609593d704076b38d0b c72756b0f2db30c622f00f43be9245d50e36049bd7740ee6332164f0c48f9c3d
-R 6cbaead5bd5c21e8bcf8c5222e15e555
+P 34279797be0922b9df05e0d4f327f8582ab25fb6fb21583f8441ddf5deded891
+R 33c519177a8614fb691ab50256f2cf44
 U stephan
-Z 2bf8ba3c4f232c47481eaff62acadb99
+Z d1dd6a72031bb9355624c4c89a613214
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index ac06f3fffa..6044ded307 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-34279797be0922b9df05e0d4f327f8582ab25fb6fb21583f8441ddf5deded891
\ No newline at end of file
+b5058f14fadbc8a1886f27cff08593dd2c8e2b2cb6d7bed3b8733a55f031989f
\ No newline at end of file

From 9a2efd8e1f488c3c00295bc7490e3b40ebc192c4 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 29 Aug 2022 09:51:17 +0000
Subject: [PATCH 032/428] Add begin/end comment markers to the test blocks in
 speedtest1 --script output to facilitate chopping up the output into chunks
 for JS-side processing.

FossilOrigin-Name: ef0b7ef2d2e19b1f9437fdd7e24f040f662d9907d1fa17c6a3892fcf091b849e
---
 manifest          | 12 ++++++------
 manifest.uuid     |  2 +-
 test/speedtest1.c | 10 ++++++++++
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/manifest b/manifest
index 532fe66a0e..1c823620f6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C oo\s#1\sapi:\scorrect\sa\scase\swhere\sa\snull\scallback\sis\scalled.\sRename\ssome\svars\sfor\sclarity.\sIncrease\swasm-side\smemory\sin\sorder\sto\sbe\sable\sto\sload\sthe\sspeedtest1\soutput.
-D 2022-08-29T08:04:55.473
+C Add\sbegin/end\scomment\smarkers\sto\sthe\stest\sblocks\sin\sspeedtest1\s--script\soutput\sto\sfacilitate\schopping\sup\sthe\soutput\sinto\schunks\sfor\sJS-side\sprocessing.
+D 2022-08-29T09:51:17.953
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1490,7 +1490,7 @@ F test/speed3.test 694affeb9100526007436334cf7d08f3d74b85ef
 F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
 F test/speed4p.test 377a0c48e5a92e0b11c1c5ebb1bc9d83a7312c922bc0cb05970ef5d6a96d1f0c
-F test/speedtest1.c 8bf7ebac9ac316feed6656951249db531dc380c73fb3e3b22e224ffda96beff6
+F test/speedtest1.c ad03c49d993b6fd4e8e6ad1df561edd1c17ec85226edd2137c355e404a0f985d
 F test/spellfix.test 951a6405d49d1a23d6b78027d3877b4a33eeb8221dcab5704b499755bb4f552e
 F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3
 F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33
@@ -2009,8 +2009,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 34279797be0922b9df05e0d4f327f8582ab25fb6fb21583f8441ddf5deded891
-R 33c519177a8614fb691ab50256f2cf44
+P b5058f14fadbc8a1886f27cff08593dd2c8e2b2cb6d7bed3b8733a55f031989f
+R 36f1b21cb1d4644e92fb6c673b070ffc
 U stephan
-Z d1dd6a72031bb9355624c4c89a613214
+Z 7df3fe59906fdbadae6efee36992f3be
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 6044ded307..aef69a98ac 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b5058f14fadbc8a1886f27cff08593dd2c8e2b2cb6d7bed3b8733a55f031989f
\ No newline at end of file
+ef0b7ef2d2e19b1f9437fdd7e24f040f662d9907d1fa17c6a3892fcf091b849e
\ No newline at end of file
diff --git a/test/speedtest1.c b/test/speedtest1.c
index b115a57e2b..7f0e3d34a9 100644
--- a/test/speedtest1.c
+++ b/test/speedtest1.c
@@ -372,10 +372,12 @@ int speedtest1_numbername(unsigned int n, char *zOut, int nOut){
 #define NAMEWIDTH 60
 static const char zDots[] =
   ".......................................................................";
+static int iTestNumber = 0;  /* Current test # for begin/end_test(). */
 void speedtest1_begin_test(int iTestNum, const char *zTestName, ...){
   int n = (int)strlen(zTestName);
   char *zName;
   va_list ap;
+  iTestNumber = iTestNum;
   va_start(ap, zTestName);
   zName = sqlite3_vmprintf(zTestName, ap);
   va_end(ap);
@@ -384,6 +386,9 @@ void speedtest1_begin_test(int iTestNum, const char *zTestName, ...){
     zName[NAMEWIDTH] = 0;
     n = NAMEWIDTH;
   }
+  if( g.pScript ){
+    fprintf(g.pScript,"-- begin test %d\n", iTestNumber);
+  }
   if( g.bSqlOnly ){
     printf("/* %4d - %s%.*s */\n", iTestNum, zName, NAMEWIDTH-n, zDots);
   }else{
@@ -404,6 +409,10 @@ void speedtest1_exec(const char*,...);
 void speedtest1_end_test(void){
   sqlite3_int64 iElapseTime = speedtest1_timestamp() - g.iStart;
   if( g.doCheckpoint ) speedtest1_exec("PRAGMA wal_checkpoint;");
+  assert( iTestNumber > 0 );
+  if( g.pScript ){
+    fprintf(g.pScript,"-- end test %d\n", iTestNumber);
+  }
   if( !g.bSqlOnly ){
     g.iTotal += iElapseTime;
     printf("%4d.%03ds\n", (int)(iElapseTime/1000), (int)(iElapseTime%1000));
@@ -412,6 +421,7 @@ void speedtest1_end_test(void){
     sqlite3_finalize(g.pStmt);
     g.pStmt = 0;
   }
+  iTestNumber = 0;
 }
 
 /* Report end of testing */

From f2e624ea918d6509165a07205d08acd7ffe77927 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 29 Aug 2022 12:31:57 +0000
Subject: [PATCH 033/428] Add get/setPtrValue() to the common wasm utils.

FossilOrigin-Name: 24d70fc458c6002d5ff3c9f8ce7c66bde299b32aca6417c2dd1236e1412b036d
---
 ext/wasm/api/sqlite3-api-oo1.js |  4 ++--
 ext/wasm/common/whwasmutil.js   |  9 +++++++++
 manifest                        | 14 +++++++-------
 manifest.uuid                   |  2 +-
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index 6317f97f51..5d4b19b5a9 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -553,8 +553,8 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
           DB.checkRc(this, capi.sqlite3_prepare_v3(
             this.pointer, pSql, sqlByteLen, 0, ppStmt, pzTail
           ));
-          const pStmt = wasm.getMemValue(ppStmt, wasm.ptrIR);
-          pSql = wasm.getMemValue(pzTail, wasm.ptrIR);
+          const pStmt = wasm.getPtrValue(ppStmt);
+          pSql = wasm.getPtrValue(pzTail);
           sqlByteLen = pSqlEnd - pSql;
           if(!pStmt) continue;
           if(Array.isArray(opt.saveSql)){
diff --git a/ext/wasm/common/whwasmutil.js b/ext/wasm/common/whwasmutil.js
index e51f690e29..3fef06f724 100644
--- a/ext/wasm/common/whwasmutil.js
+++ b/ext/wasm/common/whwasmutil.js
@@ -654,6 +654,15 @@ self.WhWasmUtilInstaller = function(target){
     toss('Invalid type for setMemValue(): ' + type);
   };
 
+
+  /** Convenience form of getMemValue() intended for fetching
+      pointer-to-pointer values. */
+  target.getPtrValue = (ptr)=>target.getMemValue(ptr, ptrIR);
+
+  /** Convenience form of setMemValue() intended for setting
+      pointer-to-pointer values. */
+  target.setPtrValue = (ptr, value)=>target.setMemValue(ptr, value, ptrIR);
+
   /**
      Expects ptr to be a pointer into the WASM heap memory which
      refers to a NUL-terminated C-style string encoded as UTF-8.
diff --git a/manifest b/manifest
index 1c823620f6..4ae286c3d5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sbegin/end\scomment\smarkers\sto\sthe\stest\sblocks\sin\sspeedtest1\s--script\soutput\sto\sfacilitate\schopping\sup\sthe\soutput\sinto\schunks\sfor\sJS-side\sprocessing.
-D 2022-08-29T09:51:17.953
+C Add\sget/setPtrValue()\sto\sthe\scommon\swasm\sutils.
+D 2022-08-29T12:31:57.599
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -483,7 +483,7 @@ F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba814
 F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a4a06cb776c003880b
 F ext/wasm/api/sqlite3-api-cleanup.js 1a12e64060c2cb0defd34656a76a9b1d7ed58459c290249bb31567c806fd44de
 F ext/wasm/api/sqlite3-api-glue.js 67ca83974410961953eeaa1dfed3518530d68381729ed1d27f95122f5baeabd3
-F ext/wasm/api/sqlite3-api-oo1.js ae7b07445b47cd3b875a8f926abad6c1b836aaba0c9e16c090051f5c8461949d
+F ext/wasm/api/sqlite3-api-oo1.js 46a5151610076f45472c8d4fd31b728cc12e6fac4d44ea5c7cd1af087a906539
 F ext/wasm/api/sqlite3-api-opfs.js 011799db398157cbd254264b6ebae00d7234b93d0e9e810345f213a5774993c0
 F ext/wasm/api/sqlite3-api-prologue.js 2d5c5d3355f55eefe51922cec5bfedbec0f8300db98a17685ab7a34a03953c7a
 F ext/wasm/api/sqlite3-api-worker1.js 73579555563b789785ae83724014eaf31811073aad9be6596c8336ffb51edd71
@@ -492,7 +492,7 @@ F ext/wasm/api/sqlite3-wasm.c 0d81282eaeff2a6e9fc5c28a388c5c5b45cf25a9393992fa51
 F ext/wasm/common/SqliteTestUtil.js eb96275bed43fdb364b7d65bcded0ca5e22aaacff120d593d1385f852f486247
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 572cf1ffae0b6eb7ca63684d3392bf350217a07b90e7a896e4fa850700c989b0
-F ext/wasm/common/whwasmutil.js 41b8e097e0a9cb07c24c0ede3c81b72470a63f4a4efb07f75586dc131569f5ae
+F ext/wasm/common/whwasmutil.js e1c6779c977c8614053e24311d489dd4872962cb58c27013d4778f0dd7329e9c
 F ext/wasm/demo-oo1.html 75646855b38405d82781246fd08c852a2b3bee05dd9f0fe10ab655a8cffb79aa
 F ext/wasm/demo-oo1.js aad38cb90b6fa7fd4d1184e759b25056fb4ed45c4957c458896354281259515f
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
@@ -2009,8 +2009,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 b5058f14fadbc8a1886f27cff08593dd2c8e2b2cb6d7bed3b8733a55f031989f
-R 36f1b21cb1d4644e92fb6c673b070ffc
+P ef0b7ef2d2e19b1f9437fdd7e24f040f662d9907d1fa17c6a3892fcf091b849e
+R b442ab29e0d8d5bef6fe7f9423ce5596
 U stephan
-Z 7df3fe59906fdbadae6efee36992f3be
+Z 5511f58972906137802924f203cb8dde
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index aef69a98ac..50e61bf33a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ef0b7ef2d2e19b1f9437fdd7e24f040f662d9907d1fa17c6a3892fcf091b849e
\ No newline at end of file
+24d70fc458c6002d5ff3c9f8ce7c66bde299b32aca6417c2dd1236e1412b036d
\ No newline at end of file

From 2cae138fbae5404fc8fc5319ba52abdb0d723c0c Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 29 Aug 2022 12:39:34 +0000
Subject: [PATCH 034/428] Add batch-runner.js for running batch SQL scripts
 with timing info.

FossilOrigin-Name: 11f3ed61150c5940da6c157e5063e70c3aa0628dfd0023c47bb65b00af74ab1f
---
 ext/wasm/GNUmakefile                |  18 ++-
 ext/wasm/batch-runner.html          |  59 +++++++
 ext/wasm/batch-runner.js            | 237 ++++++++++++++++++++++++++++
 ext/wasm/split-speedtest1-script.sh |  11 ++
 manifest                            |  15 +-
 manifest.uuid                       |   2 +-
 6 files changed, 333 insertions(+), 9 deletions(-)
 create mode 100644 ext/wasm/batch-runner.html
 create mode 100644 ext/wasm/batch-runner.js
 create mode 100755 ext/wasm/split-speedtest1-script.sh

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 40a69b200c..25d1e98084 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -194,15 +194,17 @@ ifneq (0,$(ENABLE_WASMFS))
   emcc.jsflags += -pthread -sWASMFS -sPTHREAD_POOL_SIZE=2
   emcc.cflags += '-DSQLITE_DEFAULT_UNIX_VFS="unix-none"'
   emcc.environment := $(emcc.environment),worker
+  emcc.jsflags += -sINITIAL_MEMORY=128450560
 else
   emcc.jsflags += -sALLOW_MEMORY_GROWTH
   # emcc: warning: USE_PTHREADS + ALLOW_MEMORY_GROWTH may run non-wasm code
   #       slowly, see https://github.com/WebAssembly/design/issues/1271
   #       [-Wpthreads-mem-growth]
+  emcc.jsflags += -sINITIAL_MEMORY=13107200
+  #emcc.jsflags += -sINITIAL_MEMORY=64225280
+  # ^^^^ 64MB is not enough for WASMFS/OPFS test runs using batch-runner.js
 endif
 emcc.jsflags += $(emcc.environment)
-#emcc.jsflags += -sINITIAL_MEMORY=13107200
-emcc.jsflags += -sINITIAL_MEMORY=64225280
 #emcc.jsflags += -sTOTAL_STACK=4194304
 emcc.jsflags += -sEXPORT_NAME=sqlite3InitModule
 emcc.jsflags += -sGLOBAL_BASE=4096 # HYPOTHETICALLY keep func table indexes from overlapping w/ heap addr.
@@ -285,6 +287,18 @@ all: $(sqlite3.js)
 # End main Emscripten-based module build
 ########################################################################
 
+########################################################################
+# Bits for use with batch-runner.js...
+speedtest1 := ../../speedtest1
+$(speedtest1):
+	$(MAKE) -C ../.. speedtest1
+speedtest1.sql: $(speedtest1)
+	$(speedtest1) --script $@
+batch-sql.in := $(sort $(wildcard *.sql))
+batch-runner.list: $(batch-sql.in) $(MAKEFILE) speedtest1.sql
+	bash split-speedtest1-script.sh speedtest1.sql
+	ls -1 *.sql | sort > $@
+batch: batch-runner.list
 
 ########################################################################
 # fiddle_remote is the remote destination for the fiddle app. It
diff --git a/ext/wasm/batch-runner.html b/ext/wasm/batch-runner.html
new file mode 100644
index 0000000000..f5031f8fe1
--- /dev/null
+++ b/ext/wasm/batch-runner.html
@@ -0,0 +1,59 @@
+<!doctype html>
+<html lang="en-us">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
+    <link rel="stylesheet" href="common/emscripten.css"/>
+    <link rel="stylesheet" href="common/testing.css"/>
+    <title>sqlite3-api batch SQL runner</title>
+  </head>
+  <body>
+    <header id='titlebar'><span>sqlite3-api batch SQL runner</span></header>
+    <!-- emscripten bits -->
+    <figure id="module-spinner">
+      <div class="spinner"></div>
+      <div class='center'><strong>Initializing app...</strong></div>
+      <div class='center'>
+        On a slow internet connection this may take a moment.  If this
+        message displays for "a long time", intialization may have
+        failed and the JavaScript console may contain clues as to why.
+      </div>
+    </figure>
+    <div class="emscripten" id="module-status">Downloading...</div>
+    <div class="emscripten">
+      <progress value="0" max="100" id="module-progress" hidden='1'></progress>  
+    </div><!-- /emscripten bits -->
+    <p class='warning'>ACHTUNG: this file requires a generated input list
+      file. Run "make batch" from this directory to generate it.
+    </p>
+    <p class='warning'>WARNING: if the WASMFS/OPFS layer crashes, this page may
+      become completely unresponsive and need to be closed and
+      reloaded to recover.
+    </p>
+    <hr>
+    <div>
+      <select id='sql-select'>
+        <option disabled selected>Populated via script code</option>
+      </select>
+      <button id='sql-run'>Run selected SQL</button>
+      <button id='output-clear'>Clear output</button>
+    </div>
+    <hr>
+    <div id='test-output'></div>
+    
+    <script src="sqlite3.js"></script>
+    <script src="common/SqliteTestUtil.js"></script>
+    <script src="batch-runner.js"></script>
+    <style>
+      .warning { color: firebrick; } 
+      #test-output {
+          border: 1px inset;
+          padding: 0.25em;
+          max-height: 20em;
+          overflow: auto;
+          white-space: break-spaces;
+      }
+    </style>
+  </body>
+</html>
diff --git a/ext/wasm/batch-runner.js b/ext/wasm/batch-runner.js
new file mode 100644
index 0000000000..b412dc2ced
--- /dev/null
+++ b/ext/wasm/batch-runner.js
@@ -0,0 +1,237 @@
+/*
+  2022-08-29
+
+  The author disclaims copyright to this source code.  In place of a
+  legal notice, here is a blessing:
+
+  *   May you do good and not evil.
+  *   May you find forgiveness for yourself and forgive others.
+  *   May you share freely, never taking more than you give.
+
+  ***********************************************************************
+
+  A basic batch SQL running for sqlite3-api.js. This file must be run in
+  main JS thread and sqlite3.js must have been loaded before it.
+*/
+'use strict';
+(function(){
+  const T = self.SqliteTestUtil;
+  const toss = function(...args){throw new Error(args.join(' '))};
+  const debug = console.debug.bind(console);
+
+  const App = {
+    e: {
+      output: document.querySelector('#test-output'),
+      selSql: document.querySelector('#sql-select'),
+      btnRun: document.querySelector('#sql-run'),
+      btnClear: document.querySelector('#output-clear')
+    },
+    log: console.log.bind(console),
+    warn: console.warn.bind(console),
+    cls: function(){this.e.output.innerHTML = ''},
+    logHtml2: function(cssClass,...args){
+      const ln = document.createElement('div');
+      if(cssClass) ln.classList.add(cssClass);
+      ln.append(document.createTextNode(args.join(' ')));
+      this.e.output.append(ln);
+    },
+    logHtml: function(...args){
+      console.log(...args);
+      if(1) this.logHtml2('', ...args);
+    },
+    logErr: function(...args){
+      console.error(...args);
+      if(1) this.logHtml2('error', ...args);
+    },
+
+    openDb: function(fn){
+      if(this.pDb){
+        toss("Already have an opened db.");
+      }
+      const capi = this.sqlite3.capi, wasm = capi.wasm;
+      const stack = wasm.scopedAllocPush();
+      let pDb = 0;
+      try{
+        const oFlags = capi.SQLITE_OPEN_CREATE | capi.SQLITE_OPEN_READWRITE;
+        const ppDb = wasm.scopedAllocPtr();
+        const rc = capi.sqlite3_open_v2(fn, ppDb, oFlags, null);
+        pDb = wasm.getPtrValue(ppDb)
+      }finally{
+        wasm.scopedAllocPop(stack);
+      }
+      this.logHtml("Opened db:",capi.sqlite3_db_filename(pDb, 'main'));
+      return this.pDb = pDb;
+    },
+
+    closeDb: function(){
+      if(this.pDb){
+        this.sqlite3.capi.sqlite3_close_v2(this.pDb);
+        this.pDb = undefined;
+      }
+    },
+
+    loadSqlList: async function(){
+      const sel = this.e.selSql;
+      sel.innerHTML = '';
+      this.blockControls(true);
+      const infile = 'batch-runner.list';
+      this.logHtml("Loading list of SQL files:", infile);
+      let txt;
+      try{
+        const r = await fetch(infile);
+        if(404 === r.status){
+          toss("Missing file '"+infile+"'.");
+        }
+        if(!r.ok) toss("Loading",infile,"failed:",r.statusText);
+        txt = await r.text();
+      }catch(e){
+        this.logErr(e.message);
+        throw e;
+      }finally{
+        this.blockControls(false);
+      }
+      const list = txt.split('\n');
+      let opt;
+      if(0){
+        opt = document.createElement('option');
+        opt.innerText = "Select file to evaluate...";
+        opt.value = '';
+        opt.disabled = true;
+        opt.selected = true;
+        sel.appendChild(opt);
+      }
+      list.forEach(function(fn){
+        opt = document.createElement('option');
+        opt.value = opt.innerText = fn;
+        sel.appendChild(opt);
+      });
+      this.logHtml("Loaded",infile);
+    },
+
+    /** Fetch ./fn and return its contents as a Uint8Array. */
+    fetchFile: async function(fn){
+      this.logHtml("Fetching",fn,"...");
+      let sql;
+      try {
+        const r = await fetch(fn);
+        if(!r.ok) toss("Fetch failed:",r.statusText);
+        sql = new Uint8Array(await r.arrayBuffer());
+      }catch(e){
+        this.logErr(e.message);
+        throw e;
+      }
+      this.logHtml("Fetched",sql.length,"bytes from",fn);
+      return sql;
+    },
+
+    checkRc: function(rc){
+      if(rc){
+        toss("Prepare failed:",this.sqlite3.capi.sqlite3_errmsg(this.pDb));
+      }
+    },
+
+    blockControls: function(block){
+      [
+        this.e.selSql, this.e.btnRun, this.e.btnClear
+      ].forEach((e)=>e.disabled = block);
+    },
+    
+    /** Fetch ./fn and eval it as an SQL blob. */
+    evalFile: async function(fn){
+      const sql = await this.fetchFile(fn);
+      this.logHtml("Running",fn,'...');
+      const capi = this.sqlite3.capi, wasm = capi.wasm;
+      let pStmt = 0, pSqlBegin;
+      const stack = wasm.scopedAllocPush();
+      const metrics = Object.create(null);
+      metrics.prepTotal = metrics.stepTotal = 0;
+      metrics.stmtCount = 0;
+      this.blockControls(true);
+      // Use setTimeout() so that the above log messages run before the loop starts.
+      setTimeout((function(){
+        metrics.timeStart = performance.now();
+        try {
+          let t;
+          let sqlByteLen = sql.byteLength;
+          const [ppStmt, pzTail] = wasm.scopedAllocPtr(2);
+          pSqlBegin = wasm.alloc( sqlByteLen + 1/*SQL + NUL*/);
+          let pSql = pSqlBegin;
+          const pSqlEnd = pSqlBegin + sqlByteLen;
+          wasm.heap8().set(sql, pSql);
+          wasm.setMemValue(pSql + sqlByteLen, 0);
+          while(wasm.getMemValue(pSql,'i8')){
+            pStmt = 0;
+            wasm.setPtrValue(ppStmt, 0);
+            wasm.setPtrValue(pzTail, 0);
+            t = performance.now();
+            let rc = capi.sqlite3_prepare_v3(
+              this.pDb, pSql, sqlByteLen, 0, ppStmt, pzTail
+            );
+            metrics.prepTotal += performance.now() - t;
+            this.checkRc(rc);
+            ++metrics.stmtCount;
+            pStmt = wasm.getPtrValue(ppStmt);
+            pSql = wasm.getPtrValue(pzTail);
+            sqlByteLen = pSqlEnd - pSql;
+            if(!pStmt) continue/*empty statement*/;
+            t = performance.now();
+            rc = capi.sqlite3_step(pStmt);
+            metrics.stepTotal += performance.now() - t;
+            switch(rc){
+                case capi.SQLITE_ROW:
+                case capi.SQLITE_DONE: break;
+                default: this.checkRc(rc); toss("Not reached.");
+            }
+          }
+        }catch(e){
+          this.logErr(e.message);
+          throw e;
+        }finally{
+          wasm.dealloc(pSqlBegin);
+          wasm.scopedAllocPop(stack);
+          this.blockControls(false);
+        }
+        metrics.timeEnd = performance.now();
+        metrics.timeTotal = (metrics.timeEnd - metrics.timeStart);
+        this.logHtml("Metrics:");//,JSON.stringify(metrics, undefined, ' '));
+        this.logHtml("prepare() count:",metrics.stmtCount);
+        this.logHtml("Time in prepare_v2():",metrics.prepTotal,"ms",
+                     "("+(metrics.prepTotal / metrics.stmtCount),"ms per prepare())");
+        this.logHtml("Time in step():",metrics.stepTotal,"ms",
+                     "("+(metrics.stepTotal / metrics.stmtCount),"ms per step())");
+        this.logHtml("Total runtime:",metrics.timeTotal,"ms");
+        this.logHtml("Overhead (time - prep - step):",
+                     (metrics.timeTotal - metrics.prepTotal - metrics.stepTotal)+"ms");
+      }.bind(this)), 10);
+    },
+
+    run: function(sqlite3){
+      this.sqlite3 = sqlite3;
+      const capi = sqlite3.capi, wasm = capi.wasm;
+      this.logHtml("Loaded module:",capi.sqlite3_libversion(), capi.sqlite3_sourceid());
+      this.logHtml("WASM heap size =",wasm.heap8().length);
+      this.logHtml("WARNING: if the WASMFS/OPFS layer crashes, this page may",
+                   "become unresponsive and need to be closed and ",
+                   "reloaded to recover.");
+      const pDir = capi.sqlite3_web_persistent_dir();
+      const dbFile = pDir ? pDir+"/speedtest.db" : ":memory:";
+      if(pDir){
+        // We initially need a clean db file, so...
+        capi.sqlite3_wasm_vfs_unlink(dbFile);
+      }
+      this.openDb(dbFile);
+      this.loadSqlList();
+      const who = this;
+      this.e.btnClear.addEventListener('click', ()=>this.cls(), false);
+      this.e.btnRun.addEventListener('click', function(){
+        if(!who.e.selSql.value) return;
+        who.evalFile(who.e.selSql.value);
+      }, false);
+    }
+  }/*App*/;
+
+  self.sqlite3TestModule.initSqlite3().then(function(theEmccModule){
+    self._MODULE = theEmccModule /* this is only to facilitate testing from the console */;
+    App.run(theEmccModule.sqlite3);
+  });
+})();
diff --git a/ext/wasm/split-speedtest1-script.sh b/ext/wasm/split-speedtest1-script.sh
new file mode 100755
index 0000000000..c7dae3eb68
--- /dev/null
+++ b/ext/wasm/split-speedtest1-script.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+# Expects $1 to be a (speedtest1 --script) output file. Output is a
+# series of SQL files extracted from that file.
+infile=${1:?arg = speedtest1 --script output file}
+testnums=$(grep -e '^-- begin test' "$infile" | cut -d' ' -f4)
+#echo testnums=$testnums
+for n in $testnums; do
+  ofile=$(printf "speedtest1-%03d.sql" $n)
+  sed -n -e "/^-- begin test $n\$/,/^-- end test $n\$/p" $infile > $ofile
+  echo -e "$n\t$ofile"
+done
diff --git a/manifest b/manifest
index 4ae286c3d5..ca4d7ea9d8 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sget/setPtrValue()\sto\sthe\scommon\swasm\sutils.
-D 2022-08-29T12:31:57.599
+C Add\sbatch-runner.js\sfor\srunning\sbatch\sSQL\sscripts\swith\stiming\sinfo.
+D 2022-08-29T12:39:34.874
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle db7a4602f043cf4a5e4135be3609a487f9f1c83f05778bfbdf93766be4541b96
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile 12b4cefa1653df172ac54400f83b626b4969b4007da2ce523ebc27c8726656b0
+F ext/wasm/GNUmakefile 61c0d9dcda9ca174907f87770c9440b26408dc415d2e11a3cbcae017358fd08c
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 77ef4bcf37e362b9ad61f9c175dfc0f1b3e571563fb311b96581cf422ee6a8ec
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -489,6 +489,8 @@ F ext/wasm/api/sqlite3-api-prologue.js 2d5c5d3355f55eefe51922cec5bfedbec0f8300db
 F ext/wasm/api/sqlite3-api-worker1.js 73579555563b789785ae83724014eaf31811073aad9be6596c8336ffb51edd71
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 0d81282eaeff2a6e9fc5c28a388c5c5b45cf25a9393992fa511ac009b27df982
+F ext/wasm/batch-runner.html f9068c4b4222d0c11ba0590391892e4d7576ef1a4fb76974ba0bd3b80c6217f9
+F ext/wasm/batch-runner.js 57f325e40812a89f8d47c918963f278d7a249d158cf0d245d75e74577af638c8
 F ext/wasm/common/SqliteTestUtil.js eb96275bed43fdb364b7d65bcded0ca5e22aaacff120d593d1385f852f486247
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 572cf1ffae0b6eb7ca63684d3392bf350217a07b90e7a896e4fa850700c989b0
@@ -508,6 +510,7 @@ F ext/wasm/scratchpad-opfs-main.js 69e960e9161f6412fd0c30f355d4112f1894d6609eb43
 F ext/wasm/scratchpad-opfs-worker.html 66c1d15d678f3bd306373d76b61c6c8aef988f61f4a8dd40185d452f9c6d2bf5
 F ext/wasm/scratchpad-opfs-worker.js 3ec2868c669713145c76eb5877c64a1b20741f741817b87c907a154b676283a9
 F ext/wasm/scratchpad-opfs-worker2.js 5f2237427ac537b8580b1c659ff14ad2621d1694043eaaf41ae18dbfef2e48c0
+F ext/wasm/split-speedtest1-script.sh dc187a66b692e21343a84767627e9e408dde504d9e92d4dfa63a2b43cedab292 x
 F ext/wasm/sqlite3-worker1-promiser.js 92b8da5f38439ffec459a8215775d30fa498bc0f1ab929ff341fc3dd479660b9
 F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
@@ -2009,8 +2012,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 ef0b7ef2d2e19b1f9437fdd7e24f040f662d9907d1fa17c6a3892fcf091b849e
-R b442ab29e0d8d5bef6fe7f9423ce5596
+P 24d70fc458c6002d5ff3c9f8ce7c66bde299b32aca6417c2dd1236e1412b036d
+R ed1761d31b9a32171fc27afe1d89c1b7
 U stephan
-Z 5511f58972906137802924f203cb8dde
+Z 4abbcdb5df49f5d67360636a18d94c2b
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 50e61bf33a..36a59ff465 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-24d70fc458c6002d5ff3c9f8ce7c66bde299b32aca6417c2dd1236e1412b036d
\ No newline at end of file
+11f3ed61150c5940da6c157e5063e70c3aa0628dfd0023c47bb65b00af74ab1f
\ No newline at end of file

From 49a785fa34753687c00f3a492700efbdce0535aa Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 29 Aug 2022 17:41:16 +0000
Subject: [PATCH 035/428] Add test descriptions to the speedtest1 '-- begin'
 markers for potential display by the downstream JS code which uses those
 markers.

FossilOrigin-Name: e5b7006f0f57f10a490d7eaeb7df77251a2f684602fed8ff161d8ce60033e7bc
---
 ext/wasm/split-speedtest1-script.sh |  6 +++++-
 manifest                            | 14 +++++++-------
 manifest.uuid                       |  2 +-
 test/speedtest1.c                   |  4 +++-
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/ext/wasm/split-speedtest1-script.sh b/ext/wasm/split-speedtest1-script.sh
index c7dae3eb68..e228a872ec 100755
--- a/ext/wasm/split-speedtest1-script.sh
+++ b/ext/wasm/split-speedtest1-script.sh
@@ -3,9 +3,13 @@
 # series of SQL files extracted from that file.
 infile=${1:?arg = speedtest1 --script output file}
 testnums=$(grep -e '^-- begin test' "$infile" | cut -d' ' -f4)
+if [ x = "x${testnums}" ]; then
+  echo "Could not parse any begin/end blocks out of $infile" 1>&2
+  exit 1
+fi
 #echo testnums=$testnums
 for n in $testnums; do
   ofile=$(printf "speedtest1-%03d.sql" $n)
-  sed -n -e "/^-- begin test $n\$/,/^-- end test $n\$/p" $infile > $ofile
+  sed -n -e "/^-- begin test $n /,/^-- end test $n\$/p" $infile > $ofile
   echo -e "$n\t$ofile"
 done
diff --git a/manifest b/manifest
index ca4d7ea9d8..6eb43c0ef2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sbatch-runner.js\sfor\srunning\sbatch\sSQL\sscripts\swith\stiming\sinfo.
-D 2022-08-29T12:39:34.874
+C Add\stest\sdescriptions\sto\sthe\sspeedtest1\s'--\sbegin'\smarkers\sfor\spotential\sdisplay\sby\sthe\sdownstream\sJS\scode\swhich\suses\sthose\smarkers.
+D 2022-08-29T17:41:16.571
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -510,7 +510,7 @@ F ext/wasm/scratchpad-opfs-main.js 69e960e9161f6412fd0c30f355d4112f1894d6609eb43
 F ext/wasm/scratchpad-opfs-worker.html 66c1d15d678f3bd306373d76b61c6c8aef988f61f4a8dd40185d452f9c6d2bf5
 F ext/wasm/scratchpad-opfs-worker.js 3ec2868c669713145c76eb5877c64a1b20741f741817b87c907a154b676283a9
 F ext/wasm/scratchpad-opfs-worker2.js 5f2237427ac537b8580b1c659ff14ad2621d1694043eaaf41ae18dbfef2e48c0
-F ext/wasm/split-speedtest1-script.sh dc187a66b692e21343a84767627e9e408dde504d9e92d4dfa63a2b43cedab292 x
+F ext/wasm/split-speedtest1-script.sh 7138e474122686fecb274d78050f9bee6525bc64b72ff1af39f6fc0753ccfc1f x
 F ext/wasm/sqlite3-worker1-promiser.js 92b8da5f38439ffec459a8215775d30fa498bc0f1ab929ff341fc3dd479660b9
 F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
@@ -1493,7 +1493,7 @@ F test/speed3.test 694affeb9100526007436334cf7d08f3d74b85ef
 F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
 F test/speed4p.test 377a0c48e5a92e0b11c1c5ebb1bc9d83a7312c922bc0cb05970ef5d6a96d1f0c
-F test/speedtest1.c ad03c49d993b6fd4e8e6ad1df561edd1c17ec85226edd2137c355e404a0f985d
+F test/speedtest1.c 995c78f884e2388106b2b42de9e5a527e7cac01384b8f317ca0cc7b0814c9a18
 F test/spellfix.test 951a6405d49d1a23d6b78027d3877b4a33eeb8221dcab5704b499755bb4f552e
 F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3
 F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33
@@ -2012,8 +2012,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 24d70fc458c6002d5ff3c9f8ce7c66bde299b32aca6417c2dd1236e1412b036d
-R ed1761d31b9a32171fc27afe1d89c1b7
+P 11f3ed61150c5940da6c157e5063e70c3aa0628dfd0023c47bb65b00af74ab1f
+R 2ae8456ec9776838052861c3fb138f8f
 U stephan
-Z 4abbcdb5df49f5d67360636a18d94c2b
+Z 47d6dbc110cfca896ac7235ddcb7f7bf
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 36a59ff465..99bc257577 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-11f3ed61150c5940da6c157e5063e70c3aa0628dfd0023c47bb65b00af74ab1f
\ No newline at end of file
+e5b7006f0f57f10a490d7eaeb7df77251a2f684602fed8ff161d8ce60033e7bc
\ No newline at end of file
diff --git a/test/speedtest1.c b/test/speedtest1.c
index 7f0e3d34a9..401217f105 100644
--- a/test/speedtest1.c
+++ b/test/speedtest1.c
@@ -387,7 +387,9 @@ void speedtest1_begin_test(int iTestNum, const char *zTestName, ...){
     n = NAMEWIDTH;
   }
   if( g.pScript ){
-    fprintf(g.pScript,"-- begin test %d\n", iTestNumber);
+    fprintf(g.pScript,"-- begin test %d %.*s\n", iTestNumber, n, zName)
+      /* maintenance reminder: ^^^ code in ext/wasm expects %d to be
+      ** field #4 (as in: cut -d' ' -f4). */;
   }
   if( g.bSqlOnly ){
     printf("/* %4d - %s%.*s */\n", iTestNum, zName, NAMEWIDTH-n, zDots);

From 2f06bf2541f651be4f0fdcaf2329f25b4eb2f3e5 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 29 Aug 2022 18:58:38 +0000
Subject: [PATCH 036/428] Lots of tweaking in batch-runner.js. Minor internal
 API update in OO #1 API.

FossilOrigin-Name: 24b82b9504db3d8e1335c2300b133f897dc1a541026dc24be5b0ffd8be66d977
---
 ext/wasm/GNUmakefile            |   8 +-
 ext/wasm/api/sqlite3-api-oo1.js |   6 +-
 ext/wasm/batch-runner.html      |  23 ++++-
 ext/wasm/batch-runner.js        | 157 ++++++++++++++++++++++----------
 manifest                        |  18 ++--
 manifest.uuid                   |   2 +-
 6 files changed, 147 insertions(+), 67 deletions(-)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 25d1e98084..6a0835ece4 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -294,10 +294,12 @@ $(speedtest1):
 	$(MAKE) -C ../.. speedtest1
 speedtest1.sql: $(speedtest1)
 	$(speedtest1) --script $@
-batch-sql.in := $(sort $(wildcard *.sql))
-batch-runner.list: $(batch-sql.in) $(MAKEFILE) speedtest1.sql
+speedtest1-000.sql:
+	echo "select 1;" > $@
+batch-runner.list: $(MAKEFILE) speedtest1.sql speedtest1-000.sql
 	bash split-speedtest1-script.sh speedtest1.sql
-	ls -1 *.sql | sort > $@
+	ls -1 *.sql | grep -v speedtest1.sql | sort > $@
+CLEAN_FILES += batch-runner.list speedtest1*.sql
 batch: batch-runner.list
 
 ########################################################################
diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index 5d4b19b5a9..2cfb478865 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -540,7 +540,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
         if(isTA) wasm.heap8().set(arg.sql, pSql);
         else wasm.jstrcpy(arg.sql, wasm.heap8(), pSql, sqlByteLen, false);
         wasm.setMemValue(pSql + sqlByteLen, 0/*NUL terminator*/);
-        while(wasm.getMemValue(pSql, 'i8')
+        while(pSql && wasm.getMemValue(pSql, 'i8')
               /* Maintenance reminder:^^^ _must_ be 'i8' or else we
                  will very likely cause an endless loop. What that's
                  doing is checking for a terminating NUL byte. If we
@@ -548,8 +548,8 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
                  around the NUL terminator, and get stuck in and
                  endless loop at the end of the SQL, endlessly
                  re-preparing an empty statement. */ ){
-          wasm.setMemValue(ppStmt, 0, wasm.ptrIR);
-          wasm.setMemValue(pzTail, 0, wasm.ptrIR);
+          wasm.setPtrValue(ppStmt, 0);
+          wasm.setPtrValue(pzTail, 0);
           DB.checkRc(this, capi.sqlite3_prepare_v3(
             this.pointer, pSql, sqlByteLen, 0, ppStmt, pzTail
           ));
diff --git a/ext/wasm/batch-runner.html b/ext/wasm/batch-runner.html
index f5031f8fe1..c91e591553 100644
--- a/ext/wasm/batch-runner.html
+++ b/ext/wasm/batch-runner.html
@@ -24,35 +24,48 @@
     <div class="emscripten">
       <progress value="0" max="100" id="module-progress" hidden='1'></progress>  
     </div><!-- /emscripten bits -->
-    <p class='warning'>ACHTUNG: this file requires a generated input list
+    <p>
+      This page is for running extracts from the output of <tt>speedtest --script</tt>.
+    </p>
+    <p id='warn-list' class='warning'>ACHTUNG: this file requires a generated input list
       file. Run "make batch" from this directory to generate it.
     </p>
-    <p class='warning'>WARNING: if the WASMFS/OPFS layer crashes, this page may
+    <p id='warn-opfs' class='warning'>WARNING: if the WASMFS/OPFS layer crashes, this page may
       become completely unresponsive and need to be closed and
       reloaded to recover.
     </p>
     <hr>
     <div>
-      <select id='sql-select'>
+      <select class='disable-during-eval' id='sql-select'>
         <option disabled selected>Populated via script code</option>
       </select>
-      <button id='sql-run'>Run selected SQL</button>
+      <button class='disable-during-eval' id='sql-run'>Run selected SQL</button>
+      <button class='disable-during-eval' id='sql-run-next'>Run next...</button>
+      <button class='disable-during-eval' id='sql-run-remaining'>Run all remaining...</button>
+      <button class='disable-during-eval' id='db-reset'>Reset db</button>
       <button id='output-clear'>Clear output</button>
     </div>
     <hr>
+    <div>(Log output is in reverse order, newest first!)</div>
     <div id='test-output'></div>
     
     <script src="sqlite3.js"></script>
     <script src="common/SqliteTestUtil.js"></script>
     <script src="batch-runner.js"></script>
     <style>
+      body {
+          display: flex;
+          flex-direction: column;
+          flex-wrap: wrap;
+      }
       .warning { color: firebrick; } 
       #test-output {
           border: 1px inset;
           padding: 0.25em;
-          max-height: 20em;
+          /*max-height: 30em;*/
           overflow: auto;
           white-space: break-spaces;
+          display: flex; flex-direction: column-reverse;
       }
     </style>
   </body>
diff --git a/ext/wasm/batch-runner.js b/ext/wasm/batch-runner.js
index b412dc2ced..0f5406f902 100644
--- a/ext/wasm/batch-runner.js
+++ b/ext/wasm/batch-runner.js
@@ -17,15 +17,19 @@
 (function(){
   const T = self.SqliteTestUtil;
   const toss = function(...args){throw new Error(args.join(' '))};
-  const debug = console.debug.bind(console);
+  const warn = console.warn.bind(console);
 
   const App = {
     e: {
       output: document.querySelector('#test-output'),
       selSql: document.querySelector('#sql-select'),
       btnRun: document.querySelector('#sql-run'),
-      btnClear: document.querySelector('#output-clear')
+      btnRunNext: document.querySelector('#sql-run-next'),
+      btnRunRemaining: document.querySelector('#sql-run-remaining'),
+      btnClear: document.querySelector('#output-clear'),
+      btnReset: document.querySelector('#db-reset')
     },
+    cache:{},
     log: console.log.bind(console),
     warn: console.warn.bind(console),
     cls: function(){this.e.output.innerHTML = ''},
@@ -34,6 +38,7 @@
       if(cssClass) ln.classList.add(cssClass);
       ln.append(document.createTextNode(args.join(' ')));
       this.e.output.append(ln);
+      //this.e.output.lastElementChild.scrollIntoViewIfNeeded();
     },
     logHtml: function(...args){
       console.log(...args);
@@ -44,29 +49,38 @@
       if(1) this.logHtml2('error', ...args);
     },
 
-    openDb: function(fn){
-      if(this.pDb){
+    openDb: function(fn, unlinkFirst=true){
+      if(this.db && this.db.ptr){
         toss("Already have an opened db.");
       }
       const capi = this.sqlite3.capi, wasm = capi.wasm;
       const stack = wasm.scopedAllocPush();
       let pDb = 0;
       try{
+        /*if(unlinkFirst && fn && ':memory:'!==fn){
+          capi.sqlite3_wasm_vfs_unlink(fn);
+        }*/
         const oFlags = capi.SQLITE_OPEN_CREATE | capi.SQLITE_OPEN_READWRITE;
         const ppDb = wasm.scopedAllocPtr();
         const rc = capi.sqlite3_open_v2(fn, ppDb, oFlags, null);
+        if(rc) toss("sqlite3_open_v2() failed with code",rc);
         pDb = wasm.getPtrValue(ppDb)
       }finally{
         wasm.scopedAllocPop(stack);
       }
-      this.logHtml("Opened db:",capi.sqlite3_db_filename(pDb, 'main'));
-      return this.pDb = pDb;
+      this.db = Object.create(null);
+      this.db.filename = fn;
+      this.db.ptr = pDb;
+      this.logHtml("Opened db:",fn);
+      return this.db.ptr;
     },
 
-    closeDb: function(){
-      if(this.pDb){
-        this.sqlite3.capi.sqlite3_close_v2(this.pDb);
-        this.pDb = undefined;
+    closeDb: function(unlink=false){
+      if(this.db && this.db.ptr){
+        this.sqlite3.capi.sqlite3_close_v2(this.db.ptr);
+        this.logHtml("Closed db",this.db.filename);
+        if(unlink) capi.sqlite3_wasm_vfs_unlink(this.db.filename);
+        this.db.ptr = this.db.filename = undefined;
       }
     },
 
@@ -84,13 +98,15 @@
         }
         if(!r.ok) toss("Loading",infile,"failed:",r.statusText);
         txt = await r.text();
+        const warning = document.querySelector('#warn-list');
+        if(warning) warning.remove();
       }catch(e){
         this.logErr(e.message);
         throw e;
       }finally{
         this.blockControls(false);
       }
-      const list = txt.split('\n');
+      const list = txt.split(/\n+/);
       let opt;
       if(0){
         opt = document.createElement('option');
@@ -101,6 +117,7 @@
         sel.appendChild(opt);
       }
       list.forEach(function(fn){
+        if(!fn) return;
         opt = document.createElement('option');
         opt.value = opt.innerText = fn;
         sel.appendChild(opt);
@@ -109,7 +126,8 @@
     },
 
     /** Fetch ./fn and return its contents as a Uint8Array. */
-    fetchFile: async function(fn){
+    fetchFile: async function(fn, cacheIt=false){
+      if(cacheIt && this.cache[fn]) return this.cache[fn];
       this.logHtml("Fetching",fn,"...");
       let sql;
       try {
@@ -121,25 +139,28 @@
         throw e;
       }
       this.logHtml("Fetched",sql.length,"bytes from",fn);
+      if(cacheIt) this.cache[fn] = sql;
       return sql;
-    },
+    }/*fetchFile()*/,
 
+    /** Throws if the given sqlite3 result code is not 0. */
     checkRc: function(rc){
-      if(rc){
-        toss("Prepare failed:",this.sqlite3.capi.sqlite3_errmsg(this.pDb));
+      if(this.db.ptr && rc){
+        toss("Prepare failed:",this.sqlite3.capi.sqlite3_errmsg(this.db.ptr));
       }
     },
 
-    blockControls: function(block){
-      [
-        this.e.selSql, this.e.btnRun, this.e.btnClear
-      ].forEach((e)=>e.disabled = block);
+    /** Disable or enable certain UI controls. */
+    blockControls: function(disable){
+      document.querySelectorAll('.disable-during-eval').forEach((e)=>e.disabled = disable);
     },
-    
+
     /** Fetch ./fn and eval it as an SQL blob. */
     evalFile: async function(fn){
       const sql = await this.fetchFile(fn);
-      this.logHtml("Running",fn,'...');
+      const banner = "========================================";
+      this.logHtml(banner,
+                   "Running",fn,'('+sql.length,'bytes)...');
       const capi = this.sqlite3.capi, wasm = capi.wasm;
       let pStmt = 0, pSqlBegin;
       const stack = wasm.scopedAllocPush();
@@ -147,35 +168,41 @@
       metrics.prepTotal = metrics.stepTotal = 0;
       metrics.stmtCount = 0;
       this.blockControls(true);
-      // Use setTimeout() so that the above log messages run before the loop starts.
-      setTimeout((function(){
-        metrics.timeStart = performance.now();
+      if(this.gotErr){
+        this.logErr("Cannot run ["+fn+"]: error cleanup is pending.");
+        return;
+      }
+      // Run this async so that the UI can be updated for the above header...
+      const ff = function(resolve, reject){
+        metrics.evalFileStart = performance.now();
         try {
           let t;
           let sqlByteLen = sql.byteLength;
           const [ppStmt, pzTail] = wasm.scopedAllocPtr(2);
-          pSqlBegin = wasm.alloc( sqlByteLen + 1/*SQL + NUL*/);
+          pSqlBegin = wasm.alloc( sqlByteLen + 1/*SQL + NUL*/) || toss("alloc(",sqlByteLen,") failed");
           let pSql = pSqlBegin;
           const pSqlEnd = pSqlBegin + sqlByteLen;
           wasm.heap8().set(sql, pSql);
           wasm.setMemValue(pSql + sqlByteLen, 0);
-          while(wasm.getMemValue(pSql,'i8')){
-            pStmt = 0;
+          let breaker = 0;
+          while(pSql && wasm.getMemValue(pSql,'i8')){
             wasm.setPtrValue(ppStmt, 0);
             wasm.setPtrValue(pzTail, 0);
             t = performance.now();
             let rc = capi.sqlite3_prepare_v3(
-              this.pDb, pSql, sqlByteLen, 0, ppStmt, pzTail
+              this.db.ptr, pSql, sqlByteLen, 0, ppStmt, pzTail
             );
             metrics.prepTotal += performance.now() - t;
             this.checkRc(rc);
-            ++metrics.stmtCount;
             pStmt = wasm.getPtrValue(ppStmt);
             pSql = wasm.getPtrValue(pzTail);
             sqlByteLen = pSqlEnd - pSql;
             if(!pStmt) continue/*empty statement*/;
+            ++metrics.stmtCount;
             t = performance.now();
             rc = capi.sqlite3_step(pStmt);
+            capi.sqlite3_finalize(pStmt);
+            pStmt = 0;
             metrics.stepTotal += performance.now() - t;
             switch(rc){
                 case capi.SQLITE_ROW:
@@ -184,50 +211,88 @@
             }
           }
         }catch(e){
-          this.logErr(e.message);
-          throw e;
+          if(pStmt) capi.sqlite3_finalize(pStmt);
+          this.gotErr = e;
+          //throw e;
+          reject(e);
+          return;
         }finally{
           wasm.dealloc(pSqlBegin);
           wasm.scopedAllocPop(stack);
           this.blockControls(false);
         }
-        metrics.timeEnd = performance.now();
-        metrics.timeTotal = (metrics.timeEnd - metrics.timeStart);
+        metrics.evalFileEnd = performance.now();
+        metrics.evalTimeTotal = (metrics.evalFileEnd - metrics.evalFileStart);
         this.logHtml("Metrics:");//,JSON.stringify(metrics, undefined, ' '));
         this.logHtml("prepare() count:",metrics.stmtCount);
         this.logHtml("Time in prepare_v2():",metrics.prepTotal,"ms",
                      "("+(metrics.prepTotal / metrics.stmtCount),"ms per prepare())");
         this.logHtml("Time in step():",metrics.stepTotal,"ms",
                      "("+(metrics.stepTotal / metrics.stmtCount),"ms per step())");
-        this.logHtml("Total runtime:",metrics.timeTotal,"ms");
+        this.logHtml("Total runtime:",metrics.evalTimeTotal,"ms");
         this.logHtml("Overhead (time - prep - step):",
-                     (metrics.timeTotal - metrics.prepTotal - metrics.stepTotal)+"ms");
-      }.bind(this)), 10);
-    },
+                     (metrics.evalTimeTotal - metrics.prepTotal - metrics.stepTotal)+"ms");
+        this.logHtml(banner,"End of",fn);
+        resolve(this);
+      }.bind(this);
+      let p;
+      if(1){
+        p = new Promise(function(res,rej){
+          setTimeout(()=>ff(res, rej), 50)/*give UI a chance to output the "running" banner*/;
+        });
+      }else{
+        p = new Promise(ff);
+      }
+      return p.catch((e)=>this.logErr("Error via evalFile("+fn+"):",e.message));
+    }/*evalFile()*/,
 
     run: function(sqlite3){
+      delete this.run;
       this.sqlite3 = sqlite3;
       const capi = sqlite3.capi, wasm = capi.wasm;
       this.logHtml("Loaded module:",capi.sqlite3_libversion(), capi.sqlite3_sourceid());
       this.logHtml("WASM heap size =",wasm.heap8().length);
-      this.logHtml("WARNING: if the WASMFS/OPFS layer crashes, this page may",
-                   "become unresponsive and need to be closed and ",
-                   "reloaded to recover.");
+      this.loadSqlList();
       const pDir = capi.sqlite3_web_persistent_dir();
       const dbFile = pDir ? pDir+"/speedtest.db" : ":memory:";
-      if(pDir){
-        // We initially need a clean db file, so...
-        capi.sqlite3_wasm_vfs_unlink(dbFile);
+      if(!pDir){
+        document.querySelector('#warn-opfs').remove();
       }
-      this.openDb(dbFile);
-      this.loadSqlList();
+      this.openDb(dbFile, !!pDir);
       const who = this;
       this.e.btnClear.addEventListener('click', ()=>this.cls(), false);
       this.e.btnRun.addEventListener('click', function(){
         if(!who.e.selSql.value) return;
         who.evalFile(who.e.selSql.value);
       }, false);
-    }
+      this.e.btnRunNext.addEventListener('click', function(){
+        ++who.e.selSql.selectedIndex;
+        if(!who.e.selSql.value) return;
+        who.evalFile(who.e.selSql.value);
+      }, false);
+      this.e.btnReset.addEventListener('click', function(){
+        const fn = who.db.filename;
+        if(fn){
+          who.closeDb(true);
+          who.openDb(fn,true);
+        }
+      }, false);
+      this.e.btnRunRemaining.addEventListener('click', async function(){
+        let v = who.e.selSql.value;
+        const timeStart = performance.now();
+        while(v){
+          await who.evalFile(v);
+          if(who.gotError){
+            who.logErr("Error handling script",v,":",who.gotError.message);
+            break;
+          }
+          ++who.e.selSql.selectedIndex;
+          v = who.e.selSql.value;
+        }
+        const timeTotal = performance.now() - timeStart;
+        who.logHtml("Run-remaining time:",timeTotal,"ms ("+(timeTotal/1000/60)+" minute(s))");
+      }, false);
+    }/*run()*/
   }/*App*/;
 
   self.sqlite3TestModule.initSqlite3().then(function(theEmccModule){
diff --git a/manifest b/manifest
index 6eb43c0ef2..bfcc12ac8f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stest\sdescriptions\sto\sthe\sspeedtest1\s'--\sbegin'\smarkers\sfor\spotential\sdisplay\sby\sthe\sdownstream\sJS\scode\swhich\suses\sthose\smarkers.
-D 2022-08-29T17:41:16.571
+C Lots\sof\stweaking\sin\sbatch-runner.js.\sMinor\sinternal\sAPI\supdate\sin\sOO\s#1\sAPI.
+D 2022-08-29T18:58:38.025
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle db7a4602f043cf4a5e4135be3609a487f9f1c83f05778bfbdf93766be4541b96
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile 61c0d9dcda9ca174907f87770c9440b26408dc415d2e11a3cbcae017358fd08c
+F ext/wasm/GNUmakefile cabfbb177d16c550442313416698e66dde575df27177d4ca3ccece5a66b37de4
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 77ef4bcf37e362b9ad61f9c175dfc0f1b3e571563fb311b96581cf422ee6a8ec
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -483,14 +483,14 @@ F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba814
 F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a4a06cb776c003880b
 F ext/wasm/api/sqlite3-api-cleanup.js 1a12e64060c2cb0defd34656a76a9b1d7ed58459c290249bb31567c806fd44de
 F ext/wasm/api/sqlite3-api-glue.js 67ca83974410961953eeaa1dfed3518530d68381729ed1d27f95122f5baeabd3
-F ext/wasm/api/sqlite3-api-oo1.js 46a5151610076f45472c8d4fd31b728cc12e6fac4d44ea5c7cd1af087a906539
+F ext/wasm/api/sqlite3-api-oo1.js 183e863eedaba547ffe4981ab95797813b60da46749992bca400d2646e5ccd82
 F ext/wasm/api/sqlite3-api-opfs.js 011799db398157cbd254264b6ebae00d7234b93d0e9e810345f213a5774993c0
 F ext/wasm/api/sqlite3-api-prologue.js 2d5c5d3355f55eefe51922cec5bfedbec0f8300db98a17685ab7a34a03953c7a
 F ext/wasm/api/sqlite3-api-worker1.js 73579555563b789785ae83724014eaf31811073aad9be6596c8336ffb51edd71
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 0d81282eaeff2a6e9fc5c28a388c5c5b45cf25a9393992fa511ac009b27df982
-F ext/wasm/batch-runner.html f9068c4b4222d0c11ba0590391892e4d7576ef1a4fb76974ba0bd3b80c6217f9
-F ext/wasm/batch-runner.js 57f325e40812a89f8d47c918963f278d7a249d158cf0d245d75e74577af638c8
+F ext/wasm/batch-runner.html e5c3edd4a6c9359f6d9e6c99cb5f87f09007d98fa1c705ed3efa370abcd4323e
+F ext/wasm/batch-runner.js 84a465acde760de81d0372415cce56737799876395a878c44a7d3ce5dfe29e39
 F ext/wasm/common/SqliteTestUtil.js eb96275bed43fdb364b7d65bcded0ca5e22aaacff120d593d1385f852f486247
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 572cf1ffae0b6eb7ca63684d3392bf350217a07b90e7a896e4fa850700c989b0
@@ -2012,8 +2012,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 11f3ed61150c5940da6c157e5063e70c3aa0628dfd0023c47bb65b00af74ab1f
-R 2ae8456ec9776838052861c3fb138f8f
+P e5b7006f0f57f10a490d7eaeb7df77251a2f684602fed8ff161d8ce60033e7bc
+R ac09921b66efbf8cc7311954674841d9
 U stephan
-Z 47d6dbc110cfca896ac7235ddcb7f7bf
+Z 16cfbad53a69907d89a4919845ccdd35
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 99bc257577..622070996d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e5b7006f0f57f10a490d7eaeb7df77251a2f684602fed8ff161d8ce60033e7bc
\ No newline at end of file
+24b82b9504db3d8e1335c2300b133f897dc1a541026dc24be5b0ffd8be66d977
\ No newline at end of file

From 5bb5965710d0429c371e9a24c7865eae891bdfa8 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 30 Aug 2022 09:49:30 +0000
Subject: [PATCH 037/428] wasm util: remove superfluous function.bind() calls
 to eliminate a level of call() indirection.

FossilOrigin-Name: 1aab9627983ef0f016b01f78564e79cf815ed14d4b1b6dc04ec627b96f1b2f70
---
 ext/wasm/common/whwasmutil.js | 123 +++++++++++++++++-----------------
 manifest                      |  12 ++--
 manifest.uuid                 |   2 +-
 3 files changed, 68 insertions(+), 69 deletions(-)

diff --git a/ext/wasm/common/whwasmutil.js b/ext/wasm/common/whwasmutil.js
index 3fef06f724..38adc76c2f 100644
--- a/ext/wasm/common/whwasmutil.js
+++ b/ext/wasm/common/whwasmutil.js
@@ -326,7 +326,7 @@ self.WhWasmUtilInstaller = function(target){
           if(c.HEAP64) return unsigned ? c.HEAP64U : c.HEAP64;
           break;
         default:
-          if(this.bigIntEnabled){
+          if(target.bigIntEnabled){
             if(n===self['BigUint64Array']) return c.HEAP64U;
             else if(n===self['BigInt64Array']) return c.HEAP64;
             break;
@@ -334,7 +334,7 @@ self.WhWasmUtilInstaller = function(target){
     }
     toss("Invalid heapForSize() size: expecting 8, 16, 32,",
          "or (if BigInt is enabled) 64.");
-  }.bind(target);
+  };
 
   /**
      Returns the WASM-exported "indirect function table."
@@ -346,16 +346,16 @@ self.WhWasmUtilInstaller = function(target){
         - Use `__indirect_function_table` as the import name for the
         table, which is what LLVM does.
     */
-  }.bind(target);
+  };
 
   /**
      Given a function pointer, returns the WASM function table entry
      if found, else returns a falsy value.
   */
   target.functionEntry = function(fptr){
-    const ft = this.functionTable();
+    const ft = target.functionTable();
     return fptr < ft.length ? ft.get(fptr) : undefined;
-  }.bind(target);
+  };
 
   /**
      Creates a WASM function which wraps the given JS function and
@@ -504,7 +504,7 @@ self.WhWasmUtilInstaller = function(target){
      https://github.com/emscripten-core/emscripten/issues/17323
   */
   target.installFunction = function f(func, sig){
-    const ft = this.functionTable();
+    const ft = target.functionTable();
     const oldLen = ft.length;
     let ptr;
     while(cache.freeFuncIndexes.length){
@@ -532,13 +532,13 @@ self.WhWasmUtilInstaller = function(target){
     }
     // It's not a WASM-exported function, so compile one...
     try {
-      ft.set(ptr, this.jsFuncToWasm(func, sig));
+      ft.set(ptr, target.jsFuncToWasm(func, sig));
     }catch(e){
       if(ptr===oldLen) cache.freeFuncIndexes.push(oldLen);
       throw e;
     }
     return ptr;      
-  }.bind(target);
+  };
 
   /**
      Requires a pointer value previously returned from
@@ -551,12 +551,12 @@ self.WhWasmUtilInstaller = function(target){
   */
   target.uninstallFunction = function(ptr){
     const fi = cache.freeFuncIndexes;
-    const ft = this.functionTable();
+    const ft = target.functionTable();
     fi.push(ptr);
     const rc = ft.get(ptr);
     ft.set(ptr, null);
     return rc;
-  }.bind(target);
+  };
 
   /**
      Given a WASM heap memory address and a data type name in the form
@@ -614,14 +614,14 @@ self.WhWasmUtilInstaller = function(target){
         case 'i16': return c.HEAP16[ptr>>1];
         case 'i32': return c.HEAP32[ptr>>2];
         case 'i64':
-          if(this.bigIntEnabled) return BigInt(c.HEAP64[ptr>>3]);
+          if(target.bigIntEnabled) return BigInt(c.HEAP64[ptr>>3]);
           break;
         case 'float': case 'f32': return c.HEAP32F[ptr>>2];
         case 'double': case 'f64': return Number(c.HEAP64F[ptr>>3]);
         default: break;
     }
     toss('Invalid type for getMemValue():',type);
-  }.bind(target);
+  };
 
   /**
      The counterpart of getMemValue(), this sets a numeric value at
@@ -698,9 +698,9 @@ self.WhWasmUtilInstaller = function(target){
      ptr is falsy, `null` is returned.
   */
   target.cstringToJs = function(ptr){
-    const n = this.cstrlen(ptr);
+    const n = target.cstrlen(ptr);
     return n ? __utf8Decode(heapWrappers().HEAP8U, ptr, ptr+n) : (null===n ? n : "");
-  }.bind(target);
+  };
 
   /**
      Given a JS string, this function returns its UTF-8 length in
@@ -828,16 +828,16 @@ self.WhWasmUtilInstaller = function(target){
   */
   target.cstrncpy = function(tgtPtr, srcPtr, n){
     if(!tgtPtr || !srcPtr) toss("cstrncpy() does not accept NULL strings.");
-    if(n<0) n = this.cstrlen(strPtr)+1;
+    if(n<0) n = target.cstrlen(strPtr)+1;
     else if(!(n>0)) return 0;
-    const heap = this.heap8u();
+    const heap = target.heap8u();
     let i = 0, ch;
     for(; i < n && (ch = heap[srcPtr+i]); ++i){
       heap[tgtPtr+i] = ch;
     }
     if(i<n) heap[tgtPtr + i++] = 0;
     return i;
-  }.bind(target);
+  };
 
   /**
      For the given JS string, returns a Uint8Array of its contents
@@ -882,13 +882,13 @@ self.WhWasmUtilInstaller = function(target){
   };
 
   const __allocCStr = function(jstr, returnWithLength, allocator, funcName){
-    __affirmAlloc(this, funcName);
+    __affirmAlloc(target, funcName);
     if('string'!==typeof jstr) return null;
-    const n = this.jstrlen(jstr),
+    const n = target.jstrlen(jstr),
           ptr = allocator(n+1);
-    this.jstrcpy(jstr, this.heap8u(), ptr, n+1, true);
+    target.jstrcpy(jstr, target.heap8u(), ptr, n+1, true);
     return returnWithLength ? [ptr, n] : ptr;
-  }.bind(target);
+  };
 
   /**
      Uses target.alloc() to allocate enough memory for jstrlen(jstr)+1
@@ -941,11 +941,11 @@ self.WhWasmUtilInstaller = function(target){
      alloc levels are currently active.
    */
   target.scopedAllocPush = function(){
-    __affirmAlloc(this, 'scopedAllocPush');
+    __affirmAlloc(target, 'scopedAllocPush');
     const a = [];
     cache.scopedAlloc.push(a);
     return a;
-  }.bind(target);
+  };
 
   /**
      Cleans up all allocations made using scopedAlloc() in the context
@@ -970,15 +970,15 @@ self.WhWasmUtilInstaller = function(target){
      trivial code that may be a non-issue.
   */
   target.scopedAllocPop = function(state){
-    __affirmAlloc(this, 'scopedAllocPop');
+    __affirmAlloc(target, 'scopedAllocPop');
     const n = arguments.length
           ? cache.scopedAlloc.indexOf(state)
           : cache.scopedAlloc.length-1;
     if(n<0) toss("Invalid state object for scopedAllocPop().");
     if(0===arguments.length) state = cache.scopedAlloc[n];
     cache.scopedAlloc.splice(n,1);
-    for(let p; (p = state.pop()); ) this.dealloc(p);
-  }.bind(target);
+    for(let p; (p = state.pop()); ) target.dealloc(p);
+  };
 
   /**
      Allocates n bytes of memory using this.alloc() and records that
@@ -1000,10 +1000,10 @@ self.WhWasmUtilInstaller = function(target){
     if(!cache.scopedAlloc.length){
       toss("No scopedAllocPush() scope is active.");
     }
-    const p = this.alloc(n);
+    const p = target.alloc(n);
     cache.scopedAlloc[cache.scopedAlloc.length-1].push(p);
     return p;
-  }.bind(target);
+  };
 
   Object.defineProperty(target.scopedAlloc, 'level', {
     configurable: false, enumerable: false,
@@ -1030,15 +1030,15 @@ self.WhWasmUtilInstaller = function(target){
      result of calling func().
   */
   target.scopedAllocCall = function(func){
-    this.scopedAllocPush();
-    try{ return func() } finally{ this.scopedAllocPop() }
-  }.bind(target);
+    target.scopedAllocPush();
+    try{ return func() } finally{ target.scopedAllocPop() }
+  };
 
   /** Internal impl for allocPtr() and scopedAllocPtr(). */
   const __allocPtr = function(howMany, method){
-    __affirmAlloc(this, method);
-    let m = this[method](howMany * ptrSizeof);
-    this.setMemValue(m, 0, ptrIR)
+    __affirmAlloc(target, method);
+    let m = target[method](howMany * ptrSizeof);
+    target.setMemValue(m, 0, ptrIR)
     if(1===howMany){
       return m;
     }
@@ -1046,10 +1046,10 @@ self.WhWasmUtilInstaller = function(target){
     for(let i = 1; i < howMany; ++i){
       m += ptrSizeof;
       a[i] = m;
-      this.setMemValue(m, 0, ptrIR);
+      target.setMemValue(m, 0, ptrIR);
     }
     return a;
-  }.bind(target);  
+  };
 
   /**
      Allocates a single chunk of memory capable of holding `howMany`
@@ -1099,7 +1099,7 @@ self.WhWasmUtilInstaller = function(target){
      not legal to pass an Array object to a WASM function.)
   */
   target.xCall = function(fname, ...args){
-    const f = this.xGet(fname);
+    const f = target.xGet(fname);
     if(!(f instanceof Function)) toss("Exported symbol",fname,"is not a function.");
     if(f.length!==args.length) __argcMismatch(fname,f.length)
     /* This is arguably over-pedantic but we want to help clients keep
@@ -1107,7 +1107,7 @@ self.WhWasmUtilInstaller = function(target){
     return (2===arguments.length && Array.isArray(arguments[1]))
       ? f.apply(null, arguments[1])
       : f.apply(null, args);
-  }.bind(target);
+  };
 
   /**
      State for use with xWrap()
@@ -1181,19 +1181,19 @@ self.WhWasmUtilInstaller = function(target){
     */
     xcv.arg['func-ptr'] = function(v){
       if(!(v instanceof Function)) return xcv.arg[ptrIR];
-      const f = this.jsFuncToWasm(v, WHAT_SIGNATURE);
-    }.bind(target);
+      const f = target.jsFuncToWasm(v, WHAT_SIGNATURE);
+    };
   }
 
-  const __xArgAdapter =
+  const __xArgAdapterCheck =
         (t)=>xcv.arg[t] || toss("Argument adapter not found:",t);
 
-  const __xResultAdapter =
+  const __xResultAdapterCheck =
         (t)=>xcv.result[t] || toss("Result adapter not found:",t);
   
-  cache.xWrap.convertArg = (t,v)=>__xArgAdapter(t)(v);
+  cache.xWrap.convertArg = (t,v)=>__xArgAdapterCheck(t)(v);
   cache.xWrap.convertResult =
-    (t,v)=>(null===t ? v : (t ? __xResultAdapter(t)(v) : undefined));
+    (t,v)=>(null===t ? v : (t ? __xResultAdapterCheck(t)(v) : undefined));
 
   /**
      Creates a wrapper for the WASM-exported function fname. Uses
@@ -1327,34 +1327,32 @@ self.WhWasmUtilInstaller = function(target){
     if(3===arguments.length && Array.isArray(arguments[2])){
       argTypes = arguments[2];
     }
-    const xf = this.xGet(fname);
-    if(argTypes.length!==xf.length) __argcMismatch(fname, xf.length)
+    const xf = target.xGet(fname);
+    if(argTypes.length!==xf.length) __argcMismatch(fname, xf.length);
     if((null===resultType) && 0===xf.length){
       /* Func taking no args with an as-is return. We don't need a wrapper. */
       return xf;
     }
     /*Verify the arg type conversions are valid...*/;
-    if(undefined!==resultType && null!==resultType) __xResultAdapter(resultType);
-    argTypes.forEach(__xArgAdapter)
+    if(undefined!==resultType && null!==resultType) __xResultAdapterCheck(resultType);
+    argTypes.forEach(__xArgAdapterCheck);
     if(0===xf.length){
       // No args to convert, so we can create a simpler wrapper...
-      return function(){
-        return (arguments.length
-                ? __argcMismatch(fname, xf.length)
-                : cache.xWrap.convertResult(resultType, xf.call(null)));
-      };
+      return (...args)=>(args.length
+                         ? __argcMismatch(fname, xf.length)
+                         : cache.xWrap.convertResult(resultType, xf.call(null)));
     }
     return function(...args){
       if(args.length!==xf.length) __argcMismatch(fname, xf.length);
-      const scope = this.scopedAllocPush();
+      const scope = target.scopedAllocPush();
       try{
         const rc = xf.apply(null,args.map((v,i)=>cache.xWrap.convertArg(argTypes[i], v)));
         return cache.xWrap.convertResult(resultType, rc);
       }finally{
-        this.scopedAllocPop(scope);
+        target.scopedAllocPop(scope);
       }
-    }.bind(this);
-  }.bind(target)/*xWrap()*/;
+    };
+  }/*xWrap()*/;
 
   /** Internal impl for xWrap.resultAdapter() and argAdaptor(). */
   const __xAdapter = function(func, argc, typeName, adapter, modeName, xcvPart){
@@ -1458,8 +1456,8 @@ self.WhWasmUtilInstaller = function(target){
   */
   target.xCallWrapped = function(fname, resultType, argTypes, ...args){
     if(Array.isArray(arguments[3])) args = arguments[3];
-    return this.xWrap(fname, resultType, argTypes||[]).apply(null, args||[]);
-  }.bind(target);
+    return target.xWrap(fname, resultType, argTypes||[]).apply(null, args||[]);
+  };
   
   return target;
 };
@@ -1539,10 +1537,11 @@ self.WhWasmUtilInstaller.yawl = function(config){
           || toss("Missing 'memory' object!");
       }
       if(!tgt.alloc && arg.instance.exports.malloc){
+        const exports = arg.instance.exports;
         tgt.alloc = function(n){
-          return this(n) || toss("Allocation of",n,"bytes failed.");
-        }.bind(arg.instance.exports.malloc);
-        tgt.dealloc = function(m){this(m)}.bind(arg.instance.exports.free);
+          return exports.malloc(n) || toss("Allocation of",n,"bytes failed.");
+        };
+        tgt.dealloc = function(m){exports.free(m)};
       }
       wui(tgt);
     }
diff --git a/manifest b/manifest
index bfcc12ac8f..11a40f3737 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Lots\sof\stweaking\sin\sbatch-runner.js.\sMinor\sinternal\sAPI\supdate\sin\sOO\s#1\sAPI.
-D 2022-08-29T18:58:38.025
+C wasm\sutil:\sremove\ssuperfluous\sfunction.bind()\scalls\sto\seliminate\sa\slevel\sof\scall()\sindirection.
+D 2022-08-30T09:49:30.007
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -494,7 +494,7 @@ F ext/wasm/batch-runner.js 84a465acde760de81d0372415cce56737799876395a878c44a7d3
 F ext/wasm/common/SqliteTestUtil.js eb96275bed43fdb364b7d65bcded0ca5e22aaacff120d593d1385f852f486247
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 572cf1ffae0b6eb7ca63684d3392bf350217a07b90e7a896e4fa850700c989b0
-F ext/wasm/common/whwasmutil.js e1c6779c977c8614053e24311d489dd4872962cb58c27013d4778f0dd7329e9c
+F ext/wasm/common/whwasmutil.js 3d68a9cd87a2d8f7e6d5a78f3b829a927f2e28422685e029139f6e75d4ed42e4
 F ext/wasm/demo-oo1.html 75646855b38405d82781246fd08c852a2b3bee05dd9f0fe10ab655a8cffb79aa
 F ext/wasm/demo-oo1.js aad38cb90b6fa7fd4d1184e759b25056fb4ed45c4957c458896354281259515f
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
@@ -2012,8 +2012,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 e5b7006f0f57f10a490d7eaeb7df77251a2f684602fed8ff161d8ce60033e7bc
-R ac09921b66efbf8cc7311954674841d9
+P 24b82b9504db3d8e1335c2300b133f897dc1a541026dc24be5b0ffd8be66d977
+R c9f285330e60c2a709dc88c6f308d17d
 U stephan
-Z 16cfbad53a69907d89a4919845ccdd35
+Z 746ec57f2eb86d7d664aa6615f7c7bf3
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 622070996d..fe3f5cacb1 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-24b82b9504db3d8e1335c2300b133f897dc1a541026dc24be5b0ffd8be66d977
\ No newline at end of file
+1aab9627983ef0f016b01f78564e79cf815ed14d4b1b6dc04ec627b96f1b2f70
\ No newline at end of file

From 429899ddad8acac2346874184d263f438ac9b4b6 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 30 Aug 2022 09:51:24 +0000
Subject: [PATCH 038/428] Remove the .timer script entry from fiddle app
 because emscripten has removed getrusage(), which breaks the timer.

FossilOrigin-Name: 9034f19ae50f196cc2b94478edfcc8d765b08bcf383166f6212b3522dea63c01
---
 ext/wasm/fiddle/fiddle.js |  3 ++-
 manifest                  | 12 ++++++------
 manifest.uuid             |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ext/wasm/fiddle/fiddle.js b/ext/wasm/fiddle/fiddle.js
index 3fd36bff86..ec56dd5930 100644
--- a/ext/wasm/fiddle/fiddle.js
+++ b/ext/wasm/fiddle/fiddle.js
@@ -730,7 +730,8 @@
 -- only that part is executed.
 -- ================================================
 .help`},
-                {name: "Timer on", sql: ".timer on"},
+              //{name: "Timer on", sql: ".timer on"},
+              // ^^^ re-enable if emscripten re-enables getrusage()
                 {name: "Setup table T", sql:`.nullvalue NULL
 CREATE TABLE t(a,b);
 INSERT INTO t(a,b) VALUES('abc',123),('def',456),(NULL,789),('ghi',012);
diff --git a/manifest b/manifest
index 11a40f3737..97a8f12651 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C wasm\sutil:\sremove\ssuperfluous\sfunction.bind()\scalls\sto\seliminate\sa\slevel\sof\scall()\sindirection.
-D 2022-08-30T09:49:30.007
+C Remove\sthe\s.timer\sscript\sentry\sfrom\sfiddle\sapp\sbecause\semscripten\shas\sremoved\sgetrusage(),\swhich\sbreaks\sthe\stimer.
+D 2022-08-30T09:51:24.863
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -500,7 +500,7 @@ F ext/wasm/demo-oo1.js aad38cb90b6fa7fd4d1184e759b25056fb4ed45c4957c458896354281
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js bccf46045be8824752876f3eec01c223be0616ccac184bffd0024cfe7a3262b8
 F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
-F ext/wasm/fiddle/fiddle.js bef4b30e078445a7cd2255fba07acd083aa1c3cc074a73b38ea847fd340f1adc
+F ext/wasm/fiddle/fiddle.js 4ffcfc9a235beebaddec689a549e9e0dfad6dca5c1f0b41f03468d7e76480686
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 447cc02b598f7792edaa8ae6853a7847b8178a18ed356afacbdbf312b2588106
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
@@ -2012,8 +2012,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 24b82b9504db3d8e1335c2300b133f897dc1a541026dc24be5b0ffd8be66d977
-R c9f285330e60c2a709dc88c6f308d17d
+P 1aab9627983ef0f016b01f78564e79cf815ed14d4b1b6dc04ec627b96f1b2f70
+R 7a91cd8f075d71f1129b2c16dc0c7e0d
 U stephan
-Z 746ec57f2eb86d7d664aa6615f7c7bf3
+Z fa99287ead67c43b637178f52d6fe01b
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index fe3f5cacb1..ef13e59932 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1aab9627983ef0f016b01f78564e79cf815ed14d4b1b6dc04ec627b96f1b2f70
\ No newline at end of file
+9034f19ae50f196cc2b94478edfcc8d765b08bcf383166f6212b3522dea63c01
\ No newline at end of file

From fbf0f488cfe0a240ca219969a334d498a30769b5 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 30 Aug 2022 10:04:08 +0000
Subject: [PATCH 039/428] batch-runner.js: move generated SQL files into ./sql
 and start adding hand-written ones (like the Mandelbrot) to that set.

FossilOrigin-Name: 06c106a7d23e4486dbed092757b7588688226ad35539ecc31378a8497f59d1ec
---
 ext/wasm/GNUmakefile                | 15 ++++++++-------
 ext/wasm/batch-runner.js            |  3 ++-
 ext/wasm/split-speedtest1-script.sh |  4 +++-
 ext/wasm/sql/000-mandelbrot.sql     | 17 +++++++++++++++++
 manifest                            | 17 +++++++++--------
 manifest.uuid                       |  2 +-
 6 files changed, 40 insertions(+), 18 deletions(-)
 create mode 100644 ext/wasm/sql/000-mandelbrot.sql

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 6a0835ece4..1067018d4a 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -289,18 +289,19 @@ all: $(sqlite3.js)
 
 ########################################################################
 # Bits for use with batch-runner.js...
+dir.sql := sql
 speedtest1 := ../../speedtest1
+speedtest1.sql := $(dir.sql)/speedtest1.sql
 $(speedtest1):
 	$(MAKE) -C ../.. speedtest1
-speedtest1.sql: $(speedtest1)
+$(speedtest1.sql): $(speedtest1)
 	$(speedtest1) --script $@
-speedtest1-000.sql:
-	echo "select 1;" > $@
-batch-runner.list: $(MAKEFILE) speedtest1.sql speedtest1-000.sql
-	bash split-speedtest1-script.sh speedtest1.sql
-	ls -1 *.sql | grep -v speedtest1.sql | sort > $@
-CLEAN_FILES += batch-runner.list speedtest1*.sql
+batch-runner.list: $(MAKEFILE) $(speedtest1.sql) $(dir.sql)/000-mandelbrot.sql
+	bash split-speedtest1-script.sh $(dir.sql)/speedtest1.sql
+	ls -1 $(dir.sql)/*.sql | grep -v speedtest1.sql | sort > $@
+CLEAN_FILES += batch-runner.list $(dir.sql)/speedtest1*.sql
 batch: batch-runner.list
+all: batch
 
 ########################################################################
 # fiddle_remote is the remote destination for the fiddle app. It
diff --git a/ext/wasm/batch-runner.js b/ext/wasm/batch-runner.js
index 0f5406f902..71171c3236 100644
--- a/ext/wasm/batch-runner.js
+++ b/ext/wasm/batch-runner.js
@@ -119,7 +119,8 @@
       list.forEach(function(fn){
         if(!fn) return;
         opt = document.createElement('option');
-        opt.value = opt.innerText = fn;
+        opt.value = fn;
+        opt.innerText = fn.split('/').pop();
         sel.appendChild(opt);
       });
       this.logHtml("Loaded",infile);
diff --git a/ext/wasm/split-speedtest1-script.sh b/ext/wasm/split-speedtest1-script.sh
index e228a872ec..e072d08a1e 100755
--- a/ext/wasm/split-speedtest1-script.sh
+++ b/ext/wasm/split-speedtest1-script.sh
@@ -7,9 +7,11 @@ if [ x = "x${testnums}" ]; then
   echo "Could not parse any begin/end blocks out of $infile" 1>&2
   exit 1
 fi
+odir=${infile%%/*}
+if [ "$odir" = "$infile" ]; then odir="."; fi
 #echo testnums=$testnums
 for n in $testnums; do
-  ofile=$(printf "speedtest1-%03d.sql" $n)
+  ofile=$odir/$(printf "speedtest1-%03d.sql" $n)
   sed -n -e "/^-- begin test $n /,/^-- end test $n\$/p" $infile > $ofile
   echo -e "$n\t$ofile"
 done
diff --git a/ext/wasm/sql/000-mandelbrot.sql b/ext/wasm/sql/000-mandelbrot.sql
new file mode 100644
index 0000000000..3aa5f57156
--- /dev/null
+++ b/ext/wasm/sql/000-mandelbrot.sql
@@ -0,0 +1,17 @@
+WITH RECURSIVE
+  xaxis(x) AS (VALUES(-2.0) UNION ALL SELECT x+0.05 FROM xaxis WHERE x<1.2),
+  yaxis(y) AS (VALUES(-1.0) UNION ALL SELECT y+0.1 FROM yaxis WHERE y<1.0),
+  m(iter, cx, cy, x, y) AS (
+    SELECT 0, x, y, 0.0, 0.0 FROM xaxis, yaxis
+    UNION ALL
+    SELECT iter+1, cx, cy, x*x-y*y + cx, 2.0*x*y + cy FROM m 
+     WHERE (x*x + y*y) < 4.0 AND iter<28
+  ),
+  m2(iter, cx, cy) AS (
+    SELECT max(iter), cx, cy FROM m GROUP BY cx, cy
+  ),
+  a(t) AS (
+    SELECT group_concat( substr(' .+*#', 1+min(iter/7,4), 1), '') 
+    FROM m2 GROUP BY cy
+  )
+SELECT group_concat(rtrim(t),x'0a') as Mandelbrot FROM a;
diff --git a/manifest b/manifest
index 97a8f12651..f8f5e73b26 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sthe\s.timer\sscript\sentry\sfrom\sfiddle\sapp\sbecause\semscripten\shas\sremoved\sgetrusage(),\swhich\sbreaks\sthe\stimer.
-D 2022-08-30T09:51:24.863
+C batch-runner.js:\smove\sgenerated\sSQL\sfiles\sinto\s./sql\sand\sstart\sadding\shand-written\sones\s(like\sthe\sMandelbrot)\sto\sthat\sset.
+D 2022-08-30T10:04:08.374
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle db7a4602f043cf4a5e4135be3609a487f9f1c83f05778bfbdf93766be4541b96
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile cabfbb177d16c550442313416698e66dde575df27177d4ca3ccece5a66b37de4
+F ext/wasm/GNUmakefile b5d1e285ed9814646e1fb12a27b7507aea2d7208ef76e486e1471c8aabac5226
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 77ef4bcf37e362b9ad61f9c175dfc0f1b3e571563fb311b96581cf422ee6a8ec
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -490,7 +490,7 @@ F ext/wasm/api/sqlite3-api-worker1.js 73579555563b789785ae83724014eaf31811073aad
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 0d81282eaeff2a6e9fc5c28a388c5c5b45cf25a9393992fa511ac009b27df982
 F ext/wasm/batch-runner.html e5c3edd4a6c9359f6d9e6c99cb5f87f09007d98fa1c705ed3efa370abcd4323e
-F ext/wasm/batch-runner.js 84a465acde760de81d0372415cce56737799876395a878c44a7d3ce5dfe29e39
+F ext/wasm/batch-runner.js e5b4b93b8008b2cc53694025042b7322267790063d1f0c96cf1b17e9d5a75c7d
 F ext/wasm/common/SqliteTestUtil.js eb96275bed43fdb364b7d65bcded0ca5e22aaacff120d593d1385f852f486247
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 572cf1ffae0b6eb7ca63684d3392bf350217a07b90e7a896e4fa850700c989b0
@@ -510,7 +510,8 @@ F ext/wasm/scratchpad-opfs-main.js 69e960e9161f6412fd0c30f355d4112f1894d6609eb43
 F ext/wasm/scratchpad-opfs-worker.html 66c1d15d678f3bd306373d76b61c6c8aef988f61f4a8dd40185d452f9c6d2bf5
 F ext/wasm/scratchpad-opfs-worker.js 3ec2868c669713145c76eb5877c64a1b20741f741817b87c907a154b676283a9
 F ext/wasm/scratchpad-opfs-worker2.js 5f2237427ac537b8580b1c659ff14ad2621d1694043eaaf41ae18dbfef2e48c0
-F ext/wasm/split-speedtest1-script.sh 7138e474122686fecb274d78050f9bee6525bc64b72ff1af39f6fc0753ccfc1f x
+F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
+F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sqlite3-worker1-promiser.js 92b8da5f38439ffec459a8215775d30fa498bc0f1ab929ff341fc3dd479660b9
 F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
@@ -2012,8 +2013,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 1aab9627983ef0f016b01f78564e79cf815ed14d4b1b6dc04ec627b96f1b2f70
-R 7a91cd8f075d71f1129b2c16dc0c7e0d
+P 9034f19ae50f196cc2b94478edfcc8d765b08bcf383166f6212b3522dea63c01
+R 3fee411065930bf42f56509feb119f8a
 U stephan
-Z fa99287ead67c43b637178f52d6fe01b
+Z 41ba67db7a03bd9c0e2ce1f308cc01b3
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index ef13e59932..f8b12461be 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9034f19ae50f196cc2b94478edfcc8d765b08bcf383166f6212b3522dea63c01
\ No newline at end of file
+06c106a7d23e4486dbed092757b7588688226ad35539ecc31378a8497f59d1ec
\ No newline at end of file

From ffc0cbb0248123ea635ad83428d5b4be11a8508b Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 30 Aug 2022 10:26:33 +0000
Subject: [PATCH 040/428] batch-runner.js: re-enable unlink-before-run so that
 OPFS speedtest1 batch can work.

FossilOrigin-Name: ba08f7a7f12601aa580a8dc493b43cdd5ab65c87d5e4b3fd2f549343e45c2d2a
---
 ext/wasm/batch-runner.js |  4 ++--
 manifest                 | 12 ++++++------
 manifest.uuid            |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ext/wasm/batch-runner.js b/ext/wasm/batch-runner.js
index 71171c3236..cbd712bb91 100644
--- a/ext/wasm/batch-runner.js
+++ b/ext/wasm/batch-runner.js
@@ -57,9 +57,9 @@
       const stack = wasm.scopedAllocPush();
       let pDb = 0;
       try{
-        /*if(unlinkFirst && fn && ':memory:'!==fn){
+        if(unlinkFirst && fn && ':memory:'!==fn){
           capi.sqlite3_wasm_vfs_unlink(fn);
-        }*/
+        }
         const oFlags = capi.SQLITE_OPEN_CREATE | capi.SQLITE_OPEN_READWRITE;
         const ppDb = wasm.scopedAllocPtr();
         const rc = capi.sqlite3_open_v2(fn, ppDb, oFlags, null);
diff --git a/manifest b/manifest
index f8f5e73b26..28e7c2d2de 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C batch-runner.js:\smove\sgenerated\sSQL\sfiles\sinto\s./sql\sand\sstart\sadding\shand-written\sones\s(like\sthe\sMandelbrot)\sto\sthat\sset.
-D 2022-08-30T10:04:08.374
+C batch-runner.js:\sre-enable\sunlink-before-run\sso\sthat\sOPFS\sspeedtest1\sbatch\scan\swork.
+D 2022-08-30T10:26:33.223
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -490,7 +490,7 @@ F ext/wasm/api/sqlite3-api-worker1.js 73579555563b789785ae83724014eaf31811073aad
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 0d81282eaeff2a6e9fc5c28a388c5c5b45cf25a9393992fa511ac009b27df982
 F ext/wasm/batch-runner.html e5c3edd4a6c9359f6d9e6c99cb5f87f09007d98fa1c705ed3efa370abcd4323e
-F ext/wasm/batch-runner.js e5b4b93b8008b2cc53694025042b7322267790063d1f0c96cf1b17e9d5a75c7d
+F ext/wasm/batch-runner.js da471fb7b5c6c918cfe59adaebedc3af24a1268084d09d90143653c71b2493dd
 F ext/wasm/common/SqliteTestUtil.js eb96275bed43fdb364b7d65bcded0ca5e22aaacff120d593d1385f852f486247
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 572cf1ffae0b6eb7ca63684d3392bf350217a07b90e7a896e4fa850700c989b0
@@ -2013,8 +2013,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 9034f19ae50f196cc2b94478edfcc8d765b08bcf383166f6212b3522dea63c01
-R 3fee411065930bf42f56509feb119f8a
+P 06c106a7d23e4486dbed092757b7588688226ad35539ecc31378a8497f59d1ec
+R 4e67c8f75eba175d0066f0954616ff1b
 U stephan
-Z 41ba67db7a03bd9c0e2ce1f308cc01b3
+Z 9d799461f6bdad041adab908a7c4bd92
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f8b12461be..50b5203520 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-06c106a7d23e4486dbed092757b7588688226ad35539ecc31378a8497f59d1ec
\ No newline at end of file
+ba08f7a7f12601aa580a8dc493b43cdd5ab65c87d5e4b3fd2f549343e45c2d2a
\ No newline at end of file

From 53f635df55ecfce3baf9fccc1909dad53bd9643e Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 30 Aug 2022 17:57:50 +0000
Subject: [PATCH 041/428] batch-runner.js: add rudimentary metrics export to
 CSV. Add a toggle to reverse the log output mode (in normal order or most
 recent first).

FossilOrigin-Name: b26e2bc05537a1f451db1bdd36a824d71c3ea25a130b6285f31ff9799d65fa7a
---
 ext/wasm/GNUmakefile       |   6 +-
 ext/wasm/batch-runner.html |  23 +++++++-
 ext/wasm/batch-runner.js   | 111 +++++++++++++++++++++++++++++++++++--
 manifest                   |  16 +++---
 manifest.uuid              |   2 +-
 5 files changed, 141 insertions(+), 17 deletions(-)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 1067018d4a..39cf8b26e4 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -62,11 +62,14 @@ $(dir.top)/sqlite3.c:
 emcc_opt ?= -O0
 .PHONY: release
 release:
-	$(MAKE) 'emcc_opt=-Os -g3'
+	$(MAKE) 'emcc_opt=-Os -g3 -flto'
 # ^^^^^ target-specific vars, e.g.:
 #   release: emcc_opt=...
 # apparently only work for file targets, not PHONY targets?
 #
+# ^^^ -flto improves runtime speed at -O0 considerably but doubles
+# build time.
+#
 # ^^^^ -O3, -Oz, -Os minify symbol names and there appears to be no
 # way around that except to use -g3, but -g3 causes the binary file
 # size to absolutely explode (approx. 5x larger). This minification
@@ -284,6 +287,7 @@ endif
 
 CLEAN_FILES += $(sqlite3.js) $(sqlite3.wasm)
 all: $(sqlite3.js)
+wasm: $(sqlite3.js)
 # End main Emscripten-based module build
 ########################################################################
 
diff --git a/ext/wasm/batch-runner.html b/ext/wasm/batch-runner.html
index c91e591553..1b8d335ddb 100644
--- a/ext/wasm/batch-runner.html
+++ b/ext/wasm/batch-runner.html
@@ -42,11 +42,16 @@
       <button class='disable-during-eval' id='sql-run'>Run selected SQL</button>
       <button class='disable-during-eval' id='sql-run-next'>Run next...</button>
       <button class='disable-during-eval' id='sql-run-remaining'>Run all remaining...</button>
+      <button class='disable-during-eval' id='export-metrics'>Export metrics (WIP)</button>
       <button class='disable-during-eval' id='db-reset'>Reset db</button>
       <button id='output-clear'>Clear output</button>
+      <span class='input-wrapper'>
+        <input type='checkbox' class='disable-during-eval' id='cb-reverse-log-order' checked></input>
+        <label for='cb-reverse-log-order'>Reverse log order</label>
+      </span>
     </div>
     <hr>
-    <div>(Log output is in reverse order, newest first!)</div>
+    <div id='reverse-log-notice' class='hidden'>(Log output is in reverse order, newest first!)</div>
     <div id='test-output'></div>
     
     <script src="sqlite3.js"></script>
@@ -58,14 +63,26 @@
           flex-direction: column;
           flex-wrap: wrap;
       }
-      .warning { color: firebrick; } 
+      .warning { color: firebrick; }
+      .input-wrapper {
+          white-space: nowrap;
+      }
       #test-output {
           border: 1px inset;
           padding: 0.25em;
           /*max-height: 30em;*/
           overflow: auto;
           white-space: break-spaces;
-          display: flex; flex-direction: column-reverse;
+          display: flex; flex-direction: column;
+      }
+      #test-output.reverse {
+          flex-direction: column-reverse;
+      }
+      .hidden {
+          position: absolute !important;
+          opacity: 0 !important;
+          pointer-events: none !important;
+          display: none !important;
       }
     </style>
   </body>
diff --git a/ext/wasm/batch-runner.js b/ext/wasm/batch-runner.js
index cbd712bb91..909a140047 100644
--- a/ext/wasm/batch-runner.js
+++ b/ext/wasm/batch-runner.js
@@ -26,10 +26,22 @@
       btnRun: document.querySelector('#sql-run'),
       btnRunNext: document.querySelector('#sql-run-next'),
       btnRunRemaining: document.querySelector('#sql-run-remaining'),
+      btnExportMetrics: document.querySelector('#export-metrics'),
       btnClear: document.querySelector('#output-clear'),
-      btnReset: document.querySelector('#db-reset')
+      btnReset: document.querySelector('#db-reset'),
+      cbReverseLog: document.querySelector('#cb-reverse-log-order')
     },
     cache:{},
+    metrics:{
+      /**
+         Map of sql-file to timing metrics. We currently only store
+         the most recent run of each file, but we really should store
+         all runs so that we can average out certain values which vary
+         significantly across runs. e.g. a mandelbrot-generating query
+         will have a wide range of runtimes when run 10 times in a
+         row.         
+      */
+    },
     log: console.log.bind(console),
     warn: console.warn.bind(console),
     cls: function(){this.e.output.innerHTML = ''},
@@ -63,8 +75,11 @@
         const oFlags = capi.SQLITE_OPEN_CREATE | capi.SQLITE_OPEN_READWRITE;
         const ppDb = wasm.scopedAllocPtr();
         const rc = capi.sqlite3_open_v2(fn, ppDb, oFlags, null);
-        if(rc) toss("sqlite3_open_v2() failed with code",rc);
         pDb = wasm.getPtrValue(ppDb)
+        if(rc){
+          if(pDb) capi.sqlite3_close_v2(pDb);
+          toss("sqlite3_open_v2() failed with code",rc);
+        }
       }finally{
         wasm.scopedAllocPop(stack);
       }
@@ -84,6 +99,12 @@
       }
     },
 
+    /**
+       Loads batch-runner.list and populates the selection list from
+       it. Returns a promise which resolves to nothing in particular
+       when it completes. Only intended to be run once at the start
+       of the app.
+     */
     loadSqlList: async function(){
       const sel = this.e.selSql;
       sel.innerHTML = '';
@@ -156,7 +177,62 @@
       document.querySelectorAll('.disable-during-eval').forEach((e)=>e.disabled = disable);
     },
 
-    /** Fetch ./fn and eval it as an SQL blob. */
+    /**
+       Converts this.metrics() to a form which is suitable for easy conversion to
+       CSV. It returns an array of arrays. The first sub-array is the column names.
+       The 2nd and subsequent are the values, one per test file (only the most recent
+       metrics are kept for any given file).
+    */
+    metricsToArrays: function(){
+      const rc = [];
+      Object.keys(this.metrics).sort().forEach((k)=>{
+        const m = this.metrics[k];
+        delete m.evalFileStart;
+        delete m.evalFileEnd;
+        const mk = Object.keys(m).sort();
+        if(!rc.length){
+          rc.push(['file', ...mk]);
+        }
+        const row = [k.split('/').pop()/*remove dir prefix from filename*/];
+        rc.push(row);
+        mk.forEach((kk)=>row.push(m[kk]));
+      });
+      return rc;
+    },
+
+    metricsToBlob: function(colSeparator='\t'){
+      const ar = [], ma = this.metricsToArrays();
+      if(!ma.length){
+        this.logErr("Metrics are empty. Run something.");
+        return;
+      }
+      ma.forEach(function(row){
+        ar.push(row.join(colSeparator),'\n');
+      });
+      return new Blob(ar);
+    },
+    
+    downloadMetrics: function(){
+      const b = this.metricsToBlob();
+      if(!b) return;
+      const url = URL.createObjectURL(b);
+      const a = document.createElement('a');
+      a.href = url;
+      a.download = 'batch-runner-metrics-'+((new Date().getTime()/1000) | 0)+'.csv';
+      this.logHtml("Triggering download of",a.download);
+      document.body.appendChild(a);
+      a.click();
+      setTimeout(()=>{
+        document.body.removeChild(a);
+        URL.revokeObjectURL(url);
+      }, 500);
+    },
+
+    /**
+       Fetch file fn and eval it as an SQL blob. This is an async
+       operation and returns a Promise which resolves to this
+       object on success.
+    */
     evalFile: async function(fn){
       const sql = await this.fetchFile(fn);
       const banner = "========================================";
@@ -165,9 +241,11 @@
       const capi = this.sqlite3.capi, wasm = capi.wasm;
       let pStmt = 0, pSqlBegin;
       const stack = wasm.scopedAllocPush();
-      const metrics = Object.create(null);
+      const metrics = this.metrics[fn] = Object.create(null);
       metrics.prepTotal = metrics.stepTotal = 0;
       metrics.stmtCount = 0;
+      metrics.malloc = 0;
+      metrics.strcpy = 0;
       this.blockControls(true);
       if(this.gotErr){
         this.logErr("Cannot run ["+fn+"]: error cleanup is pending.");
@@ -180,11 +258,16 @@
           let t;
           let sqlByteLen = sql.byteLength;
           const [ppStmt, pzTail] = wasm.scopedAllocPtr(2);
+          t = performance.now();
           pSqlBegin = wasm.alloc( sqlByteLen + 1/*SQL + NUL*/) || toss("alloc(",sqlByteLen,") failed");
+          metrics.malloc = performance.now() - t;
+          metrics.byteLength = sqlByteLen;
           let pSql = pSqlBegin;
           const pSqlEnd = pSqlBegin + sqlByteLen;
+          t = performance.now();
           wasm.heap8().set(sql, pSql);
           wasm.setMemValue(pSql + sqlByteLen, 0);
+          metrics.strcpy = performance.now() - t;
           let breaker = 0;
           while(pSql && wasm.getMemValue(pSql,'i8')){
             wasm.setPtrValue(ppStmt, 0);
@@ -261,6 +344,20 @@
       }
       this.openDb(dbFile, !!pDir);
       const who = this;
+      const eReverseLogNotice = document.querySelector('#reverse-log-notice');
+      if(this.e.cbReverseLog.checked){
+        eReverseLogNotice.classList.remove('hidden');
+        this.e.output.classList.add('reverse');
+      }
+      this.e.cbReverseLog.addEventListener('change', function(){
+        if(this.checked){
+          who.e.output.classList.add('reverse');
+          eReverseLogNotice.classList.remove('hidden');
+        }else{
+          who.e.output.classList.remove('reverse');
+          eReverseLogNotice.classList.add('hidden');
+        }
+      }, false);
       this.e.btnClear.addEventListener('click', ()=>this.cls(), false);
       this.e.btnRun.addEventListener('click', function(){
         if(!who.e.selSql.value) return;
@@ -278,6 +375,12 @@
           who.openDb(fn,true);
         }
       }, false);
+      this.e.btnExportMetrics.addEventListener('click', function(){
+        who.logHtml2('warning',"Metrics export is a Work in Progress. See output in dev console.");
+        who.downloadMetrics();
+        const m = who.metricsToArrays();
+        console.log("Metrics:",who.metrics, m);
+      });
       this.e.btnRunRemaining.addEventListener('click', async function(){
         let v = who.e.selSql.value;
         const timeStart = performance.now();
diff --git a/manifest b/manifest
index 28e7c2d2de..d6ecf92b24 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C batch-runner.js:\sre-enable\sunlink-before-run\sso\sthat\sOPFS\sspeedtest1\sbatch\scan\swork.
-D 2022-08-30T10:26:33.223
+C batch-runner.js:\sadd\srudimentary\smetrics\sexport\sto\sCSV.\sAdd\sa\stoggle\sto\sreverse\sthe\slog\soutput\smode\s(in\snormal\sorder\sor\smost\srecent\sfirst).
+D 2022-08-30T17:57:50.778
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle db7a4602f043cf4a5e4135be3609a487f9f1c83f05778bfbdf93766be4541b96
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile b5d1e285ed9814646e1fb12a27b7507aea2d7208ef76e486e1471c8aabac5226
+F ext/wasm/GNUmakefile fd1ba419c38d79f742849cc96a1f1e1dd63821e6173bc5727f0a5439f04b4131
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 77ef4bcf37e362b9ad61f9c175dfc0f1b3e571563fb311b96581cf422ee6a8ec
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -489,8 +489,8 @@ F ext/wasm/api/sqlite3-api-prologue.js 2d5c5d3355f55eefe51922cec5bfedbec0f8300db
 F ext/wasm/api/sqlite3-api-worker1.js 73579555563b789785ae83724014eaf31811073aad9be6596c8336ffb51edd71
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 0d81282eaeff2a6e9fc5c28a388c5c5b45cf25a9393992fa511ac009b27df982
-F ext/wasm/batch-runner.html e5c3edd4a6c9359f6d9e6c99cb5f87f09007d98fa1c705ed3efa370abcd4323e
-F ext/wasm/batch-runner.js da471fb7b5c6c918cfe59adaebedc3af24a1268084d09d90143653c71b2493dd
+F ext/wasm/batch-runner.html 439245594711981831f2775f1426fd20d73a9b1bbf53f2cbbfc1194fa069891c
+F ext/wasm/batch-runner.js dfe194ff87dac20e641aeee7080b74a877ca4a24ea107d6a80ff8115b28b7f0b
 F ext/wasm/common/SqliteTestUtil.js eb96275bed43fdb364b7d65bcded0ca5e22aaacff120d593d1385f852f486247
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 572cf1ffae0b6eb7ca63684d3392bf350217a07b90e7a896e4fa850700c989b0
@@ -2013,8 +2013,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 06c106a7d23e4486dbed092757b7588688226ad35539ecc31378a8497f59d1ec
-R 4e67c8f75eba175d0066f0954616ff1b
+P ba08f7a7f12601aa580a8dc493b43cdd5ab65c87d5e4b3fd2f549343e45c2d2a
+R cd46865d209bc499b87d03a53afeb5f7
 U stephan
-Z 9d799461f6bdad041adab908a7c4bd92
+Z a638c92d95e9388486f91bc003769b2d
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 50b5203520..9cdf828810 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ba08f7a7f12601aa580a8dc493b43cdd5ab65c87d5e4b3fd2f549343e45c2d2a
\ No newline at end of file
+b26e2bc05537a1f451db1bdd36a824d71c3ea25a130b6285f31ff9799d65fa7a
\ No newline at end of file

From 73b09b87d5a7c9e35af045b5b59cbd49756cb4df Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Wed, 31 Aug 2022 20:45:43 +0000
Subject: [PATCH 042/428] Add new files for an extension to recover data from
 corrupted databases.

FossilOrigin-Name: f8298eeba01cb5b02ac4d642c06f3801331ca90edea533ea898a3283981a9e49
---
 ext/misc/dbdata.c              |  31 +-
 ext/recover/recover1.test      | 116 ++++++
 ext/recover/recover_common.tcl |   5 +
 ext/recover/sqlite3recover.c   | 728 +++++++++++++++++++++++++++++++++
 ext/recover/sqlite3recover.h   |  66 +++
 ext/recover/test_recover.c     | 185 +++++++++
 main.mk                        |   3 +
 manifest                       |  26 +-
 manifest.uuid                  |   2 +-
 src/test_tclsh.c               |   2 +
 10 files changed, 1152 insertions(+), 12 deletions(-)
 create mode 100644 ext/recover/recover1.test
 create mode 100644 ext/recover/recover_common.tcl
 create mode 100644 ext/recover/sqlite3recover.c
 create mode 100644 ext/recover/sqlite3recover.h
 create mode 100644 ext/recover/test_recover.c

diff --git a/ext/misc/dbdata.c b/ext/misc/dbdata.c
index 7405e7c890..b79eafce7c 100644
--- a/ext/misc/dbdata.c
+++ b/ext/misc/dbdata.c
@@ -660,6 +660,18 @@ static int dbdataEof(sqlite3_vtab_cursor *pCursor){
   return pCsr->aPage==0;
 }
 
+/*
+** Return true if nul-terminated string zSchema ends in "()". Or false
+** otherwise.
+*/
+static int dbdataIsFunction(const char *zSchema){
+  int n = strlen(zSchema);
+  if( n>2 && zSchema[n-2]=='(' && zSchema[n-1]==')' ){
+    return n-2;
+  }
+  return 0;
+}
+
 /* 
 ** Determine the size in pages of database zSchema (where zSchema is
 ** "main", "temp" or the name of an attached database) and set 
@@ -670,10 +682,16 @@ static int dbdataDbsize(DbdataCursor *pCsr, const char *zSchema){
   DbdataTable *pTab = (DbdataTable*)pCsr->base.pVtab;
   char *zSql = 0;
   int rc, rc2;
+  int nFunc = 0;
   sqlite3_stmt *pStmt = 0;
 
-  zSql = sqlite3_mprintf("PRAGMA %Q.page_count", zSchema);
+  if( (nFunc = dbdataIsFunction(zSchema))>0 ){
+    zSql = sqlite3_mprintf("SELECT %.*s(0)", nFunc, zSchema);
+  }else{
+    zSql = sqlite3_mprintf("PRAGMA %Q.page_count", zSchema);
+  }
   if( zSql==0 ) return SQLITE_NOMEM;
+
   rc = sqlite3_prepare_v2(pTab->db, zSql, -1, &pStmt, 0);
   sqlite3_free(zSql);
   if( rc==SQLITE_OK && sqlite3_step(pStmt)==SQLITE_ROW ){
@@ -711,9 +729,18 @@ static int dbdataFilter(
   }
 
   if( rc==SQLITE_OK ){
+    int nFunc = 0;
     if( pTab->pStmt ){
       pCsr->pStmt = pTab->pStmt;
       pTab->pStmt = 0;
+    }else if( (nFunc = dbdataIsFunction(zSchema))>0 ){
+      char *zSql = sqlite3_mprintf("SELECT %.*s(?2)", nFunc, zSchema);
+      if( zSql==0 ){
+        rc = SQLITE_NOMEM;
+      }else{
+        rc = sqlite3_prepare_v2(pTab->db, zSql, -1, &pCsr->pStmt, 0);
+        sqlite3_free(zSql);
+      }
     }else{
       rc = sqlite3_prepare_v2(pTab->db, 
           "SELECT data FROM sqlite_dbpage(?) WHERE pgno=?", -1,
@@ -732,7 +759,7 @@ static int dbdataFilter(
   return rc;
 }
 
-/* 
+/*
 ** Return a column for the sqlite_dbdata or sqlite_dbptr table.
 */
 static int dbdataColumn(
diff --git a/ext/recover/recover1.test b/ext/recover/recover1.test
new file mode 100644
index 0000000000..c4348baea0
--- /dev/null
+++ b/ext/recover/recover1.test
@@ -0,0 +1,116 @@
+# 2022 August 28
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+#
+
+if {![info exists testdir]} {
+  set testdir [file join [file dirname [info script]] .. .. test]
+} 
+source [file join [file dirname [info script]] recover_common.tcl]
+source $testdir/tester.tcl
+
+set testprefix recover1
+
+
+
+proc compare_result {db1 db2 sql} {
+  set r1 [$db1 eval $sql]
+  set r2 [$db2 eval $sql]
+  if {$r1 != $r2} {
+    puts "r1: $r1"
+    puts "r2: $r2"
+    error "mismatch for $sql"
+  }
+  return ""
+}
+
+proc compare_dbs {db1 db2} {
+  compare_result $db1 $db2 "SELECT sql FROM sqlite_master ORDER BY 1"
+  foreach tbl [$db1 eval {SELECT name FROM sqlite_master WHERE type='table'}] {
+    compare_result $db1 $db2 "SELECT * FROM $tbl"
+  }
+}
+
+proc do_recover_test {tn} {
+  forcedelete test.db2
+
+  uplevel [list do_test $tn.1 {
+    set R [sqlite3_recover_init db main test.db2]
+    $R step
+    $R finish
+  } {}]
+
+  sqlite3 db2 test.db2
+  uplevel [list do_test $tn.2 [list compare_dbs db db2] {}]
+  db2 close
+}
+
+
+do_execsql_test 1.0 {
+  CREATE TABLE t1(a INTEGER PRIMARY KEY, b);
+  CREATE TABLE t2(a INTEGER PRIMARY KEY, b) WITHOUT ROWID;
+  WITH s(i) AS (
+    SELECT 1 UNION ALL SELECT i+1 FROM s WHERE i<10
+  )
+  INSERT INTO t1 SELECT i*2, hex(randomblob(250)) FROM s;
+  INSERT INTO t2 SELECT * FROM t1;
+}
+
+do_recover_test 1
+
+do_execsql_test 2.0 {
+  ALTER TABLE t1 ADD COLUMN c DEFAULT 'xyz'
+}
+do_recover_test 2
+
+do_execsql_test 3.0 {
+  CREATE INDEX i1 ON t1(c);
+}
+do_recover_test 3
+
+do_execsql_test 4.0 {
+  CREATE VIEW v1 AS SELECT * FROM t2;
+}
+do_recover_test 4
+
+do_execsql_test 5.0 {
+  CREATE UNIQUE INDEX i2 ON t1(c, b);
+}
+do_recover_test 5
+
+#--------------------------------------------------------------------------
+#
+reset_db
+do_execsql_test 6.0 {
+  CREATE TABLE t1(
+      a INTEGER PRIMARY KEY,
+      b INT,
+      c TEXT,
+      d INT GENERATED ALWAYS AS (a*abs(b)) VIRTUAL,
+      e TEXT GENERATED ALWAYS AS (substr(c,b,b+1)) STORED,
+      f TEXT GENERATED ALWAYS AS (substr(c,b,b+1)) STORED
+  );
+
+  INSERT INTO t1 VALUES(1, 2, 'hello world');
+}
+do_recover_test 6
+
+do_execsql_test 7.0 {
+  CREATE TABLE t2(i, j GENERATED ALWAYS AS (i+1) STORED, k);
+  INSERT INTO t2 VALUES(10, 'ten');
+}
+do_execsql_test 7.1 {
+  SELECT * FROM t2
+} {10 11 ten}
+
+do_recover_test 7.2
+
+finish_test
+
diff --git a/ext/recover/recover_common.tcl b/ext/recover/recover_common.tcl
new file mode 100644
index 0000000000..3f2ff2d6cc
--- /dev/null
+++ b/ext/recover/recover_common.tcl
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
new file mode 100644
index 0000000000..6c7828c007
--- /dev/null
+++ b/ext/recover/sqlite3recover.c
@@ -0,0 +1,728 @@
+/*
+** 2022-08-27
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+**
+*/
+
+
+#include "sqlite3recover.h"
+#include <assert.h>
+#include <string.h>
+
+typedef unsigned int u32;
+typedef sqlite3_int64 i64;
+
+typedef struct RecoverColumn RecoverColumn;
+struct RecoverColumn {
+  char *zCol;
+  int eHidden;
+};
+
+#define RECOVER_EHIDDEN_NONE    0
+#define RECOVER_EHIDDEN_HIDDEN  1
+#define RECOVER_EHIDDEN_VIRTUAL 2
+#define RECOVER_EHIDDEN_STORED  3
+
+/*
+** When running the ".recover" command, each output table, and the special
+** orphaned row table if it is required, is represented by an instance
+** of the following struct.
+*/
+typedef struct RecoverTable RecoverTable;
+struct RecoverTable {
+  u32 iRoot;                      /* Root page in original database */
+  char *zTab;                     /* Name of table */
+  int nCol;                       /* Number of columns in table */
+  RecoverColumn *aCol;            /* Array of columns */
+  int bIntkey;                    /* True for intkey, false for without rowid */
+  int iPk;                        /* Index of IPK column, if bIntkey */
+
+  RecoverTable *pNext;
+};
+
+/*
+** 
+*/
+#define RECOVERY_SCHEMA \
+"  CREATE TABLE recovery.freelist("                            \
+"      pgno INTEGER PRIMARY KEY"                               \
+"  );"                                                         \
+"  CREATE TABLE recovery.dbptr("                               \
+"      pgno, child, PRIMARY KEY(child, pgno)"                  \
+"  ) WITHOUT ROWID;"                                           \
+"  CREATE TABLE recovery.map("                                 \
+"      pgno INTEGER PRIMARY KEY, maxlen INT, intkey, root INT" \
+"  );"                                                         \
+"  CREATE TABLE recovery.schema("                              \
+"      type, name, tbl_name, rootpage, sql"                    \
+"  );" 
+
+
+struct sqlite3_recover {
+  sqlite3 *dbIn;
+  sqlite3 *dbOut;
+
+  sqlite3_stmt *pGetPage;
+
+  char *zDb;
+  char *zUri;
+  RecoverTable *pTblList;
+
+  int errCode;                    /* For sqlite3_recover_errcode() */
+  char *zErrMsg;                  /* For sqlite3_recover_errmsg() */
+
+  char *zStateDb;
+};
+
+/*
+** Like strlen(). But handles NULL pointer arguments.
+*/
+static int recoverStrlen(const char *zStr){
+  int nRet = 0;
+  if( zStr ){
+    while( zStr[nRet] ) nRet++;
+  }
+  return nRet;
+}
+
+static void *recoverMalloc(sqlite3_recover *p, sqlite3_int64 nByte){
+  void *pRet = 0;
+  assert( nByte>0 );
+  if( p->errCode==SQLITE_OK ){
+    pRet = sqlite3_malloc64(nByte);
+    if( pRet ){
+      memset(pRet, 0, nByte);
+    }else{
+      p->errCode = SQLITE_NOMEM;
+    }
+  }
+  return pRet;
+}
+
+static int recoverError(
+  sqlite3_recover *p, 
+  int errCode, 
+  const char *zFmt, ...
+){
+  va_list ap;
+  char *z;
+  va_start(ap, zFmt);
+  z = sqlite3_vmprintf(zFmt, ap);
+  va_end(ap);
+
+  sqlite3_free(p->zErrMsg);
+  p->zErrMsg = z;
+  p->errCode = errCode;
+  return errCode;
+}
+
+static int recoverDbError(sqlite3_recover *p, sqlite3 *db){
+  return recoverError(p, sqlite3_errcode(db), "%s", sqlite3_errmsg(db));
+}
+
+static sqlite3_stmt *recoverPrepare(
+  sqlite3_recover *p,
+  sqlite3 *db, 
+  const char *zSql
+){
+  sqlite3_stmt *pStmt = 0;
+  if( p->errCode==SQLITE_OK ){
+    if( sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0) ){
+      recoverDbError(p, db);
+    }
+  }
+  return pStmt;
+}
+
+/*
+** Create a prepared statement using printf-style arguments for the SQL.
+*/
+static sqlite3_stmt *recoverPreparePrintf(
+  sqlite3_recover *p,
+  sqlite3 *db, 
+  const char *zFmt, ...
+){
+  sqlite3_stmt *pStmt = 0;
+  if( p->errCode==SQLITE_OK ){
+    va_list ap;
+    char *z;
+    va_start(ap, zFmt);
+    z = sqlite3_vmprintf(zFmt, ap);
+    va_end(ap);
+    if( z==0 ){
+      p->errCode = SQLITE_NOMEM;
+    }else{
+      pStmt = recoverPrepare(p, db, z);
+      sqlite3_free(z);
+    }
+  }
+  return pStmt;
+}
+
+
+static sqlite3_stmt *recoverReset(sqlite3_recover *p, sqlite3_stmt *pStmt){
+  int rc = sqlite3_reset(pStmt);
+  if( rc!=SQLITE_OK && p->errCode==SQLITE_OK ){
+    recoverDbError(p, sqlite3_db_handle(pStmt));
+  }
+  return pStmt;
+}
+
+static void recoverFinalize(sqlite3_recover *p, sqlite3_stmt *pStmt){
+  sqlite3 *db = sqlite3_db_handle(pStmt);
+  int rc = sqlite3_finalize(pStmt);
+  if( rc!=SQLITE_OK && p->errCode==SQLITE_OK ){
+    recoverDbError(p, db);
+  }
+}
+
+static int recoverExec(sqlite3_recover *p, sqlite3 *db, const char *zSql){
+  if( p->errCode==SQLITE_OK ){
+    int rc = sqlite3_exec(p->dbOut, zSql, 0, 0, 0);
+    if( rc ){
+      recoverDbError(p, p->dbOut);
+    }
+  }
+  return p->errCode;
+}
+
+/*
+** The implementation of a user-defined SQL function invoked by the 
+** sqlite_dbdata and sqlite_dbptr virtual table modules to access pages
+** of the database being recovered.
+**
+** This function always takes a single integer argument. If the arguement
+** is zero, then the value returned is the number of pages in the db being
+** recovered. If the argument is greater than zero, it is a page number. 
+** The value returned in this case is an SQL blob containing the data for 
+** the identified page of the db being recovered. e.g.
+**
+**     SELECT getpage(0);       -- return number of pages in db
+**     SELECT getpage(4);       -- return page 4 of db as a blob of data 
+*/
+static void recoverGetPage(
+  sqlite3_context *pCtx,
+  int nArg,
+  sqlite3_value **apArg
+){
+  sqlite3_recover *p = (sqlite3_recover*)sqlite3_user_data(pCtx);
+  sqlite3_int64 pgno = sqlite3_value_int64(apArg[0]);
+  sqlite3_stmt *pStmt = 0;
+
+  assert( nArg==1 );
+  if( pgno==0 ){
+    pStmt = recoverPreparePrintf(p, p->dbIn, "PRAGMA %Q.page_count", p->zDb);
+  }else if( p->pGetPage==0 ){
+    pStmt = recoverPreparePrintf(
+        p, p->dbIn, "SELECT data FROM sqlite_dbpage(%Q) WHERE pgno=?", p->zDb
+    );
+  }else{
+    pStmt = p->pGetPage;
+  }
+
+  if( pStmt ){
+    if( pgno ) sqlite3_bind_int64(pStmt, 1, pgno);
+    if( SQLITE_ROW==sqlite3_step(pStmt) ){
+      sqlite3_result_value(pCtx, sqlite3_column_value(pStmt, 0));
+    }
+    if( pgno ){
+      p->pGetPage = recoverReset(p, pStmt);
+    }else{
+      recoverFinalize(p, pStmt);
+    }
+  }
+
+  if( p->errCode ){
+    if( p->zErrMsg ) sqlite3_result_error(pCtx, p->zErrMsg, -1);
+    sqlite3_result_error_code(pCtx, p->errCode);
+  }
+}
+
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
+int sqlite3_dbdata_init(sqlite3*, char**, const sqlite3_api_routines*);
+
+static int recoverOpenOutput(sqlite3_recover *p){
+  int rc = SQLITE_OK;
+  if( p->dbOut==0 ){
+    const int flags = SQLITE_OPEN_URI|SQLITE_OPEN_CREATE|SQLITE_OPEN_READWRITE;
+    sqlite3 *db = 0;
+
+    assert( p->dbOut==0 );
+
+    rc = sqlite3_open_v2(p->zUri, &db, flags, 0);
+    if( rc==SQLITE_OK ){
+      const char *zPath = p->zStateDb ? p->zStateDb : ":memory:";
+      char *zSql = sqlite3_mprintf("ATTACH %Q AS recovery", zPath);
+      if( zSql==0 ){
+        rc = p->errCode = SQLITE_NOMEM;
+      }else{
+        rc = sqlite3_exec(db, zSql, 0, 0, 0);
+      }
+      sqlite3_free(zSql);
+    }
+
+    if( rc==SQLITE_OK ){
+      sqlite3_backup *pBackup = sqlite3_backup_init(db, "main", db, "recovery");
+      if( pBackup ){
+        while( sqlite3_backup_step(pBackup, 1000)==SQLITE_OK );
+        rc = sqlite3_backup_finish(pBackup);
+      }
+    }
+    if( rc==SQLITE_OK ){
+      rc = sqlite3_exec(db, RECOVERY_SCHEMA, 0, 0, 0);
+    }
+
+    if( rc==SQLITE_OK ){
+      sqlite3_dbdata_init(db, 0, 0);
+      rc = sqlite3_create_function(
+          db, "getpage", 1, SQLITE_UTF8, (void*)p, recoverGetPage, 0, 0
+      );
+    }
+
+    if( rc!=SQLITE_OK ){
+      if( p->errCode==SQLITE_OK ) rc = recoverDbError(p, db);
+      sqlite3_close(db);
+    }else{
+      p->dbOut = db;
+    }
+  }
+  return rc;
+}
+
+static int recoverCacheDbptr(sqlite3_recover *p){
+  return recoverExec(p, p->dbOut,
+    "INSERT INTO recovery.dbptr "
+    "SELECT pgno, child FROM sqlite_dbptr('getpage()')"
+  );
+}
+
+static int recoverCacheSchema(sqlite3_recover *p){
+  return recoverExec(p, p->dbOut,
+    "WITH RECURSIVE pages(p) AS ("
+    "  SELECT 1"
+    "    UNION"
+    "  SELECT child FROM recovery.dbptr, pages WHERE pgno=p"
+    ")"
+    "INSERT INTO recovery.schema SELECT"
+    "  max(CASE WHEN field=0 THEN value ELSE NULL END),"
+    "  max(CASE WHEN field=1 THEN value ELSE NULL END),"
+    "  max(CASE WHEN field=2 THEN value ELSE NULL END),"
+    "  max(CASE WHEN field=3 THEN value ELSE NULL END),"
+    "  max(CASE WHEN field=4 THEN value ELSE NULL END)"
+    "FROM sqlite_dbdata('getpage()') WHERE pgno IN ("
+    "  SELECT p FROM pages"
+    ") GROUP BY pgno, cell"
+  );
+}
+
+static void recoverAddTable(sqlite3_recover *p, const char *zName, i64 iRoot){
+  sqlite3_stmt *pStmt = recoverPreparePrintf(p, p->dbOut, 
+      "PRAGMA table_xinfo(%Q)", zName
+  );
+
+  if( pStmt ){
+    RecoverTable *pNew = 0;
+    int nCol = 0;
+    int nName = recoverStrlen(zName);
+    int nByte = 0;
+    while( sqlite3_step(pStmt)==SQLITE_ROW ){
+      nCol++;
+      nByte += (sqlite3_column_bytes(pStmt, 1)+1);
+    }
+    nByte += sizeof(RecoverTable) + nCol*sizeof(RecoverColumn) + nName+1;
+    recoverReset(p, pStmt);
+
+    pNew = recoverMalloc(p, nByte);
+    if( pNew ){
+      int i = 0;
+      char *csr = 0;
+      pNew->aCol = (RecoverColumn*)&pNew[1];
+      pNew->zTab = csr = (char*)&pNew->aCol[nCol];
+      pNew->nCol = nCol;
+      pNew->iRoot = iRoot;
+      pNew->iPk = -1;
+      memcpy(csr, zName, nName);
+      csr += nName+1;
+
+      for(i=0; sqlite3_step(pStmt)==SQLITE_ROW; i++){
+        int bPk = sqlite3_column_int(pStmt, 5);
+        int n = sqlite3_column_bytes(pStmt, 1);
+        const char *z = (const char*)sqlite3_column_text(pStmt, 1);
+        int eHidden = sqlite3_column_int(pStmt, 6);
+
+        if( bPk ) pNew->iPk = i;
+        pNew->aCol[i].zCol = csr;
+        pNew->aCol[i].eHidden = eHidden;
+        memcpy(csr, z, n);
+        csr += (n+1);
+      }
+
+      pNew->pNext = p->pTblList;
+      p->pTblList = pNew;
+    }
+
+    recoverFinalize(p, pStmt);
+
+    pStmt = recoverPreparePrintf(p, p->dbOut, "PRAGMA index_info(%Q)", zName);
+    if( pStmt && sqlite3_step(pStmt)!=SQLITE_ROW ){
+      pNew->bIntkey = 1;
+    }else{
+      pNew->iPk = -1;
+    }
+    recoverFinalize(p, pStmt);
+  }
+}
+
+/*
+**  
+*/
+static int recoverWriteSchema1(sqlite3_recover *p){
+  sqlite3_stmt *pSelect = 0;
+  sqlite3_stmt *pTblname = 0;
+
+  pSelect = recoverPrepare(p, p->dbOut,
+      "SELECT rootpage, sql, type='table' FROM recovery.schema "
+      "  WHERE type='table' OR (type='index' AND sql LIKE '%unique%')"
+  );
+
+  pTblname = recoverPrepare(p, p->dbOut,
+      "SELECT name FROM sqlite_schema "
+      "WHERE type='table' ORDER BY rowid DESC LIMIT 1"
+  );
+
+  if( pSelect ){
+    while( sqlite3_step(pSelect)==SQLITE_ROW ){
+      i64 iRoot = sqlite3_column_int64(pSelect, 0);
+      const char *zSql = (const char*)sqlite3_column_text(pSelect, 1);
+      int bTable = sqlite3_column_int(pSelect, 2);
+
+      int rc = sqlite3_exec(p->dbOut, zSql, 0, 0, 0);
+      if( rc==SQLITE_OK ){
+        if( bTable ){
+          if( SQLITE_ROW==sqlite3_step(pTblname) ){
+            const char *zName = sqlite3_column_text(pTblname, 0);
+            recoverAddTable(p, zName, iRoot);
+          }
+          recoverReset(p, pTblname);
+        }
+      }else if( rc!=SQLITE_ERROR ){
+        recoverDbError(p, p->dbOut);
+      }
+    }
+  }
+  recoverFinalize(p, pSelect);
+  recoverFinalize(p, pTblname);
+
+  return p->errCode;
+}
+
+static int recoverWriteSchema2(sqlite3_recover *p){
+  sqlite3_stmt *pSelect = 0;
+
+  pSelect = recoverPrepare(p, p->dbOut,
+      "SELECT rootpage, sql FROM recovery.schema "
+      "  WHERE type!='table' AND (type!='index' OR sql NOT LIKE '%unique%')"
+  );
+
+  if( pSelect ){
+    while( sqlite3_step(pSelect)==SQLITE_ROW ){
+      i64 iRoot = sqlite3_column_int64(pSelect, 0);
+      const char *zSql = (const char*)sqlite3_column_text(pSelect, 1);
+      int rc = sqlite3_exec(p->dbOut, zSql, 0, 0, 0);
+      if( rc!=SQLITE_OK && rc!=SQLITE_ERROR ){
+        recoverDbError(p, p->dbOut);
+      }
+    }
+  }
+  recoverFinalize(p, pSelect);
+
+  return p->errCode;
+}
+
+
+static char *recoverMPrintf(sqlite3_recover *p, const char *zFmt, ...){
+  char *zRet = 0;
+  if( p->errCode==SQLITE_OK ){
+    va_list ap;
+    char *z;
+    va_start(ap, zFmt);
+    zRet = sqlite3_vmprintf(zFmt, ap);
+    va_end(ap);
+    if( zRet==0 ){
+      p->errCode = SQLITE_NOMEM;
+    }
+  }
+  return zRet;
+}
+
+static sqlite3_stmt *recoverInsertStmt(
+  sqlite3_recover *p, 
+  RecoverTable *pTab,
+  int nField
+){
+  const char *zSep = "";
+  char *zSql = 0;
+  char *zBind = 0;
+  int ii;
+  sqlite3_stmt *pRet = 0;
+
+  assert( nField<=pTab->nCol );
+
+  zSql = recoverMPrintf(p, "INSERT OR IGNORE INTO %Q(", pTab->zTab);
+  for(ii=0; ii<nField; ii++){
+    int eHidden = pTab->aCol[ii].eHidden;
+    if( eHidden!=RECOVER_EHIDDEN_VIRTUAL
+     && eHidden!=RECOVER_EHIDDEN_STORED
+    ){
+      zSql = recoverMPrintf(p, "%z%s%Q", zSql, zSep, pTab->aCol[ii].zCol);
+      zBind = recoverMPrintf(p, "%z%s?", zBind, zSep);
+      zSep = ", ";
+    }
+  }
+  zSql = recoverMPrintf(p, "%z) VALUES (%z)", zSql, zBind);
+
+  pRet = recoverPrepare(p, p->dbOut, zSql);
+  sqlite3_free(zSql);
+  
+  return pRet;
+}
+
+
+static RecoverTable *recoverFindTable(sqlite3_recover *p, u32 iRoot){
+  RecoverTable *pRet = 0;
+  for(pRet=p->pTblList; pRet && pRet->iRoot!=iRoot; pRet=pRet->pNext);
+  return pRet;
+}
+
+static int recoverWriteData(sqlite3_recover *p){
+  RecoverTable *pTbl;
+  int nMax = 0;
+  sqlite3_value **apVal = 0;
+  sqlite3_stmt *pSel = 0;
+
+  /* Figure out the maximum number of columns for any table in the schema */
+  for(pTbl=p->pTblList; pTbl; pTbl=pTbl->pNext){
+    if( pTbl->nCol>nMax ) nMax = pTbl->nCol;
+  }
+
+  apVal = (sqlite3_value**)recoverMalloc(p, sizeof(sqlite3_value*) * nMax);
+  if( apVal==0 ) return p->errCode;
+
+  pSel = recoverPrepare(p, p->dbOut, 
+      "WITH RECURSIVE pages(root, page) AS ("
+      "  SELECT rootpage, rootpage FROM recovery.schema"
+      "    UNION"
+      "   SELECT root, child FROM recovery.dbptr, pages WHERE pgno=page"
+      ") "
+      "SELECT root, page, cell, field, value "
+      "FROM sqlite_dbdata('getpage()') d, pages p WHERE p.page=d.pgno "
+      "UNION ALL "
+      "SELECT 0, 0, 0, 0, 0"
+  );
+  if( pSel ){
+    RecoverTable *pTab = 0;
+    sqlite3_stmt *pInsert = 0;
+    int nInsert = -1;
+    i64 iPrevRoot = -1;
+    i64 iPrevPage = -1;
+    int iPrevCell = -1;
+    i64 iRowid = 0;
+    int nVal = -1;
+
+    while( p->errCode==SQLITE_OK && sqlite3_step(pSel)==SQLITE_ROW ){
+      i64 iRoot = sqlite3_column_int64(pSel, 0);
+      i64 iPage = sqlite3_column_int64(pSel, 1);
+      int iCell = sqlite3_column_int(pSel, 2);
+      int iField = sqlite3_column_int(pSel, 3);
+      sqlite3_value *pVal = sqlite3_column_value(pSel, 4);
+
+      int bNewCell = (iPrevRoot!=iRoot || iPrevPage!=iPage || iPrevCell!=iCell);
+      assert( bNewCell==0 || (iField==-1 || iField==0) );
+      assert( bNewCell || iField==nVal );
+
+      if( bNewCell ){
+        if( nVal>=0 ){
+          int ii;
+
+          if( pTab ){
+            int iVal = 0;
+            int iBind = 1;
+
+            if( pInsert==0 || nVal!=nInsert ){
+              recoverFinalize(p, pInsert);
+              pInsert = recoverInsertStmt(p, pTab, nVal);
+              nInsert = nVal;
+            }
+
+            for(ii=0; ii<pTab->nCol && iVal<nVal; ii++){
+              int eHidden = pTab->aCol[ii].eHidden;
+              switch( eHidden ){
+                case RECOVER_EHIDDEN_NONE:
+                case RECOVER_EHIDDEN_HIDDEN:
+                  if( ii==pTab->iPk ){
+                    sqlite3_bind_int64(pInsert, iBind, iRowid);
+                  }else{
+                    sqlite3_bind_value(pInsert, iBind, apVal[iVal]);
+                  }
+                  iBind++;
+                  iVal++;
+                  break;
+
+                case RECOVER_EHIDDEN_VIRTUAL:
+                  break;
+
+                case RECOVER_EHIDDEN_STORED:
+                  iVal++;
+                  break;
+              }
+            }
+
+            sqlite3_step(pInsert);
+            recoverReset(p, pInsert);
+            assert( p->errCode || pInsert );
+            if( pInsert ) sqlite3_clear_bindings(pInsert);
+          }
+
+          for(ii=0; ii<nVal; ii++){
+            sqlite3_value_free(apVal[ii]);
+            apVal[ii] = 0;
+          }
+          nVal = -1;
+        }
+
+        if( iRoot==0 ) continue;
+
+        if( iRoot!=iPrevRoot ){
+          pTab = recoverFindTable(p, iRoot);
+          recoverFinalize(p, pInsert);
+          pInsert = 0;
+        }
+      }
+
+      if( iField<0 ){
+        iRowid = sqlite3_column_int64(pSel, 4);
+        assert( nVal==-1 );
+        nVal = 0;
+      }else if( iField<nMax ){
+        assert( apVal[iField]==0 );
+        apVal[iField] = sqlite3_value_dup( pVal );
+        nVal = iField+1;
+      }
+      iPrevRoot = iRoot;
+      iPrevCell = iCell;
+      iPrevPage = iPage;
+    }
+
+    recoverFinalize(p, pInsert);
+    recoverFinalize(p, pSel);
+  }
+
+  sqlite3_free(apVal);
+  return p->errCode;
+}
+
+sqlite3_recover *sqlite3_recover_init(
+  sqlite3* db, 
+  const char *zDb, 
+  const char *zUri
+){
+  sqlite3_recover *pRet = 0;
+  int nDb = 0;
+  int nUri = 0;
+  int nByte = 0;
+
+  if( zDb==0 ){ zDb = "main"; }
+  if( zUri==0 ){ zUri = ""; }
+
+  nDb = recoverStrlen(zDb);
+  nUri = recoverStrlen(zUri);
+
+  nByte = sizeof(sqlite3_recover) + nDb+1 + nUri+1;
+  pRet = (sqlite3_recover*)sqlite3_malloc(nByte);
+  if( pRet ){
+    memset(pRet, 0, nByte);
+    pRet->dbIn = db;
+    pRet->zDb = (char*)&pRet[1];
+    pRet->zUri = &pRet->zDb[nDb+1];
+    memcpy(pRet->zDb, zDb, nDb);
+    memcpy(pRet->zUri, zUri, nUri);
+  }
+
+  return pRet;
+}
+
+const char *sqlite3_recover_errmsg(sqlite3_recover *p){
+  return p ? p->zErrMsg : "not an error";
+}
+int sqlite3_recover_errcode(sqlite3_recover *p){
+  return p ? p->errCode : SQLITE_NOMEM;
+}
+
+int sqlite3_recover_config(sqlite3_recover *p, int op, void *pArg){
+  int rc = SQLITE_OK;
+
+  switch( op ){
+    case SQLITE_RECOVER_TESTDB:
+      sqlite3_free(p->zStateDb);
+      p->zStateDb = sqlite3_mprintf("%s", (char*)pArg);
+      break;
+
+    default:
+      rc = SQLITE_NOTFOUND;
+      break;
+  }
+
+  return rc;
+}
+
+static void recoverStep(sqlite3_recover *p){
+
+  assert( p->errCode==SQLITE_OK );
+
+  if( p->dbOut==0 ){
+    if( recoverOpenOutput(p) ) return;
+    if( recoverCacheDbptr(p) ) return;
+    if( recoverCacheSchema(p) ) return;
+    if( recoverWriteSchema1(p) ) return;
+    if( recoverWriteData(p) ) return;
+    if( recoverWriteSchema2(p) ) return;
+  }
+}
+
+int sqlite3_recover_step(sqlite3_recover *p){
+  if( p && p->errCode==SQLITE_OK ){
+    recoverStep(p);
+  }
+  return p ? p->errCode : SQLITE_NOMEM;
+}
+
+int sqlite3_recover_finish(sqlite3_recover *p){
+  RecoverTable *pTab;
+  RecoverTable *pNext;
+  int rc;
+
+  for(pTab=p->pTblList; pTab; pTab=pNext){
+    pNext = pTab->pNext;
+    sqlite3_free(pTab);
+  }
+
+  sqlite3_finalize(p->pGetPage);
+  rc = sqlite3_close(p->dbOut);
+  assert( rc==SQLITE_OK );
+  p->pGetPage = 0;
+  rc = p->errCode;
+
+  sqlite3_free(p);
+  return rc;
+}
+
diff --git a/ext/recover/sqlite3recover.h b/ext/recover/sqlite3recover.h
new file mode 100644
index 0000000000..401f83ea28
--- /dev/null
+++ b/ext/recover/sqlite3recover.h
@@ -0,0 +1,66 @@
+/*
+** 2022-08-27
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+**
+*/
+
+
+#ifndef _SQLITE_RECOVER_H
+#define _SQLITE_RECOVER_H
+
+#include "sqlite3.h"              /* Required for error code definitions */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct sqlite3_recover sqlite3_recover;
+
+/* Create an object to recover data from database zDb (e.g. "main")
+** opened by handle db. Data will be recovered into the database
+** identified by parameter zUri. Database zUri is clobbered if it
+** already exists.
+*/
+sqlite3_recover *sqlite3_recover_init(
+  sqlite3* db, 
+  const char *zDb, 
+  const char *zUri
+);
+
+/* Details TBD. */
+int sqlite3_recover_config(sqlite3_recover*, int op, void *pArg);
+
+#define SQLITE_RECOVER_TESTDB 789
+
+/* Step the recovery object. Return SQLITE_DONE if recovery is complete,
+** SQLITE_OK if recovery is not complete but no error has occurred, or
+** an SQLite error code if an error has occurred.
+*/
+int sqlite3_recover_step(sqlite3_recover*);
+
+const char *sqlite3_recover_errmsg(sqlite3_recover*);
+
+int sqlite3_recover_errcode(sqlite3_recover*);
+
+/* Clean up a recovery object created by a call to sqlite3_recover_init().
+** This function returns SQLITE_DONE if the new database was created,
+** SQLITE_OK if it processing was abandoned before it as finished or
+** an SQLite error code (e.g. SQLITE_IOERR, SQLITE_NOMEM etc.) if an
+** error occurred.  */
+int sqlite3_recover_finish(sqlite3_recover*);
+
+
+#ifdef __cplusplus
+}  /* end of the 'extern "C"' block */
+#endif
+
+#endif /* ifndef _SQLITE_RECOVER_H */
+
diff --git a/ext/recover/test_recover.c b/ext/recover/test_recover.c
new file mode 100644
index 0000000000..912b8dec5c
--- /dev/null
+++ b/ext/recover/test_recover.c
@@ -0,0 +1,185 @@
+/*
+** 2022-08-27
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+**
+*/
+
+#include "sqlite3recover.h"
+
+#include <tcl.h>
+#include <assert.h>
+
+typedef struct TestRecover TestRecover;
+struct TestRecover {
+  sqlite3_recover *p;
+};
+
+static int getDbPointer(Tcl_Interp *interp, Tcl_Obj *pObj, sqlite3 **pDb){
+  Tcl_CmdInfo info;
+  if( 0==Tcl_GetCommandInfo(interp, Tcl_GetString(pObj), &info) ){
+    Tcl_AppendResult(interp, "no such handle: ", Tcl_GetString(pObj), 0);
+    return TCL_ERROR;
+  }
+  *pDb = *(sqlite3 **)info.objClientData;
+  return TCL_OK;
+}
+
+/*
+** Implementation of the command created by [sqlite3_recover_init]:
+**
+**     $cmd config OP ARG
+**     $cmd step
+**     $cmd errmsg
+**     $cmd errcode
+**     $cmd finalize
+*/
+static int testRecoverCmd(
+  void *clientData,
+  Tcl_Interp *interp,
+  int objc,
+  Tcl_Obj *CONST objv[]
+){
+  static struct RecoverSub {
+    const char *zSub;
+    int nArg;
+    const char *zMsg;
+  } aSub[] = {
+    { "config",    2, "REBASE-BLOB" }, /* 0 */
+    { "step",      0, ""            }, /* 1 */
+    { "errmsg",    0, ""            }, /* 2 */
+    { "errcode",   0, ""            }, /* 3 */
+    { "finish",  0, ""              }, /* 4 */
+    { 0 }
+  };
+  int rc = TCL_OK;
+  int iSub = 0;
+  TestRecover *pTest = (TestRecover*)clientData;
+
+  if( objc<2 ){
+    Tcl_WrongNumArgs(interp, 1, objv, "SUBCOMMAND ...");
+    return TCL_ERROR;
+  }
+  rc = Tcl_GetIndexFromObjStruct(interp, 
+      objv[1], aSub, sizeof(aSub[0]), "sub-command", 0, &iSub
+  );
+  if( rc!=TCL_OK ) return rc;
+  if( (objc-2)!=aSub[iSub].nArg ){
+    Tcl_WrongNumArgs(interp, 2, objv, aSub[iSub].zMsg);
+    return TCL_ERROR;
+  }
+
+  switch( iSub ){
+    case 0:  assert( sqlite3_stricmp("config", aSub[iSub].zSub)==0 ); {
+      const char *aOp[] = {
+        "testdb",    /* 0 */
+        0
+      };
+      int iOp = 0;
+      int res = 0;
+      if( Tcl_GetIndexFromObj(interp, objv[2], aOp, "option", 0, &iOp) ){
+        return TCL_ERROR;
+      }
+      switch( iOp ){
+        case 0:
+          res = sqlite3_recover_config(
+              pTest->p, SQLITE_RECOVER_TESTDB, (void*)Tcl_GetString(objv[3])
+          );
+          break;
+      }
+      Tcl_SetObjResult(interp, Tcl_NewIntObj(res));
+      break;
+    }
+    case 1:  assert( sqlite3_stricmp("step", aSub[iSub].zSub)==0 ); {
+      int res = sqlite3_recover_step(pTest->p);
+      Tcl_SetObjResult(interp, Tcl_NewIntObj(res));
+      break;
+    }
+    case 2:  assert( sqlite3_stricmp("errmsg", aSub[iSub].zSub)==0 ); {
+      const char *zErr = sqlite3_recover_errmsg(pTest->p);
+      Tcl_SetObjResult(interp, Tcl_NewStringObj(zErr, -1));
+      break;
+    }
+    case 3:  assert( sqlite3_stricmp("errcode", aSub[iSub].zSub)==0 ); {
+      int errCode = sqlite3_recover_errcode(pTest->p);
+      Tcl_SetObjResult(interp, Tcl_NewIntObj(errCode));
+      break;
+    }
+    case 4:  assert( sqlite3_stricmp("finish", aSub[iSub].zSub)==0 ); {
+      int res = sqlite3_recover_errcode(pTest->p);
+      int res2;
+      if( res!=SQLITE_OK ){
+        const char *zErr = sqlite3_recover_errmsg(pTest->p);
+        char *zRes = sqlite3_mprintf("(%d) - %s", res, zErr);
+        Tcl_SetObjResult(interp, Tcl_NewStringObj(zRes, -1));
+        sqlite3_free(zRes);
+      }
+      res2 = sqlite3_recover_finish(pTest->p);
+      assert( res2==res );
+      if( res ) return TCL_ERROR;
+      break;
+    }
+  }
+
+  return TCL_OK;
+}
+
+/*
+** sqlite3_recover_init DB DBNAME URI
+*/
+static int test_sqlite3_recover_init(
+  void *clientData,
+  Tcl_Interp *interp,
+  int objc,
+  Tcl_Obj *CONST objv[]
+){
+  static int iTestRecoverCmd = 1;
+
+  TestRecover *pNew = 0;
+  sqlite3 *db = 0;
+  const char *zDb = 0;
+  const char *zUri = 0;
+  char zCmd[128];
+
+  if( objc!=4 ){
+    Tcl_WrongNumArgs(interp, 1, objv, "DB DBNAME URI");
+    return TCL_ERROR;
+  }
+  if( getDbPointer(interp, objv[1], &db) ) return TCL_ERROR;
+  zDb = Tcl_GetString(objv[2]);
+  zUri = Tcl_GetString(objv[3]);
+
+  pNew = ckalloc(sizeof(TestRecover));
+  pNew->p = sqlite3_recover_init(db, zDb, zUri);
+
+  sprintf(zCmd, "sqlite_recover%d", iTestRecoverCmd++);
+  Tcl_CreateObjCommand(interp, zCmd, testRecoverCmd, (void*)pNew, 0);
+
+  Tcl_SetObjResult(interp, Tcl_NewStringObj(zCmd, -1));
+  return TCL_OK;
+}
+
+int TestRecover_Init(Tcl_Interp *interp){
+  struct Cmd {
+    const char *zCmd;
+    Tcl_ObjCmdProc *xProc;
+  } aCmd[] = {
+    { "sqlite3_recover_init", test_sqlite3_recover_init },
+  };
+  int i;
+
+  for(i=0; i<sizeof(aCmd)/sizeof(struct Cmd); i++){
+    struct Cmd *p = &aCmd[i];
+    Tcl_CreateObjCommand(interp, p->zCmd, p->xProc, 0, 0);
+  }
+
+  return TCL_OK;
+}
+
diff --git a/main.mk b/main.mk
index 3d8a07494d..5263546042 100644
--- a/main.mk
+++ b/main.mk
@@ -444,6 +444,9 @@ TESTSRC2 = \
   $(TOP)/ext/misc/stmt.c \
   $(TOP)/ext/session/sqlite3session.c \
   $(TOP)/ext/session/test_session.c \
+  $(TOP)/ext/recover/sqlite3recover.c \
+  $(TOP)/ext/misc/dbdata.c \
+  $(TOP)/ext/recover/test_recover.c \
   fts5.c
 
 # Header files used by all library source files.
diff --git a/manifest b/manifest
index 746bbe3c38..0fab53a46f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\sthe\sb-tree\spage\ssorting\scode\sto\sensure\sthat\ssqlite3PagerRekey()\snever\noverloads\sa\spage\snumber\sand\suses\sonly\sthe\sPENDING_BYTE\spage\sfor\stemporary\nstorage.
-D 2022-08-31T15:04:42.204
+C Add\snew\sfiles\sfor\san\sextension\sto\srecover\sdata\sfrom\scorrupted\sdatabases.
+D 2022-08-31T20:45:43.730
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -299,7 +299,7 @@ F ext/misc/closure.c dbfd8543b2a017ae6b1a5843986b22ddf99ff126ec9634a2f4047cd14c8
 F ext/misc/completion.c 6dafd7f4348eecc7be9e920d4b419d1fb2af75d938cd9c59a20cfe8beb2f22b9
 F ext/misc/compress.c 3354c77a7c8e86e07d849916000cdac451ed96500bfb5bd83b20eb61eee012c9
 F ext/misc/csv.c ca8d6dafc5469639de81937cb66ae2e6b358542aba94c4f791910d355a8e7f73
-F ext/misc/dbdata.c e316fba936571584e55abd5b974a32a191727a6b746053a0c9d439bd2cf93940
+F ext/misc/dbdata.c f317980cea788e67932828b94a16ee8a8b859e3c2d62859d09ba3d5ca85f87cb
 F ext/misc/dbdump.c b8592f6f2da292c62991a13864a60d6c573c47a9cc58362131b9e6a64f823e01
 F ext/misc/decimal.c 09f967dcf4a1ee35a76309829308ec278d3648168733f4a1147820e11ebefd12
 F ext/misc/eval.c 04bc9aada78c888394204b4ed996ab834b99726fb59603b0ee3ed6e049755dc1
@@ -387,6 +387,11 @@ F ext/rbu/rbuvacuum4.test a78898e438a44803eb2bc897ba3323373c9f277418e2d6d76e90f2
 F ext/rbu/sqlite3rbu.c 8737cabdfbee84bb25a7851ecef8b1312be332761238da9be6ddb10c62ad4291
 F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9cd389812
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
+F ext/recover/recover1.test 861ad5140566102a8c5a3d1f936a7d6da569f34c86597c274de695f597031bac
+F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
+F ext/recover/sqlite3recover.c 594fb45777a14f0b88b944b9fb2ccb3e85a29ef5b17522b8dac3e3944c4c27ea
+F ext/recover/sqlite3recover.h 3255f6491007e57be310aedb72a848c88f79fc14e7222bda4b8d4dab1a2450c3
+F ext/recover/test_recover.c 919f61df54776598b350250057fd2d3ea9cc2cef1aeac0dbb760958d26fe1afb
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
 F ext/repair/checkfreelist.c e21f06995ff4efdc1622dcceaea4dcba2caa83ca2f31a1607b98a8509168a996
 F ext/repair/checkindex.c 4383e4469c21e5b9ae321d0d63cec53e981af9d7a6564be6374f0eeb93dfc890
@@ -509,7 +514,7 @@ F ext/wasm/testing2.js d37433c601f88ed275712c1cfc92d3fb36c7c22e1ed8c7396fb2359e4
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
-F main.mk 20801eed419dc58936ff9449b04041edbbbc0488a9fc683e72471dded050e0bb
+F main.mk 8c9965c408aaa8b93d0dd52e83445894835e1a42dc360c77435393f80f8d8d1d
 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@ -641,7 +646,7 @@ F src/test_server.c a2615049954cbb9cfb4a62e18e2f0616e4dc38fe
 F src/test_sqllog.c 540feaea7280cd5f926168aee9deb1065ae136d0bbbe7361e2ef3541783e187a
 F src/test_superlock.c 4839644b9201da822f181c5bc406c0b2385f672e
 F src/test_syscall.c 1073306ba2e9bfc886771871a13d3de281ed3939
-F src/test_tclsh.c c4065ced25126e25c40122c5ff62dc89902ea617d72cdd27765151cdd7fcc477
+F src/test_tclsh.c 7dd98be675a1dc0d1fd302b8247bab992c909db384df054381a2279ad76f9b0e
 F src/test_tclvar.c 33ff42149494a39c5fbb0df3d25d6fafb2f668888e41c0688d07273dcb268dfc
 F src/test_thread.c 269ea9e1fa5828dba550eb26f619aa18aedbc29fd92f8a5f6b93521fbb74a61c
 F src/test_vdbecov.c f60c6f135ec42c0de013a1d5136777aa328a776d33277f92abac648930453d43
@@ -1999,8 +2004,11 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P dd017bb1b3e31c7692d29dc4865d6bda871e429978c8738a39160d0114e5bf9b
-R 98122ff0aaf5ca87deda59c5c8a25251
-U drh
-Z 8d73d18db9ab73a94a9689d17f937c1d
+P 5007742886bd20de20be3973737cf46b010359911615eb3da69cd262bd9a2435
+R 563b8320bf923831e4768bc403655fc2
+T *branch * recover-extension
+T *sym-recover-extension *
+T -sym-trunk *
+U dan
+Z 1c7612740eb933f84d589533d182c6df
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 00cb077051..16703e1b2f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5007742886bd20de20be3973737cf46b010359911615eb3da69cd262bd9a2435
\ No newline at end of file
+f8298eeba01cb5b02ac4d642c06f3801331ca90edea533ea898a3283981a9e49
\ No newline at end of file
diff --git a/src/test_tclsh.c b/src/test_tclsh.c
index 707c16812c..c133deca25 100644
--- a/src/test_tclsh.c
+++ b/src/test_tclsh.c
@@ -108,6 +108,7 @@ const char *sqlite3TestInit(Tcl_Interp *interp){
   extern int TestExpert_Init(Tcl_Interp*);
   extern int Sqlitetest_window_Init(Tcl_Interp *);
   extern int Sqlitetestvdbecov_Init(Tcl_Interp *);
+  extern int TestRecover_Init(Tcl_Interp*);
 
   Tcl_CmdInfo cmdInfo;
 
@@ -175,6 +176,7 @@ const char *sqlite3TestInit(Tcl_Interp *interp){
   TestExpert_Init(interp);
   Sqlitetest_window_Init(interp);
   Sqlitetestvdbecov_Init(interp);
+  TestRecover_Init(interp);
 
   Tcl_CreateObjCommand(
       interp, "load_testfixture_extensions", load_testfixture_extensions,0,0

From 6c86783f9a212781f6e69dbf102c1048e1c066f4 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Thu, 1 Sep 2022 21:00:39 +0000
Subject: [PATCH 043/428] Further work on making recovery extension compatible
 with the shell tool ".recover" code.

FossilOrigin-Name: 8df7c7d0dcd1b2fcdad00e765a9868407f0ced02ac4432ee2cdf25d83b130759
---
 ext/recover/recover1.test    |   2 +
 ext/recover/sqlite3recover.c | 177 +++++++++++++++++++++++++++++++----
 ext/recover/sqlite3recover.h |   3 +-
 manifest                     |  19 ++--
 manifest.uuid                |   2 +-
 5 files changed, 171 insertions(+), 32 deletions(-)

diff --git a/ext/recover/recover1.test b/ext/recover/recover1.test
index c4348baea0..73832c8a12 100644
--- a/ext/recover/recover1.test
+++ b/ext/recover/recover1.test
@@ -40,9 +40,11 @@ proc compare_dbs {db1 db2} {
 
 proc do_recover_test {tn} {
   forcedelete test.db2
+  forcedelete rstate.db
 
   uplevel [list do_test $tn.1 {
     set R [sqlite3_recover_init db main test.db2]
+    $R config testdb rstate.db
     $R step
     $R finish
   } {}]
diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index 6c7828c007..d8b151616b 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -48,6 +48,12 @@ struct RecoverTable {
   RecoverTable *pNext;
 };
 
+typedef struct RecoverBitmap RecoverBitmap;
+struct RecoverBitmap {
+  i64 nPg;                        /* Size of bitmap */
+  u32 aElem[0];                   /* Array of 32-bit bitmasks */
+};
+
 /*
 ** 
 */
@@ -59,7 +65,7 @@ struct RecoverTable {
 "      pgno, child, PRIMARY KEY(child, pgno)"                  \
 "  ) WITHOUT ROWID;"                                           \
 "  CREATE TABLE recovery.map("                                 \
-"      pgno INTEGER PRIMARY KEY, maxlen INT, intkey, root INT" \
+"      pgno INTEGER PRIMARY KEY, parent INT"                   \
 "  );"                                                         \
 "  CREATE TABLE recovery.schema("                              \
 "      type, name, tbl_name, rootpage, sql"                    \
@@ -75,11 +81,14 @@ struct sqlite3_recover {
   char *zDb;
   char *zUri;
   RecoverTable *pTblList;
+  RecoverBitmap *pUsed;           /* Used by recoverWriteLostAndFound() */
 
   int errCode;                    /* For sqlite3_recover_errcode() */
   char *zErrMsg;                  /* For sqlite3_recover_errmsg() */
 
   char *zStateDb;
+  int bLostAndFound;
+
 };
 
 /*
@@ -124,6 +133,41 @@ static int recoverError(
   return errCode;
 }
 
+
+static RecoverBitmap *recoverBitmapAlloc(sqlite3_recover *p, i64 nPg){
+  int nElem = (nPg+1+31) / 32;
+  int nByte = sizeof(RecoverBitmap) + nElem*sizeof(u32);
+  RecoverBitmap *pRet = (RecoverBitmap*)recoverMalloc(p, nByte);
+
+  if( pRet ){
+    pRet->nPg = nPg;
+  }
+  return pRet;
+}
+
+static void recoverBitmapFree(RecoverBitmap *pMap){
+  sqlite3_free(pMap);
+}
+
+static void recoverBitmapSet(RecoverBitmap *pMap, i64 iPg){
+  if( iPg<=pMap->nPg ){
+    int iElem = (iPg / 32);
+    int iBit = (iPg % 32);
+    pMap->aElem[iElem] |= (((u32)1) << iBit);
+  }
+}
+
+static int recoverBitmapQuery(RecoverBitmap *pMap, i64 iPg){
+  int ret = 1;
+  if( iPg<=pMap->nPg ){
+    int iElem = (iPg / 32);
+    int iBit = (iPg % 32);
+    ret = (pMap->aElem[iElem] & (((u32)1) << iBit)) ? 1 : 0;
+  }
+  return ret;
+}
+
+
 static int recoverDbError(sqlite3_recover *p, sqlite3 *db){
   return recoverError(p, sqlite3_errcode(db), "%s", sqlite3_errmsg(db));
 }
@@ -194,6 +238,24 @@ static int recoverExec(sqlite3_recover *p, sqlite3 *db, const char *zSql){
   return p->errCode;
 }
 
+/*
+** Execute "PRAGMA page_count" against the input database. If successful,
+** return the integer result. Or, if an error occurs, leave an error code 
+** and error message in the sqlite3_recover handle.
+*/
+static i64 recoverPageCount(sqlite3_recover *p){
+  i64 nPg = 0;
+  if( p->errCode==SQLITE_OK ){
+    sqlite3_stmt *pStmt = 0;
+    pStmt = recoverPreparePrintf(p, p->dbIn, "PRAGMA %Q.page_count", p->zDb);
+    if( pStmt && SQLITE_ROW==sqlite3_step(pStmt) ){
+      nPg = sqlite3_column_int64(pStmt, 0);
+    }
+    recoverFinalize(p, pStmt);
+  }
+  return nPg;
+}
+
 /*
 ** The implementation of a user-defined SQL function invoked by the 
 ** sqlite_dbdata and sqlite_dbptr virtual table modules to access pages
@@ -219,24 +281,23 @@ static void recoverGetPage(
 
   assert( nArg==1 );
   if( pgno==0 ){
-    pStmt = recoverPreparePrintf(p, p->dbIn, "PRAGMA %Q.page_count", p->zDb);
-  }else if( p->pGetPage==0 ){
-    pStmt = recoverPreparePrintf(
-        p, p->dbIn, "SELECT data FROM sqlite_dbpage(%Q) WHERE pgno=?", p->zDb
-    );
+    sqlite3_result_int64(pCtx, recoverPageCount(p));
+    return;
   }else{
-    pStmt = p->pGetPage;
-  }
-
-  if( pStmt ){
-    if( pgno ) sqlite3_bind_int64(pStmt, 1, pgno);
-    if( SQLITE_ROW==sqlite3_step(pStmt) ){
-      sqlite3_result_value(pCtx, sqlite3_column_value(pStmt, 0));
-    }
-    if( pgno ){
-      p->pGetPage = recoverReset(p, pStmt);
+    if( p->pGetPage==0 ){
+      pStmt = recoverPreparePrintf(
+          p, p->dbIn, "SELECT data FROM sqlite_dbpage(%Q) WHERE pgno=?", p->zDb
+          );
     }else{
-      recoverFinalize(p, pStmt);
+      pStmt = p->pGetPage;
+    }
+
+    if( pStmt ){
+      sqlite3_bind_int64(pStmt, 1, pgno);
+      if( SQLITE_ROW==sqlite3_step(pStmt) ){
+        sqlite3_result_value(pCtx, sqlite3_column_value(pStmt, 0));
+      }
+        p->pGetPage = recoverReset(p, pStmt);
     }
   }
 
@@ -311,7 +372,7 @@ static int recoverCacheSchema(sqlite3_recover *p){
     "WITH RECURSIVE pages(p) AS ("
     "  SELECT 1"
     "    UNION"
-    "  SELECT child FROM recovery.dbptr, pages WHERE pgno=p"
+    "  SELECT child FROM sqlite_dbptr('getpage()'), pages WHERE pgno=p"
     ")"
     "INSERT INTO recovery.schema SELECT"
     "  max(CASE WHEN field=0 THEN value ELSE NULL END),"
@@ -504,6 +565,77 @@ static RecoverTable *recoverFindTable(sqlite3_recover *p, u32 iRoot){
   return pRet;
 }
 
+static int recoverWriteLostAndFound(sqlite3_recover *p){
+  i64 nPg = 0;
+  RecoverBitmap *pMap = 0;
+
+  nPg = recoverPageCount(p);
+  pMap = p->pUsed = recoverBitmapAlloc(p, nPg);
+  if( pMap ){
+    sqlite3_stmt *pStmt = 0;
+    char *zField = 0;
+    const char *zSep = 0;
+    int ii;
+
+    sqlite3_stmt *pStmt = recoverPrepare(
+        p, p->dbOut,
+        "WITH RECURSIVE used(page) AS ("
+        "  SELECT rootpage FROM recovery.schema WHERE rootpage>0"
+        "    UNION"
+        "  SELECT child FROM sqlite_dbptr('getpage()'), used "
+        "    WHERE pgno=page"
+        ") "
+        "SELECT page FROM used"
+    );
+    while( pStmt && sqlite3_step(pStmt) ){
+      i64 iPg = sqlite3_column_int64(pStmt);
+      recoverBitmapSet(pMap, iPg);
+    }
+    recoverFinalize(pStmt);
+
+    pStmt = recoverPreparePrintf(
+        p, p->dbOut,
+        "WITH RECURSIVE seq(ii) AS ("
+        "  SELECT 1 UNION ALL SELECT ii+1 FROM seq WHERE ii<%lld"
+        ")"
+        "INSERT INTO recover.map(pgno) "
+        "    SELECT ii FROM seq WHERE !page_is_used(ii)"
+    );
+    sqlite3_step(pStmt);
+    recoverFinalize(pStmt);
+
+    pStmt = recoverPrepare(
+        p, p->dbOut,
+        "UPDATE recover.map SET parent = ptr.pgno "
+        "    FROM sqlite_dbptr('getpage()') WHERE recover.map.pgno=ptr.child"
+    );
+    sqlite3_step(pStmt);
+    recoverFinalize(pStmt);
+      
+    pStmt = recoverPrepare(
+        p, p->dbOut,
+        "SELECT max(field) FROM sqlite_dbdata('getpage') WHERE pgno IN ("
+        "  SELECT pgno FROM recover.map"
+        ")"
+    );
+    if( pStmt && sqlite3_step(pStmt) ){
+      nMaxField = sqlite3_column_int64(pStmt, 0);
+    }
+    recoverFinalize(pStmt);
+
+    if( nMaxField==0 || p->errCode!=SQLITE_OK ) return p->errCode;
+
+    zSep = "rootpgno INTEGER, pgno INTEGER, nfield INTEGER, id INTEGER, ";
+    for(ii=0; ii<nMaxField; ii++){
+      zField = sqlite3_mprintf("%z%sc%d", zField, zSep, ii);
+      zSep = ", ";
+      if( zField==0 ){
+        p->errCode = SQLITE_NOMEM;
+      }
+    }
+  }
+}
+
 static int recoverWriteData(sqlite3_recover *p){
   RecoverTable *pTbl;
   int nMax = 0;
@@ -522,7 +654,8 @@ static int recoverWriteData(sqlite3_recover *p){
       "WITH RECURSIVE pages(root, page) AS ("
       "  SELECT rootpage, rootpage FROM recovery.schema"
       "    UNION"
-      "   SELECT root, child FROM recovery.dbptr, pages WHERE pgno=page"
+      "   SELECT root, child FROM sqlite_dbptr('getpage()'), pages "
+      "    WHERE pgno=page"
       ") "
       "SELECT root, page, cell, field, value "
       "FROM sqlite_dbdata('getpage()') d, pages p WHERE p.page=d.pgno "
@@ -677,6 +810,10 @@ int sqlite3_recover_config(sqlite3_recover *p, int op, void *pArg){
       p->zStateDb = sqlite3_mprintf("%s", (char*)pArg);
       break;
 
+    case SQLITE_RECOVER_LOST_AND_FOUND:
+      p->bLostAndFound = (pArg ? 1 : 0);
+      break;
+
     default:
       rc = SQLITE_NOTFOUND;
       break;
@@ -695,6 +832,7 @@ static void recoverStep(sqlite3_recover *p){
     if( recoverCacheSchema(p) ) return;
     if( recoverWriteSchema1(p) ) return;
     if( recoverWriteData(p) ) return;
+    if( p->bLostAndFound && recoverWriteLostAndFound(p) ) return;
     if( recoverWriteSchema2(p) ) return;
   }
 }
@@ -722,6 +860,7 @@ int sqlite3_recover_finish(sqlite3_recover *p){
   p->pGetPage = 0;
   rc = p->errCode;
 
+  sqlite3_free(p->zStateDb);
   sqlite3_free(p);
   return rc;
 }
diff --git a/ext/recover/sqlite3recover.h b/ext/recover/sqlite3recover.h
index 401f83ea28..0c83f8dea5 100644
--- a/ext/recover/sqlite3recover.h
+++ b/ext/recover/sqlite3recover.h
@@ -38,7 +38,8 @@ sqlite3_recover *sqlite3_recover_init(
 /* Details TBD. */
 int sqlite3_recover_config(sqlite3_recover*, int op, void *pArg);
 
-#define SQLITE_RECOVER_TESTDB 789
+#define SQLITE_RECOVER_TESTDB         789
+#define SQLITE_RECOVER_LOST_AND_FOUND 790
 
 /* Step the recovery object. Return SQLITE_DONE if recovery is complete,
 ** SQLITE_OK if recovery is not complete but no error has occurred, or
diff --git a/manifest b/manifest
index 0fab53a46f..7f8f333f25 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\snew\sfiles\sfor\san\sextension\sto\srecover\sdata\sfrom\scorrupted\sdatabases.
-D 2022-08-31T20:45:43.730
+C Further\swork\son\smaking\srecovery\sextension\scompatible\swith\sthe\sshell\stool\s".recover"\scode.
+D 2022-09-01T21:00:39.747
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -387,10 +387,10 @@ F ext/rbu/rbuvacuum4.test a78898e438a44803eb2bc897ba3323373c9f277418e2d6d76e90f2
 F ext/rbu/sqlite3rbu.c 8737cabdfbee84bb25a7851ecef8b1312be332761238da9be6ddb10c62ad4291
 F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9cd389812
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
-F ext/recover/recover1.test 861ad5140566102a8c5a3d1f936a7d6da569f34c86597c274de695f597031bac
+F ext/recover/recover1.test a848af8c82fe0731af835ff99475724f8654d2f24f772cc4e6f7ec4eb2ab71ea
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
-F ext/recover/sqlite3recover.c 594fb45777a14f0b88b944b9fb2ccb3e85a29ef5b17522b8dac3e3944c4c27ea
-F ext/recover/sqlite3recover.h 3255f6491007e57be310aedb72a848c88f79fc14e7222bda4b8d4dab1a2450c3
+F ext/recover/sqlite3recover.c d81b430f968d838035ebf5ca168b43ae8a0bec1e7c2c950b74ec4fd5e16ca47b
+F ext/recover/sqlite3recover.h 94e277a9b314a03df46b5e94cc44b70ed6c6893d2776d09c7ea0b55c969ad854
 F ext/recover/test_recover.c 919f61df54776598b350250057fd2d3ea9cc2cef1aeac0dbb760958d26fe1afb
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
 F ext/repair/checkfreelist.c e21f06995ff4efdc1622dcceaea4dcba2caa83ca2f31a1607b98a8509168a996
@@ -2004,11 +2004,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 5007742886bd20de20be3973737cf46b010359911615eb3da69cd262bd9a2435
-R 563b8320bf923831e4768bc403655fc2
-T *branch * recover-extension
-T *sym-recover-extension *
-T -sym-trunk *
+P f8298eeba01cb5b02ac4d642c06f3801331ca90edea533ea898a3283981a9e49
+R 185cdcc7bc591773e93e55f9de4bfb4c
 U dan
-Z 1c7612740eb933f84d589533d182c6df
+Z 5d96e275b1b3f6a2d23b93e2a033e9c9
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 16703e1b2f..5c5b60080f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f8298eeba01cb5b02ac4d642c06f3801331ca90edea533ea898a3283981a9e49
\ No newline at end of file
+8df7c7d0dcd1b2fcdad00e765a9868407f0ced02ac4432ee2cdf25d83b130759
\ No newline at end of file

From cdefd5d046db3baa83e18b82cac15c54c8e8d60a Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sat, 3 Sep 2022 11:41:44 +0000
Subject: [PATCH 044/428] wasm: minor text and build cleanups.

FossilOrigin-Name: 36ceef94e1935f5e85f79e489cd0ed265a77820fb68329c190794df5e076bf84
---
 ext/wasm/GNUmakefile              | 12 ++++++++++--
 ext/wasm/batch-runner.js          | 11 +++++------
 ext/wasm/common/SqliteTestUtil.js | 13 +++++++++----
 manifest                          | 16 ++++++++--------
 manifest.uuid                     |  2 +-
 5 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 39cf8b26e4..11b1402662 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -167,9 +167,12 @@ $(post-js.js): $(post-jses) $(MAKEFILE)
 
 
 ########################################################################
-# emcc flags for .c/.o/.wasm.
+# emcc flags for .c/.o/.wasm/.js.
 emcc.flags =
 #emcc.flags += -v # _very_ loud but also informative about what it's doing
+# -g is needed to keep -O2 and higher from creating broken JS via
+# minification.
+emcc.flags += -g
 
 ########################################################################
 # emcc flags for .c/.o.
@@ -181,6 +184,7 @@ emcc.cflags += -I. -I$(dir.top) # $(SQLITE_OPT)
 ########################################################################
 # emcc flags specific to building the final .js/.wasm file...
 emcc.jsflags := -fPIC
+emcc.jsflags := --minify 0
 emcc.jsflags += --no-entry
 emcc.jsflags += -sMODULARIZE
 emcc.jsflags += -sSTRICT_JS
@@ -303,7 +307,11 @@ $(speedtest1.sql): $(speedtest1)
 batch-runner.list: $(MAKEFILE) $(speedtest1.sql) $(dir.sql)/000-mandelbrot.sql
 	bash split-speedtest1-script.sh $(dir.sql)/speedtest1.sql
 	ls -1 $(dir.sql)/*.sql | grep -v speedtest1.sql | sort > $@
-CLEAN_FILES += batch-runner.list $(dir.sql)/speedtest1*.sql
+clean-batch:
+	rm -f batch-runner.list $(dir.sql)/speedtest1*.sql
+# ^^^ we don't do this along with 'clean' because we clean/rebuild on
+# a regular basis with different -Ox flags and rebuilding the batch
+# pieces each time is an unnecessary time sink.
 batch: batch-runner.list
 all: batch
 
diff --git a/ext/wasm/batch-runner.js b/ext/wasm/batch-runner.js
index 909a140047..6cee157051 100644
--- a/ext/wasm/batch-runner.js
+++ b/ext/wasm/batch-runner.js
@@ -10,12 +10,11 @@
 
   ***********************************************************************
 
-  A basic batch SQL running for sqlite3-api.js. This file must be run in
+  A basic batch SQL runner for sqlite3-api.js. This file must be run in
   main JS thread and sqlite3.js must have been loaded before it.
 */
 'use strict';
 (function(){
-  const T = self.SqliteTestUtil;
   const toss = function(...args){throw new Error(args.join(' '))};
   const warn = console.warn.bind(console);
 
@@ -218,7 +217,7 @@
       const url = URL.createObjectURL(b);
       const a = document.createElement('a');
       a.href = url;
-      a.download = 'batch-runner-metrics-'+((new Date().getTime()/1000) | 0)+'.csv';
+      a.download = 'batch-runner-js-'+((new Date().getTime()/1000) | 0)+'.csv';
       this.logHtml("Triggering download of",a.download);
       document.body.appendChild(a);
       a.click();
@@ -376,10 +375,10 @@
         }
       }, false);
       this.e.btnExportMetrics.addEventListener('click', function(){
-        who.logHtml2('warning',"Metrics export is a Work in Progress. See output in dev console.");
+        who.logHtml2('warning',"Triggering download of metrics CSV. Check your downloads folder.");
         who.downloadMetrics();
-        const m = who.metricsToArrays();
-        console.log("Metrics:",who.metrics, m);
+        //const m = who.metricsToArrays();
+        //console.log("Metrics:",who.metrics, m);
       });
       this.e.btnRunRemaining.addEventListener('click', async function(){
         let v = who.e.selSql.value;
diff --git a/ext/wasm/common/SqliteTestUtil.js b/ext/wasm/common/SqliteTestUtil.js
index c21469c9b0..51cd64108e 100644
--- a/ext/wasm/common/SqliteTestUtil.js
+++ b/ext/wasm/common/SqliteTestUtil.js
@@ -122,6 +122,11 @@
      sqlite3InitModule() factory function.
   */
   self.sqlite3TestModule = {
+    /**
+       Array of functions to call after Emscripten has initialized the
+       wasm module. Each gets passed the Emscripten module object
+       (which is _this_ object).
+    */
     postRun: [
       /* function(theModule){...} */
     ],
@@ -135,10 +140,10 @@
       console.error.apply(console, Array.prototype.slice.call(arguments));
     },
     /**
-       Called by the module init bits to report loading
-       progress. It gets passed an empty argument when loading is
-       done (after onRuntimeInitialized() and any this.postRun
-       callbacks have been run).
+       Called by the Emscripten module init bits to report loading
+       progress. It gets passed an empty argument when loading is done
+       (after onRuntimeInitialized() and any this.postRun callbacks
+       have been run).
     */
     setStatus: function f(text){
       if(!f.last){
diff --git a/manifest b/manifest
index d6ecf92b24..ddfd3bdce4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C batch-runner.js:\sadd\srudimentary\smetrics\sexport\sto\sCSV.\sAdd\sa\stoggle\sto\sreverse\sthe\slog\soutput\smode\s(in\snormal\sorder\sor\smost\srecent\sfirst).
-D 2022-08-30T17:57:50.778
+C wasm:\sminor\stext\sand\sbuild\scleanups.
+D 2022-09-03T11:41:44.176
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle db7a4602f043cf4a5e4135be3609a487f9f1c83f05778bfbdf93766be4541b96
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile fd1ba419c38d79f742849cc96a1f1e1dd63821e6173bc5727f0a5439f04b4131
+F ext/wasm/GNUmakefile 49d76f7b4c45d6ff8cb573ba0d1dd7b4712e59582bdc1dfb2f96a4b89f47e34c
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 77ef4bcf37e362b9ad61f9c175dfc0f1b3e571563fb311b96581cf422ee6a8ec
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -490,8 +490,8 @@ F ext/wasm/api/sqlite3-api-worker1.js 73579555563b789785ae83724014eaf31811073aad
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 0d81282eaeff2a6e9fc5c28a388c5c5b45cf25a9393992fa511ac009b27df982
 F ext/wasm/batch-runner.html 439245594711981831f2775f1426fd20d73a9b1bbf53f2cbbfc1194fa069891c
-F ext/wasm/batch-runner.js dfe194ff87dac20e641aeee7080b74a877ca4a24ea107d6a80ff8115b28b7f0b
-F ext/wasm/common/SqliteTestUtil.js eb96275bed43fdb364b7d65bcded0ca5e22aaacff120d593d1385f852f486247
+F ext/wasm/batch-runner.js a727cbbffe63fd17fb5a590dc679f0b13bd51880e8f84b461d7df246417689e8
+F ext/wasm/common/SqliteTestUtil.js 7a543e238c2ebda922c85076abda017d0480944fdfee576692a0c3a580319ebd
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 572cf1ffae0b6eb7ca63684d3392bf350217a07b90e7a896e4fa850700c989b0
 F ext/wasm/common/whwasmutil.js 3d68a9cd87a2d8f7e6d5a78f3b829a927f2e28422685e029139f6e75d4ed42e4
@@ -2013,8 +2013,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 ba08f7a7f12601aa580a8dc493b43cdd5ab65c87d5e4b3fd2f549343e45c2d2a
-R cd46865d209bc499b87d03a53afeb5f7
+P b26e2bc05537a1f451db1bdd36a824d71c3ea25a130b6285f31ff9799d65fa7a
+R be49009f54e0ae14227cc16ba0e36553
 U stephan
-Z a638c92d95e9388486f91bc003769b2d
+Z eee0918a1e799dd377ca7c8eb624a8df
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 9cdf828810..99f4bce223 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b26e2bc05537a1f451db1bdd36a824d71c3ea25a130b6285f31ff9799d65fa7a
\ No newline at end of file
+36ceef94e1935f5e85f79e489cd0ed265a77820fb68329c190794df5e076bf84
\ No newline at end of file

From f2f8a3a348c59d1faabaf9690422fab09002ae32 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Sat, 3 Sep 2022 20:07:39 +0000
Subject: [PATCH 045/428] Further work on making the recover extension
 compatible with the .recover command.

FossilOrigin-Name: f2ac315844d8db1bd1c6950a4fef7c459ddd37cc21a8f3daafa5639fad8118e2
---
 ext/misc/dbdata.c            |   1 +
 ext/recover/recoverold.test  | 139 ++++++++++++
 ext/recover/sqlite3recover.c | 396 +++++++++++++++++++++++++++++------
 ext/recover/sqlite3recover.h |  12 ++
 ext/recover/test_recover.c   |  12 +-
 manifest                     |  21 +-
 manifest.uuid                |   2 +-
 test/permutations.test       |   1 +
 8 files changed, 503 insertions(+), 81 deletions(-)
 create mode 100644 ext/recover/recoverold.test

diff --git a/ext/misc/dbdata.c b/ext/misc/dbdata.c
index b79eafce7c..a18304b96b 100644
--- a/ext/misc/dbdata.c
+++ b/ext/misc/dbdata.c
@@ -477,6 +477,7 @@ static int dbdataNext(sqlite3_vtab_cursor *pCursor){
         rc = dbdataLoadPage(pCsr, pCsr->iPgno, &pCsr->aPage, &pCsr->nPage);
         if( rc!=SQLITE_OK ) return rc;
         if( pCsr->aPage ) break;
+        if( pCsr->bOnePage ) return SQLITE_OK;
         pCsr->iPgno++;
       }
       pCsr->iCell = pTab->bPtr ? -2 : 0;
diff --git a/ext/recover/recoverold.test b/ext/recover/recoverold.test
new file mode 100644
index 0000000000..61f09397b8
--- /dev/null
+++ b/ext/recover/recoverold.test
@@ -0,0 +1,139 @@
+# 2019 April 23
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+#
+#
+
+if {![info exists testdir]} {
+  set testdir [file join [file dirname [info script]] .. .. test]
+} 
+source [file join [file dirname [info script]] recover_common.tcl]
+source $testdir/tester.tcl
+set testprefix recoverold
+
+ifcapable !vtab {
+  finish_test; return
+}
+
+proc compare_result {db1 db2 sql} {
+  set r1 [$db1 eval $sql]
+  set r2 [$db2 eval $sql]
+  if {$r1 != $r2} {
+  puts "sql: $sql"
+  puts "r1: $r1"
+  puts "r2: $r2"
+    error "mismatch for $sql"
+  }
+  return ""
+}
+
+proc compare_dbs {db1 db2} {
+  compare_result $db1 $db2 "SELECT sql FROM sqlite_master ORDER BY 1"
+  foreach tbl [$db1 eval {SELECT name FROM sqlite_master WHERE type='table'}] {
+    compare_result $db1 $db2 "SELECT * FROM $tbl"
+  }
+}
+
+proc do_recover_test {tn {tsql {}} {res {}}} {
+  forcedelete test.db2
+  forcedelete rstate.db
+
+  set R [sqlite3_recover_init db main test.db2]
+  $R config lostandfound lost_and_found
+  $R config testdb rstate.db
+  $R step
+  $R finish
+  
+  sqlite3 db2 test.db2
+
+  if {$tsql==""} {
+    uplevel [list do_test $tn [list compare_dbs db db2] {}]
+  } else {
+    uplevel [list do_execsql_test -db db2 $tn $tsql $res]
+  }
+  db2 close
+}
+
+set doc {
+  hello
+  world
+}
+do_execsql_test 1.1.1 {
+  CREATE TABLE t1(a INTEGER PRIMARY KEY, b, c);
+  INSERT INTO t1 VALUES(1, 4, X'1234567800');
+  INSERT INTO t1 VALUES(2, 'test', 8.1);
+  INSERT INTO t1 VALUES(3, $doc, 8.4);
+}
+do_recover_test 1.1.2
+
+do_execsql_test 1.2.1 "
+  DELETE FROM t1;
+  INSERT INTO t1 VALUES(13, 'hello\r\nworld', 13);
+"
+do_recover_test 1.2.2
+
+do_execsql_test 1.3.1 "
+  CREATE TABLE t2(i INTEGER PRIMARY KEY AUTOINCREMENT, b, c);
+  INSERT INTO t2 VALUES(NULL, 1, 2);
+  INSERT INTO t2 VALUES(NULL, 3, 4);
+  INSERT INTO t2 VALUES(NULL, 5, 6);
+  CREATE TABLE t3(i INTEGER PRIMARY KEY AUTOINCREMENT, b, c);
+  INSERT INTO t3 VALUES(NULL, 1, 2);
+  INSERT INTO t3 VALUES(NULL, 3, 4);
+  INSERT INTO t3 VALUES(NULL, 5, 6);
+  DELETE FROM t2;
+"
+do_recover_test 1.3.2
+
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 2.1.0 {
+  PRAGMA auto_vacuum = 0;
+  CREATE TABLE t1(a, b, c, PRIMARY KEY(b, c)) WITHOUT ROWID;
+  INSERT INTO t1 VALUES(1, 2, 3);
+  INSERT INTO t1 VALUES(4, 5, 6);
+  INSERT INTO t1 VALUES(7, 8, 9);
+}
+
+do_recover_test 2.1.1
+
+do_execsql_test 2.2.0 {
+  PRAGMA writable_schema = 1;
+  DELETE FROM sqlite_master WHERE name='t1';
+}
+do_recover_test 2.2.1 {
+  SELECT name FROM sqlite_master
+} {lost_and_found}
+
+do_execsql_test 2.3.0 {
+  CREATE TABLE lost_and_found(a, b, c);
+}
+do_recover_test 2.3.1 {
+  SELECT name FROM sqlite_master
+} {lost_and_found lost_and_found_0}
+
+do_execsql_test 2.4.0 {
+  CREATE TABLE lost_and_found_0(a, b, c);
+}
+do_recover_test 2.4.1 {
+  SELECT name FROM sqlite_master;
+  SELECT * FROM lost_and_found_1;
+} {lost_and_found lost_and_found_0 lost_and_found_1
+  2 2 3 {} 2 3 1
+  2 2 3 {} 5 6 4
+  2 2 3 {} 8 9 7
+}
+
+#-------------------------------------------------------------------------
+breakpoint
+reset_db
+do_recover_test 3.0
+
+finish_test
diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index d8b151616b..ec333f0d05 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -22,6 +22,9 @@ typedef sqlite3_int64 i64;
 
 typedef struct RecoverColumn RecoverColumn;
 struct RecoverColumn {
+  int iField;                     /* Field in record on disk */
+  int iBind;                      /* Binding to use in INSERT */
+  int bIPK;                       /* True for IPK column */
   char *zCol;
   int eHidden;
 };
@@ -35,6 +38,9 @@ struct RecoverColumn {
 ** When running the ".recover" command, each output table, and the special
 ** orphaned row table if it is required, is represented by an instance
 ** of the following struct.
+**
+** aCol[]:
+**  Array of nCol columns. In the order in which they appear in the table.
 */
 typedef struct RecoverTable RecoverTable;
 struct RecoverTable {
@@ -43,7 +49,6 @@ struct RecoverTable {
   int nCol;                       /* Number of columns in table */
   RecoverColumn *aCol;            /* Array of columns */
   int bIntkey;                    /* True for intkey, false for without rowid */
-  int iPk;                        /* Index of IPK column, if bIntkey */
 
   RecoverTable *pNext;
 };
@@ -81,13 +86,13 @@ struct sqlite3_recover {
   char *zDb;
   char *zUri;
   RecoverTable *pTblList;
-  RecoverBitmap *pUsed;           /* Used by recoverWriteLostAndFound() */
+  RecoverBitmap *pUsed;           /* Used by recoverLostAndFound() */
 
   int errCode;                    /* For sqlite3_recover_errcode() */
   char *zErrMsg;                  /* For sqlite3_recover_errmsg() */
 
   char *zStateDb;
-  int bLostAndFound;
+  char *zLostAndFound;            /* Name of lost-and-found table (or NULL) */
 
 };
 
@@ -238,6 +243,21 @@ static int recoverExec(sqlite3_recover *p, sqlite3 *db, const char *zSql){
   return p->errCode;
 }
 
+static char *recoverPrintf(sqlite3_recover *p, const char *zFmt, ...){
+  va_list ap;
+  char *z;
+  va_start(ap, zFmt);
+  z = sqlite3_vmprintf(zFmt, ap);
+  va_end(ap);
+  if( p->errCode==SQLITE_OK ){
+    if( z==0 ) p->errCode = SQLITE_NOMEM;
+  }else{
+    sqlite3_free(z);
+    z = 0;
+  }
+  return z;
+}
+
 /*
 ** Execute "PRAGMA page_count" against the input database. If successful,
 ** return the integer result. Or, if an error occurs, leave an error code 
@@ -256,6 +276,24 @@ static i64 recoverPageCount(sqlite3_recover *p){
   return nPg;
 }
 
+/*
+** SELECT page_is_used(pgno);
+*/
+static void recoverPageIsUsed(
+  sqlite3_context *pCtx,
+  int nArg,
+  sqlite3_value **apArg
+){
+  sqlite3_recover *p = (sqlite3_recover*)sqlite3_user_data(pCtx);
+  sqlite3_int64 pgno = sqlite3_value_int64(apArg[0]);
+  sqlite3_stmt *pStmt = 0;
+  int bRet;
+
+  assert( nArg==1 );
+  bRet = recoverBitmapQuery(p->pUsed, pgno);
+  sqlite3_result_int(pCtx, bRet);
+}
+
 /*
 ** The implementation of a user-defined SQL function invoked by the 
 ** sqlite_dbdata and sqlite_dbptr virtual table modules to access pages
@@ -281,13 +319,14 @@ static void recoverGetPage(
 
   assert( nArg==1 );
   if( pgno==0 ){
-    sqlite3_result_int64(pCtx, recoverPageCount(p));
+    i64 nPg = recoverPageCount(p);
+    sqlite3_result_int64(pCtx, nPg);
     return;
   }else{
     if( p->pGetPage==0 ){
       pStmt = recoverPreparePrintf(
           p, p->dbIn, "SELECT data FROM sqlite_dbpage(%Q) WHERE pgno=?", p->zDb
-          );
+      );
     }else{
       pStmt = p->pGetPage;
     }
@@ -321,6 +360,9 @@ static int recoverOpenOutput(sqlite3_recover *p){
     assert( p->dbOut==0 );
 
     rc = sqlite3_open_v2(p->zUri, &db, flags, 0);
+    if( rc==SQLITE_OK ){
+      rc = sqlite3_exec(db, "PRAGMA writable_schema = 1", 0, 0, 0);
+    }
     if( rc==SQLITE_OK ){
       const char *zPath = p->zStateDb ? p->zStateDb : ":memory:";
       char *zSql = sqlite3_mprintf("ATTACH %Q AS recovery", zPath);
@@ -332,6 +374,7 @@ static int recoverOpenOutput(sqlite3_recover *p){
       sqlite3_free(zSql);
     }
 
+
     if( rc==SQLITE_OK ){
       sqlite3_backup *pBackup = sqlite3_backup_init(db, "main", db, "recovery");
       if( pBackup ){
@@ -349,6 +392,11 @@ static int recoverOpenOutput(sqlite3_recover *p){
           db, "getpage", 1, SQLITE_UTF8, (void*)p, recoverGetPage, 0, 0
       );
     }
+    if( rc==SQLITE_OK ){
+      rc = sqlite3_create_function(
+          db, "page_is_used", 1, SQLITE_UTF8, (void*)p, recoverPageIsUsed, 0, 0
+      );
+    }
 
     if( rc!=SQLITE_OK ){
       if( p->errCode==SQLITE_OK ) rc = recoverDbError(p, db);
@@ -392,6 +440,7 @@ static void recoverAddTable(sqlite3_recover *p, const char *zName, i64 iRoot){
   );
 
   if( pStmt ){
+    int iPk = -1;
     RecoverTable *pNew = 0;
     int nCol = 0;
     int nName = recoverStrlen(zName);
@@ -406,24 +455,37 @@ static void recoverAddTable(sqlite3_recover *p, const char *zName, i64 iRoot){
     pNew = recoverMalloc(p, nByte);
     if( pNew ){
       int i = 0;
+      int iField = 0;
+      int iBind = 1;
       char *csr = 0;
       pNew->aCol = (RecoverColumn*)&pNew[1];
       pNew->zTab = csr = (char*)&pNew->aCol[nCol];
       pNew->nCol = nCol;
       pNew->iRoot = iRoot;
-      pNew->iPk = -1;
       memcpy(csr, zName, nName);
       csr += nName+1;
 
       for(i=0; sqlite3_step(pStmt)==SQLITE_ROW; i++){
-        int bPk = sqlite3_column_int(pStmt, 5);
+        int iPKF = sqlite3_column_int(pStmt, 5);
         int n = sqlite3_column_bytes(pStmt, 1);
         const char *z = (const char*)sqlite3_column_text(pStmt, 1);
+        const char *zType = (const char*)sqlite3_column_text(pStmt, 2);
         int eHidden = sqlite3_column_int(pStmt, 6);
 
-        if( bPk ) pNew->iPk = i;
+        if( iPk==-1 && iPKF==1 && !sqlite3_stricmp("integer", zType) ) iPk = i;
+        if( iPKF>1 ) iPk = -2;
         pNew->aCol[i].zCol = csr;
         pNew->aCol[i].eHidden = eHidden;
+        if( eHidden==RECOVER_EHIDDEN_VIRTUAL ){
+          pNew->aCol[i].iField = -1;
+        }else{
+          pNew->aCol[i].iField = iField++;
+        }
+        if( eHidden!=RECOVER_EHIDDEN_VIRTUAL
+         && eHidden!=RECOVER_EHIDDEN_STORED
+        ){
+          pNew->aCol[i].iBind = iBind++;
+        }
         memcpy(csr, z, n);
         csr += (n+1);
       }
@@ -434,18 +496,26 @@ static void recoverAddTable(sqlite3_recover *p, const char *zName, i64 iRoot){
 
     recoverFinalize(p, pStmt);
 
-    pStmt = recoverPreparePrintf(p, p->dbOut, "PRAGMA index_info(%Q)", zName);
-    if( pStmt && sqlite3_step(pStmt)!=SQLITE_ROW ){
-      pNew->bIntkey = 1;
-    }else{
-      pNew->iPk = -1;
+    pNew->bIntkey = 1;
+    pStmt = recoverPreparePrintf(p, p->dbOut, "PRAGMA index_xinfo(%Q)", zName);
+    while( pStmt && sqlite3_step(pStmt)==SQLITE_ROW ){
+      int iField = sqlite3_column_int(pStmt, 0);
+      int iCol = sqlite3_column_int(pStmt, 1);
+
+      assert( iField<pNew->nCol && iCol<pNew->nCol );
+      pNew->aCol[iCol].iField = iField;
+
+      pNew->bIntkey = 0;
+      iPk = -2;
     }
     recoverFinalize(p, pStmt);
+
+    if( iPk>=0 ) pNew->aCol[iPk].bIPK = 1;
   }
 }
 
 /*
-**  
+**
 */
 static int recoverWriteSchema1(sqlite3_recover *p){
   sqlite3_stmt *pSelect = 0;
@@ -453,7 +523,8 @@ static int recoverWriteSchema1(sqlite3_recover *p){
 
   pSelect = recoverPrepare(p, p->dbOut,
       "SELECT rootpage, sql, type='table' FROM recovery.schema "
-      "  WHERE type='table' OR (type='index' AND sql LIKE '%unique%')"
+      "  WHERE type='table' OR (type='index' AND sql LIKE '%unique%') "
+      "  ORDER BY type!='table', name!='sqlite_sequence'"
   );
 
   pTblname = recoverPrepare(p, p->dbOut,
@@ -545,8 +616,9 @@ static sqlite3_stmt *recoverInsertStmt(
     if( eHidden!=RECOVER_EHIDDEN_VIRTUAL
      && eHidden!=RECOVER_EHIDDEN_STORED
     ){
+      assert( pTab->aCol[ii].iField>=0 && pTab->aCol[ii].iBind>=1 );
       zSql = recoverMPrintf(p, "%z%s%Q", zSql, zSep, pTab->aCol[ii].zCol);
-      zBind = recoverMPrintf(p, "%z%s?", zBind, zSep);
+      zBind = recoverMPrintf(p, "%z%s?%d", zBind, zSep, pTab->aCol[ii].iBind);
       zSep = ", ";
     }
   }
@@ -565,74 +637,268 @@ static RecoverTable *recoverFindTable(sqlite3_recover *p, u32 iRoot){
   return pRet;
 }
 
-static int recoverWriteLostAndFound(sqlite3_recover *p){
+/*
+** This function attempts to create a lost and found table within the 
+** output db. If successful, it returns a pointer to a buffer containing
+** the name of the new table. It is the responsibility of the caller to
+** eventually free this buffer using sqlite3_free().
+**
+** If an error occurs, NULL is returned and an error code and error 
+** message left in the recover handle.
+*/
+static char *recoverLostAndFoundCreate(
+  sqlite3_recover *p,             /* Recover object */
+  int nField                      /* Number of column fields in new table */
+){
+  char *zTbl = 0;
+  sqlite3_stmt *pProbe = 0;
+  int ii = 0;
+
+  pProbe = recoverPrepare(p, p->dbOut,
+    "SELECT 1 FROM sqlite_schema WHERE name=?"
+  );
+  for(ii=-1; zTbl==0 && p->errCode==SQLITE_OK && ii<1000; ii++){
+    int bFail = 0;
+    if( ii<0 ){
+      zTbl = recoverPrintf(p, "%s", p->zLostAndFound);
+    }else{
+      zTbl = recoverPrintf(p, "%s_%d", p->zLostAndFound, ii);
+    }
+
+    if( p->errCode==SQLITE_OK ){
+      sqlite3_bind_text(pProbe, 1, zTbl, -1, SQLITE_STATIC);
+      if( SQLITE_ROW==sqlite3_step(pProbe) ){
+        bFail = 1;
+      }
+      recoverReset(p, pProbe);
+    }
+
+    if( bFail ){
+      sqlite3_clear_bindings(pProbe);
+      sqlite3_free(zTbl);
+      zTbl = 0;
+    }
+  }
+  recoverFinalize(p, pProbe);
+
+  if( zTbl ){
+    const char *zSep = 0;
+    char *zField = 0;
+    char *zSql = 0;
+
+    zSep = "rootpgno INTEGER, pgno INTEGER, nfield INTEGER, id INTEGER, ";
+    for(ii=0; p->errCode==SQLITE_OK && ii<nField; ii++){
+      zField = recoverMPrintf(p, "%z%sc%d", zField, zSep, ii);
+      zSep = ", ";
+    }
+
+    zSql = recoverPrintf(p, "CREATE TABLE %s(%s)", zTbl, zField);
+    sqlite3_free(zField);
+
+    recoverExec(p, p->dbOut, zSql);
+    sqlite3_free(zSql);
+  }else if( p->errCode==SQLITE_OK ){
+    recoverError(
+        p, SQLITE_ERROR, "failed to create %s output table", p->zLostAndFound
+    );
+  }
+
+  return zTbl;
+}
+
+/*
+** Synthesize and prepare an INSERT statement to write to the lost_and_found
+** table in the output database. The name of the table is zTab, and it has
+** nField c* fields.
+*/
+static sqlite3_stmt *recoverLostAndFoundInsert(
+  sqlite3_recover *p,
+  const char *zTab,
+  int nField
+){
+  int nTotal = nField + 4;
+  int ii;
+  char *zBind = 0;
+  const char *zSep = "";
+  sqlite3_stmt *pRet = 0;
+
+  for(ii=0; ii<nTotal; ii++){
+    zBind = recoverMPrintf(p, "%z%s?", zBind, zBind?", ":"", ii);
+  }
+
+  pRet = recoverPreparePrintf(
+      p, p->dbOut, "INSERT INTO %s VALUES(%s)", zTab, zBind
+  );
+  sqlite3_free(zBind);
+  return pRet;
+}
+
+static void recoverLostAndFoundPopulate(
+  sqlite3_recover *p, 
+  sqlite3_stmt *pInsert,
+  int nField
+){
+  sqlite3_stmt *pStmt = recoverPrepare(p, p->dbOut,
+      "WITH RECURSIVE pages(root, page) AS ("
+      "  SELECT pgno, pgno FROM recovery.map WHERE parent IS NULL"
+      "    UNION"
+      "  SELECT root, child FROM sqlite_dbptr('getpage()'), pages "
+      "    WHERE pgno=page"
+      ") "
+      "SELECT root, page, cell, field, value "
+      "FROM sqlite_dbdata('getpage()') d, pages p WHERE p.page=d.pgno "
+      "  AND NOT page_is_used(page) "
+      "UNION ALL "
+      "SELECT 0, 0, 0, 0, 0"
+  );
+
+  sqlite3_value **apVal = 0;
+  int nVal = -1;
+  i64 iRowid = 0;
+  int bHaveRowid = 0;
+  int ii;
+
+  i64 iPrevRoot = -1;
+  i64 iPrevPage = -1;
+  int iPrevCell = -1;
+
+  apVal = (sqlite3_value**)recoverMalloc(p, nField*sizeof(sqlite3_value*));
+  while( p->errCode==SQLITE_OK && SQLITE_ROW==sqlite3_step(pStmt) ){
+    i64 iRoot = sqlite3_column_int64(pStmt, 0);
+    i64 iPage = sqlite3_column_int64(pStmt, 1);
+    int iCell = sqlite3_column_int64(pStmt, 2);
+    int iField = sqlite3_column_int64(pStmt, 3);
+
+    if( iPrevRoot>0 && (
+      iPrevRoot!=iRoot || iPrevPage!=iPage || iPrevCell!=iCell
+    )){
+      /* Insert the new row */
+      sqlite3_bind_int64(pInsert, 1, iPrevRoot);  /* rootpgno */
+      sqlite3_bind_int64(pInsert, 2, iPrevPage);  /* pgno */
+      sqlite3_bind_int(pInsert, 3, nVal);         /* nfield */
+      if( bHaveRowid ){
+        sqlite3_bind_int64(pInsert, 4, iRowid);   /* id */
+      }
+      for(ii=0; ii<nVal; ii++){
+        sqlite3_bind_value(pInsert, 5+ii, apVal[ii]);
+      }
+      sqlite3_step(pInsert);
+      recoverReset(p, pInsert);
+
+      /* Discard the accumulated row data */
+      for(ii=0; ii<nVal; ii++){
+        sqlite3_value_free(apVal[ii]);
+        apVal[ii] = 0;
+      }
+      bHaveRowid = 0;
+      nVal = -1;
+    }
+
+    if( iField<0 ){
+      assert( nVal==-1 );
+      iRowid = sqlite3_column_int64(pStmt, 4);
+      bHaveRowid = 1;
+      nVal = 0;
+    }else if( iField<nField && iRoot!=0 ){
+      sqlite3_value *pVal = sqlite3_column_value(pStmt, 4);
+      apVal[iField] = sqlite3_value_dup(pVal);
+      assert( iField==nVal || (nVal==-1 && iField==0) );
+      nVal = iField+1;
+    }
+
+    iPrevRoot = iRoot;
+    iPrevPage = iPage;
+    iPrevCell = iCell;
+  }
+  recoverFinalize(p, pStmt);
+
+  for(ii=0; ii<nVal; ii++){
+    sqlite3_value_free(apVal[ii]);
+    apVal[ii] = 0;
+  }
+  sqlite3_free(apVal);
+}
+
+static int recoverLostAndFound(sqlite3_recover *p){
   i64 nPg = 0;
   RecoverBitmap *pMap = 0;
 
   nPg = recoverPageCount(p);
   pMap = p->pUsed = recoverBitmapAlloc(p, nPg);
   if( pMap ){
-    sqlite3_stmt *pStmt = 0;
-    char *zField = 0;
-    const char *zSep = 0;
-    int ii;
+    char *zTab = 0;               /* Name of lost_and_found table */
+    sqlite3_stmt *pInsert = 0;    /* INSERT INTO lost_and_found ... */
+    int nField = 0;
 
+    /* Add all pages that are part of any tree in the recoverable part of
+    ** the input database schema to the bitmap. */
     sqlite3_stmt *pStmt = recoverPrepare(
         p, p->dbOut,
-        "WITH RECURSIVE used(page) AS ("
+        "WITH roots(r) AS ("
+        "  SELECT 1 UNION ALL"
         "  SELECT rootpage FROM recovery.schema WHERE rootpage>0"
+        "),"
+        "used(page) AS ("
+        "  SELECT r FROM roots"
         "    UNION"
         "  SELECT child FROM sqlite_dbptr('getpage()'), used "
         "    WHERE pgno=page"
         ") "
         "SELECT page FROM used"
     );
-    while( pStmt && sqlite3_step(pStmt) ){
-      i64 iPg = sqlite3_column_int64(pStmt);
+    while( pStmt && SQLITE_ROW==sqlite3_step(pStmt) ){
+      i64 iPg = sqlite3_column_int64(pStmt, 0);
       recoverBitmapSet(pMap, iPg);
     }
-    recoverFinalize(pStmt);
+    recoverFinalize(p, pStmt);
 
+    /* Add an entry for each page not already added to the bitmap to 
+    ** the recovery.map table. This loop leaves the "parent" column
+    ** of each recovery.map row set to NULL - to be filled in below.  */
     pStmt = recoverPreparePrintf(
         p, p->dbOut,
         "WITH RECURSIVE seq(ii) AS ("
         "  SELECT 1 UNION ALL SELECT ii+1 FROM seq WHERE ii<%lld"
         ")"
-        "INSERT INTO recover.map(pgno) "
-        "    SELECT ii FROM seq WHERE !page_is_used(ii)"
+        "INSERT INTO recovery.map(pgno) "
+        "    SELECT ii FROM seq WHERE NOT page_is_used(ii)", nPg
     );
     sqlite3_step(pStmt);
-    recoverFinalize(pStmt);
+    recoverFinalize(p, pStmt);
 
+    /* Set the "parent" column for each row of the recovery.map table */
     pStmt = recoverPrepare(
         p, p->dbOut,
-        "UPDATE recover.map SET parent = ptr.pgno "
-        "    FROM sqlite_dbptr('getpage()') WHERE recover.map.pgno=ptr.child"
+        "UPDATE recovery.map SET parent = ptr.pgno "
+        "    FROM sqlite_dbptr('getpage()') AS ptr "
+        "    WHERE recovery.map.pgno=ptr.child"
     );
     sqlite3_step(pStmt);
-    recoverFinalize(pStmt);
+    recoverFinalize(p, pStmt);
       
+    /* Figure out the number of fields in the longest record that will be
+    ** recovered into the lost_and_found table. Set nField to this value. */
     pStmt = recoverPrepare(
         p, p->dbOut,
-        "SELECT max(field) FROM sqlite_dbdata('getpage') WHERE pgno IN ("
-        "  SELECT pgno FROM recover.map"
+        "SELECT max(field)+1 FROM sqlite_dbdata('getpage') WHERE pgno IN ("
+        "  SELECT pgno FROM recovery.map"
         ")"
     );
-    if( pStmt && sqlite3_step(pStmt) ){
-      nMaxField = sqlite3_column_int64(pStmt, 0);
+    if( pStmt && SQLITE_ROW==sqlite3_step(pStmt) ){
+      nField = sqlite3_column_int64(pStmt, 0);
     }
-    recoverFinalize(pStmt);
+    recoverFinalize(p, pStmt);
 
-    if( nMaxField==0 || p->errCode!=SQLITE_OK ) return p->errCode;
-
-    zSep = "rootpgno INTEGER, pgno INTEGER, nfield INTEGER, id INTEGER, ";
-    for(ii=0; ii<nMaxField; ii++){
-      zField = sqlite3_mprintf("%z%sc%d", zField, zSep, ii);
-      zSep = ", ";
-      if( zField==0 ){
-        p->errCode = SQLITE_NOMEM;
-      }
+    if( nField>0 ){
+      zTab = recoverLostAndFoundCreate(p, nField);
+      pInsert = recoverLostAndFoundInsert(p, zTab, nField);
+      recoverLostAndFoundPopulate(p, pInsert, nField);
+      recoverFinalize(p, pInsert);
+      sqlite3_free(zTab);
     }
+
+    recoverBitmapFree(pMap);
+    p->pUsed = 0;
   }
 }
 
@@ -647,7 +913,7 @@ static int recoverWriteData(sqlite3_recover *p){
     if( pTbl->nCol>nMax ) nMax = pTbl->nCol;
   }
 
-  apVal = (sqlite3_value**)recoverMalloc(p, sizeof(sqlite3_value*) * nMax);
+  apVal = (sqlite3_value**)recoverMalloc(p, sizeof(sqlite3_value*) * (nMax+1));
   if( apVal==0 ) return p->errCode;
 
   pSel = recoverPrepare(p, p->dbOut, 
@@ -697,26 +963,15 @@ static int recoverWriteData(sqlite3_recover *p){
               nInsert = nVal;
             }
 
-            for(ii=0; ii<pTab->nCol && iVal<nVal; ii++){
-              int eHidden = pTab->aCol[ii].eHidden;
-              switch( eHidden ){
-                case RECOVER_EHIDDEN_NONE:
-                case RECOVER_EHIDDEN_HIDDEN:
-                  if( ii==pTab->iPk ){
-                    sqlite3_bind_int64(pInsert, iBind, iRowid);
-                  }else{
-                    sqlite3_bind_value(pInsert, iBind, apVal[iVal]);
-                  }
-                  iBind++;
-                  iVal++;
-                  break;
+            for(ii=0; ii<pTab->nCol; ii++){
+              RecoverColumn *pCol = &pTab->aCol[ii];
 
-                case RECOVER_EHIDDEN_VIRTUAL:
-                  break;
-
-                case RECOVER_EHIDDEN_STORED:
-                  iVal++;
-                  break;
+              if( pCol->iBind>0 ){
+                if( pCol->bIPK ){
+                  sqlite3_bind_int64(pInsert, pCol->iBind, iRowid);
+                }else if( pCol->iField<nVal ){
+                  sqlite3_bind_value(pInsert, pCol->iBind, apVal[pCol->iField]);
+                }
               }
             }
 
@@ -811,7 +1066,13 @@ int sqlite3_recover_config(sqlite3_recover *p, int op, void *pArg){
       break;
 
     case SQLITE_RECOVER_LOST_AND_FOUND:
-      p->bLostAndFound = (pArg ? 1 : 0);
+      const char *zArg = (const char*)pArg;
+      sqlite3_free(p->zLostAndFound);
+      if( zArg ){
+        p->zLostAndFound = recoverPrintf(p, "%s", zArg);
+      }else{
+        p->zLostAndFound = 0;
+      }
       break;
 
     default:
@@ -832,7 +1093,7 @@ static void recoverStep(sqlite3_recover *p){
     if( recoverCacheSchema(p) ) return;
     if( recoverWriteSchema1(p) ) return;
     if( recoverWriteData(p) ) return;
-    if( p->bLostAndFound && recoverWriteLostAndFound(p) ) return;
+    if( p->zLostAndFound && recoverLostAndFound(p) ) return;
     if( recoverWriteSchema2(p) ) return;
   }
 }
@@ -861,6 +1122,7 @@ int sqlite3_recover_finish(sqlite3_recover *p){
   rc = p->errCode;
 
   sqlite3_free(p->zStateDb);
+  sqlite3_free(p->zLostAndFound);
   sqlite3_free(p);
   return rc;
 }
diff --git a/ext/recover/sqlite3recover.h b/ext/recover/sqlite3recover.h
index 0c83f8dea5..8306c67a12 100644
--- a/ext/recover/sqlite3recover.h
+++ b/ext/recover/sqlite3recover.h
@@ -38,6 +38,18 @@ sqlite3_recover *sqlite3_recover_init(
 /* Details TBD. */
 int sqlite3_recover_config(sqlite3_recover*, int op, void *pArg);
 
+/*
+** SQLITE_RECOVER_TESTDB:
+**
+**
+** SQLITE_RECOVER_LOST_AND_FOUND:
+**   The pArg argument points to a string buffer containing the name
+**   of a "lost-and-found" table in the output database, or NULL. If
+**   the argument is non-NULL and the database contains seemingly
+**   valid pages that cannot be associated with any table in the
+**   recovered part of the schema, data is extracted from these
+**   pages to add to the lost-and-found table.
+*/
 #define SQLITE_RECOVER_TESTDB         789
 #define SQLITE_RECOVER_LOST_AND_FOUND 790
 
diff --git a/ext/recover/test_recover.c b/ext/recover/test_recover.c
index 912b8dec5c..cdd5d090fa 100644
--- a/ext/recover/test_recover.c
+++ b/ext/recover/test_recover.c
@@ -79,7 +79,8 @@ static int testRecoverCmd(
   switch( iSub ){
     case 0:  assert( sqlite3_stricmp("config", aSub[iSub].zSub)==0 ); {
       const char *aOp[] = {
-        "testdb",    /* 0 */
+        "testdb",          /* 0 */
+        "lostandfound",    /* 1 */
         0
       };
       int iOp = 0;
@@ -89,8 +90,13 @@ static int testRecoverCmd(
       }
       switch( iOp ){
         case 0:
-          res = sqlite3_recover_config(
-              pTest->p, SQLITE_RECOVER_TESTDB, (void*)Tcl_GetString(objv[3])
+          res = sqlite3_recover_config(pTest->p, 
+              SQLITE_RECOVER_TESTDB, (void*)Tcl_GetString(objv[3])
+          );
+          break;
+        case 1:
+          res = sqlite3_recover_config(pTest->p, 
+              SQLITE_RECOVER_LOST_AND_FOUND, (void*)Tcl_GetString(objv[3])
           );
           break;
       }
diff --git a/manifest b/manifest
index 7f8f333f25..10281dc64e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Further\swork\son\smaking\srecovery\sextension\scompatible\swith\sthe\sshell\stool\s".recover"\scode.
-D 2022-09-01T21:00:39.747
+C Further\swork\son\smaking\sthe\srecover\sextension\scompatible\swith\sthe\s.recover\scommand.
+D 2022-09-03T20:07:39.011
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -299,7 +299,7 @@ F ext/misc/closure.c dbfd8543b2a017ae6b1a5843986b22ddf99ff126ec9634a2f4047cd14c8
 F ext/misc/completion.c 6dafd7f4348eecc7be9e920d4b419d1fb2af75d938cd9c59a20cfe8beb2f22b9
 F ext/misc/compress.c 3354c77a7c8e86e07d849916000cdac451ed96500bfb5bd83b20eb61eee012c9
 F ext/misc/csv.c ca8d6dafc5469639de81937cb66ae2e6b358542aba94c4f791910d355a8e7f73
-F ext/misc/dbdata.c f317980cea788e67932828b94a16ee8a8b859e3c2d62859d09ba3d5ca85f87cb
+F ext/misc/dbdata.c 9bb3666519bd8a54cce4934076a557fe6441c5bafce7e9c24d8b5ced148e8154
 F ext/misc/dbdump.c b8592f6f2da292c62991a13864a60d6c573c47a9cc58362131b9e6a64f823e01
 F ext/misc/decimal.c 09f967dcf4a1ee35a76309829308ec278d3648168733f4a1147820e11ebefd12
 F ext/misc/eval.c 04bc9aada78c888394204b4ed996ab834b99726fb59603b0ee3ed6e049755dc1
@@ -389,9 +389,10 @@ F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9c
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
 F ext/recover/recover1.test a848af8c82fe0731af835ff99475724f8654d2f24f772cc4e6f7ec4eb2ab71ea
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
-F ext/recover/sqlite3recover.c d81b430f968d838035ebf5ca168b43ae8a0bec1e7c2c950b74ec4fd5e16ca47b
-F ext/recover/sqlite3recover.h 94e277a9b314a03df46b5e94cc44b70ed6c6893d2776d09c7ea0b55c969ad854
-F ext/recover/test_recover.c 919f61df54776598b350250057fd2d3ea9cc2cef1aeac0dbb760958d26fe1afb
+F ext/recover/recoverold.test 33ccbe2393af0e82f292c135b725e3eca1e803960681cf6da41fc00d28bd8683
+F ext/recover/sqlite3recover.c 8d93b9aa056c3fae9a5e2736a4ffa71414bdb502863ef879e55bec7b37030266
+F ext/recover/sqlite3recover.h b82974790b528480163d87dcd84afffe7568393194c9ec8241cfbc3ee6bbdd1b
+F ext/recover/test_recover.c b8dddd96ccd4a62bc14cb3a8d5696407892e184fe7d45ecbedde954577857de2
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
 F ext/repair/checkfreelist.c e21f06995ff4efdc1622dcceaea4dcba2caa83ca2f31a1607b98a8509168a996
 F ext/repair/checkindex.c 4383e4469c21e5b9ae321d0d63cec53e981af9d7a6564be6374f0eeb93dfc890
@@ -1341,7 +1342,7 @@ F test/parser1.test 6ccdf5e459a5dc4673d3273dc311a7e9742ca952dd0551a6a6320d27035c
 F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
 F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
 F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
-F test/permutations.test 909c84575ac50f6d30fa125a109a01986e08c26b9ea38d28501a0711b50b5627
+F test/permutations.test 847df2d81f0172ab7032e55145f0f3da460dd65759ac2b02864e385add1947d5
 F test/pg_common.tcl 3b27542224db1e713ae387459b5d117c836a5f6e328846922993b6d2b7640d9f
 F test/pragma.test cae534c12a033a5c319ccc94f50b32811acdef9f67bf19a82ff42697caccd69f
 F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
@@ -2004,8 +2005,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 f8298eeba01cb5b02ac4d642c06f3801331ca90edea533ea898a3283981a9e49
-R 185cdcc7bc591773e93e55f9de4bfb4c
+P 8df7c7d0dcd1b2fcdad00e765a9868407f0ced02ac4432ee2cdf25d83b130759
+R 93788fe8081a2011cde8fac3142d518f
 U dan
-Z 5d96e275b1b3f6a2d23b93e2a033e9c9
+Z 21514150d144c868f0bbea27057fe308
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 5c5b60080f..093f196c7a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8df7c7d0dcd1b2fcdad00e765a9868407f0ced02ac4432ee2cdf25d83b130759
\ No newline at end of file
+f2ac315844d8db1bd1c6950a4fef7c459ddd37cc21a8f3daafa5639fad8118e2
\ No newline at end of file
diff --git a/test/permutations.test b/test/permutations.test
index c5044e1a6d..8ab9dc8755 100644
--- a/test/permutations.test
+++ b/test/permutations.test
@@ -91,6 +91,7 @@ foreach f [glob -nocomplain            \
     $testdir/../ext/fts5/test/*.test   \
     $testdir/../ext/expert/*.test      \
     $testdir/../ext/lsm1/test/*.test   \
+    $testdir/../ext/recover/*.test     \
 ] {
   lappend alltests $f 
 }

From be2e212cf93f6bae68dc75ed0aa9f2b07988cd3f Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Sat, 3 Sep 2022 20:31:36 +0000
Subject: [PATCH 046/428] Take the freelist into account when recovering data
 that is not linked in to any tree associated with a schema entry.

FossilOrigin-Name: dbd1f1efb349a9c8886e42b3f07d3f4c576924136f111558c7294d0a272e415a
---
 ext/recover/recoverold.test  | 17 ++++++++++
 ext/recover/sqlite3recover.c | 64 ++++++++++++++++++++++++++++++++++--
 manifest                     | 14 ++++----
 manifest.uuid                |  2 +-
 4 files changed, 86 insertions(+), 11 deletions(-)

diff --git a/ext/recover/recoverold.test b/ext/recover/recoverold.test
index 61f09397b8..001426b88d 100644
--- a/ext/recover/recoverold.test
+++ b/ext/recover/recoverold.test
@@ -131,6 +131,23 @@ do_recover_test 2.4.1 {
   2 2 3 {} 8 9 7
 }
 
+do_execsql_test 2.5 {
+  CREATE TABLE x1(a, b, c);
+  WITH s(i) AS (
+    SELECT 1 UNION ALL SELECT i+1 FROM s WHERE i<100
+  )
+  INSERT INTO x1 SELECT i, i, hex(randomblob(500)) FROM s;
+  DROP TABLE x1;
+}
+do_recover_test 2.5.1 {
+  SELECT name FROM sqlite_master;
+  SELECT * FROM lost_and_found_1;
+} {lost_and_found lost_and_found_0 lost_and_found_1
+  2 2 3 {} 2 3 1
+  2 2 3 {} 5 6 4
+  2 2 3 {} 8 9 7
+}
+
 #-------------------------------------------------------------------------
 breakpoint
 reset_db
diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index ec333f0d05..34cc0cdd50 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -107,7 +107,7 @@ static int recoverStrlen(const char *zStr){
   return nRet;
 }
 
-static void *recoverMalloc(sqlite3_recover *p, sqlite3_int64 nByte){
+static void *recoverMalloc(sqlite3_recover *p, i64 nByte){
   void *pRet = 0;
   assert( nByte>0 );
   if( p->errCode==SQLITE_OK ){
@@ -276,6 +276,36 @@ static i64 recoverPageCount(sqlite3_recover *p){
   return nPg;
 }
 
+/*
+** Scalar function "read_i32". The first argument to this function
+** must be a blob. The second a non-negative integer. This function
+** reads and returns a 32-bit big-endian integer from byte
+** offset (4*<arg2>) of the blob.
+*/
+static void recoverReadI32(
+  sqlite3_context *context, 
+  int argc, 
+  sqlite3_value **argv
+){
+  const unsigned char *pBlob;
+  int nBlob;
+  int iInt;
+
+  assert( argc==2 );
+  nBlob = sqlite3_value_bytes(argv[0]);
+  pBlob = (const unsigned char*)sqlite3_value_blob(argv[0]);
+  iInt = sqlite3_value_int(argv[1]);
+
+  if( iInt>=0 && (iInt+1)*4<=nBlob ){
+    const unsigned char *a = &pBlob[iInt*4];
+    i64 iVal = ((i64)a[0]<<24)
+             + ((i64)a[1]<<16)
+             + ((i64)a[2]<< 8)
+             + ((i64)a[3]<< 0);
+    sqlite3_result_int64(context, iVal);
+  }
+}
+
 /*
 ** SELECT page_is_used(pgno);
 */
@@ -285,7 +315,7 @@ static void recoverPageIsUsed(
   sqlite3_value **apArg
 ){
   sqlite3_recover *p = (sqlite3_recover*)sqlite3_user_data(pCtx);
-  sqlite3_int64 pgno = sqlite3_value_int64(apArg[0]);
+  i64 pgno = sqlite3_value_int64(apArg[0]);
   sqlite3_stmt *pStmt = 0;
   int bRet;
 
@@ -314,7 +344,7 @@ static void recoverGetPage(
   sqlite3_value **apArg
 ){
   sqlite3_recover *p = (sqlite3_recover*)sqlite3_user_data(pCtx);
-  sqlite3_int64 pgno = sqlite3_value_int64(apArg[0]);
+  i64 pgno = sqlite3_value_int64(apArg[0]);
   sqlite3_stmt *pStmt = 0;
 
   assert( nArg==1 );
@@ -397,6 +427,11 @@ static int recoverOpenOutput(sqlite3_recover *p){
           db, "page_is_used", 1, SQLITE_UTF8, (void*)p, recoverPageIsUsed, 0, 0
       );
     }
+    if( rc==SQLITE_OK ){
+      rc = sqlite3_create_function(
+          db, "read_i32", 2, SQLITE_UTF8, (void*)p, recoverReadI32, 0, 0
+      );
+    }
 
     if( rc!=SQLITE_OK ){
       if( p->errCode==SQLITE_OK ) rc = recoverDbError(p, db);
@@ -852,6 +887,29 @@ static int recoverLostAndFound(sqlite3_recover *p){
     }
     recoverFinalize(p, pStmt);
 
+    /* Add all pages that appear to be part of the freelist to the bitmap. */
+    pStmt = recoverPrepare(p, p->dbOut,
+      "WITH trunk(pgno) AS ("
+      "  SELECT read_i32(getpage(1), 8) AS x WHERE x>0"
+      "    UNION"
+      "  SELECT read_i32(getpage(trunk.pgno), 0) AS x FROM trunk WHERE x>0"
+      "),"
+      "trunkdata(pgno, data) AS ("
+      "  SELECT pgno, getpage(pgno) FROM trunk"
+      "),"
+      "freelist(data, n, freepgno) AS ("
+      "  SELECT data, min(16384, read_i32(data, 1)-1), pgno FROM trunkdata"
+      "    UNION ALL"
+      "  SELECT data, n-1, read_i32(data, 2+n) FROM freelist WHERE n>=0"
+      ")"
+      "SELECT freepgno FROM freelist"
+    );
+    while( pStmt && SQLITE_ROW==sqlite3_step(pStmt) ){
+      i64 iPg = sqlite3_column_int64(pStmt, 0);
+      recoverBitmapSet(pMap, iPg);
+    }
+    recoverFinalize(p, pStmt);
+
     /* Add an entry for each page not already added to the bitmap to 
     ** the recovery.map table. This loop leaves the "parent" column
     ** of each recovery.map row set to NULL - to be filled in below.  */
diff --git a/manifest b/manifest
index 10281dc64e..00fb244d2e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Further\swork\son\smaking\sthe\srecover\sextension\scompatible\swith\sthe\s.recover\scommand.
-D 2022-09-03T20:07:39.011
+C Take\sthe\sfreelist\sinto\saccount\swhen\srecovering\sdata\sthat\sis\snot\slinked\sin\sto\sany\stree\sassociated\swith\sa\sschema\sentry.
+D 2022-09-03T20:31:36.832
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -389,8 +389,8 @@ F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9c
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
 F ext/recover/recover1.test a848af8c82fe0731af835ff99475724f8654d2f24f772cc4e6f7ec4eb2ab71ea
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
-F ext/recover/recoverold.test 33ccbe2393af0e82f292c135b725e3eca1e803960681cf6da41fc00d28bd8683
-F ext/recover/sqlite3recover.c 8d93b9aa056c3fae9a5e2736a4ffa71414bdb502863ef879e55bec7b37030266
+F ext/recover/recoverold.test 7578e9b938db15dc469a4af247e15866226f366bde0cbe09a40b0aef4a0506c8
+F ext/recover/sqlite3recover.c 6c9cbc993a970060f9fb881d78f6c7e182ec988a5e48acbf15bb4a5f05ce2902
 F ext/recover/sqlite3recover.h b82974790b528480163d87dcd84afffe7568393194c9ec8241cfbc3ee6bbdd1b
 F ext/recover/test_recover.c b8dddd96ccd4a62bc14cb3a8d5696407892e184fe7d45ecbedde954577857de2
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -2005,8 +2005,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 8df7c7d0dcd1b2fcdad00e765a9868407f0ced02ac4432ee2cdf25d83b130759
-R 93788fe8081a2011cde8fac3142d518f
+P f2ac315844d8db1bd1c6950a4fef7c459ddd37cc21a8f3daafa5639fad8118e2
+R 471b646b541e0fcab850e84cb036ac46
 U dan
-Z 21514150d144c868f0bbea27057fe308
+Z 9f579b130a06a2078244b88aebbd5365
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 093f196c7a..f01f3f35e4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f2ac315844d8db1bd1c6950a4fef7c459ddd37cc21a8f3daafa5639fad8118e2
\ No newline at end of file
+dbd1f1efb349a9c8886e42b3f07d3f4c576924136f111558c7294d0a272e415a
\ No newline at end of file

From 7302079dbe01c7b136ccc0853816bd7cc4319dde Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Sat, 3 Sep 2022 21:08:38 +0000
Subject: [PATCH 047/428] Add an option to assume the freelist is corrupt when
 recovering data.

FossilOrigin-Name: 253e498f5200b8b3e2bc309587af108dd1cec8a884b3d2a49d5406525c9a4b4c
---
 ext/recover/recoverold.test  | 13 +++++++++-
 ext/recover/sqlite3recover.c | 48 ++++++++++++++++++++----------------
 ext/recover/sqlite3recover.h | 16 +++++++++---
 ext/recover/test_recover.c   |  9 +++++++
 manifest                     | 18 +++++++-------
 manifest.uuid                |  2 +-
 6 files changed, 71 insertions(+), 35 deletions(-)

diff --git a/ext/recover/recoverold.test b/ext/recover/recoverold.test
index 001426b88d..8f70a7473d 100644
--- a/ext/recover/recoverold.test
+++ b/ext/recover/recoverold.test
@@ -47,7 +47,6 @@ proc do_recover_test {tn {tsql {}} {res {}}} {
 
   set R [sqlite3_recover_init db main test.db2]
   $R config lostandfound lost_and_found
-  $R config testdb rstate.db
   $R step
   $R finish
   
@@ -148,6 +147,18 @@ do_recover_test 2.5.1 {
   2 2 3 {} 8 9 7
 }
 
+do_test 2.6 {
+  forcedelete test.db2
+  set R [sqlite3_recover_init db main test.db2]
+  $R config lostandfound lost_and_found
+  $R config freelistcorrupt 1
+  $R step
+  $R finish
+  sqlite3 db2 test.db2
+  execsql { SELECT count(*) FROM lost_and_found_1; } db2
+} {103}
+db2 close
+
 #-------------------------------------------------------------------------
 breakpoint
 reset_db
diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index 34cc0cdd50..14cc29e476 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -93,7 +93,7 @@ struct sqlite3_recover {
 
   char *zStateDb;
   char *zLostAndFound;            /* Name of lost-and-found table (or NULL) */
-
+  int bFreelistCorrupt;
 };
 
 /*
@@ -888,27 +888,29 @@ static int recoverLostAndFound(sqlite3_recover *p){
     recoverFinalize(p, pStmt);
 
     /* Add all pages that appear to be part of the freelist to the bitmap. */
-    pStmt = recoverPrepare(p, p->dbOut,
-      "WITH trunk(pgno) AS ("
-      "  SELECT read_i32(getpage(1), 8) AS x WHERE x>0"
-      "    UNION"
-      "  SELECT read_i32(getpage(trunk.pgno), 0) AS x FROM trunk WHERE x>0"
-      "),"
-      "trunkdata(pgno, data) AS ("
-      "  SELECT pgno, getpage(pgno) FROM trunk"
-      "),"
-      "freelist(data, n, freepgno) AS ("
-      "  SELECT data, min(16384, read_i32(data, 1)-1), pgno FROM trunkdata"
-      "    UNION ALL"
-      "  SELECT data, n-1, read_i32(data, 2+n) FROM freelist WHERE n>=0"
-      ")"
-      "SELECT freepgno FROM freelist"
-    );
-    while( pStmt && SQLITE_ROW==sqlite3_step(pStmt) ){
-      i64 iPg = sqlite3_column_int64(pStmt, 0);
-      recoverBitmapSet(pMap, iPg);
+    if( p->bFreelistCorrupt==0 ){
+      pStmt = recoverPrepare(p, p->dbOut,
+          "WITH trunk(pgno) AS ("
+          "  SELECT read_i32(getpage(1), 8) AS x WHERE x>0"
+          "    UNION"
+          "  SELECT read_i32(getpage(trunk.pgno), 0) AS x FROM trunk WHERE x>0"
+          "),"
+          "trunkdata(pgno, data) AS ("
+          "  SELECT pgno, getpage(pgno) FROM trunk"
+          "),"
+          "freelist(data, n, freepgno) AS ("
+          "  SELECT data, min(16384, read_i32(data, 1)-1), pgno FROM trunkdata"
+          "    UNION ALL"
+          "  SELECT data, n-1, read_i32(data, 2+n) FROM freelist WHERE n>=0"
+          ")"
+          "SELECT freepgno FROM freelist"
+      );
+      while( pStmt && SQLITE_ROW==sqlite3_step(pStmt) ){
+        i64 iPg = sqlite3_column_int64(pStmt, 0);
+        recoverBitmapSet(pMap, iPg);
+      }
+      recoverFinalize(p, pStmt);
     }
-    recoverFinalize(p, pStmt);
 
     /* Add an entry for each page not already added to the bitmap to 
     ** the recovery.map table. This loop leaves the "parent" column
@@ -1133,6 +1135,10 @@ int sqlite3_recover_config(sqlite3_recover *p, int op, void *pArg){
       }
       break;
 
+    case SQLITE_RECOVER_FREELIST_CORRUPT:
+      p->bFreelistCorrupt = (pArg ? 1 : 0);
+      break;
+
     default:
       rc = SQLITE_NOTFOUND;
       break;
diff --git a/ext/recover/sqlite3recover.h b/ext/recover/sqlite3recover.h
index 8306c67a12..638a8b1c92 100644
--- a/ext/recover/sqlite3recover.h
+++ b/ext/recover/sqlite3recover.h
@@ -41,7 +41,6 @@ int sqlite3_recover_config(sqlite3_recover*, int op, void *pArg);
 /*
 ** SQLITE_RECOVER_TESTDB:
 **
-**
 ** SQLITE_RECOVER_LOST_AND_FOUND:
 **   The pArg argument points to a string buffer containing the name
 **   of a "lost-and-found" table in the output database, or NULL. If
@@ -49,9 +48,20 @@ int sqlite3_recover_config(sqlite3_recover*, int op, void *pArg);
 **   valid pages that cannot be associated with any table in the
 **   recovered part of the schema, data is extracted from these
 **   pages to add to the lost-and-found table.
+**
+** SQLITE_RECOVER_FREELIST_CORRUPT:
+**   The pArg value must actually be integer (type "int") value 0 or 1
+**   cast as a (void*). If this option is set (argument is 1) and
+**   a lost-and-found table has been configured using
+**   SQLITE_RECOVER_LOST_AND_FOUND, then is assumed that the freelist is 
+**   corrupt and an attempt is made to recover records from pages that
+**   appear to be linked into the freelist. Otherwise, pages on the freelist
+**   are ignored. Setting this option can recover more data from the
+**   database, but often ends up "recovering" deleted records.
 */
-#define SQLITE_RECOVER_TESTDB         789
-#define SQLITE_RECOVER_LOST_AND_FOUND 790
+#define SQLITE_RECOVER_TESTDB           789
+#define SQLITE_RECOVER_LOST_AND_FOUND   790
+#define SQLITE_RECOVER_FREELIST_CORRUPT 791
 
 /* Step the recovery object. Return SQLITE_DONE if recovery is complete,
 ** SQLITE_OK if recovery is not complete but no error has occurred, or
diff --git a/ext/recover/test_recover.c b/ext/recover/test_recover.c
index cdd5d090fa..835a203f66 100644
--- a/ext/recover/test_recover.c
+++ b/ext/recover/test_recover.c
@@ -81,6 +81,7 @@ static int testRecoverCmd(
       const char *aOp[] = {
         "testdb",          /* 0 */
         "lostandfound",    /* 1 */
+        "freelistcorrupt", /* 2 */
         0
       };
       int iOp = 0;
@@ -99,6 +100,14 @@ static int testRecoverCmd(
               SQLITE_RECOVER_LOST_AND_FOUND, (void*)Tcl_GetString(objv[3])
           );
           break;
+        case 2: {
+          int iVal = 0;
+          if( Tcl_GetIntFromObj(interp, objv[3], &iVal) ) return TCL_ERROR;
+          res = sqlite3_recover_config(pTest->p, 
+              SQLITE_RECOVER_FREELIST_CORRUPT, (void*)iVal
+          );
+          break;
+        }
       }
       Tcl_SetObjResult(interp, Tcl_NewIntObj(res));
       break;
diff --git a/manifest b/manifest
index 00fb244d2e..04d150cbd7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Take\sthe\sfreelist\sinto\saccount\swhen\srecovering\sdata\sthat\sis\snot\slinked\sin\sto\sany\stree\sassociated\swith\sa\sschema\sentry.
-D 2022-09-03T20:31:36.832
+C Add\san\soption\sto\sassume\sthe\sfreelist\sis\scorrupt\swhen\srecovering\sdata.
+D 2022-09-03T21:08:38.958
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -389,10 +389,10 @@ F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9c
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
 F ext/recover/recover1.test a848af8c82fe0731af835ff99475724f8654d2f24f772cc4e6f7ec4eb2ab71ea
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
-F ext/recover/recoverold.test 7578e9b938db15dc469a4af247e15866226f366bde0cbe09a40b0aef4a0506c8
-F ext/recover/sqlite3recover.c 6c9cbc993a970060f9fb881d78f6c7e182ec988a5e48acbf15bb4a5f05ce2902
-F ext/recover/sqlite3recover.h b82974790b528480163d87dcd84afffe7568393194c9ec8241cfbc3ee6bbdd1b
-F ext/recover/test_recover.c b8dddd96ccd4a62bc14cb3a8d5696407892e184fe7d45ecbedde954577857de2
+F ext/recover/recoverold.test e7e00c78ec35b60488369ddf99e36a3b30e686566571969b05781e5063bdffe8
+F ext/recover/sqlite3recover.c 395c9f623cf84bd8c2e651ec112898d81e1908bbda66fe5f0efcfaa85ad2b262
+F ext/recover/sqlite3recover.h 35aacde3b3834d8ceefb20a2cf0ba221cbb5d802efc11a0529aafc018c462e13
+F ext/recover/test_recover.c 112c580e7cd765a20bbc94998f8b43b629db47fa6bfd696484ca722e418f4172
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
 F ext/repair/checkfreelist.c e21f06995ff4efdc1622dcceaea4dcba2caa83ca2f31a1607b98a8509168a996
 F ext/repair/checkindex.c 4383e4469c21e5b9ae321d0d63cec53e981af9d7a6564be6374f0eeb93dfc890
@@ -2005,8 +2005,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 f2ac315844d8db1bd1c6950a4fef7c459ddd37cc21a8f3daafa5639fad8118e2
-R 471b646b541e0fcab850e84cb036ac46
+P dbd1f1efb349a9c8886e42b3f07d3f4c576924136f111558c7294d0a272e415a
+R f1692b1a741d9ca9573411dcac80d98d
 U dan
-Z 9f579b130a06a2078244b88aebbd5365
+Z 9a22d599f360a7b8179802a74accdf31
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f01f3f35e4..9852bbbed1 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dbd1f1efb349a9c8886e42b3f07d3f4c576924136f111558c7294d0a272e415a
\ No newline at end of file
+253e498f5200b8b3e2bc309587af108dd1cec8a884b3d2a49d5406525c9a4b4c
\ No newline at end of file

From 49cb8d7314f201bcc264ab3c38c01ae48822a7a4 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 5 Sep 2022 13:24:08 +0000
Subject: [PATCH 048/428] Minor cleanups in OO API #1. Add Sudoku SQL to
 batch-runner.js's list.

FossilOrigin-Name: 4488cb5798f34cbba14eb8e2aa5da8420c14a85d37d278d357406aedd5c3a9e5
---
 ext/wasm/api/sqlite3-api-oo1.js | 86 ++++++++++++++++++---------------
 ext/wasm/batch-runner.html      |  4 +-
 ext/wasm/sql/001-sudoku.sql     | 28 +++++++++++
 manifest                        | 15 +++---
 manifest.uuid                   |  2 +-
 5 files changed, 86 insertions(+), 49 deletions(-)
 create mode 100644 ext/wasm/sql/001-sudoku.sql

diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index 2cfb478865..3d24a7689a 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -126,7 +126,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     try {
       const ppDb = capi.wasm.scopedAllocPtr() /* output (sqlite3**) arg */;
       const rc = capi.sqlite3_open_v2(fn, ppDb, oflags, null);
-      ptr = capi.wasm.getMemValue(ppDb, '*');
+      ptr = capi.wasm.getPtrValue(ppDb);
       ctor.checkRc(ptr, rc);
     }catch( e ){
       if( ptr ) capi.sqlite3_close_v2(ptr);
@@ -166,6 +166,15 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
      For purposes of passing a Stmt instance to C-style sqlite3
      functions, its read-only `pointer` property holds its `sqlite3_stmt*`
      pointer value.
+
+     Other non-function properties include:
+
+     - `db`: the DB object which created the statement.
+
+     - `columnCount`: the number of result columns in the query, or 0 for
+     queries which cannot return results.
+
+     - `parameterCount`: the number of bindable paramters in the query.
   */
   const Stmt = function(){
     if(BindTypes!==arguments[2]){
@@ -272,22 +281,25 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
   };
 
   /**
-     Expects to be given a DB instance or an `sqlite3*` pointer, and an
-     sqlite3 API result code. If the result code is not falsy, this
-     function throws an SQLite3Error with an error message from
-     sqlite3_errmsg(), using dbPtr as the db handle. Note that if it's
-     passed a non-error code like SQLITE_ROW or SQLITE_DONE, it will
-     still throw but the error string might be "Not an error."  The
-     various non-0 non-error codes need to be checked for in client
-     code where they are expected.
+     Expects to be given a DB instance or an `sqlite3*` pointer (may
+     be null) and an sqlite3 API result code. If the result code is
+     not falsy, this function throws an SQLite3Error with an error
+     message from sqlite3_errmsg(), using dbPtr as the db handle, or
+     sqlite3_errstr() if dbPtr is falsy. Note that if it's passed a
+     non-error code like SQLITE_ROW or SQLITE_DONE, it will still
+     throw but the error string might be "Not an error."  The various
+     non-0 non-error codes need to be checked for in
+     client code where they are expected.
   */
   DB.checkRc = function(dbPtr, sqliteResultCode){
     if(sqliteResultCode){
       if(dbPtr instanceof DB) dbPtr = dbPtr.pointer;
-      throw new SQLite3Error([
+      throw new SQLite3Error(
         "sqlite result code",sqliteResultCode+":",
-        capi.sqlite3_errmsg(dbPtr) || "Unknown db error."
-      ].join(' '));
+        (dbPtr
+         ? capi.sqlite3_errmsg(dbPtr)
+         : capi.sqlite3_errstr(sqliteResultCode))
+      );
     }
   };
 
@@ -379,9 +391,8 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        required to check `stmt.pointer` after calling `prepare()` in
        order to determine whether the Stmt instance is empty or not.
        Long-time practice (with other sqlite3 script bindings)
-       suggests that the empty-prepare case is sufficiently rare (and
-       useless) that supporting it here would simply hurt overall
-       usability.
+       suggests that the empty-prepare case is sufficiently rare that
+       supporting it here would simply hurt overall usability.
     */
     prepare: function(sql){
       affirmDbOpen(this);
@@ -390,7 +401,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
       try{
         ppStmt = capi.wasm.scopedAllocPtr()/* output (sqlite3_stmt**) arg */;
         DB.checkRc(this, capi.sqlite3_prepare_v2(this.pointer, sql, -1, ppStmt, null));
-        pStmt = capi.wasm.getMemValue(ppStmt, '*');
+        pStmt = capi.wasm.getPtrValue(ppStmt);
       }
       finally {capi.wasm.scopedAllocPop(stack)}
       if(!pStmt) toss3("Cannot prepare empty SQL.");
@@ -412,22 +423,21 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        The optional options object may contain any of the following
        properties:
 
-       - .sql = the SQL to run (unless it's provided as the first
+       - `.sql` = the SQL to run (unless it's provided as the first
        argument). This must be of type string, Uint8Array, or an array
        of strings. In the latter case they're concatenated together
        as-is, _with no separator_ between elements, before evaluation.
        The array form is often simpler for long hand-written queries.
 
-       - .bind = a single value valid as an argument for
+       - `.bind` = a single value valid as an argument for
        Stmt.bind(). This is _only_ applied to the _first_ non-empty
        statement in the SQL which has any bindable parameters. (Empty
        statements are skipped entirely.)
 
-       - .saveSql = an optional array. If set, the SQL of each
+       - `.saveSql` = an optional array. If set, the SQL of each
        executed statement is appended to this array before the
-       statement is executed (but after it is prepared - we
-       don't have the string until after that). Empty SQL
-       statements are elided.
+       statement is executed (but after it is prepared - we don't have
+       the string until after that). Empty SQL statements are elided.
 
        ==================================================================
        The following options apply _only_ to the _first_ statement
@@ -435,8 +445,8 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        the statement actually produces any result rows.
        ==================================================================
 
-       - .callback = a function which gets called for each row of the
-       result set, but only if that statement has any result
+       - `.callback` = a function which gets called for each row of
+       the result set, but only if that statement has any result
        _rows_. The callback's "this" is the options object. The second
        argument passed to the callback is always the current Stmt
        object (so that the caller may collect column names, or
@@ -455,24 +465,24 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        The first argument passed to the callback defaults to an array of
        values from the current result row but may be changed with ...
 
-       - .rowMode = specifies the type of he callback's first argument.
+       - `.rowMode` = specifies the type of he callback's first argument.
        It may be any of...
 
        A) A string describing what type of argument should be passed
        as the first argument to the callback:
 
-         A.1) 'array' (the default) causes the results of
+         A.1) `'array'` (the default) causes the results of
          `stmt.get([])` to be passed to passed on and/or appended to
          `resultRows`.
 
-         A.2) 'object' causes the results of
+         A.2) `'object'` causes the results of
          `stmt.get(Object.create(null))` to be passed to the
          `callback` and/or appended to `resultRows`.  Achtung: an SQL
          result may have multiple columns with identical names. In
          that case, the right-most column will be the one set in this
          object!
 
-         A.3) 'stmt' causes the current Stmt to be passed to the
+         A.3) `'stmt'` causes the current Stmt to be passed to the
          callback, but this mode will trigger an exception if
          `resultRows` is an array because appending the statement to
          the array would be unhelpful.
@@ -491,7 +501,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
 
        Any other `rowMode` value triggers an exception.
 
-       - .resultRows: if this is an array, it functions similarly to
+       - `.resultRows`: if this is an array, it functions similarly to
        the `callback` option: each row of the result set (if any),
        with the exception that the `rowMode` 'stmt' is not legal. It
        is legal to use both `resultRows` and `callback`, but
@@ -499,12 +509,12 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        and can be used over a WebWorker-style message interface.
        exec() throws if `resultRows` is set and `rowMode` is 'stmt'.
 
-       - .columnNames: if this is an array, the column names of the
+       - `.columnNames`: if this is an array, the column names of the
        result set are stored in this array before the callback (if
        any) is triggered (regardless of whether the query produces any
        result rows). If no statement has result columns, this value is
-       unchanged. Achtung: an SQL result may have multiple columns with
-       identical names.
+       unchanged. Achtung: an SQL result may have multiple columns
+       with identical names.
     */
     exec: function(/*(sql [,obj]) || (obj)*/){
       affirmDbOpen(this);
@@ -517,11 +527,9 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
       const callback = opt.callback;
       let resultRows = (Array.isArray(opt.resultRows)
                           ? opt.resultRows : undefined);
-      let rowMode = (((callback||resultRows) && (undefined!==opt.rowMode))
-                     ? opt.rowMode : undefined);
       let stmt;
       let bind = opt.bind;
-      let runFirstQuery = !!(arg.cbArg || opt.columnNames) /* true to evaluate the first result-returning query */;
+      let evalFirstResult = !!(arg.cbArg || opt.columnNames) /* true to evaluate the first result-returning query */;
       const stack = wasm.scopedAllocPush();
       try{
         const isTA = util.isSQLableTypedArray(arg.sql)
@@ -565,10 +573,10 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
             stmt.bind(bind);
             bind = null;
           }
-          if(runFirstQuery && stmt.columnCount){
+          if(evalFirstResult && stmt.columnCount){
             /* Only forward SELECT results for the FIRST query
                in the SQL which potentially has them. */
-            runFirstQuery = false;
+            evalFirstResult = false;
             if(Array.isArray(opt.columnNames)){
               stmt.getColumnNames(opt.columnNames);
             }
@@ -580,7 +588,6 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
               stmt._isLocked = false;
             }
           }else{
-            // Do we need to while(stmt.step()){} here?
             stmt.step();
           }
           stmt.finalize();
@@ -679,8 +686,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
           let i, pVal, valType, arg;
           const tgt = [];
           for(i = 0; i < argc; ++i){
-            pVal = capi.wasm.getMemValue(pArgv + (capi.wasm.ptrSizeof * i),
-                                        capi.wasm.ptrIR);
+            pVal = capi.wasm.getPtrValue(pArgv + (capi.wasm.ptrSizeof * i));
             /**
                Curiously: despite ostensibly requiring 8-byte
                alignment, the pArgv array is parcelled into chunks of
diff --git a/ext/wasm/batch-runner.html b/ext/wasm/batch-runner.html
index 1b8d335ddb..10f7e45df7 100644
--- a/ext/wasm/batch-runner.html
+++ b/ext/wasm/batch-runner.html
@@ -25,7 +25,9 @@
       <progress value="0" max="100" id="module-progress" hidden='1'></progress>  
     </div><!-- /emscripten bits -->
     <p>
-      This page is for running extracts from the output of <tt>speedtest --script</tt>.
+      This page is for batch-running extracts from the output
+      of <tt>speedtest1 --script</tt>, as well as other standalone SQL
+      scripts.
     </p>
     <p id='warn-list' class='warning'>ACHTUNG: this file requires a generated input list
       file. Run "make batch" from this directory to generate it.
diff --git a/ext/wasm/sql/001-sudoku.sql b/ext/wasm/sql/001-sudoku.sql
new file mode 100644
index 0000000000..53661b1c35
--- /dev/null
+++ b/ext/wasm/sql/001-sudoku.sql
@@ -0,0 +1,28 @@
+WITH RECURSIVE
+  input(sud) AS (
+    VALUES('53..7....6..195....98....6.8...6...34..8.3..17...2...6.6....28....419..5....8..79')
+  ),
+  digits(z, lp) AS (
+    VALUES('1', 1)
+    UNION ALL SELECT
+    CAST(lp+1 AS TEXT), lp+1 FROM digits WHERE lp<9
+  ),
+  x(s, ind) AS (
+    SELECT sud, instr(sud, '.') FROM input
+    UNION ALL
+    SELECT
+      substr(s, 1, ind-1) || z || substr(s, ind+1),
+      instr( substr(s, 1, ind-1) || z || substr(s, ind+1), '.' )
+     FROM x, digits AS z
+    WHERE ind>0
+      AND NOT EXISTS (
+            SELECT 1
+              FROM digits AS lp
+             WHERE z.z = substr(s, ((ind-1)/9)*9 + lp, 1)
+                OR z.z = substr(s, ((ind-1)%9) + (lp-1)*9 + 1, 1)
+                OR z.z = substr(s, (((ind-1)/3) % 3) * 3
+                        + ((ind-1)/27) * 27 + lp
+                        + ((lp-1) / 3) * 6, 1)
+         )
+  )
+SELECT s FROM x WHERE ind=0;
diff --git a/manifest b/manifest
index ddfd3bdce4..b8a3ffbcd5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C wasm:\sminor\stext\sand\sbuild\scleanups.
-D 2022-09-03T11:41:44.176
+C Minor\scleanups\sin\sOO\sAPI\s#1.\sAdd\sSudoku\sSQL\sto\sbatch-runner.js's\slist.
+D 2022-09-05T13:24:08.577
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -483,13 +483,13 @@ F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba814
 F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a4a06cb776c003880b
 F ext/wasm/api/sqlite3-api-cleanup.js 1a12e64060c2cb0defd34656a76a9b1d7ed58459c290249bb31567c806fd44de
 F ext/wasm/api/sqlite3-api-glue.js 67ca83974410961953eeaa1dfed3518530d68381729ed1d27f95122f5baeabd3
-F ext/wasm/api/sqlite3-api-oo1.js 183e863eedaba547ffe4981ab95797813b60da46749992bca400d2646e5ccd82
+F ext/wasm/api/sqlite3-api-oo1.js 8818c96272ed70e8a95d09b10f2381df94a79de0d722ef9057005e6594db2f33
 F ext/wasm/api/sqlite3-api-opfs.js 011799db398157cbd254264b6ebae00d7234b93d0e9e810345f213a5774993c0
 F ext/wasm/api/sqlite3-api-prologue.js 2d5c5d3355f55eefe51922cec5bfedbec0f8300db98a17685ab7a34a03953c7a
 F ext/wasm/api/sqlite3-api-worker1.js 73579555563b789785ae83724014eaf31811073aad9be6596c8336ffb51edd71
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 0d81282eaeff2a6e9fc5c28a388c5c5b45cf25a9393992fa511ac009b27df982
-F ext/wasm/batch-runner.html 439245594711981831f2775f1426fd20d73a9b1bbf53f2cbbfc1194fa069891c
+F ext/wasm/batch-runner.html 2d44d99a556c46f586d3319003dd281dd0eb6a13eeadde3eab05ba81eec9ff8a
 F ext/wasm/batch-runner.js a727cbbffe63fd17fb5a590dc679f0b13bd51880e8f84b461d7df246417689e8
 F ext/wasm/common/SqliteTestUtil.js 7a543e238c2ebda922c85076abda017d0480944fdfee576692a0c3a580319ebd
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
@@ -512,6 +512,7 @@ F ext/wasm/scratchpad-opfs-worker.js 3ec2868c669713145c76eb5877c64a1b20741f74181
 F ext/wasm/scratchpad-opfs-worker2.js 5f2237427ac537b8580b1c659ff14ad2621d1694043eaaf41ae18dbfef2e48c0
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
+F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
 F ext/wasm/sqlite3-worker1-promiser.js 92b8da5f38439ffec459a8215775d30fa498bc0f1ab929ff341fc3dd479660b9
 F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
@@ -2013,8 +2014,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 b26e2bc05537a1f451db1bdd36a824d71c3ea25a130b6285f31ff9799d65fa7a
-R be49009f54e0ae14227cc16ba0e36553
+P 36ceef94e1935f5e85f79e489cd0ed265a77820fb68329c190794df5e076bf84
+R 7441dbef21a285816a3b01822ba89eea
 U stephan
-Z eee0918a1e799dd377ca7c8eb624a8df
+Z 1c45c40df6428914f663fd75d3ed35bb
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 99f4bce223..871f2346e9 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-36ceef94e1935f5e85f79e489cd0ed265a77820fb68329c190794df5e076bf84
\ No newline at end of file
+4488cb5798f34cbba14eb8e2aa5da8420c14a85d37d278d357406aedd5c3a9e5
\ No newline at end of file

From a768b67dcc5880f7078de0135838e0d0a0e7334f Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Mon, 5 Sep 2022 15:56:09 +0000
Subject: [PATCH 049/428] Add the SQLITE_RECOVER_ROWIDS option. To specify that
 rowid values that are not also explicit INTEGER PRIMARY KEY values should be
 preserved.

FossilOrigin-Name: 69cc9aba56a196bbd159bd24868aa5ccc60bed0dc612d09ed8a3ae898f156809
---
 ext/recover/sqlite3recover.c | 27 +++++++++++++++++++++++++--
 ext/recover/sqlite3recover.h |  3 +++
 ext/recover/test_recover.c   | 11 ++++++++++-
 manifest                     | 16 ++++++++--------
 manifest.uuid                |  2 +-
 5 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index 14cc29e476..e0eda09d82 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -49,6 +49,7 @@ struct RecoverTable {
   int nCol;                       /* Number of columns in table */
   RecoverColumn *aCol;            /* Array of columns */
   int bIntkey;                    /* True for intkey, false for without rowid */
+  int iRowidBind;                 /* If >0, bind rowid to INSERT here */
 
   RecoverTable *pNext;
 };
@@ -94,6 +95,7 @@ struct sqlite3_recover {
   char *zStateDb;
   char *zLostAndFound;            /* Name of lost-and-found table (or NULL) */
   int bFreelistCorrupt;
+  int bRecoverRowid;
 };
 
 /*
@@ -476,6 +478,7 @@ static void recoverAddTable(sqlite3_recover *p, const char *zName, i64 iRoot){
 
   if( pStmt ){
     int iPk = -1;
+    int iBind = 1;
     RecoverTable *pNew = 0;
     int nCol = 0;
     int nName = recoverStrlen(zName);
@@ -491,7 +494,6 @@ static void recoverAddTable(sqlite3_recover *p, const char *zName, i64 iRoot){
     if( pNew ){
       int i = 0;
       int iField = 0;
-      int iBind = 1;
       char *csr = 0;
       pNew->aCol = (RecoverColumn*)&pNew[1];
       pNew->zTab = csr = (char*)&pNew->aCol[nCol];
@@ -545,7 +547,11 @@ static void recoverAddTable(sqlite3_recover *p, const char *zName, i64 iRoot){
     }
     recoverFinalize(p, pStmt);
 
-    if( iPk>=0 ) pNew->aCol[iPk].bIPK = 1;
+    if( iPk>=0 ){
+      pNew->aCol[iPk].bIPK = 1;
+    }else if( pNew->bIntkey ){
+      pNew->iRowidBind = iBind++;
+    }
   }
 }
 
@@ -646,6 +652,13 @@ static sqlite3_stmt *recoverInsertStmt(
   assert( nField<=pTab->nCol );
 
   zSql = recoverMPrintf(p, "INSERT OR IGNORE INTO %Q(", pTab->zTab);
+
+  if( pTab->iRowidBind ){
+    assert( pTab->bIntkey );
+    zSql = recoverMPrintf(p, "%z_rowid_", zSql);
+    zBind = recoverMPrintf(p, "%z?%d", zBind, pTab->iRowidBind);
+    zSep = ", ";
+  }
   for(ii=0; ii<nField; ii++){
     int eHidden = pTab->aCol[ii].eHidden;
     if( eHidden!=RECOVER_EHIDDEN_VIRTUAL
@@ -995,6 +1008,7 @@ static int recoverWriteData(sqlite3_recover *p){
     i64 iPrevRoot = -1;
     i64 iPrevPage = -1;
     int iPrevCell = -1;
+    int bHaveRowid = 0;           /* True if iRowid is valid */
     i64 iRowid = 0;
     int nVal = -1;
 
@@ -1034,6 +1048,9 @@ static int recoverWriteData(sqlite3_recover *p){
                 }
               }
             }
+            if( p->bRecoverRowid && pTab->iRowidBind>0 && bHaveRowid ){
+              sqlite3_bind_int64(pInsert, pTab->iRowidBind, iRowid);
+            }
 
             sqlite3_step(pInsert);
             recoverReset(p, pInsert);
@@ -1046,6 +1063,7 @@ static int recoverWriteData(sqlite3_recover *p){
             apVal[ii] = 0;
           }
           nVal = -1;
+          bHaveRowid = 0;
         }
 
         if( iRoot==0 ) continue;
@@ -1061,6 +1079,7 @@ static int recoverWriteData(sqlite3_recover *p){
         iRowid = sqlite3_column_int64(pSel, 4);
         assert( nVal==-1 );
         nVal = 0;
+        bHaveRowid = 1;
       }else if( iField<nMax ){
         assert( apVal[iField]==0 );
         apVal[iField] = sqlite3_value_dup( pVal );
@@ -1139,6 +1158,10 @@ int sqlite3_recover_config(sqlite3_recover *p, int op, void *pArg){
       p->bFreelistCorrupt = (pArg ? 1 : 0);
       break;
 
+    case SQLITE_RECOVER_ROWIDS:
+      p->bRecoverRowid = (pArg ? 1 : 0);
+      break;
+
     default:
       rc = SQLITE_NOTFOUND;
       break;
diff --git a/ext/recover/sqlite3recover.h b/ext/recover/sqlite3recover.h
index 638a8b1c92..0294baddaa 100644
--- a/ext/recover/sqlite3recover.h
+++ b/ext/recover/sqlite3recover.h
@@ -58,10 +58,13 @@ int sqlite3_recover_config(sqlite3_recover*, int op, void *pArg);
 **   appear to be linked into the freelist. Otherwise, pages on the freelist
 **   are ignored. Setting this option can recover more data from the
 **   database, but often ends up "recovering" deleted records.
+**
+** SQLITE_RECOVER_ROWIDS:
 */
 #define SQLITE_RECOVER_TESTDB           789
 #define SQLITE_RECOVER_LOST_AND_FOUND   790
 #define SQLITE_RECOVER_FREELIST_CORRUPT 791
+#define SQLITE_RECOVER_ROWIDS           792
 
 /* Step the recovery object. Return SQLITE_DONE if recovery is complete,
 ** SQLITE_OK if recovery is not complete but no error has occurred, or
diff --git a/ext/recover/test_recover.c b/ext/recover/test_recover.c
index 835a203f66..0646ff78b8 100644
--- a/ext/recover/test_recover.c
+++ b/ext/recover/test_recover.c
@@ -82,6 +82,7 @@ static int testRecoverCmd(
         "testdb",          /* 0 */
         "lostandfound",    /* 1 */
         "freelistcorrupt", /* 2 */
+        "rowids",          /* 3 */
         0
       };
       int iOp = 0;
@@ -102,12 +103,20 @@ static int testRecoverCmd(
           break;
         case 2: {
           int iVal = 0;
-          if( Tcl_GetIntFromObj(interp, objv[3], &iVal) ) return TCL_ERROR;
+          if( Tcl_GetBooleanFromObj(interp, objv[3], &iVal) ) return TCL_ERROR;
           res = sqlite3_recover_config(pTest->p, 
               SQLITE_RECOVER_FREELIST_CORRUPT, (void*)iVal
           );
           break;
         }
+        case 3: {
+          int iVal = 0;
+          if( Tcl_GetBooleanFromObj(interp, objv[3], &iVal) ) return TCL_ERROR;
+          res = sqlite3_recover_config(pTest->p, 
+              SQLITE_RECOVER_ROWIDS, (void*)iVal
+          );
+          break;
+        }
       }
       Tcl_SetObjResult(interp, Tcl_NewIntObj(res));
       break;
diff --git a/manifest b/manifest
index 04d150cbd7..9f01e7c919 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\san\soption\sto\sassume\sthe\sfreelist\sis\scorrupt\swhen\srecovering\sdata.
-D 2022-09-03T21:08:38.958
+C Add\sthe\sSQLITE_RECOVER_ROWIDS\soption.\sTo\sspecify\sthat\srowid\svalues\sthat\sare\snot\salso\sexplicit\sINTEGER\sPRIMARY\sKEY\svalues\sshould\sbe\spreserved.
+D 2022-09-05T15:56:09.391
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -390,9 +390,9 @@ F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f5974282
 F ext/recover/recover1.test a848af8c82fe0731af835ff99475724f8654d2f24f772cc4e6f7ec4eb2ab71ea
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
 F ext/recover/recoverold.test e7e00c78ec35b60488369ddf99e36a3b30e686566571969b05781e5063bdffe8
-F ext/recover/sqlite3recover.c 395c9f623cf84bd8c2e651ec112898d81e1908bbda66fe5f0efcfaa85ad2b262
-F ext/recover/sqlite3recover.h 35aacde3b3834d8ceefb20a2cf0ba221cbb5d802efc11a0529aafc018c462e13
-F ext/recover/test_recover.c 112c580e7cd765a20bbc94998f8b43b629db47fa6bfd696484ca722e418f4172
+F ext/recover/sqlite3recover.c 13e78c8a9d5521e06ebe5ac992a90169155e685f5c4b3cebc632c50b41e061c9
+F ext/recover/sqlite3recover.h ed34bc96befdf581a7de039d99772caabf0b338eb2a841d869acd9f7893ffce7
+F ext/recover/test_recover.c 9b8144ac94e6a2f3aabfcd24db6416179afdd32a3d654d1ef603c570e0384b2f
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
 F ext/repair/checkfreelist.c e21f06995ff4efdc1622dcceaea4dcba2caa83ca2f31a1607b98a8509168a996
 F ext/repair/checkindex.c 4383e4469c21e5b9ae321d0d63cec53e981af9d7a6564be6374f0eeb93dfc890
@@ -2005,8 +2005,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 dbd1f1efb349a9c8886e42b3f07d3f4c576924136f111558c7294d0a272e415a
-R f1692b1a741d9ca9573411dcac80d98d
+P 253e498f5200b8b3e2bc309587af108dd1cec8a884b3d2a49d5406525c9a4b4c
+R e5ada01eb624b55d2f64c4994830b06d
 U dan
-Z 9a22d599f360a7b8179802a74accdf31
+Z a7e3c99975f0369d94d22f82581262dd
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 9852bbbed1..f34597368d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-253e498f5200b8b3e2bc309587af108dd1cec8a884b3d2a49d5406525c9a4b4c
\ No newline at end of file
+69cc9aba56a196bbd159bd24868aa5ccc60bed0dc612d09ed8a3ae898f156809
\ No newline at end of file

From d5e3fe50f8f7d3aa01cf06ad7815dbf5bec1548f Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Mon, 5 Sep 2022 21:00:22 +0000
Subject: [PATCH 050/428] Add a mode to output SQL statements instead of
 populating a database to the recover extension.

FossilOrigin-Name: 73058416e7da6581000898b7988a7010e2ce6632246f4c12b4398700c7744b83
---
 ext/recover/recover1.test    | 20 ++++++++
 ext/recover/recoverold.test  | 28 ++++++++++-
 ext/recover/sqlite3recover.c | 96 ++++++++++++++++++++++++++++--------
 ext/recover/sqlite3recover.h | 12 ++++-
 ext/recover/test_recover.c   | 44 +++++++++++++++--
 manifest                     | 20 ++++----
 manifest.uuid                |  2 +-
 7 files changed, 182 insertions(+), 40 deletions(-)

diff --git a/ext/recover/recover1.test b/ext/recover/recover1.test
index 73832c8a12..167b2796bd 100644
--- a/ext/recover/recover1.test
+++ b/ext/recover/recover1.test
@@ -52,8 +52,27 @@ proc do_recover_test {tn} {
   sqlite3 db2 test.db2
   uplevel [list do_test $tn.2 [list compare_dbs db db2] {}]
   db2 close
+
+  forcedelete test.db2
+  forcedelete rstate.db
+
+  uplevel [list do_test $tn.3 {
+    set ::sqlhook [list]
+    set R [sqlite3_recover_init_sql db main my_sql_hook]
+    $R config testdb rstate.db
+    $R step
+    $R finish
+  } {}]
+
+  sqlite3 db2 test.db2
+  execsql [join $::sqlhook ";"] db2
+  uplevel [list do_test $tn.4 [list compare_dbs db db2] {}]
+  db2 close
 }
 
+proc my_sql_hook {sql} {
+  lappend ::sqlhook $sql
+}
 
 do_execsql_test 1.0 {
   CREATE TABLE t1(a INTEGER PRIMARY KEY, b);
@@ -112,6 +131,7 @@ do_execsql_test 7.1 {
   SELECT * FROM t2
 } {10 11 ten}
 
+breakpoint
 do_recover_test 7.2
 
 finish_test
diff --git a/ext/recover/recoverold.test b/ext/recover/recoverold.test
index 8f70a7473d..83f210aebc 100644
--- a/ext/recover/recoverold.test
+++ b/ext/recover/recoverold.test
@@ -53,13 +53,37 @@ proc do_recover_test {tn {tsql {}} {res {}}} {
   sqlite3 db2 test.db2
 
   if {$tsql==""} {
-    uplevel [list do_test $tn [list compare_dbs db db2] {}]
+    uplevel [list do_test $tn.1 [list compare_dbs db db2] {}]
   } else {
-    uplevel [list do_execsql_test -db db2 $tn $tsql $res]
+    uplevel [list do_execsql_test -db db2 $tn.1 $tsql $res]
+  }
+  db2 close
+
+  forcedelete test.db2
+  forcedelete rstate.db
+
+  set ::sqlhook [list]
+  set R [sqlite3_recover_init_sql db main my_sql_hook]
+  $R config lostandfound lost_and_found
+  $R step
+  $R finish
+  
+  sqlite3 db2 test.db2
+  db2 eval [join $::sqlhook ";"]
+
+  if {$tsql==""} {
+    uplevel [list do_test $tn.sql [list compare_dbs db db2] {}]
+  } else {
+    uplevel [list do_execsql_test -db db2 $tn.sql $tsql $res]
   }
   db2 close
 }
 
+proc my_sql_hook {sql} {
+  lappend ::sqlhook $sql
+}
+
+
 set doc {
   hello
   world
diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index e0eda09d82..1014e576a4 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -64,12 +64,6 @@ struct RecoverBitmap {
 ** 
 */
 #define RECOVERY_SCHEMA \
-"  CREATE TABLE recovery.freelist("                            \
-"      pgno INTEGER PRIMARY KEY"                               \
-"  );"                                                         \
-"  CREATE TABLE recovery.dbptr("                               \
-"      pgno, child, PRIMARY KEY(child, pgno)"                  \
-"  ) WITHOUT ROWID;"                                           \
 "  CREATE TABLE recovery.map("                                 \
 "      pgno INTEGER PRIMARY KEY, parent INT"                   \
 "  );"                                                         \
@@ -96,6 +90,9 @@ struct sqlite3_recover {
   char *zLostAndFound;            /* Name of lost-and-found table (or NULL) */
   int bFreelistCorrupt;
   int bRecoverRowid;
+
+  void *pSqlCtx;
+  int (*xSql)(void*,const char*);
 };
 
 /*
@@ -445,13 +442,6 @@ static int recoverOpenOutput(sqlite3_recover *p){
   return rc;
 }
 
-static int recoverCacheDbptr(sqlite3_recover *p){
-  return recoverExec(p, p->dbOut,
-    "INSERT INTO recovery.dbptr "
-    "SELECT pgno, child FROM sqlite_dbptr('getpage()')"
-  );
-}
-
 static int recoverCacheSchema(sqlite3_recover *p){
   return recoverExec(p, p->dbOut,
     "WITH RECURSIVE pages(p) AS ("
@@ -555,6 +545,15 @@ static void recoverAddTable(sqlite3_recover *p, const char *zName, i64 iRoot){
   }
 }
 
+static void recoverSqlCallback(sqlite3_recover *p, const char *zSql){
+  if( p->errCode==SQLITE_OK && p->xSql ){
+    int res = p->xSql(p->pSqlCtx, zSql);
+    if( res ){
+      recoverError(p, SQLITE_ERROR, "callback returned an error - %d", res);
+    }
+  }
+}
+
 /*
 **
 */
@@ -581,6 +580,7 @@ static int recoverWriteSchema1(sqlite3_recover *p){
 
       int rc = sqlite3_exec(p->dbOut, zSql, 0, 0, 0);
       if( rc==SQLITE_OK ){
+        recoverSqlCallback(p, zSql);
         if( bTable ){
           if( SQLITE_ROW==sqlite3_step(pTblname) ){
             const char *zName = sqlite3_column_text(pTblname, 0);
@@ -614,6 +614,8 @@ static int recoverWriteSchema2(sqlite3_recover *p){
       int rc = sqlite3_exec(p->dbOut, zSql, 0, 0, 0);
       if( rc!=SQLITE_OK && rc!=SQLITE_ERROR ){
         recoverDbError(p, p->dbOut);
+      }else if( rc==SQLITE_OK ){
+        recoverSqlCallback(p, zSql);
       }
     }
   }
@@ -644,9 +646,12 @@ static sqlite3_stmt *recoverInsertStmt(
   int nField
 ){
   const char *zSep = "";
+  const char *zSqlSep = "";
   char *zSql = 0;
+  char *zFinal = 0;
   char *zBind = 0;
   int ii;
+  int bSql = p->xSql ? 1 : 0;
   sqlite3_stmt *pRet = 0;
 
   assert( nField<=pTab->nCol );
@@ -656,9 +661,16 @@ static sqlite3_stmt *recoverInsertStmt(
   if( pTab->iRowidBind ){
     assert( pTab->bIntkey );
     zSql = recoverMPrintf(p, "%z_rowid_", zSql);
-    zBind = recoverMPrintf(p, "%z?%d", zBind, pTab->iRowidBind);
+    if( bSql ){
+      zBind = recoverMPrintf(p, "%zquote(?%d)", zBind, pTab->iRowidBind);
+    }else{
+      zBind = recoverMPrintf(p, "%z?%d", zBind, pTab->iRowidBind);
+    }
+    zSqlSep = "||', '||";
     zSep = ", ";
   }
+
+
   for(ii=0; ii<nField; ii++){
     int eHidden = pTab->aCol[ii].eHidden;
     if( eHidden!=RECOVER_EHIDDEN_VIRTUAL
@@ -666,14 +678,31 @@ static sqlite3_stmt *recoverInsertStmt(
     ){
       assert( pTab->aCol[ii].iField>=0 && pTab->aCol[ii].iBind>=1 );
       zSql = recoverMPrintf(p, "%z%s%Q", zSql, zSep, pTab->aCol[ii].zCol);
-      zBind = recoverMPrintf(p, "%z%s?%d", zBind, zSep, pTab->aCol[ii].iBind);
+
+      if( bSql ){
+        zBind = recoverMPrintf(
+            p, "%z%squote(?%d)", zBind, zSqlSep, pTab->aCol[ii].iBind
+        );
+        zSqlSep = "||', '||";
+      }else{
+        zBind = recoverMPrintf(p, "%z%s?%d", zBind, zSep, pTab->aCol[ii].iBind);
+      }
       zSep = ", ";
     }
   }
-  zSql = recoverMPrintf(p, "%z) VALUES (%z)", zSql, zBind);
 
-  pRet = recoverPrepare(p, p->dbOut, zSql);
+  if( bSql ){
+    zFinal = recoverMPrintf(p, "SELECT %Q || ') VALUES (' || %s || ')'", 
+        zSql, zBind
+    );
+  }else{
+    zFinal = recoverMPrintf(p, "%s) VALUES (%s)", zSql, zBind);
+  }
+
+  pRet = recoverPrepare(p, p->dbOut, zFinal);
   sqlite3_free(zSql);
+  sqlite3_free(zBind);
+  sqlite3_free(zFinal);
   
   return pRet;
 }
@@ -744,6 +773,7 @@ static char *recoverLostAndFoundCreate(
     sqlite3_free(zField);
 
     recoverExec(p, p->dbOut, zSql);
+    recoverSqlCallback(p, zSql);
     sqlite3_free(zSql);
   }else if( p->errCode==SQLITE_OK ){
     recoverError(
@@ -838,6 +868,7 @@ static void recoverLostAndFoundPopulate(
         sqlite3_value_free(apVal[ii]);
         apVal[ii] = 0;
       }
+      sqlite3_clear_bindings(pInsert);
       bHaveRowid = 0;
       nVal = -1;
     }
@@ -1052,7 +1083,10 @@ static int recoverWriteData(sqlite3_recover *p){
               sqlite3_bind_int64(pInsert, pTab->iRowidBind, iRowid);
             }
 
-            sqlite3_step(pInsert);
+            if( SQLITE_ROW==sqlite3_step(pInsert) && p->xSql ){
+              const char *zSql = (const char*)sqlite3_column_text(pInsert, 0);
+              recoverSqlCallback(p, zSql);
+            }
             recoverReset(p, pInsert);
             assert( p->errCode || pInsert );
             if( pInsert ) sqlite3_clear_bindings(pInsert);
@@ -1098,10 +1132,12 @@ static int recoverWriteData(sqlite3_recover *p){
   return p->errCode;
 }
 
-sqlite3_recover *sqlite3_recover_init(
+sqlite3_recover *recoverInit(
   sqlite3* db, 
   const char *zDb, 
-  const char *zUri
+  const char *zUri,
+  int (*xSql)(void*, const char*),
+  void *pSqlCtx
 ){
   sqlite3_recover *pRet = 0;
   int nDb = 0;
@@ -1123,11 +1159,30 @@ sqlite3_recover *sqlite3_recover_init(
     pRet->zUri = &pRet->zDb[nDb+1];
     memcpy(pRet->zDb, zDb, nDb);
     memcpy(pRet->zUri, zUri, nUri);
+    pRet->xSql = xSql;
+    pRet->pSqlCtx = pSqlCtx;
   }
 
   return pRet;
 }
 
+sqlite3_recover *sqlite3_recover_init(
+  sqlite3* db, 
+  const char *zDb, 
+  const char *zUri
+){
+  return recoverInit(db, zDb, zUri, 0, 0);
+}
+
+sqlite3_recover *sqlite3_recover_init_sql(
+  sqlite3* db, 
+  const char *zDb, 
+  int (*xSql)(void*, const char*),
+  void *pSqlCtx
+){
+  return recoverInit(db, zDb, "", xSql, pSqlCtx);
+}
+
 const char *sqlite3_recover_errmsg(sqlite3_recover *p){
   return p ? p->zErrMsg : "not an error";
 }
@@ -1176,7 +1231,6 @@ static void recoverStep(sqlite3_recover *p){
 
   if( p->dbOut==0 ){
     if( recoverOpenOutput(p) ) return;
-    if( recoverCacheDbptr(p) ) return;
     if( recoverCacheSchema(p) ) return;
     if( recoverWriteSchema1(p) ) return;
     if( recoverWriteData(p) ) return;
diff --git a/ext/recover/sqlite3recover.h b/ext/recover/sqlite3recover.h
index 0294baddaa..5dc2a56d30 100644
--- a/ext/recover/sqlite3recover.h
+++ b/ext/recover/sqlite3recover.h
@@ -24,7 +24,8 @@ extern "C" {
 
 typedef struct sqlite3_recover sqlite3_recover;
 
-/* Create an object to recover data from database zDb (e.g. "main")
+/* 
+** Create an object to recover data from database zDb (e.g. "main")
 ** opened by handle db. Data will be recovered into the database
 ** identified by parameter zUri. Database zUri is clobbered if it
 ** already exists.
@@ -35,6 +36,13 @@ sqlite3_recover *sqlite3_recover_init(
   const char *zUri
 );
 
+sqlite3_recover *sqlite3_recover_init_sql(
+  sqlite3* db, 
+  const char *zDb, 
+  int (*xSql)(void*, const char*),
+  void *pCtx
+);
+
 /* Details TBD. */
 int sqlite3_recover_config(sqlite3_recover*, int op, void *pArg);
 
@@ -60,6 +68,8 @@ int sqlite3_recover_config(sqlite3_recover*, int op, void *pArg);
 **   database, but often ends up "recovering" deleted records.
 **
 ** SQLITE_RECOVER_ROWIDS:
+**
+** SQLITE_RECOVER_SQLHOOK:
 */
 #define SQLITE_RECOVER_TESTDB           789
 #define SQLITE_RECOVER_LOST_AND_FOUND   790
diff --git a/ext/recover/test_recover.c b/ext/recover/test_recover.c
index 0646ff78b8..acfcf8c7a3 100644
--- a/ext/recover/test_recover.c
+++ b/ext/recover/test_recover.c
@@ -20,8 +20,31 @@
 typedef struct TestRecover TestRecover;
 struct TestRecover {
   sqlite3_recover *p;
+  Tcl_Interp *interp;
+  Tcl_Obj *pScript;
 };
 
+static int xSqlCallback(void *pSqlArg, const char *zSql){
+  TestRecover *p = (TestRecover*)pSqlArg;
+  Tcl_Obj *pEval = 0;
+  int res = 0;
+
+  pEval = Tcl_DuplicateObj(p->pScript);
+  Tcl_IncrRefCount(pEval);
+
+  res = Tcl_ListObjAppendElement(p->interp, pEval, Tcl_NewStringObj(zSql, -1));
+  if( res==TCL_OK ){
+    res = Tcl_EvalObjEx(p->interp, pEval, 0);
+  }
+
+  Tcl_DecrRefCount(pEval);
+  if( res ){
+    Tcl_BackgroundError(p->interp);
+    return TCL_ERROR;
+  }
+  return SQLITE_OK;
+}
+
 static int getDbPointer(Tcl_Interp *interp, Tcl_Obj *pObj, sqlite3 **pDb){
   Tcl_CmdInfo info;
   if( 0==Tcl_GetCommandInfo(interp, Tcl_GetString(pObj), &info) ){
@@ -171,17 +194,26 @@ static int test_sqlite3_recover_init(
   const char *zDb = 0;
   const char *zUri = 0;
   char zCmd[128];
+  int bSql = clientData ? 1 : 0;
 
   if( objc!=4 ){
-    Tcl_WrongNumArgs(interp, 1, objv, "DB DBNAME URI");
+    const char *zErr = (bSql ? "DB DBNAME SCRIPT" : "DB DBNAME URI");
+    Tcl_WrongNumArgs(interp, 1, objv, zErr);
     return TCL_ERROR;
   }
   if( getDbPointer(interp, objv[1], &db) ) return TCL_ERROR;
   zDb = Tcl_GetString(objv[2]);
-  zUri = Tcl_GetString(objv[3]);
 
   pNew = ckalloc(sizeof(TestRecover));
-  pNew->p = sqlite3_recover_init(db, zDb, zUri);
+  if( bSql==0 ){
+    zUri = Tcl_GetString(objv[3]);
+    pNew->p = sqlite3_recover_init(db, zDb, zUri);
+  }else{
+    pNew->interp = interp;
+    pNew->pScript = objv[3];
+    Tcl_IncrRefCount(pNew->pScript);
+    pNew->p = sqlite3_recover_init_sql(db, zDb, xSqlCallback, (void*)pNew);
+  }
 
   sprintf(zCmd, "sqlite_recover%d", iTestRecoverCmd++);
   Tcl_CreateObjCommand(interp, zCmd, testRecoverCmd, (void*)pNew, 0);
@@ -194,14 +226,16 @@ int TestRecover_Init(Tcl_Interp *interp){
   struct Cmd {
     const char *zCmd;
     Tcl_ObjCmdProc *xProc;
+    void *pArg;
   } aCmd[] = {
-    { "sqlite3_recover_init", test_sqlite3_recover_init },
+    { "sqlite3_recover_init", test_sqlite3_recover_init, 0 },
+    { "sqlite3_recover_init_sql", test_sqlite3_recover_init, (void*)1 },
   };
   int i;
 
   for(i=0; i<sizeof(aCmd)/sizeof(struct Cmd); i++){
     struct Cmd *p = &aCmd[i];
-    Tcl_CreateObjCommand(interp, p->zCmd, p->xProc, 0, 0);
+    Tcl_CreateObjCommand(interp, p->zCmd, p->xProc, p->pArg, 0);
   }
 
   return TCL_OK;
diff --git a/manifest b/manifest
index 9f01e7c919..9244609811 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\sSQLITE_RECOVER_ROWIDS\soption.\sTo\sspecify\sthat\srowid\svalues\sthat\sare\snot\salso\sexplicit\sINTEGER\sPRIMARY\sKEY\svalues\sshould\sbe\spreserved.
-D 2022-09-05T15:56:09.391
+C Add\sa\smode\sto\soutput\sSQL\sstatements\sinstead\sof\spopulating\sa\sdatabase\sto\sthe\srecover\sextension.
+D 2022-09-05T21:00:22.268
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -387,12 +387,12 @@ F ext/rbu/rbuvacuum4.test a78898e438a44803eb2bc897ba3323373c9f277418e2d6d76e90f2
 F ext/rbu/sqlite3rbu.c 8737cabdfbee84bb25a7851ecef8b1312be332761238da9be6ddb10c62ad4291
 F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9cd389812
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
-F ext/recover/recover1.test a848af8c82fe0731af835ff99475724f8654d2f24f772cc4e6f7ec4eb2ab71ea
+F ext/recover/recover1.test ae8ce9828210aa6c466bf88e23b0933849d5bb43091abe48cf2e56d636e51e93
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
-F ext/recover/recoverold.test e7e00c78ec35b60488369ddf99e36a3b30e686566571969b05781e5063bdffe8
-F ext/recover/sqlite3recover.c 13e78c8a9d5521e06ebe5ac992a90169155e685f5c4b3cebc632c50b41e061c9
-F ext/recover/sqlite3recover.h ed34bc96befdf581a7de039d99772caabf0b338eb2a841d869acd9f7893ffce7
-F ext/recover/test_recover.c 9b8144ac94e6a2f3aabfcd24db6416179afdd32a3d654d1ef603c570e0384b2f
+F ext/recover/recoverold.test f368a6ae2db12b6017257b332a19ab5df527f4061e43f12f5c85d8e2b236f074
+F ext/recover/sqlite3recover.c 47767b52f09fb1bba47009236285f09bcf68b6b5d1ec0de96b1a30b508e536a4
+F ext/recover/sqlite3recover.h 32f89b66f0235c0d94dfee0f1c3e9ed1ad726b3c4f3716ef0262b31cc33e8301
+F ext/recover/test_recover.c be0d74f0eba44fe7964e22d287dba0f3fa2baf197f630d51f0f9066af9b5eb2a
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
 F ext/repair/checkfreelist.c e21f06995ff4efdc1622dcceaea4dcba2caa83ca2f31a1607b98a8509168a996
 F ext/repair/checkindex.c 4383e4469c21e5b9ae321d0d63cec53e981af9d7a6564be6374f0eeb93dfc890
@@ -2005,8 +2005,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 253e498f5200b8b3e2bc309587af108dd1cec8a884b3d2a49d5406525c9a4b4c
-R e5ada01eb624b55d2f64c4994830b06d
+P 69cc9aba56a196bbd159bd24868aa5ccc60bed0dc612d09ed8a3ae898f156809
+R fe94b03379801a454a2e4362e6c6eea7
 U dan
-Z a7e3c99975f0369d94d22f82581262dd
+Z bbf845b5205dd27415c5eec6b9356a28
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f34597368d..89f3b16ef4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-69cc9aba56a196bbd159bd24868aa5ccc60bed0dc612d09ed8a3ae898f156809
\ No newline at end of file
+73058416e7da6581000898b7988a7010e2ce6632246f4c12b4398700c7744b83
\ No newline at end of file

From 108c51b6ae731d76b5c77f4c4689d64c89401230 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Mon, 5 Sep 2022 21:22:35 +0000
Subject: [PATCH 051/428] Fix a problem with script mode and lost-and-found
 tables.

FossilOrigin-Name: 09ec588d2fe24dd321e88318fe90a9ae912cbc73c8a2d59a10c821625dd12d9d
---
 ext/recover/sqlite3recover.c | 29 +++++++++++++++++++++++------
 manifest                     | 12 ++++++------
 manifest.uuid                |  2 +-
 3 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index 1014e576a4..f4bf5c0e4f 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -800,13 +800,24 @@ static sqlite3_stmt *recoverLostAndFoundInsert(
   const char *zSep = "";
   sqlite3_stmt *pRet = 0;
 
-  for(ii=0; ii<nTotal; ii++){
-    zBind = recoverMPrintf(p, "%z%s?", zBind, zBind?", ":"", ii);
+  if( p->xSql==0 ){
+    for(ii=0; ii<nTotal; ii++){
+      zBind = recoverMPrintf(p, "%z%s?", zBind, zBind?", ":"", ii);
+    }
+    pRet = recoverPreparePrintf(
+        p, p->dbOut, "INSERT INTO %s VALUES(%s)", zTab, zBind
+    );
+  }else{
+    const char *zSep = "";
+    for(ii=0; ii<nTotal; ii++){
+      zBind = recoverMPrintf(p, "%z%squote(?)", zBind, zSep);
+      zSep = "|| ', ' ||";
+    }
+    pRet = recoverPreparePrintf(
+        p, p->dbOut, "SELECT 'INSERT INTO %s VALUES(' || %s || ')'", zTab, zBind
+    );
   }
 
-  pRet = recoverPreparePrintf(
-      p, p->dbOut, "INSERT INTO %s VALUES(%s)", zTab, zBind
-  );
   sqlite3_free(zBind);
   return pRet;
 }
@@ -860,7 +871,9 @@ static void recoverLostAndFoundPopulate(
       for(ii=0; ii<nVal; ii++){
         sqlite3_bind_value(pInsert, 5+ii, apVal[ii]);
       }
-      sqlite3_step(pInsert);
+      if( sqlite3_step(pInsert)==SQLITE_ROW && p->xSql ){
+        recoverSqlCallback(p, sqlite3_column_text(pInsert, 0));
+      }
       recoverReset(p, pInsert);
 
       /* Discard the accumulated row data */
@@ -1229,6 +1242,8 @@ static void recoverStep(sqlite3_recover *p){
 
   assert( p->errCode==SQLITE_OK );
 
+  recoverSqlCallback(p, "PRAGMA writable_schema = on");
+
   if( p->dbOut==0 ){
     if( recoverOpenOutput(p) ) return;
     if( recoverCacheSchema(p) ) return;
@@ -1237,6 +1252,8 @@ static void recoverStep(sqlite3_recover *p){
     if( p->zLostAndFound && recoverLostAndFound(p) ) return;
     if( recoverWriteSchema2(p) ) return;
   }
+
+  recoverSqlCallback(p, "PRAGMA writable_schema = off");
 }
 
 int sqlite3_recover_step(sqlite3_recover *p){
diff --git a/manifest b/manifest
index 9244609811..d0030bd28b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\smode\sto\soutput\sSQL\sstatements\sinstead\sof\spopulating\sa\sdatabase\sto\sthe\srecover\sextension.
-D 2022-09-05T21:00:22.268
+C Fix\sa\sproblem\swith\sscript\smode\sand\slost-and-found\stables.
+D 2022-09-05T21:22:35.859
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -390,7 +390,7 @@ F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f5974282
 F ext/recover/recover1.test ae8ce9828210aa6c466bf88e23b0933849d5bb43091abe48cf2e56d636e51e93
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
 F ext/recover/recoverold.test f368a6ae2db12b6017257b332a19ab5df527f4061e43f12f5c85d8e2b236f074
-F ext/recover/sqlite3recover.c 47767b52f09fb1bba47009236285f09bcf68b6b5d1ec0de96b1a30b508e536a4
+F ext/recover/sqlite3recover.c 5dca1b3904cb028bef7348a5e0726a253c48f7fcd5da5ec687a44e4e665a24bf
 F ext/recover/sqlite3recover.h 32f89b66f0235c0d94dfee0f1c3e9ed1ad726b3c4f3716ef0262b31cc33e8301
 F ext/recover/test_recover.c be0d74f0eba44fe7964e22d287dba0f3fa2baf197f630d51f0f9066af9b5eb2a
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -2005,8 +2005,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 69cc9aba56a196bbd159bd24868aa5ccc60bed0dc612d09ed8a3ae898f156809
-R fe94b03379801a454a2e4362e6c6eea7
+P 73058416e7da6581000898b7988a7010e2ce6632246f4c12b4398700c7744b83
+R 9dcaa53e272447eefaba97715f5d61ae
 U dan
-Z bbf845b5205dd27415c5eec6b9356a28
+Z 82e767f579594364114308f585b07fed
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 89f3b16ef4..8ad6e97f6b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-73058416e7da6581000898b7988a7010e2ce6632246f4c12b4398700c7744b83
\ No newline at end of file
+09ec588d2fe24dd321e88318fe90a9ae912cbc73c8a2d59a10c821625dd12d9d
\ No newline at end of file

From 09aa80d109eba3e3317a6d844673e6a0bc64ca06 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 6 Sep 2022 16:35:54 +0000
Subject: [PATCH 052/428] Minor internal doc clarifications.

FossilOrigin-Name: 09796cc2bfce7bc4ce11db9673d20737259e9928f0484660cba3a9751f7d01c5
---
 ext/wasm/api/sqlite3-api-oo1.js | 14 +++++++++-----
 manifest                        | 12 ++++++------
 manifest.uuid                   |  2 +-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index 3d24a7689a..aafc04a2d5 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -197,7 +197,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
 
       Reminder: this will also fail after the statement is finalized
       but the resulting error will be about an out-of-bounds column
-      index.
+      index rather than a statement-is-finalized error.
   */
   const affirmColIndex = function(stmt,ndx){
     if((ndx !== (ndx|0)) || ndx<0 || ndx>=stmt.columnCount){
@@ -213,10 +213,14 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
 
      { sql: the SQL, opt: optionsObj, cbArg: function}
 
-     cbArg is only set if the opt.callback is set, in which case
-     it's a function which expects to be passed the current Stmt
-     and returns the callback argument of the type indicated by
-     the input arguments.
+     The opt object is a normalized copy of any passed to this
+     function. The sql will be converted to a string if it is provided
+     in one of the supported non-string formats.
+
+     cbArg is only set if the opt.callback or opt.resultRows are set,
+     in which case it's a function which expects to be passed the
+     current Stmt and returns the callback argument of the type
+     indicated by the input arguments.
   */
   const parseExecArgs = function(args){
     const out = Object.create(null);
diff --git a/manifest b/manifest
index 8171ff2ddc..bfd4f4eb2e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\strunk\sinto\sfiddle-opfs\sbranch.
-D 2022-09-06T09:59:06.910
+C Minor\sinternal\sdoc\sclarifications.
+D 2022-09-06T16:35:54.448
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -483,7 +483,7 @@ F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba814
 F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a4a06cb776c003880b
 F ext/wasm/api/sqlite3-api-cleanup.js 1a12e64060c2cb0defd34656a76a9b1d7ed58459c290249bb31567c806fd44de
 F ext/wasm/api/sqlite3-api-glue.js 67ca83974410961953eeaa1dfed3518530d68381729ed1d27f95122f5baeabd3
-F ext/wasm/api/sqlite3-api-oo1.js 8818c96272ed70e8a95d09b10f2381df94a79de0d722ef9057005e6594db2f33
+F ext/wasm/api/sqlite3-api-oo1.js b06a1ac982c7d433396b8304550ce1493a63671a3bf653c3b5646a9075e0ca41
 F ext/wasm/api/sqlite3-api-opfs.js 011799db398157cbd254264b6ebae00d7234b93d0e9e810345f213a5774993c0
 F ext/wasm/api/sqlite3-api-prologue.js 2d5c5d3355f55eefe51922cec5bfedbec0f8300db98a17685ab7a34a03953c7a
 F ext/wasm/api/sqlite3-api-worker1.js 73579555563b789785ae83724014eaf31811073aad9be6596c8336ffb51edd71
@@ -2015,8 +2015,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 4488cb5798f34cbba14eb8e2aa5da8420c14a85d37d278d357406aedd5c3a9e5 6b00ecb59fd303f7985902c35a46db9e729201d4beaedea46596b728d9e4b1c8
-R fe1e5247661b941e3cd5ee02be72aa3d
+P 7f76eaec793720db87415a476ddf539bc4dea3e74c8e5406d6739206aebdacc2
+R ddf4f26b01c2c564d2354931a4072700
 U stephan
-Z 52c5dac4d2eba4046599a7e7052e5fe2
+Z d6b7c42fac31d9af4682922126e1ce62
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index c528b411f9..dacbc05c13 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7f76eaec793720db87415a476ddf539bc4dea3e74c8e5406d6739206aebdacc2
\ No newline at end of file
+09796cc2bfce7bc4ce11db9673d20737259e9928f0484660cba3a9751f7d01c5
\ No newline at end of file

From 100b496dd28f62ff12f650c0eaf4827674c5e537 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 6 Sep 2022 16:47:43 +0000
Subject: [PATCH 053/428] Initial build of speedtest1.wasm and speedtest1.html
 with which to run it.

FossilOrigin-Name: 4441535e3e54dc1881f700fa3878964eb8554a6790fd6aa32945f7cc104a8467
---
 ext/wasm/GNUmakefile          | 39 ++++++++++++++-
 ext/wasm/common/whwasmutil.js | 30 ++++++++++--
 ext/wasm/speedtest1.html      | 92 +++++++++++++++++++++++++++++++++++
 manifest                      | 15 +++---
 manifest.uuid                 |  2 +-
 5 files changed, 165 insertions(+), 13 deletions(-)
 create mode 100644 ext/wasm/speedtest1.html

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 11b1402662..ae9870054f 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -33,6 +33,10 @@ dir.jacc := jaccwabyt
 dir.common := common
 CLEAN_FILES := *~ $(dir.jacc)/*~ $(dir.api)/*~ $(dir.common)/*~
 
+sqlite3.c := $(dir.top)/sqlite3.c
+$(sqlite3.c):
+	$(MAKE) -C $(dir.top) sqlite3.c
+
 SQLITE_OPT = \
   -DSQLITE_ENABLE_FTS4 \
   -DSQLITE_ENABLE_RTREE \
@@ -53,8 +57,6 @@ SQLITE_OPT = \
 # ^^^ MEMSYS5 is hypothetically useful for non-Emscripten builds but
 # requires adding more infrastructure and fixing one spot in the
 # sqlite3 internals which calls malloc() early on.
-$(dir.top)/sqlite3.c:
-	$(MAKE) -C $(dir.top) sqlite3.c
 
 # SQLITE_OMIT_LOAD_EXTENSION: if this is true, sqlite3_vfs::xDlOpen
 # and friends may be NULL.
@@ -299,6 +301,7 @@ wasm: $(sqlite3.js)
 # Bits for use with batch-runner.js...
 dir.sql := sql
 speedtest1 := ../../speedtest1
+speedtest1.c := ../../test/speedtest1.c
 speedtest1.sql := $(dir.sql)/speedtest1.sql
 $(speedtest1):
 	$(MAKE) -C ../.. speedtest1
@@ -315,6 +318,38 @@ clean-batch:
 batch: batch-runner.list
 all: batch
 
+speedtest1.js := speedtest1.js
+$(speedtest1.js): emcc.cflags+=
+$(speedtest1.js): $(speedtest1.c) $(MAKEFILE)
+	$(emcc.bin) -g $(emcc_opt) \
+        -sINVOKE_RUN=0 \
+        --no-entry \
+        -sALLOW_TABLE_GROWTH \
+        -sABORTING_MALLOC \
+        -sINITIAL_MEMORY=128450560 \
+        -sSTRICT_JS \
+        -sENVIRONMENT=web \
+        -sMODULARIZE \
+        -sEXPORT_NAME=sqlite3Speedtest1InitModule \
+        -Wno-limited-postlink-optimizations \
+        -sEXPORTED_FUNCTIONS=_main,_malloc,_free \
+        -sDYNAMIC_EXECUTION=0 \
+        --minify 0 \
+        -I. -I$(dir.top) \
+        -DSQLITE_THREADSAFE=0 \
+        -DSQLITE_TEMP_STORE=3 \
+        -DSQLITE_OMIT_UTF16 \
+        -DSQLITE_OMIT_DEPRECATED \
+        -DSQLITE_OMIT_SHARED_CACHE \
+        '-DSQLITE_DEFAULT_UNIX_VFS="unix-none"' \
+        -DSQLITE_SPEEDTEST1_WASM \
+        $(emcc_flags_wasmfs) \
+        -o $@ $(speedtest1.c) $(sqlite3.c) -lm
+
+speedtest1: $(speedtest1.js)
+all: $(speedtest1.js)
+CLEAN_FILES += $(speedtest1.js) $(subst .js,.wasm,$(speedtest1.js))
+
 ########################################################################
 # fiddle_remote is the remote destination for the fiddle app. It
 # must be a [user@]HOST:/path for rsync.
diff --git a/ext/wasm/common/whwasmutil.js b/ext/wasm/common/whwasmutil.js
index 38adc76c2f..f72fba72c7 100644
--- a/ext/wasm/common/whwasmutil.js
+++ b/ext/wasm/common/whwasmutil.js
@@ -212,9 +212,10 @@ self.WhWasmUtilInstaller = function(target){
      that will certainly change.
   */
   const ptrIR = target.pointerIR || 'i32';
-  const ptrSizeof = ('i32'===ptrIR ? 4
-                     : ('i64'===ptrIR
-                        ? 8 : toss("Unhandled ptrSizeof:",ptrIR)));
+  const ptrSizeof = target.ptrSizeof =
+        ('i32'===ptrIR ? 4
+         : ('i64'===ptrIR
+            ? 8 : toss("Unhandled ptrSizeof:",ptrIR)));
   /** Stores various cached state. */
   const cache = Object.create(null);
   /** Previously-recorded size of cache.memory.buffer, noted so that
@@ -1021,6 +1022,29 @@ self.WhWasmUtilInstaller = function(target){
     (jstr, returnWithLength=false)=>__allocCStr(jstr, returnWithLength,
                                                 target.scopedAlloc, 'scopedAllocCString()');
 
+  /**
+     Creates an array, using scopedAlloc(), suitable for passing to a
+     C-level main() routine. The input is a collection with a length
+     property and a forEach() method. A block of memory list.length
+     entries long is allocated and each pointer-sized block of that
+     memory is populated with a scopedAllocCString() conversion of the
+     (''+value) of each element. Returns a pointer to the start of the
+     list, suitable for passing as the 2nd argument to a C-style
+     main() function.
+
+     Throws if list.length is falsy or scopedAllocPush() is not active.
+  */
+  target.scopedAllocMainArgv = function(list){
+    if(!list.length) toss("Cannot allocate empty array.");
+    const pList = target.scopedAlloc(list.length * target.ptrSizeof);
+    let i = 0;
+    list.forEach((e)=>{
+      target.setPtrValue(pList + (target.ptrSizeof * i++),
+                         target.scopedAllocCString(""+e));
+    });
+    return pList;
+  };
+
   /**
      Wraps function call func() in a scopedAllocPush() and
      scopedAllocPop() block, such that all calls to scopedAlloc() and
diff --git a/ext/wasm/speedtest1.html b/ext/wasm/speedtest1.html
new file mode 100644
index 0000000000..526c05ac46
--- /dev/null
+++ b/ext/wasm/speedtest1.html
@@ -0,0 +1,92 @@
+<!doctype html>
+<html lang="en-us">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
+    <link rel="stylesheet" href="common/emscripten.css"/>
+    <link rel="stylesheet" href="common/testing.css"/>
+    <title>speedtest1.wasm</title>
+  </head>
+  <body>
+    <header id='titlebar'><span>speedtest1.wasm</span></header>
+    <!-- emscripten bits -->
+    <figure id="module-spinner">
+      <div class="spinner"></div>
+      <div class='center'><strong>Initializing app...</strong></div>
+      <div class='center'>
+        On a slow internet connection this may take a moment.  If this
+        message displays for "a long time", intialization may have
+        failed and the JavaScript console may contain clues as to why.
+      </div>
+    </figure>
+    <div class="emscripten" id="module-status">Downloading...</div>
+    <div class="emscripten">
+      <progress value="0" max="100" id="module-progress" hidden='1'></progress>  
+    </div><!-- /emscripten bits -->
+    <div>Output is sent to the dev console because we cannot update the UI while the
+      speedtest is running unless/until we move the speedtest to a worker thread.</div>
+    <hr>
+    <div id='test-output'></div>
+    <script src="common/whwasmutil.js"></script>
+    <script src="common/SqliteTestUtil.js"></script>
+    <script src="speedtest1.js"></script>
+    <script>
+      (function(){
+        const eOut = document.querySelector('#test-output');
+        const logHtml2 = async function(cssClass,...args){
+          const ln = document.createElement('div');
+          if(cssClass) ln.classList.add(cssClass);
+          ln.append(document.createTextNode(args.join(' ')));
+          eOut.append(ln);
+          //this.e.output.lastElementChild.scrollIntoViewIfNeeded();
+        };
+        const doHtmlOutput = false
+        /* can't update DOM while speedtest is running unless we run
+           speedtest in a worker thread. */;
+        const logHtml = (...args)=>{
+          console.log(...args);
+          if(doHtmlOutput) logHtml2('', ...args);
+        };
+        const logErr = function(...args){
+          console.error(...args);
+          if(doHtmlOutput) this.logHtml2('error', ...args);
+        };
+
+        const runTests = function(EmscriptenModule){
+          console.log("Module inited.");
+          const wasm = {
+            exports: EmscriptenModule.asm,
+            alloc: (n)=>EmscriptenModule._malloc(n),
+            dealloc: (m)=>EmscriptenModule._free(m)
+          };
+          //console.debug('Emscripten Module =',EmscriptenModule);
+          //console.debug('wasm =',wasm);
+          self.WhWasmUtilInstaller(wasm);
+          const scope = wasm.scopedAllocPush();
+          try{
+            const maxArgc = 12;
+            const aArgs = [
+              // TODO: accept flags via URL arguments and/or a
+              // UI control. A multi-SELECT element should do
+              // nicely.
+              "speedtest1",
+              "--memdb",
+              "--stats"
+            ];
+            wasm.xCall('__main_argc_argv', aArgs.length,
+                       wasm.scopedAllocMainArgv(aArgs));
+          }finally{
+            wasm.scopedAllocPop(scope);
+          }
+        };
+
+        self.sqlite3TestModule.print = logHtml;
+        self.sqlite3TestModule.printErr = logErr;
+        sqlite3Speedtest1InitModule(self.sqlite3TestModule).then(function(M){
+          setTimeout(()=>runTests(M), 100);
+        });
+      })();
+    </script>
+  </body>
+</html>
diff --git a/manifest b/manifest
index bfd4f4eb2e..91cc5e9d1c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\sinternal\sdoc\sclarifications.
-D 2022-09-06T16:35:54.448
+C Initial\sbuild\sof\sspeedtest1.wasm\sand\sspeedtest1.html\swith\swhich\sto\srun\sit.
+D 2022-09-06T16:47:43.072
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle db7a4602f043cf4a5e4135be3609a487f9f1c83f05778bfbdf93766be4541b96
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile 49d76f7b4c45d6ff8cb573ba0d1dd7b4712e59582bdc1dfb2f96a4b89f47e34c
+F ext/wasm/GNUmakefile 445b81c44804f029bcc938aa777ca3fe450a0061a586a21be411362575c7cf61
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 77ef4bcf37e362b9ad61f9c175dfc0f1b3e571563fb311b96581cf422ee6a8ec
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -494,7 +494,7 @@ F ext/wasm/batch-runner.js a727cbbffe63fd17fb5a590dc679f0b13bd51880e8f84b461d7df
 F ext/wasm/common/SqliteTestUtil.js 7a543e238c2ebda922c85076abda017d0480944fdfee576692a0c3a580319ebd
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 572cf1ffae0b6eb7ca63684d3392bf350217a07b90e7a896e4fa850700c989b0
-F ext/wasm/common/whwasmutil.js 3d68a9cd87a2d8f7e6d5a78f3b829a927f2e28422685e029139f6e75d4ed42e4
+F ext/wasm/common/whwasmutil.js ed10ab537b800e1f8fac9d5ecec00908f4d4b0e1a270de196e43782600ae59f7
 F ext/wasm/demo-oo1.html 75646855b38405d82781246fd08c852a2b3bee05dd9f0fe10ab655a8cffb79aa
 F ext/wasm/demo-oo1.js aad38cb90b6fa7fd4d1184e759b25056fb4ed45c4957c458896354281259515f
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
@@ -510,6 +510,7 @@ F ext/wasm/scratchpad-opfs-main.js 69e960e9161f6412fd0c30f355d4112f1894d6609eb43
 F ext/wasm/scratchpad-opfs-worker.html 66c1d15d678f3bd306373d76b61c6c8aef988f61f4a8dd40185d452f9c6d2bf5
 F ext/wasm/scratchpad-opfs-worker.js 3ec2868c669713145c76eb5877c64a1b20741f741817b87c907a154b676283a9
 F ext/wasm/scratchpad-opfs-worker2.js 5f2237427ac537b8580b1c659ff14ad2621d1694043eaaf41ae18dbfef2e48c0
+F ext/wasm/speedtest1.html e5b6ca8d09e15ab77fcec95ab30a330cc5376795f3d3b7cc05b9377b08824071
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
@@ -2015,8 +2016,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 7f76eaec793720db87415a476ddf539bc4dea3e74c8e5406d6739206aebdacc2
-R ddf4f26b01c2c564d2354931a4072700
+P 09796cc2bfce7bc4ce11db9673d20737259e9928f0484660cba3a9751f7d01c5
+R 98ebaeee264c8d9d604307fc8843d5b6
 U stephan
-Z d6b7c42fac31d9af4682922126e1ce62
+Z 0a749029dbb2383547531131a6904c9b
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index dacbc05c13..11b9ffd031 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-09796cc2bfce7bc4ce11db9673d20737259e9928f0484660cba3a9751f7d01c5
\ No newline at end of file
+4441535e3e54dc1881f700fa3878964eb8554a6790fd6aa32945f7cc104a8467
\ No newline at end of file

From 497b3e6a1152e58be842fa17dee247360aaf8888 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Tue, 6 Sep 2022 19:38:06 +0000
Subject: [PATCH 054/428] Tests and a fix for the SQLITE_RECOVER_ROWIDS option.

FossilOrigin-Name: 1d5000f5718004110776ff58284d824854a93fe1cd1f6d8a4e8b8b0c2b2c3076
---
 ext/recover/recoverrowid.test | 58 +++++++++++++++++++++++++++++++++++
 ext/recover/sqlite3recover.c  | 18 ++++++++---
 manifest                      | 13 ++++----
 manifest.uuid                 |  2 +-
 4 files changed, 79 insertions(+), 12 deletions(-)
 create mode 100644 ext/recover/recoverrowid.test

diff --git a/ext/recover/recoverrowid.test b/ext/recover/recoverrowid.test
new file mode 100644
index 0000000000..3dfafbcc7f
--- /dev/null
+++ b/ext/recover/recoverrowid.test
@@ -0,0 +1,58 @@
+# 2022 September 07
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+# 
+# Tests for the SQLITE_RECOVER_ROWIDS option.
+#
+
+if {![info exists testdir]} {
+  set testdir [file join [file dirname [info script]] .. .. test]
+} 
+source [file join [file dirname [info script]] recover_common.tcl]
+source $testdir/tester.tcl
+set testprefix recoverrowid
+
+ifcapable !vtab {
+  finish_test; return
+}
+
+proc recover {db bRowids output} {
+  forcedelete $output
+
+  set R [sqlite3_recover_init db main test.db2]
+  $R config rowids $bRowids
+  $R step
+  $R finish
+}
+
+do_execsql_test 1.0 {
+  CREATE TABLE t1(a, b);
+  INSERT INTO t1 VALUES(1, 1), (2, 2), (3, 3), (4, 4);
+  DELETE FROM t1 WHERE a IN (1, 3);
+}
+
+do_test 1.1 {
+  recover db 0 test.db2
+  sqlite3 db2 test.db2
+  execsql { SELECT rowid, a, b FROM t1 ORDER BY rowid} db2
+} {1 2 2 2 4 4}
+
+do_test 1.2 {
+  db2 close
+  recover db 1 test.db2
+  sqlite3 db2 test.db2
+  execsql { SELECT rowid, a, b FROM t1 ORDER BY rowid} db2
+} {2 2 2 4 4 4}
+db2 close
+
+
+
+
+finish_test
diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index f4bf5c0e4f..df6ab36b98 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -403,14 +403,22 @@ static int recoverOpenOutput(sqlite3_recover *p){
       sqlite3_free(zSql);
     }
 
-
+    /* Truncate the output database. This is done by opening a new, empty,
+    ** temp db, then using the backup API to clobber any existing output db
+    ** with a copy of it. */
     if( rc==SQLITE_OK ){
-      sqlite3_backup *pBackup = sqlite3_backup_init(db, "main", db, "recovery");
-      if( pBackup ){
-        while( sqlite3_backup_step(pBackup, 1000)==SQLITE_OK );
-        rc = sqlite3_backup_finish(pBackup);
+      sqlite3 *db2 = 0;
+      rc = sqlite3_open("", &db2);
+      if( rc==SQLITE_OK ){
+        sqlite3_backup *pBackup = sqlite3_backup_init(db, "main", db2, "main");
+        if( pBackup ){
+          while( sqlite3_backup_step(pBackup, 1000)==SQLITE_OK );
+          rc = sqlite3_backup_finish(pBackup);
+        }
       }
+      sqlite3_close(db2);
     }
+
     if( rc==SQLITE_OK ){
       rc = sqlite3_exec(db, RECOVERY_SCHEMA, 0, 0, 0);
     }
diff --git a/manifest b/manifest
index d0030bd28b..a19ce57ac1 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\swith\sscript\smode\sand\slost-and-found\stables.
-D 2022-09-05T21:22:35.859
+C Tests\sand\sa\sfix\sfor\sthe\sSQLITE_RECOVER_ROWIDS\soption.
+D 2022-09-06T19:38:06.927
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -390,7 +390,8 @@ F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f5974282
 F ext/recover/recover1.test ae8ce9828210aa6c466bf88e23b0933849d5bb43091abe48cf2e56d636e51e93
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
 F ext/recover/recoverold.test f368a6ae2db12b6017257b332a19ab5df527f4061e43f12f5c85d8e2b236f074
-F ext/recover/sqlite3recover.c 5dca1b3904cb028bef7348a5e0726a253c48f7fcd5da5ec687a44e4e665a24bf
+F ext/recover/recoverrowid.test ec4436cd69e6cdacb48dd2963ff6dd9dbd5fe648376de5e7c0c2f4f6cbacb417
+F ext/recover/sqlite3recover.c 297fdef9da8523ef7fa3f88adb31356340826dac56c1fb13db2dd3e167806efe
 F ext/recover/sqlite3recover.h 32f89b66f0235c0d94dfee0f1c3e9ed1ad726b3c4f3716ef0262b31cc33e8301
 F ext/recover/test_recover.c be0d74f0eba44fe7964e22d287dba0f3fa2baf197f630d51f0f9066af9b5eb2a
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -2005,8 +2006,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 73058416e7da6581000898b7988a7010e2ce6632246f4c12b4398700c7744b83
-R 9dcaa53e272447eefaba97715f5d61ae
+P 09ec588d2fe24dd321e88318fe90a9ae912cbc73c8a2d59a10c821625dd12d9d
+R 2900e793f9b609ad9d5a7b230af64f99
 U dan
-Z 82e767f579594364114308f585b07fed
+Z a6081cceac978cdb593b5cd251ae6a63
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 8ad6e97f6b..c0fbb47278 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-09ec588d2fe24dd321e88318fe90a9ae912cbc73c8a2d59a10c821625dd12d9d
\ No newline at end of file
+1d5000f5718004110776ff58284d824854a93fe1cd1f6d8a4e8b8b0c2b2c3076
\ No newline at end of file

From 8fc8b5b35f8d576f784ef42c73bf498aa12505a2 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 6 Sep 2022 20:17:15 +0000
Subject: [PATCH 055/428] Get speedtest1.js working with WASMFS/OPFS.

FossilOrigin-Name: 40e60f570d4f489d58d12e27c1c067b41d6c5a5e374c5fce0baa8881ef183216
---
 ext/wasm/GNUmakefile          | 68 ++++++++++++++++++++++-------------
 ext/wasm/api/sqlite3-wasm.c   |  2 +-
 ext/wasm/common/whwasmutil.js |  2 +-
 ext/wasm/speedtest1.html      | 68 ++++++++++++++++++++++++++---------
 manifest                      | 18 +++++-----
 manifest.uuid                 |  2 +-
 6 files changed, 107 insertions(+), 53 deletions(-)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index ae9870054f..09b4479ba5 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -259,10 +259,11 @@ emcc.jsflags += -sMEMORY64=0
 # sqlite3.worker.js generated in conjunction with -sWASMFS).
 sqlite3.js := sqlite3.js
 sqlite3.wasm := sqlite3.wasm
-$(dir.api)/sqlite3-wasm.o: emcc.cflags += $(SQLITE_OPT)
-$(dir.api)/sqlite3-wasm.o: $(dir.top)/sqlite3.c
+sqlite3-wasm.o := $(dir.api)/sqlite3-wasm.o
+$(sqlite3-wasm.o): emcc.cflags += $(SQLITE_OPT)
+$(sqlite3-wasm.o): $(dir.top)/sqlite3.c
 $(dir.api)/wasm_util.o: emcc.cflags += $(SQLITE_OPT)
-sqlite3.wasm.c := $(dir.api)/sqlite3-wasm.c \
+sqlite3-wasm.c := $(dir.api)/sqlite3-wasm.c \
     $(dir.jacc)/jaccwabyt_test.c
 # ^^^ FIXME (how?): jaccwabyt_test.c is only needed for the test apps,
 # so we don't really want to include it in release builds. However, we
@@ -270,7 +271,7 @@ sqlite3.wasm.c := $(dir.api)/sqlite3-wasm.c \
 # elide that file in release builds. That component is critical to the
 # VFS bindings so needs to be tested along with the core APIs.
 ifneq (,$(filter -sWASMFS,$(emcc.jsflags)))
-  $(dir.api)/sqlite3-wasm.o: emcc.cflags+=-DSQLITE_WASM_OPFS
+  $(sqlite3-wasm.o): emcc.cflags+=-DSQLITE_WASM_OPFS
 endif
 define WASM_C_COMPILE
 $(1).o := $$(subst .c,.o,$(1))
@@ -279,7 +280,7 @@ $$($(1).o): $$(MAKEFILE) $(1)
 	$$(emcc.bin) $$(emcc_opt) $$(emcc.flags) $$(emcc.cflags) -c $(1) -o $$@
 CLEAN_FILES += $$($(1).o)
 endef
-$(foreach c,$(sqlite3.wasm.c),$(eval $(call WASM_C_COMPILE,$(c))))
+$(foreach c,$(sqlite3-wasm.c),$(eval $(call WASM_C_COMPILE,$(c))))
 $(sqlite3.js): 
 $(sqlite3.js): $(MAKEFILE) $(sqlite3.wasm.obj) \
     EXPORTED_FUNCTIONS.api \
@@ -298,7 +299,7 @@ wasm: $(sqlite3.js)
 ########################################################################
 
 ########################################################################
-# Bits for use with batch-runner.js...
+# batch-runner.js...
 dir.sql := sql
 speedtest1 := ../../speedtest1
 speedtest1.c := ../../test/speedtest1.c
@@ -317,24 +318,38 @@ clean-batch:
 # pieces each time is an unnecessary time sink.
 batch: batch-runner.list
 all: batch
+# end batch-runner.js
+########################################################################
+# speedtest1.js...
+emcc.speedtest1-flags := -g $(emcc_opt)
+ifneq (0,$(ENABLE_WASMFS))
+  emcc.speedtest1-flags += -pthread -sWASMFS -sPTHREAD_POOL_SIZE=2
+  emcc.speedtest1-flags += -DSQLITE_WASM_OPFS
+endif
+emcc.speedtest1-flags += -sINVOKE_RUN=0
+#emcc.speedtest1-flags += --no-entry
+emcc.speedtest1-flags += -flto
+emcc.speedtest1-flags += -sABORTING_MALLOC
+emcc.speedtest1-flags += -sINITIAL_MEMORY=128450560
+emcc.speedtest1-flags += -sSTRICT_JS
+emcc.speedtest1-flags += $(emcc.environment)
+emcc.speedtest1-flags += -sMODULARIZE
+emcc.speedtest1-flags += -sEXPORT_NAME=sqlite3Speedtest1InitModule
+emcc.speedtest1-flags += -Wno-limited-postlink-optimizations
+emcc.speedtest1-flags += -sEXPORTED_FUNCTIONS=_main,_malloc,_free,_sqlite3_wasm_vfs_unlink,_sqlite3_wasm_init_opfs
+emcc.speedtest1-flags += -sDYNAMIC_EXECUTION=0
+emcc.speedtest1-flags += --minify 0
 
 speedtest1.js := speedtest1.js
+speedtest1.wasm := $(subst .js,.wasm,$(speedtest1.js))
 $(speedtest1.js): emcc.cflags+=
-$(speedtest1.js): $(speedtest1.c) $(MAKEFILE)
-	$(emcc.bin) -g $(emcc_opt) \
-        -sINVOKE_RUN=0 \
-        --no-entry \
-        -sALLOW_TABLE_GROWTH \
-        -sABORTING_MALLOC \
-        -sINITIAL_MEMORY=128450560 \
-        -sSTRICT_JS \
-        -sENVIRONMENT=web \
-        -sMODULARIZE \
-        -sEXPORT_NAME=sqlite3Speedtest1InitModule \
-        -Wno-limited-postlink-optimizations \
-        -sEXPORTED_FUNCTIONS=_main,_malloc,_free \
-        -sDYNAMIC_EXECUTION=0 \
-        --minify 0 \
+# speedtest1 notes re. sqlite3-wasm.o vs sqlite3-wasm.c: building against
+# the latter (predictably) results in a slightly faster binary, but we're
+# close enough to the target speed requirements that the 500ms makes a
+# difference.
+$(speedtest1.js): $(speedtest1.c) $(sqlite3-wasm.c) $(MAKEFILE)
+	$(emcc.bin) \
+        $(emcc.speedtest1-flags) \
         -I. -I$(dir.top) \
         -DSQLITE_THREADSAFE=0 \
         -DSQLITE_TEMP_STORE=3 \
@@ -343,13 +358,16 @@ $(speedtest1.js): $(speedtest1.c) $(MAKEFILE)
         -DSQLITE_OMIT_SHARED_CACHE \
         '-DSQLITE_DEFAULT_UNIX_VFS="unix-none"' \
         -DSQLITE_SPEEDTEST1_WASM \
-        $(emcc_flags_wasmfs) \
-        -o $@ $(speedtest1.c) $(sqlite3.c) -lm
+        -o $@ $(speedtest1.c) $(sqlite3-wasm.c) -lm
+ifneq (,$(wasm-strip))
+	$(wasm-strip) $(speedtest1.wasm)
+endif
+	ls -la $@ $(speedtest1.wasm)
 
 speedtest1: $(speedtest1.js)
 all: $(speedtest1.js)
-CLEAN_FILES += $(speedtest1.js) $(subst .js,.wasm,$(speedtest1.js))
-
+CLEAN_FILES += $(speedtest1.js) $(speedtest1.wasm)
+# end speedtest1.js
 ########################################################################
 # fiddle_remote is the remote destination for the fiddle app. It
 # must be a [user@]HOST:/path for rsync.
diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index 070282b8ee..cea6dffa1f 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -473,7 +473,7 @@ int sqlite3_wasm_init_opfs(const char *zMountPoint){
        hypothetically suffice for the transient wasm-based virtual
        filesystem we're currently running in. */
     const int rc = wasmfs_create_directory(zMountPoint, 0777, pOpfs);
-    emscripten_console_logf("OPFS mkdir rc=%d", rc);
+    emscripten_console_logf("OPFS mkdir(%s) rc=%d", zMountPoint, rc);
     if(rc) return SQLITE_IOERR;
   }
   return pOpfs ? 0 : SQLITE_NOMEM;
diff --git a/ext/wasm/common/whwasmutil.js b/ext/wasm/common/whwasmutil.js
index f72fba72c7..42f602d00d 100644
--- a/ext/wasm/common/whwasmutil.js
+++ b/ext/wasm/common/whwasmutil.js
@@ -1482,7 +1482,7 @@ self.WhWasmUtilInstaller = function(target){
     if(Array.isArray(arguments[3])) args = arguments[3];
     return target.xWrap(fname, resultType, argTypes||[]).apply(null, args||[]);
   };
-  
+
   return target;
 };
 
diff --git a/ext/wasm/speedtest1.html b/ext/wasm/speedtest1.html
index 526c05ac46..5e05feed26 100644
--- a/ext/wasm/speedtest1.html
+++ b/ext/wasm/speedtest1.html
@@ -31,10 +31,37 @@
     <script src="common/whwasmutil.js"></script>
     <script src="common/SqliteTestUtil.js"></script>
     <script src="speedtest1.js"></script>
-    <script>
-      (function(){
+    <script>(function(){
+        /**
+           If this environment contains OPFS, this function initializes it and
+           returns the name of the dir on which OPFS is mounted, else it returns
+           an empty string.
+        */
+        const opfsDir = function f(wasmUtil){
+          if(undefined !== f._) return f._;
+          const pdir = '/persistent';
+          if( !self.FileSystemHandle
+              || !self.FileSystemDirectoryHandle
+              || !self.FileSystemFileHandle){
+            return f._ = "";
+          }
+          try{
+            if(0===wasmUtil.xCallWrapped(
+              'sqlite3_wasm_init_opfs', 'i32', ['string'], pdir
+            )){
+              return f._ = pdir;
+            }else{
+              return f._ = "";
+            }
+          }catch(e){
+            // sqlite3_wasm_init_opfs() is not available
+            return f._ = "";
+          }
+        };
+        opfsDir._ = undefined;
+
         const eOut = document.querySelector('#test-output');
-        const logHtml2 = async function(cssClass,...args){
+        const log2 = async function(cssClass,...args){
           const ln = document.createElement('div');
           if(cssClass) ln.classList.add(cssClass);
           ln.append(document.createTextNode(args.join(' ')));
@@ -44,44 +71,53 @@
         const doHtmlOutput = false
         /* can't update DOM while speedtest is running unless we run
            speedtest in a worker thread. */;
-        const logHtml = (...args)=>{
+        const log = (...args)=>{
           console.log(...args);
-          if(doHtmlOutput) logHtml2('', ...args);
+          if(doHtmlOutput) log2('', ...args);
         };
         const logErr = function(...args){
           console.error(...args);
-          if(doHtmlOutput) this.logHtml2('error', ...args);
+          if(doHtmlOutput) log2('error', ...args);
         };
 
         const runTests = function(EmscriptenModule){
-          console.log("Module inited.");
+          console.log("Module inited.",EmscriptenModule);
           const wasm = {
             exports: EmscriptenModule.asm,
             alloc: (n)=>EmscriptenModule._malloc(n),
-            dealloc: (m)=>EmscriptenModule._free(m)
+            dealloc: (m)=>EmscriptenModule._free(m),
+            memory: EmscriptenModule.asm.memory || EmscriptenModule.wasmMemory
           };
-          //console.debug('Emscripten Module =',EmscriptenModule);
           //console.debug('wasm =',wasm);
           self.WhWasmUtilInstaller(wasm);
+          const unlink = wasm.xWrap("sqlite3_wasm_vfs_unlink", "int", ["string"]);
+          const pDir = opfsDir(wasm);
+          if(pDir){
+            console.warn("Persistent storage:",pDir);
+          }
           const scope = wasm.scopedAllocPush();
+          const dbFile = 0 ? "" : pDir+"/speedtest1.db";
           try{
-            const maxArgc = 12;
-            const aArgs = [
+            const argv = [
               // TODO: accept flags via URL arguments and/or a
               // UI control. A multi-SELECT element should do
               // nicely.
               "speedtest1",
-              "--memdb",
-              "--stats"
+              "--singlethread",
+              //"--stats",
+              "--memdb", // note that memdb trumps the filename arg
+              dbFile
             ];
-            wasm.xCall('__main_argc_argv', aArgs.length,
-                       wasm.scopedAllocMainArgv(aArgs));
+            console.log("argv =",argv);
+            wasm.xCall('__main_argc_argv', argv.length,
+                       wasm.scopedAllocMainArgv(argv));
           }finally{
             wasm.scopedAllocPop(scope);
+            if(pDir) unlink(dbFile);
           }
         };
 
-        self.sqlite3TestModule.print = logHtml;
+        self.sqlite3TestModule.print = log;
         self.sqlite3TestModule.printErr = logErr;
         sqlite3Speedtest1InitModule(self.sqlite3TestModule).then(function(M){
           setTimeout(()=>runTests(M), 100);
diff --git a/manifest b/manifest
index 91cc5e9d1c..22d4c0358d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Initial\sbuild\sof\sspeedtest1.wasm\sand\sspeedtest1.html\swith\swhich\sto\srun\sit.
-D 2022-09-06T16:47:43.072
+C Get\sspeedtest1.js\sworking\swith\sWASMFS/OPFS.
+D 2022-09-06T20:17:15.425
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle db7a4602f043cf4a5e4135be3609a487f9f1c83f05778bfbdf93766be4541b96
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile 445b81c44804f029bcc938aa777ca3fe450a0061a586a21be411362575c7cf61
+F ext/wasm/GNUmakefile 2333e782a412c56438e9c08b56b8e26d402d70067760925e6900df5cb4165b66
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 77ef4bcf37e362b9ad61f9c175dfc0f1b3e571563fb311b96581cf422ee6a8ec
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -488,13 +488,13 @@ F ext/wasm/api/sqlite3-api-opfs.js 011799db398157cbd254264b6ebae00d7234b93d0e9e8
 F ext/wasm/api/sqlite3-api-prologue.js 2d5c5d3355f55eefe51922cec5bfedbec0f8300db98a17685ab7a34a03953c7a
 F ext/wasm/api/sqlite3-api-worker1.js 73579555563b789785ae83724014eaf31811073aad9be6596c8336ffb51edd71
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c 0d81282eaeff2a6e9fc5c28a388c5c5b45cf25a9393992fa511ac009b27df982
+F ext/wasm/api/sqlite3-wasm.c 19c3797edc35821e362a8b60ce45d1adfe6d24fca7cd1f55f89d2086ef33870e
 F ext/wasm/batch-runner.html 2d44d99a556c46f586d3319003dd281dd0eb6a13eeadde3eab05ba81eec9ff8a
 F ext/wasm/batch-runner.js a727cbbffe63fd17fb5a590dc679f0b13bd51880e8f84b461d7df246417689e8
 F ext/wasm/common/SqliteTestUtil.js 7a543e238c2ebda922c85076abda017d0480944fdfee576692a0c3a580319ebd
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 572cf1ffae0b6eb7ca63684d3392bf350217a07b90e7a896e4fa850700c989b0
-F ext/wasm/common/whwasmutil.js ed10ab537b800e1f8fac9d5ecec00908f4d4b0e1a270de196e43782600ae59f7
+F ext/wasm/common/whwasmutil.js f7282ef36c9625330d4e6e82d1beec6678cd101e95e7108cd85db587a788c145
 F ext/wasm/demo-oo1.html 75646855b38405d82781246fd08c852a2b3bee05dd9f0fe10ab655a8cffb79aa
 F ext/wasm/demo-oo1.js aad38cb90b6fa7fd4d1184e759b25056fb4ed45c4957c458896354281259515f
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
@@ -510,7 +510,7 @@ F ext/wasm/scratchpad-opfs-main.js 69e960e9161f6412fd0c30f355d4112f1894d6609eb43
 F ext/wasm/scratchpad-opfs-worker.html 66c1d15d678f3bd306373d76b61c6c8aef988f61f4a8dd40185d452f9c6d2bf5
 F ext/wasm/scratchpad-opfs-worker.js 3ec2868c669713145c76eb5877c64a1b20741f741817b87c907a154b676283a9
 F ext/wasm/scratchpad-opfs-worker2.js 5f2237427ac537b8580b1c659ff14ad2621d1694043eaaf41ae18dbfef2e48c0
-F ext/wasm/speedtest1.html e5b6ca8d09e15ab77fcec95ab30a330cc5376795f3d3b7cc05b9377b08824071
+F ext/wasm/speedtest1.html a1204f5cbbd592baa191535dc7eaa2d875f661aefb2a70a4631df0a925e19f4b
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
@@ -2016,8 +2016,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 09796cc2bfce7bc4ce11db9673d20737259e9928f0484660cba3a9751f7d01c5
-R 98ebaeee264c8d9d604307fc8843d5b6
+P 4441535e3e54dc1881f700fa3878964eb8554a6790fd6aa32945f7cc104a8467
+R 63d4e2043bd53d54be9ba5bac375f852
 U stephan
-Z 0a749029dbb2383547531131a6904c9b
+Z 29ed13e3400f211a842f97710dcb5fd5
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 11b9ffd031..6d532fae16 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4441535e3e54dc1881f700fa3878964eb8554a6790fd6aa32945f7cc104a8467
\ No newline at end of file
+40e60f570d4f489d58d12e27c1c067b41d6c5a5e374c5fce0baa8881ef183216
\ No newline at end of file

From 3a59dd12d2da38b6372341a9afd91c7a041dfc7e Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 6 Sep 2022 23:04:51 +0000
Subject: [PATCH 056/428] Add a note about Emscripten's -sSINGLE_FILE flag, why
 it would be nice, and why we can't use it.

FossilOrigin-Name: 5ea0623630d769a8f3f07a40cd119be86b631192cdb5178131876b01b40ee5e0
---
 ext/wasm/GNUmakefile | 10 ++++++++++
 manifest             | 12 ++++++------
 manifest.uuid        |  2 +-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 09b4479ba5..a312bbdab4 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -252,6 +252,16 @@ emcc.jsflags += -sMEMORY64=0
 ########################################################################
 
 
+########################################################################
+# -sSINGLE_FILE:
+# https://github.com/emscripten-core/emscripten/blob/main/src/settings.js#L1704
+# -sSINGLE_FILE=1 would be really nice but we have to build with -g
+# for -O2 and higher to work (else minification breaks the code) and
+# cannot wasm-strip the binary before it gets encoded into the JS
+# file. The result is that the generated JS file is, because of the -g
+# debugging info, _huge_.
+########################################################################
+
 ########################################################################
 # Maintenance reminder: the output .js and .wasm files of emcc must be
 # in _this_ dir, rather than a subdir, or else parts of the generated
diff --git a/manifest b/manifest
index 22d4c0358d..aef6da12d0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Get\sspeedtest1.js\sworking\swith\sWASMFS/OPFS.
-D 2022-09-06T20:17:15.425
+C Add\sa\snote\sabout\sEmscripten's\s-sSINGLE_FILE\sflag,\swhy\sit\swould\sbe\snice,\sand\swhy\swe\scan't\suse\sit.
+D 2022-09-06T23:04:51.823
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle db7a4602f043cf4a5e4135be3609a487f9f1c83f05778bfbdf93766be4541b96
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile 2333e782a412c56438e9c08b56b8e26d402d70067760925e6900df5cb4165b66
+F ext/wasm/GNUmakefile 5c566211fe64a45659064bae65e032150e451a0b9dca00be6552f3f6b7252693
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 77ef4bcf37e362b9ad61f9c175dfc0f1b3e571563fb311b96581cf422ee6a8ec
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -2016,8 +2016,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 4441535e3e54dc1881f700fa3878964eb8554a6790fd6aa32945f7cc104a8467
-R 63d4e2043bd53d54be9ba5bac375f852
+P 40e60f570d4f489d58d12e27c1c067b41d6c5a5e374c5fce0baa8881ef183216
+R 0096ecafc15630b25658c12eafbbea1b
 U stephan
-Z 29ed13e3400f211a842f97710dcb5fd5
+Z 7b5e51ab80c88507303a95f3b8f5d0e1
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 6d532fae16..08a78c3d74 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-40e60f570d4f489d58d12e27c1c067b41d6c5a5e374c5fce0baa8881ef183216
\ No newline at end of file
+5ea0623630d769a8f3f07a40cd119be86b631192cdb5178131876b01b40ee5e0
\ No newline at end of file

From abb28667f159796be159292b8c0c6a68b56f73d9 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Wed, 7 Sep 2022 16:41:33 +0000
Subject: [PATCH 057/428] Ensure that the recover extension properly escapes CR
 and NL characters in text mode. Also that it holds transactions open on both
 input and output databases for the duration of a recovery operation.

FossilOrigin-Name: 6cca8913e703635ad89415a60fc84000ac188d9df43f45594b8ad87facb91d54
---
 ext/recover/sqlite3recover.c | 331 +++++++++++++++++++++++------------
 ext/recover/test_recover.c   |   5 +-
 manifest                     |  14 +-
 manifest.uuid                |   2 +-
 4 files changed, 229 insertions(+), 123 deletions(-)

diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index df6ab36b98..de3dc6ea1a 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -234,15 +234,15 @@ static void recoverFinalize(sqlite3_recover *p, sqlite3_stmt *pStmt){
 
 static int recoverExec(sqlite3_recover *p, sqlite3 *db, const char *zSql){
   if( p->errCode==SQLITE_OK ){
-    int rc = sqlite3_exec(p->dbOut, zSql, 0, 0, 0);
+    int rc = sqlite3_exec(db, zSql, 0, 0, 0);
     if( rc ){
-      recoverDbError(p, p->dbOut);
+      recoverDbError(p, db);
     }
   }
   return p->errCode;
 }
 
-static char *recoverPrintf(sqlite3_recover *p, const char *zFmt, ...){
+static char *recoverMPrintf(sqlite3_recover *p, const char *zFmt, ...){
   va_list ap;
   char *z;
   va_start(ap, zFmt);
@@ -375,79 +375,187 @@ static void recoverGetPage(
   }
 }
 
+/*
+** Find a string that is not found anywhere in z[].  Return a pointer
+** to that string.
+**
+** Try to use zA and zB first.  If both of those are already found in z[]
+** then make up some string and store it in the buffer zBuf.
+*/
+static const char *unused_string(
+  const char *z,                    /* Result must not appear anywhere in z */
+  const char *zA, const char *zB,   /* Try these first */
+  char *zBuf                        /* Space to store a generated string */
+){
+  unsigned i = 0;
+  if( strstr(z, zA)==0 ) return zA;
+  if( strstr(z, zB)==0 ) return zB;
+  do{
+    sqlite3_snprintf(20,zBuf,"(%s%u)", zA, i++);
+  }while( strstr(z,zBuf)!=0 );
+  return zBuf;
+}
+
+
+/*
+** Scalar function "escape_crnl".  The argument passed to this function is the
+** output of built-in function quote(). If the first character of the input is
+** "'", indicating that the value passed to quote() was a text value, then this
+** function searches the input for "\n" and "\r" characters and adds a wrapper
+** similar to the following:
+**
+**   replace(replace(<input>, '\n', char(10), '\r', char(13));
+**
+** Or, if the first character of the input is not "'", then a copy
+** of the input is returned.
+*/
+static void recoverEscapeCrnl(
+  sqlite3_context *context, 
+  int argc, 
+  sqlite3_value **argv
+){
+  const char *zText = (const char*)sqlite3_value_text(argv[0]);
+  if( zText && zText[0]=='\'' ){
+    int nText = sqlite3_value_bytes(argv[0]);
+    int i;
+    char zBuf1[20];
+    char zBuf2[20];
+    const char *zNL = 0;
+    const char *zCR = 0;
+    int nCR = 0;
+    int nNL = 0;
+
+    for(i=0; zText[i]; i++){
+      if( zNL==0 && zText[i]=='\n' ){
+        zNL = unused_string(zText, "\\n", "\\012", zBuf1);
+        nNL = (int)strlen(zNL);
+      }
+      if( zCR==0 && zText[i]=='\r' ){
+        zCR = unused_string(zText, "\\r", "\\015", zBuf2);
+        nCR = (int)strlen(zCR);
+      }
+    }
+
+    if( zNL || zCR ){
+      int iOut = 0;
+      i64 nMax = (nNL > nCR) ? nNL : nCR;
+      i64 nAlloc = nMax * nText + (nMax+64)*2;
+      char *zOut = (char*)sqlite3_malloc64(nAlloc);
+      if( zOut==0 ){
+        sqlite3_result_error_nomem(context);
+        return;
+      }
+
+      if( zNL && zCR ){
+        memcpy(&zOut[iOut], "replace(replace(", 16);
+        iOut += 16;
+      }else{
+        memcpy(&zOut[iOut], "replace(", 8);
+        iOut += 8;
+      }
+      for(i=0; zText[i]; i++){
+        if( zText[i]=='\n' ){
+          memcpy(&zOut[iOut], zNL, nNL);
+          iOut += nNL;
+        }else if( zText[i]=='\r' ){
+          memcpy(&zOut[iOut], zCR, nCR);
+          iOut += nCR;
+        }else{
+          zOut[iOut] = zText[i];
+          iOut++;
+        }
+      }
+
+      if( zNL ){
+        memcpy(&zOut[iOut], ",'", 2); iOut += 2;
+        memcpy(&zOut[iOut], zNL, nNL); iOut += nNL;
+        memcpy(&zOut[iOut], "', char(10))", 12); iOut += 12;
+      }
+      if( zCR ){
+        memcpy(&zOut[iOut], ",'", 2); iOut += 2;
+        memcpy(&zOut[iOut], zCR, nCR); iOut += nCR;
+        memcpy(&zOut[iOut], "', char(13))", 12); iOut += 12;
+      }
+
+      sqlite3_result_text(context, zOut, iOut, SQLITE_TRANSIENT);
+      sqlite3_free(zOut);
+      return;
+    }
+  }
+
+  sqlite3_result_value(context, argv[0]);
+}
+
+
 #ifdef _WIN32
 __declspec(dllexport)
 #endif
 int sqlite3_dbdata_init(sqlite3*, char**, const sqlite3_api_routines*);
 
 static int recoverOpenOutput(sqlite3_recover *p){
-  int rc = SQLITE_OK;
-  if( p->dbOut==0 ){
-    const int flags = SQLITE_OPEN_URI|SQLITE_OPEN_CREATE|SQLITE_OPEN_READWRITE;
-    sqlite3 *db = 0;
+  struct Func {
+    const char *zName;
+    int nArg;
+    void (*xFunc)(sqlite3_context*,int,sqlite3_value **);
+  } aFunc[] = {
+    { "getpage", 1, recoverGetPage },
+    { "page_is_used", 1, recoverPageIsUsed },
+    { "read_i32", 2, recoverReadI32 },
+    { "escape_crnl", 1, recoverEscapeCrnl },
+  };
 
-    assert( p->dbOut==0 );
+  const int flags = SQLITE_OPEN_URI|SQLITE_OPEN_CREATE|SQLITE_OPEN_READWRITE;
+  sqlite3 *db = 0;                /* New database handle */
+  int ii;                         /* For iterating through aFunc[] */
 
-    rc = sqlite3_open_v2(p->zUri, &db, flags, 0);
-    if( rc==SQLITE_OK ){
-      rc = sqlite3_exec(db, "PRAGMA writable_schema = 1", 0, 0, 0);
-    }
-    if( rc==SQLITE_OK ){
-      const char *zPath = p->zStateDb ? p->zStateDb : ":memory:";
-      char *zSql = sqlite3_mprintf("ATTACH %Q AS recovery", zPath);
-      if( zSql==0 ){
-        rc = p->errCode = SQLITE_NOMEM;
-      }else{
-        rc = sqlite3_exec(db, zSql, 0, 0, 0);
-      }
-      sqlite3_free(zSql);
-    }
+  assert( p->dbOut==0 );
 
-    /* Truncate the output database. This is done by opening a new, empty,
-    ** temp db, then using the backup API to clobber any existing output db
-    ** with a copy of it. */
-    if( rc==SQLITE_OK ){
-      sqlite3 *db2 = 0;
-      rc = sqlite3_open("", &db2);
-      if( rc==SQLITE_OK ){
-        sqlite3_backup *pBackup = sqlite3_backup_init(db, "main", db2, "main");
-        if( pBackup ){
-          while( sqlite3_backup_step(pBackup, 1000)==SQLITE_OK );
-          rc = sqlite3_backup_finish(pBackup);
-        }
-      }
-      sqlite3_close(db2);
-    }
-
-    if( rc==SQLITE_OK ){
-      rc = sqlite3_exec(db, RECOVERY_SCHEMA, 0, 0, 0);
-    }
-
-    if( rc==SQLITE_OK ){
-      sqlite3_dbdata_init(db, 0, 0);
-      rc = sqlite3_create_function(
-          db, "getpage", 1, SQLITE_UTF8, (void*)p, recoverGetPage, 0, 0
-      );
-    }
-    if( rc==SQLITE_OK ){
-      rc = sqlite3_create_function(
-          db, "page_is_used", 1, SQLITE_UTF8, (void*)p, recoverPageIsUsed, 0, 0
-      );
-    }
-    if( rc==SQLITE_OK ){
-      rc = sqlite3_create_function(
-          db, "read_i32", 2, SQLITE_UTF8, (void*)p, recoverReadI32, 0, 0
-      );
-    }
-
-    if( rc!=SQLITE_OK ){
-      if( p->errCode==SQLITE_OK ) rc = recoverDbError(p, db);
-      sqlite3_close(db);
-    }else{
-      p->dbOut = db;
-    }
+  if( sqlite3_open_v2(p->zUri, &db, flags, 0) ){
+    recoverDbError(p, db);
+  }else{
+    char *zSql = recoverMPrintf(p, "ATTACH %Q AS recovery;", p->zStateDb);
+    recoverExec(p, db, zSql);
+    recoverExec(p, db,
+        "PRAGMA writable_schema = 1;"
+        "CREATE TABLE recovery.map(pgno INTEGER PRIMARY KEY, parent INT);" 
+        "CREATE TABLE recovery.schema(type, name, tbl_name, rootpage, sql);"
+    );
+    sqlite3_free(zSql);
   }
-  return rc;
+
+  /* Register the sqlite_dbdata and sqlite_dbptr virtual table modules.
+  ** These two are registered with the output database handle - this
+  ** module depends on the input handle supporting the sqlite_dbpage
+  ** virtual table only.  */
+  if( p->errCode==SQLITE_OK ){
+    p->errCode = sqlite3_dbdata_init(db, 0, 0);
+  }
+
+  /* Register the custom user-functions with the output handle. */
+  for(ii=0; p->errCode==SQLITE_OK && ii<sizeof(aFunc)/sizeof(aFunc[0]); ii++){
+    p->errCode = sqlite3_create_function(db, aFunc[ii].zName, 
+        aFunc[ii].nArg, SQLITE_UTF8, (void*)p, aFunc[ii].xFunc, 0, 0
+    );
+  }
+
+  /* Truncate the output database to 0 pages in size. This is done by 
+  ** opening a new, empty, temp db, then using the backup API to clobber 
+  ** any existing output db with a copy of it. */
+  if( p->errCode==SQLITE_OK ){
+    sqlite3 *db2 = 0;
+    int rc = sqlite3_open("", &db2);
+    if( rc==SQLITE_OK ){
+      sqlite3_backup *pBackup = sqlite3_backup_init(db, "main", db2, "main");
+      if( pBackup ){
+        while( sqlite3_backup_step(pBackup, 1000)==SQLITE_OK );
+        p->errCode = sqlite3_backup_finish(pBackup);
+      }
+    }
+    sqlite3_close(db2);
+  }
+
+  p->dbOut = db;
+  return p->errCode;
 }
 
 static int recoverCacheSchema(sqlite3_recover *p){
@@ -632,22 +740,6 @@ static int recoverWriteSchema2(sqlite3_recover *p){
   return p->errCode;
 }
 
-
-static char *recoverMPrintf(sqlite3_recover *p, const char *zFmt, ...){
-  char *zRet = 0;
-  if( p->errCode==SQLITE_OK ){
-    va_list ap;
-    char *z;
-    va_start(ap, zFmt);
-    zRet = sqlite3_vmprintf(zFmt, ap);
-    va_end(ap);
-    if( zRet==0 ){
-      p->errCode = SQLITE_NOMEM;
-    }
-  }
-  return zRet;
-}
-
 static sqlite3_stmt *recoverInsertStmt(
   sqlite3_recover *p, 
   RecoverTable *pTab,
@@ -688,8 +780,8 @@ static sqlite3_stmt *recoverInsertStmt(
       zSql = recoverMPrintf(p, "%z%s%Q", zSql, zSep, pTab->aCol[ii].zCol);
 
       if( bSql ){
-        zBind = recoverMPrintf(
-            p, "%z%squote(?%d)", zBind, zSqlSep, pTab->aCol[ii].iBind
+        zBind = recoverMPrintf(p, 
+            "%z%sescape_crnl(quote(?%d))", zBind, zSqlSep, pTab->aCol[ii].iBind
         );
         zSqlSep = "||', '||";
       }else{
@@ -745,9 +837,9 @@ static char *recoverLostAndFoundCreate(
   for(ii=-1; zTbl==0 && p->errCode==SQLITE_OK && ii<1000; ii++){
     int bFail = 0;
     if( ii<0 ){
-      zTbl = recoverPrintf(p, "%s", p->zLostAndFound);
+      zTbl = recoverMPrintf(p, "%s", p->zLostAndFound);
     }else{
-      zTbl = recoverPrintf(p, "%s_%d", p->zLostAndFound, ii);
+      zTbl = recoverMPrintf(p, "%s_%d", p->zLostAndFound, ii);
     }
 
     if( p->errCode==SQLITE_OK ){
@@ -777,7 +869,7 @@ static char *recoverLostAndFoundCreate(
       zSep = ", ";
     }
 
-    zSql = recoverPrintf(p, "CREATE TABLE %s(%s)", zTbl, zField);
+    zSql = recoverMPrintf(p, "CREATE TABLE %s(%s)", zTbl, zField);
     sqlite3_free(zField);
 
     recoverExec(p, p->dbOut, zSql);
@@ -1217,14 +1309,14 @@ int sqlite3_recover_config(sqlite3_recover *p, int op, void *pArg){
   switch( op ){
     case SQLITE_RECOVER_TESTDB:
       sqlite3_free(p->zStateDb);
-      p->zStateDb = sqlite3_mprintf("%s", (char*)pArg);
+      p->zStateDb = recoverMPrintf(p, "%s", (char*)pArg);
       break;
 
     case SQLITE_RECOVER_LOST_AND_FOUND:
       const char *zArg = (const char*)pArg;
       sqlite3_free(p->zLostAndFound);
       if( zArg ){
-        p->zLostAndFound = recoverPrintf(p, "%s", zArg);
+        p->zLostAndFound = recoverMPrintf(p, "%s", zArg);
       }else{
         p->zLostAndFound = 0;
       }
@@ -1247,21 +1339,47 @@ int sqlite3_recover_config(sqlite3_recover *p, int op, void *pArg){
 }
 
 static void recoverStep(sqlite3_recover *p){
-
+  RecoverTable *pTab = 0;
+  RecoverTable *pNext = 0;
+  int rc = SQLITE_OK;
   assert( p->errCode==SQLITE_OK );
 
+  recoverSqlCallback(p, "BEGIN");
   recoverSqlCallback(p, "PRAGMA writable_schema = on");
 
-  if( p->dbOut==0 ){
-    if( recoverOpenOutput(p) ) return;
-    if( recoverCacheSchema(p) ) return;
-    if( recoverWriteSchema1(p) ) return;
-    if( recoverWriteData(p) ) return;
-    if( p->zLostAndFound && recoverLostAndFound(p) ) return;
-    if( recoverWriteSchema2(p) ) return;
-  }
+  /* Open the output database. And register required virtual tables and 
+  ** user functions with the new handle. */
+  recoverOpenOutput(p);
+
+  /* Open transactions on both the input and output databases. */
+  recoverExec(p, p->dbIn, "BEGIN");
+  recoverExec(p, p->dbOut, "BEGIN");
+
+  recoverCacheSchema(p);
+  recoverWriteSchema1(p);
+  recoverWriteData(p);
+  if( p->zLostAndFound ) recoverLostAndFound(p);
+  recoverWriteSchema2(p);
+
+  /* If no error has occurred, commit the write transaction on the output
+  ** database. Then end the read transaction on the input database, regardless
+  ** of whether or not prior errors have occurred.  */
+  recoverExec(p, p->dbOut, "COMMIT");
+  rc = sqlite3_exec(p->dbIn, "END", 0, 0, 0);
+  if( p->errCode==SQLITE_OK ) p->errCode = rc;
 
   recoverSqlCallback(p, "PRAGMA writable_schema = off");
+  recoverSqlCallback(p, "COMMIT");
+
+  for(pTab=p->pTblList; pTab; pTab=pNext){
+    pNext = pTab->pNext;
+    sqlite3_free(pTab);
+  }
+  p->pTblList = 0;
+
+  sqlite3_finalize(p->pGetPage);
+  sqlite3_close(p->dbOut);
+  p->pGetPage = 0;
 }
 
 int sqlite3_recover_step(sqlite3_recover *p){
@@ -1272,21 +1390,8 @@ int sqlite3_recover_step(sqlite3_recover *p){
 }
 
 int sqlite3_recover_finish(sqlite3_recover *p){
-  RecoverTable *pTab;
-  RecoverTable *pNext;
-  int rc;
-
-  for(pTab=p->pTblList; pTab; pTab=pNext){
-    pNext = pTab->pNext;
-    sqlite3_free(pTab);
-  }
-
-  sqlite3_finalize(p->pGetPage);
-  rc = sqlite3_close(p->dbOut);
-  assert( rc==SQLITE_OK );
-  p->pGetPage = 0;
-  rc = p->errCode;
-
+  int rc = p->errCode;
+  sqlite3_free(p->zErrMsg);
   sqlite3_free(p->zStateDb);
   sqlite3_free(p->zLostAndFound);
   sqlite3_free(p);
diff --git a/ext/recover/test_recover.c b/ext/recover/test_recover.c
index acfcf8c7a3..1de99f4bd6 100644
--- a/ext/recover/test_recover.c
+++ b/ext/recover/test_recover.c
@@ -13,6 +13,7 @@
 */
 
 #include "sqlite3recover.h"
+#include "sqliteInt.h"
 
 #include <tcl.h>
 #include <assert.h>
@@ -128,7 +129,7 @@ static int testRecoverCmd(
           int iVal = 0;
           if( Tcl_GetBooleanFromObj(interp, objv[3], &iVal) ) return TCL_ERROR;
           res = sqlite3_recover_config(pTest->p, 
-              SQLITE_RECOVER_FREELIST_CORRUPT, (void*)iVal
+              SQLITE_RECOVER_FREELIST_CORRUPT, SQLITE_INT_TO_PTR(iVal)
           );
           break;
         }
@@ -136,7 +137,7 @@ static int testRecoverCmd(
           int iVal = 0;
           if( Tcl_GetBooleanFromObj(interp, objv[3], &iVal) ) return TCL_ERROR;
           res = sqlite3_recover_config(pTest->p, 
-              SQLITE_RECOVER_ROWIDS, (void*)iVal
+              SQLITE_RECOVER_ROWIDS, SQLITE_INT_TO_PTR(iVal)
           );
           break;
         }
diff --git a/manifest b/manifest
index a19ce57ac1..9e036d2201 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Tests\sand\sa\sfix\sfor\sthe\sSQLITE_RECOVER_ROWIDS\soption.
-D 2022-09-06T19:38:06.927
+C Ensure\sthat\sthe\srecover\sextension\sproperly\sescapes\sCR\sand\sNL\scharacters\sin\stext\smode.\sAlso\sthat\sit\sholds\stransactions\sopen\son\sboth\sinput\sand\soutput\sdatabases\sfor\sthe\sduration\sof\sa\srecovery\soperation.
+D 2022-09-07T16:41:33.248
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -391,9 +391,9 @@ F ext/recover/recover1.test ae8ce9828210aa6c466bf88e23b0933849d5bb43091abe48cf2e
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
 F ext/recover/recoverold.test f368a6ae2db12b6017257b332a19ab5df527f4061e43f12f5c85d8e2b236f074
 F ext/recover/recoverrowid.test ec4436cd69e6cdacb48dd2963ff6dd9dbd5fe648376de5e7c0c2f4f6cbacb417
-F ext/recover/sqlite3recover.c 297fdef9da8523ef7fa3f88adb31356340826dac56c1fb13db2dd3e167806efe
+F ext/recover/sqlite3recover.c 9724f913fd457f655e2873552bc6600a6aaff7104b9113ccb38fea18b6a71f03
 F ext/recover/sqlite3recover.h 32f89b66f0235c0d94dfee0f1c3e9ed1ad726b3c4f3716ef0262b31cc33e8301
-F ext/recover/test_recover.c be0d74f0eba44fe7964e22d287dba0f3fa2baf197f630d51f0f9066af9b5eb2a
+F ext/recover/test_recover.c 7aa268d3431d630eaa82ce14974ae04be50fe7feba660ffaea009cd581916d27
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
 F ext/repair/checkfreelist.c e21f06995ff4efdc1622dcceaea4dcba2caa83ca2f31a1607b98a8509168a996
 F ext/repair/checkindex.c 4383e4469c21e5b9ae321d0d63cec53e981af9d7a6564be6374f0eeb93dfc890
@@ -2006,8 +2006,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 09ec588d2fe24dd321e88318fe90a9ae912cbc73c8a2d59a10c821625dd12d9d
-R 2900e793f9b609ad9d5a7b230af64f99
+P 1d5000f5718004110776ff58284d824854a93fe1cd1f6d8a4e8b8b0c2b2c3076
+R 3bf4abb672d881722cf6509f544c5091
 U dan
-Z a6081cceac978cdb593b5cd251ae6a63
+Z c71f206aa1a37ae4579417497726bb42
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index c0fbb47278..85ba19965b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1d5000f5718004110776ff58284d824854a93fe1cd1f6d8a4e8b8b0c2b2c3076
\ No newline at end of file
+6cca8913e703635ad89415a60fc84000ac188d9df43f45594b8ad87facb91d54
\ No newline at end of file

From 59ece7e1060e00b711f9967706379cb7d2214cc3 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Wed, 7 Sep 2022 17:29:22 +0000
Subject: [PATCH 058/428] Non-working code towards a VFS for text key/value
 storage.

FossilOrigin-Name: f9c89ee8d5ef46342bea78fa8d4da058d9ea628183ec985642bbda1cdfeacd5f
---
 ext/misc/vfskv.c | 645 +++++++++++++++++++++++++++++++++++++++++++++++
 manifest         |  15 +-
 manifest.uuid    |   2 +-
 3 files changed, 655 insertions(+), 7 deletions(-)
 create mode 100644 ext/misc/vfskv.c

diff --git a/ext/misc/vfskv.c b/ext/misc/vfskv.c
new file mode 100644
index 0000000000..4d8d797a4f
--- /dev/null
+++ b/ext/misc/vfskv.c
@@ -0,0 +1,645 @@
+/*
+** 2022-09-06
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+******************************************************************************
+**
+** This file contains an experimental VFS layer that operates on a
+** Key/Value storage engine where both keys and values must be pure
+** text.
+*/
+#include "sqlite3.h"
+#include <string.h>
+#include <assert.h>
+#include <stdio.h>
+#include <stat/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <assert.h>
+
+
+/*****************************************************************************
+** The low-level storage engine
+*/
+typedef struct KVStorage KVStorage;
+struct KVStorage {
+  char *zDir;
+  char zKey[50];
+};
+
+static KVStorage *kvstorageOpen(void);
+static void kvstorageClose(KVStorage*);
+static int kvstorageWrite(KVStorage*, const char *zKey, const char *zData);
+static int kvstorageDelete(KVStorage*, const char *zKey);
+static int kvstorageSize(KVStorage*, const char *zKey);
+static int kvstorageRead(KVStorage*, const char *zKey, char *zBuf, int nBuf);
+
+
+/*
+** Forward declaration of objects used by this utility
+*/
+typedef struct KVVfsVfs KVVfsVfs;
+typedef struct KVVfsFile KVVfsFile;
+
+struct KVVfsVfs {
+  sqlite3_vfs base;               /* VFS methods */
+  KVStorage *pStore;              /* Single command KV storage object */
+  KVVfsFile *pFiles;              /* List of open KVVfsFile objects */
+};
+
+struct KVVfsFile {
+  sqlite3_file base;              /* IO methods */
+  KVVfsVfs *pVfs;                 /* The VFS to which this file belongs */
+  KVVfsFile *pNext;               /* Next in list of all files */
+  int isJournal;                  /* True if this is a journal file */
+  int nJrnl;                      /* Space allocated for aJrnl[] */
+  char *aJrnl;                    /* Journal content */
+};
+
+/*
+** Methods for KVVfsFile
+*/
+static int kvvfsClose(sqlite3_file*);
+static int kvvfsRead(sqlite3_file*, void*, int iAmt, sqlite3_int64 iOfst);
+static int kvvfsWrite(sqlite3_file*,const void*,int iAmt, sqlite3_int64 iOfst);
+static int kvvfsTruncate(sqlite3_file*, sqlite3_int64 size);
+static int kvvfsSync(sqlite3_file*, int flags);
+static int kvvfsFileSize(sqlite3_file*, sqlite3_int64 *pSize);
+static int kvvfsLock(sqlite3_file*, int);
+static int kvvfsUnlock(sqlite3_file*, int);
+static int kvvfsCheckReservedLock(sqlite3_file*, int *pResOut);
+static int kvvfsFileControl(sqlite3_file*, int op, void *pArg);
+static int kvvfsSectorSize(sqlite3_file*);
+static int kvvfsDeviceCharacteristics(sqlite3_file*);
+
+/*
+** Methods for KVVfsVfs
+*/
+static int kvvfsOpen(sqlite3_vfs*, const char *, sqlite3_file*, int , int *);
+static int kvvfsDelete(sqlite3_vfs*, const char *zName, int syncDir);
+static int kvvfsAccess(sqlite3_vfs*, const char *zName, int flags, int *);
+static int kvvfsFullPathname(sqlite3_vfs*, const char *zName, int, char *zOut);
+static void *kvvfsDlOpen(sqlite3_vfs*, const char *zFilename);
+static void kvvfsDlError(sqlite3_vfs*, int nByte, char *zErrMsg);
+static void (*kvvfsDlSym(sqlite3_vfs *pVfs, void *p, const char*zSym))(void);
+static void kvvfsDlClose(sqlite3_vfs*, void*);
+static int kvvfsRandomness(sqlite3_vfs*, int nByte, char *zOut);
+static int kvvfsSleep(sqlite3_vfs*, int microseconds);
+static int kvvfsCurrentTime(sqlite3_vfs*, double*);
+static int kvvfsGetLastError(sqlite3_vfs*, int, char *);
+static int kvvfsCurrentTimeInt64(sqlite3_vfs*, sqlite3_int64*);
+
+static KVVfsVfs kvvfs_vfs = {
+  {
+    1,                            /* iVersion */
+    sizeof(KVVfsFile),            /* szOsFile */
+    1024,                         /* mxPathname */
+    0,                            /* pNext */
+    "kvvfs",                      /* zName */
+    0,                            /* pAppData */
+    kvvfsOpen,                    /* xOpen */
+    kvvfsDelete,                  /* xDelete */
+    kvvfsAccess,                  /* xAccess */
+    kvvfsFullPathname,            /* xFullPathname */
+    kvvfsDlOpen,                  /* xDlOpen */
+    0,                            /* xDlError */
+    0,                            /* xDlSym */
+    0,                            /* xDlClose */
+    kvvfsRandomness,              /* xRandomness */
+    kvvfsSleep,                   /* xSleep */
+    kvvfsCurrentTime,             /* xCurrentTime */
+    0,                            /* xGetLastError */
+    kvvfsCurrentTimeInt64,        /* xCurrentTimeInt64 */
+  },
+  0,
+  0
+};
+
+static sqlite3_io_methods kvvfs_io_methods = {
+  1,                              /* iVersion */
+  kvvfsClose,                     /* xClose */
+  kvvfsRead,                      /* xRead */
+  kvvfsWrite,                     /* xWrite */
+  kvvfsTruncate,                  /* xTruncate */
+  kvvfsSync,                      /* xSync */
+  kvvfsFileSize,                  /* xFileSize */
+  kvvfsLock,                      /* xLock */
+  kvvfsUnlock,                    /* xUnlock */
+  kvvfsCheckReservedLock,         /* xCheckReservedLock */
+  kvvfsFileControl,               /* xFileControl */
+  kvvfsSectorSize,                /* xSectorSize */
+  kvvfsDeviceCharacteristics      /* xDeviceCharacteristics */
+  0,                              /* xShmMap */
+  0,                              /* xShmLock */
+  0,                              /* xShmBarrier */
+  0,                              /* xShmUnmap */
+  0,                              /* xFetch */
+  0                               /* xUnfetch */
+};
+
+/****** Storage subsystem **************************************************/
+
+/* Allocate a new storage subsystem.
+** Return NULL if OOM
+*/
+static KVStorage *kvstorageOpen(void){
+  KVStorage *pStore;
+  pStore = sqlite3_malloc64( sizeof(*pStore) );
+  if( pStore==0 ) return 0;
+  memset(pStore, 0, sizeof(*pStore));
+  return pStore;
+}
+
+/* Free all resources associated with the storage subsystem */
+static void kvstorageClose(KVStorage *pStore){
+  sqlite3_free(pStore);
+}
+
+/* Expand the key name with an appropriate prefix and put the result
+** in pStore->zKey[]
+*/
+static void kvstorageMakeKey(KVStorage *pStore, const char *zKey){
+  sqlite3_snprintf(sizeof(pStore->zKey), pStore->zKey, "kvvfs-%s", zKey);
+}
+
+/* Write content into a key.  zKey is of limited size.  zData should be
+** pure text.  In other words, zData has already been encoded.
+**
+** Return the number of errors.
+*/
+static int kvstorageWrite(
+  KVStorage *pStore,
+  const char *zKey,
+  const char *zData
+){
+  FILE *fd;
+  kvstorageMakeKey(pStore, zKey);
+  fd = fopen(pStore->zKey, "wb");
+  if( fd==0 ) return 1;
+  if( fd ){
+    fputs(zData, fd);
+    fclose(fd);
+  }
+  return 0;
+}
+
+/* Delete a key
+*/
+static int kvstorageDelete(KVStorage *pStore, const char *zKey){
+  kvstorageMakeKey(pStore, zKey);
+  unlink(pStore->zKey);
+  return 0;
+}
+
+/* Read the value associated with a key and put the result in the first
+** nBuf bytes of zBuf[].  The value might be truncated if zBuf is not large
+** enough to hold it all.  The value put into zBuf will always be zero
+** terminated.
+**
+** Return the total number of bytes in the data, without truncation, and
+** not counting the final zero terminator.   Return -1 if the key does
+** not exist.
+**
+** If nBuf==0 then this routine simply returns the size of the data without
+** actually reading it.
+*/
+static int kvstorageRead(
+  KVStorage *pStore,
+  const char *zKey,
+  char *zBuf,
+  int nBuf
+){
+  FILE *fd;
+  struct stat buf;
+  kvstorageMakeKey(pStore, zKey);
+  if( access(pStore->zKey, R_OK)!=0
+   || stat(pStore->zKey, &buf)!=0
+   || !S_ISREG(buf.st_mode)
+  ){
+    return -1;
+  }
+  if( nBuf<0 ){
+    return (int)buf.st_size;
+  }else if( nBuf==1 ){
+    zBuf[0] = 0;
+    return (int)buf.st_size;
+  }
+  if( nBuf-1 > buf.st_size ){
+    nBuf = buf.st_size + 1;
+  }
+  fd = fopen(pStore->zKey, "rb");
+  if( fd==0 ) return -1;
+  fread(zBuf, nBuf-1, 1, fd);
+  fclose(fd);
+  return nBuf-1;
+}
+
+
+/****** The main VFS code **************************************************/
+
+/*
+** Close an kvvfs-file.
+*/
+static int kvvfsClose(sqlite3_file *pProtoFile){
+  KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
+  KVVfsVfs *pVfs = pFile->pVfs;
+
+  if( pVfs->pFiles==pFile ){
+    pVfs->pFiles = pFile->pNext;
+    if( pVfs->pFiles==0 ){
+      kvstorageClose(pVfs->pStore);
+      pVfs->pStore = 0;
+    }
+  }else{
+    KVVfsFile *pX = pVfs->pFiles;
+    while( 1 ){
+      assert( pX );
+      if( pX->pNext==pFile ){
+        pX->pNext = pFile->pNext;
+        break;
+      }
+      pX = pX->pNext; 
+    }
+  }
+  sqlite3_free(pFile->aData);
+  sqlite3_free(pFile);
+  return SQLITE_OK;
+}
+
+/*
+** Encode binary into the text encoded used to persist on disk.
+** The output text is stored in aOut[], which must be at least
+** nData+1 bytes in length.
+**
+** Return the actual length of the encoded text, not counting the
+** zero terminator at the end.
+*/
+static int kvvfsEncode(const char *aData, int nData, char *aOut){
+  int i, j;
+  const unsigned *a = (const unsigned char*)aData;
+  for(i=j=0; i<nData; i++){
+    unsigned char c = a[i];
+    if( c!=0 ){
+      aOut[j++] = "0123456789ABCDEF"[c>>4];
+      aOut[j++] = "0123456789ABCDEF"[c&0xf];
+    }else{
+      /* A sequence of 1 or more zeros is stored as a little-endian
+      ** base-26 number using a..z as the digits. So one zero is "b".
+      ** Two zeros is "c". 25 zeros is "z", 26 zeros is "ba" and so forth.
+      */
+      int k;
+      for(k=1; a[i+k]==0 && i+k<nData; k++){}
+      i += k;
+      while( k>0 ){
+        aOut[j++] = 'a'+(k%26);
+        k /= 26;
+      }
+    }
+  }
+  aOut[j] = 0;
+  return j;
+}
+
+/* Convert hex to binary */
+static char kvvfsHexToBinary(char c){
+  if( c>='0' && c<='9' ) return c - '0';
+  if( c>='a' && c<='f' ) return c - 'a' + 10;
+  return 0;
+}
+
+/*
+** Decode the text encoding back to binary.  The binary content is
+** written into pOut, which must be at least nOut bytes in length.
+*/
+static int kvvfsDecode(const char *aIn, char *aOut, int nOut){
+  char *aOut;
+  int i, j, k;
+  int c;
+  i = 0;
+  j = 0;
+  while( (c = aIn[i])!=0 ){
+    if( c>='a' ){
+      int n = 0;
+      while( c>='a' && c<='z' ){
+        n = n*26 + c - 'a';
+        c = aIn[++i];
+      }
+      if( j+n>nOut ) return -1;
+      while( n-->0 ){
+        aOut[j++] = 0;
+      }
+    }else{
+      if( j>nOut ) return -1;
+      aOut[j] = kvvfsHexToBinary(aIn[i])<<4;
+      i++;
+      aOut[j] += kvvfsHexToBinary(aIn[i]);
+      i++;
+    }
+  }
+  return j;
+}
+
+/*
+** Read from the -journal file.
+*/
+static int kvvfsReadFromJournal(
+  KVVfsFile *pFile, 
+  void *zBuf, 
+  int iAmt, 
+  sqlite_int64 iOfst
+){
+  assert( pFile->isJournal );
+  if( pFile->aJrnl==0 ){
+    int szTxt = kvstorageRead(pFile->pVfs->pStore, "journal", 0, 0);
+    char *aTxt;
+    if( szTxt<=4 ){
+      return SQLITE_IOERR;
+    }
+    aTxt = sqlite3_malloc64( szTxt+1 );
+    if( aTxt==0 ) return SQLITE_NOMEM;
+    kvstorageRead(pFile->pVfs->pStore, "journal", aTxt, szTxt+1);
+    kvvfsDecodeJournal(pFile, aTxt, szTxt);
+    sqlite3_free(aTxt);
+    if( pFile->aData==0 ) return SQLITE_IOERR;
+  }
+  if( iOfst+iAmt>pFile->nJrnl ){
+    return SQLITE_IOERR_SHORT_READ;
+  }
+  mcmcpy(zBuf, pFile->aJrnl+iOfst, iAmt);
+  return SQLITE_OK;
+}
+
+/*
+** Read from the database file.
+*/
+static int kvvfsReadFromDb(
+  KVVfsFile *pFile, 
+  void *zBuf, 
+  int iAmt, 
+  sqlite_int64 iOfst
+){
+  return SQLITE_IOERR;
+}
+
+
+/*
+** Read data from an kvvfs-file.
+*/
+static int kvvfsRead(
+  sqlite3_file *pProtoFile, 
+  void *zBuf, 
+  int iAmt, 
+  sqlite_int64 iOfst
+){
+  int rc;
+  KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
+  if( pFile->isJournal ){
+    rc = kvvfsReadFromJournal(pFile,zBuf,iAmt,iOfst);
+  }else{
+    rc = kvvfsReadFromDb(pFile,zBuf,iAmt,iOfst);
+  }
+  return rc;
+}
+
+/*
+** Write into the -journal file.
+*/
+static int kvvfsWriteToJournal(
+  KVVfsFile *pFile, 
+  const void *zBuf, 
+  int iAmt, 
+  sqlite_int64 iOfst
+){
+  return SQLITE_IOERR;
+}
+
+/*
+** Read from the database file.
+*/
+static int kvvfsWriteToDb(
+  KVVfsFile *pFile, 
+  const void *zBuf, 
+  int iAmt, 
+  sqlite_int64 iOfst
+){
+  return SQLITE_IOERR;
+}
+
+
+/*
+** Write data into the kvvfs-file.
+*/
+static int kvvfsWrite(
+  sqlite3_file *pProtoFile, 
+  const void *zBuf, 
+  int iAmt, 
+  sqlite_int64 iOfst
+){
+  int rc;
+  KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
+  if( pFile->isJournal ){
+    rc = kvvfsWriteToJournal(pFile,zBuf,iAmt,iOfst);
+  }else{
+    rc = kvvfsWriteToDb(pFile,zBuf,iAmt,iOfst);
+  }
+  return rc;
+}
+
+/*
+** Truncate an kvvfs-file.
+*/
+static int kvvfsTruncate(sqlite3_file *pFile, sqlite_int64 size){
+  int rc;
+  KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
+  rc = SQLITE_IOERR;
+  return rc;
+}
+
+/*
+** Sync an kvvfs-file.
+*/
+static int kvvfsSync(sqlite3_file *pFile, int flags){
+  int rc;
+  KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
+  rc = SQLITE_IOERR;
+  return rc;
+}
+
+/*
+** Return the current file-size of an kvvfs-file.
+*/
+static int kvvfsFileSize(sqlite3_file *pFile, sqlite_int64 *pSize){
+  int rc;
+  KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
+  *pSize = 0;
+  rc = SQLITE_IOERR;
+  return rc;
+}
+
+/*
+** Lock an kvvfs-file.
+*/
+static int kvvfsLock(sqlite3_file *pFile, int eLock){
+  int rc;
+  KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
+  rc = SQLITE_IOERR;
+  return rc;
+}
+
+/*
+** Unlock an kvvfs-file.
+*/
+static int kvvfsUnlock(sqlite3_file *pFile, int eLock){
+  int rc;
+  KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
+  rc = SQLITE_IOERR;
+  return rc;
+}
+
+/*
+** Check if another file-handle holds a RESERVED lock on an kvvfs-file.
+*/
+static int kvvfsCheckReservedLock(sqlite3_file *pFile, int *pResOut){
+  int rc;
+  KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
+  *pResOut = 0;
+  rc = SQLITE_IOERR;
+  return rc;
+}
+
+/*
+** File control method. For custom operations on an kvvfs-file.
+*/
+static int kvvfsFileControl(sqlite3_file *pFile, int op, void *pArg){
+  int rc;
+  KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
+  rc = SQLITE_NOTFOUND;
+  return rc;
+}
+
+/*
+** Return the sector-size in bytes for an kvvfs-file.
+*/
+static int kvvfsSectorSize(sqlite3_file *pFile){
+  return 4096;
+}
+
+/*
+** Return the device characteristic flags supported by an kvvfs-file.
+*/
+static int kvvfsDeviceCharacteristics(sqlite3_file *pFile){
+  return 0;
+}
+
+
+/*
+** Open an kvvfs file handle.
+*/
+static int kvvfsOpen(
+  sqlite3_vfs *pProtoVfs,
+  const char *zName,
+  sqlite3_file *pProtoFile,
+  int flags,
+  int *pOutFlags
+){
+  int rc;
+  KVVfsFile *pFile = (KVVfsFile*)pProtoFile;
+  KVVfsVfs *pVfs = (KVVfsVfs*)pProtoVfs;
+
+  
+  return rc;
+}
+
+/*
+** Delete the file located at zPath. If the dirSync argument is true,
+** ensure the file-system modifications are synced to disk before
+** returning.
+*/
+static int kvvfsDelete(sqlite3_vfs *pVfs, const char *zPath, int dirSync){
+  KVVfsVfs *p = (KVVfsVfs*)pVfs;
+  if( sqlite3_strglob("*-journal",zPath)==0 ){
+    kvstorageDelete(p->pStore, "journal");
+  }
+  return SQLITE_OK;
+}
+
+/*
+** Test for access permissions. Return true if the requested permission
+** is available, or false otherwise.
+*/
+static int kvvfsAccess(
+  sqlite3_vfs *pVfs, 
+  const char *zPath, 
+  int flags, 
+  int *pResOut
+){
+  *pResOut = 1;
+  return SQLITE_OK;
+}
+
+/*
+** Populate buffer zOut with the full canonical pathname corresponding
+** to the pathname in zPath. zOut is guaranteed to point to a buffer
+** of at least (INST_MAX_PATHNAME+1) bytes.
+*/
+static int kvvfsFullPathname(
+  sqlite3_vfs *pVfs, 
+  const char *zPath, 
+  int nOut, 
+  char *zOut
+){
+  size_t nPath = strlen(zPath);
+  if( nOut<nPath+1 ) nPath = nOut - 1;
+  memcpy(zOut, zPath, nPath);
+  zPath[nPath] = 0;
+  return SQLITE_OK;
+}
+
+/*
+** Open the dynamic library located at zPath and return a handle.
+*/
+static void *kvvfsDlOpen(sqlite3_vfs *pVfs, const char *zPath){
+  return 0;
+}
+
+/*
+** Populate the buffer pointed to by zBufOut with nByte bytes of 
+** random data.
+*/
+static int kvvfsRandomness(sqlite3_vfs *pVfs, int nByte, char *zBufOut){
+  memset(zBufOut, 0, nByte);
+  return nByte;
+}
+
+/*
+** Sleep for nMicro microseconds. Return the number of microseconds 
+** actually slept.
+*/
+static int kvvfsSleep(sqlite3_vfs *pVfs, int nMicro){
+  return SQLITE_OK;
+}
+
+/*
+** Return the current time as a Julian Day number in *pTimeOut.
+*/
+static int kvvfsCurrentTime(sqlite3_vfs *pVfs, double *pTimeOut){
+  *pTimeOut = 2459829.13362986;
+  return SQLITE_OK;
+}
+static int kvvfsCurrentTimeInt64(sqlite3_vfs *pVfs, sqlite3_int64 *pTimeOut){
+  *pTimeOut = (sqlite3_int64)(2459829.13362986*86400000.0);
+  return SQLITE_OK;
+}
+
+/*
+** Register debugvfs as the default VFS for this process.
+*/
+int sqlite3_register_kvvfs(const char *zArg){
+  return sqlite3_vfs_register(&kvvfs_vfs.base, 1);
+}
diff --git a/manifest b/manifest
index e6d926c22b..dfddb1fb37 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\stool/omittest-msvc.tcl\sscript\sthat\swill\stry\sto\sbuild\susing\sMSVC\nusing\svarious\scompile-time\soptions,\sto\sensure\sthat\sthe\scompile-time\soptions\nall\sbuild\swithout\serrors.
-D 2022-09-05T22:54:36.015
+C Non-working\scode\stowards\sa\sVFS\sfor\stext\skey/value\sstorage.
+D 2022-09-07T17:29:22.881
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -335,6 +335,7 @@ F ext/misc/uint.c 053fed3bce2e89583afcd4bf804d75d659879bbcedac74d0fa9ed548839a03
 F ext/misc/unionvtab.c 36237f0607ca954ac13a4a0e2d2ac40c33bc6e032a5f55f431713061ef1625f9
 F ext/misc/urifuncs.c f71360d14fa9e7626b563f1f781c6148109462741c5235ac63ae0f8917b9c751
 F ext/misc/uuid.c 5bb2264c1b64d163efa46509544fd7500cb8769cb7c16dd52052da8d961505cf
+F ext/misc/vfskv.c aebaf8b59b70a066c2c0ba9344db0494ff50452ff6b4e79c9133e7a2ea112a99
 F ext/misc/vfslog.c 3932ab932eeb2601dbc4447cb14d445aaa9fbe43b863ef5f014401c3420afd20
 F ext/misc/vfsstat.c 474d08efc697b8eba300082cb1eb74a5f0f3df31ed257db1cb07e72ab0e53dfb
 F ext/misc/vtablog.c 5538acd0c8ddaae372331bee11608d76973436b77d6a91e8635cfc9432fba5ae
@@ -2000,9 +2001,11 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P f74a5ea8c986dc33d3afcda169c38abbe55728c56716cf9991a5e2ef7fc4917a 82b89f8a074858a81d841dfc26436e8d39ce4907b8f989eba4d848db16758303
-R 6ca49c20c002174082011fae5352b9a2
-T +closed 82b89f8a074858a81d841dfc26436e8d39ce4907b8f989eba4d848db16758303
+P 6b00ecb59fd303f7985902c35a46db9e729201d4beaedea46596b728d9e4b1c8
+R 26f26a2d9ce78c288f974e48234fd3a7
+T *branch * kv-vfs
+T *sym-kv-vfs *
+T -sym-trunk *
 U drh
-Z 072f191f34018bff25742e9863a6762e
+Z 68d678ebfc334c4be8e66c0fb69610ed
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 1a48ad4407..d9d59da7ca 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6b00ecb59fd303f7985902c35a46db9e729201d4beaedea46596b728d9e4b1c8
\ No newline at end of file
+f9c89ee8d5ef46342bea78fa8d4da058d9ea628183ec985642bbda1cdfeacd5f
\ No newline at end of file

From 4a08e793c6125c5ef6dc2f3c7b403c90ee6a196a Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Thu, 8 Sep 2022 11:04:23 +0000
Subject: [PATCH 059/428] Add new test file recoverclobber.test.

FossilOrigin-Name: cb4e950c472bd24a79a8505a7f8e4c3a0f7821648297d05cc760738b777d5149
---
 ext/recover/recoverclobber.test | 58 +++++++++++++++++++++++++++++++++
 manifest                        | 11 ++++---
 manifest.uuid                   |  2 +-
 3 files changed, 65 insertions(+), 6 deletions(-)
 create mode 100644 ext/recover/recoverclobber.test

diff --git a/ext/recover/recoverclobber.test b/ext/recover/recoverclobber.test
new file mode 100644
index 0000000000..e6967ec9be
--- /dev/null
+++ b/ext/recover/recoverclobber.test
@@ -0,0 +1,58 @@
+# 2019 April 23
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+# 
+# Tests for the SQLITE_RECOVER_ROWIDS option.
+#
+
+if {![info exists testdir]} {
+  set testdir [file join [file dirname [info script]] .. .. test]
+} 
+source [file join [file dirname [info script]] recover_common.tcl]
+source $testdir/tester.tcl
+set testprefix recoverclobber
+
+ifcapable !vtab {
+  finish_test; return
+}
+
+proc recover {db output} {
+  set R [sqlite3_recover_init db main test.db2]
+  $R step
+  $R finish
+}
+
+forcedelete test.db2
+do_execsql_test 1.0 {
+  ATTACH 'test.db2' AS aux;
+  CREATE TABLE aux.x1(x, one);
+  INSERT INTO x1 VALUES(1, 'one'), (2, 'two'), (3, 'three');
+
+  CREATE TABLE t1(a, b);
+  INSERT INTO t1 VALUES(1, 1), (2, 2), (3, 3), (4, 4);
+
+  DETACH aux;
+}
+
+breakpoint
+do_test 1.1 {
+  recover db test.db2
+} {}
+
+do_execsql_test 1.2 {
+  ATTACH 'test.db2' AS aux;
+  SELECT * FROM aux.t1;
+} {1 1   2 2   3 3   4 4}
+
+do_catchsql_test 1.3 {
+  SELECT * FROM aux.x1;
+} {1 {no such table: aux.x1}}
+
+finish_test
diff --git a/manifest b/manifest
index 9e036d2201..421372fcab 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthat\sthe\srecover\sextension\sproperly\sescapes\sCR\sand\sNL\scharacters\sin\stext\smode.\sAlso\sthat\sit\sholds\stransactions\sopen\son\sboth\sinput\sand\soutput\sdatabases\sfor\sthe\sduration\sof\sa\srecovery\soperation.
-D 2022-09-07T16:41:33.248
+C Add\snew\stest\sfile\srecoverclobber.test.
+D 2022-09-08T11:04:23.161
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -389,6 +389,7 @@ F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9c
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
 F ext/recover/recover1.test ae8ce9828210aa6c466bf88e23b0933849d5bb43091abe48cf2e56d636e51e93
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
+F ext/recover/recoverclobber.test e6537ebf99f57bfff6cca59550b5f4278319b57a89865abb98d755a8fd561d84
 F ext/recover/recoverold.test f368a6ae2db12b6017257b332a19ab5df527f4061e43f12f5c85d8e2b236f074
 F ext/recover/recoverrowid.test ec4436cd69e6cdacb48dd2963ff6dd9dbd5fe648376de5e7c0c2f4f6cbacb417
 F ext/recover/sqlite3recover.c 9724f913fd457f655e2873552bc6600a6aaff7104b9113ccb38fea18b6a71f03
@@ -2006,8 +2007,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 1d5000f5718004110776ff58284d824854a93fe1cd1f6d8a4e8b8b0c2b2c3076
-R 3bf4abb672d881722cf6509f544c5091
+P 6cca8913e703635ad89415a60fc84000ac188d9df43f45594b8ad87facb91d54
+R 102ea2ce4694a6be6ee34f8e72c4fbd9
 U dan
-Z c71f206aa1a37ae4579417497726bb42
+Z e86817dfd35f39cea8c450fbde6bc553
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 85ba19965b..2f04809195 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6cca8913e703635ad89415a60fc84000ac188d9df43f45594b8ad87facb91d54
\ No newline at end of file
+cb4e950c472bd24a79a8505a7f8e4c3a0f7821648297d05cc760738b777d5149
\ No newline at end of file

From 44a87f08efbb4d19bb935afb44c3472b4a54a9f9 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Thu, 8 Sep 2022 15:30:59 +0000
Subject: [PATCH 060/428] Add speedtest1-worker.html, an interactive
 Worker-thread variant of speedtest1.html. Add ext/wasm/index.html to act as a
 gateway to the various test pages.

FossilOrigin-Name: f16c68ee6d5ebb8dec2ab656dbab2ddb5f1d5133153ad553f986b31020adaa38
---
 ext/wasm/batch-runner.html      |  28 ---
 ext/wasm/common/testing.css     |  20 +-
 ext/wasm/index.html             |  54 ++++++
 ext/wasm/speedtest1-worker.html | 315 ++++++++++++++++++++++++++++++++
 ext/wasm/speedtest1-worker.js   |  99 ++++++++++
 ext/wasm/speedtest1.html        |   4 +
 manifest                        |  21 ++-
 manifest.uuid                   |   2 +-
 test/speedtest1.c               |   6 +
 9 files changed, 510 insertions(+), 39 deletions(-)
 create mode 100644 ext/wasm/index.html
 create mode 100644 ext/wasm/speedtest1-worker.html
 create mode 100644 ext/wasm/speedtest1-worker.js

diff --git a/ext/wasm/batch-runner.html b/ext/wasm/batch-runner.html
index 10f7e45df7..38f38070c0 100644
--- a/ext/wasm/batch-runner.html
+++ b/ext/wasm/batch-runner.html
@@ -59,33 +59,5 @@
     <script src="sqlite3.js"></script>
     <script src="common/SqliteTestUtil.js"></script>
     <script src="batch-runner.js"></script>
-    <style>
-      body {
-          display: flex;
-          flex-direction: column;
-          flex-wrap: wrap;
-      }
-      .warning { color: firebrick; }
-      .input-wrapper {
-          white-space: nowrap;
-      }
-      #test-output {
-          border: 1px inset;
-          padding: 0.25em;
-          /*max-height: 30em;*/
-          overflow: auto;
-          white-space: break-spaces;
-          display: flex; flex-direction: column;
-      }
-      #test-output.reverse {
-          flex-direction: column-reverse;
-      }
-      .hidden {
-          position: absolute !important;
-          opacity: 0 !important;
-          pointer-events: none !important;
-          display: none !important;
-      }
-    </style>
   </body>
 </html>
diff --git a/ext/wasm/common/testing.css b/ext/wasm/common/testing.css
index 09c570f48a..e112fd0a83 100644
--- a/ext/wasm/common/testing.css
+++ b/ext/wasm/common/testing.css
@@ -1,3 +1,8 @@
+body {
+  display: flex;
+  flex-direction: column;
+  flex-wrap: wrap;
+}
 textarea {
     font-family: monospace;
 }
@@ -29,4 +34,17 @@ span.labeled-input {
     color: red;
     background-color: yellow;
 }
-#test-output { font-family: monospace }
+.warning { color: firebrick; }
+.input-wrapper { white-space: nowrap; }
+#test-output {
+  border: 1px inset;
+  padding: 0.25em;
+  /*max-height: 30em;*/
+  overflow: auto;
+  white-space: break-spaces;
+  display: flex; flex-direction: column;
+  font-family: monospace;
+}
+#test-output.reverse {
+  flex-direction: column-reverse;
+}
diff --git a/ext/wasm/index.html b/ext/wasm/index.html
new file mode 100644
index 0000000000..def70cce03
--- /dev/null
+++ b/ext/wasm/index.html
@@ -0,0 +1,54 @@
+<!doctype html>
+<html lang="en-us">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
+    <link rel="stylesheet" href="common/testing.css"/>
+    <title>sqlite3 WASM Testing Page Index</title>
+  </head>
+  <body>
+    <header id='titlebar'><span>sqlite3 WASM test pages</span></header>
+    <hr>
+    <div>Below is the list of test pages for the sqlite3 WASM
+      builds. All of them require that this directory have been
+      "make"d first. The intent is that <em>this</em> page be run
+      using:</div>
+    <blockquote><pre>althttpd -page index.html</pre></blockquote>
+    <div>and the individual tests be started in their own tab.</div>
+    <div>Warnings and Caveats:
+      <ul class='warning'>
+        <li>Some of these pages require that
+          the web server emit the so-called COOP and COEP headers. The
+          default build of althttpd <em>does not</em>.
+        </li>
+        <li>Whether or not WASMFS/OPFS support is enabled on any given
+          page may depend on build-time options which are <em>off by
+          default</em> because they currently (as of 2022-09-08) break
+          with Worker-based pages.
+        </li>
+      </ul>
+    </div>
+    <div>The tests...
+      <ul id='test-list'>
+        <li><a href='testing1.html'>testing1</a>: sanity tests of the core APIs and surrounding utility code.</li>
+        <li><a href='testing2.html'>testing2</a>: Worker-based test of OO API #1.</li>
+        <li><a href='testing-worker1-promiser.html'>testing-worker1-promiser</a>:
+          tests for the Promise-based wrapper of the Worker-based API.</li>
+        <li><a href='batch-runner.html'>batch-runner</a>: runs batches of SQL exported from speedtest1.</li>
+        <li><a href='speedtest1.html'>speedtest1</a>: a main-thread WASM build of speedtest1.</li>
+        <li><a href='speedtest1-worker.html'>speedtest1-worker</a>: an interactive Worker-thread variant of speedtest1.</li>
+        <li><a href='demo-oo1.html'>demo-oo1</a>: demonstration of the OO API #1.</li>
+        <!--li><a href='x.html'></a></li-->
+      </ul>
+    </div>
+    <style>
+      #test-list { font-size: 120%; }
+    </style>
+    <script>//Assign a distinct target tab name for each test page...
+      document.querySelectorAll('a').forEach(function(e){
+          e.target = e.href;
+      });
+    </script>
+  </body>
+</html>
diff --git a/ext/wasm/speedtest1-worker.html b/ext/wasm/speedtest1-worker.html
new file mode 100644
index 0000000000..60c475798c
--- /dev/null
+++ b/ext/wasm/speedtest1-worker.html
@@ -0,0 +1,315 @@
+<!doctype html>
+<html lang="en-us">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
+    <link rel="stylesheet" href="common/emscripten.css"/>
+    <link rel="stylesheet" href="common/testing.css"/>
+    <title>speedtest1.wasm Worker</title>
+  </head>
+  <body>
+    <header id='titlebar'>speedtest1.wasm Worker</header>
+    <div>See also: <a href='speedtest1.html'>A main-thread variant of this page.</a></div>
+    <!-- emscripten bits -->
+    <figure id="module-spinner">
+      <div class="spinner"></div>
+      <div class='center'><strong>Initializing app...</strong></div>
+      <div class='center'>
+        On a slow internet connection this may take a moment.  If this
+        message displays for "a long time", intialization may have
+        failed and the JavaScript console may contain clues as to why.
+      </div>
+    </figure>
+    <div class="emscripten" id="module-status">Downloading...</div>
+    <div class="emscripten">
+      <progress value="0" max="100" id="module-progress" hidden='1'></progress>  
+    </div><!-- /emscripten bits -->
+    <fieldset id='ui-controls' class='hidden'>
+      <legend>Options</legend>
+      <div id='toolbar'>
+        <div id='toolbar-select'>
+          <select id='select-flags' size='10' multiple></select>
+          <div>TODO? Options which require values are not represented here.</div>
+        </div>
+        <div class='toolbar-inner-vertical' id='toolbar-selected-flags'>
+          <button id='btn-reset-flags'>Reset Flags</button>
+          <button id='btn-output-clear'>Clear output</button>
+          <button id='btn-run'>Run</button>
+        </div>
+        <div class='toolbar-inner-vertical' id='toolbar-runner-controls'>
+          <button id='btn-reset-flags'>Reset Flags</button>
+          <button id='btn-output-clear'>Clear output</button>
+          <button id='btn-run'>Run</button>
+        </div>
+      </div>
+    </fieldset>
+    <div>
+      <span class='input-wrapper'>
+        <input type='checkbox' class='disable-during-eval' id='cb-reverse-log-order' checked></input>
+        <label for='cb-reverse-log-order' id='lbl-reverse-log-order'>Reverse log order</label>
+      </span>
+    </div>
+    <div id='test-output'></div>
+    <style>
+      #test-output {
+          white-space: break-spaces;
+          overflow: auto;
+      }
+      #toolbar {
+          display: flex;
+          flex-direction: row;
+          flex-wrap: wrap;
+      }
+      #toolbar > * {
+          margin: 0 0.5em;
+      }
+      .toolbar-inner-vertical {
+          display: flex;
+          flex-direction: column;
+          justify-content: space-between;
+      }
+      #toolbar-select {
+          display: flex;
+          flex-direction: column;
+      }
+      .toolbar-inner-vertical > *, #toolbar-select > * {
+          margin: 0.2em 0;
+      }
+      #select-flags > option {
+          white-space: pre;
+          font-family: monospace;
+      }
+      fieldset {
+          border-radius: 0.5em;
+      }
+      #toolbar-runner-controls { flex-grow: 1 }
+      #toolbar-runner-controls > * { flex: 1 0 auto }
+      #toolbar-selected-flags::before {
+        font-family: initial;
+        content:"Selected flags: ";
+      }
+      #toolbar-selected-flags {
+        font-family: monospace;
+        justify-content: flex-start;
+      }
+    </style>
+    <script>(function(){
+      'use strict';
+      const E = (sel)=>document.querySelector(sel);
+      const eOut = E('#test-output');
+      const log2 = function(cssClass,...args){
+        let ln;
+        if(1 || cssClass){
+          ln = document.createElement('div');
+          if(cssClass) ln.classList.add(cssClass);
+          ln.append(document.createTextNode(args.join(' ')));
+        }else{
+          // This doesn't work with the "reverse order" option!
+          ln = document.createTextNode(args.join(' ')+'\n');
+        }
+        eOut.append(ln);
+      };
+      const log = (...args)=>{
+        //console.log(...args);
+        log2('', ...args);
+      };
+      const logErr = function(...args){
+        //console.error(...args);
+        log2('error', ...args);
+      };
+      const logWarn = function(...args){
+        //console.warn(...args);
+        log2('warning', ...args);
+      };
+
+      const spacePad = function(str,len=18){
+        if(str.length===len) return str;
+        else if(str.length>len) return str.substr(0,len);
+        const a = []; a.length = len - str.length;
+        return str+a.join(' ');
+      };
+      // OPTION elements seem to ignore white-space:pre, so do this the hard way...
+      const nbspPad = function(str,len=18){
+        if(str.length===len) return str;
+        else if(str.length>len) return str.substr(0,len);
+        const a = []; a.length = len - str.length;
+        return str+a.join('&nbsp;');
+      };
+
+      const W = new Worker("speedtest1-worker.js");
+      const mPost = function(msgType,payload){
+        W.postMessage({type: msgType, data: payload});
+      };
+
+      const eFlags = E('#select-flags');
+      const eSelectedFlags = E('#toolbar-selected-flags');
+      
+      const getSelectedFlags = ()=>Array.prototype.map.call(eFlags.selectedOptions, (v)=>v.value);
+      const updateSelectedFlags = function(){
+        eSelectedFlags.innerText = '';
+        getSelectedFlags().forEach(function(f){
+          const e = document.createElement('span');
+          e.innerText = f;
+          eSelectedFlags.appendChild(e);
+        });
+      };
+      eFlags.addEventListener('change', updateSelectedFlags );
+      {
+        const flags = Object.create(null);
+        /* TODO? Flags which require values need custom UI
+           controls and some of them make little sense here
+           (e.g. --script FILE). */
+        flags["autovacuum"] = "Enable AUTOVACUUM mode";
+        //flags["cachesize"] = "N       Set the cache size to N";
+        flags["checkpoint"] = "Run PRAGMA wal_checkpoint after each test case";
+        flags["exclusive"] = "Enable locking_mode=EXCLUSIVE";
+        flags["explain"] = "Like --sqlonly but with added EXPLAIN keywords";
+        //flags["heap"] = "SZ MIN       Memory allocator uses SZ bytes & min allocation MIN";
+        flags["incrvacuum"] = "Enable incremenatal vacuum mode";
+        //flags["journal"] = "M         Set the journal_mode to M";
+        //flags["key"] = "KEY           Set the encryption key to KEY";
+        //flags["lookaside"] = "N SZ    Configure lookaside for N slots of SZ bytes each";
+        flags["memdb"] = "Use an in-memory database";
+        //flags["mmap"] = "SZ           MMAP the first SZ bytes of the database file";
+        flags["multithread"] = "Set multithreaded mode";
+        flags["nomemstat"] = "Disable memory statistics";
+        flags["nosync"] = "Set PRAGMA synchronous=OFF";
+        flags["notnull"] = "Add NOT NULL constraints to table columns";
+        //flags["output"] = "FILE       Store SQL output in FILE";
+        //flags["pagesize"] = "N        Set the page size to N";
+        //flags["pcache"] = "N SZ       Configure N pages of pagecache each of size SZ bytes";
+        //flags["primarykey"] = "Use PRIMARY KEY instead of UNIQUE where appropriate";
+        //flags["repeat"] = "N          Repeat each SELECT N times (default: 1)";
+        flags["reprepare"] = "Reprepare each statement upon every invocation";
+        //flags["reserve"] = "N         Reserve N bytes on each database page";
+        //flags["script"] = "FILE       Write an SQL script for the test into FILE";
+        flags["serialized"] = "Set serialized threading mode";
+        flags["singlethread"] = "Set single-threaded mode - disables all mutexing";
+        flags["sqlonly"] = "No-op.  Only show the SQL that would have been run.";
+        flags["shrink"] = "memory     Invoke sqlite3_db_release_memory() frequently.";
+        //flags["size"] = "N            Relative test size.  Default=100";
+        flags["strict"] = "Use STRICT table where appropriate";
+        flags["stats"] = "Show statistics at the end";
+        //flags["temp"] = "N            N from 0 to 9.  0: no temp table. 9: all temp tables";
+        //flags["testset"] = "T         Run test-set T (main, cte, rtree, orm, fp, debug)";
+        flags["trace"] = "Turn on SQL tracing";
+        //flags["threads"] = "N         Use up to N threads for sorting";
+        /*
+          The core API's WASM build does not support UTF16, but in
+          this app it's not an issue because the data are not crossing
+          JS/WASM boundaries.
+        */
+        flags["utf16be"] = "Set text encoding to UTF-16BE";
+        flags["utf16le"] = "Set text encoding to UTF-16LE";
+        flags["verify"] = "Run additional verification steps.";
+        flags["without"] = "rowid     Use WITHOUT ROWID where appropriate";
+        const preselectedFlags = [
+          'singlethread',
+          'memdb'
+        ];
+        Object.keys(flags).sort().forEach(function(f){
+          const opt = document.createElement('option');
+          eFlags.appendChild(opt);
+          const lbl = nbspPad('--'+f)+flags[f];
+          //opt.innerText = lbl;
+          opt.innerHTML = lbl;
+          opt.value = '--'+f;
+          if(preselectedFlags.indexOf(f) >= 0) opt.selected = true;
+        });
+        
+        const cbReverseLog = E('#cb-reverse-log-order');
+        const lblReverseLog = E('#lbl-reverse-log-order');
+        if(cbReverseLog.checked){
+          lblReverseLog.classList.add('warning');
+          eOut.classList.add('reverse');
+        }
+        cbReverseLog.addEventListener('change', function(){
+          if(this.checked){
+            eOut.classList.add('reverse');
+            lblReverseLog.classList.add('warning');
+          }else{
+            eOut.classList.remove('reverse');
+            lblReverseLog.classList.remove('warning');
+          }
+        }, false);
+        updateSelectedFlags();
+      }
+      E('#btn-output-clear').addEventListener('click', ()=>{
+        eOut.innerText = '';
+      });
+      E('#btn-reset-flags').addEventListener('click',()=>{
+        eFlags.value = '';
+        updateSelectedFlags();
+      });
+      E('#btn-run').addEventListener('click',function(){
+        log("Running speedtest1. UI controls will be disabled until it completes.");
+        mPost('run', getSelectedFlags());
+      });
+
+      const eControls = E('#ui-controls');
+      /** Update Emscripten-related UI elements while loading the module. */
+      const updateLoadStatus = function f(text){
+        if(!f.last){
+          f.last = { text: '', step: 0 };
+          const E = (cssSelector)=>document.querySelector(cssSelector);
+          f.ui = {
+            status: E('#module-status'),
+            progress: E('#module-progress'),
+            spinner: E('#module-spinner')
+          };
+        }
+        if(text === f.last.text) return;
+        f.last.text = text;
+        if(f.ui.progress){
+          f.ui.progress.value = f.last.step;
+          f.ui.progress.max = f.last.step + 1;
+        }
+        ++f.last.step;
+        if(text) {
+          f.ui.status.classList.remove('hidden');
+          f.ui.status.innerText = text;
+        }else{
+          if(f.ui.progress){
+            f.ui.progress.remove();
+            f.ui.spinner.remove();
+            delete f.ui.progress;
+            delete f.ui.spinner;
+          }
+          f.ui.status.classList.add('hidden');
+        }
+      };
+
+      log("Control-click the flags to (de)select multiple flags.");
+      logWarn("\nThe easiest way to try different optimization levels is, from this directory:\n"+
+              "  $ make clean; make -e emcc_opt='-O2' speedtest1\n"+
+              "Then reload this page. -O2 seems to consistently produce the fastest results.\n");
+      logWarn('\nAchtung: the Worker thread overhead slightly reduces the speed',
+              'compared to running the same options via speedtest1.html.\n'+
+              'TODO: add a link in this app which launches the main-thread',
+              'version with the same flags.\n');
+
+      W.onmessage = function(msg){
+        msg = msg.data;
+        switch(msg.type){
+            case 'ready': log("Worker is ready."); eControls.classList.remove('hidden'); break;
+            case 'stdout': log(msg.data); break;
+            case 'stdout': logErr(msg.data); break;
+            case 'run-start':
+              eControls.disabled = true;
+              log("Running speedtest1 with argv =",msg.data.join(' '));
+              break;
+            case 'run-end': log("speedtest1 finished.");
+              eControls.disabled = false;
+              // app output is in msg.data
+              break;
+            case 'error': logErr(msg.data); break;
+            case 'load-status': updateLoadStatus(msg.data); break;
+            default:
+              logErr("Unhandled worker message type:",arguments[0]);
+              break;
+        }
+      };
+    })();</script>
+  </body>
+</html>
diff --git a/ext/wasm/speedtest1-worker.js b/ext/wasm/speedtest1-worker.js
new file mode 100644
index 0000000000..8512bdbbf7
--- /dev/null
+++ b/ext/wasm/speedtest1-worker.js
@@ -0,0 +1,99 @@
+'use strict';
+(function(){
+  importScripts('common/whwasmutil.js','speedtest1.js');
+  /**
+     If this environment contains OPFS, this function initializes it and
+     returns the name of the dir on which OPFS is mounted, else it returns
+     an empty string.
+  */
+  const opfsDir = function f(wasmUtil){
+    if(undefined !== f._) return f._;
+    const pdir = '/persistent';
+    if( !self.FileSystemHandle
+        || !self.FileSystemDirectoryHandle
+        || !self.FileSystemFileHandle){
+      return f._ = "";
+    }
+    try{
+      if(0===wasmUtil.xCallWrapped(
+        'sqlite3_wasm_init_opfs', 'i32', ['string'], pdir
+      )){
+        return f._ = pdir;
+      }else{
+        return f._ = "";
+      }
+    }catch(e){
+      // sqlite3_wasm_init_opfs() is not available
+      return f._ = "";
+    }
+  };
+  opfsDir._ = undefined;
+
+  const mPost = function(msgType,payload){
+    postMessage({type: msgType, data: payload});
+  };
+
+  const App = Object.create(null);
+  App.logBuffer = [];
+  const logMsg = (type,msgArgs)=>{
+    const msg = msgArgs.join(' ');
+    App.logBuffer.push(msg);
+    mPost(type,msg);
+  };
+  const log = (...args)=>logMsg('stdout',args);
+  const logErr = (...args)=>logMsg('stderr',args);
+  
+  const runSpeedtest = function(cliFlagsArray){
+    const scope = App.wasm.scopedAllocPush();
+    const dbFile = 0 ? "" : App.pDir+"/speedtest1.db";
+    try{
+      const argv = [
+        "speedtest1.wasm", ...cliFlagsArray, dbFile
+      ];
+      App.logBuffer.length = 0;
+      mPost('run-start', [...argv]);
+      App.wasm.xCall('__main_argc_argv', argv.length,
+                     App.wasm.scopedAllocMainArgv(argv));
+    }catch(e){
+      mPost('error',e.message);
+    }finally{
+      App.wasm.scopedAllocPop(scope);
+      App.unlink(dbFile);
+      mPost('run-end', App.logBuffer.join('\n'));
+      App.logBuffer.length = 0;
+    }
+  };
+
+  self.onmessage = function(msg){
+    msg = msg.data;
+    switch(msg.type){
+        case 'run': runSpeedtest(msg.data || []); break;
+        default:
+          logErr("Unhandled worker message type:",msg.type);
+          break;
+    }
+  };
+
+  const EmscriptenModule = {
+    print: log,
+    printErr: logErr,
+    setStatus: (text)=>mPost('load-status',text)
+  };
+  self.sqlite3Speedtest1InitModule(EmscriptenModule).then(function(EmscriptenModule){
+    log("Module inited.");
+    App.wasm = {
+      exports: EmscriptenModule.asm,
+      alloc: (n)=>EmscriptenModule._malloc(n),
+      dealloc: (m)=>EmscriptenModule._free(m),
+      memory: EmscriptenModule.asm.memory || EmscriptenModule.wasmMemory
+    };
+    //console.debug('wasm =',wasm);
+    self.WhWasmUtilInstaller(App.wasm);
+    App.unlink = App.wasm.xWrap("sqlite3_wasm_vfs_unlink", "int", ["string"]);
+    App.pDir = opfsDir(App.wasm);
+    if(App.pDir){
+      log("Persistent storage:",pDir);
+    }
+    mPost('ready',true);
+  });
+})();
diff --git a/ext/wasm/speedtest1.html b/ext/wasm/speedtest1.html
index 5e05feed26..fad2b28129 100644
--- a/ext/wasm/speedtest1.html
+++ b/ext/wasm/speedtest1.html
@@ -10,6 +10,7 @@
   </head>
   <body>
     <header id='titlebar'><span>speedtest1.wasm</span></header>
+    <div>See also: <a href='speedtest1-worker.html'>A Worker-thread variant of this page.</a></div>
     <!-- emscripten bits -->
     <figure id="module-spinner">
       <div class="spinner"></div>
@@ -24,6 +25,9 @@
     <div class="emscripten">
       <progress value="0" max="100" id="module-progress" hidden='1'></progress>  
     </div><!-- /emscripten bits -->
+    <div class='warning'>This page starts running the main exe when it loads, which will
+      block the UI until it finishes! Adding UI controls to manually configure and start it
+      are TODO.</div>
     <div>Output is sent to the dev console because we cannot update the UI while the
       speedtest is running unless/until we move the speedtest to a worker thread.</div>
     <hr>
diff --git a/manifest b/manifest
index aef6da12d0..75eb7e14a6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\snote\sabout\sEmscripten's\s-sSINGLE_FILE\sflag,\swhy\sit\swould\sbe\snice,\sand\swhy\swe\scan't\suse\sit.
-D 2022-09-06T23:04:51.823
+C Add\sspeedtest1-worker.html,\san\sinteractive\sWorker-thread\svariant\sof\sspeedtest1.html.\sAdd\sext/wasm/index.html\sto\sact\sas\sa\sgateway\sto\sthe\svarious\stest\spages.
+D 2022-09-08T15:30:59.731
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -489,11 +489,11 @@ F ext/wasm/api/sqlite3-api-prologue.js 2d5c5d3355f55eefe51922cec5bfedbec0f8300db
 F ext/wasm/api/sqlite3-api-worker1.js 73579555563b789785ae83724014eaf31811073aad9be6596c8336ffb51edd71
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 19c3797edc35821e362a8b60ce45d1adfe6d24fca7cd1f55f89d2086ef33870e
-F ext/wasm/batch-runner.html 2d44d99a556c46f586d3319003dd281dd0eb6a13eeadde3eab05ba81eec9ff8a
+F ext/wasm/batch-runner.html 23209ade7981acce7ecd79d6eff9f4c5a4e8b14ae867ac27cd89b230be640fa6
 F ext/wasm/batch-runner.js a727cbbffe63fd17fb5a590dc679f0b13bd51880e8f84b461d7df246417689e8
 F ext/wasm/common/SqliteTestUtil.js 7a543e238c2ebda922c85076abda017d0480944fdfee576692a0c3a580319ebd
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
-F ext/wasm/common/testing.css 572cf1ffae0b6eb7ca63684d3392bf350217a07b90e7a896e4fa850700c989b0
+F ext/wasm/common/testing.css 3a5143699c2b73a85b962271e1a9b3241b30d90e30d895e4f55665e648572962
 F ext/wasm/common/whwasmutil.js f7282ef36c9625330d4e6e82d1beec6678cd101e95e7108cd85db587a788c145
 F ext/wasm/demo-oo1.html 75646855b38405d82781246fd08c852a2b3bee05dd9f0fe10ab655a8cffb79aa
 F ext/wasm/demo-oo1.js aad38cb90b6fa7fd4d1184e759b25056fb4ed45c4957c458896354281259515f
@@ -501,6 +501,7 @@ F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d695
 F ext/wasm/fiddle/fiddle-worker.js bccf46045be8824752876f3eec01c223be0616ccac184bffd0024cfe7a3262b8
 F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
 F ext/wasm/fiddle/fiddle.js 4ffcfc9a235beebaddec689a549e9e0dfad6dca5c1f0b41f03468d7e76480686
+F ext/wasm/index.html 4f635f986dbc7518280abe0ef537ba41682e35f160fac35a0745cf6c4d223b62
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 447cc02b598f7792edaa8ae6853a7847b8178a18ed356afacbdbf312b2588106
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
@@ -510,7 +511,9 @@ F ext/wasm/scratchpad-opfs-main.js 69e960e9161f6412fd0c30f355d4112f1894d6609eb43
 F ext/wasm/scratchpad-opfs-worker.html 66c1d15d678f3bd306373d76b61c6c8aef988f61f4a8dd40185d452f9c6d2bf5
 F ext/wasm/scratchpad-opfs-worker.js 3ec2868c669713145c76eb5877c64a1b20741f741817b87c907a154b676283a9
 F ext/wasm/scratchpad-opfs-worker2.js 5f2237427ac537b8580b1c659ff14ad2621d1694043eaaf41ae18dbfef2e48c0
-F ext/wasm/speedtest1.html a1204f5cbbd592baa191535dc7eaa2d875f661aefb2a70a4631df0a925e19f4b
+F ext/wasm/speedtest1-worker.html 4f8d7391ec17b6fd13f1a1e181436d3331842548fe7cc84e4e322f72850eb97b
+F ext/wasm/speedtest1-worker.js 356b9953add4449acf199793db9b76b11ee016021918d8daffd19f08ec68d305
+F ext/wasm/speedtest1.html 02d281c25a8048cce24695bed01ca613d11f40b599cd47f3a18dca8c982d0a15
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
@@ -1496,7 +1499,7 @@ F test/speed3.test 694affeb9100526007436334cf7d08f3d74b85ef
 F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
 F test/speed4p.test 377a0c48e5a92e0b11c1c5ebb1bc9d83a7312c922bc0cb05970ef5d6a96d1f0c
-F test/speedtest1.c 995c78f884e2388106b2b42de9e5a527e7cac01384b8f317ca0cc7b0814c9a18
+F test/speedtest1.c 55ef13e008cbb7dbea032478e60686599679b0b6192e44845c100fdabd14f8ff
 F test/spellfix.test 951a6405d49d1a23d6b78027d3877b4a33eeb8221dcab5704b499755bb4f552e
 F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3
 F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33
@@ -2016,8 +2019,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 40e60f570d4f489d58d12e27c1c067b41d6c5a5e374c5fce0baa8881ef183216
-R 0096ecafc15630b25658c12eafbbea1b
+P 5ea0623630d769a8f3f07a40cd119be86b631192cdb5178131876b01b40ee5e0
+R b5dc0101db445e11af3bccae9adaef48
 U stephan
-Z 7b5e51ab80c88507303a95f3b8f5d0e1
+Z 2c78924308cfac29c905a5ead30d4718
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 08a78c3d74..9c75a6fdf6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5ea0623630d769a8f3f07a40cd119be86b631192cdb5178131876b01b40ee5e0
\ No newline at end of file
+f16c68ee6d5ebb8dec2ab656dbab2ddb5f1d5133153ad553f986b31020adaa38
\ No newline at end of file
diff --git a/test/speedtest1.c b/test/speedtest1.c
index 401217f105..3b8bd92e3b 100644
--- a/test/speedtest1.c
+++ b/test/speedtest1.c
@@ -2204,6 +2204,12 @@ int main(int argc, char **argv){
   int i;                        /* Loop counter */
   int rc;                       /* API return code */
 
+#ifdef SQLITE_SPEEDTEST1_WASM
+  /* Resetting all state is important for the WASM build, which may
+  ** call main() multiple times. */
+  memset(&g, 0, sizeof(g));
+  iTestNumber = 0;
+#endif
 #ifdef SQLITE_CKSUMVFS_STATIC
   sqlite3_register_cksumvfs(0);
 #endif

From cb94132d9f7997bc1b0fbce97740c1576cac40a6 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Thu, 8 Sep 2022 15:48:01 +0000
Subject: [PATCH 061/428] Code snapshot.  Completely untested.  Probably does
 not compile.

FossilOrigin-Name: 51e267696d25f2f83b5bb847d5254ab15573ef1a16ea3d7dd8279c73c0bee539
---
 ext/misc/vfskv.c | 241 +++++++++++++++++++++++++++++++++++++++++------
 manifest         |  15 ++-
 manifest.uuid    |   2 +-
 3 files changed, 217 insertions(+), 41 deletions(-)

diff --git a/ext/misc/vfskv.c b/ext/misc/vfskv.c
index 4d8d797a4f..0773f70945 100644
--- a/ext/misc/vfskv.c
+++ b/ext/misc/vfskv.c
@@ -47,19 +47,26 @@ static int kvstorageRead(KVStorage*, const char *zKey, char *zBuf, int nBuf);
 typedef struct KVVfsVfs KVVfsVfs;
 typedef struct KVVfsFile KVVfsFile;
 
+
+/* All information about the database */
 struct KVVfsVfs {
   sqlite3_vfs base;               /* VFS methods */
   KVStorage *pStore;              /* Single command KV storage object */
   KVVfsFile *pFiles;              /* List of open KVVfsFile objects */
 };
 
+/* A single open file.  There are only two files represented by this
+** VFS - the database and the rollback journal.
+*/
 struct KVVfsFile {
   sqlite3_file base;              /* IO methods */
   KVVfsVfs *pVfs;                 /* The VFS to which this file belongs */
   KVVfsFile *pNext;               /* Next in list of all files */
   int isJournal;                  /* True if this is a journal file */
-  int nJrnl;                      /* Space allocated for aJrnl[] */
+  unsigned int nJrnl;             /* Space allocated for aJrnl[] */
   char *aJrnl;                    /* Journal content */
+  int szPage;                     /* Last known page size */
+  sqlite3_int64 szDb;             /* Database file size.  -1 means unknown */
 };
 
 /*
@@ -291,7 +298,8 @@ static int kvvfsEncode(const char *aData, int nData, char *aOut){
     }else{
       /* A sequence of 1 or more zeros is stored as a little-endian
       ** base-26 number using a..z as the digits. So one zero is "b".
-      ** Two zeros is "c". 25 zeros is "z", 26 zeros is "ba" and so forth.
+      ** Two zeros is "c". 25 zeros is "z", 26 zeros is "ab", 27 is "bb",
+      ** and so forth.
       */
       int k;
       for(k=1; a[i+k]==0 && i+k<nData; k++){}
@@ -316,6 +324,8 @@ static char kvvfsHexToBinary(char c){
 /*
 ** Decode the text encoding back to binary.  The binary content is
 ** written into pOut, which must be at least nOut bytes in length.
+**
+** The return value is the number of bytes actually written into aOut[].
 */
 static int kvvfsDecode(const char *aIn, char *aOut, int nOut){
   char *aOut;
@@ -326,8 +336,10 @@ static int kvvfsDecode(const char *aIn, char *aOut, int nOut){
   while( (c = aIn[i])!=0 ){
     if( c>='a' ){
       int n = 0;
+      int mult = 1;
       while( c>='a' && c<='z' ){
-        n = n*26 + c - 'a';
+        n += (c - 'a')*mult;
+        mult *= 26;
         c = aIn[++i];
       }
       if( j+n>nOut ) return -1;
@@ -345,6 +357,44 @@ static int kvvfsDecode(const char *aIn, char *aOut, int nOut){
   return j;
 }
 
+/*
+** Decode a complete journal file.  Allocate space in pFile->aJrnl
+** and store the decoding there.  Or leave pFile->aJrnl set to NULL
+** if an error is encountered.
+**
+** The first few characters of the text encoding will be a
+** base-26 number (digits a..z) that is the total number of bytes
+** in the decoding.  Use this number to size the initial allocation.
+*/
+static void kvvfsDecodeJournal(
+  KVVfsFile *pFile,      /* Store decoding in pFile->aJrnl */
+  const char *zTxt,      /* Text encoding.  Zero-terminated */
+  int nTxt               /* Bytes in zTxt, excluding zero terminator */
+){
+  unsigned int n;
+  int c, i, mult;
+  i = 0;
+  mult = 1;
+  while( (c = zTxt[i])>='a' && c<='z' ){
+    n += (zTxt[i] - 'a')*mult;
+    mult *= 26;
+    i++;
+  }
+  sqlite3_free(pFile->aJrnl);
+  pFile->aJrnl = sqlite3_malloc64( n );
+  if( pFile->aJrnl==0 ){
+    pFile->nJrnl = 0;
+    return;
+  }
+  pFile->nJrnl = n;
+  n = kvvfsDecode(zTxt+i, pFile->aJrnl, pFile->nJrnl);
+  if( n<pFile->nJrnl ){
+    sqlite3_free(pFile->aJrnl);
+    pFile->aJrnl = 0;
+    pFile->nJrnl = 0;
+  }
+}
+
 /*
 ** Read from the -journal file.
 */
@@ -384,7 +434,36 @@ static int kvvfsReadFromDb(
   int iAmt, 
   sqlite_int64 iOfst
 ){
-  return SQLITE_IOERR;
+  unsigned int pgno;
+  KVVfsPage *pPage;
+  int got;
+  char zKey[30];
+  char aData[131073];
+  assert( pFile->szDb>=0 );
+  assert( iOfst>=0 );
+  assert( iAmt>=0 );
+  if( (iOfst % iAmt)!=0 ){
+    return SQLITE_IOERR_READ;
+  }
+  if( iAmt!=100 || iOfst!=0 ){
+    if( (iAmt & (iAmt-1))!=0 || iAmt<512 || iAmt>65536 ){
+      return SQLITE_IOERR_READ;
+    }
+    pFile->szPage = iAmt;
+  }
+  pgno = 1 + iOfst/iAmt;
+  sqlite3_snprintf(sizeof(zKey), zKey, "pg-%u", pgno)
+  got = kvstorageRead(pFile->pVfs->pStore, zKey, aData, sizeof(aData)-1);
+  if( got<0 ){
+    return SQLITE_IOERR_READ;
+  }
+  aData[got] = 0;
+  n = kvvfsDecode(aData, zBuf, iAmt);
+  if( n<iAmt ){
+    memset(zBuf+n, 0, iAmt-n);
+    return SQLITE_IOERR_SHORT_READ;
+  }
+  return SQLITE_OK;
 }
 
 
@@ -407,6 +486,21 @@ static int kvvfsRead(
   return rc;
 }
 
+/*
+** Read or write the "sz" element, containing the database file size.
+*/
+static sqlite3_int64 kvvfsReadFileSize(KVVfsFile *pFile){
+  char zData[50];
+  zData[0] = 0;
+  kvstorageRead(pFile->pVfs->pStore, "sz", zData, sizeof(zData)-1);
+  return strtoll(zData, 0, 0);
+}
+static void kvvfsWriteFileSize(KVVfsFile *pFile, sqlite3_int64 sz){
+  char zData[50];
+  sqlite3_snprintf(sizeof(zData), zData, "%lld", sz);
+  kvstorageWrite(pFile->pVfs->pStore, "sz", zData);
+}
+
 /*
 ** Write into the -journal file.
 */
@@ -416,11 +510,25 @@ static int kvvfsWriteToJournal(
   int iAmt, 
   sqlite_int64 iOfst
 ){
-  return SQLITE_IOERR;
+  sqlite3_int64 iEnd = iOfst+iAmt;
+  if( iEnd>=0x10000000 ) return SQLITE_FULL;
+  if( pFile->aJrnl==0 || pFile->nJrnl<iEnd ){
+    char *aNew = sqlite3_realloc(pFile->aJrnl, iEnd);
+    if( aNew==0 ){
+      return SQLITE_IOERR_NOMEM;
+    }
+    pFile->aJrnl = aNew;
+    if( pFile->nJrnl<iOfst ){
+      memset(pFile->aJrnl+pFile->nJrnl, 0, iOfst-pFile->nJrnl);
+    }
+    pFile->nJrnl = iEnd;
+  }
+  memcpy(pFile->aJrnl+iOfst, zBuf, iAmt);
+  return SQLITE_OK;
 }
 
 /*
-** Read from the database file.
+** Write into the database file.
 */
 static int kvvfsWriteToDb(
   KVVfsFile *pFile, 
@@ -428,7 +536,19 @@ static int kvvfsWriteToDb(
   int iAmt, 
   sqlite_int64 iOfst
 ){
-  return SQLITE_IOERR;
+  unsigned int pgno;
+  char zKey[30];
+  char aData[131073];
+  assert( iAmt>=512 && iAmt<=65536 );
+  assert( (iAmt & (iAmt-1))==0 );
+  pgno = 1 + iOfst/iAmt;
+  sqlite3_snprintf(sizeof(zKey), zKey, "pg-%u", pgno)
+  nData = kvvfsEncode(zBuf, iAmt, aData);
+  kvstorageWrite(pFile->pVfs->pStore, zKey, aData);
+  if( iOfst+iAmt > pFile->szDb ){
+    pFile->szDb = iOfst + iAmt;
+  }
+  return SQLITE_OK;
 }
 
 
@@ -454,20 +574,65 @@ static int kvvfsWrite(
 /*
 ** Truncate an kvvfs-file.
 */
-static int kvvfsTruncate(sqlite3_file *pFile, sqlite_int64 size){
-  int rc;
+static int kvvfsTruncate(sqlite3_file *pProtoFile, sqlite_int64 size){
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
-  rc = SQLITE_IOERR;
-  return rc;
+  if( pFile->isJournal ){
+    assert( size==0 );
+    kvstorageDelete(pFile->pVfs->pStore, "journal");
+    sqlite3_free(pFile->aData);
+    pFile->aData = 0;
+    pFile->nData = 0;
+    return SQLITE_OK;
+  }
+  if( pFile->szDb>size
+   && pFile->szPage>0 
+   && (size % pFile->szPage)==0
+  ){
+    char zKey[50];
+    unsigned int pgno, pgnoMax;
+    pgno = 1 + size/pFile->szPage;
+    pgnoMax = 2 + pFile->szDb/pFile->szPage;
+    while( pgno<=pgnoMax ){
+      sqlite3_snprintf(sizeof(zKey), zKey, "pg-%u", pgno);
+      kvstorageDelete(pFile->pVfs->pStore, zKey);
+      pgno++;
+    }
+    pFile->szDb = size;
+    kvvfsWriteFileSize(pFile->pVfs->pStore, size);
+    return SQLITE_OK;
+  }
+  return SQLITE_IOERR;
 }
 
 /*
 ** Sync an kvvfs-file.
 */
-static int kvvfsSync(sqlite3_file *pFile, int flags){
-  int rc;
+static int kvvfsSync(sqlite3_file *pProtoFile, int flags){
+  int i, k, n;
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
-  rc = SQLITE_IOERR;
+  char *zOut;
+  if( !pFile->isJournal ){
+    if( pFile->szDb>0 ){
+      kvvfsWriteFileSize(pFile, pFile->szDb);
+    }
+    return SQLITE_OK;
+  }
+  if( pFile->nJrnl<=0 ){
+     return kvvfsTruncate(pProtoFile, 0);
+  }
+  zOut = sqlite3_malloc64( pFile->nJrnl*2 + 50 );
+  if( zOut==0 ){
+    return SQLITE_IOERR_NOMEM;
+  }
+  n = pFile->nJrnl;
+  i = 0;
+  do{
+    zOut[i++] = 'a' + (n%26);
+    n /= 26;
+  }while( n>0 );
+  kvvfsEncode(pFile->aJrnl, pFile->nJrnl, &zOut[i]);
+  kvstorageWrite(pFile->pVfs->pStore, "journal", zOut);
+  sqlite3_free(zOut);
   return rc;
 }
 
@@ -475,31 +640,37 @@ static int kvvfsSync(sqlite3_file *pFile, int flags){
 ** Return the current file-size of an kvvfs-file.
 */
 static int kvvfsFileSize(sqlite3_file *pFile, sqlite_int64 *pSize){
-  int rc;
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
-  *pSize = 0;
-  rc = SQLITE_IOERR;
-  return rc;
+  if( pFile->isJournal ){
+    *pSize = pFile->nJrnl;
+  }else{
+    *pSize = pFile->szDb;
+  }
+  return SQLITE_OK;
 }
 
 /*
 ** Lock an kvvfs-file.
 */
 static int kvvfsLock(sqlite3_file *pFile, int eLock){
-  int rc;
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
-  rc = SQLITE_IOERR;
-  return rc;
+  assert( !pFile->isJournal );
+  if( eLock!=SQLITE_LOCK_NONE ){
+    pFile->szDb = kvvfsReadFileSize(pFile);
+  }
+  return SQLITE_OK;
 }
 
 /*
 ** Unlock an kvvfs-file.
 */
 static int kvvfsUnlock(sqlite3_file *pFile, int eLock){
-  int rc;
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
-  rc = SQLITE_IOERR;
-  return rc;
+  assert( !pFile->isJournal );
+  if( eLock==SQLITE_LOCK_NONE ){
+    pFile->szDb = -1;
+  }
+  return SQLITE_OK;
 }
 
 /*
@@ -509,7 +680,7 @@ static int kvvfsCheckReservedLock(sqlite3_file *pFile, int *pResOut){
   int rc;
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
   *pResOut = 0;
-  rc = SQLITE_IOERR;
+  rc = SQLITE_OK;
   return rc;
 }
 
@@ -527,7 +698,7 @@ static int kvvfsFileControl(sqlite3_file *pFile, int op, void *pArg){
 ** Return the sector-size in bytes for an kvvfs-file.
 */
 static int kvvfsSectorSize(sqlite3_file *pFile){
-  return 4096;
+  return 512;
 }
 
 /*
@@ -548,12 +719,15 @@ static int kvvfsOpen(
   int flags,
   int *pOutFlags
 ){
-  int rc;
   KVVfsFile *pFile = (KVVfsFile*)pProtoFile;
   KVVfsVfs *pVfs = (KVVfsVfs*)pProtoVfs;
-
+  pFile->aJrnl = 0;
+  pFile->nJrnl = 0;
+  pFile->isJournal = sqlite3_strglob("*-journal", zName)==0;
+  pFile->szPage = -1;
+  pFile->szDb = -1;
   
-  return rc;
+  return SQLITE_OK;
 }
 
 /*
@@ -574,12 +748,17 @@ static int kvvfsDelete(sqlite3_vfs *pVfs, const char *zPath, int dirSync){
 ** is available, or false otherwise.
 */
 static int kvvfsAccess(
-  sqlite3_vfs *pVfs, 
+  sqlite3_vfs *pProtoVfs, 
   const char *zPath, 
   int flags, 
   int *pResOut
 ){
-  *pResOut = 1;
+  KVVfsVfs *pVfs = (KVVfsVfs*)pProtoVfs;
+  if( sqlite3_strglob("*-journal", zPath)==0 ){
+    *pResOut = kvstorageRead(pVfs->pStore, "journal", 0, 0)>0;
+  }else{
+    *pResOut = 1;
+  }
   return SQLITE_OK;
 }
 
diff --git a/manifest b/manifest
index dfddb1fb37..f872ac3349 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Non-working\scode\stowards\sa\sVFS\sfor\stext\skey/value\sstorage.
-D 2022-09-07T17:29:22.881
+C Code\ssnapshot.\s\sCompletely\suntested.\s\sProbably\sdoes\snot\scompile.
+D 2022-09-08T15:48:01.413
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -335,7 +335,7 @@ F ext/misc/uint.c 053fed3bce2e89583afcd4bf804d75d659879bbcedac74d0fa9ed548839a03
 F ext/misc/unionvtab.c 36237f0607ca954ac13a4a0e2d2ac40c33bc6e032a5f55f431713061ef1625f9
 F ext/misc/urifuncs.c f71360d14fa9e7626b563f1f781c6148109462741c5235ac63ae0f8917b9c751
 F ext/misc/uuid.c 5bb2264c1b64d163efa46509544fd7500cb8769cb7c16dd52052da8d961505cf
-F ext/misc/vfskv.c aebaf8b59b70a066c2c0ba9344db0494ff50452ff6b4e79c9133e7a2ea112a99
+F ext/misc/vfskv.c cb82423dcc37af07953d71f15518e8a75d81b2dbab45dc237e181c5b03373703
 F ext/misc/vfslog.c 3932ab932eeb2601dbc4447cb14d445aaa9fbe43b863ef5f014401c3420afd20
 F ext/misc/vfsstat.c 474d08efc697b8eba300082cb1eb74a5f0f3df31ed257db1cb07e72ab0e53dfb
 F ext/misc/vtablog.c 5538acd0c8ddaae372331bee11608d76973436b77d6a91e8635cfc9432fba5ae
@@ -2001,11 +2001,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 6b00ecb59fd303f7985902c35a46db9e729201d4beaedea46596b728d9e4b1c8
-R 26f26a2d9ce78c288f974e48234fd3a7
-T *branch * kv-vfs
-T *sym-kv-vfs *
-T -sym-trunk *
+P f9c89ee8d5ef46342bea78fa8d4da058d9ea628183ec985642bbda1cdfeacd5f
+R fed5a09fb1667ca82dde0796f5fd6c9d
 U drh
-Z 68d678ebfc334c4be8e66c0fb69610ed
+Z ee96129288f9f67591a72cc787991652
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index d9d59da7ca..8e900ee9c5 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f9c89ee8d5ef46342bea78fa8d4da058d9ea628183ec985642bbda1cdfeacd5f
\ No newline at end of file
+51e267696d25f2f83b5bb847d5254ab15573ef1a16ea3d7dd8279c73c0bee539
\ No newline at end of file

From e3485ee9966a1d888cda478f92b098d13ab138dd Mon Sep 17 00:00:00 2001
From: drh <>
Date: Thu, 8 Sep 2022 16:27:50 +0000
Subject: [PATCH 062/428] Compiles without error, but untested.

FossilOrigin-Name: a329939c32e33d8d00066ba3d4327f07cca1b4e67de0b8d85f1e7f98afe40954
---
 ext/misc/vfskv.c | 130 ++++++++++++++++++++++++++++-------------------
 manifest         |  12 ++---
 manifest.uuid    |   2 +-
 3 files changed, 86 insertions(+), 58 deletions(-)

diff --git a/ext/misc/vfskv.c b/ext/misc/vfskv.c
index 0773f70945..5d71816a82 100644
--- a/ext/misc/vfskv.c
+++ b/ext/misc/vfskv.c
@@ -14,14 +14,25 @@
 ** Key/Value storage engine where both keys and values must be pure
 ** text.
 */
-#include "sqlite3.h"
+#include <sqlite3ext.h>
+SQLITE_EXTENSION_INIT1
 #include <string.h>
 #include <assert.h>
 #include <stdio.h>
-#include <stat/types.h>
+#include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <assert.h>
+#include <stdlib.h>
+
+/*****************************************************************************
+** Debugging logic
+*/
+#if 1
+#define KVVFS_TRACE(X)  printf X;
+#else
+#define KVVFS_TRACE(X)
+#endif
 
 
 /*****************************************************************************
@@ -37,7 +48,6 @@ static KVStorage *kvstorageOpen(void);
 static void kvstorageClose(KVStorage*);
 static int kvstorageWrite(KVStorage*, const char *zKey, const char *zData);
 static int kvstorageDelete(KVStorage*, const char *zKey);
-static int kvstorageSize(KVStorage*, const char *zKey);
 static int kvstorageRead(KVStorage*, const char *zKey, char *zBuf, int nBuf);
 
 
@@ -93,13 +103,9 @@ static int kvvfsDelete(sqlite3_vfs*, const char *zName, int syncDir);
 static int kvvfsAccess(sqlite3_vfs*, const char *zName, int flags, int *);
 static int kvvfsFullPathname(sqlite3_vfs*, const char *zName, int, char *zOut);
 static void *kvvfsDlOpen(sqlite3_vfs*, const char *zFilename);
-static void kvvfsDlError(sqlite3_vfs*, int nByte, char *zErrMsg);
-static void (*kvvfsDlSym(sqlite3_vfs *pVfs, void *p, const char*zSym))(void);
-static void kvvfsDlClose(sqlite3_vfs*, void*);
 static int kvvfsRandomness(sqlite3_vfs*, int nByte, char *zOut);
 static int kvvfsSleep(sqlite3_vfs*, int microseconds);
 static int kvvfsCurrentTime(sqlite3_vfs*, double*);
-static int kvvfsGetLastError(sqlite3_vfs*, int, char *);
 static int kvvfsCurrentTimeInt64(sqlite3_vfs*, sqlite3_int64*);
 
 static KVVfsVfs kvvfs_vfs = {
@@ -122,7 +128,7 @@ static KVVfsVfs kvvfs_vfs = {
     kvvfsSleep,                   /* xSleep */
     kvvfsCurrentTime,             /* xCurrentTime */
     0,                            /* xGetLastError */
-    kvvfsCurrentTimeInt64,        /* xCurrentTimeInt64 */
+    kvvfsCurrentTimeInt64         /* xCurrentTimeInt64 */
   },
   0,
   0
@@ -141,7 +147,7 @@ static sqlite3_io_methods kvvfs_io_methods = {
   kvvfsCheckReservedLock,         /* xCheckReservedLock */
   kvvfsFileControl,               /* xFileControl */
   kvvfsSectorSize,                /* xSectorSize */
-  kvvfsDeviceCharacteristics      /* xDeviceCharacteristics */
+  kvvfsDeviceCharacteristics,     /* xDeviceCharacteristics */
   0,                              /* xShmMap */
   0,                              /* xShmLock */
   0,                              /* xShmBarrier */
@@ -188,12 +194,15 @@ static int kvstorageWrite(
   FILE *fd;
   kvstorageMakeKey(pStore, zKey);
   fd = fopen(pStore->zKey, "wb");
-  if( fd==0 ) return 1;
   if( fd ){
+    KVVFS_TRACE(("KVVFS-WRITE  %-12s (%d) %.30s\n", pStore->zKey,
+                 (int)strlen(zData), zData));
     fputs(zData, fd);
     fclose(fd);
+    return 0;
+  }else{
+    return 1;
   }
-  return 0;
 }
 
 /* Delete a key
@@ -201,6 +210,7 @@ static int kvstorageWrite(
 static int kvstorageDelete(KVStorage *pStore, const char *zKey){
   kvstorageMakeKey(pStore, zKey);
   unlink(pStore->zKey);
+  KVVFS_TRACE(("KVVFS-DELETE %-12s\n", pStore->zKey));
   return 0;
 }
 
@@ -229,22 +239,31 @@ static int kvstorageRead(
    || stat(pStore->zKey, &buf)!=0
    || !S_ISREG(buf.st_mode)
   ){
+    KVVFS_TRACE(("KVVFS-READ   %-12s (-1)\n", pStore->zKey));
     return -1;
   }
   if( nBuf<0 ){
     return (int)buf.st_size;
   }else if( nBuf==1 ){
     zBuf[0] = 0;
+    KVVFS_TRACE(("KVVFS-READ   %-12s (%d)\n", pStore->zKey,
+                 (int)buf.st_size));
     return (int)buf.st_size;
   }
   if( nBuf-1 > buf.st_size ){
     nBuf = buf.st_size + 1;
   }
   fd = fopen(pStore->zKey, "rb");
-  if( fd==0 ) return -1;
-  fread(zBuf, nBuf-1, 1, fd);
-  fclose(fd);
-  return nBuf-1;
+  if( fd==0 ){
+    KVVFS_TRACE(("KVVFS-READ   %-12s (-1)\n", pStore->zKey));
+    return -1;
+  }else{
+    fread(zBuf, nBuf-1, 1, fd);
+    fclose(fd);
+    KVVFS_TRACE(("KVVFS-READ   %-12s (%d) %.30s\n", pStore->zKey,
+                 nBuf-1, zBuf));
+    return nBuf-1;
+  }
 }
 
 
@@ -274,7 +293,7 @@ static int kvvfsClose(sqlite3_file *pProtoFile){
       pX = pX->pNext; 
     }
   }
-  sqlite3_free(pFile->aData);
+  sqlite3_free(pFile->aJrnl);
   sqlite3_free(pFile);
   return SQLITE_OK;
 }
@@ -289,7 +308,7 @@ static int kvvfsClose(sqlite3_file *pProtoFile){
 */
 static int kvvfsEncode(const char *aData, int nData, char *aOut){
   int i, j;
-  const unsigned *a = (const unsigned char*)aData;
+  const unsigned char *a = (const unsigned char*)aData;
   for(i=j=0; i<nData; i++){
     unsigned char c = a[i];
     if( c!=0 ){
@@ -328,8 +347,7 @@ static char kvvfsHexToBinary(char c){
 ** The return value is the number of bytes actually written into aOut[].
 */
 static int kvvfsDecode(const char *aIn, char *aOut, int nOut){
-  char *aOut;
-  int i, j, k;
+  int i, j;
   int c;
   i = 0;
   j = 0;
@@ -416,12 +434,12 @@ static int kvvfsReadFromJournal(
     kvstorageRead(pFile->pVfs->pStore, "journal", aTxt, szTxt+1);
     kvvfsDecodeJournal(pFile, aTxt, szTxt);
     sqlite3_free(aTxt);
-    if( pFile->aData==0 ) return SQLITE_IOERR;
+    if( pFile->aJrnl==0 ) return SQLITE_IOERR;
   }
   if( iOfst+iAmt>pFile->nJrnl ){
     return SQLITE_IOERR_SHORT_READ;
   }
-  mcmcpy(zBuf, pFile->aJrnl+iOfst, iAmt);
+  memcpy(zBuf, pFile->aJrnl+iOfst, iAmt);
   return SQLITE_OK;
 }
 
@@ -435,8 +453,7 @@ static int kvvfsReadFromDb(
   sqlite_int64 iOfst
 ){
   unsigned int pgno;
-  KVVfsPage *pPage;
-  int got;
+  int got, n;
   char zKey[30];
   char aData[131073];
   assert( pFile->szDb>=0 );
@@ -452,7 +469,7 @@ static int kvvfsReadFromDb(
     pFile->szPage = iAmt;
   }
   pgno = 1 + iOfst/iAmt;
-  sqlite3_snprintf(sizeof(zKey), zKey, "pg-%u", pgno)
+  sqlite3_snprintf(sizeof(zKey), zKey, "pg-%u", pgno);
   got = kvstorageRead(pFile->pVfs->pStore, zKey, aData, sizeof(aData)-1);
   if( got<0 ){
     return SQLITE_IOERR_READ;
@@ -542,8 +559,8 @@ static int kvvfsWriteToDb(
   assert( iAmt>=512 && iAmt<=65536 );
   assert( (iAmt & (iAmt-1))==0 );
   pgno = 1 + iOfst/iAmt;
-  sqlite3_snprintf(sizeof(zKey), zKey, "pg-%u", pgno)
-  nData = kvvfsEncode(zBuf, iAmt, aData);
+  sqlite3_snprintf(sizeof(zKey), zKey, "pg-%u", pgno);
+  kvvfsEncode(zBuf, iAmt, aData);
   kvstorageWrite(pFile->pVfs->pStore, zKey, aData);
   if( iOfst+iAmt > pFile->szDb ){
     pFile->szDb = iOfst + iAmt;
@@ -579,9 +596,9 @@ static int kvvfsTruncate(sqlite3_file *pProtoFile, sqlite_int64 size){
   if( pFile->isJournal ){
     assert( size==0 );
     kvstorageDelete(pFile->pVfs->pStore, "journal");
-    sqlite3_free(pFile->aData);
-    pFile->aData = 0;
-    pFile->nData = 0;
+    sqlite3_free(pFile->aJrnl);
+    pFile->aJrnl = 0;
+    pFile->nJrnl = 0;
     return SQLITE_OK;
   }
   if( pFile->szDb>size
@@ -598,7 +615,7 @@ static int kvvfsTruncate(sqlite3_file *pProtoFile, sqlite_int64 size){
       pgno++;
     }
     pFile->szDb = size;
-    kvvfsWriteFileSize(pFile->pVfs->pStore, size);
+    kvvfsWriteFileSize(pFile, size);
     return SQLITE_OK;
   }
   return SQLITE_IOERR;
@@ -608,7 +625,7 @@ static int kvvfsTruncate(sqlite3_file *pProtoFile, sqlite_int64 size){
 ** Sync an kvvfs-file.
 */
 static int kvvfsSync(sqlite3_file *pProtoFile, int flags){
-  int i, k, n;
+  int i, n;
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
   char *zOut;
   if( !pFile->isJournal ){
@@ -633,13 +650,13 @@ static int kvvfsSync(sqlite3_file *pProtoFile, int flags){
   kvvfsEncode(pFile->aJrnl, pFile->nJrnl, &zOut[i]);
   kvstorageWrite(pFile->pVfs->pStore, "journal", zOut);
   sqlite3_free(zOut);
-  return rc;
+  return SQLITE_OK;
 }
 
 /*
 ** Return the current file-size of an kvvfs-file.
 */
-static int kvvfsFileSize(sqlite3_file *pFile, sqlite_int64 *pSize){
+static int kvvfsFileSize(sqlite3_file *pProtoFile, sqlite_int64 *pSize){
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
   if( pFile->isJournal ){
     *pSize = pFile->nJrnl;
@@ -652,7 +669,7 @@ static int kvvfsFileSize(sqlite3_file *pFile, sqlite_int64 *pSize){
 /*
 ** Lock an kvvfs-file.
 */
-static int kvvfsLock(sqlite3_file *pFile, int eLock){
+static int kvvfsLock(sqlite3_file *pProtoFile, int eLock){
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
   assert( !pFile->isJournal );
   if( eLock!=SQLITE_LOCK_NONE ){
@@ -664,7 +681,7 @@ static int kvvfsLock(sqlite3_file *pFile, int eLock){
 /*
 ** Unlock an kvvfs-file.
 */
-static int kvvfsUnlock(sqlite3_file *pFile, int eLock){
+static int kvvfsUnlock(sqlite3_file *pProtoFile, int eLock){
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
   assert( !pFile->isJournal );
   if( eLock==SQLITE_LOCK_NONE ){
@@ -676,22 +693,16 @@ static int kvvfsUnlock(sqlite3_file *pFile, int eLock){
 /*
 ** Check if another file-handle holds a RESERVED lock on an kvvfs-file.
 */
-static int kvvfsCheckReservedLock(sqlite3_file *pFile, int *pResOut){
-  int rc;
-  KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
+static int kvvfsCheckReservedLock(sqlite3_file *pProtoFile, int *pResOut){
   *pResOut = 0;
-  rc = SQLITE_OK;
-  return rc;
+  return SQLITE_OK;
 }
 
 /*
 ** File control method. For custom operations on an kvvfs-file.
 */
-static int kvvfsFileControl(sqlite3_file *pFile, int op, void *pArg){
-  int rc;
-  KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
-  rc = SQLITE_NOTFOUND;
-  return rc;
+static int kvvfsFileControl(sqlite3_file *pProtoFile, int op, void *pArg){
+  return SQLITE_NOTFOUND;
 }
 
 /*
@@ -704,7 +715,7 @@ static int kvvfsSectorSize(sqlite3_file *pFile){
 /*
 ** Return the device characteristic flags supported by an kvvfs-file.
 */
-static int kvvfsDeviceCharacteristics(sqlite3_file *pFile){
+static int kvvfsDeviceCharacteristics(sqlite3_file *pProtoFile){
   return 0;
 }
 
@@ -726,7 +737,13 @@ static int kvvfsOpen(
   pFile->isJournal = sqlite3_strglob("*-journal", zName)==0;
   pFile->szPage = -1;
   pFile->szDb = -1;
-  
+  pFile->base.pMethods = &kvvfs_io_methods;
+  pFile->pVfs = pVfs;
+  if( pVfs->pFiles==0 ){
+    pVfs->pStore = kvstorageOpen();
+  }
+  pFile->pNext = pVfs->pFiles;
+  pVfs->pFiles = pFile;
   return SQLITE_OK;
 }
 
@@ -776,7 +793,7 @@ static int kvvfsFullPathname(
   size_t nPath = strlen(zPath);
   if( nOut<nPath+1 ) nPath = nOut - 1;
   memcpy(zOut, zPath, nPath);
-  zPath[nPath] = 0;
+  zOut[nPath] = 0;
   return SQLITE_OK;
 }
 
@@ -816,9 +833,20 @@ static int kvvfsCurrentTimeInt64(sqlite3_vfs *pVfs, sqlite3_int64 *pTimeOut){
   return SQLITE_OK;
 }
 
-/*
-** Register debugvfs as the default VFS for this process.
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
+/* 
+** This routine is called when the extension is loaded.
+**
+** Register the new VFS.  Make arrangement to register the virtual table
+** for each new database connection.
 */
-int sqlite3_register_kvvfs(const char *zArg){
+int sqlite3_vfskv_init(
+  sqlite3 *db, 
+  char **pzErrMsg, 
+  const sqlite3_api_routines *pApi
+){
+  SQLITE_EXTENSION_INIT2(pApi);
   return sqlite3_vfs_register(&kvvfs_vfs.base, 1);
 }
diff --git a/manifest b/manifest
index f872ac3349..27e3a020d0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Code\ssnapshot.\s\sCompletely\suntested.\s\sProbably\sdoes\snot\scompile.
-D 2022-09-08T15:48:01.413
+C Compiles\swithout\serror,\sbut\suntested.
+D 2022-09-08T16:27:50.573
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -335,7 +335,7 @@ F ext/misc/uint.c 053fed3bce2e89583afcd4bf804d75d659879bbcedac74d0fa9ed548839a03
 F ext/misc/unionvtab.c 36237f0607ca954ac13a4a0e2d2ac40c33bc6e032a5f55f431713061ef1625f9
 F ext/misc/urifuncs.c f71360d14fa9e7626b563f1f781c6148109462741c5235ac63ae0f8917b9c751
 F ext/misc/uuid.c 5bb2264c1b64d163efa46509544fd7500cb8769cb7c16dd52052da8d961505cf
-F ext/misc/vfskv.c cb82423dcc37af07953d71f15518e8a75d81b2dbab45dc237e181c5b03373703
+F ext/misc/vfskv.c f21561436948a853c4df512c68a814ef69d8a278dbbbacbf2acceed1aa477d02
 F ext/misc/vfslog.c 3932ab932eeb2601dbc4447cb14d445aaa9fbe43b863ef5f014401c3420afd20
 F ext/misc/vfsstat.c 474d08efc697b8eba300082cb1eb74a5f0f3df31ed257db1cb07e72ab0e53dfb
 F ext/misc/vtablog.c 5538acd0c8ddaae372331bee11608d76973436b77d6a91e8635cfc9432fba5ae
@@ -2001,8 +2001,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 f9c89ee8d5ef46342bea78fa8d4da058d9ea628183ec985642bbda1cdfeacd5f
-R fed5a09fb1667ca82dde0796f5fd6c9d
+P 51e267696d25f2f83b5bb847d5254ab15573ef1a16ea3d7dd8279c73c0bee539
+R 3f65efdb484bcd33ce484018dd231698
 U drh
-Z ee96129288f9f67591a72cc787991652
+Z e40c8d61375542bcfdfb80455dd845c0
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 8e900ee9c5..741bfceb1b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-51e267696d25f2f83b5bb847d5254ab15573ef1a16ea3d7dd8279c73c0bee539
\ No newline at end of file
+a329939c32e33d8d00066ba3d4327f07cca1b4e67de0b8d85f1e7f98afe40954
\ No newline at end of file

From 7cd81af3a99a51348a5bdc9fa41260b2da13415a Mon Sep 17 00:00:00 2001
From: drh <>
Date: Thu, 8 Sep 2022 17:12:12 +0000
Subject: [PATCH 063/428] Compiles and loads as an extension.  Starts to run
 but quickly hits issues.

FossilOrigin-Name: 2e38726f46918b28b5c638967f960a20afd3fe84ad245f3bea39a1d64980435b
---
 ext/misc/vfskv.c | 23 ++++++++++++-----------
 manifest         | 12 ++++++------
 manifest.uuid    |  2 +-
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/ext/misc/vfskv.c b/ext/misc/vfskv.c
index 5d71816a82..bde2f08336 100644
--- a/ext/misc/vfskv.c
+++ b/ext/misc/vfskv.c
@@ -195,7 +195,7 @@ static int kvstorageWrite(
   kvstorageMakeKey(pStore, zKey);
   fd = fopen(pStore->zKey, "wb");
   if( fd ){
-    KVVFS_TRACE(("KVVFS-WRITE  %-12s (%d) %.30s\n", pStore->zKey,
+    KVVFS_TRACE(("KVVFS-WRITE  %-14s (%d) %.30s\n", pStore->zKey,
                  (int)strlen(zData), zData));
     fputs(zData, fd);
     fclose(fd);
@@ -210,7 +210,7 @@ static int kvstorageWrite(
 static int kvstorageDelete(KVStorage *pStore, const char *zKey){
   kvstorageMakeKey(pStore, zKey);
   unlink(pStore->zKey);
-  KVVFS_TRACE(("KVVFS-DELETE %-12s\n", pStore->zKey));
+  KVVFS_TRACE(("KVVFS-DELETE %-14s\n", pStore->zKey));
   return 0;
 }
 
@@ -239,14 +239,14 @@ static int kvstorageRead(
    || stat(pStore->zKey, &buf)!=0
    || !S_ISREG(buf.st_mode)
   ){
-    KVVFS_TRACE(("KVVFS-READ   %-12s (-1)\n", pStore->zKey));
+    KVVFS_TRACE(("KVVFS-READ   %-14s (-1)\n", pStore->zKey));
     return -1;
   }
   if( nBuf<0 ){
     return (int)buf.st_size;
   }else if( nBuf==1 ){
     zBuf[0] = 0;
-    KVVFS_TRACE(("KVVFS-READ   %-12s (%d)\n", pStore->zKey,
+    KVVFS_TRACE(("KVVFS-READ   %-14s (%d)\n", pStore->zKey,
                  (int)buf.st_size));
     return (int)buf.st_size;
   }
@@ -255,12 +255,12 @@ static int kvstorageRead(
   }
   fd = fopen(pStore->zKey, "rb");
   if( fd==0 ){
-    KVVFS_TRACE(("KVVFS-READ   %-12s (-1)\n", pStore->zKey));
+    KVVFS_TRACE(("KVVFS-READ   %-14s (-1)\n", pStore->zKey));
     return -1;
   }else{
     fread(zBuf, nBuf-1, 1, fd);
     fclose(fd);
-    KVVFS_TRACE(("KVVFS-READ   %-12s (%d) %.30s\n", pStore->zKey,
+    KVVFS_TRACE(("KVVFS-READ   %-14s (%d) %.30s\n", pStore->zKey,
                  nBuf-1, zBuf));
     return nBuf-1;
   }
@@ -456,7 +456,6 @@ static int kvvfsReadFromDb(
   int got, n;
   char zKey[30];
   char aData[131073];
-  assert( pFile->szDb>=0 );
   assert( iOfst>=0 );
   assert( iAmt>=0 );
   if( (iOfst % iAmt)!=0 ){
@@ -472,10 +471,11 @@ static int kvvfsReadFromDb(
   sqlite3_snprintf(sizeof(zKey), zKey, "pg-%u", pgno);
   got = kvstorageRead(pFile->pVfs->pStore, zKey, aData, sizeof(aData)-1);
   if( got<0 ){
-    return SQLITE_IOERR_READ;
+    n = 0;
+  }else{
+    aData[got] = 0;
+    n = kvvfsDecode(aData, zBuf, iAmt);
   }
-  aData[got] = 0;
-  n = kvvfsDecode(aData, zBuf, iAmt);
   if( n<iAmt ){
     memset(zBuf+n, 0, iAmt-n);
     return SQLITE_IOERR_SHORT_READ;
@@ -848,5 +848,6 @@ int sqlite3_vfskv_init(
   const sqlite3_api_routines *pApi
 ){
   SQLITE_EXTENSION_INIT2(pApi);
-  return sqlite3_vfs_register(&kvvfs_vfs.base, 1);
+  sqlite3_vfs_register(&kvvfs_vfs.base, 1);
+  return SQLITE_OK_LOAD_PERMANENTLY;
 }
diff --git a/manifest b/manifest
index 27e3a020d0..95ed97d626 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Compiles\swithout\serror,\sbut\suntested.
-D 2022-09-08T16:27:50.573
+C Compiles\sand\sloads\sas\san\sextension.\s\sStarts\sto\srun\sbut\squickly\shits\sissues.
+D 2022-09-08T17:12:12.069
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -335,7 +335,7 @@ F ext/misc/uint.c 053fed3bce2e89583afcd4bf804d75d659879bbcedac74d0fa9ed548839a03
 F ext/misc/unionvtab.c 36237f0607ca954ac13a4a0e2d2ac40c33bc6e032a5f55f431713061ef1625f9
 F ext/misc/urifuncs.c f71360d14fa9e7626b563f1f781c6148109462741c5235ac63ae0f8917b9c751
 F ext/misc/uuid.c 5bb2264c1b64d163efa46509544fd7500cb8769cb7c16dd52052da8d961505cf
-F ext/misc/vfskv.c f21561436948a853c4df512c68a814ef69d8a278dbbbacbf2acceed1aa477d02
+F ext/misc/vfskv.c 8664e43778e5d7cda6abd2e57ec374e7e0eb424ff4da093847bac7aa154c7789
 F ext/misc/vfslog.c 3932ab932eeb2601dbc4447cb14d445aaa9fbe43b863ef5f014401c3420afd20
 F ext/misc/vfsstat.c 474d08efc697b8eba300082cb1eb74a5f0f3df31ed257db1cb07e72ab0e53dfb
 F ext/misc/vtablog.c 5538acd0c8ddaae372331bee11608d76973436b77d6a91e8635cfc9432fba5ae
@@ -2001,8 +2001,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 51e267696d25f2f83b5bb847d5254ab15573ef1a16ea3d7dd8279c73c0bee539
-R 3f65efdb484bcd33ce484018dd231698
+P a329939c32e33d8d00066ba3d4327f07cca1b4e67de0b8d85f1e7f98afe40954
+R 3c0347d709594b19afa07b9bd97b3623
 U drh
-Z e40c8d61375542bcfdfb80455dd845c0
+Z c98d8a23118cf655e6b32d119c295b3c
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 741bfceb1b..0963ec3e9b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a329939c32e33d8d00066ba3d4327f07cca1b4e67de0b8d85f1e7f98afe40954
\ No newline at end of file
+2e38726f46918b28b5c638967f960a20afd3fe84ad245f3bea39a1d64980435b
\ No newline at end of file

From 3887ffe82a146aaee393d1d5560b9bce8058a75a Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Thu, 8 Sep 2022 17:42:33 +0000
Subject: [PATCH 064/428] Fix problems with recovering the sqlite_sequence
 table.

FossilOrigin-Name: 356d2209ea5f6b69ce15b62027c63419c2d039e52f01c74a3810a6317abf4fb0
---
 ext/recover/recover1.test    |  26 ++++-
 ext/recover/sqlite3recover.c | 183 ++++++++++++++++++-----------------
 manifest                     |  14 +--
 manifest.uuid                |   2 +-
 4 files changed, 128 insertions(+), 97 deletions(-)

diff --git a/ext/recover/recover1.test b/ext/recover/recover1.test
index 167b2796bd..26e7c60d26 100644
--- a/ext/recover/recover1.test
+++ b/ext/recover/recover1.test
@@ -45,6 +45,7 @@ proc do_recover_test {tn} {
   uplevel [list do_test $tn.1 {
     set R [sqlite3_recover_init db main test.db2]
     $R config testdb rstate.db
+    $R config rowids 1
     $R step
     $R finish
   } {}]
@@ -60,12 +61,14 @@ proc do_recover_test {tn} {
     set ::sqlhook [list]
     set R [sqlite3_recover_init_sql db main my_sql_hook]
     $R config testdb rstate.db
+    $R config rowids 1
     $R step
     $R finish
   } {}]
 
   sqlite3 db2 test.db2
   execsql [join $::sqlhook ";"] db2
+  # puts [join $::sqlhook ";\n"]
   uplevel [list do_test $tn.4 [list compare_dbs db db2] {}]
   db2 close
 }
@@ -82,6 +85,7 @@ do_execsql_test 1.0 {
   )
   INSERT INTO t1 SELECT i*2, hex(randomblob(250)) FROM s;
   INSERT INTO t2 SELECT * FROM t1;
+
 }
 
 do_recover_test 1
@@ -131,8 +135,28 @@ do_execsql_test 7.1 {
   SELECT * FROM t2
 } {10 11 ten}
 
-breakpoint
 do_recover_test 7.2
 
+#--------------------------------------------------------------------------
+#
+reset_db
+do_execsql_test 8.0 {
+  CREATE TABLE x1(a INTEGER PRIMARY KEY AUTOINCREMENT, b, c);
+  WITH s(i) AS (
+    SELECT 1 UNION ALL SELECT i+1 FROM s WHERE i<2
+  )
+  INSERT INTO x1(b, c) SELECT hex(randomblob(100)), hex(randomblob(100)) FROM s;
+  
+  CREATE INDEX x1b ON x1(b);
+  CREATE INDEX x1cb ON x1(c, b);
+  DELETE FROM x1 WHERE a>50;
+
+  ANALYZE;
+}
+
+do_recover_test 8
+
+
+
 finish_test
 
diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index de3dc6ea1a..1ab4f5d6d5 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -60,17 +60,6 @@ struct RecoverBitmap {
   u32 aElem[0];                   /* Array of 32-bit bitmasks */
 };
 
-/*
-** 
-*/
-#define RECOVERY_SCHEMA \
-"  CREATE TABLE recovery.map("                                 \
-"      pgno INTEGER PRIMARY KEY, parent INT"                   \
-"  );"                                                         \
-"  CREATE TABLE recovery.schema("                              \
-"      type, name, tbl_name, rootpage, sql"                    \
-"  );" 
-
 
 struct sqlite3_recover {
   sqlite3 *dbIn;
@@ -1123,6 +1112,8 @@ static int recoverWriteData(sqlite3_recover *p){
   RecoverTable *pTbl;
   int nMax = 0;
   sqlite3_value **apVal = 0;
+
+  sqlite3_stmt *pTbls = 0;
   sqlite3_stmt *pSel = 0;
 
   /* Figure out the maximum number of columns for any table in the schema */
@@ -1133,114 +1124,130 @@ static int recoverWriteData(sqlite3_recover *p){
   apVal = (sqlite3_value**)recoverMalloc(p, sizeof(sqlite3_value*) * (nMax+1));
   if( apVal==0 ) return p->errCode;
 
+  pTbls = recoverPrepare(p, p->dbOut,
+      "SELECT rootpage FROM recovery.schema WHERE type='table'"
+      "  ORDER BY (tbl_name='sqlite_sequence') ASC"
+  );
+
   pSel = recoverPrepare(p, p->dbOut, 
-      "WITH RECURSIVE pages(root, page) AS ("
-      "  SELECT rootpage, rootpage FROM recovery.schema"
+      "WITH RECURSIVE pages(page) AS ("
+      "  SELECT ?1"
       "    UNION"
-      "   SELECT root, child FROM sqlite_dbptr('getpage()'), pages "
+      "  SELECT child FROM sqlite_dbptr('getpage()'), pages "
       "    WHERE pgno=page"
       ") "
-      "SELECT root, page, cell, field, value "
+      "SELECT page, cell, field, value "
       "FROM sqlite_dbdata('getpage()') d, pages p WHERE p.page=d.pgno "
       "UNION ALL "
-      "SELECT 0, 0, 0, 0, 0"
+      "SELECT 0, 0, 0, 0"
   );
   if( pSel ){
-    RecoverTable *pTab = 0;
-    sqlite3_stmt *pInsert = 0;
-    int nInsert = -1;
-    i64 iPrevRoot = -1;
-    i64 iPrevPage = -1;
-    int iPrevCell = -1;
-    int bHaveRowid = 0;           /* True if iRowid is valid */
-    i64 iRowid = 0;
-    int nVal = -1;
 
-    while( p->errCode==SQLITE_OK && sqlite3_step(pSel)==SQLITE_ROW ){
-      i64 iRoot = sqlite3_column_int64(pSel, 0);
-      i64 iPage = sqlite3_column_int64(pSel, 1);
-      int iCell = sqlite3_column_int(pSel, 2);
-      int iField = sqlite3_column_int(pSel, 3);
-      sqlite3_value *pVal = sqlite3_column_value(pSel, 4);
+    /* The outer loop runs once for each table to recover. */
+    while( sqlite3_step(pTbls)==SQLITE_ROW ){
+      i64 iRoot = sqlite3_column_int64(pTbls, 0);
+      RecoverTable *pTab = recoverFindTable(p, iRoot);
+      if( pTab ){
+        int ii;
+        sqlite3_stmt *pInsert = 0;
+        int nInsert = -1;
+        i64 iPrevPage = -1;
+        int iPrevCell = -1;
+        int bHaveRowid = 0;           /* True if iRowid is valid */
+        i64 iRowid = 0;
+        int nVal = -1;
 
-      int bNewCell = (iPrevRoot!=iRoot || iPrevPage!=iPage || iPrevCell!=iCell);
-      assert( bNewCell==0 || (iField==-1 || iField==0) );
-      assert( bNewCell || iField==nVal );
+        if( sqlite3_stricmp("sqlite_sequence", pTab->zTab)==0 ){
+          recoverExec(p, p->dbOut, "DELETE FROM sqlite_sequence");
+          recoverSqlCallback(p, "DELETE FROM sqlite_sequence");
+        }
 
-      if( bNewCell ){
-        if( nVal>=0 ){
-          int ii;
+        sqlite3_bind_int64(pSel, 1, iRoot);
+        while( p->errCode==SQLITE_OK && sqlite3_step(pSel)==SQLITE_ROW ){
+          i64 iPage = sqlite3_column_int64(pSel, 0);
+          int iCell = sqlite3_column_int(pSel, 1);
+          int iField = sqlite3_column_int(pSel, 2);
+          sqlite3_value *pVal = sqlite3_column_value(pSel, 3);
 
-          if( pTab ){
-            int iVal = 0;
-            int iBind = 1;
+          int bNewCell = (iPrevPage!=iPage || iPrevCell!=iCell);
+          assert( bNewCell==0 || (iField==-1 || iField==0) );
+          assert( bNewCell || iField==nVal );
 
-            if( pInsert==0 || nVal!=nInsert ){
-              recoverFinalize(p, pInsert);
-              pInsert = recoverInsertStmt(p, pTab, nVal);
-              nInsert = nVal;
-            }
+          if( bNewCell ){
+            if( nVal>=0 ){
+              int ii;
+              int iVal = 0;
+              int iBind = 1;
 
-            for(ii=0; ii<pTab->nCol; ii++){
-              RecoverColumn *pCol = &pTab->aCol[ii];
+              if( pInsert==0 || nVal!=nInsert ){
+                recoverFinalize(p, pInsert);
+                pInsert = recoverInsertStmt(p, pTab, nVal);
+                nInsert = nVal;
+              }
 
-              if( pCol->iBind>0 ){
-                if( pCol->bIPK ){
-                  sqlite3_bind_int64(pInsert, pCol->iBind, iRowid);
-                }else if( pCol->iField<nVal ){
-                  sqlite3_bind_value(pInsert, pCol->iBind, apVal[pCol->iField]);
+              for(ii=0; ii<pTab->nCol; ii++){
+                RecoverColumn *pCol = &pTab->aCol[ii];
+
+                if( pCol->iBind>0 ){
+                  if( pCol->bIPK ){
+                    sqlite3_bind_int64(pInsert, pCol->iBind, iRowid);
+                  }else if( pCol->iField<nVal ){
+                    sqlite3_bind_value(pInsert,pCol->iBind,apVal[pCol->iField]);
+                  }
                 }
               }
-            }
-            if( p->bRecoverRowid && pTab->iRowidBind>0 && bHaveRowid ){
-              sqlite3_bind_int64(pInsert, pTab->iRowidBind, iRowid);
+              if( p->bRecoverRowid && pTab->iRowidBind>0 && bHaveRowid ){
+                sqlite3_bind_int64(pInsert, pTab->iRowidBind, iRowid);
+              }
+
+              if( SQLITE_ROW==sqlite3_step(pInsert) && p->xSql ){
+                const char *zSql = (const char*)sqlite3_column_text(pInsert, 0);
+                recoverSqlCallback(p, zSql);
+              }
+              recoverReset(p, pInsert);
+              assert( p->errCode || pInsert );
+              if( pInsert ) sqlite3_clear_bindings(pInsert);
             }
 
-            if( SQLITE_ROW==sqlite3_step(pInsert) && p->xSql ){
-              const char *zSql = (const char*)sqlite3_column_text(pInsert, 0);
-              recoverSqlCallback(p, zSql);
+            for(ii=0; ii<nVal; ii++){
+              sqlite3_value_free(apVal[ii]);
+              apVal[ii] = 0;
             }
-            recoverReset(p, pInsert);
-            assert( p->errCode || pInsert );
-            if( pInsert ) sqlite3_clear_bindings(pInsert);
+            nVal = -1;
+            bHaveRowid = 0;
           }
 
-          for(ii=0; ii<nVal; ii++){
-            sqlite3_value_free(apVal[ii]);
-            apVal[ii] = 0;
+          if( iPage!=0 ){
+            if( iField<0 ){
+              iRowid = sqlite3_column_int64(pSel, 3);
+              assert( nVal==-1 );
+              nVal = 0;
+              bHaveRowid = 1;
+            }else if( iField<nMax ){
+              assert( apVal[iField]==0 );
+              apVal[iField] = sqlite3_value_dup( pVal );
+              nVal = iField+1;
+            }
+            iPrevCell = iCell;
+            iPrevPage = iPage;
           }
-          nVal = -1;
-          bHaveRowid = 0;
         }
 
-        if( iRoot==0 ) continue;
-
-        if( iRoot!=iPrevRoot ){
-          pTab = recoverFindTable(p, iRoot);
-          recoverFinalize(p, pInsert);
-          pInsert = 0;
+        recoverReset(p, pSel);
+        recoverFinalize(p, pInsert);
+        pInsert = 0;
+        for(ii=0; ii<nVal; ii++){
+          sqlite3_value_free(apVal[ii]);
+          apVal[ii] = 0;
         }
       }
-
-      if( iField<0 ){
-        iRowid = sqlite3_column_int64(pSel, 4);
-        assert( nVal==-1 );
-        nVal = 0;
-        bHaveRowid = 1;
-      }else if( iField<nMax ){
-        assert( apVal[iField]==0 );
-        apVal[iField] = sqlite3_value_dup( pVal );
-        nVal = iField+1;
-      }
-      iPrevRoot = iRoot;
-      iPrevCell = iCell;
-      iPrevPage = iPage;
     }
 
-    recoverFinalize(p, pInsert);
-    recoverFinalize(p, pSel);
   }
 
+  recoverFinalize(p, pTbls);
+  recoverFinalize(p, pSel);
+
   sqlite3_free(apVal);
   return p->errCode;
 }
diff --git a/manifest b/manifest
index 421372fcab..f5344ad585 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\snew\stest\sfile\srecoverclobber.test.
-D 2022-09-08T11:04:23.161
+C Fix\sproblems\swith\srecovering\sthe\ssqlite_sequence\stable.
+D 2022-09-08T17:42:33.679
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -387,12 +387,12 @@ F ext/rbu/rbuvacuum4.test a78898e438a44803eb2bc897ba3323373c9f277418e2d6d76e90f2
 F ext/rbu/sqlite3rbu.c 8737cabdfbee84bb25a7851ecef8b1312be332761238da9be6ddb10c62ad4291
 F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9cd389812
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
-F ext/recover/recover1.test ae8ce9828210aa6c466bf88e23b0933849d5bb43091abe48cf2e56d636e51e93
+F ext/recover/recover1.test ddc322148170eafe1dabbea91ac175a72f7e7d2777619a6434696a310beff9a3
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
 F ext/recover/recoverclobber.test e6537ebf99f57bfff6cca59550b5f4278319b57a89865abb98d755a8fd561d84
 F ext/recover/recoverold.test f368a6ae2db12b6017257b332a19ab5df527f4061e43f12f5c85d8e2b236f074
 F ext/recover/recoverrowid.test ec4436cd69e6cdacb48dd2963ff6dd9dbd5fe648376de5e7c0c2f4f6cbacb417
-F ext/recover/sqlite3recover.c 9724f913fd457f655e2873552bc6600a6aaff7104b9113ccb38fea18b6a71f03
+F ext/recover/sqlite3recover.c 2c45ab8cce41dcb578ef739652e65675d161751fe0d979b806d947a02de7fd32
 F ext/recover/sqlite3recover.h 32f89b66f0235c0d94dfee0f1c3e9ed1ad726b3c4f3716ef0262b31cc33e8301
 F ext/recover/test_recover.c 7aa268d3431d630eaa82ce14974ae04be50fe7feba660ffaea009cd581916d27
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -2007,8 +2007,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 6cca8913e703635ad89415a60fc84000ac188d9df43f45594b8ad87facb91d54
-R 102ea2ce4694a6be6ee34f8e72c4fbd9
+P cb4e950c472bd24a79a8505a7f8e4c3a0f7821648297d05cc760738b777d5149
+R e45081ba4805e1d831caf7a65d0c00b9
 U dan
-Z e86817dfd35f39cea8c450fbde6bc553
+Z 8c44bc5cd3a46bb8aa19fae7f571d64e
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 2f04809195..34b201c3c5 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cb4e950c472bd24a79a8505a7f8e4c3a0f7821648297d05cc760738b777d5149
\ No newline at end of file
+356d2209ea5f6b69ce15b62027c63419c2d039e52f01c74a3810a6317abf4fb0
\ No newline at end of file

From 9a27d65044d64cf4ad49b618244f3de022a39d9e Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Thu, 8 Sep 2022 19:22:29 +0000
Subject: [PATCH 065/428] Update the shell to use the recover extension for the
 .recover command.

FossilOrigin-Name: ae832e77084eddd696c80cb926d070a5db9d45dce34156a02522b3140e8f5e8b
---
 ext/recover/recover1.test    |   2 -
 ext/recover/sqlite3recover.c |  16 +-
 ext/recover/sqlite3recover.h |   8 +-
 ext/recover/test_recover.c   |   4 +-
 manifest                     |  20 +-
 manifest.uuid                |   2 +-
 src/shell.c.in               | 658 ++---------------------------------
 7 files changed, 54 insertions(+), 656 deletions(-)

diff --git a/ext/recover/recover1.test b/ext/recover/recover1.test
index 26e7c60d26..9afe43209f 100644
--- a/ext/recover/recover1.test
+++ b/ext/recover/recover1.test
@@ -45,7 +45,6 @@ proc do_recover_test {tn} {
   uplevel [list do_test $tn.1 {
     set R [sqlite3_recover_init db main test.db2]
     $R config testdb rstate.db
-    $R config rowids 1
     $R step
     $R finish
   } {}]
@@ -68,7 +67,6 @@ proc do_recover_test {tn} {
 
   sqlite3 db2 test.db2
   execsql [join $::sqlhook ";"] db2
-  # puts [join $::sqlhook ";\n"]
   uplevel [list do_test $tn.4 [list compare_dbs db db2] {}]
   db2 close
 }
diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index 1ab4f5d6d5..cef2fb9da7 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -84,6 +84,11 @@ struct sqlite3_recover {
   int (*xSql)(void*,const char*);
 };
 
+/* 
+** Default value for SQLITE_RECOVER_ROWIDS (sqlite3_recover.bRecoverRowid).
+*/
+#define RECOVER_ROWID_DEFAULT 1
+
 /*
 ** Like strlen(). But handles NULL pointer arguments.
 */
@@ -371,7 +376,7 @@ static void recoverGetPage(
 ** Try to use zA and zB first.  If both of those are already found in z[]
 ** then make up some string and store it in the buffer zBuf.
 */
-static const char *unused_string(
+static const char *recoverUnusedString(
   const char *z,                    /* Result must not appear anywhere in z */
   const char *zA, const char *zB,   /* Try these first */
   char *zBuf                        /* Space to store a generated string */
@@ -416,11 +421,11 @@ static void recoverEscapeCrnl(
 
     for(i=0; zText[i]; i++){
       if( zNL==0 && zText[i]=='\n' ){
-        zNL = unused_string(zText, "\\n", "\\012", zBuf1);
+        zNL = recoverUnusedString(zText, "\\n", "\\012", zBuf1);
         nNL = (int)strlen(zNL);
       }
       if( zCR==0 && zText[i]=='\r' ){
-        zCR = unused_string(zText, "\\r", "\\015", zBuf2);
+        zCR = recoverUnusedString(zText, "\\r", "\\015", zBuf2);
         nCR = (int)strlen(zCR);
       }
     }
@@ -1281,6 +1286,7 @@ sqlite3_recover *recoverInit(
     memcpy(pRet->zUri, zUri, nUri);
     pRet->xSql = xSql;
     pRet->pSqlCtx = pSqlCtx;
+    pRet->bRecoverRowid = RECOVER_ROWID_DEFAULT;
   }
 
   return pRet;
@@ -1330,11 +1336,11 @@ int sqlite3_recover_config(sqlite3_recover *p, int op, void *pArg){
       break;
 
     case SQLITE_RECOVER_FREELIST_CORRUPT:
-      p->bFreelistCorrupt = (pArg ? 1 : 0);
+      p->bFreelistCorrupt = *(int*)pArg;
       break;
 
     case SQLITE_RECOVER_ROWIDS:
-      p->bRecoverRowid = (pArg ? 1 : 0);
+      p->bRecoverRowid = *(int*)pArg;
       break;
 
     default:
diff --git a/ext/recover/sqlite3recover.h b/ext/recover/sqlite3recover.h
index 5dc2a56d30..1ef707e13c 100644
--- a/ext/recover/sqlite3recover.h
+++ b/ext/recover/sqlite3recover.h
@@ -16,7 +16,7 @@
 #ifndef _SQLITE_RECOVER_H
 #define _SQLITE_RECOVER_H
 
-#include "sqlite3.h"              /* Required for error code definitions */
+#include "sqlite3.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -58,9 +58,9 @@ int sqlite3_recover_config(sqlite3_recover*, int op, void *pArg);
 **   pages to add to the lost-and-found table.
 **
 ** SQLITE_RECOVER_FREELIST_CORRUPT:
-**   The pArg value must actually be integer (type "int") value 0 or 1
-**   cast as a (void*). If this option is set (argument is 1) and
-**   a lost-and-found table has been configured using
+**   The pArg value must actually be a pointer to a value of type
+**   int containing value 0 or 1 cast as a (void*). If this option is set
+**   (argument is 1) and a lost-and-found table has been configured using
 **   SQLITE_RECOVER_LOST_AND_FOUND, then is assumed that the freelist is 
 **   corrupt and an attempt is made to recover records from pages that
 **   appear to be linked into the freelist. Otherwise, pages on the freelist
diff --git a/ext/recover/test_recover.c b/ext/recover/test_recover.c
index 1de99f4bd6..83166e994c 100644
--- a/ext/recover/test_recover.c
+++ b/ext/recover/test_recover.c
@@ -129,7 +129,7 @@ static int testRecoverCmd(
           int iVal = 0;
           if( Tcl_GetBooleanFromObj(interp, objv[3], &iVal) ) return TCL_ERROR;
           res = sqlite3_recover_config(pTest->p, 
-              SQLITE_RECOVER_FREELIST_CORRUPT, SQLITE_INT_TO_PTR(iVal)
+              SQLITE_RECOVER_FREELIST_CORRUPT, (void*)&iVal
           );
           break;
         }
@@ -137,7 +137,7 @@ static int testRecoverCmd(
           int iVal = 0;
           if( Tcl_GetBooleanFromObj(interp, objv[3], &iVal) ) return TCL_ERROR;
           res = sqlite3_recover_config(pTest->p, 
-              SQLITE_RECOVER_ROWIDS, SQLITE_INT_TO_PTR(iVal)
+              SQLITE_RECOVER_ROWIDS, (void*)&iVal
           );
           break;
         }
diff --git a/manifest b/manifest
index f5344ad585..013ce9cd0f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sproblems\swith\srecovering\sthe\ssqlite_sequence\stable.
-D 2022-09-08T17:42:33.679
+C Update\sthe\sshell\sto\suse\sthe\srecover\sextension\sfor\sthe\s.recover\scommand.
+D 2022-09-08T19:22:29.395
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -387,14 +387,14 @@ F ext/rbu/rbuvacuum4.test a78898e438a44803eb2bc897ba3323373c9f277418e2d6d76e90f2
 F ext/rbu/sqlite3rbu.c 8737cabdfbee84bb25a7851ecef8b1312be332761238da9be6ddb10c62ad4291
 F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9cd389812
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
-F ext/recover/recover1.test ddc322148170eafe1dabbea91ac175a72f7e7d2777619a6434696a310beff9a3
+F ext/recover/recover1.test aa9f7f46b7209cae6d52321052d4440bc8f82b93991e693c4bad20a6f05a53e5
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
 F ext/recover/recoverclobber.test e6537ebf99f57bfff6cca59550b5f4278319b57a89865abb98d755a8fd561d84
 F ext/recover/recoverold.test f368a6ae2db12b6017257b332a19ab5df527f4061e43f12f5c85d8e2b236f074
 F ext/recover/recoverrowid.test ec4436cd69e6cdacb48dd2963ff6dd9dbd5fe648376de5e7c0c2f4f6cbacb417
-F ext/recover/sqlite3recover.c 2c45ab8cce41dcb578ef739652e65675d161751fe0d979b806d947a02de7fd32
-F ext/recover/sqlite3recover.h 32f89b66f0235c0d94dfee0f1c3e9ed1ad726b3c4f3716ef0262b31cc33e8301
-F ext/recover/test_recover.c 7aa268d3431d630eaa82ce14974ae04be50fe7feba660ffaea009cd581916d27
+F ext/recover/sqlite3recover.c b44241ca3b0cca2b50cfa7f715f79f4eddbe87d56e3baadd4e7bafe4c5872550
+F ext/recover/sqlite3recover.h 218cd9ba8c5c66c3841ca5014910982dc956cba5274257a0ecefb889db879133
+F ext/recover/test_recover.c 68b095ad396d8b1d9242ea663a4be1ad7585a46b1fc03483e9a692c8a87d2674
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
 F ext/repair/checkfreelist.c e21f06995ff4efdc1622dcceaea4dcba2caa83ca2f31a1607b98a8509168a996
 F ext/repair/checkindex.c 4383e4469c21e5b9ae321d0d63cec53e981af9d7a6564be6374f0eeb93dfc890
@@ -597,7 +597,7 @@ F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c ccce37e7fbe71089cf6aec91e7134c9c0c1d4840cff9f02587bbc71240d914a5
-F src/shell.c.in e7e7c2c69ae86c5ee9e8ad66227203d46ff6dce8700a1b1dababff01c71d33df
+F src/shell.c.in b36581c005ebaa59b1eeb143bd3ad5a4b273bf15380ccac63ac8cdf4f0c4d3c9
 F src/sqlite.h.in b9b7fd73239d94db20332bb6e504688001e5564b655e1318a4427a1caef4b99e
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d
@@ -2007,8 +2007,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 cb4e950c472bd24a79a8505a7f8e4c3a0f7821648297d05cc760738b777d5149
-R e45081ba4805e1d831caf7a65d0c00b9
+P 356d2209ea5f6b69ce15b62027c63419c2d039e52f01c74a3810a6317abf4fb0
+R 9479c02b6838b39b62d6729211ce276e
 U dan
-Z 8c44bc5cd3a46bb8aa19fae7f571d64e
+Z df9c400431a19b9f6f7750b759f567b5
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 34b201c3c5..8cbff6b606 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-356d2209ea5f6b69ce15b62027c63419c2d039e52f01c74a3810a6317abf4fb0
\ No newline at end of file
+ae832e77084eddd696c80cb926d070a5db9d45dce34156a02522b3140e8f5e8b
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index d6f3a0aeb6..2a2aa81463 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -1039,6 +1039,8 @@ INCLUDE ../ext/expert/sqlite3expert.c
 
 #if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
 INCLUDE ../ext/misc/dbdata.c
+INCLUDE ../ext/recover/sqlite3recover.h
+INCLUDE ../ext/recover/sqlite3recover.c
 #endif
 
 #if defined(SQLITE_ENABLE_SESSION)
@@ -7252,363 +7254,15 @@ end_ar_command:
 #endif /* !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_HAVE_ZLIB) */
 
 #if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
-/*
-** If (*pRc) is not SQLITE_OK when this function is called, it is a no-op.
-** Otherwise, the SQL statement or statements in zSql are executed using
-** database connection db and the error code written to *pRc before
-** this function returns.
-*/
-static void shellExec(sqlite3 *db, int *pRc, const char *zSql){
-  int rc = *pRc;
-  if( rc==SQLITE_OK ){
-    char *zErr = 0;
-    rc = sqlite3_exec(db, zSql, 0, 0, &zErr);
-    if( rc!=SQLITE_OK ){
-      raw_printf(stderr, "SQL error: %s\n", zErr);
-    }
-    sqlite3_free(zErr);
-    *pRc = rc;
-  }
-}
 
 /*
-** Like shellExec(), except that zFmt is a printf() style format string.
+** This function is used as a callback by the recover extension. Simply
+** print the supplied SQL statement to stdout.
 */
-static void shellExecPrintf(sqlite3 *db, int *pRc, const char *zFmt, ...){
-  char *z = 0;
-  if( *pRc==SQLITE_OK ){
-    va_list ap;
-    va_start(ap, zFmt);
-    z = sqlite3_vmprintf(zFmt, ap);
-    va_end(ap);
-    if( z==0 ){
-      *pRc = SQLITE_NOMEM;
-    }else{
-      shellExec(db, pRc, z);
-    }
-    sqlite3_free(z);
-  }
-}
-
-/*
-** If *pRc is not SQLITE_OK when this function is called, it is a no-op.
-** Otherwise, an attempt is made to allocate, zero and return a pointer
-** to a buffer nByte bytes in size. If an OOM error occurs, *pRc is set
-** to SQLITE_NOMEM and NULL returned.
-*/
-static void *shellMalloc(int *pRc, sqlite3_int64 nByte){
-  void *pRet = 0;
-  if( *pRc==SQLITE_OK ){
-    pRet = sqlite3_malloc64(nByte);
-    if( pRet==0 ){
-      *pRc = SQLITE_NOMEM;
-    }else{
-      memset(pRet, 0, nByte);
-    }
-  }
-  return pRet;
-}
-
-/*
-** If *pRc is not SQLITE_OK when this function is called, it is a no-op.
-** Otherwise, zFmt is treated as a printf() style string. The result of
-** formatting it along with any trailing arguments is written into a 
-** buffer obtained from sqlite3_malloc(), and pointer to which is returned.
-** It is the responsibility of the caller to eventually free this buffer
-** using a call to sqlite3_free().
-** 
-** If an OOM error occurs, (*pRc) is set to SQLITE_NOMEM and a NULL 
-** pointer returned.
-*/
-static char *shellMPrintf(int *pRc, const char *zFmt, ...){
-  char *z = 0;
-  if( *pRc==SQLITE_OK ){
-    va_list ap;
-    va_start(ap, zFmt);
-    z = sqlite3_vmprintf(zFmt, ap);
-    va_end(ap);
-    if( z==0 ){
-      *pRc = SQLITE_NOMEM;
-    }
-  }
-  return z;
-}
-
-
-/*
-** When running the ".recover" command, each output table, and the special
-** orphaned row table if it is required, is represented by an instance
-** of the following struct.
-*/
-typedef struct RecoverTable RecoverTable;
-struct RecoverTable {
-  char *zQuoted;                  /* Quoted version of table name */
-  int nCol;                       /* Number of columns in table */
-  char **azlCol;                  /* Array of column lists */
-  int iPk;                        /* Index of IPK column */
-};
-
-/*
-** Free a RecoverTable object allocated by recoverFindTable() or
-** recoverOrphanTable().
-*/
-static void recoverFreeTable(RecoverTable *pTab){
-  if( pTab ){
-    sqlite3_free(pTab->zQuoted);
-    if( pTab->azlCol ){
-      int i;
-      for(i=0; i<=pTab->nCol; i++){
-        sqlite3_free(pTab->azlCol[i]);
-      }
-      sqlite3_free(pTab->azlCol);
-    }
-    sqlite3_free(pTab);
-  }
-}
-
-/*
-** This function is a no-op if (*pRc) is not SQLITE_OK when it is called.
-** Otherwise, it allocates and returns a RecoverTable object based on the
-** final four arguments passed to this function. It is the responsibility
-** of the caller to eventually free the returned object using
-** recoverFreeTable().
-*/
-static RecoverTable *recoverNewTable(
-  int *pRc,                       /* IN/OUT: Error code */
-  const char *zName,              /* Name of table */
-  const char *zSql,               /* CREATE TABLE statement */
-  int bIntkey, 
-  int nCol
-){
-  sqlite3 *dbtmp = 0;             /* sqlite3 handle for testing CREATE TABLE */
-  int rc = *pRc;
-  RecoverTable *pTab = 0;
-
-  pTab = (RecoverTable*)shellMalloc(&rc, sizeof(RecoverTable));
-  if( rc==SQLITE_OK ){
-    int nSqlCol = 0;
-    int bSqlIntkey = 0;
-    sqlite3_stmt *pStmt = 0;
-    
-    rc = sqlite3_open("", &dbtmp);
-    if( rc==SQLITE_OK ){
-      sqlite3_create_function(dbtmp, "shell_idquote", 1, SQLITE_UTF8, 0,
-                              shellIdQuote, 0, 0);
-    }
-    if( rc==SQLITE_OK ){
-      rc = sqlite3_exec(dbtmp, "PRAGMA writable_schema = on", 0, 0, 0);
-    }
-    if( rc==SQLITE_OK ){
-      rc = sqlite3_exec(dbtmp, zSql, 0, 0, 0);
-      if( rc==SQLITE_ERROR ){
-        rc = SQLITE_OK;
-        goto finished;
-      }
-    }
-    shellPreparePrintf(dbtmp, &rc, &pStmt, 
-        "SELECT count(*) FROM pragma_table_info(%Q)", zName
-    );
-    if( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pStmt) ){
-      nSqlCol = sqlite3_column_int(pStmt, 0);
-    }
-    shellFinalize(&rc, pStmt);
-
-    if( rc!=SQLITE_OK || nSqlCol<nCol ){
-      goto finished;
-    }
-
-    shellPreparePrintf(dbtmp, &rc, &pStmt, 
-      "SELECT ("
-      "  SELECT substr(data,1,1)==X'0D' FROM sqlite_dbpage WHERE pgno=rootpage"
-      ") FROM sqlite_schema WHERE name = %Q", zName
-    );
-    if( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pStmt) ){
-      bSqlIntkey = sqlite3_column_int(pStmt, 0);
-    }
-    shellFinalize(&rc, pStmt);
-
-    if( bIntkey==bSqlIntkey ){
-      int i;
-      const char *zPk = "_rowid_";
-      sqlite3_stmt *pPkFinder = 0;
-
-      /* If this is an intkey table and there is an INTEGER PRIMARY KEY,
-      ** set zPk to the name of the PK column, and pTab->iPk to the index
-      ** of the column, where columns are 0-numbered from left to right.
-      ** Or, if this is a WITHOUT ROWID table or if there is no IPK column,
-      ** leave zPk as "_rowid_" and pTab->iPk at -2.  */
-      pTab->iPk = -2;
-      if( bIntkey ){
-        shellPreparePrintf(dbtmp, &rc, &pPkFinder, 
-          "SELECT cid, name FROM pragma_table_info(%Q) "
-          "  WHERE pk=1 AND type='integer' COLLATE nocase"
-          "  AND NOT EXISTS (SELECT cid FROM pragma_table_info(%Q) WHERE pk=2)"
-          , zName, zName
-        );
-        if( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pPkFinder) ){
-          pTab->iPk = sqlite3_column_int(pPkFinder, 0);
-          zPk = (const char*)sqlite3_column_text(pPkFinder, 1);
-          if( zPk==0 ){ zPk = "_";  /* Defensive.  Should never happen */ }
-        }
-      }
-
-      pTab->zQuoted = shellMPrintf(&rc, "\"%w\"", zName);
-      pTab->azlCol = (char**)shellMalloc(&rc, sizeof(char*) * (nSqlCol+1));
-      pTab->nCol = nSqlCol;
-
-      if( bIntkey ){
-        pTab->azlCol[0] = shellMPrintf(&rc, "\"%w\"", zPk);
-      }else{
-        pTab->azlCol[0] = shellMPrintf(&rc, "");
-      }
-      i = 1;
-      shellPreparePrintf(dbtmp, &rc, &pStmt, 
-          "SELECT %Q || group_concat(shell_idquote(name), ', ') "
-          "  FILTER (WHERE cid!=%d) OVER (ORDER BY %s cid) "
-          "FROM pragma_table_info(%Q)", 
-          bIntkey ? ", " : "", pTab->iPk, 
-          bIntkey ? "" : "(CASE WHEN pk=0 THEN 1000000 ELSE pk END), ",
-          zName
-      );
-      while( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pStmt) ){
-        const char *zText = (const char*)sqlite3_column_text(pStmt, 0);
-        pTab->azlCol[i] = shellMPrintf(&rc, "%s%s", pTab->azlCol[0], zText);
-        i++;
-      }
-      shellFinalize(&rc, pStmt);
-
-      shellFinalize(&rc, pPkFinder);
-    }
-  }
-
- finished:
-  sqlite3_close(dbtmp);
-  *pRc = rc;
-  if( rc!=SQLITE_OK || (pTab && pTab->zQuoted==0) ){
-    recoverFreeTable(pTab);
-    pTab = 0;
-  }
-  return pTab;
-}
-
-/*
-** This function is called to search the schema recovered from the
-** sqlite_schema table of the (possibly) corrupt database as part
-** of a ".recover" command. Specifically, for a table with root page
-** iRoot and at least nCol columns. Additionally, if bIntkey is 0, the
-** table must be a WITHOUT ROWID table, or if non-zero, not one of
-** those.
-**
-** If a table is found, a (RecoverTable*) object is returned. Or, if
-** no such table is found, but bIntkey is false and iRoot is the 
-** root page of an index in the recovered schema, then (*pbNoop) is
-** set to true and NULL returned. Or, if there is no such table or
-** index, NULL is returned and (*pbNoop) set to 0, indicating that
-** the caller should write data to the orphans table.
-*/
-static RecoverTable *recoverFindTable(
-  ShellState *pState,             /* Shell state object */
-  int *pRc,                       /* IN/OUT: Error code */
-  int iRoot,                      /* Root page of table */
-  int bIntkey,                    /* True for an intkey table */
-  int nCol,                       /* Number of columns in table */
-  int *pbNoop                     /* OUT: True if iRoot is root of index */
-){
-  sqlite3_stmt *pStmt = 0;
-  RecoverTable *pRet = 0;
-  int bNoop = 0;
-  const char *zSql = 0;
-  const char *zName = 0;
-
-  /* Search the recovered schema for an object with root page iRoot. */
-  shellPreparePrintf(pState->db, pRc, &pStmt,
-      "SELECT type, name, sql FROM recovery.schema WHERE rootpage=%d", iRoot
-  );
-  while( *pRc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pStmt) ){
-    const char *zType = (const char*)sqlite3_column_text(pStmt, 0);
-    if( bIntkey==0 && sqlite3_stricmp(zType, "index")==0 ){
-      bNoop = 1;
-      break;
-    }
-    if( sqlite3_stricmp(zType, "table")==0 ){
-      zName = (const char*)sqlite3_column_text(pStmt, 1);
-      zSql = (const char*)sqlite3_column_text(pStmt, 2);
-      if( zName!=0 && zSql!=0 ){
-        pRet = recoverNewTable(pRc, zName, zSql, bIntkey, nCol);
-        break;
-      }
-    }
-  }
-
-  shellFinalize(pRc, pStmt);
-  *pbNoop = bNoop;
-  return pRet;
-}
-
-/*
-** Return a RecoverTable object representing the orphans table.
-*/
-static RecoverTable *recoverOrphanTable(
-  ShellState *pState,             /* Shell state object */
-  int *pRc,                       /* IN/OUT: Error code */
-  const char *zLostAndFound,      /* Base name for orphans table */
-  int nCol                        /* Number of user data columns */
-){
-  RecoverTable *pTab = 0;
-  if( nCol>=0 && *pRc==SQLITE_OK ){
-    int i;
-
-    /* This block determines the name of the orphan table. The prefered
-    ** name is zLostAndFound. But if that clashes with another name
-    ** in the recovered schema, try zLostAndFound_0, zLostAndFound_1
-    ** and so on until a non-clashing name is found.  */
-    int iTab = 0;
-    char *zTab = shellMPrintf(pRc, "%s", zLostAndFound);
-    sqlite3_stmt *pTest = 0;
-    shellPrepare(pState->db, pRc,
-        "SELECT 1 FROM recovery.schema WHERE name=?", &pTest
-    );
-    if( pTest ) sqlite3_bind_text(pTest, 1, zTab, -1, SQLITE_TRANSIENT);
-    while( *pRc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pTest) ){
-      shellReset(pRc, pTest);
-      sqlite3_free(zTab);
-      zTab = shellMPrintf(pRc, "%s_%d", zLostAndFound, iTab++);
-      sqlite3_bind_text(pTest, 1, zTab, -1, SQLITE_TRANSIENT);
-    }
-    shellFinalize(pRc, pTest);
-
-    pTab = (RecoverTable*)shellMalloc(pRc, sizeof(RecoverTable));
-    if( pTab ){
-      pTab->zQuoted = shellMPrintf(pRc, "\"%w\"", zTab);
-      pTab->nCol = nCol;
-      pTab->iPk = -2;
-      if( nCol>0 ){
-        pTab->azlCol = (char**)shellMalloc(pRc, sizeof(char*) * (nCol+1));
-        if( pTab->azlCol ){
-          pTab->azlCol[nCol] = shellMPrintf(pRc, "");
-          for(i=nCol-1; i>=0; i--){
-            pTab->azlCol[i] = shellMPrintf(pRc, "%s, NULL", pTab->azlCol[i+1]);
-          }
-        }
-      }
-
-      if( *pRc!=SQLITE_OK ){
-        recoverFreeTable(pTab);
-        pTab = 0;
-      }else{
-        raw_printf(pState->out, 
-            "CREATE TABLE %s(rootpgno INTEGER, "
-            "pgno INTEGER, nfield INTEGER, id INTEGER", pTab->zQuoted
-        );
-        for(i=0; i<nCol; i++){
-          raw_printf(pState->out, ", c%d", i);
-        }
-        raw_printf(pState->out, ");\n");
-      }
-    }
-    sqlite3_free(zTab);
-  }
-  return pTab;
+static int recoverSqlCb(void *pCtx, const char *zSql){
+  ShellState *pState = (ShellState*)pCtx;
+  raw_printf(stdout, "%s;\n", zSql);
+  return SQLITE_OK;
 }
 
 /*
@@ -7618,17 +7272,13 @@ static RecoverTable *recoverOrphanTable(
 */
 static int recoverDatabaseCmd(ShellState *pState, int nArg, char **azArg){
   int rc = SQLITE_OK;
-  sqlite3_stmt *pLoop = 0;        /* Loop through all root pages */
-  sqlite3_stmt *pPages = 0;       /* Loop through all pages in a group */
-  sqlite3_stmt *pCells = 0;       /* Loop through all cells in a page */
   const char *zRecoveryDb = "";   /* Name of "recovery" database */
-  const char *zLostAndFound = "lost_and_found";
-  int i;
-  int nOrphan = -1;
-  RecoverTable *pOrphan = 0;
-
+  const char *zLAF = "lost_and_found";
   int bFreelist = 1;              /* 0 if --freelist-corrupt is specified */
   int bRowids = 1;                /* 0 if --no-rowids */
+  sqlite3_recover *p = 0;
+  int i = 0;
+
   for(i=1; i<nArg; i++){
     char *z = azArg[i];
     int n;
@@ -7643,7 +7293,7 @@ static int recoverDatabaseCmd(ShellState *pState, int nArg, char **azArg){
     }else
     if( n<=15 && memcmp("-lost-and-found", z, n)==0 && i<(nArg-1) ){
       i++;
-      zLostAndFound = azArg[i];
+      zLAF = azArg[i];
     }else
     if( n<=10 && memcmp("-no-rowids", z, n)==0 ){
       bRowids = 0;
@@ -7655,278 +7305,22 @@ static int recoverDatabaseCmd(ShellState *pState, int nArg, char **azArg){
     }
   }
 
-  shellExecPrintf(pState->db, &rc,
-    /* Attach an in-memory database named 'recovery'. Create an indexed 
-    ** cache of the sqlite_dbptr virtual table. */
-    "PRAGMA writable_schema = on;"
-    "ATTACH %Q AS recovery;"
-    "DROP TABLE IF EXISTS recovery.dbptr;"
-    "DROP TABLE IF EXISTS recovery.freelist;"
-    "DROP TABLE IF EXISTS recovery.map;"
-    "DROP TABLE IF EXISTS recovery.schema;"
-    "CREATE TABLE recovery.freelist(pgno INTEGER PRIMARY KEY);", zRecoveryDb
+  p = sqlite3_recover_init_sql(
+      pState->db, "main", recoverSqlCb, (void*)pState
   );
 
-  if( bFreelist ){
-    shellExec(pState->db, &rc,
-      "WITH trunk(pgno) AS ("
-      "  SELECT shell_int32("
-      "      (SELECT data FROM sqlite_dbpage WHERE pgno=1), 8) AS x "
-      "      WHERE x>0"
-      "    UNION"
-      "  SELECT shell_int32("
-      "      (SELECT data FROM sqlite_dbpage WHERE pgno=trunk.pgno), 0) AS x "
-      "      FROM trunk WHERE x>0"
-      "),"
-      "freelist(data, n, freepgno) AS ("
-      "  SELECT data, min(16384, shell_int32(data, 1)-1), t.pgno "
-      "      FROM trunk t, sqlite_dbpage s WHERE s.pgno=t.pgno"
-      "    UNION ALL"
-      "  SELECT data, n-1, shell_int32(data, 2+n) "
-      "      FROM freelist WHERE n>=0"
-      ")"
-      "REPLACE INTO recovery.freelist SELECT freepgno FROM freelist;"
-    );
+  sqlite3_recover_config(p, SQLITE_RECOVER_TESTDB, (void*)zRecoveryDb);
+  sqlite3_recover_config(p, SQLITE_RECOVER_LOST_AND_FOUND, (void*)zLAF);
+  sqlite3_recover_config(p, SQLITE_RECOVER_ROWIDS, (void*)&bRowids);
+  sqlite3_recover_config(p, SQLITE_RECOVER_FREELIST_CORRUPT,(void*)&bFreelist);
+
+  sqlite3_recover_step(p);
+  if( sqlite3_recover_errcode(p)!=SQLITE_OK ){
+    const char *zErr = sqlite3_recover_errmsg(p);
+    int errCode = sqlite3_recover_errcode(p);
+    raw_printf(stderr, "sql error: %s (%d)\n", zErr, errCode);
   }
-
-  /* If this is an auto-vacuum database, add all pointer-map pages to
-  ** the freelist table. Do this regardless of whether or not 
-  ** --freelist-corrupt was specified.  */
-  shellExec(pState->db, &rc, 
-    "WITH ptrmap(pgno) AS ("
-    "  SELECT 2 WHERE shell_int32("
-    "    (SELECT data FROM sqlite_dbpage WHERE pgno=1), 13"
-    "  )"
-    "    UNION ALL "
-    "  SELECT pgno+1+(SELECT page_size FROM pragma_page_size)/5 AS pp "
-    "  FROM ptrmap WHERE pp<=(SELECT page_count FROM pragma_page_count)"
-    ")"
-    "REPLACE INTO recovery.freelist SELECT pgno FROM ptrmap"
-  );
-
-  shellExec(pState->db, &rc, 
-    "CREATE TABLE recovery.dbptr("
-    "      pgno, child, PRIMARY KEY(child, pgno)"
-    ") WITHOUT ROWID;"
-    "INSERT OR IGNORE INTO recovery.dbptr(pgno, child) "
-    "    SELECT * FROM sqlite_dbptr"
-    "      WHERE pgno NOT IN freelist AND child NOT IN freelist;"
-
-    /* Delete any pointer to page 1. This ensures that page 1 is considered
-    ** a root page, regardless of how corrupt the db is. */
-    "DELETE FROM recovery.dbptr WHERE child = 1;"
-
-    /* Delete all pointers to any pages that have more than one pointer
-    ** to them. Such pages will be treated as root pages when recovering
-    ** data.  */
-    "DELETE FROM recovery.dbptr WHERE child IN ("
-    "  SELECT child FROM recovery.dbptr GROUP BY child HAVING count(*)>1"
-    ");"
-
-    /* Create the "map" table that will (eventually) contain instructions
-    ** for dealing with each page in the db that contains one or more 
-    ** records. */
-    "CREATE TABLE recovery.map("
-      "pgno INTEGER PRIMARY KEY, maxlen INT, intkey, root INT"
-    ");"
-
-    /* Populate table [map]. If there are circular loops of pages in the
-    ** database, the following adds all pages in such a loop to the map
-    ** as individual root pages. This could be handled better.  */
-    "WITH pages(i, maxlen) AS ("
-    "  SELECT page_count, ("
-    "    SELECT max(field+1) FROM sqlite_dbdata WHERE pgno=page_count"
-    "  ) FROM pragma_page_count WHERE page_count>0"
-    "    UNION ALL"
-    "  SELECT i-1, ("
-    "    SELECT max(field+1) FROM sqlite_dbdata WHERE pgno=i-1"
-    "  ) FROM pages WHERE i>=2"
-    ")"
-    "INSERT INTO recovery.map(pgno, maxlen, intkey, root) "
-    "  SELECT i, maxlen, NULL, ("
-    "    WITH p(orig, pgno, parent) AS ("
-    "      SELECT 0, i, (SELECT pgno FROM recovery.dbptr WHERE child=i)"
-    "        UNION "
-    "      SELECT i, p.parent, "
-    "        (SELECT pgno FROM recovery.dbptr WHERE child=p.parent) FROM p"
-    "    )"
-    "    SELECT pgno FROM p WHERE (parent IS NULL OR pgno = orig)"
-    ") "
-    "FROM pages WHERE maxlen IS NOT NULL AND i NOT IN freelist;"
-    "UPDATE recovery.map AS o SET intkey = ("
-    "  SELECT substr(data, 1, 1)==X'0D' FROM sqlite_dbpage WHERE pgno=o.pgno"
-    ");"
-
-    /* Extract data from page 1 and any linked pages into table
-    ** recovery.schema. With the same schema as an sqlite_schema table.  */
-    "CREATE TABLE recovery.schema(type, name, tbl_name, rootpage, sql);"
-    "INSERT INTO recovery.schema SELECT "
-    "  max(CASE WHEN field=0 THEN value ELSE NULL END),"
-    "  max(CASE WHEN field=1 THEN value ELSE NULL END),"
-    "  max(CASE WHEN field=2 THEN value ELSE NULL END),"
-    "  max(CASE WHEN field=3 THEN value ELSE NULL END),"
-    "  max(CASE WHEN field=4 THEN value ELSE NULL END)"
-    "FROM sqlite_dbdata WHERE pgno IN ("
-    "  SELECT pgno FROM recovery.map WHERE root=1"
-    ")"
-    "GROUP BY pgno, cell;"
-    "CREATE INDEX recovery.schema_rootpage ON schema(rootpage);"
-  );
-
-  /* Open a transaction, then print out all non-virtual, non-"sqlite_%" 
-  ** CREATE TABLE statements that extracted from the existing schema.  */
-  if( rc==SQLITE_OK ){
-    sqlite3_stmt *pStmt = 0;
-    /* ".recover" might output content in an order which causes immediate
-    ** foreign key constraints to be violated. So disable foreign-key
-    ** constraint enforcement to prevent problems when running the output
-    ** script. */
-    raw_printf(pState->out, "PRAGMA foreign_keys=OFF;\n");
-    raw_printf(pState->out, "BEGIN;\n");
-    raw_printf(pState->out, "PRAGMA writable_schema = on;\n");
-    shellPrepare(pState->db, &rc,
-        "SELECT sql FROM recovery.schema "
-        "WHERE type='table' AND sql LIKE 'create table%'", &pStmt
-    );
-    while( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pStmt) ){
-      const char *zCreateTable = (const char*)sqlite3_column_text(pStmt, 0);
-      raw_printf(pState->out, "CREATE TABLE IF NOT EXISTS %s;\n", 
-          &zCreateTable[12]
-      );
-    }
-    shellFinalize(&rc, pStmt);
-  }
-
-  /* Figure out if an orphan table will be required. And if so, how many
-  ** user columns it should contain */
-  shellPrepare(pState->db, &rc, 
-      "SELECT coalesce(max(maxlen), -2) FROM recovery.map WHERE root>1"
-      , &pLoop
-  );
-  if( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pLoop) ){
-    nOrphan = sqlite3_column_int(pLoop, 0);
-  }
-  shellFinalize(&rc, pLoop);
-  pLoop = 0;
-
-  shellPrepare(pState->db, &rc,
-      "SELECT pgno FROM recovery.map WHERE root=?", &pPages
-  );
-
-  shellPrepare(pState->db, &rc,
-      "SELECT max(field), group_concat(shell_escape_crnl(quote"
-      "(case when (? AND field<0) then NULL else value end)"
-      "), ', ')"
-      ", min(field) "
-      "FROM sqlite_dbdata WHERE pgno = ? AND field != ?"
-      "GROUP BY cell", &pCells
-  );
-
-  /* Loop through each root page. */
-  shellPrepare(pState->db, &rc, 
-      "SELECT root, intkey, max(maxlen) FROM recovery.map" 
-      " WHERE root>1 GROUP BY root, intkey ORDER BY root=("
-      "  SELECT rootpage FROM recovery.schema WHERE name='sqlite_sequence'"
-      ")", &pLoop
-  );
-  while( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pLoop) ){
-    int iRoot = sqlite3_column_int(pLoop, 0);
-    int bIntkey = sqlite3_column_int(pLoop, 1);
-    int nCol = sqlite3_column_int(pLoop, 2);
-    int bNoop = 0;
-    RecoverTable *pTab;
-
-    assert( bIntkey==0 || bIntkey==1 );
-    pTab = recoverFindTable(pState, &rc, iRoot, bIntkey, nCol, &bNoop);
-    if( bNoop || rc ) continue;
-    if( pTab==0 ){
-      if( pOrphan==0 ){
-        pOrphan = recoverOrphanTable(pState, &rc, zLostAndFound, nOrphan);
-      }
-      pTab = pOrphan;
-      if( pTab==0 ) break;
-    }
-
-    if( 0==sqlite3_stricmp(pTab->zQuoted, "\"sqlite_sequence\"") ){
-      raw_printf(pState->out, "DELETE FROM sqlite_sequence;\n");
-    }
-    sqlite3_bind_int(pPages, 1, iRoot);
-    if( bRowids==0 && pTab->iPk<0 ){
-      sqlite3_bind_int(pCells, 1, 1);
-    }else{
-      sqlite3_bind_int(pCells, 1, 0);
-    }
-    sqlite3_bind_int(pCells, 3, pTab->iPk);
-
-    while( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pPages) ){
-      int iPgno = sqlite3_column_int(pPages, 0);
-      sqlite3_bind_int(pCells, 2, iPgno);
-      while( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pCells) ){
-        int nField = sqlite3_column_int(pCells, 0);
-        int iMin = sqlite3_column_int(pCells, 2);
-        const char *zVal = (const char*)sqlite3_column_text(pCells, 1);
-
-        RecoverTable *pTab2 = pTab;
-        if( pTab!=pOrphan && (iMin<0)!=bIntkey ){
-          if( pOrphan==0 ){
-            pOrphan = recoverOrphanTable(pState, &rc, zLostAndFound, nOrphan);
-          }
-          pTab2 = pOrphan;
-          if( pTab2==0 ) break;
-        }
-
-        nField = nField+1;
-        if( pTab2==pOrphan ){
-          raw_printf(pState->out, 
-              "INSERT INTO %s VALUES(%d, %d, %d, %s%s%s);\n",
-              pTab2->zQuoted, iRoot, iPgno, nField,
-              iMin<0 ? "" : "NULL, ", zVal, pTab2->azlCol[nField]
-          );
-        }else{
-          raw_printf(pState->out, "INSERT INTO %s(%s) VALUES( %s );\n", 
-              pTab2->zQuoted, pTab2->azlCol[nField], zVal
-          );
-        }
-      }
-      shellReset(&rc, pCells);
-    }
-    shellReset(&rc, pPages);
-    if( pTab!=pOrphan ) recoverFreeTable(pTab);
-  }
-  shellFinalize(&rc, pLoop);
-  shellFinalize(&rc, pPages);
-  shellFinalize(&rc, pCells);
-  recoverFreeTable(pOrphan);
-
-  /* The rest of the schema */
-  if( rc==SQLITE_OK ){
-    sqlite3_stmt *pStmt = 0;
-    shellPrepare(pState->db, &rc, 
-        "SELECT sql, name FROM recovery.schema "
-        "WHERE sql NOT LIKE 'create table%'", &pStmt
-    );
-    while( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pStmt) ){
-      const char *zSql = (const char*)sqlite3_column_text(pStmt, 0);
-      if( sqlite3_strnicmp(zSql, "create virt", 11)==0 ){
-        const char *zName = (const char*)sqlite3_column_text(pStmt, 1);
-        char *zPrint = shellMPrintf(&rc, 
-          "INSERT INTO sqlite_schema VALUES('table', %Q, %Q, 0, %Q)",
-          zName, zName, zSql
-        );
-        raw_printf(pState->out, "%s;\n", zPrint);
-        sqlite3_free(zPrint);
-      }else{
-        raw_printf(pState->out, "%s;\n", zSql);
-      }
-    }
-    shellFinalize(&rc, pStmt);
-  }
-
-  if( rc==SQLITE_OK ){
-    raw_printf(pState->out, "PRAGMA writable_schema = off;\n");
-    raw_printf(pState->out, "COMMIT;\n");
-  }
-  sqlite3_exec(pState->db, "DETACH recovery", 0, 0, 0);
+  rc = sqlite3_recover_finish(p);
   return rc;
 }
 #endif /* !(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB) */

From fa7098d5436a485c3ff4cf7e84e29a996c4fddd6 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Thu, 8 Sep 2022 19:53:59 +0000
Subject: [PATCH 066/428] Experimentally add --nomutex flag to speedtest1 to
 have it open db with the SQLITE_OPEN_NOMUTEX flag.

FossilOrigin-Name: 45ef576b2ee6369ab1e3aa2ad284764bb334f92a69a33d88b7292bbc0a1b1fda
---
 manifest          | 12 ++++++------
 manifest.uuid     |  2 +-
 test/speedtest1.c |  8 +++++++-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/manifest b/manifest
index 75eb7e14a6..e7aae4339d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sspeedtest1-worker.html,\san\sinteractive\sWorker-thread\svariant\sof\sspeedtest1.html.\sAdd\sext/wasm/index.html\sto\sact\sas\sa\sgateway\sto\sthe\svarious\stest\spages.
-D 2022-09-08T15:30:59.731
+C Experimentally\sadd\s--nomutex\sflag\sto\sspeedtest1\sto\shave\sit\sopen\sdb\swith\sthe\sSQLITE_OPEN_NOMUTEX\sflag.
+D 2022-09-08T19:53:59.576
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1499,7 +1499,7 @@ F test/speed3.test 694affeb9100526007436334cf7d08f3d74b85ef
 F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
 F test/speed4p.test 377a0c48e5a92e0b11c1c5ebb1bc9d83a7312c922bc0cb05970ef5d6a96d1f0c
-F test/speedtest1.c 55ef13e008cbb7dbea032478e60686599679b0b6192e44845c100fdabd14f8ff
+F test/speedtest1.c 345566965466923762c1d7f29295d766a05c87bf48115b3030ceec7592cd1cca
 F test/spellfix.test 951a6405d49d1a23d6b78027d3877b4a33eeb8221dcab5704b499755bb4f552e
 F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3
 F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33
@@ -2019,8 +2019,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 5ea0623630d769a8f3f07a40cd119be86b631192cdb5178131876b01b40ee5e0
-R b5dc0101db445e11af3bccae9adaef48
+P f16c68ee6d5ebb8dec2ab656dbab2ddb5f1d5133153ad553f986b31020adaa38
+R 7f356b1a33873f45424fcff13841218e
 U stephan
-Z 2c78924308cfac29c905a5ead30d4718
+Z 0d8d2c17b5d2ef83d66b0d6f4d0cb65c
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 9c75a6fdf6..2d863e14be 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f16c68ee6d5ebb8dec2ab656dbab2ddb5f1d5133153ad553f986b31020adaa38
\ No newline at end of file
+45ef576b2ee6369ab1e3aa2ad284764bb334f92a69a33d88b7292bbc0a1b1fda
\ No newline at end of file
diff --git a/test/speedtest1.c b/test/speedtest1.c
index 3b8bd92e3b..980ee747d1 100644
--- a/test/speedtest1.c
+++ b/test/speedtest1.c
@@ -20,6 +20,7 @@ static const char zHelp[] =
   "  --mmap SZ           MMAP the first SZ bytes of the database file\n"
   "  --multithread       Set multithreaded mode\n"
   "  --nomemstat         Disable memory statistics\n"
+  "  --nomutex           Open db with SQLITE_OPEN_NOMUTEX\n"
   "  --nosync            Set PRAGMA synchronous=OFF\n"
   "  --notnull           Add NOT NULL constraints to table columns\n"
   "  --output FILE       Store SQL output in FILE\n"
@@ -2192,6 +2193,8 @@ int main(int argc, char **argv){
   int nThread = 0;              /* --threads value */
   int mmapSize = 0;             /* How big of a memory map to use */
   int memDb = 0;                /* --memdb.  Use an in-memory database */
+  int openFlags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE
+    ;                           /* SQLITE_OPEN_xxx flags. */
   char *zTSet = "main";         /* Which --testset torun */
   int doTrace = 0;              /* True for --trace */
   const char *zEncoding = 0;    /* --utf16be or --utf16le */
@@ -2272,6 +2275,8 @@ int main(int argc, char **argv){
         if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]);
         mmapSize = integerValue(argv[++i]);
  #endif
+      }else if( strcmp(z,"nomutex")==0 ){
+        openFlags |= SQLITE_OPEN_NOMUTEX;
       }else if( strcmp(z,"nosync")==0 ){
         noSync = 1;
       }else if( strcmp(z,"notnull")==0 ){
@@ -2413,7 +2418,8 @@ int main(int argc, char **argv){
   sqlite3_initialize();
 
   /* Open the database and the input file */
-  if( sqlite3_open(memDb ? ":memory:" : zDbName, &g.db) ){
+  if( sqlite3_open_v2(memDb ? ":memory:" : zDbName, &g.db,
+                      openFlags, 0) ){
     fatal_error("Cannot open database file: %s\n", zDbName);
   }
 #if SQLITE_VERSION_NUMBER>=3006001

From 1174c23e0dd8354a19d79c09dad8214c7ed85f02 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Thu, 8 Sep 2022 20:04:52 +0000
Subject: [PATCH 067/428] Minor build cleanups and tweaks in the speedtest1
 wasm apps.

FossilOrigin-Name: 5240fb4d795dea826f23cf5d2152b519f5a46f49bb2499ea868fa7c7f4ce788b
---
 ext/wasm/GNUmakefile            |  6 +++---
 ext/wasm/speedtest1-worker.html | 35 ++++++++++++++++++++++-----------
 ext/wasm/speedtest1.html        |  2 +-
 manifest                        | 16 +++++++--------
 manifest.uuid                   |  2 +-
 5 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index a312bbdab4..576b8d320f 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -273,8 +273,8 @@ sqlite3-wasm.o := $(dir.api)/sqlite3-wasm.o
 $(sqlite3-wasm.o): emcc.cflags += $(SQLITE_OPT)
 $(sqlite3-wasm.o): $(dir.top)/sqlite3.c
 $(dir.api)/wasm_util.o: emcc.cflags += $(SQLITE_OPT)
-sqlite3-wasm.c := $(dir.api)/sqlite3-wasm.c \
-    $(dir.jacc)/jaccwabyt_test.c
+sqlite3-wasm.c := $(dir.api)/sqlite3-wasm.c
+jaccwabyt_test.c := $(dir.jacc)/jaccwabyt_test.c
 # ^^^ FIXME (how?): jaccwabyt_test.c is only needed for the test apps,
 # so we don't really want to include it in release builds. However, we
 # want to test the release builds with those apps, so we cannot simply
@@ -290,7 +290,7 @@ $$($(1).o): $$(MAKEFILE) $(1)
 	$$(emcc.bin) $$(emcc_opt) $$(emcc.flags) $$(emcc.cflags) -c $(1) -o $$@
 CLEAN_FILES += $$($(1).o)
 endef
-$(foreach c,$(sqlite3-wasm.c),$(eval $(call WASM_C_COMPILE,$(c))))
+$(foreach c,$(sqlite3-wasm.c) $(jaccwabyt_test.c),$(eval $(call WASM_C_COMPILE,$(c))))
 $(sqlite3.js): 
 $(sqlite3.js): $(MAKEFILE) $(sqlite3.wasm.obj) \
     EXPORTED_FUNCTIONS.api \
diff --git a/ext/wasm/speedtest1-worker.html b/ext/wasm/speedtest1-worker.html
index 60c475798c..f537ccacf7 100644
--- a/ext/wasm/speedtest1-worker.html
+++ b/ext/wasm/speedtest1-worker.html
@@ -50,12 +50,27 @@
         <label for='cb-reverse-log-order' id='lbl-reverse-log-order'>Reverse log order</label>
       </span>
     </div>
-    <div id='test-output'></div>
+    <div id='test-output'>
+    </div>
+    <div id='tips'>
+      <strong>Tips:</strong>
+      <ul>
+        <li>Control-click the flags to (de)select multiple flags.</li>
+        <li>The easiest way to try different optimization levels is,
+          from this directory:
+          <pre>$ rm -f speedtest1.js; make -e emcc_opt='-O2' speedtest1.js</pre>
+          Then reload this page. -O2 seems to consistently produce the fastest results.
+        </li>
+        <li>TODO: add a link in this app which launches the main-thread
+          version with the same flags.</li>
+        </ul>
+    </div>
     <style>
       #test-output {
           white-space: break-spaces;
           overflow: auto;
       }
+      div#tips { margin-top: 1em; }
       #toolbar {
           display: flex;
           flex-direction: row;
@@ -174,6 +189,7 @@
         //flags["mmap"] = "SZ           MMAP the first SZ bytes of the database file";
         flags["multithread"] = "Set multithreaded mode";
         flags["nomemstat"] = "Disable memory statistics";
+        flags["nomutex"] = "Open db with SQLITE_OPEN_NOMUTEX";
         flags["nosync"] = "Set PRAGMA synchronous=OFF";
         flags["notnull"] = "Add NOT NULL constraints to table columns";
         //flags["output"] = "FILE       Store SQL output in FILE";
@@ -280,26 +296,21 @@
         }
       };
 
-      log("Control-click the flags to (de)select multiple flags.");
-      logWarn("\nThe easiest way to try different optimization levels is, from this directory:\n"+
-              "  $ make clean; make -e emcc_opt='-O2' speedtest1\n"+
-              "Then reload this page. -O2 seems to consistently produce the fastest results.\n");
-      logWarn('\nAchtung: the Worker thread overhead slightly reduces the speed',
-              'compared to running the same options via speedtest1.html.\n'+
-              'TODO: add a link in this app which launches the main-thread',
-              'version with the same flags.\n');
-
       W.onmessage = function(msg){
         msg = msg.data;
         switch(msg.type){
-            case 'ready': log("Worker is ready."); eControls.classList.remove('hidden'); break;
+            case 'ready':
+              log("Worker is ready.");
+              eControls.classList.remove('hidden');
+              break;
             case 'stdout': log(msg.data); break;
             case 'stdout': logErr(msg.data); break;
             case 'run-start':
               eControls.disabled = true;
               log("Running speedtest1 with argv =",msg.data.join(' '));
               break;
-            case 'run-end': log("speedtest1 finished.");
+            case 'run-end':
+              log("speedtest1 finished.");
               eControls.disabled = false;
               // app output is in msg.data
               break;
diff --git a/ext/wasm/speedtest1.html b/ext/wasm/speedtest1.html
index fad2b28129..97c210de28 100644
--- a/ext/wasm/speedtest1.html
+++ b/ext/wasm/speedtest1.html
@@ -108,7 +108,7 @@
               // nicely.
               "speedtest1",
               "--singlethread",
-              //"--stats",
+              "--nomutex",
               "--memdb", // note that memdb trumps the filename arg
               dbFile
             ];
diff --git a/manifest b/manifest
index e7aae4339d..ab0cda003e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Experimentally\sadd\s--nomutex\sflag\sto\sspeedtest1\sto\shave\sit\sopen\sdb\swith\sthe\sSQLITE_OPEN_NOMUTEX\sflag.
-D 2022-09-08T19:53:59.576
+C Minor\sbuild\scleanups\sand\stweaks\sin\sthe\sspeedtest1\swasm\sapps.
+D 2022-09-08T20:04:52.074
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle db7a4602f043cf4a5e4135be3609a487f9f1c83f05778bfbdf93766be4541b96
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile 5c566211fe64a45659064bae65e032150e451a0b9dca00be6552f3f6b7252693
+F ext/wasm/GNUmakefile 04e1df08665a81b8815415571cc874176001295a889e649f6ecfea2f6091cfea
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 77ef4bcf37e362b9ad61f9c175dfc0f1b3e571563fb311b96581cf422ee6a8ec
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -511,9 +511,9 @@ F ext/wasm/scratchpad-opfs-main.js 69e960e9161f6412fd0c30f355d4112f1894d6609eb43
 F ext/wasm/scratchpad-opfs-worker.html 66c1d15d678f3bd306373d76b61c6c8aef988f61f4a8dd40185d452f9c6d2bf5
 F ext/wasm/scratchpad-opfs-worker.js 3ec2868c669713145c76eb5877c64a1b20741f741817b87c907a154b676283a9
 F ext/wasm/scratchpad-opfs-worker2.js 5f2237427ac537b8580b1c659ff14ad2621d1694043eaaf41ae18dbfef2e48c0
-F ext/wasm/speedtest1-worker.html 4f8d7391ec17b6fd13f1a1e181436d3331842548fe7cc84e4e322f72850eb97b
+F ext/wasm/speedtest1-worker.html 22938a087c4cf0ef1a8711d675d851f3ca5f25c2ea5a2a68c548c3c032d4b841
 F ext/wasm/speedtest1-worker.js 356b9953add4449acf199793db9b76b11ee016021918d8daffd19f08ec68d305
-F ext/wasm/speedtest1.html 02d281c25a8048cce24695bed01ca613d11f40b599cd47f3a18dca8c982d0a15
+F ext/wasm/speedtest1.html 75b5ab41b29188e1c173e443c999ce70058a77f04aa6ba92603b89dc9064f66a
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
@@ -2019,8 +2019,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 f16c68ee6d5ebb8dec2ab656dbab2ddb5f1d5133153ad553f986b31020adaa38
-R 7f356b1a33873f45424fcff13841218e
+P 45ef576b2ee6369ab1e3aa2ad284764bb334f92a69a33d88b7292bbc0a1b1fda
+R 64ae0ceed9d3a82f7eef9f630fe798ba
 U stephan
-Z 0d8d2c17b5d2ef83d66b0d6f4d0cb65c
+Z f95ff8b3ecd08b87fe1868262a4025a0
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 2d863e14be..9f908f5b4e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-45ef576b2ee6369ab1e3aa2ad284764bb334f92a69a33d88b7292bbc0a1b1fda
\ No newline at end of file
+5240fb4d795dea826f23cf5d2152b519f5a46f49bb2499ea868fa7c7f4ce788b
\ No newline at end of file

From e07ce18be505414bc7644574bc3079f147199b7a Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Thu, 8 Sep 2022 21:09:42 +0000
Subject: [PATCH 068/428] Add speedtest1 --big-transactions flag to cause its
 large tests which rely on implicit transactions to be wrapped in
 BEGIN/COMMIT, per /chat discussion. Added to support of the WASMFS build,
 which slows down significantly when thousands of implicit transactions are
 used.

FossilOrigin-Name: 51395c005da46b7fa5a5f28809dd8fea263a6bac2b1492759b3d5a5aa7d399ca
---
 manifest          | 12 ++++++------
 manifest.uuid     |  2 +-
 test/speedtest1.c | 23 +++++++++++++++++++++++
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/manifest b/manifest
index ab0cda003e..ddf22774dd 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\sbuild\scleanups\sand\stweaks\sin\sthe\sspeedtest1\swasm\sapps.
-D 2022-09-08T20:04:52.074
+C Add\sspeedtest1\s--big-transactions\sflag\sto\scause\sits\slarge\stests\swhich\srely\son\simplicit\stransactions\sto\sbe\swrapped\sin\sBEGIN/COMMIT,\sper\s/chat\sdiscussion.\sAdded\sto\ssupport\sof\sthe\sWASMFS\sbuild,\swhich\sslows\sdown\ssignificantly\swhen\sthousands\sof\simplicit\stransactions\sare\sused.
+D 2022-09-08T21:09:42.601
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1499,7 +1499,7 @@ F test/speed3.test 694affeb9100526007436334cf7d08f3d74b85ef
 F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
 F test/speed4p.test 377a0c48e5a92e0b11c1c5ebb1bc9d83a7312c922bc0cb05970ef5d6a96d1f0c
-F test/speedtest1.c 345566965466923762c1d7f29295d766a05c87bf48115b3030ceec7592cd1cca
+F test/speedtest1.c 4001e0fcdbe5f136829319b547771d4a0d9b069cdd2d5d878222bed5d61e0b56
 F test/spellfix.test 951a6405d49d1a23d6b78027d3877b4a33eeb8221dcab5704b499755bb4f552e
 F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3
 F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33
@@ -2019,8 +2019,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 45ef576b2ee6369ab1e3aa2ad284764bb334f92a69a33d88b7292bbc0a1b1fda
-R 64ae0ceed9d3a82f7eef9f630fe798ba
+P 5240fb4d795dea826f23cf5d2152b519f5a46f49bb2499ea868fa7c7f4ce788b
+R b4518397db2d29dbb2157e07b557b159
 U stephan
-Z f95ff8b3ecd08b87fe1868262a4025a0
+Z 5034bb533c4e0d8f568aa6b28ab174ab
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 9f908f5b4e..2ccc07423d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5240fb4d795dea826f23cf5d2152b519f5a46f49bb2499ea868fa7c7f4ce788b
\ No newline at end of file
+51395c005da46b7fa5a5f28809dd8fea263a6bac2b1492759b3d5a5aa7d399ca
\ No newline at end of file
diff --git a/test/speedtest1.c b/test/speedtest1.c
index 980ee747d1..ac0ab361a7 100644
--- a/test/speedtest1.c
+++ b/test/speedtest1.c
@@ -7,6 +7,7 @@ static const char zHelp[] =
   "Usage: %s [--options] DATABASE\n"
   "Options:\n"
   "  --autovacuum        Enable AUTOVACUUM mode\n"
+  "  --big-transactions  Add BEGIN/END around large tests which normally don't\n"
   "  --cachesize N       Set the cache size to N\n"
   "  --checkpoint        Run PRAGMA wal_checkpoint after each test case\n"
   "  --exclusive         Enable locking_mode=EXCLUSIVE\n"
@@ -98,6 +99,7 @@ static struct Global {
   int nRepeat;               /* Repeat selects this many times */
   int doCheckpoint;          /* Run PRAGMA wal_checkpoint after each trans */
   int nReserve;              /* Reserve bytes */
+  int doBigTransactions;     /* Enable transactions on tests 410 and 510 */
   const char *zWR;           /* Might be WITHOUT ROWID */
   const char *zNN;           /* Might be NOT NULL */
   const char *zPK;           /* Might be UNIQUE or PRIMARY KEY */
@@ -1118,12 +1120,24 @@ void testset_main(void){
   speedtest1_exec("COMMIT");
   speedtest1_end_test();
   speedtest1_begin_test(410, "%d SELECTS on an IPK", n);
+  if( g.doBigTransactions ){
+    /* Historical note: tests 410 and 510 have historically not used
+    ** explicit transactions. The --big-transactions flag was added
+    ** 2022-09-08 to support the WASM/OPFS build, as the run-times
+    ** approach 1 minute for each of these tests if they're not in an
+    ** explicit transaction. The run-time effect of --big-transaciions
+    ** on native builds is negligible. */
+    speedtest1_exec("BEGIN");
+  }
   speedtest1_prepare("SELECT b FROM t5 WHERE a=?1; --  %d times",n);
   for(i=1; i<=n; i++){
     x1 = swizzle(i,maxb);
     sqlite3_bind_int(g.pStmt, 1, (sqlite3_int64)x1);
     speedtest1_run();
   }
+  if( g.doBigTransactions ){
+    speedtest1_exec("COMMIT");
+  }
   speedtest1_end_test();
 
   sz = n = g.szTest*700;
@@ -1145,6 +1159,10 @@ void testset_main(void){
   speedtest1_exec("COMMIT");
   speedtest1_end_test();
   speedtest1_begin_test(510, "%d SELECTS on a TEXT PK", n);
+  if( g.doBigTransactions ){
+    /* See notes for test 410. */
+    speedtest1_exec("BEGIN");
+  }
   speedtest1_prepare("SELECT b FROM t6 WHERE a=?1; --  %d times",n);
   for(i=1; i<=n; i++){
     x1 = swizzle(i,maxb);
@@ -1152,6 +1170,9 @@ void testset_main(void){
     sqlite3_bind_text(g.pStmt, 1, zNum, -1, SQLITE_STATIC);
     speedtest1_run();
   }
+  if( g.doBigTransactions ){
+    speedtest1_exec("COMMIT");
+  }
   speedtest1_end_test();
   speedtest1_begin_test(520, "%d SELECT DISTINCT", n);
   speedtest1_exec("SELECT DISTINCT b FROM t5;");
@@ -2233,6 +2254,8 @@ int main(int argc, char **argv){
       do{ z++; }while( z[0]=='-' );
       if( strcmp(z,"autovacuum")==0 ){
         doAutovac = 1;
+      }else if( strcmp(z,"big-transactions")==0 ){
+        g.doBigTransactions = 1;
       }else if( strcmp(z,"cachesize")==0 ){
         if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]);
         i++;

From dd628ed58bb29e2f83325c8913e8b97f78eccc4f Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Thu, 8 Sep 2022 21:33:50 +0000
Subject: [PATCH 069/428] Make use of the --big-transactions flag in the
 speedtest1 JS apps.

FossilOrigin-Name: f2846dcbcaac7880394fb14597c3a60ed310419128c4c5b863cd771a7e5cdeb5
---
 ext/wasm/speedtest1-worker.html |  8 +++--
 ext/wasm/speedtest1.html        | 57 ++++++++++++++++++++-------------
 manifest                        | 14 ++++----
 manifest.uuid                   |  2 +-
 4 files changed, 48 insertions(+), 33 deletions(-)

diff --git a/ext/wasm/speedtest1-worker.html b/ext/wasm/speedtest1-worker.html
index f537ccacf7..7f913be98b 100644
--- a/ext/wasm/speedtest1-worker.html
+++ b/ext/wasm/speedtest1-worker.html
@@ -176,6 +176,7 @@
            controls and some of them make little sense here
            (e.g. --script FILE). */
         flags["autovacuum"] = "Enable AUTOVACUUM mode";
+        flags["big-transactions"] = "Important for tests 410 and 510!";
         //flags["cachesize"] = "N       Set the cache size to N";
         flags["checkpoint"] = "Run PRAGMA wal_checkpoint after each test case";
         flags["exclusive"] = "Enable locking_mode=EXCLUSIVE";
@@ -221,8 +222,9 @@
         flags["verify"] = "Run additional verification steps.";
         flags["without"] = "rowid     Use WITHOUT ROWID where appropriate";
         const preselectedFlags = [
-          'singlethread',
-          'memdb'
+          'big-transactions',
+          'memdb',
+          'singlethread'
         ];
         Object.keys(flags).sort().forEach(function(f){
           const opt = document.createElement('option');
@@ -317,7 +319,7 @@
             case 'error': logErr(msg.data); break;
             case 'load-status': updateLoadStatus(msg.data); break;
             default:
-              logErr("Unhandled worker message type:",arguments[0]);
+              logErr("Unhandled worker message type:",msg);
               break;
         }
       };
diff --git a/ext/wasm/speedtest1.html b/ext/wasm/speedtest1.html
index 97c210de28..0f95145eb4 100644
--- a/ext/wasm/speedtest1.html
+++ b/ext/wasm/speedtest1.html
@@ -29,9 +29,15 @@
       block the UI until it finishes! Adding UI controls to manually configure and start it
       are TODO.</div>
     <div>Output is sent to the dev console because we cannot update the UI while the
-      speedtest is running unless/until we move the speedtest to a worker thread.</div>
+      speedtest is running unless/until we move the speedtest to a worker thread.
+    </div>
+      <div class='warning'>Achtung: running it with the dev tools open <em>drastically</em>
+        slows it down: by a factor of 2.5+. For faster results, keep the dev tools closed
+        when running it!
+    </div>
     <hr>
-    <div id='test-output'></div>
+    <div id='test-output'>
+    </div>
     <script src="common/whwasmutil.js"></script>
     <script src="common/SqliteTestUtil.js"></script>
     <script src="speedtest1.js"></script>
@@ -65,7 +71,7 @@
         opfsDir._ = undefined;
 
         const eOut = document.querySelector('#test-output');
-        const log2 = async function(cssClass,...args){
+        const log2 = function(cssClass,...args){
           const ln = document.createElement('div');
           if(cssClass) ln.classList.add(cssClass);
           ln.append(document.createTextNode(args.join(' ')));
@@ -101,25 +107,32 @@
           }
           const scope = wasm.scopedAllocPush();
           const dbFile = 0 ? "" : pDir+"/speedtest1.db";
-          try{
-            const argv = [
-              // TODO: accept flags via URL arguments and/or a
-              // UI control. A multi-SELECT element should do
-              // nicely.
-              "speedtest1",
-              "--singlethread",
-              "--nomutex",
-              "--memdb", // note that memdb trumps the filename arg
-              dbFile
-            ];
-            console.log("argv =",argv);
-            wasm.xCall('__main_argc_argv', argv.length,
-                       wasm.scopedAllocMainArgv(argv));
-          }finally{
-            wasm.scopedAllocPop(scope);
-            if(pDir) unlink(dbFile);
-          }
-        };
+          const argv = [
+            // TODO: accept flags via URL arguments and/or a
+            // UI control. A multi-SELECT element should do
+            // nicely.
+            "speedtest1",
+            "--singlethread",
+            "--nomutex",
+            "--nosync",
+            "--nomemstat",
+            "--big-transactions", // important for tests 410 and 510!
+            //"--memdb", // note that memdb trumps the filename arg
+            dbFile
+          ];
+          console.log("argv =",argv);
+          // These log messages are not emitted to the UI until after main() returns. Fixing that
+          // requires moving the main() call and related cleanup into a timeout handler.
+          log2('',"Starting native main() with flags:",argv.join(' '));
+          log2('',"This will take a while and the browser might warn about the runaway JS. Give it time.");
+          setTimeout(function(){
+              wasm.xCall('__main_argc_argv', argv.length,
+                         wasm.scopedAllocMainArgv(argv));
+              wasm.scopedAllocPop(scope);
+              if(pDir) unlink(dbFile);
+              log2('',"Done running native main(). Check dev console for output.");
+          }, 100);
+        }/*runTests()*/;
 
         self.sqlite3TestModule.print = log;
         self.sqlite3TestModule.printErr = logErr;
diff --git a/manifest b/manifest
index ddf22774dd..ff1338362f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sspeedtest1\s--big-transactions\sflag\sto\scause\sits\slarge\stests\swhich\srely\son\simplicit\stransactions\sto\sbe\swrapped\sin\sBEGIN/COMMIT,\sper\s/chat\sdiscussion.\sAdded\sto\ssupport\sof\sthe\sWASMFS\sbuild,\swhich\sslows\sdown\ssignificantly\swhen\sthousands\sof\simplicit\stransactions\sare\sused.
-D 2022-09-08T21:09:42.601
+C Make\suse\sof\sthe\s--big-transactions\sflag\sin\sthe\sspeedtest1\sJS\sapps.
+D 2022-09-08T21:33:50.335
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -511,9 +511,9 @@ F ext/wasm/scratchpad-opfs-main.js 69e960e9161f6412fd0c30f355d4112f1894d6609eb43
 F ext/wasm/scratchpad-opfs-worker.html 66c1d15d678f3bd306373d76b61c6c8aef988f61f4a8dd40185d452f9c6d2bf5
 F ext/wasm/scratchpad-opfs-worker.js 3ec2868c669713145c76eb5877c64a1b20741f741817b87c907a154b676283a9
 F ext/wasm/scratchpad-opfs-worker2.js 5f2237427ac537b8580b1c659ff14ad2621d1694043eaaf41ae18dbfef2e48c0
-F ext/wasm/speedtest1-worker.html 22938a087c4cf0ef1a8711d675d851f3ca5f25c2ea5a2a68c548c3c032d4b841
+F ext/wasm/speedtest1-worker.html 23b91da39859b890d73b28bd74629442c6873f38dc4d7ca94cacdc1be1202fb1
 F ext/wasm/speedtest1-worker.js 356b9953add4449acf199793db9b76b11ee016021918d8daffd19f08ec68d305
-F ext/wasm/speedtest1.html 75b5ab41b29188e1c173e443c999ce70058a77f04aa6ba92603b89dc9064f66a
+F ext/wasm/speedtest1.html ffda8a118c09d5429bc34b1ddfd05a963b6786ac83f2deae4f5241c2f5437f83
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
@@ -2019,8 +2019,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 5240fb4d795dea826f23cf5d2152b519f5a46f49bb2499ea868fa7c7f4ce788b
-R b4518397db2d29dbb2157e07b557b159
+P 51395c005da46b7fa5a5f28809dd8fea263a6bac2b1492759b3d5a5aa7d399ca
+R 838553aa9700f04488b76fccfa35dc26
 U stephan
-Z 5034bb533c4e0d8f568aa6b28ab174ab
+Z 42d1e2550cb35842fb99b726ce6e4b2a
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 2ccc07423d..8b41f7137e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-51395c005da46b7fa5a5f28809dd8fea263a6bac2b1492759b3d5a5aa7d399ca
\ No newline at end of file
+f2846dcbcaac7880394fb14597c3a60ed310419128c4c5b863cd771a7e5cdeb5
\ No newline at end of file

From 46d439844043cef65b11e32317d54caf798cc7dd Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Thu, 8 Sep 2022 21:43:18 +0000
Subject: [PATCH 070/428] Update comments in sqlite3recover.h.

FossilOrigin-Name: 14164047c43e3ca43aa010c77ea00dfa85400e15645ee0f5b90a677898b6a836
---
 ext/recover/sqlite3recover.c |  2 +-
 ext/recover/sqlite3recover.h | 93 ++++++++++++++++++++++++++++++------
 ext/recover/test_recover.c   |  2 +-
 manifest                     | 18 +++----
 manifest.uuid                |  2 +-
 src/shell.c.in               |  2 +-
 6 files changed, 91 insertions(+), 28 deletions(-)

diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index cef2fb9da7..3e797e4bb3 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -1395,7 +1395,7 @@ static void recoverStep(sqlite3_recover *p){
   p->pGetPage = 0;
 }
 
-int sqlite3_recover_step(sqlite3_recover *p){
+int sqlite3_recover_run(sqlite3_recover *p){
   if( p && p->errCode==SQLITE_OK ){
     recoverStep(p);
   }
diff --git a/ext/recover/sqlite3recover.h b/ext/recover/sqlite3recover.h
index 1ef707e13c..ffe016b4f3 100644
--- a/ext/recover/sqlite3recover.h
+++ b/ext/recover/sqlite3recover.h
@@ -10,6 +10,31 @@
 **
 *************************************************************************
 **
+** This file contains the public interface to the "recover" extension -
+** an SQLite extension designed to recover data from corrupted database
+** files.
+*/
+
+/*
+** OVERVIEW:
+**
+** To use the API to recover data from a corrupted database, an
+** application:
+**
+** 1) Creates an sqlite3_recover handle by calling either
+**    sqlite3_recover_init() or sqlite3_recover_init_sql().
+**
+** 2) Configures the new handle using one or more calls to
+**    sqlite3_recover_config().
+**
+** 3) Executes the recovery by calling sqlite3_recover_run() on the handle.
+**
+** 4) Retrieves any error code and English language error message using the
+**    sqlite3_recover_errcode() and sqlite3_recover_errmsg() APIs,
+**    respectively.
+**
+** 5) Destroys the sqlite3_recover handle and frees all resources
+**    using sqlite3_recover_finish().
 */
 
 
@@ -22,20 +47,46 @@
 extern "C" {
 #endif
 
+/*
+** Opaque handle type.
+*/
 typedef struct sqlite3_recover sqlite3_recover;
 
 /* 
-** Create an object to recover data from database zDb (e.g. "main")
-** opened by handle db. Data will be recovered into the database
-** identified by parameter zUri. Database zUri is clobbered if it
-** already exists.
+** These two APIs attempt to create and return a new sqlite3_recover object.
+** In both cases the first two arguments identify the (possibly
+** corrupt) database to recover data from. The first argument is an open
+** database handle and the second the name of a database attached to that
+** handle (i.e. "main", "temp" or the name of an attached database).
+**
+** If sqlite3_recover_init() is used to create the new sqlite3_recover
+** handle, then data is recovered into a new database, identified by
+** string parameter zUri. zUri may be an absolute or relative file path,
+** or may be an SQLite URI. If the identified database file already exists,
+** it is overwritten.
+**
+** If sqlite3_recover_init_sql() is invoked, then any recovered data will
+** be returned to the user as a series of SQL statements. Executing these
+** SQL statements results in the same database as would have been created
+** had sqlite3_recover_init() been used. For each SQL statement in the
+** output, the callback function passed as the third argument (xSql) is 
+** invoked once. The first parameter is a passed a copy of the fourth argument
+** to this function (pCtx) as its first parameter, and a pointer to a
+** nul-terminated buffer containing the SQL statement formated as UTF-8 as 
+** the second. If the xSql callback returns any value other than SQLITE_OK,
+** then processing is immediately abandoned and the value returned used as
+** the recover handle error code (see below).
+**
+** If an out-of-memory error occurs, NULL may be returned instead of
+** a valid handle. In all other cases, it is the responsibility of the
+** application to avoid resource leaks by ensuring that
+** sqlite3_recover_finish() is called on all allocated handles.
 */
 sqlite3_recover *sqlite3_recover_init(
   sqlite3* db, 
   const char *zDb, 
   const char *zUri
 );
-
 sqlite3_recover *sqlite3_recover_init_sql(
   sqlite3* db, 
   const char *zDb, 
@@ -43,7 +94,9 @@ sqlite3_recover *sqlite3_recover_init_sql(
   void *pCtx
 );
 
-/* Details TBD. */
+/*
+**
+*/
 int sqlite3_recover_config(sqlite3_recover*, int op, void *pArg);
 
 /*
@@ -76,21 +129,31 @@ int sqlite3_recover_config(sqlite3_recover*, int op, void *pArg);
 #define SQLITE_RECOVER_FREELIST_CORRUPT 791
 #define SQLITE_RECOVER_ROWIDS           792
 
-/* Step the recovery object. Return SQLITE_DONE if recovery is complete,
-** SQLITE_OK if recovery is not complete but no error has occurred, or
-** an SQLite error code if an error has occurred.
+/* 
+** Run the recovery. Return an SQLite error code if an error occurs, or
+** SQLITE_OK otherwise. 
 */
-int sqlite3_recover_step(sqlite3_recover*);
+int sqlite3_recover_run(sqlite3_recover*);
 
+/*
+** Return a pointer to a buffer containing the English language error
+** message stored in the sqlite3_recover handle. If no error message
+** is available (including in the case where no error has occurred),
+** NULL is returned.
+*/
 const char *sqlite3_recover_errmsg(sqlite3_recover*);
 
+/*
+** Return the recover handle error code. SQLITE_OK is returned if no error
+** has occurred.
+*/
 int sqlite3_recover_errcode(sqlite3_recover*);
 
-/* Clean up a recovery object created by a call to sqlite3_recover_init().
-** This function returns SQLITE_DONE if the new database was created,
-** SQLITE_OK if it processing was abandoned before it as finished or
-** an SQLite error code (e.g. SQLITE_IOERR, SQLITE_NOMEM etc.) if an
-** error occurred.  */
+/* 
+** Clean up a recovery object created by a call to sqlite3_recover_init().
+** This function returns SQLITE_OK if no error occurred, or else a copy
+** of the recover handle error code.
+*/
 int sqlite3_recover_finish(sqlite3_recover*);
 
 
diff --git a/ext/recover/test_recover.c b/ext/recover/test_recover.c
index 83166e994c..e7fef42fd7 100644
--- a/ext/recover/test_recover.c
+++ b/ext/recover/test_recover.c
@@ -146,7 +146,7 @@ static int testRecoverCmd(
       break;
     }
     case 1:  assert( sqlite3_stricmp("step", aSub[iSub].zSub)==0 ); {
-      int res = sqlite3_recover_step(pTest->p);
+      int res = sqlite3_recover_run(pTest->p);
       Tcl_SetObjResult(interp, Tcl_NewIntObj(res));
       break;
     }
diff --git a/manifest b/manifest
index 013ce9cd0f..f0dfaa0cd4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\sshell\sto\suse\sthe\srecover\sextension\sfor\sthe\s.recover\scommand.
-D 2022-09-08T19:22:29.395
+C Update\scomments\sin\ssqlite3recover.h.
+D 2022-09-08T21:43:18.230
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -392,9 +392,9 @@ F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007acef
 F ext/recover/recoverclobber.test e6537ebf99f57bfff6cca59550b5f4278319b57a89865abb98d755a8fd561d84
 F ext/recover/recoverold.test f368a6ae2db12b6017257b332a19ab5df527f4061e43f12f5c85d8e2b236f074
 F ext/recover/recoverrowid.test ec4436cd69e6cdacb48dd2963ff6dd9dbd5fe648376de5e7c0c2f4f6cbacb417
-F ext/recover/sqlite3recover.c b44241ca3b0cca2b50cfa7f715f79f4eddbe87d56e3baadd4e7bafe4c5872550
-F ext/recover/sqlite3recover.h 218cd9ba8c5c66c3841ca5014910982dc956cba5274257a0ecefb889db879133
-F ext/recover/test_recover.c 68b095ad396d8b1d9242ea663a4be1ad7585a46b1fc03483e9a692c8a87d2674
+F ext/recover/sqlite3recover.c aaab721cf1ade0703162e95f1d154b811eef962be42a861b59ef015514bc3b65
+F ext/recover/sqlite3recover.h 73648878cea3492427b9a8facebdad0464ed15b161ed1cd70f349a02456e8879
+F ext/recover/test_recover.c b973526785e145e7d9d7920ccde72112025ee5204e22b332db9d86796be73f00
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
 F ext/repair/checkfreelist.c e21f06995ff4efdc1622dcceaea4dcba2caa83ca2f31a1607b98a8509168a996
 F ext/repair/checkindex.c 4383e4469c21e5b9ae321d0d63cec53e981af9d7a6564be6374f0eeb93dfc890
@@ -597,7 +597,7 @@ F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c ccce37e7fbe71089cf6aec91e7134c9c0c1d4840cff9f02587bbc71240d914a5
-F src/shell.c.in b36581c005ebaa59b1eeb143bd3ad5a4b273bf15380ccac63ac8cdf4f0c4d3c9
+F src/shell.c.in a805e05f3ed90e0236eb4eb5bdec327bf735d12e754b83ac037cbc22e45ecc09
 F src/sqlite.h.in b9b7fd73239d94db20332bb6e504688001e5564b655e1318a4427a1caef4b99e
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d
@@ -2007,8 +2007,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 356d2209ea5f6b69ce15b62027c63419c2d039e52f01c74a3810a6317abf4fb0
-R 9479c02b6838b39b62d6729211ce276e
+P ae832e77084eddd696c80cb926d070a5db9d45dce34156a02522b3140e8f5e8b
+R 260b6b87f29011e60d0280e7bdf9107f
 U dan
-Z df9c400431a19b9f6f7750b759f567b5
+Z c0005f6f4d932e314a4bcb73861ec3e0
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 8cbff6b606..e003488dbc 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ae832e77084eddd696c80cb926d070a5db9d45dce34156a02522b3140e8f5e8b
\ No newline at end of file
+14164047c43e3ca43aa010c77ea00dfa85400e15645ee0f5b90a677898b6a836
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index 2a2aa81463..632d9633fd 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -7314,7 +7314,7 @@ static int recoverDatabaseCmd(ShellState *pState, int nArg, char **azArg){
   sqlite3_recover_config(p, SQLITE_RECOVER_ROWIDS, (void*)&bRowids);
   sqlite3_recover_config(p, SQLITE_RECOVER_FREELIST_CORRUPT,(void*)&bFreelist);
 
-  sqlite3_recover_step(p);
+  sqlite3_recover_run(p);
   if( sqlite3_recover_errcode(p)!=SQLITE_OK ){
     const char *zErr = sqlite3_recover_errmsg(p);
     int errCode = sqlite3_recover_errcode(p);

From e66b26818b3a6347dd395df4db568b92f9fe662e Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Fri, 9 Sep 2022 04:50:18 +0000
Subject: [PATCH 071/428] speedtest1 wasm: add a link in the worker variant
 which launches the main-thread variant with the selected CLI flags. Append
 collected stdout/stderr to the main-thread page after execution is finished
 to avoid having to open the dev tools (which inexplicably slows down wasm
 execution).

FossilOrigin-Name: 02709ee2beab36d144b807fd9ffaee639e3c1bdd1908a34e05f3fd23dad2ef66
---
 ext/wasm/common/SqliteTestUtil.js | 40 ++++++++++++++++++++
 ext/wasm/speedtest1-worker.html   | 24 ++++++++----
 ext/wasm/speedtest1.html          | 63 ++++++++++++++++++-------------
 manifest                          | 16 ++++----
 manifest.uuid                     |  2 +-
 5 files changed, 101 insertions(+), 44 deletions(-)

diff --git a/ext/wasm/common/SqliteTestUtil.js b/ext/wasm/common/SqliteTestUtil.js
index 51cd64108e..779f271fb4 100644
--- a/ext/wasm/common/SqliteTestUtil.js
+++ b/ext/wasm/common/SqliteTestUtil.js
@@ -113,6 +113,46 @@
       ++this.counter;
       if(!this.toBool(expr)) throw new Error(msg || "throwUnless() failed");
       return this;
+    },
+
+    /**
+       Parses window.location.search-style string into an object
+       containing key/value pairs of URL arguments (already
+       urldecoded). The object is created using Object.create(null),
+       so contains only parsed-out properties and has no prototype
+       (and thus no inherited properties).
+
+       If the str argument is not passed (arguments.length==0) then
+       window.location.search.substring(1) is used by default. If
+       neither str is passed in nor window exists then false is returned.
+
+       On success it returns an Object containing the key/value pairs
+       parsed from the string. Keys which have no value are treated
+       has having the boolean true value.
+
+       Pedantic licensing note: this code has appeared in other source
+       trees, but was originally written by the same person who pasted
+       it into those trees.
+    */
+    processUrlArgs: function(str) {
+      if( 0 === arguments.length ) {
+        if( ('undefined' === typeof window) ||
+            !window.location ||
+            !window.location.search )  return false;
+        else str = (''+window.location.search).substring(1);
+      }
+      if( ! str ) return false;
+      str = (''+str).split(/#/,2)[0]; // remove #... to avoid it being added as part of the last value.
+      const args = Object.create(null);
+      const sp = str.split(/&+/);
+      const rx = /^([^=]+)(=(.+))?/;
+      var i, m;
+      for( i in sp ) {
+        m = rx.exec( sp[i] );
+        if( ! m ) continue;
+        args[decodeURIComponent(m[1])] = (m[3] ? decodeURIComponent(m[3]) : true);
+      }
+      return args;
     }
   };
 
diff --git a/ext/wasm/speedtest1-worker.html b/ext/wasm/speedtest1-worker.html
index 7f913be98b..74ccf66737 100644
--- a/ext/wasm/speedtest1-worker.html
+++ b/ext/wasm/speedtest1-worker.html
@@ -32,10 +32,11 @@
           <select id='select-flags' size='10' multiple></select>
           <div>TODO? Options which require values are not represented here.</div>
         </div>
-        <div class='toolbar-inner-vertical' id='toolbar-selected-flags'>
-          <button id='btn-reset-flags'>Reset Flags</button>
-          <button id='btn-output-clear'>Clear output</button>
-          <button id='btn-run'>Run</button>
+        <div class='toolbar-inner-vertical'>
+          <div id='toolbar-selected-flags'></div>
+          <span>&rarr; <a id='link-main-thread' href='#' target='main-thread'
+                          title='Start speedtest1.html with the selected flags'>speedtest1.html</a>
+          </span>
         </div>
         <div class='toolbar-inner-vertical' id='toolbar-runner-controls'>
           <button id='btn-reset-flags'>Reset Flags</button>
@@ -105,6 +106,8 @@
         content:"Selected flags: ";
       }
       #toolbar-selected-flags {
+        display: flex;
+        flex-direction: column;
         font-family: monospace;
         justify-content: flex-start;
       }
@@ -138,14 +141,14 @@
         log2('warning', ...args);
       };
 
-      const spacePad = function(str,len=18){
+      const spacePad = function(str,len=21){
         if(str.length===len) return str;
         else if(str.length>len) return str.substr(0,len);
         const a = []; a.length = len - str.length;
         return str+a.join(' ');
       };
       // OPTION elements seem to ignore white-space:pre, so do this the hard way...
-      const nbspPad = function(str,len=18){
+      const nbspPad = function(str,len=21){
         if(str.length===len) return str;
         else if(str.length>len) return str.substr(0,len);
         const a = []; a.length = len - str.length;
@@ -159,15 +162,20 @@
 
       const eFlags = E('#select-flags');
       const eSelectedFlags = E('#toolbar-selected-flags');
-      
+      const eLinkMainThread = E('#link-main-thread');
       const getSelectedFlags = ()=>Array.prototype.map.call(eFlags.selectedOptions, (v)=>v.value);
       const updateSelectedFlags = function(){
         eSelectedFlags.innerText = '';
-        getSelectedFlags().forEach(function(f){
+        const flags = getSelectedFlags();
+        flags.forEach(function(f){
           const e = document.createElement('span');
           e.innerText = f;
           eSelectedFlags.appendChild(e);
         });
+        const rxStripDash = /^(-+)?/;
+        const comma = flags.map((v)=>v.replace(rxStripDash,'')).join(',');
+        eLinkMainThread.setAttribute('target', 'main-thread-'+comma);
+        eLinkMainThread.href = 'speedtest1.html?flags='+comma;
       };
       eFlags.addEventListener('change', updateSelectedFlags );
       {
diff --git a/ext/wasm/speedtest1.html b/ext/wasm/speedtest1.html
index 0f95145eb4..bc8b4ec9f1 100644
--- a/ext/wasm/speedtest1.html
+++ b/ext/wasm/speedtest1.html
@@ -28,16 +28,14 @@
     <div class='warning'>This page starts running the main exe when it loads, which will
       block the UI until it finishes! Adding UI controls to manually configure and start it
       are TODO.</div>
-    <div>Output is sent to the dev console because we cannot update the UI while the
-      speedtest is running unless/until we move the speedtest to a worker thread.
     </div>
-      <div class='warning'>Achtung: running it with the dev tools open <em>drastically</em>
-        slows it down: by a factor of 2.5+. For faster results, keep the dev tools closed
-        when running it!
-    </div>
-    <hr>
-    <div id='test-output'>
+    <div class='warning'>Achtung: running it with the dev tools open may
+      <em>drastically</em> slow it down. For faster results, keep the dev
+      tools closed when running it!
     </div>
+    <div>Output is delayed/buffered because we cannot update the UI while the
+      speedtest is running. Output will appear below when ready...
+    <div id='test-output'></div>
     <script src="common/whwasmutil.js"></script>
     <script src="common/SqliteTestUtil.js"></script>
     <script src="speedtest1.js"></script>
@@ -78,16 +76,20 @@
           eOut.append(ln);
           //this.e.output.lastElementChild.scrollIntoViewIfNeeded();
         };
-        const doHtmlOutput = false
+        const logList = [];
+        const dumpLogList = function(){
+          logList.forEach((v)=>log2('',v));
+          logList.length = 0;
+        };
         /* can't update DOM while speedtest is running unless we run
            speedtest in a worker thread. */;
         const log = (...args)=>{
           console.log(...args);
-          if(doHtmlOutput) log2('', ...args);
+          logList.push(args.join(' '));
         };
         const logErr = function(...args){
           console.error(...args);
-          if(doHtmlOutput) log2('error', ...args);
+          logList.push('ERROR: '+args.join(' '));
         };
 
         const runTests = function(EmscriptenModule){
@@ -107,31 +109,38 @@
           }
           const scope = wasm.scopedAllocPush();
           const dbFile = 0 ? "" : pDir+"/speedtest1.db";
-          const argv = [
-            // TODO: accept flags via URL arguments and/or a
-            // UI control. A multi-SELECT element should do
-            // nicely.
-            "speedtest1",
-            "--singlethread",
-            "--nomutex",
-            "--nosync",
-            "--nomemstat",
-            "--big-transactions", // important for tests 410 and 510!
+          const urlArgs = self.SqliteTestUtil.processUrlArgs();
+          const argv = ["speedtest1"];
+          if(urlArgs.flags){
+            // transform flags=a,b,c to ["--a", "--b", "--c"]
+            argv.push(...(urlArgs.flags.split(',').map((v)=>'--'+v)));
+          }else{
+            argv.push(
+              "--singlethread",
+              "--nomutex",
+              "--nosync",
+              "--nomemstat"
+            );
             //"--memdb", // note that memdb trumps the filename arg
-            dbFile
-          ];
+            argv.push("--big-transactions"/*important for tests 410 and 510!*/,
+                      dbFile);
+          }
           console.log("argv =",argv);
           // These log messages are not emitted to the UI until after main() returns. Fixing that
           // requires moving the main() call and related cleanup into a timeout handler.
-          log2('',"Starting native main() with flags:",argv.join(' '));
-          log2('',"This will take a while and the browser might warn about the runaway JS. Give it time.");
+          if(pDir) unlink(dbFile);
+          log2('',"Starting native app:\n ",argv.join(' '));
+          log2('',"This will take a while and the browser might warn about the runaway JS.",
+               "Give it time...");
+          logList.length = 0;
           setTimeout(function(){
               wasm.xCall('__main_argc_argv', argv.length,
                          wasm.scopedAllocMainArgv(argv));
               wasm.scopedAllocPop(scope);
               if(pDir) unlink(dbFile);
-              log2('',"Done running native main(). Check dev console for output.");
-          }, 100);
+              logList.unshift("Done running native main(). Output:");
+              dumpLogList();
+          }, 50);
         }/*runTests()*/;
 
         self.sqlite3TestModule.print = log;
diff --git a/manifest b/manifest
index ff1338362f..771a1e4d08 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\suse\sof\sthe\s--big-transactions\sflag\sin\sthe\sspeedtest1\sJS\sapps.
-D 2022-09-08T21:33:50.335
+C speedtest1\swasm:\sadd\sa\slink\sin\sthe\sworker\svariant\swhich\slaunches\sthe\smain-thread\svariant\swith\sthe\sselected\sCLI\sflags.\sAppend\scollected\sstdout/stderr\sto\sthe\smain-thread\spage\safter\sexecution\sis\sfinished\sto\savoid\shaving\sto\sopen\sthe\sdev\stools\s(which\sinexplicably\sslows\sdown\swasm\sexecution).
+D 2022-09-09T04:50:18.498
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -491,7 +491,7 @@ F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b56
 F ext/wasm/api/sqlite3-wasm.c 19c3797edc35821e362a8b60ce45d1adfe6d24fca7cd1f55f89d2086ef33870e
 F ext/wasm/batch-runner.html 23209ade7981acce7ecd79d6eff9f4c5a4e8b14ae867ac27cd89b230be640fa6
 F ext/wasm/batch-runner.js a727cbbffe63fd17fb5a590dc679f0b13bd51880e8f84b461d7df246417689e8
-F ext/wasm/common/SqliteTestUtil.js 7a543e238c2ebda922c85076abda017d0480944fdfee576692a0c3a580319ebd
+F ext/wasm/common/SqliteTestUtil.js 529161a624265ba84271a52db58da022649832fa1c71309fb1e02cc037327a2b
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 3a5143699c2b73a85b962271e1a9b3241b30d90e30d895e4f55665e648572962
 F ext/wasm/common/whwasmutil.js f7282ef36c9625330d4e6e82d1beec6678cd101e95e7108cd85db587a788c145
@@ -511,9 +511,9 @@ F ext/wasm/scratchpad-opfs-main.js 69e960e9161f6412fd0c30f355d4112f1894d6609eb43
 F ext/wasm/scratchpad-opfs-worker.html 66c1d15d678f3bd306373d76b61c6c8aef988f61f4a8dd40185d452f9c6d2bf5
 F ext/wasm/scratchpad-opfs-worker.js 3ec2868c669713145c76eb5877c64a1b20741f741817b87c907a154b676283a9
 F ext/wasm/scratchpad-opfs-worker2.js 5f2237427ac537b8580b1c659ff14ad2621d1694043eaaf41ae18dbfef2e48c0
-F ext/wasm/speedtest1-worker.html 23b91da39859b890d73b28bd74629442c6873f38dc4d7ca94cacdc1be1202fb1
+F ext/wasm/speedtest1-worker.html 516f8434623e229d98554d34be64faeb9651083f20f2d0ebac2e67ea715574e8
 F ext/wasm/speedtest1-worker.js 356b9953add4449acf199793db9b76b11ee016021918d8daffd19f08ec68d305
-F ext/wasm/speedtest1.html ffda8a118c09d5429bc34b1ddfd05a963b6786ac83f2deae4f5241c2f5437f83
+F ext/wasm/speedtest1.html 8f61cbe68300acca25dd9fa74dce79b774786e2b4feeb9bcbc46e1cefbfa6262
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
@@ -2019,8 +2019,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 51395c005da46b7fa5a5f28809dd8fea263a6bac2b1492759b3d5a5aa7d399ca
-R 838553aa9700f04488b76fccfa35dc26
+P f2846dcbcaac7880394fb14597c3a60ed310419128c4c5b863cd771a7e5cdeb5
+R 76ac17000a84c98911a70f4e46426ce1
 U stephan
-Z 42d1e2550cb35842fb99b726ce6e4b2a
+Z 8dd38cd18f4d355043f091ca5e469e89
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 8b41f7137e..b814c009b3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f2846dcbcaac7880394fb14597c3a60ed310419128c4c5b863cd771a7e5cdeb5
\ No newline at end of file
+02709ee2beab36d144b807fd9ffaee639e3c1bdd1908a34e05f3fd23dad2ef66
\ No newline at end of file

From f5bf66c8750b77b786ba52acac5e2838b8a4d91b Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Fri, 9 Sep 2022 05:39:36 +0000
Subject: [PATCH 072/428] Remove a reference to a completed TODO.

FossilOrigin-Name: 757ad69607201a26802a304839b8454b1634712458539d6aa8cf999ab2447e59
---
 ext/wasm/speedtest1-worker.html |  8 ++++++--
 manifest                        | 12 ++++++------
 manifest.uuid                   |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/ext/wasm/speedtest1-worker.html b/ext/wasm/speedtest1-worker.html
index 74ccf66737..ba74d9f7c6 100644
--- a/ext/wasm/speedtest1-worker.html
+++ b/ext/wasm/speedtest1-worker.html
@@ -57,13 +57,17 @@
       <strong>Tips:</strong>
       <ul>
         <li>Control-click the flags to (de)select multiple flags.</li>
+        <li>The <tt>--big-transactions</tt> flag is important for two
+          of the bigger tests. Without it, those tests create a
+          combined total of 140k implicit transactions, reducing their
+          speed to an absolute crawl, especially when WASMFS is
+          activated.
+        </li>
         <li>The easiest way to try different optimization levels is,
           from this directory:
           <pre>$ rm -f speedtest1.js; make -e emcc_opt='-O2' speedtest1.js</pre>
           Then reload this page. -O2 seems to consistently produce the fastest results.
         </li>
-        <li>TODO: add a link in this app which launches the main-thread
-          version with the same flags.</li>
         </ul>
     </div>
     <style>
diff --git a/manifest b/manifest
index 771a1e4d08..4b4df74808 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C speedtest1\swasm:\sadd\sa\slink\sin\sthe\sworker\svariant\swhich\slaunches\sthe\smain-thread\svariant\swith\sthe\sselected\sCLI\sflags.\sAppend\scollected\sstdout/stderr\sto\sthe\smain-thread\spage\safter\sexecution\sis\sfinished\sto\savoid\shaving\sto\sopen\sthe\sdev\stools\s(which\sinexplicably\sslows\sdown\swasm\sexecution).
-D 2022-09-09T04:50:18.498
+C Remove\sa\sreference\sto\sa\scompleted\sTODO.
+D 2022-09-09T05:39:36.904
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -511,7 +511,7 @@ F ext/wasm/scratchpad-opfs-main.js 69e960e9161f6412fd0c30f355d4112f1894d6609eb43
 F ext/wasm/scratchpad-opfs-worker.html 66c1d15d678f3bd306373d76b61c6c8aef988f61f4a8dd40185d452f9c6d2bf5
 F ext/wasm/scratchpad-opfs-worker.js 3ec2868c669713145c76eb5877c64a1b20741f741817b87c907a154b676283a9
 F ext/wasm/scratchpad-opfs-worker2.js 5f2237427ac537b8580b1c659ff14ad2621d1694043eaaf41ae18dbfef2e48c0
-F ext/wasm/speedtest1-worker.html 516f8434623e229d98554d34be64faeb9651083f20f2d0ebac2e67ea715574e8
+F ext/wasm/speedtest1-worker.html 6b5fda04d0b69e8c2651689356cb0c28fd33aa1a82b03dcbc8b0d68fbd7ed57f
 F ext/wasm/speedtest1-worker.js 356b9953add4449acf199793db9b76b11ee016021918d8daffd19f08ec68d305
 F ext/wasm/speedtest1.html 8f61cbe68300acca25dd9fa74dce79b774786e2b4feeb9bcbc46e1cefbfa6262
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
@@ -2019,8 +2019,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 f2846dcbcaac7880394fb14597c3a60ed310419128c4c5b863cd771a7e5cdeb5
-R 76ac17000a84c98911a70f4e46426ce1
+P 02709ee2beab36d144b807fd9ffaee639e3c1bdd1908a34e05f3fd23dad2ef66
+R bd063a67330eab4c443bec97e40e0753
 U stephan
-Z 8dd38cd18f4d355043f091ca5e469e89
+Z bd537cef11d41fe7e8fbc4a9611dc217
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index b814c009b3..fb7f9156f4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-02709ee2beab36d144b807fd9ffaee639e3c1bdd1908a34e05f3fd23dad2ef66
\ No newline at end of file
+757ad69607201a26802a304839b8454b1634712458539d6aa8cf999ab2447e59
\ No newline at end of file

From 126976c9f8ab240918a6e37a74bbd0bd2aa942ec Mon Sep 17 00:00:00 2001
From: drh <>
Date: Fri, 9 Sep 2022 11:41:54 +0000
Subject: [PATCH 073/428] Simple reading and writing now works.

FossilOrigin-Name: 00845ac9ef2616e90f5f6a20da3dd040fa8bdcfe73f72fe9c06039561150a82d
---
 ext/misc/vfskv.c | 83 ++++++++++++++++++++++++++++++++++++------------
 manifest         | 12 +++----
 manifest.uuid    |  2 +-
 3 files changed, 70 insertions(+), 27 deletions(-)

diff --git a/ext/misc/vfskv.c b/ext/misc/vfskv.c
index bde2f08336..9897cd8185 100644
--- a/ext/misc/vfskv.c
+++ b/ext/misc/vfskv.c
@@ -28,11 +28,16 @@ SQLITE_EXTENSION_INIT1
 /*****************************************************************************
 ** Debugging logic
 */
-#if 1
+#if 0
 #define KVVFS_TRACE(X)  printf X;
 #else
 #define KVVFS_TRACE(X)
 #endif
+#if 0
+#define KVVFS_LOG(X)  printf X;
+#else
+#define KVVFS_LOG(X)
+#endif
 
 
 /*****************************************************************************
@@ -258,11 +263,12 @@ static int kvstorageRead(
     KVVFS_TRACE(("KVVFS-READ   %-14s (-1)\n", pStore->zKey));
     return -1;
   }else{
-    fread(zBuf, nBuf-1, 1, fd);
+    sqlite3_int64 n = fread(zBuf, 1, nBuf-1, fd);
     fclose(fd);
-    KVVFS_TRACE(("KVVFS-READ   %-14s (%d) %.30s\n", pStore->zKey,
-                 nBuf-1, zBuf));
-    return nBuf-1;
+    zBuf[n] = 0;
+    KVVFS_TRACE(("KVVFS-READ   %-14s (%lld) %.30s\n", pStore->zKey,
+                 n, zBuf));
+    return (int)n;
   }
 }
 
@@ -276,6 +282,7 @@ static int kvvfsClose(sqlite3_file *pProtoFile){
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
   KVVfsVfs *pVfs = pFile->pVfs;
 
+  KVVFS_LOG(("xClose %s\n", pFile->isJournal ? "journal" : "db"));
   if( pVfs->pFiles==pFile ){
     pVfs->pFiles = pFile->pNext;
     if( pVfs->pFiles==0 ){
@@ -294,7 +301,6 @@ static int kvvfsClose(sqlite3_file *pProtoFile){
     }
   }
   sqlite3_free(pFile->aJrnl);
-  sqlite3_free(pFile);
   return SQLITE_OK;
 }
 
@@ -321,8 +327,8 @@ static int kvvfsEncode(const char *aData, int nData, char *aOut){
       ** and so forth.
       */
       int k;
-      for(k=1; a[i+k]==0 && i+k<nData; k++){}
-      i += k;
+      for(k=1; i+k<nData && a[i+k]==0; k++){}
+      i += k-1;
       while( k>0 ){
         aOut[j++] = 'a'+(k%26);
         k /= 26;
@@ -336,7 +342,7 @@ static int kvvfsEncode(const char *aData, int nData, char *aOut){
 /* Convert hex to binary */
 static char kvvfsHexToBinary(char c){
   if( c>='0' && c<='9' ) return c - '0';
-  if( c>='a' && c<='f' ) return c - 'a' + 10;
+  if( c>='A' && c<='F' ) return c - 'A' + 10;
   return 0;
 }
 
@@ -366,10 +372,8 @@ static int kvvfsDecode(const char *aIn, char *aOut, int nOut){
       }
     }else{
       if( j>nOut ) return -1;
-      aOut[j] = kvvfsHexToBinary(aIn[i])<<4;
-      i++;
-      aOut[j] += kvvfsHexToBinary(aIn[i]);
-      i++;
+      aOut[j] = kvvfsHexToBinary(aIn[i++])<<4;
+      aOut[j++] += kvvfsHexToBinary(aIn[i++]);
     }
   }
   return j;
@@ -423,6 +427,7 @@ static int kvvfsReadFromJournal(
   sqlite_int64 iOfst
 ){
   assert( pFile->isJournal );
+  KVVFS_LOG(("xRead('journal',%d,%lld)\n", iAmt, iOfst));
   if( pFile->aJrnl==0 ){
     int szTxt = kvstorageRead(pFile->pVfs->pStore, "journal", 0, 0);
     char *aTxt;
@@ -458,23 +463,36 @@ static int kvvfsReadFromDb(
   char aData[131073];
   assert( iOfst>=0 );
   assert( iAmt>=0 );
-  if( (iOfst % iAmt)!=0 ){
-    return SQLITE_IOERR_READ;
-  }
-  if( iAmt!=100 || iOfst!=0 ){
+  KVVFS_LOG(("xRead('db',%d,%lld)\n", iAmt, iOfst));
+  if( iOfst+iAmt>=512 ){
+    if( (iOfst % iAmt)!=0 ){
+      return SQLITE_IOERR_READ;
+    }
     if( (iAmt & (iAmt-1))!=0 || iAmt<512 || iAmt>65536 ){
       return SQLITE_IOERR_READ;
     }
     pFile->szPage = iAmt;
+    pgno = 1 + iOfst/iAmt;
+  }else{
+    pgno = 1;
   }
-  pgno = 1 + iOfst/iAmt;
   sqlite3_snprintf(sizeof(zKey), zKey, "pg-%u", pgno);
   got = kvstorageRead(pFile->pVfs->pStore, zKey, aData, sizeof(aData)-1);
   if( got<0 ){
     n = 0;
   }else{
     aData[got] = 0;
-    n = kvvfsDecode(aData, zBuf, iAmt);
+    if( iOfst+iAmt<512 ){
+      n = kvvfsDecode(aData, &aData[1000], 1000);
+      if( n>=iOfst+iAmt ){
+        memcpy(zBuf, &aData[1000+iOfst], iAmt);
+        n = iAmt;
+      }else{
+        n = 0;
+      }
+    }else{
+      n = kvvfsDecode(aData, zBuf, iAmt);
+    }
   }
   if( n<iAmt ){
     memset(zBuf+n, 0, iAmt-n);
@@ -500,6 +518,7 @@ static int kvvfsRead(
   }else{
     rc = kvvfsReadFromDb(pFile,zBuf,iAmt,iOfst);
   }
+  KVVFS_LOG(("xRead result: 0x%x\n", rc));
   return rc;
 }
 
@@ -528,6 +547,7 @@ static int kvvfsWriteToJournal(
   sqlite_int64 iOfst
 ){
   sqlite3_int64 iEnd = iOfst+iAmt;
+  KVVFS_LOG(("xWrite('journal',%d,%lld)\n", iAmt, iOfst));
   if( iEnd>=0x10000000 ) return SQLITE_FULL;
   if( pFile->aJrnl==0 || pFile->nJrnl<iEnd ){
     char *aNew = sqlite3_realloc(pFile->aJrnl, iEnd);
@@ -556,6 +576,7 @@ static int kvvfsWriteToDb(
   unsigned int pgno;
   char zKey[30];
   char aData[131073];
+  KVVFS_LOG(("xWrite('db',%d,%lld)\n", iAmt, iOfst));
   assert( iAmt>=512 && iAmt<=65536 );
   assert( (iAmt & (iAmt-1))==0 );
   pgno = 1 + iOfst/iAmt;
@@ -585,6 +606,7 @@ static int kvvfsWrite(
   }else{
     rc = kvvfsWriteToDb(pFile,zBuf,iAmt,iOfst);
   }
+  KVVFS_LOG(("xWrite result: 0x%x\n", rc));
   return rc;
 }
 
@@ -594,6 +616,7 @@ static int kvvfsWrite(
 static int kvvfsTruncate(sqlite3_file *pProtoFile, sqlite_int64 size){
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
   if( pFile->isJournal ){
+    KVVFS_LOG(("xTruncate('journal',%lld)\n", size));
     assert( size==0 );
     kvstorageDelete(pFile->pVfs->pStore, "journal");
     sqlite3_free(pFile->aJrnl);
@@ -607,6 +630,7 @@ static int kvvfsTruncate(sqlite3_file *pProtoFile, sqlite_int64 size){
   ){
     char zKey[50];
     unsigned int pgno, pgnoMax;
+    KVVFS_LOG(("xTruncate('db',%lld)\n", size));
     pgno = 1 + size/pFile->szPage;
     pgnoMax = 2 + pFile->szDb/pFile->szPage;
     while( pgno<=pgnoMax ){
@@ -629,11 +653,13 @@ static int kvvfsSync(sqlite3_file *pProtoFile, int flags){
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
   char *zOut;
   if( !pFile->isJournal ){
+    KVVFS_LOG(("xSync('db')\n"));
     if( pFile->szDb>0 ){
       kvvfsWriteFileSize(pFile, pFile->szDb);
     }
     return SQLITE_OK;
   }
+  KVVFS_LOG(("xSync('journal')\n"));
   if( pFile->nJrnl<=0 ){
      return kvvfsTruncate(pProtoFile, 0);
   }
@@ -659,10 +685,17 @@ static int kvvfsSync(sqlite3_file *pProtoFile, int flags){
 static int kvvfsFileSize(sqlite3_file *pProtoFile, sqlite_int64 *pSize){
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
   if( pFile->isJournal ){
+    KVVFS_LOG(("xFileSize('journal')\n"));
     *pSize = pFile->nJrnl;
   }else{
-    *pSize = pFile->szDb;
+    KVVFS_LOG(("xFileSize('db')\n"));
+    if( pFile->szDb>=0 ){
+      *pSize = pFile->szDb;
+    }else{
+      *pSize = kvvfsReadFileSize(pFile);
+    }
   }
+  KVVFS_LOG(("xFileSize: %lld\n", *pSize));
   return SQLITE_OK;
 }
 
@@ -672,6 +705,8 @@ static int kvvfsFileSize(sqlite3_file *pProtoFile, sqlite_int64 *pSize){
 static int kvvfsLock(sqlite3_file *pProtoFile, int eLock){
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
   assert( !pFile->isJournal );
+  KVVFS_LOG(("xLock(%d)\n", eLock));
+
   if( eLock!=SQLITE_LOCK_NONE ){
     pFile->szDb = kvvfsReadFileSize(pFile);
   }
@@ -684,6 +719,7 @@ static int kvvfsLock(sqlite3_file *pProtoFile, int eLock){
 static int kvvfsUnlock(sqlite3_file *pProtoFile, int eLock){
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
   assert( !pFile->isJournal );
+  KVVFS_LOG(("xUnlock(%d)\n", eLock));
   if( eLock==SQLITE_LOCK_NONE ){
     pFile->szDb = -1;
   }
@@ -694,6 +730,7 @@ static int kvvfsUnlock(sqlite3_file *pProtoFile, int eLock){
 ** Check if another file-handle holds a RESERVED lock on an kvvfs-file.
 */
 static int kvvfsCheckReservedLock(sqlite3_file *pProtoFile, int *pResOut){
+  KVVFS_LOG(("xCheckReservedLock\n"));
   *pResOut = 0;
   return SQLITE_OK;
 }
@@ -732,6 +769,7 @@ static int kvvfsOpen(
 ){
   KVVfsFile *pFile = (KVVfsFile*)pProtoFile;
   KVVfsVfs *pVfs = (KVVfsVfs*)pProtoVfs;
+  KVVFS_LOG(("xOpen(\"%s\")\n", zName));
   pFile->aJrnl = 0;
   pFile->nJrnl = 0;
   pFile->isJournal = sqlite3_strglob("*-journal", zName)==0;
@@ -771,11 +809,15 @@ static int kvvfsAccess(
   int *pResOut
 ){
   KVVfsVfs *pVfs = (KVVfsVfs*)pProtoVfs;
+  KVVFS_LOG(("xAccess(\"%s\")\n", zPath));
   if( sqlite3_strglob("*-journal", zPath)==0 ){
     *pResOut = kvstorageRead(pVfs->pStore, "journal", 0, 0)>0;
+  }else if( sqlite3_strglob("*-wal", zPath)==0 ){
+    *pResOut = 0;
   }else{
     *pResOut = 1;
   }
+  KVVFS_LOG(("xAccess returns %d\n",*pResOut));
   return SQLITE_OK;
 }
 
@@ -791,6 +833,7 @@ static int kvvfsFullPathname(
   char *zOut
 ){
   size_t nPath = strlen(zPath);
+  KVVFS_LOG(("xFullPathname(\"%s\")\n", zPath));
   if( nOut<nPath+1 ) nPath = nOut - 1;
   memcpy(zOut, zPath, nPath);
   zOut[nPath] = 0;
diff --git a/manifest b/manifest
index 95ed97d626..0db4723321 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Compiles\sand\sloads\sas\san\sextension.\s\sStarts\sto\srun\sbut\squickly\shits\sissues.
-D 2022-09-08T17:12:12.069
+C Simple\sreading\sand\swriting\snow\sworks.
+D 2022-09-09T11:41:54.677
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -335,7 +335,7 @@ F ext/misc/uint.c 053fed3bce2e89583afcd4bf804d75d659879bbcedac74d0fa9ed548839a03
 F ext/misc/unionvtab.c 36237f0607ca954ac13a4a0e2d2ac40c33bc6e032a5f55f431713061ef1625f9
 F ext/misc/urifuncs.c f71360d14fa9e7626b563f1f781c6148109462741c5235ac63ae0f8917b9c751
 F ext/misc/uuid.c 5bb2264c1b64d163efa46509544fd7500cb8769cb7c16dd52052da8d961505cf
-F ext/misc/vfskv.c 8664e43778e5d7cda6abd2e57ec374e7e0eb424ff4da093847bac7aa154c7789
+F ext/misc/vfskv.c 8c0d3af0b68fdee50ff46b64bec28d693805bd5fc5e26605e198915e9392d6e3
 F ext/misc/vfslog.c 3932ab932eeb2601dbc4447cb14d445aaa9fbe43b863ef5f014401c3420afd20
 F ext/misc/vfsstat.c 474d08efc697b8eba300082cb1eb74a5f0f3df31ed257db1cb07e72ab0e53dfb
 F ext/misc/vtablog.c 5538acd0c8ddaae372331bee11608d76973436b77d6a91e8635cfc9432fba5ae
@@ -2001,8 +2001,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 a329939c32e33d8d00066ba3d4327f07cca1b4e67de0b8d85f1e7f98afe40954
-R 3c0347d709594b19afa07b9bd97b3623
+P 2e38726f46918b28b5c638967f960a20afd3fe84ad245f3bea39a1d64980435b
+R d99171917ec9b13f78c647c76b29147e
 U drh
-Z c98d8a23118cf655e6b32d119c295b3c
+Z d5b6013a0fd62dab0ae32db15d37fb8f
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 0963ec3e9b..43d0014bd4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2e38726f46918b28b5c638967f960a20afd3fe84ad245f3bea39a1d64980435b
\ No newline at end of file
+00845ac9ef2616e90f5f6a20da3dd040fa8bdcfe73f72fe9c06039561150a82d
\ No newline at end of file

From f7377d576375920e152d603b47e7db077080f967 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Fri, 9 Sep 2022 14:22:41 +0000
Subject: [PATCH 074/428] Separate sqlite3_io_methods objects for database
 files and journals.

FossilOrigin-Name: 74fbf6c2a97729e481d5562344e960d0c237aeb1f07240262d32a24fb1f4b5a3
---
 ext/misc/vfskv.c | 338 +++++++++++++++++++++++++----------------------
 manifest         |  12 +-
 manifest.uuid    |   2 +-
 3 files changed, 188 insertions(+), 164 deletions(-)

diff --git a/ext/misc/vfskv.c b/ext/misc/vfskv.c
index 9897cd8185..05259eaa43 100644
--- a/ext/misc/vfskv.c
+++ b/ext/misc/vfskv.c
@@ -28,11 +28,15 @@ SQLITE_EXTENSION_INIT1
 /*****************************************************************************
 ** Debugging logic
 */
+
+/* KVVFS_TRACE() is used for tracing calls to kvstorage routines. */
 #if 0
 #define KVVFS_TRACE(X)  printf X;
 #else
 #define KVVFS_TRACE(X)
 #endif
+
+/* KVVFS_LOG() is used for tracing calls to the VFS interface */
 #if 0
 #define KVVFS_LOG(X)  printf X;
 #else
@@ -88,11 +92,16 @@ struct KVVfsFile {
 ** Methods for KVVfsFile
 */
 static int kvvfsClose(sqlite3_file*);
-static int kvvfsRead(sqlite3_file*, void*, int iAmt, sqlite3_int64 iOfst);
-static int kvvfsWrite(sqlite3_file*,const void*,int iAmt, sqlite3_int64 iOfst);
-static int kvvfsTruncate(sqlite3_file*, sqlite3_int64 size);
-static int kvvfsSync(sqlite3_file*, int flags);
-static int kvvfsFileSize(sqlite3_file*, sqlite3_int64 *pSize);
+static int kvvfsReadDb(sqlite3_file*, void*, int iAmt, sqlite3_int64 iOfst);
+static int kvvfsReadJrnl(sqlite3_file*, void*, int iAmt, sqlite3_int64 iOfst);
+static int kvvfsWriteDb(sqlite3_file*,const void*,int iAmt, sqlite3_int64);
+static int kvvfsWriteJrnl(sqlite3_file*,const void*,int iAmt, sqlite3_int64);
+static int kvvfsTruncateDb(sqlite3_file*, sqlite3_int64 size);
+static int kvvfsTruncateJrnl(sqlite3_file*, sqlite3_int64 size);
+static int kvvfsSyncDb(sqlite3_file*, int flags);
+static int kvvfsSyncJrnl(sqlite3_file*, int flags);
+static int kvvfsFileSizeDb(sqlite3_file*, sqlite3_int64 *pSize);
+static int kvvfsFileSizeJrnl(sqlite3_file*, sqlite3_int64 *pSize);
 static int kvvfsLock(sqlite3_file*, int);
 static int kvvfsUnlock(sqlite3_file*, int);
 static int kvvfsCheckReservedLock(sqlite3_file*, int *pResOut);
@@ -139,14 +148,40 @@ static KVVfsVfs kvvfs_vfs = {
   0
 };
 
-static sqlite3_io_methods kvvfs_io_methods = {
+/* Methods for sqlite3_file objects referencing a database file
+*/
+static sqlite3_io_methods kvvfs_db_io_methods = {
   1,                              /* iVersion */
   kvvfsClose,                     /* xClose */
-  kvvfsRead,                      /* xRead */
-  kvvfsWrite,                     /* xWrite */
-  kvvfsTruncate,                  /* xTruncate */
-  kvvfsSync,                      /* xSync */
-  kvvfsFileSize,                  /* xFileSize */
+  kvvfsReadDb,                    /* xRead */
+  kvvfsWriteDb,                   /* xWrite */
+  kvvfsTruncateDb,                /* xTruncate */
+  kvvfsSyncDb,                    /* xSync */
+  kvvfsFileSizeDb,                /* xFileSize */
+  kvvfsLock,                      /* xLock */
+  kvvfsUnlock,                    /* xUnlock */
+  kvvfsCheckReservedLock,         /* xCheckReservedLock */
+  kvvfsFileControl,               /* xFileControl */
+  kvvfsSectorSize,                /* xSectorSize */
+  kvvfsDeviceCharacteristics,     /* xDeviceCharacteristics */
+  0,                              /* xShmMap */
+  0,                              /* xShmLock */
+  0,                              /* xShmBarrier */
+  0,                              /* xShmUnmap */
+  0,                              /* xFetch */
+  0                               /* xUnfetch */
+};
+
+/* Methods for sqlite3_file objects referencing a rollback journal
+*/
+static sqlite3_io_methods kvvfs_jrnl_io_methods = {
+  1,                              /* iVersion */
+  kvvfsClose,                     /* xClose */
+  kvvfsReadJrnl,                  /* xRead */
+  kvvfsWriteJrnl,                 /* xWrite */
+  kvvfsTruncateJrnl,              /* xTruncate */
+  kvvfsSyncJrnl,                  /* xSync */
+  kvvfsFileSizeJrnl,              /* xFileSize */
   kvvfsLock,                      /* xLock */
   kvvfsUnlock,                    /* xUnlock */
   kvvfsCheckReservedLock,         /* xCheckReservedLock */
@@ -200,8 +235,9 @@ static int kvstorageWrite(
   kvstorageMakeKey(pStore, zKey);
   fd = fopen(pStore->zKey, "wb");
   if( fd ){
-    KVVFS_TRACE(("KVVFS-WRITE  %-14s (%d) %.30s\n", pStore->zKey,
-                 (int)strlen(zData), zData));
+    KVVFS_TRACE(("KVVFS-WRITE  %-10s (%d) %.50s%s\n", pStore->zKey,
+                 (int)strlen(zData), zData,
+                 strlen(zData)>50 ? "..." : ""));
     fputs(zData, fd);
     fclose(fd);
     return 0;
@@ -215,7 +251,7 @@ static int kvstorageWrite(
 static int kvstorageDelete(KVStorage *pStore, const char *zKey){
   kvstorageMakeKey(pStore, zKey);
   unlink(pStore->zKey);
-  KVVFS_TRACE(("KVVFS-DELETE %-14s\n", pStore->zKey));
+  KVVFS_TRACE(("KVVFS-DELETE %-10s\n", pStore->zKey));
   return 0;
 }
 
@@ -244,14 +280,14 @@ static int kvstorageRead(
    || stat(pStore->zKey, &buf)!=0
    || !S_ISREG(buf.st_mode)
   ){
-    KVVFS_TRACE(("KVVFS-READ   %-14s (-1)\n", pStore->zKey));
+    KVVFS_TRACE(("KVVFS-READ   %-10s (-1)\n", pStore->zKey));
     return -1;
   }
   if( nBuf<0 ){
     return (int)buf.st_size;
   }else if( nBuf==1 ){
     zBuf[0] = 0;
-    KVVFS_TRACE(("KVVFS-READ   %-14s (%d)\n", pStore->zKey,
+    KVVFS_TRACE(("KVVFS-READ   %-10s (%d)\n", pStore->zKey,
                  (int)buf.st_size));
     return (int)buf.st_size;
   }
@@ -260,49 +296,20 @@ static int kvstorageRead(
   }
   fd = fopen(pStore->zKey, "rb");
   if( fd==0 ){
-    KVVFS_TRACE(("KVVFS-READ   %-14s (-1)\n", pStore->zKey));
+    KVVFS_TRACE(("KVVFS-READ   %-10s (-1)\n", pStore->zKey));
     return -1;
   }else{
     sqlite3_int64 n = fread(zBuf, 1, nBuf-1, fd);
     fclose(fd);
     zBuf[n] = 0;
-    KVVFS_TRACE(("KVVFS-READ   %-14s (%lld) %.30s\n", pStore->zKey,
-                 n, zBuf));
+    KVVFS_TRACE(("KVVFS-READ   %-10s (%lld) %.50s%s\n", pStore->zKey,
+                 n, zBuf, n>50 ? "..." : ""));
     return (int)n;
   }
 }
 
+/****** Utility subroutines ************************************************/
 
-/****** The main VFS code **************************************************/
-
-/*
-** Close an kvvfs-file.
-*/
-static int kvvfsClose(sqlite3_file *pProtoFile){
-  KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
-  KVVfsVfs *pVfs = pFile->pVfs;
-
-  KVVFS_LOG(("xClose %s\n", pFile->isJournal ? "journal" : "db"));
-  if( pVfs->pFiles==pFile ){
-    pVfs->pFiles = pFile->pNext;
-    if( pVfs->pFiles==0 ){
-      kvstorageClose(pVfs->pStore);
-      pVfs->pStore = 0;
-    }
-  }else{
-    KVVfsFile *pX = pVfs->pFiles;
-    while( 1 ){
-      assert( pX );
-      if( pX->pNext==pFile ){
-        pX->pNext = pFile->pNext;
-        break;
-      }
-      pX = pX->pNext; 
-    }
-  }
-  sqlite3_free(pFile->aJrnl);
-  return SQLITE_OK;
-}
 
 /*
 ** Encode binary into the text encoded used to persist on disk.
@@ -311,6 +318,20 @@ static int kvvfsClose(sqlite3_file *pProtoFile){
 **
 ** Return the actual length of the encoded text, not counting the
 ** zero terminator at the end.
+**
+** Encoding format
+** ---------------
+**
+**   *  Non-zero bytes are encoded as upper-case hexadecimal
+**
+**   *  A sequence of one or more zero-bytes that are not at the
+**      beginning of the buffer are encoded as a little-endian
+**      base-26 number using a..z.  "a" means 0.  "b" means 1,
+**      "z" means 25.  "ab" means 26.  "ac" means 52.  And so forth.
+**
+**   *  Because there is no overlap between the encoding characters
+**      of hexadecimal and base-26 numbers, it is always clear where
+**      one stops and the next begins.
 */
 static int kvvfsEncode(const char *aData, int nData, char *aOut){
   int i, j;
@@ -384,9 +405,11 @@ static int kvvfsDecode(const char *aIn, char *aOut, int nOut){
 ** and store the decoding there.  Or leave pFile->aJrnl set to NULL
 ** if an error is encountered.
 **
-** The first few characters of the text encoding will be a
+** The first few characters of the text encoding will be a little-endian
 ** base-26 number (digits a..z) that is the total number of bytes
-** in the decoding.  Use this number to size the initial allocation.
+** in the decoded journal file image.  This base-26 number is followed
+** by a single space, then the encoding of the journal.  The space
+** separator is required to act as a terminator for the base-26 number.
 */
 static void kvvfsDecodeJournal(
   KVVfsFile *pFile,      /* Store decoding in pFile->aJrnl */
@@ -397,10 +420,9 @@ static void kvvfsDecodeJournal(
   int c, i, mult;
   i = 0;
   mult = 1;
-  while( (c = zTxt[i])>='a' && c<='z' ){
+  while( (c = zTxt[i++])>='a' && c<='z' ){
     n += (zTxt[i] - 'a')*mult;
     mult *= 26;
-    i++;
   }
   sqlite3_free(pFile->aJrnl);
   pFile->aJrnl = sqlite3_malloc64( n );
@@ -417,26 +439,73 @@ static void kvvfsDecodeJournal(
   }
 }
 
+/*
+** Read or write the "sz" element, containing the database file size.
+*/
+static sqlite3_int64 kvvfsReadFileSize(KVVfsFile *pFile){
+  char zData[50];
+  zData[0] = 0;
+  kvstorageRead(pFile->pVfs->pStore, "sz", zData, sizeof(zData)-1);
+  return strtoll(zData, 0, 0);
+}
+static void kvvfsWriteFileSize(KVVfsFile *pFile, sqlite3_int64 sz){
+  char zData[50];
+  sqlite3_snprintf(sizeof(zData), zData, "%lld", sz);
+  kvstorageWrite(pFile->pVfs->pStore, "sz", zData);
+}
+
+/****** VFS methods ********************************************************/
+
+/*
+** Close an kvvfs-file.
+*/
+static int kvvfsClose(sqlite3_file *pProtoFile){
+  KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
+  KVVfsVfs *pVfs = pFile->pVfs;
+
+  KVVFS_LOG(("xClose %s\n", pFile->isJournal ? "journal" : "db"));
+  if( pVfs->pFiles==pFile ){
+    pVfs->pFiles = pFile->pNext;
+    if( pVfs->pFiles==0 ){
+      kvstorageClose(pVfs->pStore);
+      pVfs->pStore = 0;
+    }
+  }else{
+    KVVfsFile *pX = pVfs->pFiles;
+    while( 1 ){
+      assert( pX );
+      if( pX->pNext==pFile ){
+        pX->pNext = pFile->pNext;
+        break;
+      }
+      pX = pX->pNext; 
+    }
+  }
+  sqlite3_free(pFile->aJrnl);
+  return SQLITE_OK;
+}
+
 /*
 ** Read from the -journal file.
 */
-static int kvvfsReadFromJournal(
-  KVVfsFile *pFile, 
+static int kvvfsReadJrnl(
+  sqlite3_file *pProtoFile,
   void *zBuf, 
   int iAmt, 
   sqlite_int64 iOfst
 ){
+  KVVfsFile *pFile = (KVVfsFile*)pProtoFile;
   assert( pFile->isJournal );
   KVVFS_LOG(("xRead('journal',%d,%lld)\n", iAmt, iOfst));
   if( pFile->aJrnl==0 ){
-    int szTxt = kvstorageRead(pFile->pVfs->pStore, "journal", 0, 0);
+    int szTxt = kvstorageRead(pFile->pVfs->pStore, "jrnl", 0, 0);
     char *aTxt;
     if( szTxt<=4 ){
       return SQLITE_IOERR;
     }
     aTxt = sqlite3_malloc64( szTxt+1 );
     if( aTxt==0 ) return SQLITE_NOMEM;
-    kvstorageRead(pFile->pVfs->pStore, "journal", aTxt, szTxt+1);
+    kvstorageRead(pFile->pVfs->pStore, "jrnl", aTxt, szTxt+1);
     kvvfsDecodeJournal(pFile, aTxt, szTxt);
     sqlite3_free(aTxt);
     if( pFile->aJrnl==0 ) return SQLITE_IOERR;
@@ -451,12 +520,13 @@ static int kvvfsReadFromJournal(
 /*
 ** Read from the database file.
 */
-static int kvvfsReadFromDb(
-  KVVfsFile *pFile, 
+static int kvvfsReadDb(
+  sqlite3_file *pProtoFile,
   void *zBuf, 
   int iAmt, 
   sqlite_int64 iOfst
 ){
+  KVVfsFile *pFile = (KVVfsFile*)pProtoFile;
   unsigned int pgno;
   int got, n;
   char zKey[30];
@@ -476,7 +546,7 @@ static int kvvfsReadFromDb(
   }else{
     pgno = 1;
   }
-  sqlite3_snprintf(sizeof(zKey), zKey, "pg-%u", pgno);
+  sqlite3_snprintf(sizeof(zKey), zKey, "%u", pgno);
   got = kvstorageRead(pFile->pVfs->pStore, zKey, aData, sizeof(aData)-1);
   if( got<0 ){
     n = 0;
@@ -502,50 +572,16 @@ static int kvvfsReadFromDb(
 }
 
 
-/*
-** Read data from an kvvfs-file.
-*/
-static int kvvfsRead(
-  sqlite3_file *pProtoFile, 
-  void *zBuf, 
-  int iAmt, 
-  sqlite_int64 iOfst
-){
-  int rc;
-  KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
-  if( pFile->isJournal ){
-    rc = kvvfsReadFromJournal(pFile,zBuf,iAmt,iOfst);
-  }else{
-    rc = kvvfsReadFromDb(pFile,zBuf,iAmt,iOfst);
-  }
-  KVVFS_LOG(("xRead result: 0x%x\n", rc));
-  return rc;
-}
-
-/*
-** Read or write the "sz" element, containing the database file size.
-*/
-static sqlite3_int64 kvvfsReadFileSize(KVVfsFile *pFile){
-  char zData[50];
-  zData[0] = 0;
-  kvstorageRead(pFile->pVfs->pStore, "sz", zData, sizeof(zData)-1);
-  return strtoll(zData, 0, 0);
-}
-static void kvvfsWriteFileSize(KVVfsFile *pFile, sqlite3_int64 sz){
-  char zData[50];
-  sqlite3_snprintf(sizeof(zData), zData, "%lld", sz);
-  kvstorageWrite(pFile->pVfs->pStore, "sz", zData);
-}
-
 /*
 ** Write into the -journal file.
 */
-static int kvvfsWriteToJournal(
-  KVVfsFile *pFile, 
+static int kvvfsWriteJrnl(
+  sqlite3_file *pProtoFile,
   const void *zBuf, 
   int iAmt, 
   sqlite_int64 iOfst
 ){
+  KVVfsFile *pFile = (KVVfsFile*)pProtoFile;
   sqlite3_int64 iEnd = iOfst+iAmt;
   KVVFS_LOG(("xWrite('journal',%d,%lld)\n", iAmt, iOfst));
   if( iEnd>=0x10000000 ) return SQLITE_FULL;
@@ -567,12 +603,13 @@ static int kvvfsWriteToJournal(
 /*
 ** Write into the database file.
 */
-static int kvvfsWriteToDb(
-  KVVfsFile *pFile, 
+static int kvvfsWriteDb(
+  sqlite3_file *pProtoFile,
   const void *zBuf, 
   int iAmt, 
   sqlite_int64 iOfst
 ){
+  KVVfsFile *pFile = (KVVfsFile*)pProtoFile;
   unsigned int pgno;
   char zKey[30];
   char aData[131073];
@@ -580,7 +617,7 @@ static int kvvfsWriteToDb(
   assert( iAmt>=512 && iAmt<=65536 );
   assert( (iAmt & (iAmt-1))==0 );
   pgno = 1 + iOfst/iAmt;
-  sqlite3_snprintf(sizeof(zKey), zKey, "pg-%u", pgno);
+  sqlite3_snprintf(sizeof(zKey), zKey, "%u", pgno);
   kvvfsEncode(zBuf, iAmt, aData);
   kvstorageWrite(pFile->pVfs->pStore, zKey, aData);
   if( iOfst+iAmt > pFile->szDb ){
@@ -589,41 +626,21 @@ static int kvvfsWriteToDb(
   return SQLITE_OK;
 }
 
-
-/*
-** Write data into the kvvfs-file.
-*/
-static int kvvfsWrite(
-  sqlite3_file *pProtoFile, 
-  const void *zBuf, 
-  int iAmt, 
-  sqlite_int64 iOfst
-){
-  int rc;
-  KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
-  if( pFile->isJournal ){
-    rc = kvvfsWriteToJournal(pFile,zBuf,iAmt,iOfst);
-  }else{
-    rc = kvvfsWriteToDb(pFile,zBuf,iAmt,iOfst);
-  }
-  KVVFS_LOG(("xWrite result: 0x%x\n", rc));
-  return rc;
-}
-
 /*
 ** Truncate an kvvfs-file.
 */
-static int kvvfsTruncate(sqlite3_file *pProtoFile, sqlite_int64 size){
+static int kvvfsTruncateJrnl(sqlite3_file *pProtoFile, sqlite_int64 size){
+  KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
+  KVVFS_LOG(("xTruncate('journal',%lld)\n", size));
+  assert( size==0 );
+  kvstorageDelete(pFile->pVfs->pStore, "jrnl");
+  sqlite3_free(pFile->aJrnl);
+  pFile->aJrnl = 0;
+  pFile->nJrnl = 0;
+  return SQLITE_OK;
+}
+static int kvvfsTruncateDb(sqlite3_file *pProtoFile, sqlite_int64 size){
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
-  if( pFile->isJournal ){
-    KVVFS_LOG(("xTruncate('journal',%lld)\n", size));
-    assert( size==0 );
-    kvstorageDelete(pFile->pVfs->pStore, "journal");
-    sqlite3_free(pFile->aJrnl);
-    pFile->aJrnl = 0;
-    pFile->nJrnl = 0;
-    return SQLITE_OK;
-  }
   if( pFile->szDb>size
    && pFile->szPage>0 
    && (size % pFile->szPage)==0
@@ -634,7 +651,7 @@ static int kvvfsTruncate(sqlite3_file *pProtoFile, sqlite_int64 size){
     pgno = 1 + size/pFile->szPage;
     pgnoMax = 2 + pFile->szDb/pFile->szPage;
     while( pgno<=pgnoMax ){
-      sqlite3_snprintf(sizeof(zKey), zKey, "pg-%u", pgno);
+      sqlite3_snprintf(sizeof(zKey), zKey, "%u", pgno);
       kvstorageDelete(pFile->pVfs->pStore, zKey);
       pgno++;
     }
@@ -648,20 +665,13 @@ static int kvvfsTruncate(sqlite3_file *pProtoFile, sqlite_int64 size){
 /*
 ** Sync an kvvfs-file.
 */
-static int kvvfsSync(sqlite3_file *pProtoFile, int flags){
+static int kvvfsSyncJrnl(sqlite3_file *pProtoFile, int flags){
   int i, n;
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
   char *zOut;
-  if( !pFile->isJournal ){
-    KVVFS_LOG(("xSync('db')\n"));
-    if( pFile->szDb>0 ){
-      kvvfsWriteFileSize(pFile, pFile->szDb);
-    }
-    return SQLITE_OK;
-  }
   KVVFS_LOG(("xSync('journal')\n"));
   if( pFile->nJrnl<=0 ){
-     return kvvfsTruncate(pProtoFile, 0);
+    return kvvfsTruncateJrnl(pProtoFile, 0);
   }
   zOut = sqlite3_malloc64( pFile->nJrnl*2 + 50 );
   if( zOut==0 ){
@@ -673,29 +683,38 @@ static int kvvfsSync(sqlite3_file *pProtoFile, int flags){
     zOut[i++] = 'a' + (n%26);
     n /= 26;
   }while( n>0 );
+  zOut[i++] = ' ';
   kvvfsEncode(pFile->aJrnl, pFile->nJrnl, &zOut[i]);
-  kvstorageWrite(pFile->pVfs->pStore, "journal", zOut);
+  kvstorageWrite(pFile->pVfs->pStore, "jrnl", zOut);
   sqlite3_free(zOut);
   return SQLITE_OK;
 }
+static int kvvfsSyncDb(sqlite3_file *pProtoFile, int flags){
+  KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
+  KVVFS_LOG(("xSync('db')\n"));
+  if( pFile->szDb>0 ){
+    kvvfsWriteFileSize(pFile, pFile->szDb);
+  }
+  return SQLITE_OK;
+}
 
 /*
 ** Return the current file-size of an kvvfs-file.
 */
-static int kvvfsFileSize(sqlite3_file *pProtoFile, sqlite_int64 *pSize){
+static int kvvfsFileSizeJrnl(sqlite3_file *pProtoFile, sqlite_int64 *pSize){
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
-  if( pFile->isJournal ){
-    KVVFS_LOG(("xFileSize('journal')\n"));
-    *pSize = pFile->nJrnl;
+  KVVFS_LOG(("xFileSize('journal')\n"));
+  *pSize = pFile->nJrnl;
+  return SQLITE_OK;
+}
+static int kvvfsFileSizeDb(sqlite3_file *pProtoFile, sqlite_int64 *pSize){
+  KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
+  KVVFS_LOG(("xFileSize('db')\n"));
+  if( pFile->szDb>=0 ){
+    *pSize = pFile->szDb;
   }else{
-    KVVFS_LOG(("xFileSize('db')\n"));
-    if( pFile->szDb>=0 ){
-      *pSize = pFile->szDb;
-    }else{
-      *pSize = kvvfsReadFileSize(pFile);
-    }
+    *pSize = kvvfsReadFileSize(pFile);
   }
-  KVVFS_LOG(("xFileSize: %lld\n", *pSize));
   return SQLITE_OK;
 }
 
@@ -772,10 +791,15 @@ static int kvvfsOpen(
   KVVFS_LOG(("xOpen(\"%s\")\n", zName));
   pFile->aJrnl = 0;
   pFile->nJrnl = 0;
-  pFile->isJournal = sqlite3_strglob("*-journal", zName)==0;
+  if( sqlite3_strglob("*-journal", zName)==0 ){
+    pFile->isJournal = 1;
+    pFile->base.pMethods = &kvvfs_jrnl_io_methods;
+  }else{
+    pFile->isJournal = 0;
+    pFile->base.pMethods = &kvvfs_db_io_methods;
+  }
   pFile->szPage = -1;
   pFile->szDb = -1;
-  pFile->base.pMethods = &kvvfs_io_methods;
   pFile->pVfs = pVfs;
   if( pVfs->pFiles==0 ){
     pVfs->pStore = kvstorageOpen();
@@ -793,7 +817,7 @@ static int kvvfsOpen(
 static int kvvfsDelete(sqlite3_vfs *pVfs, const char *zPath, int dirSync){
   KVVfsVfs *p = (KVVfsVfs*)pVfs;
   if( sqlite3_strglob("*-journal",zPath)==0 ){
-    kvstorageDelete(p->pStore, "journal");
+    kvstorageDelete(p->pStore, "jrnl");
   }
   return SQLITE_OK;
 }
@@ -811,7 +835,7 @@ static int kvvfsAccess(
   KVVfsVfs *pVfs = (KVVfsVfs*)pProtoVfs;
   KVVFS_LOG(("xAccess(\"%s\")\n", zPath));
   if( sqlite3_strglob("*-journal", zPath)==0 ){
-    *pResOut = kvstorageRead(pVfs->pStore, "journal", 0, 0)>0;
+    *pResOut = kvstorageRead(pVfs->pStore, "jrnl", 0, 0)>0;
   }else if( sqlite3_strglob("*-wal", zPath)==0 ){
     *pResOut = 0;
   }else{
diff --git a/manifest b/manifest
index 0db4723321..0a3a992338 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Simple\sreading\sand\swriting\snow\sworks.
-D 2022-09-09T11:41:54.677
+C Separate\ssqlite3_io_methods\sobjects\sfor\sdatabase\sfiles\sand\sjournals.
+D 2022-09-09T14:22:41.989
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -335,7 +335,7 @@ F ext/misc/uint.c 053fed3bce2e89583afcd4bf804d75d659879bbcedac74d0fa9ed548839a03
 F ext/misc/unionvtab.c 36237f0607ca954ac13a4a0e2d2ac40c33bc6e032a5f55f431713061ef1625f9
 F ext/misc/urifuncs.c f71360d14fa9e7626b563f1f781c6148109462741c5235ac63ae0f8917b9c751
 F ext/misc/uuid.c 5bb2264c1b64d163efa46509544fd7500cb8769cb7c16dd52052da8d961505cf
-F ext/misc/vfskv.c 8c0d3af0b68fdee50ff46b64bec28d693805bd5fc5e26605e198915e9392d6e3
+F ext/misc/vfskv.c 7b2fa888cd33f41a7a3821eec10ed258fe029af41ad788a43856958c4d216432
 F ext/misc/vfslog.c 3932ab932eeb2601dbc4447cb14d445aaa9fbe43b863ef5f014401c3420afd20
 F ext/misc/vfsstat.c 474d08efc697b8eba300082cb1eb74a5f0f3df31ed257db1cb07e72ab0e53dfb
 F ext/misc/vtablog.c 5538acd0c8ddaae372331bee11608d76973436b77d6a91e8635cfc9432fba5ae
@@ -2001,8 +2001,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 2e38726f46918b28b5c638967f960a20afd3fe84ad245f3bea39a1d64980435b
-R d99171917ec9b13f78c647c76b29147e
+P 00845ac9ef2616e90f5f6a20da3dd040fa8bdcfe73f72fe9c06039561150a82d
+R 460848ff6f3cd63ef5eccab59824c77b
 U drh
-Z d5b6013a0fd62dab0ae32db15d37fb8f
+Z 26961af5f4b759d7a43ac0a5cf8d117b
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 43d0014bd4..581c44b250 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-00845ac9ef2616e90f5f6a20da3dd040fa8bdcfe73f72fe9c06039561150a82d
\ No newline at end of file
+74fbf6c2a97729e481d5562344e960d0c237aeb1f07240262d32a24fb1f4b5a3
\ No newline at end of file

From 25f62508f5f45686e282893b518196a41d8a60e4 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Fri, 9 Sep 2022 16:16:33 +0000
Subject: [PATCH 075/428] Database must be named either "local" or "session". 
 Each has a distinct namespace.

FossilOrigin-Name: c8e41279294ea7c2f041c7d4cbbd85fce47d55f2f56180ca837316f7dfd75237
---
 ext/misc/vfskv.c | 257 ++++++++++++++++++++---------------------------
 manifest         |  12 +--
 manifest.uuid    |   2 +-
 3 files changed, 118 insertions(+), 153 deletions(-)

diff --git a/ext/misc/vfskv.c b/ext/misc/vfskv.c
index 05259eaa43..fee190f256 100644
--- a/ext/misc/vfskv.c
+++ b/ext/misc/vfskv.c
@@ -47,40 +47,23 @@ SQLITE_EXTENSION_INIT1
 /*****************************************************************************
 ** The low-level storage engine
 */
-typedef struct KVStorage KVStorage;
-struct KVStorage {
-  char *zDir;
-  char zKey[50];
-};
-
-static KVStorage *kvstorageOpen(void);
-static void kvstorageClose(KVStorage*);
-static int kvstorageWrite(KVStorage*, const char *zKey, const char *zData);
-static int kvstorageDelete(KVStorage*, const char *zKey);
-static int kvstorageRead(KVStorage*, const char *zKey, char *zBuf, int nBuf);
+#define KVSTORAGE_KEY_SZ  24
+static int kvstorageWrite(const char*, const char *zKey, const char *zData);
+static int kvstorageDelete(const char*, const char *zKey);
+static int kvstorageRead(const char*, const char *zKey, char *zBuf, int nBuf);
 
 
 /*
-** Forward declaration of objects used by this utility
+** Forward declaration of objects used by this VFS implementation
 */
-typedef struct KVVfsVfs KVVfsVfs;
 typedef struct KVVfsFile KVVfsFile;
 
-
-/* All information about the database */
-struct KVVfsVfs {
-  sqlite3_vfs base;               /* VFS methods */
-  KVStorage *pStore;              /* Single command KV storage object */
-  KVVfsFile *pFiles;              /* List of open KVVfsFile objects */
-};
-
 /* A single open file.  There are only two files represented by this
 ** VFS - the database and the rollback journal.
 */
 struct KVVfsFile {
   sqlite3_file base;              /* IO methods */
-  KVVfsVfs *pVfs;                 /* The VFS to which this file belongs */
-  KVVfsFile *pNext;               /* Next in list of all files */
+  const char *zClass;             /* Storage class */
   int isJournal;                  /* True if this is a journal file */
   unsigned int nJrnl;             /* Space allocated for aJrnl[] */
   char *aJrnl;                    /* Journal content */
@@ -110,7 +93,7 @@ static int kvvfsSectorSize(sqlite3_file*);
 static int kvvfsDeviceCharacteristics(sqlite3_file*);
 
 /*
-** Methods for KVVfsVfs
+** Methods for sqlite3_vfs
 */
 static int kvvfsOpen(sqlite3_vfs*, const char *, sqlite3_file*, int , int *);
 static int kvvfsDelete(sqlite3_vfs*, const char *zName, int syncDir);
@@ -122,30 +105,26 @@ static int kvvfsSleep(sqlite3_vfs*, int microseconds);
 static int kvvfsCurrentTime(sqlite3_vfs*, double*);
 static int kvvfsCurrentTimeInt64(sqlite3_vfs*, sqlite3_int64*);
 
-static KVVfsVfs kvvfs_vfs = {
-  {
-    1,                            /* iVersion */
-    sizeof(KVVfsFile),            /* szOsFile */
-    1024,                         /* mxPathname */
-    0,                            /* pNext */
-    "kvvfs",                      /* zName */
-    0,                            /* pAppData */
-    kvvfsOpen,                    /* xOpen */
-    kvvfsDelete,                  /* xDelete */
-    kvvfsAccess,                  /* xAccess */
-    kvvfsFullPathname,            /* xFullPathname */
-    kvvfsDlOpen,                  /* xDlOpen */
-    0,                            /* xDlError */
-    0,                            /* xDlSym */
-    0,                            /* xDlClose */
-    kvvfsRandomness,              /* xRandomness */
-    kvvfsSleep,                   /* xSleep */
-    kvvfsCurrentTime,             /* xCurrentTime */
-    0,                            /* xGetLastError */
-    kvvfsCurrentTimeInt64         /* xCurrentTimeInt64 */
-  },
-  0,
-  0
+static sqlite3_vfs kvvfs_vfs = {
+  1,                              /* iVersion */
+  sizeof(KVVfsFile),              /* szOsFile */
+  1024,                           /* mxPathname */
+  0,                              /* pNext */
+  "kvvfs",                        /* zName */
+  0,                              /* pAppData */
+  kvvfsOpen,                      /* xOpen */
+  kvvfsDelete,                    /* xDelete */
+  kvvfsAccess,                    /* xAccess */
+  kvvfsFullPathname,              /* xFullPathname */
+  kvvfsDlOpen,                    /* xDlOpen */
+  0,                              /* xDlError */
+  0,                              /* xDlSym */
+  0,                              /* xDlClose */
+  kvvfsRandomness,                /* xRandomness */
+  kvvfsSleep,                     /* xSleep */
+  kvvfsCurrentTime,               /* xCurrentTime */
+  0,                              /* xGetLastError */
+  kvvfsCurrentTimeInt64           /* xCurrentTimeInt64 */
 };
 
 /* Methods for sqlite3_file objects referencing a database file
@@ -198,27 +177,16 @@ static sqlite3_io_methods kvvfs_jrnl_io_methods = {
 
 /****** Storage subsystem **************************************************/
 
-/* Allocate a new storage subsystem.
-** Return NULL if OOM
-*/
-static KVStorage *kvstorageOpen(void){
-  KVStorage *pStore;
-  pStore = sqlite3_malloc64( sizeof(*pStore) );
-  if( pStore==0 ) return 0;
-  memset(pStore, 0, sizeof(*pStore));
-  return pStore;
-}
-
-/* Free all resources associated with the storage subsystem */
-static void kvstorageClose(KVStorage *pStore){
-  sqlite3_free(pStore);
-}
 
 /* Expand the key name with an appropriate prefix and put the result
 ** in pStore->zKey[]
 */
-static void kvstorageMakeKey(KVStorage *pStore, const char *zKey){
-  sqlite3_snprintf(sizeof(pStore->zKey), pStore->zKey, "kvvfs-%s", zKey);
+static void kvstorageMakeKey(
+  const char *zClass,
+  const char *zKeyIn,
+  char *zKeyOut
+){
+  sqlite3_snprintf(KVSTORAGE_KEY_SZ, zKeyOut, "%s-%s", zClass, zKeyIn);
 }
 
 /* Write content into a key.  zKey is of limited size.  zData should be
@@ -227,15 +195,16 @@ static void kvstorageMakeKey(KVStorage *pStore, const char *zKey){
 ** Return the number of errors.
 */
 static int kvstorageWrite(
-  KVStorage *pStore,
+  const char *zClass,
   const char *zKey,
   const char *zData
 ){
   FILE *fd;
-  kvstorageMakeKey(pStore, zKey);
-  fd = fopen(pStore->zKey, "wb");
+  char zXKey[KVSTORAGE_KEY_SZ];
+  kvstorageMakeKey(zClass, zKey, zXKey);
+  fd = fopen(zXKey, "wb");
   if( fd ){
-    KVVFS_TRACE(("KVVFS-WRITE  %-10s (%d) %.50s%s\n", pStore->zKey,
+    KVVFS_TRACE(("KVVFS-WRITE  %-15s (%d) %.50s%s\n", zXKey,
                  (int)strlen(zData), zData,
                  strlen(zData)>50 ? "..." : ""));
     fputs(zData, fd);
@@ -248,10 +217,11 @@ static int kvstorageWrite(
 
 /* Delete a key
 */
-static int kvstorageDelete(KVStorage *pStore, const char *zKey){
-  kvstorageMakeKey(pStore, zKey);
-  unlink(pStore->zKey);
-  KVVFS_TRACE(("KVVFS-DELETE %-10s\n", pStore->zKey));
+static int kvstorageDelete(const char *zClass, const char *zKey){
+  char zXKey[KVSTORAGE_KEY_SZ];
+  kvstorageMakeKey(zClass, zKey, zXKey);
+  unlink(zXKey);
+  KVVFS_TRACE(("KVVFS-DELETE %-15s\n", zXKey));
   return 0;
 }
 
@@ -268,41 +238,42 @@ static int kvstorageDelete(KVStorage *pStore, const char *zKey){
 ** actually reading it.
 */
 static int kvstorageRead(
-  KVStorage *pStore,
+  const char *zClass,
   const char *zKey,
   char *zBuf,
   int nBuf
 ){
   FILE *fd;
   struct stat buf;
-  kvstorageMakeKey(pStore, zKey);
-  if( access(pStore->zKey, R_OK)!=0
-   || stat(pStore->zKey, &buf)!=0
+  char zXKey[KVSTORAGE_KEY_SZ];
+  kvstorageMakeKey(zClass, zKey, zXKey);
+  if( access(zXKey, R_OK)!=0
+   || stat(zXKey, &buf)!=0
    || !S_ISREG(buf.st_mode)
   ){
-    KVVFS_TRACE(("KVVFS-READ   %-10s (-1)\n", pStore->zKey));
+    KVVFS_TRACE(("KVVFS-READ   %-15s (-1)\n", zXKey));
     return -1;
   }
   if( nBuf<0 ){
     return (int)buf.st_size;
   }else if( nBuf==1 ){
     zBuf[0] = 0;
-    KVVFS_TRACE(("KVVFS-READ   %-10s (%d)\n", pStore->zKey,
+    KVVFS_TRACE(("KVVFS-READ   %-15s (%d)\n", zXKey,
                  (int)buf.st_size));
     return (int)buf.st_size;
   }
-  if( nBuf-1 > buf.st_size ){
+  if( nBuf > buf.st_size + 1 ){
     nBuf = buf.st_size + 1;
   }
-  fd = fopen(pStore->zKey, "rb");
+  fd = fopen(zXKey, "rb");
   if( fd==0 ){
-    KVVFS_TRACE(("KVVFS-READ   %-10s (-1)\n", pStore->zKey));
+    KVVFS_TRACE(("KVVFS-READ   %-15s (-1)\n", zXKey));
     return -1;
   }else{
     sqlite3_int64 n = fread(zBuf, 1, nBuf-1, fd);
     fclose(fd);
     zBuf[n] = 0;
-    KVVFS_TRACE(("KVVFS-READ   %-10s (%lld) %.50s%s\n", pStore->zKey,
+    KVVFS_TRACE(("KVVFS-READ   %-15s (%lld) %.50s%s\n", zXKey,
                  n, zBuf, n>50 ? "..." : ""));
     return (int)n;
   }
@@ -445,42 +416,25 @@ static void kvvfsDecodeJournal(
 static sqlite3_int64 kvvfsReadFileSize(KVVfsFile *pFile){
   char zData[50];
   zData[0] = 0;
-  kvstorageRead(pFile->pVfs->pStore, "sz", zData, sizeof(zData)-1);
+  kvstorageRead(pFile->zClass, "sz", zData, sizeof(zData)-1);
   return strtoll(zData, 0, 0);
 }
 static void kvvfsWriteFileSize(KVVfsFile *pFile, sqlite3_int64 sz){
   char zData[50];
   sqlite3_snprintf(sizeof(zData), zData, "%lld", sz);
-  kvstorageWrite(pFile->pVfs->pStore, "sz", zData);
+  kvstorageWrite(pFile->zClass, "sz", zData);
 }
 
-/****** VFS methods ********************************************************/
+/****** sqlite3_io_methods methods ******************************************/
 
 /*
 ** Close an kvvfs-file.
 */
 static int kvvfsClose(sqlite3_file *pProtoFile){
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
-  KVVfsVfs *pVfs = pFile->pVfs;
 
-  KVVFS_LOG(("xClose %s\n", pFile->isJournal ? "journal" : "db"));
-  if( pVfs->pFiles==pFile ){
-    pVfs->pFiles = pFile->pNext;
-    if( pVfs->pFiles==0 ){
-      kvstorageClose(pVfs->pStore);
-      pVfs->pStore = 0;
-    }
-  }else{
-    KVVfsFile *pX = pVfs->pFiles;
-    while( 1 ){
-      assert( pX );
-      if( pX->pNext==pFile ){
-        pX->pNext = pFile->pNext;
-        break;
-      }
-      pX = pX->pNext; 
-    }
-  }
+  KVVFS_LOG(("xClose %s %s\n", pFile->zClass, 
+             pFile->isJournal ? "journal" : "db"));
   sqlite3_free(pFile->aJrnl);
   return SQLITE_OK;
 }
@@ -496,16 +450,16 @@ static int kvvfsReadJrnl(
 ){
   KVVfsFile *pFile = (KVVfsFile*)pProtoFile;
   assert( pFile->isJournal );
-  KVVFS_LOG(("xRead('journal',%d,%lld)\n", iAmt, iOfst));
+  KVVFS_LOG(("xRead('%s-journal',%d,%lld)\n", pFile->zClass, iAmt, iOfst));
   if( pFile->aJrnl==0 ){
-    int szTxt = kvstorageRead(pFile->pVfs->pStore, "jrnl", 0, 0);
+    int szTxt = kvstorageRead(pFile->zClass, "jrnl", 0, -1);
     char *aTxt;
     if( szTxt<=4 ){
       return SQLITE_IOERR;
     }
     aTxt = sqlite3_malloc64( szTxt+1 );
     if( aTxt==0 ) return SQLITE_NOMEM;
-    kvstorageRead(pFile->pVfs->pStore, "jrnl", aTxt, szTxt+1);
+    kvstorageRead(pFile->zClass, "jrnl", aTxt, szTxt+1);
     kvvfsDecodeJournal(pFile, aTxt, szTxt);
     sqlite3_free(aTxt);
     if( pFile->aJrnl==0 ) return SQLITE_IOERR;
@@ -533,7 +487,7 @@ static int kvvfsReadDb(
   char aData[131073];
   assert( iOfst>=0 );
   assert( iAmt>=0 );
-  KVVFS_LOG(("xRead('db',%d,%lld)\n", iAmt, iOfst));
+  KVVFS_LOG(("xRead('%s-db',%d,%lld)\n", pFile->zClass, iAmt, iOfst));
   if( iOfst+iAmt>=512 ){
     if( (iOfst % iAmt)!=0 ){
       return SQLITE_IOERR_READ;
@@ -547,7 +501,7 @@ static int kvvfsReadDb(
     pgno = 1;
   }
   sqlite3_snprintf(sizeof(zKey), zKey, "%u", pgno);
-  got = kvstorageRead(pFile->pVfs->pStore, zKey, aData, sizeof(aData)-1);
+  got = kvstorageRead(pFile->zClass, zKey, aData, sizeof(aData)-1);
   if( got<0 ){
     n = 0;
   }else{
@@ -583,7 +537,7 @@ static int kvvfsWriteJrnl(
 ){
   KVVfsFile *pFile = (KVVfsFile*)pProtoFile;
   sqlite3_int64 iEnd = iOfst+iAmt;
-  KVVFS_LOG(("xWrite('journal',%d,%lld)\n", iAmt, iOfst));
+  KVVFS_LOG(("xWrite('%s-journal',%d,%lld)\n", pFile->zClass, iAmt, iOfst));
   if( iEnd>=0x10000000 ) return SQLITE_FULL;
   if( pFile->aJrnl==0 || pFile->nJrnl<iEnd ){
     char *aNew = sqlite3_realloc(pFile->aJrnl, iEnd);
@@ -613,13 +567,13 @@ static int kvvfsWriteDb(
   unsigned int pgno;
   char zKey[30];
   char aData[131073];
-  KVVFS_LOG(("xWrite('db',%d,%lld)\n", iAmt, iOfst));
+  KVVFS_LOG(("xWrite('%s-db',%d,%lld)\n", pFile->zClass, iAmt, iOfst));
   assert( iAmt>=512 && iAmt<=65536 );
   assert( (iAmt & (iAmt-1))==0 );
   pgno = 1 + iOfst/iAmt;
   sqlite3_snprintf(sizeof(zKey), zKey, "%u", pgno);
   kvvfsEncode(zBuf, iAmt, aData);
-  kvstorageWrite(pFile->pVfs->pStore, zKey, aData);
+  kvstorageWrite(pFile->zClass, zKey, aData);
   if( iOfst+iAmt > pFile->szDb ){
     pFile->szDb = iOfst + iAmt;
   }
@@ -631,9 +585,9 @@ static int kvvfsWriteDb(
 */
 static int kvvfsTruncateJrnl(sqlite3_file *pProtoFile, sqlite_int64 size){
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
-  KVVFS_LOG(("xTruncate('journal',%lld)\n", size));
+  KVVFS_LOG(("xTruncate('%s-journal',%lld)\n", pFile->zClass, size));
   assert( size==0 );
-  kvstorageDelete(pFile->pVfs->pStore, "jrnl");
+  kvstorageDelete(pFile->zClass, "jrnl");
   sqlite3_free(pFile->aJrnl);
   pFile->aJrnl = 0;
   pFile->nJrnl = 0;
@@ -647,12 +601,12 @@ static int kvvfsTruncateDb(sqlite3_file *pProtoFile, sqlite_int64 size){
   ){
     char zKey[50];
     unsigned int pgno, pgnoMax;
-    KVVFS_LOG(("xTruncate('db',%lld)\n", size));
+    KVVFS_LOG(("xTruncate('%s-db',%lld)\n", pFile->zClass, size));
     pgno = 1 + size/pFile->szPage;
     pgnoMax = 2 + pFile->szDb/pFile->szPage;
     while( pgno<=pgnoMax ){
       sqlite3_snprintf(sizeof(zKey), zKey, "%u", pgno);
-      kvstorageDelete(pFile->pVfs->pStore, zKey);
+      kvstorageDelete(pFile->zClass, zKey);
       pgno++;
     }
     pFile->szDb = size;
@@ -669,7 +623,7 @@ static int kvvfsSyncJrnl(sqlite3_file *pProtoFile, int flags){
   int i, n;
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
   char *zOut;
-  KVVFS_LOG(("xSync('journal')\n"));
+  KVVFS_LOG(("xSync('%s-journal')\n", pFile->zClass));
   if( pFile->nJrnl<=0 ){
     return kvvfsTruncateJrnl(pProtoFile, 0);
   }
@@ -685,13 +639,13 @@ static int kvvfsSyncJrnl(sqlite3_file *pProtoFile, int flags){
   }while( n>0 );
   zOut[i++] = ' ';
   kvvfsEncode(pFile->aJrnl, pFile->nJrnl, &zOut[i]);
-  kvstorageWrite(pFile->pVfs->pStore, "jrnl", zOut);
+  kvstorageWrite(pFile->zClass, "jrnl", zOut);
   sqlite3_free(zOut);
   return SQLITE_OK;
 }
 static int kvvfsSyncDb(sqlite3_file *pProtoFile, int flags){
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
-  KVVFS_LOG(("xSync('db')\n"));
+  KVVFS_LOG(("xSync('%s-db')\n", pFile->zClass));
   if( pFile->szDb>0 ){
     kvvfsWriteFileSize(pFile, pFile->szDb);
   }
@@ -703,13 +657,13 @@ static int kvvfsSyncDb(sqlite3_file *pProtoFile, int flags){
 */
 static int kvvfsFileSizeJrnl(sqlite3_file *pProtoFile, sqlite_int64 *pSize){
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
-  KVVFS_LOG(("xFileSize('journal')\n"));
+  KVVFS_LOG(("xFileSize('%s-journal')\n", pFile->zClass));
   *pSize = pFile->nJrnl;
   return SQLITE_OK;
 }
 static int kvvfsFileSizeDb(sqlite3_file *pProtoFile, sqlite_int64 *pSize){
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
-  KVVFS_LOG(("xFileSize('db')\n"));
+  KVVFS_LOG(("xFileSize('%s-db')\n", pFile->zClass));
   if( pFile->szDb>=0 ){
     *pSize = pFile->szDb;
   }else{
@@ -724,7 +678,7 @@ static int kvvfsFileSizeDb(sqlite3_file *pProtoFile, sqlite_int64 *pSize){
 static int kvvfsLock(sqlite3_file *pProtoFile, int eLock){
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
   assert( !pFile->isJournal );
-  KVVFS_LOG(("xLock(%d)\n", eLock));
+  KVVFS_LOG(("xLock(%s,%d)\n", pFile->zClass, eLock));
 
   if( eLock!=SQLITE_LOCK_NONE ){
     pFile->szDb = kvvfsReadFileSize(pFile);
@@ -738,7 +692,7 @@ static int kvvfsLock(sqlite3_file *pProtoFile, int eLock){
 static int kvvfsUnlock(sqlite3_file *pProtoFile, int eLock){
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
   assert( !pFile->isJournal );
-  KVVFS_LOG(("xUnlock(%d)\n", eLock));
+  KVVFS_LOG(("xUnlock(%s,%d)\n", pFile->zClass, eLock));
   if( eLock==SQLITE_LOCK_NONE ){
     pFile->szDb = -1;
   }
@@ -775,6 +729,7 @@ static int kvvfsDeviceCharacteristics(sqlite3_file *pProtoFile){
   return 0;
 }
 
+/****** sqlite3_vfs methods *************************************************/
 
 /*
 ** Open an kvvfs file handle.
@@ -787,25 +742,26 @@ static int kvvfsOpen(
   int *pOutFlags
 ){
   KVVfsFile *pFile = (KVVfsFile*)pProtoFile;
-  KVVfsVfs *pVfs = (KVVfsVfs*)pProtoVfs;
   KVVFS_LOG(("xOpen(\"%s\")\n", zName));
-  pFile->aJrnl = 0;
-  pFile->nJrnl = 0;
-  if( sqlite3_strglob("*-journal", zName)==0 ){
+  if( strcmp(zName, "local")==0
+   || strcmp(zName, "session")==0
+  ){
+    pFile->isJournal = 0;
+    pFile->base.pMethods = &kvvfs_db_io_methods;
+  }else
+  if( strcmp(zName, "local-journal")==0 
+   || strcmp(zName, "session-journal")==0
+  ){
     pFile->isJournal = 1;
     pFile->base.pMethods = &kvvfs_jrnl_io_methods;
   }else{
-    pFile->isJournal = 0;
-    pFile->base.pMethods = &kvvfs_db_io_methods;
+    return SQLITE_CANTOPEN;
   }
+  pFile->zClass = zName[0]=='s' ? "kvvfs-ses" : "kvvfs-loc";
+  pFile->aJrnl = 0;
+  pFile->nJrnl = 0;
   pFile->szPage = -1;
   pFile->szDb = -1;
-  pFile->pVfs = pVfs;
-  if( pVfs->pFiles==0 ){
-    pVfs->pStore = kvstorageOpen();
-  }
-  pFile->pNext = pVfs->pFiles;
-  pVfs->pFiles = pFile;
   return SQLITE_OK;
 }
 
@@ -815,9 +771,11 @@ static int kvvfsOpen(
 ** returning.
 */
 static int kvvfsDelete(sqlite3_vfs *pVfs, const char *zPath, int dirSync){
-  KVVfsVfs *p = (KVVfsVfs*)pVfs;
-  if( sqlite3_strglob("*-journal",zPath)==0 ){
-    kvstorageDelete(p->pStore, "jrnl");
+  if( strcmp(zPath, "local-journal")==0 ){
+    kvstorageDelete("kvvfs-loc", "jrnl");
+  }else
+  if( strcmp(zPath, "session-journal")==0 ){
+    kvstorageDelete("kvvfs-ses", "jrnl");
   }
   return SQLITE_OK;
 }
@@ -832,14 +790,21 @@ static int kvvfsAccess(
   int flags, 
   int *pResOut
 ){
-  KVVfsVfs *pVfs = (KVVfsVfs*)pProtoVfs;
   KVVFS_LOG(("xAccess(\"%s\")\n", zPath));
-  if( sqlite3_strglob("*-journal", zPath)==0 ){
-    *pResOut = kvstorageRead(pVfs->pStore, "jrnl", 0, 0)>0;
-  }else if( sqlite3_strglob("*-wal", zPath)==0 ){
+  if( strcmp(zPath, "local-journal")==0 ){
+    *pResOut = kvstorageRead("kvvfs-loc", "jrnl", 0, -1)>0;
+  }else
+  if( strcmp(zPath, "session-journal")==0 ){
+    *pResOut = kvstorageRead("kvvfs-ses", "jrnl", 0, -1)>0;
+  }else
+  if( strcmp(zPath, "local")==0 ){
+    *pResOut = kvstorageRead("kvvfs-loc", "sz", 0, -1)>0;
+  }else
+  if( strcmp(zPath, "session")==0 ){
+    *pResOut = kvstorageRead("kvvfs-ses", "sz", 0, -1)>0;
+  }else
+  {
     *pResOut = 0;
-  }else{
-    *pResOut = 1;
   }
   KVVFS_LOG(("xAccess returns %d\n",*pResOut));
   return SQLITE_OK;
@@ -915,6 +880,6 @@ int sqlite3_vfskv_init(
   const sqlite3_api_routines *pApi
 ){
   SQLITE_EXTENSION_INIT2(pApi);
-  sqlite3_vfs_register(&kvvfs_vfs.base, 1);
+  sqlite3_vfs_register(&kvvfs_vfs, 1);
   return SQLITE_OK_LOAD_PERMANENTLY;
 }
diff --git a/manifest b/manifest
index 0a3a992338..fb9682d0f2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Separate\ssqlite3_io_methods\sobjects\sfor\sdatabase\sfiles\sand\sjournals.
-D 2022-09-09T14:22:41.989
+C Database\smust\sbe\snamed\seither\s"local"\sor\s"session".\s\sEach\shas\sa\sdistinct\nnamespace.
+D 2022-09-09T16:16:33.749
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -335,7 +335,7 @@ F ext/misc/uint.c 053fed3bce2e89583afcd4bf804d75d659879bbcedac74d0fa9ed548839a03
 F ext/misc/unionvtab.c 36237f0607ca954ac13a4a0e2d2ac40c33bc6e032a5f55f431713061ef1625f9
 F ext/misc/urifuncs.c f71360d14fa9e7626b563f1f781c6148109462741c5235ac63ae0f8917b9c751
 F ext/misc/uuid.c 5bb2264c1b64d163efa46509544fd7500cb8769cb7c16dd52052da8d961505cf
-F ext/misc/vfskv.c 7b2fa888cd33f41a7a3821eec10ed258fe029af41ad788a43856958c4d216432
+F ext/misc/vfskv.c f154254c7585a0434d50d1b0fa0bb27b03ae4231a9045961e58a046dc5ea40ab
 F ext/misc/vfslog.c 3932ab932eeb2601dbc4447cb14d445aaa9fbe43b863ef5f014401c3420afd20
 F ext/misc/vfsstat.c 474d08efc697b8eba300082cb1eb74a5f0f3df31ed257db1cb07e72ab0e53dfb
 F ext/misc/vtablog.c 5538acd0c8ddaae372331bee11608d76973436b77d6a91e8635cfc9432fba5ae
@@ -2001,8 +2001,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 00845ac9ef2616e90f5f6a20da3dd040fa8bdcfe73f72fe9c06039561150a82d
-R 460848ff6f3cd63ef5eccab59824c77b
+P 74fbf6c2a97729e481d5562344e960d0c237aeb1f07240262d32a24fb1f4b5a3
+R ef722c3c17f5bd16a7c59b26dec45e05
 U drh
-Z 26961af5f4b759d7a43ac0a5cf8d117b
+Z c4e335313d89d964aa7abb0331378ddc
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 581c44b250..8a58829e44 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-74fbf6c2a97729e481d5562344e960d0c237aeb1f07240262d32a24fb1f4b5a3
\ No newline at end of file
+c8e41279294ea7c2f041c7d4cbbd85fce47d55f2f56180ca837316f7dfd75237
\ No newline at end of file

From 7920162093da6dd205cc8902e3e93fdb9592991b Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Fri, 9 Sep 2022 16:25:19 +0000
Subject: [PATCH 076/428] Handle recovery of virtual tables by recovering each
 shadow table individually, then writing the CREATE VIRTUAL TABLE statement
 directly into the sqlite_schema table.

FossilOrigin-Name: 5f2d5ccd56c06c3468377126acfd4be39b79b05bb6fb09b674b2e185df143aa3
---
 ext/recover/recover1.test    | 13 +++++++++++++
 ext/recover/sqlite3recover.c | 36 ++++++++++++++++++++++++++++--------
 main.mk                      |  2 ++
 manifest                     | 18 +++++++++---------
 manifest.uuid                |  2 +-
 test/e_wal.test              |  1 +
 6 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/ext/recover/recover1.test b/ext/recover/recover1.test
index 9afe43209f..5f1bb2b0fe 100644
--- a/ext/recover/recover1.test
+++ b/ext/recover/recover1.test
@@ -67,6 +67,8 @@ proc do_recover_test {tn} {
 
   sqlite3 db2 test.db2
   execsql [join $::sqlhook ";"] db2
+  db2 close
+  sqlite3 db2 test.db2
   uplevel [list do_test $tn.4 [list compare_dbs db db2] {}]
   db2 close
 }
@@ -154,6 +156,17 @@ do_execsql_test 8.0 {
 
 do_recover_test 8
 
+#-------------------------------------------------------------------------
+reset_db
+ifcapable fts5 {
+  do_execsql_test 9.1 {
+    CREATE VIRTUAL TABLE ft5 USING fts5(a, b);
+    INSERT INTO ft5 VALUES('hello', 'world');
+  }
+  do_recover_test 9 
+}
+
+
 
 
 finish_test
diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index 3e797e4bb3..7d05ec2b3e 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -672,9 +672,17 @@ static int recoverWriteSchema1(sqlite3_recover *p){
   sqlite3_stmt *pTblname = 0;
 
   pSelect = recoverPrepare(p, p->dbOut,
-      "SELECT rootpage, sql, type='table' FROM recovery.schema "
-      "  WHERE type='table' OR (type='index' AND sql LIKE '%unique%') "
-      "  ORDER BY type!='table', name!='sqlite_sequence'"
+      "WITH dbschema(rootpage, name, sql, tbl, isVirtual, isUnique) AS ("
+      "  SELECT rootpage, name, sql, "
+      "    type='table', "
+      "    sql LIKE 'create virtual%',"
+      "    (type='index' AND sql LIKE '%unique%')"
+      "  FROM recovery.schema"
+      ")"
+      "SELECT rootpage, tbl, isVirtual, name, sql"
+      " FROM dbschema "
+      "  WHERE tbl OR isUnique"
+      "  ORDER BY tbl DESC, name=='sqlite_sequence' DESC"
   );
 
   pTblname = recoverPrepare(p, p->dbOut,
@@ -685,13 +693,23 @@ static int recoverWriteSchema1(sqlite3_recover *p){
   if( pSelect ){
     while( sqlite3_step(pSelect)==SQLITE_ROW ){
       i64 iRoot = sqlite3_column_int64(pSelect, 0);
-      const char *zSql = (const char*)sqlite3_column_text(pSelect, 1);
-      int bTable = sqlite3_column_int(pSelect, 2);
+      int bTable = sqlite3_column_int(pSelect, 1);
+      int bVirtual = sqlite3_column_int(pSelect, 2);
+      const char *zName = (const char*)sqlite3_column_text(pSelect, 3);
+      const char *zSql = (const char*)sqlite3_column_text(pSelect, 4);
+      char *zFree = 0;
+      int rc = SQLITE_OK;
 
-      int rc = sqlite3_exec(p->dbOut, zSql, 0, 0, 0);
+      if( bVirtual ){
+        zSql = (const char*)(zFree = recoverMPrintf(p,
+            "INSERT INTO sqlite_schema VALUES('table', %Q, %Q, 0, %Q)",
+            zName, zName, zSql
+        ));
+      }
+      rc = sqlite3_exec(p->dbOut, zSql, 0, 0, 0);
       if( rc==SQLITE_OK ){
         recoverSqlCallback(p, zSql);
-        if( bTable ){
+        if( bTable && !bVirtual ){
           if( SQLITE_ROW==sqlite3_step(pTblname) ){
             const char *zName = sqlite3_column_text(pTblname, 0);
             recoverAddTable(p, zName, iRoot);
@@ -701,6 +719,7 @@ static int recoverWriteSchema1(sqlite3_recover *p){
       }else if( rc!=SQLITE_ERROR ){
         recoverDbError(p, p->dbOut);
       }
+      sqlite3_free(zFree);
     }
   }
   recoverFinalize(p, pSelect);
@@ -1130,7 +1149,8 @@ static int recoverWriteData(sqlite3_recover *p){
   if( apVal==0 ) return p->errCode;
 
   pTbls = recoverPrepare(p, p->dbOut,
-      "SELECT rootpage FROM recovery.schema WHERE type='table'"
+      "SELECT rootpage FROM recovery.schema "
+      "  WHERE type='table' AND (sql NOT LIKE 'create virtual%')"
       "  ORDER BY (tbl_name='sqlite_sequence') ASC"
   );
 
diff --git a/main.mk b/main.mk
index 5263546042..123c7ce757 100644
--- a/main.mk
+++ b/main.mk
@@ -763,6 +763,8 @@ SHELL_SRC = \
 	$(TOP)/ext/misc/zipfile.c \
 	$(TOP)/ext/misc/memtrace.c \
 	$(TOP)/ext/misc/dbdata.c \
+	$(TOP)/ext/recover/sqlite3recover.c \
+	$(TOP)/ext/recover/sqlite3recover.h \
         $(TOP)/src/test_windirent.c
 
 shell.c:	$(SHELL_SRC) $(TOP)/tool/mkshellc.tcl
diff --git a/manifest b/manifest
index f0dfaa0cd4..3da6b77b47 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\scomments\sin\ssqlite3recover.h.
-D 2022-09-08T21:43:18.230
+C Handle\srecovery\sof\svirtual\stables\sby\srecovering\seach\sshadow\stable\sindividually,\sthen\swriting\sthe\sCREATE\sVIRTUAL\sTABLE\sstatement\sdirectly\sinto\sthe\ssqlite_schema\stable.
+D 2022-09-09T16:25:19.064
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -387,12 +387,12 @@ F ext/rbu/rbuvacuum4.test a78898e438a44803eb2bc897ba3323373c9f277418e2d6d76e90f2
 F ext/rbu/sqlite3rbu.c 8737cabdfbee84bb25a7851ecef8b1312be332761238da9be6ddb10c62ad4291
 F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9cd389812
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
-F ext/recover/recover1.test aa9f7f46b7209cae6d52321052d4440bc8f82b93991e693c4bad20a6f05a53e5
+F ext/recover/recover1.test 942016356f9098ca36933536b194b5878827a3a749e0bf41a83d83530c0d0ea8
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
 F ext/recover/recoverclobber.test e6537ebf99f57bfff6cca59550b5f4278319b57a89865abb98d755a8fd561d84
 F ext/recover/recoverold.test f368a6ae2db12b6017257b332a19ab5df527f4061e43f12f5c85d8e2b236f074
 F ext/recover/recoverrowid.test ec4436cd69e6cdacb48dd2963ff6dd9dbd5fe648376de5e7c0c2f4f6cbacb417
-F ext/recover/sqlite3recover.c aaab721cf1ade0703162e95f1d154b811eef962be42a861b59ef015514bc3b65
+F ext/recover/sqlite3recover.c 7ed9a573d081435a16982b972c6bb963d273a0a457ec69fa16b0918165991e9d
 F ext/recover/sqlite3recover.h 73648878cea3492427b9a8facebdad0464ed15b161ed1cd70f349a02456e8879
 F ext/recover/test_recover.c b973526785e145e7d9d7920ccde72112025ee5204e22b332db9d86796be73f00
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -517,7 +517,7 @@ F ext/wasm/testing2.js d37433c601f88ed275712c1cfc92d3fb36c7c22e1ed8c7396fb2359e4
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
-F main.mk 8c9965c408aaa8b93d0dd52e83445894835e1a42dc360c77435393f80f8d8d1d
+F main.mk 3e2a50cc103bd3386bbac9c96bf3650f91174b26e092701164aa42875bff24c9
 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@ -931,7 +931,7 @@ F test/e_totalchanges.test c927f7499dc3aa28b9b556b7d6d115a2f0fe41f012b128d16bf1f
 F test/e_update.test f46c2554d915c9197548681e8d8c33a267e84528
 F test/e_uri.test 86564382132d9c453845eeb5293c7e375487b625900ab56c181a0464908417d8
 F test/e_vacuum.test 89fc48e8beee2f9dfd6de1fbb2edea6542dae9121dc0fbe6313764169e742104
-F test/e_wal.test ae9a593207a77d711443ee69ffe081fda9243625
+F test/e_wal.test db7c33642711cf3c7959714b5f012aca08cacfa78da0382f95e849eb3ba66aa4
 F test/e_walauto.test 248af31e73c98df23476a22bdb815524c9dc3ba8
 F test/e_walckpt.test 28c371a6bb5e5fe7f31679c1df1763a19d19e8a0
 F test/e_walhook.test 01b494287ba9e60b70f6ebf3c6c62e0ffe01788e344a4846b08e5de0b344cb66
@@ -2007,8 +2007,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 ae832e77084eddd696c80cb926d070a5db9d45dce34156a02522b3140e8f5e8b
-R 260b6b87f29011e60d0280e7bdf9107f
+P 14164047c43e3ca43aa010c77ea00dfa85400e15645ee0f5b90a677898b6a836
+R e52e610730a5083b962d51491c2e90a5
 U dan
-Z c0005f6f4d932e314a4bcb73861ec3e0
+Z 0661ae93944ad96dd9dbcc27159d9d3c
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index e003488dbc..c6ebbcda0e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-14164047c43e3ca43aa010c77ea00dfa85400e15645ee0f5b90a677898b6a836
\ No newline at end of file
+5f2d5ccd56c06c3468377126acfd4be39b79b05bb6fb09b674b2e185df143aa3
\ No newline at end of file
diff --git a/test/e_wal.test b/test/e_wal.test
index 77ac83a0ae..c9c5e9643f 100644
--- a/test/e_wal.test
+++ b/test/e_wal.test
@@ -15,6 +15,7 @@ source $testdir/tester.tcl
 set testprefix e_wal
 
 db close
+forcedelete test.db-shm 
 testvfs oldvfs -iversion 1
 
 

From bc2e7fc228f2a8c41bb1702aff1a9f450f8bfcda Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Fri, 9 Sep 2022 20:44:56 +0000
Subject: [PATCH 077/428] Further fixes to comments in sqlite3recover.h. Also
 rework some data structures in sqlite3recover.c.

FossilOrigin-Name: 599d1f8ec2f9e24924a6f9e66c85664360c7b95531b07a4efe1dd8c096b3fc99
---
 ext/recover/sqlite3recover.c | 140 ++++++++++++++++++++++++++---------
 ext/recover/sqlite3recover.h |  82 +++++++++++++++-----
 ext/recover/test_recover.c   |   2 +-
 manifest                     |  18 ++---
 manifest.uuid                |   2 +-
 test/savepoint.test          |   2 +
 6 files changed, 181 insertions(+), 65 deletions(-)

diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index 7d05ec2b3e..e6975b8771 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -20,7 +20,76 @@
 typedef unsigned int u32;
 typedef sqlite3_int64 i64;
 
+typedef struct RecoverTable RecoverTable;
 typedef struct RecoverColumn RecoverColumn;
+
+/*
+** When recovering rows of data that can be associated with table
+** definitions recovered from the sqlite_schema table, each table is
+** represented by an instance of the following object.
+**
+** iRoot:
+**   The root page in the original database. Not necessarily (and usually
+**   not) the same in the recovered database.
+**
+** zTab:
+**   Name of the table.
+**
+** nCol/aCol[]:
+**   aCol[] is an array of nCol columns. In the order in which they appear 
+**   in the table.
+**
+** bIntkey:
+**   Set to true for intkey tables, false for WITHOUT ROWID.
+**
+** iRowidBind:
+**   Each column in the aCol[] array has associated with it the index of
+**   the bind parameter its values will be bound to in the INSERT statement
+**   used to construct the output database. If the table does has a rowid
+**   but not an INTEGER PRIMARY KEY column, then iRowidBind contains the
+**   index of the bind paramater to which the rowid value should be bound.
+**   Otherwise, it contains -1. If the table does contain an INTEGER PRIMARY 
+**   KEY column, then the rowid value should be bound to the index associated
+**   with the column.
+**
+** pNext:
+**   All RecoverTable objects used by the recovery operation are allocated
+**   and populated as part of creating the recovered database schema in
+**   the output database, before any non-schema data are recovered. They
+**   are then stored in a singly-linked list linked by this variable beginning
+**   at sqlite3_recover.pTblList.
+*/
+struct RecoverTable {
+  u32 iRoot;                      /* Root page in original database */
+  char *zTab;                     /* Name of table */
+  int nCol;                       /* Number of columns in table */
+  RecoverColumn *aCol;            /* Array of columns */
+  int bIntkey;                    /* True for intkey, false for without rowid */
+  int iRowidBind;                 /* If >0, bind rowid to INSERT here */
+  RecoverTable *pNext;
+};
+
+/*
+** Each database column is represented by an instance of the following object
+** stored in the RecoverTable.aCol[] array of the associated table.
+**
+** iField:
+**   The index of the associated field within database records. Or -1 if
+**   there is no associated field (e.g. for virtual generated columns).
+**
+** iBind:
+**   The bind index of the INSERT statement to bind this columns values
+**   to. Or 0 if there is no such index (iff (iField<0)).
+**
+** bIPK:
+**   True if this is the INTEGER PRIMARY KEY column.
+**
+** zCol:
+**   Name of column.
+**
+** eHidden:
+**   A RECOVER_EHIDDEN_* constant value (see below for interpretation of each).
+*/
 struct RecoverColumn {
   int iField;                     /* Field in record on disk */
   int iBind;                      /* Binding to use in INSERT */
@@ -29,59 +98,62 @@ struct RecoverColumn {
   int eHidden;
 };
 
-#define RECOVER_EHIDDEN_NONE    0
-#define RECOVER_EHIDDEN_HIDDEN  1
-#define RECOVER_EHIDDEN_VIRTUAL 2
-#define RECOVER_EHIDDEN_STORED  3
+#define RECOVER_EHIDDEN_NONE    0      /* Normal database column */
+#define RECOVER_EHIDDEN_HIDDEN  1      /* Column is __HIDDEN__ */
+#define RECOVER_EHIDDEN_VIRTUAL 2      /* Virtual generated column */
+#define RECOVER_EHIDDEN_STORED  3      /* Stored generated column */
 
 /*
-** When running the ".recover" command, each output table, and the special
-** orphaned row table if it is required, is represented by an instance
-** of the following struct.
+** Bitmap object used to track pages in the input database. Allocated
+** and manipulated only by the following functions:
 **
-** aCol[]:
-**  Array of nCol columns. In the order in which they appear in the table.
+**     recoverBitmapAlloc()
+**     recoverBitmapFree()
+**     recoverBitmapSet()
+**     recoverBitmapQuery()
+**
+** nPg:
+**   Largest page number that may be stored in the bitmap. The range
+**   of valid keys is 1 to nPg, inclusive.
+**
+** aElem[]:
+**   Array large enough to contain a bit for each key. For key value
+**   iKey, the associated bit is the bit (iKey%32) of aElem[iKey/32].
+**   In other words, the following is true if bit iKey is set, or 
+**   false if it is clear:
+**
+**       (aElem[iKey/32] & (1 << (iKey%32))) ? 1 : 0
 */
-typedef struct RecoverTable RecoverTable;
-struct RecoverTable {
-  u32 iRoot;                      /* Root page in original database */
-  char *zTab;                     /* Name of table */
-  int nCol;                       /* Number of columns in table */
-  RecoverColumn *aCol;            /* Array of columns */
-  int bIntkey;                    /* True for intkey, false for without rowid */
-  int iRowidBind;                 /* If >0, bind rowid to INSERT here */
-
-  RecoverTable *pNext;
-};
-
 typedef struct RecoverBitmap RecoverBitmap;
 struct RecoverBitmap {
   i64 nPg;                        /* Size of bitmap */
   u32 aElem[0];                   /* Array of 32-bit bitmasks */
 };
 
-
+/*
+**
+*/
 struct sqlite3_recover {
-  sqlite3 *dbIn;
-  sqlite3 *dbOut;
+  sqlite3 *dbIn;                  /* Input database */
+  sqlite3 *dbOut;                 /* Output database */
 
-  sqlite3_stmt *pGetPage;
+  sqlite3_stmt *pGetPage;         /* SELECT against input db sqlite_dbdata */
 
-  char *zDb;
-  char *zUri;
-  RecoverTable *pTblList;
+  char *zDb;                      /* Name of input db ("main" etc.) */
+  char *zUri;                     /* URI for output database */
+  RecoverTable *pTblList;         /* List of tables recovered from schem */
   RecoverBitmap *pUsed;           /* Used by recoverLostAndFound() */
 
   int errCode;                    /* For sqlite3_recover_errcode() */
   char *zErrMsg;                  /* For sqlite3_recover_errmsg() */
 
-  char *zStateDb;
+  char *zStateDb;                 /* State database to use (or NULL) */
   char *zLostAndFound;            /* Name of lost-and-found table (or NULL) */
-  int bFreelistCorrupt;
-  int bRecoverRowid;
+  int bFreelistCorrupt;           /* SQLITE_RECOVER_FREELIST_CORRUPT setting */
+  int bRecoverRowid;              /* SQLITE_RECOVER_ROWIDS setting */
 
-  void *pSqlCtx;
-  int (*xSql)(void*,const char*);
+  void *pSqlCtx;                  /* SQL callback context */
+  int (*xSql)(void*,const char*); /* Pointer to SQL callback function */
 };
 
 /* 
@@ -1340,7 +1412,7 @@ int sqlite3_recover_config(sqlite3_recover *p, int op, void *pArg){
   int rc = SQLITE_OK;
 
   switch( op ){
-    case SQLITE_RECOVER_TESTDB:
+    case 789:
       sqlite3_free(p->zStateDb);
       p->zStateDb = recoverMPrintf(p, "%s", (char*)pArg);
       break;
diff --git a/ext/recover/sqlite3recover.h b/ext/recover/sqlite3recover.h
index ffe016b4f3..30771d8804 100644
--- a/ext/recover/sqlite3recover.h
+++ b/ext/recover/sqlite3recover.h
@@ -37,7 +37,6 @@
 **    using sqlite3_recover_finish().
 */
 
-
 #ifndef _SQLITE_RECOVER_H
 #define _SQLITE_RECOVER_H
 
@@ -95,13 +94,18 @@ sqlite3_recover *sqlite3_recover_init_sql(
 );
 
 /*
+** Configure an sqlite3_recover object that has just been created using
+** sqlite3_recover_init() or sqlite3_recover_init_sql(). The second
+** argument passed to this function must be one of the SQLITE_RECOVER_*
+** symbols defined below. Valid values for the third argument depend
+** on the specific SQLITE_RECOVER_* symbol in use.
 **
+** SQLITE_OK is returned if the configuration operation was successful,
+** or an SQLite error code otherwise.
 */
 int sqlite3_recover_config(sqlite3_recover*, int op, void *pArg);
 
 /*
-** SQLITE_RECOVER_TESTDB:
-**
 ** SQLITE_RECOVER_LOST_AND_FOUND:
 **   The pArg argument points to a string buffer containing the name
 **   of a "lost-and-found" table in the output database, or NULL. If
@@ -118,41 +122,79 @@ int sqlite3_recover_config(sqlite3_recover*, int op, void *pArg);
 **   corrupt and an attempt is made to recover records from pages that
 **   appear to be linked into the freelist. Otherwise, pages on the freelist
 **   are ignored. Setting this option can recover more data from the
-**   database, but often ends up "recovering" deleted records.
+**   database, but often ends up "recovering" deleted records. The default 
+**   value is 0 (clear).
 **
 ** SQLITE_RECOVER_ROWIDS:
-**
-** SQLITE_RECOVER_SQLHOOK:
+**   The pArg value must actually be a pointer to a value of type
+**   int containing value 0 or 1 cast as a (void*). If this option is set
+**   (argument is 1), then an attempt is made to recover rowid values
+**   that are not also INTEGER PRIMARY KEY values. If this option is
+**   clear, then new rowids are assigned to all recovered rows. The
+**   default value is 1 (set).
 */
-#define SQLITE_RECOVER_TESTDB           789
-#define SQLITE_RECOVER_LOST_AND_FOUND   790
-#define SQLITE_RECOVER_FREELIST_CORRUPT 791
-#define SQLITE_RECOVER_ROWIDS           792
+#define SQLITE_RECOVER_LOST_AND_FOUND   1
+#define SQLITE_RECOVER_FREELIST_CORRUPT 2
+#define SQLITE_RECOVER_ROWIDS           3
 
 /* 
-** Run the recovery. Return an SQLite error code if an error occurs, or
-** SQLITE_OK otherwise. 
+** Run the recovery operation. This function does not return until the 
+** recovery operation is completed - either the new database has been
+** created and populated (sqlite3_recover_init()) or all SQL statements have
+** been passed to the callback (sqlite3_recover_init_sql()) - or an error
+** occurs. If the recovery is completed without error, SQLITE_OK
+** is returned. It is not considered an error if data cannot be recovered
+** due to database corruption.
+**
+** If an error (for example an out-of-memory or IO error) occurs, then
+** an SQLite error code is returned. The final state of the output database
+** or the results of running any SQL statements already passed to the
+** callback in this case are undefined. An English language error 
+** message corresponding to the error may be available via the 
+** sqlite3_recover_errmsg() API.
+**
+** This function may only be called once on an sqlite3_recover handle.
+** If it is called more than once, the second and subsequent calls
+** return SQLITE_MISUSE. The error code and error message returned
+** by sqlite3_recover_errcode() and sqlite3_recover_errmsg() are not
+** updated in this case.
 */
 int sqlite3_recover_run(sqlite3_recover*);
 
 /*
-** Return a pointer to a buffer containing the English language error
-** message stored in the sqlite3_recover handle. If no error message
-** is available (including in the case where no error has occurred),
-** NULL is returned.
+** If this is called on an sqlite3_recover handle before 
+** sqlite3_recover_run() has been called, or if the call to
+** sqlite3_recover_run() returned SQLITE_OK, then this API always returns
+** a NULL pointer.
+**
+** Otherwise, an attempt is made to return a pointer to a buffer containing 
+** an English language error message related to the error that occurred
+** within the sqlite3_recover_run() call. If no error message is available,
+** or if an out-of-memory error occurs while attempting to allocate a buffer
+** for one, NULL may still be returned.
+**
+** The buffer remains valid until the sqlite3_recover handle is destroyed
+** using sqlite3_recover_finish().
 */
 const char *sqlite3_recover_errmsg(sqlite3_recover*);
 
 /*
-** Return the recover handle error code. SQLITE_OK is returned if no error
-** has occurred.
+** If this function is called on an sqlite3_recover handle before
+** sqlite3_recover_run() has been called, it always returns SQLITE_OK.
+** Otherwise, it returns a copy of the value returned by the first
+** sqlite3_recover_run() call made on the handle.
 */
 int sqlite3_recover_errcode(sqlite3_recover*);
 
 /* 
 ** Clean up a recovery object created by a call to sqlite3_recover_init().
-** This function returns SQLITE_OK if no error occurred, or else a copy
-** of the recover handle error code.
+** The results of using a recovery object with any API after it has been
+** passed to this function are undefined.
+**
+** If this function is called on an sqlite3_recover handle before
+** sqlite3_recover_run() has been called, it always returns SQLITE_OK.
+** Otherwise, it returns a copy of the value returned by the first
+** sqlite3_recover_run() call made on the handle.
 */
 int sqlite3_recover_finish(sqlite3_recover*);
 
diff --git a/ext/recover/test_recover.c b/ext/recover/test_recover.c
index e7fef42fd7..a31ddbb94a 100644
--- a/ext/recover/test_recover.c
+++ b/ext/recover/test_recover.c
@@ -117,7 +117,7 @@ static int testRecoverCmd(
       switch( iOp ){
         case 0:
           res = sqlite3_recover_config(pTest->p, 
-              SQLITE_RECOVER_TESTDB, (void*)Tcl_GetString(objv[3])
+              789, (void*)Tcl_GetString(objv[3]) /* MAGIC NUMBER! */
           );
           break;
         case 1:
diff --git a/manifest b/manifest
index 3da6b77b47..3f230d9467 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Handle\srecovery\sof\svirtual\stables\sby\srecovering\seach\sshadow\stable\sindividually,\sthen\swriting\sthe\sCREATE\sVIRTUAL\sTABLE\sstatement\sdirectly\sinto\sthe\ssqlite_schema\stable.
-D 2022-09-09T16:25:19.064
+C Further\sfixes\sto\scomments\sin\ssqlite3recover.h.\sAlso\srework\ssome\sdata\sstructures\sin\ssqlite3recover.c.
+D 2022-09-09T20:44:56.135
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -392,9 +392,9 @@ F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007acef
 F ext/recover/recoverclobber.test e6537ebf99f57bfff6cca59550b5f4278319b57a89865abb98d755a8fd561d84
 F ext/recover/recoverold.test f368a6ae2db12b6017257b332a19ab5df527f4061e43f12f5c85d8e2b236f074
 F ext/recover/recoverrowid.test ec4436cd69e6cdacb48dd2963ff6dd9dbd5fe648376de5e7c0c2f4f6cbacb417
-F ext/recover/sqlite3recover.c 7ed9a573d081435a16982b972c6bb963d273a0a457ec69fa16b0918165991e9d
-F ext/recover/sqlite3recover.h 73648878cea3492427b9a8facebdad0464ed15b161ed1cd70f349a02456e8879
-F ext/recover/test_recover.c b973526785e145e7d9d7920ccde72112025ee5204e22b332db9d86796be73f00
+F ext/recover/sqlite3recover.c e8d0eae7da7ba24e733f6247082c12d7a030ce794eb5c42d64993f55c12882f5
+F ext/recover/sqlite3recover.h 81108efb8c4618d3d9c6da4df785212b0e4501aa0d25edfc463405fe839a6640
+F ext/recover/test_recover.c ed8d0cc8703ab29cf562f793623b045de109b7937f254108ff4132f35abb37fb
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
 F ext/repair/checkfreelist.c e21f06995ff4efdc1622dcceaea4dcba2caa83ca2f31a1607b98a8509168a996
 F ext/repair/checkindex.c 4383e4469c21e5b9ae321d0d63cec53e981af9d7a6564be6374f0eeb93dfc890
@@ -1398,7 +1398,7 @@ F test/rowvaluefault.test 963ae9cdaed30a85a29668dd514e639f3556cae903ee9f172ea972
 F test/rowvaluevtab.test cd9747bb3f308086944c07968f547ad6b05022e698d80b9ffbdfe09ce0b8da6f
 F test/rtree.test 0c8d9dd458d6824e59683c19ab2ffa9ef946f798
 F test/run-wordcount.sh 891e89c4c2d16e629cd45951d4ed899ad12afc09
-F test/savepoint.test 1f8a6b1aea9a0d05837adc463d4bf47bd9d0f1c842f1c2a9caccd639baf34bf9
+F test/savepoint.test 6e9804a17767f08432c7a5e738b9a8f4b891d243110b63d3a41d270d3d1378ec
 F test/savepoint2.test 9b8543940572a2f01a18298c3135ad0c9f4f67d7
 F test/savepoint4.test c8f8159ade6d2acd9128be61e1230f1c1edc6cc0
 F test/savepoint5.test 0735db177e0ebbaedc39812c8d065075d563c4fd
@@ -2007,8 +2007,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 14164047c43e3ca43aa010c77ea00dfa85400e15645ee0f5b90a677898b6a836
-R e52e610730a5083b962d51491c2e90a5
+P 5f2d5ccd56c06c3468377126acfd4be39b79b05bb6fb09b674b2e185df143aa3
+R d4558eaeefd2a718275b323dc4307f9b
 U dan
-Z 0661ae93944ad96dd9dbcc27159d9d3c
+Z 6e64e7331e56e0c44a533586bb618920
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index c6ebbcda0e..a1b607602a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5f2d5ccd56c06c3468377126acfd4be39b79b05bb6fb09b674b2e185df143aa3
\ No newline at end of file
+599d1f8ec2f9e24924a6f9e66c85664360c7b95531b07a4efe1dd8c096b3fc99
\ No newline at end of file
diff --git a/test/savepoint.test b/test/savepoint.test
index eed8a9e702..3952981dab 100644
--- a/test/savepoint.test
+++ b/test/savepoint.test
@@ -16,6 +16,8 @@ source $testdir/tester.tcl
 source $testdir/lock_common.tcl
 source $testdir/malloc_common.tcl
 
+forcedelete test2.db
+
 #----------------------------------------------------------------------
 # The following tests - savepoint-1.* - test that the SAVEPOINT, RELEASE
 # and ROLLBACK TO comands are correctly parsed, and that the auto-commit

From 7585f49a0a5b134297c5f9cfebf9428743edfbea Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sat, 10 Sep 2022 18:20:59 +0000
Subject: [PATCH 078/428] Move the vfskv.c extension to src/os_kv.c and make it
 part of the amalgamation, activated if and only if SQLITE_OS_KV is true.

FossilOrigin-Name: f6632e69c2ec1a7ddc4e51f3567e3bc082ee94a6dd51fdafdc0c3bf386a32d4c
---
 Makefile.in                     |   7 +-
 main.mk                         |   4 +-
 manifest                        |  24 +++---
 manifest.uuid                   |   2 +-
 src/main.c                      |   2 +-
 ext/misc/vfskv.c => src/os_kv.c | 132 +++++++++++++++-----------------
 src/os_setup.h                  |  86 ++++++++++++++-------
 src/sqliteInt.h                 |   2 +-
 tool/mksqlite3c.tcl             |   1 +
 9 files changed, 146 insertions(+), 114 deletions(-)
 rename ext/misc/vfskv.c => src/os_kv.c (89%)

diff --git a/Makefile.in b/Makefile.in
index cc4943f2c4..d4d42c6b18 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -184,7 +184,7 @@ LIBOBJS0 = alter.lo analyze.lo attach.lo auth.lo \
          main.lo malloc.lo mem0.lo mem1.lo mem2.lo mem3.lo mem5.lo \
          memdb.lo memjournal.lo \
          mutex.lo mutex_noop.lo mutex_unix.lo mutex_w32.lo \
-         notify.lo opcodes.lo os.lo os_unix.lo os_win.lo \
+         notify.lo opcodes.lo os.lo os_kv.lo os_unix.lo os_win.lo \
          pager.lo parse.lo pcache.lo pcache1.lo pragma.lo prepare.lo printf.lo \
          random.lo resolve.lo rowset.lo rtree.lo \
          sqlite3session.lo select.lo sqlite3rbu.lo status.lo stmt.lo \
@@ -257,6 +257,7 @@ SRC = \
   $(TOP)/src/os.h \
   $(TOP)/src/os_common.h \
   $(TOP)/src/os_setup.h \
+  $(TOP)/src/os_kv.c \
   $(TOP)/src/os_unix.c \
   $(TOP)/src/os_win.c \
   $(TOP)/src/os_win.h \
@@ -492,6 +493,7 @@ TESTSRC2 = \
   $(TOP)/src/main.c \
   $(TOP)/src/mem5.c \
   $(TOP)/src/os.c \
+  $(TOP)/src/os_kv.c \
   $(TOP)/src/os_unix.c \
   $(TOP)/src/os_win.c \
   $(TOP)/src/pager.c \
@@ -938,6 +940,9 @@ pcache1.lo:	$(TOP)/src/pcache1.c $(HDR) $(TOP)/src/pcache.h
 os.lo:	$(TOP)/src/os.c $(HDR)
 	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/os.c
 
+os_kv.lo:	$(TOP)/src/os_kv.c $(HDR)
+	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/os_kv.c
+
 os_unix.lo:	$(TOP)/src/os_unix.c $(HDR)
 	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/os_unix.c
 
diff --git a/main.mk b/main.mk
index 3d8a07494d..49f4fbf90e 100644
--- a/main.mk
+++ b/main.mk
@@ -68,7 +68,7 @@ LIBOBJ+= vdbe.o parse.o \
          main.o malloc.o mem0.o mem1.o mem2.o mem3.o mem5.o \
          memdb.o memjournal.o \
          mutex.o mutex_noop.o mutex_unix.o mutex_w32.o \
-         notify.o opcodes.o os.o os_unix.o os_win.o \
+         notify.o opcodes.o os.o os_kv.o os_unix.o os_win.o \
          pager.o pcache.o pcache1.o pragma.o prepare.o printf.o \
          random.o resolve.o rowset.o rtree.o \
          select.o sqlite3rbu.o status.o stmt.o \
@@ -134,6 +134,7 @@ SRC = \
   $(TOP)/src/os.h \
   $(TOP)/src/os_common.h \
   $(TOP)/src/os_setup.h \
+  $(TOP)/src/os_kv.c \
   $(TOP)/src/os_unix.c \
   $(TOP)/src/os_win.c \
   $(TOP)/src/os_win.h \
@@ -411,6 +412,7 @@ TESTSRC2 = \
   $(TOP)/src/main.c \
   $(TOP)/src/mem5.c \
   $(TOP)/src/os.c \
+  $(TOP)/src/os_kv.c \
   $(TOP)/src/os_unix.c \
   $(TOP)/src/os_win.c \
   $(TOP)/src/pager.c \
diff --git a/manifest b/manifest
index fb9682d0f2..a139582803 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Database\smust\sbe\snamed\seither\s"local"\sor\s"session".\s\sEach\shas\sa\sdistinct\nnamespace.
-D 2022-09-09T16:16:33.749
+C Move\sthe\svfskv.c\sextension\sto\ssrc/os_kv.c\sand\smake\sit\spart\sof\sthe\samalgamation,\nactivated\sif\sand\sonly\sif\sSQLITE_OS_KV\sis\strue.
+D 2022-09-10T18:20:59.146
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in 525bccb89e36a927f9312a231f054a2dc029f6af75901c7fc1a781d51b260323
+F Makefile.in ee179f405fd5f8845473f888517c4ada46099306c33ae1f27dd1aef53fe8e867
 F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
 F Makefile.msc d547a2fdba38a1c6cd1954977d0b0cc017f5f8fbfbc65287bf8d335808938016
 F README.md 8b8df9ca852aeac4864eb1e400002633ee6db84065bd01b78c33817f97d31f5e
@@ -335,7 +335,6 @@ F ext/misc/uint.c 053fed3bce2e89583afcd4bf804d75d659879bbcedac74d0fa9ed548839a03
 F ext/misc/unionvtab.c 36237f0607ca954ac13a4a0e2d2ac40c33bc6e032a5f55f431713061ef1625f9
 F ext/misc/urifuncs.c f71360d14fa9e7626b563f1f781c6148109462741c5235ac63ae0f8917b9c751
 F ext/misc/uuid.c 5bb2264c1b64d163efa46509544fd7500cb8769cb7c16dd52052da8d961505cf
-F ext/misc/vfskv.c f154254c7585a0434d50d1b0fa0bb27b03ae4231a9045961e58a046dc5ea40ab
 F ext/misc/vfslog.c 3932ab932eeb2601dbc4447cb14d445aaa9fbe43b863ef5f014401c3420afd20
 F ext/misc/vfsstat.c 474d08efc697b8eba300082cb1eb74a5f0f3df31ed257db1cb07e72ab0e53dfb
 F ext/misc/vtablog.c 5538acd0c8ddaae372331bee11608d76973436b77d6a91e8635cfc9432fba5ae
@@ -510,7 +509,7 @@ F ext/wasm/testing2.js d37433c601f88ed275712c1cfc92d3fb36c7c22e1ed8c7396fb2359e4
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
-F main.mk 20801eed419dc58936ff9449b04041edbbbc0488a9fc683e72471dded050e0bb
+F main.mk b1b02927b2e0b73d025f93e388f2f7fba07614e972453983bddc65cd2bf33bb1
 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@ -553,7 +552,7 @@ F src/insert.c aea5361767817f917b0f0f647a1f0b1621bd858938ae6ae545c3b6b9814b798f
 F src/json.c 7749b98c62f691697c7ee536b570c744c0583cab4a89200fdd0fc2aa8cc8cbd6
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 853385cc7a604157e137585097949252d5d0c731768e16b044608e5c95c3614b
-F src/main.c 8983b4a316d7e09946dd731913aa41712f02e2b55cb5c6c92126ccfe2473244a
+F src/main.c e11267cdd380be68d95d4292666636a7f1dff5f17a395f3d55be910d7e9350fb
 F src/malloc.c b7a3430cbe91d3e8e04fc10c2041b3a19794e63556ad2441a13d8dadd9b2bafc
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@ -572,7 +571,8 @@ F src/notify.c 89a97dc854c3aa62ad5f384ef50c5a4a11d70fcc69f86de3e991573421130ed6
 F src/os.c 0eb831ba3575af5277e47f4edd14fdfc90025c67eb25ce5cda634518d308d4e9
 F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
-F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
+F src/os_kv.c dc409476c3e533def81d022849726f2892e69e6529d4a40a637224cfb3f5df68 w ext/misc/vfskv.c
+F src/os_setup.h 0711dbc4678f3ac52d7fe736951b6384a0615387c4ba5135a4764e4e31f4b6a6
 F src/os_unix.c 102f7e5c5b59c18ea3dbc929dc3be8acb3afc0e0b6ad572e032335c9c27f44f1
 F src/os_win.c e9454cb141908e8eef2102180bad353a36480612d5b736e4c2bd5777d9b25a34
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
@@ -594,7 +594,7 @@ F src/shell.c.in e7e7c2c69ae86c5ee9e8ad66227203d46ff6dce8700a1b1dababff01c71d33d
 F src/sqlite.h.in b9b7fd73239d94db20332bb6e504688001e5564b655e1318a4427a1caef4b99e
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d
-F src/sqliteInt.h 94e7fc2a5f0fa5d1f0af84513fd2d1c70a9f6e772556b9dfef16feee63291eae
+F src/sqliteInt.h 44eb45c25d379361ee1bd7fc49205471c6cb8a3727aed42372cf4716f653ebf2
 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -1938,7 +1938,7 @@ F tool/mkshellc.tcl df5d249617f9cc94d5c48eb0401673eb3f31f383ecbc54e8a13ca3dd97e8
 F tool/mksourceid.c 36aa8020014aed0836fd13c51d6dc9219b0df1761d6b5f58ff5b616211b079b9
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
 F tool/mksqlite3c-noext.tcl 4f7cfef5152b0c91920355cbfc1d608a4ad242cb819f1aea07f6d0274f584a7f
-F tool/mksqlite3c.tcl eee7e9d9c58abb1045f6ed74ad95ad26e8d22be29fdc431deea5267fb3fa049c
+F tool/mksqlite3c.tcl 4fc26a9bfa0c4505b203d7ca0cf086e75ebcd4d63eb719c82f37e3fecdf23d37
 F tool/mksqlite3h.tcl 1f5e4a1dbbbc43c83cc6e74fe32c6c620502240b66c7c0f33a51378e78fc4edf
 F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
 F tool/mkvsix.tcl b9e0777a213c23156b6542842c238479e496ebf5
@@ -2001,8 +2001,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 74fbf6c2a97729e481d5562344e960d0c237aeb1f07240262d32a24fb1f4b5a3
-R ef722c3c17f5bd16a7c59b26dec45e05
+P c8e41279294ea7c2f041c7d4cbbd85fce47d55f2f56180ca837316f7dfd75237
+R 781601077fda92ceda7382ba24a16664
 U drh
-Z c4e335313d89d964aa7abb0331378ddc
+Z b2ad663d300b47ac24999ede7b88d1e7
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 8a58829e44..4bfd8ba9c2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c8e41279294ea7c2f041c7d4cbbd85fce47d55f2f56180ca837316f7dfd75237
\ No newline at end of file
+f6632e69c2ec1a7ddc4e51f3567e3bc082ee94a6dd51fdafdc0c3bf386a32d4c
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index b5ef703287..efa5fc3681 100644
--- a/src/main.c
+++ b/src/main.c
@@ -4781,8 +4781,8 @@ int sqlite3_snapshot_open(
 */
 int sqlite3_snapshot_recover(sqlite3 *db, const char *zDb){
   int rc = SQLITE_ERROR;
-  int iDb;
 #ifndef SQLITE_OMIT_WAL
+  int iDb;
 
 #ifdef SQLITE_ENABLE_API_ARMOR
   if( !sqlite3SafetyCheckOk(db) ){
diff --git a/ext/misc/vfskv.c b/src/os_kv.c
similarity index 89%
rename from ext/misc/vfskv.c
rename to src/os_kv.c
index fee190f256..8ae1a65c59 100644
--- a/ext/misc/vfskv.c
+++ b/src/os_kv.c
@@ -14,45 +14,28 @@
 ** Key/Value storage engine where both keys and values must be pure
 ** text.
 */
-#include <sqlite3ext.h>
-SQLITE_EXTENSION_INIT1
-#include <string.h>
-#include <assert.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <assert.h>
-#include <stdlib.h>
+#include <sqliteInt.h>
+#if SQLITE_OS_KV
 
 /*****************************************************************************
 ** Debugging logic
 */
 
-/* KVVFS_TRACE() is used for tracing calls to kvstorage routines. */
+/* SQLITE_KV_TRACE() is used for tracing calls to kvstorage routines. */
 #if 0
-#define KVVFS_TRACE(X)  printf X;
+#define SQLITE_KV_TRACE(X)  printf X;
 #else
-#define KVVFS_TRACE(X)
+#define SQLITE_KV_TRACE(X)
 #endif
 
-/* KVVFS_LOG() is used for tracing calls to the VFS interface */
+/* SQLITE_KV_LOG() is used for tracing calls to the VFS interface */
 #if 0
-#define KVVFS_LOG(X)  printf X;
+#define SQLITE_KV_LOG(X)  printf X;
 #else
-#define KVVFS_LOG(X)
+#define SQLITE_KV_LOG(X)
 #endif
 
 
-/*****************************************************************************
-** The low-level storage engine
-*/
-#define KVSTORAGE_KEY_SZ  24
-static int kvstorageWrite(const char*, const char *zKey, const char *zData);
-static int kvstorageDelete(const char*, const char *zKey);
-static int kvstorageRead(const char*, const char *zKey, char *zBuf, int nBuf);
-
-
 /*
 ** Forward declaration of objects used by this VFS implementation
 */
@@ -176,6 +159,17 @@ static sqlite3_io_methods kvvfs_jrnl_io_methods = {
 };
 
 /****** Storage subsystem **************************************************/
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+/* Forward declarations for the low-level storage engine
+*/
+#define KVSTORAGE_KEY_SZ  24
+#define KVSTORAGE_KEY_PREFIX  "kvvfs-"
+static int kvstorageWrite(const char*, const char *zKey, const char *zData);
+static int kvstorageDelete(const char*, const char *zKey);
+static int kvstorageRead(const char*, const char *zKey, char *zBuf, int nBuf);
 
 
 /* Expand the key name with an appropriate prefix and put the result
@@ -204,7 +198,7 @@ static int kvstorageWrite(
   kvstorageMakeKey(zClass, zKey, zXKey);
   fd = fopen(zXKey, "wb");
   if( fd ){
-    KVVFS_TRACE(("KVVFS-WRITE  %-15s (%d) %.50s%s\n", zXKey,
+    SQLITE_KV_TRACE(("KVVFS-WRITE  %-15s (%d) %.50s%s\n", zXKey,
                  (int)strlen(zData), zData,
                  strlen(zData)>50 ? "..." : ""));
     fputs(zData, fd);
@@ -221,7 +215,7 @@ static int kvstorageDelete(const char *zClass, const char *zKey){
   char zXKey[KVSTORAGE_KEY_SZ];
   kvstorageMakeKey(zClass, zKey, zXKey);
   unlink(zXKey);
-  KVVFS_TRACE(("KVVFS-DELETE %-15s\n", zXKey));
+  SQLITE_KV_TRACE(("KVVFS-DELETE %-15s\n", zXKey));
   return 0;
 }
 
@@ -251,14 +245,14 @@ static int kvstorageRead(
    || stat(zXKey, &buf)!=0
    || !S_ISREG(buf.st_mode)
   ){
-    KVVFS_TRACE(("KVVFS-READ   %-15s (-1)\n", zXKey));
+    SQLITE_KV_TRACE(("KVVFS-READ   %-15s (-1)\n", zXKey));
     return -1;
   }
   if( nBuf<0 ){
     return (int)buf.st_size;
   }else if( nBuf==1 ){
     zBuf[0] = 0;
-    KVVFS_TRACE(("KVVFS-READ   %-15s (%d)\n", zXKey,
+    SQLITE_KV_TRACE(("KVVFS-READ   %-15s (%d)\n", zXKey,
                  (int)buf.st_size));
     return (int)buf.st_size;
   }
@@ -267,13 +261,13 @@ static int kvstorageRead(
   }
   fd = fopen(zXKey, "rb");
   if( fd==0 ){
-    KVVFS_TRACE(("KVVFS-READ   %-15s (-1)\n", zXKey));
+    SQLITE_KV_TRACE(("KVVFS-READ   %-15s (-1)\n", zXKey));
     return -1;
   }else{
     sqlite3_int64 n = fread(zBuf, 1, nBuf-1, fd);
     fclose(fd);
     zBuf[n] = 0;
-    KVVFS_TRACE(("KVVFS-READ   %-15s (%lld) %.50s%s\n", zXKey,
+    SQLITE_KV_TRACE(("KVVFS-READ   %-15s (%lld) %.50s%s\n", zXKey,
                  n, zBuf, n>50 ? "..." : ""));
     return (int)n;
   }
@@ -433,7 +427,7 @@ static void kvvfsWriteFileSize(KVVfsFile *pFile, sqlite3_int64 sz){
 static int kvvfsClose(sqlite3_file *pProtoFile){
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
 
-  KVVFS_LOG(("xClose %s %s\n", pFile->zClass, 
+  SQLITE_KV_LOG(("xClose %s %s\n", pFile->zClass, 
              pFile->isJournal ? "journal" : "db"));
   sqlite3_free(pFile->aJrnl);
   return SQLITE_OK;
@@ -450,7 +444,7 @@ static int kvvfsReadJrnl(
 ){
   KVVfsFile *pFile = (KVVfsFile*)pProtoFile;
   assert( pFile->isJournal );
-  KVVFS_LOG(("xRead('%s-journal',%d,%lld)\n", pFile->zClass, iAmt, iOfst));
+  SQLITE_KV_LOG(("xRead('%s-journal',%d,%lld)\n", pFile->zClass, iAmt, iOfst));
   if( pFile->aJrnl==0 ){
     int szTxt = kvstorageRead(pFile->zClass, "jrnl", 0, -1);
     char *aTxt;
@@ -487,7 +481,7 @@ static int kvvfsReadDb(
   char aData[131073];
   assert( iOfst>=0 );
   assert( iAmt>=0 );
-  KVVFS_LOG(("xRead('%s-db',%d,%lld)\n", pFile->zClass, iAmt, iOfst));
+  SQLITE_KV_LOG(("xRead('%s-db',%d,%lld)\n", pFile->zClass, iAmt, iOfst));
   if( iOfst+iAmt>=512 ){
     if( (iOfst % iAmt)!=0 ){
       return SQLITE_IOERR_READ;
@@ -537,7 +531,7 @@ static int kvvfsWriteJrnl(
 ){
   KVVfsFile *pFile = (KVVfsFile*)pProtoFile;
   sqlite3_int64 iEnd = iOfst+iAmt;
-  KVVFS_LOG(("xWrite('%s-journal',%d,%lld)\n", pFile->zClass, iAmt, iOfst));
+  SQLITE_KV_LOG(("xWrite('%s-journal',%d,%lld)\n", pFile->zClass, iAmt, iOfst));
   if( iEnd>=0x10000000 ) return SQLITE_FULL;
   if( pFile->aJrnl==0 || pFile->nJrnl<iEnd ){
     char *aNew = sqlite3_realloc(pFile->aJrnl, iEnd);
@@ -567,7 +561,7 @@ static int kvvfsWriteDb(
   unsigned int pgno;
   char zKey[30];
   char aData[131073];
-  KVVFS_LOG(("xWrite('%s-db',%d,%lld)\n", pFile->zClass, iAmt, iOfst));
+  SQLITE_KV_LOG(("xWrite('%s-db',%d,%lld)\n", pFile->zClass, iAmt, iOfst));
   assert( iAmt>=512 && iAmt<=65536 );
   assert( (iAmt & (iAmt-1))==0 );
   pgno = 1 + iOfst/iAmt;
@@ -585,7 +579,7 @@ static int kvvfsWriteDb(
 */
 static int kvvfsTruncateJrnl(sqlite3_file *pProtoFile, sqlite_int64 size){
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
-  KVVFS_LOG(("xTruncate('%s-journal',%lld)\n", pFile->zClass, size));
+  SQLITE_KV_LOG(("xTruncate('%s-journal',%lld)\n", pFile->zClass, size));
   assert( size==0 );
   kvstorageDelete(pFile->zClass, "jrnl");
   sqlite3_free(pFile->aJrnl);
@@ -601,7 +595,7 @@ static int kvvfsTruncateDb(sqlite3_file *pProtoFile, sqlite_int64 size){
   ){
     char zKey[50];
     unsigned int pgno, pgnoMax;
-    KVVFS_LOG(("xTruncate('%s-db',%lld)\n", pFile->zClass, size));
+    SQLITE_KV_LOG(("xTruncate('%s-db',%lld)\n", pFile->zClass, size));
     pgno = 1 + size/pFile->szPage;
     pgnoMax = 2 + pFile->szDb/pFile->szPage;
     while( pgno<=pgnoMax ){
@@ -623,7 +617,7 @@ static int kvvfsSyncJrnl(sqlite3_file *pProtoFile, int flags){
   int i, n;
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
   char *zOut;
-  KVVFS_LOG(("xSync('%s-journal')\n", pFile->zClass));
+  SQLITE_KV_LOG(("xSync('%s-journal')\n", pFile->zClass));
   if( pFile->nJrnl<=0 ){
     return kvvfsTruncateJrnl(pProtoFile, 0);
   }
@@ -645,7 +639,7 @@ static int kvvfsSyncJrnl(sqlite3_file *pProtoFile, int flags){
 }
 static int kvvfsSyncDb(sqlite3_file *pProtoFile, int flags){
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
-  KVVFS_LOG(("xSync('%s-db')\n", pFile->zClass));
+  SQLITE_KV_LOG(("xSync('%s-db')\n", pFile->zClass));
   if( pFile->szDb>0 ){
     kvvfsWriteFileSize(pFile, pFile->szDb);
   }
@@ -657,13 +651,13 @@ static int kvvfsSyncDb(sqlite3_file *pProtoFile, int flags){
 */
 static int kvvfsFileSizeJrnl(sqlite3_file *pProtoFile, sqlite_int64 *pSize){
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
-  KVVFS_LOG(("xFileSize('%s-journal')\n", pFile->zClass));
+  SQLITE_KV_LOG(("xFileSize('%s-journal')\n", pFile->zClass));
   *pSize = pFile->nJrnl;
   return SQLITE_OK;
 }
 static int kvvfsFileSizeDb(sqlite3_file *pProtoFile, sqlite_int64 *pSize){
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
-  KVVFS_LOG(("xFileSize('%s-db')\n", pFile->zClass));
+  SQLITE_KV_LOG(("xFileSize('%s-db')\n", pFile->zClass));
   if( pFile->szDb>=0 ){
     *pSize = pFile->szDb;
   }else{
@@ -678,7 +672,7 @@ static int kvvfsFileSizeDb(sqlite3_file *pProtoFile, sqlite_int64 *pSize){
 static int kvvfsLock(sqlite3_file *pProtoFile, int eLock){
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
   assert( !pFile->isJournal );
-  KVVFS_LOG(("xLock(%s,%d)\n", pFile->zClass, eLock));
+  SQLITE_KV_LOG(("xLock(%s,%d)\n", pFile->zClass, eLock));
 
   if( eLock!=SQLITE_LOCK_NONE ){
     pFile->szDb = kvvfsReadFileSize(pFile);
@@ -692,7 +686,7 @@ static int kvvfsLock(sqlite3_file *pProtoFile, int eLock){
 static int kvvfsUnlock(sqlite3_file *pProtoFile, int eLock){
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
   assert( !pFile->isJournal );
-  KVVFS_LOG(("xUnlock(%s,%d)\n", pFile->zClass, eLock));
+  SQLITE_KV_LOG(("xUnlock(%s,%d)\n", pFile->zClass, eLock));
   if( eLock==SQLITE_LOCK_NONE ){
     pFile->szDb = -1;
   }
@@ -703,7 +697,7 @@ static int kvvfsUnlock(sqlite3_file *pProtoFile, int eLock){
 ** Check if another file-handle holds a RESERVED lock on an kvvfs-file.
 */
 static int kvvfsCheckReservedLock(sqlite3_file *pProtoFile, int *pResOut){
-  KVVFS_LOG(("xCheckReservedLock\n"));
+  SQLITE_KV_LOG(("xCheckReservedLock\n"));
   *pResOut = 0;
   return SQLITE_OK;
 }
@@ -742,7 +736,7 @@ static int kvvfsOpen(
   int *pOutFlags
 ){
   KVVfsFile *pFile = (KVVfsFile*)pProtoFile;
-  KVVFS_LOG(("xOpen(\"%s\")\n", zName));
+  SQLITE_KV_LOG(("xOpen(\"%s\")\n", zName));
   if( strcmp(zName, "local")==0
    || strcmp(zName, "session")==0
   ){
@@ -757,7 +751,11 @@ static int kvvfsOpen(
   }else{
     return SQLITE_CANTOPEN;
   }
-  pFile->zClass = zName[0]=='s' ? "kvvfs-ses" : "kvvfs-loc";
+  if( zName[0]=='s' ){
+    pFile->zClass = KVSTORAGE_KEY_PREFIX "ses";
+  }else{
+    pFile->zClass = KVSTORAGE_KEY_PREFIX "loc";
+  }
   pFile->aJrnl = 0;
   pFile->nJrnl = 0;
   pFile->szPage = -1;
@@ -772,10 +770,10 @@ static int kvvfsOpen(
 */
 static int kvvfsDelete(sqlite3_vfs *pVfs, const char *zPath, int dirSync){
   if( strcmp(zPath, "local-journal")==0 ){
-    kvstorageDelete("kvvfs-loc", "jrnl");
+    kvstorageDelete(KVSTORAGE_KEY_PREFIX "loc", "jrnl");
   }else
   if( strcmp(zPath, "session-journal")==0 ){
-    kvstorageDelete("kvvfs-ses", "jrnl");
+    kvstorageDelete(KVSTORAGE_KEY_PREFIX "ses", "jrnl");
   }
   return SQLITE_OK;
 }
@@ -790,23 +788,23 @@ static int kvvfsAccess(
   int flags, 
   int *pResOut
 ){
-  KVVFS_LOG(("xAccess(\"%s\")\n", zPath));
+  SQLITE_KV_LOG(("xAccess(\"%s\")\n", zPath));
   if( strcmp(zPath, "local-journal")==0 ){
-    *pResOut = kvstorageRead("kvvfs-loc", "jrnl", 0, -1)>0;
+    *pResOut = kvstorageRead(KVSTORAGE_KEY_PREFIX "loc", "jrnl", 0, -1)>0;
   }else
   if( strcmp(zPath, "session-journal")==0 ){
-    *pResOut = kvstorageRead("kvvfs-ses", "jrnl", 0, -1)>0;
+    *pResOut = kvstorageRead(KVSTORAGE_KEY_PREFIX "ses", "jrnl", 0, -1)>0;
   }else
   if( strcmp(zPath, "local")==0 ){
-    *pResOut = kvstorageRead("kvvfs-loc", "sz", 0, -1)>0;
+    *pResOut = kvstorageRead(KVSTORAGE_KEY_PREFIX "loc", "sz", 0, -1)>0;
   }else
   if( strcmp(zPath, "session")==0 ){
-    *pResOut = kvstorageRead("kvvfs-ses", "sz", 0, -1)>0;
+    *pResOut = kvstorageRead(KVSTORAGE_KEY_PREFIX "ses", "sz", 0, -1)>0;
   }else
   {
     *pResOut = 0;
   }
-  KVVFS_LOG(("xAccess returns %d\n",*pResOut));
+  SQLITE_KV_LOG(("xAccess returns %d\n",*pResOut));
   return SQLITE_OK;
 }
 
@@ -822,7 +820,7 @@ static int kvvfsFullPathname(
   char *zOut
 ){
   size_t nPath = strlen(zPath);
-  KVVFS_LOG(("xFullPathname(\"%s\")\n", zPath));
+  SQLITE_KV_LOG(("xFullPathname(\"%s\")\n", zPath));
   if( nOut<nPath+1 ) nPath = nOut - 1;
   memcpy(zOut, zPath, nPath);
   zOut[nPath] = 0;
@@ -865,21 +863,13 @@ static int kvvfsCurrentTimeInt64(sqlite3_vfs *pVfs, sqlite3_int64 *pTimeOut){
   return SQLITE_OK;
 }
 
-#ifdef _WIN32
-__declspec(dllexport)
-#endif
 /* 
-** This routine is called when the extension is loaded.
-**
-** Register the new VFS.  Make arrangement to register the virtual table
-** for each new database connection.
+** This routine is called initialize the KV-vfs as the default VFS.
 */
-int sqlite3_vfskv_init(
-  sqlite3 *db, 
-  char **pzErrMsg, 
-  const sqlite3_api_routines *pApi
-){
-  SQLITE_EXTENSION_INIT2(pApi);
-  sqlite3_vfs_register(&kvvfs_vfs, 1);
-  return SQLITE_OK_LOAD_PERMANENTLY;
+int sqlite3_os_init(void){
+  return sqlite3_vfs_register(&kvvfs_vfs, 1);
 }
+int sqlite3_os_end(void){
+  return SQLITE_OK;
+}
+#endif /* SQLITE_OS_KV */
diff --git a/src/os_setup.h b/src/os_setup.h
index 08aaa1195a..df2f52a7ee 100644
--- a/src/os_setup.h
+++ b/src/os_setup.h
@@ -20,38 +20,72 @@
 ** Figure out if we are dealing with Unix, Windows, or some other operating
 ** system.
 **
-** After the following block of preprocess macros, all of SQLITE_OS_UNIX,
-** SQLITE_OS_WIN, and SQLITE_OS_OTHER will defined to either 1 or 0.  One of
-** the three will be 1.  The other two will be 0.
+** After the following block of preprocess macros, all of 
+**
+**    SQLITE_OS_KV
+**    SQLITE_OS_OTHER
+**    SQLITE_OS_UNIX
+**    SQLITE_OS_WIN
+**
+** will defined to either 1 or 0. One of them will be 1. The others will be 0.
+** If none of the macros are initially defined, then select either
+** SQLITE_OS_UNIX or SQLITE_OS_WIN depending on the target platform.
+**
+** If SQLITE_OS_OTHER=1 is specified at compile-time, then the application
+** must provide its own VFS implementation together with sqlite3_os_init()
+** and sqlite3_os_end() routines.
 */
-#if defined(SQLITE_OS_OTHER)
-#  if SQLITE_OS_OTHER==1
-#    undef SQLITE_OS_UNIX
+#if !defined(SQLITE_OS_KV) && !defined(SQLITE_OS_OTHER) && \
+       !defined(SQLITE_OS_UNIX) && !defined(SQLITE_OS_WIN)
+#  if defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || \
+          defined(__MINGW32__) || defined(__BORLANDC__)
+#    define SQLITE_OS_WIN 1
 #    define SQLITE_OS_UNIX 0
-#    undef SQLITE_OS_WIN
-#    define SQLITE_OS_WIN 0
 #  else
-#    undef SQLITE_OS_OTHER
+#    define SQLITE_OS_WIN 0
+#    define SQLITE_OS_UNIX 1
 #  endif
 #endif
-#if !defined(SQLITE_OS_UNIX) && !defined(SQLITE_OS_OTHER)
+#if SQLITE_OS_OTHER+1>1
+#  undef SQLITE_OS_KV
+#  define SQLITE_OS_KV 0
+#  undef SQLITE_OS_UNIX
+#  define SQLITE_OS_UNIX 0
+#  undef SQLITE_OS_WIN
+#  define SQLITE_OS_WIN 0
+#endif
+#if SQLITE_OS_KV+1>1
+#  undef SQLITE_OS_OTHER
 #  define SQLITE_OS_OTHER 0
-#  ifndef SQLITE_OS_WIN
-#    if defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || \
-        defined(__MINGW32__) || defined(__BORLANDC__)
-#      define SQLITE_OS_WIN 1
-#      define SQLITE_OS_UNIX 0
-#    else
-#      define SQLITE_OS_WIN 0
-#      define SQLITE_OS_UNIX 1
-#    endif
-#  else
-#    define SQLITE_OS_UNIX 0
-#  endif
-#else
-#  ifndef SQLITE_OS_WIN
-#    define SQLITE_OS_WIN 0
-#  endif
+#  undef SQLITE_OS_UNIX
+#  define SQLITE_OS_UNIX 0
+#  undef SQLITE_OS_WIN
+#  define SQLITE_OS_WIN 0
+#  define SQLITE_OMIT_LOAD_EXTENSION 1
+#  define SQLITE_OMIT_WAL 1
+#  define SQLITE_OMIT DEPRECATED 1
+#  undef SQLITE_TEMP_STORE
+#  define SQLITE_TEMP_STORE 3  /* Always use memory for temporary storage */
+#  define SQLITE_DQS 0
+#  define SQLITE_OMIT_SHARED_CACHE 1
+#  define SQLITE_OMIT_AUTOINIT 1
+#endif
+#if SQLITE_OS_UNIX+1>1
+#  undef SQLITE_OS_KV
+#  define SQLITE_OS_KV 0
+#  undef SQLITE_OS_OTHER
+#  define SQLITE_OS_OTHER 0
+#  undef SQLITE_OS_WIN
+#  define SQLITE_OS_WIN 0
+#endif
+#if SQLITE_OS_WIN+1>1
+#  undef SQLITE_OS_KV
+#  define SQLITE_OS_KV 0
+#  undef SQLITE_OS_OTHER
+#  define SQLITE_OS_OTHER 0
+#  undef SQLITE_OS_UNIX
+#  define SQLITE_OS_UNIX 0
 #endif
 
+
 #endif /* SQLITE_OS_SETUP_H */
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 148ba75949..63e3583c8c 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -1268,11 +1268,11 @@ typedef int VList;
 ** "BusyHandler" typedefs. vdbe.h also requires a few of the opaque
 ** pointer types (i.e. FuncDef) defined above.
 */
+#include "os.h"
 #include "pager.h"
 #include "btree.h"
 #include "vdbe.h"
 #include "pcache.h"
-#include "os.h"
 #include "mutex.h"
 
 /* The SQLITE_EXTRA_DURABLE compile-time option used to set the default
diff --git a/tool/mksqlite3c.tcl b/tool/mksqlite3c.tcl
index 595fc4c602..0cdf514e44 100644
--- a/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@ -355,6 +355,7 @@ foreach file {
    hash.c
    opcodes.c
 
+   os_kv.c
    os_unix.c
    os_win.c
    memdb.c

From c6c9c6aad0a8652d3daf0298fe9d411b03c79c41 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sat, 10 Sep 2022 18:38:21 +0000
Subject: [PATCH 079/428] Improved comments in os_kv.c.  Better names for the
 key/value name spaces.

FossilOrigin-Name: 8e1652a3856765c9146cc2a7e3b598a2dc7dc84c556b35eab9a35184514384b9
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/os_kv.c   | 48 ++++++++++++++++++++++++++----------------------
 3 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/manifest b/manifest
index a139582803..23b98932b2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Move\sthe\svfskv.c\sextension\sto\ssrc/os_kv.c\sand\smake\sit\spart\sof\sthe\samalgamation,\nactivated\sif\sand\sonly\sif\sSQLITE_OS_KV\sis\strue.
-D 2022-09-10T18:20:59.146
+C Improved\scomments\sin\sos_kv.c.\s\sBetter\snames\sfor\sthe\skey/value\sname\sspaces.
+D 2022-09-10T18:38:21.976
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -571,7 +571,7 @@ F src/notify.c 89a97dc854c3aa62ad5f384ef50c5a4a11d70fcc69f86de3e991573421130ed6
 F src/os.c 0eb831ba3575af5277e47f4edd14fdfc90025c67eb25ce5cda634518d308d4e9
 F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
-F src/os_kv.c dc409476c3e533def81d022849726f2892e69e6529d4a40a637224cfb3f5df68 w ext/misc/vfskv.c
+F src/os_kv.c c658ddfb433b982afb3d12d133117e8db9eee11af33db41c30a6f30375f9b99a
 F src/os_setup.h 0711dbc4678f3ac52d7fe736951b6384a0615387c4ba5135a4764e4e31f4b6a6
 F src/os_unix.c 102f7e5c5b59c18ea3dbc929dc3be8acb3afc0e0b6ad572e032335c9c27f44f1
 F src/os_win.c e9454cb141908e8eef2102180bad353a36480612d5b736e4c2bd5777d9b25a34
@@ -2001,8 +2001,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 c8e41279294ea7c2f041c7d4cbbd85fce47d55f2f56180ca837316f7dfd75237
-R 781601077fda92ceda7382ba24a16664
+P f6632e69c2ec1a7ddc4e51f3567e3bc082ee94a6dd51fdafdc0c3bf386a32d4c
+R 8cd4482ba17a8f6c143ea61b8462f46c
 U drh
-Z b2ad663d300b47ac24999ede7b88d1e7
+Z 81846bec91bdcab04bc60c9c032d039e
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 4bfd8ba9c2..c114a26d08 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f6632e69c2ec1a7ddc4e51f3567e3bc082ee94a6dd51fdafdc0c3bf386a32d4c
\ No newline at end of file
+8e1652a3856765c9146cc2a7e3b598a2dc7dc84c556b35eab9a35184514384b9
\ No newline at end of file
diff --git a/src/os_kv.c b/src/os_kv.c
index 8ae1a65c59..1412de8122 100644
--- a/src/os_kv.c
+++ b/src/os_kv.c
@@ -165,26 +165,28 @@ static sqlite3_io_methods kvvfs_jrnl_io_methods = {
 
 /* Forward declarations for the low-level storage engine
 */
-#define KVSTORAGE_KEY_SZ  24
-#define KVSTORAGE_KEY_PREFIX  "kvvfs-"
+#define KVSTORAGE_KEY_SZ  32
 static int kvstorageWrite(const char*, const char *zKey, const char *zData);
 static int kvstorageDelete(const char*, const char *zKey);
 static int kvstorageRead(const char*, const char *zKey, char *zBuf, int nBuf);
 
 
 /* Expand the key name with an appropriate prefix and put the result
-** in pStore->zKey[]
+** zKeyOut[].  The zKeyOut[] buffer is assumed to hold at least
+** KVSTORAGE_KEY_SZ bytes.
 */
 static void kvstorageMakeKey(
   const char *zClass,
   const char *zKeyIn,
   char *zKeyOut
 ){
-  sqlite3_snprintf(KVSTORAGE_KEY_SZ, zKeyOut, "%s-%s", zClass, zKeyIn);
+  sqlite3_snprintf(KVSTORAGE_KEY_SZ, zKeyOut, "kvvfs-%s-%s", zClass, zKeyIn);
 }
 
-/* Write content into a key.  zKey is of limited size.  zData should be
-** pure text.  In other words, zData has already been encoded.
+/* Write content into a key.  zClass is the particular namespace of the
+** underlying key/value store to use - either "local" or "session".
+**
+** Both zKey and zData are zero-terminated pure text strings.
 **
 ** Return the number of errors.
 */
@@ -209,7 +211,9 @@ static int kvstorageWrite(
   }
 }
 
-/* Delete a key
+/* Delete a key (with its corresponding data) from the key/value
+** namespace given by zClass.  If the key does not previously exist,
+** this routine is a no-op.
 */
 static int kvstorageDelete(const char *zClass, const char *zKey){
   char zXKey[KVSTORAGE_KEY_SZ];
@@ -219,16 +223,17 @@ static int kvstorageDelete(const char *zClass, const char *zKey){
   return 0;
 }
 
-/* Read the value associated with a key and put the result in the first
+/* Read the value associated with a zKey from the key/value namespace given
+** by zClass and put the text data associated with that key in the first
 ** nBuf bytes of zBuf[].  The value might be truncated if zBuf is not large
-** enough to hold it all.  The value put into zBuf will always be zero
-** terminated.
+** enough to hold it all.  The value put into zBuf must always be zero
+** terminated, even if it gets truncated because nBuf is not large enough.
 **
 ** Return the total number of bytes in the data, without truncation, and
 ** not counting the final zero terminator.   Return -1 if the key does
 ** not exist.
 **
-** If nBuf==0 then this routine simply returns the size of the data without
+** If nBuf<=0 then this routine simply returns the size of the data without
 ** actually reading it.
 */
 static int kvstorageRead(
@@ -248,7 +253,7 @@ static int kvstorageRead(
     SQLITE_KV_TRACE(("KVVFS-READ   %-15s (-1)\n", zXKey));
     return -1;
   }
-  if( nBuf<0 ){
+  if( nBuf<=0 ){
     return (int)buf.st_size;
   }else if( nBuf==1 ){
     zBuf[0] = 0;
@@ -275,7 +280,6 @@ static int kvstorageRead(
 
 /****** Utility subroutines ************************************************/
 
-
 /*
 ** Encode binary into the text encoded used to persist on disk.
 ** The output text is stored in aOut[], which must be at least
@@ -446,7 +450,7 @@ static int kvvfsReadJrnl(
   assert( pFile->isJournal );
   SQLITE_KV_LOG(("xRead('%s-journal',%d,%lld)\n", pFile->zClass, iAmt, iOfst));
   if( pFile->aJrnl==0 ){
-    int szTxt = kvstorageRead(pFile->zClass, "jrnl", 0, -1);
+    int szTxt = kvstorageRead(pFile->zClass, "jrnl", 0, 0);
     char *aTxt;
     if( szTxt<=4 ){
       return SQLITE_IOERR;
@@ -752,9 +756,9 @@ static int kvvfsOpen(
     return SQLITE_CANTOPEN;
   }
   if( zName[0]=='s' ){
-    pFile->zClass = KVSTORAGE_KEY_PREFIX "ses";
+    pFile->zClass = "session";
   }else{
-    pFile->zClass = KVSTORAGE_KEY_PREFIX "loc";
+    pFile->zClass = "local";
   }
   pFile->aJrnl = 0;
   pFile->nJrnl = 0;
@@ -770,10 +774,10 @@ static int kvvfsOpen(
 */
 static int kvvfsDelete(sqlite3_vfs *pVfs, const char *zPath, int dirSync){
   if( strcmp(zPath, "local-journal")==0 ){
-    kvstorageDelete(KVSTORAGE_KEY_PREFIX "loc", "jrnl");
+    kvstorageDelete("local", "jrnl");
   }else
   if( strcmp(zPath, "session-journal")==0 ){
-    kvstorageDelete(KVSTORAGE_KEY_PREFIX "ses", "jrnl");
+    kvstorageDelete("session", "jrnl");
   }
   return SQLITE_OK;
 }
@@ -790,16 +794,16 @@ static int kvvfsAccess(
 ){
   SQLITE_KV_LOG(("xAccess(\"%s\")\n", zPath));
   if( strcmp(zPath, "local-journal")==0 ){
-    *pResOut = kvstorageRead(KVSTORAGE_KEY_PREFIX "loc", "jrnl", 0, -1)>0;
+    *pResOut = kvstorageRead("local", "jrnl", 0, 0)>0;
   }else
   if( strcmp(zPath, "session-journal")==0 ){
-    *pResOut = kvstorageRead(KVSTORAGE_KEY_PREFIX "ses", "jrnl", 0, -1)>0;
+    *pResOut = kvstorageRead("session", "jrnl", 0, 0)>0;
   }else
   if( strcmp(zPath, "local")==0 ){
-    *pResOut = kvstorageRead(KVSTORAGE_KEY_PREFIX "loc", "sz", 0, -1)>0;
+    *pResOut = kvstorageRead("local", "sz", 0, 0)>0;
   }else
   if( strcmp(zPath, "session")==0 ){
-    *pResOut = kvstorageRead(KVSTORAGE_KEY_PREFIX "ses", "sz", 0, -1)>0;
+    *pResOut = kvstorageRead("session", "sz", 0, 0)>0;
   }else
   {
     *pResOut = 0;

From 65660916dc906dc2323b704caf937e1c0cfc6c9b Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Sat, 10 Sep 2022 20:01:49 +0000
Subject: [PATCH 080/428] Rework recover extension code for readability.

FossilOrigin-Name: 1a2540960e40e3c8c622448fd3862e249bd463c29ae4ce5e39942e942533f60a
---
 ext/recover/sqlite3recover.c | 516 ++++++++++++++++++++++++++++-------
 manifest                     |  12 +-
 manifest.uuid                |   2 +-
 3 files changed, 421 insertions(+), 109 deletions(-)

diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index e6975b8771..9c5e10433b 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -17,6 +17,16 @@
 #include <assert.h>
 #include <string.h>
 
+/*
+** Declaration for public API function in file dbdata.c. This may be called
+** with NULL as the final two arguments to register the sqlite_dbptr and
+** sqlite_dbdata virtual tables with a database handle.
+*/
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
+int sqlite3_dbdata_init(sqlite3*, char**, const sqlite3_api_routines*);
+
 typedef unsigned int u32;
 typedef sqlite3_int64 i64;
 
@@ -131,29 +141,32 @@ struct RecoverBitmap {
 };
 
 /*
-**
+** Main recover handle structure.
 */
 struct sqlite3_recover {
+  /* Copies of sqlite3_recover_init[_sql]() parameters */
   sqlite3 *dbIn;                  /* Input database */
-  sqlite3 *dbOut;                 /* Output database */
-
-  sqlite3_stmt *pGetPage;         /* SELECT against input db sqlite_dbdata */
-
   char *zDb;                      /* Name of input db ("main" etc.) */
   char *zUri;                     /* URI for output database */
-  RecoverTable *pTblList;         /* List of tables recovered from schem */
-  RecoverBitmap *pUsed;           /* Used by recoverLostAndFound() */
-
-  int errCode;                    /* For sqlite3_recover_errcode() */
-  char *zErrMsg;                  /* For sqlite3_recover_errmsg() */
+  void *pSqlCtx;                  /* SQL callback context */
+  int (*xSql)(void*,const char*); /* Pointer to SQL callback function */
 
+  /* Values configured by sqlite3_recover_config() */
   char *zStateDb;                 /* State database to use (or NULL) */
   char *zLostAndFound;            /* Name of lost-and-found table (or NULL) */
   int bFreelistCorrupt;           /* SQLITE_RECOVER_FREELIST_CORRUPT setting */
   int bRecoverRowid;              /* SQLITE_RECOVER_ROWIDS setting */
 
-  void *pSqlCtx;                  /* SQL callback context */
-  int (*xSql)(void*,const char*); /* Pointer to SQL callback function */
+  /* Error code and error message */
+  int errCode;                    /* For sqlite3_recover_errcode() */
+  char *zErrMsg;                  /* For sqlite3_recover_errmsg() */
+
+  /* Fields used within sqlite3_recover_run() */
+  int bRun;                       /* True once _recover_run() has been called */
+  sqlite3 *dbOut;                 /* Output database */
+  sqlite3_stmt *pGetPage;         /* SELECT against input db sqlite_dbdata */
+  RecoverTable *pTblList;         /* List of tables recovered from schem */
+  RecoverBitmap *pUsed;           /* Used by recoverLostAndFound() */
 };
 
 /* 
@@ -172,6 +185,15 @@ static int recoverStrlen(const char *zStr){
   return nRet;
 }
 
+/*
+** This function is a no-op if the recover handle passed as the first 
+** argument already contains an error (if p->errCode!=SQLITE_OK). 
+**
+** Otherwise, an attempt is made to allocate, zero and return a buffer nByte
+** bytes in size. If successful, a pointer to the new buffer is returned. Or,
+** if an OOM error occurs, NULL is returned and the handle error code
+** (p->errCode) set to SQLITE_NOMEM.
+*/
 static void *recoverMalloc(sqlite3_recover *p, i64 nByte){
   void *pRet = 0;
   assert( nByte>0 );
@@ -186,6 +208,19 @@ static void *recoverMalloc(sqlite3_recover *p, i64 nByte){
   return pRet;
 }
 
+/*
+** Set the error code and error message for the recover handle passed as
+** the first argument. The error code is set to the value of parameter
+** errCode.
+**
+** Parameter zFmt must be a printf() style formatting string. The handle 
+** error message is set to the result of using any trailing arguments for 
+** parameter substitutions in the formatting string.
+**
+** For example:
+**
+**   recoverError(p, SQLITE_ERROR, "no such table: %s", zTablename);
+*/
 static int recoverError(
   sqlite3_recover *p, 
   int errCode, 
@@ -204,6 +239,14 @@ static int recoverError(
 }
 
 
+/*
+** This function is a no-op if p->errCode is initially other than SQLITE_OK.
+** In this case it returns NULL.
+**
+** Otherwise, an attempt is made to allocate and return a bitmap object
+** large enough to store a bit for all page numbers between 1 and nPg,
+** inclusive. The bitmap is initially zeroed.
+*/
 static RecoverBitmap *recoverBitmapAlloc(sqlite3_recover *p, i64 nPg){
   int nElem = (nPg+1+31) / 32;
   int nByte = sizeof(RecoverBitmap) + nElem*sizeof(u32);
@@ -215,10 +258,16 @@ static RecoverBitmap *recoverBitmapAlloc(sqlite3_recover *p, i64 nPg){
   return pRet;
 }
 
+/*
+** Free a bitmap object allocated by recoverBitmapAlloc().
+*/
 static void recoverBitmapFree(RecoverBitmap *pMap){
   sqlite3_free(pMap);
 }
 
+/*
+** Set the bit associated with page iPg in bitvec pMap.
+*/
 static void recoverBitmapSet(RecoverBitmap *pMap, i64 iPg){
   if( iPg<=pMap->nPg ){
     int iElem = (iPg / 32);
@@ -227,6 +276,10 @@ static void recoverBitmapSet(RecoverBitmap *pMap, i64 iPg){
   }
 }
 
+/*
+** Query bitmap object pMap for the state of the bit associated with page
+** iPg. Return 1 if it is set, or 0 otherwise.
+*/
 static int recoverBitmapQuery(RecoverBitmap *pMap, i64 iPg){
   int ret = 1;
   if( iPg<=pMap->nPg ){
@@ -237,11 +290,24 @@ static int recoverBitmapQuery(RecoverBitmap *pMap, i64 iPg){
   return ret;
 }
 
-
+/*
+** Set the recover handle error to the error code and message returned by
+** calling sqlite3_errcode() and sqlite3_errmsg(), respectively, on database
+** handle db.
+*/
 static int recoverDbError(sqlite3_recover *p, sqlite3 *db){
   return recoverError(p, sqlite3_errcode(db), "%s", sqlite3_errmsg(db));
 }
 
+/*
+** This function is a no-op if recover handle p already contains an error
+** (if p->errCode!=SQLITE_OK). 
+**
+** Otherwise, it attempts to prepare the SQL statement in zSql against
+** database handle db. If successful, the statement handle is returned.
+** Or, if an error occurs, NULL is returned and an error left in the
+** recover handle.
+*/
 static sqlite3_stmt *recoverPrepare(
   sqlite3_recover *p,
   sqlite3 *db, 
@@ -257,7 +323,15 @@ static sqlite3_stmt *recoverPrepare(
 }
 
 /*
-** Create a prepared statement using printf-style arguments for the SQL.
+** This function is a no-op if recover handle p already contains an error
+** (if p->errCode!=SQLITE_OK). 
+**
+** Otherwise, argument zFmt is used as a printf() style format string,
+** along with any trailing arguments, to create an SQL statement. This
+** SQL statement is prepared against database handle db and, if successful,
+** the statment handle returned. Or, if an error occurs - either during
+** the printf() formatting or when preparing the resulting SQL - an
+** error code and message are left in the recover handle.
 */
 static sqlite3_stmt *recoverPreparePrintf(
   sqlite3_recover *p,
@@ -281,7 +355,15 @@ static sqlite3_stmt *recoverPreparePrintf(
   return pStmt;
 }
 
-
+/*
+** Reset SQLite statement handle pStmt. If the call to sqlite3_reset() 
+** indicates that an error occurred, and there is not already an error
+** in the recover handle passed as the first argument, set the error
+** code and error message appropriately.
+**
+** This function returns a copy of the statement handle pointer passed
+** as the second argument.
+*/
 static sqlite3_stmt *recoverReset(sqlite3_recover *p, sqlite3_stmt *pStmt){
   int rc = sqlite3_reset(pStmt);
   if( rc!=SQLITE_OK && p->errCode==SQLITE_OK ){
@@ -290,6 +372,12 @@ static sqlite3_stmt *recoverReset(sqlite3_recover *p, sqlite3_stmt *pStmt){
   return pStmt;
 }
 
+/*
+** Finalize SQLite statement handle pStmt. If the call to sqlite3_reset() 
+** indicates that an error occurred, and there is not already an error
+** in the recover handle passed as the first argument, set the error
+** code and error message appropriately.
+*/
 static void recoverFinalize(sqlite3_recover *p, sqlite3_stmt *pStmt){
   sqlite3 *db = sqlite3_db_handle(pStmt);
   int rc = sqlite3_finalize(pStmt);
@@ -298,6 +386,15 @@ static void recoverFinalize(sqlite3_recover *p, sqlite3_stmt *pStmt){
   }
 }
 
+/*
+** This function is a no-op if recover handle p already contains an error
+** (if p->errCode!=SQLITE_OK). A copy of p->errCode is returned in this 
+** case.
+**
+** Otherwise, execute SQL script zSql. If successful, return SQLITE_OK.
+** Or, if an error occurs, leave an error code and message in the recover
+** handle and return a copy of the error code.
+*/
 static int recoverExec(sqlite3_recover *p, sqlite3 *db, const char *zSql){
   if( p->errCode==SQLITE_OK ){
     int rc = sqlite3_exec(db, zSql, 0, 0, 0);
@@ -308,6 +405,20 @@ static int recoverExec(sqlite3_recover *p, sqlite3 *db, const char *zSql){
   return p->errCode;
 }
 
+/*
+** This function is a no-op if recover handle p already contains an error
+** (if p->errCode!=SQLITE_OK). NULL is returned in this case.
+**
+** Otherwise, an attempt is made to interpret zFmt as a printf() style
+** formatting string and the result of using the trailing arguments for
+** parameter substitution with it written into a buffer obtained from
+** sqlite3_malloc(). If successful, a pointer to the buffer is returned.
+** It is the responsibility of the caller to eventually free the buffer
+** using sqlite3_free().
+**
+** Or, if an error occurs, an error code and message is left in the recover
+** handle and NULL returned.
+*/
 static char *recoverMPrintf(sqlite3_recover *p, const char *zFmt, ...){
   va_list ap;
   char *z;
@@ -324,9 +435,13 @@ static char *recoverMPrintf(sqlite3_recover *p, const char *zFmt, ...){
 }
 
 /*
-** Execute "PRAGMA page_count" against the input database. If successful,
-** return the integer result. Or, if an error occurs, leave an error code 
-** and error message in the sqlite3_recover handle.
+** This function is a no-op if recover handle p already contains an error
+** (if p->errCode!=SQLITE_OK). Zero is returned in this case.
+**
+** Otherwise, execute "PRAGMA page_count" against the input database. If
+** successful, return the integer result. Or, if an error occurs, leave an
+** error code and error message in the sqlite3_recover handle and return
+** zero.
 */
 static i64 recoverPageCount(sqlite3_recover *p){
   i64 nPg = 0;
@@ -342,10 +457,12 @@ static i64 recoverPageCount(sqlite3_recover *p){
 }
 
 /*
-** Scalar function "read_i32". The first argument to this function
-** must be a blob. The second a non-negative integer. This function
-** reads and returns a 32-bit big-endian integer from byte
+** Implementation of SQL scalar function "read_i32". The first argument to 
+** this function must be a blob. The second a non-negative integer. This 
+** function reads and returns a 32-bit big-endian integer from byte
 ** offset (4*<arg2>) of the blob.
+**
+**     SELECT read_i32(<blob>, <idx>)
 */
 static void recoverReadI32(
   sqlite3_context *context, 
@@ -372,7 +489,16 @@ static void recoverReadI32(
 }
 
 /*
-** SELECT page_is_used(pgno);
+** Implementation of SQL scalar function "page_is_used". This function
+** is used as part of the procedure for locating orphan rows for the
+** lost-and-found table, and it depends on those routines having populated
+** the sqlite3_recover.pUsed variable.
+**
+** The only argument to this function is a page-number. It returns true 
+** if the page has already been used somehow during data recovery, or false
+** otherwise.
+**
+**     SELECT page_is_used(<pgno>);
 */
 static void recoverPageIsUsed(
   sqlite3_context *pCtx,
@@ -394,7 +520,7 @@ static void recoverPageIsUsed(
 ** sqlite_dbdata and sqlite_dbptr virtual table modules to access pages
 ** of the database being recovered.
 **
-** This function always takes a single integer argument. If the arguement
+** This function always takes a single integer argument. If the argument
 ** is zero, then the value returned is the number of pages in the db being
 ** recovered. If the argument is greater than zero, it is a page number. 
 ** The value returned in this case is an SQL blob containing the data for 
@@ -462,18 +588,17 @@ static const char *recoverUnusedString(
   return zBuf;
 }
 
-
 /*
-** Scalar function "escape_crnl".  The argument passed to this function is the
-** output of built-in function quote(). If the first character of the input is
-** "'", indicating that the value passed to quote() was a text value, then this
-** function searches the input for "\n" and "\r" characters and adds a wrapper
-** similar to the following:
+** Implementation of scalar SQL function "escape_crnl".  The argument passed to
+** this function is the output of built-in function quote(). If the first
+** character of the input is "'", indicating that the value passed to quote()
+** was a text value, then this function searches the input for "\n" and "\r"
+** characters and adds a wrapper similar to the following:
 **
 **   replace(replace(<input>, '\n', char(10), '\r', char(13));
 **
-** Or, if the first character of the input is not "'", then a copy
-** of the input is returned.
+** Or, if the first character of the input is not "'", then a copy of the input
+** is returned.
 */
 static void recoverEscapeCrnl(
   sqlite3_context *context, 
@@ -552,12 +677,20 @@ static void recoverEscapeCrnl(
   sqlite3_result_value(context, argv[0]);
 }
 
-
-#ifdef _WIN32
-__declspec(dllexport)
-#endif
-int sqlite3_dbdata_init(sqlite3*, char**, const sqlite3_api_routines*);
-
+/*
+** This function is a no-op if recover handle p already contains an error
+** (if p->errCode!=SQLITE_OK). A copy of the error code is returned in
+** this case. 
+**
+** Otherwise, an attempt is made to open the output database, attach
+** and create the schema of the temporary database used to store
+** intermediate data, and to register all required user functions and
+** virtual table modules with the output handle.
+**
+** If no error occurs, SQLITE_OK is returned. Otherwise, an error code
+** and error message are left in the recover handle and a copy of the
+** error code returned.
+*/
 static int recoverOpenOutput(sqlite3_recover *p){
   struct Func {
     const char *zName;
@@ -576,17 +709,19 @@ static int recoverOpenOutput(sqlite3_recover *p){
 
   assert( p->dbOut==0 );
 
-  if( sqlite3_open_v2(p->zUri, &db, flags, 0) ){
-    recoverDbError(p, db);
-  }else{
-    char *zSql = recoverMPrintf(p, "ATTACH %Q AS recovery;", p->zStateDb);
-    recoverExec(p, db, zSql);
-    recoverExec(p, db,
-        "PRAGMA writable_schema = 1;"
-        "CREATE TABLE recovery.map(pgno INTEGER PRIMARY KEY, parent INT);" 
-        "CREATE TABLE recovery.schema(type, name, tbl_name, rootpage, sql);"
-    );
-    sqlite3_free(zSql);
+  if( p->errCode==SQLITE_OK ){
+    if( sqlite3_open_v2(p->zUri, &db, flags, 0) ){
+      recoverDbError(p, db);
+    }else{
+      char *zSql = recoverMPrintf(p, "ATTACH %Q AS recovery;", p->zStateDb);
+      recoverExec(p, db, zSql);
+      recoverExec(p, db,
+          "PRAGMA writable_schema = 1;"
+          "CREATE TABLE recovery.map(pgno INTEGER PRIMARY KEY, parent INT);" 
+          "CREATE TABLE recovery.schema(type, name, tbl_name, rootpage, sql);"
+          );
+      sqlite3_free(zSql);
+    }
   }
 
   /* Register the sqlite_dbdata and sqlite_dbptr virtual table modules.
@@ -624,6 +759,19 @@ static int recoverOpenOutput(sqlite3_recover *p){
   return p->errCode;
 }
 
+/*
+** This function is a no-op if recover handle p already contains an error
+** (if p->errCode!=SQLITE_OK). A copy of the error code is returned in
+** this case. 
+**
+** Otherwise, attempt to populate temporary table "recovery.schema" with the
+** parts of the database schema that can be extracted from the input database.
+**
+** If no error occurs, SQLITE_OK is returned. Otherwise, an error code
+** and error message are left in the recover handle and a copy of the
+** error code returned. It is not considered an error if part of all of
+** the database schema cannot be recovered due to corruption.
+*/
 static int recoverCacheSchema(sqlite3_recover *p){
   return recoverExec(p, p->dbOut,
     "WITH RECURSIVE pages(p) AS ("
@@ -643,7 +791,24 @@ static int recoverCacheSchema(sqlite3_recover *p){
   );
 }
 
-static void recoverAddTable(sqlite3_recover *p, const char *zName, i64 iRoot){
+/*
+** This function is a no-op if recover handle p already contains an error
+** (if p->errCode!=SQLITE_OK).
+**
+** Otherwise, argument zName must be the name of a table that has just been
+** created in the output database. This function queries the output db
+** for the schema of said table, and creates a RecoverTable object to
+** store the schema in memory. The new RecoverTable object is linked into
+** the list at sqlite3_recover.pTblList.
+**
+** Parameter iRoot must be the root page of table zName in the INPUT 
+** database.
+*/
+static void recoverAddTable(
+  sqlite3_recover *p, 
+  const char *zName,              /* Name of table created in output db */
+  i64 iRoot                       /* Root page of same table in INPUT db */
+){
   sqlite3_stmt *pStmt = recoverPreparePrintf(p, p->dbOut, 
       "PRAGMA table_xinfo(%Q)", zName
   );
@@ -727,6 +892,15 @@ static void recoverAddTable(sqlite3_recover *p, const char *zName, i64 iRoot){
   }
 }
 
+/*
+** If this recover handle is not in SQL callback mode (i.e. was not created 
+** using sqlite3_recover_init_sql()) of if an error has already occurred, 
+** this function is a no-op. Otherwise, issue a callback with SQL statement
+** zSql as the parameter. 
+**
+** If the callback returns non-zero, set the recover handle error code to
+** the value returned (so that the caller will abandon processing).
+*/
 static void recoverSqlCallback(sqlite3_recover *p, const char *zSql){
   if( p->errCode==SQLITE_OK && p->xSql ){
     int res = p->xSql(p->pSqlCtx, zSql);
@@ -737,7 +911,23 @@ static void recoverSqlCallback(sqlite3_recover *p, const char *zSql){
 }
 
 /*
+** This function is called after recoverCacheSchema() has cached those parts
+** of the input database schema that could be recovered in temporary table
+** "recovery.schema". This function creates in the output database copies
+** of all parts of that schema that must be created before the tables can
+** be populated. Specifically, this means:
 **
+**     * all tables that are not VIRTUAL, and
+**     * UNIQUE indexes.
+**
+** If the recovery handle uses SQL callbacks, then callbacks containing
+** the associated "CREATE TABLE" and "CREATE INDEX" statements are made.
+**
+** Additionally, records are added to the sqlite_schema table of the
+** output database for any VIRTUAL tables. The CREATE VIRTUAL TABLE
+** records are written directly to sqlite_schema, not actually executed.
+** If the handle is in SQL callback mode, then callbacks are invoked 
+** with equivalent SQL statements.
 */
 static int recoverWriteSchema1(sqlite3_recover *p){
   sqlite3_stmt *pSelect = 0;
@@ -800,6 +990,19 @@ static int recoverWriteSchema1(sqlite3_recover *p){
   return p->errCode;
 }
 
+/*
+** This function is called after the output database has been populated. It
+** adds all recovered schema elements that were not created in the output
+** database by recoverWriteSchema1() - everything except for tables and
+** UNIQUE indexes. Specifically:
+**
+**     * views,
+**     * triggers,
+**     * non-UNIQUE indexes.
+**
+** If the recover handle is in SQL callback mode, then equivalent callbacks
+** are issued to create the schema elements.
+*/
 static int recoverWriteSchema2(sqlite3_recover *p){
   sqlite3_stmt *pSelect = 0;
 
@@ -825,6 +1028,41 @@ static int recoverWriteSchema2(sqlite3_recover *p){
   return p->errCode;
 }
 
+/*
+** This function is a no-op if recover handle p already contains an error
+** (if p->errCode!=SQLITE_OK). In this case it returns NULL.
+**
+** Otherwise, if the recover handle is configured to create an output
+** database (was created by sqlite3_recover_init()), then this function
+** prepares and returns an SQL statement to INSERT a new record into table
+** pTab, assuming the first nField fields of a record extracted from disk
+** are valid.
+**
+** For example, if table pTab is:
+**
+**     CREATE TABLE name(a, b GENERATED ALWAYS AS (a+1) STORED, c, d, e);
+**
+** And nField is 4, then the SQL statement prepared and returned is:
+**
+**     INSERT INTO (a, c, d) VALUES (?1, ?2, ?3);
+**
+** In this case even though 4 values were extracted from the input db,
+** only 3 are written to the output, as the generated STORED column 
+** cannot be written.
+**
+** If the recover handle is in SQL callback mode, then the SQL statement
+** prepared is such that evaluating it returns a single row containing
+** a single text value - itself an SQL statement similar to the above,
+** except with SQL literals in place of the variables. For example:
+**
+**     SELECT 'INSERT INTO (a, c, d) VALUES (' 
+**          || quote(?1) || ', '
+**          || quote(?2) || ', '
+**          || quote(?3) || ')';
+**
+** In either case, it is the responsibility of the caller to eventually
+** free the statement handle using sqlite3_finalize().
+*/
 static sqlite3_stmt *recoverInsertStmt(
   sqlite3_recover *p, 
   RecoverTable *pTab,
@@ -855,7 +1093,6 @@ static sqlite3_stmt *recoverInsertStmt(
     zSep = ", ";
   }
 
-
   for(ii=0; ii<nField; ii++){
     int eHidden = pTab->aCol[ii].eHidden;
     if( eHidden!=RECOVER_EHIDDEN_VIRTUAL
@@ -893,6 +1130,11 @@ static sqlite3_stmt *recoverInsertStmt(
 }
 
 
+/*
+** Search the list of RecoverTable objects at p->pTblList for one that
+** has root page iRoot in the input database. If such an object is found,
+** return a pointer to it. Otherwise, return NULL.
+*/
 static RecoverTable *recoverFindTable(sqlite3_recover *p, u32 iRoot){
   RecoverTable *pRet = 0;
   for(pRet=p->pTblList; pRet && pRet->iRoot!=iRoot; pRet=pRet->pNext);
@@ -1007,6 +1249,9 @@ static sqlite3_stmt *recoverLostAndFoundInsert(
   return pRet;
 }
 
+/*
+** Helper function for recoverLostAndFound().
+*/
 static void recoverLostAndFoundPopulate(
   sqlite3_recover *p, 
   sqlite3_stmt *pInsert,
@@ -1096,6 +1341,12 @@ static void recoverLostAndFoundPopulate(
   sqlite3_free(apVal);
 }
 
+/*
+** This function searches for orphaned rows in the input database. If
+** any are found, it creates the lost-and-found table in the output
+** db and writes all orphaned rows to it. Or, if the recover handle is
+** in SQL callback mode, issues equivalent callbacks.
+*/
 static int recoverLostAndFound(sqlite3_recover *p){
   i64 nPg = 0;
   RecoverBitmap *pMap = 0;
@@ -1198,12 +1449,18 @@ static int recoverLostAndFound(sqlite3_recover *p){
       recoverFinalize(p, pInsert);
       sqlite3_free(zTab);
     }
-
-    recoverBitmapFree(pMap);
-    p->pUsed = 0;
   }
 }
 
+/*
+** For each table in the recovered schema, this function extracts as much
+** data as possible from the output database and writes it to the input
+** database. Or, if the recover handle is in SQL callback mode, issues
+** equivalent callbacks.
+**
+** It does not recover "orphaned" data into the lost-and-found table.
+** See recoverLostAndFound() for that.
+*/
 static int recoverWriteData(sqlite3_recover *p){
   RecoverTable *pTbl;
   int nMax = 0;
@@ -1349,12 +1606,79 @@ static int recoverWriteData(sqlite3_recover *p){
   return p->errCode;
 }
 
+/*
+** This function does the work of sqlite3_recover_run(). It is assumed that
+** no error has occurred when this is called. If an error occurs during
+** the recovery operation, an error code and error message are left in
+** the recovery handle.
+*/
+static void recoverRun(sqlite3_recover *p){
+  RecoverTable *pTab = 0;
+  RecoverTable *pNext = 0;
+  int rc = SQLITE_OK;
+
+  assert( p->errCode==SQLITE_OK );
+  assert( p->bRun==0 );
+  p->bRun = 1;
+
+  recoverSqlCallback(p, "BEGIN");
+  recoverSqlCallback(p, "PRAGMA writable_schema = on");
+
+  /* Open the output database. And register required virtual tables and 
+  ** user functions with the new handle. */
+  recoverOpenOutput(p);
+
+  /* Open transactions on both the input and output databases. */
+  recoverExec(p, p->dbIn, "BEGIN");
+  recoverExec(p, p->dbOut, "BEGIN");
+
+  recoverCacheSchema(p);
+  recoverWriteSchema1(p);
+  recoverWriteData(p);
+  if( p->zLostAndFound ) recoverLostAndFound(p);
+  recoverWriteSchema2(p);
+
+  /* If no error has occurred, commit the write transaction on the output
+  ** database. Then end the read transaction on the input database, regardless
+  ** of whether or not prior errors have occurred.  */
+  recoverExec(p, p->dbOut, "COMMIT");
+  rc = sqlite3_exec(p->dbIn, "END", 0, 0, 0);
+  if( p->errCode==SQLITE_OK ) p->errCode = rc;
+
+  recoverSqlCallback(p, "PRAGMA writable_schema = off");
+  recoverSqlCallback(p, "COMMIT");
+
+  /* Clean up various resources allocated by this function. */
+  for(pTab=p->pTblList; pTab; pTab=pNext){
+    pNext = pTab->pNext;
+    sqlite3_free(pTab);
+  }
+  p->pTblList = 0;
+  sqlite3_finalize(p->pGetPage);
+  p->pGetPage = 0;
+  recoverBitmapFree(p->pUsed);
+  p->pUsed = 0;
+  sqlite3_close(p->dbOut);
+}
+
+
+/*
+** This is a worker function that does the heavy lifting for both init
+** functions:
+**
+**     sqlite3_recover_init()
+**     sqlite3_recover_init_sql()
+**
+** All this function does is allocate space for the recover handle and
+** take copies of the input parameters. All the real work is done within
+** sqlite3_recover_run().
+*/
 sqlite3_recover *recoverInit(
   sqlite3* db, 
   const char *zDb, 
-  const char *zUri,
-  int (*xSql)(void*, const char*),
-  void *pSqlCtx
+  const char *zUri,               /* Output URI for _recover_init() */
+  int (*xSql)(void*, const char*),/* SQL callback for _recover_init_sql() */
+  void *pSqlCtx                   /* Context arg for _recover_init_sql() */
 ){
   sqlite3_recover *pRet = 0;
   int nDb = 0;
@@ -1384,6 +1708,10 @@ sqlite3_recover *recoverInit(
   return pRet;
 }
 
+/*
+** Initialize a recovery handle that creates a new database containing
+** the recovered data.
+*/
 sqlite3_recover *sqlite3_recover_init(
   sqlite3* db, 
   const char *zDb, 
@@ -1392,6 +1720,10 @@ sqlite3_recover *sqlite3_recover_init(
   return recoverInit(db, zDb, zUri, 0, 0);
 }
 
+/*
+** Initialize a recovery handle that returns recovered data in the
+** form of SQL statements via a callback.
+*/
 sqlite3_recover *sqlite3_recover_init_sql(
   sqlite3* db, 
   const char *zDb, 
@@ -1401,13 +1733,23 @@ sqlite3_recover *sqlite3_recover_init_sql(
   return recoverInit(db, zDb, "", xSql, pSqlCtx);
 }
 
+/*
+** Return the handle error message, if any.
+*/
 const char *sqlite3_recover_errmsg(sqlite3_recover *p){
   return p ? p->zErrMsg : "not an error";
 }
+
+/*
+** Return the handle error code.
+*/
 int sqlite3_recover_errcode(sqlite3_recover *p){
   return p ? p->errCode : SQLITE_NOMEM;
 }
 
+/*
+** Configure the handle.
+*/
 int sqlite3_recover_config(sqlite3_recover *p, int op, void *pArg){
   int rc = SQLITE_OK;
 
@@ -1443,57 +1785,27 @@ int sqlite3_recover_config(sqlite3_recover *p, int op, void *pArg){
   return rc;
 }
 
-static void recoverStep(sqlite3_recover *p){
-  RecoverTable *pTab = 0;
-  RecoverTable *pNext = 0;
-  int rc = SQLITE_OK;
-  assert( p->errCode==SQLITE_OK );
-
-  recoverSqlCallback(p, "BEGIN");
-  recoverSqlCallback(p, "PRAGMA writable_schema = on");
-
-  /* Open the output database. And register required virtual tables and 
-  ** user functions with the new handle. */
-  recoverOpenOutput(p);
-
-  /* Open transactions on both the input and output databases. */
-  recoverExec(p, p->dbIn, "BEGIN");
-  recoverExec(p, p->dbOut, "BEGIN");
-
-  recoverCacheSchema(p);
-  recoverWriteSchema1(p);
-  recoverWriteData(p);
-  if( p->zLostAndFound ) recoverLostAndFound(p);
-  recoverWriteSchema2(p);
-
-  /* If no error has occurred, commit the write transaction on the output
-  ** database. Then end the read transaction on the input database, regardless
-  ** of whether or not prior errors have occurred.  */
-  recoverExec(p, p->dbOut, "COMMIT");
-  rc = sqlite3_exec(p->dbIn, "END", 0, 0, 0);
-  if( p->errCode==SQLITE_OK ) p->errCode = rc;
-
-  recoverSqlCallback(p, "PRAGMA writable_schema = off");
-  recoverSqlCallback(p, "COMMIT");
-
-  for(pTab=p->pTblList; pTab; pTab=pNext){
-    pNext = pTab->pNext;
-    sqlite3_free(pTab);
-  }
-  p->pTblList = 0;
-
-  sqlite3_finalize(p->pGetPage);
-  sqlite3_close(p->dbOut);
-  p->pGetPage = 0;
-}
-
+/*
+** Do the configured recovery operation. Return SQLITE_OK if successful, or
+** else an SQLite error code.
+*/
 int sqlite3_recover_run(sqlite3_recover *p){
-  if( p && p->errCode==SQLITE_OK ){
-    recoverStep(p);
+  if( p ){
+    if( p->bRun ) return SQLITE_MISUSE;     /* Has already run */
+    if( p->errCode==SQLITE_OK ) recoverRun(p);
   }
   return p ? p->errCode : SQLITE_NOMEM;
 }
 
+/*
+** Free all resources associated with the recover handle passed as the only
+** argument. The results of using a handle with any sqlite3_recover_**
+** API function after it has been passed to this function are undefined.
+**
+** A copy of the value returned by the first call made to sqlite3_recover_run()
+** on this handle is returned, or SQLITE_OK if sqlite3_recover_run() has
+** not been called on this handle.
+*/
 int sqlite3_recover_finish(sqlite3_recover *p){
   int rc = p->errCode;
   sqlite3_free(p->zErrMsg);
diff --git a/manifest b/manifest
index 3f230d9467..d505905e12 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Further\sfixes\sto\scomments\sin\ssqlite3recover.h.\sAlso\srework\ssome\sdata\sstructures\sin\ssqlite3recover.c.
-D 2022-09-09T20:44:56.135
+C Rework\srecover\sextension\scode\sfor\sreadability.
+D 2022-09-10T20:01:49.308
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -392,7 +392,7 @@ F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007acef
 F ext/recover/recoverclobber.test e6537ebf99f57bfff6cca59550b5f4278319b57a89865abb98d755a8fd561d84
 F ext/recover/recoverold.test f368a6ae2db12b6017257b332a19ab5df527f4061e43f12f5c85d8e2b236f074
 F ext/recover/recoverrowid.test ec4436cd69e6cdacb48dd2963ff6dd9dbd5fe648376de5e7c0c2f4f6cbacb417
-F ext/recover/sqlite3recover.c e8d0eae7da7ba24e733f6247082c12d7a030ce794eb5c42d64993f55c12882f5
+F ext/recover/sqlite3recover.c 4ed53fd33639ede83505f4397b8e1e46b6c0c5a5188c42f28f8372487141170a
 F ext/recover/sqlite3recover.h 81108efb8c4618d3d9c6da4df785212b0e4501aa0d25edfc463405fe839a6640
 F ext/recover/test_recover.c ed8d0cc8703ab29cf562f793623b045de109b7937f254108ff4132f35abb37fb
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -2007,8 +2007,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 5f2d5ccd56c06c3468377126acfd4be39b79b05bb6fb09b674b2e185df143aa3
-R d4558eaeefd2a718275b323dc4307f9b
+P 599d1f8ec2f9e24924a6f9e66c85664360c7b95531b07a4efe1dd8c096b3fc99
+R cd56b05532a91c08b9e673fffba829f5
 U dan
-Z 6e64e7331e56e0c44a533586bb618920
+Z 624cfda4b7c658530a41a87671068e55
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index a1b607602a..98f37f0563 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-599d1f8ec2f9e24924a6f9e66c85664360c7b95531b07a4efe1dd8c096b3fc99
\ No newline at end of file
+1a2540960e40e3c8c622448fd3862e249bd463c29ae4ce5e39942e942533f60a
\ No newline at end of file

From d15822965be3898e9b306bbcdbfb72cbcdec4683 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sun, 11 Sep 2022 02:43:08 +0000
Subject: [PATCH 081/428] Initial prototype impls of write/delete-key ops for
 the pending kvvfs which use sessionStorage or localStorage for db page
 storage. read-key op is pending.

FossilOrigin-Name: a4bd96f5348e607d0fcb627b751f9d86a188173a4b3bfb2c95f92913a78bd31e
---
 ext/wasm/GNUmakefile                        |   3 +-
 ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api |   2 +
 ext/wasm/api/sqlite3-api-prologue.js        |   3 +-
 ext/wasm/api/sqlite3-wasm.c                 | 144 ++++++++++++++++++++
 manifest                                    |  18 +--
 manifest.uuid                               |   2 +-
 6 files changed, 160 insertions(+), 12 deletions(-)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 576b8d320f..bcc23feee7 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -193,7 +193,8 @@ emcc.jsflags += -sSTRICT_JS
 emcc.jsflags += -sDYNAMIC_EXECUTION=0
 emcc.jsflags += -sNO_POLYFILL
 emcc.jsflags += -sEXPORTED_FUNCTIONS=@$(dir.wasm)/EXPORTED_FUNCTIONS.api
-emcc.jsflags += -sEXPORTED_RUNTIME_METHODS=FS,wasmMemory # wasmMemory==>for -sIMPORTED_MEMORY
+emcc.jsflags += -sEXPORTED_RUNTIME_METHODS=FS,wasmMemory
+                # wasmMemory ==> required by our code for use with -sIMPORTED_MEMORY
 emcc.jsflags += -sUSE_CLOSURE_COMPILER=0
 emcc.jsflags += -sIMPORTED_MEMORY
 emcc.environment := -sENVIRONMENT=web
diff --git a/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api b/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
index 4a6b71b8ea..814f17fd93 100644
--- a/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
+++ b/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
@@ -70,5 +70,7 @@ _sqlite3_wasm_db_error
 _sqlite3_wasm_enum_json
 _sqlite3_wasm_init_opfs
 _sqlite3_wasm_vfs_unlink
+_sqlite3_wasm__emjs_test
+_sqlite3_wasm__kvvfsMakeKey
 _malloc
 _free
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 5217cfcde3..2d377f2701 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -650,7 +650,8 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     ["sqlite3_value_type", "int", "*"],
     ["sqlite3_vfs_find", "*", "string"],
     ["sqlite3_vfs_register", "int", "*", "int"],
-    ["sqlite3_wasm_vfs_unlink", "int", "string"]
+    ["sqlite3_wasm_vfs_unlink", "int", "string"],
+    ["sqlite3_wasm__emjs_test", undefined, "int"]
   ]/*capi.wasm.bindingSignatures*/;
 
   if(false && capi.wasm.compileOptionUsed('SQLITE_ENABLE_NORMALIZE')){
diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index cea6dffa1f..b0e51d068c 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -483,3 +483,147 @@ int sqlite3_wasm_init_opfs(void){
   return SQLITE_NOTFOUND;
 }
 #endif /* __EMSCRIPTEN__ && SQLITE_WASM_OPFS */
+
+#if defined(__EMSCRIPTEN__) // && defined(SQLITE_OS_KV)
+#include "emscripten.h"
+
+#ifndef KVSTORAGE_KEY_SZ
+/* We can remove this once kvvfs and this bit is merged. */
+#  define KVSTORAGE_KEY_SZ 32
+static void kvstorageMakeKey(
+  const char *zClass,
+  const char *zKeyIn,
+  char *zKeyOut
+){
+  sqlite3_snprintf(KVSTORAGE_KEY_SZ, zKeyOut, "kvvfs-%s-%s", zClass, zKeyIn);
+}
+#endif
+
+/*
+** An internal level of indirection for accessing the static
+** kvstorageMakeKey() from EM_JS()-generated functions. This must be
+** made available for export via Emscripten but is not intended to be
+** used from client code. If called with a NULL zClass it is a no-op.
+** It returns KVSTORAGE_KEY_SZ, so JS code (which cannot see that
+** constant) may call it with NULL arguments to get the size of the
+** allocation they'll need for a kvvfs key.
+**
+** Maintenance reminder: Emscripten will install this in the Module
+** init scope and will prefix its name with "_".
+*/
+int sqlite3_wasm__kvvfsMakeKey(const char *zClass,
+                                  const char *zKeyIn,
+                                  char *zKeyOut){
+  if(zClass) kvstorageMakeKey(zClass, zKeyIn, zKeyOut);
+  return KVSTORAGE_KEY_SZ;
+}
+
+#if 0
+/*
+** Alternately, we can implement kvstorageMakeKey() in JS in such a
+** way that it's visible to kvstorageWrite/Delete/Read() but not the
+** rest of the world. This impl is considerably more verbose than
+** the C impl because writing directly to memory requires more code in
+** JS.
+*/
+EM_JS(void, kvstorageMakeKeyJS,
+      (const char *zClass, const char *zKeyIn, char *zKeyOut),{
+  const max = 32;
+  if(!arguments.length) return max;
+  let n = 0, i = 0, ch = 0;
+  // Write key prefix to dest...
+  if(0){
+    const prefix = "kvvfs-";
+    for(i in prefix) setValue(zKeyOut+(n++), prefix.charCodeAt(i));
+  }else{
+    // slightly optimized but less readable...
+    setValue(zKeyOut + (n++), 107/*'k'*/);
+    setValue(zKeyOut + (n++), 118/*'v'*/);
+    setValue(zKeyOut + (n++), 118/*'v'*/);
+    setValue(zKeyOut + (n++), 102/*'f'*/);
+    setValue(zKeyOut + (n++), 115/*'s'*/);
+    setValue(zKeyOut + (n++),  45/*'-'*/);
+  }
+  // Write zClass to dest...
+  for(i = 0; n < max && (ch = getValue(zClass+i)); ++n, ++i){
+    setValue(zKeyOut + n, ch);
+  }
+  // Write "-" separator to dest...
+  if(n<max) setValue(zKeyOut + (n++), 45/* == '-'*/);
+  // Write zKeyIn to dest...
+  for(i = 0; n < max && (ch = getValue(zKeyIn+i)); ++n, ++i){
+    setValue(zKeyOut + n, ch);
+  }
+  // NUL terminate...
+  if(n<max) setValue(zKeyOut + n, 0);
+});
+#endif
+
+EM_JS(int, kvstorageWrite,
+      (const char *zClass, const char *zKey, const char *zData),{
+  const stack = stackSave();
+  try {
+    //const zXKey = stackAlloc(kvstorageMakeKeyJS());
+    //kvstorageMakeKeyJS(zClass, zKey, zXKey);
+    const zXKey = stackAlloc(_sqlite3_wasm__kvvfsMakeKey(0,0,0));
+    _sqlite3_wasm__kvvfsMakeKey(zClass, zKey, zXKey);
+    const jKey = UTF8ToString(zXKey);
+    /**
+       We could simplify this function and eliminate the
+       kvstorageMakeKey() symbol acrobatics if we'd simply hard-code
+       the key algo into the 3 functions which need it:
+
+       const jKey = "kvvfs-"+UTF8ToString(zClass)+"-"+UTF8ToString(zKey);
+    */
+    ((115/*=='s'*/===getValue(zClass))
+     ? sessionStorage : localStorage).setItem(jKey, UTF8ToString(zData));
+  }catch(e){
+    console.error("kvstorageWrite()",e);
+    return 1; // Can't access SQLITE_xxx from here
+  }finally{
+    stackRestore(stack);
+  }
+  return 0;
+});
+
+EM_JS(int, kvstorageDelete,
+      (const char *zClass, const char *zKey),{
+  const stack = stackSave();
+  try {
+    const zXKey = stackAlloc(_sqlite3_wasm__kvvfsMakeKey(0,0,0));
+    _sqlite3_wasm__kvvfsMakeKey(zClass, zKey, zXKey);
+    const jKey = UTF8ToString(zXKey);
+    ((115/*=='s'*/===getValue(zClass))
+     ? sessionStorage : localStorage).removeItem(jKey);
+  }catch(e){
+    console.error("kvstorageDelete()",e);
+    return 1;
+  }finally{
+    stackRestore(stack);
+  }
+  return 0;
+});
+
+/*
+** This function exists for (1) WASM testing purposes and (2) as a
+** hook to get Emscripten to export several EM_JS()-generated
+** functions. It is not part of the public API and its signature
+** and semantics may change at any time.
+*/
+void sqlite3_wasm__emjs_test(int whichOp){
+  const char * zClass = "session";
+  const char * zKey = "hello";
+  switch( whichOp ){
+    case 1:
+      kvstorageWrite(zClass, zKey, "world");
+      break;
+    case 2:
+      kvstorageDelete(zClass, zKey);
+      break;
+  default:
+    //kvstorageMakeKeyJS(0,0,0) /* force Emscripten to include this */;
+    break;
+  }
+}
+
+#endif /* ifdef __EMSCRIPTEN__ */
diff --git a/manifest b/manifest
index 4b4df74808..2144f4800d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sa\sreference\sto\sa\scompleted\sTODO.
-D 2022-09-09T05:39:36.904
+C Initial\sprototype\simpls\sof\swrite/delete-key\sops\sfor\sthe\spending\skvvfs\swhich\suse\ssessionStorage\sor\slocalStorage\sfor\sdb\spage\sstorage.\sread-key\sop\sis\spending.
+D 2022-09-11T02:43:08.758
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,9 +474,9 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle db7a4602f043cf4a5e4135be3609a487f9f1c83f05778bfbdf93766be4541b96
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile 04e1df08665a81b8815415571cc874176001295a889e649f6ecfea2f6091cfea
+F ext/wasm/GNUmakefile e8dcbf6de96196158bbc583d5a990f542a7ab33ad3858ca6563388d04d22d38b
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
-F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 77ef4bcf37e362b9ad61f9c175dfc0f1b3e571563fb311b96581cf422ee6a8ec
+F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api d6396db6405ecfc4d25ebee8c1fab29d4522c852fcf9011df8bbcd54da00c14a
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
 F ext/wasm/api/README.md d876597edd2b9542b6ea031adaaff1c042076fde7b670b1dc6d8a87b28a6631b
 F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba81456260a713ed04900c
@@ -485,10 +485,10 @@ F ext/wasm/api/sqlite3-api-cleanup.js 1a12e64060c2cb0defd34656a76a9b1d7ed58459c2
 F ext/wasm/api/sqlite3-api-glue.js 67ca83974410961953eeaa1dfed3518530d68381729ed1d27f95122f5baeabd3
 F ext/wasm/api/sqlite3-api-oo1.js b06a1ac982c7d433396b8304550ce1493a63671a3bf653c3b5646a9075e0ca41
 F ext/wasm/api/sqlite3-api-opfs.js 011799db398157cbd254264b6ebae00d7234b93d0e9e810345f213a5774993c0
-F ext/wasm/api/sqlite3-api-prologue.js 2d5c5d3355f55eefe51922cec5bfedbec0f8300db98a17685ab7a34a03953c7a
+F ext/wasm/api/sqlite3-api-prologue.js 3cd4343698a8f9a9b9d62486c06a03d220b88588a08666964f378ae858622b54
 F ext/wasm/api/sqlite3-api-worker1.js 73579555563b789785ae83724014eaf31811073aad9be6596c8336ffb51edd71
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c 19c3797edc35821e362a8b60ce45d1adfe6d24fca7cd1f55f89d2086ef33870e
+F ext/wasm/api/sqlite3-wasm.c c9a1cbe67b7684d41a4235aa3b05aba9a6389ff4d4adfc4e35d73b7f797142a3
 F ext/wasm/batch-runner.html 23209ade7981acce7ecd79d6eff9f4c5a4e8b14ae867ac27cd89b230be640fa6
 F ext/wasm/batch-runner.js a727cbbffe63fd17fb5a590dc679f0b13bd51880e8f84b461d7df246417689e8
 F ext/wasm/common/SqliteTestUtil.js 529161a624265ba84271a52db58da022649832fa1c71309fb1e02cc037327a2b
@@ -2019,8 +2019,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 02709ee2beab36d144b807fd9ffaee639e3c1bdd1908a34e05f3fd23dad2ef66
-R bd063a67330eab4c443bec97e40e0753
+P 757ad69607201a26802a304839b8454b1634712458539d6aa8cf999ab2447e59
+R 97007ca8c1155bdfa1827179882900c6
 U stephan
-Z bd537cef11d41fe7e8fbc4a9611dc217
+Z 611b03bde2a6634a4d1d6b501abe44cc
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index fb7f9156f4..6830cb8f1a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-757ad69607201a26802a304839b8454b1634712458539d6aa8cf999ab2447e59
\ No newline at end of file
+a4bd96f5348e607d0fcb627b751f9d86a188173a4b3bfb2c95f92913a78bd31e
\ No newline at end of file

From e99f742a32565e3be05e68ea649fb8254a1e5c44 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sun, 11 Sep 2022 04:49:29 +0000
Subject: [PATCH 082/428] Add EM_JS() impl for kvstorageRead().

FossilOrigin-Name: 06610314fcf644f323c2f7ae11d7f4349b195e66d0ebbee590438dd99d97eb96
---
 ext/wasm/GNUmakefile                 |  3 +-
 ext/wasm/api/sqlite3-api-prologue.js |  2 +-
 ext/wasm/api/sqlite3-wasm.c          | 45 ++++++++++++++++++++++++++--
 manifest                             | 16 +++++-----
 manifest.uuid                        |  2 +-
 5 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index bcc23feee7..dccbbbe5d1 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -193,8 +193,9 @@ emcc.jsflags += -sSTRICT_JS
 emcc.jsflags += -sDYNAMIC_EXECUTION=0
 emcc.jsflags += -sNO_POLYFILL
 emcc.jsflags += -sEXPORTED_FUNCTIONS=@$(dir.wasm)/EXPORTED_FUNCTIONS.api
-emcc.jsflags += -sEXPORTED_RUNTIME_METHODS=FS,wasmMemory
+emcc.jsflags += -sEXPORTED_RUNTIME_METHODS=FS,wasmMemory,allocateUTF8OnStack
                 # wasmMemory ==> required by our code for use with -sIMPORTED_MEMORY
+                # allocateUTF8OnStack => for kvvp internals
 emcc.jsflags += -sUSE_CLOSURE_COMPILER=0
 emcc.jsflags += -sIMPORTED_MEMORY
 emcc.environment := -sENVIRONMENT=web
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 2d377f2701..d991d6f27b 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -651,7 +651,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     ["sqlite3_vfs_find", "*", "string"],
     ["sqlite3_vfs_register", "int", "*", "int"],
     ["sqlite3_wasm_vfs_unlink", "int", "string"],
-    ["sqlite3_wasm__emjs_test", undefined, "int"]
+    ["sqlite3_wasm__emjs_test", "int", "int"]
   ]/*capi.wasm.bindingSignatures*/;
 
   if(false && capi.wasm.compileOptionUsed('SQLITE_ENABLE_NORMALIZE')){
diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index b0e51d068c..6cda681a70 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -604,26 +604,67 @@ EM_JS(int, kvstorageDelete,
   return 0;
 });
 
+EM_JS(int, kvstorageRead,
+      (const char *zClass, const char *zKey, char *zBuf, int nBuf),{
+  const stack = stackSave();
+  try {
+    const zXKey = stackAlloc(_sqlite3_wasm__kvvfsMakeKey(0,0,0));
+    _sqlite3_wasm__kvvfsMakeKey(zClass, zKey, zXKey);
+    const jKey = UTF8ToString(zXKey);
+    const storage = (115/*=='s'*/===getValue(zClass))
+      ? sessionStorage : localStorage;
+    const jV = storage.getItem(jKey);
+    if(!jV) return -1;
+    const nV = jV.length /* Note that we are relying 100% on v being
+                            ASCII so that jV.length is equal to the
+                            C-string's byte length. */;
+    if(nBuf<=0) return nV;
+    else if(1===nBuf){
+      setValue(zBuf, 0);
+      return nV;
+    }
+    const zV = allocateUTF8OnStack(jV);
+    if(nBuf > nV + 1) nBuf = nV + 1;
+    HEAPU8.copyWithin(zBuf, zV, zV + nBuf - 1);
+    setValue( zBuf + nBuf - 1, 0 );
+    return nBuf - 1;
+  }catch(e){
+    console.error("kvstorageRead()",e);
+    return -1;
+  }finally{
+    stackRestore(stack);
+  }
+});
+
 /*
 ** This function exists for (1) WASM testing purposes and (2) as a
 ** hook to get Emscripten to export several EM_JS()-generated
 ** functions. It is not part of the public API and its signature
 ** and semantics may change at any time.
 */
-void sqlite3_wasm__emjs_test(int whichOp){
+int sqlite3_wasm__emjs_test(int whichOp){
   const char * zClass = "session";
   const char * zKey = "hello";
+  int rc = 0;
   switch( whichOp ){
     case 1:
       kvstorageWrite(zClass, zKey, "world");
       break;
-    case 2:
+    case 2: {
+      char buffer[128] = {0};
+      char * zBuf = &buffer[0];
+      rc = kvstorageRead(zClass, zKey, zBuf, (int)sizeof(buffer));
+      printf("kvstorageRead()=%d %s\n", rc, zBuf);
+      break;
+    }
+    case 3:
       kvstorageDelete(zClass, zKey);
       break;
   default:
     //kvstorageMakeKeyJS(0,0,0) /* force Emscripten to include this */;
     break;
   }
+  return rc;
 }
 
 #endif /* ifdef __EMSCRIPTEN__ */
diff --git a/manifest b/manifest
index 2144f4800d..64d9baf481 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Initial\sprototype\simpls\sof\swrite/delete-key\sops\sfor\sthe\spending\skvvfs\swhich\suse\ssessionStorage\sor\slocalStorage\sfor\sdb\spage\sstorage.\sread-key\sop\sis\spending.
-D 2022-09-11T02:43:08.758
+C Add\sEM_JS()\simpl\sfor\skvstorageRead().
+D 2022-09-11T04:49:29.771
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle db7a4602f043cf4a5e4135be3609a487f9f1c83f05778bfbdf93766be4541b96
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile e8dcbf6de96196158bbc583d5a990f542a7ab33ad3858ca6563388d04d22d38b
+F ext/wasm/GNUmakefile 18b80a063c684b0ca44b96221fc2c23647d0196f757c83c7a572b853562d8ac9
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api d6396db6405ecfc4d25ebee8c1fab29d4522c852fcf9011df8bbcd54da00c14a
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -485,10 +485,10 @@ F ext/wasm/api/sqlite3-api-cleanup.js 1a12e64060c2cb0defd34656a76a9b1d7ed58459c2
 F ext/wasm/api/sqlite3-api-glue.js 67ca83974410961953eeaa1dfed3518530d68381729ed1d27f95122f5baeabd3
 F ext/wasm/api/sqlite3-api-oo1.js b06a1ac982c7d433396b8304550ce1493a63671a3bf653c3b5646a9075e0ca41
 F ext/wasm/api/sqlite3-api-opfs.js 011799db398157cbd254264b6ebae00d7234b93d0e9e810345f213a5774993c0
-F ext/wasm/api/sqlite3-api-prologue.js 3cd4343698a8f9a9b9d62486c06a03d220b88588a08666964f378ae858622b54
+F ext/wasm/api/sqlite3-api-prologue.js 88e58145b0c71b00cd523b656016193d6ce8cf22c7ece8225838625f9187e6d1
 F ext/wasm/api/sqlite3-api-worker1.js 73579555563b789785ae83724014eaf31811073aad9be6596c8336ffb51edd71
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c c9a1cbe67b7684d41a4235aa3b05aba9a6389ff4d4adfc4e35d73b7f797142a3
+F ext/wasm/api/sqlite3-wasm.c af771ebd94f4c75bb99823d84667a47ecee1425a05b73f13a7c7ff2b368e439d
 F ext/wasm/batch-runner.html 23209ade7981acce7ecd79d6eff9f4c5a4e8b14ae867ac27cd89b230be640fa6
 F ext/wasm/batch-runner.js a727cbbffe63fd17fb5a590dc679f0b13bd51880e8f84b461d7df246417689e8
 F ext/wasm/common/SqliteTestUtil.js 529161a624265ba84271a52db58da022649832fa1c71309fb1e02cc037327a2b
@@ -2019,8 +2019,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 757ad69607201a26802a304839b8454b1634712458539d6aa8cf999ab2447e59
-R 97007ca8c1155bdfa1827179882900c6
+P a4bd96f5348e607d0fcb627b751f9d86a188173a4b3bfb2c95f92913a78bd31e
+R 310c3e2e3269e2d647346b038874eb9d
 U stephan
-Z 611b03bde2a6634a4d1d6b501abe44cc
+Z 24c87f794d1a08fdf28cff48f949d74b
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 6830cb8f1a..e21a71990d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a4bd96f5348e607d0fcb627b751f9d86a188173a4b3bfb2c95f92913a78bd31e
\ No newline at end of file
+06610314fcf644f323c2f7ae11d7f4349b195e66d0ebbee590438dd99d97eb96
\ No newline at end of file

From ade4f4d6454bcaf7b61bb40ab1f80f1b1cfc1f83 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sun, 11 Sep 2022 05:38:39 +0000
Subject: [PATCH 083/428] Minor cleanups and docs for the EM_JS() impls of the
 kvvfs read/write/delete ops.

FossilOrigin-Name: 53b7572e441be4b4b29b4228d0f95b24457d7faaf6c0b568ed5c970a55e21ffb
---
 ext/wasm/api/sqlite3-wasm.c | 57 ++++++++++++++++++++++++++++---------
 manifest                    | 12 ++++----
 manifest.uuid               |  2 +-
 3 files changed, 51 insertions(+), 20 deletions(-)

diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index 6cda681a70..8e382e7f53 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -503,7 +503,7 @@ static void kvstorageMakeKey(
 ** An internal level of indirection for accessing the static
 ** kvstorageMakeKey() from EM_JS()-generated functions. This must be
 ** made available for export via Emscripten but is not intended to be
-** used from client code. If called with a NULL zClass it is a no-op.
+** used from client code. If called with a NULL zKeyOut it is a no-op.
 ** It returns KVSTORAGE_KEY_SZ, so JS code (which cannot see that
 ** constant) may call it with NULL arguments to get the size of the
 ** allocation they'll need for a kvvfs key.
@@ -514,7 +514,7 @@ static void kvstorageMakeKey(
 int sqlite3_wasm__kvvfsMakeKey(const char *zClass,
                                   const char *zKeyIn,
                                   char *zKeyOut){
-  if(zClass) kvstorageMakeKey(zClass, zKeyIn, zKeyOut);
+  if(zKeyOut) kvstorageMakeKey(zClass, zKeyIn, zKeyOut);
   return KVSTORAGE_KEY_SZ;
 }
 
@@ -559,14 +559,33 @@ EM_JS(void, kvstorageMakeKeyJS,
 });
 #endif
 
+/*
+** Internal helper for kvstorageWrite/Read/Delete() which creates a
+** storage key for the given zClass/zKeyIn combination. Returns a
+** pointer to the key: a C string allocated on the WASM stack, or 0 if
+** allocation fails. It is up to the caller to save/restore the stack
+** before/after this operation.
+*/
+EM_JS(const char *, kvstorageMakeKeyOnJSStack,
+      (const char *zClass, const char *zKeyIn),{
+  if( 0==zClass || 0==zKeyIn) return 0;
+  const zXKey = stackAlloc(_sqlite3_wasm__kvvfsMakeKey(0,0,0));
+  if(zXKey) _sqlite3_wasm__kvvfsMakeKey(zClass, zKeyIn, zXKey);
+  return zXKey;
+});
+
+/*
+** JS impl of kvstorageWrite(). Main docs are in the C impl. This impl
+** writes zData to the global sessionStorage (if zClass starts with
+** 's') or localStorage, using a storage key derived from zClass and
+** zKey.
+*/
 EM_JS(int, kvstorageWrite,
       (const char *zClass, const char *zKey, const char *zData),{
   const stack = stackSave();
   try {
-    //const zXKey = stackAlloc(kvstorageMakeKeyJS());
-    //kvstorageMakeKeyJS(zClass, zKey, zXKey);
-    const zXKey = stackAlloc(_sqlite3_wasm__kvvfsMakeKey(0,0,0));
-    _sqlite3_wasm__kvvfsMakeKey(zClass, zKey, zXKey);
+    const zXKey = kvstorageMakeKeyOnJSStack(zClass,zKey);
+    if(!zXKey) return 1/*OOM*/;
     const jKey = UTF8ToString(zXKey);
     /**
        We could simplify this function and eliminate the
@@ -586,11 +605,18 @@ EM_JS(int, kvstorageWrite,
   return 0;
 });
 
+/*
+** JS impl of kvstorageDelete(). Main docs are in the C impl. This
+** impl generates a key derived from zClass and zKey, and removes the
+** matching entry (if any) from global sessionStorage (if zClass
+** starts with 's') or localStorage.
+*/
 EM_JS(int, kvstorageDelete,
       (const char *zClass, const char *zKey),{
   const stack = stackSave();
   try {
-    const zXKey = stackAlloc(_sqlite3_wasm__kvvfsMakeKey(0,0,0));
+    const zXKey = kvstorageMakeKeyOnJSStack(zClass,zKey);
+    if(!zXKey) return 1/*OOM*/;
     _sqlite3_wasm__kvvfsMakeKey(zClass, zKey, zXKey);
     const jKey = UTF8ToString(zXKey);
     ((115/*=='s'*/===getValue(zClass))
@@ -604,16 +630,21 @@ EM_JS(int, kvstorageDelete,
   return 0;
 });
 
+/*
+** JS impl of kvstorageRead(). Main docs are in the C impl. This impl
+** reads its data from the global sessionStorage (if zClass starts
+** with 's') or localStorage, using a storage key derived from zClass
+** and zKey.
+*/
 EM_JS(int, kvstorageRead,
       (const char *zClass, const char *zKey, char *zBuf, int nBuf),{
   const stack = stackSave();
   try {
-    const zXKey = stackAlloc(_sqlite3_wasm__kvvfsMakeKey(0,0,0));
-    _sqlite3_wasm__kvvfsMakeKey(zClass, zKey, zXKey);
+    const zXKey = kvstorageMakeKeyOnJSStack(zClass,zKey);
+    if(!zXKey) return 1/*OOM*/;
     const jKey = UTF8ToString(zXKey);
-    const storage = (115/*=='s'*/===getValue(zClass))
-      ? sessionStorage : localStorage;
-    const jV = storage.getItem(jKey);
+    const jV = ((115/*=='s'*/===getValue(zClass))
+                ? sessionStorage : localStorage).getItem(jKey);
     if(!jV) return -1;
     const nV = jV.length /* Note that we are relying 100% on v being
                             ASCII so that jV.length is equal to the
@@ -661,7 +692,7 @@ int sqlite3_wasm__emjs_test(int whichOp){
       kvstorageDelete(zClass, zKey);
       break;
   default:
-    //kvstorageMakeKeyJS(0,0,0) /* force Emscripten to include this */;
+    kvstorageMakeKeyOnJSStack(0,0) /* force Emscripten to include this */;
     break;
   }
   return rc;
diff --git a/manifest b/manifest
index 64d9baf481..fc069fb45b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sEM_JS()\simpl\sfor\skvstorageRead().
-D 2022-09-11T04:49:29.771
+C Minor\scleanups\sand\sdocs\sfor\sthe\sEM_JS()\simpls\sof\sthe\skvvfs\sread/write/delete\sops.
+D 2022-09-11T05:38:39.331
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -488,7 +488,7 @@ F ext/wasm/api/sqlite3-api-opfs.js 011799db398157cbd254264b6ebae00d7234b93d0e9e8
 F ext/wasm/api/sqlite3-api-prologue.js 88e58145b0c71b00cd523b656016193d6ce8cf22c7ece8225838625f9187e6d1
 F ext/wasm/api/sqlite3-api-worker1.js 73579555563b789785ae83724014eaf31811073aad9be6596c8336ffb51edd71
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c af771ebd94f4c75bb99823d84667a47ecee1425a05b73f13a7c7ff2b368e439d
+F ext/wasm/api/sqlite3-wasm.c ca61244ff11992d82f0abe30563f6a46b5bc5ba6ae6e3fe0de813a539d032638
 F ext/wasm/batch-runner.html 23209ade7981acce7ecd79d6eff9f4c5a4e8b14ae867ac27cd89b230be640fa6
 F ext/wasm/batch-runner.js a727cbbffe63fd17fb5a590dc679f0b13bd51880e8f84b461d7df246417689e8
 F ext/wasm/common/SqliteTestUtil.js 529161a624265ba84271a52db58da022649832fa1c71309fb1e02cc037327a2b
@@ -2019,8 +2019,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 a4bd96f5348e607d0fcb627b751f9d86a188173a4b3bfb2c95f92913a78bd31e
-R 310c3e2e3269e2d647346b038874eb9d
+P 06610314fcf644f323c2f7ae11d7f4349b195e66d0ebbee590438dd99d97eb96
+R 57acbb8d05cac7106145ba92b2f60bd7
 U stephan
-Z 24c87f794d1a08fdf28cff48f949d74b
+Z a67cf75775135685688642fe9cc532b8
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index e21a71990d..f196ec7f1b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-06610314fcf644f323c2f7ae11d7f4349b195e66d0ebbee590438dd99d97eb96
\ No newline at end of file
+53b7572e441be4b4b29b4228d0f95b24457d7faaf6c0b568ed5c970a55e21ffb
\ No newline at end of file

From 2a91126d761eb0cc9e4dc01f7e7d9e620178910b Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sun, 11 Sep 2022 05:44:15 +0000
Subject: [PATCH 084/428] Correct the result code from kvstorageRead() for the
 OOM case to be a negative value.

FossilOrigin-Name: cdbf09fa1b0c93aeb3222a157de33a4688ae629c2b829ffff0f1f62364c5ae1c
---
 ext/wasm/api/sqlite3-wasm.c |  4 ++--
 manifest                    | 12 ++++++------
 manifest.uuid               |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index 8e382e7f53..e2f1576c6c 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -641,7 +641,7 @@ EM_JS(int, kvstorageRead,
   const stack = stackSave();
   try {
     const zXKey = kvstorageMakeKeyOnJSStack(zClass,zKey);
-    if(!zXKey) return 1/*OOM*/;
+    if(!zXKey) return -3/*OOM*/;
     const jKey = UTF8ToString(zXKey);
     const jV = ((115/*=='s'*/===getValue(zClass))
                 ? sessionStorage : localStorage).getItem(jKey);
@@ -661,7 +661,7 @@ EM_JS(int, kvstorageRead,
     return nBuf - 1;
   }catch(e){
     console.error("kvstorageRead()",e);
-    return -1;
+    return -2;
   }finally{
     stackRestore(stack);
   }
diff --git a/manifest b/manifest
index fc069fb45b..df15b88938 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\scleanups\sand\sdocs\sfor\sthe\sEM_JS()\simpls\sof\sthe\skvvfs\sread/write/delete\sops.
-D 2022-09-11T05:38:39.331
+C Correct\sthe\sresult\scode\sfrom\skvstorageRead()\sfor\sthe\sOOM\scase\sto\sbe\sa\snegative\svalue.
+D 2022-09-11T05:44:15.092
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -488,7 +488,7 @@ F ext/wasm/api/sqlite3-api-opfs.js 011799db398157cbd254264b6ebae00d7234b93d0e9e8
 F ext/wasm/api/sqlite3-api-prologue.js 88e58145b0c71b00cd523b656016193d6ce8cf22c7ece8225838625f9187e6d1
 F ext/wasm/api/sqlite3-api-worker1.js 73579555563b789785ae83724014eaf31811073aad9be6596c8336ffb51edd71
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c ca61244ff11992d82f0abe30563f6a46b5bc5ba6ae6e3fe0de813a539d032638
+F ext/wasm/api/sqlite3-wasm.c 7fc3a86843e99e0dc09df8ef11fa8e5d17351ddb77ff2603e6282dd376f63e72
 F ext/wasm/batch-runner.html 23209ade7981acce7ecd79d6eff9f4c5a4e8b14ae867ac27cd89b230be640fa6
 F ext/wasm/batch-runner.js a727cbbffe63fd17fb5a590dc679f0b13bd51880e8f84b461d7df246417689e8
 F ext/wasm/common/SqliteTestUtil.js 529161a624265ba84271a52db58da022649832fa1c71309fb1e02cc037327a2b
@@ -2019,8 +2019,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 06610314fcf644f323c2f7ae11d7f4349b195e66d0ebbee590438dd99d97eb96
-R 57acbb8d05cac7106145ba92b2f60bd7
+P 53b7572e441be4b4b29b4228d0f95b24457d7faaf6c0b568ed5c970a55e21ffb
+R 8c8179df681ac6c18cab6f56d59f4476
 U stephan
-Z a67cf75775135685688642fe9cc532b8
+Z a75e401f8f11ec78560c63fda40a275f
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f196ec7f1b..964b66bfee 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-53b7572e441be4b4b29b4228d0f95b24457d7faaf6c0b568ed5c970a55e21ffb
\ No newline at end of file
+cdbf09fa1b0c93aeb3222a157de33a4688ae629c2b829ffff0f1f62364c5ae1c
\ No newline at end of file

From 73079dba00f879be162b601d074cca978dc94604 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sun, 11 Sep 2022 16:59:40 +0000
Subject: [PATCH 085/428] Minor cleanups and documentation in the wasm pieces.

FossilOrigin-Name: 4e6ce329872eb733ba2f7f7879747c52761ae97790fd8ed169a25a79854cc3d9
---
 ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api |  6 --
 ext/wasm/api/sqlite3-api-glue.js            |  3 +
 ext/wasm/api/sqlite3-api-prologue.js        | 13 +++-
 ext/wasm/api/sqlite3-api-worker1.js         |  2 +-
 ext/wasm/api/sqlite3-wasm.c                 | 73 +++++++++++++++++----
 ext/wasm/batch-runner.js                    |  4 +-
 ext/wasm/demo-oo1.js                        |  2 +-
 manifest                                    | 24 +++----
 manifest.uuid                               |  2 +-
 9 files changed, 90 insertions(+), 39 deletions(-)

diff --git a/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api b/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
index 814f17fd93..aead79e50d 100644
--- a/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
+++ b/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
@@ -66,11 +66,5 @@ _sqlite3_value_text
 _sqlite3_value_type
 _sqlite3_vfs_find
 _sqlite3_vfs_register
-_sqlite3_wasm_db_error
-_sqlite3_wasm_enum_json
-_sqlite3_wasm_init_opfs
-_sqlite3_wasm_vfs_unlink
-_sqlite3_wasm__emjs_test
-_sqlite3_wasm__kvvfsMakeKey
 _malloc
 _free
diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index 84bbdb10ac..3a9e8803cb 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -63,6 +63,9 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     for(const e of wasm.bindingSignatures){
       capi[e[0]] = wasm.xWrap.apply(null, e);
     }
+    for(const e of wasm.bindingSignatures.wasm){
+      capi.wasm[e[0]] = wasm.xWrap.apply(null, e);
+    }
 
     /* For C API functions which cannot work properly unless
        wasm.bigIntEnabled is true, install a bogus impl which
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index d991d6f27b..7959d047c9 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -649,9 +649,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     ["sqlite3_value_text", "string", "*"],
     ["sqlite3_value_type", "int", "*"],
     ["sqlite3_vfs_find", "*", "string"],
-    ["sqlite3_vfs_register", "int", "*", "int"],
-    ["sqlite3_wasm_vfs_unlink", "int", "string"],
-    ["sqlite3_wasm__emjs_test", "int", "int"]
+    ["sqlite3_vfs_register", "int", "*", "int"]
   ]/*capi.wasm.bindingSignatures*/;
 
   if(false && capi.wasm.compileOptionUsed('SQLITE_ENABLE_NORMALIZE')){
@@ -673,6 +671,15 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
       ["sqlite3_total_changes64", "i64", ["sqlite3*"]]
   ];
 
+  /**
+     Functions which are intended solely for API-internal use by the
+     WASM components, not client code. These get installed into
+     capi.wasm.
+  */
+  capi.wasm.bindingSignatures.wasm = [
+    ["sqlite3_wasm_vfs_unlink", "int", "string"]
+  ];
+
   /** State for sqlite3_web_persistent_dir(). */
   let __persistentDir;
   /**
diff --git a/ext/wasm/api/sqlite3-api-worker1.js b/ext/wasm/api/sqlite3-api-worker1.js
index 6ca337df1d..00359413b2 100644
--- a/ext/wasm/api/sqlite3-api-worker1.js
+++ b/ext/wasm/api/sqlite3-api-worker1.js
@@ -375,7 +375,7 @@ sqlite3.initWorker1API = function(){
         db.close();
         if(db===this.defaultDb) this.defaultDb = undefined;
         if(alsoUnlink && filename){
-          sqlite3.capi.sqlite3_wasm_vfs_unlink(filename);
+          sqlite3.capi.wasm.sqlite3_wasm_vfs_unlink(filename);
         }
       }
     },
diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index e2f1576c6c..df60a4a24c 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -1,5 +1,39 @@
+/*
+** This file requires access to sqlite3.c static state in order to
+** implement certain WASM-specific features. Unlike the rest of
+** sqlite3.c, this file requires compiling with -std=c99 (or
+** equivalent, or a later C version) because it makes use of features
+** not available in C89.
+*/
 #include "sqlite3.c"
 
+/*
+** WASM_KEEP is identical to EMSCRIPTEN_KEEPALIVE but is not
+** Emscripten-specific. It explicitly includes marked functions for
+** export into the target wasm file without requiring explicit listing
+** of those functions in Emscripten's -sEXPORTED_FUNCTIONS=... list
+** (or equivalent in other build platforms). Any function with neither
+** this attribute nor which is listed as an explicit export will not
+** be exported from the wasm file (but may still be used internally
+** within the wasm file).
+**
+** The functions in this file (sqlite3-wasm.c) which require exporting
+** are marked with this flag. They may also be added to any explicit
+** build-time export list but need not be. All of these APIs are
+** intended for use only within the project's own JS/WASM code, and
+** not by client code, so an argument can be made for reducing their
+** visibility by not including them in any build-time export lists.
+**
+** 2022-09-11: it's not yet _proven_ that this approach works in
+** non-Emscripten builds. If not, such builds will need to export
+** those using the --export=... wasm-ld flag (or equivalent). As of
+** this writing we are tied to Emscripten for various reasons
+** and cannot test the library with other build environments.
+*/
+#define WASM_KEEP __attribute__((used,visibility("default")))
+// See also:
+//__attribute__((export_name("theExportedName"), used, visibility("default")))
+
 /*
 ** This function is NOT part of the sqlite3 public API. It is strictly
 ** for use by the sqlite project's own JS/WASM bindings.
@@ -14,8 +48,8 @@
 **
 ** Returns err_code.
 */
-int sqlite3_wasm_db_error(sqlite3*db, int err_code,
-                          const char *zMsg){
+WASM_KEEP
+int sqlite3_wasm_db_error(sqlite3*db, int err_code, const char *zMsg){
   if(0!=zMsg){
     const int nMsg = sqlite3Strlen30(zMsg);
     sqlite3ErrorWithMsg(db, err_code, "%.*s", nMsg, zMsg);
@@ -40,6 +74,7 @@ int sqlite3_wasm_db_error(sqlite3*db, int err_code,
 ** buffer is not large enough for the generated JSON. In debug builds
 ** that will trigger an assert().
 */
+WASM_KEEP
 const char * sqlite3_wasm_enum_json(void){
   static char strBuf[1024 * 8] = {0} /* where the JSON goes */;
   int n = 0, childCount = 0, structCount = 0
@@ -421,6 +456,7 @@ const char * sqlite3_wasm_enum_json(void){
 ** found, or it has no xDelete method, SQLITE_MISUSE is returned, else
 ** the result of the xDelete() call is returned.
 */
+WASM_KEEP
 int sqlite3_wasm_vfs_unlink(const char * zName){
   int rc = SQLITE_MISUSE /* ??? */;
   sqlite3_vfs * const pVfs = sqlite3_vfs_find(0);
@@ -433,6 +469,7 @@ int sqlite3_wasm_vfs_unlink(const char * zName){
 #if defined(__EMSCRIPTEN__) && defined(SQLITE_WASM_OPFS)
 #include <emscripten/wasmfs.h>
 #include <emscripten/console.h>
+
 /*
 ** This function is NOT part of the sqlite3 public API. It is strictly
 ** for use by the sqlite project's own JS/WASM bindings, specifically
@@ -454,6 +491,7 @@ int sqlite3_wasm_vfs_unlink(const char * zName){
 ** the virtual FS fails. In builds compiled without SQLITE_WASM_OPFS
 ** defined, SQLITE_NOTFOUND is returned without side effects.
 */
+WASM_KEEP
 int sqlite3_wasm_init_opfs(const char *zMountPoint){
   static backend_t pOpfs = 0;
   if( !zMountPoint || !*zMountPoint ) zMountPoint = "/persistent";
@@ -479,13 +517,15 @@ int sqlite3_wasm_init_opfs(const char *zMountPoint){
   return pOpfs ? 0 : SQLITE_NOMEM;
 }
 #else
+WASM_KEEP
 int sqlite3_wasm_init_opfs(void){
   return SQLITE_NOTFOUND;
 }
 #endif /* __EMSCRIPTEN__ && SQLITE_WASM_OPFS */
 
 #if defined(__EMSCRIPTEN__) // && defined(SQLITE_OS_KV)
-#include "emscripten.h"
+#include <emscripten.h>
+#include <emscripten/console.h>
 
 #ifndef KVSTORAGE_KEY_SZ
 /* We can remove this once kvvfs and this bit is merged. */
@@ -511,6 +551,7 @@ static void kvstorageMakeKey(
 ** Maintenance reminder: Emscripten will install this in the Module
 ** init scope and will prefix its name with "_".
 */
+WASM_KEEP
 int sqlite3_wasm__kvvfsMakeKey(const char *zClass,
                                   const char *zKeyIn,
                                   char *zKeyOut){
@@ -522,9 +563,11 @@ int sqlite3_wasm__kvvfsMakeKey(const char *zClass,
 /*
 ** Alternately, we can implement kvstorageMakeKey() in JS in such a
 ** way that it's visible to kvstorageWrite/Delete/Read() but not the
-** rest of the world. This impl is considerably more verbose than
-** the C impl because writing directly to memory requires more code in
-** JS.
+** rest of the world. This impl is considerably more verbose than the
+** C impl because writing directly to memory requires more code in
+** JS. Though more verbose, this approach enables removal of
+** sqlite3_wasm__kvvfsMakeKey(). The only catch is that the
+** KVSTORAGE_KEY_SZ constant has to be hard-coded into this function.
 */
 EM_JS(void, kvstorageMakeKeyJS,
       (const char *zClass, const char *zKeyIn, char *zKeyOut),{
@@ -673,11 +716,13 @@ EM_JS(int, kvstorageRead,
 ** functions. It is not part of the public API and its signature
 ** and semantics may change at any time.
 */
-int sqlite3_wasm__emjs_test(int whichOp){
+WASM_KEEP
+int sqlite3_wasm__emjs_keep(int whichOp){
+  int rc = 0;
   const char * zClass = "session";
   const char * zKey = "hello";
-  int rc = 0;
   switch( whichOp ){
+    case 0: break;
     case 1:
       kvstorageWrite(zClass, zKey, "world");
       break;
@@ -685,17 +730,19 @@ int sqlite3_wasm__emjs_test(int whichOp){
       char buffer[128] = {0};
       char * zBuf = &buffer[0];
       rc = kvstorageRead(zClass, zKey, zBuf, (int)sizeof(buffer));
-      printf("kvstorageRead()=%d %s\n", rc, zBuf);
+      emscripten_console_logf("kvstorageRead()=%d %s\n", rc, zBuf);
       break;
     }
     case 3:
       kvstorageDelete(zClass, zKey);
       break;
-  default:
-    kvstorageMakeKeyOnJSStack(0,0) /* force Emscripten to include this */;
-    break;
+    case 4:
+      kvstorageMakeKeyOnJSStack(0,0) /* force Emscripten to include this */;
+      break;
+    default: break;
   }
   return rc;
 }
+#endif /* ifdef __EMSCRIPTEN__  (kvvfs method impls) */
 
-#endif /* ifdef __EMSCRIPTEN__ */
+#undef WASM_KEEP
diff --git a/ext/wasm/batch-runner.js b/ext/wasm/batch-runner.js
index 6cee157051..437424b48f 100644
--- a/ext/wasm/batch-runner.js
+++ b/ext/wasm/batch-runner.js
@@ -69,7 +69,7 @@
       let pDb = 0;
       try{
         if(unlinkFirst && fn && ':memory:'!==fn){
-          capi.sqlite3_wasm_vfs_unlink(fn);
+          capi.wasm.sqlite3_wasm_vfs_unlink(fn);
         }
         const oFlags = capi.SQLITE_OPEN_CREATE | capi.SQLITE_OPEN_READWRITE;
         const ppDb = wasm.scopedAllocPtr();
@@ -93,7 +93,7 @@
       if(this.db && this.db.ptr){
         this.sqlite3.capi.sqlite3_close_v2(this.db.ptr);
         this.logHtml("Closed db",this.db.filename);
-        if(unlink) capi.sqlite3_wasm_vfs_unlink(this.db.filename);
+        if(unlink) capi.wasm.sqlite3_wasm_vfs_unlink(this.db.filename);
         this.db.ptr = this.db.filename = undefined;
       }
     },
diff --git a/ext/wasm/demo-oo1.js b/ext/wasm/demo-oo1.js
index 353ed50a64..4564fe0ddd 100644
--- a/ext/wasm/demo-oo1.js
+++ b/ext/wasm/demo-oo1.js
@@ -30,7 +30,7 @@
       0 ? "" : capi.sqlite3_web_persistent_dir()
     )+"/mydb.sqlite3"
     if(0 && capi.sqlite3_web_persistent_dir()){
-      capi.sqlite3_wasm_vfs_unlink(dbName);
+      capi.wasm.sqlite3_wasm_vfs_unlink(dbName);
     }
     const db = new oo.DB(dbName);
     log("db =",db.filename);
diff --git a/manifest b/manifest
index df15b88938..cdac3ba49c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Correct\sthe\sresult\scode\sfrom\skvstorageRead()\sfor\sthe\sOOM\scase\sto\sbe\sa\snegative\svalue.
-D 2022-09-11T05:44:15.092
+C Minor\scleanups\sand\sdocumentation\sin\sthe\swasm\spieces.
+D 2022-09-11T16:59:40.674
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -476,27 +476,27 @@ F ext/wasm/EXPORTED_FUNCTIONS.fiddle db7a4602f043cf4a5e4135be3609a487f9f1c83f057
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
 F ext/wasm/GNUmakefile 18b80a063c684b0ca44b96221fc2c23647d0196f757c83c7a572b853562d8ac9
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
-F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api d6396db6405ecfc4d25ebee8c1fab29d4522c852fcf9011df8bbcd54da00c14a
+F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 1dfd067b3cbd9a49cb204097367cf2f8fe71b5a3b245d9d82a24779fd4ac2394
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
 F ext/wasm/api/README.md d876597edd2b9542b6ea031adaaff1c042076fde7b670b1dc6d8a87b28a6631b
 F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba81456260a713ed04900c
 F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a4a06cb776c003880b
 F ext/wasm/api/sqlite3-api-cleanup.js 1a12e64060c2cb0defd34656a76a9b1d7ed58459c290249bb31567c806fd44de
-F ext/wasm/api/sqlite3-api-glue.js 67ca83974410961953eeaa1dfed3518530d68381729ed1d27f95122f5baeabd3
+F ext/wasm/api/sqlite3-api-glue.js 2bf536a38cde324cf352bc2c575f8e22c6d204d667c0eda5a254ba45318914bc
 F ext/wasm/api/sqlite3-api-oo1.js b06a1ac982c7d433396b8304550ce1493a63671a3bf653c3b5646a9075e0ca41
 F ext/wasm/api/sqlite3-api-opfs.js 011799db398157cbd254264b6ebae00d7234b93d0e9e810345f213a5774993c0
-F ext/wasm/api/sqlite3-api-prologue.js 88e58145b0c71b00cd523b656016193d6ce8cf22c7ece8225838625f9187e6d1
-F ext/wasm/api/sqlite3-api-worker1.js 73579555563b789785ae83724014eaf31811073aad9be6596c8336ffb51edd71
+F ext/wasm/api/sqlite3-api-prologue.js afd753be49ecba4b5bfc3e54929826a01eaf96ac2d8cec575d683e3c5bcc8464
+F ext/wasm/api/sqlite3-api-worker1.js d33062afa045fd4be01ba4abc266801807472558b862b30056211b00c9c347b4
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c 7fc3a86843e99e0dc09df8ef11fa8e5d17351ddb77ff2603e6282dd376f63e72
+F ext/wasm/api/sqlite3-wasm.c ab8abf26708238a17840cad224bec1511efde6e5b182068f3abf079ba1d83ef6
 F ext/wasm/batch-runner.html 23209ade7981acce7ecd79d6eff9f4c5a4e8b14ae867ac27cd89b230be640fa6
-F ext/wasm/batch-runner.js a727cbbffe63fd17fb5a590dc679f0b13bd51880e8f84b461d7df246417689e8
+F ext/wasm/batch-runner.js 2abd146d3e3a66128ac0a2cc39bfd01e9811c9511fa10ec927d6649795f1ee50
 F ext/wasm/common/SqliteTestUtil.js 529161a624265ba84271a52db58da022649832fa1c71309fb1e02cc037327a2b
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 3a5143699c2b73a85b962271e1a9b3241b30d90e30d895e4f55665e648572962
 F ext/wasm/common/whwasmutil.js f7282ef36c9625330d4e6e82d1beec6678cd101e95e7108cd85db587a788c145
 F ext/wasm/demo-oo1.html 75646855b38405d82781246fd08c852a2b3bee05dd9f0fe10ab655a8cffb79aa
-F ext/wasm/demo-oo1.js aad38cb90b6fa7fd4d1184e759b25056fb4ed45c4957c458896354281259515f
+F ext/wasm/demo-oo1.js 477f230cce3455e701431436d892d8c6bfea2bdf1ddcdd32a273e2f4bb339801
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js bccf46045be8824752876f3eec01c223be0616ccac184bffd0024cfe7a3262b8
 F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
@@ -2019,8 +2019,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 53b7572e441be4b4b29b4228d0f95b24457d7faaf6c0b568ed5c970a55e21ffb
-R 8c8179df681ac6c18cab6f56d59f4476
+P cdbf09fa1b0c93aeb3222a157de33a4688ae629c2b829ffff0f1f62364c5ae1c
+R 9d278bdeb3b04c59e81ef94ad61886ea
 U stephan
-Z a75e401f8f11ec78560c63fda40a275f
+Z 1e71f5bdda12caaeb1881e6b3d2fda00
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 964b66bfee..0742ec8643 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cdbf09fa1b0c93aeb3222a157de33a4688ae629c2b829ffff0f1f62364c5ae1c
\ No newline at end of file
+4e6ce329872eb733ba2f7f7879747c52761ae97790fd8ed169a25a79854cc3d9
\ No newline at end of file

From ad5125a624f22d8d18989287437f50a69ca8ff2b Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 12 Sep 2022 12:39:28 +0000
Subject: [PATCH 086/428] Initial build of kvvfs in wasm. It loads but cannot
 find the VFS for as-yet-unknown reasons (sqlite3 shell works fine), and most
 APIs throw "null function or function signature mismatch" from deep within
 wasm, presumably as a side effect of the "missing" VFS.

FossilOrigin-Name: 1a2f24a0bdfc6eaae478916b8f4f9c6b63ead9964534fc2951fb4e995ffe61f1
---
 ext/wasm/GNUmakefile |   1 +
 ext/wasm/kvvfs.make  |  82 +++++++++++++++++
 ext/wasm/kvvfs1.html |  34 +++++++
 ext/wasm/kvvfs1.js   |  52 +++++++++++
 manifest             |  19 ++--
 manifest.uuid        |   2 +-
 src/os_kv.c          | 206 ++++++++++++++++++++++++++++++++++++++++++-
 7 files changed, 383 insertions(+), 13 deletions(-)
 create mode 100644 ext/wasm/kvvfs.make
 create mode 100644 ext/wasm/kvvfs1.html
 create mode 100644 ext/wasm/kvvfs1.js

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index ee8ade74a3..3133d1230b 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -262,6 +262,7 @@ all: $(sqlite3.js)
 # End main Emscripten-based module build
 ########################################################################
 
+include kvvfs.make
 
 ########################################################################
 # fiddle_remote is the remote destination for the fiddle app. It
diff --git a/ext/wasm/kvvfs.make b/ext/wasm/kvvfs.make
new file mode 100644
index 0000000000..83a2691370
--- /dev/null
+++ b/ext/wasm/kvvfs.make
@@ -0,0 +1,82 @@
+#!/usr/bin/make
+#^^^^ help emacs select makefile mode
+#
+# This is a sub-make for building a standalone kvvfs-based
+# sqlite3.wasm.  It is intended to be "include"d from the main
+# GNUMakefile.
+#
+# Notable potential TODOs:
+#
+# - Trim down a custom sqlite3-api.js for this build. We can elimate
+#   the jaccwabyt dependency, for example, because this build won't
+#   make use of the VFS bits. Similarly, we can eliminate or replace
+#   parts of the OO1 API, or provide a related API which manages
+#   singletons of the localStorage/sessionStorage instances.
+#
+########################################################################
+MAKEFILE.kvvfs := $(lastword $(MAKEFILE_LIST))
+
+kvvfs.js     := sqlite3-kvvfs.js
+kvvfs.wasm   := sqlite3-kvvfs.wasm
+kvvfs.wasm.c := $(dir.api)/sqlite3-wasm.c
+
+CLEAN_FILES += $(kvvfs.js) $(kvvfs.wasm)
+
+########################################################################
+# emcc flags for .c/.o/.wasm.
+kvvfs.flags =
+#kvvfs.flags += -v # _very_ loud but also informative about what it's doing
+
+########################################################################
+# emcc flags for .c/.o.
+kvvfs.cflags :=
+kvvfs.cflags += -std=c99 -fPIC
+kvvfs.cflags += -I. -I$(dir.top)
+kvvfs.cflags += -DSQLITE_OS_KV=1 $(SQLITE_OPT)
+
+########################################################################
+# emcc flags specific to building the final .js/.wasm file...
+kvvfs.jsflags := -fPIC
+kvvfs.jsflags += --no-entry
+kvvfs.jsflags += -sENVIRONMENT=web
+kvvfs.jsflags += -sMODULARIZE
+kvvfs.jsflags += -sSTRICT_JS
+kvvfs.jsflags += -sDYNAMIC_EXECUTION=0
+kvvfs.jsflags += -sNO_POLYFILL
+kvvfs.jsflags += -sEXPORTED_FUNCTIONS=@$(dir.api)/EXPORTED_FUNCTIONS.sqlite3-api
+kvvfs.jsflags += -sEXPORTED_RUNTIME_METHODS=FS,wasmMemory,allocateUTF8OnStack
+                                            # wasmMemory ==> for -sIMPORTED_MEMORY
+                                            # allocateUTF8OnStack ==> kvvfs internals
+kvvfs.jsflags += -sUSE_CLOSURE_COMPILER=0
+kvvfs.jsflags += -sIMPORTED_MEMORY
+#kvvfs.jsflags += -sINITIAL_MEMORY=13107200
+#kvvfs.jsflags += -sTOTAL_STACK=4194304
+kvvfs.jsflags += -sEXPORT_NAME=sqlite3InitModule
+kvvfs.jsflags += -sGLOBAL_BASE=4096 # HYPOTHETICALLY keep func table indexes from overlapping w/ heap addr.
+kvvfs.jsflags += --post-js=$(post-js.js)
+#kvvfs.jsflags += -sFILESYSTEM=0 # only for experimentation. sqlite3 needs the FS API
+#                                Perhaps the kvvfs build doesn't?
+#kvvfs.jsflags += -sABORTING_MALLOC
+kvvfs.jsflags += -sALLOW_MEMORY_GROWTH
+kvvfs.jsflags += -sALLOW_TABLE_GROWTH
+kvvfs.jsflags += -Wno-limited-postlink-optimizations
+# ^^^^^ it likes to warn when we have "limited optimizations" via the -g3 flag.
+kvvfs.jsflags += -sERROR_ON_UNDEFINED_SYMBOLS=0
+kvvfs.jsflags += -sLLD_REPORT_UNDEFINED
+#kvvfs.jsflags += --import-undefined
+kvvfs.jsflags += -sMEMORY64=0
+ifneq (0,$(enable_bigint))
+kvvfs.jsflags += -sWASM_BIGINT
+endif
+
+$(kvvfs.js): $(MAKEFILE) $(MAKEFILE.kvvfs) $(kvvfs.wasm.c) \
+    EXPORTED_FUNCTIONS.api \
+    $(post-js.js)
+	$(emcc.bin) -o $@ $(emcc_opt) $(emcc.flags) $(kvvfs.cflags) $(kvvfs.jsflags) $(kvvfs.wasm.c)
+	chmod -x $(kvvfs.wasm)
+ifneq (,$(wasm-strip))
+	$(wasm-strip) $(kvvfs.wasm)
+endif
+	@ls -la $@ $(kvvfs.wasm)
+
+kvvfs: $(kvvfs.js)
diff --git a/ext/wasm/kvvfs1.html b/ext/wasm/kvvfs1.html
new file mode 100644
index 0000000000..0657920c53
--- /dev/null
+++ b/ext/wasm/kvvfs1.html
@@ -0,0 +1,34 @@
+<!doctype html>
+<html lang="en-us">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
+    <link rel="stylesheet" href="common/emscripten.css"/>
+    <link rel="stylesheet" href="common/testing.css"/>
+    <title>sqlite3-kvvfs.js tests</title>
+  </head>
+  <body>
+    <header id='titlebar'><span>sqlite3-kvvfs.js tests</span></header>
+    <!-- emscripten bits -->
+    <figure id="module-spinner">
+      <div class="spinner"></div>
+      <div class='center'><strong>Initializing app...</strong></div>
+      <div class='center'>
+        On a slow internet connection this may take a moment.  If this
+        message displays for "a long time", intialization may have
+        failed and the JavaScript console may contain clues as to why.
+      </div>
+    </figure>
+    <div class="emscripten" id="module-status">Downloading...</div>
+    <div class="emscripten">
+      <progress value="0" max="100" id="module-progress" hidden='1'></progress>  
+    </div><!-- /emscripten bits -->
+    <div>Everything on this page happens in the dev console.</div>
+    <hr>
+    <div id='test-output'></div>
+    <script src="sqlite3-kvvfs.js"></script>
+    <script src="common/SqliteTestUtil.js"></script>
+    <script src="kvvfs1.js"></script>
+  </body>
+</html>
diff --git a/ext/wasm/kvvfs1.js b/ext/wasm/kvvfs1.js
new file mode 100644
index 0000000000..a9737a565b
--- /dev/null
+++ b/ext/wasm/kvvfs1.js
@@ -0,0 +1,52 @@
+/*
+  2022-09-12
+
+  The author disclaims copyright to this source code.  In place of a
+  legal notice, here is a blessing:
+
+  *   May you do good and not evil.
+  *   May you find forgiveness for yourself and forgive others.
+  *   May you share freely, never taking more than you give.
+
+  ***********************************************************************
+
+  A basic test script for sqlite3-kvvfs.wasm. This file must be run in
+  main JS thread and sqlite3-kvvfs.js must have been loaded before it.
+*/
+'use strict';
+(function(){
+  const T = self.SqliteTestUtil;
+  const toss = function(...args){throw new Error(args.join(' '))};
+  const debug = console.debug.bind(console);
+  const eOutput = document.querySelector('#test-output');
+  const log = console.log.bind(console)
+  const logHtml = function(...args){
+    log.apply(this, args);
+    const ln = document.createElement('div');
+    ln.append(document.createTextNode(args.join(' ')));
+    eOutput.append(ln);
+  };
+
+  const runTests = function(Module){
+    //log("Module",Module);
+    const sqlite3 = Module.sqlite3,
+          capi = sqlite3.capi,
+          oo = sqlite3.oo1,
+          wasm = capi.wasm;
+    log("Loaded module:",capi.sqlite3_libversion(), capi.sqlite3_sourceid());
+    log("Build options:",wasm.compileOptionUsed());
+    self.S = sqlite3;
+
+    log("vfs(null) =",capi.sqlite3_vfs_find(null))
+    log("vfs('kvvfs') =",capi.sqlite3_vfs_find('kvvfs'))
+    //const db = new oo.DB("session");
+    
+    log("Init done. Proceed from the dev console.");
+  };
+
+  sqlite3InitModule(self.sqlite3TestModule).then(function(theModule){
+    console.warn("Installing Emscripten module as global EM for dev console access.");
+    self.EM = theModule;
+    runTests(theModule);
+  });
+})();
diff --git a/manifest b/manifest
index 23b98932b2..9ebf8cf89c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\scomments\sin\sos_kv.c.\s\sBetter\snames\sfor\sthe\skey/value\sname\sspaces.
-D 2022-09-10T18:38:21.976
+C Initial\sbuild\sof\skvvfs\sin\swasm.\sIt\sloads\sbut\scannot\sfind\sthe\sVFS\sfor\sas-yet-unknown\sreasons\s(sqlite3\sshell\sworks\sfine),\sand\smost\sAPIs\sthrow\s"null\sfunction\sor\sfunction\ssignature\smismatch"\sfrom\sdeep\swithin\swasm,\spresumably\sas\sa\sside\seffect\sof\sthe\s"missing"\sVFS.
+D 2022-09-12T12:39:28.819
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle 7fb73f7150ab79d83bb45a67d257553c905c78cd3d693101699243f36c5ae6c3
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile 5359a37fc13b68fad2259228590450339a0c59687744edd0db7bb93d3b1ae2b1
+F ext/wasm/GNUmakefile 12a672ab9125dc860457c2853f7651b98517e424d7a0e9714c89b28c5ff73800
 F ext/wasm/README.md 4b00ae7c7d93c4591251245f0996a319e2651361013c98d2efb0b026771b7331
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api c5eaceabb9e759aaae7d3101a4a3e542f96ab2c99d89a80ce20ec18c23115f33
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -502,6 +502,9 @@ F ext/wasm/jaccwabyt/jaccwabyt.js 99b424b4d467d4544e82615b58e2fe07532a898540bf9d
 F ext/wasm/jaccwabyt/jaccwabyt.md 447cc02b598f7792edaa8ae6853a7847b8178a18ed356afacbdbf312b2588106
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
 F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e568d2c2307c416902059339c06f19
+F ext/wasm/kvvfs.make 7cc9cf10e744c3ba523c3eaf5c4af47028f3a5bb76db304ea8044a9b2a9d496f
+F ext/wasm/kvvfs1.html 2acb241a6110a4ec581adbf07a23d5fc2ef9c7142aa9d60856732a102abc5016
+F ext/wasm/kvvfs1.js 461d571234244bd682725f1dd73195b1d9a7eabdd57c0181ff41dc7c55252313
 F ext/wasm/testing1.html 0bf3ff224628c1f1e3ed22a2dc1837c6c73722ad8c0ad9c8e6fb9e6047667231
 F ext/wasm/testing1.js cba7134901a965743fa9289d82447ab71de4690b1ee5d06f6cb83e8b569d7943
 F ext/wasm/testing2.html 73e5048e666fd6fb28b6e635677a9810e1e139c599ddcf28d687c982134b92b8
@@ -571,7 +574,7 @@ F src/notify.c 89a97dc854c3aa62ad5f384ef50c5a4a11d70fcc69f86de3e991573421130ed6
 F src/os.c 0eb831ba3575af5277e47f4edd14fdfc90025c67eb25ce5cda634518d308d4e9
 F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
-F src/os_kv.c c658ddfb433b982afb3d12d133117e8db9eee11af33db41c30a6f30375f9b99a
+F src/os_kv.c a188e92dac693b1c1b512d93b0c4dc85c1baad11e322b01121f87057996e4d11
 F src/os_setup.h 0711dbc4678f3ac52d7fe736951b6384a0615387c4ba5135a4764e4e31f4b6a6
 F src/os_unix.c 102f7e5c5b59c18ea3dbc929dc3be8acb3afc0e0b6ad572e032335c9c27f44f1
 F src/os_win.c e9454cb141908e8eef2102180bad353a36480612d5b736e4c2bd5777d9b25a34
@@ -2001,8 +2004,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 f6632e69c2ec1a7ddc4e51f3567e3bc082ee94a6dd51fdafdc0c3bf386a32d4c
-R 8cd4482ba17a8f6c143ea61b8462f46c
-U drh
-Z 81846bec91bdcab04bc60c9c032d039e
+P 8e1652a3856765c9146cc2a7e3b598a2dc7dc84c556b35eab9a35184514384b9
+R 87fbf09a4dec22281b7328e04378fb76
+U stephan
+Z bc0b4e3041260a10b10ef1c5f11f1ba3
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index c114a26d08..6d9a377576 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8e1652a3856765c9146cc2a7e3b598a2dc7dc84c556b35eab9a35184514384b9
\ No newline at end of file
+1a2f24a0bdfc6eaae478916b8f4f9c6b63ead9964534fc2951fb4e995ffe61f1
\ No newline at end of file
diff --git a/src/os_kv.c b/src/os_kv.c
index 1412de8122..a14dc5c543 100644
--- a/src/os_kv.c
+++ b/src/os_kv.c
@@ -166,10 +166,6 @@ static sqlite3_io_methods kvvfs_jrnl_io_methods = {
 /* Forward declarations for the low-level storage engine
 */
 #define KVSTORAGE_KEY_SZ  32
-static int kvstorageWrite(const char*, const char *zKey, const char *zData);
-static int kvstorageDelete(const char*, const char *zKey);
-static int kvstorageRead(const char*, const char *zKey, char *zBuf, int nBuf);
-
 
 /* Expand the key name with an appropriate prefix and put the result
 ** zKeyOut[].  The zKeyOut[] buffer is assumed to hold at least
@@ -183,6 +179,207 @@ static void kvstorageMakeKey(
   sqlite3_snprintf(KVSTORAGE_KEY_SZ, zKeyOut, "kvvfs-%s-%s", zClass, zKeyIn);
 }
 
+#ifdef __EMSCRIPTEN__
+/* Provide Emscripten-based impls of kvstorageWrite/Read/Delete()... */
+#include <emscripten.h>
+#include <emscripten/console.h>
+
+/*
+** WASM_KEEP is identical to EMSCRIPTEN_KEEPALIVE but is not
+** Emscripten-specific. It explicitly includes marked functions for
+** export into the target wasm file without requiring explicit listing
+** of those functions in Emscripten's -sEXPORTED_FUNCTIONS=... list
+** (or equivalent in other build platforms). Any function with neither
+** this attribute nor which is listed as an explicit export will not
+** be exported from the wasm file (but may still be used internally
+** within the wasm file).
+**
+** The functions in this file (sqlite3-wasm.c) which require exporting
+** are marked with this flag. They may also be added to any explicit
+** build-time export list but need not be. All of these APIs are
+** intended for use only within the project's own JS/WASM code, and
+** not by client code, so an argument can be made for reducing their
+** visibility by not including them in any build-time export lists.
+**
+** 2022-09-11: it's not yet _proven_ that this approach works in
+** non-Emscripten builds. If not, such builds will need to export
+** those using the --export=... wasm-ld flag (or equivalent). As of
+** this writing we are tied to Emscripten for various reasons
+** and cannot test the library with other build environments.
+*/
+#define WASM_KEEP __attribute__((used,visibility("default")))
+/*
+** An internal level of indirection for accessing the static
+** kvstorageMakeKey() from EM_JS()-generated functions. This must be
+** made available for export via Emscripten but is not intended to be
+** used from client code. If called with a NULL zKeyOut it is a no-op.
+** It returns KVSTORAGE_KEY_SZ, so JS code (which cannot see that
+** constant) may call it with NULL arguments to get the size of the
+** allocation they'll need for a kvvfs key.
+**
+** Maintenance reminder: Emscripten will install this in the Module
+** init scope and will prefix its name with "_".
+*/
+WASM_KEEP
+int sqlite3_wasm__kvvfsMakeKey(const char *zClass, const char *zKeyIn,
+                               char *zKeyOut){
+  if( 0!=zKeyOut ) kvstorageMakeKey(zClass, zKeyIn, zKeyOut);
+  return KVSTORAGE_KEY_SZ;
+}
+/*
+** Internal helper for kvstorageWrite/Read/Delete() which creates a
+** storage key for the given zClass/zKeyIn combination. Returns a
+** pointer to the key: a C string allocated on the WASM stack, or 0 if
+** allocation fails. It is up to the caller to save/restore the stack
+** before/after this operation.
+*/
+EM_JS(const char *, kvstorageMakeKeyOnJSStack,
+      (const char *zClass, const char *zKeyIn),{
+  if( 0==zClass || 0==zKeyIn) return 0;
+  const zXKey = stackAlloc(_sqlite3_wasm__kvvfsMakeKey(0,0,0));
+  if(zXKey) _sqlite3_wasm__kvvfsMakeKey(zClass, zKeyIn, zXKey);
+  return zXKey;
+});
+
+/*
+** JS impl of kvstorageWrite(). Main docs are in the C impl. This impl
+** writes zData to the global sessionStorage (if zClass starts with
+** 's') or localStorage, using a storage key derived from zClass and
+** zKey.
+*/
+EM_JS(int, kvstorageWrite,
+      (const char *zClass, const char *zKey, const char *zData),{
+  const stack = stackSave();
+  try {
+    const zXKey = kvstorageMakeKeyOnJSStack(zClass,zKey);
+    if(!zXKey) return 1/*OOM*/;
+    const jKey = UTF8ToString(zXKey);
+    /**
+       We could simplify this function and eliminate the
+       kvstorageMakeKey() symbol acrobatics if we'd simply hard-code
+       the key algo into the 3 functions which need it:
+
+       const jKey = "kvvfs-"+UTF8ToString(zClass)+"-"+UTF8ToString(zKey);
+    */
+    ((115/*=='s'*/===getValue(zClass))
+     ? sessionStorage : localStorage).setItem(jKey, UTF8ToString(zData));
+  }catch(e){
+    console.error("kvstorageWrite()",e);
+    return 1; // Can't access SQLITE_xxx from here
+  }finally{
+    stackRestore(stack);
+  }
+  return 0;
+});
+
+/*
+** JS impl of kvstorageDelete(). Main docs are in the C impl. This
+** impl generates a key derived from zClass and zKey, and removes the
+** matching entry (if any) from global sessionStorage (if zClass
+** starts with 's') or localStorage.
+*/
+EM_JS(int, kvstorageDelete,
+      (const char *zClass, const char *zKey),{
+  const stack = stackSave();
+  try {
+    const zXKey = kvstorageMakeKeyOnJSStack(zClass,zKey);
+    if(!zXKey) return 1/*OOM*/;
+    _sqlite3_wasm__kvvfsMakeKey(zClass, zKey, zXKey);
+    const jKey = UTF8ToString(zXKey);
+    ((115/*=='s'*/===getValue(zClass))
+     ? sessionStorage : localStorage).removeItem(jKey);
+  }catch(e){
+    console.error("kvstorageDelete()",e);
+    return 1;
+  }finally{
+    stackRestore(stack);
+  }
+  return 0;
+});
+
+/*
+** JS impl of kvstorageRead(). Main docs are in the C impl. This impl
+** reads its data from the global sessionStorage (if zClass starts
+** with 's') or localStorage, using a storage key derived from zClass
+** and zKey.
+*/
+EM_JS(int, kvstorageRead,
+      (const char *zClass, const char *zKey, char *zBuf, int nBuf),{
+  const stack = stackSave();
+  try {
+    const zXKey = kvstorageMakeKeyOnJSStack(zClass,zKey);
+    if(!zXKey) return -3/*OOM*/;
+    const jKey = UTF8ToString(zXKey);
+    const jV = ((115/*=='s'*/===getValue(zClass))
+                ? sessionStorage : localStorage).getItem(jKey);
+    if(!jV) return -1;
+    const nV = jV.length /* Note that we are relying 100% on v being
+                            ASCII so that jV.length is equal to the
+                            C-string's byte length. */;
+    if(nBuf<=0) return nV;
+    else if(1===nBuf){
+      setValue(zBuf, 0);
+      return nV;
+    }
+    const zV = allocateUTF8OnStack(jV);
+    if(nBuf > nV + 1) nBuf = nV + 1;
+    HEAPU8.copyWithin(zBuf, zV, zV + nBuf - 1);
+    setValue( zBuf + nBuf - 1, 0 );
+    return nBuf - 1;
+  }catch(e){
+    console.error("kvstorageRead()",e);
+    return -2;
+  }finally{
+    stackRestore(stack);
+  }
+});
+
+/*
+** This function exists for (1) WASM testing purposes and (2) as a
+** hook to get Emscripten to export several EM_JS()-generated
+** functions (if we don't reference them from exported C functions
+** then they get stripped away at build time). It is not part of the
+** public API and its signature and semantics may change at any time.
+** It's not even part of the private API, for that matter - it's part
+** of the Emscripten C/JS/WASM glue.
+*/
+WASM_KEEP
+int sqlite3__wasm_emjs_kvvfs(int whichOp){
+  int rc = 0;
+  const char * zClass =
+    "sezzion" /*don't collide with "session" records!*/;
+  const char * zKey = "hello";
+  switch( whichOp ){
+    case 0: break;
+    case 1:
+      kvstorageWrite(zClass, zKey, "world");
+      break;
+    case 2: {
+      char buffer[128] = {0};
+      char * zBuf = &buffer[0];
+      rc = kvstorageRead(zClass, zKey, zBuf, (int)sizeof(buffer));
+      emscripten_console_logf("kvstorageRead()=%d %s\n", rc, zBuf);
+      break;
+    }
+    case 3:
+      kvstorageDelete(zClass, zKey);
+      break;
+    case 4:
+      kvstorageMakeKeyOnJSStack(0,0);
+      break;
+    default: break;
+  }
+  return rc;
+}
+
+#undef WASM_KEEP
+#else /* end ifdef __EMSCRIPTEN__ */
+/* Forward declarations for the low-level storage engine
+*/
+static int kvstorageWrite(const char*, const char *zKey, const char *zData);
+static int kvstorageDelete(const char*, const char *zKey);
+static int kvstorageRead(const char*, const char *zKey, char *zBuf, int nBuf);
+
 /* Write content into a key.  zClass is the particular namespace of the
 ** underlying key/value store to use - either "local" or "session".
 **
@@ -277,6 +474,7 @@ static int kvstorageRead(
     return (int)n;
   }
 }
+#endif /* ifdef __EMSCRIPTEN__ */
 
 /****** Utility subroutines ************************************************/
 

From 6b013afb8880da7f755433ffd3387722d2b92a10 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 12 Sep 2022 12:41:07 +0000
Subject: [PATCH 087/428] Fix the amalgamation so that it builds with the
 standard unix backend again.

FossilOrigin-Name: 0adf158f4e5791339988185cc29347c75056b062e0db65b5999fdfa1f433c1ed
---
 manifest      | 14 +++++++-------
 manifest.uuid |  2 +-
 src/os_unix.c |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/manifest b/manifest
index 9ebf8cf89c..3bb098086d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Initial\sbuild\sof\skvvfs\sin\swasm.\sIt\sloads\sbut\scannot\sfind\sthe\sVFS\sfor\sas-yet-unknown\sreasons\s(sqlite3\sshell\sworks\sfine),\sand\smost\sAPIs\sthrow\s"null\sfunction\sor\sfunction\ssignature\smismatch"\sfrom\sdeep\swithin\swasm,\spresumably\sas\sa\sside\seffect\sof\sthe\s"missing"\sVFS.
-D 2022-09-12T12:39:28.819
+C Fix\sthe\samalgamation\sso\sthat\sit\sbuilds\swith\sthe\sstandard\sunix\sbackend\sagain.
+D 2022-09-12T12:41:07.918
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -576,7 +576,7 @@ F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
 F src/os_kv.c a188e92dac693b1c1b512d93b0c4dc85c1baad11e322b01121f87057996e4d11
 F src/os_setup.h 0711dbc4678f3ac52d7fe736951b6384a0615387c4ba5135a4764e4e31f4b6a6
-F src/os_unix.c 102f7e5c5b59c18ea3dbc929dc3be8acb3afc0e0b6ad572e032335c9c27f44f1
+F src/os_unix.c d6322b78130d995160bb9cfb7850678ad6838b08c1d13915461b33326a406c04
 F src/os_win.c e9454cb141908e8eef2102180bad353a36480612d5b736e4c2bd5777d9b25a34
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c 6176d9752eb580419e8fef4592dc417a6b00ddfd43ee22f818819bf8840ceee8
@@ -2004,8 +2004,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 8e1652a3856765c9146cc2a7e3b598a2dc7dc84c556b35eab9a35184514384b9
-R 87fbf09a4dec22281b7328e04378fb76
-U stephan
-Z bc0b4e3041260a10b10ef1c5f11f1ba3
+P 1a2f24a0bdfc6eaae478916b8f4f9c6b63ead9964534fc2951fb4e995ffe61f1
+R fe9e8080b230bfa064abaa9f8e686ee1
+U drh
+Z 78a6c00935086fa910a2a1532a85cf90
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 6d9a377576..b4f4bbf88d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1a2f24a0bdfc6eaae478916b8f4f9c6b63ead9964534fc2951fb4e995ffe61f1
\ No newline at end of file
+0adf158f4e5791339988185cc29347c75056b062e0db65b5999fdfa1f433c1ed
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index fd7a50dcdb..422fb25ed1 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -87,11 +87,11 @@
 /*
 ** standard include files.
 */
-#include <sys/types.h>
-#include <sys/stat.h>
+#include <sys/types.h>   /* amalgamator: keep */
+#include <sys/stat.h>    /* amalgamator: keep */
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#include <unistd.h>
+#include <unistd.h>      /* amalgamator: keep */
 #include <time.h>
 #include <sys/time.h>
 #include <errno.h>

From 2811759d5ee88008e7e05134204c859d5f6838ca Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 12 Sep 2022 13:05:54 +0000
Subject: [PATCH 088/428] Resolve missing kvvfs JS test: sqlite3_initialize()
 must be called by the client in this build. Add basic sanity test of kvvfs
 using sessionStorage().

FossilOrigin-Name: 250a935aeb94d3fadec0d3fe22de85de4e658e2fdb3be3aa9a8bbc8f7b7d8414
---
 ext/wasm/kvvfs1.js | 40 ++++++++++++++++++++++++++++++++++++----
 manifest           | 14 +++++++-------
 manifest.uuid      |  2 +-
 3 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/ext/wasm/kvvfs1.js b/ext/wasm/kvvfs1.js
index a9737a565b..f56f4874e0 100644
--- a/ext/wasm/kvvfs1.js
+++ b/ext/wasm/kvvfs1.js
@@ -36,10 +36,42 @@
     log("Loaded module:",capi.sqlite3_libversion(), capi.sqlite3_sourceid());
     log("Build options:",wasm.compileOptionUsed());
     self.S = sqlite3;
-
-    log("vfs(null) =",capi.sqlite3_vfs_find(null))
-    log("vfs('kvvfs') =",capi.sqlite3_vfs_find('kvvfs'))
-    //const db = new oo.DB("session");
+    T.assert(0 === capi.sqlite3_vfs_find(null));
+    S.capi.sqlite3_initialize();
+    T.assert( Number.isFinite( capi.sqlite3_vfs_find(null) ) );
+    const stores = {
+      local: localStorage,
+      session: sessionStorage
+    };
+    const cleanupStore = function(n){
+      const s = stores[n];
+      const isKv = (key)=>key.startsWith('kvvfs-'+n);
+      let i, k, toRemove = [];
+      for( i = 0; (k = s.key(i)); ++i) {
+        if(isKv(k)) toRemove.push(k);
+      }
+      toRemove.forEach((k)=>s.removeItem(k));
+    };
+    const dbStorage = 1 ? 'session' : 'local';
+    const db = new oo.DB(dbStorage);
+    try {
+      db.exec("create table if not exists t(a)");
+      if(undefined===db.selectValue("select a from t limit 1")){
+        log("New db. Populating..");
+        db.exec("insert into t(a) values(1),(2),(3)");
+      }else{
+        log("Found existing table data:");
+        db.exec({
+          sql: "select * from t order by a",
+          rowMode: 0,
+          callback: function(v){log(v)}
+        });
+      }
+    }finally{
+      const n = db.filename;
+      db.close();
+      //cleanupStore(n);
+    }
     
     log("Init done. Proceed from the dev console.");
   };
diff --git a/manifest b/manifest
index 3bb098086d..23b3e750c1 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\samalgamation\sso\sthat\sit\sbuilds\swith\sthe\sstandard\sunix\sbackend\sagain.
-D 2022-09-12T12:41:07.918
+C Resolve\smissing\skvvfs\sJS\stest:\ssqlite3_initialize()\smust\sbe\scalled\sby\sthe\sclient\sin\sthis\sbuild.\sAdd\sbasic\ssanity\stest\sof\skvvfs\susing\ssessionStorage().
+D 2022-09-12T13:05:54.108
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -504,7 +504,7 @@ F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5
 F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e568d2c2307c416902059339c06f19
 F ext/wasm/kvvfs.make 7cc9cf10e744c3ba523c3eaf5c4af47028f3a5bb76db304ea8044a9b2a9d496f
 F ext/wasm/kvvfs1.html 2acb241a6110a4ec581adbf07a23d5fc2ef9c7142aa9d60856732a102abc5016
-F ext/wasm/kvvfs1.js 461d571234244bd682725f1dd73195b1d9a7eabdd57c0181ff41dc7c55252313
+F ext/wasm/kvvfs1.js 46afaf4faba041bf938355627bc529854295e561f49db3a240c914e75a529338
 F ext/wasm/testing1.html 0bf3ff224628c1f1e3ed22a2dc1837c6c73722ad8c0ad9c8e6fb9e6047667231
 F ext/wasm/testing1.js cba7134901a965743fa9289d82447ab71de4690b1ee5d06f6cb83e8b569d7943
 F ext/wasm/testing2.html 73e5048e666fd6fb28b6e635677a9810e1e139c599ddcf28d687c982134b92b8
@@ -2004,8 +2004,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 1a2f24a0bdfc6eaae478916b8f4f9c6b63ead9964534fc2951fb4e995ffe61f1
-R fe9e8080b230bfa064abaa9f8e686ee1
-U drh
-Z 78a6c00935086fa910a2a1532a85cf90
+P 0adf158f4e5791339988185cc29347c75056b062e0db65b5999fdfa1f433c1ed
+R 034fe3ea9e2b85698d729ef37913abeb
+U stephan
+Z 428f2bf7fe12828b5f66501dd0945c6a
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index b4f4bbf88d..50486e9917 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0adf158f4e5791339988185cc29347c75056b062e0db65b5999fdfa1f433c1ed
\ No newline at end of file
+250a935aeb94d3fadec0d3fe22de85de4e658e2fdb3be3aa9a8bbc8f7b7d8414
\ No newline at end of file

From 1ad51ffe21adb0924f4ad7375d94fb5e2e7cbbee Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 12 Sep 2022 15:59:35 +0000
Subject: [PATCH 089/428] Fix uninitialized variable in rollback-journal
 processing in os_kv.c

FossilOrigin-Name: e49682c5eac91958f143e639c5656ca54560d14f5805d514bf4aa0c206e63844
---
 manifest      | 14 +++++++-------
 manifest.uuid |  2 +-
 src/os_kv.c   |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index 23b3e750c1..601e86a73d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Resolve\smissing\skvvfs\sJS\stest:\ssqlite3_initialize()\smust\sbe\scalled\sby\sthe\sclient\sin\sthis\sbuild.\sAdd\sbasic\ssanity\stest\sof\skvvfs\susing\ssessionStorage().
-D 2022-09-12T13:05:54.108
+C Fix\suninitialized\svariable\sin\srollback-journal\sprocessing\sin\sos_kv.c
+D 2022-09-12T15:59:35.676
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -574,7 +574,7 @@ F src/notify.c 89a97dc854c3aa62ad5f384ef50c5a4a11d70fcc69f86de3e991573421130ed6
 F src/os.c 0eb831ba3575af5277e47f4edd14fdfc90025c67eb25ce5cda634518d308d4e9
 F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
-F src/os_kv.c a188e92dac693b1c1b512d93b0c4dc85c1baad11e322b01121f87057996e4d11
+F src/os_kv.c 2b4c04a470c05fe95a84d2ba3a5eb4874f0dbaa12da3a47f221ee3beec7eeda0
 F src/os_setup.h 0711dbc4678f3ac52d7fe736951b6384a0615387c4ba5135a4764e4e31f4b6a6
 F src/os_unix.c d6322b78130d995160bb9cfb7850678ad6838b08c1d13915461b33326a406c04
 F src/os_win.c e9454cb141908e8eef2102180bad353a36480612d5b736e4c2bd5777d9b25a34
@@ -2004,8 +2004,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 0adf158f4e5791339988185cc29347c75056b062e0db65b5999fdfa1f433c1ed
-R 034fe3ea9e2b85698d729ef37913abeb
-U stephan
-Z 428f2bf7fe12828b5f66501dd0945c6a
+P 250a935aeb94d3fadec0d3fe22de85de4e658e2fdb3be3aa9a8bbc8f7b7d8414
+R b0d44b8764d44e0d25567b7049186ee6
+U drh
+Z b805cc7ee3bf0477637e784d78058472
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 50486e9917..3839586165 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-250a935aeb94d3fadec0d3fe22de85de4e658e2fdb3be3aa9a8bbc8f7b7d8414
\ No newline at end of file
+e49682c5eac91958f143e639c5656ca54560d14f5805d514bf4aa0c206e63844
\ No newline at end of file
diff --git a/src/os_kv.c b/src/os_kv.c
index a14dc5c543..9260852dbe 100644
--- a/src/os_kv.c
+++ b/src/os_kv.c
@@ -583,7 +583,7 @@ static void kvvfsDecodeJournal(
   const char *zTxt,      /* Text encoding.  Zero-terminated */
   int nTxt               /* Bytes in zTxt, excluding zero terminator */
 ){
-  unsigned int n;
+  unsigned int n = 0;
   int c, i, mult;
   i = 0;
   mult = 1;

From 6acd7b0a75206d9dbad55436bb0b48ac53c74413 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 12 Sep 2022 17:44:35 +0000
Subject: [PATCH 090/428] Faster text decoder for kv_os.c.

FossilOrigin-Name: 3354a2edb762d70ccc31d4d25f81b70e644d76e01cb1e81d2e97b5414d809d30
---
 manifest      | 12 +++++------
 manifest.uuid |  2 +-
 src/os_kv.c   | 55 ++++++++++++++++++++++++++++++++++++---------------
 3 files changed, 46 insertions(+), 23 deletions(-)

diff --git a/manifest b/manifest
index 601e86a73d..ed3fd61f48 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\suninitialized\svariable\sin\srollback-journal\sprocessing\sin\sos_kv.c
-D 2022-09-12T15:59:35.676
+C Faster\stext\sdecoder\sfor\skv_os.c.
+D 2022-09-12T17:44:35.983
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -574,7 +574,7 @@ F src/notify.c 89a97dc854c3aa62ad5f384ef50c5a4a11d70fcc69f86de3e991573421130ed6
 F src/os.c 0eb831ba3575af5277e47f4edd14fdfc90025c67eb25ce5cda634518d308d4e9
 F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
-F src/os_kv.c 2b4c04a470c05fe95a84d2ba3a5eb4874f0dbaa12da3a47f221ee3beec7eeda0
+F src/os_kv.c 3f4c2f56375d50b210ddadfbfd652001c63e8b8138b8b2c9339e32d610107558
 F src/os_setup.h 0711dbc4678f3ac52d7fe736951b6384a0615387c4ba5135a4764e4e31f4b6a6
 F src/os_unix.c d6322b78130d995160bb9cfb7850678ad6838b08c1d13915461b33326a406c04
 F src/os_win.c e9454cb141908e8eef2102180bad353a36480612d5b736e4c2bd5777d9b25a34
@@ -2004,8 +2004,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 250a935aeb94d3fadec0d3fe22de85de4e658e2fdb3be3aa9a8bbc8f7b7d8414
-R b0d44b8764d44e0d25567b7049186ee6
+P e49682c5eac91958f143e639c5656ca54560d14f5805d514bf4aa0c206e63844
+R 81ed8ce798a46ae2544ed3d032a07983
 U drh
-Z b805cc7ee3bf0477637e784d78058472
+Z 85de880a922a0287811e4245e97cc473
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 3839586165..e0ded92cce 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e49682c5eac91958f143e639c5656ca54560d14f5805d514bf4aa0c206e63844
\ No newline at end of file
+3354a2edb762d70ccc31d4d25f81b70e644d76e01cb1e81d2e97b5414d809d30
\ No newline at end of file
diff --git a/src/os_kv.c b/src/os_kv.c
index 9260852dbe..6ecec6309c 100644
--- a/src/os_kv.c
+++ b/src/os_kv.c
@@ -527,12 +527,25 @@ static int kvvfsEncode(const char *aData, int nData, char *aOut){
   return j;
 }
 
-/* Convert hex to binary */
-static char kvvfsHexToBinary(char c){
-  if( c>='0' && c<='9' ) return c - '0';
-  if( c>='A' && c<='F' ) return c - 'A' + 10;
-  return 0;
-}
+static const signed char kvvfsHexValue[256] = {
+  -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
+   0,  1,  2,  3,  4,  5,  6,  7,    8,  9, -1, -1, -1, -1, -1, -1,
+  -1, 10, 11, 12, 13, 14, 15, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
+
+  -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1
+};
 
 /*
 ** Decode the text encoding back to binary.  The binary content is
@@ -540,28 +553,35 @@ static char kvvfsHexToBinary(char c){
 **
 ** The return value is the number of bytes actually written into aOut[].
 */
-static int kvvfsDecode(const char *aIn, char *aOut, int nOut){
+static int kvvfsDecode(const char *a, char *aOut, int nOut){
   int i, j;
   int c;
+  const unsigned char *aIn = (const unsigned char*)a;
   i = 0;
   j = 0;
-  while( (c = aIn[i])!=0 ){
-    if( c>='a' ){
+  while( 1 ){
+    c = kvvfsHexValue[aIn[i]];
+    if( c<0 ){
       int n = 0;
       int mult = 1;
+      c = aIn[i];
+      if( c==0 ) break;
       while( c>='a' && c<='z' ){
         n += (c - 'a')*mult;
         mult *= 26;
         c = aIn[++i];
       }
       if( j+n>nOut ) return -1;
-      while( n-->0 ){
-        aOut[j++] = 0;
-      }
+      memset(&aOut[j], 0, n);
+      j += n;
+      c = aIn[i];
+      if( c==0 ) break;
     }else{
-      if( j>nOut ) return -1;
-      aOut[j] = kvvfsHexToBinary(aIn[i++])<<4;
-      aOut[j++] += kvvfsHexToBinary(aIn[i++]);
+      aOut[j] = c<<4;
+      c = kvvfsHexValue[aIn[++i]];
+      if( c<0 ) break;
+      aOut[j++] += c;
+      i++;
     }
   }
   return j;
@@ -1021,7 +1041,10 @@ static int kvvfsFullPathname(
   int nOut, 
   char *zOut
 ){
-  size_t nPath = strlen(zPath);
+  size_t nPath;
+
+zPath = "local";
+  nPath = strlen(zPath);
   SQLITE_KV_LOG(("xFullPathname(\"%s\")\n", zPath));
   if( nOut<nPath+1 ) nPath = nOut - 1;
   memcpy(zOut, zPath, nPath);

From a002cc174ffa1e440643b28b3571a60675b94a86 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 12 Sep 2022 17:59:04 +0000
Subject: [PATCH 091/428] Add sqlite3.oo1.DB.clearKvvfsStorage(). Add controls
 to kvvfs1.js demo to reset and query the db without requiring the dev
 console.

FossilOrigin-Name: d845c6c22bd5d3fffc66e0566df346d690dd8bd1fc1688e312161b1a1edcfd79
---
 ext/wasm/api/sqlite3-api-oo1.js | 35 +++++++++-----
 ext/wasm/kvvfs1.html            | 27 ++++++-----
 ext/wasm/kvvfs1.js              | 81 +++++++++++++++++++++++++--------
 manifest                        | 24 +++++-----
 manifest.uuid                   |  2 +-
 src/os_win.c                    |  3 +-
 src/pcache.c                    | 12 ++---
 src/pcache1.c                   | 19 +-------
 tool/speed-check.sh             |  6 +++
 9 files changed, 132 insertions(+), 77 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index af179d1fe1..3dfe5bfb05 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -1581,17 +1581,30 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
   }/*oo1 object*/;
 
   if( self.window===self && 0!==capi.sqlite3_vfs_find('kvvfs') ){
-    /* In the main window thread, add a couple of convenience proxies
-       for localStorage and sessionStorage DBs... */
-    let klass = sqlite3.oo1.LocalStorageDb = function(){
-      dbCtorHelper.call(this, 'local', 'c', 'kvvfs');
+    /* Features specific to kvvfs... */
+    /**
+       Clears all storage used by the kvvfs DB backend, deleting any
+       DB(s) stored there. Its argument must be either 'session',
+       'local', or ''. In the first two cases, only sessionStorage
+       resp. localStorage is cleared. If it's an empty string (the
+       default) then both are cleared. Only storage keys which match
+       the pattern used by kvvfs are cleared: any other client-side
+       data are retained.
+    */
+    DB.clearKvvfsStorage = function(which=''){
+      const prefix = 'kvvfs-'+which;
+      const stores = [];
+      if('session'===which || ''===which) stores.push(sessionStorage);
+      if('local'===which || ''===which) stores.push(localStorage);
+      stores.forEach(function(s){
+        const toRm = [];
+        let i = 0, k;
+        for( i = 0; (k = s.key(i)); ++i ){
+          if(k.startsWith(prefix)) toRm.push(k);
+        }
+        toRm.forEach((kk)=>s.removeItem(kk));
+      });
     };
-    klass.prototype = DB.prototype;
-
-    klass = sqlite3.oo1.SessionStorageDb = function(){
-      dbCtorHelper.call(this, 'session', 'c', 'kvvfs');
-    };
-    klass.prototype = DB.prototype;
-  }
+  }/* main-window-only bits */
 });
 
diff --git a/ext/wasm/kvvfs1.html b/ext/wasm/kvvfs1.html
index 773de0a603..1a5eb62cf1 100644
--- a/ext/wasm/kvvfs1.html
+++ b/ext/wasm/kvvfs1.html
@@ -24,18 +24,23 @@
     <div class="emscripten">
       <progress value="0" max="100" id="module-progress" hidden='1'></progress>  
     </div><!-- /emscripten bits -->
-    <div>Everything on this page happens in the dev console. TODOs for this demo include,
-      but are not necessarily limited to:
-
-      <ul>
-        <li>UI controls to switch between localStorage and sessionStorage</li>
-        <li>Button to clear storage.</li>
-        <li>Button to dump the current db contents.</li>
-        <!--li></li-->
-      </ul>
-    </div>
-    <hr>
+    <fieldset>
+      <legend>Options</legend>
+      <div class='toolbar'>
+        <button id='btn-clear-log'>Clear log</button>
+        <button id='btn-clear-storage'>Clear storage</button>
+        <button id='btn-init-db'>(Re)init db</button>
+        <button id='btn-select1'>Select db rows</button>
+      </div>
+    </fieldset>
     <div id='test-output'></div>
+    <style>
+      .toolbar {
+          display: flex;
+      }
+      .toolbar > * { margin: 0.25em; }
+      fieldset { border-radius: 0.5em; }
+    </style>
     <script src="sqlite3-kvvfs.js"></script>
     <script src="common/SqliteTestUtil.js"></script>
     <script src="kvvfs1.js"></script>
diff --git a/ext/wasm/kvvfs1.js b/ext/wasm/kvvfs1.js
index 169fcc8bdf..c29426fc63 100644
--- a/ext/wasm/kvvfs1.js
+++ b/ext/wasm/kvvfs1.js
@@ -19,12 +19,25 @@
   const toss = function(...args){throw new Error(args.join(' '))};
   const debug = console.debug.bind(console);
   const eOutput = document.querySelector('#test-output');
-  const log = console.log.bind(console)
-  const logHtml = function(...args){
-    log.apply(this, args);
+  const logC = console.log.bind(console)
+  const logE = function(domElement){
+    eOutput.append(domElement);
+  };
+  const logHtml = function(cssClass,...args){
     const ln = document.createElement('div');
+    if(cssClass) ln.classList.add(cssClass);
     ln.append(document.createTextNode(args.join(' ')));
-    eOutput.append(ln);
+    logE(ln);
+  }
+  const log = function(...args){
+    logC(...args);
+    logHtml('',...args);
+  };
+  const warn = function(...args){
+    logHtml('warning',...args);
+  };
+  const error = function(...args){
+    logHtml('error',...args);
   };
 
   const runTests = function(Module){
@@ -34,10 +47,14 @@
           oo = sqlite3.oo1,
           wasm = capi.wasm;
     log("Loaded module:",capi.sqlite3_libversion(), capi.sqlite3_sourceid());
-    log("Build options:",wasm.compileOptionUsed());
     T.assert( 0 !== capi.sqlite3_vfs_find(null) );
-
+    if(!oo.DB.clearKvvfsStorage){
+      warn("This build is not kvvfs-capable.");
+      return;
+    }
+    
     const dbStorage = 1 ? ':sessionStorage:' : ':localStorage:';
+    const theStore = 's'===dbStorage[1] ? sessionStorage : localStorage;
     /**
        The names ':sessionStorage:' and ':localStorage:' are handled
        via the DB class constructor, not the C level. In the C API,
@@ -45,24 +62,52 @@
        names for those keys, but that is subject to change.
     */
     const db = new oo.DB( dbStorage );
-    log("Storage backend:",db.filename /* note that the name was internally translated */);
-    try {
-      db.exec("create table if not exists t(a)");
-      if(undefined===db.selectValue("select a from t limit 1")){
-        log("New db. Populating. This DB will persist across page reloads.");
-        db.exec("insert into t(a) values(1),(2),(3)");
-      }else{
-        log("Found existing table data:");
+
+    document.querySelector('#btn-clear-storage').addEventListener('click',function(){
+      oo.DB.clearKvvfsStorage();
+      log("kvvfs localStorage and sessionStorage cleared.");
+    });
+    document.querySelector('#btn-clear-log').addEventListener('click',function(){
+      eOutput.innerText = '';
+    });
+    document.querySelector('#btn-init-db').addEventListener('click',function(){
+      const saveSql = [];
+      try{
+        db.exec({
+          sql:["drop table if exists t;",
+               "create table if not exists t(a);",
+               "insert into t(a) values(?),(?),(?)"],
+          bind: [performance.now() >> 0,
+                 (performance.now() * 2) >> 0,
+                 (performance.now() / 2) >> 0],
+          saveSql
+        });
+        console.log("saveSql =",saveSql,theStore);
+        log("DB (re)initialized.");
+      }catch(e){
+        error(e.message);
+      }
+    });
+    const btnSelect = document.querySelector('#btn-select1');
+    btnSelect.addEventListener('click',function(){
+      log("DB rows:");
+      try{
         db.exec({
           sql: "select * from t order by a",
           rowMode: 0,
-          callback: function(v){log(v)}
+          callback: (v)=>log(v)
         });
+      }catch(e){
+        error(e.message);
       }
-    }finally{
-      db.close();
+    });
+    log("Storage backend:",db.filename /* note that the name was internally translated */);
+    if(0===db.selectValue('select count(*) from sqlite_master')){
+      log("DB is empty. Use the init button to populate it.");
+    }else{
+      log("DB contains data from a previous session. Use the Clear Ctorage button to delete it.");
+      btnSelect.click();
     }
-    log("End of demo.");
   };
 
   sqlite3InitModule(self.sqlite3TestModule).then(function(theModule){
diff --git a/manifest b/manifest
index c182819a97..f11a02ef2a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\skv-vfs\sbranch\sinto\sfiddle-opfs\sbranch\sto\sadd\skvvfs-based\swasm\sbuild\sand\sdemo.
-D 2022-09-12T16:09:50.625
+C Add\ssqlite3.oo1.DB.clearKvvfsStorage().\sAdd\scontrols\sto\skvvfs1.js\sdemo\sto\sreset\sand\squery\sthe\sdb\swithout\srequiring\sthe\sdev\sconsole.
+D 2022-09-12T17:59:04.237
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -483,7 +483,7 @@ F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba814
 F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a4a06cb776c003880b
 F ext/wasm/api/sqlite3-api-cleanup.js 101919ec261644e2f6f0a59952fd9612127b69ea99b493277b2789ea478f9b6b
 F ext/wasm/api/sqlite3-api-glue.js 2bf536a38cde324cf352bc2c575f8e22c6d204d667c0eda5a254ba45318914bc
-F ext/wasm/api/sqlite3-api-oo1.js a9d8892be246548a9978ace506d108954aa13eb5ce25332975c8377953804ff3
+F ext/wasm/api/sqlite3-api-oo1.js b498662748918c132aa59433ea2bd2ebb7e026549fd68506a1ae1ea94736f4f6
 F ext/wasm/api/sqlite3-api-opfs.js 011799db398157cbd254264b6ebae00d7234b93d0e9e810345f213a5774993c0
 F ext/wasm/api/sqlite3-api-prologue.js 9e37ce4dfd74926d0df80dd7e72e33085db4bcee48e2c21236039be416a7dff2
 F ext/wasm/api/sqlite3-api-worker1.js d33062afa045fd4be01ba4abc266801807472558b862b30056211b00c9c347b4
@@ -507,8 +507,8 @@ F ext/wasm/jaccwabyt/jaccwabyt.md 447cc02b598f7792edaa8ae6853a7847b8178a18ed356a
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
 F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e568d2c2307c416902059339c06f19
 F ext/wasm/kvvfs.make dba616578bf91a76370a46494dd68a09c6dff5beb6d5561e2db65a27216e9630
-F ext/wasm/kvvfs1.html b8304cd5c7e7ec32c3b15521a95c322d6efdb8d22b3c4156123545dc54e07583
-F ext/wasm/kvvfs1.js a5075f98ffecd7d32348697db991fc61342d89aa20651034d1572af61890fb8b
+F ext/wasm/kvvfs1.html 83bac238d1e93ed102a461672fc58fe74e611e426708e9a5c66002c01eadb942
+F ext/wasm/kvvfs1.js 53721a42e0ec45f6978cc723e5de47f882517867d0fcff4c6ff05f4c422e27c4
 F ext/wasm/scratchpad-opfs-main.html 4565cf194e66188190d35f70e82553e2e2d72b9809b73c94ab67b8cfd14d2e0c
 F ext/wasm/scratchpad-opfs-main.js 69e960e9161f6412fd0c30f355d4112f1894d6609eb431e2d16d207d1380518e
 F ext/wasm/scratchpad-opfs-worker.html 66c1d15d678f3bd306373d76b61c6c8aef988f61f4a8dd40185d452f9c6d2bf5
@@ -596,14 +596,14 @@ F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
 F src/os_kv.c a188e92dac693b1c1b512d93b0c4dc85c1baad11e322b01121f87057996e4d11
 F src/os_setup.h 0711dbc4678f3ac52d7fe736951b6384a0615387c4ba5135a4764e4e31f4b6a6
 F src/os_unix.c d6322b78130d995160bb9cfb7850678ad6838b08c1d13915461b33326a406c04
-F src/os_win.c e9454cb141908e8eef2102180bad353a36480612d5b736e4c2bd5777d9b25a34
+F src/os_win.c 8d129ae3e59e0fa900e20d0ad789e96f2e08177f0b00b53cdda65c40331e0902
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c 6176d9752eb580419e8fef4592dc417a6b00ddfd43ee22f818819bf8840ceee8
 F src/pager.h f82e9844166e1585f5786837ddc7709966138ced17f568c16af7ccf946c2baa3
 F src/parse.y 8e67d820030d2655b9942ffe61c1e7e6b96cea2f2f72183533299393907d0564
-F src/pcache.c 22a6ebe498d1d26c85fd1e3bcb246d97b882c060027c1e1688fbea905f5ac3cf
+F src/pcache.c f4268f7f73c6a3db12ce22fd25bc68dc42315d19599414ab1207d7cf32f79197
 F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
-F src/pcache1.c 849a26ea9dc1e6a176b75dc576672a598170b0b46aeef87a981dd25e0af0ccf9
+F src/pcache1.c dee95e3cd2b61e6512dc814c5ab76d5eb36f0bfc9441dbb4260fccc0d12bbddc
 F src/pragma.c 9bf7d8a2a9ad3bc36df3ec0d61817a44c38a1da527d59c26c203047f906e334a
 F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 F src/prepare.c 971d5819a4bda88038c2283d71fc0a2974ffc3dd480f9bd941341017abacfd1b
@@ -1981,7 +1981,7 @@ F tool/showstat4.c 0682ebea7abf4d3657f53c4a243f2e7eab48eab344ed36a94bb75dcd19a5c
 F tool/showwal.c 0253c187ae16fdae9cde89e63e1dfcd3bb35e5416d066415f99e2f8cac6ab03d
 F tool/soak1.tcl 8d407956e1a45b485a8e072470a3e629a27037fe
 F tool/spaceanal.tcl 1b5be34c6223cb1af06da2a10fb77863eb869b1962d055820b0a11cf2336ab45
-F tool/speed-check.sh ff74a68bb95a0341275f4d3c9a7d8a3800bd278aceecf1913295a1f0175bc3e6
+F tool/speed-check.sh 13f8e07dbfe25f3aecda33fb6068894665af61ca1360a7b654be0ad0c3f3ae0b
 F tool/speedtest.tcl 06c76698485ccf597b9e7dbb1ac70706eb873355
 F tool/speedtest16.c ecb6542862151c3e6509bbc00509b234562ae81e
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
@@ -2023,8 +2023,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 4e6ce329872eb733ba2f7f7879747c52761ae97790fd8ed169a25a79854cc3d9 e49682c5eac91958f143e639c5656ca54560d14f5805d514bf4aa0c206e63844
-R f15733833cf5e73dce86b4365f218581
+P a7d8b26acd3c1ae344369e4d70804c0cab45272c0983cfd32d616a0a7b28acb9
+R 984d02350bb7056e7ff7dbf797b44085
 U stephan
-Z f2a01bf4c99986993a2e00b39e93be73
+Z f41406c18c315f5b1f10f4c607ad1f16
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index bde2102af8..c3f7434826 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a7d8b26acd3c1ae344369e4d70804c0cab45272c0983cfd32d616a0a7b28acb9
\ No newline at end of file
+d845c6c22bd5d3fffc66e0566df346d690dd8bd1fc1688e312161b1a1edcfd79
\ No newline at end of file
diff --git a/src/os_win.c b/src/os_win.c
index 2827b0b49b..d71fb39220 100644
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -5763,7 +5763,8 @@ static int winFullPathname(
   char *zFull                   /* Output buffer */
 ){
   int rc;
-  sqlite3_mutex *pMutex = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_TEMPDIR);
+  MUTEX_LOGIC( sqlite3_mutex *pMutex; )
+  MUTEX_LOGIC( pMutex = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_TEMPDIR); )
   sqlite3_mutex_enter(pMutex);
   rc = winFullPathnameNoMutex(pVfs, zRelative, nFull, zFull);
   sqlite3_mutex_leave(pMutex);
diff --git a/src/pcache.c b/src/pcache.c
index 8c57f5b1eb..0407e06b2f 100644
--- a/src/pcache.c
+++ b/src/pcache.c
@@ -655,14 +655,14 @@ void sqlite3PcacheMove(PgHdr *p, Pgno newPgno){
   assert( sqlite3PcachePageSanity(p) );
   pcacheTrace(("%p.MOVE %d -> %d\n",pCache,p->pgno,newPgno));
   pOther = sqlite3GlobalConfig.pcache2.xFetch(pCache->pCache, newPgno, 0);
-  sqlite3GlobalConfig.pcache2.xRekey(pCache->pCache, p->pPage, p->pgno,newPgno);
   if( pOther ){
-    PgHdr *pPg = (PgHdr*)pOther->pExtra;
-    pPg->pgno = p->pgno;
-    if( pPg->pPage==0 ){
-      sqlite3GlobalConfig.pcache2.xUnpin(pCache->pCache, pOther, 0);
-    }
+    PgHdr *pXPage = (PgHdr*)pOther->pExtra;
+    assert( pXPage->nRef==0 );
+    pXPage->nRef++;
+    pCache->nRefSum++;
+    sqlite3PcacheDrop(pXPage);
   }
+  sqlite3GlobalConfig.pcache2.xRekey(pCache->pCache, p->pPage, p->pgno,newPgno);
   p->pgno = newPgno;
   if( (p->flags&PGHDR_DIRTY) && (p->flags&PGHDR_NEED_SYNC) ){
     pcacheManageDirtyList(p, PCACHE_DIRTYLIST_FRONT);
diff --git a/src/pcache1.c b/src/pcache1.c
index a47087fa11..adbe953959 100644
--- a/src/pcache1.c
+++ b/src/pcache1.c
@@ -1125,7 +1125,7 @@ static void pcache1Rekey(
   assert( iOld!=iNew );               /* The page number really is changing */
 
   pcache1EnterMutex(pCache->pGroup);
-  
+
   assert( pcache1FetchNoMutex(p, iOld, 0)==pPage ); /* pPg really is iOld */
   hOld = iOld%pCache->nHash;
   pp = &pCache->apHash[hOld];
@@ -1134,23 +1134,8 @@ static void pcache1Rekey(
   }
   *pp = pPage->pNext;
 
+  assert( pcache1FetchNoMutex(p, iNew, 0)==0 ); /* iNew not in cache */
   hNew = iNew%pCache->nHash;
-  pp = &pCache->apHash[hNew];
-  while( *pp ){
-    if( (*pp)->iKey==iNew ){
-      /* If there is already another pcache entry at iNew, change it to iOld,
-      ** thus swapping the positions of iNew and iOld */
-      PgHdr1 *pOld = *pp;
-      *pp = pOld->pNext;
-      pOld->pNext = pCache->apHash[hOld];
-      pCache->apHash[hOld] = pOld;
-      pOld->iKey = iOld;
-      break;
-    }else{
-      pp = &(*pp)->pNext;
-    }
-  }
-
   pPage->iKey = iNew;
   pPage->pNext = pCache->apHash[hNew];
   pCache->apHash[hNew] = pPage;
diff --git a/tool/speed-check.sh b/tool/speed-check.sh
index 6b0fbeb43a..879ffa9562 100644
--- a/tool/speed-check.sh
+++ b/tool/speed-check.sh
@@ -96,6 +96,9 @@ while test "$1" != ""; do
     --cachesize)
         shift; SPEEDTEST_OPTS="$SPEEDTEST_OPTS --cachesize $1"
         ;;
+    --stmtcache)
+        shift; SPEEDTEST_OPTS="$SPEEDTEST_OPTS --stmtcache $1"
+        ;;
     --checkpoint)
         SPEEDTEST_OPTS="$SPEEDTEST_OPTS --checkpoint"
         ;;
@@ -143,6 +146,9 @@ while test "$1" != ""; do
         SPEEDTEST_OPTS="$SPEEDTEST_OPTS --testset rtree"
         CC_OPTS="$CC_OPTS -DSQLITE_ENABLE_RTREE"
         ;;
+    --persist)
+        SPEEDTEST_OPTS="$SPEEDTEST_OPTS --persist"
+        ;;
     --orm)
         SPEEDTEST_OPTS="$SPEEDTEST_OPTS --testset orm"
         ;;

From bb195124382c934f635fa9634feb9543c9dd4af2 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 12 Sep 2022 18:10:41 +0000
Subject: [PATCH 092/428] Fix a debugging/testing edit in the previous
 check-in.

FossilOrigin-Name: 6fc8d34c0ae1f8277544be741f2f0835fad8e475d35bd24573224ccc1699b8bd
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/os_kv.c   |  5 +++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index ed3fd61f48..06fc95c9d8 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Faster\stext\sdecoder\sfor\skv_os.c.
-D 2022-09-12T17:44:35.983
+C Fix\sa\sdebugging/testing\sedit\sin\sthe\sprevious\scheck-in.
+D 2022-09-12T18:10:41.031
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -574,7 +574,7 @@ F src/notify.c 89a97dc854c3aa62ad5f384ef50c5a4a11d70fcc69f86de3e991573421130ed6
 F src/os.c 0eb831ba3575af5277e47f4edd14fdfc90025c67eb25ce5cda634518d308d4e9
 F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
-F src/os_kv.c 3f4c2f56375d50b210ddadfbfd652001c63e8b8138b8b2c9339e32d610107558
+F src/os_kv.c 226d9051af316dc547a37629b269ba2aebff8fa21915b91a9b41f7872bb4cc05
 F src/os_setup.h 0711dbc4678f3ac52d7fe736951b6384a0615387c4ba5135a4764e4e31f4b6a6
 F src/os_unix.c d6322b78130d995160bb9cfb7850678ad6838b08c1d13915461b33326a406c04
 F src/os_win.c e9454cb141908e8eef2102180bad353a36480612d5b736e4c2bd5777d9b25a34
@@ -2004,8 +2004,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 e49682c5eac91958f143e639c5656ca54560d14f5805d514bf4aa0c206e63844
-R 81ed8ce798a46ae2544ed3d032a07983
+P 3354a2edb762d70ccc31d4d25f81b70e644d76e01cb1e81d2e97b5414d809d30
+R 742e0e4f6e4e5630d202911ef2cdc14a
 U drh
-Z 85de880a922a0287811e4245e97cc473
+Z 0a81f46489fd3e0c2c270769139a2009
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index e0ded92cce..bf2f87a85b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3354a2edb762d70ccc31d4d25f81b70e644d76e01cb1e81d2e97b5414d809d30
\ No newline at end of file
+6fc8d34c0ae1f8277544be741f2f0835fad8e475d35bd24573224ccc1699b8bd
\ No newline at end of file
diff --git a/src/os_kv.c b/src/os_kv.c
index 6ecec6309c..ce0a571965 100644
--- a/src/os_kv.c
+++ b/src/os_kv.c
@@ -1042,8 +1042,9 @@ static int kvvfsFullPathname(
   char *zOut
 ){
   size_t nPath;
-
-zPath = "local";
+#ifdef SQLITE_OS_KV_ALWAYS_LOCAL
+  zPath = "local";
+#endif
   nPath = strlen(zPath);
   SQLITE_KV_LOG(("xFullPathname(\"%s\")\n", zPath));
   if( nOut<nPath+1 ) nPath = nOut - 1;

From aede9b5bd3cfaaa36f81a4a435ef623cdafc2670 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Mon, 12 Sep 2022 19:23:50 +0000
Subject: [PATCH 093/428] More tests for the recover module.

FossilOrigin-Name: 37fb093b95c6b7d7ad07a275697df73b69f9fb5c5549aea8544b26e38f24833f
---
 ext/recover/recovercorrupt.test |  68 ++++++++++++++++++++++
 ext/recover/recoverfault.test   |  72 +++++++++++++++++++++++
 ext/recover/sqlite3recover.c    | 100 +++++++++++++++++++-------------
 ext/recover/test_recover.c      |   4 +-
 manifest                        |  16 ++---
 manifest.uuid                   |   2 +-
 6 files changed, 211 insertions(+), 51 deletions(-)
 create mode 100644 ext/recover/recovercorrupt.test
 create mode 100644 ext/recover/recoverfault.test

diff --git a/ext/recover/recovercorrupt.test b/ext/recover/recovercorrupt.test
new file mode 100644
index 0000000000..ff1d2af19f
--- /dev/null
+++ b/ext/recover/recovercorrupt.test
@@ -0,0 +1,68 @@
+# 2022 August 28
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+#
+
+if {![info exists testdir]} {
+  set testdir [file join [file dirname [info script]] .. .. test]
+} 
+source [file join [file dirname [info script]] recover_common.tcl]
+source $testdir/tester.tcl
+
+set testprefix recovercorrupt
+
+do_execsql_test 1.0 {
+  PRAGMA page_size = 512;
+  CREATE TABLE t1(a INTEGER PRIMARY KEY, b, c);
+  INSERT INTO t1 VALUES(1, 2, 3);
+  INSERT INTO t1 VALUES(2, hex(randomblob(100)), randomblob(200));
+  CREATE INDEX i1 ON t1(b, c);
+  CREATE TABLE t2(a PRIMARY KEY, b, c) WITHOUT ROWID;
+  INSERT INTO t2 VALUES(1, 2, 3);
+  INSERT INTO t2 VALUES(2, hex(randomblob(100)), randomblob(200));
+  ANALYZE;
+  PRAGMA writable_schema = 1;
+  DELETE FROM sqlite_schema WHERE name='t2';
+}
+
+do_test 1.1 {
+  file size test.db
+} {5120}
+
+proc toggle_bit {blob bit} {
+  set byte [expr {$bit / 8}]
+  set bit [expr {$bit & 0x0F}]
+  binary scan $blob a${byte}ca* A x B
+  set x [expr {$x ^ (1 << $bit)}]
+  binary format a*ca* $A $x $B
+}
+
+
+db_save_and_close
+for {set ii 200} {$ii < 10000} {incr ii} {
+  db_restore_and_reopen
+  db func toggle_bit toggle_bit
+  set pg [expr {($ii / 512)+1}]
+  set byte [expr {$ii % 512}]
+  db eval {
+    UPDATE sqlite_dbpage SET data = toggle_bit(data, $byte) WHERE pgno=$pg
+  }
+
+  do_test 1.2.$ii {
+    set R [sqlite3_recover_init db main test.db2]
+    $R config lostandfound lost_and_found
+    $R step
+    $R finish
+  } {}
+}
+
+
+finish_test
+
diff --git a/ext/recover/recoverfault.test b/ext/recover/recoverfault.test
new file mode 100644
index 0000000000..b2411fb6c7
--- /dev/null
+++ b/ext/recover/recoverfault.test
@@ -0,0 +1,72 @@
+# 2022 August 28
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+#
+
+if {![info exists testdir]} {
+  set testdir [file join [file dirname [info script]] .. .. test]
+} 
+source [file join [file dirname [info script]] recover_common.tcl]
+source $testdir/tester.tcl
+
+set testprefix recoverfault
+
+
+#--------------------------------------------------------------------------
+proc compare_result {db1 db2 sql} {
+  set r1 [$db1 eval $sql]
+  set r2 [$db2 eval $sql]
+  if {$r1 != $r2} {
+    puts "r1: $r1"
+    puts "r2: $r2"
+    error "mismatch for $sql"
+  }
+  return ""
+}
+
+proc compare_dbs {db1 db2} {
+  compare_result $db1 $db2 "SELECT sql FROM sqlite_master ORDER BY 1"
+  foreach tbl [$db1 eval {SELECT name FROM sqlite_master WHERE type='table'}] {
+    compare_result $db1 $db2 "SELECT * FROM $tbl"
+  }
+}
+#--------------------------------------------------------------------------
+
+do_execsql_test 1.0 {
+  CREATE TABLE t1(a INTEGER PRIMARY KEY, b, c);
+  INSERT INTO t1 VALUES(1, 2, 3);
+  INSERT INTO t1 VALUES(2, hex(randomblob(1000)), randomblob(2000));
+  CREATE INDEX i1 ON t1(b, c);
+  CREATE TABLE t2(a INTEGER PRIMARY KEY, b, c);
+  INSERT INTO t2 VALUES(1, 2, 3);
+  INSERT INTO t2 VALUES(2, hex(randomblob(1000)), randomblob(2000));
+  ANALYZE;
+  PRAGMA writable_schema = 1;
+  DELETE FROM sqlite_schema WHERE name='t2';
+}
+
+do_faultsim_test 1 -faults oom* -prep {
+  faultsim_restore_and_reopen
+} -body {
+  set R [sqlite3_recover_init db main test.db2]
+  $R config lostandfound lost_and_found
+  $R step
+  $R finish
+} -test {
+  faultsim_test_result {0 {}} {1 {}}
+  if {$testrc==0} {
+    sqlite3 db2 test.db2
+    compare_dbs db db2
+    db2 close
+  }
+}
+
+finish_test
+
diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index 9c5e10433b..849c3bc801 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -226,12 +226,13 @@ static int recoverError(
   int errCode, 
   const char *zFmt, ...
 ){
+  char *z = 0;
   va_list ap;
-  char *z;
   va_start(ap, zFmt);
-  z = sqlite3_vmprintf(zFmt, ap);
-  va_end(ap);
-
+  if( zFmt ){
+    z = sqlite3_vmprintf(zFmt, ap);
+    va_end(ap);
+  }
   sqlite3_free(p->zErrMsg);
   p->zErrMsg = z;
   p->errCode = errCode;
@@ -448,7 +449,8 @@ static i64 recoverPageCount(sqlite3_recover *p){
   if( p->errCode==SQLITE_OK ){
     sqlite3_stmt *pStmt = 0;
     pStmt = recoverPreparePrintf(p, p->dbIn, "PRAGMA %Q.page_count", p->zDb);
-    if( pStmt && SQLITE_ROW==sqlite3_step(pStmt) ){
+    if( pStmt ){
+      sqlite3_step(pStmt);
       nPg = sqlite3_column_int64(pStmt, 0);
     }
     recoverFinalize(p, pStmt);
@@ -866,11 +868,11 @@ static void recoverAddTable(
 
       pNew->pNext = p->pTblList;
       p->pTblList = pNew;
+      pNew->bIntkey = 1;
     }
 
     recoverFinalize(p, pStmt);
 
-    pNew->bIntkey = 1;
     pStmt = recoverPreparePrintf(p, p->dbOut, "PRAGMA index_xinfo(%Q)", zName);
     while( pStmt && sqlite3_step(pStmt)==SQLITE_ROW ){
       int iField = sqlite3_column_int(pStmt, 0);
@@ -884,10 +886,12 @@ static void recoverAddTable(
     }
     recoverFinalize(p, pStmt);
 
-    if( iPk>=0 ){
-      pNew->aCol[iPk].bIPK = 1;
-    }else if( pNew->bIntkey ){
-      pNew->iRowidBind = iBind++;
+    if( p->errCode==SQLITE_OK ){
+      if( iPk>=0 ){
+        pNew->aCol[iPk].bIPK = 1;
+      }else if( pNew->bIntkey ){
+        pNew->iRowidBind = iBind++;
+      }
     }
   }
 }
@@ -1068,6 +1072,7 @@ static sqlite3_stmt *recoverInsertStmt(
   RecoverTable *pTab,
   int nField
 ){
+  sqlite3_stmt *pRet = 0;
   const char *zSep = "";
   const char *zSqlSep = "";
   char *zSql = 0;
@@ -1075,7 +1080,8 @@ static sqlite3_stmt *recoverInsertStmt(
   char *zBind = 0;
   int ii;
   int bSql = p->xSql ? 1 : 0;
-  sqlite3_stmt *pRet = 0;
+
+  if( nField<=0 ) return 0;
 
   assert( nField<=pTab->nCol );
 
@@ -1525,7 +1531,7 @@ static int recoverWriteData(sqlite3_recover *p){
 
           int bNewCell = (iPrevPage!=iPage || iPrevCell!=iCell);
           assert( bNewCell==0 || (iField==-1 || iField==0) );
-          assert( bNewCell || iField==nVal );
+          assert( bNewCell || iField==nVal || nVal==pTab->nCol );
 
           if( bNewCell ){
             if( nVal>=0 ){
@@ -1538,29 +1544,31 @@ static int recoverWriteData(sqlite3_recover *p){
                 pInsert = recoverInsertStmt(p, pTab, nVal);
                 nInsert = nVal;
               }
+              if( nVal>0 ){
+                for(ii=0; ii<pTab->nCol; ii++){
+                  RecoverColumn *pCol = &pTab->aCol[ii];
 
-              for(ii=0; ii<pTab->nCol; ii++){
-                RecoverColumn *pCol = &pTab->aCol[ii];
-
-                if( pCol->iBind>0 ){
-                  if( pCol->bIPK ){
-                    sqlite3_bind_int64(pInsert, pCol->iBind, iRowid);
-                  }else if( pCol->iField<nVal ){
-                    sqlite3_bind_value(pInsert,pCol->iBind,apVal[pCol->iField]);
+                  if( pCol->iBind>0 ){
+                    int iBind = pCol->iBind;
+                    if( pCol->bIPK ){
+                      sqlite3_bind_int64(pInsert, iBind, iRowid);
+                    }else if( pCol->iField<nVal ){
+                      sqlite3_bind_value(pInsert, iBind, apVal[pCol->iField]);
+                    }
                   }
                 }
-              }
-              if( p->bRecoverRowid && pTab->iRowidBind>0 && bHaveRowid ){
-                sqlite3_bind_int64(pInsert, pTab->iRowidBind, iRowid);
-              }
+                if( p->bRecoverRowid && pTab->iRowidBind>0 && bHaveRowid ){
+                  sqlite3_bind_int64(pInsert, pTab->iRowidBind, iRowid);
+                }
 
-              if( SQLITE_ROW==sqlite3_step(pInsert) && p->xSql ){
-                const char *zSql = (const char*)sqlite3_column_text(pInsert, 0);
-                recoverSqlCallback(p, zSql);
+                if( SQLITE_ROW==sqlite3_step(pInsert) && p->xSql ){
+                  const char *z = (const char*)sqlite3_column_text(pInsert, 0);
+                  recoverSqlCallback(p, z);
+                }
+                recoverReset(p, pInsert);
+                assert( p->errCode || pInsert );
+                if( pInsert ) sqlite3_clear_bindings(pInsert);
               }
-              recoverReset(p, pInsert);
-              assert( p->errCode || pInsert );
-              if( pInsert ) sqlite3_clear_bindings(pInsert);
             }
 
             for(ii=0; ii<nVal; ii++){
@@ -1577,9 +1585,12 @@ static int recoverWriteData(sqlite3_recover *p){
               assert( nVal==-1 );
               nVal = 0;
               bHaveRowid = 1;
-            }else if( iField<nMax ){
+            }else if( iField<pTab->nCol ){
               assert( apVal[iField]==0 );
               apVal[iField] = sqlite3_value_dup( pVal );
+              if( apVal[iField]==0 ){
+                recoverError(p, SQLITE_NOMEM, 0);
+              }
               nVal = iField+1;
             }
             iPrevCell = iCell;
@@ -1686,7 +1697,6 @@ sqlite3_recover *recoverInit(
   int nByte = 0;
 
   if( zDb==0 ){ zDb = "main"; }
-  if( zUri==0 ){ zUri = ""; }
 
   nDb = recoverStrlen(zDb);
   nUri = recoverStrlen(zUri);
@@ -1699,7 +1709,7 @@ sqlite3_recover *recoverInit(
     pRet->zDb = (char*)&pRet[1];
     pRet->zUri = &pRet->zDb[nDb+1];
     memcpy(pRet->zDb, zDb, nDb);
-    memcpy(pRet->zUri, zUri, nUri);
+    if( nUri>0 ) memcpy(pRet->zUri, zUri, nUri);
     pRet->xSql = xSql;
     pRet->pSqlCtx = pSqlCtx;
     pRet->bRecoverRowid = RECOVER_ROWID_DEFAULT;
@@ -1730,14 +1740,14 @@ sqlite3_recover *sqlite3_recover_init_sql(
   int (*xSql)(void*, const char*),
   void *pSqlCtx
 ){
-  return recoverInit(db, zDb, "", xSql, pSqlCtx);
+  return recoverInit(db, zDb, 0, xSql, pSqlCtx);
 }
 
 /*
 ** Return the handle error message, if any.
 */
 const char *sqlite3_recover_errmsg(sqlite3_recover *p){
-  return p ? p->zErrMsg : "not an error";
+  return (p && p->errCode!=SQLITE_NOMEM) ? p->zErrMsg : "out of memory";
 }
 
 /*
@@ -1753,6 +1763,7 @@ int sqlite3_recover_errcode(sqlite3_recover *p){
 int sqlite3_recover_config(sqlite3_recover *p, int op, void *pArg){
   int rc = SQLITE_OK;
 
+  if( p==0 ) return SQLITE_NOMEM;
   switch( op ){
     case 789:
       sqlite3_free(p->zStateDb);
@@ -1791,8 +1802,12 @@ int sqlite3_recover_config(sqlite3_recover *p, int op, void *pArg){
 */
 int sqlite3_recover_run(sqlite3_recover *p){
   if( p ){
+    recoverExec(p, p->dbIn, "PRAGMA writable_schema=1");
     if( p->bRun ) return SQLITE_MISUSE;     /* Has already run */
     if( p->errCode==SQLITE_OK ) recoverRun(p);
+    if( sqlite3_exec(p->dbIn, "PRAGMA writable_schema=0", 0, 0, 0) ){
+      recoverDbError(p, p->dbIn);
+    }
   }
   return p ? p->errCode : SQLITE_NOMEM;
 }
@@ -1807,11 +1822,16 @@ int sqlite3_recover_run(sqlite3_recover *p){
 ** not been called on this handle.
 */
 int sqlite3_recover_finish(sqlite3_recover *p){
-  int rc = p->errCode;
-  sqlite3_free(p->zErrMsg);
-  sqlite3_free(p->zStateDb);
-  sqlite3_free(p->zLostAndFound);
-  sqlite3_free(p);
+  int rc;
+  if( p==0 ){
+    rc = SQLITE_NOMEM;
+  }else{
+    rc = p->errCode;
+    sqlite3_free(p->zErrMsg);
+    sqlite3_free(p->zStateDb);
+    sqlite3_free(p->zLostAndFound);
+    sqlite3_free(p);
+  }
   return rc;
 }
 
diff --git a/ext/recover/test_recover.c b/ext/recover/test_recover.c
index a31ddbb94a..a7c5afd3aa 100644
--- a/ext/recover/test_recover.c
+++ b/ext/recover/test_recover.c
@@ -165,9 +165,7 @@ static int testRecoverCmd(
       int res2;
       if( res!=SQLITE_OK ){
         const char *zErr = sqlite3_recover_errmsg(pTest->p);
-        char *zRes = sqlite3_mprintf("(%d) - %s", res, zErr);
-        Tcl_SetObjResult(interp, Tcl_NewStringObj(zRes, -1));
-        sqlite3_free(zRes);
+        Tcl_SetObjResult(interp, Tcl_NewStringObj(zErr, -1));
       }
       res2 = sqlite3_recover_finish(pTest->p);
       assert( res2==res );
diff --git a/manifest b/manifest
index d505905e12..c61b4a13ae 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Rework\srecover\sextension\scode\sfor\sreadability.
-D 2022-09-10T20:01:49.308
+C More\stests\sfor\sthe\srecover\smodule.
+D 2022-09-12T19:23:50.588
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -390,11 +390,13 @@ F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f5974282
 F ext/recover/recover1.test 942016356f9098ca36933536b194b5878827a3a749e0bf41a83d83530c0d0ea8
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
 F ext/recover/recoverclobber.test e6537ebf99f57bfff6cca59550b5f4278319b57a89865abb98d755a8fd561d84
+F ext/recover/recovercorrupt.test 115cdb67ac29b4e8ec786cee9190ced674f62388f126b20deea22fa5fd11b814
+F ext/recover/recoverfault.test 30e3d1b423b33b4c57f4a97f9754b2d493a411d858b2672ab369d65199bc2420
 F ext/recover/recoverold.test f368a6ae2db12b6017257b332a19ab5df527f4061e43f12f5c85d8e2b236f074
 F ext/recover/recoverrowid.test ec4436cd69e6cdacb48dd2963ff6dd9dbd5fe648376de5e7c0c2f4f6cbacb417
-F ext/recover/sqlite3recover.c 4ed53fd33639ede83505f4397b8e1e46b6c0c5a5188c42f28f8372487141170a
+F ext/recover/sqlite3recover.c d40d7c68a118e01d2b06c96325bbe3b85701f3add2ab5aeec289eeafd5e36d6c
 F ext/recover/sqlite3recover.h 81108efb8c4618d3d9c6da4df785212b0e4501aa0d25edfc463405fe839a6640
-F ext/recover/test_recover.c ed8d0cc8703ab29cf562f793623b045de109b7937f254108ff4132f35abb37fb
+F ext/recover/test_recover.c 8f5ef0c9b7523c41a393f65e44d727c23cda8f44d5180fff5b698ee068ba538d
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
 F ext/repair/checkfreelist.c e21f06995ff4efdc1622dcceaea4dcba2caa83ca2f31a1607b98a8509168a996
 F ext/repair/checkindex.c 4383e4469c21e5b9ae321d0d63cec53e981af9d7a6564be6374f0eeb93dfc890
@@ -2007,8 +2009,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 599d1f8ec2f9e24924a6f9e66c85664360c7b95531b07a4efe1dd8c096b3fc99
-R cd56b05532a91c08b9e673fffba829f5
+P 1a2540960e40e3c8c622448fd3862e249bd463c29ae4ce5e39942e942533f60a
+R 91d8f87cd1493a401d98e4544c1e3f6e
 U dan
-Z 624cfda4b7c658530a41a87671068e55
+Z d3a21f62871d8e066c6c2bd48e5f7060
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 98f37f0563..340320e0cf 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1a2540960e40e3c8c622448fd3862e249bd463c29ae4ce5e39942e942533f60a
\ No newline at end of file
+37fb093b95c6b7d7ad07a275697df73b69f9fb5c5549aea8544b26e38f24833f
\ No newline at end of file

From d8bb0b5ae61221dd26a336fe103b8a98bd8fc757 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 12 Sep 2022 19:29:34 +0000
Subject: [PATCH 094/428] Add a gettimeofday()-based implementation of
 xCurrentTimeInt64() to os_kv.c.

FossilOrigin-Name: e393ed650ef124143f84e9d787fb996e308dd7af6b8f50df72a6f085b67bf9c3
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/os_kv.c   | 13 ++++++++++---
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/manifest b/manifest
index 06fc95c9d8..15f08523a8 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sdebugging/testing\sedit\sin\sthe\sprevious\scheck-in.
-D 2022-09-12T18:10:41.031
+C Add\sa\sgettimeofday()-based\simplementation\sof\sxCurrentTimeInt64()\sto\sos_kv.c.
+D 2022-09-12T19:29:34.236
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -574,7 +574,7 @@ F src/notify.c 89a97dc854c3aa62ad5f384ef50c5a4a11d70fcc69f86de3e991573421130ed6
 F src/os.c 0eb831ba3575af5277e47f4edd14fdfc90025c67eb25ce5cda634518d308d4e9
 F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
-F src/os_kv.c 226d9051af316dc547a37629b269ba2aebff8fa21915b91a9b41f7872bb4cc05
+F src/os_kv.c 395b3ab831e0d2b172e6dccf6bae3e21b141f3b6d8b3aa828630634edac2604d
 F src/os_setup.h 0711dbc4678f3ac52d7fe736951b6384a0615387c4ba5135a4764e4e31f4b6a6
 F src/os_unix.c d6322b78130d995160bb9cfb7850678ad6838b08c1d13915461b33326a406c04
 F src/os_win.c e9454cb141908e8eef2102180bad353a36480612d5b736e4c2bd5777d9b25a34
@@ -2004,8 +2004,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 3354a2edb762d70ccc31d4d25f81b70e644d76e01cb1e81d2e97b5414d809d30
-R 742e0e4f6e4e5630d202911ef2cdc14a
+P 6fc8d34c0ae1f8277544be741f2f0835fad8e475d35bd24573224ccc1699b8bd
+R d1f30b2b05b4b258ee2d7add5fd2e488
 U drh
-Z 0a81f46489fd3e0c2c270769139a2009
+Z aaf2d483b1b9208133805d5c75708f65
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index bf2f87a85b..c45584142b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6fc8d34c0ae1f8277544be741f2f0835fad8e475d35bd24573224ccc1699b8bd
\ No newline at end of file
+e393ed650ef124143f84e9d787fb996e308dd7af6b8f50df72a6f085b67bf9c3
\ No newline at end of file
diff --git a/src/os_kv.c b/src/os_kv.c
index ce0a571965..eebbcd17cd 100644
--- a/src/os_kv.c
+++ b/src/os_kv.c
@@ -1081,11 +1081,18 @@ static int kvvfsSleep(sqlite3_vfs *pVfs, int nMicro){
 ** Return the current time as a Julian Day number in *pTimeOut.
 */
 static int kvvfsCurrentTime(sqlite3_vfs *pVfs, double *pTimeOut){
-  *pTimeOut = 2459829.13362986;
-  return SQLITE_OK;
+  sqlite3_int64 i = 0;
+  int rc;
+  rc = kvvfsCurrentTimeInt64(0, &i);
+  *pTimeOut = i/86400000.0;
+  return rc;
 }
+#include <sys/time.h>
 static int kvvfsCurrentTimeInt64(sqlite3_vfs *pVfs, sqlite3_int64 *pTimeOut){
-  *pTimeOut = (sqlite3_int64)(2459829.13362986*86400000.0);
+  static const sqlite3_int64 unixEpoch = 24405875*(sqlite3_int64)8640000;
+  struct timeval sNow;
+  (void)gettimeofday(&sNow, 0);  /* Cannot fail given valid arguments */
+  *pTimeOut = unixEpoch + 1000*(sqlite3_int64)sNow.tv_sec + sNow.tv_usec/1000;
   return SQLITE_OK;
 }
 

From b126ec18b6f1a6046243073a0ac2dc5f845ed8b1 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 12 Sep 2022 19:33:20 +0000
Subject: [PATCH 095/428] Fix the &lt;sys/time.h&gt; include in os_kv.c.

FossilOrigin-Name: 878cc93e779c3857adc711f212520f007256274fcd3f6f3d72c754a937fcd198
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/os_unix.c |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/manifest b/manifest
index 15f08523a8..69204b63ea 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\sgettimeofday()-based\simplementation\sof\sxCurrentTimeInt64()\sto\sos_kv.c.
-D 2022-09-12T19:29:34.236
+C Fix\sthe\s&lt;sys/time.h&gt;\sinclude\sin\sos_kv.c.
+D 2022-09-12T19:33:20.055
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -576,7 +576,7 @@ F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
 F src/os_kv.c 395b3ab831e0d2b172e6dccf6bae3e21b141f3b6d8b3aa828630634edac2604d
 F src/os_setup.h 0711dbc4678f3ac52d7fe736951b6384a0615387c4ba5135a4764e4e31f4b6a6
-F src/os_unix.c d6322b78130d995160bb9cfb7850678ad6838b08c1d13915461b33326a406c04
+F src/os_unix.c 0fa91925f0b8831fc0156a9c04d39d86f85baf9eef66c98712395e1715cb75cc
 F src/os_win.c e9454cb141908e8eef2102180bad353a36480612d5b736e4c2bd5777d9b25a34
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c 6176d9752eb580419e8fef4592dc417a6b00ddfd43ee22f818819bf8840ceee8
@@ -2004,8 +2004,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 6fc8d34c0ae1f8277544be741f2f0835fad8e475d35bd24573224ccc1699b8bd
-R d1f30b2b05b4b258ee2d7add5fd2e488
+P e393ed650ef124143f84e9d787fb996e308dd7af6b8f50df72a6f085b67bf9c3
+R 7d043d1f24831e04bac4a09dedf809ea
 U drh
-Z aaf2d483b1b9208133805d5c75708f65
+Z f4bc361a8f5540cb46c54b92ebd31edc
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index c45584142b..f40ca1a770 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e393ed650ef124143f84e9d787fb996e308dd7af6b8f50df72a6f085b67bf9c3
\ No newline at end of file
+878cc93e779c3857adc711f212520f007256274fcd3f6f3d72c754a937fcd198
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index 422fb25ed1..784686d0a3 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -93,7 +93,7 @@
 #include <sys/ioctl.h>
 #include <unistd.h>      /* amalgamator: keep */
 #include <time.h>
-#include <sys/time.h>
+#include <sys/time.h>    /* amalgamator: keep */
 #include <errno.h>
 #if !defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0
 # include <sys/mman.h>

From 5ca0b38605b5e147b5a8b846c1b6fef826ba362b Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Mon, 12 Sep 2022 20:02:33 +0000
Subject: [PATCH 096/428] Fix some problems with handling corrupt database in
 the recovery extension.

FossilOrigin-Name: ed318be8241981ef96334ba13d3201a717cc812a59aed64e3dc67f7e7e71854b
---
 ext/recover/recoverfault.test | 27 +++++++++++++++++++++------
 ext/recover/sqlite3recover.c  | 19 +++++++++++++++++--
 manifest                      | 18 +++++++++---------
 manifest.uuid                 |  2 +-
 src/dbpage.c                  |  2 +-
 src/shell.c.in                |  2 +-
 6 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/ext/recover/recoverfault.test b/ext/recover/recoverfault.test
index b2411fb6c7..2ac1c67f34 100644
--- a/ext/recover/recoverfault.test
+++ b/ext/recover/recoverfault.test
@@ -44,19 +44,14 @@ do_execsql_test 1.0 {
   INSERT INTO t1 VALUES(1, 2, 3);
   INSERT INTO t1 VALUES(2, hex(randomblob(1000)), randomblob(2000));
   CREATE INDEX i1 ON t1(b, c);
-  CREATE TABLE t2(a INTEGER PRIMARY KEY, b, c);
-  INSERT INTO t2 VALUES(1, 2, 3);
-  INSERT INTO t2 VALUES(2, hex(randomblob(1000)), randomblob(2000));
   ANALYZE;
-  PRAGMA writable_schema = 1;
-  DELETE FROM sqlite_schema WHERE name='t2';
 }
+faultsim_save_and_close
 
 do_faultsim_test 1 -faults oom* -prep {
   faultsim_restore_and_reopen
 } -body {
   set R [sqlite3_recover_init db main test.db2]
-  $R config lostandfound lost_and_found
   $R step
   $R finish
 } -test {
@@ -68,5 +63,25 @@ do_faultsim_test 1 -faults oom* -prep {
   }
 }
 
+faultsim_restore_and_reopen 
+do_execsql_test 2.0 {
+  CREATE TABLE t2(a INTEGER PRIMARY KEY, b, c);
+  INSERT INTO t2 VALUES(1, 2, 3);
+  INSERT INTO t2 VALUES(2, hex(randomblob(1000)), hex(randomblob(2000)));
+  PRAGMA writable_schema = 1;
+  DELETE FROM sqlite_schema WHERE name='t2';
+}
+
+do_faultsim_test 2 -faults oom* -prep {
+  faultsim_restore_and_reopen
+} -body {
+  set R [sqlite3_recover_init db main test.db2]
+  $R config lostandfound lost_and_found
+  $R step
+  $R finish
+} -test {
+  faultsim_test_result {0 {}} {1 {}}
+}
+
 finish_test
 
diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index 849c3bc801..c1ff3b5439 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -406,6 +406,18 @@ static int recoverExec(sqlite3_recover *p, sqlite3 *db, const char *zSql){
   return p->errCode;
 }
 
+static void recoverBindValue(
+  sqlite3_recover *p, 
+  sqlite3_stmt *pStmt, 
+  int iBind, 
+  sqlite3_value *pVal
+){
+  if( p->errCode==SQLITE_OK ){
+    int rc = sqlite3_bind_value(pStmt, iBind, pVal);
+    if( rc ) recoverError(p, rc, 0);
+  }
+}
+
 /*
 ** This function is a no-op if recover handle p already contains an error
 ** (if p->errCode!=SQLITE_OK). NULL is returned in this case.
@@ -1305,7 +1317,7 @@ static void recoverLostAndFoundPopulate(
         sqlite3_bind_int64(pInsert, 4, iRowid);   /* id */
       }
       for(ii=0; ii<nVal; ii++){
-        sqlite3_bind_value(pInsert, 5+ii, apVal[ii]);
+        recoverBindValue(p, pInsert, 5+ii, apVal[ii]);
       }
       if( sqlite3_step(pInsert)==SQLITE_ROW && p->xSql ){
         recoverSqlCallback(p, sqlite3_column_text(pInsert, 0));
@@ -1332,6 +1344,9 @@ static void recoverLostAndFoundPopulate(
       apVal[iField] = sqlite3_value_dup(pVal);
       assert( iField==nVal || (nVal==-1 && iField==0) );
       nVal = iField+1;
+      if( apVal[iField]==0 ){
+        recoverError(p, SQLITE_NOMEM, 0);
+      }
     }
 
     iPrevRoot = iRoot;
@@ -1553,7 +1568,7 @@ static int recoverWriteData(sqlite3_recover *p){
                     if( pCol->bIPK ){
                       sqlite3_bind_int64(pInsert, iBind, iRowid);
                     }else if( pCol->iField<nVal ){
-                      sqlite3_bind_value(pInsert, iBind, apVal[pCol->iField]);
+                      recoverBindValue(p, pInsert, iBind, apVal[pCol->iField]);
                     }
                   }
                 }
diff --git a/manifest b/manifest
index c61b4a13ae..f5b2895b91 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C More\stests\sfor\sthe\srecover\smodule.
-D 2022-09-12T19:23:50.588
+C Fix\ssome\sproblems\swith\shandling\scorrupt\sdatabase\sin\sthe\srecovery\sextension.
+D 2022-09-12T20:02:33.923
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -391,10 +391,10 @@ F ext/recover/recover1.test 942016356f9098ca36933536b194b5878827a3a749e0bf41a83d
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
 F ext/recover/recoverclobber.test e6537ebf99f57bfff6cca59550b5f4278319b57a89865abb98d755a8fd561d84
 F ext/recover/recovercorrupt.test 115cdb67ac29b4e8ec786cee9190ced674f62388f126b20deea22fa5fd11b814
-F ext/recover/recoverfault.test 30e3d1b423b33b4c57f4a97f9754b2d493a411d858b2672ab369d65199bc2420
+F ext/recover/recoverfault.test db6b0ba5a993c38ec885867a12556fa7c5d73948b168b0b59e7d3053c0787f29
 F ext/recover/recoverold.test f368a6ae2db12b6017257b332a19ab5df527f4061e43f12f5c85d8e2b236f074
 F ext/recover/recoverrowid.test ec4436cd69e6cdacb48dd2963ff6dd9dbd5fe648376de5e7c0c2f4f6cbacb417
-F ext/recover/sqlite3recover.c d40d7c68a118e01d2b06c96325bbe3b85701f3add2ab5aeec289eeafd5e36d6c
+F ext/recover/sqlite3recover.c 0154617e73430b594f3d8b94eb2847bd5dc3dc3cd6ff6f0511dc6db5d116621d
 F ext/recover/sqlite3recover.h 81108efb8c4618d3d9c6da4df785212b0e4501aa0d25edfc463405fe839a6640
 F ext/recover/test_recover.c 8f5ef0c9b7523c41a393f65e44d727c23cda8f44d5180fff5b698ee068ba538d
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -546,7 +546,7 @@ F src/callback.c 4cd7225b26a97f7de5fee5ae10464bed5a78f2adefe19534cc2095b3a8ca484
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c 93e4b5f4faf6d3f688988a116773259a4fbfb4ddac0e9bf9d0ae0429390c2543
 F src/date.c 94ce83b4cd848a387680a5f920c9018c16655db778c4d36525af0a0f34679ac5
-F src/dbpage.c 5808e91bc27fa3981b028000f8fadfdc10ce9e59a34ce7dc4e035a69be3906ec
+F src/dbpage.c dc1e8e7ba880009986b2f2050213157d2328b6d8cd4df6cf0f48883734510558
 F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
 F src/delete.c 86573edae75e3d3e9a8b590d87db8e47222103029df4f3e11fa56044459b514e
 F src/expr.c 24e828db6b2fab8aabfb5d2c0d83dbdfc5a1972b1147fa893350e317ab7e282f
@@ -599,7 +599,7 @@ F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c ccce37e7fbe71089cf6aec91e7134c9c0c1d4840cff9f02587bbc71240d914a5
-F src/shell.c.in a805e05f3ed90e0236eb4eb5bdec327bf735d12e754b83ac037cbc22e45ecc09
+F src/shell.c.in 36d5792e35515f2389f175b41486b78b1ad6e571799e3c9b211f47c3629f96e5
 F src/sqlite.h.in b9b7fd73239d94db20332bb6e504688001e5564b655e1318a4427a1caef4b99e
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d
@@ -2009,8 +2009,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 1a2540960e40e3c8c622448fd3862e249bd463c29ae4ce5e39942e942533f60a
-R 91d8f87cd1493a401d98e4544c1e3f6e
+P 37fb093b95c6b7d7ad07a275697df73b69f9fb5c5549aea8544b26e38f24833f
+R 4bca180a2c79c76d0affba5c0d731d37
 U dan
-Z d3a21f62871d8e066c6c2bd48e5f7060
+Z 8bfc7241f27e2d2e9de40f4a070a3e2c
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 340320e0cf..f7f9d304f7 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-37fb093b95c6b7d7ad07a275697df73b69f9fb5c5549aea8544b26e38f24833f
\ No newline at end of file
+ed318be8241981ef96334ba13d3201a717cc812a59aed64e3dc67f7e7e71854b
\ No newline at end of file
diff --git a/src/dbpage.c b/src/dbpage.c
index 9b565177c5..7990199fcc 100644
--- a/src/dbpage.c
+++ b/src/dbpage.c
@@ -288,7 +288,7 @@ static int dbpageColumn(
       break;
     }
   }
-  return SQLITE_OK;
+  return rc;
 }
 
 static int dbpageRowid(sqlite3_vtab_cursor *pCursor, sqlite_int64 *pRowid){
diff --git a/src/shell.c.in b/src/shell.c.in
index 632d9633fd..739c2d816c 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -7309,7 +7309,7 @@ static int recoverDatabaseCmd(ShellState *pState, int nArg, char **azArg){
       pState->db, "main", recoverSqlCb, (void*)pState
   );
 
-  sqlite3_recover_config(p, SQLITE_RECOVER_TESTDB, (void*)zRecoveryDb);
+  sqlite3_recover_config(p, 789, (void*)zRecoveryDb);
   sqlite3_recover_config(p, SQLITE_RECOVER_LOST_AND_FOUND, (void*)zLAF);
   sqlite3_recover_config(p, SQLITE_RECOVER_ROWIDS, (void*)&bRowids);
   sqlite3_recover_config(p, SQLITE_RECOVER_FREELIST_CORRUPT,(void*)&bFreelist);

From 5fd8f27bfb5abf924ca26d239b3352d7b6d82264 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 12 Sep 2022 20:21:34 +0000
Subject: [PATCH 097/428] Remove an extraneous key-copy op in the EM_JS impl of
 kvstorageDelete().

FossilOrigin-Name: 1c5aeee45564c14e7e2e7730f3f52106339ea3148fb5aa786fa767a35db46f51
---
 manifest      | 14 +++++++-------
 manifest.uuid |  2 +-
 src/os_kv.c   |  1 -
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index 69204b63ea..e8ffc8d53e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\s&lt;sys/time.h&gt;\sinclude\sin\sos_kv.c.
-D 2022-09-12T19:33:20.055
+C Remove\san\sextraneous\skey-copy\sop\sin\sthe\sEM_JS\simpl\sof\skvstorageDelete().
+D 2022-09-12T20:21:34.667
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -574,7 +574,7 @@ F src/notify.c 89a97dc854c3aa62ad5f384ef50c5a4a11d70fcc69f86de3e991573421130ed6
 F src/os.c 0eb831ba3575af5277e47f4edd14fdfc90025c67eb25ce5cda634518d308d4e9
 F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
-F src/os_kv.c 395b3ab831e0d2b172e6dccf6bae3e21b141f3b6d8b3aa828630634edac2604d
+F src/os_kv.c 889c6f9b59702859f9041549845769bae2cbd6b59cf15bd7904551a676b85533
 F src/os_setup.h 0711dbc4678f3ac52d7fe736951b6384a0615387c4ba5135a4764e4e31f4b6a6
 F src/os_unix.c 0fa91925f0b8831fc0156a9c04d39d86f85baf9eef66c98712395e1715cb75cc
 F src/os_win.c e9454cb141908e8eef2102180bad353a36480612d5b736e4c2bd5777d9b25a34
@@ -2004,8 +2004,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 e393ed650ef124143f84e9d787fb996e308dd7af6b8f50df72a6f085b67bf9c3
-R 7d043d1f24831e04bac4a09dedf809ea
-U drh
-Z f4bc361a8f5540cb46c54b92ebd31edc
+P 878cc93e779c3857adc711f212520f007256274fcd3f6f3d72c754a937fcd198
+R ea387427fef090c92e0fdcd9a6ab25a2
+U stephan
+Z d8eaf9989333b333239c3719fa4ba2d7
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f40ca1a770..8dbaf37dda 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-878cc93e779c3857adc711f212520f007256274fcd3f6f3d72c754a937fcd198
\ No newline at end of file
+1c5aeee45564c14e7e2e7730f3f52106339ea3148fb5aa786fa767a35db46f51
\ No newline at end of file
diff --git a/src/os_kv.c b/src/os_kv.c
index eebbcd17cd..62214a13ad 100644
--- a/src/os_kv.c
+++ b/src/os_kv.c
@@ -284,7 +284,6 @@ EM_JS(int, kvstorageDelete,
   try {
     const zXKey = kvstorageMakeKeyOnJSStack(zClass,zKey);
     if(!zXKey) return 1/*OOM*/;
-    _sqlite3_wasm__kvvfsMakeKey(zClass, zKey, zXKey);
     const jKey = UTF8ToString(zXKey);
     ((115/*=='s'*/===getValue(zClass))
      ? sessionStorage : localStorage).removeItem(jKey);

From 23d39ce54d2001af90e453765a38adcc964e5820 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 12 Sep 2022 22:27:00 +0000
Subject: [PATCH 098/428] Get testing1.js working with a kvvfs build.

FossilOrigin-Name: 333a45725d1708e0fefa559c33ce1c7eeb425cdb04f594b1f2b48166c1478c79
---
 ext/wasm/GNUmakefile   |  5 +++--
 ext/wasm/kvvfs.make    | 20 +++++++++++++++-----
 ext/wasm/testing1.html |  2 ++
 ext/wasm/testing1.js   | 17 +++++++++++++----
 manifest               | 18 +++++++++---------
 manifest.uuid          |  2 +-
 6 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 0cf365b912..ff37281ea4 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -316,10 +316,11 @@ dir.sql := sql
 speedtest1 := ../../speedtest1
 speedtest1.c := ../../test/speedtest1.c
 speedtest1.sql := $(dir.sql)/speedtest1.sql
+speedtest1.cliflags := --size 100
 $(speedtest1):
 	$(MAKE) -C ../.. speedtest1
-$(speedtest1.sql): $(speedtest1)
-	$(speedtest1) --script $@
+$(speedtest1.sql): $(speedtest1) $(MAKEFILE)
+	$(speedtest1) $(speedtest1.cliflags) --script $@
 batch-runner.list: $(MAKEFILE) $(speedtest1.sql) $(dir.sql)/000-mandelbrot.sql
 	bash split-speedtest1-script.sh $(dir.sql)/speedtest1.sql
 	ls -1 $(dir.sql)/*.sql | grep -v speedtest1.sql | sort > $@
diff --git a/ext/wasm/kvvfs.make b/ext/wasm/kvvfs.make
index cfe0af652c..ad743dfda6 100644
--- a/ext/wasm/kvvfs.make
+++ b/ext/wasm/kvvfs.make
@@ -34,6 +34,12 @@ kvvfs.cflags += -std=c99 -fPIC -g
 kvvfs.cflags += -I. -I$(dir.top)
 kvvfs.cflags += -DSQLITE_OS_KV=1 $(SQLITE_OPT)
 
+kvvfs.extra.c :=
+ifeq (1,1)
+  # To get testing1.js to run with $(kvvfs.js) we need...
+  kvvfs.extra.c += $(jaccwabyt_test.c)
+endif
+
 ########################################################################
 # emcc flags specific to building the final .js/.wasm file...
 kvvfs.jsflags := -fPIC
@@ -44,7 +50,12 @@ kvvfs.jsflags += -sMODULARIZE
 kvvfs.jsflags += -sSTRICT_JS
 kvvfs.jsflags += -sDYNAMIC_EXECUTION=0
 kvvfs.jsflags += -sNO_POLYFILL
-kvvfs.jsflags += -sEXPORTED_FUNCTIONS=@$(dir.api)/EXPORTED_FUNCTIONS.sqlite3-api
+ifeq (,$(kvvfs.extra.c))
+  kvvfs.jsflags += -sEXPORTED_FUNCTIONS=@$(dir.api)/EXPORTED_FUNCTIONS.sqlite3-api
+else
+  # need more exports for jaccwabyt test code...
+  kvvfs.jsflags += -sEXPORTED_FUNCTIONS=@$(dir.wasm)/EXPORTED_FUNCTIONS.api
+endif
 kvvfs.jsflags += -sEXPORTED_RUNTIME_METHODS=FS,wasmMemory,allocateUTF8OnStack
                                             # wasmMemory ==> for -sIMPORTED_MEMORY
                                             # allocateUTF8OnStack ==> kvvfs internals
@@ -69,13 +80,12 @@ kvvfs.jsflags += -sMEMORY64=0
 ifneq (0,$(enable_bigint))
 kvvfs.jsflags += -sWASM_BIGINT
 endif
-
-$(kvvfs.js): $(MAKEFILE) $(MAKEFILE.kvvfs) $(kvvfs.wasm.c) $(sqlite3.c) \
-    EXPORTED_FUNCTIONS.api \
+$(kvvfs.js): $(kvvfs.wasm.c) $(sqlite3.c) $(kvvfs.extra.c) \
+    EXPORTED_FUNCTIONS.api $(MAKEFILE) $(MAKEFILE.kvvfs) \
     $(post-js.js)
 	$(emcc.bin) -o $@ $(emcc_opt) $(emcc.flags) \
   $(SQLITE_OPT) \
-  $(kvvfs.cflags) $(kvvfs.jsflags) $(kvvfs.wasm.c)
+  $(kvvfs.cflags) $(kvvfs.jsflags) $(kvvfs.wasm.c) $(kvvfs.extra.c)
 	chmod -x $(kvvfs.wasm)
 ifneq (,$(wasm-strip))
 	$(wasm-strip) $(kvvfs.wasm)
diff --git a/ext/wasm/testing1.html b/ext/wasm/testing1.html
index 24c1e82360..bf73974ee7 100644
--- a/ext/wasm/testing1.html
+++ b/ext/wasm/testing1.html
@@ -27,6 +27,8 @@
     <div>Most stuff on this page happens in the dev console.</div>
     <hr>
     <div id='test-output'></div>
+    <!-- testing1.js "should" work with both sqlite3.js and sqlite3-kvvfs.js -->
+    <!--script src="sqlite3-kvvfs.js"></script-->
     <script src="sqlite3.js"></script>
     <script src="common/SqliteTestUtil.js"></script>
     <script src="testing1.js"></script>
diff --git a/ext/wasm/testing1.js b/ext/wasm/testing1.js
index 4144219527..2aadc30c3a 100644
--- a/ext/wasm/testing1.js
+++ b/ext/wasm/testing1.js
@@ -252,7 +252,7 @@
     db.exec({
       sql:new TextEncoder('utf-8').encode([
         // ^^^ testing string-vs-typedarray handling in execMulti()
-        "attach 'foo.db' as foo;",
+        "attach 'session' as foo;" /* name 'session' is magic for kvvfs! */,
         "create table foo.bar(a);",
         "insert into foo.bar(a) values(1),(2),(3);",
         "select a from foo.bar order by a;"
@@ -744,7 +744,7 @@
         .assert('sqlite3_vfs' === dVfs.structName)
         .assert(!!dVfs.structInfo)
         .assert(SB.StructType.hasExternalPointer(dVfs))
-        .assert(3===dVfs.$iVersion)
+        .assert(dVfs.$iVersion>0)
         .assert('number'===typeof dVfs.$zName)
         .assert('number'===typeof dVfs.$xSleep)
         .assert(capi.wasm.functionEntry(dVfs.$xOpen))
@@ -1046,9 +1046,18 @@
       T.assert(capi.wasm[k] instanceof Function);
     });
 
-    const db = new oo.DB(':memory:'), startTime = performance.now();
+    let dbName = "/testing1.sqlite3";
+    let vfsName = undefined;
+    if(oo.DB.clearKvvfsStorage){
+      dbName = "local";
+      vfsName = 'kvvfs';
+      logHtml("Found kvvfs. Clearing db(s) from sessionStorage and localStorage",
+              "and selecting kvvfs-friendly db name:",dbName);
+      oo.DB.clearKvvfsStorage();
+    }
+    const db = new oo.DB(dbName,'c',vfsName), startTime = performance.now();
     try {
-      log("DB filename:",db.filename,db.fileName());
+      log("db.filename =",db.filename,"db.fileName() =",db.fileName());
       const banner1 = '>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>',
             banner2 = '<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<';
       [
diff --git a/manifest b/manifest
index 75b3e09950..b104be806b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\skv-vfs\sbranch\sinto\sfiddle-opfs\sand\sadd\sspeedtest1-kvvfs.html\stest\sapp\s(which\scurrently\sfails\searly\son).
-D 2022-09-12T20:18:28.723
+C Get\stesting1.js\sworking\swith\sa\skvvfs\sbuild.
+D 2022-09-12T22:27:00.037
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle db7a4602f043cf4a5e4135be3609a487f9f1c83f05778bfbdf93766be4541b96
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile 0434268aa7e042ec265c13e85a82cc3a760be02851ba428aa996a36d4ba77dfd
+F ext/wasm/GNUmakefile b175a00599c976fe9e7bc02bbc1337b5e3b81d042320c3a0be1621d2c7a21b21
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 1dfd067b3cbd9a49cb204097367cf2f8fe71b5a3b245d9d82a24779fd4ac2394
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -506,7 +506,7 @@ F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab26
 F ext/wasm/jaccwabyt/jaccwabyt.md 447cc02b598f7792edaa8ae6853a7847b8178a18ed356afacbdbf312b2588106
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
 F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e568d2c2307c416902059339c06f19
-F ext/wasm/kvvfs.make 1858354b02ebdccc459fb2d235552f8951d6ce28340083da9bb230bcf2533789
+F ext/wasm/kvvfs.make bfa0aaac384d9f200d2c8e31efb3536b40d139667b88e6eba9c0a71e23da6a5c
 F ext/wasm/kvvfs1.html 83bac238d1e93ed102a461672fc58fe74e611e426708e9a5c66002c01eadb942
 F ext/wasm/kvvfs1.js 53721a42e0ec45f6978cc723e5de47f882517867d0fcff4c6ff05f4c422e27c4
 F ext/wasm/scratchpad-opfs-main.html 4565cf194e66188190d35f70e82553e2e2d72b9809b73c94ab67b8cfd14d2e0c
@@ -525,8 +525,8 @@ F ext/wasm/sqlite3-worker1-promiser.js 92b8da5f38439ffec459a8215775d30fa498bc0f1
 F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
 F ext/wasm/testing-worker1-promiser.js c62b5879339eef0b21aebd9d75bc125c86530edc17470afff18077f931cb704a
-F ext/wasm/testing1.html 528001c7e32ee567abc195aa071fd9820cc3c8ffc9c8a39a75e680db05f0c409
-F ext/wasm/testing1.js 2def7a86c52ff28b145cb86188d5c7a49d5993f9b78c50d140e1c31551220955
+F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d7669fb17fcae
+F ext/wasm/testing1.js 735120231d6e55b92964924fcb54a66484d8b2e30fe5a18c71081b3590344a5f
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
 F ext/wasm/testing2.js 25584bcc30f19673ce13a6f301f89f8820a59dfe044e0c4f2913941f4097fe3c
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
@@ -2024,8 +2024,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 d845c6c22bd5d3fffc66e0566df346d690dd8bd1fc1688e312161b1a1edcfd79 878cc93e779c3857adc711f212520f007256274fcd3f6f3d72c754a937fcd198
-R af6be1e15f44117c1188e0c623230580
+P 8b1608a9a37131121cb3a0cb1e8dbad5e39dc1fc2a341d056f09537f179b2e7a
+R 77095a41dfb9b784dcab0078822e6eff
 U stephan
-Z 1b00f3836ac4e8ae817bece731c1dd12
+Z c624cb9efadffe8972e3df15b8dc9939
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index e78c4a139f..69b3e88fd2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8b1608a9a37131121cb3a0cb1e8dbad5e39dc1fc2a341d056f09537f179b2e7a
\ No newline at end of file
+333a45725d1708e0fefa559c33ce1c7eeb425cdb04f594b1f2b48166c1478c79
\ No newline at end of file

From 7985e05a9729fa44a4c0969caa694825d56da1c7 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Tue, 13 Sep 2022 18:08:24 +0000
Subject: [PATCH 099/428] Add tests. Deal issues surrounding aborting recovery
 from within the SQL callback, and avoiding the pending-byte page.

FossilOrigin-Name: 4e97dd31f5240d9231167ae172a5116426c42177a1ed3c5422b9d51b762d5a87
---
 ext/recover/recover1.test       |  5 +--
 ext/recover/recoverclobber.test |  2 +-
 ext/recover/recovercorrupt.test |  2 +-
 ext/recover/recoverfault.test   |  4 +--
 ext/recover/recoverold.test     |  8 +++--
 ext/recover/recoverrowid.test   |  2 +-
 ext/recover/recoversql.test     | 60 +++++++++++++++++++++++++++++++++
 ext/recover/sqlite3recover.c    | 10 ++++--
 ext/recover/test_recover.c      | 16 ++++++---
 manifest                        | 29 ++++++++--------
 manifest.uuid                   |  2 +-
 src/dbpage.c                    | 16 ++++++---
 12 files changed, 120 insertions(+), 36 deletions(-)
 create mode 100644 ext/recover/recoversql.test

diff --git a/ext/recover/recover1.test b/ext/recover/recover1.test
index 5f1bb2b0fe..3ee4c18ad6 100644
--- a/ext/recover/recover1.test
+++ b/ext/recover/recover1.test
@@ -45,7 +45,7 @@ proc do_recover_test {tn} {
   uplevel [list do_test $tn.1 {
     set R [sqlite3_recover_init db main test.db2]
     $R config testdb rstate.db
-    $R step
+    $R run
     $R finish
   } {}]
 
@@ -61,7 +61,7 @@ proc do_recover_test {tn} {
     set R [sqlite3_recover_init_sql db main my_sql_hook]
     $R config testdb rstate.db
     $R config rowids 1
-    $R step
+    $R run
     $R finish
   } {}]
 
@@ -75,6 +75,7 @@ proc do_recover_test {tn} {
 
 proc my_sql_hook {sql} {
   lappend ::sqlhook $sql
+  return 0
 }
 
 do_execsql_test 1.0 {
diff --git a/ext/recover/recoverclobber.test b/ext/recover/recoverclobber.test
index e6967ec9be..537af8e7c1 100644
--- a/ext/recover/recoverclobber.test
+++ b/ext/recover/recoverclobber.test
@@ -25,7 +25,7 @@ ifcapable !vtab {
 
 proc recover {db output} {
   set R [sqlite3_recover_init db main test.db2]
-  $R step
+  $R run
   $R finish
 }
 
diff --git a/ext/recover/recovercorrupt.test b/ext/recover/recovercorrupt.test
index ff1d2af19f..54a94e1b0c 100644
--- a/ext/recover/recovercorrupt.test
+++ b/ext/recover/recovercorrupt.test
@@ -58,7 +58,7 @@ for {set ii 200} {$ii < 10000} {incr ii} {
   do_test 1.2.$ii {
     set R [sqlite3_recover_init db main test.db2]
     $R config lostandfound lost_and_found
-    $R step
+    $R run
     $R finish
   } {}
 }
diff --git a/ext/recover/recoverfault.test b/ext/recover/recoverfault.test
index 2ac1c67f34..0241034100 100644
--- a/ext/recover/recoverfault.test
+++ b/ext/recover/recoverfault.test
@@ -52,7 +52,7 @@ do_faultsim_test 1 -faults oom* -prep {
   faultsim_restore_and_reopen
 } -body {
   set R [sqlite3_recover_init db main test.db2]
-  $R step
+  $R run
   $R finish
 } -test {
   faultsim_test_result {0 {}} {1 {}}
@@ -77,7 +77,7 @@ do_faultsim_test 2 -faults oom* -prep {
 } -body {
   set R [sqlite3_recover_init db main test.db2]
   $R config lostandfound lost_and_found
-  $R step
+  $R run
   $R finish
 } -test {
   faultsim_test_result {0 {}} {1 {}}
diff --git a/ext/recover/recoverold.test b/ext/recover/recoverold.test
index 83f210aebc..691737bdc5 100644
--- a/ext/recover/recoverold.test
+++ b/ext/recover/recoverold.test
@@ -47,7 +47,7 @@ proc do_recover_test {tn {tsql {}} {res {}}} {
 
   set R [sqlite3_recover_init db main test.db2]
   $R config lostandfound lost_and_found
-  $R step
+  $R run
   $R finish
   
   sqlite3 db2 test.db2
@@ -65,7 +65,7 @@ proc do_recover_test {tn {tsql {}} {res {}}} {
   set ::sqlhook [list]
   set R [sqlite3_recover_init_sql db main my_sql_hook]
   $R config lostandfound lost_and_found
-  $R step
+  $R run
   $R finish
   
   sqlite3 db2 test.db2
@@ -81,6 +81,7 @@ proc do_recover_test {tn {tsql {}} {res {}}} {
 
 proc my_sql_hook {sql} {
   lappend ::sqlhook $sql
+  return 0
 }
 
 
@@ -154,6 +155,7 @@ do_recover_test 2.4.1 {
   2 2 3 {} 8 9 7
 }
 
+breakpoint
 do_execsql_test 2.5 {
   CREATE TABLE x1(a, b, c);
   WITH s(i) AS (
@@ -176,7 +178,7 @@ do_test 2.6 {
   set R [sqlite3_recover_init db main test.db2]
   $R config lostandfound lost_and_found
   $R config freelistcorrupt 1
-  $R step
+  $R run
   $R finish
   sqlite3 db2 test.db2
   execsql { SELECT count(*) FROM lost_and_found_1; } db2
diff --git a/ext/recover/recoverrowid.test b/ext/recover/recoverrowid.test
index 3dfafbcc7f..bd47422eaf 100644
--- a/ext/recover/recoverrowid.test
+++ b/ext/recover/recoverrowid.test
@@ -28,7 +28,7 @@ proc recover {db bRowids output} {
 
   set R [sqlite3_recover_init db main test.db2]
   $R config rowids $bRowids
-  $R step
+  $R run
   $R finish
 }
 
diff --git a/ext/recover/recoversql.test b/ext/recover/recoversql.test
new file mode 100644
index 0000000000..19f7ec7a1c
--- /dev/null
+++ b/ext/recover/recoversql.test
@@ -0,0 +1,60 @@
+# 2022 September 13
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+#
+#
+
+if {![info exists testdir]} {
+  set testdir [file join [file dirname [info script]] .. .. test]
+} 
+source [file join [file dirname [info script]] recover_common.tcl]
+source $testdir/tester.tcl
+set testprefix recoversql
+
+ifcapable !vtab {
+  finish_test; return
+}
+
+do_execsql_test 1.0 {
+  CREATE TABLE "x.1" (x, y);
+  INSERT INTO "x.1" VALUES(1, 1), (2, 2), (3, 3);
+  CREATE INDEX "i.1" ON "x.1"(y, x);
+}
+
+proc sql_hook {sql} {
+  incr ::iSqlHook
+  if {$::iSqlHook==$::sql_hook_cnt} { return 4 }
+  return 0
+}
+
+do_test 1.1 {
+  set ::sql_hook_cnt -1
+  set ::iSqlHook 0
+  set R [sqlite3_recover_init_sql db main sql_hook]
+  $R run
+  $R finish
+} {}
+
+set nSqlCall $iSqlHook
+
+for {set ii 1} {$ii<$nSqlCall} {incr ii} {
+  set iSqlHook 0
+  set sql_hook_cnt $ii
+  do_test 1.$ii.a {
+    set R [sqlite3_recover_init_sql db main sql_hook]
+    $R run
+  } {1}
+  do_test 1.$ii.b {
+    list [catch { $R finish } msg] $msg
+  } {1 {callback returned an error - 4}}
+}
+
+
+finish_test
diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index c1ff3b5439..206a6fad5b 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -406,6 +406,11 @@ static int recoverExec(sqlite3_recover *p, sqlite3 *db, const char *zSql){
   return p->errCode;
 }
 
+/*
+** Bind the value pVal to parameter iBind of statement pStmt. Leave an
+** error in the recover handle passed as the first argument if an error
+** (e.g. an OOM) occurs.
+*/
 static void recoverBindValue(
   sqlite3_recover *p, 
   sqlite3_stmt *pStmt, 
@@ -559,7 +564,7 @@ static void recoverGetPage(
     return;
   }else{
     if( p->pGetPage==0 ){
-      pStmt = recoverPreparePrintf(
+      pStmt = p->pGetPage = recoverPreparePrintf(
           p, p->dbIn, "SELECT data FROM sqlite_dbpage(%Q) WHERE pgno=?", p->zDb
       );
     }else{
@@ -567,11 +572,12 @@ static void recoverGetPage(
     }
 
     if( pStmt ){
+      int rc = SQLITE_OK;
       sqlite3_bind_int64(pStmt, 1, pgno);
       if( SQLITE_ROW==sqlite3_step(pStmt) ){
         sqlite3_result_value(pCtx, sqlite3_column_value(pStmt, 0));
       }
-        p->pGetPage = recoverReset(p, pStmt);
+      recoverReset(p, pStmt);
     }
   }
 
diff --git a/ext/recover/test_recover.c b/ext/recover/test_recover.c
index a7c5afd3aa..b273fbcd1d 100644
--- a/ext/recover/test_recover.c
+++ b/ext/recover/test_recover.c
@@ -42,8 +42,16 @@ static int xSqlCallback(void *pSqlArg, const char *zSql){
   if( res ){
     Tcl_BackgroundError(p->interp);
     return TCL_ERROR;
+  }else{
+    Tcl_Obj *pObj = Tcl_GetObjResult(p->interp);
+    if( Tcl_GetCharLength(pObj)==0 ){
+      res = 0;
+    }else if( Tcl_GetIntFromObj(p->interp, pObj, &res) ){
+      Tcl_BackgroundError(p->interp);
+      return TCL_ERROR;
+    }
   }
-  return SQLITE_OK;
+  return res;
 }
 
 static int getDbPointer(Tcl_Interp *interp, Tcl_Obj *pObj, sqlite3 **pDb){
@@ -60,7 +68,7 @@ static int getDbPointer(Tcl_Interp *interp, Tcl_Obj *pObj, sqlite3 **pDb){
 ** Implementation of the command created by [sqlite3_recover_init]:
 **
 **     $cmd config OP ARG
-**     $cmd step
+**     $cmd run
 **     $cmd errmsg
 **     $cmd errcode
 **     $cmd finalize
@@ -77,7 +85,7 @@ static int testRecoverCmd(
     const char *zMsg;
   } aSub[] = {
     { "config",    2, "REBASE-BLOB" }, /* 0 */
-    { "step",      0, ""            }, /* 1 */
+    { "run",      0, ""             }, /* 1 */
     { "errmsg",    0, ""            }, /* 2 */
     { "errcode",   0, ""            }, /* 3 */
     { "finish",  0, ""              }, /* 4 */
@@ -145,7 +153,7 @@ static int testRecoverCmd(
       Tcl_SetObjResult(interp, Tcl_NewIntObj(res));
       break;
     }
-    case 1:  assert( sqlite3_stricmp("step", aSub[iSub].zSub)==0 ); {
+    case 1:  assert( sqlite3_stricmp("run", aSub[iSub].zSub)==0 ); {
       int res = sqlite3_recover_run(pTest->p);
       Tcl_SetObjResult(interp, Tcl_NewIntObj(res));
       break;
diff --git a/manifest b/manifest
index f5b2895b91..3f6d9ab674 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\ssome\sproblems\swith\shandling\scorrupt\sdatabase\sin\sthe\srecovery\sextension.
-D 2022-09-12T20:02:33.923
+C Add\stests.\sDeal\sissues\ssurrounding\saborting\srecovery\sfrom\swithin\sthe\sSQL\scallback,\sand\savoiding\sthe\spending-byte\spage.
+D 2022-09-13T18:08:24.770
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -387,16 +387,17 @@ F ext/rbu/rbuvacuum4.test a78898e438a44803eb2bc897ba3323373c9f277418e2d6d76e90f2
 F ext/rbu/sqlite3rbu.c 8737cabdfbee84bb25a7851ecef8b1312be332761238da9be6ddb10c62ad4291
 F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9cd389812
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
-F ext/recover/recover1.test 942016356f9098ca36933536b194b5878827a3a749e0bf41a83d83530c0d0ea8
+F ext/recover/recover1.test d0fa2f945aac4754e0abb802941b9b80efd4828a775a090f9d2253f5a0ee1d0e
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
-F ext/recover/recoverclobber.test e6537ebf99f57bfff6cca59550b5f4278319b57a89865abb98d755a8fd561d84
-F ext/recover/recovercorrupt.test 115cdb67ac29b4e8ec786cee9190ced674f62388f126b20deea22fa5fd11b814
-F ext/recover/recoverfault.test db6b0ba5a993c38ec885867a12556fa7c5d73948b168b0b59e7d3053c0787f29
-F ext/recover/recoverold.test f368a6ae2db12b6017257b332a19ab5df527f4061e43f12f5c85d8e2b236f074
-F ext/recover/recoverrowid.test ec4436cd69e6cdacb48dd2963ff6dd9dbd5fe648376de5e7c0c2f4f6cbacb417
-F ext/recover/sqlite3recover.c 0154617e73430b594f3d8b94eb2847bd5dc3dc3cd6ff6f0511dc6db5d116621d
+F ext/recover/recoverclobber.test 294dcc894124ab4ca3a7b35766630742a3d25810fceac22220beb64f70a33a60
+F ext/recover/recovercorrupt.test e3f3cbe0162ba681518aac9ea0ae8119f32ac93fb0900b5f09b6318966108e54
+F ext/recover/recoverfault.test 862ab02bd503922281a5ee9f81a3a92312561bb7a39e2fdb06e6afd60c3a167e
+F ext/recover/recoverold.test 46e9d99b595fac583d4c67f74d7d89c20a435c752ef6eeb3e918b599940c88e0
+F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
+F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
+F ext/recover/sqlite3recover.c ed5ab827433823ebf3ad7ada192ecefdc8ef9327af68fd4db9ae463a11bbc476
 F ext/recover/sqlite3recover.h 81108efb8c4618d3d9c6da4df785212b0e4501aa0d25edfc463405fe839a6640
-F ext/recover/test_recover.c 8f5ef0c9b7523c41a393f65e44d727c23cda8f44d5180fff5b698ee068ba538d
+F ext/recover/test_recover.c 5941ecf484b6158be26e34c6f7b6c7f03967c72a63db0c08e7fd0fa43023eafa
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
 F ext/repair/checkfreelist.c e21f06995ff4efdc1622dcceaea4dcba2caa83ca2f31a1607b98a8509168a996
 F ext/repair/checkindex.c 4383e4469c21e5b9ae321d0d63cec53e981af9d7a6564be6374f0eeb93dfc890
@@ -546,7 +547,7 @@ F src/callback.c 4cd7225b26a97f7de5fee5ae10464bed5a78f2adefe19534cc2095b3a8ca484
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c 93e4b5f4faf6d3f688988a116773259a4fbfb4ddac0e9bf9d0ae0429390c2543
 F src/date.c 94ce83b4cd848a387680a5f920c9018c16655db778c4d36525af0a0f34679ac5
-F src/dbpage.c dc1e8e7ba880009986b2f2050213157d2328b6d8cd4df6cf0f48883734510558
+F src/dbpage.c 433f13b34f1e5a84cbb5f10214c12471c6f0197f276389634a1cc393ec821c3d
 F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
 F src/delete.c 86573edae75e3d3e9a8b590d87db8e47222103029df4f3e11fa56044459b514e
 F src/expr.c 24e828db6b2fab8aabfb5d2c0d83dbdfc5a1972b1147fa893350e317ab7e282f
@@ -2009,8 +2010,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 37fb093b95c6b7d7ad07a275697df73b69f9fb5c5549aea8544b26e38f24833f
-R 4bca180a2c79c76d0affba5c0d731d37
+P ed318be8241981ef96334ba13d3201a717cc812a59aed64e3dc67f7e7e71854b
+R 11a8fecaa81e021bbb20605615a33134
 U dan
-Z 8bfc7241f27e2d2e9de40f4a070a3e2c
+Z 28892e8b77cb290f00759179724671d9
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f7f9d304f7..9694fdd0c2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ed318be8241981ef96334ba13d3201a717cc812a59aed64e3dc67f7e7e71854b
\ No newline at end of file
+4e97dd31f5240d9231167ae172a5116426c42177a1ed3c5422b9d51b762d5a87
\ No newline at end of file
diff --git a/src/dbpage.c b/src/dbpage.c
index 7990199fcc..e13740d81d 100644
--- a/src/dbpage.c
+++ b/src/dbpage.c
@@ -274,12 +274,18 @@ static int dbpageColumn(
     }
     case 1: {           /* data */
       DbPage *pDbPage = 0;
-      rc = sqlite3PagerGet(pCsr->pPager, pCsr->pgno, (DbPage**)&pDbPage, 0);
-      if( rc==SQLITE_OK ){
-        sqlite3_result_blob(ctx, sqlite3PagerGetData(pDbPage), pCsr->szPage,
-                            SQLITE_TRANSIENT);
+      if( pCsr->pgno==((PENDING_BYTE/pCsr->szPage)+1) ){
+        /* The pending byte page. Assume it is zeroed out. Attempting to
+        ** request this page from the page is an SQLITE_CORRUPT error. */
+        sqlite3_result_zeroblob(ctx, pCsr->szPage);
+      }else{
+        rc = sqlite3PagerGet(pCsr->pPager, pCsr->pgno, (DbPage**)&pDbPage, 0);
+        if( rc==SQLITE_OK ){
+          sqlite3_result_blob(ctx, sqlite3PagerGetData(pDbPage), pCsr->szPage,
+              SQLITE_TRANSIENT);
+        }
+        sqlite3PagerUnref(pDbPage);
       }
-      sqlite3PagerUnref(pDbPage);
       break;
     }
     default: {          /* schema */

From 5b9150079606c31741572ef2aca5e39e8f7f9b56 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 13 Sep 2022 19:27:03 +0000
Subject: [PATCH 100/428] Add/apply various kvvfs-specific utility APIs to the
 JS layer to assist in testing and analysis. Correct a backwards default arg
 check for sqlite3ApiBootstrap(). Add exports for sqlite3_db_handle(),
 sqlite3_file_control(), and the SQLITE_FCNTL_xxx enum.

FossilOrigin-Name: 0d78961870ee9f22f1ba16d423377d28dcc36e04b1e31ffd57f3e2fd51f8f0f2
---
 ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api |   2 +
 ext/wasm/api/sqlite3-api-cleanup.js         |  27 ++-
 ext/wasm/api/sqlite3-api-glue.js            |   3 +-
 ext/wasm/api/sqlite3-api-oo1.js             |  68 +++----
 ext/wasm/api/sqlite3-api-prologue.js        | 185 ++++++++++++++++----
 ext/wasm/api/sqlite3-wasm.c                 |  48 ++++-
 ext/wasm/batch-runner.html                  |   4 +-
 ext/wasm/batch-runner.js                    |  51 ++++--
 ext/wasm/kvvfs1.html                        |   1 +
 ext/wasm/kvvfs1.js                          |  24 +--
 ext/wasm/testing1.js                        |  19 +-
 manifest                                    |  32 ++--
 manifest.uuid                               |   2 +-
 13 files changed, 340 insertions(+), 126 deletions(-)

diff --git a/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api b/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
index aead79e50d..f03478b17c 100644
--- a/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
+++ b/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
@@ -25,6 +25,7 @@ _sqlite3_compileoption_used
 _sqlite3_create_function_v2
 _sqlite3_data_count
 _sqlite3_db_filename
+_sqlite3_db_handle
 _sqlite3_db_name
 _sqlite3_errmsg
 _sqlite3_error_offset
@@ -33,6 +34,7 @@ _sqlite3_exec
 _sqlite3_expanded_sql
 _sqlite3_extended_errcode
 _sqlite3_extended_result_codes
+_sqlite3_file_control
 _sqlite3_finalize
 _sqlite3_initialize
 _sqlite3_interrupt
diff --git a/ext/wasm/api/sqlite3-api-cleanup.js b/ext/wasm/api/sqlite3-api-cleanup.js
index 1b57cdc5de..0e99edf508 100644
--- a/ext/wasm/api/sqlite3-api-cleanup.js
+++ b/ext/wasm/api/sqlite3-api-cleanup.js
@@ -20,11 +20,17 @@ if('undefined' !== typeof Module){ // presumably an Emscripten build
   /**
      Install a suitable default configuration for sqlite3ApiBootstrap().
   */
-  const SABC = self.sqlite3ApiBootstrap.defaultConfig;
-  SABC.Module = Module /* ==>  Currently needs to be exposed here for test code. NOT part
-                          of the public API. */;
-  SABC.exports = Module['asm'];
-  SABC.memory = Module.wasmMemory /* gets set if built with -sIMPORT_MEMORY */;
+  const SABC = self.sqlite3ApiConfig || Object.create(null);
+  if(undefined===SABC.Module){
+    SABC.Module = Module /* ==> Currently needs to be exposed here for
+                            test code. NOT part of the public API. */;
+  }
+  if(undefined===SABC.exports){
+    SABC.exports = Module['asm'];
+  }
+  if(undefined===SABC.memory){
+    SABC.memory = Module.wasmMemory /* gets set if built with -sIMPORT_MEMORY */;
+  }
 
   /**
      For current (2022-08-22) purposes, automatically call
@@ -35,8 +41,15 @@ if('undefined' !== typeof Module){ // presumably an Emscripten build
      configuration used by a no-args call to sqlite3ApiBootstrap().
   */
   //console.warn("self.sqlite3ApiConfig = ",self.sqlite3ApiConfig);
-  const sqlite3 = self.sqlite3ApiBootstrap();
-  delete self.sqlite3ApiBootstrap;
+  const rmApiConfig = (SABC !== self.sqlite3ApiConfig);
+  self.sqlite3ApiConfig = SABC;
+  let sqlite3;
+  try{
+    sqlite3 = self.sqlite3ApiBootstrap();
+  }finally{
+    delete self.sqlite3ApiBootstrap;
+    if(rmApiConfig) delete self.sqlite3ApiConfig;
+  }
 
   if(self.location && +self.location.port > 1024){
     console.warn("Installing sqlite3 bits as global S for local dev/test purposes.");
diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index 3a9e8803cb..67f9403548 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -55,6 +55,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     */
     const aPtr = wasm.xWrap.argAdapter('*');
     wasm.xWrap.argAdapter('sqlite3*', aPtr)('sqlite3_stmt*', aPtr);
+    wasm.xWrap.resultAdapter('sqlite3*', aPtr)('sqlite3_stmt*', aPtr);
 
     /**
        Populate api object with sqlite3_...() by binding the "raw" wasm
@@ -174,7 +175,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     wasm.ctype = JSON.parse(wasm.cstringToJs(cJson));
     //console.debug('wasm.ctype length =',wasm.cstrlen(cJson));
     for(const t of ['access', 'blobFinalizers', 'dataTypes',
-                    'encodings', 'flock', 'ioCap',
+                    'encodings', 'fcntl', 'flock', 'ioCap',
                     'openFlags', 'prepareFlags', 'resultCodes',
                     'syncFlags', 'udfFlags', 'version'
                    ]){
diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index 3dfe5bfb05..8280204d62 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -496,6 +496,13 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        the statement actually produces any result rows.
        ==================================================================
 
+       - `.columnNames`: if this is an array, the column names of the
+       result set are stored in this array before the callback (if
+       any) is triggered (regardless of whether the query produces any
+       result rows). If no statement has result columns, this value is
+       unchanged. Achtung: an SQL result may have multiple columns
+       with identical names.
+
        - `.callback` = a function which gets called for each row of
        the result set, but only if that statement has any result
        _rows_. The callback's "this" is the options object. The second
@@ -523,8 +530,8 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        as the first argument to the callback:
 
          A.1) `'array'` (the default) causes the results of
-         `stmt.get([])` to be passed to passed on and/or appended to
-         `resultRows`.
+         `stmt.get([])` to be passed to the `callback` and/or appended
+         to `resultRows`.
 
          A.2) `'object'` causes the results of
          `stmt.get(Object.create(null))` to be passed to the
@@ -536,7 +543,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
          A.3) `'stmt'` causes the current Stmt to be passed to the
          callback, but this mode will trigger an exception if
          `resultRows` is an array because appending the statement to
-         the array would be unhelpful.
+         the array would be downright unhelpful.
 
        B) An integer, indicating a zero-based column in the result
        row. Only that one single value will be passed on.
@@ -545,10 +552,14 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        ':', '$', or '@' will fetch the row as an object, extract that
        one field, and pass that field's value to the callback. Note
        that these keys are case-sensitive so must match the case used
-       in the SQL. e.g. `"select a A from t"` with a `rowMode` of '$A'
-       would work but '$a' would not. A reference to a column not in
-       the result set will trigger an exception on the first row (as
-       the check is not performed until rows are fetched).
+       in the SQL. e.g. `"select a A from t"` with a `rowMode` of
+       `'$A'` would work but `'$a'` would not. A reference to a column
+       not in the result set will trigger an exception on the first
+       row (as the check is not performed until rows are fetched).
+       Note also that `$` is a legal identifier character in JS so
+       need not be quoted. (Design note: those 3 characters were
+       chosen because they are the characters support for naming bound
+       parameters.)
 
        Any other `rowMode` value triggers an exception.
 
@@ -560,12 +571,17 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        and can be used over a WebWorker-style message interface.
        exec() throws if `resultRows` is set and `rowMode` is 'stmt'.
 
-       - `.columnNames`: if this is an array, the column names of the
-       result set are stored in this array before the callback (if
-       any) is triggered (regardless of whether the query produces any
-       result rows). If no statement has result columns, this value is
-       unchanged. Achtung: an SQL result may have multiple columns
-       with identical names.
+
+       Potential TODOs:
+
+       - `.bind`: permit an array of arrays/objects to bind. The first
+       sub-array would act on the first statement which has bindable
+       parameters (as it does now). The 2nd would act on the next such
+       statement, etc.
+
+       - `.callback` and `.resultRows`: permit an array entries with
+       semantics similar to those described for `.bind` above.
+
     */
     exec: function(/*(sql [,obj]) || (obj)*/){
       affirmDbOpen(this);
@@ -1580,31 +1596,5 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     Stmt
   }/*oo1 object*/;
 
-  if( self.window===self && 0!==capi.sqlite3_vfs_find('kvvfs') ){
-    /* Features specific to kvvfs... */
-    /**
-       Clears all storage used by the kvvfs DB backend, deleting any
-       DB(s) stored there. Its argument must be either 'session',
-       'local', or ''. In the first two cases, only sessionStorage
-       resp. localStorage is cleared. If it's an empty string (the
-       default) then both are cleared. Only storage keys which match
-       the pattern used by kvvfs are cleared: any other client-side
-       data are retained.
-    */
-    DB.clearKvvfsStorage = function(which=''){
-      const prefix = 'kvvfs-'+which;
-      const stores = [];
-      if('session'===which || ''===which) stores.push(sessionStorage);
-      if('local'===which || ''===which) stores.push(localStorage);
-      stores.forEach(function(s){
-        const toRm = [];
-        let i = 0, k;
-        for( i = 0; (k = s.key(i)); ++i ){
-          if(k.startsWith(prefix)) toRm.push(k);
-        }
-        toRm.forEach((kk)=>s.removeItem(kk));
-      });
-    };
-  }/* main-window-only bits */
 });
 
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 17dcd42289..1c22e9ea21 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -43,10 +43,7 @@
 
   - Insofar as possible, support client-side storage using JS
     filesystem APIs. As of this writing, such things are still very
-    much TODO. Initial testing with using IndexedDB as backing storage
-    showed it to work reasonably well, but it's also too easy to
-    corrupt by using a web page in two browser tabs because IndexedDB
-    lacks the locking features needed to support that.
+    much under development.
 
   Specific non-goals of this project:
 
@@ -54,8 +51,10 @@
     Encodings in that realm, there are no currently plans to support
     the UTF16-related sqlite3 APIs. They would add a complication to
     the bindings for no appreciable benefit. Though web-related
-    implementation details take priority, the lower-level WASM module
-    "should" work in non-web WASM environments.
+    implementation details take priority, and the JavaScript
+    components of the API specifically focus on browser clients, the
+    lower-level WASM module "should" work in non-web WASM
+    environments.
 
   - Supporting old or niche-market platforms. WASM is built for a
     modern web and requires modern platforms.
@@ -78,17 +77,18 @@
 */
 
 /**
-   sqlite3ApiBootstrap() is the only global symbol exposed by this
-   API. It is intended to be called one time at the end of the API
-   amalgamation process, passed configuration details for the current
-   environment, and then optionally be removed from the global object
-   using `delete self.sqlite3ApiBootstrap`.
+   sqlite3ApiBootstrap() is the only global symbol persistently
+   exposed by this API. It is intended to be called one time at the
+   end of the API amalgamation process, passed configuration details
+   for the current environment, and then optionally be removed from
+   the global object using `delete self.sqlite3ApiBootstrap`.
 
    This function expects a configuration object, intended to abstract
    away details specific to any given WASM environment, primarily so
    that it can be used without any _direct_ dependency on
-   Emscripten. The config object is only honored the first time this
-   is called. Subsequent calls ignore the argument and return the same
+   Emscripten. (Note the default values for the config object!) The
+   config object is only honored the first time this is
+   called. Subsequent calls ignore the argument and return the same
    (configured) object which gets initialized by the first call.
 
    The config object properties include:
@@ -133,7 +133,7 @@
 */
 'use strict';
 self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
-  apiConfig = (sqlite3ApiBootstrap.defaultConfig || self.sqlite3ApiConfig)
+  apiConfig = (self.sqlite3ApiConfig || sqlite3ApiBootstrap.defaultConfig)
 ){
   if(sqlite3ApiBootstrap.sqlite3){ /* already initalized */
     console.warn("sqlite3ApiBootstrap() called multiple times.",
@@ -567,18 +567,22 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     ) ? !!capi.sqlite3_compileoption_used(optName) : false;
   }/*compileOptionUsed()*/;
 
-  capi.wasm.bindingSignatures = [
-    /**
-       Signatures for the WASM-exported C-side functions. Each entry
-       is an array with 2+ elements:
+  /**
+     Signatures for the WASM-exported C-side functions. Each entry
+     is an array with 2+ elements:
 
-       ["c-side name",
-        "result type" (capi.wasm.xWrap() syntax),
-         [arg types in xWrap() syntax]
-         // ^^^ this needn't strictly be an array: it can be subsequent
-         // elements instead: [x,y,z] is equivalent to x,y,z
-       ]
-    */
+     [ "c-side name",
+       "result type" (capi.wasm.xWrap() syntax),
+       [arg types in xWrap() syntax]
+       // ^^^ this needn't strictly be an array: it can be subsequent
+       // elements instead: [x,y,z] is equivalent to x,y,z
+     ]
+
+     Note that support for the API-specific data types in the
+     result/argument type strings gets plugged in at a later phase in
+     the API initialization process.
+  */
+  capi.wasm.bindingSignatures = [
     // Please keep these sorted by function name!
     ["sqlite3_bind_blob","int", "sqlite3_stmt*", "int", "*", "int", "*"],
     ["sqlite3_bind_double","int", "sqlite3_stmt*", "int", "f64"],
@@ -604,6 +608,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
      "sqlite3*", "string", "int", "int", "*", "*", "*", "*", "*"],
     ["sqlite3_data_count", "int", "sqlite3_stmt*"],
     ["sqlite3_db_filename", "string", "sqlite3*", "string"],
+    ["sqlite3_db_handle", "sqlite3*", "sqlite3_stmt*"],
     ["sqlite3_db_name", "string", "sqlite3*", "int"],
     ["sqlite3_errmsg", "string", "sqlite3*"],
     ["sqlite3_error_offset", "int", "sqlite3*"],
@@ -614,6 +619,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     ["sqlite3_expanded_sql", "string", "sqlite3_stmt*"],
     ["sqlite3_extended_errcode", "int", "sqlite3*"],
     ["sqlite3_extended_result_codes", "int", "sqlite3*", "int"],
+    ["sqlite3_file_control", "int", "sqlite3*", "string", "int", "*"],
     ["sqlite3_finalize", "int", "sqlite3_stmt*"],
     ["sqlite3_initialize", undefined],
     ["sqlite3_interrupt", undefined, "sqlite3*"
@@ -740,20 +746,132 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
 
   /**
      Returns true if sqlite3.capi.sqlite3_web_persistent_dir() is a
-     non-empty string and the given name has that string as its
-     prefix, else returns false.
+     non-empty string and the given name starts with (that string +
+     '/'), else returns false.
+
+     Potential (but arguable) TODO: return true if the name is one of
+     (":localStorage:", "local", ":sessionStorage:", "session") and
+     kvvfs is available.
   */
   capi.sqlite3_web_filename_is_persistent = function(name){
     const p = capi.sqlite3_web_persistent_dir();
-    return (p && name) ? name.startsWith(p) : false;
+    return (p && name) ? name.startsWith(p+'/') : false;
   };
-  
+
   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();
   }
 
+  if( self.window===self ){
+    /* Features specific to the main window thread... */
+
+    /**
+       Internal helper for sqlite3_web_kvvfs_clear() and friends.
+       Its argument should be one of ('local','session','').
+    */
+    const __kvvfsInfo = function(which){
+      const rc = Object.create(null);
+      rc.prefix = 'kvvfs-'+which;
+      rc.stores = [];
+      if('session'===which || ''===which) rc.stores.push(self.sessionStorage);
+      if('local'===which || ''===which) rc.stores.push(self.localStorage);
+      return rc;
+    };
+
+    /**
+       Clears all storage used by the kvvfs DB backend, deleting any
+       DB(s) stored there. Its argument must be either 'session',
+       'local', or ''. In the first two cases, only sessionStorage
+       resp. localStorage is cleared. If it's an empty string (the
+       default) then both are cleared. Only storage keys which match
+       the pattern used by kvvfs are cleared: any other client-side
+       data are retained.
+
+       This function is only available in the main window thread.
+
+       Returns the number of entries cleared.
+    */
+    capi.sqlite3_web_kvvfs_clear = function(which=''){
+      let rc = 0;
+      const kvinfo = __kvvfsInfo(which);
+      kvinfo.stores.forEach((s)=>{
+        const toRm = [] /* keys to remove */;
+        let i;
+        for( i = 0; i < s.length; ++i ){
+          const k = s.key(i);
+          if(k.startsWith(kvinfo.prefix)) toRm.push(k);
+        }
+        toRm.forEach((kk)=>s.removeItem(kk));
+        rc += toRm.length;
+      });
+      return rc;
+    };
+
+    /**
+       This routine guesses the approximate amount of
+       window.localStorage and/or window.sessionStorage in use by the
+       kvvfs database backend.  Its argument must be one of
+       ('session', 'local', ''). In the first two cases, only
+       sessionStorage resp. localStorage is counted. If it's an empty
+       string (the default) then both are counted. Only storage keys
+       which match the pattern used by kvvfs are counted. The returned
+       value is the "length" value of every matching key and value,
+       noting that the kvvf uses only ASCII keys and values.
+
+       Note that the returned size is not authoritative from the
+       perspective of how much data can fit into localStorage and
+       sessionStorage, as the precise algorithms for determining
+       those limits are unspecified and may include per-entry
+       overhead invisible to clients.
+    */
+    capi.sqlite3_web_kvvfs_size = function(which=''){
+      let sz = 0;
+      const kvinfo = __kvvfsInfo(which);
+      kvinfo.stores.forEach((s)=>{
+        let i;
+        for(i = 0; i < s.length; ++i){
+          const k = s.key(i);
+          if(k.startsWith(kvinfo.prefix)){
+            sz += k.length;
+            sz += s.getItem(k).length;
+          }
+        }
+      });
+      return sz;
+    };
+
+    /**
+       Given an `sqlite3*`, returns a truthy value (see below) if that
+       db handle uses the "kvvfs" VFS, else returns false. If pDb is
+       NULL then this function returns true if the default VFS is
+       "kvvfs". Results are undefined if pDb is truthy but refers to
+       an invalid pointer.
+
+       The truthy value it returns is a pointer to the kvvfs
+       `sqlite3_vfs` object.
+    */
+    capi.sqlite3_web_db_is_kvvfs = function(pDb){
+      const pK = capi.sqlite3_vfs_find("kvvfs");
+      if(!pK) return false;
+      else if(!pDb){
+        return capi.sqlite3_vfs_find(0) && pK;
+      }
+      const scope = capi.wasm.scopedAllocPush();
+      try{
+        const ppVfs = capi.wasm.scopedAllocPtr();
+        return (
+          (0===capi.sqlite3_file_control(
+            pDb, "main", capi.SQLITE_FCNTL_VFS_POINTER, ppVfs
+          )) && (capi.wasm.getPtrValue(ppVfs) === pK)
+        ) ? pK : false;
+      }finally{
+        capi.wasm.scopedAllocPop(scope);
+      }
+    };
+  }/* main-window-only bits */
+
   /* The remainder of the API will be set up in later steps. */
   const sqlite3 = {
     WasmAllocError: WasmAllocError,
@@ -790,6 +908,11 @@ self.sqlite3ApiBootstrap.initializers = [];
    global-scope symbol.
 */
 self.sqlite3ApiBootstrap.defaultConfig = Object.create(null);
-/** Placeholder: gets installed by the first call to
-    self.sqlite3ApiBootstrap(). */
+/**
+   Placeholder: gets installed by the first call to
+   self.sqlite3ApiBootstrap(). However, it is recommended that the
+   caller of sqlite3ApiBootstrap() capture its return value and delete
+   self.sqlite3ApiBootstrap after calling it. It returns the same
+   value which will be stored here.
+*/
 self.sqlite3ApiBootstrap.sqlite3 = undefined;
diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index 2a505f19ab..c072e8c9d4 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -76,7 +76,7 @@ int sqlite3_wasm_db_error(sqlite3*db, int err_code, const char *zMsg){
 */
 WASM_KEEP
 const char * sqlite3_wasm_enum_json(void){
-  static char strBuf[1024 * 8] = {0} /* where the JSON goes */;
+  static char strBuf[1024 * 12] = {0} /* where the JSON goes */;
   int n = 0, childCount = 0, structCount = 0
     /* output counters for figuring out where commas go */;
   char * pos = &strBuf[1] /* skip first byte for now to help protect
@@ -259,7 +259,8 @@ const char * sqlite3_wasm_enum_json(void){
   } _DefGroup;
 
   DefGroup(openFlags) {
-    /* Noting that not all of these will have any effect in WASM-space. */
+    /* Noting that not all of these will have any effect in
+    ** WASM-space. */
     DefInt(SQLITE_OPEN_READONLY);
     DefInt(SQLITE_OPEN_READWRITE);
     DefInt(SQLITE_OPEN_CREATE);
@@ -322,6 +323,49 @@ const char * sqlite3_wasm_enum_json(void){
     DefInt(SQLITE_IOCAP_BATCH_ATOMIC);
   } _DefGroup;
 
+  DefGroup(fcntl) {
+    DefInt(SQLITE_FCNTL_LOCKSTATE);
+    DefInt(SQLITE_FCNTL_GET_LOCKPROXYFILE);
+    DefInt(SQLITE_FCNTL_SET_LOCKPROXYFILE);
+    DefInt(SQLITE_FCNTL_LAST_ERRNO);
+    DefInt(SQLITE_FCNTL_SIZE_HINT);
+    DefInt(SQLITE_FCNTL_CHUNK_SIZE);
+    DefInt(SQLITE_FCNTL_FILE_POINTER);
+    DefInt(SQLITE_FCNTL_SYNC_OMITTED);
+    DefInt(SQLITE_FCNTL_WIN32_AV_RETRY);
+    DefInt(SQLITE_FCNTL_PERSIST_WAL);
+    DefInt(SQLITE_FCNTL_OVERWRITE);
+    DefInt(SQLITE_FCNTL_VFSNAME);
+    DefInt(SQLITE_FCNTL_POWERSAFE_OVERWRITE);
+    DefInt(SQLITE_FCNTL_PRAGMA);
+    DefInt(SQLITE_FCNTL_BUSYHANDLER);
+    DefInt(SQLITE_FCNTL_TEMPFILENAME);
+    DefInt(SQLITE_FCNTL_MMAP_SIZE);
+    DefInt(SQLITE_FCNTL_TRACE);
+    DefInt(SQLITE_FCNTL_HAS_MOVED);
+    DefInt(SQLITE_FCNTL_SYNC);
+    DefInt(SQLITE_FCNTL_COMMIT_PHASETWO);
+    DefInt(SQLITE_FCNTL_WIN32_SET_HANDLE);
+    DefInt(SQLITE_FCNTL_WAL_BLOCK);
+    DefInt(SQLITE_FCNTL_ZIPVFS);
+    DefInt(SQLITE_FCNTL_RBU);
+    DefInt(SQLITE_FCNTL_VFS_POINTER);
+    DefInt(SQLITE_FCNTL_JOURNAL_POINTER);
+    DefInt(SQLITE_FCNTL_WIN32_GET_HANDLE);
+    DefInt(SQLITE_FCNTL_PDB);
+    DefInt(SQLITE_FCNTL_BEGIN_ATOMIC_WRITE);
+    DefInt(SQLITE_FCNTL_COMMIT_ATOMIC_WRITE);
+    DefInt(SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE);
+    DefInt(SQLITE_FCNTL_LOCK_TIMEOUT);
+    DefInt(SQLITE_FCNTL_DATA_VERSION);
+    DefInt(SQLITE_FCNTL_SIZE_LIMIT);
+    DefInt(SQLITE_FCNTL_CKPT_DONE);
+    DefInt(SQLITE_FCNTL_RESERVE_BYTES);
+    DefInt(SQLITE_FCNTL_CKPT_START);
+    DefInt(SQLITE_FCNTL_EXTERNAL_READER);
+    DefInt(SQLITE_FCNTL_CKSM_FILE);
+  } _DefGroup;
+
   DefGroup(access){
     DefInt(SQLITE_ACCESS_EXISTS);
     DefInt(SQLITE_ACCESS_READWRITE);
diff --git a/ext/wasm/batch-runner.html b/ext/wasm/batch-runner.html
index 38f38070c0..2a6c1405cf 100644
--- a/ext/wasm/batch-runner.html
+++ b/ext/wasm/batch-runner.html
@@ -55,7 +55,9 @@
     <hr>
     <div id='reverse-log-notice' class='hidden'>(Log output is in reverse order, newest first!)</div>
     <div id='test-output'></div>
-    
+    <!-- batch-runner.js "should" work with sqlite3-kvvfs so long as
+         its data sets don't violate the the storage limits. -->
+    <!--script src="sqlite3-kvvfs.js"></script-->
     <script src="sqlite3.js"></script>
     <script src="common/SqliteTestUtil.js"></script>
     <script src="batch-runner.js"></script>
diff --git a/ext/wasm/batch-runner.js b/ext/wasm/batch-runner.js
index 437424b48f..9964d747c7 100644
--- a/ext/wasm/batch-runner.js
+++ b/ext/wasm/batch-runner.js
@@ -17,6 +17,7 @@
 (function(){
   const toss = function(...args){throw new Error(args.join(' '))};
   const warn = console.warn.bind(console);
+  let sqlite3;
 
   const App = {
     e: {
@@ -30,6 +31,7 @@
       btnReset: document.querySelector('#db-reset'),
       cbReverseLog: document.querySelector('#cb-reverse-log-order')
     },
+    db: Object.create(null),
     cache:{},
     metrics:{
       /**
@@ -61,15 +63,16 @@
     },
 
     openDb: function(fn, unlinkFirst=true){
-      if(this.db && this.db.ptr){
+      if(this.db.ptr){
         toss("Already have an opened db.");
       }
       const capi = this.sqlite3.capi, wasm = capi.wasm;
       const stack = wasm.scopedAllocPush();
       let pDb = 0;
       try{
-        if(unlinkFirst && fn && ':memory:'!==fn){
-          capi.wasm.sqlite3_wasm_vfs_unlink(fn);
+        if(unlinkFirst && fn){
+          if(':'!==fn[0]) capi.wasm.sqlite3_wasm_vfs_unlink(fn);
+          this.clearStorage();
         }
         const oFlags = capi.SQLITE_OPEN_CREATE | capi.SQLITE_OPEN_READWRITE;
         const ppDb = wasm.scopedAllocPtr();
@@ -82,7 +85,6 @@
       }finally{
         wasm.scopedAllocPop(stack);
       }
-      this.db = Object.create(null);
       this.db.filename = fn;
       this.db.ptr = pDb;
       this.logHtml("Opened db:",fn);
@@ -90,10 +92,13 @@
     },
 
     closeDb: function(unlink=false){
-      if(this.db && this.db.ptr){
+      if(this.db.ptr){
         this.sqlite3.capi.sqlite3_close_v2(this.db.ptr);
         this.logHtml("Closed db",this.db.filename);
-        if(unlink) capi.wasm.sqlite3_wasm_vfs_unlink(this.db.filename);
+        if(unlink){
+          capi.wasm.sqlite3_wasm_vfs_unlink(this.db.filename);
+          this.clearStorage();
+        }
         this.db.ptr = this.db.filename = undefined;
       }
     },
@@ -329,6 +334,21 @@
       return p.catch((e)=>this.logErr("Error via evalFile("+fn+"):",e.message));
     }/*evalFile()*/,
 
+    clearStorage: function(){
+      const sz = sqlite3.capi.sqlite3_web_kvvfs_size();
+      const n = sqlite3.capi.sqlite3_web_kvvfs_clear(this.db.filename || '');
+      this.logHtml("Cleared kvvfs local/sessionStorage:",
+                   n,"entries totaling approximately",sz,"bytes.");
+    },
+
+    resetDb: function(){
+      if(this.db.ptr){
+        const fn = this.db.filename;
+        this.closeDb(true);
+        this.openDb(fn,false);
+      }
+    },
+
     run: function(sqlite3){
       delete this.run;
       this.sqlite3 = sqlite3;
@@ -336,9 +356,14 @@
       this.logHtml("Loaded module:",capi.sqlite3_libversion(), capi.sqlite3_sourceid());
       this.logHtml("WASM heap size =",wasm.heap8().length);
       this.loadSqlList();
-      const pDir = capi.sqlite3_web_persistent_dir();
-      const dbFile = pDir ? pDir+"/speedtest.db" : ":memory:";
-      if(!pDir){
+      const pDir = 1 ? '' : capi.sqlite3_web_persistent_dir();
+      const dbFile = pDir ? pDir+"/speedtest.db" : (
+        sqlite3.capi.sqlite3_vfs_find('kvvfs') ? 'local' : ':memory:'
+      );
+      this.clearStorage();
+      if(pDir){
+        logHtml("Using persistent storage:",dbFile);
+      }else{
         document.querySelector('#warn-opfs').remove();
       }
       this.openDb(dbFile, !!pDir);
@@ -368,11 +393,7 @@
         who.evalFile(who.e.selSql.value);
       }, false);
       this.e.btnReset.addEventListener('click', function(){
-        const fn = who.db.filename;
-        if(fn){
-          who.closeDb(true);
-          who.openDb(fn,true);
-        }
+        who.resetDb();
       }, false);
       this.e.btnExportMetrics.addEventListener('click', function(){
         who.logHtml2('warning',"Triggering download of metrics CSV. Check your downloads folder.");
@@ -394,12 +415,14 @@
         }
         const timeTotal = performance.now() - timeStart;
         who.logHtml("Run-remaining time:",timeTotal,"ms ("+(timeTotal/1000/60)+" minute(s))");
+        who.clearStorage();
       }, false);
     }/*run()*/
   }/*App*/;
 
   self.sqlite3TestModule.initSqlite3().then(function(theEmccModule){
     self._MODULE = theEmccModule /* this is only to facilitate testing from the console */;
+    sqlite3 = theEmccModule.sqlite3;
     App.run(theEmccModule.sqlite3);
   });
 })();
diff --git a/ext/wasm/kvvfs1.html b/ext/wasm/kvvfs1.html
index 1a5eb62cf1..5d9f077958 100644
--- a/ext/wasm/kvvfs1.html
+++ b/ext/wasm/kvvfs1.html
@@ -31,6 +31,7 @@
         <button id='btn-clear-storage'>Clear storage</button>
         <button id='btn-init-db'>(Re)init db</button>
         <button id='btn-select1'>Select db rows</button>
+        <button id='btn-storage-size'>Approx. storage size</button>
       </div>
     </fieldset>
     <div id='test-output'></div>
diff --git a/ext/wasm/kvvfs1.js b/ext/wasm/kvvfs1.js
index c29426fc63..fd57051a26 100644
--- a/ext/wasm/kvvfs1.js
+++ b/ext/wasm/kvvfs1.js
@@ -48,35 +48,35 @@
           wasm = capi.wasm;
     log("Loaded module:",capi.sqlite3_libversion(), capi.sqlite3_sourceid());
     T.assert( 0 !== capi.sqlite3_vfs_find(null) );
-    if(!oo.DB.clearKvvfsStorage){
+    if(!capi.sqlite3_vfs_find('kvvfs')){
       warn("This build is not kvvfs-capable.");
       return;
     }
     
-    const dbStorage = 1 ? ':sessionStorage:' : ':localStorage:';
-    const theStore = 's'===dbStorage[1] ? sessionStorage : localStorage;
+    const dbStorage = 1 ? 'session' : 'local';
+    const theStore = 's'===dbStorage[0] ? sessionStorage : localStorage;
     /**
        The names ':sessionStorage:' and ':localStorage:' are handled
        via the DB class constructor, not the C level. In the C API,
        the names "local" and "session" are the current (2022-09-12)
        names for those keys, but that is subject to change.
     */
-    const db = new oo.DB( dbStorage );
+    const db = new oo.DB( dbStorage, 'c', 'kvvfs' );
 
     document.querySelector('#btn-clear-storage').addEventListener('click',function(){
-      oo.DB.clearKvvfsStorage();
-      log("kvvfs localStorage and sessionStorage cleared.");
+      const sz = capi.sqlite3_web_kvvfs_clear();
+      log("kvvfs localStorage and sessionStorage cleared:",sz,"entries.");
     });
     document.querySelector('#btn-clear-log').addEventListener('click',function(){
       eOutput.innerText = '';
     });
     document.querySelector('#btn-init-db').addEventListener('click',function(){
-      const saveSql = [];
       try{
+        const saveSql = [];
         db.exec({
-          sql:["drop table if exists t;",
-               "create table if not exists t(a);",
-               "insert into t(a) values(?),(?),(?)"],
+          sql: ["drop table if exists t;",
+                "create table if not exists t(a);",
+                "insert into t(a) values(?),(?),(?)"],
           bind: [performance.now() >> 0,
                  (performance.now() * 2) >> 0,
                  (performance.now() / 2) >> 0],
@@ -101,6 +101,10 @@
         error(e.message);
       }
     });
+    document.querySelector('#btn-storage-size').addEventListener('click',function(){
+      log("sqlite3_web_kvvfs_size(",dbStorage,") says", capi.sqlite3_web_kvvfs_size(dbStorage),
+         "bytes");
+    });
     log("Storage backend:",db.filename /* note that the name was internally translated */);
     if(0===db.selectValue('select count(*) from sqlite_master')){
       log("DB is empty. Use the init button to populate it.");
diff --git a/ext/wasm/testing1.js b/ext/wasm/testing1.js
index 2aadc30c3a..e45b52bfa0 100644
--- a/ext/wasm/testing1.js
+++ b/ext/wasm/testing1.js
@@ -33,6 +33,8 @@
     return v1>=(v2-factor) && v1<=(v2+factor);
   };
 
+  let sqlite3;
+  
   const testBasicSanity = function(db,sqlite3){
     const capi = sqlite3.capi;
     log("Basic sanity tests...");
@@ -1005,10 +1007,17 @@
     }
   }/*testWasmUtil()*/;
 
+  const clearKvvfs = function(){
+    const sz = sqlite3.capi.sqlite3_web_kvvfs_size();
+    const n = sqlite3.capi.sqlite3_web_kvvfs_clear('');
+    log("Cleared kvvfs local/sessionStorage:",
+        n,"entries totaling approximately",sz,"bytes.");
+  };
+
   const runTests = function(Module){
     //log("Module",Module);
-    const sqlite3 = Module.sqlite3,
-          capi = sqlite3.capi,
+    sqlite3 = Module.sqlite3;
+    const capi = sqlite3.capi,
           oo = sqlite3.oo1,
           wasm = capi.wasm;
     log("Loaded module:",capi.sqlite3_libversion(), capi.sqlite3_sourceid());
@@ -1048,14 +1057,15 @@
 
     let dbName = "/testing1.sqlite3";
     let vfsName = undefined;
-    if(oo.DB.clearKvvfsStorage){
+    if(capi.sqlite3_web_db_is_kvvfs()){
       dbName = "local";
       vfsName = 'kvvfs';
       logHtml("Found kvvfs. Clearing db(s) from sessionStorage and localStorage",
               "and selecting kvvfs-friendly db name:",dbName);
-      oo.DB.clearKvvfsStorage();
+      clearKvvfs();
     }
     const db = new oo.DB(dbName,'c',vfsName), startTime = performance.now();
+    log("capi.sqlite3_web_db_is_kvvfs() ==",capi.sqlite3_web_db_is_kvvfs(db.pointer));
     try {
       log("db.filename =",db.filename,"db.fileName() =",db.fileName());
       const banner1 = '>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>',
@@ -1072,6 +1082,7 @@
       });
     }finally{
       db.close();
+      if('kvvfs'===vfsName) clearKvvfs();
     }
     logHtml("Total Test count:",T.counter,"in",(performance.now() - startTime),"ms");
     log('capi.wasm.exports',capi.wasm.exports);
diff --git a/manifest b/manifest
index b104be806b..6fa5a9fc8a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Get\stesting1.js\sworking\swith\sa\skvvfs\sbuild.
-D 2022-09-12T22:27:00.037
+C Add/apply\svarious\skvvfs-specific\sutility\sAPIs\sto\sthe\sJS\slayer\sto\sassist\sin\stesting\sand\sanalysis.\sCorrect\sa\sbackwards\sdefault\sarg\scheck\sfor\ssqlite3ApiBootstrap().\sAdd\sexports\sfor\ssqlite3_db_handle(),\ssqlite3_file_control(),\sand\sthe\sSQLITE_FCNTL_xxx\senum.
+D 2022-09-13T19:27:03.599
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -476,21 +476,21 @@ F ext/wasm/EXPORTED_FUNCTIONS.fiddle db7a4602f043cf4a5e4135be3609a487f9f1c83f057
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
 F ext/wasm/GNUmakefile b175a00599c976fe9e7bc02bbc1337b5e3b81d042320c3a0be1621d2c7a21b21
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
-F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 1dfd067b3cbd9a49cb204097367cf2f8fe71b5a3b245d9d82a24779fd4ac2394
+F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 150a793a47205b8009ac934f3b6d6ebf67b965c072339aaa25ce808a19e116cc
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
 F ext/wasm/api/README.md d876597edd2b9542b6ea031adaaff1c042076fde7b670b1dc6d8a87b28a6631b
 F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba81456260a713ed04900c
 F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a4a06cb776c003880b
-F ext/wasm/api/sqlite3-api-cleanup.js 101919ec261644e2f6f0a59952fd9612127b69ea99b493277b2789ea478f9b6b
-F ext/wasm/api/sqlite3-api-glue.js 2bf536a38cde324cf352bc2c575f8e22c6d204d667c0eda5a254ba45318914bc
-F ext/wasm/api/sqlite3-api-oo1.js b498662748918c132aa59433ea2bd2ebb7e026549fd68506a1ae1ea94736f4f6
+F ext/wasm/api/sqlite3-api-cleanup.js 8564a6077cdcaea9a9f428a019af8a05887f0131e6a2a1e72a7ff1145fadfe77
+F ext/wasm/api/sqlite3-api-glue.js 366d580c8e5bf7fcf4c6dee6f646c31f5549bd417ea03a59a0acca00e8ecce30
+F ext/wasm/api/sqlite3-api-oo1.js 4925f4736eb28fd3a6d4dbbd2c078c38be651aa5996041e7f0b81be36506608e
 F ext/wasm/api/sqlite3-api-opfs.js 011799db398157cbd254264b6ebae00d7234b93d0e9e810345f213a5774993c0
-F ext/wasm/api/sqlite3-api-prologue.js 9e37ce4dfd74926d0df80dd7e72e33085db4bcee48e2c21236039be416a7dff2
+F ext/wasm/api/sqlite3-api-prologue.js c496adc0cf2ae427ee900aad01c09db97850bd8b6737f2849cab207c8415b839
 F ext/wasm/api/sqlite3-api-worker1.js d33062afa045fd4be01ba4abc266801807472558b862b30056211b00c9c347b4
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c bf4637cf28463cada4b25f09651943c7ece004b253ef39b7ab68eaa60662aa09
-F ext/wasm/batch-runner.html 23209ade7981acce7ecd79d6eff9f4c5a4e8b14ae867ac27cd89b230be640fa6
-F ext/wasm/batch-runner.js 2abd146d3e3a66128ac0a2cc39bfd01e9811c9511fa10ec927d6649795f1ee50
+F ext/wasm/api/sqlite3-wasm.c 7d1760f3a864a9ae16cfb71543829d946a54384bd07af99a3adf9ef32913705f
+F ext/wasm/batch-runner.html 2857a6db7292ac83d1581af865d643fd34235db2df830d10b43b01388c599e04
+F ext/wasm/batch-runner.js fb6a338aeef509f181f499700a8595bc578bbc54ef832e0cda7e7e7c10b90a18
 F ext/wasm/common/SqliteTestUtil.js 529161a624265ba84271a52db58da022649832fa1c71309fb1e02cc037327a2b
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 3a5143699c2b73a85b962271e1a9b3241b30d90e30d895e4f55665e648572962
@@ -507,8 +507,8 @@ F ext/wasm/jaccwabyt/jaccwabyt.md 447cc02b598f7792edaa8ae6853a7847b8178a18ed356a
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
 F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e568d2c2307c416902059339c06f19
 F ext/wasm/kvvfs.make bfa0aaac384d9f200d2c8e31efb3536b40d139667b88e6eba9c0a71e23da6a5c
-F ext/wasm/kvvfs1.html 83bac238d1e93ed102a461672fc58fe74e611e426708e9a5c66002c01eadb942
-F ext/wasm/kvvfs1.js 53721a42e0ec45f6978cc723e5de47f882517867d0fcff4c6ff05f4c422e27c4
+F ext/wasm/kvvfs1.html 13bb24190bfb276a57b228499519badcc1bf39ed07e4b37bc2a425ce6418fed1
+F ext/wasm/kvvfs1.js a23ee98a78b9da379eab7a20d7ddf5283a684dd7a91685a84686c05216f96689
 F ext/wasm/scratchpad-opfs-main.html 4565cf194e66188190d35f70e82553e2e2d72b9809b73c94ab67b8cfd14d2e0c
 F ext/wasm/scratchpad-opfs-main.js 69e960e9161f6412fd0c30f355d4112f1894d6609eb431e2d16d207d1380518e
 F ext/wasm/scratchpad-opfs-worker.html 66c1d15d678f3bd306373d76b61c6c8aef988f61f4a8dd40185d452f9c6d2bf5
@@ -526,7 +526,7 @@ F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
 F ext/wasm/testing-worker1-promiser.js c62b5879339eef0b21aebd9d75bc125c86530edc17470afff18077f931cb704a
 F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d7669fb17fcae
-F ext/wasm/testing1.js 735120231d6e55b92964924fcb54a66484d8b2e30fe5a18c71081b3590344a5f
+F ext/wasm/testing1.js 7cd8ab255c238b030d928755ae8e91e7d90a12f2ae601b1b8f7827aaa4fb258e
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
 F ext/wasm/testing2.js 25584bcc30f19673ce13a6f301f89f8820a59dfe044e0c4f2913941f4097fe3c
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
@@ -2024,8 +2024,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 8b1608a9a37131121cb3a0cb1e8dbad5e39dc1fc2a341d056f09537f179b2e7a
-R 77095a41dfb9b784dcab0078822e6eff
+P 333a45725d1708e0fefa559c33ce1c7eeb425cdb04f594b1f2b48166c1478c79
+R fff963b52d5c3a76677d96f35303ab67
 U stephan
-Z c624cb9efadffe8972e3df15b8dc9939
+Z e8c548c1774e1a39daa4183bad155966
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 69b3e88fd2..e142fcae1f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-333a45725d1708e0fefa559c33ce1c7eeb425cdb04f594b1f2b48166c1478c79
\ No newline at end of file
+0d78961870ee9f22f1ba16d423377d28dcc36e04b1e31ffd57f3e2fd51f8f0f2
\ No newline at end of file

From a3a6d63b4087895764ce15a8cf2e6afde76b6f9a Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Tue, 13 Sep 2022 19:47:01 +0000
Subject: [PATCH 101/428] Fix a broken error handling case in the recovery
 extension.

FossilOrigin-Name: 60089547e1fc77ecc02f207ebf75ee3160e5ff25f41d12e02e170fd7fde66602
---
 ext/recover/recoverfault.test |  1 +
 ext/recover/sqlite3recover.c  | 11 ++++++++---
 manifest                      | 14 +++++++-------
 manifest.uuid                 |  2 +-
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/ext/recover/recoverfault.test b/ext/recover/recoverfault.test
index 0241034100..e6d8392a44 100644
--- a/ext/recover/recoverfault.test
+++ b/ext/recover/recoverfault.test
@@ -49,6 +49,7 @@ do_execsql_test 1.0 {
 faultsim_save_and_close
 
 do_faultsim_test 1 -faults oom* -prep {
+  catch { db2 close }
   faultsim_restore_and_reopen
 } -body {
   set R [sqlite3_recover_init db main test.db2]
diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index 206a6fad5b..c67d9b3d49 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -495,9 +495,9 @@ static void recoverReadI32(
   assert( argc==2 );
   nBlob = sqlite3_value_bytes(argv[0]);
   pBlob = (const unsigned char*)sqlite3_value_blob(argv[0]);
-  iInt = sqlite3_value_int(argv[1]);
+  iInt = sqlite3_value_int(argv[1]) & 0xFFFF;
 
-  if( iInt>=0 && (iInt+1)*4<=nBlob ){
+  if( (iInt+1)*4<=nBlob ){
     const unsigned char *a = &pBlob[iInt*4];
     i64 iVal = ((i64)a[0]<<24)
              + ((i64)a[1]<<16)
@@ -770,7 +770,11 @@ static int recoverOpenOutput(sqlite3_recover *p){
       if( pBackup ){
         while( sqlite3_backup_step(pBackup, 1000)==SQLITE_OK );
         p->errCode = sqlite3_backup_finish(pBackup);
+      }else{
+        recoverDbError(p, db);
       }
+    }else{
+      recoverDbError(p, db2);
     }
     sqlite3_close(db2);
   }
@@ -1791,7 +1795,7 @@ int sqlite3_recover_config(sqlite3_recover *p, int op, void *pArg){
       p->zStateDb = recoverMPrintf(p, "%s", (char*)pArg);
       break;
 
-    case SQLITE_RECOVER_LOST_AND_FOUND:
+    case SQLITE_RECOVER_LOST_AND_FOUND: {
       const char *zArg = (const char*)pArg;
       sqlite3_free(p->zLostAndFound);
       if( zArg ){
@@ -1800,6 +1804,7 @@ int sqlite3_recover_config(sqlite3_recover *p, int op, void *pArg){
         p->zLostAndFound = 0;
       }
       break;
+    }
 
     case SQLITE_RECOVER_FREELIST_CORRUPT:
       p->bFreelistCorrupt = *(int*)pArg;
diff --git a/manifest b/manifest
index 3f6d9ab674..954e80712a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stests.\sDeal\sissues\ssurrounding\saborting\srecovery\sfrom\swithin\sthe\sSQL\scallback,\sand\savoiding\sthe\spending-byte\spage.
-D 2022-09-13T18:08:24.770
+C Fix\sa\sbroken\serror\shandling\scase\sin\sthe\srecovery\sextension.
+D 2022-09-13T19:47:01.338
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -391,11 +391,11 @@ F ext/recover/recover1.test d0fa2f945aac4754e0abb802941b9b80efd4828a775a090f9d22
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
 F ext/recover/recoverclobber.test 294dcc894124ab4ca3a7b35766630742a3d25810fceac22220beb64f70a33a60
 F ext/recover/recovercorrupt.test e3f3cbe0162ba681518aac9ea0ae8119f32ac93fb0900b5f09b6318966108e54
-F ext/recover/recoverfault.test 862ab02bd503922281a5ee9f81a3a92312561bb7a39e2fdb06e6afd60c3a167e
+F ext/recover/recoverfault.test f3587c218c448545a082b99d59294dff5ec0b7daa15b0556cf926f6c350f221e
 F ext/recover/recoverold.test 46e9d99b595fac583d4c67f74d7d89c20a435c752ef6eeb3e918b599940c88e0
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
-F ext/recover/sqlite3recover.c ed5ab827433823ebf3ad7ada192ecefdc8ef9327af68fd4db9ae463a11bbc476
+F ext/recover/sqlite3recover.c 1afcac2bbfcf5ef67a3391f59678dc866348ac88745067e683052ede02c425fb
 F ext/recover/sqlite3recover.h 81108efb8c4618d3d9c6da4df785212b0e4501aa0d25edfc463405fe839a6640
 F ext/recover/test_recover.c 5941ecf484b6158be26e34c6f7b6c7f03967c72a63db0c08e7fd0fa43023eafa
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -2010,8 +2010,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 ed318be8241981ef96334ba13d3201a717cc812a59aed64e3dc67f7e7e71854b
-R 11a8fecaa81e021bbb20605615a33134
+P 4e97dd31f5240d9231167ae172a5116426c42177a1ed3c5422b9d51b762d5a87
+R bab9a5e0534df0c970f1689fb0655c4b
 U dan
-Z 28892e8b77cb290f00759179724671d9
+Z ca04715ddf53f08e8c8270238268a615
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 9694fdd0c2..d9dc13270c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4e97dd31f5240d9231167ae172a5116426c42177a1ed3c5422b9d51b762d5a87
\ No newline at end of file
+60089547e1fc77ecc02f207ebf75ee3160e5ff25f41d12e02e170fd7fde66602
\ No newline at end of file

From 322967df59cf549e6836f45cf38bc2dcb81f35b1 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Tue, 13 Sep 2022 20:40:57 +0000
Subject: [PATCH 102/428] Add OOM tests for the recovery extension.

FossilOrigin-Name: 9b6b4c7162439a889144edb561356afc66436db921a867c20871f0c556716502
---
 ext/recover/recover1.test      |  26 ++++++++
 ext/recover/recoverfault2.test | 108 +++++++++++++++++++++++++++++++++
 manifest                       |  13 ++--
 manifest.uuid                  |   2 +-
 4 files changed, 142 insertions(+), 7 deletions(-)
 create mode 100644 ext/recover/recoverfault2.test

diff --git a/ext/recover/recover1.test b/ext/recover/recover1.test
index 3ee4c18ad6..e7a45e8e90 100644
--- a/ext/recover/recover1.test
+++ b/ext/recover/recover1.test
@@ -167,6 +167,32 @@ ifcapable fts5 {
   do_recover_test 9 
 }
 
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 10.1 {
+  CREATE TABLE x1(a PRIMARY KEY, str TEXT) WITHOUT ROWID;
+  INSERT INTO x1 VALUES(1, '
+    \nhello\012world(\n0)(\n1)
+  ');
+  INSERT INTO x1 VALUES(2, '
+    \nhello
+  ');
+}
+do_execsql_test 10.2 "
+  INSERT INTO x1 VALUES(3, '\012hello there\015world');
+  INSERT INTO x1 VALUES(4, '\015hello there\015world');
+"
+do_recover_test 10 
+
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 11.1 {
+  PRAGMA encoding='utf16';
+  CREATE TABLE u1(u, v);
+  INSERT INTO u1 VALUES('edvin marton', 'bond');
+  INSERT INTO u1 VALUES(1, 4.0);
+}
+do_recover_test 11 
 
 
 
diff --git a/ext/recover/recoverfault2.test b/ext/recover/recoverfault2.test
new file mode 100644
index 0000000000..7489206050
--- /dev/null
+++ b/ext/recover/recoverfault2.test
@@ -0,0 +1,108 @@
+# 2022 August 28
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+#
+
+if {![info exists testdir]} {
+  set testdir [file join [file dirname [info script]] .. .. test]
+} 
+source [file join [file dirname [info script]] recover_common.tcl]
+source $testdir/tester.tcl
+
+set testprefix recoverfault2
+
+
+#--------------------------------------------------------------------------
+proc compare_result {db1 db2 sql} {
+  set r1 [$db1 eval $sql]
+  set r2 [$db2 eval $sql]
+  if {$r1 != $r2} {
+    puts "r1: $r1"
+    puts "r2: $r2"
+    error "mismatch for $sql"
+  }
+  return ""
+}
+
+proc compare_dbs {db1 db2} {
+  compare_result $db1 $db2 "SELECT sql FROM sqlite_master ORDER BY 1"
+  foreach tbl [$db1 eval {SELECT name FROM sqlite_master WHERE type='table'}] {
+    compare_result $db1 $db2 "SELECT * FROM $tbl"
+  }
+}
+#--------------------------------------------------------------------------
+
+do_execsql_test 1.0 "
+  CREATE TABLE t1(a INTEGER PRIMARY KEY, b);
+  INSERT INTO t1 VALUES(2, '\012hello\015world\012today\n');
+"
+faultsim_save_and_close
+
+proc my_sql_hook {sql} {
+  lappend ::lSql $sql
+  return 0
+}
+
+do_faultsim_test 1 -faults oom* -prep {
+  catch { db2 close }
+  faultsim_restore_and_reopen
+  set ::lSql [list]
+} -body {
+  set R [sqlite3_recover_init_sql db main my_sql_hook]
+  $R run
+  $R finish
+} -test {
+  faultsim_test_result {0 {}} {1 {}}
+  if {$testrc==0} {
+    sqlite3 db2 ""
+    db2 eval [join $::lSql ";"]
+    compare_dbs db db2
+    db2 close
+  }
+}
+
+ifcapable utf16 {
+  reset_db
+  do_execsql_test 2.0 "
+    PRAGMA encoding='utf-16';
+    CREATE TABLE t1(a INTEGER PRIMARY KEY, b);
+    INSERT INTO t1 VALUES(2, '\012hello\015world\012today\n');
+  "
+  faultsim_save_and_close
+  
+  proc my_sql_hook {sql} {
+  puts "HOOK $sql"
+    lappend ::lSql $sql
+    return 0
+  }
+  
+  do_faultsim_test 2 -faults oom-t* -prep {
+    catch { db2 close }
+    faultsim_restore_and_reopen
+    set ::lSql [list]
+  } -body {
+    set R [sqlite3_recover_init_sql db main my_sql_hook]
+    $R run
+    $R finish
+  } -test {
+    faultsim_test_result {0 {}} {1 {}}
+    if {$testrc==0} {
+      sqlite3 db2 ""
+      db2 eval [join $::lSql ";"]
+      compare_dbs db db2
+      db2 close
+    }
+  }
+}
+
+
+
+finish_test
+
diff --git a/manifest b/manifest
index 954e80712a..18c614dd00 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sbroken\serror\shandling\scase\sin\sthe\srecovery\sextension.
-D 2022-09-13T19:47:01.338
+C Add\sOOM\stests\sfor\sthe\srecovery\sextension.
+D 2022-09-13T20:40:57.096
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -387,11 +387,12 @@ F ext/rbu/rbuvacuum4.test a78898e438a44803eb2bc897ba3323373c9f277418e2d6d76e90f2
 F ext/rbu/sqlite3rbu.c 8737cabdfbee84bb25a7851ecef8b1312be332761238da9be6ddb10c62ad4291
 F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9cd389812
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
-F ext/recover/recover1.test d0fa2f945aac4754e0abb802941b9b80efd4828a775a090f9d2253f5a0ee1d0e
+F ext/recover/recover1.test 623afa77b91996bb1319b069ced5245c243caa995f66793d6879fbc2c190f0be
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
 F ext/recover/recoverclobber.test 294dcc894124ab4ca3a7b35766630742a3d25810fceac22220beb64f70a33a60
 F ext/recover/recovercorrupt.test e3f3cbe0162ba681518aac9ea0ae8119f32ac93fb0900b5f09b6318966108e54
 F ext/recover/recoverfault.test f3587c218c448545a082b99d59294dff5ec0b7daa15b0556cf926f6c350f221e
+F ext/recover/recoverfault2.test 699b3ec07ba6982291e65e1811807f18d7f115234b407c819eaf3529878867f5
 F ext/recover/recoverold.test 46e9d99b595fac583d4c67f74d7d89c20a435c752ef6eeb3e918b599940c88e0
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
@@ -2010,8 +2011,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 4e97dd31f5240d9231167ae172a5116426c42177a1ed3c5422b9d51b762d5a87
-R bab9a5e0534df0c970f1689fb0655c4b
+P 60089547e1fc77ecc02f207ebf75ee3160e5ff25f41d12e02e170fd7fde66602
+R 4e62121f5a47cd1728b6e036c3f3c8c0
 U dan
-Z ca04715ddf53f08e8c8270238268a615
+Z 5fc633ab904798afb52a452a7e949f53
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index d9dc13270c..2c3276310d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-60089547e1fc77ecc02f207ebf75ee3160e5ff25f41d12e02e170fd7fde66602
\ No newline at end of file
+9b6b4c7162439a889144edb561356afc66436db921a867c20871f0c556716502
\ No newline at end of file

From b8eaf9a10dbbcb217ffa5c85f2f2c99f9c584dc6 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Wed, 14 Sep 2022 16:37:59 +0000
Subject: [PATCH 103/428] Fix recovery of utf-16 databases.

FossilOrigin-Name: 5b05be0861f35804270fbd184ad4b89c23e98cc2fbd56b9e4fe6197daef5fe49
---
 ext/misc/dbdata.c              | 61 ++++++++++++++++++++++++++++------
 ext/recover/recover1.test      |  1 +
 ext/recover/recoverfault2.test |  1 -
 ext/recover/test_recover.c     | 35 +++++++++++++++++++
 manifest                       | 20 +++++------
 manifest.uuid                  |  2 +-
 test/tester.tcl                | 41 +++++++++++++++++++++++
 7 files changed, 138 insertions(+), 23 deletions(-)

diff --git a/ext/misc/dbdata.c b/ext/misc/dbdata.c
index a18304b96b..29a6497bef 100644
--- a/ext/misc/dbdata.c
+++ b/ext/misc/dbdata.c
@@ -75,6 +75,7 @@
 #include "sqlite3ext.h"
 
 typedef unsigned char u8;
+typedef unsigned int u32;
 
 #endif
 SQLITE_EXTENSION_INIT1
@@ -107,6 +108,7 @@ struct DbdataCursor {
   int iField;                     /* Current field number */
   u8 *pHdrPtr;
   u8 *pPtr;
+  u32 enc;                        /* Text encoding */
   
   sqlite3_int64 iIntkey;          /* Integer key value */
 };
@@ -299,14 +301,14 @@ static int dbdataClose(sqlite3_vtab_cursor *pCursor){
 /* 
 ** Utility methods to decode 16 and 32-bit big-endian unsigned integers. 
 */
-static unsigned int get_uint16(unsigned char *a){
+static u32 get_uint16(unsigned char *a){
   return (a[0]<<8)|a[1];
 }
-static unsigned int get_uint32(unsigned char *a){
-  return ((unsigned int)a[0]<<24)
-       | ((unsigned int)a[1]<<16)
-       | ((unsigned int)a[2]<<8)
-       | ((unsigned int)a[3]);
+static u32 get_uint32(unsigned char *a){
+  return ((u32)a[0]<<24)
+       | ((u32)a[1]<<16)
+       | ((u32)a[2]<<8)
+       | ((u32)a[3]);
 }
 
 /*
@@ -321,7 +323,7 @@ static unsigned int get_uint32(unsigned char *a){
 */
 static int dbdataLoadPage(
   DbdataCursor *pCsr,             /* Cursor object */
-  unsigned int pgno,              /* Page number of page to load */
+  u32 pgno,                       /* Page number of page to load */
   u8 **ppPage,                    /* OUT: pointer to page buffer */
   int *pnPage                     /* OUT: Size of (*ppPage) in bytes */
 ){
@@ -405,6 +407,7 @@ static int dbdataValueBytes(int eType){
 */
 static void dbdataValue(
   sqlite3_context *pCtx, 
+  u32 enc,
   int eType, 
   u8 *pData,
   int nData
@@ -449,7 +452,17 @@ static void dbdataValue(
       default: {
         int n = ((eType-12) / 2);
         if( eType % 2 ){
-          sqlite3_result_text(pCtx, (const char*)pData, n, SQLITE_TRANSIENT);
+          switch( enc ){
+            case SQLITE_UTF16BE:
+              sqlite3_result_text16be(pCtx, (void*)pData, n, SQLITE_TRANSIENT);
+              break;
+            case SQLITE_UTF16LE:
+              sqlite3_result_text16le(pCtx, (void*)pData, n, SQLITE_TRANSIENT);
+              break;
+            default:
+              sqlite3_result_text(pCtx, (char*)pData, n, SQLITE_TRANSIENT);
+              break;
+          }
         }else{
           sqlite3_result_blob(pCtx, pData, n, SQLITE_TRANSIENT);
         }
@@ -588,7 +601,7 @@ static int dbdataNext(sqlite3_vtab_cursor *pCursor){
             /* Load content from overflow pages */
             if( nPayload>nLocal ){
               sqlite3_int64 nRem = nPayload - nLocal;
-              unsigned int pgnoOvfl = get_uint32(&pCsr->aPage[iOff]);
+              u32 pgnoOvfl = get_uint32(&pCsr->aPage[iOff]);
               while( nRem>0 ){
                 u8 *aOvfl = 0;
                 int nOvfl = 0;
@@ -703,6 +716,25 @@ static int dbdataDbsize(DbdataCursor *pCsr, const char *zSchema){
   return rc;
 }
 
+/*
+** Attempt to figure out the encoding of the database by retrieving page 1
+** and inspecting the header field. If successful, set the pCsr->enc variable
+** and return SQLITE_OK. Otherwise, return an SQLite error code.
+*/
+static int dbdataGetEncoding(DbdataCursor *pCsr){
+  int rc = SQLITE_OK;
+  int nPg1 = 0;
+  u8 *aPg1 = 0;
+  rc = dbdataLoadPage(pCsr, 1, &aPg1, &nPg1);
+  assert( rc!=SQLITE_OK || nPg1==0 || nPg1>=512 );
+  if( rc==SQLITE_OK && nPg1>0 ){
+    pCsr->enc = get_uint32(&aPg1[56]);
+  }
+  sqlite3_free(aPg1);
+  return rc;
+}
+
+
 /* 
 ** xFilter method for sqlite_dbdata and sqlite_dbptr.
 */
@@ -725,7 +757,6 @@ static int dbdataFilter(
     pCsr->iPgno = sqlite3_value_int(argv[(idxNum & 0x01)]);
     pCsr->bOnePage = 1;
   }else{
-    pCsr->nPage = dbdataDbsize(pCsr, zSchema);
     rc = dbdataDbsize(pCsr, zSchema);
   }
 
@@ -754,6 +785,13 @@ static int dbdataFilter(
   }else{
     pTab->base.zErrMsg = sqlite3_mprintf("%s", sqlite3_errmsg(pTab->db));
   }
+
+  /* Try to determine the encoding of the db by inspecting the header
+  ** field on page 1. */
+  if( rc==SQLITE_OK ){
+    rc = dbdataGetEncoding(pCsr);
+  }
+
   if( rc==SQLITE_OK ){
     rc = dbdataNext(pCursor);
   }
@@ -808,7 +846,8 @@ static int dbdataColumn(
           sqlite3_int64 iType;
           dbdataGetVarint(pCsr->pHdrPtr, &iType);
           dbdataValue(
-              ctx, iType, pCsr->pPtr, &pCsr->pRec[pCsr->nRec] - pCsr->pPtr
+              ctx, pCsr->enc, iType, pCsr->pPtr, 
+              &pCsr->pRec[pCsr->nRec] - pCsr->pPtr
           );
         }
         break;
diff --git a/ext/recover/recover1.test b/ext/recover/recover1.test
index e7a45e8e90..358015a591 100644
--- a/ext/recover/recover1.test
+++ b/ext/recover/recover1.test
@@ -192,6 +192,7 @@ do_execsql_test 11.1 {
   INSERT INTO u1 VALUES('edvin marton', 'bond');
   INSERT INTO u1 VALUES(1, 4.0);
 }
+
 do_recover_test 11 
 
 
diff --git a/ext/recover/recoverfault2.test b/ext/recover/recoverfault2.test
index 7489206050..4f7131ecfb 100644
--- a/ext/recover/recoverfault2.test
+++ b/ext/recover/recoverfault2.test
@@ -78,7 +78,6 @@ ifcapable utf16 {
   faultsim_save_and_close
   
   proc my_sql_hook {sql} {
-  puts "HOOK $sql"
     lappend ::lSql $sql
     return 0
   }
diff --git a/ext/recover/test_recover.c b/ext/recover/test_recover.c
index b273fbcd1d..7ab440fa37 100644
--- a/ext/recover/test_recover.c
+++ b/ext/recover/test_recover.c
@@ -229,6 +229,40 @@ static int test_sqlite3_recover_init(
   return TCL_OK;
 }
 
+/*
+** Declaration for public API function in file dbdata.c. This may be called
+** with NULL as the final two arguments to register the sqlite_dbptr and
+** sqlite_dbdata virtual tables with a database handle.
+*/
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
+int sqlite3_dbdata_init(sqlite3*, char**, const sqlite3_api_routines*);
+
+/*
+** sqlite3_recover_init DB DBNAME URI
+*/
+static int test_sqlite3_dbdata_init(
+  void *clientData,
+  Tcl_Interp *interp,
+  int objc,
+  Tcl_Obj *CONST objv[]
+){
+  sqlite3 *db = 0;
+
+  if( objc!=2 ){
+    Tcl_WrongNumArgs(interp, 1, objv, "DB");
+    return TCL_ERROR;
+  }
+  if( getDbPointer(interp, objv[1], &db) ) return TCL_ERROR;
+  sqlite3_dbdata_init(db, 0, 0);
+
+  Tcl_ResetResult(interp);
+  return TCL_OK;
+}
+
+
+
 int TestRecover_Init(Tcl_Interp *interp){
   struct Cmd {
     const char *zCmd;
@@ -237,6 +271,7 @@ int TestRecover_Init(Tcl_Interp *interp){
   } aCmd[] = {
     { "sqlite3_recover_init", test_sqlite3_recover_init, 0 },
     { "sqlite3_recover_init_sql", test_sqlite3_recover_init, (void*)1 },
+    { "sqlite3_dbdata_init", test_sqlite3_dbdata_init, (void*)1 },
   };
   int i;
 
diff --git a/manifest b/manifest
index 18c614dd00..b17390fa0e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sOOM\stests\sfor\sthe\srecovery\sextension.
-D 2022-09-13T20:40:57.096
+C Fix\srecovery\sof\sutf-16\sdatabases.
+D 2022-09-14T16:37:59.285
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -299,7 +299,7 @@ F ext/misc/closure.c dbfd8543b2a017ae6b1a5843986b22ddf99ff126ec9634a2f4047cd14c8
 F ext/misc/completion.c 6dafd7f4348eecc7be9e920d4b419d1fb2af75d938cd9c59a20cfe8beb2f22b9
 F ext/misc/compress.c 3354c77a7c8e86e07d849916000cdac451ed96500bfb5bd83b20eb61eee012c9
 F ext/misc/csv.c ca8d6dafc5469639de81937cb66ae2e6b358542aba94c4f791910d355a8e7f73
-F ext/misc/dbdata.c 9bb3666519bd8a54cce4934076a557fe6441c5bafce7e9c24d8b5ced148e8154
+F ext/misc/dbdata.c ca7b235fa2396e8fc2e950826872f820f31268ac2cb51368b0d655bb71568f07
 F ext/misc/dbdump.c b8592f6f2da292c62991a13864a60d6c573c47a9cc58362131b9e6a64f823e01
 F ext/misc/decimal.c 09f967dcf4a1ee35a76309829308ec278d3648168733f4a1147820e11ebefd12
 F ext/misc/eval.c 04bc9aada78c888394204b4ed996ab834b99726fb59603b0ee3ed6e049755dc1
@@ -387,18 +387,18 @@ F ext/rbu/rbuvacuum4.test a78898e438a44803eb2bc897ba3323373c9f277418e2d6d76e90f2
 F ext/rbu/sqlite3rbu.c 8737cabdfbee84bb25a7851ecef8b1312be332761238da9be6ddb10c62ad4291
 F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9cd389812
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
-F ext/recover/recover1.test 623afa77b91996bb1319b069ced5245c243caa995f66793d6879fbc2c190f0be
+F ext/recover/recover1.test 167ad4b267f6db5c06963a72196527cb42369c7cd77de2b4273d9fdc8bd7a254
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
 F ext/recover/recoverclobber.test 294dcc894124ab4ca3a7b35766630742a3d25810fceac22220beb64f70a33a60
 F ext/recover/recovercorrupt.test e3f3cbe0162ba681518aac9ea0ae8119f32ac93fb0900b5f09b6318966108e54
 F ext/recover/recoverfault.test f3587c218c448545a082b99d59294dff5ec0b7daa15b0556cf926f6c350f221e
-F ext/recover/recoverfault2.test 699b3ec07ba6982291e65e1811807f18d7f115234b407c819eaf3529878867f5
+F ext/recover/recoverfault2.test 321036336af23e778a87f148c4cc4407f88fbdab1fd72ddb661669be9020d36b
 F ext/recover/recoverold.test 46e9d99b595fac583d4c67f74d7d89c20a435c752ef6eeb3e918b599940c88e0
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
 F ext/recover/sqlite3recover.c 1afcac2bbfcf5ef67a3391f59678dc866348ac88745067e683052ede02c425fb
 F ext/recover/sqlite3recover.h 81108efb8c4618d3d9c6da4df785212b0e4501aa0d25edfc463405fe839a6640
-F ext/recover/test_recover.c 5941ecf484b6158be26e34c6f7b6c7f03967c72a63db0c08e7fd0fa43023eafa
+F ext/recover/test_recover.c 6a6f86ea61d728c67382047d574c62df83e6a28db23c329e93a177093689cd20
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
 F ext/repair/checkfreelist.c e21f06995ff4efdc1622dcceaea4dcba2caa83ca2f31a1607b98a8509168a996
 F ext/repair/checkindex.c 4383e4469c21e5b9ae321d0d63cec53e981af9d7a6564be6374f0eeb93dfc890
@@ -1536,7 +1536,7 @@ F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
 F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d1631311a16
 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
-F test/tester.tcl d759ac44a501fb832f2ea966429ca18acfba0f9a8d34ad5c499332b079b37023
+F test/tester.tcl 65c29b6f1dbf71b0e59a7b221d7e849dfa5a55fa7d0a2902811e8abdecdb1d44
 F test/testrunner.tcl 86b57135754ab2160aeb04b4829d321fb285a5cfa7a505fe61d69aed605854cc
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
@@ -2011,8 +2011,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 60089547e1fc77ecc02f207ebf75ee3160e5ff25f41d12e02e170fd7fde66602
-R 4e62121f5a47cd1728b6e036c3f3c8c0
+P 9b6b4c7162439a889144edb561356afc66436db921a867c20871f0c556716502
+R 7d7577824671621531c65dae0de3846f
 U dan
-Z 5fc633ab904798afb52a452a7e949f53
+Z b3ef1682460d7df284b8cd64863e6715
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 2c3276310d..05a5c951ed 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9b6b4c7162439a889144edb561356afc66436db921a867c20871f0c556716502
\ No newline at end of file
+5b05be0861f35804270fbd184ad4b89c23e98cc2fbd56b9e4fe6197daef5fe49
\ No newline at end of file
diff --git a/test/tester.tcl b/test/tester.tcl
index 5612311dab..9353b91244 100644
--- a/test/tester.tcl
+++ b/test/tester.tcl
@@ -1548,6 +1548,47 @@ proc explain_i {sql {db db}} {
   output2 "----  ------------  ------  ------  ------  ----------------  --  -"
 }
 
+proc execsql_pp {sql {db db}} {
+  set nCol 0
+  $db eval $sql A {
+    if {$nCol==0} {
+      set nCol [llength $A(*)]
+      foreach c $A(*) { 
+        set aWidth($c) [string length $c] 
+        lappend data $c
+      }
+    }
+    foreach c $A(*) { 
+      set n [string length $A($c)]
+      if {$n > $aWidth($c)} {
+        set aWidth($c) $n
+      }
+      lappend data $A($c)
+    }
+  }
+  if {$nCol>0} {
+    set nTotal 0
+    foreach e [array names aWidth] { incr nTotal $aWidth($e) }
+    incr nTotal [expr ($nCol-1) * 3]
+    incr nTotal 4
+
+    set fmt ""
+    foreach c $A(*) { 
+      lappend fmt "% -$aWidth($c)s"
+    }
+    set fmt "| [join $fmt { | }] |"
+    
+    puts [string repeat - $nTotal]
+    for {set i 0} {$i < [llength $data]} {incr i $nCol} {
+      set vals [lrange $data $i [expr $i+$nCol-1]]
+      puts [format $fmt {*}$vals]
+      if {$i==0} { puts [string repeat - $nTotal] }
+    }
+    puts [string repeat - $nTotal]
+  }
+}
+
+
 # Show the VDBE program for an SQL statement but omit the Trace
 # opcode at the beginning.  This procedure can be used to prove
 # that different SQL statements generate exactly the same VDBE code.

From 3c24342841614c8f31d0ae27cad111a950959c3e Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Wed, 14 Sep 2022 18:57:46 +0000
Subject: [PATCH 104/428] Extra tests and fixes.

FossilOrigin-Name: deed5336931b23bb507c064d08e9899b33f04e4f7eee03beb8d7147eb4caa030
---
 ext/recover/recover1.test        | 12 +++++
 ext/recover/recovercorrupt2.test | 76 ++++++++++++++++++++++++++++++++
 ext/recover/recoverfault.test    |  1 +
 ext/recover/sqlite3recover.c     | 16 +++----
 ext/recover/test_recover.c       | 14 ++++--
 manifest                         | 19 ++++----
 manifest.uuid                    |  2 +-
 7 files changed, 118 insertions(+), 22 deletions(-)
 create mode 100644 ext/recover/recovercorrupt2.test

diff --git a/ext/recover/recover1.test b/ext/recover/recover1.test
index 358015a591..79258b7e8f 100644
--- a/ext/recover/recover1.test
+++ b/ext/recover/recover1.test
@@ -195,7 +195,19 @@ do_execsql_test 11.1 {
 
 do_recover_test 11 
 
+do_test 12.1 {
+  set R [sqlite3_recover_init db "" test.db2]
+  $R config lostandfound ""
+  $R config invalid xyz
+} {12}
+do_test 12.2 {
+  $R run
+  $R run
+} {21}
 
+do_test 12.3 {
+  $R finish
+} {}
 
 finish_test
 
diff --git a/ext/recover/recovercorrupt2.test b/ext/recover/recovercorrupt2.test
new file mode 100644
index 0000000000..58dee54815
--- /dev/null
+++ b/ext/recover/recovercorrupt2.test
@@ -0,0 +1,76 @@
+# 2022 August 28
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+#
+
+if {![info exists testdir]} {
+  set testdir [file join [file dirname [info script]] .. .. test]
+} 
+source [file join [file dirname [info script]] recover_common.tcl]
+source $testdir/tester.tcl
+
+set testprefix recovercorrupt2
+
+do_execsql_test 1.0 {
+  PRAGMA page_size = 512;
+  CREATE TABLE t1(a INTEGER PRIMARY KEY, b, c);
+  INSERT INTO t1 VALUES(1, 2, 3);
+  INSERT INTO t1 VALUES(2, hex(randomblob(100)), randomblob(200));
+  CREATE INDEX i1 ON t1(b, c);
+  CREATE TABLE t2(a PRIMARY KEY, b, c) WITHOUT ROWID;
+  INSERT INTO t2 VALUES(1, 2, 3);
+  INSERT INTO t2 VALUES(2, hex(randomblob(100)), randomblob(200));
+  ANALYZE;
+  PRAGMA writable_schema = 1;
+  UPDATE sqlite_schema SET sql = 'CREATE INDEX i1 ON o(world)' WHERE name='i1'; 
+}
+
+do_test 1.1 {
+  set R [sqlite3_recover_init db main test.db2]
+  $R run
+  $R finish
+} {}
+
+sqlite3 db2 test.db2
+do_execsql_test -db db2 1.2 {
+  SELECT sql FROM sqlite_schema
+} {
+  {CREATE TABLE t1(a INTEGER PRIMARY KEY, b, c)}
+  {CREATE TABLE t2(a PRIMARY KEY, b, c) WITHOUT ROWID} 
+  {CREATE TABLE sqlite_stat1(tbl,idx,stat)} 
+  {CREATE TABLE sqlite_stat4(tbl,idx,neq,nlt,ndlt,sample)}
+}
+db2 close
+
+do_execsql_test 1.3 {
+  PRAGMA writable_schema = 1;
+  UPDATE sqlite_schema SET sql = 'CREATE TABLE t2 syntax error!' WHERE name='t2';
+}
+
+do_test 1.4 {
+  set R [sqlite3_recover_init db main test.db2]
+  $R run
+  $R finish
+} {}
+
+sqlite3 db2 test.db2
+do_execsql_test -db db2 1.5 {
+  SELECT sql FROM sqlite_schema
+} {
+  {CREATE TABLE t1(a INTEGER PRIMARY KEY, b, c)}
+  {CREATE TABLE sqlite_stat1(tbl,idx,stat)} 
+  {CREATE TABLE sqlite_stat4(tbl,idx,neq,nlt,ndlt,sample)}
+}
+db2 close
+
+
+
+finish_test
+
diff --git a/ext/recover/recoverfault.test b/ext/recover/recoverfault.test
index e6d8392a44..2ea87860b3 100644
--- a/ext/recover/recoverfault.test
+++ b/ext/recover/recoverfault.test
@@ -72,6 +72,7 @@ do_execsql_test 2.0 {
   PRAGMA writable_schema = 1;
   DELETE FROM sqlite_schema WHERE name='t2';
 }
+faultsim_save_and_close
 
 do_faultsim_test 2 -faults oom* -prep {
   faultsim_restore_and_reopen
diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index c67d9b3d49..6c52d99855 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -768,7 +768,7 @@ static int recoverOpenOutput(sqlite3_recover *p){
     if( rc==SQLITE_OK ){
       sqlite3_backup *pBackup = sqlite3_backup_init(db, "main", db2, "main");
       if( pBackup ){
-        while( sqlite3_backup_step(pBackup, 1000)==SQLITE_OK );
+        sqlite3_backup_step(pBackup, -1);
         p->errCode = sqlite3_backup_finish(pBackup);
       }else{
         recoverDbError(p, db);
@@ -1042,10 +1042,10 @@ static int recoverWriteSchema2(sqlite3_recover *p){
       i64 iRoot = sqlite3_column_int64(pSelect, 0);
       const char *zSql = (const char*)sqlite3_column_text(pSelect, 1);
       int rc = sqlite3_exec(p->dbOut, zSql, 0, 0, 0);
-      if( rc!=SQLITE_OK && rc!=SQLITE_ERROR ){
-        recoverDbError(p, p->dbOut);
-      }else if( rc==SQLITE_OK ){
+      if( rc==SQLITE_OK ){
         recoverSqlCallback(p, zSql);
+      }else if( rc!=SQLITE_ERROR ){
+        recoverDbError(p, p->dbOut);
       }
     }
   }
@@ -1316,9 +1316,7 @@ static void recoverLostAndFoundPopulate(
     int iCell = sqlite3_column_int64(pStmt, 2);
     int iField = sqlite3_column_int64(pStmt, 3);
 
-    if( iPrevRoot>0 && (
-      iPrevRoot!=iRoot || iPrevPage!=iPage || iPrevCell!=iCell
-    )){
+    if( iPrevRoot>0 && (iPrevPage!=iPage || iPrevCell!=iCell) ){
       /* Insert the new row */
       sqlite3_bind_int64(pInsert, 1, iPrevRoot);  /* rootpgno */
       sqlite3_bind_int64(pInsert, 2, iPrevPage);  /* pgno */
@@ -1329,7 +1327,7 @@ static void recoverLostAndFoundPopulate(
       for(ii=0; ii<nVal; ii++){
         recoverBindValue(p, pInsert, 5+ii, apVal[ii]);
       }
-      if( sqlite3_step(pInsert)==SQLITE_ROW && p->xSql ){
+      if( sqlite3_step(pInsert)==SQLITE_ROW ){
         recoverSqlCallback(p, sqlite3_column_text(pInsert, 0));
       }
       recoverReset(p, pInsert);
@@ -1586,7 +1584,7 @@ static int recoverWriteData(sqlite3_recover *p){
                   sqlite3_bind_int64(pInsert, pTab->iRowidBind, iRowid);
                 }
 
-                if( SQLITE_ROW==sqlite3_step(pInsert) && p->xSql ){
+                if( SQLITE_ROW==sqlite3_step(pInsert) ){
                   const char *z = (const char*)sqlite3_column_text(pInsert, 0);
                   recoverSqlCallback(p, z);
                 }
diff --git a/ext/recover/test_recover.c b/ext/recover/test_recover.c
index 7ab440fa37..d660a5345e 100644
--- a/ext/recover/test_recover.c
+++ b/ext/recover/test_recover.c
@@ -84,7 +84,7 @@ static int testRecoverCmd(
     int nArg;
     const char *zMsg;
   } aSub[] = {
-    { "config",    2, "REBASE-BLOB" }, /* 0 */
+    { "config",    2, "ARG"         }, /* 0 */
     { "run",      0, ""             }, /* 1 */
     { "errmsg",    0, ""            }, /* 2 */
     { "errcode",   0, ""            }, /* 3 */
@@ -115,6 +115,7 @@ static int testRecoverCmd(
         "lostandfound",    /* 1 */
         "freelistcorrupt", /* 2 */
         "rowids",          /* 3 */
+        "invalid",         /* 4 */
         0
       };
       int iOp = 0;
@@ -128,11 +129,13 @@ static int testRecoverCmd(
               789, (void*)Tcl_GetString(objv[3]) /* MAGIC NUMBER! */
           );
           break;
-        case 1:
+        case 1: {
+          const char *zStr = Tcl_GetString(objv[3]);
           res = sqlite3_recover_config(pTest->p, 
-              SQLITE_RECOVER_LOST_AND_FOUND, (void*)Tcl_GetString(objv[3])
+              SQLITE_RECOVER_LOST_AND_FOUND, (void*)(zStr[0] ? zStr : 0)
           );
           break;
+        }
         case 2: {
           int iVal = 0;
           if( Tcl_GetBooleanFromObj(interp, objv[3], &iVal) ) return TCL_ERROR;
@@ -149,6 +152,10 @@ static int testRecoverCmd(
           );
           break;
         }
+        case 4: {
+          res = sqlite3_recover_config(pTest->p, 12345, 0);
+          break;
+        }
       }
       Tcl_SetObjResult(interp, Tcl_NewIntObj(res));
       break;
@@ -210,6 +217,7 @@ static int test_sqlite3_recover_init(
   }
   if( getDbPointer(interp, objv[1], &db) ) return TCL_ERROR;
   zDb = Tcl_GetString(objv[2]);
+  if( zDb[0]=='\0' ) zDb = 0;
 
   pNew = ckalloc(sizeof(TestRecover));
   if( bSql==0 ){
diff --git a/manifest b/manifest
index b17390fa0e..cc05de1c51 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\srecovery\sof\sutf-16\sdatabases.
-D 2022-09-14T16:37:59.285
+C Extra\stests\sand\sfixes.
+D 2022-09-14T18:57:46.380
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -387,18 +387,19 @@ F ext/rbu/rbuvacuum4.test a78898e438a44803eb2bc897ba3323373c9f277418e2d6d76e90f2
 F ext/rbu/sqlite3rbu.c 8737cabdfbee84bb25a7851ecef8b1312be332761238da9be6ddb10c62ad4291
 F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9cd389812
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
-F ext/recover/recover1.test 167ad4b267f6db5c06963a72196527cb42369c7cd77de2b4273d9fdc8bd7a254
+F ext/recover/recover1.test 3f26db7692ed98c0de4fc9511f3d3a2f2c91a137b7e6666f3b85b593438b5d09
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
 F ext/recover/recoverclobber.test 294dcc894124ab4ca3a7b35766630742a3d25810fceac22220beb64f70a33a60
 F ext/recover/recovercorrupt.test e3f3cbe0162ba681518aac9ea0ae8119f32ac93fb0900b5f09b6318966108e54
-F ext/recover/recoverfault.test f3587c218c448545a082b99d59294dff5ec0b7daa15b0556cf926f6c350f221e
+F ext/recover/recovercorrupt2.test 7a1e3fe43231e7571aff4a09f359dcc0c98ef8f74d507c17953d35f2ad9f4c1f
+F ext/recover/recoverfault.test 3a0a32b9fc216592b97775d69220695b0926980c0f7424b7a59144e47d7cb568
 F ext/recover/recoverfault2.test 321036336af23e778a87f148c4cc4407f88fbdab1fd72ddb661669be9020d36b
 F ext/recover/recoverold.test 46e9d99b595fac583d4c67f74d7d89c20a435c752ef6eeb3e918b599940c88e0
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
-F ext/recover/sqlite3recover.c 1afcac2bbfcf5ef67a3391f59678dc866348ac88745067e683052ede02c425fb
+F ext/recover/sqlite3recover.c 29cb0ef3ff22e4a813d741930be123b7a44d59ba4c93868e74c4b0ebbee90a62
 F ext/recover/sqlite3recover.h 81108efb8c4618d3d9c6da4df785212b0e4501aa0d25edfc463405fe839a6640
-F ext/recover/test_recover.c 6a6f86ea61d728c67382047d574c62df83e6a28db23c329e93a177093689cd20
+F ext/recover/test_recover.c 72a765616a3fa9dae2ed537d79b00f365d9f639d347858341b71bda7a3a45f56
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
 F ext/repair/checkfreelist.c e21f06995ff4efdc1622dcceaea4dcba2caa83ca2f31a1607b98a8509168a996
 F ext/repair/checkindex.c 4383e4469c21e5b9ae321d0d63cec53e981af9d7a6564be6374f0eeb93dfc890
@@ -2011,8 +2012,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 9b6b4c7162439a889144edb561356afc66436db921a867c20871f0c556716502
-R 7d7577824671621531c65dae0de3846f
+P 5b05be0861f35804270fbd184ad4b89c23e98cc2fbd56b9e4fe6197daef5fe49
+R 7d672439d169025c8f5a2255e79dee5d
 U dan
-Z b3ef1682460d7df284b8cd64863e6715
+Z 7e26bca497bd6fe58832c34f4ec41a30
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 05a5c951ed..9efa9051fd 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5b05be0861f35804270fbd184ad4b89c23e98cc2fbd56b9e4fe6197daef5fe49
\ No newline at end of file
+deed5336931b23bb507c064d08e9899b33f04e4f7eee03beb8d7147eb4caa030
\ No newline at end of file

From 6fa0a11c7b9e8b8c86454e266e158b79c22f471b Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Wed, 14 Sep 2022 20:45:46 +0000
Subject: [PATCH 105/428] Include recovery extension in configure/make builds
 of testfixture.

FossilOrigin-Name: d2f4652144c4a54012a2176c178c5ade3463bd017515f472cfa8dafdde192df3
---
 Makefile.in                      |  6 ++++++
 ext/recover/recovercorrupt2.test |  3 +--
 manifest                         | 14 +++++++-------
 manifest.uuid                    |  2 +-
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index cc4943f2c4..ca3dfdcae8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -433,6 +433,9 @@ TESTSRC = \
   $(TOP)/ext/fts3/fts3_term.c \
   $(TOP)/ext/fts3/fts3_test.c  \
   $(TOP)/ext/session/test_session.c \
+  $(TOP)/ext/recover/sqlite3recover.c \
+  $(TOP)/ext/misc/dbdata.c \
+  $(TOP)/ext/recover/test_recover.c \
   $(TOP)/ext/rbu/test_rbu.c 
 
 # Statically linked extensions
@@ -1102,6 +1105,9 @@ SHELL_SRC = \
 	$(TOP)/ext/expert/sqlite3expert.h \
 	$(TOP)/ext/misc/zipfile.c \
 	$(TOP)/ext/misc/memtrace.c \
+	$(TOP)/ext/misc/dbdata.c \
+	$(TOP)/ext/recover/sqlite3recover.c \
+	$(TOP)/ext/recover/sqlite3recover.h \
         $(TOP)/src/test_windirent.c
 
 shell.c:	$(SHELL_SRC) $(TOP)/tool/mkshellc.tcl
diff --git a/ext/recover/recovercorrupt2.test b/ext/recover/recovercorrupt2.test
index 58dee54815..cb5fa05baa 100644
--- a/ext/recover/recovercorrupt2.test
+++ b/ext/recover/recovercorrupt2.test
@@ -30,6 +30,7 @@ do_execsql_test 1.0 {
   ANALYZE;
   PRAGMA writable_schema = 1;
   UPDATE sqlite_schema SET sql = 'CREATE INDEX i1 ON o(world)' WHERE name='i1'; 
+  DELETE FROM sqlite_schema WHERE name='sqlite_stat4';
 }
 
 do_test 1.1 {
@@ -45,7 +46,6 @@ do_execsql_test -db db2 1.2 {
   {CREATE TABLE t1(a INTEGER PRIMARY KEY, b, c)}
   {CREATE TABLE t2(a PRIMARY KEY, b, c) WITHOUT ROWID} 
   {CREATE TABLE sqlite_stat1(tbl,idx,stat)} 
-  {CREATE TABLE sqlite_stat4(tbl,idx,neq,nlt,ndlt,sample)}
 }
 db2 close
 
@@ -66,7 +66,6 @@ do_execsql_test -db db2 1.5 {
 } {
   {CREATE TABLE t1(a INTEGER PRIMARY KEY, b, c)}
   {CREATE TABLE sqlite_stat1(tbl,idx,stat)} 
-  {CREATE TABLE sqlite_stat4(tbl,idx,neq,nlt,ndlt,sample)}
 }
 db2 close
 
diff --git a/manifest b/manifest
index cc05de1c51..77ef3c20e0 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Extra\stests\sand\sfixes.
-D 2022-09-14T18:57:46.380
+C Include\srecovery\sextension\sin\sconfigure/make\sbuilds\sof\stestfixture.
+D 2022-09-14T20:45:46.778
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in 525bccb89e36a927f9312a231f054a2dc029f6af75901c7fc1a781d51b260323
+F Makefile.in 1dd98f0349f14a7b106ae05904d4d040b4d20f2ab8e2d3c34f8231ba08948e42
 F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
 F Makefile.msc d547a2fdba38a1c6cd1954977d0b0cc017f5f8fbfbc65287bf8d335808938016
 F README.md 8b8df9ca852aeac4864eb1e400002633ee6db84065bd01b78c33817f97d31f5e
@@ -391,7 +391,7 @@ F ext/recover/recover1.test 3f26db7692ed98c0de4fc9511f3d3a2f2c91a137b7e6666f3b85
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
 F ext/recover/recoverclobber.test 294dcc894124ab4ca3a7b35766630742a3d25810fceac22220beb64f70a33a60
 F ext/recover/recovercorrupt.test e3f3cbe0162ba681518aac9ea0ae8119f32ac93fb0900b5f09b6318966108e54
-F ext/recover/recovercorrupt2.test 7a1e3fe43231e7571aff4a09f359dcc0c98ef8f74d507c17953d35f2ad9f4c1f
+F ext/recover/recovercorrupt2.test a131d8005337c092e2dfa3b84909ed67ae82d22399a8cfb8c984b2939969ca42
 F ext/recover/recoverfault.test 3a0a32b9fc216592b97775d69220695b0926980c0f7424b7a59144e47d7cb568
 F ext/recover/recoverfault2.test 321036336af23e778a87f148c4cc4407f88fbdab1fd72ddb661669be9020d36b
 F ext/recover/recoverold.test 46e9d99b595fac583d4c67f74d7d89c20a435c752ef6eeb3e918b599940c88e0
@@ -2012,8 +2012,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 5b05be0861f35804270fbd184ad4b89c23e98cc2fbd56b9e4fe6197daef5fe49
-R 7d672439d169025c8f5a2255e79dee5d
+P deed5336931b23bb507c064d08e9899b33f04e4f7eee03beb8d7147eb4caa030
+R 280ffbfae11c88d50514166a9090fc16
 U dan
-Z 7e26bca497bd6fe58832c34f4ec41a30
+Z 303ba5cc3bab2dbc239e16c7c361938c
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 9efa9051fd..bf8054daff 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-deed5336931b23bb507c064d08e9899b33f04e4f7eee03beb8d7147eb4caa030
\ No newline at end of file
+d2f4652144c4a54012a2176c178c5ade3463bd017515f472cfa8dafdde192df3
\ No newline at end of file

From 409505c74361a5a3c49171f2eb194a3b7a1ef10c Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Thu, 15 Sep 2022 02:27:48 +0000
Subject: [PATCH 106/428] Clean up some JS documentation.

FossilOrigin-Name: 925fdbfc6c1f9f06951346bc0d4fb81ffb5797d5f1123728931973f6cb1a0efa
---
 ext/wasm/api/sqlite3-api-oo1.js      | 19 +++++++++----------
 ext/wasm/kvvfs1.js                   |  2 +-
 ext/wasm/testing-worker1-promiser.js |  4 ----
 manifest                             | 16 ++++++++--------
 manifest.uuid                        |  2 +-
 5 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index 8280204d62..6a8c229392 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -505,20 +505,19 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
 
        - `.callback` = a function which gets called for each row of
        the result set, but only if that statement has any result
-       _rows_. The callback's "this" is the options object. The second
-       argument passed to the callback is always the current Stmt
-       object (so that the caller may collect column names, or
-       similar). The 2nd argument to the callback is always the Stmt
-       instance, as it's needed if the caller wants to fetch the
-       column names or some such (noting that they could also be
-       fetched via `this.columnNames`, if the client provides the
-       `columnNames` option).
+       _rows_. The callback's "this" is the options object, noting
+       that this function synthesizes one if the caller does not pass
+       one to exec(). The second argument passed to the callback is
+       always the current Stmt object, as it's needed if the caller
+       wants to fetch the column names or some such (noting that they
+       could also be fetched via `this.columnNames`, if the client
+       provides the `columnNames` option).
 
        ACHTUNG: The callback MUST NOT modify the Stmt object. Calling
        any of the Stmt.get() variants, Stmt.getColumnName(), or
        similar, is legal, but calling step() or finalize() is
-       not. Routines which are illegal in this context will trigger an
-       exception.
+       not. Member methods which are illegal in this context will
+       trigger an exception.
 
        The first argument passed to the callback defaults to an array of
        values from the current result row but may be changed with ...
diff --git a/ext/wasm/kvvfs1.js b/ext/wasm/kvvfs1.js
index fd57051a26..57f990f16b 100644
--- a/ext/wasm/kvvfs1.js
+++ b/ext/wasm/kvvfs1.js
@@ -105,7 +105,7 @@
       log("sqlite3_web_kvvfs_size(",dbStorage,") says", capi.sqlite3_web_kvvfs_size(dbStorage),
          "bytes");
     });
-    log("Storage backend:",db.filename /* note that the name was internally translated */);
+    log("Storage backend:",db.filename);
     if(0===db.selectValue('select count(*) from sqlite_master')){
       log("DB is empty. Use the init button to populate it.");
     }else{
diff --git a/ext/wasm/testing-worker1-promiser.js b/ext/wasm/testing-worker1-promiser.js
index 4cc6547882..a6cbd7910d 100644
--- a/ext/wasm/testing-worker1-promiser.js
+++ b/ext/wasm/testing-worker1-promiser.js
@@ -145,10 +145,6 @@
       mustNotReach
     ).catch((e)=>{
       warn("Intentional error:",e);
-      // Why does the browser report console.error "Uncaught (in
-      // promise)" when we catch(), and does so _twice_ if we don't
-      // catch()? According to all docs, that error must be supressed
-      // if we explicitly catch().
     });
 
     await wtest('exec',{
diff --git a/manifest b/manifest
index 6fa5a9fc8a..d06cfdc78b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add/apply\svarious\skvvfs-specific\sutility\sAPIs\sto\sthe\sJS\slayer\sto\sassist\sin\stesting\sand\sanalysis.\sCorrect\sa\sbackwards\sdefault\sarg\scheck\sfor\ssqlite3ApiBootstrap().\sAdd\sexports\sfor\ssqlite3_db_handle(),\ssqlite3_file_control(),\sand\sthe\sSQLITE_FCNTL_xxx\senum.
-D 2022-09-13T19:27:03.599
+C Clean\sup\ssome\sJS\sdocumentation.
+D 2022-09-15T02:27:48.888
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -483,7 +483,7 @@ F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba814
 F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a4a06cb776c003880b
 F ext/wasm/api/sqlite3-api-cleanup.js 8564a6077cdcaea9a9f428a019af8a05887f0131e6a2a1e72a7ff1145fadfe77
 F ext/wasm/api/sqlite3-api-glue.js 366d580c8e5bf7fcf4c6dee6f646c31f5549bd417ea03a59a0acca00e8ecce30
-F ext/wasm/api/sqlite3-api-oo1.js 4925f4736eb28fd3a6d4dbbd2c078c38be651aa5996041e7f0b81be36506608e
+F ext/wasm/api/sqlite3-api-oo1.js 8a8e464c2c786f4faa3fd5b48852818dd2938c3211d82b6176143990a976f8ec
 F ext/wasm/api/sqlite3-api-opfs.js 011799db398157cbd254264b6ebae00d7234b93d0e9e810345f213a5774993c0
 F ext/wasm/api/sqlite3-api-prologue.js c496adc0cf2ae427ee900aad01c09db97850bd8b6737f2849cab207c8415b839
 F ext/wasm/api/sqlite3-api-worker1.js d33062afa045fd4be01ba4abc266801807472558b862b30056211b00c9c347b4
@@ -508,7 +508,7 @@ F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5
 F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e568d2c2307c416902059339c06f19
 F ext/wasm/kvvfs.make bfa0aaac384d9f200d2c8e31efb3536b40d139667b88e6eba9c0a71e23da6a5c
 F ext/wasm/kvvfs1.html 13bb24190bfb276a57b228499519badcc1bf39ed07e4b37bc2a425ce6418fed1
-F ext/wasm/kvvfs1.js a23ee98a78b9da379eab7a20d7ddf5283a684dd7a91685a84686c05216f96689
+F ext/wasm/kvvfs1.js ec1c1d071bb055711f9151df05616111432cf3e6bf7ac7f8dcbcfb56c9d9ed48
 F ext/wasm/scratchpad-opfs-main.html 4565cf194e66188190d35f70e82553e2e2d72b9809b73c94ab67b8cfd14d2e0c
 F ext/wasm/scratchpad-opfs-main.js 69e960e9161f6412fd0c30f355d4112f1894d6609eb431e2d16d207d1380518e
 F ext/wasm/scratchpad-opfs-worker.html 66c1d15d678f3bd306373d76b61c6c8aef988f61f4a8dd40185d452f9c6d2bf5
@@ -524,7 +524,7 @@ F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f
 F ext/wasm/sqlite3-worker1-promiser.js 92b8da5f38439ffec459a8215775d30fa498bc0f1ab929ff341fc3dd479660b9
 F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
-F ext/wasm/testing-worker1-promiser.js c62b5879339eef0b21aebd9d75bc125c86530edc17470afff18077f931cb704a
+F ext/wasm/testing-worker1-promiser.js e281c6a58dfe5b455e26997dd2985227588d1b583dc55e1f4f6253bf32f154f5
 F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d7669fb17fcae
 F ext/wasm/testing1.js 7cd8ab255c238b030d928755ae8e91e7d90a12f2ae601b1b8f7827aaa4fb258e
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
@@ -2024,8 +2024,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 333a45725d1708e0fefa559c33ce1c7eeb425cdb04f594b1f2b48166c1478c79
-R fff963b52d5c3a76677d96f35303ab67
+P 0d78961870ee9f22f1ba16d423377d28dcc36e04b1e31ffd57f3e2fd51f8f0f2
+R bf00de6cf3febea830f05611ed6027b0
 U stephan
-Z e8c548c1774e1a39daa4183bad155966
+Z 4c6a69dd322d5934ed4c1741f188a00d
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index e142fcae1f..f903450bae 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0d78961870ee9f22f1ba16d423377d28dcc36e04b1e31ffd57f3e2fd51f8f0f2
\ No newline at end of file
+925fdbfc6c1f9f06951346bc0d4fb81ffb5797d5f1123728931973f6cb1a0efa
\ No newline at end of file

From 0117693f626443b737752dd468eac29415d302c6 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Thu, 15 Sep 2022 03:09:00 +0000
Subject: [PATCH 107/428] Split wasmfs-enabled build of sqlite3.js/wasm into
 sqlite3-wasmfs.js/wasm, as enabling wasmfs breaks all tests/demos which run
 from a Worker thread.

FossilOrigin-Name: 08476f3c218d45846e7496bdae0b06e2122466111fdf2aa2aabb1805b15ef982
---
 ext/wasm/GNUmakefile                          |  35 ++----
 ext/wasm/index.html                           |   4 +
 ext/wasm/kvvfs.make                           |  15 +--
 ext/wasm/scratchpad-opfs-worker2.js           |   2 +-
 ...-main.html => scratchpad-wasmfs-main.html} |   4 +-
 ...opfs-main.js => scratchpad-wasmfs-main.js} |   0
 ext/wasm/testing-worker1-promiser.js          |   1 -
 ext/wasm/wasmfs.make                          | 104 ++++++++++++++++++
 manifest                                      |  25 +++--
 manifest.uuid                                 |   2 +-
 10 files changed, 143 insertions(+), 49 deletions(-)
 rename ext/wasm/{scratchpad-opfs-main.html => scratchpad-wasmfs-main.html} (94%)
 rename ext/wasm/{scratchpad-opfs-main.js => scratchpad-wasmfs-main.js} (100%)
 create mode 100644 ext/wasm/wasmfs.make

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index ff37281ea4..3e1bc90248 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -199,22 +199,13 @@ emcc.jsflags += -sEXPORTED_RUNTIME_METHODS=FS,wasmMemory,allocateUTF8OnStack
 emcc.jsflags += -sUSE_CLOSURE_COMPILER=0
 emcc.jsflags += -sIMPORTED_MEMORY
 emcc.environment := -sENVIRONMENT=web
-ENABLE_WASMFS ?= 0
-ifneq (0,$(ENABLE_WASMFS))
-  emcc.cflags += -pthread
-  emcc.jsflags += -pthread -sWASMFS -sPTHREAD_POOL_SIZE=2
-  emcc.cflags += '-DSQLITE_DEFAULT_UNIX_VFS="unix-none"'
-  emcc.environment := $(emcc.environment),worker
-  emcc.jsflags += -sINITIAL_MEMORY=128450560
-else
-  emcc.jsflags += -sALLOW_MEMORY_GROWTH
-  # emcc: warning: USE_PTHREADS + ALLOW_MEMORY_GROWTH may run non-wasm code
-  #       slowly, see https://github.com/WebAssembly/design/issues/1271
-  #       [-Wpthreads-mem-growth]
-  emcc.jsflags += -sINITIAL_MEMORY=13107200
-  #emcc.jsflags += -sINITIAL_MEMORY=64225280
-  # ^^^^ 64MB is not enough for WASMFS/OPFS test runs using batch-runner.js
-endif
+emcc.jsflags += -sALLOW_MEMORY_GROWTH
+# emcc: warning: USE_PTHREADS + ALLOW_MEMORY_GROWTH may run non-wasm code
+#       slowly, see https://github.com/WebAssembly/design/issues/1271
+#       [-Wpthreads-mem-growth]
+emcc.jsflags += -sINITIAL_MEMORY=13107200
+#emcc.jsflags += -sINITIAL_MEMORY=64225280
+# ^^^^ 64MB is not enough for WASMFS/OPFS test runs using batch-runner.js
 emcc.jsflags += $(emcc.environment)
 #emcc.jsflags += -sTOTAL_STACK=4194304
 emcc.jsflags += -sEXPORT_NAME=sqlite3InitModule
@@ -274,7 +265,6 @@ sqlite3.wasm := sqlite3.wasm
 sqlite3-wasm.o := $(dir.api)/sqlite3-wasm.o
 $(sqlite3-wasm.o): emcc.cflags += $(SQLITE_OPT)
 $(sqlite3-wasm.o): $(dir.top)/sqlite3.c
-$(dir.api)/wasm_util.o: emcc.cflags += $(SQLITE_OPT)
 sqlite3-wasm.c := $(dir.api)/sqlite3-wasm.c
 jaccwabyt_test.c := $(dir.jacc)/jaccwabyt_test.c
 # ^^^ FIXME (how?): jaccwabyt_test.c is only needed for the test apps,
@@ -282,9 +272,6 @@ jaccwabyt_test.c := $(dir.jacc)/jaccwabyt_test.c
 # want to test the release builds with those apps, so we cannot simply
 # elide that file in release builds. That component is critical to the
 # VFS bindings so needs to be tested along with the core APIs.
-ifneq (,$(filter -sWASMFS,$(emcc.jsflags)))
-  $(sqlite3-wasm.o): emcc.cflags+=-DSQLITE_WASM_OPFS
-endif
 define WASM_C_COMPILE
 $(1).o := $$(subst .c,.o,$(1))
 sqlite3.wasm.obj += $$($(1).o)
@@ -293,10 +280,10 @@ $$($(1).o): $$(MAKEFILE) $(1)
 CLEAN_FILES += $$($(1).o)
 endef
 $(foreach c,$(sqlite3-wasm.c) $(jaccwabyt_test.c),$(eval $(call WASM_C_COMPILE,$(c))))
-$(sqlite3.js): 
 $(sqlite3.js): $(MAKEFILE) $(sqlite3.wasm.obj) \
     EXPORTED_FUNCTIONS.api \
     $(post-js.js)
+	@echo "Building $@ ..."
 	$(emcc.bin) -o $(sqlite3.js) $(emcc_opt) $(emcc.flags) $(emcc.jsflags) $(sqlite3.wasm.obj)
 	chmod -x $(sqlite3.wasm)
 ifneq (,$(wasm-strip))
@@ -335,10 +322,6 @@ all: batch
 ########################################################################
 # speedtest1.js...
 emcc.speedtest1-flags := -g $(emcc_opt)
-ifneq (0,$(ENABLE_WASMFS))
-  emcc.speedtest1-flags += -pthread -sWASMFS -sPTHREAD_POOL_SIZE=2
-  emcc.speedtest1-flags += -DSQLITE_WASM_OPFS
-endif
 emcc.speedtest1-flags += -sINVOKE_RUN=0
 #emcc.speedtest1-flags += --no-entry
 emcc.speedtest1-flags += -flto
@@ -365,6 +348,7 @@ $(speedtest1.js): emcc.cflags+=
 # close enough to the target speed requirements that the 500ms makes a
 # difference.
 $(speedtest1.js): $(speedtest1.c) $(sqlite3-wasm.c) $(MAKEFILE) $(sqlite3.c)
+	@echo "Building $@ ..."
 	$(emcc.bin) \
         $(emcc.speedtest1-flags) $(speedtest1.cflags) \
         $(SQLITE_OPT) \
@@ -405,3 +389,4 @@ push-fiddle: $(fiddle_files)
 ########################################################################
 
 include kvvfs.make
+include wasmfs.make
diff --git a/ext/wasm/index.html b/ext/wasm/index.html
index da5ad1a3e9..a7e468aab0 100644
--- a/ext/wasm/index.html
+++ b/ext/wasm/index.html
@@ -42,6 +42,10 @@
         <li><a href='speedtest1-kvvfs.html'>speedtest1-kvvfs</a>: a variant of speedtest1 built solely for the kv-vfs feature.</li>
         <li><a href='kvvfs1.html'>kvvfs1</a>: very basic demo of using the key-value vfs for storing
           a persistent db in JS localStorage or sessionStorage.</li>
+        <li><a href='scratchpad-wasmfs-main.html'>scratchpad-wasmfs-main</a>:
+          experimenting with WASMFS/OPFS-based persistence. Maintenance
+          reminder: we cannot currently (2022-09-15) load WASMFS in a
+          worker due to an Emscripten limitation.</li>
         <!--li><a href='x.html'></a></li-->
       </ul>
     </div>
diff --git a/ext/wasm/kvvfs.make b/ext/wasm/kvvfs.make
index ad743dfda6..3ef9dbddf9 100644
--- a/ext/wasm/kvvfs.make
+++ b/ext/wasm/kvvfs.make
@@ -83,9 +83,10 @@ endif
 $(kvvfs.js): $(kvvfs.wasm.c) $(sqlite3.c) $(kvvfs.extra.c) \
     EXPORTED_FUNCTIONS.api $(MAKEFILE) $(MAKEFILE.kvvfs) \
     $(post-js.js)
+	@echo "Building $@ ..."
 	$(emcc.bin) -o $@ $(emcc_opt) $(emcc.flags) \
-  $(SQLITE_OPT) \
-  $(kvvfs.cflags) $(kvvfs.jsflags) $(kvvfs.wasm.c) $(kvvfs.extra.c)
+      $(SQLITE_OPT) \
+      $(kvvfs.cflags) $(kvvfs.jsflags) $(kvvfs.wasm.c) $(kvvfs.extra.c)
 	chmod -x $(kvvfs.wasm)
 ifneq (,$(wasm-strip))
 	$(wasm-strip) $(kvvfs.wasm)
@@ -102,11 +103,11 @@ speedtest1-kvvfs.wasm := speedtest1-kvvfs.wasm
 CLEAN_FILES += $(speedtest1-kvvfs.js) $(speedtest1-kvvfs.wasm)
 $(speedtest1-kvvfs.js): $(speedtest1.c) $(sqlite3-wasm.c) $(sqlite3.c) $(MAKEFILE.kvvfs)
 	$(emcc.bin) \
-        $(emcc.speedtest1-flags) $(speedtest1.cflags) \
-        $(SQLITE_OPT) \
-        -sEXIT_RUNTIME=1 \
-        $(kvvfs.cflags) \
-        -o $@ $(speedtest1.c) $(sqlite3-wasm.c) -lm
+      $(emcc.speedtest1-flags) $(speedtest1.cflags) \
+      $(SQLITE_OPT) \
+      -sEXIT_RUNTIME=1 \
+      $(kvvfs.cflags) \
+      -o $@ $(speedtest1.c) $(sqlite3-wasm.c) -lm
 ifneq (,$(wasm-strip))
 	$(wasm-strip) $(speedtest1-kvvfs.wasm)
 endif
diff --git a/ext/wasm/scratchpad-opfs-worker2.js b/ext/wasm/scratchpad-opfs-worker2.js
index e27fe2b372..e3eba16a2e 100644
--- a/ext/wasm/scratchpad-opfs-worker2.js
+++ b/ext/wasm/scratchpad-opfs-worker2.js
@@ -18,7 +18,7 @@
 'use strict';
 (function(){
   const toss = function(...args){throw new Error(args.join(' '))};
-  importScripts('sqlite3.js');
+  importScripts('sqlite3-wasmfs.js');
 
   /**
      Posts a message in the form {type,data} unless passed more than 2
diff --git a/ext/wasm/scratchpad-opfs-main.html b/ext/wasm/scratchpad-wasmfs-main.html
similarity index 94%
rename from ext/wasm/scratchpad-opfs-main.html
rename to ext/wasm/scratchpad-wasmfs-main.html
index 8edd15a671..91f61526cd 100644
--- a/ext/wasm/scratchpad-opfs-main.html
+++ b/ext/wasm/scratchpad-wasmfs-main.html
@@ -33,8 +33,8 @@
     <p>All stuff on this page happens in the dev console.</p>
     <hr>
     <div id='test-output'></div>
-    <script src="sqlite3.js"></script>
+    <script src="sqlite3-wasmfs.js"></script>
     <script src="common/SqliteTestUtil.js"></script>
-    <script src="scratchpad-opfs-main.js"></script>
+    <script src="scratchpad-wasmfs-main.js"></script>
   </body>
 </html>
diff --git a/ext/wasm/scratchpad-opfs-main.js b/ext/wasm/scratchpad-wasmfs-main.js
similarity index 100%
rename from ext/wasm/scratchpad-opfs-main.js
rename to ext/wasm/scratchpad-wasmfs-main.js
diff --git a/ext/wasm/testing-worker1-promiser.js b/ext/wasm/testing-worker1-promiser.js
index a6cbd7910d..1f2347c6fe 100644
--- a/ext/wasm/testing-worker1-promiser.js
+++ b/ext/wasm/testing-worker1-promiser.js
@@ -150,7 +150,6 @@
     await wtest('exec',{
       sql:'select 1 union all select 3',
       resultRows: [],
-      //rowMode: 'array', // array is the default in the Worker interface
     }, function(ev){
       ev = ev.result;
       T.assert(2 === ev.resultRows.length)
diff --git a/ext/wasm/wasmfs.make b/ext/wasm/wasmfs.make
new file mode 100644
index 0000000000..d96e68f77d
--- /dev/null
+++ b/ext/wasm/wasmfs.make
@@ -0,0 +1,104 @@
+#!/usr/bin/make
+#^^^^ help emacs select makefile mode
+#
+# This is a sub-make for building a standalone wasmfs-based
+# sqlite3.wasm.  It is intended to be "include"d from the main
+# GNUMakefile.
+#
+# Notable potential TODOs:
+#
+# - Trim down a custom sqlite3-api.js for this build. We can elimate
+#   the jaccwabyt dependency, for example, because this build won't
+#   make use of the VFS bits. Similarly, we can eliminate or replace
+#   parts of the OO1 API, or provide a related API which manages
+#   singletons of the localStorage/sessionStorage instances.
+#
+########################################################################
+MAKEFILE.wasmfs := $(lastword $(MAKEFILE_LIST))
+
+wasmfs.js     := sqlite3-wasmfs.js
+wasmfs.wasm   := sqlite3-wasmfs.wasm
+wasmfs.wasm.c := $(dir.api)/sqlite3-wasm.c
+
+CLEAN_FILES += $(wasmfs.js) $(wasmfs.wasm)
+
+########################################################################
+# emcc flags for .c/.o/.wasm.
+wasmfs.flags =
+#wasmfs.flags += -v # _very_ loud but also informative about what it's doing
+
+########################################################################
+# emcc flags for .c/.o.
+wasmfs.cflags :=
+wasmfs.cflags += -std=c99 -fPIC -g
+wasmfs.cflags += -pthread
+wasmfs.cflags += -I. -I$(dir.top)
+wasmfs.cflags += $(SQLITE_OPT) -DSQLITE_WASM_OPFS
+wasmfs.cflags += '-DSQLITE_DEFAULT_UNIX_VFS="unix-none"'
+
+wasmfs.extra.c :=
+ifeq (1,1)
+  # To get testing1.js to run with $(wasmfs.js) we need...
+  wasmfs.extra.c += $(jaccwabyt_test.c)
+endif
+
+########################################################################
+# emcc flags specific to building the final .js/.wasm file...
+wasmfs.jsflags := -fPIC
+wasmfs.jsflags += --no-entry
+wasmfs.jsflags += --minify 0
+wasmfs.jsflags += -sENVIRONMENT=web,worker
+wasmfs.jsflags += -sMODULARIZE
+wasmfs.jsflags += -sSTRICT_JS
+wasmfs.jsflags += -sDYNAMIC_EXECUTION=0
+wasmfs.jsflags += -sNO_POLYFILL
+ifeq (,$(wasmfs.extra.c))
+  wasmfs.jsflags += -sEXPORTED_FUNCTIONS=@$(dir.api)/EXPORTED_FUNCTIONS.sqlite3-api
+else
+  # need more exports for jaccwabyt test code...
+  wasmfs.jsflags += -sEXPORTED_FUNCTIONS=@$(dir.wasm)/EXPORTED_FUNCTIONS.api
+endif
+wasmfs.jsflags += -sEXPORTED_RUNTIME_METHODS=FS,wasmMemory,allocateUTF8OnStack
+                                            # wasmMemory ==> for -sIMPORTED_MEMORY
+                                            # allocateUTF8OnStack ==> wasmfs internals
+wasmfs.jsflags += -sUSE_CLOSURE_COMPILER=0
+wasmfs.jsflags += -sIMPORTED_MEMORY
+#wasmfs.jsflags += -sINITIAL_MEMORY=13107200
+#wasmfs.jsflags += -sTOTAL_STACK=4194304
+wasmfs.jsflags += -sEXPORT_NAME=sqlite3InitModule
+wasmfs.jsflags += -sGLOBAL_BASE=4096 # HYPOTHETICALLY keep func table indexes from overlapping w/ heap addr.
+wasmfs.jsflags += --post-js=$(post-js.js)
+#wasmfs.jsflags += -sFILESYSTEM=0 # only for experimentation. sqlite3 needs the FS API
+#                                Perhaps the wasmfs build doesn't?
+#wasmfs.jsflags += -sABORTING_MALLOC
+wasmfs.jsflags += -sALLOW_TABLE_GROWTH
+wasmfs.jsflags += -Wno-limited-postlink-optimizations
+# ^^^^^ it likes to warn when we have "limited optimizations" via the -g3 flag.
+wasmfs.jsflags += -sERROR_ON_UNDEFINED_SYMBOLS=0
+wasmfs.jsflags += -sLLD_REPORT_UNDEFINED
+#wasmfs.jsflags += --import-undefined
+wasmfs.jsflags += -sMEMORY64=0
+wasmfs.jsflags += -pthread -sWASMFS -sPTHREAD_POOL_SIZE=2
+wasmfs.jsflags += -sINITIAL_MEMORY=128450560
+#wasmfs.jsflags += -sALLOW_MEMORY_GROWTH
+#^^^ using ALLOW_MEMORY_GROWTH produces a warning from emcc:
+#   USE_PTHREADS + ALLOW_MEMORY_GROWTH may run non-wasm code slowly,
+#   see https://github.com/WebAssembly/design/issues/1271 [-Wpthreads-mem-growth]
+ifneq (0,$(enable_bigint))
+wasmfs.jsflags += -sWASM_BIGINT
+endif
+
+$(wasmfs.js): $(wasmfs.wasm.c) $(sqlite3.c) $(wasmfs.extra.c) \
+    EXPORTED_FUNCTIONS.api $(MAKEFILE) $(MAKEFILE.wasmfs) \
+    $(post-js.js)
+	@echo "Building $@ ..."
+	$(emcc.bin) -o $@ $(emcc_opt) $(emcc.flags) \
+  $(wasmfs.cflags) $(wasmfs.jsflags) $(wasmfs.wasm.c) $(wasmfs.extra.c)
+	chmod -x $(wasmfs.wasm)
+ifneq (,$(wasm-strip))
+	$(wasm-strip) $(wasmfs.wasm)
+endif
+	@ls -la $@ $(wasmfs.wasm)
+
+wasmfs: $(wasmfs.js)
+all: wasmfs
diff --git a/manifest b/manifest
index d06cfdc78b..045ad7cfc0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Clean\sup\ssome\sJS\sdocumentation.
-D 2022-09-15T02:27:48.888
+C Split\swasmfs-enabled\sbuild\sof\ssqlite3.js/wasm\sinto\ssqlite3-wasmfs.js/wasm,\sas\senabling\swasmfs\sbreaks\sall\stests/demos\swhich\srun\sfrom\sa\sWorker\sthread.
+D 2022-09-15T03:09:00.109
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle db7a4602f043cf4a5e4135be3609a487f9f1c83f05778bfbdf93766be4541b96
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile b175a00599c976fe9e7bc02bbc1337b5e3b81d042320c3a0be1621d2c7a21b21
+F ext/wasm/GNUmakefile f06963ecf1a8275755a568f84ad66e1c6a093e190cffd84f1414d8e75d3c5277
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 150a793a47205b8009ac934f3b6d6ebf67b965c072339aaa25ce808a19e116cc
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -501,19 +501,19 @@ F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d695
 F ext/wasm/fiddle/fiddle-worker.js bccf46045be8824752876f3eec01c223be0616ccac184bffd0024cfe7a3262b8
 F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
 F ext/wasm/fiddle/fiddle.js 4ffcfc9a235beebaddec689a549e9e0dfad6dca5c1f0b41f03468d7e76480686
-F ext/wasm/index.html f4b04f866ac420e7037b3818e9cb73ccc059675e0f24482932a2f7a121b814e3
+F ext/wasm/index.html 97968cdfa957c9ede7c81df55c9a2276b1a9784dc41a9802d3d94ad9c30ba2ed
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 447cc02b598f7792edaa8ae6853a7847b8178a18ed356afacbdbf312b2588106
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
 F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e568d2c2307c416902059339c06f19
-F ext/wasm/kvvfs.make bfa0aaac384d9f200d2c8e31efb3536b40d139667b88e6eba9c0a71e23da6a5c
+F ext/wasm/kvvfs.make 99d61a438232d03f7a39fff05a5738d00d5af629e54b3f03caf87f041c194d51
 F ext/wasm/kvvfs1.html 13bb24190bfb276a57b228499519badcc1bf39ed07e4b37bc2a425ce6418fed1
 F ext/wasm/kvvfs1.js ec1c1d071bb055711f9151df05616111432cf3e6bf7ac7f8dcbcfb56c9d9ed48
-F ext/wasm/scratchpad-opfs-main.html 4565cf194e66188190d35f70e82553e2e2d72b9809b73c94ab67b8cfd14d2e0c
-F ext/wasm/scratchpad-opfs-main.js 69e960e9161f6412fd0c30f355d4112f1894d6609eb431e2d16d207d1380518e
 F ext/wasm/scratchpad-opfs-worker.html 66c1d15d678f3bd306373d76b61c6c8aef988f61f4a8dd40185d452f9c6d2bf5
 F ext/wasm/scratchpad-opfs-worker.js 3ec2868c669713145c76eb5877c64a1b20741f741817b87c907a154b676283a9
-F ext/wasm/scratchpad-opfs-worker2.js 5f2237427ac537b8580b1c659ff14ad2621d1694043eaaf41ae18dbfef2e48c0
+F ext/wasm/scratchpad-opfs-worker2.js 779500d97140812509c04ba182de5bf76727052bdcbc09b3cedfb71a8574e07b
+F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06 w ext/wasm/scratchpad-opfs-main.html
+F ext/wasm/scratchpad-wasmfs-main.js 69e960e9161f6412fd0c30f355d4112f1894d6609eb431e2d16d207d1380518e w ext/wasm/scratchpad-opfs-main.js
 F ext/wasm/speedtest1-kvvfs.html fe7d314343b275f8b241af83267ca56274ea995535c6abca4d6e568a98fa31e3
 F ext/wasm/speedtest1-worker.html 6b5fda04d0b69e8c2651689356cb0c28fd33aa1a82b03dcbc8b0d68fbd7ed57f
 F ext/wasm/speedtest1-worker.js 356b9953add4449acf199793db9b76b11ee016021918d8daffd19f08ec68d305
@@ -524,11 +524,12 @@ F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f
 F ext/wasm/sqlite3-worker1-promiser.js 92b8da5f38439ffec459a8215775d30fa498bc0f1ab929ff341fc3dd479660b9
 F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
-F ext/wasm/testing-worker1-promiser.js e281c6a58dfe5b455e26997dd2985227588d1b583dc55e1f4f6253bf32f154f5
+F ext/wasm/testing-worker1-promiser.js 63448fddfd3b8c89ff667d17c8b31c6c2259dd4647ebbbd28f3a921c48e924da
 F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d7669fb17fcae
 F ext/wasm/testing1.js 7cd8ab255c238b030d928755ae8e91e7d90a12f2ae601b1b8f7827aaa4fb258e
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
 F ext/wasm/testing2.js 25584bcc30f19673ce13a6f301f89f8820a59dfe044e0c4f2913941f4097fe3c
+F ext/wasm/wasmfs.make 86ce03d75a462ef4431e0c2d851f707156975bca5347daa8d8a1cb430ba83a62
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
@@ -2024,8 +2025,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 0d78961870ee9f22f1ba16d423377d28dcc36e04b1e31ffd57f3e2fd51f8f0f2
-R bf00de6cf3febea830f05611ed6027b0
+P 925fdbfc6c1f9f06951346bc0d4fb81ffb5797d5f1123728931973f6cb1a0efa
+R a69df33d531c68d33c70b5a00ef5df51
 U stephan
-Z 4c6a69dd322d5934ed4c1741f188a00d
+Z bd73fd5e630d2b9c280c487da7e4705d
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f903450bae..1f14dcc292 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-925fdbfc6c1f9f06951346bc0d4fb81ffb5797d5f1123728931973f6cb1a0efa
\ No newline at end of file
+08476f3c218d45846e7496bdae0b06e2122466111fdf2aa2aabb1805b15ef982
\ No newline at end of file

From dae7518ae407ab379068cd3685e773b462d3b61a Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Thu, 15 Sep 2022 03:16:49 +0000
Subject: [PATCH 108/428] Remove some stale comments. Get
 scratchpad-opfs-worker2.js running again in prep for reuse in experimenting
 with the OPFS all-synchronous API.

FossilOrigin-Name: 4cbbd370186f84e440f496e7f11c641d7dc1723acc46e4a31483392e0eb046e9
---
 ext/wasm/index.html                  |  2 ++
 ext/wasm/scratchpad-opfs-worker.html | 25 ++-----------------------
 ext/wasm/scratchpad-opfs-worker2.js  |  4 ++--
 ext/wasm/wasmfs.make                 |  9 ---------
 manifest                             | 22 +++++++++++-----------
 manifest.uuid                        |  2 +-
 6 files changed, 18 insertions(+), 46 deletions(-)

diff --git a/ext/wasm/index.html b/ext/wasm/index.html
index a7e468aab0..4b21839a4a 100644
--- a/ext/wasm/index.html
+++ b/ext/wasm/index.html
@@ -46,6 +46,8 @@
           experimenting with WASMFS/OPFS-based persistence. Maintenance
           reminder: we cannot currently (2022-09-15) load WASMFS in a
           worker due to an Emscripten limitation.</li>
+        <li><a href='scratchpad-opfs-worker.html'>scratchpad-opfs-worker</a>:
+          experimenting with OPFS from a Worker thread (without WASMFS).
         <!--li><a href='x.html'></a></li-->
       </ul>
     </div>
diff --git a/ext/wasm/scratchpad-opfs-worker.html b/ext/wasm/scratchpad-opfs-worker.html
index 2f3e5b1de6..0ab7822d82 100644
--- a/ext/wasm/scratchpad-opfs-worker.html
+++ b/ext/wasm/scratchpad-opfs-worker.html
@@ -6,31 +6,10 @@
     <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
     <link rel="stylesheet" href="common/emscripten.css"/>
     <link rel="stylesheet" href="common/testing.css"/>
-    <title>sqlite3 WASMFS/OPFS Worker-thread Scratchpad</title>
+    <title>sqlite3 OPFS Worker-thread Scratchpad</title>
   </head>
   <body>
-    <header id='titlebar'><span>sqlite3 WASMFS/OPFS Worker-thread Scratchpad</span></header>
-    <!-- emscripten bits -->
-    <!--figure id="module-spinner">
-      <div class="spinner"></div>
-      <div class='center'><strong>Initializing app...</strong></div>
-      <div class='center'>
-        On a slow internet connection this may take a moment.  If this
-        message displays for "a long time", intialization may have
-        failed and the JavaScript console may contain clues as to why.
-      </div>
-    </figure>
-    <div class="emscripten" id="module-status">Downloading...</div>
-    <div class="emscripten">
-      <progress value="0" max="100" id="module-progress" hidden='1'></progress>  
-    </div--><!-- /emscripten bits -->
-    <p><strong>This test is known, as of 2022-08-13, to not work.</strong></p>
-    <p>Scratchpad/test app for the WASMF/OPFS integration in a
-      WORKER thread. This page requires that the sqlite3 API have
-      been built with WASMFS support. If OPFS support is available then
-      it "should" persist a database across reloads (watch the dev console
-      output), otherwise it will not.
-    </p>
+    <header id='titlebar'><span>sqlite3 OPFS Worker-thread Scratchpad</span></header>
     <p>All stuff on this page happens in the dev console.</p>
     <hr>
     <div id='test-output'></div>
diff --git a/ext/wasm/scratchpad-opfs-worker2.js b/ext/wasm/scratchpad-opfs-worker2.js
index e3eba16a2e..04b6bfc274 100644
--- a/ext/wasm/scratchpad-opfs-worker2.js
+++ b/ext/wasm/scratchpad-opfs-worker2.js
@@ -18,7 +18,7 @@
 'use strict';
 (function(){
   const toss = function(...args){throw new Error(args.join(' '))};
-  importScripts('sqlite3-wasmfs.js');
+  importScripts('sqlite3.js');
 
   /**
      Posts a message in the form {type,data} unless passed more than 2
@@ -37,7 +37,7 @@
   const stderr = console.error.bind(console);//function(...args){wMsg('stderr', args);};
 
   const test1 = function(db){
-    db.execMulti("create table if not exists t(a);")
+    db.exec("create table if not exists t(a);")
       .transaction(function(db){
         db.prepare("insert into t(a) values(?)")
           .bind(new Date().getTime())
diff --git a/ext/wasm/wasmfs.make b/ext/wasm/wasmfs.make
index d96e68f77d..f69da43b9e 100644
--- a/ext/wasm/wasmfs.make
+++ b/ext/wasm/wasmfs.make
@@ -4,15 +4,6 @@
 # This is a sub-make for building a standalone wasmfs-based
 # sqlite3.wasm.  It is intended to be "include"d from the main
 # GNUMakefile.
-#
-# Notable potential TODOs:
-#
-# - Trim down a custom sqlite3-api.js for this build. We can elimate
-#   the jaccwabyt dependency, for example, because this build won't
-#   make use of the VFS bits. Similarly, we can eliminate or replace
-#   parts of the OO1 API, or provide a related API which manages
-#   singletons of the localStorage/sessionStorage instances.
-#
 ########################################################################
 MAKEFILE.wasmfs := $(lastword $(MAKEFILE_LIST))
 
diff --git a/manifest b/manifest
index 045ad7cfc0..543bbdbf9a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Split\swasmfs-enabled\sbuild\sof\ssqlite3.js/wasm\sinto\ssqlite3-wasmfs.js/wasm,\sas\senabling\swasmfs\sbreaks\sall\stests/demos\swhich\srun\sfrom\sa\sWorker\sthread.
-D 2022-09-15T03:09:00.109
+C Remove\ssome\sstale\scomments.\sGet\sscratchpad-opfs-worker2.js\srunning\sagain\sin\sprep\sfor\sreuse\sin\sexperimenting\swith\sthe\sOPFS\sall-synchronous\sAPI.
+D 2022-09-15T03:16:49.402
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -501,7 +501,7 @@ F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d695
 F ext/wasm/fiddle/fiddle-worker.js bccf46045be8824752876f3eec01c223be0616ccac184bffd0024cfe7a3262b8
 F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
 F ext/wasm/fiddle/fiddle.js 4ffcfc9a235beebaddec689a549e9e0dfad6dca5c1f0b41f03468d7e76480686
-F ext/wasm/index.html 97968cdfa957c9ede7c81df55c9a2276b1a9784dc41a9802d3d94ad9c30ba2ed
+F ext/wasm/index.html 7e38070c8c64738eb3893be19e1291d66629fc424f1a70e12c4b459d51dbeffe
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 447cc02b598f7792edaa8ae6853a7847b8178a18ed356afacbdbf312b2588106
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
@@ -509,11 +509,11 @@ F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e5
 F ext/wasm/kvvfs.make 99d61a438232d03f7a39fff05a5738d00d5af629e54b3f03caf87f041c194d51
 F ext/wasm/kvvfs1.html 13bb24190bfb276a57b228499519badcc1bf39ed07e4b37bc2a425ce6418fed1
 F ext/wasm/kvvfs1.js ec1c1d071bb055711f9151df05616111432cf3e6bf7ac7f8dcbcfb56c9d9ed48
-F ext/wasm/scratchpad-opfs-worker.html 66c1d15d678f3bd306373d76b61c6c8aef988f61f4a8dd40185d452f9c6d2bf5
+F ext/wasm/scratchpad-opfs-worker.html 5fdda167571264300f388847d34f00b77dd48984a8dba2ee9c099c3ffa05db66
 F ext/wasm/scratchpad-opfs-worker.js 3ec2868c669713145c76eb5877c64a1b20741f741817b87c907a154b676283a9
-F ext/wasm/scratchpad-opfs-worker2.js 779500d97140812509c04ba182de5bf76727052bdcbc09b3cedfb71a8574e07b
-F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06 w ext/wasm/scratchpad-opfs-main.html
-F ext/wasm/scratchpad-wasmfs-main.js 69e960e9161f6412fd0c30f355d4112f1894d6609eb431e2d16d207d1380518e w ext/wasm/scratchpad-opfs-main.js
+F ext/wasm/scratchpad-opfs-worker2.js 8cd4961e1c96fbaad9743a34cd17d0d27b9286b845e77242d444a4c78fe2a810
+F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
+F ext/wasm/scratchpad-wasmfs-main.js 69e960e9161f6412fd0c30f355d4112f1894d6609eb431e2d16d207d1380518e
 F ext/wasm/speedtest1-kvvfs.html fe7d314343b275f8b241af83267ca56274ea995535c6abca4d6e568a98fa31e3
 F ext/wasm/speedtest1-worker.html 6b5fda04d0b69e8c2651689356cb0c28fd33aa1a82b03dcbc8b0d68fbd7ed57f
 F ext/wasm/speedtest1-worker.js 356b9953add4449acf199793db9b76b11ee016021918d8daffd19f08ec68d305
@@ -529,7 +529,7 @@ F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d766
 F ext/wasm/testing1.js 7cd8ab255c238b030d928755ae8e91e7d90a12f2ae601b1b8f7827aaa4fb258e
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
 F ext/wasm/testing2.js 25584bcc30f19673ce13a6f301f89f8820a59dfe044e0c4f2913941f4097fe3c
-F ext/wasm/wasmfs.make 86ce03d75a462ef4431e0c2d851f707156975bca5347daa8d8a1cb430ba83a62
+F ext/wasm/wasmfs.make 44c35734f531199dab7c49f82ed265344c86aa03d741fd7911ddb4de0c551ddd
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
@@ -2025,8 +2025,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 925fdbfc6c1f9f06951346bc0d4fb81ffb5797d5f1123728931973f6cb1a0efa
-R a69df33d531c68d33c70b5a00ef5df51
+P 08476f3c218d45846e7496bdae0b06e2122466111fdf2aa2aabb1805b15ef982
+R 520f42f1cc70efba1aa8d99f68fa03bf
 U stephan
-Z bd73fd5e630d2b9c280c487da7e4705d
+Z a50915abdf47f7036b78a2ce4e5a53d8
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 1f14dcc292..d3cb0d93c3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-08476f3c218d45846e7496bdae0b06e2122466111fdf2aa2aabb1805b15ef982
\ No newline at end of file
+4cbbd370186f84e440f496e7f11c641d7dc1723acc46e4a31483392e0eb046e9
\ No newline at end of file

From 73390f09c2e93c61e4da507d2b61e4cf03a98b59 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Thu, 15 Sep 2022 03:54:52 +0000
Subject: [PATCH 109/428] Fix windows builds of recover extension.

FossilOrigin-Name: abcbb6abfe08fc590123f0aa1bd72cfdecc75908f078f1348dc0e957de98bf52
---
 Makefile.msc                 |  6 ++++++
 ext/recover/sqlite3recover.c | 18 +++++++-----------
 manifest                     | 14 +++++++-------
 manifest.uuid                |  2 +-
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/Makefile.msc b/Makefile.msc
index 9baa4ae937..4abf2d8e82 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -1587,6 +1587,9 @@ TESTEXT = \
   $(TOP)\ext\misc\unionvtab.c \
   $(TOP)\ext\misc\wholenumber.c \
   $(TOP)\ext\rtree\test_rtreedoc.c \
+  $(TOP)\ext\recover\sqlite3recover.c \
+  $(TOP)\ext\recover\test_recover.c \
+  $(TOP)\ext\misc\dbdata.c \
   fts5.c
 
 # If use of zlib is enabled, add the "zipfile.c" source file.
@@ -2224,6 +2227,9 @@ SHELL_SRC = \
 	$(TOP)\ext\expert\sqlite3expert.c \
 	$(TOP)\ext\expert\sqlite3expert.h \
 	$(TOP)\ext\misc\memtrace.c \
+	$(TOP)/ext/misc/dbdata.c \
+	$(TOP)/ext/recover/sqlite3recover.c \
+	$(TOP)/ext/recover/sqlite3recover.h \
 	$(TOP)\src\test_windirent.c
 
 # If use of zlib is enabled, add the "zipfile.c" source file.
diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index 6c52d99855..a370ca0c46 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -137,7 +137,7 @@ struct RecoverColumn {
 typedef struct RecoverBitmap RecoverBitmap;
 struct RecoverBitmap {
   i64 nPg;                        /* Size of bitmap */
-  u32 aElem[0];                   /* Array of 32-bit bitmasks */
+  u32 aElem[1];                   /* Array of 32-bit bitmasks */
 };
 
 /*
@@ -999,8 +999,8 @@ static int recoverWriteSchema1(sqlite3_recover *p){
         recoverSqlCallback(p, zSql);
         if( bTable && !bVirtual ){
           if( SQLITE_ROW==sqlite3_step(pTblname) ){
-            const char *zName = sqlite3_column_text(pTblname, 0);
-            recoverAddTable(p, zName, iRoot);
+            const char *zTbl = (const char*)sqlite3_column_text(pTblname, 0);
+            recoverAddTable(p, zTbl, iRoot);
           }
           recoverReset(p, pTblname);
         }
@@ -1252,7 +1252,6 @@ static sqlite3_stmt *recoverLostAndFoundInsert(
   int nTotal = nField + 4;
   int ii;
   char *zBind = 0;
-  const char *zSep = "";
   sqlite3_stmt *pRet = 0;
 
   if( p->xSql==0 ){
@@ -1328,7 +1327,7 @@ static void recoverLostAndFoundPopulate(
         recoverBindValue(p, pInsert, 5+ii, apVal[ii]);
       }
       if( sqlite3_step(pInsert)==SQLITE_ROW ){
-        recoverSqlCallback(p, sqlite3_column_text(pInsert, 0));
+        recoverSqlCallback(p, (const char*)sqlite3_column_text(pInsert, 0));
       }
       recoverReset(p, pInsert);
 
@@ -1376,7 +1375,7 @@ static void recoverLostAndFoundPopulate(
 ** db and writes all orphaned rows to it. Or, if the recover handle is
 ** in SQL callback mode, issues equivalent callbacks.
 */
-static int recoverLostAndFound(sqlite3_recover *p){
+static void recoverLostAndFound(sqlite3_recover *p){
   i64 nPg = 0;
   RecoverBitmap *pMap = 0;
 
@@ -1558,9 +1557,7 @@ static int recoverWriteData(sqlite3_recover *p){
 
           if( bNewCell ){
             if( nVal>=0 ){
-              int ii;
               int iVal = 0;
-              int iBind = 1;
 
               if( pInsert==0 || nVal!=nInsert ){
                 recoverFinalize(p, pInsert);
@@ -1570,9 +1567,8 @@ static int recoverWriteData(sqlite3_recover *p){
               if( nVal>0 ){
                 for(ii=0; ii<pTab->nCol; ii++){
                   RecoverColumn *pCol = &pTab->aCol[ii];
-
-                  if( pCol->iBind>0 ){
-                    int iBind = pCol->iBind;
+		  int iBind = pCol->iBind;
+                  if( iBind>0 ){
                     if( pCol->bIPK ){
                       sqlite3_bind_int64(pInsert, iBind, iRowid);
                     }else if( pCol->iField<nVal ){
diff --git a/manifest b/manifest
index 77ef3c20e0..c20e260d60 100644
--- a/manifest
+++ b/manifest
@@ -1,11 +1,11 @@
-C Include\srecovery\sextension\sin\sconfigure/make\sbuilds\sof\stestfixture.
-D 2022-09-14T20:45:46.778
+C Fix\swindows\sbuilds\sof\srecover\sextension.
+D 2022-09-15T03:54:52.116
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
 F Makefile.in 1dd98f0349f14a7b106ae05904d4d040b4d20f2ab8e2d3c34f8231ba08948e42
 F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
-F Makefile.msc d547a2fdba38a1c6cd1954977d0b0cc017f5f8fbfbc65287bf8d335808938016
+F Makefile.msc 8a3c44169360ac55ceb55ac9f81bacb5f27b65eb5cb8b59a0c18a122c6edf4ed
 F README.md 8b8df9ca852aeac4864eb1e400002633ee6db84065bd01b78c33817f97d31f5e
 F VERSION 8868ddfa6e1eee218286021a94b3e22d13e550c76c72d878857547ca001de24a
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -397,7 +397,7 @@ F ext/recover/recoverfault2.test 321036336af23e778a87f148c4cc4407f88fbdab1fd72dd
 F ext/recover/recoverold.test 46e9d99b595fac583d4c67f74d7d89c20a435c752ef6eeb3e918b599940c88e0
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
-F ext/recover/sqlite3recover.c 29cb0ef3ff22e4a813d741930be123b7a44d59ba4c93868e74c4b0ebbee90a62
+F ext/recover/sqlite3recover.c 699d14bf128f103f823dbeef0aa4987ae0f8cd822b113fca5be5615ca57f28de
 F ext/recover/sqlite3recover.h 81108efb8c4618d3d9c6da4df785212b0e4501aa0d25edfc463405fe839a6640
 F ext/recover/test_recover.c 72a765616a3fa9dae2ed537d79b00f365d9f639d347858341b71bda7a3a45f56
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -2012,8 +2012,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 deed5336931b23bb507c064d08e9899b33f04e4f7eee03beb8d7147eb4caa030
-R 280ffbfae11c88d50514166a9090fc16
+P d2f4652144c4a54012a2176c178c5ade3463bd017515f472cfa8dafdde192df3
+R 9e3a41d484514f69e10e038c6c38b48d
 U dan
-Z 303ba5cc3bab2dbc239e16c7c361938c
+Z 602ce8dc722093a825536633983df6e0
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index bf8054daff..c8d62a0caa 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d2f4652144c4a54012a2176c178c5ade3463bd017515f472cfa8dafdde192df3
\ No newline at end of file
+abcbb6abfe08fc590123f0aa1bd72cfdecc75908f078f1348dc0e957de98bf52
\ No newline at end of file

From 28ef9bddb3bdd823711d818d67ba16ae286c6c69 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Thu, 15 Sep 2022 06:42:41 +0000
Subject: [PATCH 110/428] More work on the synchronous OPFS experimentation.
 Numerous wasm/js build tweaks. Add speeedtest-wasmfs.html, the wasmfs/opfs
 counterpart of speedtest1.html.

FossilOrigin-Name: 00ee49a3a2c148480f614e49a0ee5b35a255758c0a53693f0b464b31e7a4045b
---
 ext/wasm/EXPORTED_FUNCTIONS.fiddle   |   2 -
 ext/wasm/GNUmakefile                 |  79 +++--
 ext/wasm/api/sqlite3-api-oo1.js      |  11 +-
 ext/wasm/api/sqlite3-api-prologue.js |   4 +-
 ext/wasm/api/sqlite3-wasm.c          |  10 +-
 ext/wasm/index.html                  |   1 +
 ext/wasm/kvvfs.make                  |  10 +-
 ext/wasm/scratchpad-opfs-worker.js   |  23 +-
 ext/wasm/scratchpad-opfs-worker2.js  | 445 +++++++++++++++++++++++++--
 ext/wasm/speedtest1-wasmfs.html      | 159 ++++++++++
 ext/wasm/speedtest1-worker.html      |  16 +-
 ext/wasm/speedtest1-worker.js        |   9 +-
 ext/wasm/speedtest1.html             |   8 +-
 ext/wasm/wasmfs.make                 | 133 ++++----
 manifest                             |  37 +--
 manifest.uuid                        |   2 +-
 16 files changed, 792 insertions(+), 157 deletions(-)
 create mode 100644 ext/wasm/speedtest1-wasmfs.html

diff --git a/ext/wasm/EXPORTED_FUNCTIONS.fiddle b/ext/wasm/EXPORTED_FUNCTIONS.fiddle
index 602d612548..b96ce4e67c 100644
--- a/ext/wasm/EXPORTED_FUNCTIONS.fiddle
+++ b/ext/wasm/EXPORTED_FUNCTIONS.fiddle
@@ -5,5 +5,3 @@ _fiddle_the_db
 _fiddle_db_arg
 _fiddle_db_filename
 _fiddle_reset_db
-_sqlite3_wasm_init_opfs
-_sqlite3_wasm_vfs_unlink
diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 3e1bc90248..390472dea2 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -9,10 +9,11 @@
 # components).
 SHELL := $(shell which bash 2>/dev/null)
 all:
+emcc_opt ?= -O0
 
 .PHONY: fiddle
 ifneq (,$(wildcard /home/stephan))
-  fiddle_opt ?= -O0
+  fiddle_opt ?= $(emcc_opt)
 else
   fiddle_opt = -Os
 endif
@@ -61,7 +62,6 @@ SQLITE_OPT = \
 # SQLITE_OMIT_LOAD_EXTENSION: if this is true, sqlite3_vfs::xDlOpen
 # and friends may be NULL.
 
-emcc_opt ?= -O0
 .PHONY: release
 release:
 	$(MAKE) 'emcc_opt=-Os -g3 -flto'
@@ -101,12 +101,12 @@ wasm-strip ?= $(shell which wasm-strip 2>/dev/null)
 ifeq (,$(filter clean,$(MAKECMDGOALS)))
 ifeq (,$(wasm-strip))
   $(info WARNING: *******************************************************************)
-  $(info WARNING: builds using -O3/-Os/-Oz will minify WASM-exported names,)
+  $(info WARNING: builds using -O2/-O3/-Os/-Oz will minify WASM-exported names,)
   $(info WARNING: breaking _All The Things_. The workaround for that is to build)
   $(info WARNING: with -g3 (which explodes the file size) and then strip the debug)
   $(info WARNING: info after compilation, using wasm-strip, to shrink the wasm file.)
   $(info WARNING: wasm-strip was not found in the PATH so we cannot strip those.)
-  $(info WARNING: If this build uses any optimization level higher than -O2 then)
+  $(info WARNING: If this build uses any optimization level higher than -O1 then)
   $(info WARNING: the ***resulting WASM binary WILL NOT BE USABLE***.)
   $(info WARNING: wasm-strip is part of the wabt package:)
   $(info WARNING:    https://github.com/WebAssembly/wabt)
@@ -116,6 +116,13 @@ ifeq (,$(wasm-strip))
 endif
 endif # 'make clean' check
 
+
+ifeq (,$(wasm-strip))
+  maybe-wasm-strip = echo "not wasm-stripping"
+else
+  maybe-wasm-strip = $(wasm-strip)
+endif
+
 ifeq (release,$(filter release,$(MAKECMDGOALS)))
   ifeq (,$(wasm-strip))
     $(error Cannot make release-quality binary because wasm-strip is not available. \
@@ -286,9 +293,7 @@ $(sqlite3.js): $(MAKEFILE) $(sqlite3.wasm.obj) \
 	@echo "Building $@ ..."
 	$(emcc.bin) -o $(sqlite3.js) $(emcc_opt) $(emcc.flags) $(emcc.jsflags) $(sqlite3.wasm.obj)
 	chmod -x $(sqlite3.wasm)
-ifneq (,$(wasm-strip))
-	$(wasm-strip) $(sqlite3.wasm)
-endif
+	$(maybe-wasm-strip) $(sqlite3.wasm)
 	@ls -la $@ $(sqlite3.wasm)
 
 CLEAN_FILES += $(sqlite3.js) $(sqlite3.wasm)
@@ -321,25 +326,28 @@ all: batch
 # end batch-runner.js
 ########################################################################
 # speedtest1.js...
-emcc.speedtest1-flags := -g $(emcc_opt)
-emcc.speedtest1-flags += -sINVOKE_RUN=0
-#emcc.speedtest1-flags += --no-entry
-emcc.speedtest1-flags += -flto
-emcc.speedtest1-flags += -sABORTING_MALLOC
-emcc.speedtest1-flags += -sINITIAL_MEMORY=128450560
-emcc.speedtest1-flags += -sSTRICT_JS
-emcc.speedtest1-flags += $(emcc.environment)
-emcc.speedtest1-flags += -sMODULARIZE
-emcc.speedtest1-flags += -sEXPORT_NAME=sqlite3Speedtest1InitModule
-emcc.speedtest1-flags += -Wno-limited-postlink-optimizations
-emcc.speedtest1-flags += -sEXPORTED_FUNCTIONS=_main,_malloc,_free,_sqlite3_wasm_vfs_unlink,_sqlite3_wasm_init_opfs
-emcc.speedtest1-flags += -sDYNAMIC_EXECUTION=0
-emcc.speedtest1-flags += --minify 0
+# speedtest1-common.eflags = emcc flags used by multiple builds of speedtest1
+# speedtest1.eflags = emcc flags used by main build of speedtest1
+speedtest1-common.eflags := -g $(emcc_opt)
+speedtest1.eflags :=
+speedtest1-common.eflags += -sINVOKE_RUN=0
+#speedtest1-common.eflags += --no-entry
+speedtest1-common.eflags += -flto
+speedtest1-common.eflags += -sABORTING_MALLOC
+speedtest1-common.eflags += -sINITIAL_MEMORY=128450560
+speedtest1-common.eflags += -sSTRICT_JS
+speedtest1-common.eflags += -sMODULARIZE
+speedtest1-common.eflags += -Wno-limited-postlink-optimizations
+speedtest1-common.eflags += -sEXPORTED_FUNCTIONS=_main,_malloc,_free
+speedtest1-common.eflags += -sDYNAMIC_EXECUTION=0
+speedtest1-common.eflags += --minify 0
+speedtest1-common.eflags += -sEXPORT_NAME=sqlite3Speedtest1InitModule
+speedtest1.eflags += -sENVIRONMENT=web
 
 speedtest1.js := speedtest1.js
 speedtest1.wasm := $(subst .js,.wasm,$(speedtest1.js))
 speedtest1.cflags := \
-  -I. -I$(dir.top) \
+  -I. -I.. -I$(dir.top) \
   -DSQLITE_SPEEDTEST1_WASM
 
 $(speedtest1.js): emcc.cflags+=
@@ -350,13 +358,11 @@ $(speedtest1.js): emcc.cflags+=
 $(speedtest1.js): $(speedtest1.c) $(sqlite3-wasm.c) $(MAKEFILE) $(sqlite3.c)
 	@echo "Building $@ ..."
 	$(emcc.bin) \
-        $(emcc.speedtest1-flags) $(speedtest1.cflags) \
+        $(speedtest1.eflags) $(speedtest1-common.eflags) $(speedtest1.cflags) \
         $(SQLITE_OPT) \
         '-DSQLITE_DEFAULT_UNIX_VFS="unix-none"' \
         -o $@ $(speedtest1.c) $(sqlite3-wasm.c) -lm
-ifneq (,$(wasm-strip))
-	$(wasm-strip) $(speedtest1.wasm)
-endif
+	$(maybe-wasm-strip) $(speedtest1.wasm)
 	ls -la $@ $(speedtest1.wasm)
 
 speedtest1: $(speedtest1.js)
@@ -388,5 +394,26 @@ push-fiddle: $(fiddle_files)
 # end fiddle remote push
 ########################################################################
 
+########################################################################
+# Convenience rules to rebuild with various -Ox levels. Much
+# experimentation shows -O2 to be the clear winner in terms of speed.
+# Note that build times with anything higher than -O0 are somewhat
+# painful.
+.PHONY: o0 o1 o2 o3 os oz
+o0:
+	$(MAKE) clean; $(MAKE) -e emcc_opt=-O0
+o1:
+	$(MAKE) clean; $(MAKE) -e emcc_opt=-O1
+o2:
+	$(MAKE) clean; $(MAKE) -e emcc_opt=-O2
+o3:
+	$(MAKE) clean; $(MAKE) -e emcc_opt=-O3
+os:
+	$(MAKE) clean; $(MAKE) -e emcc_opt=-Os
+oz:
+	$(MAKE) clean; $(MAKE) -e emcc_opt=-Oz
+
+########################################################################
+# Sub-makes...
 include kvvfs.make
 include wasmfs.make
diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index 6a8c229392..368986933f 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -1383,12 +1383,11 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
       return this.reset();
     },
     /**
-       Functions like step() except that
-       it finalizes this statement immediately after stepping unless
-       the step cannot be performed because the statement is
-       locked. Throws on error, but any error other than the
-       statement-is-locked case will also trigger finalization of this
-       statement.
+       Functions like step() except that it finalizes this statement
+       immediately after stepping unless the step cannot be performed
+       because the statement is locked. Throws on error, but any error
+       other than the statement-is-locked case will also trigger
+       finalization of this statement.
 
        On success, it returns true if the step indicated that a row of
        data was available, else it returns false.
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 1c22e9ea21..3d6d4c92b5 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -720,7 +720,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     }
     try{
       if(pdir && 0===capi.wasm.xCallWrapped(
-        'sqlite3_wasm_init_opfs', 'i32', ['string'], pdir
+        'sqlite3_wasm_init_wasmfs', 'i32', ['string'], pdir
       )){
         /** OPFS does not support locking and will trigger errors if
             we try to lock. We don't _really_ want to
@@ -739,7 +739,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
         return __persistentDir = "";
       }
     }catch(e){
-      // sqlite3_wasm_init_opfs() is not available
+      // sqlite3_wasm_init_wasmfs() is not available
       return __persistentDir = "";
     }
   };
diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index c072e8c9d4..eb8f58b402 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -510,7 +510,7 @@ int sqlite3_wasm_vfs_unlink(const char * zName){
   return rc;
 }
 
-#if defined(__EMSCRIPTEN__) && defined(SQLITE_WASM_OPFS)
+#if defined(__EMSCRIPTEN__) && defined(SQLITE_WASM_WASMFS)
 #include <emscripten/wasmfs.h>
 #include <emscripten/console.h>
 
@@ -532,11 +532,11 @@ int sqlite3_wasm_vfs_unlink(const char * zName){
 **
 ** Returns 0 on success, SQLITE_NOMEM if instantiation of the backend
 ** object fails, SQLITE_IOERR if mkdir() of the zMountPoint dir in
-** the virtual FS fails. In builds compiled without SQLITE_WASM_OPFS
+** the virtual FS fails. In builds compiled without SQLITE_WASM_WASMFS
 ** defined, SQLITE_NOTFOUND is returned without side effects.
 */
 WASM_KEEP
-int sqlite3_wasm_init_opfs(const char *zMountPoint){
+int sqlite3_wasm_init_wasmfs(const char *zMountPoint){
   static backend_t pOpfs = 0;
   if( !zMountPoint || !*zMountPoint ) zMountPoint = "/persistent";
   if( !pOpfs ){
@@ -562,10 +562,10 @@ int sqlite3_wasm_init_opfs(const char *zMountPoint){
 }
 #else
 WASM_KEEP
-int sqlite3_wasm_init_opfs(void){
+int sqlite3_wasm_init_wasmfs(void){
   return SQLITE_NOTFOUND;
 }
-#endif /* __EMSCRIPTEN__ && SQLITE_WASM_OPFS */
+#endif /* __EMSCRIPTEN__ && SQLITE_WASM_WASMFS */
 
 
 #undef WASM_KEEP
diff --git a/ext/wasm/index.html b/ext/wasm/index.html
index 4b21839a4a..383045ea2c 100644
--- a/ext/wasm/index.html
+++ b/ext/wasm/index.html
@@ -39,6 +39,7 @@
         <li><a href='batch-runner.html'>batch-runner</a>: runs batches of SQL exported from speedtest1.</li>
         <li><a href='speedtest1.html'>speedtest1</a>: a main-thread WASM build of speedtest1.</li>
         <li><a href='speedtest1-worker.html'>speedtest1-worker</a>: an interactive Worker-thread variant of speedtest1.</li>
+        <li><a href='speedtest1-wasmfs.html'>speedtest1-wasmfs</a>: a variant of speedtest1 built solely for the wasmfs/opfs feature.</li>
         <li><a href='speedtest1-kvvfs.html'>speedtest1-kvvfs</a>: a variant of speedtest1 built solely for the kv-vfs feature.</li>
         <li><a href='kvvfs1.html'>kvvfs1</a>: very basic demo of using the key-value vfs for storing
           a persistent db in JS localStorage or sessionStorage.</li>
diff --git a/ext/wasm/kvvfs.make b/ext/wasm/kvvfs.make
index 3ef9dbddf9..293bcee04f 100644
--- a/ext/wasm/kvvfs.make
+++ b/ext/wasm/kvvfs.make
@@ -88,9 +88,7 @@ $(kvvfs.js): $(kvvfs.wasm.c) $(sqlite3.c) $(kvvfs.extra.c) \
       $(SQLITE_OPT) \
       $(kvvfs.cflags) $(kvvfs.jsflags) $(kvvfs.wasm.c) $(kvvfs.extra.c)
 	chmod -x $(kvvfs.wasm)
-ifneq (,$(wasm-strip))
-	$(wasm-strip) $(kvvfs.wasm)
-endif
+	$(maybe-wasm-strip) $(kvvfs.wasm)
 	@ls -la $@ $(kvvfs.wasm)
 
 kvvfs: $(kvvfs.js)
@@ -103,14 +101,12 @@ speedtest1-kvvfs.wasm := speedtest1-kvvfs.wasm
 CLEAN_FILES += $(speedtest1-kvvfs.js) $(speedtest1-kvvfs.wasm)
 $(speedtest1-kvvfs.js): $(speedtest1.c) $(sqlite3-wasm.c) $(sqlite3.c) $(MAKEFILE.kvvfs)
 	$(emcc.bin) \
-      $(emcc.speedtest1-flags) $(speedtest1.cflags) \
+      $(speedtest1.eflags) $(speedtest1-common.eflags) $(speedtest1.cflags) \
       $(SQLITE_OPT) \
       -sEXIT_RUNTIME=1 \
       $(kvvfs.cflags) \
       -o $@ $(speedtest1.c) $(sqlite3-wasm.c) -lm
-ifneq (,$(wasm-strip))
-	$(wasm-strip) $(speedtest1-kvvfs.wasm)
-endif
+	$(maybe-wasm-strip) $(speedtest1-kvvfs.wasm)
 	ls -la $@ $(speedtest1-kvvfs.wasm)
 
 speedtest1: $(speedtest1-kvvfs.js)
diff --git a/ext/wasm/scratchpad-opfs-worker.js b/ext/wasm/scratchpad-opfs-worker.js
index debd0245e0..e27164775c 100644
--- a/ext/wasm/scratchpad-opfs-worker.js
+++ b/ext/wasm/scratchpad-opfs-worker.js
@@ -16,11 +16,26 @@
 'use strict';
 (function(){
   const toss = function(...args){throw new Error(args.join(' '))};
-  const log = console.log.bind(console),
-        warn = console.warn.bind(console),
-        error = console.error.bind(console);
+  const eOutput = document.querySelector('#test-output');
+  const logHtml = function(cssClass,...args){
+    if(Array.isArray(args[0])) args = args[0];
+    const ln = document.createElement('div');
+    if(cssClass) ln.classList.add(cssClass);
+    ln.append(document.createTextNode(args.join(' ')));
+    eOutput.append(ln);
+  };
+  const log = function(...args){
+    logHtml('',...args);
+  };
+  const error = function(...args){
+    logHtml('error',...args);
+  };
+  const warn = function(...args){
+    logHtml('warning',...args);
+  };
+
   const W = new Worker("scratchpad-opfs-worker2.js");
-  self.onmessage = function(ev){
+  W.onmessage = function(ev){
     ev = ev.data;
     const d = ev.data;
     switch(ev.type){
diff --git a/ext/wasm/scratchpad-opfs-worker2.js b/ext/wasm/scratchpad-opfs-worker2.js
index 04b6bfc274..64e5266db2 100644
--- a/ext/wasm/scratchpad-opfs-worker2.js
+++ b/ext/wasm/scratchpad-opfs-worker2.js
@@ -16,25 +16,404 @@
   is, quite frankly, broken).
 */
 'use strict';
-(function(){
-  const toss = function(...args){throw new Error(args.join(' '))};
-  importScripts('sqlite3.js');
+
+const toss = function(...args){throw new Error(args.join(' '))};
+/**
+   Posts a message in the form {type,data} unless passed more than 2
+   args, in which case it posts {type, data:[arg1...argN]}.
+*/
+const wMsg = function(type,data){
+  postMessage({
+    type,
+    data: arguments.length<3
+      ? data
+      : Array.prototype.slice.call(arguments,1)
+  });
+};
+
+const stdout = function(...args){
+  wMsg('stdout',args);
+  console.log(...args);
+};
+const stderr = function(...args){
+  wMsg('stderr',args);
+  console.error(...args);
+};
+
+const log = console.log.bind(console);
+const warn = console.warn.bind(console);
+const error = console.error.bind(console);
+
+
+const initOpfsBits = async function(sqlite3){
+  if(!self.importScripts || !self.FileSystemFileHandle){
+    //|| !self.FileSystemFileHandle.prototype.createSyncAccessHandle){
+    // ^^^ sync API is not required with WASMFS/OPFS backend.
+    warn("OPFS is not available in this environment.");
+    return;
+  }else if(!sqlite3.capi.wasm.bigIntEnabled){
+    error("OPFS requires BigInt support but sqlite3.capi.wasm.bigIntEnabled is false.");
+    return;
+  }
+  //warn('self.FileSystemFileHandle =',self.FileSystemFileHandle);
+  //warn('self.FileSystemFileHandle.prototype =',self.FileSystemFileHandle.prototype);
+  const capi = sqlite3.capi,
+        wasm = capi.wasm;
+  const sqlite3_vfs = capi.sqlite3_vfs
+        || toss("Missing sqlite3.capi.sqlite3_vfs object.");
+  const sqlite3_file = capi.sqlite3_file
+        || toss("Missing sqlite3.capi.sqlite3_file object.");
+  const sqlite3_io_methods = capi.sqlite3_io_methods
+        || toss("Missing sqlite3.capi.sqlite3_io_methods object.");
+  const StructBinder = sqlite3.StructBinder || toss("Missing sqlite3.StructBinder.");
+  const debug = console.debug.bind(console),
+        log = console.log.bind(console);
+  warn("UNDER CONSTRUCTION: setting up OPFS VFS...");
+
+  const pDVfs = capi.sqlite3_vfs_find(null)/*pointer to default VFS*/;
+  const dVfs = pDVfs
+        ? new sqlite3_vfs(pDVfs)
+        : null /* dVfs will be null when sqlite3 is built with
+                  SQLITE_OS_OTHER. Though we cannot currently handle
+                  that case, the hope is to eventually be able to. */;
+  const oVfs = new sqlite3_vfs();
+  const oIom = new sqlite3_io_methods();
+  oVfs.$iVersion = 2/*yes, two*/;
+  oVfs.$szOsFile = capi.sqlite3_file.structInfo.sizeof;
+  oVfs.$mxPathname = 1024/*sure, why not?*/;
+  oVfs.$zName = wasm.allocCString("opfs");
+  oVfs.ondispose = [
+    '$zName', oVfs.$zName,
+    'cleanup dVfs', ()=>(dVfs ? dVfs.dispose() : null)
+  ];
+  if(dVfs){
+    oVfs.$xSleep = dVfs.$xSleep;
+    oVfs.$xRandomness = dVfs.$xRandomness;
+  }
+  // All C-side memory of oVfs is zeroed out, but just to be explicit:
+  oVfs.$xDlOpen = oVfs.$xDlError = oVfs.$xDlSym = oVfs.$xDlClose = null;
 
   /**
-     Posts a message in the form {type,data} unless passed more than 2
-     args, in which case it posts {type, data:[arg1...argN]}.
+     Pedantic sidebar about oVfs.ondispose: the entries in that array
+     are items to clean up when oVfs.dispose() is called, but in this
+     environment it will never be called. The VFS instance simply
+     hangs around until the WASM module instance is cleaned up. We
+     "could" _hypothetically_ clean it up by "importing" an
+     sqlite3_os_end() impl into the wasm build, but the shutdown order
+     of the wasm engine and the JS one are undefined so there is no
+     guaranty that the oVfs instance would be available in one
+     environment or the other when sqlite3_os_end() is called (_if_ it
+     gets called at all in a wasm build, which is undefined).
   */
-  const wMsg = function(type,data){
-    postMessage({
-      type,
-      data: arguments.length<3
-        ? data
-        : Array.prototype.slice.call(arguments,1)
-    });
+
+  /**
+     Installs a StructBinder-bound function pointer member of the
+     given name and function in the given StructType target object.
+     It creates a WASM proxy for the given function and arranges for
+     that proxy to be cleaned up when tgt.dispose() is called.  Throws
+     on the slightest hint of error (e.g. tgt is-not-a StructType,
+     name does not map to a struct-bound member, etc.).
+
+     Returns a proxy for this function which is bound to tgt and takes
+     2 args (name,func). That function returns the same thing,
+     permitting calls to be chained.
+
+     If called with only 1 arg, it has no side effects but returns a
+     func with the same signature as described above.
+  */
+  const installMethod = function callee(tgt, name, func){
+    if(!(tgt instanceof StructBinder.StructType)){
+      toss("Usage error: target object is-not-a StructType.");
+    }
+    if(1===arguments.length){
+      return (n,f)=>callee(tgt,n,f);
+    }
+    if(!callee.argcProxy){
+      callee.argcProxy = function(func,sig){
+        return function(...args){
+          if(func.length!==arguments.length){
+            toss("Argument mismatch. Native signature is:",sig);
+          }
+          return func.apply(this, args);
+        }
+      };
+      callee.removeFuncList = function(){
+        if(this.ondispose.__removeFuncList){
+          this.ondispose.__removeFuncList.forEach(
+            (v,ndx)=>{
+              if('number'===typeof v){
+                try{wasm.uninstallFunction(v)}
+                catch(e){/*ignore*/}
+              }
+              /* else it's a descriptive label for the next number in
+                 the list. */
+            }
+          );
+          delete this.ondispose.__removeFuncList;
+        }
+      };
+    }/*static init*/
+    const sigN = tgt.memberSignature(name);
+    if(sigN.length<2){
+      toss("Member",name," is not a function pointer. Signature =",sigN);
+    }
+    const memKey = tgt.memberKey(name);
+    //log("installMethod",tgt, name, sigN);
+    const fProxy = 1
+          // We can remove this proxy middle-man once the VFS is working
+          ? callee.argcProxy(func, sigN)
+          : func;
+    const pFunc = wasm.installFunction(fProxy, tgt.memberSignature(name, true));
+    tgt[memKey] = pFunc;
+    if(!tgt.ondispose) tgt.ondispose = [];
+    if(!tgt.ondispose.__removeFuncList){
+      tgt.ondispose.push('ondispose.__removeFuncList handler',
+                         callee.removeFuncList);
+      tgt.ondispose.__removeFuncList = [];
+    }
+    tgt.ondispose.__removeFuncList.push(memKey, pFunc);
+    return (n,f)=>callee(tgt, n, f);
+  }/*installMethod*/;
+
+  /**
+     Map of sqlite3_file pointers to OPFS handles.
+  */
+  const __opfsHandles = Object.create(null);
+
+  /**
+     Generates a random ASCII string len characters long, intended for
+     use as a temporary file name.
+  */
+  const randomFilename = function f(len=16){
+    if(!f._chars){
+      f._chars = "abcdefghijklmnopqrstuvwxyz"+
+        "ABCDEFGHIJKLMNOPQRSTUVWXYZ"+
+        "012346789";
+      f._n = f._chars.length;
+    }
+    const a = [];
+    let i = 0;
+    for( ; i < len; ++i){
+      const ndx = Math.random() * (f._n * 64) % f._n | 0;
+      a[i] = f._chars[ndx];
+    }
+    return a.join('');
   };
 
-  const stdout = console.log.bind(console);
-  const stderr = console.error.bind(console);//function(...args){wMsg('stderr', args);};
+  const rootDir = await navigator.storage.getDirectory();
+  log("rootDir =",rootDir);
+  
+  ////////////////////////////////////////////////////////////////////////
+  // Set up OPFS VFS methods...
+  let inst = installMethod(oVfs);
+  inst('xOpen', function(pVfs, zName, pFile, flags, pOutFlags){
+    const f = new sqlite3_file(pFile);
+    f.$pMethods = oIom.pointer;
+    __opfsHandles[pFile] = f;
+    f.opfsHandle = null /* TODO */;
+    if(flags & capi.SQLITE_OPEN_DELETEONCLOSE){
+      f.deleteOnClose = true;
+    }
+    f.filename = zName ? wasm.cstringToJs(zName) : 'sqlite3-xOpen-'+randomFilename();
+    error("OPFS sqlite3_vfs::xOpen is not yet full implemented.");
+    return capi.SQLITE_IOERR;
+  })
+  ('xFullPathname', function(pVfs,zName,nOut,pOut){
+    /* Until/unless we have some notion of "current dir"
+       in OPFS, simply copy zName to pOut... */
+    const i = wasm.cstrncpy(pOut, zName, nOut);
+    return i<nOut ? 0 : capi.SQLITE_CANTOPEN
+    /*CANTOPEN is required by the docs but SQLITE_RANGE would be a closer match*/;
+  })
+  ('xAccess', function(pVfs,zName,flags,pOut){
+    error("OPFS sqlite3_vfs::xAccess is not yet implemented.");
+    let fileExists = 0;
+    switch(flags){
+        case capi.SQLITE_ACCESS_EXISTS: break;
+        case capi.SQLITE_ACCESS_READWRITE: break;
+        case capi.SQLITE_ACCESS_READ/*docs say this is never used*/:
+        default:
+          error("Unexpected flags value for sqlite3_vfs::xAccess():",flags);
+          return capi.SQLITE_MISUSE;
+    }
+    wasm.setMemValue(pOut, fileExists, 'i32');
+    return 0;
+  })
+  ('xDelete', function(pVfs, zName, doSyncDir){
+    error("OPFS sqlite3_vfs::xDelete is not yet implemented.");
+    // https://source.chromium.org/chromium/chromium/src/+/main:third_party/blink/renderer/modules/file_system_access/file_system_handle.idl
+    // ==> remove()
+    return capi.SQLITE_IOERR;
+  })
+  ('xGetLastError', function(pVfs,nOut,pOut){
+    debug("OPFS sqlite3_vfs::xGetLastError() has nothing sensible to return.");
+    return 0;
+  })
+  ('xCurrentTime', function(pVfs,pOut){
+    /* If it turns out that we need to adjust for timezone, see:
+       https://stackoverflow.com/a/11760121/1458521 */
+    wasm.setMemValue(pOut, 2440587.5 + (new Date().getTime()/86400000),
+                     'double');
+    return 0;
+  })
+  ('xCurrentTimeInt64',function(pVfs,pOut){
+    // TODO: confirm that this calculation is correct
+    wasm.setMemValue(pOut, (2440587.5 * 86400000) + new Date().getTime(),
+                     'i64');
+    return 0;
+  });
+  if(!oVfs.$xSleep){
+    inst('xSleep', function(pVfs,ms){
+      error("sqlite3_vfs::xSleep(",ms,") cannot be implemented from "+
+           "JS and we have no default VFS to copy the impl from.");
+      return 0;
+    });
+  }
+  if(!oVfs.$xRandomness){
+    inst('xRandomness', function(pVfs, nOut, pOut){
+      const heap = wasm.heap8u();
+      let i = 0;
+      for(; i < nOut; ++i) heap[pOut + i] = (Math.random()*255000) & 0xFF;
+      return i;
+    });
+  }
+
+  ////////////////////////////////////////////////////////////////////////
+  // Set up OPFS sqlite3_io_methods...
+  inst = installMethod(oIom);
+  inst('xClose', async function(pFile){
+    warn("xClose(",arguments,") uses await");
+    const f = __opfsHandles[pFile];
+    delete __opfsHandles[pFile];
+    if(f.opfsHandle){
+      await f.opfsHandle.close();
+      if(f.deleteOnClose){
+        // TODO
+      }
+    }
+    f.dispose();
+    return 0;
+  })
+  ('xRead', /*i(ppij)*/function(pFile,pDest,n,offset){
+    /* int (*xRead)(sqlite3_file*, void*, int iAmt, sqlite3_int64 iOfst) */
+    try {
+      const f = __opfsHandles[pFile];
+      const heap = wasm.heap8u();
+      const b = new Uint8Array(heap.buffer, pDest, n);
+      const nRead = f.opfsHandle.read(b, {at: offset});
+      if(nRead<n){
+        // MUST zero-fill short reads (per the docs)
+        heap.fill(0, dest + nRead, n - nRead);
+      }
+      return 0;
+    }catch(e){
+      error("xRead(",arguments,") failed:",e);
+      return capi.SQLITE_IOERR_READ;
+    }
+  })
+  ('xWrite', /*i(ppij)*/function(pFile,pSrc,n,offset){
+    /* int (*xWrite)(sqlite3_file*, const void*, int iAmt, sqlite3_int64 iOfst) */
+    try {
+      const f = __opfsHandles[pFile];
+      const b = new Uint8Array(wasm.heap8u().buffer, pSrc, n);
+      const nOut = f.opfsHandle.write(b, {at: offset});
+      if(nOut<n){
+        error("xWrite(",arguments,") short write!");
+        return capi.SQLITE_IOERR_WRITE;
+      }
+      return 0;
+    }catch(e){
+      error("xWrite(",arguments,") failed:",e);
+      return capi.SQLITE_IOERR_WRITE;
+    }
+  })
+  ('xTruncate', /*i(pj)*/async function(pFile,sz){
+    /* int (*xTruncate)(sqlite3_file*, sqlite3_int64 size) */
+    try{
+      warn("xTruncate(",arguments,") uses await");
+      const f = __opfsHandles[pFile];
+      await f.opfsHandle.truncate(sz);
+      return 0;
+    }
+    catch(e){
+      error("xTruncate(",arguments,") failed:",e);
+      return capi.SQLITE_IOERR_TRUNCATE;
+    }
+  })
+  ('xSync', /*i(pi)*/async function(pFile,flags){
+    /* int (*xSync)(sqlite3_file*, int flags) */
+    try {
+      warn("xSync(",arguments,") uses await");
+      const f = __opfsHandles[pFile];
+      await f.opfsHandle.flush();
+      return 0;
+    }catch(e){
+      error("xSync(",arguments,") failed:",e);
+      return capi.SQLITE_IOERR_SYNC;
+    }
+  })
+  ('xFileSize', /*i(pp)*/async function(pFile,pSz){
+    /* int (*xFileSize)(sqlite3_file*, sqlite3_int64 *pSize) */
+    try {
+      warn("xFileSize(",arguments,") uses await");
+      const f = __opfsHandles[pFile];
+      const fsz = await f.opfsHandle.getSize();
+      capi.wasm.setMemValue(pSz, fsz,'i64');
+      return 0;
+    }catch(e){
+      error("xFileSize(",arguments,") failed:",e);
+      return capi.SQLITE_IOERR_SEEK;
+    }
+  })
+  ('xLock', /*i(pi)*/function(pFile,lockType){
+    /* int (*xLock)(sqlite3_file*, int) */
+    // Opening a handle locks it automatically.
+    warn("xLock(",arguments,") is a no-op");
+    return 0;
+  })
+  ('xUnlock', /*i(pi)*/function(pFile,lockType){
+    /* int (*xUnlock)(sqlite3_file*, int) */
+    // Opening a handle locks it automatically.
+    warn("xUnlock(",arguments,") is a no-op");
+    return 0;
+  })
+  ('xCheckReservedLock', /*i(pp)*/function(pFile,pOut){
+    /* int (*xCheckReservedLock)(sqlite3_file*, int *pResOut) */
+    // Exclusive lock is automatically acquired when opened
+    warn("xCheckReservedLock(",arguments,") is a no-op");
+    wasm.setMemValue(pOut,1,'i32');
+    return 0;
+  })
+  ('xFileControl', /*i(pip)*/function(pFile,op,pArg){
+    /* int (*xFileControl)(sqlite3_file*, int op, void *pArg) */
+    debug("xFileControl(",arguments,") is a no-op");
+    return capi.SQLITE_NOTFOUND;
+  })
+  ('xDeviceCharacteristics',/*i(p)*/function(pFile){
+    /* int (*xDeviceCharacteristics)(sqlite3_file*) */
+    debug("xDeviceCharacteristics(",pFile,")");
+    return capi.SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN;
+  });
+  // xSectorSize may be NULL
+  //('xSectorSize', function(pFile){
+  //  /* int (*xSectorSize)(sqlite3_file*) */
+  //  log("xSectorSize(",pFile,")");
+  //  return 4096 /* ==> SQLITE_DEFAULT_SECTOR_SIZE */;
+  //})
+
+  const rc = capi.sqlite3_vfs_register(oVfs.pointer, 0);
+  if(rc){
+    oVfs.dispose();
+    toss("sqlite3_vfs_register(OPFS) failed with rc",rc);
+  }
+  capi.sqlite3_vfs_register.addReference(oVfs, oIom);
+  warn("End of (very incomplete) OPFS setup.", oVfs);
+  //oVfs.dispose()/*only because we can't yet do anything with it*/;
+
+}/*initOpfsBits()*/;
+
+(async function(){
+  importScripts('sqlite3.js');
 
   const test1 = function(db){
     db.exec("create table if not exists t(a);")
@@ -47,7 +426,7 @@
       });
   };
 
-  const runTests = function(Module){
+  const runTests = async function(Module){
     //stdout("Module",Module);
     self._MODULE = Module /* this is only to facilitate testing from the console */;
     const sqlite3 = Module.sqlite3,
@@ -55,11 +434,39 @@
           oo = sqlite3.oo1,
           wasm = capi.wasm;
     stdout("Loaded sqlite3:",capi.sqlite3_libversion(), capi.sqlite3_sourceid());
-    const persistentDir = capi.sqlite3_web_persistent_dir();
-    if(persistentDir){
-      stderr("Persistent storage dir:",persistentDir);
+
+    if(1){
+      let errCount = 0;
+      [
+        'FileSystemHandle', 'FileSystemFileHandle', 'FileSystemDirectoryHandle',
+        'FileSystemHandle', 'FileSystemFileHandle', 'FileSystemDirectoryHandle'
+      ].forEach(function(n){
+        const f = self[n];
+        if(f){
+          warn(n,f);
+          warn(n+'.prototype',f.prototype);
+        }else{
+          stderr("MISSING",n);
+          ++errCount;
+        }
+      });
+      if(errCount) return;
+    }
+    await initOpfsBits(sqlite3);
+
+    if(1) return;
+    
+    let persistentDir;
+    if(1){
+      persistentDir = '';
     }else{
-      stderr("No persistent storage available.");
+      persistentDir = capi.sqlite3_web_persistent_dir();
+      if(persistentDir){
+        stderr("Persistent storage dir:",persistentDir);
+      }else{
+        stderr("No persistent storage available.");
+        return;
+      }
     }
     const startTime = performance.now();
     let db;
diff --git a/ext/wasm/speedtest1-wasmfs.html b/ext/wasm/speedtest1-wasmfs.html
new file mode 100644
index 0000000000..151ced89a3
--- /dev/null
+++ b/ext/wasm/speedtest1-wasmfs.html
@@ -0,0 +1,159 @@
+<!doctype html>
+<html lang="en-us">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
+    <link rel="stylesheet" href="common/emscripten.css"/>
+    <link rel="stylesheet" href="common/testing.css"/>
+    <title>speedtest1-wasmfs.wasm</title>
+  </head>
+  <body>
+    <header id='titlebar'><span>speedtest1-wasmfs.wasm</span></header>
+    <div>See also: <a href='speedtest1-worker.html'>A Worker-thread variant of this page.</a></div>
+    <!-- emscripten bits -->
+    <figure id="module-spinner">
+      <div class="spinner"></div>
+      <div class='center'><strong>Initializing app...</strong></div>
+      <div class='center'>
+        On a slow internet connection this may take a moment.  If this
+        message displays for "a long time", intialization may have
+        failed and the JavaScript console may contain clues as to why.
+      </div>
+    </figure>
+    <div class="emscripten" id="module-status">Downloading...</div>
+    <div class="emscripten">
+      <progress value="0" max="100" id="module-progress" hidden='1'></progress>  
+    </div><!-- /emscripten bits -->
+    <div class='warning'>This page starts running the main exe when it loads, which will
+      block the UI until it finishes! Adding UI controls to manually configure and start it
+      are TODO.</div>
+    </div>
+    <div class='warning'>Achtung: running it with the dev tools open may
+      <em>drastically</em> slow it down. For faster results, keep the dev
+      tools closed when running it!
+    </div>
+    <div>Output is delayed/buffered because we cannot update the UI while the
+      speedtest is running. Output will appear below when ready...
+    <div id='test-output'></div>
+    <script src="common/whwasmutil.js"></script>
+    <script src="common/SqliteTestUtil.js"></script>
+    <script src="speedtest1-wasmfs.js"></script>
+    <script>(function(){
+        /**
+           If this environment contains OPFS, this function initializes it and
+           returns the name of the dir on which OPFS is mounted, else it returns
+           an empty string.
+        */
+        const opfsDir = function f(wasmUtil){
+          if(undefined !== f._) return f._;
+          const pdir = '/persistent';
+          if( !self.FileSystemHandle
+              || !self.FileSystemDirectoryHandle
+              || !self.FileSystemFileHandle){
+            return f._ = "";
+          }
+          try{
+            if(0===wasmUtil.xCallWrapped(
+              'sqlite3_wasm_init_wasmfs', 'i32', ['string'], pdir
+            )){
+              return f._ = pdir;
+            }else{
+              return f._ = "";
+            }
+          }catch(e){
+            // sqlite3_wasm_init_wasmfs() is not available
+            return f._ = "";
+          }
+        };
+        opfsDir._ = undefined;
+
+        const eOut = document.querySelector('#test-output');
+        const log2 = function(cssClass,...args){
+          const ln = document.createElement('div');
+          if(cssClass) ln.classList.add(cssClass);
+          ln.append(document.createTextNode(args.join(' ')));
+          eOut.append(ln);
+          //this.e.output.lastElementChild.scrollIntoViewIfNeeded();
+        };
+        const logList = [];
+        const dumpLogList = function(){
+          logList.forEach((v)=>log2('',v));
+          logList.length = 0;
+        };
+        /* can't update DOM while speedtest is running unless we run
+           speedtest in a worker thread. */;
+        const log = (...args)=>{
+          console.log(...args);
+          logList.push(args.join(' '));
+        };
+        const logErr = function(...args){
+          console.error(...args);
+          logList.push('ERROR: '+args.join(' '));
+        };
+
+        const runTests = function(EmscriptenModule){
+          console.log("Module inited.",EmscriptenModule);
+          const wasm = {
+            exports: EmscriptenModule.asm,
+            alloc: (n)=>EmscriptenModule._malloc(n),
+            dealloc: (m)=>EmscriptenModule._free(m),
+            memory: EmscriptenModule.asm.memory || EmscriptenModule.wasmMemory
+          };
+          //console.debug('wasm =',wasm);
+          self.WhWasmUtilInstaller(wasm);
+          const unlink = wasm.xWrap("sqlite3_wasm_vfs_unlink", "int", ["string"]);
+          const pDir = opfsDir(wasm);
+          if(pDir) log2('',"Persistent storage:",pDir);
+          else{
+            log2('error',"Expecting persistent storage in this build.");
+            return;
+          }
+          const scope = wasm.scopedAllocPush();
+          const dbFile = 0 ? "" : pDir+"/speedtest1.db";
+          const urlArgs = self.SqliteTestUtil.processUrlArgs();
+          const argv = ["speedtest1"];
+          if(urlArgs.flags){
+            // transform flags=a,b,c to ["--a", "--b", "--c"]
+            argv.push(...(urlArgs.flags.split(',').map((v)=>'--'+v)));
+          }else{
+            argv.push(
+              "--singlethread",
+              "--nomutex",
+              "--nosync",
+              "--nomemstat"
+            );
+            //"--memdb", // note that memdb trumps the filename arg
+          }
+          if(argv.indexOf('--memdb')>=0){
+              log2('error',"WARNING: --memdb flag trumps db filename.");
+          }
+          argv.push("--big-transactions"/*important for tests 410 and 510!*/,
+                    dbFile);
+          console.log("argv =",argv);
+          // These log messages are not emitted to the UI until after main() returns. Fixing that
+          // requires moving the main() call and related cleanup into a timeout handler.
+          if(pDir) unlink(dbFile);
+          log2('',"Starting native app:\n ",argv.join(' '));
+          log2('',"This will take a while and the browser might warn about the runaway JS.",
+               "Give it time...");
+          logList.length = 0;
+          setTimeout(function(){
+              wasm.xCall('__main_argc_argv', argv.length,
+                         wasm.scopedAllocMainArgv(argv));
+              wasm.scopedAllocPop(scope);
+              if(pDir) unlink(dbFile);
+              logList.unshift("Done running native main(). Output:");
+              dumpLogList();
+          }, 50);
+        }/*runTests()*/;
+
+        self.sqlite3TestModule.print = log;
+        self.sqlite3TestModule.printErr = logErr;
+        sqlite3Speedtest1InitModule(self.sqlite3TestModule).then(function(M){
+          setTimeout(()=>runTests(M), 100);
+        });
+      })();
+    </script>
+  </body>
+</html>
diff --git a/ext/wasm/speedtest1-worker.html b/ext/wasm/speedtest1-worker.html
index ba74d9f7c6..0e0ca4c464 100644
--- a/ext/wasm/speedtest1-worker.html
+++ b/ext/wasm/speedtest1-worker.html
@@ -34,9 +34,14 @@
         </div>
         <div class='toolbar-inner-vertical'>
           <div id='toolbar-selected-flags'></div>
-          <span>&rarr; <a id='link-main-thread' href='#' target='main-thread'
-                          title='Start speedtest1.html with the selected flags'>speedtest1.html</a>
-          </span>
+          <div class='toolbar-inner-vertical'>
+            <span>&rarr; <a id='link-main-thread' href='#' target='speedtest-main'
+                            title='Start speedtest1.html with the selected flags'>speedtest1.html</a>
+            </span>
+            <span>&rarr; <a id='link-wasmfs' href='#' target='speedtest-wasmfs'
+                            title='Start speedtest1-wasmfs.html with the selected flags'>speedtest1-wasmfs.html</a>
+            </span>
+          </div>
         </div>
         <div class='toolbar-inner-vertical' id='toolbar-runner-controls'>
           <button id='btn-reset-flags'>Reset Flags</button>
@@ -167,6 +172,7 @@
       const eFlags = E('#select-flags');
       const eSelectedFlags = E('#toolbar-selected-flags');
       const eLinkMainThread = E('#link-main-thread');
+      const eLinkWasmfs = E('#link-wasmfs');
       const getSelectedFlags = ()=>Array.prototype.map.call(eFlags.selectedOptions, (v)=>v.value);
       const updateSelectedFlags = function(){
         eSelectedFlags.innerText = '';
@@ -178,8 +184,10 @@
         });
         const rxStripDash = /^(-+)?/;
         const comma = flags.map((v)=>v.replace(rxStripDash,'')).join(',');
-        eLinkMainThread.setAttribute('target', 'main-thread-'+comma);
+        eLinkMainThread.setAttribute('target', 'speedtest1-main-'+comma);
         eLinkMainThread.href = 'speedtest1.html?flags='+comma;
+        eLinkWasmfs.setAttribute('target', 'speedtest1-wasmfs-'+comma);
+        eLinkWasmfs.href = 'speedtest1-wasmfs.html?flags='+comma;
       };
       eFlags.addEventListener('change', updateSelectedFlags );
       {
diff --git a/ext/wasm/speedtest1-worker.js b/ext/wasm/speedtest1-worker.js
index 8512bdbbf7..b954f9939a 100644
--- a/ext/wasm/speedtest1-worker.js
+++ b/ext/wasm/speedtest1-worker.js
@@ -16,14 +16,14 @@
     }
     try{
       if(0===wasmUtil.xCallWrapped(
-        'sqlite3_wasm_init_opfs', 'i32', ['string'], pdir
+        'sqlite3_wasm_init_wasmfs', 'i32', ['string'], pdir
       )){
         return f._ = pdir;
       }else{
         return f._ = "";
       }
     }catch(e){
-      // sqlite3_wasm_init_opfs() is not available
+      // sqlite3_wasm_init_wasmfs() is not available
       return f._ = "";
     }
   };
@@ -91,9 +91,8 @@
     self.WhWasmUtilInstaller(App.wasm);
     App.unlink = App.wasm.xWrap("sqlite3_wasm_vfs_unlink", "int", ["string"]);
     App.pDir = opfsDir(App.wasm);
-    if(App.pDir){
-      log("Persistent storage:",pDir);
-    }
+    if(App.pDir) log("Persistent storage:",pDir);
+    else log("Using transient storage.");
     mPost('ready',true);
   });
 })();
diff --git a/ext/wasm/speedtest1.html b/ext/wasm/speedtest1.html
index bc8b4ec9f1..172266aa68 100644
--- a/ext/wasm/speedtest1.html
+++ b/ext/wasm/speedtest1.html
@@ -55,14 +55,14 @@
           }
           try{
             if(0===wasmUtil.xCallWrapped(
-              'sqlite3_wasm_init_opfs', 'i32', ['string'], pdir
+              'sqlite3_wasm_init_wasmfs', 'i32', ['string'], pdir
             )){
               return f._ = pdir;
             }else{
               return f._ = "";
             }
           }catch(e){
-            // sqlite3_wasm_init_opfs() is not available
+            // sqlite3_wasm_init_wasmfs() is not available
             return f._ = "";
           }
         };
@@ -122,9 +122,9 @@
               "--nomemstat"
             );
             //"--memdb", // note that memdb trumps the filename arg
-            argv.push("--big-transactions"/*important for tests 410 and 510!*/,
-                      dbFile);
           }
+          argv.push("--big-transactions"/*important for tests 410 and 510!*/,
+                    dbFile);
           console.log("argv =",argv);
           // These log messages are not emitted to the UI until after main() returns. Fixing that
           // requires moving the main() call and related cleanup into a timeout handler.
diff --git a/ext/wasm/wasmfs.make b/ext/wasm/wasmfs.make
index f69da43b9e..cc10e58877 100644
--- a/ext/wasm/wasmfs.make
+++ b/ext/wasm/wasmfs.make
@@ -7,89 +7,114 @@
 ########################################################################
 MAKEFILE.wasmfs := $(lastword $(MAKEFILE_LIST))
 
-wasmfs.js     := sqlite3-wasmfs.js
-wasmfs.wasm   := sqlite3-wasmfs.wasm
-wasmfs.wasm.c := $(dir.api)/sqlite3-wasm.c
+sqlite3-wasmfs.js     := sqlite3-wasmfs.js
+sqlite3-wasmfs.wasm   := sqlite3-wasmfs.wasm
+sqlite3-wasmfs.wasm.c := $(dir.api)/sqlite3-wasm.c
 
-CLEAN_FILES += $(wasmfs.js) $(wasmfs.wasm)
+CLEAN_FILES += $(sqlite3-wasmfs.js) $(sqlite3-wasmfs.wasm) \
+    $(subst .js,.worker.js,$(sqlite3-wasmfs.js))
 
 ########################################################################
 # emcc flags for .c/.o/.wasm.
-wasmfs.flags =
-#wasmfs.flags += -v # _very_ loud but also informative about what it's doing
+sqlite3-wasmfs.flags =
+#sqlite3-wasmfs.flags += -v # _very_ loud but also informative about what it's doing
 
 ########################################################################
 # emcc flags for .c/.o.
-wasmfs.cflags :=
-wasmfs.cflags += -std=c99 -fPIC -g
-wasmfs.cflags += -pthread
-wasmfs.cflags += -I. -I$(dir.top)
-wasmfs.cflags += $(SQLITE_OPT) -DSQLITE_WASM_OPFS
-wasmfs.cflags += '-DSQLITE_DEFAULT_UNIX_VFS="unix-none"'
+sqlite3-wasmfs.cflags :=
+sqlite3-wasmfs.cflags += -std=c99 -fPIC -g
+sqlite3-wasmfs.cflags += -pthread
+sqlite3-wasmfs.cflags += -I. -I.. -I$(dir.top)
+sqlite3-wasmfs.cflags += $(SQLITE_OPT) -DSQLITE_WASM_WASMFS
+sqlite3-wasmfs.cflags += '-DSQLITE_DEFAULT_UNIX_VFS="unix-none"'
 
-wasmfs.extra.c :=
+sqlite3-wasmfs.extra.c :=
 ifeq (1,1)
-  # To get testing1.js to run with $(wasmfs.js) we need...
-  wasmfs.extra.c += $(jaccwabyt_test.c)
+  # To get testing1.js to run with $(sqlite3-wasmfs.js) we need...
+  sqlite3-wasmfs.extra.c += $(jaccwabyt_test.c)
 endif
 
 ########################################################################
 # emcc flags specific to building the final .js/.wasm file...
-wasmfs.jsflags := -fPIC
-wasmfs.jsflags += --no-entry
-wasmfs.jsflags += --minify 0
-wasmfs.jsflags += -sENVIRONMENT=web,worker
-wasmfs.jsflags += -sMODULARIZE
-wasmfs.jsflags += -sSTRICT_JS
-wasmfs.jsflags += -sDYNAMIC_EXECUTION=0
-wasmfs.jsflags += -sNO_POLYFILL
-ifeq (,$(wasmfs.extra.c))
-  wasmfs.jsflags += -sEXPORTED_FUNCTIONS=@$(dir.api)/EXPORTED_FUNCTIONS.sqlite3-api
+sqlite3-wasmfs.jsflags := -fPIC
+sqlite3-wasmfs.jsflags += --no-entry
+sqlite3-wasmfs.jsflags += --minify 0
+sqlite3-wasmfs.jsflags += -sMODULARIZE
+sqlite3-wasmfs.jsflags += -sSTRICT_JS
+sqlite3-wasmfs.jsflags += -sDYNAMIC_EXECUTION=0
+sqlite3-wasmfs.jsflags += -sNO_POLYFILL
+ifeq (,$(sqlite3-wasmfs.extra.c))
+  sqlite3-wasmfs.jsflags += -sEXPORTED_FUNCTIONS=@$(dir.api)/EXPORTED_FUNCTIONS.sqlite3-api
 else
   # need more exports for jaccwabyt test code...
-  wasmfs.jsflags += -sEXPORTED_FUNCTIONS=@$(dir.wasm)/EXPORTED_FUNCTIONS.api
+  sqlite3-wasmfs.jsflags += -sEXPORTED_FUNCTIONS=@$(dir.wasm)/EXPORTED_FUNCTIONS.api
 endif
-wasmfs.jsflags += -sEXPORTED_RUNTIME_METHODS=FS,wasmMemory,allocateUTF8OnStack
+sqlite3-wasmfs.jsflags += -sEXPORTED_RUNTIME_METHODS=FS,wasmMemory,allocateUTF8OnStack
                                             # wasmMemory ==> for -sIMPORTED_MEMORY
                                             # allocateUTF8OnStack ==> wasmfs internals
-wasmfs.jsflags += -sUSE_CLOSURE_COMPILER=0
-wasmfs.jsflags += -sIMPORTED_MEMORY
-#wasmfs.jsflags += -sINITIAL_MEMORY=13107200
-#wasmfs.jsflags += -sTOTAL_STACK=4194304
-wasmfs.jsflags += -sEXPORT_NAME=sqlite3InitModule
-wasmfs.jsflags += -sGLOBAL_BASE=4096 # HYPOTHETICALLY keep func table indexes from overlapping w/ heap addr.
-wasmfs.jsflags += --post-js=$(post-js.js)
-#wasmfs.jsflags += -sFILESYSTEM=0 # only for experimentation. sqlite3 needs the FS API
+sqlite3-wasmfs.jsflags += -sUSE_CLOSURE_COMPILER=0
+sqlite3-wasmfs.jsflags += -sIMPORTED_MEMORY
+#sqlite3-wasmfs.jsflags += -sINITIAL_MEMORY=13107200
+#sqlite3-wasmfs.jsflags += -sTOTAL_STACK=4194304
+sqlite3-wasmfs.jsflags += -sEXPORT_NAME=sqlite3InitModule
+sqlite3-wasmfs.jsflags += -sGLOBAL_BASE=4096 # HYPOTHETICALLY keep func table indexes from overlapping w/ heap addr.
+sqlite3-wasmfs.jsflags += --post-js=$(post-js.js)
+#sqlite3-wasmfs.jsflags += -sFILESYSTEM=0 # only for experimentation. sqlite3 needs the FS API
 #                                Perhaps the wasmfs build doesn't?
-#wasmfs.jsflags += -sABORTING_MALLOC
-wasmfs.jsflags += -sALLOW_TABLE_GROWTH
-wasmfs.jsflags += -Wno-limited-postlink-optimizations
+#sqlite3-wasmfs.jsflags += -sABORTING_MALLOC
+sqlite3-wasmfs.jsflags += -sALLOW_TABLE_GROWTH
+sqlite3-wasmfs.jsflags += -Wno-limited-postlink-optimizations
 # ^^^^^ it likes to warn when we have "limited optimizations" via the -g3 flag.
-wasmfs.jsflags += -sERROR_ON_UNDEFINED_SYMBOLS=0
-wasmfs.jsflags += -sLLD_REPORT_UNDEFINED
-#wasmfs.jsflags += --import-undefined
-wasmfs.jsflags += -sMEMORY64=0
-wasmfs.jsflags += -pthread -sWASMFS -sPTHREAD_POOL_SIZE=2
-wasmfs.jsflags += -sINITIAL_MEMORY=128450560
-#wasmfs.jsflags += -sALLOW_MEMORY_GROWTH
+sqlite3-wasmfs.jsflags += -sERROR_ON_UNDEFINED_SYMBOLS=0
+sqlite3-wasmfs.jsflags += -sLLD_REPORT_UNDEFINED
+#sqlite3-wasmfs.jsflags += --import-undefined
+sqlite3-wasmfs.jsflags += -sMEMORY64=0
+sqlite3-wasmfs.jsflags += -sINITIAL_MEMORY=128450560
+sqlite3-wasmfs.fsflags := -pthread -sWASMFS -sPTHREAD_POOL_SIZE=2 -sENVIRONMENT=web,worker
+sqlite3-wasmfs.jsflags += $(sqlite3-wasmfs.fsflags)
+#sqlite3-wasmfs.jsflags += -sALLOW_MEMORY_GROWTH
 #^^^ using ALLOW_MEMORY_GROWTH produces a warning from emcc:
 #   USE_PTHREADS + ALLOW_MEMORY_GROWTH may run non-wasm code slowly,
 #   see https://github.com/WebAssembly/design/issues/1271 [-Wpthreads-mem-growth]
 ifneq (0,$(enable_bigint))
-wasmfs.jsflags += -sWASM_BIGINT
+sqlite3-wasmfs.jsflags += -sWASM_BIGINT
 endif
 
-$(wasmfs.js): $(wasmfs.wasm.c) $(sqlite3.c) $(wasmfs.extra.c) \
+$(sqlite3-wasmfs.js): $(sqlite3-wasmfs.wasm.c) $(sqlite3.c) $(sqlite3-wasmfs.extra.c) \
     EXPORTED_FUNCTIONS.api $(MAKEFILE) $(MAKEFILE.wasmfs) \
     $(post-js.js)
 	@echo "Building $@ ..."
 	$(emcc.bin) -o $@ $(emcc_opt) $(emcc.flags) \
-  $(wasmfs.cflags) $(wasmfs.jsflags) $(wasmfs.wasm.c) $(wasmfs.extra.c)
-	chmod -x $(wasmfs.wasm)
-ifneq (,$(wasm-strip))
-	$(wasm-strip) $(wasmfs.wasm)
-endif
-	@ls -la $@ $(wasmfs.wasm)
+      $(sqlite3-wasmfs.cflags) $(sqlite3-wasmfs.jsflags) $(sqlite3-wasmfs.wasm.c) $(sqlite3-wasmfs.extra.c)
+	chmod -x $(sqlite3-wasmfs.wasm)
+	$(maybe-wasm-strip) $(sqlite3-wasmfs.wasm)
+	@ls -la $@ $(sqlite3-wasmfs.wasm)
 
-wasmfs: $(wasmfs.js)
+wasmfs: $(sqlite3-wasmfs.js)
 all: wasmfs
+
+########################################################################
+# speedtest1 for wasmfs. Re. sqlite3-wasm.o vs sqlite3-wasm.c:
+# building against the latter (predictably) results in a slightly
+# faster binary.
+speedtest1-wasmfs.js := speedtest1-wasmfs.js
+speedtest1-wasmfs.wasm := $(subst .js,.wasm,$(speedtest1-wasmfs.js))
+speedtest1-wasmfs.eflags := -sENVIRONMENT=web,worker $(sqlite3-wasmfs.fsflags)
+speedtest1-wasmfs.eflags += $(SQLITE_OPT) -DSQLITE_WASM_WASMFS
+$(speedtest1-wasmfs.js): $(MAKEFILE) $(MAKEFILE.wasmfs)
+#$(speedtest1-wasmfs.js): $(sqlite3-wasmfs.js)
+$(speedtest1-wasmfs.js): $(speedtest1.c) $(sqlite3-wasm.c)
+	@echo "Building $@ ..."
+	$(emcc.bin) \
+        $(speedtest1-wasmfs.eflags) $(speedtest1-common.eflags) \
+        $(speedtest1.cflags) \
+        $(sqlite3-wasmfs.cflags) \
+        -o $@ $(speedtest1.c) $(sqlite3-wasm.c) -lm
+	$(maybe-wasm-strip) $(speedtest1-wasmfs.wasm)
+	ls -la $@ $(speedtest1-wasmfs.wasm)
+
+speedtest1: $(speedtest1-wasmfs.js)
+CLEAN_FILES += $(speedtest1-wasmfs.js) $(speedtest1-wasmfs.wasm) \
+     $(subst .js,.worker.js,$(speedtest1-wasmfs.js))
+# end speedtest1.js
+########################################################################
diff --git a/manifest b/manifest
index 543bbdbf9a..68aabcc46a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\ssome\sstale\scomments.\sGet\sscratchpad-opfs-worker2.js\srunning\sagain\sin\sprep\sfor\sreuse\sin\sexperimenting\swith\sthe\sOPFS\sall-synchronous\sAPI.
-D 2022-09-15T03:16:49.402
+C More\swork\son\sthe\ssynchronous\sOPFS\sexperimentation.\sNumerous\swasm/js\sbuild\stweaks.\sAdd\sspeeedtest-wasmfs.html,\sthe\swasmfs/opfs\scounterpart\sof\sspeedtest1.html.
+D 2022-09-15T06:42:41.192
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -472,9 +472,9 @@ F ext/session/test_session.c f433f68a8a8c64b0f5bc74dc725078f12483301ad4ae8375205
 F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
-F ext/wasm/EXPORTED_FUNCTIONS.fiddle db7a4602f043cf4a5e4135be3609a487f9f1c83f05778bfbdf93766be4541b96
+F ext/wasm/EXPORTED_FUNCTIONS.fiddle 7fb73f7150ab79d83bb45a67d257553c905c78cd3d693101699243f36c5ae6c3
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile f06963ecf1a8275755a568f84ad66e1c6a093e190cffd84f1414d8e75d3c5277
+F ext/wasm/GNUmakefile 104ad527fd7cf1b33dd8ac544c4e26c529c305e591d85a32999258750998b0b8
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 150a793a47205b8009ac934f3b6d6ebf67b965c072339aaa25ce808a19e116cc
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -483,12 +483,12 @@ F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba814
 F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a4a06cb776c003880b
 F ext/wasm/api/sqlite3-api-cleanup.js 8564a6077cdcaea9a9f428a019af8a05887f0131e6a2a1e72a7ff1145fadfe77
 F ext/wasm/api/sqlite3-api-glue.js 366d580c8e5bf7fcf4c6dee6f646c31f5549bd417ea03a59a0acca00e8ecce30
-F ext/wasm/api/sqlite3-api-oo1.js 8a8e464c2c786f4faa3fd5b48852818dd2938c3211d82b6176143990a976f8ec
+F ext/wasm/api/sqlite3-api-oo1.js d7526517f7ad3f6bda16ad66d373bbb71b43168deef7af60eda5c9fe873d1387
 F ext/wasm/api/sqlite3-api-opfs.js 011799db398157cbd254264b6ebae00d7234b93d0e9e810345f213a5774993c0
-F ext/wasm/api/sqlite3-api-prologue.js c496adc0cf2ae427ee900aad01c09db97850bd8b6737f2849cab207c8415b839
+F ext/wasm/api/sqlite3-api-prologue.js 7aff2d9b110d5a6e70dbf5fe44189d983d7886a465ad156176f4ad290447c97b
 F ext/wasm/api/sqlite3-api-worker1.js d33062afa045fd4be01ba4abc266801807472558b862b30056211b00c9c347b4
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c 7d1760f3a864a9ae16cfb71543829d946a54384bd07af99a3adf9ef32913705f
+F ext/wasm/api/sqlite3-wasm.c 4130e2df9587f4e4c3afc04c3549d682c8a5c0cfe5b22819a0a86edb7f01b9bd
 F ext/wasm/batch-runner.html 2857a6db7292ac83d1581af865d643fd34235db2df830d10b43b01388c599e04
 F ext/wasm/batch-runner.js fb6a338aeef509f181f499700a8595bc578bbc54ef832e0cda7e7e7c10b90a18
 F ext/wasm/common/SqliteTestUtil.js 529161a624265ba84271a52db58da022649832fa1c71309fb1e02cc037327a2b
@@ -501,23 +501,24 @@ F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d695
 F ext/wasm/fiddle/fiddle-worker.js bccf46045be8824752876f3eec01c223be0616ccac184bffd0024cfe7a3262b8
 F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
 F ext/wasm/fiddle/fiddle.js 4ffcfc9a235beebaddec689a549e9e0dfad6dca5c1f0b41f03468d7e76480686
-F ext/wasm/index.html 7e38070c8c64738eb3893be19e1291d66629fc424f1a70e12c4b459d51dbeffe
+F ext/wasm/index.html e251800a64cf13e731ddec5a86ca4a299dcc4c1fafafd87658ccca3c538dd843
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 447cc02b598f7792edaa8ae6853a7847b8178a18ed356afacbdbf312b2588106
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
 F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e568d2c2307c416902059339c06f19
-F ext/wasm/kvvfs.make 99d61a438232d03f7a39fff05a5738d00d5af629e54b3f03caf87f041c194d51
+F ext/wasm/kvvfs.make 6f19ef9bdf0394e752b62717db968268206c5237a87541efb825d58945694ff0
 F ext/wasm/kvvfs1.html 13bb24190bfb276a57b228499519badcc1bf39ed07e4b37bc2a425ce6418fed1
 F ext/wasm/kvvfs1.js ec1c1d071bb055711f9151df05616111432cf3e6bf7ac7f8dcbcfb56c9d9ed48
 F ext/wasm/scratchpad-opfs-worker.html 5fdda167571264300f388847d34f00b77dd48984a8dba2ee9c099c3ffa05db66
-F ext/wasm/scratchpad-opfs-worker.js 3ec2868c669713145c76eb5877c64a1b20741f741817b87c907a154b676283a9
-F ext/wasm/scratchpad-opfs-worker2.js 8cd4961e1c96fbaad9743a34cd17d0d27b9286b845e77242d444a4c78fe2a810
+F ext/wasm/scratchpad-opfs-worker.js cf6c4554d3b099c1a50013e50d19b3dc60e183511b4b4dbe7fabc2b9d3360567
+F ext/wasm/scratchpad-opfs-worker2.js 2424d7d7b8801fc143f6540fbdd8a96f3f2e5b811f0f545714d06147ccce58bf
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
 F ext/wasm/scratchpad-wasmfs-main.js 69e960e9161f6412fd0c30f355d4112f1894d6609eb431e2d16d207d1380518e
 F ext/wasm/speedtest1-kvvfs.html fe7d314343b275f8b241af83267ca56274ea995535c6abca4d6e568a98fa31e3
-F ext/wasm/speedtest1-worker.html 6b5fda04d0b69e8c2651689356cb0c28fd33aa1a82b03dcbc8b0d68fbd7ed57f
-F ext/wasm/speedtest1-worker.js 356b9953add4449acf199793db9b76b11ee016021918d8daffd19f08ec68d305
-F ext/wasm/speedtest1.html 8f61cbe68300acca25dd9fa74dce79b774786e2b4feeb9bcbc46e1cefbfa6262
+F ext/wasm/speedtest1-wasmfs.html 6a67a6812f03a2058eb5c6ad0c8dea4bf749d0160ed9d6b826dabe7b766c3cf7
+F ext/wasm/speedtest1-worker.html a1dc7611026adad43ddb138172996e13a96dd2d37dcdcb7cef39a130f6b1f57b
+F ext/wasm/speedtest1-worker.js fb5d282c0b8aed18daf41c57f768cbf434f8137dbff707d53dcedcd7d4cb60ef
+F ext/wasm/speedtest1.html fbb8e4d1639028443f3687a683be660beca6927920545cf6b1fdf503104591c0
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
@@ -529,7 +530,7 @@ F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d766
 F ext/wasm/testing1.js 7cd8ab255c238b030d928755ae8e91e7d90a12f2ae601b1b8f7827aaa4fb258e
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
 F ext/wasm/testing2.js 25584bcc30f19673ce13a6f301f89f8820a59dfe044e0c4f2913941f4097fe3c
-F ext/wasm/wasmfs.make 44c35734f531199dab7c49f82ed265344c86aa03d741fd7911ddb4de0c551ddd
+F ext/wasm/wasmfs.make 21a5cf297954a689e0dc2a95299ae158f681cae5e90c10b99d986097815fd42d
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
@@ -2025,8 +2026,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 08476f3c218d45846e7496bdae0b06e2122466111fdf2aa2aabb1805b15ef982
-R 520f42f1cc70efba1aa8d99f68fa03bf
+P 4cbbd370186f84e440f496e7f11c641d7dc1723acc46e4a31483392e0eb046e9
+R c453132da1df672225f03816e5e29221
 U stephan
-Z a50915abdf47f7036b78a2ce4e5a53d8
+Z e87dced3d077599bf1560627688e6f4f
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index d3cb0d93c3..7d6cc0aac1 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4cbbd370186f84e440f496e7f11c641d7dc1723acc46e4a31483392e0eb046e9
\ No newline at end of file
+00ee49a3a2c148480f614e49a0ee5b35a255758c0a53693f0b464b31e7a4045b
\ No newline at end of file

From 0144a8482a02e05bc3140ffcf1aa0348a81aec90 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Fri, 16 Sep 2022 01:05:19 +0000
Subject: [PATCH 111/428] Add return value checks to kvstorageWrite(),
 necessary for recognizing storage-full errors in the JS binding.
 speedtest1-kvvfs.html runs successfully on localStorage with --size 1 to 6
 and starts failing with storage shortage at --size 7.

FossilOrigin-Name: 13839759f8f45e4eb0aa6a5052801f3964d5b2dc2e427e5e91ee6692176381eb
---
 ext/wasm/GNUmakefile            | 21 ++++++++++++++++++-
 ext/wasm/kvvfs.make             |  2 +-
 ext/wasm/speedtest1-kvvfs.html  | 37 ++++++++++++++++++++++++++-------
 ext/wasm/speedtest1-worker.html |  6 ++++++
 manifest                        | 20 +++++++++---------
 manifest.uuid                   |  2 +-
 src/os_kv.c                     | 24 +++++++++++----------
 7 files changed, 80 insertions(+), 32 deletions(-)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 390472dea2..fe3c7a61f8 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -330,6 +330,7 @@ all: batch
 # speedtest1.eflags = emcc flags used by main build of speedtest1
 speedtest1-common.eflags := -g $(emcc_opt)
 speedtest1.eflags :=
+speedtest1.eflags += -sENVIRONMENT=web
 speedtest1-common.eflags += -sINVOKE_RUN=0
 #speedtest1-common.eflags += --no-entry
 speedtest1-common.eflags += -flto
@@ -342,7 +343,24 @@ speedtest1-common.eflags += -sEXPORTED_FUNCTIONS=_main,_malloc,_free
 speedtest1-common.eflags += -sDYNAMIC_EXECUTION=0
 speedtest1-common.eflags += --minify 0
 speedtest1-common.eflags += -sEXPORT_NAME=sqlite3Speedtest1InitModule
-speedtest1.eflags += -sENVIRONMENT=web
+speedtest1.exit-runtime0 := -sEXIT_RUNTIME=0
+speedtest1.exit-runtime1 := -sEXIT_RUNTIME=1
+# Re -sEXIT_RUNTIME=1 vs 0: if it's 1 and speedtest1 crashes, we get
+# this error from emscripten:
+#
+# > native function `free` called after runtime exit (use
+# NO_EXIT_RUNTIME to keep it alive after main() exits))
+#
+# If it's 0 and it crashes, we get:
+#
+# > stdio streams had content in them that was not flushed. you should
+# set EXIT_RUNTIME to 1 (see the FAQ), or make sure to emit a newline
+# when you printf etc.
+#
+# and pending output is not flushed because it didn't end with a
+# newline (by design). The lesser of the two evils seems to be
+# -sEXIT_RUNTIME=1 but we need EXIT_RUNTIME=0 for the worker-based app
+# which runs speedtest1 multiple times.
 
 speedtest1.js := speedtest1.js
 speedtest1.wasm := $(subst .js,.wasm,$(speedtest1.js))
@@ -360,6 +378,7 @@ $(speedtest1.js): $(speedtest1.c) $(sqlite3-wasm.c) $(MAKEFILE) $(sqlite3.c)
 	$(emcc.bin) \
         $(speedtest1.eflags) $(speedtest1-common.eflags) $(speedtest1.cflags) \
         $(SQLITE_OPT) \
+        $(speedtest1.exit-runtime0) \
         '-DSQLITE_DEFAULT_UNIX_VFS="unix-none"' \
         -o $@ $(speedtest1.c) $(sqlite3-wasm.c) -lm
 	$(maybe-wasm-strip) $(speedtest1.wasm)
diff --git a/ext/wasm/kvvfs.make b/ext/wasm/kvvfs.make
index 293bcee04f..d9a9539566 100644
--- a/ext/wasm/kvvfs.make
+++ b/ext/wasm/kvvfs.make
@@ -103,7 +103,7 @@ $(speedtest1-kvvfs.js): $(speedtest1.c) $(sqlite3-wasm.c) $(sqlite3.c) $(MAKEFIL
 	$(emcc.bin) \
       $(speedtest1.eflags) $(speedtest1-common.eflags) $(speedtest1.cflags) \
       $(SQLITE_OPT) \
-      -sEXIT_RUNTIME=1 \
+      $(speedtest1.exit-runtime1) \
       $(kvvfs.cflags) \
       -o $@ $(speedtest1.c) $(sqlite3-wasm.c) -lm
 	$(maybe-wasm-strip) $(speedtest1-kvvfs.wasm)
diff --git a/ext/wasm/speedtest1-kvvfs.html b/ext/wasm/speedtest1-kvvfs.html
index 778790722f..272425262b 100644
--- a/ext/wasm/speedtest1-kvvfs.html
+++ b/ext/wasm/speedtest1-kvvfs.html
@@ -6,10 +6,10 @@
     <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
     <link rel="stylesheet" href="common/emscripten.css"/>
     <link rel="stylesheet" href="common/testing.css"/>
-    <title>speedtest1.wasm</title>
+    <title>speedtest1-kvvfs.wasm</title>
   </head>
   <body>
-    <header id='titlebar'><span>speedtest1.wasm</span></header>
+    <header id='titlebar'><span>speedtest1-kvvfs.wasm</span></header>
     <div>See also: <a href='speedtest1-worker.html'>A Worker-thread variant of this page.</a></div>
     <!-- emscripten bits -->
     <figure id="module-spinner">
@@ -63,12 +63,28 @@
           console.error(...args);
           logList.push('ERROR: '+args.join(' '));
         };
+
+        const guessStorageSize = function(which=''){
+          let sz = 0;
+          const prefix = 'kvvfs-'+which;
+          [localStorage,sessionStorage].forEach((s)=>{
+            let i;
+            for(i = 0; i < s.length; ++i){
+              const k = s.key(i);
+              if(k.startsWith(prefix)){
+                sz += k.length;
+                sz += s.getItem(k).length;
+              }
+            }
+          });
+          return sz;
+        };
         const clearStorage = function(){
             sessionStorage.clear();
             localStorage.clear();
         };
         const runTests = function(EmscriptenModule){
-            console.log("Module inited.",EmscriptenModule);
+          console.log("Module inited.",EmscriptenModule);
             
           const wasm = {
             exports: EmscriptenModule.asm,
@@ -83,7 +99,7 @@
           const scope = wasm.scopedAllocPush();
           const dbFile = 0 ? "session" : "local";
           const urlArgs = self.SqliteTestUtil.processUrlArgs();
-          const argv = ["speedtest1", "--size", "1"];
+          const argv = ["speedtest1", "--size", "5"];
           if(urlArgs.flags){
             // transform flags=a,b,c to ["--a", "--b", "--c"]
             argv.push(...(urlArgs.flags.split(',').map((v)=>'--'+v)));
@@ -93,10 +109,14 @@
               "--nomutex",
               "--nosync",
               "--nomemstat"
+              //"--sqlonly"
             );
             //argv.push("--memdb" /* note that memdb trumps the filename arg */);
-            argv.push("--big-transactions"/*important for tests 410 and 510!*/,
-                      dbFile);
+          }
+          argv.push("--big-transactions"/*important for tests 410 and 510!*/,
+                    dbFile);
+          if(argv.indexOf('--memdb')>=0){
+              log2('error',"WARNING: --memdb flag trumps db filename.");
           }
           console.log("argv =",argv);
           // These log messages are not emitted to the UI until after main() returns. Fixing that
@@ -119,8 +139,9 @@
             wasm.scopedAllocPop(scope);
             logList.unshift("Done running native main(). Output:");
             dumpLogList();
-            log2('warning',"Clearing session/local storage.");
-            clearStorage();
+            log2('',"Approximate",dbFile,"storage usage:",guessStorageSize(),"bytes");
+            log2('warning',"Clearing",dbFile,"storage.");
+            clearStorage(dbFile);
           });
         }/*runTests()*/;
 
diff --git a/ext/wasm/speedtest1-worker.html b/ext/wasm/speedtest1-worker.html
index 0e0ca4c464..3c9740286f 100644
--- a/ext/wasm/speedtest1-worker.html
+++ b/ext/wasm/speedtest1-worker.html
@@ -41,6 +41,9 @@
             <span>&rarr; <a id='link-wasmfs' href='#' target='speedtest-wasmfs'
                             title='Start speedtest1-wasmfs.html with the selected flags'>speedtest1-wasmfs.html</a>
             </span>
+            <span>&rarr; <a id='link-kvvfs' href='#' target='speedtest-kvvfs'
+                            title='Start speedtest1-kvvfs.html with the selected flags'>speedtest1-kvvfs.html</a>
+            </span>
           </div>
         </div>
         <div class='toolbar-inner-vertical' id='toolbar-runner-controls'>
@@ -173,6 +176,7 @@
       const eSelectedFlags = E('#toolbar-selected-flags');
       const eLinkMainThread = E('#link-main-thread');
       const eLinkWasmfs = E('#link-wasmfs');
+      const eLinkKvvfs = E('#link-kvvfs');
       const getSelectedFlags = ()=>Array.prototype.map.call(eFlags.selectedOptions, (v)=>v.value);
       const updateSelectedFlags = function(){
         eSelectedFlags.innerText = '';
@@ -188,6 +192,8 @@
         eLinkMainThread.href = 'speedtest1.html?flags='+comma;
         eLinkWasmfs.setAttribute('target', 'speedtest1-wasmfs-'+comma);
         eLinkWasmfs.href = 'speedtest1-wasmfs.html?flags='+comma;
+        eLinkKvvfs.setAttribute('target', 'speedtest1-kvvfs-'+comma);
+        eLinkKvvfs.href = 'speedtest1-kvvfs.html?flags='+comma;
       };
       eFlags.addEventListener('change', updateSelectedFlags );
       {
diff --git a/manifest b/manifest
index 68aabcc46a..b9e43a7389 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C More\swork\son\sthe\ssynchronous\sOPFS\sexperimentation.\sNumerous\swasm/js\sbuild\stweaks.\sAdd\sspeeedtest-wasmfs.html,\sthe\swasmfs/opfs\scounterpart\sof\sspeedtest1.html.
-D 2022-09-15T06:42:41.192
+C Add\sreturn\svalue\schecks\sto\skvstorageWrite(),\snecessary\sfor\srecognizing\sstorage-full\serrors\sin\sthe\sJS\sbinding.\sspeedtest1-kvvfs.html\sruns\ssuccessfully\son\slocalStorage\swith\s--size\s1\sto\s6\sand\sstarts\sfailing\swith\sstorage\sshortage\sat\s--size\s7.
+D 2022-09-16T01:05:19.939
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle 7fb73f7150ab79d83bb45a67d257553c905c78cd3d693101699243f36c5ae6c3
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile 104ad527fd7cf1b33dd8ac544c4e26c529c305e591d85a32999258750998b0b8
+F ext/wasm/GNUmakefile bec8b98f00c81561215bd8adff9870a30508fd6813bccf1b821ddf073446525e
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 150a793a47205b8009ac934f3b6d6ebf67b965c072339aaa25ce808a19e116cc
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -506,7 +506,7 @@ F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab26
 F ext/wasm/jaccwabyt/jaccwabyt.md 447cc02b598f7792edaa8ae6853a7847b8178a18ed356afacbdbf312b2588106
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
 F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e568d2c2307c416902059339c06f19
-F ext/wasm/kvvfs.make 6f19ef9bdf0394e752b62717db968268206c5237a87541efb825d58945694ff0
+F ext/wasm/kvvfs.make 4b2ba6d061f3a52da9f5812f86f4faa80fb4d9456a152f6b0585dccd667a4e22
 F ext/wasm/kvvfs1.html 13bb24190bfb276a57b228499519badcc1bf39ed07e4b37bc2a425ce6418fed1
 F ext/wasm/kvvfs1.js ec1c1d071bb055711f9151df05616111432cf3e6bf7ac7f8dcbcfb56c9d9ed48
 F ext/wasm/scratchpad-opfs-worker.html 5fdda167571264300f388847d34f00b77dd48984a8dba2ee9c099c3ffa05db66
@@ -514,9 +514,9 @@ F ext/wasm/scratchpad-opfs-worker.js cf6c4554d3b099c1a50013e50d19b3dc60e183511b4
 F ext/wasm/scratchpad-opfs-worker2.js 2424d7d7b8801fc143f6540fbdd8a96f3f2e5b811f0f545714d06147ccce58bf
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
 F ext/wasm/scratchpad-wasmfs-main.js 69e960e9161f6412fd0c30f355d4112f1894d6609eb431e2d16d207d1380518e
-F ext/wasm/speedtest1-kvvfs.html fe7d314343b275f8b241af83267ca56274ea995535c6abca4d6e568a98fa31e3
+F ext/wasm/speedtest1-kvvfs.html c9cb752f9c81cdcf9ccdc09146bd8c9c77970ed44ab10908ed15f1cce95c0f8d
 F ext/wasm/speedtest1-wasmfs.html 6a67a6812f03a2058eb5c6ad0c8dea4bf749d0160ed9d6b826dabe7b766c3cf7
-F ext/wasm/speedtest1-worker.html a1dc7611026adad43ddb138172996e13a96dd2d37dcdcb7cef39a130f6b1f57b
+F ext/wasm/speedtest1-worker.html d8881ae802d15fb8adb94049265173e99f350e07e1d4e6f9e1cbd8969fe63a04
 F ext/wasm/speedtest1-worker.js fb5d282c0b8aed18daf41c57f768cbf434f8137dbff707d53dcedcd7d4cb60ef
 F ext/wasm/speedtest1.html fbb8e4d1639028443f3687a683be660beca6927920545cf6b1fdf503104591c0
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
@@ -596,7 +596,7 @@ F src/notify.c 89a97dc854c3aa62ad5f384ef50c5a4a11d70fcc69f86de3e991573421130ed6
 F src/os.c 0eb831ba3575af5277e47f4edd14fdfc90025c67eb25ce5cda634518d308d4e9
 F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
-F src/os_kv.c f3c5f46f62ed495c7d17c752f58f250c04b944c9cf34060518511e4e7537658c
+F src/os_kv.c d4909b439043183f9b6aec65528a7433cee49d41cca95b9a3a4c8fb6bbedc0c2
 F src/os_setup.h 0711dbc4678f3ac52d7fe736951b6384a0615387c4ba5135a4764e4e31f4b6a6
 F src/os_unix.c 0fa91925f0b8831fc0156a9c04d39d86f85baf9eef66c98712395e1715cb75cc
 F src/os_win.c 8d129ae3e59e0fa900e20d0ad789e96f2e08177f0b00b53cdda65c40331e0902
@@ -2026,8 +2026,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 4cbbd370186f84e440f496e7f11c641d7dc1723acc46e4a31483392e0eb046e9
-R c453132da1df672225f03816e5e29221
+P 00ee49a3a2c148480f614e49a0ee5b35a255758c0a53693f0b464b31e7a4045b
+R a6e9c244c29b55941f4ad5b4e78621c2
 U stephan
-Z e87dced3d077599bf1560627688e6f4f
+Z daf2b8c0bbcd601af0a5bcd00e934942
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 7d6cc0aac1..b3a08b5d95 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-00ee49a3a2c148480f614e49a0ee5b35a255758c0a53693f0b464b31e7a4045b
\ No newline at end of file
+13839759f8f45e4eb0aa6a5052801f3964d5b2dc2e427e5e91ee6692176381eb
\ No newline at end of file
diff --git a/src/os_kv.c b/src/os_kv.c
index 4651400b15..17d4c254e1 100644
--- a/src/os_kv.c
+++ b/src/os_kv.c
@@ -351,7 +351,7 @@ int sqlite3__wasm_emjs_kvvfs(int whichOp){
   switch( whichOp ){
     case 0: break;
     case 1:
-      kvstorageWrite(zClass, zKey, "world");
+      rc = kvstorageWrite(zClass, zKey, "world");
       break;
     case 2: {
       char buffer[128] = {0};
@@ -634,10 +634,10 @@ static sqlite3_int64 kvvfsReadFileSize(KVVfsFile *pFile){
   kvstorageRead(pFile->zClass, "sz", zData, sizeof(zData)-1);
   return strtoll(zData, 0, 0);
 }
-static void kvvfsWriteFileSize(KVVfsFile *pFile, sqlite3_int64 sz){
+static int kvvfsWriteFileSize(KVVfsFile *pFile, sqlite3_int64 sz){
   char zData[50];
   sqlite3_snprintf(sizeof(zData), zData, "%lld", sz);
-  kvstorageWrite(pFile->zClass, "sz", zData);
+  return kvstorageWrite(pFile->zClass, "sz", zData);
 }
 
 /****** sqlite3_io_methods methods ******************************************/
@@ -788,7 +788,9 @@ static int kvvfsWriteDb(
   pgno = 1 + iOfst/iAmt;
   sqlite3_snprintf(sizeof(zKey), zKey, "%u", pgno);
   kvvfsEncode(zBuf, iAmt, aData);
-  kvstorageWrite(pFile->zClass, zKey, aData);
+  if( kvstorageWrite(pFile->zClass, zKey, aData) ){
+    return SQLITE_IOERR;
+  }
   if( iOfst+iAmt > pFile->szDb ){
     pFile->szDb = iOfst + iAmt;
   }
@@ -825,8 +827,7 @@ static int kvvfsTruncateDb(sqlite3_file *pProtoFile, sqlite_int64 size){
       pgno++;
     }
     pFile->szDb = size;
-    kvvfsWriteFileSize(pFile, size);
-    return SQLITE_OK;
+    return kvvfsWriteFileSize(pFile, size) ? SQLITE_IOERR : SQLITE_OK;
   }
   return SQLITE_IOERR;
 }
@@ -854,17 +855,18 @@ static int kvvfsSyncJrnl(sqlite3_file *pProtoFile, int flags){
   }while( n>0 );
   zOut[i++] = ' ';
   kvvfsEncode(pFile->aJrnl, pFile->nJrnl, &zOut[i]);
-  kvstorageWrite(pFile->zClass, "jrnl", zOut);
+  i = kvstorageWrite(pFile->zClass, "jrnl", zOut);
   sqlite3_free(zOut);
-  return SQLITE_OK;
+  return i ? SQLITE_IOERR : SQLITE_OK;
 }
 static int kvvfsSyncDb(sqlite3_file *pProtoFile, int flags){
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
+  int rc = SQLITE_OK;
   SQLITE_KV_LOG(("xSync('%s-db')\n", pFile->zClass));
-  if( pFile->szDb>0 ){
-    kvvfsWriteFileSize(pFile, pFile->szDb);
+  if( pFile->szDb>0 && 0!=kvvfsWriteFileSize(pFile, pFile->szDb) ){
+    rc = SQLITE_IOERR;
   }
-  return SQLITE_OK;
+  return rc;
 }
 
 /*

From d22cfa8c80e9d95ed4068083f7dd5ffbb8f29dda Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Fri, 16 Sep 2022 01:08:06 +0000
Subject: [PATCH 112/428] Pull the src/os_kv.c part of [13839759f8f4] into the
 kv-vfs branch.

FossilOrigin-Name: e334449912d5176e355d02024a07ed867741f71c9d10ce6744ca800414bf3eeb
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/os_kv.c   | 26 ++++++++++++++------------
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/manifest b/manifest
index e8ffc8d53e..da3fab544e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\san\sextraneous\skey-copy\sop\sin\sthe\sEM_JS\simpl\sof\skvstorageDelete().
-D 2022-09-12T20:21:34.667
+C Pull\sthe\ssrc/os_kv.c\spart\sof\s[13839759f8f4]\sinto\sthe\skv-vfs\sbranch.
+D 2022-09-16T01:08:06.279
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -574,7 +574,7 @@ F src/notify.c 89a97dc854c3aa62ad5f384ef50c5a4a11d70fcc69f86de3e991573421130ed6
 F src/os.c 0eb831ba3575af5277e47f4edd14fdfc90025c67eb25ce5cda634518d308d4e9
 F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
-F src/os_kv.c 889c6f9b59702859f9041549845769bae2cbd6b59cf15bd7904551a676b85533
+F src/os_kv.c d4909b439043183f9b6aec65528a7433cee49d41cca95b9a3a4c8fb6bbedc0c2
 F src/os_setup.h 0711dbc4678f3ac52d7fe736951b6384a0615387c4ba5135a4764e4e31f4b6a6
 F src/os_unix.c 0fa91925f0b8831fc0156a9c04d39d86f85baf9eef66c98712395e1715cb75cc
 F src/os_win.c e9454cb141908e8eef2102180bad353a36480612d5b736e4c2bd5777d9b25a34
@@ -2004,8 +2004,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 878cc93e779c3857adc711f212520f007256274fcd3f6f3d72c754a937fcd198
-R ea387427fef090c92e0fdcd9a6ab25a2
+P 1c5aeee45564c14e7e2e7730f3f52106339ea3148fb5aa786fa767a35db46f51
+R 06fb792046d4c535864a12af9a1a5d61
 U stephan
-Z d8eaf9989333b333239c3719fa4ba2d7
+Z 125d6637967f22bfb5b9fb3681eda03b
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 8dbaf37dda..445b7e7e25 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1c5aeee45564c14e7e2e7730f3f52106339ea3148fb5aa786fa767a35db46f51
\ No newline at end of file
+e334449912d5176e355d02024a07ed867741f71c9d10ce6744ca800414bf3eeb
\ No newline at end of file
diff --git a/src/os_kv.c b/src/os_kv.c
index 62214a13ad..17d4c254e1 100644
--- a/src/os_kv.c
+++ b/src/os_kv.c
@@ -351,7 +351,7 @@ int sqlite3__wasm_emjs_kvvfs(int whichOp){
   switch( whichOp ){
     case 0: break;
     case 1:
-      kvstorageWrite(zClass, zKey, "world");
+      rc = kvstorageWrite(zClass, zKey, "world");
       break;
     case 2: {
       char buffer[128] = {0};
@@ -602,7 +602,7 @@ static void kvvfsDecodeJournal(
   const char *zTxt,      /* Text encoding.  Zero-terminated */
   int nTxt               /* Bytes in zTxt, excluding zero terminator */
 ){
-  unsigned int n = 0;
+  unsigned int n;
   int c, i, mult;
   i = 0;
   mult = 1;
@@ -634,10 +634,10 @@ static sqlite3_int64 kvvfsReadFileSize(KVVfsFile *pFile){
   kvstorageRead(pFile->zClass, "sz", zData, sizeof(zData)-1);
   return strtoll(zData, 0, 0);
 }
-static void kvvfsWriteFileSize(KVVfsFile *pFile, sqlite3_int64 sz){
+static int kvvfsWriteFileSize(KVVfsFile *pFile, sqlite3_int64 sz){
   char zData[50];
   sqlite3_snprintf(sizeof(zData), zData, "%lld", sz);
-  kvstorageWrite(pFile->zClass, "sz", zData);
+  return kvstorageWrite(pFile->zClass, "sz", zData);
 }
 
 /****** sqlite3_io_methods methods ******************************************/
@@ -788,7 +788,9 @@ static int kvvfsWriteDb(
   pgno = 1 + iOfst/iAmt;
   sqlite3_snprintf(sizeof(zKey), zKey, "%u", pgno);
   kvvfsEncode(zBuf, iAmt, aData);
-  kvstorageWrite(pFile->zClass, zKey, aData);
+  if( kvstorageWrite(pFile->zClass, zKey, aData) ){
+    return SQLITE_IOERR;
+  }
   if( iOfst+iAmt > pFile->szDb ){
     pFile->szDb = iOfst + iAmt;
   }
@@ -825,8 +827,7 @@ static int kvvfsTruncateDb(sqlite3_file *pProtoFile, sqlite_int64 size){
       pgno++;
     }
     pFile->szDb = size;
-    kvvfsWriteFileSize(pFile, size);
-    return SQLITE_OK;
+    return kvvfsWriteFileSize(pFile, size) ? SQLITE_IOERR : SQLITE_OK;
   }
   return SQLITE_IOERR;
 }
@@ -854,17 +855,18 @@ static int kvvfsSyncJrnl(sqlite3_file *pProtoFile, int flags){
   }while( n>0 );
   zOut[i++] = ' ';
   kvvfsEncode(pFile->aJrnl, pFile->nJrnl, &zOut[i]);
-  kvstorageWrite(pFile->zClass, "jrnl", zOut);
+  i = kvstorageWrite(pFile->zClass, "jrnl", zOut);
   sqlite3_free(zOut);
-  return SQLITE_OK;
+  return i ? SQLITE_IOERR : SQLITE_OK;
 }
 static int kvvfsSyncDb(sqlite3_file *pProtoFile, int flags){
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
+  int rc = SQLITE_OK;
   SQLITE_KV_LOG(("xSync('%s-db')\n", pFile->zClass));
-  if( pFile->szDb>0 ){
-    kvvfsWriteFileSize(pFile, pFile->szDb);
+  if( pFile->szDb>0 && 0!=kvvfsWriteFileSize(pFile, pFile->szDb) ){
+    rc = SQLITE_IOERR;
   }
-  return SQLITE_OK;
+  return rc;
 }
 
 /*

From 58bcfe075dcaf4bc94f7f1d56ce3a4b3ed230e22 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Fri, 16 Sep 2022 02:28:03 +0000
Subject: [PATCH 113/428] Remove --nosync flag from speedtest1-kvvfs.html, as
 that seems to be the trigger for the 'no such table: z1' error. That app now
 warns if that flag is passed to it via URL args.

FossilOrigin-Name: ad0677e8abcc077636d1cf1d8485be4943506382581edf832e6b8a2021560040
---
 ext/wasm/speedtest1-kvvfs.html |  7 +++++--
 manifest                       | 12 ++++++------
 manifest.uuid                  |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/ext/wasm/speedtest1-kvvfs.html b/ext/wasm/speedtest1-kvvfs.html
index 272425262b..080f7e4e18 100644
--- a/ext/wasm/speedtest1-kvvfs.html
+++ b/ext/wasm/speedtest1-kvvfs.html
@@ -107,9 +107,9 @@
             argv.push(
               "--singlethread",
               "--nomutex",
-              "--nosync",
+              //"--nosync",
               "--nomemstat"
-              //"--sqlonly"
+              //  ,"--sqlonly"
             );
             //argv.push("--memdb" /* note that memdb trumps the filename arg */);
           }
@@ -118,6 +118,9 @@
           if(argv.indexOf('--memdb')>=0){
               log2('error',"WARNING: --memdb flag trumps db filename.");
           }
+          if(argv.indexOf('--nosync')>=0){
+              log2('error',"WARNING: --nosync flag is known to cause this test to fail.");
+          }
           console.log("argv =",argv);
           // These log messages are not emitted to the UI until after main() returns. Fixing that
           // requires moving the main() call and related cleanup into a timeout handler.
diff --git a/manifest b/manifest
index b9e43a7389..37ab517eef 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sreturn\svalue\schecks\sto\skvstorageWrite(),\snecessary\sfor\srecognizing\sstorage-full\serrors\sin\sthe\sJS\sbinding.\sspeedtest1-kvvfs.html\sruns\ssuccessfully\son\slocalStorage\swith\s--size\s1\sto\s6\sand\sstarts\sfailing\swith\sstorage\sshortage\sat\s--size\s7.
-D 2022-09-16T01:05:19.939
+C Remove\s--nosync\sflag\sfrom\sspeedtest1-kvvfs.html,\sas\sthat\sseems\sto\sbe\sthe\strigger\sfor\sthe\s'no\ssuch\stable:\sz1'\serror.\sThat\sapp\snow\swarns\sif\sthat\sflag\sis\spassed\sto\sit\svia\sURL\sargs.
+D 2022-09-16T02:28:03.733
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -514,7 +514,7 @@ F ext/wasm/scratchpad-opfs-worker.js cf6c4554d3b099c1a50013e50d19b3dc60e183511b4
 F ext/wasm/scratchpad-opfs-worker2.js 2424d7d7b8801fc143f6540fbdd8a96f3f2e5b811f0f545714d06147ccce58bf
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
 F ext/wasm/scratchpad-wasmfs-main.js 69e960e9161f6412fd0c30f355d4112f1894d6609eb431e2d16d207d1380518e
-F ext/wasm/speedtest1-kvvfs.html c9cb752f9c81cdcf9ccdc09146bd8c9c77970ed44ab10908ed15f1cce95c0f8d
+F ext/wasm/speedtest1-kvvfs.html ad08e2018c67cde7c459f692122a7d675b54a3709726c094ecbeed230f36abd3
 F ext/wasm/speedtest1-wasmfs.html 6a67a6812f03a2058eb5c6ad0c8dea4bf749d0160ed9d6b826dabe7b766c3cf7
 F ext/wasm/speedtest1-worker.html d8881ae802d15fb8adb94049265173e99f350e07e1d4e6f9e1cbd8969fe63a04
 F ext/wasm/speedtest1-worker.js fb5d282c0b8aed18daf41c57f768cbf434f8137dbff707d53dcedcd7d4cb60ef
@@ -2026,8 +2026,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 00ee49a3a2c148480f614e49a0ee5b35a255758c0a53693f0b464b31e7a4045b
-R a6e9c244c29b55941f4ad5b4e78621c2
+P 13839759f8f45e4eb0aa6a5052801f3964d5b2dc2e427e5e91ee6692176381eb
+R bad0de454d5232b2bfe356090d3af869
 U stephan
-Z daf2b8c0bbcd601af0a5bcd00e934942
+Z 949ebd6be72bc73feff93f2475059791
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index b3a08b5d95..ca8b17d577 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-13839759f8f45e4eb0aa6a5052801f3964d5b2dc2e427e5e91ee6692176381eb
\ No newline at end of file
+ad0677e8abcc077636d1cf1d8485be4943506382581edf832e6b8a2021560040
\ No newline at end of file

From 57db2174d53b713d3bdeb38fa05d9eb1580ee9c0 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Fri, 16 Sep 2022 02:30:49 +0000
Subject: [PATCH 114/428] Add batch-runner-kvvfs.html, a kvvfs-specific build
 of batch-runner.html. Reduce the speedtest1 --size X value for the batch list
 generation to 5 so that the kvvfs batch runner can handle it.

FossilOrigin-Name: d8df25920a047d5cf2093cc6233128c5e6057a9104d0c4397e643645bd646fe1
---
 ext/wasm/GNUmakefile             |  3 +-
 ext/wasm/batch-runner-kvvfs.html | 65 ++++++++++++++++++++++++++++++++
 ext/wasm/batch-runner.js         | 23 +++++++----
 ext/wasm/index.html              |  1 +
 manifest                         | 17 +++++----
 manifest.uuid                    |  2 +-
 6 files changed, 93 insertions(+), 18 deletions(-)
 create mode 100644 ext/wasm/batch-runner-kvvfs.html

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index fe3c7a61f8..18ca4ef3ea 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -308,7 +308,8 @@ dir.sql := sql
 speedtest1 := ../../speedtest1
 speedtest1.c := ../../test/speedtest1.c
 speedtest1.sql := $(dir.sql)/speedtest1.sql
-speedtest1.cliflags := --size 100
+speedtest1.cliflags := --size 5 --big-transactions
+#  --------------------^^^^^^^^ small size is needed for batch-runner-kvvfs.html
 $(speedtest1):
 	$(MAKE) -C ../.. speedtest1
 $(speedtest1.sql): $(speedtest1) $(MAKEFILE)
diff --git a/ext/wasm/batch-runner-kvvfs.html b/ext/wasm/batch-runner-kvvfs.html
new file mode 100644
index 0000000000..420bdf4f20
--- /dev/null
+++ b/ext/wasm/batch-runner-kvvfs.html
@@ -0,0 +1,65 @@
+<!doctype html>
+<html lang="en-us">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
+    <link rel="stylesheet" href="common/emscripten.css"/>
+    <link rel="stylesheet" href="common/testing.css"/>
+    <title>sqlite3-api kvvfs batch SQL runner</title>
+  </head>
+  <body>
+    <header id='titlebar'><span>sqlite3-api kvvfs batch SQL runner</span></header>
+    <!-- emscripten bits -->
+    <figure id="module-spinner">
+      <div class="spinner"></div>
+      <div class='center'><strong>Initializing app...</strong></div>
+      <div class='center'>
+        On a slow internet connection this may take a moment.  If this
+        message displays for "a long time", intialization may have
+        failed and the JavaScript console may contain clues as to why.
+      </div>
+    </figure>
+    <div class="emscripten" id="module-status">Downloading...</div>
+    <div class="emscripten">
+      <progress value="0" max="100" id="module-progress" hidden='1'></progress>  
+    </div><!-- /emscripten bits -->
+    <p>
+      This page is for batch-running extracts from the output
+      of <tt>speedtest1 --script</tt>, as well as other standalone SQL
+      scripts. <span class='warning'>This variant runs with KVVFS and
+      has tiny size limits.</span>
+    </p>
+    <p id='warn-list' class='warning'>ACHTUNG: this file requires a generated input list
+      file. Run "make batch" from this directory to generate it.
+    </p>
+    <p id='warn-opfs' class='warning'>WARNING: if the WASMFS/OPFS layer crashes, this page may
+      become completely unresponsive and need to be closed and
+      reloaded to recover.
+    </p>
+    <hr>
+    <div>
+      <select class='disable-during-eval' id='sql-select'>
+        <option disabled selected>Populated via script code</option>
+      </select>
+      <button class='disable-during-eval' id='sql-run'>Run selected SQL</button>
+      <button class='disable-during-eval' id='sql-run-next'>Run next...</button>
+      <button class='disable-during-eval' id='sql-run-remaining'>Run all remaining...</button>
+      <button class='disable-during-eval' id='export-metrics'>Export metrics (WIP)</button>
+      <button class='disable-during-eval' id='db-reset'>Reset db</button>
+      <button id='output-clear'>Clear output</button>
+      <span class='input-wrapper'>
+        <input type='checkbox' class='disable-during-eval' id='cb-reverse-log-order' checked></input>
+        <label for='cb-reverse-log-order'>Reverse log order</label>
+      </span>
+    </div>
+    <hr>
+    <div id='reverse-log-notice' class='hidden'>(Log output is in reverse order, newest first!)</div>
+    <div id='test-output'></div>
+    <!-- batch-runner.js "should" work with sqlite3-kvvfs so long as
+         its data sets don't violate the the storage limits. -->
+    <script src="sqlite3-kvvfs.js"></script>
+    <script src="common/SqliteTestUtil.js"></script>
+    <script src="batch-runner.js"></script>
+  </body>
+</html>
diff --git a/ext/wasm/batch-runner.js b/ext/wasm/batch-runner.js
index 9964d747c7..7a90ddd13f 100644
--- a/ext/wasm/batch-runner.js
+++ b/ext/wasm/batch-runner.js
@@ -356,17 +356,24 @@
       this.logHtml("Loaded module:",capi.sqlite3_libversion(), capi.sqlite3_sourceid());
       this.logHtml("WASM heap size =",wasm.heap8().length);
       this.loadSqlList();
-      const pDir = 1 ? '' : capi.sqlite3_web_persistent_dir();
-      const dbFile = pDir ? pDir+"/speedtest.db" : (
-        sqlite3.capi.sqlite3_vfs_find('kvvfs') ? 'local' : ':memory:'
-      );
-      this.clearStorage();
-      if(pDir){
-        logHtml("Using persistent storage:",dbFile);
+      let pDir, dbFile;
+      if(sqlite3.capi.sqlite3_vfs_find('kvvfs')){
+        dbFile = 1 ? 'local' : 'session';
+        this.logHtml("Using KVVFS storage:",dbFile);
       }else{
+        pDir = capi.sqlite3_web_persistent_dir();
+        if(pDir){
+          dbFile = pDir+"/speedtest.db";
+          this.logHtml("Using persistent storage:",dbFile);
+        }else{
+          dbFile = ':memory:';
+          this.logHtml("Using",dbFile,"storage.");
+        }
+      }
+      if(!pDir){
         document.querySelector('#warn-opfs').remove();
       }
-      this.openDb(dbFile, !!pDir);
+      this.openDb(dbFile, true);
       const who = this;
       const eReverseLogNotice = document.querySelector('#reverse-log-notice');
       if(this.e.cbReverseLog.checked){
diff --git a/ext/wasm/index.html b/ext/wasm/index.html
index 383045ea2c..20c96c8cf0 100644
--- a/ext/wasm/index.html
+++ b/ext/wasm/index.html
@@ -37,6 +37,7 @@
           tests for the Promise-based wrapper of the Worker-based API.</li>
         <li><a href='demo-oo1.html'>demo-oo1</a>: demonstration of the OO API #1.</li>
         <li><a href='batch-runner.html'>batch-runner</a>: runs batches of SQL exported from speedtest1.</li>
+        <li><a href='batch-runner-kvvfs.html'>batch-runner-kvvfs</a>: KVVFS-specific variant of batch-runner.html.</li>
         <li><a href='speedtest1.html'>speedtest1</a>: a main-thread WASM build of speedtest1.</li>
         <li><a href='speedtest1-worker.html'>speedtest1-worker</a>: an interactive Worker-thread variant of speedtest1.</li>
         <li><a href='speedtest1-wasmfs.html'>speedtest1-wasmfs</a>: a variant of speedtest1 built solely for the wasmfs/opfs feature.</li>
diff --git a/manifest b/manifest
index 37ab517eef..3803dbcdfe 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\s--nosync\sflag\sfrom\sspeedtest1-kvvfs.html,\sas\sthat\sseems\sto\sbe\sthe\strigger\sfor\sthe\s'no\ssuch\stable:\sz1'\serror.\sThat\sapp\snow\swarns\sif\sthat\sflag\sis\spassed\sto\sit\svia\sURL\sargs.
-D 2022-09-16T02:28:03.733
+C Add\sbatch-runner-kvvfs.html,\sa\skvvfs-specific\sbuild\sof\sbatch-runner.html.\sReduce\sthe\sspeedtest1\s--size\sX\svalue\sfor\sthe\sbatch\slist\sgeneration\sto\s5\sso\sthat\sthe\skvvfs\sbatch\srunner\scan\shandle\sit.
+D 2022-09-16T02:30:49.153
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle 7fb73f7150ab79d83bb45a67d257553c905c78cd3d693101699243f36c5ae6c3
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile bec8b98f00c81561215bd8adff9870a30508fd6813bccf1b821ddf073446525e
+F ext/wasm/GNUmakefile ab4a43ee7aaa5abf8e30f02cedfb803a18f632bb6554e800d96616050ccab37d
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 150a793a47205b8009ac934f3b6d6ebf67b965c072339aaa25ce808a19e116cc
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -489,8 +489,9 @@ F ext/wasm/api/sqlite3-api-prologue.js 7aff2d9b110d5a6e70dbf5fe44189d983d7886a46
 F ext/wasm/api/sqlite3-api-worker1.js d33062afa045fd4be01ba4abc266801807472558b862b30056211b00c9c347b4
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 4130e2df9587f4e4c3afc04c3549d682c8a5c0cfe5b22819a0a86edb7f01b9bd
+F ext/wasm/batch-runner-kvvfs.html ef3b2f553abad4f17a2a29ce6526023793a88e8597b7a24b8c7855a030b90a16
 F ext/wasm/batch-runner.html 2857a6db7292ac83d1581af865d643fd34235db2df830d10b43b01388c599e04
-F ext/wasm/batch-runner.js fb6a338aeef509f181f499700a8595bc578bbc54ef832e0cda7e7e7c10b90a18
+F ext/wasm/batch-runner.js 6f5b86e0b5519a9a941d9f17ee9c5ecdc63f452f157602fe7fdf87f6275a2b49
 F ext/wasm/common/SqliteTestUtil.js 529161a624265ba84271a52db58da022649832fa1c71309fb1e02cc037327a2b
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 3a5143699c2b73a85b962271e1a9b3241b30d90e30d895e4f55665e648572962
@@ -501,7 +502,7 @@ F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d695
 F ext/wasm/fiddle/fiddle-worker.js bccf46045be8824752876f3eec01c223be0616ccac184bffd0024cfe7a3262b8
 F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
 F ext/wasm/fiddle/fiddle.js 4ffcfc9a235beebaddec689a549e9e0dfad6dca5c1f0b41f03468d7e76480686
-F ext/wasm/index.html e251800a64cf13e731ddec5a86ca4a299dcc4c1fafafd87658ccca3c538dd843
+F ext/wasm/index.html 095b9a8cee9aac2654c23686ead22f3452b89d581fb41d34d47b6548546b5365
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 447cc02b598f7792edaa8ae6853a7847b8178a18ed356afacbdbf312b2588106
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
@@ -2026,8 +2027,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 13839759f8f45e4eb0aa6a5052801f3964d5b2dc2e427e5e91ee6692176381eb
-R bad0de454d5232b2bfe356090d3af869
+P ad0677e8abcc077636d1cf1d8485be4943506382581edf832e6b8a2021560040
+R 6eaf6290c7f1da025383bc24b7d47eee
 U stephan
-Z 949ebd6be72bc73feff93f2475059791
+Z 5b7d05db593e0eeb6d33327ff3472ed8
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index ca8b17d577..34cc1ee971 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ad0677e8abcc077636d1cf1d8485be4943506382581edf832e6b8a2021560040
\ No newline at end of file
+d8df25920a047d5cf2093cc6233128c5e6057a9104d0c4397e643645bd646fe1
\ No newline at end of file

From 84e50767871d64ed2e9ffcf7dbee49d97746ce6f Mon Sep 17 00:00:00 2001
From: drh <>
Date: Fri, 16 Sep 2022 11:37:01 +0000
Subject: [PATCH 115/428] Fix os_kv.c so that it uses SQLITE_FCNTL_SYNC and
 hence works even with PRAGMA synchronous=OFF.

FossilOrigin-Name: 21915af560b111aeeaee751790356151a5f063c2fc703dd4b35b22dc393409fb
---
 manifest      | 14 +++++++-------
 manifest.uuid |  2 +-
 src/os_kv.c   | 31 ++++++++++++++++++++-----------
 3 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/manifest b/manifest
index da3fab544e..57b3e2ecad 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Pull\sthe\ssrc/os_kv.c\spart\sof\s[13839759f8f4]\sinto\sthe\skv-vfs\sbranch.
-D 2022-09-16T01:08:06.279
+C Fix\sos_kv.c\sso\sthat\sit\suses\sSQLITE_FCNTL_SYNC\sand\shence\nworks\seven\swith\sPRAGMA\ssynchronous=OFF.
+D 2022-09-16T11:37:01.212
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -574,7 +574,7 @@ F src/notify.c 89a97dc854c3aa62ad5f384ef50c5a4a11d70fcc69f86de3e991573421130ed6
 F src/os.c 0eb831ba3575af5277e47f4edd14fdfc90025c67eb25ce5cda634518d308d4e9
 F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
-F src/os_kv.c d4909b439043183f9b6aec65528a7433cee49d41cca95b9a3a4c8fb6bbedc0c2
+F src/os_kv.c 554a2c109f8810b743af2eed4ba732d18dfdbc4d073e3a9bd8b8e828215a9692
 F src/os_setup.h 0711dbc4678f3ac52d7fe736951b6384a0615387c4ba5135a4764e4e31f4b6a6
 F src/os_unix.c 0fa91925f0b8831fc0156a9c04d39d86f85baf9eef66c98712395e1715cb75cc
 F src/os_win.c e9454cb141908e8eef2102180bad353a36480612d5b736e4c2bd5777d9b25a34
@@ -2004,8 +2004,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 1c5aeee45564c14e7e2e7730f3f52106339ea3148fb5aa786fa767a35db46f51
-R 06fb792046d4c535864a12af9a1a5d61
-U stephan
-Z 125d6637967f22bfb5b9fb3681eda03b
+P e334449912d5176e355d02024a07ed867741f71c9d10ce6744ca800414bf3eeb
+R a55522768af3f3b5d07199ad1dd4c789
+U drh
+Z d50c7a05ab573e361ead585b4e643b32
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 445b7e7e25..c9139459b8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e334449912d5176e355d02024a07ed867741f71c9d10ce6744ca800414bf3eeb
\ No newline at end of file
+21915af560b111aeeaee751790356151a5f063c2fc703dd4b35b22dc393409fb
\ No newline at end of file
diff --git a/src/os_kv.c b/src/os_kv.c
index 17d4c254e1..b99f5574c7 100644
--- a/src/os_kv.c
+++ b/src/os_kv.c
@@ -71,7 +71,8 @@ static int kvvfsFileSizeJrnl(sqlite3_file*, sqlite3_int64 *pSize);
 static int kvvfsLock(sqlite3_file*, int);
 static int kvvfsUnlock(sqlite3_file*, int);
 static int kvvfsCheckReservedLock(sqlite3_file*, int *pResOut);
-static int kvvfsFileControl(sqlite3_file*, int op, void *pArg);
+static int kvvfsFileControlDb(sqlite3_file*, int op, void *pArg);
+static int kvvfsFileControlJrnl(sqlite3_file*, int op, void *pArg);
 static int kvvfsSectorSize(sqlite3_file*);
 static int kvvfsDeviceCharacteristics(sqlite3_file*);
 
@@ -123,7 +124,7 @@ static sqlite3_io_methods kvvfs_db_io_methods = {
   kvvfsLock,                      /* xLock */
   kvvfsUnlock,                    /* xUnlock */
   kvvfsCheckReservedLock,         /* xCheckReservedLock */
-  kvvfsFileControl,               /* xFileControl */
+  kvvfsFileControlDb,             /* xFileControl */
   kvvfsSectorSize,                /* xSectorSize */
   kvvfsDeviceCharacteristics,     /* xDeviceCharacteristics */
   0,                              /* xShmMap */
@@ -147,7 +148,7 @@ static sqlite3_io_methods kvvfs_jrnl_io_methods = {
   kvvfsLock,                      /* xLock */
   kvvfsUnlock,                    /* xUnlock */
   kvvfsCheckReservedLock,         /* xCheckReservedLock */
-  kvvfsFileControl,               /* xFileControl */
+  kvvfsFileControlJrnl,           /* xFileControl */
   kvvfsSectorSize,                /* xSectorSize */
   kvvfsDeviceCharacteristics,     /* xDeviceCharacteristics */
   0,                              /* xShmMap */
@@ -860,13 +861,7 @@ static int kvvfsSyncJrnl(sqlite3_file *pProtoFile, int flags){
   return i ? SQLITE_IOERR : SQLITE_OK;
 }
 static int kvvfsSyncDb(sqlite3_file *pProtoFile, int flags){
-  KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
-  int rc = SQLITE_OK;
-  SQLITE_KV_LOG(("xSync('%s-db')\n", pFile->zClass));
-  if( pFile->szDb>0 && 0!=kvvfsWriteFileSize(pFile, pFile->szDb) ){
-    rc = SQLITE_IOERR;
-  }
-  return rc;
+  return SQLITE_OK;
 }
 
 /*
@@ -928,7 +923,21 @@ static int kvvfsCheckReservedLock(sqlite3_file *pProtoFile, int *pResOut){
 /*
 ** File control method. For custom operations on an kvvfs-file.
 */
-static int kvvfsFileControl(sqlite3_file *pProtoFile, int op, void *pArg){
+static int kvvfsFileControlJrnl(sqlite3_file *pProtoFile, int op, void *pArg){
+  SQLITE_KV_LOG(("xFileControl(%d) on journal\n", op));
+  return SQLITE_NOTFOUND;
+}
+static int kvvfsFileControlDb(sqlite3_file *pProtoFile, int op, void *pArg){
+  SQLITE_KV_LOG(("xFileControl(%d) on database\n", op));
+  if( op==SQLITE_FCNTL_SYNC ){
+    KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
+    int rc = SQLITE_OK;
+    SQLITE_KV_LOG(("xSync('%s-db')\n", pFile->zClass));
+    if( pFile->szDb>0 && 0!=kvvfsWriteFileSize(pFile, pFile->szDb) ){
+      rc = SQLITE_IOERR;
+    }
+    return rc;
+  }
   return SQLITE_NOTFOUND;
 }
 

From 81439a07f01ddb8e72b6fd3c4d0a0f6ca345d38c Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Fri, 16 Sep 2022 12:49:45 +0000
Subject: [PATCH 116/428] When calculating kvvfs sessionStorage/localStorage
 size, multiply it by 2 to account for JS using 16-bit characters.

FossilOrigin-Name: 52d1b185b9f6cee1eb3dec436f47e0f52e4621a127abfad8c27f92fd78147889
---
 ext/wasm/api/sqlite3-api-prologue.js |  4 ++--
 ext/wasm/speedtest1-kvvfs.html       |  2 +-
 manifest                             | 14 +++++++-------
 manifest.uuid                        |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 3d6d4c92b5..1fc533da62 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -818,7 +818,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
        string (the default) then both are counted. Only storage keys
        which match the pattern used by kvvfs are counted. The returned
        value is the "length" value of every matching key and value,
-       noting that the kvvf uses only ASCII keys and values.
+       noting that JavaScript stores each character in 2 bytes.
 
        Note that the returned size is not authoritative from the
        perspective of how much data can fit into localStorage and
@@ -839,7 +839,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
           }
         }
       });
-      return sz;
+      return sz * 2 /* because JS uses UC16 encoding */;
     };
 
     /**
diff --git a/ext/wasm/speedtest1-kvvfs.html b/ext/wasm/speedtest1-kvvfs.html
index 9bb387643b..82d32f4fe0 100644
--- a/ext/wasm/speedtest1-kvvfs.html
+++ b/ext/wasm/speedtest1-kvvfs.html
@@ -77,7 +77,7 @@
               }
             }
           });
-          return sz;
+          return sz * 2 /* for 16-bit-char encoding */;
         };
         const clearStorage = function(){
             sessionStorage.clear();
diff --git a/manifest b/manifest
index a4dec59160..f946cd3989 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\skv-vfs\sbranch\sinto\sfiddle-opfs\sbranch\sfor\s[21915af560b1|synchronous=off\sfix].\sRemove\ssome\sduplicate\sdebug\soutput\sin\sOPFS\stest\scode.
-D 2022-09-16T11:45:09.066
+C When\scalculating\skvvfs\ssessionStorage/localStorage\ssize,\smultiply\sit\sby\s2\sto\saccount\sfor\sJS\susing\s16-bit\scharacters.
+D 2022-09-16T12:49:45.564
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -485,7 +485,7 @@ F ext/wasm/api/sqlite3-api-cleanup.js 8564a6077cdcaea9a9f428a019af8a05887f0131e6
 F ext/wasm/api/sqlite3-api-glue.js 366d580c8e5bf7fcf4c6dee6f646c31f5549bd417ea03a59a0acca00e8ecce30
 F ext/wasm/api/sqlite3-api-oo1.js d7526517f7ad3f6bda16ad66d373bbb71b43168deef7af60eda5c9fe873d1387
 F ext/wasm/api/sqlite3-api-opfs.js 011799db398157cbd254264b6ebae00d7234b93d0e9e810345f213a5774993c0
-F ext/wasm/api/sqlite3-api-prologue.js 7aff2d9b110d5a6e70dbf5fe44189d983d7886a465ad156176f4ad290447c97b
+F ext/wasm/api/sqlite3-api-prologue.js 48ebca4ae340b0242d4f39bbded01bd0588393c8023628be1c454b4db6f7bd6e
 F ext/wasm/api/sqlite3-api-worker1.js d33062afa045fd4be01ba4abc266801807472558b862b30056211b00c9c347b4
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 4130e2df9587f4e4c3afc04c3549d682c8a5c0cfe5b22819a0a86edb7f01b9bd
@@ -515,7 +515,7 @@ F ext/wasm/scratchpad-opfs-worker.js cf6c4554d3b099c1a50013e50d19b3dc60e183511b4
 F ext/wasm/scratchpad-opfs-worker2.js 8c980370bbd5a262d96af8627c443936e11b87d0263a02123769d5953fc146da
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
 F ext/wasm/scratchpad-wasmfs-main.js 69e960e9161f6412fd0c30f355d4112f1894d6609eb431e2d16d207d1380518e
-F ext/wasm/speedtest1-kvvfs.html 6e6e918d44b819a9ea1a146f260bd69022bdccd854439ee2d8c646f5073c2ea8
+F ext/wasm/speedtest1-kvvfs.html 20f47314ea1b892cfb9248d63e2514573be089d7ab1949dddadd4fed761e07a9
 F ext/wasm/speedtest1-wasmfs.html 6a67a6812f03a2058eb5c6ad0c8dea4bf749d0160ed9d6b826dabe7b766c3cf7
 F ext/wasm/speedtest1-worker.html d8881ae802d15fb8adb94049265173e99f350e07e1d4e6f9e1cbd8969fe63a04
 F ext/wasm/speedtest1-worker.js fb5d282c0b8aed18daf41c57f768cbf434f8137dbff707d53dcedcd7d4cb60ef
@@ -2027,8 +2027,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 d8df25920a047d5cf2093cc6233128c5e6057a9104d0c4397e643645bd646fe1 21915af560b111aeeaee751790356151a5f063c2fc703dd4b35b22dc393409fb
-R 9d036c771fee3f8c011441c0aa641532
+P 13899bb98c80525276d2484598b94e4206358f243f06d45c02700024f7e226fd
+R 9d9ce1010dbc2786b3b027fc9d4d0a5f
 U stephan
-Z 6c79830061a07791b98ec477a66ca0ad
+Z a004dca4566819b88df76b8693bd15c3
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 5aecdc9f0f..ea2d80a593 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-13899bb98c80525276d2484598b94e4206358f243f06d45c02700024f7e226fd
\ No newline at end of file
+52d1b185b9f6cee1eb3dec436f47e0f52e4621a127abfad8c27f92fd78147889
\ No newline at end of file

From 756440febc24d57d6d85e343b969678c234b03bb Mon Sep 17 00:00:00 2001
From: drh <>
Date: Fri, 16 Sep 2022 15:19:04 +0000
Subject: [PATCH 117/428] Corrections to the xRead method for databases in the
 os_kv.c VFS so that it correctly reads the header, and thus avoids
 unnecessary cache flushes.  This changes also includes an optimization to the
 header read logic.

FossilOrigin-Name: ef54961ce69fddb4cfeeff0860288de2858a6f7a5aa396691e8e99933eb9af54
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/os_kv.c   |  8 +++++---
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/manifest b/manifest
index 57b3e2ecad..62feced741 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sos_kv.c\sso\sthat\sit\suses\sSQLITE_FCNTL_SYNC\sand\shence\nworks\seven\swith\sPRAGMA\ssynchronous=OFF.
-D 2022-09-16T11:37:01.212
+C Corrections\sto\sthe\sxRead\smethod\sfor\sdatabases\sin\sthe\sos_kv.c\sVFS\sso\sthat\sit\ncorrectly\sreads\sthe\sheader,\sand\sthus\savoids\sunnecessary\scache\sflushes.\s\sThis\nchanges\salso\sincludes\san\soptimization\sto\sthe\sheader\sread\slogic.
+D 2022-09-16T15:19:04.113
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -574,7 +574,7 @@ F src/notify.c 89a97dc854c3aa62ad5f384ef50c5a4a11d70fcc69f86de3e991573421130ed6
 F src/os.c 0eb831ba3575af5277e47f4edd14fdfc90025c67eb25ce5cda634518d308d4e9
 F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
-F src/os_kv.c 554a2c109f8810b743af2eed4ba732d18dfdbc4d073e3a9bd8b8e828215a9692
+F src/os_kv.c 3a2d319988df9da8f3a4d0c753a1492542bd3017ff7ae5d07814460eac6b0b19
 F src/os_setup.h 0711dbc4678f3ac52d7fe736951b6384a0615387c4ba5135a4764e4e31f4b6a6
 F src/os_unix.c 0fa91925f0b8831fc0156a9c04d39d86f85baf9eef66c98712395e1715cb75cc
 F src/os_win.c e9454cb141908e8eef2102180bad353a36480612d5b736e4c2bd5777d9b25a34
@@ -2004,8 +2004,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 e334449912d5176e355d02024a07ed867741f71c9d10ce6744ca800414bf3eeb
-R a55522768af3f3b5d07199ad1dd4c789
+P 21915af560b111aeeaee751790356151a5f063c2fc703dd4b35b22dc393409fb
+R 64099072882bb903603d527810cdf234
 U drh
-Z d50c7a05ab573e361ead585b4e643b32
+Z 33c23cb0033c7cdf863f626ff2ea91a9
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index c9139459b8..54e92cfb4b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-21915af560b111aeeaee751790356151a5f063c2fc703dd4b35b22dc393409fb
\ No newline at end of file
+ef54961ce69fddb4cfeeff0860288de2858a6f7a5aa396691e8e99933eb9af54
\ No newline at end of file
diff --git a/src/os_kv.c b/src/os_kv.c
index b99f5574c7..db95a305b7 100644
--- a/src/os_kv.c
+++ b/src/os_kv.c
@@ -700,7 +700,7 @@ static int kvvfsReadDb(
   unsigned int pgno;
   int got, n;
   char zKey[30];
-  char aData[131073];
+  char aData[133073];
   assert( iOfst>=0 );
   assert( iAmt>=0 );
   SQLITE_KV_LOG(("xRead('%s-db',%d,%lld)\n", pFile->zClass, iAmt, iOfst));
@@ -723,9 +723,11 @@ static int kvvfsReadDb(
   }else{
     aData[got] = 0;
     if( iOfst+iAmt<512 ){
-      n = kvvfsDecode(aData, &aData[1000], 1000);
+      int k = iOfst+iAmt;
+      aData[k*2] = 0;
+      n = kvvfsDecode(aData, &aData[2000], sizeof(aData)-2000);
       if( n>=iOfst+iAmt ){
-        memcpy(zBuf, &aData[1000+iOfst], iAmt);
+        memcpy(zBuf, &aData[2000+iOfst], iAmt);
         n = iAmt;
       }else{
         n = 0;

From 132a87baa366bcda8b26e0e4e56c6abba4c5d453 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sat, 17 Sep 2022 15:08:22 +0000
Subject: [PATCH 118/428] Add initial bits of an experimental
 async-impl-via-synchronous-interface proxy intended to marshal OPFS via
 sqlite3_vfs API.

FossilOrigin-Name: 38da059b472415da52f57de7332fbeb8a91e3add1f4be3ff9c1924b52672f77c
---
 ext/wasm/api/sqlite3-api-opfs.js     |   7 +-
 ext/wasm/index.html                  |   8 +-
 ext/wasm/sqlite3-opfs-async-proxy.js | 286 +++++++++++++++++++++++++++
 ext/wasm/x-sync-async.html           |  28 +++
 ext/wasm/x-sync-async.js             | 133 +++++++++++++
 manifest                             |  17 +-
 manifest.uuid                        |   2 +-
 7 files changed, 469 insertions(+), 12 deletions(-)
 create mode 100644 ext/wasm/sqlite3-opfs-async-proxy.js
 create mode 100644 ext/wasm/x-sync-async.html
 create mode 100644 ext/wasm/x-sync-async.js

diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index 693432b35a..3faf956c72 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -34,11 +34,12 @@
 self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
   const warn = console.warn.bind(console),
         error = console.error.bind(console);
-  if(!self.importScripts || !self.FileSystemFileHandle){
-    //|| !self.FileSystemFileHandle.prototype.createSyncAccessHandle){
-    // ^^^ sync API is not required with WASMFS/OPFS backend.
+  if(self.window===self || !self.importScripts || !self.FileSystemFileHandle
+     || !self.FileSystemFileHandle.prototype.createSyncAccessHandle){
     warn("OPFS is not available in this environment.");
     return;
+  }else if(!navigator.storage.getDirectory){
+    warn("The OPFS VFS requires navigator.storage.getDirectory.");
   }else if(!sqlite3.capi.wasm.bigIntEnabled){
     error("OPFS requires BigInt support but sqlite3.capi.wasm.bigIntEnabled is false.");
     return;
diff --git a/ext/wasm/index.html b/ext/wasm/index.html
index 20c96c8cf0..a1cc194854 100644
--- a/ext/wasm/index.html
+++ b/ext/wasm/index.html
@@ -49,7 +49,13 @@
           reminder: we cannot currently (2022-09-15) load WASMFS in a
           worker due to an Emscripten limitation.</li>
         <li><a href='scratchpad-opfs-worker.html'>scratchpad-opfs-worker</a>:
-          experimenting with OPFS from a Worker thread (without WASMFS).
+          experimenting with OPFS from a Worker thread (without WASMFS).</li>
+        <li><a href='x-sync-async.html'>x-sync-async</a> is an
+          experiment in implementing a syncronous sqlite3 VFS proxy
+          for a fully synchronous backend interface (namely OPFS), using SharedArrayBuffer
+          and the Atomics APIs to regulate communication between the synchronous
+          interface and the async impl.
+        </li>
         <!--li><a href='x.html'></a></li-->
       </ul>
     </div>
diff --git a/ext/wasm/sqlite3-opfs-async-proxy.js b/ext/wasm/sqlite3-opfs-async-proxy.js
new file mode 100644
index 0000000000..98e2688149
--- /dev/null
+++ b/ext/wasm/sqlite3-opfs-async-proxy.js
@@ -0,0 +1,286 @@
+/*
+  2022-09-16
+
+  The author disclaims copyright to this source code.  In place of a
+  legal notice, here is a blessing:
+
+  *   May you do good and not evil.
+  *   May you find forgiveness for yourself and forgive others.
+  *   May you share freely, never taking more than you give.
+
+  ***********************************************************************
+
+  A EXTREMELY INCOMPLETE and UNDER CONSTRUCTION experiment for OPFS: a
+  Worker which manages asynchronous OPFS handles on behalf of a
+  synchronous API which controls it via a combination of Worker
+  messages, SharedArrayBuffer, and Atomics.
+
+  Highly indebted to:
+
+  https://github.com/rhashimoto/wa-sqlite/blob/master/src/examples/OriginPrivateFileSystemVFS.js
+
+  for demonstrating how to use the OPFS APIs.
+*/
+'use strict';
+(function(){
+  const toss = function(...args){throw new Error(args.join(' '))};
+  if(self.window === self){
+    toss("This code cannot run from the main thread.",
+         "Load it as a Worker from a separate Worker.");
+  }else if(!navigator.storage.getDirectory){
+    toss("This API requires navigator.storage.getDirectory.");
+  }
+  const logPrefix = "OPFS worker:";
+  const log = (...args)=>{
+    console.log(logPrefix,...args);
+  };
+  const warn =  (...args)=>{
+    console.warn(logPrefix,...args);
+  };
+  const error =  (...args)=>{
+    console.error(logPrefix,...args);
+  };
+
+  warn("This file is very much experimental and under construction.",self.location.pathname);
+  const wMsg = (type,payload)=>postMessage({type,payload});
+
+  const state = Object.create(null);
+  /*state.opSab;
+  state.sabIO;
+  state.opBuf;
+  state.opIds;
+  state.rootDir;*/
+  /**
+     Map of sqlite3_file pointers (integers) to metadata related to a
+     given OPFS file handles. The pointers are, in this side of the
+     interface, opaque file handle IDs provided by the synchronous
+     part of this constellation. Each value is an object with a structure
+     demonstrated in the xOpen() impl.
+  */
+  state.openFiles = Object.create(null);
+
+  /**
+     Map of dir names to FileSystemDirectoryHandle objects.
+  */
+  state.dirCache = new Map;
+
+  const __splitPath = (absFilename)=>{
+    const a = absFilename.split('/').filter((v)=>!!v);
+    return [a, a.pop()];
+  };
+  /**
+     Takes the absolute path to a filesystem element. Returns an array
+     of [handleOfContainingDir, filename]. If the 2nd argument is
+     truthy then each directory element leading to the file is created
+     along the way. Throws if any creation or resolution fails.
+  */
+  const getDirForPath = async function f(absFilename, createDirs = false){
+    const url = new URL(
+      absFilename, 'file://xyz'
+    ) /* use URL to resolve path pieces such as a/../b */;
+    const [path, filename] = __splitPath(url.pathname);
+    const allDirs = path.join('/');
+    let dh = state.dirCache.get(allDirs);
+    if(!dh){
+      dh = state.rootDir;
+      for(const dirName of path){
+        if(dirName){
+          dh = await dh.getDirectoryHandle(dirName, {create: !!createDirs});
+        }
+      }
+      state.dirCache.set(allDirs, dh);
+    }
+    return [dh, filename];
+  };
+
+  
+  /**
+     Generates a random ASCII string len characters long, intended for
+     use as a temporary file name.
+  */
+  const randomFilename = function f(len=16){
+    if(!f._chars){
+      f._chars = "abcdefghijklmnopqrstuvwxyz"+
+        "ABCDEFGHIJKLMNOPQRSTUVWXYZ"+
+        "012346789";
+      f._n = f._chars.length;
+    }
+    const a = [];
+    let i = 0;
+    for( ; i < len; ++i){
+      const ndx = Math.random() * (f._n * 64) % f._n | 0;
+      a[i] = f._chars[ndx];
+    }
+    return a.join('');
+  };
+
+  const storeAndNotify = (opName, value)=>{
+    log(opName+"() is notify()ing w/ value:",value);
+    Atomics.store(state.opBuf, state.opIds[opName], value);
+    Atomics.notify(state.opBuf, state.opIds[opName]);
+  };
+
+  const isInt32 = function(n){
+    return ('bigint'!==typeof n /*TypeError: can't convert BigInt to number*/)
+      && !!(n===(n|0) && n<=2147483647 && n>=-2147483648);
+  };
+  const affirm32Bits = function(n){
+    return isInt32(n) || toss("Number is too large (>31 bits):",n);
+  };
+
+  const ioMethods = {
+    xAccess: async function({filename, exists, readWrite}){
+      log("xAccess(",arguments,")");
+      const rc = 1;
+      storeAndNotify('xAccess', rc);
+    },
+    xClose: async function(fid){
+      const opName = 'xClose';
+      log(opName+"(",arguments[0],")");
+      log("state.openFiles",state.openFiles);
+      const fh = state.openFiles[fid];
+      if(fh){
+        delete state.openFiles[fid];
+        //await fh.close();
+        if(fh.accessHandle) await fh.accessHandle.close();
+        if(fh.deleteOnClose){
+          try{
+            await fh.dirHandle.removeEntry(fh.filenamePart);
+          }
+          catch(e){
+            warn("Ignoring dirHandle.removeEntry() failure of",fh);
+          }
+        }
+        log("state.openFiles",state.openFiles);
+        storeAndNotify(opName, 0);
+      }else{
+        storeAndNotify(opName, state.errCodes.NotFound);
+      }
+    },
+    xDelete: async function(filename){
+      log("xDelete(",arguments,")");
+      storeAndNotify('xClose', 0);
+    },
+    xFileSize: async function(fid){
+      log("xFileSize(",arguments,")");
+      const fh = state.openFiles[fid];
+      const sz = await fh.getSize();
+      affirm32Bits(sz);
+      storeAndNotify('xFileSize', sz | 0);
+    },
+    xOpen: async function({
+      fid/*sqlite3_file pointer*/, sab/*file-specific SharedArrayBuffer*/,
+      filename,
+      fileType = undefined /*mainDb, mainJournal, etc.*/,
+      create = false, readOnly = false, deleteOnClose = false,
+    }){
+      const opName = 'xOpen';
+      try{
+        if(create) readOnly = false;
+        log(opName+"(",arguments[0],")");
+
+        let hDir, filenamePart, hFile;
+        try {
+          [hDir, filenamePart] = await getDirForPath(filename, !!create);
+        }catch(e){
+          storeAndNotify(opName, state.errCodes.NotFound);
+          return;
+        }
+        hFile = await hDir.getFileHandle(filenamePart, {create: !!create});
+        log(opName,"filenamePart =",filenamePart, 'hDir =',hDir);
+        const fobj = state.openFiles[fid] = Object.create(null);
+        fobj.filenameAbs = filename;
+        fobj.filenamePart = filenamePart;
+        fobj.dirHandle = hDir;
+        fobj.fileHandle = hFile;
+        fobj.accessHandle = undefined;
+        fobj.fileType = fileType;
+        fobj.sab = sab;
+        fobj.create = !!create;
+        fobj.readOnly = !!readOnly;
+        fobj.deleteOnClose = !!deleteOnClose;
+
+        /**
+           wa-sqlite, at this point, grabs a SyncAccessHandle and
+           assigns it to the accessHandle prop of the file state
+           object, but it's unclear why it does that.
+        */
+        storeAndNotify(opName, 0);
+      }catch(e){
+        error(opName,e);
+        storeAndNotify(opName, state.errCodes.IO);
+      }
+    },
+    xRead: async function({fid,n,offset}){
+      log("xRead(",arguments,")");
+      affirm32Bits(n + offset);
+      const fh = state.openFiles[fid];
+      storeAndNotify('xRead',fid);
+    },
+    xSleep: async function f({ms}){
+      log("xSleep(",arguments[0],")");
+      await new Promise((resolve)=>{
+        setTimeout(()=>resolve(), ms);
+      }).finally(()=>storeAndNotify('xSleep',0));
+    },
+    xSync: async function({fid}){
+      log("xSync(",arguments,")");
+      const fh = state.openFiles[fid];
+      await fh.flush();
+      storeAndNotify('xSync',fid);
+    },
+    xTruncate: async function({fid,size}){
+      log("xTruncate(",arguments,")");
+      affirm32Bits(size);
+      const fh = state.openFiles[fid];
+      fh.truncate(size);
+      storeAndNotify('xTruncate',fid);
+    },
+    xWrite: async function({fid,src,n,offset}){
+      log("xWrite(",arguments,")");
+      const fh = state.openFiles[fid];
+      storeAndNotify('xWrite',fid);
+    }
+  };
+  
+  const onReady = function(){
+    self.onmessage = async function({data}){
+      log("self.onmessage",data);
+      switch(data.type){
+          case 'init':{
+            const opt = data.payload;
+            state.opSab = opt.opSab;
+            state.opBuf = new Int32Array(state.opSab);
+            state.opIds = opt.opIds;
+            state.errCodes = opt.errCodes;
+            state.sq3Codes = opt.sq3Codes;
+            Object.keys(ioMethods).forEach((k)=>{
+              if(!state.opIds[k]){
+                toss("Maintenance required: missing state.opIds[",k,"]");
+              }
+            });
+            log("init state",state);
+            break;
+          }
+          default:{
+            const m = ioMethods[data.type] || toss("Unknown message type:",data.type);
+            try {
+              await m(data.payload);
+            }catch(e){
+              error("Error handling",data.type+"():",e);
+              storeAndNotify(data.type, -99);
+            }
+            break;
+          }
+      }
+    };      
+    wMsg('ready');
+  };
+
+  navigator.storage.getDirectory().then(function(d){
+    state.rootDir = d;
+    log("state.rootDir =",state.rootDir);
+    onReady();
+  });
+    
+})();
diff --git a/ext/wasm/x-sync-async.html b/ext/wasm/x-sync-async.html
new file mode 100644
index 0000000000..4b2e08a31f
--- /dev/null
+++ b/ext/wasm/x-sync-async.html
@@ -0,0 +1,28 @@
+<!doctype html>
+<html lang="en-us">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
+    <link rel="stylesheet" href="common/emscripten.css"/>
+    <link rel="stylesheet" href="common/testing.css"/>
+    <title>Async-behind-Sync experiment</title>
+  </head>
+  <body>
+    <header id='titlebar'><span>Async-behind-Sync Experiment</span></header>
+    <div>This is an experiment in wrapping the
+      asynchronous OPFS APIs behind a fully synchronous proxy. It is
+      very much incomplete, under construction, and experimental.
+      See the dev console for all output.
+    </div>
+    <div id='test-output'>
+    </div>
+    <!--script src="common/whwasmutil.js"></script-->
+    <!--script src="common/SqliteTestUtil.js"></script-->
+    <script>
+(function(){
+    new Worker("x-sync-async.js");
+})();
+    </script>
+  </body>
+</html>
diff --git a/ext/wasm/x-sync-async.js b/ext/wasm/x-sync-async.js
new file mode 100644
index 0000000000..fec7efa73f
--- /dev/null
+++ b/ext/wasm/x-sync-async.js
@@ -0,0 +1,133 @@
+'use strict';
+const doAtomicsStuff = function(sqlite3){
+  const logPrefix = "OPFS syncer:";
+  const log = (...args)=>{
+    console.log(logPrefix,...args);
+  };
+  const warn =  (...args)=>{
+    console.warn(logPrefix,...args);
+  };
+  const error =  (...args)=>{
+    console.error(logPrefix,...args);
+  };
+  const W = new Worker("sqlite3-opfs-async-proxy.js");
+  const wMsg = (type,payload)=>W.postMessage({type,payload});
+  warn("This file is very much experimental and under construction.",self.location.pathname);
+
+  /**
+     State which we send to the async-api Worker or share with it.
+     This object must initially contain only cloneable or sharable
+     objects. After the worker's "ready" message arrives, other types
+     of data may be added to it.
+  */
+  const state = Object.create(null);
+  state.opIds = Object.create(null);
+  state.opIds.xAccess = 1;
+  state.opIds.xClose = 2;
+  state.opIds.xDelete = 3;
+  state.opIds.xFileSize = 4;
+  state.opIds.xOpen = 5;
+  state.opIds.xRead = 6;
+  state.opIds.xSync = 7;
+  state.opIds.xTruncate = 8;
+  state.opIds.xWrite = 9;
+  state.opIds.xSleep = 10;
+  state.opIds.xBlock = 99 /* to block worker while this code is still handling something */;
+  state.opSab = new SharedArrayBuffer(64);
+  state.fileBufferSize = 1024 * 65 /* 64k = max sqlite3 page size */;
+  /* TODO: use SQLITE_xxx err codes. */
+  state.errCodes = Object.create(null);
+  state.errCodes.Error = -100;
+  state.errCodes.IO = -101;
+  state.errCodes.NotFound = -102;
+  state.errCodes.Misuse = -103;
+
+  // TODO: add any SQLITE_xxx symbols we need here.
+  state.sq3Codes = Object.create(null);
+  
+  const isWorkerErrCode = (n)=>(n<=state.errCodes.Error);
+  
+  const opStore = (op,val=-1)=>Atomics.store(state.opBuf, state.opIds[op], val);
+  const opWait = (op,val=-1)=>Atomics.wait(state.opBuf, state.opIds[op], val);
+
+  const opRun = (op,args)=>{
+    opStore(op);
+    wMsg(op, args);
+    opWait(op);
+    return Atomics.load(state.opBuf, state.opIds[op]);
+  };
+
+  const wait = (ms,value)=>{
+    return new Promise((resolve)=>{
+      setTimeout(()=>resolve(value), ms);
+    });
+  };
+
+  const vfsSyncWrappers = {
+    xOpen: function f(pFile, name, flags, outFlags = {}){
+      if(!f._){
+        f._ = {
+          // TODO: map openFlags to args.fileType names.
+        };
+      }
+      const args = Object.create(null);
+      args.fid = pFile;
+      args.filename = name;
+      args.sab = new SharedArrayBuffer(state.fileBufferSize);
+      args.fileType = undefined /*TODO: populate based on SQLITE_OPEN_xxx */;
+      // TODO: populate args object based on flags:
+      // args.create, args.readOnly, args.deleteOnClose
+      args.create = true;
+      args.deleteOnClose = true;
+      const rc = opRun('xOpen', args);
+      if(!rc){
+        outFlags.readOnly = args.readOnly;
+        args.ba = new Uint8Array(args.sab);
+        state.openFiles[pFile] = args;
+      }
+      return rc;
+    },
+    xClose: function(pFile){
+      let rc = 0;
+      if(state.openFiles[pFile]){
+        delete state.openFiles[pFile];
+        rc = opRun('xClose', pFile);
+      }
+      return rc;
+    }
+  };
+
+
+  const doSomething = function(){
+    //state.ioBuf = new Uint8Array(state.sabIo);
+    const fid = 37;
+    let rc = vfsSyncWrappers.xOpen(fid, "/foo/bar/baz.sqlite3",0, {});
+    log("open rc =",rc,"state.opBuf[xOpen] =",state.opBuf[state.opIds.xOpen]);
+    if(isWorkerErrCode(rc)){
+      error("open failed with code",rc);
+      return;
+    }
+    log("xSleep()ing before close()ing...");
+    opRun('xSleep',{ms: 1500});
+    log("wait()ing before close()ing...");
+    wait(1500).then(function(){
+      rc = vfsSyncWrappers.xClose(fid);
+      log("xClose rc =",rc,"opBuf =",state.opBuf);
+    });
+  };
+
+  W.onmessage = function({data}){
+    log("Worker.onmessage:",data);
+    switch(data.type){
+        case 'ready':
+          wMsg('init',state);
+          state.opBuf = new Int32Array(state.opSab);
+          state.openFiles = Object.create(null);
+          doSomething();
+          break;
+    }
+  };
+}/*doAtomicsStuff*/
+
+importScripts('sqlite3.js');
+self.sqlite3InitModule().then((EmscriptenModule)=>doAtomicsStuff(EmscriptenModule.sqlite3));
diff --git a/manifest b/manifest
index 709a71cbc9..eeba3142ed 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\skv-vfs\sbranch\sinto\sfiddle-opfs\sbranch.\sAdjust\sspeedtest1\s--size\sflags\sto\saccount\sfor\snew\ssize\slimit.
-D 2022-09-16T20:16:50.240
+C Add\sinitial\sbits\sof\san\sexperimental\sasync-impl-via-synchronous-interface\sproxy\sintended\sto\smarshal\sOPFS\svia\ssqlite3_vfs\sAPI.
+D 2022-09-17T15:08:22.642
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -484,7 +484,7 @@ F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a
 F ext/wasm/api/sqlite3-api-cleanup.js 8564a6077cdcaea9a9f428a019af8a05887f0131e6a2a1e72a7ff1145fadfe77
 F ext/wasm/api/sqlite3-api-glue.js 366d580c8e5bf7fcf4c6dee6f646c31f5549bd417ea03a59a0acca00e8ecce30
 F ext/wasm/api/sqlite3-api-oo1.js d7526517f7ad3f6bda16ad66d373bbb71b43168deef7af60eda5c9fe873d1387
-F ext/wasm/api/sqlite3-api-opfs.js 011799db398157cbd254264b6ebae00d7234b93d0e9e810345f213a5774993c0
+F ext/wasm/api/sqlite3-api-opfs.js 130f60cc8f5835f9d77d4f12308bf4c8fb6d9c315009fc7239c5d67ff2bc8c67
 F ext/wasm/api/sqlite3-api-prologue.js 48ebca4ae340b0242d4f39bbded01bd0588393c8023628be1c454b4db6f7bd6e
 F ext/wasm/api/sqlite3-api-worker1.js d33062afa045fd4be01ba4abc266801807472558b862b30056211b00c9c347b4
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
@@ -502,7 +502,7 @@ F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d695
 F ext/wasm/fiddle/fiddle-worker.js bccf46045be8824752876f3eec01c223be0616ccac184bffd0024cfe7a3262b8
 F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
 F ext/wasm/fiddle/fiddle.js 4ffcfc9a235beebaddec689a549e9e0dfad6dca5c1f0b41f03468d7e76480686
-F ext/wasm/index.html 095b9a8cee9aac2654c23686ead22f3452b89d581fb41d34d47b6548546b5365
+F ext/wasm/index.html 8365e47e2aff1829923f0481292948487b27a0755fde9c0d3ad15f7ea0118992
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 447cc02b598f7792edaa8ae6853a7847b8178a18ed356afacbdbf312b2588106
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
@@ -523,6 +523,7 @@ F ext/wasm/speedtest1.html fbb8e4d1639028443f3687a683be660beca6927920545cf6b1fdf
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
+F ext/wasm/sqlite3-opfs-async-proxy.js c42a097dfbb96abef08554b173a47788f5bc1f58c266f859ba01c1fa3ff8327d
 F ext/wasm/sqlite3-worker1-promiser.js 92b8da5f38439ffec459a8215775d30fa498bc0f1ab929ff341fc3dd479660b9
 F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
@@ -532,6 +533,8 @@ F ext/wasm/testing1.js 7cd8ab255c238b030d928755ae8e91e7d90a12f2ae601b1b8f7827aaa
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
 F ext/wasm/testing2.js 25584bcc30f19673ce13a6f301f89f8820a59dfe044e0c4f2913941f4097fe3c
 F ext/wasm/wasmfs.make 21a5cf297954a689e0dc2a95299ae158f681cae5e90c10b99d986097815fd42d
+F ext/wasm/x-sync-async.html 283539e4fcca8c60fea18dbf1f1c0df168340145a19123f8fd5b70f41291b36f
+F ext/wasm/x-sync-async.js 42da502ea0b89bfa226c7ac7555c0c87d4ab8a10221ea6fadb4f7877c26a5137
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
@@ -2027,8 +2030,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 52d1b185b9f6cee1eb3dec436f47e0f52e4621a127abfad8c27f92fd78147889 ef54961ce69fddb4cfeeff0860288de2858a6f7a5aa396691e8e99933eb9af54
-R e35abbf6d1d9b2b828d30426a9a9f018
+P afb79050e635f3c698e51f06c346cbf23b096cfda7d0f1d8e68514ea0c25b7b7
+R dbdee404fc63f84ef61ddb4fd79c0ad1
 U stephan
-Z 0ddb259c4784fc46ece386ccc85309e5
+Z 67d0abd2dfaa993776fbe8c511ee53f5
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index a8bb9e363c..7a184bb350 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-afb79050e635f3c698e51f06c346cbf23b096cfda7d0f1d8e68514ea0c25b7b7
\ No newline at end of file
+38da059b472415da52f57de7332fbeb8a91e3add1f4be3ff9c1924b52672f77c
\ No newline at end of file

From 20a9ed1dc6fd63573e49328d27e955969f18470d Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sat, 17 Sep 2022 18:29:49 +0000
Subject: [PATCH 119/428] Include the kv-vfs as an optional VFS on unix builds
 if the SQLITE_OS_KV_OPTIONAL compile-time option is present.

FossilOrigin-Name: 852812d1e2ec3c53ad7c6c64662b37d861fefcf1baeee3d58eba88bcb3f6d8df
---
 manifest        | 16 ++++++++--------
 manifest.uuid   |  2 +-
 src/os_kv.c     | 14 +++++++++++---
 src/os_unix.c   |  3 +++
 src/sqliteInt.h |  4 ++++
 5 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/manifest b/manifest
index 82c40c633a..72b6c37ae8 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\skv-vfs\sbranch.
-D 2022-09-17T17:26:44.762
+C Include\sthe\skv-vfs\sas\san\soptional\sVFS\son\sunix\sbuilds\sif\sthe\nSQLITE_OS_KV_OPTIONAL\scompile-time\soption\sis\spresent.
+D 2022-09-17T18:29:49.617
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -574,9 +574,9 @@ F src/notify.c 89a97dc854c3aa62ad5f384ef50c5a4a11d70fcc69f86de3e991573421130ed6
 F src/os.c 0eb831ba3575af5277e47f4edd14fdfc90025c67eb25ce5cda634518d308d4e9
 F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
-F src/os_kv.c 3a2d319988df9da8f3a4d0c753a1492542bd3017ff7ae5d07814460eac6b0b19
+F src/os_kv.c 96c4062e9ca8f3bb70f43e05b766dcd30fe5c2f125fd70c51ed6ef01474a6593
 F src/os_setup.h 0711dbc4678f3ac52d7fe736951b6384a0615387c4ba5135a4764e4e31f4b6a6
-F src/os_unix.c 0fa91925f0b8831fc0156a9c04d39d86f85baf9eef66c98712395e1715cb75cc
+F src/os_unix.c 287aa5f5691a2b356780c63e83abaa33549add84227b8313395f04088486d79c
 F src/os_win.c 8d129ae3e59e0fa900e20d0ad789e96f2e08177f0b00b53cdda65c40331e0902
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c 6176d9752eb580419e8fef4592dc417a6b00ddfd43ee22f818819bf8840ceee8
@@ -597,7 +597,7 @@ F src/shell.c.in e7e7c2c69ae86c5ee9e8ad66227203d46ff6dce8700a1b1dababff01c71d33d
 F src/sqlite.h.in b9b7fd73239d94db20332bb6e504688001e5564b655e1318a4427a1caef4b99e
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d
-F src/sqliteInt.h 44eb45c25d379361ee1bd7fc49205471c6cb8a3727aed42372cf4716f653ebf2
+F src/sqliteInt.h 587be0322bf30f248350e9b0d1d36feeece94f30bcf057686c6425c36b8ed3c5
 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -2004,8 +2004,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 ef54961ce69fddb4cfeeff0860288de2858a6f7a5aa396691e8e99933eb9af54 ff46bc9d2a844dde9dafa157114f4d9ee157205ca5c08ed9ee32f018de310e62
-R 4de08b84ca8222edc80a9a00d8c86ac4
+P 37c7ca25a6e837e7f83b96a32e2b1a455730e48a48012c458ae2e734a3ccdd1f
+R 32beb89ba30390bdb85cd8d5b10c9a35
 U drh
-Z f60f4623d1ae77ea9ba72cf01682f06f
+Z 6831abb42712ac9e23b5b00f249e84e3
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 21c52cde0a..ef09e7e676 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-37c7ca25a6e837e7f83b96a32e2b1a455730e48a48012c458ae2e734a3ccdd1f
\ No newline at end of file
+852812d1e2ec3c53ad7c6c64662b37d861fefcf1baeee3d58eba88bcb3f6d8df
\ No newline at end of file
diff --git a/src/os_kv.c b/src/os_kv.c
index db95a305b7..c1df1f526d 100644
--- a/src/os_kv.c
+++ b/src/os_kv.c
@@ -15,7 +15,7 @@
 ** text.
 */
 #include <sqliteInt.h>
-#if SQLITE_OS_KV
+#if SQLITE_OS_KV || (SQLITE_OS_UNIX && defined(SQLITE_OS_KV_OPTIONAL))
 
 /*****************************************************************************
 ** Debugging logic
@@ -89,7 +89,7 @@ static int kvvfsSleep(sqlite3_vfs*, int microseconds);
 static int kvvfsCurrentTime(sqlite3_vfs*, double*);
 static int kvvfsCurrentTimeInt64(sqlite3_vfs*, sqlite3_int64*);
 
-static sqlite3_vfs kvvfs_vfs = {
+static sqlite3_vfs sqlite3OsKvvfsObject = {
   1,                              /* iVersion */
   sizeof(KVVfsFile),              /* szOsFile */
   1024,                           /* mxPathname */
@@ -1107,14 +1107,22 @@ static int kvvfsCurrentTimeInt64(sqlite3_vfs *pVfs, sqlite3_int64 *pTimeOut){
   *pTimeOut = unixEpoch + 1000*(sqlite3_int64)sNow.tv_sec + sNow.tv_usec/1000;
   return SQLITE_OK;
 }
+#endif /* SQLITE_OS_KV || SQLITE_OS_UNIX */
 
+#if SQLITE_OS_KV
 /* 
 ** This routine is called initialize the KV-vfs as the default VFS.
 */
 int sqlite3_os_init(void){
-  return sqlite3_vfs_register(&kvvfs_vfs, 1);
+  return sqlite3_vfs_register(&sqlite3OsKvvfsObject, 1);
 }
 int sqlite3_os_end(void){
   return SQLITE_OK;
 }
 #endif /* SQLITE_OS_KV */
+
+#if SQLITE_OS_UNIX && defined(SQLITE_OS_KV_OPTIONAL)
+int sqlite3KvvfsInit(void){
+  return sqlite3_vfs_register(&sqlite3OsKvvfsObject, 0);
+}
+#endif
diff --git a/src/os_unix.c b/src/os_unix.c
index 784686d0a3..c390b51888 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -8065,6 +8065,9 @@ int sqlite3_os_init(void){
     sqlite3_vfs_register(&aVfs[i], i==0);
 #endif
   }
+#ifdef SQLITE_OS_KV_OPTIONAL
+  sqlite3KvvfsInit();
+#endif
   unixBigLock = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_VFS1);
 
 #ifndef SQLITE_OMIT_WAL
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 63e3583c8c..7f1dee6eba 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -5456,4 +5456,8 @@ void sqlite3VectorErrorMsg(Parse*, Expr*);
 const char **sqlite3CompileOptions(int *pnOpt);
 #endif
 
+#if SQLITE_OS_UNIX && defined(SQLITE_OS_KV_OPTIONAL)
+int sqlite3KvvfsInit(void);
+#endif
+
 #endif /* SQLITEINT_H */

From a50d3b7a5de8616d7f8f5a9b64aa78067b4b85a6 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sat, 17 Sep 2022 18:31:31 +0000
Subject: [PATCH 120/428] Fix an uninitialized variable in the decoder kv-vfs.

FossilOrigin-Name: 354726aa6c399053785f29104de15091629ce4bc275b9e2205cb3656a9e81cd7
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/os_kv.c   |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/manifest b/manifest
index 72b6c37ae8..d9677a2ca9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Include\sthe\skv-vfs\sas\san\soptional\sVFS\son\sunix\sbuilds\sif\sthe\nSQLITE_OS_KV_OPTIONAL\scompile-time\soption\sis\spresent.
-D 2022-09-17T18:29:49.617
+C Fix\san\suninitialized\svariable\sin\sthe\sdecoder\skv-vfs.
+D 2022-09-17T18:31:31.300
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -574,7 +574,7 @@ F src/notify.c 89a97dc854c3aa62ad5f384ef50c5a4a11d70fcc69f86de3e991573421130ed6
 F src/os.c 0eb831ba3575af5277e47f4edd14fdfc90025c67eb25ce5cda634518d308d4e9
 F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
-F src/os_kv.c 96c4062e9ca8f3bb70f43e05b766dcd30fe5c2f125fd70c51ed6ef01474a6593
+F src/os_kv.c cf02a39ab3271d237890c7de03a49e5ecc19c930b8f4ad6afd43651dc05c9400
 F src/os_setup.h 0711dbc4678f3ac52d7fe736951b6384a0615387c4ba5135a4764e4e31f4b6a6
 F src/os_unix.c 287aa5f5691a2b356780c63e83abaa33549add84227b8313395f04088486d79c
 F src/os_win.c 8d129ae3e59e0fa900e20d0ad789e96f2e08177f0b00b53cdda65c40331e0902
@@ -2004,8 +2004,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 37c7ca25a6e837e7f83b96a32e2b1a455730e48a48012c458ae2e734a3ccdd1f
-R 32beb89ba30390bdb85cd8d5b10c9a35
+P 852812d1e2ec3c53ad7c6c64662b37d861fefcf1baeee3d58eba88bcb3f6d8df
+R 9c6620d4dc4ed0d3ddc9cc9e79cbabf7
 U drh
-Z 6831abb42712ac9e23b5b00f249e84e3
+Z 7ef728d647d25bb1b8240f0a67ed5ff5
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index ef09e7e676..1336748789 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-852812d1e2ec3c53ad7c6c64662b37d861fefcf1baeee3d58eba88bcb3f6d8df
\ No newline at end of file
+354726aa6c399053785f29104de15091629ce4bc275b9e2205cb3656a9e81cd7
\ No newline at end of file
diff --git a/src/os_kv.c b/src/os_kv.c
index c1df1f526d..fb8eae6270 100644
--- a/src/os_kv.c
+++ b/src/os_kv.c
@@ -603,7 +603,7 @@ static void kvvfsDecodeJournal(
   const char *zTxt,      /* Text encoding.  Zero-terminated */
   int nTxt               /* Bytes in zTxt, excluding zero terminator */
 ){
-  unsigned int n;
+  unsigned int n = 0;
   int c, i, mult;
   i = 0;
   mult = 1;

From 0731554629912621874ec7ebd5ab307e270caef4 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sat, 17 Sep 2022 20:50:12 +0000
Subject: [PATCH 121/428] Add the remaining vfs/io_methods wrappers to the OPFS
 sync/async proxy, but most are not yet tested.

FossilOrigin-Name: 44db9132145b3072488ea91db53f6c06be74544beccad5fd07efd22c0f03dc04
---
 ext/wasm/sqlite3-opfs-async-proxy.js | 537 ++++++++++++++-------------
 ext/wasm/x-sync-async.html           |  10 +-
 ext/wasm/x-sync-async.js             | 441 ++++++++++++++++++----
 manifest                             |  16 +-
 manifest.uuid                        |   2 +-
 5 files changed, 671 insertions(+), 335 deletions(-)

diff --git a/ext/wasm/sqlite3-opfs-async-proxy.js b/ext/wasm/sqlite3-opfs-async-proxy.js
index 98e2688149..88fdfa603a 100644
--- a/ext/wasm/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/sqlite3-opfs-async-proxy.js
@@ -20,267 +20,308 @@
   https://github.com/rhashimoto/wa-sqlite/blob/master/src/examples/OriginPrivateFileSystemVFS.js
 
   for demonstrating how to use the OPFS APIs.
+
+  This file is to be loaded as a Worker. It does not have any direct
+  access to the sqlite3 JS/WASM bits, so any bits which it needs (most
+  notably SQLITE_xxx integer codes) have to be imported into it via an
+  initialization process.
 */
 'use strict';
-(function(){
-  const toss = function(...args){throw new Error(args.join(' '))};
-  if(self.window === self){
-    toss("This code cannot run from the main thread.",
-         "Load it as a Worker from a separate Worker.");
-  }else if(!navigator.storage.getDirectory){
-    toss("This API requires navigator.storage.getDirectory.");
+const toss = function(...args){throw new Error(args.join(' '))};
+if(self.window === self){
+  toss("This code cannot run from the main thread.",
+       "Load it as a Worker from a separate Worker.");
+}else if(!navigator.storage.getDirectory){
+  toss("This API requires navigator.storage.getDirectory.");
+}
+/**
+   Will hold state copied to this object from the syncronous side of
+   this API.
+*/
+const state = Object.create(null);
+/**
+   verbose:
+
+   0 = no logging output
+   1 = only errors
+   2 = warnings and errors
+   3 = debug, warnings, and errors
+*/
+state.verbose = 2;
+
+const __logPrefix = "OPFS asyncer:";
+const log = (...args)=>{
+  if(state.verbose>2) console.log(__logPrefix,...args);
+};
+const warn =  (...args)=>{
+  if(state.verbose>1) console.warn(__logPrefix,...args);
+};
+const error =  (...args)=>{
+  if(state.verbose) console.error(__logPrefix,...args);
+};
+
+warn("This file is very much experimental and under construction.",self.location.pathname);
+
+/**
+   Map of sqlite3_file pointers (integers) to metadata related to a
+   given OPFS file handles. The pointers are, in this side of the
+   interface, opaque file handle IDs provided by the synchronous
+   part of this constellation. Each value is an object with a structure
+   demonstrated in the xOpen() impl.
+*/
+const __openFiles = Object.create(null);
+
+/**
+   Map of dir names to FileSystemDirectoryHandle objects.
+*/
+const __dirCache = new Map;
+
+/**
+   Takes the absolute path to a filesystem element. Returns an array
+   of [handleOfContainingDir, filename]. If the 2nd argument is
+   truthy then each directory element leading to the file is created
+   along the way. Throws if any creation or resolution fails.
+*/
+const getDirForPath = async function f(absFilename, createDirs = false){
+  const url = new URL(
+    absFilename, 'file://xyz'
+  ) /* use URL to resolve path pieces such as a/../b */;
+  const path = url.pathname.split('/').filter((v)=>!!v);
+  const filename = path.pop();
+  const allDirs = '/'+path.join('/');
+  let dh = __dirCache.get(allDirs);
+  if(!dh){
+    dh = state.rootDir;
+    for(const dirName of path){
+      if(dirName){
+        dh = await dh.getDirectoryHandle(dirName, {create: !!createDirs});
+      }
+    }
+    __dirCache.set(allDirs, dh);
   }
-  const logPrefix = "OPFS worker:";
-  const log = (...args)=>{
-    console.log(logPrefix,...args);
-  };
-  const warn =  (...args)=>{
-    console.warn(logPrefix,...args);
-  };
-  const error =  (...args)=>{
-    console.error(logPrefix,...args);
-  };
+  return [dh, filename];
+};
 
-  warn("This file is very much experimental and under construction.",self.location.pathname);
-  const wMsg = (type,payload)=>postMessage({type,payload});
 
-  const state = Object.create(null);
-  /*state.opSab;
-  state.sabIO;
-  state.opBuf;
-  state.opIds;
-  state.rootDir;*/
-  /**
-     Map of sqlite3_file pointers (integers) to metadata related to a
-     given OPFS file handles. The pointers are, in this side of the
-     interface, opaque file handle IDs provided by the synchronous
-     part of this constellation. Each value is an object with a structure
-     demonstrated in the xOpen() impl.
-  */
-  state.openFiles = Object.create(null);
+/**
+   Stores the given value at the array index reserved for the given op
+   and then Atomics.notify()'s it.
+*/
+const storeAndNotify = (opName, value)=>{
+  log(opName+"() is notify()ing w/ value:",value);
+  Atomics.store(state.opBuf, state.opIds[opName], value);
+  Atomics.notify(state.opBuf, state.opIds[opName]);
+};
 
-  /**
-     Map of dir names to FileSystemDirectoryHandle objects.
-  */
-  state.dirCache = new Map;
+const isInt32 = function(n){
+  return ('bigint'!==typeof n /*TypeError: can't convert BigInt to number*/)
+    && !!(n===(n|0) && n<=2147483647 && n>=-2147483648);
+};
+const affirm32Bits = function(n){
+  return isInt32(n) || toss("Number is too large (>31 bits) (FIXME!):",n);
+};
 
-  const __splitPath = (absFilename)=>{
-    const a = absFilename.split('/').filter((v)=>!!v);
-    return [a, a.pop()];
-  };
-  /**
-     Takes the absolute path to a filesystem element. Returns an array
-     of [handleOfContainingDir, filename]. If the 2nd argument is
-     truthy then each directory element leading to the file is created
-     along the way. Throws if any creation or resolution fails.
-  */
-  const getDirForPath = async function f(absFilename, createDirs = false){
-    const url = new URL(
-      absFilename, 'file://xyz'
-    ) /* use URL to resolve path pieces such as a/../b */;
-    const [path, filename] = __splitPath(url.pathname);
-    const allDirs = path.join('/');
-    let dh = state.dirCache.get(allDirs);
-    if(!dh){
-      dh = state.rootDir;
-      for(const dirName of path){
-        if(dirName){
-          dh = await dh.getDirectoryHandle(dirName, {create: !!createDirs});
-        }
+/**
+   Throws if fh is a file-holding object which is flagged as read-only.
+*/
+const affirmNotRO = function(opName,fh){
+  if(fh.readOnly) toss(opName+"(): File is read-only: "+fh.filenameAbs);
+};
+
+/**
+   Asynchronous wrappers for sqlite3_vfs and sqlite3_io_methods
+   methods. Maintenance reminder: members are in alphabetical order
+   to simplify finding them.
+*/
+const vfsAsyncImpls = {
+  xAccess: async function({filename, exists, readWrite}){
+    warn("xAccess(",arguments[0],") is TODO");
+    const rc = state.sq3Codes.SQLITE_IOERR;
+    storeAndNotify('xAccess', rc);
+  },
+  xClose: async function(fid){
+    const opName = 'xClose';
+    log(opName+"(",arguments[0],")");
+    const fh = __openFiles[fid];
+    if(fh){
+      delete __openFiles[fid];
+      if(fh.accessHandle) await fh.accessHandle.close();
+      if(fh.deleteOnClose){
+        try{ await fh.dirHandle.removeEntry(fh.filenamePart) }
+        catch(e){ warn("Ignoring dirHandle.removeEntry() failure of",fh,e) }
       }
-      state.dirCache.set(allDirs, dh);
+      storeAndNotify(opName, 0);
+    }else{
+      storeAndNotify(opName, state.sq3Codes.SQLITE_NOFOUND);
     }
-    return [dh, filename];
-  };
-
-  
-  /**
-     Generates a random ASCII string len characters long, intended for
-     use as a temporary file name.
-  */
-  const randomFilename = function f(len=16){
-    if(!f._chars){
-      f._chars = "abcdefghijklmnopqrstuvwxyz"+
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZ"+
-        "012346789";
-      f._n = f._chars.length;
+  },
+  xDelete: async function({filename, syncDir/*ignored*/}){
+    log("xDelete(",arguments[0],")");
+    try {
+      const [hDir, filenamePart] = await getDirForPath(filename, false);
+      await hDir.removeEntry(filenamePart);
+    }catch(e){
+      /* Ignoring: _presumably_ the file can't be found. */
     }
-    const a = [];
-    let i = 0;
-    for( ; i < len; ++i){
-      const ndx = Math.random() * (f._n * 64) % f._n | 0;
-      a[i] = f._chars[ndx];
+    storeAndNotify('xDelete', 0);
+  },
+  xFileSize: async function(fid){
+    log("xFileSize(",arguments,")");
+    const fh = __openFiles[fid];
+    let sz;
+    try{
+      sz = await fh.accessHandle.getSize();
+      fh.sabViewFileSize.setBigInt64(0, BigInt(sz));
+      sz = 0;
+    }catch(e){
+      error("xFileSize():",e, fh);
+      sz = state.sq3Codes.SQLITE_IOERR;
     }
-    return a.join('');
-  };
-
-  const storeAndNotify = (opName, value)=>{
-    log(opName+"() is notify()ing w/ value:",value);
-    Atomics.store(state.opBuf, state.opIds[opName], value);
-    Atomics.notify(state.opBuf, state.opIds[opName]);
-  };
-
-  const isInt32 = function(n){
-    return ('bigint'!==typeof n /*TypeError: can't convert BigInt to number*/)
-      && !!(n===(n|0) && n<=2147483647 && n>=-2147483648);
-  };
-  const affirm32Bits = function(n){
-    return isInt32(n) || toss("Number is too large (>31 bits):",n);
-  };
-
-  const ioMethods = {
-    xAccess: async function({filename, exists, readWrite}){
-      log("xAccess(",arguments,")");
-      const rc = 1;
-      storeAndNotify('xAccess', rc);
-    },
-    xClose: async function(fid){
-      const opName = 'xClose';
+    storeAndNotify('xFileSize', sz);
+  },
+  xOpen: async function({
+    fid/*sqlite3_file pointer*/,
+    sab/*file-specific SharedArrayBuffer*/,
+    filename,
+    fileType = undefined /*mainDb, mainJournal, etc.*/,
+    create = false, readOnly = false, deleteOnClose = false
+  }){
+    const opName = 'xOpen';
+    try{
+      if(create) readOnly = false;
       log(opName+"(",arguments[0],")");
-      log("state.openFiles",state.openFiles);
-      const fh = state.openFiles[fid];
-      if(fh){
-        delete state.openFiles[fid];
-        //await fh.close();
-        if(fh.accessHandle) await fh.accessHandle.close();
-        if(fh.deleteOnClose){
-          try{
-            await fh.dirHandle.removeEntry(fh.filenamePart);
-          }
-          catch(e){
-            warn("Ignoring dirHandle.removeEntry() failure of",fh);
-          }
-        }
-        log("state.openFiles",state.openFiles);
-        storeAndNotify(opName, 0);
-      }else{
-        storeAndNotify(opName, state.errCodes.NotFound);
-      }
-    },
-    xDelete: async function(filename){
-      log("xDelete(",arguments,")");
-      storeAndNotify('xClose', 0);
-    },
-    xFileSize: async function(fid){
-      log("xFileSize(",arguments,")");
-      const fh = state.openFiles[fid];
-      const sz = await fh.getSize();
-      affirm32Bits(sz);
-      storeAndNotify('xFileSize', sz | 0);
-    },
-    xOpen: async function({
-      fid/*sqlite3_file pointer*/, sab/*file-specific SharedArrayBuffer*/,
-      filename,
-      fileType = undefined /*mainDb, mainJournal, etc.*/,
-      create = false, readOnly = false, deleteOnClose = false,
-    }){
-      const opName = 'xOpen';
-      try{
-        if(create) readOnly = false;
-        log(opName+"(",arguments[0],")");
-
-        let hDir, filenamePart, hFile;
-        try {
-          [hDir, filenamePart] = await getDirForPath(filename, !!create);
-        }catch(e){
-          storeAndNotify(opName, state.errCodes.NotFound);
-          return;
-        }
-        hFile = await hDir.getFileHandle(filenamePart, {create: !!create});
-        log(opName,"filenamePart =",filenamePart, 'hDir =',hDir);
-        const fobj = state.openFiles[fid] = Object.create(null);
-        fobj.filenameAbs = filename;
-        fobj.filenamePart = filenamePart;
-        fobj.dirHandle = hDir;
-        fobj.fileHandle = hFile;
-        fobj.accessHandle = undefined;
-        fobj.fileType = fileType;
-        fobj.sab = sab;
-        fobj.create = !!create;
-        fobj.readOnly = !!readOnly;
-        fobj.deleteOnClose = !!deleteOnClose;
-
-        /**
-           wa-sqlite, at this point, grabs a SyncAccessHandle and
-           assigns it to the accessHandle prop of the file state
-           object, but it's unclear why it does that.
-        */
-        storeAndNotify(opName, 0);
+      let hDir, filenamePart;
+      try {
+        [hDir, filenamePart] = await getDirForPath(filename, !!create);
       }catch(e){
-        error(opName,e);
-        storeAndNotify(opName, state.errCodes.IO);
+        storeAndNotify(opName, state.sql3Codes.SQLITE_NOTFOUND);
+        return;
       }
-    },
-    xRead: async function({fid,n,offset}){
-      log("xRead(",arguments,")");
-      affirm32Bits(n + offset);
-      const fh = state.openFiles[fid];
-      storeAndNotify('xRead',fid);
-    },
-    xSleep: async function f({ms}){
-      log("xSleep(",arguments[0],")");
-      await new Promise((resolve)=>{
-        setTimeout(()=>resolve(), ms);
-      }).finally(()=>storeAndNotify('xSleep',0));
-    },
-    xSync: async function({fid}){
-      log("xSync(",arguments,")");
-      const fh = state.openFiles[fid];
-      await fh.flush();
-      storeAndNotify('xSync',fid);
-    },
-    xTruncate: async function({fid,size}){
-      log("xTruncate(",arguments,")");
-      affirm32Bits(size);
-      const fh = state.openFiles[fid];
-      fh.truncate(size);
-      storeAndNotify('xTruncate',fid);
-    },
-    xWrite: async function({fid,src,n,offset}){
-      log("xWrite(",arguments,")");
-      const fh = state.openFiles[fid];
-      storeAndNotify('xWrite',fid);
+      const hFile = await hDir.getFileHandle(filenamePart, {create: !!create});
+      log(opName,"filenamePart =",filenamePart, 'hDir =',hDir);
+      const fobj = __openFiles[fid] = Object.create(null);
+      fobj.filenameAbs = filename;
+      fobj.filenamePart = filenamePart;
+      fobj.dirHandle = hDir;
+      fobj.fileHandle = hFile;
+      fobj.fileType = fileType;
+      fobj.sab = sab;
+      fobj.sabViewFileSize = new DataView(sab,state.fbInt64Offset,8);
+      fobj.create = !!create;
+      fobj.readOnly = !!readOnly;
+      fobj.deleteOnClose = !!deleteOnClose;
+      /**
+         wa-sqlite, at this point, grabs a SyncAccessHandle and
+         assigns it to the accessHandle prop of the file state
+         object, but only for certain cases and it's unclear why it
+         places that limitation on it.
+      */
+      fobj.accessHandle = await hFile.createSyncAccessHandle();
+      storeAndNotify(opName, 0);
+    }catch(e){
+      error(opName,e);
+      storeAndNotify(opName, state.sq3Codes.SQLITE_IOERR);
+    }
+  },
+  xRead: async function({fid,n,offset}){
+    log("xRead(",arguments[0],")");
+    let rc = 0;
+    const fh = __openFiles[fid];
+    try{
+      const aRead = new Uint8array(fh.sab, n);
+      const nRead = fh.accessHandle.read(aRead, {at: offset});
+      if(nRead < n){/* Zero-fill remaining bytes */
+        new Uint8array(fh.sab).fill(0, nRead, n);
+        rc = state.sq3Codes.SQLITE_IOERR_SHORT_READ;
+      }
+    }catch(e){
+      error("xRead() failed",e,fh);
+      rc = state.sq3Codes.SQLITE_IOERR_READ;
+    }
+    storeAndNotify('xRead',rc);
+  },
+  xSleep: async function f(ms){
+    log("xSleep(",ms,")");
+    await new Promise((resolve)=>{
+      setTimeout(()=>resolve(), ms);
+    }).finally(()=>storeAndNotify('xSleep',0));
+  },
+  xSync: async function({fid,flags/*ignored*/}){
+    log("xSync(",arguments[0],")");
+    const fh = __openFiles[fid];
+    if(!fh.readOnly && fh.accessHandle) await fh.accessHandle.flush();
+    storeAndNotify('xSync',0);
+  },
+  xTruncate: async function({fid,size}){
+    log("xTruncate(",arguments[0],")");
+    let rc = 0;
+    const fh = __openFiles[fid];
+    try{
+      affirmNotRO('xTruncate', fh);
+      await fh.accessHandle.truncate(size);
+    }catch(e){
+      error("xTruncate():",e,fh);
+      rc = state.sq3Codes.SQLITE_IOERR_TRUNCATE;
+    }
+    storeAndNotify('xTruncate',rc);
+  },
+  xWrite: async function({fid,src,n,offset}){
+    log("xWrite(",arguments[0],")");
+    let rc;
+    try{
+      const fh = __openFiles[fid];
+      affirmNotRO('xWrite', fh);
+      const nOut = fh.accessHandle.write(new UInt8Array(fh.sab, 0, n), {at: offset});
+      rc = (nOut===n) ? 0 : state.sq3Codes.SQLITE_IOERR_WRITE;
+    }catch(e){
+      error("xWrite():",e,fh);
+      rc = state.sq3Codes.SQLITE_IOERR_WRITE;
+    }
+    storeAndNotify('xWrite',rc);
+  }
+};
+
+navigator.storage.getDirectory().then(function(d){
+  const wMsg = (type)=>postMessage({type});
+  state.rootDir = d;
+  log("state.rootDir =",state.rootDir);
+  self.onmessage = async function({data}){
+    log("self.onmessage()",data);
+    switch(data.type){
+        case 'init':{
+          /* Receive shared state from synchronous partner */
+          const opt = data.payload;
+          state.verbose = opt.verbose ?? 2;
+          state.fileBufferSize = opt.fileBufferSize;
+          state.fbInt64Offset = opt.fbInt64Offset;
+          state.opSab = opt.opSab;
+          state.opBuf = new Int32Array(state.opSab);
+          state.opIds = opt.opIds;
+          state.sq3Codes = opt.sq3Codes;
+          Object.keys(vfsAsyncImpls).forEach((k)=>{
+            if(!Number.isFinite(state.opIds[k])){
+              toss("Maintenance required: missing state.opIds[",k,"]");
+            }
+          });
+          log("init state",state);
+          wMsg('inited');
+          break;
+        }
+        default:{
+          let err;
+          const m = vfsAsyncImpls[data.type] || toss("Unknown message type:",data.type);
+          try {
+            await m(data.payload).catch((e)=>err=e);
+          }catch(e){
+            err = e;
+          }
+          if(err){
+            error("Error handling",data.type+"():",e);
+            storeAndNotify(data.type, state.sq3Codes.SQLITE_ERROR);
+          }
+          break;
+        }
     }
   };
-  
-  const onReady = function(){
-    self.onmessage = async function({data}){
-      log("self.onmessage",data);
-      switch(data.type){
-          case 'init':{
-            const opt = data.payload;
-            state.opSab = opt.opSab;
-            state.opBuf = new Int32Array(state.opSab);
-            state.opIds = opt.opIds;
-            state.errCodes = opt.errCodes;
-            state.sq3Codes = opt.sq3Codes;
-            Object.keys(ioMethods).forEach((k)=>{
-              if(!state.opIds[k]){
-                toss("Maintenance required: missing state.opIds[",k,"]");
-              }
-            });
-            log("init state",state);
-            break;
-          }
-          default:{
-            const m = ioMethods[data.type] || toss("Unknown message type:",data.type);
-            try {
-              await m(data.payload);
-            }catch(e){
-              error("Error handling",data.type+"():",e);
-              storeAndNotify(data.type, -99);
-            }
-            break;
-          }
-      }
-    };      
-    wMsg('ready');
-  };
-
-  navigator.storage.getDirectory().then(function(d){
-    state.rootDir = d;
-    log("state.rootDir =",state.rootDir);
-    onReady();
-  });
-    
-})();
+  wMsg('loaded');
+});
diff --git a/ext/wasm/x-sync-async.html b/ext/wasm/x-sync-async.html
index 4b2e08a31f..ec0a6353b5 100644
--- a/ext/wasm/x-sync-async.html
+++ b/ext/wasm/x-sync-async.html
@@ -13,16 +13,10 @@
     <div>This is an experiment in wrapping the
       asynchronous OPFS APIs behind a fully synchronous proxy. It is
       very much incomplete, under construction, and experimental.
-      See the dev console for all output.
+      <strong>See the dev console for all output.</strong>
     </div>
     <div id='test-output'>
     </div>
-    <!--script src="common/whwasmutil.js"></script-->
-    <!--script src="common/SqliteTestUtil.js"></script-->
-    <script>
-(function(){
-    new Worker("x-sync-async.js");
-})();
-    </script>
+    <script>new Worker("x-sync-async.js");</script>
   </body>
 </html>
diff --git a/ext/wasm/x-sync-async.js b/ext/wasm/x-sync-async.js
index fec7efa73f..c3027585b1 100644
--- a/ext/wasm/x-sync-async.js
+++ b/ext/wasm/x-sync-async.js
@@ -1,5 +1,29 @@
+/*
+  2022-09-17
+
+  The author disclaims copyright to this source code.  In place of a
+  legal notice, here is a blessing:
+
+  *   May you do good and not evil.
+  *   May you find forgiveness for yourself and forgive others.
+  *   May you share freely, never taking more than you give.
+
+  ***********************************************************************
+
+  A EXTREMELY INCOMPLETE and UNDER CONSTRUCTION experiment for OPFS.
+  This file holds the synchronous half of an sqlite3_vfs
+  implementation which proxies, in a synchronous fashion, the
+  asynchronous OPFS APIs using a second Worker.
+*/
 'use strict';
-const doAtomicsStuff = function(sqlite3){
+/**
+   This function is a placeholder for use in development. When
+   working, this will be moved into a file named
+   api/sqlite3-api-opfs.js, or similar, and hooked in to the
+   sqlite-api build construct.
+*/
+const initOpfsVfs = function(sqlite3){
+  const toss = function(...args){throw new Error(args.join(' '))};
   const logPrefix = "OPFS syncer:";
   const log = (...args)=>{
     console.log(logPrefix,...args);
@@ -10,46 +34,73 @@ const doAtomicsStuff = function(sqlite3){
   const error =  (...args)=>{
     console.error(logPrefix,...args);
   };
+  warn("This file is very much experimental and under construction.",self.location.pathname);
+
+  const capi = sqlite3.capi;
+  const wasm = capi.wasm;
+  const sqlite3_vfs = capi.sqlite3_vfs
+        || toss("Missing sqlite3.capi.sqlite3_vfs object.");
+  const sqlite3_file = capi.sqlite3_file
+        || toss("Missing sqlite3.capi.sqlite3_file object.");
+  const sqlite3_io_methods = capi.sqlite3_io_methods
+        || toss("Missing sqlite3.capi.sqlite3_io_methods object.");
+  const StructBinder = sqlite3.StructBinder || toss("Missing sqlite3.StructBinder.");
+
   const W = new Worker("sqlite3-opfs-async-proxy.js");
   const wMsg = (type,payload)=>W.postMessage({type,payload});
-  warn("This file is very much experimental and under construction.",self.location.pathname);
 
   /**
      State which we send to the async-api Worker or share with it.
      This object must initially contain only cloneable or sharable
-     objects. After the worker's "ready" message arrives, other types
+     objects. After the worker's "inited" message arrives, other types
      of data may be added to it.
   */
   const state = Object.create(null);
+  state.verbose = 3;
+  state.fileBufferSize = 1024 * 64 + 8 /* size of fileHandle.sab. 64k = max sqlite3 page size */;
+  state.fbInt64Offset = state.fileBufferSize - 8 /*spot in fileHandle.sab to store an int64*/;
   state.opIds = Object.create(null);
-  state.opIds.xAccess = 1;
-  state.opIds.xClose = 2;
-  state.opIds.xDelete = 3;
-  state.opIds.xFileSize = 4;
-  state.opIds.xOpen = 5;
-  state.opIds.xRead = 6;
-  state.opIds.xSync = 7;
-  state.opIds.xTruncate = 8;
-  state.opIds.xWrite = 9;
-  state.opIds.xSleep = 10;
-  state.opIds.xBlock = 99 /* to block worker while this code is still handling something */;
-  state.opSab = new SharedArrayBuffer(64);
-  state.fileBufferSize = 1024 * 65 /* 64k = max sqlite3 page size */;
-  /* TODO: use SQLITE_xxx err codes. */
-  state.errCodes = Object.create(null);
-  state.errCodes.Error = -100;
-  state.errCodes.IO = -101;
-  state.errCodes.NotFound = -102;
-  state.errCodes.Misuse = -103;
+  {
+    let i = 0;
+    state.opIds.xAccess = i++;
+    state.opIds.xClose = i++;
+    state.opIds.xDelete = i++;
+    state.opIds.xFileSize = i++;
+    state.opIds.xOpen = i++;
+    state.opIds.xRead = i++;
+    state.opIds.xSleep = i++;
+    state.opIds.xSync = i++;
+    state.opIds.xTruncate = i++;
+    state.opIds.xWrite = i++;
+    state.opSab = new SharedArrayBuffer(i * 4);
+  }
 
-  // TODO: add any SQLITE_xxx symbols we need here.
   state.sq3Codes = Object.create(null);
-  
-  const isWorkerErrCode = (n)=>(n<=state.errCodes.Error);
+  state.sq3Codes._reverse = Object.create(null);
+  [ // SQLITE_xxx constants to export to the async worker counterpart...
+    'SQLITE_ERROR', 'SQLITE_IOERR',
+    'SQLITE_NOTFOUND', 'SQLITE_MISUSE',
+    'SQLITE_IOERR_READ', 'SQLITE_IOERR_SHORT_READ',
+    'SQLITE_IOERR_WRITE', 'SQLITE_IOERR_FSYNC',
+    'SQLITE_IOERR_TRUNCATE', 'SQLITE_IOERR_DELETE',
+    'SQLITE_IOERR_ACCESS', 'SQLITE_IOERR_CLOSE'
+  ].forEach(function(k){
+    state.sq3Codes[k] = capi[k] || toss("Maintenance required: not found:",k);
+    state.sq3Codes._reverse[capi[k]] = k;
+  });
+
+  const isWorkerErrCode = (n)=>!!state.sq3Codes._reverse[n];
   
   const opStore = (op,val=-1)=>Atomics.store(state.opBuf, state.opIds[op], val);
   const opWait = (op,val=-1)=>Atomics.wait(state.opBuf, state.opIds[op], val);
 
+  /**
+     Runs the given operation in the async worker counterpart, waits
+     for its response, and returns the result which the async worker
+     writes to the given op's index in state.opBuf. The 2nd argument
+     must be a single object or primitive value, depending on the
+     given operation's signature in the async API counterpart.
+  */
   const opRun = (op,args)=>{
     opStore(op);
     wMsg(op, args);
@@ -63,71 +114,321 @@ const doAtomicsStuff = function(sqlite3){
     });
   };
 
-  const vfsSyncWrappers = {
-    xOpen: function f(pFile, name, flags, outFlags = {}){
-      if(!f._){
-        f._ = {
-          // TODO: map openFlags to args.fileType names.
-        };
-      }
-      const args = Object.create(null);
-      args.fid = pFile;
-      args.filename = name;
-      args.sab = new SharedArrayBuffer(state.fileBufferSize);
-      args.fileType = undefined /*TODO: populate based on SQLITE_OPEN_xxx */;
-      // TODO: populate args object based on flags:
-      // args.create, args.readOnly, args.deleteOnClose
-      args.create = true;
-      args.deleteOnClose = true;
-      const rc = opRun('xOpen', args);
-      if(!rc){
-        outFlags.readOnly = args.readOnly;
-        args.ba = new Uint8Array(args.sab);
-        state.openFiles[pFile] = args;
-      }
-      return rc;
+  /**
+     Generates a random ASCII string len characters long, intended for
+     use as a temporary file name.
+  */
+  const randomFilename = function f(len=16){
+    if(!f._chars){
+      f._chars = "abcdefghijklmnopqrstuvwxyz"+
+        "ABCDEFGHIJKLMNOPQRSTUVWXYZ"+
+        "012346789";
+      f._n = f._chars.length;
+    }
+    const a = [];
+    let i = 0;
+    for( ; i < len; ++i){
+      const ndx = Math.random() * (f._n * 64) % f._n | 0;
+      a[i] = f._chars[ndx];
+    }
+    return a.join('');
+  };
+
+  /**
+     Map of sqlite3_file pointers to objects constructed by xOpen().
+  */
+  const __openFiles = Object.create(null);
+  
+  const pDVfs = capi.sqlite3_vfs_find(null)/*pointer to default VFS*/;
+  const dVfs = pDVfs
+        ? new sqlite3_vfs(pDVfs)
+        : null /* dVfs will be null when sqlite3 is built with
+                  SQLITE_OS_OTHER. Though we cannot currently handle
+                  that case, the hope is to eventually be able to. */;
+  const opfsVfs = new sqlite3_vfs();
+  const opfsIoMethods = new sqlite3_io_methods();
+  opfsVfs.$iVersion = 2/*yes, two*/;
+  opfsVfs.$szOsFile = capi.sqlite3_file.structInfo.sizeof;
+  opfsVfs.$mxPathname = 1024/*sure, why not?*/;
+  opfsVfs.$zName = wasm.allocCString("opfs");
+  opfsVfs.ondispose = [
+    '$zName', opfsVfs.$zName,
+    'cleanup dVfs', ()=>(dVfs ? dVfs.dispose() : null)
+  ];
+  if(dVfs){
+    opfsVfs.$xSleep = dVfs.$xSleep;
+    opfsVfs.$xRandomness = dVfs.$xRandomness;
+  }
+  // All C-side memory of opfsVfs is zeroed out, but just to be explicit:
+  opfsVfs.$xDlOpen = opfsVfs.$xDlError = opfsVfs.$xDlSym = opfsVfs.$xDlClose = null;
+  /**
+     Pedantic sidebar about opfsVfs.ondispose: the entries in that array
+     are items to clean up when opfsVfs.dispose() is called, but in this
+     environment it will never be called. The VFS instance simply
+     hangs around until the WASM module instance is cleaned up. We
+     "could" _hypothetically_ clean it up by "importing" an
+     sqlite3_os_end() impl into the wasm build, but the shutdown order
+     of the wasm engine and the JS one are undefined so there is no
+     guaranty that the opfsVfs instance would be available in one
+     environment or the other when sqlite3_os_end() is called (_if_ it
+     gets called at all in a wasm build, which is undefined).
+  */
+  
+  /**
+     Impls for the sqlite3_io_methods methods. Maintenance reminder:
+     members are in alphabetical order to simplify finding them.
+  */
+  const ioSyncWrappers = {
+    xCheckReservedLock: function(pFile,pOut){
+      // Exclusive lock is automatically acquired when opened
+      //warn("xCheckReservedLock(",arguments,") is a no-op");
+      wasm.setMemValue(pOut,1,'i32');
+      return 0;
     },
     xClose: function(pFile){
       let rc = 0;
-      if(state.openFiles[pFile]){
-        delete state.openFiles[pFile];
+      const f = __openFiles[pFile];
+      if(f){
+        delete __openFiles[pFile];
         rc = opRun('xClose', pFile);
+        if(f.sq3File) f.sq3File.dispose();
       }
       return rc;
+    },
+    xDeviceCharacteristics: function(pFile){
+      //debug("xDeviceCharacteristics(",pFile,")");
+      return capi.SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN;
+    },
+    xFileControl: function(pFile,op,pArg){
+      //debug("xFileControl(",arguments,") is a no-op");
+      return capi.SQLITE_NOTFOUND;
+    },
+    xFileSize: function(pFile,pSz64){
+      const rc = opRun('xFileSize', pFile);
+      if(!isWorkerErrCode(rc)){
+        const f = __openFiles[pFile];
+        wasm.setMemValue(pSz64, f.sabViewFileSize.getBigInt64(0) ,'i64');
+      }
+      return rc;
+    },
+    xLock: function(pFile,lockType){
+      //2022-09: OPFS handles lock when opened
+      //warn("xLock(",arguments,") is a no-op");
+      return 0;
+    },
+    xRead: function(pFile,pDest,n,offset){
+      /* int (*xRead)(sqlite3_file*, void*, int iAmt, sqlite3_int64 iOfst) */
+      const f = __opfsHandles[pFile];
+      try {
+        // FIXME(?): block until we finish copying the xRead result buffer. How?
+        let rc = opRun('xRead',{fid:pFile, n, offset});
+        if(0!==rc) return rc;
+        let i = 0;
+        for(; i < n; ++i) wasm.setMemValue(pDest + i, f.sabView[i]);
+      }catch(e){
+        error("xRead(",arguments,") failed:",e,f);
+        rc = capi.SQLITE_IOERR_READ;
+      }
+      return rc;
+    },
+    xSync: function(pFile,flags){
+      return opRun('xSync', {fid:pFile, flags});
+    },
+    xTruncate: function(pFile,sz64){
+      return opRun('xTruncate', {fid:pFile, size: sz64});
+    },
+    xUnlock: function(pFile,lockType){
+      //2022-09: OPFS handles lock when opened
+      //warn("xUnlock(",arguments,") is a no-op");
+      return 0;
+    },
+    xWrite: function(pFile,pSrc,n,offset){
+    /* int (*xWrite)(sqlite3_file*, const void*, int iAmt, sqlite3_int64 iOfst) */
+      const f = __opfsHandles[pFile];
+      try {
+        let i = 0;
+        // FIXME(?): block from here until we finish the xWrite. How?
+        for(; i < n; ++i) f.sabView[i] = wasm.getMemValue(pSrc+i);
+        return opRun('xWrite',{fid:pFile, n, offset});
+      }catch(e){
+        error("xWrite(",arguments,") failed:",e,f);
+        return capi.SQLITE_IOERR_WRITE;
+      }
     }
-  };
+  }/*ioSyncWrappers*/;
+  
+  /**
+     Impls for the sqlite3_vfs methods. Maintenance reminder: members
+     are in alphabetical order to simplify finding them.
+  */
+  const vfsSyncWrappers = {
+    // TODO: xAccess
+    xCurrentTime: function(pVfs,pOut){
+      /* If it turns out that we need to adjust for timezone, see:
+         https://stackoverflow.com/a/11760121/1458521 */
+      wasm.setMemValue(pOut, 2440587.5 + (new Date().getTime()/86400000),
+                       'double');
+      return 0;
+    },
+    xCurrentTimeInt64: function(pVfs,pOut){
+      // TODO: confirm that this calculation is correct
+      wasm.setMemValue(pOut, (2440587.5 * 86400000) + new Date().getTime(),
+                       'i64');
+      return 0;
+    },
+    xDelete: function(pVfs, zName, doSyncDir){
+      return opRun('xDelete', {filename: wasm.cstringToJs(zName), syncDir: doSyncDir});
+    },
+    xFullPathname: function(pVfs,zName,nOut,pOut){
+      /* Until/unless we have some notion of "current dir"
+         in OPFS, simply copy zName to pOut... */
+      const i = wasm.cstrncpy(pOut, zName, nOut);
+      return i<nOut ? 0 : capi.SQLITE_CANTOPEN
+      /*CANTOPEN is required by the docs but SQLITE_RANGE would be a closer match*/;
+    },
+    xGetLastError: function(pVfs,nOut,pOut){
+      /* TODO: store exception.message values from the async
+         partner in a dedicated SharedArrayBuffer, noting that we'd have
+         to encode them... TextEncoder can do that for us. */
+      warn("OPFS xGetLastError() has nothing sensible to return.");
+      return 0;
+    },
+    xOpen: function f(pVfs, zName, pFile, flags, pOutFlags){
+      if(!f._){
+        f._ = {
+          fileTypes: {
+            SQLITE_OPEN_MAIN_DB: 'mainDb',
+            SQLITE_OPEN_MAIN_JOURNAL: 'mainJournal',
+            SQLITE_OPEN_TEMP_DB: 'tempDb',
+            SQLITE_OPEN_TEMP_JOURNAL: 'tempJournal',
+            SQLITE_OPEN_TRANSIENT_DB: 'transientDb',
+            SQLITE_OPEN_SUBJOURNAL: 'subjournal',
+            SQLITE_OPEN_SUPER_JOURNAL: 'superJournal',
+            SQLITE_OPEN_WAL: 'wal'
+          },
+          getFileType: function(filename,oflags){
+            const ft = f._.fileTypes;
+            for(let k of Object.keys(ft)){
+              if(oflags & capi[k]) return ft[k];
+            }
+            warn("Cannot determine fileType based on xOpen() flags for file",filename);
+            return '???';
+          }
+        };
+      }
+      if(0===zName){
+        zName = randomFilename();
+      }else if('number'===typeof zName){
+        zName = wasm.cstringToJs(zName);
+      }
+      const args = Object.create(null);
+      args.fid = pFile;
+      args.filename = zName;
+      args.sab = new SharedArrayBuffer(state.fileBufferSize);
+      args.fileType = f._.getFileType(args.filename, flags);
+      args.create = !!(flags & capi.SQLITE_OPEN_CREATE);
+      args.deleteOnClose = !!(flags & capi.SQLITE_OPEN_DELETEONCLOSE);
+      args.readOnly = !!(flags & capi.SQLITE_OPEN_READONLY);
+      const rc = opRun('xOpen', args);
+      if(!rc){
+        /* Recall that sqlite3_vfs::xClose() will be called, even on
+           error, unless pFile->pMethods is NULL. */
+        if(args.readOnly){
+          wasm.setMemValue(pOutFlags, capi.SQLITE_OPEN_READONLY, 'i32');
+        }
+        __openFiles[pFile] = args;
+        args.sabView = new Uint8Array(args.sab);
+        args.sabViewFileSize = new DataView(args.sab, state.fbInt64Offset, 8);
+        args.sq3File = new sqlite3_file(pFile);
+        args.sq3File.$pMethods = opfsIoMethods.pointer;
+        args.ba = new Uint8Array(args.sab);
+      }
+      return rc;
+    }/*xOpen()*/
+  }/*vfsSyncWrappers*/;
 
+  if(!opfsVfs.$xRandomness){
+    /* If the default VFS has no xRandomness(), add a basic JS impl... */
+    vfsSyncWrappers.xRandomness = function(pVfs, nOut, pOut){
+      const heap = wasm.heap8u();
+      let i = 0;
+      for(; i < nOut; ++i) heap[pOut + i] = (Math.random()*255000) & 0xFF;
+      return i;
+    };
+  }
+  if(!opfsVfs.$xSleep){
+    /* If we can inherit an xSleep() impl from the default VFS then
+       use it, otherwise install one which is certainly less accurate
+       because it has to go round-trip through the async worker, but
+       provides the only option for a synchronous sleep() in JS. */
+    vfsSyncWrappers.xSleep = (pVfs,ms)=>opRun('xSleep',ms);
+  }
 
-  const doSomething = function(){
+  /*
+    TODO: plug in the above functions in to opfsVfs and opfsIoMethods.
+    Code for doing so is in api/sqlite3-api-opfs.js.
+  */
+  
+  const sanityCheck = async function(){
     //state.ioBuf = new Uint8Array(state.sabIo);
-    const fid = 37;
-    let rc = vfsSyncWrappers.xOpen(fid, "/foo/bar/baz.sqlite3",0, {});
-    log("open rc =",rc,"state.opBuf[xOpen] =",state.opBuf[state.opIds.xOpen]);
-    if(isWorkerErrCode(rc)){
-      error("open failed with code",rc);
-      return;
-    }
-    log("xSleep()ing before close()ing...");
-    opRun('xSleep',{ms: 1500});
-    log("wait()ing before close()ing...");
-    wait(1500).then(function(){
-      rc = vfsSyncWrappers.xClose(fid);
+    const scope = wasm.scopedAllocPush();
+    const sq3File = new sqlite3_file();
+    try{
+      const fid = sq3File.pointer;
+      const openFlags = capi.SQLITE_OPEN_CREATE
+            | capi.SQLITE_OPEN_READWRITE
+            | capi.SQLITE_OPEN_DELETEONCLOSE
+            | capi.SQLITE_OPEN_MAIN_DB;
+      const pOut = wasm.scopedAlloc(8);
+      const dbFile = "/sanity/check/file";
+      let rc = vfsSyncWrappers.xOpen(opfsVfs.pointer, dbFile,
+                                     fid, openFlags, pOut);
+      log("open rc =",rc,"state.opBuf[xOpen] =",state.opBuf[state.opIds.xOpen]);
+      if(isWorkerErrCode(rc)){
+        error("open failed with code",rc);
+        return;
+      }
+      rc = ioSyncWrappers.xSync(sq3File.pointer, 0);
+      if(rc) toss('sync failed w/ rc',rc);
+      rc = ioSyncWrappers.xTruncate(sq3File.pointer, 1024);
+      if(rc) toss('truncate failed w/ rc',rc);
+      wasm.setMemValue(pOut,0,'i64');
+      rc = ioSyncWrappers.xFileSize(sq3File.pointer, pOut);
+      if(rc) toss('xFileSize failed w/ rc',rc);
+      log("xFileSize says:",wasm.getMemValue(pOut, 'i64'));
+      log("xSleep()ing before close()ing...");
+      opRun('xSleep',1500);
+      rc = ioSyncWrappers.xClose(fid);
       log("xClose rc =",rc,"opBuf =",state.opBuf);
-    });
+      log("Deleting file:",dbFile);
+      opRun('xDelete', dbFile);
+    }finally{
+      sq3File.dispose();
+      wasm.scopedAllocPop(scope);
+    }
   };
 
+  
   W.onmessage = function({data}){
     log("Worker.onmessage:",data);
     switch(data.type){
-        case 'ready':
+        case 'loaded':
+          /*Pass our config and shared state on to the async worker.*/
           wMsg('init',state);
+          break;
+        case 'inited':
+          /*Indicates that the async partner has received the 'init',
+            so we now know that the state object is no longer subject to
+            being copied by a pending postMessage() call.*/
           state.opBuf = new Int32Array(state.opSab);
-          state.openFiles = Object.create(null);
-          doSomething();
+          sanityCheck();
+          break;
+        default:
+          error("Unexpected message from the async worker:",data);
           break;
     }
   };
-}/*doAtomicsStuff*/
+}/*initOpfsVfs*/
 
 importScripts('sqlite3.js');
-self.sqlite3InitModule().then((EmscriptenModule)=>doAtomicsStuff(EmscriptenModule.sqlite3));
+self.sqlite3InitModule().then((EmscriptenModule)=>initOpfsVfs(EmscriptenModule.sqlite3));
diff --git a/manifest b/manifest
index eeba3142ed..cce6558812 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sinitial\sbits\sof\san\sexperimental\sasync-impl-via-synchronous-interface\sproxy\sintended\sto\smarshal\sOPFS\svia\ssqlite3_vfs\sAPI.
-D 2022-09-17T15:08:22.642
+C Add\sthe\sremaining\svfs/io_methods\swrappers\sto\sthe\sOPFS\ssync/async\sproxy,\sbut\smost\sare\snot\syet\stested.
+D 2022-09-17T20:50:12.684
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -523,7 +523,7 @@ F ext/wasm/speedtest1.html fbb8e4d1639028443f3687a683be660beca6927920545cf6b1fdf
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
-F ext/wasm/sqlite3-opfs-async-proxy.js c42a097dfbb96abef08554b173a47788f5bc1f58c266f859ba01c1fa3ff8327d
+F ext/wasm/sqlite3-opfs-async-proxy.js 62024877ad13fdff1834581ca1951ab58bda431e4d548aaaf4506ea54f0ed2de
 F ext/wasm/sqlite3-worker1-promiser.js 92b8da5f38439ffec459a8215775d30fa498bc0f1ab929ff341fc3dd479660b9
 F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
@@ -533,8 +533,8 @@ F ext/wasm/testing1.js 7cd8ab255c238b030d928755ae8e91e7d90a12f2ae601b1b8f7827aaa
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
 F ext/wasm/testing2.js 25584bcc30f19673ce13a6f301f89f8820a59dfe044e0c4f2913941f4097fe3c
 F ext/wasm/wasmfs.make 21a5cf297954a689e0dc2a95299ae158f681cae5e90c10b99d986097815fd42d
-F ext/wasm/x-sync-async.html 283539e4fcca8c60fea18dbf1f1c0df168340145a19123f8fd5b70f41291b36f
-F ext/wasm/x-sync-async.js 42da502ea0b89bfa226c7ac7555c0c87d4ab8a10221ea6fadb4f7877c26a5137
+F ext/wasm/x-sync-async.html 717b0d3bee96e49cbd36731bead497ab27a8bf3a3b23dd11e40e61d4ac9e8b80
+F ext/wasm/x-sync-async.js 05c0b49adae0600c5ad12f3325e0873ab1f07b99c2bb017f32b50a4f701490f1
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
@@ -2030,8 +2030,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 afb79050e635f3c698e51f06c346cbf23b096cfda7d0f1d8e68514ea0c25b7b7
-R dbdee404fc63f84ef61ddb4fd79c0ad1
+P 38da059b472415da52f57de7332fbeb8a91e3add1f4be3ff9c1924b52672f77c
+R 8887512b2075b067b4aa7969d08f1316
 U stephan
-Z 67d0abd2dfaa993776fbe8c511ee53f5
+Z 1bf4c438e48bd1dc1717362060b2f357
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 7a184bb350..7d2261af8e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-38da059b472415da52f57de7332fbeb8a91e3add1f4be3ff9c1924b52672f77c
\ No newline at end of file
+44db9132145b3072488ea91db53f6c06be74544beccad5fd07efd22c0f03dc04
\ No newline at end of file

From e6f8a095325ed6b183aacafa8bd2b9cd7f69ae76 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sat, 17 Sep 2022 21:13:26 +0000
Subject: [PATCH 122/428] Generic cleanups in the OPFS sync/async proxy.

FossilOrigin-Name: f36bddbe54c3acbfaa958042e4d24724f130bdca551401033f9bc63f3da73492
---
 ext/wasm/sqlite3-opfs-async-proxy.js | 16 +++----
 ext/wasm/x-sync-async.js             | 70 +++++++++++++++++++++-------
 manifest                             | 14 +++---
 manifest.uuid                        |  2 +-
 4 files changed, 70 insertions(+), 32 deletions(-)

diff --git a/ext/wasm/sqlite3-opfs-async-proxy.js b/ext/wasm/sqlite3-opfs-async-proxy.js
index 88fdfa603a..1ff9397027 100644
--- a/ext/wasm/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/sqlite3-opfs-async-proxy.js
@@ -10,10 +10,10 @@
 
   ***********************************************************************
 
-  A EXTREMELY INCOMPLETE and UNDER CONSTRUCTION experiment for OPFS: a
-  Worker which manages asynchronous OPFS handles on behalf of a
-  synchronous API which controls it via a combination of Worker
-  messages, SharedArrayBuffer, and Atomics.
+  An INCOMPLETE and UNDER CONSTRUCTION experiment for OPFS: a Worker
+  which manages asynchronous OPFS handles on behalf of a synchronous
+  API which controls it via a combination of Worker messages,
+  SharedArrayBuffer, and Atomics.
 
   Highly indebted to:
 
@@ -109,8 +109,8 @@ const getDirForPath = async function f(absFilename, createDirs = false){
 */
 const storeAndNotify = (opName, value)=>{
   log(opName+"() is notify()ing w/ value:",value);
-  Atomics.store(state.opBuf, state.opIds[opName], value);
-  Atomics.notify(state.opBuf, state.opIds[opName]);
+  Atomics.store(state.opSABView, state.opIds[opName], value);
+  Atomics.notify(state.opSABView, state.opIds[opName]);
 };
 
 const isInt32 = function(n){
@@ -294,8 +294,8 @@ navigator.storage.getDirectory().then(function(d){
           state.verbose = opt.verbose ?? 2;
           state.fileBufferSize = opt.fileBufferSize;
           state.fbInt64Offset = opt.fbInt64Offset;
-          state.opSab = opt.opSab;
-          state.opBuf = new Int32Array(state.opSab);
+          state.opSAB = opt.opSAB;
+          state.opSABView = new Int32Array(state.opSAB);
           state.opIds = opt.opIds;
           state.sq3Codes = opt.sq3Codes;
           Object.keys(vfsAsyncImpls).forEach((k)=>{
diff --git a/ext/wasm/x-sync-async.js b/ext/wasm/x-sync-async.js
index c3027585b1..9329e765ac 100644
--- a/ext/wasm/x-sync-async.js
+++ b/ext/wasm/x-sync-async.js
@@ -10,10 +10,20 @@
 
   ***********************************************************************
 
-  A EXTREMELY INCOMPLETE and UNDER CONSTRUCTION experiment for OPFS.
+  An INCOMPLETE and UNDER CONSTRUCTION experiment for OPFS.
   This file holds the synchronous half of an sqlite3_vfs
   implementation which proxies, in a synchronous fashion, the
-  asynchronous OPFS APIs using a second Worker.
+  asynchronous OPFS APIs using a second Worker, implemented
+  in sqlite3-opfs-async-proxy.js.
+
+  Summary of how this works:
+
+  This file uses the sqlite3.StructBinder-created struct wrappers for
+  sqlite3_vfs, sqlite3_io_methods, ans sqlite3_file to set up a
+  conventional sqlite3_vfs (except that it's implemented in JS). The
+  methods which require OPFS APIs use a separate worker (hereafter called the
+  OPFS worker) to access that functionality. This worker and that one
+  use SharedBufferArray
 */
 'use strict';
 /**
@@ -36,6 +46,16 @@ const initOpfsVfs = function(sqlite3){
   };
   warn("This file is very much experimental and under construction.",self.location.pathname);
 
+  if(self.window===self ||
+     !self.SharedBufferArray ||
+     !self.FileSystemHandle ||
+     !self.FileSystemDirectoryHandle ||
+     !self.FileSystemFileHandle ||
+     !self.FileSystemFileHandle.prototype.createSyncAccessHandle ||
+     !navigator.storage.getDirectory){
+    warn("This environment does not have OPFS support.");
+  }
+
   const capi = sqlite3.capi;
   const wasm = capi.wasm;
   const sqlite3_vfs = capi.sqlite3_vfs
@@ -44,7 +64,6 @@ const initOpfsVfs = function(sqlite3){
         || toss("Missing sqlite3.capi.sqlite3_file object.");
   const sqlite3_io_methods = capi.sqlite3_io_methods
         || toss("Missing sqlite3.capi.sqlite3_io_methods object.");
-  const StructBinder = sqlite3.StructBinder || toss("Missing sqlite3.StructBinder.");
 
   const W = new Worker("sqlite3-opfs-async-proxy.js");
   const wMsg = (type,payload)=>W.postMessage({type,payload});
@@ -72,7 +91,7 @@ const initOpfsVfs = function(sqlite3){
     state.opIds.xSync = i++;
     state.opIds.xTruncate = i++;
     state.opIds.xWrite = i++;
-    state.opSab = new SharedArrayBuffer(i * 4);
+    state.opSAB = new SharedArrayBuffer(i * 4/*sizeof int32*/);
   }
 
   state.sq3Codes = Object.create(null);
@@ -91,13 +110,13 @@ const initOpfsVfs = function(sqlite3){
 
   const isWorkerErrCode = (n)=>!!state.sq3Codes._reverse[n];
   
-  const opStore = (op,val=-1)=>Atomics.store(state.opBuf, state.opIds[op], val);
-  const opWait = (op,val=-1)=>Atomics.wait(state.opBuf, state.opIds[op], val);
+  const opStore = (op,val=-1)=>Atomics.store(state.opSABView, state.opIds[op], val);
+  const opWait = (op,val=-1)=>Atomics.wait(state.opSABView, state.opIds[op], val);
 
   /**
      Runs the given operation in the async worker counterpart, waits
      for its response, and returns the result which the async worker
-     writes to the given op's index in state.opBuf. The 2nd argument
+     writes to the given op's index in state.opSABView. The 2nd argument
      must be a single object or primitive value, depending on the
      given operation's signature in the async API counterpart.
   */
@@ -105,7 +124,7 @@ const initOpfsVfs = function(sqlite3){
     opStore(op);
     wMsg(op, args);
     opWait(op);
-    return Atomics.load(state.opBuf, state.opIds[op]);
+    return Atomics.load(state.opSABView, state.opIds[op]);
   };
 
   const wait = (ms,value)=>{
@@ -151,16 +170,17 @@ const initOpfsVfs = function(sqlite3){
   opfsVfs.$szOsFile = capi.sqlite3_file.structInfo.sizeof;
   opfsVfs.$mxPathname = 1024/*sure, why not?*/;
   opfsVfs.$zName = wasm.allocCString("opfs");
+  // All C-side memory of opfsVfs is zeroed out, but just to be explicit:
+  opfsVfs.$xDlOpen = opfsVfs.$xDlError = opfsVfs.$xDlSym = opfsVfs.$xDlClose = null;
   opfsVfs.ondispose = [
     '$zName', opfsVfs.$zName,
-    'cleanup dVfs', ()=>(dVfs ? dVfs.dispose() : null)
+    'cleanup default VFS wrapper', ()=>(dVfs ? dVfs.dispose() : null),
+    'cleanup opfsIoMethods', ()=>opfsIoMethods.dispose()
   ];
   if(dVfs){
     opfsVfs.$xSleep = dVfs.$xSleep;
     opfsVfs.$xRandomness = dVfs.$xRandomness;
   }
-  // All C-side memory of opfsVfs is zeroed out, but just to be explicit:
-  opfsVfs.$xDlOpen = opfsVfs.$xDlError = opfsVfs.$xDlSym = opfsVfs.$xDlClose = null;
   /**
      Pedantic sidebar about opfsVfs.ondispose: the entries in that array
      are items to clean up when opfsVfs.dispose() is called, but in this
@@ -383,7 +403,7 @@ const initOpfsVfs = function(sqlite3){
       const dbFile = "/sanity/check/file";
       let rc = vfsSyncWrappers.xOpen(opfsVfs.pointer, dbFile,
                                      fid, openFlags, pOut);
-      log("open rc =",rc,"state.opBuf[xOpen] =",state.opBuf[state.opIds.xOpen]);
+      log("open rc =",rc,"state.opSABView[xOpen] =",state.opSABView[state.opIds.xOpen]);
       if(isWorkerErrCode(rc)){
         error("open failed with code",rc);
         return;
@@ -399,7 +419,7 @@ const initOpfsVfs = function(sqlite3){
       log("xSleep()ing before close()ing...");
       opRun('xSleep',1500);
       rc = ioSyncWrappers.xClose(fid);
-      log("xClose rc =",rc,"opBuf =",state.opBuf);
+      log("xClose rc =",rc,"opSABView =",state.opSABView);
       log("Deleting file:",dbFile);
       opRun('xDelete', dbFile);
     }finally{
@@ -416,13 +436,31 @@ const initOpfsVfs = function(sqlite3){
           /*Pass our config and shared state on to the async worker.*/
           wMsg('init',state);
           break;
-        case 'inited':
+        case 'inited':{
           /*Indicates that the async partner has received the 'init',
             so we now know that the state object is no longer subject to
             being copied by a pending postMessage() call.*/
-          state.opBuf = new Int32Array(state.opSab);
-          sanityCheck();
+          try {
+            const rc = capi.sqlite3_vfs_register(opfsVfs.pointer, opfsVfs.$zName);
+            if(rc){
+              opfsVfs.dispose();
+              toss("sqlite3_vfs_register(OPFS) failed with rc",rc);
+            }
+            if(opfsVfs.pointer !== capi.sqlite3_vfs_find("opfs")){
+              toss("BUG: sqlite3_vfs_find() failed for just-installed OPFS VFS");
+            }
+            capi.sqlite3_vfs_register.addReference(opfsVfs, opfsIoMethods);
+            state.opSABView = new Int32Array(state.opSAB);
+            if(self.location && +self.location.port > 1024){
+              log("Running sanity check for dev mode...");
+              sanityCheck();
+            }
+            warn("End of (very incomplete) OPFS setup.", opfsVfs);
+          }catch(e){
+            error(e);
+          }
           break;
+        }
         default:
           error("Unexpected message from the async worker:",data);
           break;
diff --git a/manifest b/manifest
index cce6558812..bef8fab86f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\sremaining\svfs/io_methods\swrappers\sto\sthe\sOPFS\ssync/async\sproxy,\sbut\smost\sare\snot\syet\stested.
-D 2022-09-17T20:50:12.684
+C Generic\scleanups\sin\sthe\sOPFS\ssync/async\sproxy.
+D 2022-09-17T21:13:26.228
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -523,7 +523,7 @@ F ext/wasm/speedtest1.html fbb8e4d1639028443f3687a683be660beca6927920545cf6b1fdf
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
-F ext/wasm/sqlite3-opfs-async-proxy.js 62024877ad13fdff1834581ca1951ab58bda431e4d548aaaf4506ea54f0ed2de
+F ext/wasm/sqlite3-opfs-async-proxy.js ceb5e3a190bfd42d25fc137b3aaf09adf6469b5f1e33528a64ce7ff74e5ef5b1
 F ext/wasm/sqlite3-worker1-promiser.js 92b8da5f38439ffec459a8215775d30fa498bc0f1ab929ff341fc3dd479660b9
 F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
@@ -534,7 +534,7 @@ F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c2
 F ext/wasm/testing2.js 25584bcc30f19673ce13a6f301f89f8820a59dfe044e0c4f2913941f4097fe3c
 F ext/wasm/wasmfs.make 21a5cf297954a689e0dc2a95299ae158f681cae5e90c10b99d986097815fd42d
 F ext/wasm/x-sync-async.html 717b0d3bee96e49cbd36731bead497ab27a8bf3a3b23dd11e40e61d4ac9e8b80
-F ext/wasm/x-sync-async.js 05c0b49adae0600c5ad12f3325e0873ab1f07b99c2bb017f32b50a4f701490f1
+F ext/wasm/x-sync-async.js c99a6f98a8b0ccb43b2883a1bc1da42d0d84b26b5d4fd99d2f053ffe209a0a1f
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
@@ -2030,8 +2030,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 38da059b472415da52f57de7332fbeb8a91e3add1f4be3ff9c1924b52672f77c
-R 8887512b2075b067b4aa7969d08f1316
+P 44db9132145b3072488ea91db53f6c06be74544beccad5fd07efd22c0f03dc04
+R 75c9aa6717389505aa78f157abdf6d44
 U stephan
-Z 1bf4c438e48bd1dc1717362060b2f357
+Z 6a0a0bcb470dbb44e9d0c87c09f1fedd
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 7d2261af8e..4f626ec440 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-44db9132145b3072488ea91db53f6c06be74544beccad5fd07efd22c0f03dc04
\ No newline at end of file
+f36bddbe54c3acbfaa958042e4d24724f130bdca551401033f9bc63f3da73492
\ No newline at end of file

From 8200a6d8d7685ab252667768a4c291f1f0e9993c Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sat, 17 Sep 2022 23:29:27 +0000
Subject: [PATCH 123/428] Implement OPFS xAccess(), albeit with more limited
 semantics than the VFS API calls for. Add a way for OPFS xDelete() to
 optionally recursively remove empty dirs left over after deleting a file.

FossilOrigin-Name: c342b5d745f301104c59851c753287ebbbe95a69a56cb522d376d0f3e352c30f
---
 ext/wasm/sqlite3-opfs-async-proxy.js | 93 ++++++++++++++++++----------
 ext/wasm/x-sync-async.js             | 30 ++++++---
 manifest                             | 14 ++---
 manifest.uuid                        |  2 +-
 4 files changed, 93 insertions(+), 46 deletions(-)

diff --git a/ext/wasm/sqlite3-opfs-async-proxy.js b/ext/wasm/sqlite3-opfs-async-proxy.js
index 1ff9397027..4a60e8aa1a 100644
--- a/ext/wasm/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/sqlite3-opfs-async-proxy.js
@@ -72,9 +72,17 @@ warn("This file is very much experimental and under construction.",self.location
 const __openFiles = Object.create(null);
 
 /**
-   Map of dir names to FileSystemDirectoryHandle objects.
+   Expects an OPFS file path. It gets resolved, such that ".."
+   components are properly expanded, and returned. If the 2nd
+   are is true, it's returned as an array of path elements,
+   else it's returned as an absolute path string.
 */
-const __dirCache = new Map;
+const getResolvedPath = function(filename,splitIt){
+  const p = new URL(
+    filename, 'file://irrelevant'
+  ).pathname;
+  return splitIt ? p.split('/').filter((v)=>!!v) : p;
+}
 
 /**
    Takes the absolute path to a filesystem element. Returns an array
@@ -83,21 +91,13 @@ const __dirCache = new Map;
    along the way. Throws if any creation or resolution fails.
 */
 const getDirForPath = async function f(absFilename, createDirs = false){
-  const url = new URL(
-    absFilename, 'file://xyz'
-  ) /* use URL to resolve path pieces such as a/../b */;
-  const path = url.pathname.split('/').filter((v)=>!!v);
+  const path = getResolvedPath(absFilename, true);
   const filename = path.pop();
-  const allDirs = '/'+path.join('/');
-  let dh = __dirCache.get(allDirs);
-  if(!dh){
-    dh = state.rootDir;
-    for(const dirName of path){
-      if(dirName){
-        dh = await dh.getDirectoryHandle(dirName, {create: !!createDirs});
-      }
+  let dh = state.rootDir;
+  for(const dirName of path){
+    if(dirName){
+      dh = await dh.getDirectoryHandle(dirName, {create: !!createDirs});
     }
-    __dirCache.set(allDirs, dh);
   }
   return [dh, filename];
 };
@@ -113,14 +113,6 @@ const storeAndNotify = (opName, value)=>{
   Atomics.notify(state.opSABView, state.opIds[opName]);
 };
 
-const isInt32 = function(n){
-  return ('bigint'!==typeof n /*TypeError: can't convert BigInt to number*/)
-    && !!(n===(n|0) && n<=2147483647 && n>=-2147483648);
-};
-const affirm32Bits = function(n){
-  return isInt32(n) || toss("Number is too large (>31 bits) (FIXME!):",n);
-};
-
 /**
    Throws if fh is a file-holding object which is flagged as read-only.
 */
@@ -134,9 +126,26 @@ const affirmNotRO = function(opName,fh){
    to simplify finding them.
 */
 const vfsAsyncImpls = {
-  xAccess: async function({filename, exists, readWrite}){
-    warn("xAccess(",arguments[0],") is TODO");
-    const rc = state.sq3Codes.SQLITE_IOERR;
+  xAccess: async function(filename){
+    log("xAccess(",arguments[0],")");
+    /* OPFS cannot support the full range of xAccess() queries sqlite3
+       calls for. We can essentially just tell if the file is
+       accessible, but if it is it's automatically writable (unless
+       it's locked, which we cannot(?) know without trying to open
+       it). OPFS does not have the notion of read-only.
+
+       The return semantics of this function differ from sqlite3's
+       xAccess semantics because we are limited in what we can
+       communicate back to our synchronous communication partner: 0 =
+       accessible, non-0 means not accessible.
+    */
+    let rc = 0;
+    try{
+      const [dh, fn] = await getDirForPath(filename);
+      await dh.getFileHandle(fn);
+    }catch(e){
+      rc = state.sq3Codes.SQLITE_IOERR;
+    }
     storeAndNotify('xAccess', rc);
   },
   xClose: async function(fid){
@@ -156,12 +165,34 @@ const vfsAsyncImpls = {
     }
   },
   xDelete: async function({filename, syncDir/*ignored*/}){
+    /* The syncDir flag is, for purposes of the VFS API's semantics,
+       ignored here. However, if it has the value 0x1234 then: after
+       deleting the given file, recursively try to delete any empty
+       directories left behind in its wake (ignoring any errors and
+       stopping at the first failure).
+
+       That said: we don't know for sure that removeEntry() fails if
+       the dir is not empty because the API is not documented. It has,
+       however, a "recursive" flag which defaults to false, so
+       presumably it will fail if the dir is not empty and that flag
+       is false.
+    */
     log("xDelete(",arguments[0],")");
     try {
-      const [hDir, filenamePart] = await getDirForPath(filename, false);
-      await hDir.removeEntry(filenamePart);
+      while(filename){
+        const [hDir, filenamePart] = await getDirForPath(filename, false);
+        //log("Removing:",hDir, filenamePart);
+        if(!filenamePart) break;
+        await hDir.removeEntry(filenamePart);
+        if(0x1234 !== syncDir) break;
+        filename = getResolvedPath(filename, true);
+        filename.pop();
+        filename = filename.join('/');
+      }
     }catch(e){
-      /* Ignoring: _presumably_ the file can't be found. */
+      /* Ignoring: _presumably_ the file can't be found or a dir is
+         not empty. */
+      //error("Delete failed",filename, e.message);
     }
     storeAndNotify('xDelete', 0);
   },
@@ -268,8 +299,8 @@ const vfsAsyncImpls = {
   xWrite: async function({fid,src,n,offset}){
     log("xWrite(",arguments[0],")");
     let rc;
+    const fh = __openFiles[fid];
     try{
-      const fh = __openFiles[fid];
       affirmNotRO('xWrite', fh);
       const nOut = fh.accessHandle.write(new UInt8Array(fh.sab, 0, n), {at: offset});
       rc = (nOut===n) ? 0 : state.sq3Codes.SQLITE_IOERR_WRITE;
@@ -324,4 +355,4 @@ navigator.storage.getDirectory().then(function(d){
     }
   };
   wMsg('loaded');
-});
+}).catch((e)=>error(e));
diff --git a/ext/wasm/x-sync-async.js b/ext/wasm/x-sync-async.js
index 9329e765ac..250fde349f 100644
--- a/ext/wasm/x-sync-async.js
+++ b/ext/wasm/x-sync-async.js
@@ -47,13 +47,14 @@ const initOpfsVfs = function(sqlite3){
   warn("This file is very much experimental and under construction.",self.location.pathname);
 
   if(self.window===self ||
-     !self.SharedBufferArray ||
+     !self.SharedArrayBuffer ||
      !self.FileSystemHandle ||
      !self.FileSystemDirectoryHandle ||
      !self.FileSystemFileHandle ||
      !self.FileSystemFileHandle.prototype.createSyncAccessHandle ||
      !navigator.storage.getDirectory){
     warn("This environment does not have OPFS support.");
+    return;
   }
 
   const capi = sqlite3.capi;
@@ -282,7 +283,11 @@ const initOpfsVfs = function(sqlite3){
      are in alphabetical order to simplify finding them.
   */
   const vfsSyncWrappers = {
-    // TODO: xAccess
+    xAccess: function(pVfs,zName,flags,pOut){
+      const rc = opRun('xAccess', wasm.cstringToJs(zName));
+      wasm.setMemValue(pOut, rc ? 0 : 1, 'i32');
+      return 0;
+    },
     xCurrentTime: function(pVfs,pOut){
       /* If it turns out that we need to adjust for timezone, see:
          https://stackoverflow.com/a/11760121/1458521 */
@@ -397,17 +402,25 @@ const initOpfsVfs = function(sqlite3){
       const fid = sq3File.pointer;
       const openFlags = capi.SQLITE_OPEN_CREATE
             | capi.SQLITE_OPEN_READWRITE
-            | capi.SQLITE_OPEN_DELETEONCLOSE
+            //| capi.SQLITE_OPEN_DELETEONCLOSE
             | capi.SQLITE_OPEN_MAIN_DB;
       const pOut = wasm.scopedAlloc(8);
       const dbFile = "/sanity/check/file";
-      let rc = vfsSyncWrappers.xOpen(opfsVfs.pointer, dbFile,
-                                     fid, openFlags, pOut);
+      const zDbFile = wasm.scopedAllocCString(dbFile);
+      let rc;
+      vfsSyncWrappers.xAccess(opfsVfs.pointer, zDbFile, 0, pOut);
+      rc = wasm.getMemValue(pOut,'i32');
+      log("xAccess(",dbFile,") exists ?=",rc);
+      rc = vfsSyncWrappers.xOpen(opfsVfs.pointer, zDbFile,
+                                fid, openFlags, pOut);
       log("open rc =",rc,"state.opSABView[xOpen] =",state.opSABView[state.opIds.xOpen]);
       if(isWorkerErrCode(rc)){
         error("open failed with code",rc);
         return;
       }
+      vfsSyncWrappers.xAccess(opfsVfs.pointer, zDbFile, 0, pOut);
+      rc = wasm.getMemValue(pOut,'i32');
+      if(!rc) toss("xAccess() failed to detect file.");
       rc = ioSyncWrappers.xSync(sq3File.pointer, 0);
       if(rc) toss('sync failed w/ rc',rc);
       rc = ioSyncWrappers.xTruncate(sq3File.pointer, 1024);
@@ -417,11 +430,14 @@ const initOpfsVfs = function(sqlite3){
       if(rc) toss('xFileSize failed w/ rc',rc);
       log("xFileSize says:",wasm.getMemValue(pOut, 'i64'));
       log("xSleep()ing before close()ing...");
-      opRun('xSleep',1500);
+      opRun('xSleep',1000);
       rc = ioSyncWrappers.xClose(fid);
       log("xClose rc =",rc,"opSABView =",state.opSABView);
       log("Deleting file:",dbFile);
-      opRun('xDelete', dbFile);
+      vfsSyncWrappers.xDelete(opfsVfs.pointer, zDbFile, 0x1234);
+      vfsSyncWrappers.xAccess(opfsVfs.pointer, zDbFile, 0, pOut);
+      rc = wasm.getMemValue(pOut,'i32');
+      if(rc) toss("Expecting 0 from xAccess(",dbFile,") after xDelete().");
     }finally{
       sq3File.dispose();
       wasm.scopedAllocPop(scope);
diff --git a/manifest b/manifest
index bef8fab86f..503b895473 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Generic\scleanups\sin\sthe\sOPFS\ssync/async\sproxy.
-D 2022-09-17T21:13:26.228
+C Implement\sOPFS\sxAccess(),\salbeit\swith\smore\slimited\ssemantics\sthan\sthe\sVFS\sAPI\scalls\sfor.\sAdd\sa\sway\sfor\sOPFS\sxDelete()\sto\soptionally\srecursively\sremove\sempty\sdirs\sleft\sover\safter\sdeleting\sa\sfile.
+D 2022-09-17T23:29:27.832
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -523,7 +523,7 @@ F ext/wasm/speedtest1.html fbb8e4d1639028443f3687a683be660beca6927920545cf6b1fdf
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
-F ext/wasm/sqlite3-opfs-async-proxy.js ceb5e3a190bfd42d25fc137b3aaf09adf6469b5f1e33528a64ce7ff74e5ef5b1
+F ext/wasm/sqlite3-opfs-async-proxy.js c4be9e614abea5f237564757141e3e128f0cff4b4cd8350f68e17347230fd34e
 F ext/wasm/sqlite3-worker1-promiser.js 92b8da5f38439ffec459a8215775d30fa498bc0f1ab929ff341fc3dd479660b9
 F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
@@ -534,7 +534,7 @@ F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c2
 F ext/wasm/testing2.js 25584bcc30f19673ce13a6f301f89f8820a59dfe044e0c4f2913941f4097fe3c
 F ext/wasm/wasmfs.make 21a5cf297954a689e0dc2a95299ae158f681cae5e90c10b99d986097815fd42d
 F ext/wasm/x-sync-async.html 717b0d3bee96e49cbd36731bead497ab27a8bf3a3b23dd11e40e61d4ac9e8b80
-F ext/wasm/x-sync-async.js c99a6f98a8b0ccb43b2883a1bc1da42d0d84b26b5d4fd99d2f053ffe209a0a1f
+F ext/wasm/x-sync-async.js a95e8acb04fd69526317ee63bf25fa478a20e223d5dc16f7526baf5d81e07d1e
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
@@ -2030,8 +2030,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 44db9132145b3072488ea91db53f6c06be74544beccad5fd07efd22c0f03dc04
-R 75c9aa6717389505aa78f157abdf6d44
+P f36bddbe54c3acbfaa958042e4d24724f130bdca551401033f9bc63f3da73492
+R 5aad77d6a3a0d677e9c84e63e20c4294
 U stephan
-Z 6a0a0bcb470dbb44e9d0c87c09f1fedd
+Z 31fefe04f3f471aad99d738829acf9a8
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 4f626ec440..6035cd7f00 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f36bddbe54c3acbfaa958042e4d24724f130bdca551401033f9bc63f3da73492
\ No newline at end of file
+c342b5d745f301104c59851c753287ebbbe95a69a56cb522d376d0f3e352c30f
\ No newline at end of file

From 5f4ad926817650b919ef1a9a987b8b70f906e9d9 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sat, 17 Sep 2022 23:47:20 +0000
Subject: [PATCH 124/428] Correct OPFS xRead() and xWrite() impls and add a
 very basic sanity test for them.

FossilOrigin-Name: cd06cc670029763955cf60ffcf944b36d41cb005b859d9b9fd0eea1b6741d0e9
---
 ext/wasm/sqlite3-opfs-async-proxy.js |  6 +++---
 ext/wasm/x-sync-async.js             | 17 +++++++++++++----
 manifest                             | 14 +++++++-------
 manifest.uuid                        |  2 +-
 4 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/ext/wasm/sqlite3-opfs-async-proxy.js b/ext/wasm/sqlite3-opfs-async-proxy.js
index 4a60e8aa1a..58498e006b 100644
--- a/ext/wasm/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/sqlite3-opfs-async-proxy.js
@@ -259,10 +259,10 @@ const vfsAsyncImpls = {
     let rc = 0;
     const fh = __openFiles[fid];
     try{
-      const aRead = new Uint8array(fh.sab, n);
+      const aRead = new Uint8Array(fh.sab, 0, n);
       const nRead = fh.accessHandle.read(aRead, {at: offset});
       if(nRead < n){/* Zero-fill remaining bytes */
-        new Uint8array(fh.sab).fill(0, nRead, n);
+        new Uint8Array(fh.sab).fill(0, nRead, n);
         rc = state.sq3Codes.SQLITE_IOERR_SHORT_READ;
       }
     }catch(e){
@@ -302,7 +302,7 @@ const vfsAsyncImpls = {
     const fh = __openFiles[fid];
     try{
       affirmNotRO('xWrite', fh);
-      const nOut = fh.accessHandle.write(new UInt8Array(fh.sab, 0, n), {at: offset});
+      const nOut = fh.accessHandle.write(new Uint8Array(fh.sab, 0, n), {at: offset});
       rc = (nOut===n) ? 0 : state.sq3Codes.SQLITE_IOERR_WRITE;
     }catch(e){
       error("xWrite():",e,fh);
diff --git a/ext/wasm/x-sync-async.js b/ext/wasm/x-sync-async.js
index 250fde349f..d36dc1700f 100644
--- a/ext/wasm/x-sync-async.js
+++ b/ext/wasm/x-sync-async.js
@@ -76,7 +76,7 @@ const initOpfsVfs = function(sqlite3){
      of data may be added to it.
   */
   const state = Object.create(null);
-  state.verbose = 3;
+  state.verbose = 2;
   state.fileBufferSize = 1024 * 64 + 8 /* size of fileHandle.sab. 64k = max sqlite3 page size */;
   state.fbInt64Offset = state.fileBufferSize - 8 /*spot in fileHandle.sab to store an int64*/;
   state.opIds = Object.create(null);
@@ -239,10 +239,11 @@ const initOpfsVfs = function(sqlite3){
     },
     xRead: function(pFile,pDest,n,offset){
       /* int (*xRead)(sqlite3_file*, void*, int iAmt, sqlite3_int64 iOfst) */
-      const f = __opfsHandles[pFile];
+      const f = __openFiles[pFile];
+      let rc;
       try {
         // FIXME(?): block until we finish copying the xRead result buffer. How?
-        let rc = opRun('xRead',{fid:pFile, n, offset});
+        rc = opRun('xRead',{fid:pFile, n, offset});
         if(0!==rc) return rc;
         let i = 0;
         for(; i < n; ++i) wasm.setMemValue(pDest + i, f.sabView[i]);
@@ -265,7 +266,7 @@ const initOpfsVfs = function(sqlite3){
     },
     xWrite: function(pFile,pSrc,n,offset){
     /* int (*xWrite)(sqlite3_file*, const void*, int iAmt, sqlite3_int64 iOfst) */
-      const f = __opfsHandles[pFile];
+      const f = __openFiles[pFile];
       try {
         let i = 0;
         // FIXME(?): block from here until we finish the xWrite. How?
@@ -429,6 +430,14 @@ const initOpfsVfs = function(sqlite3){
       rc = ioSyncWrappers.xFileSize(sq3File.pointer, pOut);
       if(rc) toss('xFileSize failed w/ rc',rc);
       log("xFileSize says:",wasm.getMemValue(pOut, 'i64'));
+      rc = ioSyncWrappers.xWrite(sq3File.pointer, zDbFile, 10, 0);
+      if(rc) toss("xWrite() failed!");
+      const readBuf = wasm.scopedAlloc(16);
+      rc = ioSyncWrappers.xRead(sq3File.pointer, readBuf, 6, 1);
+      wasm.setMemValue(readBuf+6,0);
+      let jRead = wasm.cstringToJs(readBuf);
+      log("xRead() got:",jRead);
+      if("sanity"!==jRead) toss("Unexpected xRead() value.");
       log("xSleep()ing before close()ing...");
       opRun('xSleep',1000);
       rc = ioSyncWrappers.xClose(fid);
diff --git a/manifest b/manifest
index 503b895473..b288f12d6c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Implement\sOPFS\sxAccess(),\salbeit\swith\smore\slimited\ssemantics\sthan\sthe\sVFS\sAPI\scalls\sfor.\sAdd\sa\sway\sfor\sOPFS\sxDelete()\sto\soptionally\srecursively\sremove\sempty\sdirs\sleft\sover\safter\sdeleting\sa\sfile.
-D 2022-09-17T23:29:27.832
+C Correct\sOPFS\sxRead()\sand\sxWrite()\simpls\sand\sadd\sa\svery\sbasic\ssanity\stest\sfor\sthem.
+D 2022-09-17T23:47:20.619
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -523,7 +523,7 @@ F ext/wasm/speedtest1.html fbb8e4d1639028443f3687a683be660beca6927920545cf6b1fdf
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
-F ext/wasm/sqlite3-opfs-async-proxy.js c4be9e614abea5f237564757141e3e128f0cff4b4cd8350f68e17347230fd34e
+F ext/wasm/sqlite3-opfs-async-proxy.js ef012be0a77d3e34dc699de2e430b6d26a58c69dbebdd75248d8f41540996c71
 F ext/wasm/sqlite3-worker1-promiser.js 92b8da5f38439ffec459a8215775d30fa498bc0f1ab929ff341fc3dd479660b9
 F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
@@ -534,7 +534,7 @@ F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c2
 F ext/wasm/testing2.js 25584bcc30f19673ce13a6f301f89f8820a59dfe044e0c4f2913941f4097fe3c
 F ext/wasm/wasmfs.make 21a5cf297954a689e0dc2a95299ae158f681cae5e90c10b99d986097815fd42d
 F ext/wasm/x-sync-async.html 717b0d3bee96e49cbd36731bead497ab27a8bf3a3b23dd11e40e61d4ac9e8b80
-F ext/wasm/x-sync-async.js a95e8acb04fd69526317ee63bf25fa478a20e223d5dc16f7526baf5d81e07d1e
+F ext/wasm/x-sync-async.js 961eb6c268086babd20d7b5e07cad72dc3118f9c46954e9a73b8b826deb4f771
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
@@ -2030,8 +2030,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 f36bddbe54c3acbfaa958042e4d24724f130bdca551401033f9bc63f3da73492
-R 5aad77d6a3a0d677e9c84e63e20c4294
+P c342b5d745f301104c59851c753287ebbbe95a69a56cb522d376d0f3e352c30f
+R 70b6b0622f3dd6730d580a81783f068d
 U stephan
-Z 31fefe04f3f471aad99d738829acf9a8
+Z 5c4a37b98dc31ffc6cd63d317f5738d7
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 6035cd7f00..39390f941c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c342b5d745f301104c59851c753287ebbbe95a69a56cb522d376d0f3e352c30f
\ No newline at end of file
+cd06cc670029763955cf60ffcf944b36d41cb005b859d9b9fd0eea1b6741d0e9
\ No newline at end of file

From 3e2823cbb6e46549229ac177152d048fca8df958 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sun, 18 Sep 2022 00:16:12 +0000
Subject: [PATCH 125/428] Plug OPFS methods in to their sqlite3_vfs/io_methods
 counterparts. Add URL args to control debug output and running of
 sanity-checks in the OPFS init code.

FossilOrigin-Name: a0e93ed20b2463606a63b03ce8ca41ec1fb22886db5c5c898ace86ba24636f70
---
 ext/wasm/index.html        |   2 +-
 ext/wasm/x-sync-async.html |   2 +-
 ext/wasm/x-sync-async.js   | 104 ++++++++++++++++++++++++++++++-------
 manifest                   |  16 +++---
 manifest.uuid              |   2 +-
 5 files changed, 95 insertions(+), 31 deletions(-)

diff --git a/ext/wasm/index.html b/ext/wasm/index.html
index a1cc194854..562bb9b5ef 100644
--- a/ext/wasm/index.html
+++ b/ext/wasm/index.html
@@ -50,7 +50,7 @@
           worker due to an Emscripten limitation.</li>
         <li><a href='scratchpad-opfs-worker.html'>scratchpad-opfs-worker</a>:
           experimenting with OPFS from a Worker thread (without WASMFS).</li>
-        <li><a href='x-sync-async.html'>x-sync-async</a> is an
+        <li><a href='x-sync-async.html?opfs-sanity-check&opfs-verbose'>x-sync-async</a> is an
           experiment in implementing a syncronous sqlite3 VFS proxy
           for a fully synchronous backend interface (namely OPFS), using SharedArrayBuffer
           and the Atomics APIs to regulate communication between the synchronous
diff --git a/ext/wasm/x-sync-async.html b/ext/wasm/x-sync-async.html
index ec0a6353b5..b83d93378c 100644
--- a/ext/wasm/x-sync-async.html
+++ b/ext/wasm/x-sync-async.html
@@ -17,6 +17,6 @@
     </div>
     <div id='test-output'>
     </div>
-    <script>new Worker("x-sync-async.js");</script>
+    <script>new Worker("x-sync-async.js"+self.location.search);</script>
   </body>
 </html>
diff --git a/ext/wasm/x-sync-async.js b/ext/wasm/x-sync-async.js
index d36dc1700f..203c8eece4 100644
--- a/ext/wasm/x-sync-async.js
+++ b/ext/wasm/x-sync-async.js
@@ -44,7 +44,6 @@ const initOpfsVfs = function(sqlite3){
   const error =  (...args)=>{
     console.error(logPrefix,...args);
   };
-  warn("This file is very much experimental and under construction.",self.location.pathname);
 
   if(self.window===self ||
      !self.SharedArrayBuffer ||
@@ -56,7 +55,7 @@ const initOpfsVfs = function(sqlite3){
     warn("This environment does not have OPFS support.");
     return;
   }
-
+  warn("This file is very much experimental and under construction.",self.location.pathname);
   const capi = sqlite3.capi;
   const wasm = capi.wasm;
   const sqlite3_vfs = capi.sqlite3_vfs
@@ -65,6 +64,8 @@ const initOpfsVfs = function(sqlite3){
         || toss("Missing sqlite3.capi.sqlite3_file object.");
   const sqlite3_io_methods = capi.sqlite3_io_methods
         || toss("Missing sqlite3.capi.sqlite3_io_methods object.");
+  const StructBinder = sqlite3.StructBinder || toss("Missing sqlite3.StructBinder.");
+  const thisUrl = new URL(self.location.href);
 
   const W = new Worker("sqlite3-opfs-async-proxy.js");
   const wMsg = (type,payload)=>W.postMessage({type,payload});
@@ -76,7 +77,7 @@ const initOpfsVfs = function(sqlite3){
      of data may be added to it.
   */
   const state = Object.create(null);
-  state.verbose = 2;
+  state.verbose = thisUrl.searchParams.has('opfs-verbose') ? 3 : 2;
   state.fileBufferSize = 1024 * 64 + 8 /* size of fileHandle.sab. 64k = max sqlite3 page size */;
   state.fbInt64Offset = state.fileBufferSize - 8 /*spot in fileHandle.sab to store an int64*/;
   state.opIds = Object.create(null);
@@ -110,7 +111,6 @@ const initOpfsVfs = function(sqlite3){
   });
 
   const isWorkerErrCode = (n)=>!!state.sq3Codes._reverse[n];
-  
   const opStore = (op,val=-1)=>Atomics.store(state.opSABView, state.opIds[op], val);
   const opWait = (op,val=-1)=>Atomics.wait(state.opSABView, state.opIds[op], val);
 
@@ -128,12 +128,6 @@ const initOpfsVfs = function(sqlite3){
     return Atomics.load(state.opSABView, state.opIds[op]);
   };
 
-  const wait = (ms,value)=>{
-    return new Promise((resolve)=>{
-      setTimeout(()=>resolve(value), ms);
-    });
-  };
-
   /**
      Generates a random ASCII string len characters long, intended for
      use as a temporary file name.
@@ -194,6 +188,75 @@ const initOpfsVfs = function(sqlite3){
      environment or the other when sqlite3_os_end() is called (_if_ it
      gets called at all in a wasm build, which is undefined).
   */
+
+  /**
+     Installs a StructBinder-bound function pointer member of the
+     given name and function in the given StructType target object.
+     It creates a WASM proxy for the given function and arranges for
+     that proxy to be cleaned up when tgt.dispose() is called.  Throws
+     on the slightest hint of error (e.g. tgt is-not-a StructType,
+     name does not map to a struct-bound member, etc.).
+
+     Returns a proxy for this function which is bound to tgt and takes
+     2 args (name,func). That function returns the same thing,
+     permitting calls to be chained.
+
+     If called with only 1 arg, it has no side effects but returns a
+     func with the same signature as described above.
+  */
+  const installMethod = function callee(tgt, name, func){
+    if(!(tgt instanceof StructBinder.StructType)){
+      toss("Usage error: target object is-not-a StructType.");
+    }
+    if(1===arguments.length){
+      return (n,f)=>callee(tgt,n,f);
+    }
+    if(!callee.argcProxy){
+      callee.argcProxy = function(func,sig){
+        return function(...args){
+          if(func.length!==arguments.length){
+            toss("Argument mismatch. Native signature is:",sig);
+          }
+          return func.apply(this, args);
+        }
+      };
+      callee.removeFuncList = function(){
+        if(this.ondispose.__removeFuncList){
+          this.ondispose.__removeFuncList.forEach(
+            (v,ndx)=>{
+              if('number'===typeof v){
+                try{wasm.uninstallFunction(v)}
+                catch(e){/*ignore*/}
+              }
+              /* else it's a descriptive label for the next number in
+                 the list. */
+            }
+          );
+          delete this.ondispose.__removeFuncList;
+        }
+      };
+    }/*static init*/
+    const sigN = tgt.memberSignature(name);
+    if(sigN.length<2){
+      toss("Member",name," is not a function pointer. Signature =",sigN);
+    }
+    const memKey = tgt.memberKey(name);
+    //log("installMethod",tgt, name, sigN);
+    const fProxy = 1
+          // We can remove this proxy middle-man once the VFS is working
+          ? callee.argcProxy(func, sigN)
+          : func;
+    const pFunc = wasm.installFunction(fProxy, tgt.memberSignature(name, true));
+    tgt[memKey] = pFunc;
+    if(!tgt.ondispose) tgt.ondispose = [];
+    if(!tgt.ondispose.__removeFuncList){
+      tgt.ondispose.push('ondispose.__removeFuncList handler',
+                         callee.removeFuncList);
+      tgt.ondispose.__removeFuncList = [];
+    }
+    tgt.ondispose.__removeFuncList.push(memKey, pFunc);
+    return (n,f)=>callee(tgt, n, f);
+  }/*installMethod*/;
   
   /**
      Impls for the sqlite3_io_methods methods. Maintenance reminder:
@@ -390,10 +453,11 @@ const initOpfsVfs = function(sqlite3){
     vfsSyncWrappers.xSleep = (pVfs,ms)=>opRun('xSleep',ms);
   }
 
-  /*
-    TODO: plug in the above functions in to opfsVfs and opfsIoMethods.
-    Code for doing so is in api/sqlite3-api-opfs.js.
-  */
+  /* Install the vfs/io_methods into their C-level shared instances... */
+  let inst = installMethod(opfsIoMethods);
+  for(let k of Object.keys(ioSyncWrappers)) inst(k, ioSyncWrappers[k]);
+  inst = installMethod(opfsVfs);
+  for(let k of Object.keys(vfsSyncWrappers)) inst(k, vfsSyncWrappers[k]);
   
   const sanityCheck = async function(){
     //state.ioBuf = new Uint8Array(state.sabIo);
@@ -430,10 +494,10 @@ const initOpfsVfs = function(sqlite3){
       rc = ioSyncWrappers.xFileSize(sq3File.pointer, pOut);
       if(rc) toss('xFileSize failed w/ rc',rc);
       log("xFileSize says:",wasm.getMemValue(pOut, 'i64'));
-      rc = ioSyncWrappers.xWrite(sq3File.pointer, zDbFile, 10, 0);
+      rc = ioSyncWrappers.xWrite(sq3File.pointer, zDbFile, 10, 1);
       if(rc) toss("xWrite() failed!");
       const readBuf = wasm.scopedAlloc(16);
-      rc = ioSyncWrappers.xRead(sq3File.pointer, readBuf, 6, 1);
+      rc = ioSyncWrappers.xRead(sq3File.pointer, readBuf, 6, 2);
       wasm.setMemValue(readBuf+6,0);
       let jRead = wasm.cstringToJs(readBuf);
       log("xRead() got:",jRead);
@@ -453,9 +517,8 @@ const initOpfsVfs = function(sqlite3){
     }
   };
 
-  
   W.onmessage = function({data}){
-    log("Worker.onmessage:",data);
+    //log("Worker.onmessage:",data);
     switch(data.type){
         case 'loaded':
           /*Pass our config and shared state on to the async worker.*/
@@ -476,8 +539,9 @@ const initOpfsVfs = function(sqlite3){
             }
             capi.sqlite3_vfs_register.addReference(opfsVfs, opfsIoMethods);
             state.opSABView = new Int32Array(state.opSAB);
-            if(self.location && +self.location.port > 1024){
-              log("Running sanity check for dev mode...");
+
+            if(thisUrl.searchParams.has('opfs-sanity-check')){
+              warn("Running sanity checks because of opfs-sanity-check URL arg...");
               sanityCheck();
             }
             warn("End of (very incomplete) OPFS setup.", opfsVfs);
diff --git a/manifest b/manifest
index b288f12d6c..561605cbab 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Correct\sOPFS\sxRead()\sand\sxWrite()\simpls\sand\sadd\sa\svery\sbasic\ssanity\stest\sfor\sthem.
-D 2022-09-17T23:47:20.619
+C Plug\sOPFS\smethods\sin\sto\stheir\ssqlite3_vfs/io_methods\scounterparts.\sAdd\sURL\sargs\sto\scontrol\sdebug\soutput\sand\srunning\sof\ssanity-checks\sin\sthe\sOPFS\sinit\scode.
+D 2022-09-18T00:16:12.445
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -502,7 +502,7 @@ F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d695
 F ext/wasm/fiddle/fiddle-worker.js bccf46045be8824752876f3eec01c223be0616ccac184bffd0024cfe7a3262b8
 F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
 F ext/wasm/fiddle/fiddle.js 4ffcfc9a235beebaddec689a549e9e0dfad6dca5c1f0b41f03468d7e76480686
-F ext/wasm/index.html 8365e47e2aff1829923f0481292948487b27a0755fde9c0d3ad15f7ea0118992
+F ext/wasm/index.html b8a47afa96d0c7ac3081c6d469e1fd7be6b87c64b94e4fb62e26984a1564cac4
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 447cc02b598f7792edaa8ae6853a7847b8178a18ed356afacbdbf312b2588106
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
@@ -533,8 +533,8 @@ F ext/wasm/testing1.js 7cd8ab255c238b030d928755ae8e91e7d90a12f2ae601b1b8f7827aaa
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
 F ext/wasm/testing2.js 25584bcc30f19673ce13a6f301f89f8820a59dfe044e0c4f2913941f4097fe3c
 F ext/wasm/wasmfs.make 21a5cf297954a689e0dc2a95299ae158f681cae5e90c10b99d986097815fd42d
-F ext/wasm/x-sync-async.html 717b0d3bee96e49cbd36731bead497ab27a8bf3a3b23dd11e40e61d4ac9e8b80
-F ext/wasm/x-sync-async.js 961eb6c268086babd20d7b5e07cad72dc3118f9c46954e9a73b8b826deb4f771
+F ext/wasm/x-sync-async.html d85cb9b1ab398ef5a20ce64a689ce4bf9a347ffe69edd46c2d3dc57b869a8925
+F ext/wasm/x-sync-async.js 2cd04d73ddc515479cc2e4b9246d6da21b3f494020261d47470f4b710c84c0da
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
@@ -2030,8 +2030,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 c342b5d745f301104c59851c753287ebbbe95a69a56cb522d376d0f3e352c30f
-R 70b6b0622f3dd6730d580a81783f068d
+P cd06cc670029763955cf60ffcf944b36d41cb005b859d9b9fd0eea1b6741d0e9
+R af48df928e44c11df9f0c9eb2cf8376e
 U stephan
-Z 5c4a37b98dc31ffc6cd63d317f5738d7
+Z 07b2e0eb2359d701cc905c5402ed9c24
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 39390f941c..274fb7f0c1 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cd06cc670029763955cf60ffcf944b36d41cb005b859d9b9fd0eea1b6741d0e9
\ No newline at end of file
+a0e93ed20b2463606a63b03ce8ca41ec1fb22886db5c5c898ace86ba24636f70
\ No newline at end of file

From c5313afea7bf38bbe98b5a472b16a8f3efda07c0 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sun, 18 Sep 2022 02:35:30 +0000
Subject: [PATCH 126/428] Move the OPFS VFS bits back into
 api/sqlite3-api-opfs.js. Refactor the OPFS VFS init process to use a
 Promise-returning function which the client must call, as that eliminates any
 uncertainty about when the VFS (necessarily activated asynchronously)
 actually becomes available to the client.

FossilOrigin-Name: 1c660970d0f62bcfd6e698a72b050d99972a1e39f45a5ac24194a190f8f78ab3
---
 ext/wasm/GNUmakefile             |  15 +-
 ext/wasm/api/sqlite3-api-opfs.js | 972 +++++++++++++++++++------------
 ext/wasm/x-sync-async.js         | 544 +----------------
 manifest                         |  16 +-
 manifest.uuid                    |   2 +-
 5 files changed, 636 insertions(+), 913 deletions(-)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index dc0ce3681f..20354a6b5f 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -139,14 +139,13 @@ EXPORTED_FUNCTIONS.api: $(EXPORTED_FUNCTIONS.api.in) $(MAKEFILE)
 	cat $(EXPORTED_FUNCTIONS.api.in) > $@
 CLEAN_FILES += EXPORTED_FUNCTIONS.api
 
-sqlite3-api.jses := \
-  $(dir.api)/sqlite3-api-prologue.js \
-  $(dir.common)/whwasmutil.js \
-  $(dir.jacc)/jaccwabyt.js \
-  $(dir.api)/sqlite3-api-glue.js \
-  $(dir.api)/sqlite3-api-oo1.js \
-  $(dir.api)/sqlite3-api-worker1.js
-#sqlite3-api.jses += $(dir.api)/sqlite3-api-opfs.js 
+sqlite3-api.jses := $(dir.api)/sqlite3-api-prologue.js
+sqlite3-api.jses += $(dir.common)/whwasmutil.js
+sqlite3-api.jses += $(dir.jacc)/jaccwabyt.js
+sqlite3-api.jses += $(dir.api)/sqlite3-api-glue.js
+sqlite3-api.jses += $(dir.api)/sqlite3-api-oo1.js
+sqlite3-api.jses += $(dir.api)/sqlite3-api-worker1.js
+sqlite3-api.jses += $(dir.api)/sqlite3-api-opfs.js
 sqlite3-api.jses += $(dir.api)/sqlite3-api-cleanup.js
 
 sqlite3-api.js := sqlite3-api.js
diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index 3faf956c72..af1c6f7608 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -1,5 +1,5 @@
 /*
-  2022-07-22
+  2022-09-18
 
   The author disclaims copyright to this source code.  In place of a
   legal notice, here is a blessing:
@@ -10,10 +10,30 @@
 
   ***********************************************************************
 
-  This file contains extensions to the sqlite3 WASM API related to the
-  Origin-Private FileSystem (OPFS). It is intended to be appended to
-  the main JS deliverable somewhere after sqlite3-api-glue.js and
-  before sqlite3-api-cleanup.js.
+  This file holds the synchronous half of an sqlite3_vfs
+  implementation which proxies, in a synchronous fashion, the
+  asynchronous Origin-Private FileSystem (OPFS) APIs using a second
+  Worker, implemented in sqlite3-opfs-async-proxy.js.  This file is
+  intended to be appended to the main sqlite3 JS deliverable somewhere
+  after sqlite3-api-glue.js and before sqlite3-api-cleanup.js.
+
+*/
+
+'use strict';
+self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
+/**
+   sqlite3.installOpfsVfs() returns a Promise which, on success, installs
+   an sqlite3_vfs named "opfs", suitable for use with all sqlite3 APIs
+   which accept a VFS. It uses the Origin-Private FileSystem API for
+   all file storage. On error it is rejected with an exception
+   explaining the problem. Reasons for rejection include, but are
+   not limited to:
+
+   - The counterpart Worker (see below) could not be loaded.
+
+   - The environment does not support OPFS. That includes when
+     this function is called from the main window thread.
+
 
   Significant notes and limitations:
 
@@ -21,375 +41,587 @@
     available in bleeding-edge versions of Chrome (v102+, noting that
     that number will increase as the OPFS API matures).
 
-  - The _synchronous_ family of OPFS features (which is what this API
-    requires) are only available in non-shared Worker threads. This
-    file tries to detect that case and becomes a no-op if those
-    features do not seem to be available.
+  - The OPFS features used here are only available in dedicated Worker
+    threads. This file tries to detect that case and becomes a no-op
+    if those features do not seem to be available.
+
+  - It requires the SharedArrayBuffer and Atomics classes, and the
+    former is only available if the HTTP server emits the so-called
+    COOP and COEP response headers. These features are required for
+    proxying OPFS's synchronous API via the synchronous interface
+    required by the sqlite3_vfs API.
+
+  - This function may only be called a single time and it must be
+    called from the client, as opposed to the library initialization,
+    in case the client requires a custom path for this API's
+    "counterpart": this function's argument is the relative URI to
+    this module's "asynchronous half". When called, this function removes
+    itself from the sqlite3 object.
+
+   The argument may optionally be a plain object with the following
+   configuration options:
+
+   - proxyUri: as described above
+
+   - verbose (=2): an integer 0-3. 0 disables all logging, 1 enables
+     logging of errors. 2 enables logging of warnings and errors. 3
+     additionally enables debugging info.
+
+   - sanityChecks (=false): if true, some basic sanity tests are
+     run on the OPFS VFS API after it's initialized, before the
+     returned Promise resolves.
+
+   On success, the Promise resolves to the top-most sqlite3 namespace
+   object.
 */
-
-// FileSystemHandle
-// FileSystemDirectoryHandle
-// FileSystemFileHandle
-// FileSystemFileHandle.prototype.createSyncAccessHandle
-self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
-  const warn = console.warn.bind(console),
-        error = console.error.bind(console);
-  if(self.window===self || !self.importScripts || !self.FileSystemFileHandle
-     || !self.FileSystemFileHandle.prototype.createSyncAccessHandle){
-    warn("OPFS is not available in this environment.");
-    return;
-  }else if(!navigator.storage.getDirectory){
-    warn("The OPFS VFS requires navigator.storage.getDirectory.");
-  }else if(!sqlite3.capi.wasm.bigIntEnabled){
-    error("OPFS requires BigInt support but sqlite3.capi.wasm.bigIntEnabled is false.");
-    return;
-  }
-  //warn('self.FileSystemFileHandle =',self.FileSystemFileHandle);
-  //warn('self.FileSystemFileHandle.prototype =',self.FileSystemFileHandle.prototype);
-  const toss = (...args)=>{throw new Error(args.join(' '))};
-  const capi = sqlite3.capi,
-        wasm = capi.wasm;
-  const sqlite3_vfs = capi.sqlite3_vfs
-        || toss("Missing sqlite3.capi.sqlite3_vfs object.");
-  const sqlite3_file = capi.sqlite3_file
-        || toss("Missing sqlite3.capi.sqlite3_file object.");
-  const sqlite3_io_methods = capi.sqlite3_io_methods
-        || toss("Missing sqlite3.capi.sqlite3_io_methods object.");
-  const StructBinder = sqlite3.StructBinder || toss("Missing sqlite3.StructBinder.");
-  const debug = console.debug.bind(console),
-        log = console.log.bind(console);
-  warn("UNDER CONSTRUCTION: setting up OPFS VFS...");
-
-  const pDVfs = capi.sqlite3_vfs_find(null)/*pointer to default VFS*/;
-  const dVfs = pDVfs
-        ? new sqlite3_vfs(pDVfs)
-        : null /* dVfs will be null when sqlite3 is built with
-                  SQLITE_OS_OTHER. Though we cannot currently handle
-                  that case, the hope is to eventually be able to. */;
-  const oVfs = new sqlite3_vfs();
-  const oIom = new sqlite3_io_methods();
-  oVfs.$iVersion = 2/*yes, two*/;
-  oVfs.$szOsFile = capi.sqlite3_file.structInfo.sizeof;
-  oVfs.$mxPathname = 1024/*sure, why not?*/;
-  oVfs.$zName = wasm.allocCString("opfs");
-  oVfs.ondispose = [
-    '$zName', oVfs.$zName,
-    'cleanup dVfs', ()=>(dVfs ? dVfs.dispose() : null)
-  ];
-  if(dVfs){
-    oVfs.$xSleep = dVfs.$xSleep;
-    oVfs.$xRandomness = dVfs.$xRandomness;
-  }
-  // All C-side memory of oVfs is zeroed out, but just to be explicit:
-  oVfs.$xDlOpen = oVfs.$xDlError = oVfs.$xDlSym = oVfs.$xDlClose = null;
-
-  /**
-     Pedantic sidebar about oVfs.ondispose: the entries in that array
-     are items to clean up when oVfs.dispose() is called, but in this
-     environment it will never be called. The VFS instance simply
-     hangs around until the WASM module instance is cleaned up. We
-     "could" _hypothetically_ clean it up by "importing" an
-     sqlite3_os_end() impl into the wasm build, but the shutdown order
-     of the wasm engine and the JS one are undefined so there is no
-     guaranty that the oVfs instance would be available in one
-     environment or the other when sqlite3_os_end() is called (_if_ it
-     gets called at all in a wasm build, which is undefined).
-  */
-
-  /**
-     Installs a StructBinder-bound function pointer member of the
-     given name and function in the given StructType target object.
-     It creates a WASM proxy for the given function and arranges for
-     that proxy to be cleaned up when tgt.dispose() is called.  Throws
-     on the slightest hint of error (e.g. tgt is-not-a StructType,
-     name does not map to a struct-bound member, etc.).
-
-     Returns a proxy for this function which is bound to tgt and takes
-     2 args (name,func). That function returns the same thing,
-     permitting calls to be chained.
-
-     If called with only 1 arg, it has no side effects but returns a
-     func with the same signature as described above.
-  */
-  const installMethod = function callee(tgt, name, func){
-    if(!(tgt instanceof StructBinder.StructType)){
-      toss("Usage error: target object is-not-a StructType.");
-    }
-    if(1===arguments.length){
-      return (n,f)=>callee(tgt,n,f);
-    }
-    if(!callee.argcProxy){
-      callee.argcProxy = function(func,sig){
-        return function(...args){
-          if(func.length!==arguments.length){
-            toss("Argument mismatch. Native signature is:",sig);
-          }
-          return func.apply(this, args);
-        }
-      };
-      callee.removeFuncList = function(){
-        if(this.ondispose.__removeFuncList){
-          this.ondispose.__removeFuncList.forEach(
-            (v,ndx)=>{
-              if('number'===typeof v){
-                try{wasm.uninstallFunction(v)}
-                catch(e){/*ignore*/}
-              }
-              /* else it's a descriptive label for the next number in
-                 the list. */
-            }
-          );
-          delete this.ondispose.__removeFuncList;
-        }
-      };
-    }/*static init*/
-    const sigN = tgt.memberSignature(name);
-    if(sigN.length<2){
-      toss("Member",name," is not a function pointer. Signature =",sigN);
-    }
-    const memKey = tgt.memberKey(name);
-    //log("installMethod",tgt, name, sigN);
-    const fProxy = 1
-          // We can remove this proxy middle-man once the VFS is working
-          ? callee.argcProxy(func, sigN)
-          : func;
-    const pFunc = wasm.installFunction(fProxy, tgt.memberSignature(name, true));
-    tgt[memKey] = pFunc;
-    if(!tgt.ondispose) tgt.ondispose = [];
-    if(!tgt.ondispose.__removeFuncList){
-      tgt.ondispose.push('ondispose.__removeFuncList handler',
-                         callee.removeFuncList);
-      tgt.ondispose.__removeFuncList = [];
-    }
-    tgt.ondispose.__removeFuncList.push(memKey, pFunc);
-    return (n,f)=>callee(tgt, n, f);
-  }/*installMethod*/;
-
-  /**
-     Map of sqlite3_file pointers to OPFS handles.
-  */
-  const __opfsHandles = Object.create(null);
-
-  const randomFilename = function f(len=16){
-    if(!f._chars){
-      f._chars = "abcdefghijklmnopqrstuvwxyz"+
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZ"+
-        "012346789";
-      f._n = f._chars.length;
-    }
-    const a = [];
-    let i = 0;
-    for( ; i < len; ++i){
-      const ndx = Math.random() * (f._n * 64) % f._n | 0;
-      a[i] = f._chars[ndx];
-    }
-    return a.join('');
+sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
+  const options = (asyncProxyUri && 'object'===asyncProxyUri) ? asyncProxyUri : {
+    proxyUri: asyncProxyUri
   };
-
-  //const rootDir = await navigator.storage.getDirectory();
-  
-  ////////////////////////////////////////////////////////////////////////
-  // Set up OPFS VFS methods...
-  let inst = installMethod(oVfs);
-  inst('xOpen', function(pVfs, zName, pFile, flags, pOutFlags){
-    const f = new sqlite3_file(pFile);
-    f.$pMethods = oIom.pointer;
-    __opfsHandles[pFile] = f;
-    f.opfsHandle = null /* TODO */;
-    if(flags & capi.SQLITE_OPEN_DELETEONCLOSE){
-      f.deleteOnClose = true;
-    }
-    f.filename = zName ? wasm.cstringToJs(zName) : randomFilename();
-    error("OPFS sqlite3_vfs::xOpen is not yet full implemented.");
-    return capi.SQLITE_IOERR;
-  })
-  ('xFullPathname', function(pVfs,zName,nOut,pOut){
-    /* Until/unless we have some notion of "current dir"
-       in OPFS, simply copy zName to pOut... */
-    const i = wasm.cstrncpy(pOut, zName, nOut);
-    return i<nOut ? 0 : capi.SQLITE_CANTOPEN
-    /*CANTOPEN is required by the docs but SQLITE_RANGE would be a closer match*/;
-  })
-  ('xAccess', function(pVfs,zName,flags,pOut){
-    error("OPFS sqlite3_vfs::xAccess is not yet implemented.");
-    let fileExists = 0;
-    switch(flags){
-        case capi.SQLITE_ACCESS_EXISTS: break;
-        case capi.SQLITE_ACCESS_READWRITE: break;
-        case capi.SQLITE_ACCESS_READ/*docs say this is never used*/:
-        default:
-          error("Unexpected flags value for sqlite3_vfs::xAccess():",flags);
-          return capi.SQLITE_MISUSE;
-    }
-    wasm.setMemValue(pOut, fileExists, 'i32');
-    return 0;
-  })
-  ('xDelete', function(pVfs, zName, doSyncDir){
-    error("OPFS sqlite3_vfs::xDelete is not yet implemented.");
-    return capi.SQLITE_IOERR;
-  })
-  ('xGetLastError', function(pVfs,nOut,pOut){
-    debug("OPFS sqlite3_vfs::xGetLastError() has nothing sensible to return.");
-    return 0;
-  })
-  ('xCurrentTime', function(pVfs,pOut){
-    /* If it turns out that we need to adjust for timezone, see:
-       https://stackoverflow.com/a/11760121/1458521 */
-    wasm.setMemValue(pOut, 2440587.5 + (new Date().getTime()/86400000),
-                     'double');
-    return 0;
-  })
-  ('xCurrentTimeInt64',function(pVfs,pOut){
-    // TODO: confirm that this calculation is correct
-    wasm.setMemValue(pOut, (2440587.5 * 86400000) + new Date().getTime(),
-                     'i64');
-    return 0;
-  });
-  if(!oVfs.$xSleep){
-    inst('xSleep', function(pVfs,ms){
-      error("sqlite3_vfs::xSleep(",ms,") cannot be implemented from "+
-           "JS and we have no default VFS to copy the impl from.");
-      return 0;
-    });
+  const thisUrl = new URL(self.location.href);
+  if(undefined===options.verbose){
+    options.verbose = thisUrl.searchParams.has('opfs-verbose') ? 3 : 2;
   }
-  if(!oVfs.$xRandomness){
-    inst('xRandomness', function(pVfs, nOut, pOut){
-      const heap = wasm.heap8u();
+  if(undefined===options.sanityChecks){
+    options.sanityChecks = thisUrl.searchParams.has('opfs-sanity-check');
+  }
+  if(undefined===options.proxyUri){
+    options.proxyUri = callee.defaultProxyUri;
+  }
+  delete sqlite3.installOpfsVfs;
+  const thePromise = new Promise(function(promiseResolve, promiseReject){
+    const logPrefix = "OPFS syncer:";
+    const warn =  (...args)=>{
+      if(options.verbose>1) console.warn(logPrefix,...args);
+    };
+    if(self.window===self ||
+       !self.SharedArrayBuffer ||
+       !self.FileSystemHandle ||
+       !self.FileSystemDirectoryHandle ||
+       !self.FileSystemFileHandle ||
+       !self.FileSystemFileHandle.prototype.createSyncAccessHandle ||
+       !navigator.storage.getDirectory){
+      warn("This environment does not have OPFS support.");
+      promiseReject(new Error("This environment does not have OPFS support."));
+      return;
+    }
+    warn("The OPFS VFS feature is very much experimental and under construction.");
+    const toss = function(...args){throw new Error(args.join(' '))};
+    const log = (...args)=>{
+      if(options.verbose>2) console.log(logPrefix,...args);
+    };
+    const error =  (...args)=>{
+      if(options.verbose>0) console.error(logPrefix,...args);
+    };
+    const capi = sqlite3.capi;
+    const wasm = capi.wasm;
+    const sqlite3_vfs = capi.sqlite3_vfs;
+    const sqlite3_file = capi.sqlite3_file;
+    const sqlite3_io_methods = capi.sqlite3_io_methods;
+    const StructBinder = sqlite3.StructBinder;
+    const W = new Worker(options.proxyUri);
+    const workerOrigOnError = W.onrror;
+    W.onerror = function(err){
+      promiseReject(new Error("Loading OPFS async Worker failed for unknown reasons."));
+    };
+    const wMsg = (type,payload)=>W.postMessage({type,payload});
+
+    /**
+       State which we send to the async-api Worker or share with it.
+       This object must initially contain only cloneable or sharable
+       objects. After the worker's "inited" message arrives, other types
+       of data may be added to it.
+    */
+    const state = Object.create(null);
+    state.verbose = options.verbose;
+    state.fileBufferSize = 1024 * 64 + 8 /* size of fileHandle.sab. 64k = max sqlite3 page size */;
+    state.fbInt64Offset = state.fileBufferSize - 8 /*spot in fileHandle.sab to store an int64*/;
+    state.opIds = Object.create(null);
+    {
       let i = 0;
-      for(; i < nOut; ++i) heap[pOut + i] = (Math.random()*255000) & 0xFF;
-      return i;
+      state.opIds.xAccess = i++;
+      state.opIds.xClose = i++;
+      state.opIds.xDelete = i++;
+      state.opIds.xFileSize = i++;
+      state.opIds.xOpen = i++;
+      state.opIds.xRead = i++;
+      state.opIds.xSleep = i++;
+      state.opIds.xSync = i++;
+      state.opIds.xTruncate = i++;
+      state.opIds.xWrite = i++;
+      state.opSAB = new SharedArrayBuffer(i * 4/*sizeof int32*/);
+      /* The approach of using a single SAB to serialize comms for all
+         instances may(?) lead to deadlock situations in multi-db
+         cases. We should probably have one SAB here with a single slot
+         for locking a per-file initialization step and then allocate a
+         separate SAB like the above one for each file. That will
+         require a bit of acrobatics but should be feasible.
+      */
+    }
+
+    state.sq3Codes = Object.create(null);
+    state.sq3Codes._reverse = Object.create(null);
+    [ // SQLITE_xxx constants to export to the async worker counterpart...
+      'SQLITE_ERROR', 'SQLITE_IOERR',
+      'SQLITE_NOTFOUND', 'SQLITE_MISUSE',
+      'SQLITE_IOERR_READ', 'SQLITE_IOERR_SHORT_READ',
+      'SQLITE_IOERR_WRITE', 'SQLITE_IOERR_FSYNC',
+      'SQLITE_IOERR_TRUNCATE', 'SQLITE_IOERR_DELETE',
+      'SQLITE_IOERR_ACCESS', 'SQLITE_IOERR_CLOSE'
+    ].forEach(function(k){
+      state.sq3Codes[k] = capi[k] || toss("Maintenance required: not found:",k);
+      state.sq3Codes._reverse[capi[k]] = k;
     });
-  }
 
-  ////////////////////////////////////////////////////////////////////////
-  // Set up OPFS sqlite3_io_methods...
-  inst = installMethod(oIom);
-  inst('xClose', async function(pFile){
-    warn("xClose(",arguments,") uses await");
-    const f = __opfsHandles[pFile];
-    delete __opfsHandles[pFile];
-    if(f.opfsHandle){
-      await f.opfsHandle.close();
-      if(f.deleteOnClose){
-        // TODO
-      }
-    }
-    f.dispose();
-    return 0;
-  })
-  ('xRead', /*i(ppij)*/function(pFile,pDest,n,offset){
-    /* int (*xRead)(sqlite3_file*, void*, int iAmt, sqlite3_int64 iOfst) */
-    try {
-      const f = __opfsHandles[pFile];
-      const heap = wasm.heap8u();
-      const b = new Uint8Array(heap.buffer, pDest, n);
-      const nRead = f.opfsHandle.read(b, {at: offset});
-      if(nRead<n){
-        // MUST zero-fill short reads (per the docs)
-        heap.fill(0, dest + nRead, n - nRead);
-      }
-      return 0;
-    }catch(e){
-      error("xRead(",arguments,") failed:",e);
-      return capi.SQLITE_IOERR_READ;
-    }
-  })
-  ('xWrite', /*i(ppij)*/function(pFile,pSrc,n,offset){
-    /* int (*xWrite)(sqlite3_file*, const void*, int iAmt, sqlite3_int64 iOfst) */
-    try {
-      const f = __opfsHandles[pFile];
-      const b = new Uint8Array(wasm.heap8u().buffer, pSrc, n);
-      const nOut = f.opfsHandle.write(b, {at: offset});
-      if(nOut<n){
-        error("xWrite(",arguments,") short write!");
-        return capi.SQLITE_IOERR_WRITE;
-      }
-      return 0;
-    }catch(e){
-      error("xWrite(",arguments,") failed:",e);
-      return capi.SQLITE_IOERR_WRITE;
-    }
-  })
-  ('xTruncate', /*i(pj)*/async function(pFile,sz){
-    /* int (*xTruncate)(sqlite3_file*, sqlite3_int64 size) */
-    try{
-      warn("xTruncate(",arguments,") uses await");
-      const f = __opfsHandles[pFile];
-      await f.opfsHandle.truncate(sz);
-      return 0;
-    }
-    catch(e){
-      error("xTruncate(",arguments,") failed:",e);
-      return capi.SQLITE_IOERR_TRUNCATE;
-    }
-  })
-  ('xSync', /*i(pi)*/async function(pFile,flags){
-    /* int (*xSync)(sqlite3_file*, int flags) */
-    try {
-      warn("xSync(",arguments,") uses await");
-      const f = __opfsHandles[pFile];
-      await f.opfsHandle.flush();
-      return 0;
-    }catch(e){
-      error("xSync(",arguments,") failed:",e);
-      return capi.SQLITE_IOERR_SYNC;
-    }
-  })
-  ('xFileSize', /*i(pp)*/async function(pFile,pSz){
-    /* int (*xFileSize)(sqlite3_file*, sqlite3_int64 *pSize) */
-    try {
-      warn("xFileSize(",arguments,") uses await");
-      const f = __opfsHandles[pFile];
-      const fsz = await f.opfsHandle.getSize();
-      capi.wasm.setMemValue(pSz, fsz,'i64');
-      return 0;
-    }catch(e){
-      error("xFileSize(",arguments,") failed:",e);
-      return capi.SQLITE_IOERR_SEEK;
-    }
-  })
-  ('xLock', /*i(pi)*/function(pFile,lockType){
-    /* int (*xLock)(sqlite3_file*, int) */
-    // Opening a handle locks it automatically.
-    warn("xLock(",arguments,") is a no-op");
-    return 0;
-  })
-  ('xUnlock', /*i(pi)*/function(pFile,lockType){
-    /* int (*xUnlock)(sqlite3_file*, int) */
-    // Opening a handle locks it automatically.
-    warn("xUnlock(",arguments,") is a no-op");
-    return 0;
-  })
-  ('xCheckReservedLock', /*i(pp)*/function(pFile,pOut){
-    /* int (*xCheckReservedLock)(sqlite3_file*, int *pResOut) */
-    // Exclusive lock is automatically acquired when opened
-    warn("xCheckReservedLock(",arguments,") is a no-op");
-    wasm.setMemValue(pOut,1,'i32');
-    return 0;
-  })
-  ('xFileControl', /*i(pip)*/function(pFile,op,pArg){
-    /* int (*xFileControl)(sqlite3_file*, int op, void *pArg) */
-    debug("xFileControl(",arguments,") is a no-op");
-    return capi.SQLITE_NOTFOUND;
-  })
-  ('xDeviceCharacteristics',/*i(p)*/function(pFile){
-    /* int (*xDeviceCharacteristics)(sqlite3_file*) */
-    debug("xDeviceCharacteristics(",pFile,")");
-    return capi.SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN;
-  });
-  // xSectorSize may be NULL
-  //('xSectorSize', function(pFile){
-  //  /* int (*xSectorSize)(sqlite3_file*) */
-  //  log("xSectorSize(",pFile,")");
-  //  return 4096 /* ==> SQLITE_DEFAULT_SECTOR_SIZE */;
-  //})
+    const isWorkerErrCode = (n)=>!!state.sq3Codes._reverse[n];
+    const opStore = (op,val=-1)=>Atomics.store(state.opSABView, state.opIds[op], val);
+    const opWait = (op,val=-1)=>Atomics.wait(state.opSABView, state.opIds[op], val);
 
-  const rc = capi.sqlite3_vfs_register(oVfs.pointer, 0);
-  if(rc){
-    oVfs.dispose();
-    toss("sqlite3_vfs_register(OPFS) failed with rc",rc);
-  }
-  capi.sqlite3_vfs_register.addReference(oVfs, oIom);
-  warn("End of (very incomplete) OPFS setup.", oVfs);
-  //oVfs.dispose()/*only because we can't yet do anything with it*/;
-});
+    /**
+       Runs the given operation in the async worker counterpart, waits
+       for its response, and returns the result which the async worker
+       writes to the given op's index in state.opSABView. The 2nd argument
+       must be a single object or primitive value, depending on the
+       given operation's signature in the async API counterpart.
+    */
+    const opRun = (op,args)=>{
+      opStore(op);
+      wMsg(op, args);
+      opWait(op);
+      return Atomics.load(state.opSABView, state.opIds[op]);
+    };
+
+    /**
+       Generates a random ASCII string len characters long, intended for
+       use as a temporary file name.
+    */
+    const randomFilename = function f(len=16){
+      if(!f._chars){
+        f._chars = "abcdefghijklmnopqrstuvwxyz"+
+          "ABCDEFGHIJKLMNOPQRSTUVWXYZ"+
+          "012346789";
+        f._n = f._chars.length;
+      }
+      const a = [];
+      let i = 0;
+      for( ; i < len; ++i){
+        const ndx = Math.random() * (f._n * 64) % f._n | 0;
+        a[i] = f._chars[ndx];
+      }
+      return a.join('');
+    };
+
+    /**
+       Map of sqlite3_file pointers to objects constructed by xOpen().
+    */
+    const __openFiles = Object.create(null);
+    
+    const pDVfs = capi.sqlite3_vfs_find(null)/*pointer to default VFS*/;
+    const dVfs = pDVfs
+          ? new sqlite3_vfs(pDVfs)
+          : null /* dVfs will be null when sqlite3 is built with
+                    SQLITE_OS_OTHER. Though we cannot currently handle
+                    that case, the hope is to eventually be able to. */;
+    const opfsVfs = new sqlite3_vfs();
+    const opfsIoMethods = new sqlite3_io_methods();
+    opfsVfs.$iVersion = 2/*yes, two*/;
+    opfsVfs.$szOsFile = capi.sqlite3_file.structInfo.sizeof;
+    opfsVfs.$mxPathname = 1024/*sure, why not?*/;
+    opfsVfs.$zName = wasm.allocCString("opfs");
+    // All C-side memory of opfsVfs is zeroed out, but just to be explicit:
+    opfsVfs.$xDlOpen = opfsVfs.$xDlError = opfsVfs.$xDlSym = opfsVfs.$xDlClose = null;
+    opfsVfs.ondispose = [
+      '$zName', opfsVfs.$zName,
+      'cleanup default VFS wrapper', ()=>(dVfs ? dVfs.dispose() : null),
+      'cleanup opfsIoMethods', ()=>opfsIoMethods.dispose()
+    ];
+    if(dVfs){
+      opfsVfs.$xSleep = dVfs.$xSleep;
+      opfsVfs.$xRandomness = dVfs.$xRandomness;
+    }
+    /**
+       Pedantic sidebar about opfsVfs.ondispose: the entries in that array
+       are items to clean up when opfsVfs.dispose() is called, but in this
+       environment it will never be called. The VFS instance simply
+       hangs around until the WASM module instance is cleaned up. We
+       "could" _hypothetically_ clean it up by "importing" an
+       sqlite3_os_end() impl into the wasm build, but the shutdown order
+       of the wasm engine and the JS one are undefined so there is no
+       guaranty that the opfsVfs instance would be available in one
+       environment or the other when sqlite3_os_end() is called (_if_ it
+       gets called at all in a wasm build, which is undefined).
+    */
+
+    /**
+       Installs a StructBinder-bound function pointer member of the
+       given name and function in the given StructType target object.
+       It creates a WASM proxy for the given function and arranges for
+       that proxy to be cleaned up when tgt.dispose() is called.  Throws
+       on the slightest hint of error (e.g. tgt is-not-a StructType,
+       name does not map to a struct-bound member, etc.).
+
+       Returns a proxy for this function which is bound to tgt and takes
+       2 args (name,func). That function returns the same thing,
+       permitting calls to be chained.
+
+       If called with only 1 arg, it has no side effects but returns a
+       func with the same signature as described above.
+    */
+    const installMethod = function callee(tgt, name, func){
+      if(!(tgt instanceof StructBinder.StructType)){
+        toss("Usage error: target object is-not-a StructType.");
+      }
+      if(1===arguments.length){
+        return (n,f)=>callee(tgt,n,f);
+      }
+      if(!callee.argcProxy){
+        callee.argcProxy = function(func,sig){
+          return function(...args){
+            if(func.length!==arguments.length){
+              toss("Argument mismatch. Native signature is:",sig);
+            }
+            return func.apply(this, args);
+          }
+        };
+        callee.removeFuncList = function(){
+          if(this.ondispose.__removeFuncList){
+            this.ondispose.__removeFuncList.forEach(
+              (v,ndx)=>{
+                if('number'===typeof v){
+                  try{wasm.uninstallFunction(v)}
+                  catch(e){/*ignore*/}
+                }
+                /* else it's a descriptive label for the next number in
+                   the list. */
+              }
+            );
+            delete this.ondispose.__removeFuncList;
+          }
+        };
+      }/*static init*/
+      const sigN = tgt.memberSignature(name);
+      if(sigN.length<2){
+        toss("Member",name," is not a function pointer. Signature =",sigN);
+      }
+      const memKey = tgt.memberKey(name);
+      //log("installMethod",tgt, name, sigN);
+      const fProxy = 1
+      // We can remove this proxy middle-man once the VFS is working
+            ? callee.argcProxy(func, sigN)
+            : func;
+      const pFunc = wasm.installFunction(fProxy, tgt.memberSignature(name, true));
+      tgt[memKey] = pFunc;
+      if(!tgt.ondispose) tgt.ondispose = [];
+      if(!tgt.ondispose.__removeFuncList){
+        tgt.ondispose.push('ondispose.__removeFuncList handler',
+                           callee.removeFuncList);
+        tgt.ondispose.__removeFuncList = [];
+      }
+      tgt.ondispose.__removeFuncList.push(memKey, pFunc);
+      return (n,f)=>callee(tgt, n, f);
+    }/*installMethod*/;
+    
+    /**
+       Impls for the sqlite3_io_methods methods. Maintenance reminder:
+       members are in alphabetical order to simplify finding them.
+    */
+    const ioSyncWrappers = {
+      xCheckReservedLock: function(pFile,pOut){
+        // Exclusive lock is automatically acquired when opened
+        //warn("xCheckReservedLock(",arguments,") is a no-op");
+        wasm.setMemValue(pOut,1,'i32');
+        return 0;
+      },
+      xClose: function(pFile){
+        let rc = 0;
+        const f = __openFiles[pFile];
+        if(f){
+          delete __openFiles[pFile];
+          rc = opRun('xClose', pFile);
+          if(f.sq3File) f.sq3File.dispose();
+        }
+        return rc;
+      },
+      xDeviceCharacteristics: function(pFile){
+        //debug("xDeviceCharacteristics(",pFile,")");
+        return capi.SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN;
+      },
+      xFileControl: function(pFile,op,pArg){
+        //debug("xFileControl(",arguments,") is a no-op");
+        return capi.SQLITE_NOTFOUND;
+      },
+      xFileSize: function(pFile,pSz64){
+        const rc = opRun('xFileSize', pFile);
+        if(!isWorkerErrCode(rc)){
+          const f = __openFiles[pFile];
+          wasm.setMemValue(pSz64, f.sabViewFileSize.getBigInt64(0) ,'i64');
+        }
+        return rc;
+      },
+      xLock: function(pFile,lockType){
+        //2022-09: OPFS handles lock when opened
+        //warn("xLock(",arguments,") is a no-op");
+        return 0;
+      },
+      xRead: function(pFile,pDest,n,offset){
+        /* int (*xRead)(sqlite3_file*, void*, int iAmt, sqlite3_int64 iOfst) */
+        const f = __openFiles[pFile];
+        let rc;
+        try {
+          // FIXME(?): block until we finish copying the xRead result buffer. How?
+          rc = opRun('xRead',{fid:pFile, n, offset});
+          if(0!==rc) return rc;
+          let i = 0;
+          for(; i < n; ++i) wasm.setMemValue(pDest + i, f.sabView[i]);
+        }catch(e){
+          error("xRead(",arguments,") failed:",e,f);
+          rc = capi.SQLITE_IOERR_READ;
+        }
+        return rc;
+      },
+      xSync: function(pFile,flags){
+        return opRun('xSync', {fid:pFile, flags});
+      },
+      xTruncate: function(pFile,sz64){
+        return opRun('xTruncate', {fid:pFile, size: sz64});
+      },
+      xUnlock: function(pFile,lockType){
+        //2022-09: OPFS handles lock when opened
+        //warn("xUnlock(",arguments,") is a no-op");
+        return 0;
+      },
+      xWrite: function(pFile,pSrc,n,offset){
+        /* int (*xWrite)(sqlite3_file*, const void*, int iAmt, sqlite3_int64 iOfst) */
+        const f = __openFiles[pFile];
+        try {
+          let i = 0;
+          // FIXME(?): block from here until we finish the xWrite. How?
+          for(; i < n; ++i) f.sabView[i] = wasm.getMemValue(pSrc+i);
+          return opRun('xWrite',{fid:pFile, n, offset});
+        }catch(e){
+          error("xWrite(",arguments,") failed:",e,f);
+          return capi.SQLITE_IOERR_WRITE;
+        }
+      }
+    }/*ioSyncWrappers*/;
+    
+    /**
+       Impls for the sqlite3_vfs methods. Maintenance reminder: members
+       are in alphabetical order to simplify finding them.
+    */
+    const vfsSyncWrappers = {
+      xAccess: function(pVfs,zName,flags,pOut){
+        const rc = opRun('xAccess', wasm.cstringToJs(zName));
+        wasm.setMemValue(pOut, rc ? 0 : 1, 'i32');
+        return 0;
+      },
+      xCurrentTime: function(pVfs,pOut){
+        /* If it turns out that we need to adjust for timezone, see:
+           https://stackoverflow.com/a/11760121/1458521 */
+        wasm.setMemValue(pOut, 2440587.5 + (new Date().getTime()/86400000),
+                         'double');
+        return 0;
+      },
+      xCurrentTimeInt64: function(pVfs,pOut){
+        // TODO: confirm that this calculation is correct
+        wasm.setMemValue(pOut, (2440587.5 * 86400000) + new Date().getTime(),
+                         'i64');
+        return 0;
+      },
+      xDelete: function(pVfs, zName, doSyncDir){
+        return opRun('xDelete', {filename: wasm.cstringToJs(zName), syncDir: doSyncDir});
+      },
+      xFullPathname: function(pVfs,zName,nOut,pOut){
+        /* Until/unless we have some notion of "current dir"
+           in OPFS, simply copy zName to pOut... */
+        const i = wasm.cstrncpy(pOut, zName, nOut);
+        return i<nOut ? 0 : capi.SQLITE_CANTOPEN
+        /*CANTOPEN is required by the docs but SQLITE_RANGE would be a closer match*/;
+      },
+      xGetLastError: function(pVfs,nOut,pOut){
+        /* TODO: store exception.message values from the async
+           partner in a dedicated SharedArrayBuffer, noting that we'd have
+           to encode them... TextEncoder can do that for us. */
+        warn("OPFS xGetLastError() has nothing sensible to return.");
+        return 0;
+      },
+      xOpen: function f(pVfs, zName, pFile, flags, pOutFlags){
+        if(!f._){
+          f._ = {
+            fileTypes: {
+              SQLITE_OPEN_MAIN_DB: 'mainDb',
+              SQLITE_OPEN_MAIN_JOURNAL: 'mainJournal',
+              SQLITE_OPEN_TEMP_DB: 'tempDb',
+              SQLITE_OPEN_TEMP_JOURNAL: 'tempJournal',
+              SQLITE_OPEN_TRANSIENT_DB: 'transientDb',
+              SQLITE_OPEN_SUBJOURNAL: 'subjournal',
+              SQLITE_OPEN_SUPER_JOURNAL: 'superJournal',
+              SQLITE_OPEN_WAL: 'wal'
+            },
+            getFileType: function(filename,oflags){
+              const ft = f._.fileTypes;
+              for(let k of Object.keys(ft)){
+                if(oflags & capi[k]) return ft[k];
+              }
+              warn("Cannot determine fileType based on xOpen() flags for file",filename);
+              return '???';
+            }
+          };
+        }
+        if(0===zName){
+          zName = randomFilename();
+        }else if('number'===typeof zName){
+          zName = wasm.cstringToJs(zName);
+        }
+        const args = Object.create(null);
+        args.fid = pFile;
+        args.filename = zName;
+        args.sab = new SharedArrayBuffer(state.fileBufferSize);
+        args.fileType = f._.getFileType(args.filename, flags);
+        args.create = !!(flags & capi.SQLITE_OPEN_CREATE);
+        args.deleteOnClose = !!(flags & capi.SQLITE_OPEN_DELETEONCLOSE);
+        args.readOnly = !!(flags & capi.SQLITE_OPEN_READONLY);
+        const rc = opRun('xOpen', args);
+        if(!rc){
+          /* Recall that sqlite3_vfs::xClose() will be called, even on
+             error, unless pFile->pMethods is NULL. */
+          if(args.readOnly){
+            wasm.setMemValue(pOutFlags, capi.SQLITE_OPEN_READONLY, 'i32');
+          }
+          __openFiles[pFile] = args;
+          args.sabView = new Uint8Array(args.sab);
+          args.sabViewFileSize = new DataView(args.sab, state.fbInt64Offset, 8);
+          args.sq3File = new sqlite3_file(pFile);
+          args.sq3File.$pMethods = opfsIoMethods.pointer;
+          args.ba = new Uint8Array(args.sab);
+        }
+        return rc;
+      }/*xOpen()*/
+    }/*vfsSyncWrappers*/;
+
+    if(!opfsVfs.$xRandomness){
+      /* If the default VFS has no xRandomness(), add a basic JS impl... */
+      vfsSyncWrappers.xRandomness = function(pVfs, nOut, pOut){
+        const heap = wasm.heap8u();
+        let i = 0;
+        for(; i < nOut; ++i) heap[pOut + i] = (Math.random()*255000) & 0xFF;
+        return i;
+      };
+    }
+    if(!opfsVfs.$xSleep){
+      /* If we can inherit an xSleep() impl from the default VFS then
+         use it, otherwise install one which is certainly less accurate
+         because it has to go round-trip through the async worker, but
+         provides the only option for a synchronous sleep() in JS. */
+      vfsSyncWrappers.xSleep = (pVfs,ms)=>opRun('xSleep',ms);
+    }
+
+    /* Install the vfs/io_methods into their C-level shared instances... */
+    let inst = installMethod(opfsIoMethods);
+    for(let k of Object.keys(ioSyncWrappers)) inst(k, ioSyncWrappers[k]);
+    inst = installMethod(opfsVfs);
+    for(let k of Object.keys(vfsSyncWrappers)) inst(k, vfsSyncWrappers[k]);
+    
+    const sanityCheck = async function(){
+      const scope = wasm.scopedAllocPush();
+      const sq3File = new sqlite3_file();
+      try{
+        const fid = sq3File.pointer;
+        const openFlags = capi.SQLITE_OPEN_CREATE
+              | capi.SQLITE_OPEN_READWRITE
+        //| capi.SQLITE_OPEN_DELETEONCLOSE
+              | capi.SQLITE_OPEN_MAIN_DB;
+        const pOut = wasm.scopedAlloc(8);
+        const dbFile = "/sanity/check/file";
+        const zDbFile = wasm.scopedAllocCString(dbFile);
+        let rc;
+        vfsSyncWrappers.xAccess(opfsVfs.pointer, zDbFile, 0, pOut);
+        rc = wasm.getMemValue(pOut,'i32');
+        log("xAccess(",dbFile,") exists ?=",rc);
+        rc = vfsSyncWrappers.xOpen(opfsVfs.pointer, zDbFile,
+                                   fid, openFlags, pOut);
+        log("open rc =",rc,"state.opSABView[xOpen] =",state.opSABView[state.opIds.xOpen]);
+        if(isWorkerErrCode(rc)){
+          error("open failed with code",rc);
+          return;
+        }
+        vfsSyncWrappers.xAccess(opfsVfs.pointer, zDbFile, 0, pOut);
+        rc = wasm.getMemValue(pOut,'i32');
+        if(!rc) toss("xAccess() failed to detect file.");
+        rc = ioSyncWrappers.xSync(sq3File.pointer, 0);
+        if(rc) toss('sync failed w/ rc',rc);
+        rc = ioSyncWrappers.xTruncate(sq3File.pointer, 1024);
+        if(rc) toss('truncate failed w/ rc',rc);
+        wasm.setMemValue(pOut,0,'i64');
+        rc = ioSyncWrappers.xFileSize(sq3File.pointer, pOut);
+        if(rc) toss('xFileSize failed w/ rc',rc);
+        log("xFileSize says:",wasm.getMemValue(pOut, 'i64'));
+        rc = ioSyncWrappers.xWrite(sq3File.pointer, zDbFile, 10, 1);
+        if(rc) toss("xWrite() failed!");
+        const readBuf = wasm.scopedAlloc(16);
+        rc = ioSyncWrappers.xRead(sq3File.pointer, readBuf, 6, 2);
+        wasm.setMemValue(readBuf+6,0);
+        let jRead = wasm.cstringToJs(readBuf);
+        log("xRead() got:",jRead);
+        if("sanity"!==jRead) toss("Unexpected xRead() value.");
+        log("xSleep()ing before close()ing...");
+        opRun('xSleep',1000);
+        rc = ioSyncWrappers.xClose(fid);
+        log("xClose rc =",rc,"opSABView =",state.opSABView);
+        log("Deleting file:",dbFile);
+        vfsSyncWrappers.xDelete(opfsVfs.pointer, zDbFile, 0x1234);
+        vfsSyncWrappers.xAccess(opfsVfs.pointer, zDbFile, 0, pOut);
+        rc = wasm.getMemValue(pOut,'i32');
+        if(rc) toss("Expecting 0 from xAccess(",dbFile,") after xDelete().");
+      }finally{
+        sq3File.dispose();
+        wasm.scopedAllocPop(scope);
+      }
+    }/*sanityCheck()*/;
+
+    W.onmessage = function({data}){
+      //log("Worker.onmessage:",data);
+      switch(data.type){
+          case 'loaded':
+            /*Pass our config and shared state on to the async worker.*/
+            wMsg('init',state);
+            break;
+          case 'inited':{
+            /*Indicates that the async partner has received the 'init',
+              so we now know that the state object is no longer subject to
+              being copied by a pending postMessage() call.*/
+            try {
+              const rc = capi.sqlite3_vfs_register(opfsVfs.pointer, opfsVfs.$zName);
+              if(rc){
+                opfsVfs.dispose();
+                toss("sqlite3_vfs_register(OPFS) failed with rc",rc);
+              }
+              if(opfsVfs.pointer !== capi.sqlite3_vfs_find("opfs")){
+                toss("BUG: sqlite3_vfs_find() failed for just-installed OPFS VFS");
+              }
+              capi.sqlite3_vfs_register.addReference(opfsVfs, opfsIoMethods);
+              state.opSABView = new Int32Array(state.opSAB);
+              if(options.sanityChecks){
+                warn("Running sanity checks because of opfs-sanity-check URL arg...");
+                sanityCheck();
+              }
+              W.onerror = workerOrigOnError;
+              promiseResolve(sqlite3);
+              log("End of OPFS sqlite3_vfs setup.", opfsVfs);
+            }catch(e){
+              error(e);
+              promiseReject(e);
+            }
+            break;
+          }
+          default:
+            promiseReject(e);
+            error("Unexpected message from the async worker:",data);
+            break;
+      }
+    };
+  })/*thePromise*/;
+  return thePromise;
+}/*installOpfsVfs()*/;
+sqlite3.installOpfsVfs.defaultProxyUri = "sqlite3-opfs-async-proxy.js";
+}/*sqlite3ApiBootstrap.initializers.push()*/);
diff --git a/ext/wasm/x-sync-async.js b/ext/wasm/x-sync-async.js
index 203c8eece4..b25f5a2681 100644
--- a/ext/wasm/x-sync-async.js
+++ b/ext/wasm/x-sync-async.js
@@ -10,11 +10,7 @@
 
   ***********************************************************************
 
-  An INCOMPLETE and UNDER CONSTRUCTION experiment for OPFS.
-  This file holds the synchronous half of an sqlite3_vfs
-  implementation which proxies, in a synchronous fashion, the
-  asynchronous OPFS APIs using a second Worker, implemented
-  in sqlite3-opfs-async-proxy.js.
+  A testing ground for the OPFS VFS.
 
   Summary of how this works:
 
@@ -23,18 +19,12 @@
   conventional sqlite3_vfs (except that it's implemented in JS). The
   methods which require OPFS APIs use a separate worker (hereafter called the
   OPFS worker) to access that functionality. This worker and that one
-  use SharedBufferArray
+  use SharedArrayBuffer.
 */
 'use strict';
-/**
-   This function is a placeholder for use in development. When
-   working, this will be moved into a file named
-   api/sqlite3-api-opfs.js, or similar, and hooked in to the
-   sqlite-api build construct.
-*/
-const initOpfsVfs = function(sqlite3){
+const tryOpfsVfs = function(sqlite3){
   const toss = function(...args){throw new Error(args.join(' '))};
-  const logPrefix = "OPFS syncer:";
+  const logPrefix = "OPFS tester:";
   const log = (...args)=>{
     console.log(logPrefix,...args);
   };
@@ -44,518 +34,20 @@ const initOpfsVfs = function(sqlite3){
   const error =  (...args)=>{
     console.error(logPrefix,...args);
   };
-
-  if(self.window===self ||
-     !self.SharedArrayBuffer ||
-     !self.FileSystemHandle ||
-     !self.FileSystemDirectoryHandle ||
-     !self.FileSystemFileHandle ||
-     !self.FileSystemFileHandle.prototype.createSyncAccessHandle ||
-     !navigator.storage.getDirectory){
-    warn("This environment does not have OPFS support.");
-    return;
-  }
-  warn("This file is very much experimental and under construction.",self.location.pathname);
+  log("tryOpfsVfs()");
   const capi = sqlite3.capi;
-  const wasm = capi.wasm;
-  const sqlite3_vfs = capi.sqlite3_vfs
-        || toss("Missing sqlite3.capi.sqlite3_vfs object.");
-  const sqlite3_file = capi.sqlite3_file
-        || toss("Missing sqlite3.capi.sqlite3_file object.");
-  const sqlite3_io_methods = capi.sqlite3_io_methods
-        || toss("Missing sqlite3.capi.sqlite3_io_methods object.");
-  const StructBinder = sqlite3.StructBinder || toss("Missing sqlite3.StructBinder.");
-  const thisUrl = new URL(self.location.href);
-
-  const W = new Worker("sqlite3-opfs-async-proxy.js");
-  const wMsg = (type,payload)=>W.postMessage({type,payload});
-
-  /**
-     State which we send to the async-api Worker or share with it.
-     This object must initially contain only cloneable or sharable
-     objects. After the worker's "inited" message arrives, other types
-     of data may be added to it.
-  */
-  const state = Object.create(null);
-  state.verbose = thisUrl.searchParams.has('opfs-verbose') ? 3 : 2;
-  state.fileBufferSize = 1024 * 64 + 8 /* size of fileHandle.sab. 64k = max sqlite3 page size */;
-  state.fbInt64Offset = state.fileBufferSize - 8 /*spot in fileHandle.sab to store an int64*/;
-  state.opIds = Object.create(null);
-  {
-    let i = 0;
-    state.opIds.xAccess = i++;
-    state.opIds.xClose = i++;
-    state.opIds.xDelete = i++;
-    state.opIds.xFileSize = i++;
-    state.opIds.xOpen = i++;
-    state.opIds.xRead = i++;
-    state.opIds.xSleep = i++;
-    state.opIds.xSync = i++;
-    state.opIds.xTruncate = i++;
-    state.opIds.xWrite = i++;
-    state.opSAB = new SharedArrayBuffer(i * 4/*sizeof int32*/);
-  }
-
-  state.sq3Codes = Object.create(null);
-  state.sq3Codes._reverse = Object.create(null);
-  [ // SQLITE_xxx constants to export to the async worker counterpart...
-    'SQLITE_ERROR', 'SQLITE_IOERR',
-    'SQLITE_NOTFOUND', 'SQLITE_MISUSE',
-    'SQLITE_IOERR_READ', 'SQLITE_IOERR_SHORT_READ',
-    'SQLITE_IOERR_WRITE', 'SQLITE_IOERR_FSYNC',
-    'SQLITE_IOERR_TRUNCATE', 'SQLITE_IOERR_DELETE',
-    'SQLITE_IOERR_ACCESS', 'SQLITE_IOERR_CLOSE'
-  ].forEach(function(k){
-    state.sq3Codes[k] = capi[k] || toss("Maintenance required: not found:",k);
-    state.sq3Codes._reverse[capi[k]] = k;
-  });
-
-  const isWorkerErrCode = (n)=>!!state.sq3Codes._reverse[n];
-  const opStore = (op,val=-1)=>Atomics.store(state.opSABView, state.opIds[op], val);
-  const opWait = (op,val=-1)=>Atomics.wait(state.opSABView, state.opIds[op], val);
-
-  /**
-     Runs the given operation in the async worker counterpart, waits
-     for its response, and returns the result which the async worker
-     writes to the given op's index in state.opSABView. The 2nd argument
-     must be a single object or primitive value, depending on the
-     given operation's signature in the async API counterpart.
-  */
-  const opRun = (op,args)=>{
-    opStore(op);
-    wMsg(op, args);
-    opWait(op);
-    return Atomics.load(state.opSABView, state.opIds[op]);
-  };
-
-  /**
-     Generates a random ASCII string len characters long, intended for
-     use as a temporary file name.
-  */
-  const randomFilename = function f(len=16){
-    if(!f._chars){
-      f._chars = "abcdefghijklmnopqrstuvwxyz"+
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZ"+
-        "012346789";
-      f._n = f._chars.length;
-    }
-    const a = [];
-    let i = 0;
-    for( ; i < len; ++i){
-      const ndx = Math.random() * (f._n * 64) % f._n | 0;
-      a[i] = f._chars[ndx];
-    }
-    return a.join('');
-  };
-
-  /**
-     Map of sqlite3_file pointers to objects constructed by xOpen().
-  */
-  const __openFiles = Object.create(null);
-  
-  const pDVfs = capi.sqlite3_vfs_find(null)/*pointer to default VFS*/;
-  const dVfs = pDVfs
-        ? new sqlite3_vfs(pDVfs)
-        : null /* dVfs will be null when sqlite3 is built with
-                  SQLITE_OS_OTHER. Though we cannot currently handle
-                  that case, the hope is to eventually be able to. */;
-  const opfsVfs = new sqlite3_vfs();
-  const opfsIoMethods = new sqlite3_io_methods();
-  opfsVfs.$iVersion = 2/*yes, two*/;
-  opfsVfs.$szOsFile = capi.sqlite3_file.structInfo.sizeof;
-  opfsVfs.$mxPathname = 1024/*sure, why not?*/;
-  opfsVfs.$zName = wasm.allocCString("opfs");
-  // All C-side memory of opfsVfs is zeroed out, but just to be explicit:
-  opfsVfs.$xDlOpen = opfsVfs.$xDlError = opfsVfs.$xDlSym = opfsVfs.$xDlClose = null;
-  opfsVfs.ondispose = [
-    '$zName', opfsVfs.$zName,
-    'cleanup default VFS wrapper', ()=>(dVfs ? dVfs.dispose() : null),
-    'cleanup opfsIoMethods', ()=>opfsIoMethods.dispose()
-  ];
-  if(dVfs){
-    opfsVfs.$xSleep = dVfs.$xSleep;
-    opfsVfs.$xRandomness = dVfs.$xRandomness;
-  }
-  /**
-     Pedantic sidebar about opfsVfs.ondispose: the entries in that array
-     are items to clean up when opfsVfs.dispose() is called, but in this
-     environment it will never be called. The VFS instance simply
-     hangs around until the WASM module instance is cleaned up. We
-     "could" _hypothetically_ clean it up by "importing" an
-     sqlite3_os_end() impl into the wasm build, but the shutdown order
-     of the wasm engine and the JS one are undefined so there is no
-     guaranty that the opfsVfs instance would be available in one
-     environment or the other when sqlite3_os_end() is called (_if_ it
-     gets called at all in a wasm build, which is undefined).
-  */
-
-  /**
-     Installs a StructBinder-bound function pointer member of the
-     given name and function in the given StructType target object.
-     It creates a WASM proxy for the given function and arranges for
-     that proxy to be cleaned up when tgt.dispose() is called.  Throws
-     on the slightest hint of error (e.g. tgt is-not-a StructType,
-     name does not map to a struct-bound member, etc.).
-
-     Returns a proxy for this function which is bound to tgt and takes
-     2 args (name,func). That function returns the same thing,
-     permitting calls to be chained.
-
-     If called with only 1 arg, it has no side effects but returns a
-     func with the same signature as described above.
-  */
-  const installMethod = function callee(tgt, name, func){
-    if(!(tgt instanceof StructBinder.StructType)){
-      toss("Usage error: target object is-not-a StructType.");
-    }
-    if(1===arguments.length){
-      return (n,f)=>callee(tgt,n,f);
-    }
-    if(!callee.argcProxy){
-      callee.argcProxy = function(func,sig){
-        return function(...args){
-          if(func.length!==arguments.length){
-            toss("Argument mismatch. Native signature is:",sig);
-          }
-          return func.apply(this, args);
-        }
-      };
-      callee.removeFuncList = function(){
-        if(this.ondispose.__removeFuncList){
-          this.ondispose.__removeFuncList.forEach(
-            (v,ndx)=>{
-              if('number'===typeof v){
-                try{wasm.uninstallFunction(v)}
-                catch(e){/*ignore*/}
-              }
-              /* else it's a descriptive label for the next number in
-                 the list. */
-            }
-          );
-          delete this.ondispose.__removeFuncList;
-        }
-      };
-    }/*static init*/
-    const sigN = tgt.memberSignature(name);
-    if(sigN.length<2){
-      toss("Member",name," is not a function pointer. Signature =",sigN);
-    }
-    const memKey = tgt.memberKey(name);
-    //log("installMethod",tgt, name, sigN);
-    const fProxy = 1
-          // We can remove this proxy middle-man once the VFS is working
-          ? callee.argcProxy(func, sigN)
-          : func;
-    const pFunc = wasm.installFunction(fProxy, tgt.memberSignature(name, true));
-    tgt[memKey] = pFunc;
-    if(!tgt.ondispose) tgt.ondispose = [];
-    if(!tgt.ondispose.__removeFuncList){
-      tgt.ondispose.push('ondispose.__removeFuncList handler',
-                         callee.removeFuncList);
-      tgt.ondispose.__removeFuncList = [];
-    }
-    tgt.ondispose.__removeFuncList.push(memKey, pFunc);
-    return (n,f)=>callee(tgt, n, f);
-  }/*installMethod*/;
-  
-  /**
-     Impls for the sqlite3_io_methods methods. Maintenance reminder:
-     members are in alphabetical order to simplify finding them.
-  */
-  const ioSyncWrappers = {
-    xCheckReservedLock: function(pFile,pOut){
-      // Exclusive lock is automatically acquired when opened
-      //warn("xCheckReservedLock(",arguments,") is a no-op");
-      wasm.setMemValue(pOut,1,'i32');
-      return 0;
-    },
-    xClose: function(pFile){
-      let rc = 0;
-      const f = __openFiles[pFile];
-      if(f){
-        delete __openFiles[pFile];
-        rc = opRun('xClose', pFile);
-        if(f.sq3File) f.sq3File.dispose();
-      }
-      return rc;
-    },
-    xDeviceCharacteristics: function(pFile){
-      //debug("xDeviceCharacteristics(",pFile,")");
-      return capi.SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN;
-    },
-    xFileControl: function(pFile,op,pArg){
-      //debug("xFileControl(",arguments,") is a no-op");
-      return capi.SQLITE_NOTFOUND;
-    },
-    xFileSize: function(pFile,pSz64){
-      const rc = opRun('xFileSize', pFile);
-      if(!isWorkerErrCode(rc)){
-        const f = __openFiles[pFile];
-        wasm.setMemValue(pSz64, f.sabViewFileSize.getBigInt64(0) ,'i64');
-      }
-      return rc;
-    },
-    xLock: function(pFile,lockType){
-      //2022-09: OPFS handles lock when opened
-      //warn("xLock(",arguments,") is a no-op");
-      return 0;
-    },
-    xRead: function(pFile,pDest,n,offset){
-      /* int (*xRead)(sqlite3_file*, void*, int iAmt, sqlite3_int64 iOfst) */
-      const f = __openFiles[pFile];
-      let rc;
-      try {
-        // FIXME(?): block until we finish copying the xRead result buffer. How?
-        rc = opRun('xRead',{fid:pFile, n, offset});
-        if(0!==rc) return rc;
-        let i = 0;
-        for(; i < n; ++i) wasm.setMemValue(pDest + i, f.sabView[i]);
-      }catch(e){
-        error("xRead(",arguments,") failed:",e,f);
-        rc = capi.SQLITE_IOERR_READ;
-      }
-      return rc;
-    },
-    xSync: function(pFile,flags){
-      return opRun('xSync', {fid:pFile, flags});
-    },
-    xTruncate: function(pFile,sz64){
-      return opRun('xTruncate', {fid:pFile, size: sz64});
-    },
-    xUnlock: function(pFile,lockType){
-      //2022-09: OPFS handles lock when opened
-      //warn("xUnlock(",arguments,") is a no-op");
-      return 0;
-    },
-    xWrite: function(pFile,pSrc,n,offset){
-    /* int (*xWrite)(sqlite3_file*, const void*, int iAmt, sqlite3_int64 iOfst) */
-      const f = __openFiles[pFile];
-      try {
-        let i = 0;
-        // FIXME(?): block from here until we finish the xWrite. How?
-        for(; i < n; ++i) f.sabView[i] = wasm.getMemValue(pSrc+i);
-        return opRun('xWrite',{fid:pFile, n, offset});
-      }catch(e){
-        error("xWrite(",arguments,") failed:",e,f);
-        return capi.SQLITE_IOERR_WRITE;
-      }
-    }
-  }/*ioSyncWrappers*/;
-  
-  /**
-     Impls for the sqlite3_vfs methods. Maintenance reminder: members
-     are in alphabetical order to simplify finding them.
-  */
-  const vfsSyncWrappers = {
-    xAccess: function(pVfs,zName,flags,pOut){
-      const rc = opRun('xAccess', wasm.cstringToJs(zName));
-      wasm.setMemValue(pOut, rc ? 0 : 1, 'i32');
-      return 0;
-    },
-    xCurrentTime: function(pVfs,pOut){
-      /* If it turns out that we need to adjust for timezone, see:
-         https://stackoverflow.com/a/11760121/1458521 */
-      wasm.setMemValue(pOut, 2440587.5 + (new Date().getTime()/86400000),
-                       'double');
-      return 0;
-    },
-    xCurrentTimeInt64: function(pVfs,pOut){
-      // TODO: confirm that this calculation is correct
-      wasm.setMemValue(pOut, (2440587.5 * 86400000) + new Date().getTime(),
-                       'i64');
-      return 0;
-    },
-    xDelete: function(pVfs, zName, doSyncDir){
-      return opRun('xDelete', {filename: wasm.cstringToJs(zName), syncDir: doSyncDir});
-    },
-    xFullPathname: function(pVfs,zName,nOut,pOut){
-      /* Until/unless we have some notion of "current dir"
-         in OPFS, simply copy zName to pOut... */
-      const i = wasm.cstrncpy(pOut, zName, nOut);
-      return i<nOut ? 0 : capi.SQLITE_CANTOPEN
-      /*CANTOPEN is required by the docs but SQLITE_RANGE would be a closer match*/;
-    },
-    xGetLastError: function(pVfs,nOut,pOut){
-      /* TODO: store exception.message values from the async
-         partner in a dedicated SharedArrayBuffer, noting that we'd have
-         to encode them... TextEncoder can do that for us. */
-      warn("OPFS xGetLastError() has nothing sensible to return.");
-      return 0;
-    },
-    xOpen: function f(pVfs, zName, pFile, flags, pOutFlags){
-      if(!f._){
-        f._ = {
-          fileTypes: {
-            SQLITE_OPEN_MAIN_DB: 'mainDb',
-            SQLITE_OPEN_MAIN_JOURNAL: 'mainJournal',
-            SQLITE_OPEN_TEMP_DB: 'tempDb',
-            SQLITE_OPEN_TEMP_JOURNAL: 'tempJournal',
-            SQLITE_OPEN_TRANSIENT_DB: 'transientDb',
-            SQLITE_OPEN_SUBJOURNAL: 'subjournal',
-            SQLITE_OPEN_SUPER_JOURNAL: 'superJournal',
-            SQLITE_OPEN_WAL: 'wal'
-          },
-          getFileType: function(filename,oflags){
-            const ft = f._.fileTypes;
-            for(let k of Object.keys(ft)){
-              if(oflags & capi[k]) return ft[k];
-            }
-            warn("Cannot determine fileType based on xOpen() flags for file",filename);
-            return '???';
-          }
-        };
-      }
-      if(0===zName){
-        zName = randomFilename();
-      }else if('number'===typeof zName){
-        zName = wasm.cstringToJs(zName);
-      }
-      const args = Object.create(null);
-      args.fid = pFile;
-      args.filename = zName;
-      args.sab = new SharedArrayBuffer(state.fileBufferSize);
-      args.fileType = f._.getFileType(args.filename, flags);
-      args.create = !!(flags & capi.SQLITE_OPEN_CREATE);
-      args.deleteOnClose = !!(flags & capi.SQLITE_OPEN_DELETEONCLOSE);
-      args.readOnly = !!(flags & capi.SQLITE_OPEN_READONLY);
-      const rc = opRun('xOpen', args);
-      if(!rc){
-        /* Recall that sqlite3_vfs::xClose() will be called, even on
-           error, unless pFile->pMethods is NULL. */
-        if(args.readOnly){
-          wasm.setMemValue(pOutFlags, capi.SQLITE_OPEN_READONLY, 'i32');
-        }
-        __openFiles[pFile] = args;
-        args.sabView = new Uint8Array(args.sab);
-        args.sabViewFileSize = new DataView(args.sab, state.fbInt64Offset, 8);
-        args.sq3File = new sqlite3_file(pFile);
-        args.sq3File.$pMethods = opfsIoMethods.pointer;
-        args.ba = new Uint8Array(args.sab);
-      }
-      return rc;
-    }/*xOpen()*/
-  }/*vfsSyncWrappers*/;
-
-  if(!opfsVfs.$xRandomness){
-    /* If the default VFS has no xRandomness(), add a basic JS impl... */
-    vfsSyncWrappers.xRandomness = function(pVfs, nOut, pOut){
-      const heap = wasm.heap8u();
-      let i = 0;
-      for(; i < nOut; ++i) heap[pOut + i] = (Math.random()*255000) & 0xFF;
-      return i;
-    };
-  }
-  if(!opfsVfs.$xSleep){
-    /* If we can inherit an xSleep() impl from the default VFS then
-       use it, otherwise install one which is certainly less accurate
-       because it has to go round-trip through the async worker, but
-       provides the only option for a synchronous sleep() in JS. */
-    vfsSyncWrappers.xSleep = (pVfs,ms)=>opRun('xSleep',ms);
-  }
-
-  /* Install the vfs/io_methods into their C-level shared instances... */
-  let inst = installMethod(opfsIoMethods);
-  for(let k of Object.keys(ioSyncWrappers)) inst(k, ioSyncWrappers[k]);
-  inst = installMethod(opfsVfs);
-  for(let k of Object.keys(vfsSyncWrappers)) inst(k, vfsSyncWrappers[k]);
-  
-  const sanityCheck = async function(){
-    //state.ioBuf = new Uint8Array(state.sabIo);
-    const scope = wasm.scopedAllocPush();
-    const sq3File = new sqlite3_file();
-    try{
-      const fid = sq3File.pointer;
-      const openFlags = capi.SQLITE_OPEN_CREATE
-            | capi.SQLITE_OPEN_READWRITE
-            //| capi.SQLITE_OPEN_DELETEONCLOSE
-            | capi.SQLITE_OPEN_MAIN_DB;
-      const pOut = wasm.scopedAlloc(8);
-      const dbFile = "/sanity/check/file";
-      const zDbFile = wasm.scopedAllocCString(dbFile);
-      let rc;
-      vfsSyncWrappers.xAccess(opfsVfs.pointer, zDbFile, 0, pOut);
-      rc = wasm.getMemValue(pOut,'i32');
-      log("xAccess(",dbFile,") exists ?=",rc);
-      rc = vfsSyncWrappers.xOpen(opfsVfs.pointer, zDbFile,
-                                fid, openFlags, pOut);
-      log("open rc =",rc,"state.opSABView[xOpen] =",state.opSABView[state.opIds.xOpen]);
-      if(isWorkerErrCode(rc)){
-        error("open failed with code",rc);
-        return;
-      }
-      vfsSyncWrappers.xAccess(opfsVfs.pointer, zDbFile, 0, pOut);
-      rc = wasm.getMemValue(pOut,'i32');
-      if(!rc) toss("xAccess() failed to detect file.");
-      rc = ioSyncWrappers.xSync(sq3File.pointer, 0);
-      if(rc) toss('sync failed w/ rc',rc);
-      rc = ioSyncWrappers.xTruncate(sq3File.pointer, 1024);
-      if(rc) toss('truncate failed w/ rc',rc);
-      wasm.setMemValue(pOut,0,'i64');
-      rc = ioSyncWrappers.xFileSize(sq3File.pointer, pOut);
-      if(rc) toss('xFileSize failed w/ rc',rc);
-      log("xFileSize says:",wasm.getMemValue(pOut, 'i64'));
-      rc = ioSyncWrappers.xWrite(sq3File.pointer, zDbFile, 10, 1);
-      if(rc) toss("xWrite() failed!");
-      const readBuf = wasm.scopedAlloc(16);
-      rc = ioSyncWrappers.xRead(sq3File.pointer, readBuf, 6, 2);
-      wasm.setMemValue(readBuf+6,0);
-      let jRead = wasm.cstringToJs(readBuf);
-      log("xRead() got:",jRead);
-      if("sanity"!==jRead) toss("Unexpected xRead() value.");
-      log("xSleep()ing before close()ing...");
-      opRun('xSleep',1000);
-      rc = ioSyncWrappers.xClose(fid);
-      log("xClose rc =",rc,"opSABView =",state.opSABView);
-      log("Deleting file:",dbFile);
-      vfsSyncWrappers.xDelete(opfsVfs.pointer, zDbFile, 0x1234);
-      vfsSyncWrappers.xAccess(opfsVfs.pointer, zDbFile, 0, pOut);
-      rc = wasm.getMemValue(pOut,'i32');
-      if(rc) toss("Expecting 0 from xAccess(",dbFile,") after xDelete().");
-    }finally{
-      sq3File.dispose();
-      wasm.scopedAllocPop(scope);
-    }
-  };
-
-  W.onmessage = function({data}){
-    //log("Worker.onmessage:",data);
-    switch(data.type){
-        case 'loaded':
-          /*Pass our config and shared state on to the async worker.*/
-          wMsg('init',state);
-          break;
-        case 'inited':{
-          /*Indicates that the async partner has received the 'init',
-            so we now know that the state object is no longer subject to
-            being copied by a pending postMessage() call.*/
-          try {
-            const rc = capi.sqlite3_vfs_register(opfsVfs.pointer, opfsVfs.$zName);
-            if(rc){
-              opfsVfs.dispose();
-              toss("sqlite3_vfs_register(OPFS) failed with rc",rc);
-            }
-            if(opfsVfs.pointer !== capi.sqlite3_vfs_find("opfs")){
-              toss("BUG: sqlite3_vfs_find() failed for just-installed OPFS VFS");
-            }
-            capi.sqlite3_vfs_register.addReference(opfsVfs, opfsIoMethods);
-            state.opSABView = new Int32Array(state.opSAB);
-
-            if(thisUrl.searchParams.has('opfs-sanity-check')){
-              warn("Running sanity checks because of opfs-sanity-check URL arg...");
-              sanityCheck();
-            }
-            warn("End of (very incomplete) OPFS setup.", opfsVfs);
-          }catch(e){
-            error(e);
-          }
-          break;
-        }
-        default:
-          error("Unexpected message from the async worker:",data);
-          break;
-    }
-  };
-}/*initOpfsVfs*/
+  const pVfs = capi.sqlite3_vfs_find("opfs") || toss("Unexpectedly missing 'opfs' VFS.");
+  const oVfs = capi.sqlite3_vfs.instanceForPointer(pVfs);
+  log("OPFS VFS:",pVfs, oVfs);
+  log("Done!");
+}/*tryOpfsVfs()*/;
 
 importScripts('sqlite3.js');
-self.sqlite3InitModule().then((EmscriptenModule)=>initOpfsVfs(EmscriptenModule.sqlite3));
+self.sqlite3InitModule().then((EmscriptenModule)=>{
+  EmscriptenModule.sqlite3.installOpfsVfs()
+    .then((sqlite3)=>tryOpfsVfs(sqlite3))
+    .catch((e)=>{
+      console.error("Error initializing OPFS VFS:",e);
+      throw e;
+    });
+});
diff --git a/manifest b/manifest
index 561605cbab..98c1a9df86 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Plug\sOPFS\smethods\sin\sto\stheir\ssqlite3_vfs/io_methods\scounterparts.\sAdd\sURL\sargs\sto\scontrol\sdebug\soutput\sand\srunning\sof\ssanity-checks\sin\sthe\sOPFS\sinit\scode.
-D 2022-09-18T00:16:12.445
+C Move\sthe\sOPFS\sVFS\sbits\sback\sinto\sapi/sqlite3-api-opfs.js.\sRefactor\sthe\sOPFS\sVFS\sinit\sprocess\sto\suse\sa\sPromise-returning\sfunction\swhich\sthe\sclient\smust\scall,\sas\sthat\seliminates\sany\suncertainty\sabout\swhen\sthe\sVFS\s(necessarily\sactivated\sasynchronously)\sactually\sbecomes\savailable\sto\sthe\sclient.
+D 2022-09-18T02:35:30.998
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle 7fb73f7150ab79d83bb45a67d257553c905c78cd3d693101699243f36c5ae6c3
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile 0323a7597383bf0dab473304f3a8a7e29d49298d92b5413692c012be2dfa84bf
+F ext/wasm/GNUmakefile 24e5802cc186b492b3ef6290b64b857e51aa0afaa929b74a68f9fb457c4e8814
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 150a793a47205b8009ac934f3b6d6ebf67b965c072339aaa25ce808a19e116cc
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -484,7 +484,7 @@ F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a
 F ext/wasm/api/sqlite3-api-cleanup.js 8564a6077cdcaea9a9f428a019af8a05887f0131e6a2a1e72a7ff1145fadfe77
 F ext/wasm/api/sqlite3-api-glue.js 366d580c8e5bf7fcf4c6dee6f646c31f5549bd417ea03a59a0acca00e8ecce30
 F ext/wasm/api/sqlite3-api-oo1.js d7526517f7ad3f6bda16ad66d373bbb71b43168deef7af60eda5c9fe873d1387
-F ext/wasm/api/sqlite3-api-opfs.js 130f60cc8f5835f9d77d4f12308bf4c8fb6d9c315009fc7239c5d67ff2bc8c67
+F ext/wasm/api/sqlite3-api-opfs.js 87d98f2449d5790efd7044e492166e4ed767e3320a03ed5a173b2b9364fc4896
 F ext/wasm/api/sqlite3-api-prologue.js 48ebca4ae340b0242d4f39bbded01bd0588393c8023628be1c454b4db6f7bd6e
 F ext/wasm/api/sqlite3-api-worker1.js d33062afa045fd4be01ba4abc266801807472558b862b30056211b00c9c347b4
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
@@ -534,7 +534,7 @@ F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c2
 F ext/wasm/testing2.js 25584bcc30f19673ce13a6f301f89f8820a59dfe044e0c4f2913941f4097fe3c
 F ext/wasm/wasmfs.make 21a5cf297954a689e0dc2a95299ae158f681cae5e90c10b99d986097815fd42d
 F ext/wasm/x-sync-async.html d85cb9b1ab398ef5a20ce64a689ce4bf9a347ffe69edd46c2d3dc57b869a8925
-F ext/wasm/x-sync-async.js 2cd04d73ddc515479cc2e4b9246d6da21b3f494020261d47470f4b710c84c0da
+F ext/wasm/x-sync-async.js 95142516c0e467480fb87e71d7aab5b8ecee07fe7bd4babb5f5aa9b5b6ace4d0
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
@@ -2030,8 +2030,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 cd06cc670029763955cf60ffcf944b36d41cb005b859d9b9fd0eea1b6741d0e9
-R af48df928e44c11df9f0c9eb2cf8376e
+P a0e93ed20b2463606a63b03ce8ca41ec1fb22886db5c5c898ace86ba24636f70
+R 088ef11f22396ef93f0589b73a5e4797
 U stephan
-Z 07b2e0eb2359d701cc905c5402ed9c24
+Z 0f7cc3e7ea750e2836a1d35bc86649c9
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 274fb7f0c1..955e61f29c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a0e93ed20b2463606a63b03ce8ca41ec1fb22886db5c5c898ace86ba24636f70
\ No newline at end of file
+1c660970d0f62bcfd6e698a72b050d99972a1e39f45a5ac24194a190f8f78ab3
\ No newline at end of file

From 0db3089576b6df43fa477100446ab330b5bda905 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sun, 18 Sep 2022 03:05:55 +0000
Subject: [PATCH 127/428] Move the OPFS VFS bits back into
 api/sqlite3-api-opfs.js. Refactor the OPFS VFS init process to use a
 Promise-returning function which the client must call, as that eliminates any
 uncertainty about when the VFS (necessarily activated asynchronously)
 actually becomes available to the client. Rename x-sync-async.* to
 test-opfs-vfs.* Milestone: first successful test of OPFS without WASMFS.

FossilOrigin-Name: b2abf60dbfa6648f671a3932cb65feb28d05a0d5b7f792351d14f9c13d9798c5
---
 ext/wasm/index.html                           | 11 +++--
 ext/wasm/sqlite3-opfs-async-proxy.js          |  5 ++-
 .../{x-sync-async.html => test-opfs-vfs.html} |  2 +-
 .../{x-sync-async.js => test-opfs-vfs.js}     | 40 ++++++++++++++-----
 manifest                                      | 18 ++++-----
 manifest.uuid                                 |  2 +-
 6 files changed, 50 insertions(+), 28 deletions(-)
 rename ext/wasm/{x-sync-async.html => test-opfs-vfs.html} (91%)
 rename ext/wasm/{x-sync-async.js => test-opfs-vfs.js} (59%)

diff --git a/ext/wasm/index.html b/ext/wasm/index.html
index 562bb9b5ef..fc0c33e432 100644
--- a/ext/wasm/index.html
+++ b/ext/wasm/index.html
@@ -50,11 +50,14 @@
           worker due to an Emscripten limitation.</li>
         <li><a href='scratchpad-opfs-worker.html'>scratchpad-opfs-worker</a>:
           experimenting with OPFS from a Worker thread (without WASMFS).</li>
-        <li><a href='x-sync-async.html?opfs-sanity-check&opfs-verbose'>x-sync-async</a> is an
+        <li><a href='test-opfs-vfs.html'>test-opfs-vfs</a>
+          (<a href='test-opfs-vfs.html?opfs-sanity-check&opfs-verbose'>same
+          with verbose output and sanity-checking tests</a>) is an
           experiment in implementing a syncronous sqlite3 VFS proxy
-          for a fully synchronous backend interface (namely OPFS), using SharedArrayBuffer
-          and the Atomics APIs to regulate communication between the synchronous
-          interface and the async impl.
+          for a fully asynchronous backend interface (namely OPFS),
+          using SharedArrayBuffer and the Atomics APIs to regulate
+          communication between the synchronous interface and the
+          async impl.
         </li>
         <!--li><a href='x.html'></a></li-->
       </ul>
diff --git a/ext/wasm/sqlite3-opfs-async-proxy.js b/ext/wasm/sqlite3-opfs-async-proxy.js
index 58498e006b..00b4025569 100644
--- a/ext/wasm/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/sqlite3-opfs-async-proxy.js
@@ -260,7 +260,7 @@ const vfsAsyncImpls = {
     const fh = __openFiles[fid];
     try{
       const aRead = new Uint8Array(fh.sab, 0, n);
-      const nRead = fh.accessHandle.read(aRead, {at: offset});
+      const nRead = fh.accessHandle.read(aRead, {at: Number(offset)});
       if(nRead < n){/* Zero-fill remaining bytes */
         new Uint8Array(fh.sab).fill(0, nRead, n);
         rc = state.sq3Codes.SQLITE_IOERR_SHORT_READ;
@@ -302,7 +302,8 @@ const vfsAsyncImpls = {
     const fh = __openFiles[fid];
     try{
       affirmNotRO('xWrite', fh);
-      const nOut = fh.accessHandle.write(new Uint8Array(fh.sab, 0, n), {at: offset});
+      const nOut = fh.accessHandle.write(new Uint8Array(fh.sab, 0, n),
+                                         {at: Number(offset)});
       rc = (nOut===n) ? 0 : state.sq3Codes.SQLITE_IOERR_WRITE;
     }catch(e){
       error("xWrite():",e,fh);
diff --git a/ext/wasm/x-sync-async.html b/ext/wasm/test-opfs-vfs.html
similarity index 91%
rename from ext/wasm/x-sync-async.html
rename to ext/wasm/test-opfs-vfs.html
index b83d93378c..6e470ecc88 100644
--- a/ext/wasm/x-sync-async.html
+++ b/ext/wasm/test-opfs-vfs.html
@@ -17,6 +17,6 @@
     </div>
     <div id='test-output'>
     </div>
-    <script>new Worker("x-sync-async.js"+self.location.search);</script>
+    <script>new Worker("test-opfs-vfs.js"+self.location.search);</script>
   </body>
 </html>
diff --git a/ext/wasm/x-sync-async.js b/ext/wasm/test-opfs-vfs.js
similarity index 59%
rename from ext/wasm/x-sync-async.js
rename to ext/wasm/test-opfs-vfs.js
index b25f5a2681..fd71c9cdcf 100644
--- a/ext/wasm/x-sync-async.js
+++ b/ext/wasm/test-opfs-vfs.js
@@ -25,20 +25,39 @@
 const tryOpfsVfs = function(sqlite3){
   const toss = function(...args){throw new Error(args.join(' '))};
   const logPrefix = "OPFS tester:";
-  const log = (...args)=>{
-    console.log(logPrefix,...args);
-  };
-  const warn =  (...args)=>{
-    console.warn(logPrefix,...args);
-  };
-  const error =  (...args)=>{
-    console.error(logPrefix,...args);
-  };
+  const log = (...args)=>console.log(logPrefix,...args);
+  const warn =  (...args)=>console.warn(logPrefix,...args);
+  const error =  (...args)=>console.error(logPrefix,...args);
   log("tryOpfsVfs()");
   const capi = sqlite3.capi;
   const pVfs = capi.sqlite3_vfs_find("opfs") || toss("Unexpectedly missing 'opfs' VFS.");
-  const oVfs = capi.sqlite3_vfs.instanceForPointer(pVfs);
+  const oVfs = capi.sqlite3_vfs.instanceForPointer(pVfs) || toss("Unexpected instanceForPointer() result.");;
   log("OPFS VFS:",pVfs, oVfs);
+
+  const dbFile = "my-persistent.db";
+  const db = new sqlite3.oo1.DB(dbFile, "c", "opfs");
+  log("db file:",db.filename);
+  try{
+    let n = db.selectValue("select count(*) from sqlite_schema");
+    if(n){
+      log("Persistent data found. sqlite_schema entry count =",n);
+    }
+    db.transaction((db)=>{
+      db.exec({
+        sql:[
+          "create table if not exists t(a);",
+          "insert into t(a) values(?),(?),(?);",
+        ],
+        bind: [performance.now() | 0,
+               (performance.now() |0) / 2,
+               (performance.now() |0) / 4]
+      });
+    });
+    log("count(*) from t =",db.selectValue("select count(*) from t"));
+  }finally{
+    db.close();
+  }
+
   log("Done!");
 }/*tryOpfsVfs()*/;
 
@@ -48,6 +67,5 @@ self.sqlite3InitModule().then((EmscriptenModule)=>{
     .then((sqlite3)=>tryOpfsVfs(sqlite3))
     .catch((e)=>{
       console.error("Error initializing OPFS VFS:",e);
-      throw e;
     });
 });
diff --git a/manifest b/manifest
index 98c1a9df86..ab3e8572f1 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Move\sthe\sOPFS\sVFS\sbits\sback\sinto\sapi/sqlite3-api-opfs.js.\sRefactor\sthe\sOPFS\sVFS\sinit\sprocess\sto\suse\sa\sPromise-returning\sfunction\swhich\sthe\sclient\smust\scall,\sas\sthat\seliminates\sany\suncertainty\sabout\swhen\sthe\sVFS\s(necessarily\sactivated\sasynchronously)\sactually\sbecomes\savailable\sto\sthe\sclient.
-D 2022-09-18T02:35:30.998
+C Move\sthe\sOPFS\sVFS\sbits\sback\sinto\sapi/sqlite3-api-opfs.js.\sRefactor\sthe\sOPFS\sVFS\sinit\sprocess\sto\suse\sa\sPromise-returning\sfunction\swhich\sthe\sclient\smust\scall,\sas\sthat\seliminates\sany\suncertainty\sabout\swhen\sthe\sVFS\s(necessarily\sactivated\sasynchronously)\sactually\sbecomes\savailable\sto\sthe\sclient.\sRename\sx-sync-async.*\sto\stest-opfs-vfs.*\sMilestone:\sfirst\ssuccessful\stest\sof\sOPFS\swithout\sWASMFS.
+D 2022-09-18T03:05:55.278
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -502,7 +502,7 @@ F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d695
 F ext/wasm/fiddle/fiddle-worker.js bccf46045be8824752876f3eec01c223be0616ccac184bffd0024cfe7a3262b8
 F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
 F ext/wasm/fiddle/fiddle.js 4ffcfc9a235beebaddec689a549e9e0dfad6dca5c1f0b41f03468d7e76480686
-F ext/wasm/index.html b8a47afa96d0c7ac3081c6d469e1fd7be6b87c64b94e4fb62e26984a1564cac4
+F ext/wasm/index.html 492eb6c9023c9cda391c61702a28bd18e6c986ca2588ec3f384275bb77275285
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 447cc02b598f7792edaa8ae6853a7847b8178a18ed356afacbdbf312b2588106
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
@@ -523,9 +523,11 @@ F ext/wasm/speedtest1.html fbb8e4d1639028443f3687a683be660beca6927920545cf6b1fdf
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
-F ext/wasm/sqlite3-opfs-async-proxy.js ef012be0a77d3e34dc699de2e430b6d26a58c69dbebdd75248d8f41540996c71
+F ext/wasm/sqlite3-opfs-async-proxy.js 456bef1253fd4732f133b601a4450b7f8461e67af6e8d30bf8a239ad775c77a2
 F ext/wasm/sqlite3-worker1-promiser.js 92b8da5f38439ffec459a8215775d30fa498bc0f1ab929ff341fc3dd479660b9
 F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
+F ext/wasm/test-opfs-vfs.html 3e11c875c28f041891deeea6b2375121845ee1269cac6747df957ec0c7d4d37a w ext/wasm/x-sync-async.html
+F ext/wasm/test-opfs-vfs.js bf70cd553a443b4eda63b577787ef73144f879fa062a20a73bb44e3242c81a15 w ext/wasm/x-sync-async.js
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
 F ext/wasm/testing-worker1-promiser.js 63448fddfd3b8c89ff667d17c8b31c6c2259dd4647ebbbd28f3a921c48e924da
 F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d7669fb17fcae
@@ -533,8 +535,6 @@ F ext/wasm/testing1.js 7cd8ab255c238b030d928755ae8e91e7d90a12f2ae601b1b8f7827aaa
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
 F ext/wasm/testing2.js 25584bcc30f19673ce13a6f301f89f8820a59dfe044e0c4f2913941f4097fe3c
 F ext/wasm/wasmfs.make 21a5cf297954a689e0dc2a95299ae158f681cae5e90c10b99d986097815fd42d
-F ext/wasm/x-sync-async.html d85cb9b1ab398ef5a20ce64a689ce4bf9a347ffe69edd46c2d3dc57b869a8925
-F ext/wasm/x-sync-async.js 95142516c0e467480fb87e71d7aab5b8ecee07fe7bd4babb5f5aa9b5b6ace4d0
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
@@ -2030,8 +2030,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 a0e93ed20b2463606a63b03ce8ca41ec1fb22886db5c5c898ace86ba24636f70
-R 088ef11f22396ef93f0589b73a5e4797
+P 1c660970d0f62bcfd6e698a72b050d99972a1e39f45a5ac24194a190f8f78ab3
+R 039a2cd7ec4da87358ad6184da91bc68
 U stephan
-Z 0f7cc3e7ea750e2836a1d35bc86649c9
+Z 58e9ce410c47c756bc153984b857c4cf
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 955e61f29c..d80c68d21c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1c660970d0f62bcfd6e698a72b050d99972a1e39f45a5ac24194a190f8f78ab3
\ No newline at end of file
+b2abf60dbfa6648f671a3932cb65feb28d05a0d5b7f792351d14f9c13d9798c5
\ No newline at end of file

From f38601206997aa909b2cd6dba02cb0b4e13e8e2a Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sun, 18 Sep 2022 17:32:35 +0000
Subject: [PATCH 128/428] Numerous cleanups in the JS bits. Removed some
 now-defunct wasm test files. Expose sqlite3.opfs object containing various
 OPFS-specific utilities.

FossilOrigin-Name: 26e625d05d9820033b23536f18ad3ddc59ed712ad507d4b0c7fe88abd15d2be8
---
 ext/wasm/api/sqlite3-api-oo1.js      | 131 +++++--
 ext/wasm/api/sqlite3-api-opfs.js     | 128 +++++--
 ext/wasm/api/sqlite3-api-prologue.js |  87 +++--
 ext/wasm/api/sqlite3-api-worker1.js  |   6 +-
 ext/wasm/index.html                  |   2 -
 ext/wasm/scratchpad-opfs-worker.html |  18 -
 ext/wasm/scratchpad-opfs-worker.js   |  47 ---
 ext/wasm/scratchpad-opfs-worker2.js  | 494 ---------------------------
 ext/wasm/scratchpad-wasmfs-main.js   |   2 +-
 ext/wasm/sqlite3-opfs-async-proxy.js |  22 +-
 ext/wasm/test-opfs-vfs.html          |   4 +-
 ext/wasm/test-opfs-vfs.js            |  34 +-
 ext/wasm/testing1.js                 |   6 +-
 manifest                             |  33 +-
 manifest.uuid                        |   2 +-
 15 files changed, 337 insertions(+), 679 deletions(-)
 delete mode 100644 ext/wasm/scratchpad-opfs-worker.html
 delete mode 100644 ext/wasm/scratchpad-opfs-worker.js
 delete mode 100644 ext/wasm/scratchpad-opfs-worker2.js

diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index 368986933f..fb01e98713 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -85,9 +85,24 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
 
   /**
      A proxy for DB class constructors. It must be called with the
-     being-construct DB object as its "this".
+     being-construct DB object as its "this". See the DB constructor
+     for the argument docs. This is split into a separate function
+     in order to enable simple creation of special-case DB constructors,
+     e.g. a hypothetical LocalStorageDB or OpfsDB.
+
+     Expects to be passed a configuration object with the following
+     properties:
+
+     - `.filename`: the db filename. It may be a special name like ":memory:"
+       or "".
+
+     - `.flags`: as documented in the DB constructor.
+
+     - `.vfs`: as documented in the DB constructor.
+
+     It also accepts those as the first 3 arguments.
   */
-  const dbCtorHelper = function ctor(fn=':memory:', flags='c', vfsName){
+  const dbCtorHelper = function ctor(...args){
     if(!ctor._name2vfs){
       // Map special filenames which we handle here (instead of in C)
       // to some helpful metadata...
@@ -104,25 +119,33 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
         filename: isWorkerThread || (()=>'session')
       };
     }
-    if('string'!==typeof fn){
-      toss3("Invalid filename for DB constructor.");
+    const opt = ctor.normalizeArgs(...args);
+    let fn = opt.filename, vfsName = opt.vfs, flagsStr = opt.flags;
+    if(('string'!==typeof fn && 'number'!==typeof fn)
+       || 'string'!==typeof flagsStr
+       || (vfsName && ('string'!==typeof vfsName && 'number'!==typeof vfsName))){
+      console.error("Invalid DB ctor args",opt,arguments);
+      toss3("Invalid arguments for DB constructor.");
     }
-    const vfsCheck = ctor._name2vfs[fn];
+    let fnJs = ('number'===typeof fn) ? capi.wasm.cstringToJs(fn) : fn;
+    const vfsCheck = ctor._name2vfs[fnJs];
     if(vfsCheck){
       vfsName = vfsCheck.vfs;
-      fn = vfsCheck.filename(fn);
+      fn = fnJs = vfsCheck.filename(fnJs);
     }
     let ptr, oflags = 0;
-    if( flags.indexOf('c')>=0 ){
+    if( flagsStr.indexOf('c')>=0 ){
       oflags |= capi.SQLITE_OPEN_CREATE | capi.SQLITE_OPEN_READWRITE;
     }
-    if( flags.indexOf('w')>=0 ) oflags |= capi.SQLITE_OPEN_READWRITE;
+    if( flagsStr.indexOf('w')>=0 ) oflags |= capi.SQLITE_OPEN_READWRITE;
     if( 0===oflags ) oflags |= capi.SQLITE_OPEN_READONLY;
     oflags |= capi.SQLITE_OPEN_EXRESCODE;
     const stack = capi.wasm.scopedAllocPush();
     try {
       const ppDb = capi.wasm.scopedAllocPtr() /* output (sqlite3**) arg */;
-      const pVfsName = vfsName ? capi.wasm.scopedAllocCString(vfsName) : 0;
+      const pVfsName = vfsName ? (
+        ('number'===typeof vfsName ? vfsName : capi.wasm.scopedAllocCString(vfsName))
+      ): 0;
       const rc = capi.sqlite3_open_v2(fn, ppDb, oflags, pVfsName);
       ptr = capi.wasm.getPtrValue(ppDb);
       checkSqlite3Rc(ptr, rc);
@@ -132,11 +155,36 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     }finally{
       capi.wasm.scopedAllocPop(stack);
     }
-    this.filename = fn;
+    this.filename = fnJs;
     __ptrMap.set(this, ptr);
     __stmtMap.set(this, Object.create(null));
     __udfMap.set(this, Object.create(null));
   };
+
+  /**
+     A helper for DB constructors. It accepts either a single
+     config-style object or up to 3 arguments (filename, dbOpenFlags,
+     dbVfsName). It returns a new object containing:
+
+     { filename: ..., flags: ..., vfs: ... }
+
+     If passed an object, any additional properties it has are copied
+     as-is into the new object.
+  */
+  dbCtorHelper.normalizeArgs = function(filename,flags = 'c',vfs = null){
+    const arg = {};
+    if(1===arguments.length && 'object'===typeof arguments[0]){
+      const x = arguments[0];
+      Object.keys(x).forEach((k)=>arg[k] = x[k]);
+      if(undefined===arg.flags) arg.flags = 'c';
+      if(undefined===arg.vfs) arg.vfs = null;
+    }else{
+      arg.filename = filename;
+      arg.flags = flags;
+      arg.vfs = vfs;
+    }
+    return arg;
+  };
   
   /**
      The DB class provides a high-level OO wrapper around an sqlite3
@@ -175,6 +223,17 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
      or not at all, to use the default. If passed a value, it must
      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
+     properties:
+
+     - `.filename`: database file name
+     - `.flags`: open-mode flags
+     - `.vfs`: the VFS fname
+
+     The `filename` and `vfs` arguments may be either JS strings or
+     C-strings allocated via WASM.
+
      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
@@ -187,12 +246,12 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
      the database. In this mode, only a single database is permitted
      in each storage object. This feature is experimental and subject
      to any number of changes (including outright removal). This
-     support requires a specific build of sqlite3, the existence of
-     which can be determined at runtime by checking for a non-0 return
-     value from sqlite3.capi.sqlite3_vfs_find("kvvfs").
+     support requires the kvvfs sqlite3 VFS, the existence of which
+     can be determined at runtime by checking for a non-0 return value
+     from sqlite3.capi.sqlite3_vfs_find("kvvfs").
   */
-  const DB = function ctor(fn=':memory:', flags='c', vfsName){
-    dbCtorHelper.apply(this, Array.prototype.slice.call(arguments));
+  const DB = function(...args){
+    dbCtorHelper.apply(this, args);
   };
 
   /**
@@ -361,12 +420,31 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        closed. After calling close(), `this.pointer` will resolve to
        `undefined`, so that can be used to check whether the db
        instance is still opened.
+
+       If this.onclose.before is a function then it is called before
+       any close-related cleanup.
+
+       If this.onclose.after is a function then it is called after the
+       db is closed but before auxiliary state like this.filename is
+       cleared.
+
+       Both onclose handlers are passed this object. If this db is not
+       opened, neither of the handlers are called. Any exceptions the
+       handlers throw are ignored because "destructors must not
+       throw."
+
+       Note that garbage collection of a db handle, if it happens at
+       all, will never trigger close(), so onclose handlers are not a
+       reliable way to implement close-time cleanup or maintenance of
+       a db.
     */
     close: function(){
       if(this.pointer){
+        if(this.onclose && (this.onclose.before instanceof Function)){
+          try{this.onclose.before(this)}
+          catch(e){/*ignore*/}
+        }
         const pDb = this.pointer;
-        let s;
-        const that = this;
         Object.keys(__stmtMap.get(this)).forEach((k,s)=>{
           if(s && s.pointer) s.finalize();
         });
@@ -377,6 +455,10 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
         __stmtMap.delete(this);
         __udfMap.delete(this);
         capi.sqlite3_close_v2(pDb);
+        if(this.onclose && (this.onclose.after instanceof Function)){
+          try{this.onclose.after(this)}
+          catch(e){/*ignore*/}
+        }
         delete this.filename;
       }
     },
@@ -401,13 +483,13 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
       }
     },
     /**
-       Similar to this.filename but will return NULL for special names
-       like ":memory:". Not of much use until we have filesystem
-       support. Throws if the DB has been closed. If passed an
-       argument it then it will return the filename of the ATTACHEd db
-       with that name, else it assumes a name of `main`.
+       Similar to this.filename but will return a falsy value for
+       special names like ":memory:". Throws if the DB has been
+       closed. If passed an argument it then it will return the
+       filename of the ATTACHEd db with that name, else it assumes a
+       name of `main`.
     */
-    fileName: function(dbName='main'){
+    getFilename: function(dbName='main'){
       return capi.sqlite3_db_filename(affirmDbOpen(this).pointer, dbName);
     },
     /**
@@ -1591,7 +1673,8 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
       ooApi: "0.1"
     },
     DB,
-    Stmt
+    Stmt,
+    dbCtorHelper
   }/*oo1 object*/;
 
 });
diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index af1c6f7608..ede4fb32b1 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -42,8 +42,8 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     that number will increase as the OPFS API matures).
 
   - The OPFS features used here are only available in dedicated Worker
-    threads. This file tries to detect that case and becomes a no-op
-    if those features do not seem to be available.
+    threads. This file tries to detect that case, resulting in a
+    rejected Promise if those features do not seem to be available.
 
   - It requires the SharedArrayBuffer and Atomics classes, and the
     former is only available if the HTTP server emits the so-called
@@ -72,7 +72,8 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
      returned Promise resolves.
 
    On success, the Promise resolves to the top-most sqlite3 namespace
-   object.
+   object and that object gets a new object installed in its
+   `opfs` property, containing several OPFS-specific utilities.
 */
 sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
   const options = (asyncProxyUri && 'object'===asyncProxyUri) ? asyncProxyUri : {
@@ -89,6 +90,13 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
     options.proxyUri = callee.defaultProxyUri;
   }
   delete sqlite3.installOpfsVfs;
+
+  /**
+     Generic utilities for working with OPFS. This will get filled out
+     by the Promise setup and, on success, installed as sqlite3.opfs.
+  */
+  const opfsUtil = Object.create(null);
+
   const thePromise = new Promise(function(promiseResolve, promiseReject){
     const logPrefix = "OPFS syncer:";
     const warn =  (...args)=>{
@@ -118,9 +126,8 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
     const sqlite3_vfs = capi.sqlite3_vfs;
     const sqlite3_file = capi.sqlite3_file;
     const sqlite3_io_methods = capi.sqlite3_io_methods;
-    const StructBinder = sqlite3.StructBinder;
     const W = new Worker(options.proxyUri);
-    const workerOrigOnError = W.onrror;
+    W._originalOnError = W.onerror /* will be restored later */;
     W.onerror = function(err){
       promiseReject(new Error("Loading OPFS async Worker failed for unknown reasons."));
     };
@@ -131,17 +138,37 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
        This object must initially contain only cloneable or sharable
        objects. After the worker's "inited" message arrives, other types
        of data may be added to it.
+
+       For purposes of Atomics.wait() and Atomics.notify(), we use a
+       SharedArrayBuffer with one slot reserved for each of the API
+       proxy's methods. The sync side of the API uses Atomics.wait()
+       on the corresponding slot and the async side uses
+       Atomics.notify() on that slot.
+
+       The approach of using a single SAB to serialize comms for all
+       instances might(?) lead to deadlock situations in multi-db
+       cases. We should probably have one SAB here with a single slot
+       for locking a per-file initialization step and then allocate a
+       separate SAB like the above one for each file. That will
+       require a bit of acrobatics but should be feasible.
     */
     const state = Object.create(null);
     state.verbose = options.verbose;
-    state.fileBufferSize = 1024 * 64 + 8 /* size of fileHandle.sab. 64k = max sqlite3 page size */;
-    state.fbInt64Offset = state.fileBufferSize - 8 /*spot in fileHandle.sab to store an int64*/;
+    state.fileBufferSize =
+      1024 * 64 + 8 /* size of aFileHandle.sab. 64k = max sqlite3 page
+                       size. The additional bytes are space for
+                       holding BigInt results, since we cannot store
+                       those via the Atomics API (which only works on
+                       an Int32Array). */;
+    state.fbInt64Offset =
+      state.fileBufferSize - 8 /*spot in fileHandle.sab to store an int64 result */;
     state.opIds = Object.create(null);
     {
       let i = 0;
       state.opIds.xAccess = i++;
       state.opIds.xClose = i++;
       state.opIds.xDelete = i++;
+      state.opIds.xDeleteNoWait = i++;
       state.opIds.xFileSize = i++;
       state.opIds.xOpen = i++;
       state.opIds.xRead = i++;
@@ -149,14 +176,8 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
       state.opIds.xSync = i++;
       state.opIds.xTruncate = i++;
       state.opIds.xWrite = i++;
+      state.opIds.mkdir = i++;
       state.opSAB = new SharedArrayBuffer(i * 4/*sizeof int32*/);
-      /* The approach of using a single SAB to serialize comms for all
-         instances may(?) lead to deadlock situations in multi-db
-         cases. We should probably have one SAB here with a single slot
-         for locking a per-file initialization step and then allocate a
-         separate SAB like the above one for each file. That will
-         require a bit of acrobatics but should be feasible.
-      */
     }
 
     state.sq3Codes = Object.create(null);
@@ -167,15 +188,14 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
       'SQLITE_IOERR_READ', 'SQLITE_IOERR_SHORT_READ',
       'SQLITE_IOERR_WRITE', 'SQLITE_IOERR_FSYNC',
       'SQLITE_IOERR_TRUNCATE', 'SQLITE_IOERR_DELETE',
-      'SQLITE_IOERR_ACCESS', 'SQLITE_IOERR_CLOSE'
+      'SQLITE_IOERR_ACCESS', 'SQLITE_IOERR_CLOSE',
+      'SQLITE_IOERR_DELETE'
     ].forEach(function(k){
       state.sq3Codes[k] = capi[k] || toss("Maintenance required: not found:",k);
       state.sq3Codes._reverse[capi[k]] = k;
     });
 
     const isWorkerErrCode = (n)=>!!state.sq3Codes._reverse[n];
-    const opStore = (op,val=-1)=>Atomics.store(state.opSABView, state.opIds[op], val);
-    const opWait = (op,val=-1)=>Atomics.wait(state.opSABView, state.opIds[op], val);
 
     /**
        Runs the given operation in the async worker counterpart, waits
@@ -185,9 +205,9 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
        given operation's signature in the async API counterpart.
     */
     const opRun = (op,args)=>{
-      opStore(op);
+      Atomics.store(state.opSABView, state.opIds[op], -1);
       wMsg(op, args);
-      opWait(op);
+      Atomics.wait(state.opSABView, state.opIds[op], -1);
       return Atomics.load(state.opSABView, state.opIds[op]);
     };
 
@@ -268,7 +288,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
        func with the same signature as described above.
     */
     const installMethod = function callee(tgt, name, func){
-      if(!(tgt instanceof StructBinder.StructType)){
+      if(!(tgt instanceof sqlite3.StructBinder.StructType)){
         toss("Usage error: target object is-not-a StructType.");
       }
       if(1===arguments.length){
@@ -429,7 +449,10 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
         return 0;
       },
       xDelete: function(pVfs, zName, doSyncDir){
-        return opRun('xDelete', {filename: wasm.cstringToJs(zName), syncDir: doSyncDir});
+        opRun('xDelete', {filename: wasm.cstringToJs(zName), syncDir: doSyncDir});
+        /* We're ignoring errors because we cannot yet differentiate
+           between harmless and non-harmless failures. */
+        return 0;
       },
       xFullPathname: function(pVfs,zName,nOut,pOut){
         /* Until/unless we have some notion of "current dir"
@@ -521,6 +544,65 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
     for(let k of Object.keys(ioSyncWrappers)) inst(k, ioSyncWrappers[k]);
     inst = installMethod(opfsVfs);
     for(let k of Object.keys(vfsSyncWrappers)) inst(k, vfsSyncWrappers[k]);
+
+
+    /**
+       Syncronously deletes the given OPFS filesystem entry, ignoring
+       any errors. As this environment has no notion of "current
+       directory", the given name must be an absolute path. If the 2nd
+       argument is truthy, deletion is recursive (use with caution!).
+
+       Returns true if the deletion succeeded and fails if it fails,
+       but cannot report the nature of the failure.
+    */
+    opfsUtil.deleteEntry = function(fsEntryName,recursive){
+      return 0===opRun('xDelete', {filename:fsEntryName, recursive});
+    };
+    /**
+       Exactly like deleteEntry() but runs asynchronously.
+    */
+    opfsUtil.deleteEntryAsync = async function(fsEntryName,recursive){
+      wMsg('xDeleteNoWait', {filename: fsEntryName, recursive});
+    };
+    /**
+       Synchronously creates the given directory name, recursively, in
+       the OPFS filesystem. Returns true if it succeeds or the
+       directory already exists, else false.
+    */
+    opfsUtil.mkdir = async function(absDirName){
+      return 0===opRun('mkdir', absDirName);
+    };
+    /**
+       Synchronously checks whether the given OPFS filesystem exists,
+       returning true if it does, false if it doesn't.
+    */
+    opfsUtil.entryExists = function(fsEntryName){
+      return 0===opRun('xAccess', fsEntryName);
+    };
+
+    /**
+       Generates a random ASCII string, intended for use as a
+       temporary file name. Its argument is the length of the string,
+       defaulting to 16.
+    */
+    opfsUtil.randomFilename = randomFilename;
+    
+    if(sqlite3.oo1){
+      opfsUtil.OpfsDb = function(...args){
+        const opt = sqlite3.oo1.dbCtorHelper.normalizeArgs(...args);
+        opt.vfs = opfsVfs.$zName;
+        sqlite3.oo1.dbCtorHelper.call(this, opt);
+      };
+      opfsUtil.OpfsDb.prototype = Object.create(sqlite3.oo1.DB.prototype);
+    }
+
+    /**
+       Potential TODOs:
+
+       - Expose one or both of the Worker objects via opfsUtil and
+         publish an interface for proxying the higher-level OPFS
+         features like getting a directory listing.
+    */
     
     const sanityCheck = async function(){
       const scope = wasm.scopedAllocPush();
@@ -605,7 +687,9 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
                 warn("Running sanity checks because of opfs-sanity-check URL arg...");
                 sanityCheck();
               }
-              W.onerror = workerOrigOnError;
+              W.onerror = W._originalOnError;
+              delete W._originalOnError;
+              sqlite3.opfs = opfsUtil;
               promiseResolve(sqlite3);
               log("End of OPFS sqlite3_vfs setup.", opfsVfs);
             }catch(e){
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 1fc533da62..add8ad658e 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -689,7 +689,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
   /** State for sqlite3_web_persistent_dir(). */
   let __persistentDir;
   /**
-     An experiment. Do not use.
+     An experiment. Do not use in client code.
 
      If the wasm environment has a persistent storage directory,
      its path is returned by this function. If it does not then
@@ -699,14 +699,18 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
      environment to determine whether persistence filesystem support
      is available and, if it is, enables it (if needed).
 
+     This function currently only recognizes the WASMFS/OPFS storage
+     combination. "Plain" OPFS is provided via a separate VFS which
+     can optionally be installed (if OPFS is available on the system)
+     using sqlite3.installOpfsVfs().
+
      TODOs and caveats:
 
      - If persistent storage is available at the root of the virtual
        filesystem, this interface cannot currently distinguish that
-       from the lack of persistence. That case cannot currently (with
-       WASMFS/OPFS) happen, but it is conceivably possible in future
-       environments or non-browser runtimes (none of which are yet
-       supported targets).
+       from the lack of persistence. That can (in the mean time)
+       happen when using the JS-native "opfs" VFS, as opposed to the
+       WASMFS/OPFS combination.
   */
   capi.sqlite3_web_persistent_dir = function(){
     if(undefined !== __persistentDir) return __persistentDir;
@@ -764,6 +768,49 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     capi.wasm.exports.sqlite3_initialize();
   }
 
+  /**
+     Given an `sqlite3*` and an sqlite3_vfs name, returns a truthy
+     value (see below) if that db handle uses that VFS, else returns
+     false. If pDb is falsy then this function returns a truthy value
+     if the default VFS is that VFS. Results are undefined if pDb is
+     truthy but refers to an invalid pointer.
+
+     The 2nd argument may either be a JS string or a C-string
+     allocated from the wasm environment.
+
+     The truthy value it returns is a pointer to the `sqlite3_vfs`
+     object.
+
+     To permit safe use of this function from APIs which may be called
+     via the C stack (like SQL UDFs), this function does not throw: if
+     bad arguments cause a conversion error when passing into
+     wasm-space, false is returned.
+  */
+  capi.sqlite3_web_db_uses_vfs = function(pDb,vfsName){
+    try{
+      const pK = ('number'===vfsName)
+            ? capi.wasm.exports.sqlite3_vfs_find(vfsName)
+            : capi.sqlite3_vfs_find(vfsName);
+      if(!pK) return false;
+      else if(!pDb){
+        return capi.sqlite3_vfs_find(0)===pK ? pK : false;
+      }
+      const ppVfs = capi.wasm.allocPtr();
+      try{
+        return (
+          (0===capi.sqlite3_file_control(
+            pDb, "main", capi.SQLITE_FCNTL_VFS_POINTER, ppVfs
+          )) && (capi.wasm.getPtrValue(ppVfs) === pK)
+        ) ? pK : false;
+      }finally{
+        capi.wasm.dealloc(ppVfs);
+      }
+    }catch(e){
+      /* Ignore - probably bad args to a wasm-bound function. */
+      return false;
+    }
+  };
+
   if( self.window===self ){
     /* Features specific to the main window thread... */
 
@@ -812,7 +859,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     /**
        This routine guesses the approximate amount of
        window.localStorage and/or window.sessionStorage in use by the
-       kvvfs database backend.  Its argument must be one of
+       kvvfs database backend. Its argument must be one of
        ('session', 'local', ''). In the first two cases, only
        sessionStorage resp. localStorage is counted. If it's an empty
        string (the default) then both are counted. Only storage keys
@@ -842,34 +889,6 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
       return sz * 2 /* because JS uses UC16 encoding */;
     };
 
-    /**
-       Given an `sqlite3*`, returns a truthy value (see below) if that
-       db handle uses the "kvvfs" VFS, else returns false. If pDb is
-       NULL then this function returns true if the default VFS is
-       "kvvfs". Results are undefined if pDb is truthy but refers to
-       an invalid pointer.
-
-       The truthy value it returns is a pointer to the kvvfs
-       `sqlite3_vfs` object.
-    */
-    capi.sqlite3_web_db_is_kvvfs = function(pDb){
-      const pK = capi.sqlite3_vfs_find("kvvfs");
-      if(!pK) return false;
-      else if(!pDb){
-        return capi.sqlite3_vfs_find(0) && pK;
-      }
-      const scope = capi.wasm.scopedAllocPush();
-      try{
-        const ppVfs = capi.wasm.scopedAllocPtr();
-        return (
-          (0===capi.sqlite3_file_control(
-            pDb, "main", capi.SQLITE_FCNTL_VFS_POINTER, ppVfs
-          )) && (capi.wasm.getPtrValue(ppVfs) === pK)
-        ) ? pK : false;
-      }finally{
-        capi.wasm.scopedAllocPop(scope);
-      }
-    };
   }/* main-window-only bits */
 
   /* The remainder of the API will be set up in later steps. */
diff --git a/ext/wasm/api/sqlite3-api-worker1.js b/ext/wasm/api/sqlite3-api-worker1.js
index 00359413b2..97f2677e6c 100644
--- a/ext/wasm/api/sqlite3-api-worker1.js
+++ b/ext/wasm/api/sqlite3-api-worker1.js
@@ -371,10 +371,14 @@ sqlite3.initWorker1API = function(){
     close: function(db,alsoUnlink){
       if(db){
         delete this.dbs[getDbId(db)];
-        const filename = db.fileName();
+        const filename = db.getFilename();
         db.close();
         if(db===this.defaultDb) this.defaultDb = undefined;
         if(alsoUnlink && filename){
+          /* This isn't necessarily correct: the db might be using a
+             VFS other than the default. How do we best resolve this
+             without having to special-case the kvvfs and opfs
+             VFSes? */
           sqlite3.capi.wasm.sqlite3_wasm_vfs_unlink(filename);
         }
       }
diff --git a/ext/wasm/index.html b/ext/wasm/index.html
index fc0c33e432..d13f9bb7f3 100644
--- a/ext/wasm/index.html
+++ b/ext/wasm/index.html
@@ -48,8 +48,6 @@
           experimenting with WASMFS/OPFS-based persistence. Maintenance
           reminder: we cannot currently (2022-09-15) load WASMFS in a
           worker due to an Emscripten limitation.</li>
-        <li><a href='scratchpad-opfs-worker.html'>scratchpad-opfs-worker</a>:
-          experimenting with OPFS from a Worker thread (without WASMFS).</li>
         <li><a href='test-opfs-vfs.html'>test-opfs-vfs</a>
           (<a href='test-opfs-vfs.html?opfs-sanity-check&opfs-verbose'>same
           with verbose output and sanity-checking tests</a>) is an
diff --git a/ext/wasm/scratchpad-opfs-worker.html b/ext/wasm/scratchpad-opfs-worker.html
deleted file mode 100644
index 0ab7822d82..0000000000
--- a/ext/wasm/scratchpad-opfs-worker.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!doctype html>
-<html lang="en-us">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
-    <link rel="stylesheet" href="common/emscripten.css"/>
-    <link rel="stylesheet" href="common/testing.css"/>
-    <title>sqlite3 OPFS Worker-thread Scratchpad</title>
-  </head>
-  <body>
-    <header id='titlebar'><span>sqlite3 OPFS Worker-thread Scratchpad</span></header>
-    <p>All stuff on this page happens in the dev console.</p>
-    <hr>
-    <div id='test-output'></div>
-    <script src="scratchpad-opfs-worker.js"></script>
-  </body>
-</html>
diff --git a/ext/wasm/scratchpad-opfs-worker.js b/ext/wasm/scratchpad-opfs-worker.js
deleted file mode 100644
index e27164775c..0000000000
--- a/ext/wasm/scratchpad-opfs-worker.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-  2022-05-22
-
-  The author disclaims copyright to this source code.  In place of a
-  legal notice, here is a blessing:
-
-  *   May you do good and not evil.
-  *   May you find forgiveness for yourself and forgive others.
-  *   May you share freely, never taking more than you give.
-
-  ***********************************************************************
-
-  A basic test script for sqlite3-api.js. This file must be run in
-  main JS thread. It will load sqlite3.js in a worker thread.
-*/
-'use strict';
-(function(){
-  const toss = function(...args){throw new Error(args.join(' '))};
-  const eOutput = document.querySelector('#test-output');
-  const logHtml = function(cssClass,...args){
-    if(Array.isArray(args[0])) args = args[0];
-    const ln = document.createElement('div');
-    if(cssClass) ln.classList.add(cssClass);
-    ln.append(document.createTextNode(args.join(' ')));
-    eOutput.append(ln);
-  };
-  const log = function(...args){
-    logHtml('',...args);
-  };
-  const error = function(...args){
-    logHtml('error',...args);
-  };
-  const warn = function(...args){
-    logHtml('warning',...args);
-  };
-
-  const W = new Worker("scratchpad-opfs-worker2.js");
-  W.onmessage = function(ev){
-    ev = ev.data;
-    const d = ev.data;
-    switch(ev.type){
-        case 'stdout': log(d); break;
-        case 'stderr': error(d); break;
-        default: warn("Unhandled message type:",ev); break;
-    }
-  };
-})();
diff --git a/ext/wasm/scratchpad-opfs-worker2.js b/ext/wasm/scratchpad-opfs-worker2.js
deleted file mode 100644
index 47ace63de4..0000000000
--- a/ext/wasm/scratchpad-opfs-worker2.js
+++ /dev/null
@@ -1,494 +0,0 @@
-/*
-  2022-05-22
-
-  The author disclaims copyright to this source code.  In place of a
-  legal notice, here is a blessing:
-
-  *   May you do good and not evil.
-  *   May you find forgiveness for yourself and forgive others.
-  *   May you share freely, never taking more than you give.
-
-  ***********************************************************************
-
-  An experiment for wasmfs/opfs. This file MUST be in the same dir as
-  the sqlite3.js emscripten module or that module won't be able to
-  resolve the relative URIs (importScript()'s relative URI handling
-  is, quite frankly, broken).
-*/
-'use strict';
-
-const toss = function(...args){throw new Error(args.join(' '))};
-/**
-   Posts a message in the form {type,data} unless passed more than 2
-   args, in which case it posts {type, data:[arg1...argN]}.
-*/
-const wMsg = function(type,data){
-  postMessage({
-    type,
-    data: arguments.length<3
-      ? data
-      : Array.prototype.slice.call(arguments,1)
-  });
-};
-
-const stdout = function(...args){
-  wMsg('stdout',args);
-  console.log(...args);
-};
-const stderr = function(...args){
-  wMsg('stderr',args);
-  console.error(...args);
-};
-
-const log = console.log.bind(console);
-const warn = console.warn.bind(console);
-const error = console.error.bind(console);
-
-
-const initOpfsBits = async function(sqlite3){
-  if(!self.importScripts || !self.FileSystemFileHandle){
-    //|| !self.FileSystemFileHandle.prototype.createSyncAccessHandle){
-    // ^^^ sync API is not required with WASMFS/OPFS backend.
-    warn("OPFS is not available in this environment.");
-    return;
-  }else if(!sqlite3.capi.wasm.bigIntEnabled){
-    error("OPFS requires BigInt support but sqlite3.capi.wasm.bigIntEnabled is false.");
-    return;
-  }
-  //warn('self.FileSystemFileHandle =',self.FileSystemFileHandle);
-  //warn('self.FileSystemFileHandle.prototype =',self.FileSystemFileHandle.prototype);
-  const capi = sqlite3.capi,
-        wasm = capi.wasm;
-  const sqlite3_vfs = capi.sqlite3_vfs
-        || toss("Missing sqlite3.capi.sqlite3_vfs object.");
-  const sqlite3_file = capi.sqlite3_file
-        || toss("Missing sqlite3.capi.sqlite3_file object.");
-  const sqlite3_io_methods = capi.sqlite3_io_methods
-        || toss("Missing sqlite3.capi.sqlite3_io_methods object.");
-  const StructBinder = sqlite3.StructBinder || toss("Missing sqlite3.StructBinder.");
-  const debug = console.debug.bind(console),
-        log = console.log.bind(console);
-  warn("UNDER CONSTRUCTION: setting up OPFS VFS...");
-
-  const pDVfs = capi.sqlite3_vfs_find(null)/*pointer to default VFS*/;
-  const dVfs = pDVfs
-        ? new sqlite3_vfs(pDVfs)
-        : null /* dVfs will be null when sqlite3 is built with
-                  SQLITE_OS_OTHER. Though we cannot currently handle
-                  that case, the hope is to eventually be able to. */;
-  const oVfs = new sqlite3_vfs();
-  const oIom = new sqlite3_io_methods();
-  oVfs.$iVersion = 2/*yes, two*/;
-  oVfs.$szOsFile = capi.sqlite3_file.structInfo.sizeof;
-  oVfs.$mxPathname = 1024/*sure, why not?*/;
-  oVfs.$zName = wasm.allocCString("opfs");
-  oVfs.ondispose = [
-    '$zName', oVfs.$zName,
-    'cleanup dVfs', ()=>(dVfs ? dVfs.dispose() : null)
-  ];
-  if(dVfs){
-    oVfs.$xSleep = dVfs.$xSleep;
-    oVfs.$xRandomness = dVfs.$xRandomness;
-  }
-  // All C-side memory of oVfs is zeroed out, but just to be explicit:
-  oVfs.$xDlOpen = oVfs.$xDlError = oVfs.$xDlSym = oVfs.$xDlClose = null;
-
-  /**
-     Pedantic sidebar about oVfs.ondispose: the entries in that array
-     are items to clean up when oVfs.dispose() is called, but in this
-     environment it will never be called. The VFS instance simply
-     hangs around until the WASM module instance is cleaned up. We
-     "could" _hypothetically_ clean it up by "importing" an
-     sqlite3_os_end() impl into the wasm build, but the shutdown order
-     of the wasm engine and the JS one are undefined so there is no
-     guaranty that the oVfs instance would be available in one
-     environment or the other when sqlite3_os_end() is called (_if_ it
-     gets called at all in a wasm build, which is undefined).
-  */
-
-  /**
-     Installs a StructBinder-bound function pointer member of the
-     given name and function in the given StructType target object.
-     It creates a WASM proxy for the given function and arranges for
-     that proxy to be cleaned up when tgt.dispose() is called.  Throws
-     on the slightest hint of error (e.g. tgt is-not-a StructType,
-     name does not map to a struct-bound member, etc.).
-
-     Returns a proxy for this function which is bound to tgt and takes
-     2 args (name,func). That function returns the same thing,
-     permitting calls to be chained.
-
-     If called with only 1 arg, it has no side effects but returns a
-     func with the same signature as described above.
-  */
-  const installMethod = function callee(tgt, name, func){
-    if(!(tgt instanceof StructBinder.StructType)){
-      toss("Usage error: target object is-not-a StructType.");
-    }
-    if(1===arguments.length){
-      return (n,f)=>callee(tgt,n,f);
-    }
-    if(!callee.argcProxy){
-      callee.argcProxy = function(func,sig){
-        return function(...args){
-          if(func.length!==arguments.length){
-            toss("Argument mismatch. Native signature is:",sig);
-          }
-          return func.apply(this, args);
-        }
-      };
-      callee.removeFuncList = function(){
-        if(this.ondispose.__removeFuncList){
-          this.ondispose.__removeFuncList.forEach(
-            (v,ndx)=>{
-              if('number'===typeof v){
-                try{wasm.uninstallFunction(v)}
-                catch(e){/*ignore*/}
-              }
-              /* else it's a descriptive label for the next number in
-                 the list. */
-            }
-          );
-          delete this.ondispose.__removeFuncList;
-        }
-      };
-    }/*static init*/
-    const sigN = tgt.memberSignature(name);
-    if(sigN.length<2){
-      toss("Member",name," is not a function pointer. Signature =",sigN);
-    }
-    const memKey = tgt.memberKey(name);
-    //log("installMethod",tgt, name, sigN);
-    const fProxy = 1
-          // We can remove this proxy middle-man once the VFS is working
-          ? callee.argcProxy(func, sigN)
-          : func;
-    const pFunc = wasm.installFunction(fProxy, tgt.memberSignature(name, true));
-    tgt[memKey] = pFunc;
-    if(!tgt.ondispose) tgt.ondispose = [];
-    if(!tgt.ondispose.__removeFuncList){
-      tgt.ondispose.push('ondispose.__removeFuncList handler',
-                         callee.removeFuncList);
-      tgt.ondispose.__removeFuncList = [];
-    }
-    tgt.ondispose.__removeFuncList.push(memKey, pFunc);
-    return (n,f)=>callee(tgt, n, f);
-  }/*installMethod*/;
-
-  /**
-     Map of sqlite3_file pointers to OPFS handles.
-  */
-  const __opfsHandles = Object.create(null);
-
-  /**
-     Generates a random ASCII string len characters long, intended for
-     use as a temporary file name.
-  */
-  const randomFilename = function f(len=16){
-    if(!f._chars){
-      f._chars = "abcdefghijklmnopqrstuvwxyz"+
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZ"+
-        "012346789";
-      f._n = f._chars.length;
-    }
-    const a = [];
-    let i = 0;
-    for( ; i < len; ++i){
-      const ndx = Math.random() * (f._n * 64) % f._n | 0;
-      a[i] = f._chars[ndx];
-    }
-    return a.join('');
-  };
-
-  const rootDir = await navigator.storage.getDirectory();
-  log("rootDir =",rootDir);
-  
-  ////////////////////////////////////////////////////////////////////////
-  // Set up OPFS VFS methods...
-  let inst = installMethod(oVfs);
-  inst('xOpen', function(pVfs, zName, pFile, flags, pOutFlags){
-    const f = new sqlite3_file(pFile);
-    f.$pMethods = oIom.pointer;
-    __opfsHandles[pFile] = f;
-    f.opfsHandle = null /* TODO */;
-    if(flags & capi.SQLITE_OPEN_DELETEONCLOSE){
-      f.deleteOnClose = true;
-    }
-    f.filename = zName ? wasm.cstringToJs(zName) : 'sqlite3-xOpen-'+randomFilename();
-    error("OPFS sqlite3_vfs::xOpen is not yet full implemented.");
-    return capi.SQLITE_IOERR;
-  })
-  ('xFullPathname', function(pVfs,zName,nOut,pOut){
-    /* Until/unless we have some notion of "current dir"
-       in OPFS, simply copy zName to pOut... */
-    const i = wasm.cstrncpy(pOut, zName, nOut);
-    return i<nOut ? 0 : capi.SQLITE_CANTOPEN
-    /*CANTOPEN is required by the docs but SQLITE_RANGE would be a closer match*/;
-  })
-  ('xAccess', function(pVfs,zName,flags,pOut){
-    error("OPFS sqlite3_vfs::xAccess is not yet implemented.");
-    let fileExists = 0;
-    switch(flags){
-        case capi.SQLITE_ACCESS_EXISTS: break;
-        case capi.SQLITE_ACCESS_READWRITE: break;
-        case capi.SQLITE_ACCESS_READ/*docs say this is never used*/:
-        default:
-          error("Unexpected flags value for sqlite3_vfs::xAccess():",flags);
-          return capi.SQLITE_MISUSE;
-    }
-    wasm.setMemValue(pOut, fileExists, 'i32');
-    return 0;
-  })
-  ('xDelete', function(pVfs, zName, doSyncDir){
-    error("OPFS sqlite3_vfs::xDelete is not yet implemented.");
-    // https://source.chromium.org/chromium/chromium/src/+/main:third_party/blink/renderer/modules/file_system_access/file_system_handle.idl
-    // ==> remove()
-    return capi.SQLITE_IOERR;
-  })
-  ('xGetLastError', function(pVfs,nOut,pOut){
-    debug("OPFS sqlite3_vfs::xGetLastError() has nothing sensible to return.");
-    return 0;
-  })
-  ('xCurrentTime', function(pVfs,pOut){
-    /* If it turns out that we need to adjust for timezone, see:
-       https://stackoverflow.com/a/11760121/1458521 */
-    wasm.setMemValue(pOut, 2440587.5 + (new Date().getTime()/86400000),
-                     'double');
-    return 0;
-  })
-  ('xCurrentTimeInt64',function(pVfs,pOut){
-    // TODO: confirm that this calculation is correct
-    wasm.setMemValue(pOut, (2440587.5 * 86400000) + new Date().getTime(),
-                     'i64');
-    return 0;
-  });
-  if(!oVfs.$xSleep){
-    inst('xSleep', function(pVfs,ms){
-      error("sqlite3_vfs::xSleep(",ms,") cannot be implemented from "+
-           "JS and we have no default VFS to copy the impl from.");
-      return 0;
-    });
-  }
-  if(!oVfs.$xRandomness){
-    inst('xRandomness', function(pVfs, nOut, pOut){
-      const heap = wasm.heap8u();
-      let i = 0;
-      for(; i < nOut; ++i) heap[pOut + i] = (Math.random()*255000) & 0xFF;
-      return i;
-    });
-  }
-
-  ////////////////////////////////////////////////////////////////////////
-  // Set up OPFS sqlite3_io_methods...
-  inst = installMethod(oIom);
-  inst('xClose', async function(pFile){
-    warn("xClose(",arguments,") uses await");
-    const f = __opfsHandles[pFile];
-    delete __opfsHandles[pFile];
-    if(f.opfsHandle){
-      await f.opfsHandle.close();
-      if(f.deleteOnClose){
-        // TODO
-      }
-    }
-    f.dispose();
-    return 0;
-  })
-  ('xRead', /*i(ppij)*/function(pFile,pDest,n,offset){
-    /* int (*xRead)(sqlite3_file*, void*, int iAmt, sqlite3_int64 iOfst) */
-    try {
-      const f = __opfsHandles[pFile];
-      const heap = wasm.heap8u();
-      const b = new Uint8Array(heap.buffer, pDest, n);
-      const nRead = f.opfsHandle.read(b, {at: offset});
-      if(nRead<n){
-        // MUST zero-fill short reads (per the docs)
-        heap.fill(0, dest + nRead, n - nRead);
-      }
-      return 0;
-    }catch(e){
-      error("xRead(",arguments,") failed:",e);
-      return capi.SQLITE_IOERR_READ;
-    }
-  })
-  ('xWrite', /*i(ppij)*/function(pFile,pSrc,n,offset){
-    /* int (*xWrite)(sqlite3_file*, const void*, int iAmt, sqlite3_int64 iOfst) */
-    try {
-      const f = __opfsHandles[pFile];
-      const b = new Uint8Array(wasm.heap8u().buffer, pSrc, n);
-      const nOut = f.opfsHandle.write(b, {at: offset});
-      if(nOut<n){
-        error("xWrite(",arguments,") short write!");
-        return capi.SQLITE_IOERR_WRITE;
-      }
-      return 0;
-    }catch(e){
-      error("xWrite(",arguments,") failed:",e);
-      return capi.SQLITE_IOERR_WRITE;
-    }
-  })
-  ('xTruncate', /*i(pj)*/async function(pFile,sz){
-    /* int (*xTruncate)(sqlite3_file*, sqlite3_int64 size) */
-    try{
-      warn("xTruncate(",arguments,") uses await");
-      const f = __opfsHandles[pFile];
-      await f.opfsHandle.truncate(sz);
-      return 0;
-    }
-    catch(e){
-      error("xTruncate(",arguments,") failed:",e);
-      return capi.SQLITE_IOERR_TRUNCATE;
-    }
-  })
-  ('xSync', /*i(pi)*/async function(pFile,flags){
-    /* int (*xSync)(sqlite3_file*, int flags) */
-    try {
-      warn("xSync(",arguments,") uses await");
-      const f = __opfsHandles[pFile];
-      await f.opfsHandle.flush();
-      return 0;
-    }catch(e){
-      error("xSync(",arguments,") failed:",e);
-      return capi.SQLITE_IOERR_SYNC;
-    }
-  })
-  ('xFileSize', /*i(pp)*/async function(pFile,pSz){
-    /* int (*xFileSize)(sqlite3_file*, sqlite3_int64 *pSize) */
-    try {
-      warn("xFileSize(",arguments,") uses await");
-      const f = __opfsHandles[pFile];
-      const fsz = await f.opfsHandle.getSize();
-      capi.wasm.setMemValue(pSz, fsz,'i64');
-      return 0;
-    }catch(e){
-      error("xFileSize(",arguments,") failed:",e);
-      return capi.SQLITE_IOERR_SEEK;
-    }
-  })
-  ('xLock', /*i(pi)*/function(pFile,lockType){
-    /* int (*xLock)(sqlite3_file*, int) */
-    // Opening a handle locks it automatically.
-    warn("xLock(",arguments,") is a no-op");
-    return 0;
-  })
-  ('xUnlock', /*i(pi)*/function(pFile,lockType){
-    /* int (*xUnlock)(sqlite3_file*, int) */
-    // Opening a handle locks it automatically.
-    warn("xUnlock(",arguments,") is a no-op");
-    return 0;
-  })
-  ('xCheckReservedLock', /*i(pp)*/function(pFile,pOut){
-    /* int (*xCheckReservedLock)(sqlite3_file*, int *pResOut) */
-    // Exclusive lock is automatically acquired when opened
-    warn("xCheckReservedLock(",arguments,") is a no-op");
-    wasm.setMemValue(pOut,1,'i32');
-    return 0;
-  })
-  ('xFileControl', /*i(pip)*/function(pFile,op,pArg){
-    /* int (*xFileControl)(sqlite3_file*, int op, void *pArg) */
-    debug("xFileControl(",arguments,") is a no-op");
-    return capi.SQLITE_NOTFOUND;
-  })
-  ('xDeviceCharacteristics',/*i(p)*/function(pFile){
-    /* int (*xDeviceCharacteristics)(sqlite3_file*) */
-    debug("xDeviceCharacteristics(",pFile,")");
-    return capi.SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN;
-  });
-  // xSectorSize may be NULL
-  //('xSectorSize', function(pFile){
-  //  /* int (*xSectorSize)(sqlite3_file*) */
-  //  log("xSectorSize(",pFile,")");
-  //  return 4096 /* ==> SQLITE_DEFAULT_SECTOR_SIZE */;
-  //})
-
-  const rc = capi.sqlite3_vfs_register(oVfs.pointer, 0);
-  if(rc){
-    oVfs.dispose();
-    toss("sqlite3_vfs_register(OPFS) failed with rc",rc);
-  }
-  capi.sqlite3_vfs_register.addReference(oVfs, oIom);
-  warn("End of (very incomplete) OPFS setup.", oVfs);
-  //oVfs.dispose()/*only because we can't yet do anything with it*/;
-
-}/*initOpfsBits()*/;
-
-(async function(){
-  importScripts('sqlite3.js');
-
-  const test1 = function(db){
-    db.exec("create table if not exists t(a);")
-      .transaction(function(db){
-        db.prepare("insert into t(a) values(?)")
-          .bind(new Date().getTime())
-          .stepFinalize();
-        stdout("Number of values in table t:",
-            db.selectValue("select count(*) from t"));
-      });
-  };
-
-  const runTests = async function(Module){
-    //stdout("Module",Module);
-    self._MODULE = Module /* this is only to facilitate testing from the console */;
-    const sqlite3 = Module.sqlite3,
-          capi = sqlite3.capi,
-          oo = sqlite3.oo1,
-          wasm = capi.wasm;
-    stdout("Loaded sqlite3:",capi.sqlite3_libversion(), capi.sqlite3_sourceid());
-
-    if(1){
-      let errCount = 0;
-      [
-        'FileSystemHandle', 'FileSystemFileHandle', 'FileSystemDirectoryHandle',
-        'FileSystemSyncAccessHandle'
-      ].forEach(function(n){
-        const f = self[n];
-        if(f){
-          warn(n,f);
-          warn(n+'.prototype',f.prototype);
-        }else{
-          stderr("MISSING",n);
-          ++errCount;
-        }
-      });
-      if(errCount) return;
-    }
-    warn('self',self);
-    await initOpfsBits(sqlite3);
-
-    if(1) return;
-    
-    let persistentDir;
-    if(1){
-      persistentDir = '';
-    }else{
-      persistentDir = capi.sqlite3_web_persistent_dir();
-      if(persistentDir){
-        stderr("Persistent storage dir:",persistentDir);
-      }else{
-        stderr("No persistent storage available.");
-        return;
-      }
-    }
-    const startTime = performance.now();
-    let db;
-    try {
-      db = new oo.DB(persistentDir+'/foo.db');
-      stdout("DB filename:",db.filename,db.fileName());
-      const banner1 = '>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>',
-            banner2 = '<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<';
-      [
-        test1
-      ].forEach((f)=>{
-        const n = performance.now();
-        stdout(banner1,"Running",f.name+"()...");
-        f(db, sqlite3, Module);
-        stdout(banner2,f.name+"() took ",(performance.now() - n),"ms");
-      });
-    }finally{
-      if(db) db.close();
-    }
-    stdout("Total test time:",(performance.now() - startTime),"ms");
-  };
-
-  sqlite3InitModule(self.sqlite3TestModule).then(runTests);
-})();
diff --git a/ext/wasm/scratchpad-wasmfs-main.js b/ext/wasm/scratchpad-wasmfs-main.js
index 9f7d3fb1d8..bb0edbcfbc 100644
--- a/ext/wasm/scratchpad-wasmfs-main.js
+++ b/ext/wasm/scratchpad-wasmfs-main.js
@@ -52,7 +52,7 @@
     let db;
     try {
       db = new oo.DB(persistentDir+'/foo.db');
-      stdout("DB filename:",db.filename,db.fileName());
+      stdout("DB filename:",db.filename,db.getFilename());
       const banner1 = '>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>',
             banner2 = '<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<';
       [
diff --git a/ext/wasm/sqlite3-opfs-async-proxy.js b/ext/wasm/sqlite3-opfs-async-proxy.js
index 00b4025569..5969962d7a 100644
--- a/ext/wasm/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/sqlite3-opfs-async-proxy.js
@@ -164,7 +164,7 @@ const vfsAsyncImpls = {
       storeAndNotify(opName, state.sq3Codes.SQLITE_NOFOUND);
     }
   },
-  xDelete: async function({filename, syncDir/*ignored*/}){
+  xDeleteNoWait: async function({filename, syncDir, recursive = false}){
     /* The syncDir flag is, for purposes of the VFS API's semantics,
        ignored here. However, if it has the value 0x1234 then: after
        deleting the given file, recursively try to delete any empty
@@ -178,12 +178,13 @@ const vfsAsyncImpls = {
        is false.
     */
     log("xDelete(",arguments[0],")");
+    let rc = 0;
     try {
       while(filename){
         const [hDir, filenamePart] = await getDirForPath(filename, false);
         //log("Removing:",hDir, filenamePart);
         if(!filenamePart) break;
-        await hDir.removeEntry(filenamePart);
+        await hDir.removeEntry(filenamePart, {recursive});
         if(0x1234 !== syncDir) break;
         filename = getResolvedPath(filename, true);
         filename.pop();
@@ -193,8 +194,23 @@ const vfsAsyncImpls = {
       /* Ignoring: _presumably_ the file can't be found or a dir is
          not empty. */
       //error("Delete failed",filename, e.message);
+      rc = state.sq3Codes.SQLITE_IOERR_DELETE;
     }
-    storeAndNotify('xDelete', 0);
+    return rc;
+  },
+  xDelete: async function(...args){
+    const rc = await vfsAsyncImpls.xDeleteNoWait(...args);
+    storeAndNotify('xDelete', rc);
+  },
+  mkdir: async function(dirname){
+    let rc = 0;
+    try {
+        await getDirForPath(dirname+"/filepart", true);
+    }catch(e){
+      //error("mkdir failed",filename, e.message);
+      rc = state.sq3Codes.SQLITE_IOERR;
+    }
+    storeAndNotify('mkdir', rc);
   },
   xFileSize: async function(fid){
     log("xFileSize(",arguments,")");
diff --git a/ext/wasm/test-opfs-vfs.html b/ext/wasm/test-opfs-vfs.html
index 6e470ecc88..41b278c289 100644
--- a/ext/wasm/test-opfs-vfs.html
+++ b/ext/wasm/test-opfs-vfs.html
@@ -15,8 +15,10 @@
       very much incomplete, under construction, and experimental.
       <strong>See the dev console for all output.</strong>
     </div>
-    <div id='test-output'>
+    <div>
+      <a href='?delete'>Use this link</a> to delete the persistent OPFS-side db (if any).
     </div>
+    <div id='test-output'></div>
     <script>new Worker("test-opfs-vfs.js"+self.location.search);</script>
   </body>
 </html>
diff --git a/ext/wasm/test-opfs-vfs.js b/ext/wasm/test-opfs-vfs.js
index fd71c9cdcf..04497c1c14 100644
--- a/ext/wasm/test-opfs-vfs.js
+++ b/ext/wasm/test-opfs-vfs.js
@@ -34,12 +34,16 @@ const tryOpfsVfs = function(sqlite3){
   const oVfs = capi.sqlite3_vfs.instanceForPointer(pVfs) || toss("Unexpected instanceForPointer() result.");;
   log("OPFS VFS:",pVfs, oVfs);
 
+  const urlArgs = new URL(self.location.href).searchParams;
   const dbFile = "my-persistent.db";
-  const db = new sqlite3.oo1.DB(dbFile, "c", "opfs");
+  if(urlArgs.has('delete')) sqlite3.opfs.deleteEntry(dbFile);
+
+  const opfs = sqlite3.opfs;
+  const db = new opfs.OpfsDb(dbFile);
   log("db file:",db.filename);
   try{
-    let n = db.selectValue("select count(*) from sqlite_schema");
-    if(n){
+    if(opfs.entryExists(dbFile)){
+      let n = db.selectValue("select count(*) from sqlite_schema");
       log("Persistent data found. sqlite_schema entry count =",n);
     }
     db.transaction((db)=>{
@@ -54,6 +58,17 @@ const tryOpfsVfs = function(sqlite3){
       });
     });
     log("count(*) from t =",db.selectValue("select count(*) from t"));
+
+    // Some sanity checks of the opfs utility functions...
+    const testDir = '/sqlite3-opfs-'+opfs.randomFilename(12);
+    const aDir = testDir+'/test/dir';
+    opfs.mkdir(aDir) || toss("mkdir failed");
+    opfs.mkdir(aDir) || toss("mkdir must pass if the dir exists");
+    opfs.deleteEntry(testDir+'/test') && toss("delete 1 should have failed (dir not empty)");
+    opfs.deleteEntry(testDir+'/test/dir') || toss("delete 2 failed");
+    opfs.deleteEntry(testDir+'/test/dir') && toss("delete 2b should have failed (dir already deleted)");
+    opfs.deleteEntry(testDir,true) || toss("delete 3 failed");
+    opfs.entryExists(testDir) && toss("entryExists(",testDir,") should have failed");
   }finally{
     db.close();
   }
@@ -62,10 +77,9 @@ const tryOpfsVfs = function(sqlite3){
 }/*tryOpfsVfs()*/;
 
 importScripts('sqlite3.js');
-self.sqlite3InitModule().then((EmscriptenModule)=>{
-  EmscriptenModule.sqlite3.installOpfsVfs()
-    .then((sqlite3)=>tryOpfsVfs(sqlite3))
-    .catch((e)=>{
-      console.error("Error initializing OPFS VFS:",e);
-    });
-});
+self.sqlite3InitModule()
+  .then((EmscriptenModule)=>EmscriptenModule.sqlite3.installOpfsVfs())
+  .then((sqlite3)=>tryOpfsVfs(sqlite3))
+  .catch((e)=>{
+    console.error("Error initializing module:",e);
+  });
diff --git a/ext/wasm/testing1.js b/ext/wasm/testing1.js
index e45b52bfa0..5743719096 100644
--- a/ext/wasm/testing1.js
+++ b/ext/wasm/testing1.js
@@ -1057,7 +1057,7 @@
 
     let dbName = "/testing1.sqlite3";
     let vfsName = undefined;
-    if(capi.sqlite3_web_db_is_kvvfs()){
+    if(capi.sqlite3_web_db_uses_vfs(0,"kvvfs")){
       dbName = "local";
       vfsName = 'kvvfs';
       logHtml("Found kvvfs. Clearing db(s) from sessionStorage and localStorage",
@@ -1065,9 +1065,9 @@
       clearKvvfs();
     }
     const db = new oo.DB(dbName,'c',vfsName), startTime = performance.now();
-    log("capi.sqlite3_web_db_is_kvvfs() ==",capi.sqlite3_web_db_is_kvvfs(db.pointer));
+    log("db is kvvfs?",capi.sqlite3_web_db_uses_vfs(db.pointer,"kvvfs"));
     try {
-      log("db.filename =",db.filename,"db.fileName() =",db.fileName());
+      log("db.filename =",db.filename,"db.fileName() =",db.getFilename());
       const banner1 = '>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>',
             banner2 = '<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<';
       [
diff --git a/manifest b/manifest
index ab3e8572f1..adc88dd13b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Move\sthe\sOPFS\sVFS\sbits\sback\sinto\sapi/sqlite3-api-opfs.js.\sRefactor\sthe\sOPFS\sVFS\sinit\sprocess\sto\suse\sa\sPromise-returning\sfunction\swhich\sthe\sclient\smust\scall,\sas\sthat\seliminates\sany\suncertainty\sabout\swhen\sthe\sVFS\s(necessarily\sactivated\sasynchronously)\sactually\sbecomes\savailable\sto\sthe\sclient.\sRename\sx-sync-async.*\sto\stest-opfs-vfs.*\sMilestone:\sfirst\ssuccessful\stest\sof\sOPFS\swithout\sWASMFS.
-D 2022-09-18T03:05:55.278
+C Numerous\scleanups\sin\sthe\sJS\sbits.\sRemoved\ssome\snow-defunct\swasm\stest\sfiles.\sExpose\ssqlite3.opfs\sobject\scontaining\svarious\sOPFS-specific\sutilities.
+D 2022-09-18T17:32:35.336
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -483,10 +483,10 @@ F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba814
 F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a4a06cb776c003880b
 F ext/wasm/api/sqlite3-api-cleanup.js 8564a6077cdcaea9a9f428a019af8a05887f0131e6a2a1e72a7ff1145fadfe77
 F ext/wasm/api/sqlite3-api-glue.js 366d580c8e5bf7fcf4c6dee6f646c31f5549bd417ea03a59a0acca00e8ecce30
-F ext/wasm/api/sqlite3-api-oo1.js d7526517f7ad3f6bda16ad66d373bbb71b43168deef7af60eda5c9fe873d1387
-F ext/wasm/api/sqlite3-api-opfs.js 87d98f2449d5790efd7044e492166e4ed767e3320a03ed5a173b2b9364fc4896
-F ext/wasm/api/sqlite3-api-prologue.js 48ebca4ae340b0242d4f39bbded01bd0588393c8023628be1c454b4db6f7bd6e
-F ext/wasm/api/sqlite3-api-worker1.js d33062afa045fd4be01ba4abc266801807472558b862b30056211b00c9c347b4
+F ext/wasm/api/sqlite3-api-oo1.js 2d13dddf0d2b4168a9249f124134d37924331e5b55e05dba18b6d661fbeefe48
+F ext/wasm/api/sqlite3-api-opfs.js 4090abf4e16b460543ff665e96822048e37a2703e0ba46a01fed3a15c024c034
+F ext/wasm/api/sqlite3-api-prologue.js 4e3e26880d444000cca1b4f3ddfa9d49581dfecd1de9426080239ecc208c447d
+F ext/wasm/api/sqlite3-api-worker1.js e8456bd9b93eab297d065b25cb7a253835f606f9349383f2aa5c585e8d3b3aef
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 4130e2df9587f4e4c3afc04c3549d682c8a5c0cfe5b22819a0a86edb7f01b9bd
 F ext/wasm/batch-runner-kvvfs.html ef3b2f553abad4f17a2a29ce6526023793a88e8597b7a24b8c7855a030b90a16
@@ -502,7 +502,7 @@ F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d695
 F ext/wasm/fiddle/fiddle-worker.js bccf46045be8824752876f3eec01c223be0616ccac184bffd0024cfe7a3262b8
 F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
 F ext/wasm/fiddle/fiddle.js 4ffcfc9a235beebaddec689a549e9e0dfad6dca5c1f0b41f03468d7e76480686
-F ext/wasm/index.html 492eb6c9023c9cda391c61702a28bd18e6c986ca2588ec3f384275bb77275285
+F ext/wasm/index.html d698cc021c25ca940f67805c2cc2848c303705d98b4c4f9f55565b9a9c37d2bb
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 447cc02b598f7792edaa8ae6853a7847b8178a18ed356afacbdbf312b2588106
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
@@ -510,11 +510,8 @@ F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e5
 F ext/wasm/kvvfs.make 4b2ba6d061f3a52da9f5812f86f4faa80fb4d9456a152f6b0585dccd667a4e22
 F ext/wasm/kvvfs1.html 13bb24190bfb276a57b228499519badcc1bf39ed07e4b37bc2a425ce6418fed1
 F ext/wasm/kvvfs1.js ec1c1d071bb055711f9151df05616111432cf3e6bf7ac7f8dcbcfb56c9d9ed48
-F ext/wasm/scratchpad-opfs-worker.html 5fdda167571264300f388847d34f00b77dd48984a8dba2ee9c099c3ffa05db66
-F ext/wasm/scratchpad-opfs-worker.js cf6c4554d3b099c1a50013e50d19b3dc60e183511b4b4dbe7fabc2b9d3360567
-F ext/wasm/scratchpad-opfs-worker2.js 8c980370bbd5a262d96af8627c443936e11b87d0263a02123769d5953fc146da
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
-F ext/wasm/scratchpad-wasmfs-main.js 69e960e9161f6412fd0c30f355d4112f1894d6609eb431e2d16d207d1380518e
+F ext/wasm/scratchpad-wasmfs-main.js f0836e3576df7a89390d777bb53e142e559e8a79becfb2a5a976490b05a1c4fa
 F ext/wasm/speedtest1-kvvfs.html c8b65c20e2b35298dc02d8e0a394d5e1eb857fd22e504468388234aee13aef08
 F ext/wasm/speedtest1-wasmfs.html 6a67a6812f03a2058eb5c6ad0c8dea4bf749d0160ed9d6b826dabe7b766c3cf7
 F ext/wasm/speedtest1-worker.html d8881ae802d15fb8adb94049265173e99f350e07e1d4e6f9e1cbd8969fe63a04
@@ -523,15 +520,15 @@ F ext/wasm/speedtest1.html fbb8e4d1639028443f3687a683be660beca6927920545cf6b1fdf
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
-F ext/wasm/sqlite3-opfs-async-proxy.js 456bef1253fd4732f133b601a4450b7f8461e67af6e8d30bf8a239ad775c77a2
+F ext/wasm/sqlite3-opfs-async-proxy.js 6e89e1af7c616afdd877cbcf5d0ec3d5f47ba252b9a19e696140b9495dc1e653
 F ext/wasm/sqlite3-worker1-promiser.js 92b8da5f38439ffec459a8215775d30fa498bc0f1ab929ff341fc3dd479660b9
 F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
-F ext/wasm/test-opfs-vfs.html 3e11c875c28f041891deeea6b2375121845ee1269cac6747df957ec0c7d4d37a w ext/wasm/x-sync-async.html
-F ext/wasm/test-opfs-vfs.js bf70cd553a443b4eda63b577787ef73144f879fa062a20a73bb44e3242c81a15 w ext/wasm/x-sync-async.js
+F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
+F ext/wasm/test-opfs-vfs.js 753c6b86dd8ce0813121add44726a038ba1b83acebdc8414189cb163faf23e6d
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
 F ext/wasm/testing-worker1-promiser.js 63448fddfd3b8c89ff667d17c8b31c6c2259dd4647ebbbd28f3a921c48e924da
 F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d7669fb17fcae
-F ext/wasm/testing1.js 7cd8ab255c238b030d928755ae8e91e7d90a12f2ae601b1b8f7827aaa4fb258e
+F ext/wasm/testing1.js 507001a970fe8a8eb67b6c8d783e1c1daa3db2719f727c4551af29349410e538
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
 F ext/wasm/testing2.js 25584bcc30f19673ce13a6f301f89f8820a59dfe044e0c4f2913941f4097fe3c
 F ext/wasm/wasmfs.make 21a5cf297954a689e0dc2a95299ae158f681cae5e90c10b99d986097815fd42d
@@ -2030,8 +2027,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 1c660970d0f62bcfd6e698a72b050d99972a1e39f45a5ac24194a190f8f78ab3
-R 039a2cd7ec4da87358ad6184da91bc68
+P b2abf60dbfa6648f671a3932cb65feb28d05a0d5b7f792351d14f9c13d9798c5
+R 79bf69f52699f5d039971f9fe79e1ec3
 U stephan
-Z 58e9ce410c47c756bc153984b857c4cf
+Z 77273ebd9a43ebba5449759a950a89f3
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index d80c68d21c..6e29cdca81 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b2abf60dbfa6648f671a3932cb65feb28d05a0d5b7f792351d14f9c13d9798c5
\ No newline at end of file
+26e625d05d9820033b23536f18ad3ddc59ed712ad507d4b0c7fe88abd15d2be8
\ No newline at end of file

From ed85333977d5d2f5ce36ba2b04a9729fabad73bb Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 19 Sep 2022 00:40:53 +0000
Subject: [PATCH 129/428] Disable build of wasmfs-using components on aarch64
 (ARM), as wasmfs won't build there.

FossilOrigin-Name: 9a9eeebc2c27b734041089131b4952d7c0440df48ef32f355641aca61d4b30a0
---
 ext/wasm/GNUmakefile | 11 +++++++++++
 manifest             | 12 ++++++------
 manifest.uuid        |  2 +-
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 20354a6b5f..730c31642b 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -435,4 +435,15 @@ oz:
 ########################################################################
 # Sub-makes...
 include kvvfs.make
+
+########################################################################
+# Some platforms do not support the WASMFS build. Raspberry Pi OS is one
+# of them. As such platforms are discovered, add their (uname -m) name
+# to PLATFORMS_WITH_NO_WASMFS to exclude the wasmfs build parts.
+PLATFORMS_WITH_NO_WASMFS := aarch64 # add any others here
+THIS_ARCH := $(shell /usr/bin/uname -m)
+ifneq (,$(filter $(THIS_ARCH),$(PLATFORMS_WITH_NO_WASMFS)))
+$(info This platform does not support the WASMFS build.)
+else
 include wasmfs.make
+endif
diff --git a/manifest b/manifest
index adc88dd13b..59f75f956d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Numerous\scleanups\sin\sthe\sJS\sbits.\sRemoved\ssome\snow-defunct\swasm\stest\sfiles.\sExpose\ssqlite3.opfs\sobject\scontaining\svarious\sOPFS-specific\sutilities.
-D 2022-09-18T17:32:35.336
+C Disable\sbuild\sof\swasmfs-using\scomponents\son\saarch64\s(ARM),\sas\swasmfs\swon't\sbuild\sthere.
+D 2022-09-19T00:40:53.768
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle 7fb73f7150ab79d83bb45a67d257553c905c78cd3d693101699243f36c5ae6c3
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile 24e5802cc186b492b3ef6290b64b857e51aa0afaa929b74a68f9fb457c4e8814
+F ext/wasm/GNUmakefile 19ba3304cf4e5e5f480a5c3701b2c7d7b7383f70416359fc4a1d304b4ffdd895
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 150a793a47205b8009ac934f3b6d6ebf67b965c072339aaa25ce808a19e116cc
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -2027,8 +2027,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 b2abf60dbfa6648f671a3932cb65feb28d05a0d5b7f792351d14f9c13d9798c5
-R 79bf69f52699f5d039971f9fe79e1ec3
+P 26e625d05d9820033b23536f18ad3ddc59ed712ad507d4b0c7fe88abd15d2be8
+R 21836a2cce93d296ed51495c106454e4
 U stephan
-Z 77273ebd9a43ebba5449759a950a89f3
+Z 476194268503f5b6d3efae07b951acc1
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 6e29cdca81..2d549f8541 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-26e625d05d9820033b23536f18ad3ddc59ed712ad507d4b0c7fe88abd15d2be8
\ No newline at end of file
+9a9eeebc2c27b734041089131b4952d7c0440df48ef32f355641aca61d4b30a0
\ No newline at end of file

From ac51eb77546653a6e0563adc0f3460ae69744485 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 19 Sep 2022 03:57:31 +0000
Subject: [PATCH 130/428] Rename demo-oo1.* to demo-123.* and add
 demo-123-worker.html, which runs the same demo via a Worker. Doc typo fixes.

FossilOrigin-Name: 2e4a005bd35424caeaa99ace23162cf79e2ebdb159475ffad92b85dc864ad764
---
 ext/wasm/api/sqlite3-api-worker1.js   |   7 +-
 ext/wasm/demo-123-worker.html         |  40 +++++++++
 ext/wasm/demo-123.html                |  24 ++++++
 ext/wasm/{demo-oo1.js => demo-123.js} | 118 ++++++++++++++++----------
 ext/wasm/demo-oo1.html                |  34 --------
 ext/wasm/index.html                   |  14 ++-
 ext/wasm/sqlite3-worker1-promiser.js  |  33 ++++---
 manifest                              |  21 ++---
 manifest.uuid                         |   2 +-
 9 files changed, 181 insertions(+), 112 deletions(-)
 create mode 100644 ext/wasm/demo-123-worker.html
 create mode 100644 ext/wasm/demo-123.html
 rename ext/wasm/{demo-oo1.js => demo-123.js} (67%)
 delete mode 100644 ext/wasm/demo-oo1.html

diff --git a/ext/wasm/api/sqlite3-api-worker1.js b/ext/wasm/api/sqlite3-api-worker1.js
index 97f2677e6c..b41a837e9f 100644
--- a/ext/wasm/api/sqlite3-api-worker1.js
+++ b/ext/wasm/api/sqlite3-api-worker1.js
@@ -326,13 +326,12 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
 sqlite3.initWorker1API = function(){
   'use strict';
   const toss = (...args)=>{throw new Error(args.join(' '))};
-  if('function' !== typeof importScripts){
-    toss("Cannot initalize the sqlite3 worker API in the main thread.");
+  if(self.window === self || 'function' !== typeof importScripts){
+    toss("initWorker1API() must be run from a Worker thread.");
   }
   const self = this.self;
   const sqlite3 = this.sqlite3 || toss("Missing this.sqlite3 object.");
-  const SQLite3 = sqlite3.oo1 || toss("Missing this.sqlite3.oo1 OO API.");
-  const DB = SQLite3.DB;
+  const DB = sqlite3.oo1.DB;
 
   /**
      Returns the app-wide unique ID for the given db, creating one if
diff --git a/ext/wasm/demo-123-worker.html b/ext/wasm/demo-123-worker.html
new file mode 100644
index 0000000000..7480037a16
--- /dev/null
+++ b/ext/wasm/demo-123-worker.html
@@ -0,0 +1,40 @@
+<!doctype html>
+<html lang="en-us">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
+    <title>Hello, sqlite3</title>
+    <style>
+      .warning, .error {color: red}
+      .error {background-color: yellow}
+      body {
+          display: flex;
+          flex-direction: column;
+          font-family: monospace;
+          white-space: break-spaces;
+      }
+    </style>
+  </head>
+  <body>
+    <h1>1-2-sqlite3 worker demo</h2>
+    <script>(function(){
+      const logHtml = function(cssClass,...args){
+        const ln = document.createElement('div');
+        if(cssClass) ln.classList.add(cssClass);
+        ln.append(document.createTextNode(args.join(' ')));
+        document.body.append(ln);
+      };
+      const w = new Worker("demo-123.js");
+      w.onmessage = function({data}){
+        switch(data.type){
+            case 'log':
+              logHtml(data.payload.cssClass, ...data.payload.args);
+              break;
+            default:
+              logHtml('error',"Unhandled message:",data.type);
+        };
+      };
+    })();</script>
+  </body>
+</html>
diff --git a/ext/wasm/demo-123.html b/ext/wasm/demo-123.html
new file mode 100644
index 0000000000..25fa974910
--- /dev/null
+++ b/ext/wasm/demo-123.html
@@ -0,0 +1,24 @@
+<!doctype html>
+<html lang="en-us">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
+    <title>Hello, sqlite3</title>
+    <style>
+      .warning, .error {color: red}
+      .error {background-color: yellow}
+      body {
+          display: flex;
+          flex-direction: column;
+          font-family: monospace;
+          white-space: break-spaces;
+      }
+    </style>
+  </head>
+  <body>
+    <h1>1-2-sqlite3 demo</h2>
+    <script src="sqlite3.js"></script>
+    <script src="demo-123.js"></script>
+  </body>
+</html>
diff --git a/ext/wasm/demo-oo1.js b/ext/wasm/demo-123.js
similarity index 67%
rename from ext/wasm/demo-oo1.js
rename to ext/wasm/demo-123.js
index 4564fe0ddd..7a4843a4d9 100644
--- a/ext/wasm/demo-oo1.js
+++ b/ext/wasm/demo-123.js
@@ -1,5 +1,5 @@
 /*
-  2022-08-16
+  2022-09-19
 
   The author disclaims copyright to this source code.  In place of a
   legal notice, here is a blessing:
@@ -10,34 +10,48 @@
 
   ***********************************************************************
 
-  A basic demonstration of the SQLite3 OO API #1, shorn of assertions
-  and the like to improve readability.
+  A basic demonstration of the SQLite3 OO API.
 */
 'use strict';
 (function(){
-  const toss = function(...args){throw new Error(args.join(' '))};
-  const debug = console.debug.bind(console),
-        log = console.log.bind(console),
-        warn = console.warn.bind(console),
-        error = console.error.bind(console);
+  /**
+     Set up our output channel differently depending
+     on whether we are running in a worker thread or
+     the main (UI) thread.
+  */
+  let logHtml;
+  if(self.window === self /* UI thread */){
+    logHtml = function(cssClass,...args){
+      const ln = document.createElement('div');
+      if(cssClass) ln.classList.add(cssClass);
+      ln.append(document.createTextNode(args.join(' ')));
+      document.body.append(ln);
+    };
+  }else{ /* Worker thread */
+    logHtml = function(cssClass,...args){
+      postMessage({
+        type:'log',
+        payload:{cssClass, args}
+      });
+    };
+  }
+  const log = (...args)=>logHtml('',...args);
+  const warn = (...args)=>logHtml('warning',...args);
+  const error = (...args)=>logHtml('error',...args);
 
   const demo1 = function(sqlite3){
-    const capi = sqlite3.capi,
-          oo = sqlite3.oo1,
-          wasm = capi.wasm;
-
-    const dbName = (
-      0 ? "" : capi.sqlite3_web_persistent_dir()
-    )+"/mydb.sqlite3"
-    if(0 && capi.sqlite3_web_persistent_dir()){
-      capi.wasm.sqlite3_wasm_vfs_unlink(dbName);
-    }
-    const db = new oo.DB(dbName);
-    log("db =",db.filename);
+    const capi = sqlite3.capi/*C-style API*/,
+          oo = sqlite3.oo1/*high-level OO API*/;
+    log("sqlite3 version",capi.sqlite3_libversion(), capi.sqlite3_sourceid());
+    const db = new oo.DB("/mydb.sqlite3");
+    log("transient b =",db.filename);
     /**
        Never(!) rely on garbage collection to clean up DBs and
        (especially) statements. Always wrap their lifetimes in
-       try/finally construct...
+       try/finally construct, as demonstrated below. By and large,
+       client code can avoid lifetime-related complications of
+       prepared statement objects by using the DB.exec() method for
+       SQL execution.
     */
     try {
       log("Create a table...");
@@ -48,10 +62,13 @@
         // ... numerous other options ... 
       });
       // SQL can be either a string or a byte array
+      // or an array of strings which get concatenated
+      // together as-is (so be sure to end each statement
+      // with a semicolon).
 
       log("Insert some data using exec()...");
       let i;
-      for( i = 1; i <= 5; ++i ){
+      for( i = 20; i <= 25; ++i ){
         db.exec({
           sql: "insert into t(a,b) values (?,?)",
           // bind by parameter index...
@@ -60,7 +77,7 @@
         db.exec({
           sql: "insert into t(a,b) values ($a,$b)",
           // bind by parameter name...
-          bind: {$a: i * 3, $b: i * 4}
+          bind: {$a: i * 10, $b: i * 20}
         });
       }    
 
@@ -93,7 +110,7 @@
         sql: "select a as aa, b as bb from t order by aa limit 3",
         rowMode: 'object',
         callback: function(row){
-          log("row ",++this.counter,"=",row);
+          log("row ",++this.counter,"=",JSON.stringify(row));
         }.bind({counter: 0})
       });
 
@@ -115,6 +132,15 @@
         }.bind({counter: 0})
       });
 
+      log("Query data with exec() using rowMode $COLNAME (result column name)...");
+      db.exec({
+        sql: "select a a, b from t order by a limit 3",
+        rowMode: '$a',
+        callback: function(value){
+          log("row ",++this.counter,"a =",value);
+        }.bind({counter: 0})
+      });
+
       log("Query data with exec() without a callback...");
       let resultRows = [];
       db.exec({
@@ -122,7 +148,7 @@
         rowMode: 'object',
         resultRows: resultRows
       });
-      log("Result rows:",resultRows);
+      log("Result rows:",JSON.stringify(resultRows,undefined,2));
 
       log("Create a scalar UDF...");
       db.createFunction({
@@ -144,9 +170,12 @@
       });
       log("Result column names:",columnNames);
 
-      if(0){
-        warn("UDF will throw because of incorrect arg count...");
+      try{
+        log("The following use of the twice() UDF will",
+            "fail because of incorrect arg count...");
         db.exec("select twice(1,2,3)");
+      }catch(e){
+        warn("Got expected exception:",e.message);
       }
 
       try {
@@ -170,7 +199,7 @@
           log("In savepoint: count(*) from t =",db.selectValue("select count(*) from t"));
           D.savepoint(function(DD){
             const rows = [];
-            D.exec({
+            DD.exec({
               sql: ["insert into t(a,b) values(99,100);",
                     "select count(*) from t"],
               rowMode: 0,
@@ -188,17 +217,17 @@
           throw e;
         }
       }
-
     }finally{
       db.close();
     }
 
+    log("That's all, folks!");
+
     /**
-       Misc. DB features:
+       Some of the features of the OO API not demonstrated above...
 
        - get change count (total or statement-local, 32- or 64-bit)
-       - get its file name
-       - selectValue() takes SQL and returns first column of first row.
+       - get a DB's file name
     
        Misc. Stmt features:
 
@@ -213,20 +242,21 @@
     */
   }/*demo1()*/;
 
-  const runDemos = function(Module){
-    //log("Module.sqlite3",Module);
-    const sqlite3 = Module.sqlite3,
-          capi = sqlite3.capi;
-    log("Loaded module:",capi.sqlite3_libversion(), capi.sqlite3_sourceid());
-    log("sqlite3 namespace:",sqlite3);
+  log("Loading and initializing sqlite3 module...");
+  if(self.window!==self) /*worker thread*/{
+    importScripts("sqlite3.js");
+  }
+  self.sqlite3InitModule({
+    // We can redirect any stdout/stderr from the module
+    // like so...
+    print: log,
+    printErr: error
+  }).then(function(EmscriptenModule){
+    log("Done initializing. Running demo...");
     try {
-      demo1(sqlite3);
+      demo1(EmscriptenModule.sqlite3);
     }catch(e){
       error("Exception:",e.message);
-      throw e;
     }
-  };
-
-  //self.sqlite3TestModule.sqlite3ApiConfig.persistentDirName = "/hi";
-  self.sqlite3TestModule.initSqlite3().then(runDemos);
+  });
 })();
diff --git a/ext/wasm/demo-oo1.html b/ext/wasm/demo-oo1.html
deleted file mode 100644
index 9b6e8cbfa3..0000000000
--- a/ext/wasm/demo-oo1.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!doctype html>
-<html lang="en-us">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
-    <link rel="stylesheet" href="common/emscripten.css"/>
-    <link rel="stylesheet" href="common/testing.css"/>
-    <title>sqlite3-api OO #1 Demo</title>
-  </head>
-  <body>
-    <header id='titlebar'><span>sqlite3-api OO #1 Demo</span></header>
-    <!-- emscripten bits -->
-    <figure id="module-spinner">
-      <div class="spinner"></div>
-      <div class='center'><strong>Initializing app...</strong></div>
-      <div class='center'>
-        On a slow internet connection this may take a moment.  If this
-        message displays for "a long time", intialization may have
-        failed and the JavaScript console may contain clues as to why.
-      </div>
-    </figure>
-    <div class="emscripten" id="module-status">Downloading...</div>
-    <div class="emscripten">
-      <progress value="0" max="100" id="module-progress" hidden='1'></progress>  
-    </div><!-- /emscripten bits -->
-    <div>Most stuff on this page happens in the dev console.</div>
-    <hr>
-    <div id='test-output'></div>
-    <script src="sqlite3.js"></script>
-    <script src="common/SqliteTestUtil.js"></script>
-    <script src="demo-oo1.js"></script>
-  </body>
-</html>
diff --git a/ext/wasm/index.html b/ext/wasm/index.html
index d13f9bb7f3..68b43d7652 100644
--- a/ext/wasm/index.html
+++ b/ext/wasm/index.html
@@ -22,20 +22,30 @@
           the web server emit the so-called COOP and COEP headers. The
           default build of althttpd <em>does not</em>.
         </li>
+        <li>Any OPFS-related pages require very recent
+          version of Chrome or Chromium (v102 at least, possibly
+          newer). OPFS support in the other major browsers is
+          pending.</li>
         <li>Whether or not WASMFS/OPFS support is enabled on any given
           page may depend on build-time options which are <em>off by
           default</em> because they currently (as of 2022-09-08) break
-          with Worker-based pages.
+          with Worker-based pages. Similarly, WASMFS does not work on
+          some platforms, e.g. Raspberry Pi 4.
         </li>
       </ul>
     </div>
     <div>The tests...
       <ul id='test-list'>
+        <li><a href='demo-123.html'>demo-123</a> provides a
+          no-nonsense example of adding sqlite3 support to a
+          web page. </li>
+        <li><a href='demo-123-worker.html'>demo-123-worker</a> is the
+          same as <code>demo-123</code> but loads and run sqlite3 from
+          a Worker thread.</li>
         <li><a href='testing1.html'>testing1</a>: sanity tests of the core APIs and surrounding utility code.</li>
         <li><a href='testing2.html'>testing2</a>: Worker-based test of OO API #1.</li>
         <li><a href='testing-worker1-promiser.html'>testing-worker1-promiser</a>:
           tests for the Promise-based wrapper of the Worker-based API.</li>
-        <li><a href='demo-oo1.html'>demo-oo1</a>: demonstration of the OO API #1.</li>
         <li><a href='batch-runner.html'>batch-runner</a>: runs batches of SQL exported from speedtest1.</li>
         <li><a href='batch-runner-kvvfs.html'>batch-runner-kvvfs</a>: KVVFS-specific variant of batch-runner.html.</li>
         <li><a href='speedtest1.html'>speedtest1</a>: a main-thread WASM build of speedtest1.</li>
diff --git a/ext/wasm/sqlite3-worker1-promiser.js b/ext/wasm/sqlite3-worker1-promiser.js
index 7327e14c70..37a4b5962f 100644
--- a/ext/wasm/sqlite3-worker1-promiser.js
+++ b/ext/wasm/sqlite3-worker1-promiser.js
@@ -42,7 +42,7 @@
    arguments when the worker fires its initial
    'sqlite3-api'/'worker1-ready' message, which it does when
    sqlite3.initWorker1API() completes its initialization. This is
-   the simplest way to tell the worker to kick of work at the
+   the simplest way to tell the worker to kick off work at the
    earliest opportunity.
 
    - `onerror` (optional): a callback to pass error-type events from
@@ -55,18 +55,18 @@
    are not handled by this proxy. Ideally that "should" never
    happen, as this proxy aims to handle all known message types.
 
-   - `generateMessageId` (optional): a function which, when passed
-   an about-to-be-posted message object, generates a _unique_
-   message ID for the message, which this API then assigns as the
-   messageId property of the message. It _must_ generate unique
-   IDs so that dispatching can work. If not defined, a default
-   generator is used.
+   - `generateMessageId` (optional): a function which, when passed an
+   about-to-be-posted message object, generates a _unique_ message ID
+   for the message, which this API then assigns as the messageId
+   property of the message. It _must_ generate unique IDs on each call
+   so that dispatching can work. If not defined, a default generator
+   is used (which should be sufficient for most or all cases).
 
    - `dbId` (optional): is the database ID to be used by the
    worker. This must initially be unset or a falsy value. The
    first `open` message sent to the worker will cause this config
    entry to be assigned to the ID of the opened database. That ID
-   "should" be set as the `dbId` property of the message sent in
+   "should" be set as the `dbId` property of the messages sent in
    future requests, so that the worker uses that database.
    However, if the worker is not given an explicit dbId, it will
    use the first-opened database by default. If client code needs
@@ -80,7 +80,6 @@
    - `debug` (optional): a console.debug()-style function for logging
    information about messages.
 
-
    This function returns a stateful factory function with the
    following interfaces:
 
@@ -90,13 +89,13 @@
    The first form expects the "type" and "args" values for a Worker
    message. The second expects an object in the form {type:...,
    args:...}  plus any other properties the client cares to set. This
-   function will always set the messageId property on the object,
-   even if it's already set, and will set the dbId property to
-   config.dbId if it is _not_ set in the message object.
+   function will always set the `messageId` property on the object,
+   even if it's already set, and will set the `dbId` property to
+   `config.dbId` if it is _not_ set in the message object.
 
    The function throws on error.
 
-   The function installs a temporarily message listener, posts a
+   The function installs a temporary message listener, posts a
    message to the configured Worker, and handles the message's
    response via the temporary message listener. The then() callback
    of the returned Promise is passed the `message.data` property from
@@ -108,14 +107,14 @@
 
    ```
    const config = {...};
-   const eventPromiser = sqlite3Worker1Promiser(config);
-   eventPromiser('open', {filename:"/foo.db"}).then(function(msg){
+   const sq3Promiser = sqlite3Worker1Promiser(config);
+   sq3Promiser('open', {filename:"/foo.db"}).then(function(msg){
      console.log("open response",msg); // => {type:'open', result: {filename:'/foo.db'}, ...}
      // Recall that config.dbId will be set for the first 'open'
      // call and cleared for a matching 'close' call.
    });
-   eventPromiser({type:'close'}).then((msg)=>{
-     console.log("open response",msg); // => {type:'open', result: {filename:'/foo.db'}, ...}
+   sq3Promiser({type:'close'}).then((msg)=>{
+     console.log("close response",msg); // => {type:'close', result: {filename:'/foo.db'}, ...}
      // Recall that config.dbId will be used by default for the message's dbId if
      // none is explicitly provided, and a 'close' op will clear config.dbId if it
      // closes that exact db.
diff --git a/manifest b/manifest
index 59f75f956d..ce729f04c1 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Disable\sbuild\sof\swasmfs-using\scomponents\son\saarch64\s(ARM),\sas\swasmfs\swon't\sbuild\sthere.
-D 2022-09-19T00:40:53.768
+C Rename\sdemo-oo1.*\sto\sdemo-123.*\sand\sadd\sdemo-123-worker.html,\swhich\sruns\sthe\ssame\sdemo\svia\sa\sWorker.\sDoc\stypo\sfixes.
+D 2022-09-19T03:57:31.704
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -486,7 +486,7 @@ F ext/wasm/api/sqlite3-api-glue.js 366d580c8e5bf7fcf4c6dee6f646c31f5549bd417ea03
 F ext/wasm/api/sqlite3-api-oo1.js 2d13dddf0d2b4168a9249f124134d37924331e5b55e05dba18b6d661fbeefe48
 F ext/wasm/api/sqlite3-api-opfs.js 4090abf4e16b460543ff665e96822048e37a2703e0ba46a01fed3a15c024c034
 F ext/wasm/api/sqlite3-api-prologue.js 4e3e26880d444000cca1b4f3ddfa9d49581dfecd1de9426080239ecc208c447d
-F ext/wasm/api/sqlite3-api-worker1.js e8456bd9b93eab297d065b25cb7a253835f606f9349383f2aa5c585e8d3b3aef
+F ext/wasm/api/sqlite3-api-worker1.js ee4cf149cbacb63d06b536674f822aa5088b7e022cdffc69f1f36cebe2f9fea0
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 4130e2df9587f4e4c3afc04c3549d682c8a5c0cfe5b22819a0a86edb7f01b9bd
 F ext/wasm/batch-runner-kvvfs.html ef3b2f553abad4f17a2a29ce6526023793a88e8597b7a24b8c7855a030b90a16
@@ -496,13 +496,14 @@ F ext/wasm/common/SqliteTestUtil.js 529161a624265ba84271a52db58da022649832fa1c71
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 3a5143699c2b73a85b962271e1a9b3241b30d90e30d895e4f55665e648572962
 F ext/wasm/common/whwasmutil.js f7282ef36c9625330d4e6e82d1beec6678cd101e95e7108cd85db587a788c145
-F ext/wasm/demo-oo1.html 75646855b38405d82781246fd08c852a2b3bee05dd9f0fe10ab655a8cffb79aa
-F ext/wasm/demo-oo1.js 477f230cce3455e701431436d892d8c6bfea2bdf1ddcdd32a273e2f4bb339801
+F ext/wasm/demo-123-worker.html e419b66495d209b5211ec64903b4cfb3ca7df20d652b41fcd28bf018a773234f
+F ext/wasm/demo-123.html aa281d33b7eefa755f3122b7b5a18f39a42dc5fb69c8879171bf14b4c37c4ec4 w ext/wasm/demo-oo1.html
+F ext/wasm/demo-123.js 2c5e7775339624819067fd169d202004faeddc9d8ef452dd1f95aa4b3972a5b2 w ext/wasm/demo-oo1.js
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js bccf46045be8824752876f3eec01c223be0616ccac184bffd0024cfe7a3262b8
 F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
 F ext/wasm/fiddle/fiddle.js 4ffcfc9a235beebaddec689a549e9e0dfad6dca5c1f0b41f03468d7e76480686
-F ext/wasm/index.html d698cc021c25ca940f67805c2cc2848c303705d98b4c4f9f55565b9a9c37d2bb
+F ext/wasm/index.html aed40adf52598a353e27e50480d53e59a5e75e9ba889f7d8bb2fda45a0a91c3b
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 447cc02b598f7792edaa8ae6853a7847b8178a18ed356afacbdbf312b2588106
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
@@ -521,7 +522,7 @@ F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f129
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
 F ext/wasm/sqlite3-opfs-async-proxy.js 6e89e1af7c616afdd877cbcf5d0ec3d5f47ba252b9a19e696140b9495dc1e653
-F ext/wasm/sqlite3-worker1-promiser.js 92b8da5f38439ffec459a8215775d30fa498bc0f1ab929ff341fc3dd479660b9
+F ext/wasm/sqlite3-worker1-promiser.js 4fd0465688a28a75f1d4ee4406540ba494f49844e3cad0670d0437a001943365
 F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
 F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
 F ext/wasm/test-opfs-vfs.js 753c6b86dd8ce0813121add44726a038ba1b83acebdc8414189cb163faf23e6d
@@ -2027,8 +2028,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 26e625d05d9820033b23536f18ad3ddc59ed712ad507d4b0c7fe88abd15d2be8
-R 21836a2cce93d296ed51495c106454e4
+P 9a9eeebc2c27b734041089131b4952d7c0440df48ef32f355641aca61d4b30a0
+R 8192577a9e0361d9ed4a520726bee437
 U stephan
-Z 476194268503f5b6d3efae07b951acc1
+Z 37e4874c91d49fe3eefc7a1b4b57c686
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 2d549f8541..29452e9015 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9a9eeebc2c27b734041089131b4952d7c0440df48ef32f355641aca61d4b30a0
\ No newline at end of file
+2e4a005bd35424caeaa99ace23162cf79e2ebdb159475ffad92b85dc864ad764
\ No newline at end of file

From 8766fd20d147c224f4bb6029699bb412bf636182 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 19 Sep 2022 05:19:04 +0000
Subject: [PATCH 131/428] Replace OPFS VFS xSleep() impl with a more efficient
 one (no Worker round-trip needed).

FossilOrigin-Name: b9773f164878b0a1b7c88cc7a6d1374ea95f64920065e8b2b178a1afffd82fe5
---
 ext/wasm/api/sqlite3-api-opfs.js     | 27 ++++++++++++++++-----------
 ext/wasm/sqlite3-opfs-async-proxy.js |  6 ------
 manifest                             | 18 +++++++++---------
 manifest.uuid                        |  2 +-
 4 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index ede4fb32b1..d6a9dbd22f 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -255,10 +255,6 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
       'cleanup default VFS wrapper', ()=>(dVfs ? dVfs.dispose() : null),
       'cleanup opfsIoMethods', ()=>opfsIoMethods.dispose()
     ];
-    if(dVfs){
-      opfsVfs.$xSleep = dVfs.$xSleep;
-      opfsVfs.$xRandomness = dVfs.$xRandomness;
-    }
     /**
        Pedantic sidebar about opfsVfs.ondispose: the entries in that array
        are items to clean up when opfsVfs.dispose() is called, but in this
@@ -468,6 +464,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
         warn("OPFS xGetLastError() has nothing sensible to return.");
         return 0;
       },
+      //xSleep is optionally defined below
       xOpen: function f(pVfs, zName, pFile, flags, pOutFlags){
         if(!f._){
           f._ = {
@@ -522,6 +519,10 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
       }/*xOpen()*/
     }/*vfsSyncWrappers*/;
 
+    if(dVfs){
+      opfsVfs.$xRandomness = dVfs.$xRandomness;
+      opfsVfs.$xSleep = dVfs.$xSleep;
+    }
     if(!opfsVfs.$xRandomness){
       /* If the default VFS has no xRandomness(), add a basic JS impl... */
       vfsSyncWrappers.xRandomness = function(pVfs, nOut, pOut){
@@ -533,10 +534,12 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
     }
     if(!opfsVfs.$xSleep){
       /* If we can inherit an xSleep() impl from the default VFS then
-         use it, otherwise install one which is certainly less accurate
-         because it has to go round-trip through the async worker, but
-         provides the only option for a synchronous sleep() in JS. */
-      vfsSyncWrappers.xSleep = (pVfs,ms)=>opRun('xSleep',ms);
+         assume it's sane and use it, otherwise install a JS-based
+         one. */
+      vfsSyncWrappers.xSleep = function(pVfs,ms){
+        Atomics.wait(state.opSABView, state.opIds.xSleep, 0, ms);
+        return 0;
+      };
     }
 
     /* Install the vfs/io_methods into their C-level shared instances... */
@@ -545,7 +548,6 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
     inst = installMethod(opfsVfs);
     for(let k of Object.keys(vfsSyncWrappers)) inst(k, vfsSyncWrappers[k]);
 
-
     /**
        Syncronously deletes the given OPFS filesystem entry, ignoring
        any errors. As this environment has no notion of "current
@@ -646,8 +648,11 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
         let jRead = wasm.cstringToJs(readBuf);
         log("xRead() got:",jRead);
         if("sanity"!==jRead) toss("Unexpected xRead() value.");
-        log("xSleep()ing before close()ing...");
-        opRun('xSleep',1000);
+        if(vfsSyncWrappers.xSleep){
+          log("xSleep()ing before close()ing...");
+          vfsSyncWrappers.xSleep(opfsVfs.pointer,2000);
+          log("waking up from xSleep()");
+        }
         rc = ioSyncWrappers.xClose(fid);
         log("xClose rc =",rc,"opSABView =",state.opSABView);
         log("Deleting file:",dbFile);
diff --git a/ext/wasm/sqlite3-opfs-async-proxy.js b/ext/wasm/sqlite3-opfs-async-proxy.js
index 5969962d7a..3ae6af043a 100644
--- a/ext/wasm/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/sqlite3-opfs-async-proxy.js
@@ -287,12 +287,6 @@ const vfsAsyncImpls = {
     }
     storeAndNotify('xRead',rc);
   },
-  xSleep: async function f(ms){
-    log("xSleep(",ms,")");
-    await new Promise((resolve)=>{
-      setTimeout(()=>resolve(), ms);
-    }).finally(()=>storeAndNotify('xSleep',0));
-  },
   xSync: async function({fid,flags/*ignored*/}){
     log("xSync(",arguments[0],")");
     const fh = __openFiles[fid];
diff --git a/manifest b/manifest
index ce729f04c1..5116b71772 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Rename\sdemo-oo1.*\sto\sdemo-123.*\sand\sadd\sdemo-123-worker.html,\swhich\sruns\sthe\ssame\sdemo\svia\sa\sWorker.\sDoc\stypo\sfixes.
-D 2022-09-19T03:57:31.704
+C Replace\sOPFS\sVFS\sxSleep()\simpl\swith\sa\smore\sefficient\sone\s(no\sWorker\sround-trip\sneeded).
+D 2022-09-19T05:19:04.566
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -484,7 +484,7 @@ F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a
 F ext/wasm/api/sqlite3-api-cleanup.js 8564a6077cdcaea9a9f428a019af8a05887f0131e6a2a1e72a7ff1145fadfe77
 F ext/wasm/api/sqlite3-api-glue.js 366d580c8e5bf7fcf4c6dee6f646c31f5549bd417ea03a59a0acca00e8ecce30
 F ext/wasm/api/sqlite3-api-oo1.js 2d13dddf0d2b4168a9249f124134d37924331e5b55e05dba18b6d661fbeefe48
-F ext/wasm/api/sqlite3-api-opfs.js 4090abf4e16b460543ff665e96822048e37a2703e0ba46a01fed3a15c024c034
+F ext/wasm/api/sqlite3-api-opfs.js d44f724990e99e242725c6623d6e1fbf843addabac13aabcd8adc8b7a02cb8b6
 F ext/wasm/api/sqlite3-api-prologue.js 4e3e26880d444000cca1b4f3ddfa9d49581dfecd1de9426080239ecc208c447d
 F ext/wasm/api/sqlite3-api-worker1.js ee4cf149cbacb63d06b536674f822aa5088b7e022cdffc69f1f36cebe2f9fea0
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
@@ -497,8 +497,8 @@ F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d695
 F ext/wasm/common/testing.css 3a5143699c2b73a85b962271e1a9b3241b30d90e30d895e4f55665e648572962
 F ext/wasm/common/whwasmutil.js f7282ef36c9625330d4e6e82d1beec6678cd101e95e7108cd85db587a788c145
 F ext/wasm/demo-123-worker.html e419b66495d209b5211ec64903b4cfb3ca7df20d652b41fcd28bf018a773234f
-F ext/wasm/demo-123.html aa281d33b7eefa755f3122b7b5a18f39a42dc5fb69c8879171bf14b4c37c4ec4 w ext/wasm/demo-oo1.html
-F ext/wasm/demo-123.js 2c5e7775339624819067fd169d202004faeddc9d8ef452dd1f95aa4b3972a5b2 w ext/wasm/demo-oo1.js
+F ext/wasm/demo-123.html aa281d33b7eefa755f3122b7b5a18f39a42dc5fb69c8879171bf14b4c37c4ec4
+F ext/wasm/demo-123.js 2c5e7775339624819067fd169d202004faeddc9d8ef452dd1f95aa4b3972a5b2
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js bccf46045be8824752876f3eec01c223be0616ccac184bffd0024cfe7a3262b8
 F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
@@ -521,7 +521,7 @@ F ext/wasm/speedtest1.html fbb8e4d1639028443f3687a683be660beca6927920545cf6b1fdf
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
-F ext/wasm/sqlite3-opfs-async-proxy.js 6e89e1af7c616afdd877cbcf5d0ec3d5f47ba252b9a19e696140b9495dc1e653
+F ext/wasm/sqlite3-opfs-async-proxy.js 7806909f6957c6173843b53087b7f01fb41fb27f52bdad250fe2081d0fa44f9e
 F ext/wasm/sqlite3-worker1-promiser.js 4fd0465688a28a75f1d4ee4406540ba494f49844e3cad0670d0437a001943365
 F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
 F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
@@ -2028,8 +2028,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 9a9eeebc2c27b734041089131b4952d7c0440df48ef32f355641aca61d4b30a0
-R 8192577a9e0361d9ed4a520726bee437
+P 2e4a005bd35424caeaa99ace23162cf79e2ebdb159475ffad92b85dc864ad764
+R 7b4ce0e4c47ddeace77c92f8cdf4ccc9
 U stephan
-Z 37e4874c91d49fe3eefc7a1b4b57c686
+Z 2dc660cb87f9b9223b60fbf12ba2d753
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 29452e9015..1e0d5dc9cb 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2e4a005bd35424caeaa99ace23162cf79e2ebdb159475ffad92b85dc864ad764
\ No newline at end of file
+b9773f164878b0a1b7c88cc7a6d1374ea95f64920065e8b2b178a1afffd82fe5
\ No newline at end of file

From 862281fc47187e37b10c1fbd46250de23ebef452 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 19 Sep 2022 09:25:25 +0000
Subject: [PATCH 132/428] Correct OPFS VFS xRead() to copy the result buffer if
 the result code is SQLITE_IOERR_SHORT_READ.

FossilOrigin-Name: 56668f9902c6e896b6c63621a444444c6f58ee20f88a5feae97f1699be35892d
---
 ext/wasm/api/sqlite3-api-opfs.js |  7 ++++---
 manifest                         | 12 ++++++------
 manifest.uuid                    |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index d6a9dbd22f..6446f2fb35 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -386,9 +386,10 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
         try {
           // FIXME(?): block until we finish copying the xRead result buffer. How?
           rc = opRun('xRead',{fid:pFile, n, offset});
-          if(0!==rc) return rc;
-          let i = 0;
-          for(; i < n; ++i) wasm.setMemValue(pDest + i, f.sabView[i]);
+          if(0===rc || capi.SQLITE_IOERR_SHORT_READ===rc){
+            let i = 0;
+            for(; i < n; ++i) wasm.setMemValue(pDest + i, f.sabView[i]);
+          }
         }catch(e){
           error("xRead(",arguments,") failed:",e,f);
           rc = capi.SQLITE_IOERR_READ;
diff --git a/manifest b/manifest
index 5116b71772..c678bc0b2d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Replace\sOPFS\sVFS\sxSleep()\simpl\swith\sa\smore\sefficient\sone\s(no\sWorker\sround-trip\sneeded).
-D 2022-09-19T05:19:04.566
+C Correct\sOPFS\sVFS\sxRead()\sto\scopy\sthe\sresult\sbuffer\sif\sthe\sresult\scode\sis\sSQLITE_IOERR_SHORT_READ.
+D 2022-09-19T09:25:25.676
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -484,7 +484,7 @@ F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a
 F ext/wasm/api/sqlite3-api-cleanup.js 8564a6077cdcaea9a9f428a019af8a05887f0131e6a2a1e72a7ff1145fadfe77
 F ext/wasm/api/sqlite3-api-glue.js 366d580c8e5bf7fcf4c6dee6f646c31f5549bd417ea03a59a0acca00e8ecce30
 F ext/wasm/api/sqlite3-api-oo1.js 2d13dddf0d2b4168a9249f124134d37924331e5b55e05dba18b6d661fbeefe48
-F ext/wasm/api/sqlite3-api-opfs.js d44f724990e99e242725c6623d6e1fbf843addabac13aabcd8adc8b7a02cb8b6
+F ext/wasm/api/sqlite3-api-opfs.js 6a48568014dcadee22ff8eaa13deab573fbae362a71194efb6c1214d41d6b48d
 F ext/wasm/api/sqlite3-api-prologue.js 4e3e26880d444000cca1b4f3ddfa9d49581dfecd1de9426080239ecc208c447d
 F ext/wasm/api/sqlite3-api-worker1.js ee4cf149cbacb63d06b536674f822aa5088b7e022cdffc69f1f36cebe2f9fea0
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
@@ -2028,8 +2028,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 2e4a005bd35424caeaa99ace23162cf79e2ebdb159475ffad92b85dc864ad764
-R 7b4ce0e4c47ddeace77c92f8cdf4ccc9
+P b9773f164878b0a1b7c88cc7a6d1374ea95f64920065e8b2b178a1afffd82fe5
+R a6befd159a478cdd8d3c42193659027b
 U stephan
-Z 2dc660cb87f9b9223b60fbf12ba2d753
+Z 2c8c2a7ce6b266c9bc7d1baf57207e7e
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 1e0d5dc9cb..e3f6dd88b5 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b9773f164878b0a1b7c88cc7a6d1374ea95f64920065e8b2b178a1afffd82fe5
\ No newline at end of file
+56668f9902c6e896b6c63621a444444c6f58ee20f88a5feae97f1699be35892d
\ No newline at end of file

From 509f40526e97c321720b3cf3430f8a4361e8e547 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 19 Sep 2022 09:58:01 +0000
Subject: [PATCH 133/428] Generic cleanups in the OPFS VFS proxies.

FossilOrigin-Name: 7d5f6adc3b964413fc96ad8d2735312c3e58348024cabdd2099682cbf696eaf7
---
 ext/wasm/api/sqlite3-api-opfs.js     | 67 +++++++++++++++-------------
 ext/wasm/sqlite3-opfs-async-proxy.js | 22 ++++-----
 manifest                             | 14 +++---
 manifest.uuid                        |  2 +-
 4 files changed, 55 insertions(+), 50 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index 6446f2fb35..e0554e8c0c 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -76,51 +76,46 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
    `opfs` property, containing several OPFS-specific utilities.
 */
 sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
+  delete sqlite3.installOpfsVfs;
+  if(self.window===self ||
+     !self.SharedArrayBuffer ||
+     !self.FileSystemHandle ||
+     !self.FileSystemDirectoryHandle ||
+     !self.FileSystemFileHandle ||
+     !self.FileSystemFileHandle.prototype.createSyncAccessHandle ||
+     !navigator.storage.getDirectory){
+    return Promise.reject(
+      new Error("This environment does not have OPFS support.")
+    );
+  }
   const options = (asyncProxyUri && 'object'===asyncProxyUri) ? asyncProxyUri : {
     proxyUri: asyncProxyUri
   };
-  const thisUrl = new URL(self.location.href);
+  const urlParams = new URL(self.location.href).searchParams;
   if(undefined===options.verbose){
-    options.verbose = thisUrl.searchParams.has('opfs-verbose') ? 3 : 2;
+    options.verbose = urlParams.has('opfs-verbose') ? 3 : 2;
   }
   if(undefined===options.sanityChecks){
-    options.sanityChecks = thisUrl.searchParams.has('opfs-sanity-check');
+    options.sanityChecks = urlParams.has('opfs-sanity-check');
   }
   if(undefined===options.proxyUri){
     options.proxyUri = callee.defaultProxyUri;
   }
-  delete sqlite3.installOpfsVfs;
-
-  /**
-     Generic utilities for working with OPFS. This will get filled out
-     by the Promise setup and, on success, installed as sqlite3.opfs.
-  */
-  const opfsUtil = Object.create(null);
 
   const thePromise = new Promise(function(promiseResolve, promiseReject){
-    const logPrefix = "OPFS syncer:";
-    const warn =  (...args)=>{
-      if(options.verbose>1) console.warn(logPrefix,...args);
+    const loggers = {
+      0:console.error.bind(console),
+      1:console.warn.bind(console),
+      2:console.log.bind(console)
     };
-    if(self.window===self ||
-       !self.SharedArrayBuffer ||
-       !self.FileSystemHandle ||
-       !self.FileSystemDirectoryHandle ||
-       !self.FileSystemFileHandle ||
-       !self.FileSystemFileHandle.prototype.createSyncAccessHandle ||
-       !navigator.storage.getDirectory){
-      warn("This environment does not have OPFS support.");
-      promiseReject(new Error("This environment does not have OPFS support."));
-      return;
-    }
+    const logImpl = (level,...args)=>{
+      if(options.verbose>level) loggers[level]("OPFS syncer:",...args);
+    };
+    const log =    (...args)=>logImpl(2, ...args);
+    const warn =   (...args)=>logImpl(1, ...args);
+    const error =  (...args)=>logImpl(0, ...args);
     warn("The OPFS VFS feature is very much experimental and under construction.");
     const toss = function(...args){throw new Error(args.join(' '))};
-    const log = (...args)=>{
-      if(options.verbose>2) console.log(logPrefix,...args);
-    };
-    const error =  (...args)=>{
-      if(options.verbose>0) console.error(logPrefix,...args);
-    };
     const capi = sqlite3.capi;
     const wasm = capi.wasm;
     const sqlite3_vfs = capi.sqlite3_vfs;
@@ -129,9 +124,16 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
     const W = new Worker(options.proxyUri);
     W._originalOnError = W.onerror /* will be restored later */;
     W.onerror = function(err){
+      // The error object doesn't contain any useful info when the
+      // failure is, e.g., that the remote script is 404.
       promiseReject(new Error("Loading OPFS async Worker failed for unknown reasons."));
     };
     const wMsg = (type,payload)=>W.postMessage({type,payload});
+    /**
+       Generic utilities for working with OPFS. This will get filled out
+       by the Promise setup and, on success, installed as sqlite3.opfs.
+    */
+    const opfsUtil = Object.create(null);
 
     /**
        State which we send to the async-api Worker or share with it.
@@ -625,7 +627,8 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
         log("xAccess(",dbFile,") exists ?=",rc);
         rc = vfsSyncWrappers.xOpen(opfsVfs.pointer, zDbFile,
                                    fid, openFlags, pOut);
-        log("open rc =",rc,"state.opSABView[xOpen] =",state.opSABView[state.opIds.xOpen]);
+        log("open rc =",rc,"state.opSABView[xOpen] =",
+            state.opSABView[state.opIds.xOpen]);
         if(isWorkerErrCode(rc)){
           error("open failed with code",rc);
           return;
@@ -696,8 +699,8 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
               W.onerror = W._originalOnError;
               delete W._originalOnError;
               sqlite3.opfs = opfsUtil;
-              promiseResolve(sqlite3);
               log("End of OPFS sqlite3_vfs setup.", opfsVfs);
+              promiseResolve(sqlite3);
             }catch(e){
               error(e);
               promiseReject(e);
diff --git a/ext/wasm/sqlite3-opfs-async-proxy.js b/ext/wasm/sqlite3-opfs-async-proxy.js
index 3ae6af043a..7eb12425cc 100644
--- a/ext/wasm/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/sqlite3-opfs-async-proxy.js
@@ -49,18 +49,20 @@ const state = Object.create(null);
 */
 state.verbose = 2;
 
-const __logPrefix = "OPFS asyncer:";
-const log = (...args)=>{
-  if(state.verbose>2) console.log(__logPrefix,...args);
+const loggers = {
+  0:console.error.bind(console),
+  1:console.warn.bind(console),
+  2:console.log.bind(console)
 };
-const warn =  (...args)=>{
-  if(state.verbose>1) console.warn(__logPrefix,...args);
-};
-const error =  (...args)=>{
-  if(state.verbose) console.error(__logPrefix,...args);
+const logImpl = (level,...args)=>{
+  if(state.verbose>level) loggers[level]("OPFS asyncer:",...args);
 };
+const log =    (...args)=>logImpl(2, ...args);
+const warn =   (...args)=>logImpl(1, ...args);
+const error =  (...args)=>logImpl(0, ...args);
 
-warn("This file is very much experimental and under construction.",self.location.pathname);
+warn("This file is very much experimental and under construction.",
+     self.location.pathname);
 
 /**
    Map of sqlite3_file pointers (integers) to metadata related to a
@@ -82,7 +84,7 @@ const getResolvedPath = function(filename,splitIt){
     filename, 'file://irrelevant'
   ).pathname;
   return splitIt ? p.split('/').filter((v)=>!!v) : p;
-}
+};
 
 /**
    Takes the absolute path to a filesystem element. Returns an array
diff --git a/manifest b/manifest
index c678bc0b2d..46fcb98d2f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Correct\sOPFS\sVFS\sxRead()\sto\scopy\sthe\sresult\sbuffer\sif\sthe\sresult\scode\sis\sSQLITE_IOERR_SHORT_READ.
-D 2022-09-19T09:25:25.676
+C Generic\scleanups\sin\sthe\sOPFS\sVFS\sproxies.
+D 2022-09-19T09:58:01.741
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -484,7 +484,7 @@ F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a
 F ext/wasm/api/sqlite3-api-cleanup.js 8564a6077cdcaea9a9f428a019af8a05887f0131e6a2a1e72a7ff1145fadfe77
 F ext/wasm/api/sqlite3-api-glue.js 366d580c8e5bf7fcf4c6dee6f646c31f5549bd417ea03a59a0acca00e8ecce30
 F ext/wasm/api/sqlite3-api-oo1.js 2d13dddf0d2b4168a9249f124134d37924331e5b55e05dba18b6d661fbeefe48
-F ext/wasm/api/sqlite3-api-opfs.js 6a48568014dcadee22ff8eaa13deab573fbae362a71194efb6c1214d41d6b48d
+F ext/wasm/api/sqlite3-api-opfs.js 580be306be7301fa0b3cb2abd5765561a3d7f4746a7679f95394af50a14671bb
 F ext/wasm/api/sqlite3-api-prologue.js 4e3e26880d444000cca1b4f3ddfa9d49581dfecd1de9426080239ecc208c447d
 F ext/wasm/api/sqlite3-api-worker1.js ee4cf149cbacb63d06b536674f822aa5088b7e022cdffc69f1f36cebe2f9fea0
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
@@ -521,7 +521,7 @@ F ext/wasm/speedtest1.html fbb8e4d1639028443f3687a683be660beca6927920545cf6b1fdf
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
-F ext/wasm/sqlite3-opfs-async-proxy.js 7806909f6957c6173843b53087b7f01fb41fb27f52bdad250fe2081d0fa44f9e
+F ext/wasm/sqlite3-opfs-async-proxy.js 2e9a95fc6204f53ed871d04bdd0341d1c0d1a49c22d43b38144a5319f865930a
 F ext/wasm/sqlite3-worker1-promiser.js 4fd0465688a28a75f1d4ee4406540ba494f49844e3cad0670d0437a001943365
 F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
 F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
@@ -2028,8 +2028,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 b9773f164878b0a1b7c88cc7a6d1374ea95f64920065e8b2b178a1afffd82fe5
-R a6befd159a478cdd8d3c42193659027b
+P 56668f9902c6e896b6c63621a444444c6f58ee20f88a5feae97f1699be35892d
+R b87c8cb1e595f1f55de64a473bfd1ee8
 U stephan
-Z 2c8c2a7ce6b266c9bc7d1baf57207e7e
+Z 85b747fc9dead0d23b6c33a91c074db8
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index e3f6dd88b5..f69e6b9a41 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-56668f9902c6e896b6c63621a444444c6f58ee20f88a5feae97f1699be35892d
\ No newline at end of file
+7d5f6adc3b964413fc96ad8d2735312c3e58348024cabdd2099682cbf696eaf7
\ No newline at end of file

From ba0b157583c1977fe45f695c3bf640f7b1dcf682 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 19 Sep 2022 10:13:01 +0000
Subject: [PATCH 134/428] Minor doc improvements in demo-123.js.

FossilOrigin-Name: 9370ce94780e974da03d5c74cf9a5983eed333e7b3bc54e605c5f30b3fa99287
---
 ext/wasm/demo-123.js | 12 ++++++------
 manifest             | 12 ++++++------
 manifest.uuid        |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ext/wasm/demo-123.js b/ext/wasm/demo-123.js
index 7a4843a4d9..c7dc4c769c 100644
--- a/ext/wasm/demo-123.js
+++ b/ext/wasm/demo-123.js
@@ -10,7 +10,7 @@
 
   ***********************************************************************
 
-  A basic demonstration of the SQLite3 OO API.
+  A basic demonstration of the SQLite3 "OO#1" API.
 */
 'use strict';
 (function(){
@@ -47,11 +47,11 @@
     log("transient b =",db.filename);
     /**
        Never(!) rely on garbage collection to clean up DBs and
-       (especially) statements. Always wrap their lifetimes in
-       try/finally construct, as demonstrated below. By and large,
-       client code can avoid lifetime-related complications of
-       prepared statement objects by using the DB.exec() method for
-       SQL execution.
+       (especially) prepared statements. Always wrap their lifetimes
+       in a try/finally construct, as demonstrated below. By and
+       large, client code can entirely avoid lifetime-related
+       complications of prepared statement objects by using the
+       DB.exec() method for SQL execution.
     */
     try {
       log("Create a table...");
diff --git a/manifest b/manifest
index 46fcb98d2f..bbd2f4b6f4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Generic\scleanups\sin\sthe\sOPFS\sVFS\sproxies.
-D 2022-09-19T09:58:01.741
+C Minor\sdoc\simprovements\sin\sdemo-123.js.
+D 2022-09-19T10:13:01.255
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -498,7 +498,7 @@ F ext/wasm/common/testing.css 3a5143699c2b73a85b962271e1a9b3241b30d90e30d895e4f5
 F ext/wasm/common/whwasmutil.js f7282ef36c9625330d4e6e82d1beec6678cd101e95e7108cd85db587a788c145
 F ext/wasm/demo-123-worker.html e419b66495d209b5211ec64903b4cfb3ca7df20d652b41fcd28bf018a773234f
 F ext/wasm/demo-123.html aa281d33b7eefa755f3122b7b5a18f39a42dc5fb69c8879171bf14b4c37c4ec4
-F ext/wasm/demo-123.js 2c5e7775339624819067fd169d202004faeddc9d8ef452dd1f95aa4b3972a5b2
+F ext/wasm/demo-123.js 234655683e35a4543a23de7b10800d76b0369947b33e089e5613171fa7795afb
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js bccf46045be8824752876f3eec01c223be0616ccac184bffd0024cfe7a3262b8
 F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
@@ -2028,8 +2028,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 56668f9902c6e896b6c63621a444444c6f58ee20f88a5feae97f1699be35892d
-R b87c8cb1e595f1f55de64a473bfd1ee8
+P 7d5f6adc3b964413fc96ad8d2735312c3e58348024cabdd2099682cbf696eaf7
+R 2fec471b1001d01ad7dc38d9c67df837
 U stephan
-Z 85b747fc9dead0d23b6c33a91c074db8
+Z d026bdd80c48b40067e840d055db82e8
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f69e6b9a41..e43adac6b2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7d5f6adc3b964413fc96ad8d2735312c3e58348024cabdd2099682cbf696eaf7
\ No newline at end of file
+9370ce94780e974da03d5c74cf9a5983eed333e7b3bc54e605c5f30b3fa99287
\ No newline at end of file

From b5ae85eca27f43949ae81a8489c3168ebcf7164c Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 19 Sep 2022 13:16:35 +0000
Subject: [PATCH 135/428] Merge kv-vfs branch into fiddle-opfs. Adjust various
 JS APIs and apps to deal with the new method of handling kvvfs. Adjust
 speedtest1 JS build to include sqlite3-api.js so that it can use kvvfs and
 opfs VFSes. Permit passing of the vfs as a URL parameter to certain demo/test
 apps. Milestone: speedtest-worker.html?vfs=opfs runs with the standalone OPFS
 impl.

FossilOrigin-Name: ec09f32f7ae2249aaf27388ad2062982afa8bbbb5f88d236d6d9068bf33ad93d
---
 ext/wasm/GNUmakefile                       |  37 ++++---
 ext/wasm/api/sqlite3-api-prologue.js       |   2 +
 ext/wasm/{kvvfs1.html => demo-kvvfs1.html} |   4 +-
 ext/wasm/{kvvfs1.js => demo-kvvfs1.js}     |   9 +-
 ext/wasm/index.html                        |   7 +-
 ext/wasm/kvvfs.make                        | 112 ---------------------
 ext/wasm/speedtest1-wasmfs.html            |   2 +-
 ext/wasm/speedtest1-worker.html            |  18 +++-
 ext/wasm/speedtest1-worker.js              |  34 +++----
 ext/wasm/speedtest1.html                   |  56 +++++++----
 manifest                                   |  31 +++---
 manifest.uuid                              |   2 +-
 test/speedtest1.c                          |  11 +-
 13 files changed, 132 insertions(+), 193 deletions(-)
 rename ext/wasm/{kvvfs1.html => demo-kvvfs1.html} (95%)
 rename ext/wasm/{kvvfs1.js => demo-kvvfs1.js} (95%)
 delete mode 100644 ext/wasm/kvvfs.make

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 730c31642b..e1b6784d38 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -53,7 +53,8 @@ SQLITE_OPT = \
   -DSQLITE_OMIT_UTF16 \
   -DSQLITE_OMIT_SHARED_CACHE \
   -DSQLITE_THREADSAFE=0 \
-  -DSQLITE_TEMP_STORE=3
+  -DSQLITE_TEMP_STORE=3 \
+  -DSQLITE_OS_KV_OPTIONAL=1
 #SQLITE_OPT += -DSQLITE_ENABLE_MEMSYS5
 # ^^^ MEMSYS5 is hypothetically useful for non-Emscripten builds but
 # requires adding more infrastructure and fixing one spot in the
@@ -192,16 +193,19 @@ emcc.cflags += -I. -I$(dir.top) # $(SQLITE_OPT)
 ########################################################################
 # emcc flags specific to building the final .js/.wasm file...
 emcc.jsflags := -fPIC
-emcc.jsflags := --minify 0
+emcc.jsflags += --minify 0
 emcc.jsflags += --no-entry
 emcc.jsflags += -sMODULARIZE
 emcc.jsflags += -sSTRICT_JS
 emcc.jsflags += -sDYNAMIC_EXECUTION=0
 emcc.jsflags += -sNO_POLYFILL
 emcc.jsflags += -sEXPORTED_FUNCTIONS=@$(dir.wasm)/EXPORTED_FUNCTIONS.api
-emcc.jsflags += -sEXPORTED_RUNTIME_METHODS=FS,wasmMemory,allocateUTF8OnStack
-                # wasmMemory ==> required by our code for use with -sIMPORTED_MEMORY
-                # allocateUTF8OnStack => for kvvp internals
+emcc.exportedRuntimeMethods := \
+    -sEXPORTED_RUNTIME_METHODS=FS,wasmMemory,allocateUTF8OnStack
+    # FS ==> stdio/POSIX I/O proxies
+    # wasmMemory ==> required by our code for use with -sIMPORTED_MEMORY
+    # allocateUTF8OnStack => for kvvfs internals
+emcc.jsflags += $(emcc.exportedRuntimeMethods)
 emcc.jsflags += -sUSE_CLOSURE_COMPILER=0
 emcc.jsflags += -sIMPORTED_MEMORY
 emcc.environment := -sENVIRONMENT=web
@@ -332,17 +336,23 @@ speedtest1-common.eflags := -g $(emcc_opt)
 speedtest1.eflags :=
 speedtest1.eflags += -sENVIRONMENT=web
 speedtest1-common.eflags += -sINVOKE_RUN=0
-#speedtest1-common.eflags += --no-entry
-speedtest1-common.eflags += -flto
+speedtest1-common.eflags += --no-entry
+#speedtest1-common.eflags += -flto
 speedtest1-common.eflags += -sABORTING_MALLOC
 speedtest1-common.eflags += -sINITIAL_MEMORY=128450560
 speedtest1-common.eflags += -sSTRICT_JS
 speedtest1-common.eflags += -sMODULARIZE
 speedtest1-common.eflags += -Wno-limited-postlink-optimizations
-speedtest1-common.eflags += -sEXPORTED_FUNCTIONS=_main,_malloc,_free
+speedtest1-common.eflags += -sEXPORTED_FUNCTIONS=@$(dir.wasm)/EXPORTED_FUNCTIONS.speedtest1
+speedtest1-common.eflags += $(emcc.exportedRuntimeMethods)
+speedtest1-common.eflags += -sALLOW_TABLE_GROWTH
 speedtest1-common.eflags += -sDYNAMIC_EXECUTION=0
 speedtest1-common.eflags += --minify 0
 speedtest1-common.eflags += -sEXPORT_NAME=sqlite3Speedtest1InitModule
+speedtest1-common.eflags += --post-js=$(post-js.js)
+ifneq (0,$(enable_bigint))
+speedtest1-common.eflags += -sWASM_BIGINT
+endif
 speedtest1.exit-runtime0 := -sEXIT_RUNTIME=0
 speedtest1.exit-runtime1 := -sEXIT_RUNTIME=1
 # Re -sEXIT_RUNTIME=1 vs 0: if it's 1 and speedtest1 crashes, we get
@@ -362,25 +372,29 @@ speedtest1.exit-runtime1 := -sEXIT_RUNTIME=1
 # -sEXIT_RUNTIME=1 but we need EXIT_RUNTIME=0 for the worker-based app
 # which runs speedtest1 multiple times.
 
+EXPORTED_FUNCTIONS.speedtest1: EXPORTED_FUNCTIONS.api
+	{ echo _wasm_main; cat EXPORTED_FUNCTIONS.api; } > $@
+CLEAN_FILES += EXPORTED_FUNCTIONS.speedtest1
 speedtest1.js := speedtest1.js
 speedtest1.wasm := $(subst .js,.wasm,$(speedtest1.js))
 speedtest1.cflags := \
   -I. -I.. -I$(dir.top) \
   -DSQLITE_SPEEDTEST1_WASM
-
+speedtest1.cs := $(speedtest1.c) $(sqlite3-wasm.c) $(jaccwabyt_test.c)
 $(speedtest1.js): emcc.cflags+=
 # speedtest1 notes re. sqlite3-wasm.o vs sqlite3-wasm.c: building against
 # the latter (predictably) results in a slightly faster binary, but we're
 # close enough to the target speed requirements that the 500ms makes a
 # difference.
-$(speedtest1.js): $(speedtest1.c) $(sqlite3-wasm.c) $(MAKEFILE) $(sqlite3.c)
+$(speedtest1.js): $(MAKEFILE) $(speedtest1.cs) $(post-js.js) \
+    EXPORTED_FUNCTIONS.speedtest1
 	@echo "Building $@ ..."
 	$(emcc.bin) \
         $(speedtest1.eflags) $(speedtest1-common.eflags) $(speedtest1.cflags) \
         $(SQLITE_OPT) \
         $(speedtest1.exit-runtime0) \
         '-DSQLITE_DEFAULT_UNIX_VFS="unix-none"' \
-        -o $@ $(speedtest1.c) $(sqlite3-wasm.c) -lm
+        -o $@ $(speedtest1.cs) -lm
 	$(maybe-wasm-strip) $(speedtest1.wasm)
 	ls -la $@ $(speedtest1.wasm)
 
@@ -434,7 +448,6 @@ oz:
 
 ########################################################################
 # Sub-makes...
-include kvvfs.make
 
 ########################################################################
 # Some platforms do not support the WASMFS build. Raspberry Pi OS is one
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index add8ad658e..bd9779b7ef 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -749,6 +749,8 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
   };
 
   /**
+     Experimental and subject to change or removal.
+
      Returns true if sqlite3.capi.sqlite3_web_persistent_dir() is a
      non-empty string and the given name starts with (that string +
      '/'), else returns false.
diff --git a/ext/wasm/kvvfs1.html b/ext/wasm/demo-kvvfs1.html
similarity index 95%
rename from ext/wasm/kvvfs1.html
rename to ext/wasm/demo-kvvfs1.html
index 5d9f077958..caa3cdec85 100644
--- a/ext/wasm/kvvfs1.html
+++ b/ext/wasm/demo-kvvfs1.html
@@ -42,8 +42,8 @@
       .toolbar > * { margin: 0.25em; }
       fieldset { border-radius: 0.5em; }
     </style>
-    <script src="sqlite3-kvvfs.js"></script>
+    <script src="sqlite3.js"></script>
     <script src="common/SqliteTestUtil.js"></script>
-    <script src="kvvfs1.js"></script>
+    <script src="demo-kvvfs1.js"></script>
   </body>
 </html>
diff --git a/ext/wasm/kvvfs1.js b/ext/wasm/demo-kvvfs1.js
similarity index 95%
rename from ext/wasm/kvvfs1.js
rename to ext/wasm/demo-kvvfs1.js
index 57f990f16b..a2cff8639d 100644
--- a/ext/wasm/kvvfs1.js
+++ b/ext/wasm/demo-kvvfs1.js
@@ -10,8 +10,9 @@
 
   ***********************************************************************
 
-  A basic test script for sqlite3-kvvfs.wasm. This file must be run in
-  main JS thread and sqlite3-kvvfs.js must have been loaded before it.
+  A basic test script for sqlite3.wasm with kvvfs support. This file
+  must be run in main JS thread and sqlite3.js must have been loaded
+  before it.
 */
 'use strict';
 (function(){
@@ -39,7 +40,7 @@
   const error = function(...args){
     logHtml('error',...args);
   };
-
+  
   const runTests = function(Module){
     //log("Module",Module);
     const sqlite3 = Module.sqlite3,
@@ -49,7 +50,7 @@
     log("Loaded module:",capi.sqlite3_libversion(), capi.sqlite3_sourceid());
     T.assert( 0 !== capi.sqlite3_vfs_find(null) );
     if(!capi.sqlite3_vfs_find('kvvfs')){
-      warn("This build is not kvvfs-capable.");
+      error("This build is not kvvfs-capable.");
       return;
     }
     
diff --git a/ext/wasm/index.html b/ext/wasm/index.html
index 68b43d7652..06dd0f31e4 100644
--- a/ext/wasm/index.html
+++ b/ext/wasm/index.html
@@ -51,9 +51,10 @@
         <li><a href='speedtest1.html'>speedtest1</a>: a main-thread WASM build of speedtest1.</li>
         <li><a href='speedtest1-worker.html'>speedtest1-worker</a>: an interactive Worker-thread variant of speedtest1.</li>
         <li><a href='speedtest1-wasmfs.html'>speedtest1-wasmfs</a>: a variant of speedtest1 built solely for the wasmfs/opfs feature.</li>
-        <li><a href='speedtest1-kvvfs.html'>speedtest1-kvvfs</a>: a variant of speedtest1 built solely for the kv-vfs feature.</li>
-        <li><a href='kvvfs1.html'>kvvfs1</a>: very basic demo of using the key-value vfs for storing
-          a persistent db in JS localStorage or sessionStorage.</li>
+        <li><a href='speedtest1.html?vfs=kvvfs'>speedtest1-kvvfs</a>: speedtest1 with the kvvfs.</li>
+        <li><a href='demo-kvvfs1.html'>demo-kvvfs1</a>: very basic
+          demo of using the key-value vfs for storing a persistent db
+          in JS localStorage or sessionStorage.</li>
         <li><a href='scratchpad-wasmfs-main.html'>scratchpad-wasmfs-main</a>:
           experimenting with WASMFS/OPFS-based persistence. Maintenance
           reminder: we cannot currently (2022-09-15) load WASMFS in a
diff --git a/ext/wasm/kvvfs.make b/ext/wasm/kvvfs.make
deleted file mode 100644
index d9a9539566..0000000000
--- a/ext/wasm/kvvfs.make
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/usr/bin/make
-#^^^^ help emacs select makefile mode
-#
-# This is a sub-make for building a standalone kvvfs-based
-# sqlite3.wasm.  It is intended to be "include"d from the main
-# GNUMakefile.
-#
-# Notable potential TODOs:
-#
-# - Trim down a custom sqlite3-api.js for this build. We can elimate
-#   the jaccwabyt dependency, for example, because this build won't
-#   make use of the VFS bits. Similarly, we can eliminate or replace
-#   parts of the OO1 API, or provide a related API which manages
-#   singletons of the localStorage/sessionStorage instances.
-#
-########################################################################
-MAKEFILE.kvvfs := $(lastword $(MAKEFILE_LIST))
-
-kvvfs.js     := sqlite3-kvvfs.js
-kvvfs.wasm   := sqlite3-kvvfs.wasm
-kvvfs.wasm.c := $(dir.api)/sqlite3-wasm.c
-
-CLEAN_FILES += $(kvvfs.js) $(kvvfs.wasm)
-
-########################################################################
-# emcc flags for .c/.o/.wasm.
-kvvfs.flags =
-#kvvfs.flags += -v # _very_ loud but also informative about what it's doing
-
-########################################################################
-# emcc flags for .c/.o.
-kvvfs.cflags :=
-kvvfs.cflags += -std=c99 -fPIC -g
-kvvfs.cflags += -I. -I$(dir.top)
-kvvfs.cflags += -DSQLITE_OS_KV=1 $(SQLITE_OPT)
-
-kvvfs.extra.c :=
-ifeq (1,1)
-  # To get testing1.js to run with $(kvvfs.js) we need...
-  kvvfs.extra.c += $(jaccwabyt_test.c)
-endif
-
-########################################################################
-# emcc flags specific to building the final .js/.wasm file...
-kvvfs.jsflags := -fPIC
-kvvfs.jsflags += --no-entry
-kvvfs.jsflags += --minify 0
-kvvfs.jsflags += -sENVIRONMENT=web
-kvvfs.jsflags += -sMODULARIZE
-kvvfs.jsflags += -sSTRICT_JS
-kvvfs.jsflags += -sDYNAMIC_EXECUTION=0
-kvvfs.jsflags += -sNO_POLYFILL
-ifeq (,$(kvvfs.extra.c))
-  kvvfs.jsflags += -sEXPORTED_FUNCTIONS=@$(dir.api)/EXPORTED_FUNCTIONS.sqlite3-api
-else
-  # need more exports for jaccwabyt test code...
-  kvvfs.jsflags += -sEXPORTED_FUNCTIONS=@$(dir.wasm)/EXPORTED_FUNCTIONS.api
-endif
-kvvfs.jsflags += -sEXPORTED_RUNTIME_METHODS=FS,wasmMemory,allocateUTF8OnStack
-                                            # wasmMemory ==> for -sIMPORTED_MEMORY
-                                            # allocateUTF8OnStack ==> kvvfs internals
-kvvfs.jsflags += -sUSE_CLOSURE_COMPILER=0
-kvvfs.jsflags += -sIMPORTED_MEMORY
-#kvvfs.jsflags += -sINITIAL_MEMORY=13107200
-#kvvfs.jsflags += -sTOTAL_STACK=4194304
-kvvfs.jsflags += -sEXPORT_NAME=sqlite3InitModule
-kvvfs.jsflags += -sGLOBAL_BASE=4096 # HYPOTHETICALLY keep func table indexes from overlapping w/ heap addr.
-kvvfs.jsflags += --post-js=$(post-js.js)
-#kvvfs.jsflags += -sFILESYSTEM=0 # only for experimentation. sqlite3 needs the FS API
-#                                Perhaps the kvvfs build doesn't?
-#kvvfs.jsflags += -sABORTING_MALLOC
-kvvfs.jsflags += -sALLOW_MEMORY_GROWTH
-kvvfs.jsflags += -sALLOW_TABLE_GROWTH
-kvvfs.jsflags += -Wno-limited-postlink-optimizations
-# ^^^^^ it likes to warn when we have "limited optimizations" via the -g3 flag.
-kvvfs.jsflags += -sERROR_ON_UNDEFINED_SYMBOLS=0
-kvvfs.jsflags += -sLLD_REPORT_UNDEFINED
-#kvvfs.jsflags += --import-undefined
-kvvfs.jsflags += -sMEMORY64=0
-ifneq (0,$(enable_bigint))
-kvvfs.jsflags += -sWASM_BIGINT
-endif
-$(kvvfs.js): $(kvvfs.wasm.c) $(sqlite3.c) $(kvvfs.extra.c) \
-    EXPORTED_FUNCTIONS.api $(MAKEFILE) $(MAKEFILE.kvvfs) \
-    $(post-js.js)
-	@echo "Building $@ ..."
-	$(emcc.bin) -o $@ $(emcc_opt) $(emcc.flags) \
-      $(SQLITE_OPT) \
-      $(kvvfs.cflags) $(kvvfs.jsflags) $(kvvfs.wasm.c) $(kvvfs.extra.c)
-	chmod -x $(kvvfs.wasm)
-	$(maybe-wasm-strip) $(kvvfs.wasm)
-	@ls -la $@ $(kvvfs.wasm)
-
-kvvfs: $(kvvfs.js)
-all: kvvfs
-
-########################################################################
-# speedtest1-kvvfs
-speedtest1-kvvfs.js := speedtest1-kvvfs.js
-speedtest1-kvvfs.wasm := speedtest1-kvvfs.wasm
-CLEAN_FILES += $(speedtest1-kvvfs.js) $(speedtest1-kvvfs.wasm)
-$(speedtest1-kvvfs.js): $(speedtest1.c) $(sqlite3-wasm.c) $(sqlite3.c) $(MAKEFILE.kvvfs)
-	$(emcc.bin) \
-      $(speedtest1.eflags) $(speedtest1-common.eflags) $(speedtest1.cflags) \
-      $(SQLITE_OPT) \
-      $(speedtest1.exit-runtime1) \
-      $(kvvfs.cflags) \
-      -o $@ $(speedtest1.c) $(sqlite3-wasm.c) -lm
-	$(maybe-wasm-strip) $(speedtest1-kvvfs.wasm)
-	ls -la $@ $(speedtest1-kvvfs.wasm)
-
-speedtest1: $(speedtest1-kvvfs.js)
diff --git a/ext/wasm/speedtest1-wasmfs.html b/ext/wasm/speedtest1-wasmfs.html
index 151ced89a3..c8e93f6dcf 100644
--- a/ext/wasm/speedtest1-wasmfs.html
+++ b/ext/wasm/speedtest1-wasmfs.html
@@ -139,7 +139,7 @@
                "Give it time...");
           logList.length = 0;
           setTimeout(function(){
-              wasm.xCall('__main_argc_argv', argv.length,
+              wasm.xCall('wasm_main', argv.length,
                          wasm.scopedAllocMainArgv(argv));
               wasm.scopedAllocPop(scope);
               if(pDir) unlink(dbFile);
diff --git a/ext/wasm/speedtest1-worker.html b/ext/wasm/speedtest1-worker.html
index 3c9740286f..bc3f10a6fc 100644
--- a/ext/wasm/speedtest1-worker.html
+++ b/ext/wasm/speedtest1-worker.html
@@ -30,7 +30,9 @@
       <div id='toolbar'>
         <div id='toolbar-select'>
           <select id='select-flags' size='10' multiple></select>
-          <div>TODO? Options which require values are not represented here.</div>
+          <div>The following flags can be passed as URL parameters:
+            vfs=NAME, size=N
+          </div>
         </div>
         <div class='toolbar-inner-vertical'>
           <div id='toolbar-selected-flags'></div>
@@ -124,6 +126,7 @@
         justify-content: flex-start;
       }
     </style>
+    <script src="common/SqliteTestUtil.js"></script>
     <script>(function(){
       'use strict';
       const E = (sel)=>document.querySelector(sel);
@@ -167,7 +170,7 @@
         return str+a.join('&nbsp;');
       };
 
-      const W = new Worker("speedtest1-worker.js");
+      const W = new Worker("speedtest1-worker.js"+self.location.search);
       const mPost = function(msgType,payload){
         W.postMessage({type: msgType, data: payload});
       };
@@ -177,7 +180,16 @@
       const eLinkMainThread = E('#link-main-thread');
       const eLinkWasmfs = E('#link-wasmfs');
       const eLinkKvvfs = E('#link-kvvfs');
-      const getSelectedFlags = ()=>Array.prototype.map.call(eFlags.selectedOptions, (v)=>v.value);
+      const urlParams = new URL(self.location.href).searchParams;
+      const getSelectedFlags = ()=>{
+          const f = Array.prototype.map.call(eFlags.selectedOptions, (v)=>v.value);
+          [
+              'size', 'vfs'
+          ].forEach(function(k){
+              if(urlParams.has(k)) f.push('--'+k, urlParams.get(k));
+          });
+          return f;
+      };
       const updateSelectedFlags = function(){
         eSelectedFlags.innerText = '';
         const flags = getSelectedFlags();
diff --git a/ext/wasm/speedtest1-worker.js b/ext/wasm/speedtest1-worker.js
index b954f9939a..fe43e5646b 100644
--- a/ext/wasm/speedtest1-worker.js
+++ b/ext/wasm/speedtest1-worker.js
@@ -6,7 +6,7 @@
      returns the name of the dir on which OPFS is mounted, else it returns
      an empty string.
   */
-  const opfsDir = function f(wasmUtil){
+  const wasmfsDir = function f(wasmUtil){
     if(undefined !== f._) return f._;
     const pdir = '/persistent';
     if( !self.FileSystemHandle
@@ -27,7 +27,7 @@
       return f._ = "";
     }
   };
-  opfsDir._ = undefined;
+  wasmfsDir._ = undefined;
 
   const mPost = function(msgType,payload){
     postMessage({type: msgType, data: payload});
@@ -42,7 +42,7 @@
   };
   const log = (...args)=>logMsg('stdout',args);
   const logErr = (...args)=>logMsg('stderr',args);
-  
+
   const runSpeedtest = function(cliFlagsArray){
     const scope = App.wasm.scopedAllocPush();
     const dbFile = 0 ? "" : App.pDir+"/speedtest1.db";
@@ -52,7 +52,7 @@
       ];
       App.logBuffer.length = 0;
       mPost('run-start', [...argv]);
-      App.wasm.xCall('__main_argc_argv', argv.length,
+      App.wasm.xCall('wasm_main', argv.length,
                      App.wasm.scopedAllocMainArgv(argv));
     }catch(e){
       mPost('error',e.message);
@@ -79,20 +79,18 @@
     printErr: logErr,
     setStatus: (text)=>mPost('load-status',text)
   };
-  self.sqlite3Speedtest1InitModule(EmscriptenModule).then(function(EmscriptenModule){
+  self.sqlite3Speedtest1InitModule(EmscriptenModule).then(function(EModule){
+    const S = EModule.sqlite3;
     log("Module inited.");
-    App.wasm = {
-      exports: EmscriptenModule.asm,
-      alloc: (n)=>EmscriptenModule._malloc(n),
-      dealloc: (m)=>EmscriptenModule._free(m),
-      memory: EmscriptenModule.asm.memory || EmscriptenModule.wasmMemory
-    };
-    //console.debug('wasm =',wasm);
-    self.WhWasmUtilInstaller(App.wasm);
-    App.unlink = App.wasm.xWrap("sqlite3_wasm_vfs_unlink", "int", ["string"]);
-    App.pDir = opfsDir(App.wasm);
-    if(App.pDir) log("Persistent storage:",pDir);
-    else log("Using transient storage.");
-    mPost('ready',true);
+    return S.installOpfsVfs()
+      .catch((e)=>console.warn(e.message))
+      .then(()=>{
+        App.unlink = S.capi.wasm.xWrap("sqlite3_wasm_vfs_unlink", "int", ["string"]);
+        App.pDir = wasmfsDir(S.wasm);
+        App.wasm = S.capi.wasm;
+        //if(App.pDir) log("Persistent storage:",pDir);
+        //else log("Using transient storage.");
+        mPost('ready',true);
+      });
   });
 })();
diff --git a/ext/wasm/speedtest1.html b/ext/wasm/speedtest1.html
index 172266aa68..aca0734cf0 100644
--- a/ext/wasm/speedtest1.html
+++ b/ext/wasm/speedtest1.html
@@ -45,7 +45,7 @@
            returns the name of the dir on which OPFS is mounted, else it returns
            an empty string.
         */
-        const opfsDir = function f(wasmUtil){
+        const wasmfsDir = function f(wasmUtil){
           if(undefined !== f._) return f._;
           const pdir = '/persistent';
           if( !self.FileSystemHandle
@@ -66,7 +66,7 @@
             return f._ = "";
           }
         };
-        opfsDir._ = undefined;
+        wasmfsDir._ = undefined;
 
         const eOut = document.querySelector('#test-output');
         const log2 = function(cssClass,...args){
@@ -92,28 +92,41 @@
           logList.push('ERROR: '+args.join(' '));
         };
 
-        const runTests = function(EmscriptenModule){
-          console.log("Module inited.",EmscriptenModule);
-          const wasm = {
-            exports: EmscriptenModule.asm,
-            alloc: (n)=>EmscriptenModule._malloc(n),
-            dealloc: (m)=>EmscriptenModule._free(m),
-            memory: EmscriptenModule.asm.memory || EmscriptenModule.wasmMemory
-          };
-          //console.debug('wasm =',wasm);
-          self.WhWasmUtilInstaller(wasm);
+        const runTests = function(sqlite3){
+          const capi = sqlite3.capi, wasm = capi.wasm;
+          //console.debug('sqlite3 =',sqlite3);
           const unlink = wasm.xWrap("sqlite3_wasm_vfs_unlink", "int", ["string"]);
-          const pDir = opfsDir(wasm);
+          const pDir = wasmfsDir(wasm);
           if(pDir){
             console.warn("Persistent storage:",pDir);
           }
           const scope = wasm.scopedAllocPush();
-          const dbFile = 0 ? "" : pDir+"/speedtest1.db";
-          const urlArgs = self.SqliteTestUtil.processUrlArgs();
+          let dbFile = pDir+"/speedtest1.db";
+          const urlParams = self.SqliteTestUtil.processUrlArgs();
           const argv = ["speedtest1"];
-          if(urlArgs.flags){
+          if('string'===typeof urlParams.vfs){
+              if(!capi.sqlite3_vfs_find(urlParams.vfs)){
+                  log2('error',"Unknown VFS:",urlParams.vfs);
+                  return;
+              }
+              argv.push("--vfs", urlParams.vfs);
+              log2('',"Using VFS:",urlParams.vfs);
+              if('kvvfs' === urlParams.vfs){
+                  urlParams.size = 1;
+                  dbFile = 'session';
+                  log2('',"kvvfs VFS: forcing --size 1 and filename 'session'");
+                  capi.sqlite3_web_kvvfs_clear('session');
+              }
+          }
+          [
+              'size'
+          ].forEach(function(k){
+              const v = urlParams[k];
+              if(v) argv.push('--'+k, urlParams[k]);
+          });
+          if(urlParams.flags){
             // transform flags=a,b,c to ["--a", "--b", "--c"]
-            argv.push(...(urlArgs.flags.split(',').map((v)=>'--'+v)));
+            argv.push(...(urlParams.flags.split(',').map((v)=>'--'+v)));
           }else{
             argv.push(
               "--singlethread",
@@ -134,7 +147,7 @@
                "Give it time...");
           logList.length = 0;
           setTimeout(function(){
-              wasm.xCall('__main_argc_argv', argv.length,
+              wasm.xCall('wasm_main', argv.length,
                          wasm.scopedAllocMainArgv(argv));
               wasm.scopedAllocPop(scope);
               if(pDir) unlink(dbFile);
@@ -145,8 +158,11 @@
 
         self.sqlite3TestModule.print = log;
         self.sqlite3TestModule.printErr = logErr;
-        sqlite3Speedtest1InitModule(self.sqlite3TestModule).then(function(M){
-          setTimeout(()=>runTests(M), 100);
+        sqlite3Speedtest1InitModule(self.sqlite3TestModule)
+        .then((EmscriptenModule)=>{
+            return EmscriptenModule.sqlite3.installOpfsVfs()
+                .catch((e)=>{console.warn(e.message)})
+                .then(()=>runTests(EmscriptenModule.sqlite3));
         });
       })();
     </script>
diff --git a/manifest b/manifest
index 5e90405e4e..16af6e39d6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C speedtest1:\sadd\s--vfs\sNAME\sflag\sand\seliminate\scode\sduplication\sin\sargc\ssize\sverification\sfor\sall\sflags\swhich\stake\sa\svalue.
-D 2022-09-19T11:47:38.781
+C Merge\skv-vfs\sbranch\sinto\sfiddle-opfs.\sAdjust\svarious\sJS\sAPIs\sand\sapps\sto\sdeal\swith\sthe\snew\smethod\sof\shandling\skvvfs.\sAdjust\sspeedtest1\sJS\sbuild\sto\sinclude\ssqlite3-api.js\sso\sthat\sit\scan\suse\skvvfs\sand\sopfs\sVFSes.\sPermit\spassing\sof\sthe\svfs\sas\sa\sURL\sparameter\sto\scertain\sdemo/test\sapps.\sMilestone:\sspeedtest-worker.html?vfs=opfs\sruns\swith\sthe\sstandalone\sOPFS\simpl.
+D 2022-09-19T13:16:35.953
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle 7fb73f7150ab79d83bb45a67d257553c905c78cd3d693101699243f36c5ae6c3
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile 19ba3304cf4e5e5f480a5c3701b2c7d7b7383f70416359fc4a1d304b4ffdd895
+F ext/wasm/GNUmakefile b6a5b642e8b3e587d3edcfeb6b6275acbe4730293f4ad46c4997cd932d57aec5
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 150a793a47205b8009ac934f3b6d6ebf67b965c072339aaa25ce808a19e116cc
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -485,7 +485,7 @@ F ext/wasm/api/sqlite3-api-cleanup.js 8564a6077cdcaea9a9f428a019af8a05887f0131e6
 F ext/wasm/api/sqlite3-api-glue.js 366d580c8e5bf7fcf4c6dee6f646c31f5549bd417ea03a59a0acca00e8ecce30
 F ext/wasm/api/sqlite3-api-oo1.js 2d13dddf0d2b4168a9249f124134d37924331e5b55e05dba18b6d661fbeefe48
 F ext/wasm/api/sqlite3-api-opfs.js 580be306be7301fa0b3cb2abd5765561a3d7f4746a7679f95394af50a14671bb
-F ext/wasm/api/sqlite3-api-prologue.js 4e3e26880d444000cca1b4f3ddfa9d49581dfecd1de9426080239ecc208c447d
+F ext/wasm/api/sqlite3-api-prologue.js 7b1e4a45f733a6f95551b383eb37cb86754d18214b11f668298f7a83a23ef732
 F ext/wasm/api/sqlite3-api-worker1.js ee4cf149cbacb63d06b536674f822aa5088b7e022cdffc69f1f36cebe2f9fea0
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 4130e2df9587f4e4c3afc04c3549d682c8a5c0cfe5b22819a0a86edb7f01b9bd
@@ -499,25 +499,24 @@ F ext/wasm/common/whwasmutil.js f7282ef36c9625330d4e6e82d1beec6678cd101e95e7108c
 F ext/wasm/demo-123-worker.html e419b66495d209b5211ec64903b4cfb3ca7df20d652b41fcd28bf018a773234f
 F ext/wasm/demo-123.html aa281d33b7eefa755f3122b7b5a18f39a42dc5fb69c8879171bf14b4c37c4ec4
 F ext/wasm/demo-123.js 234655683e35a4543a23de7b10800d76b0369947b33e089e5613171fa7795afb
+F ext/wasm/demo-kvvfs1.html 7d4f28873de67f51ac18c584b7d920825139866a96049a49c424d6f5a0ea5e7f w ext/wasm/kvvfs1.html
+F ext/wasm/demo-kvvfs1.js e884ea35022d772c0d1dd884b40011413696438394f605c6cd4808cfb1642a4a w ext/wasm/kvvfs1.js
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js bccf46045be8824752876f3eec01c223be0616ccac184bffd0024cfe7a3262b8
 F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
 F ext/wasm/fiddle/fiddle.js 4ffcfc9a235beebaddec689a549e9e0dfad6dca5c1f0b41f03468d7e76480686
-F ext/wasm/index.html aed40adf52598a353e27e50480d53e59a5e75e9ba889f7d8bb2fda45a0a91c3b
+F ext/wasm/index.html de69bc78273fbe024a21dae0f378a87b37ad4cd585ed0cd0a0ed2c5d5afe9fbc
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 447cc02b598f7792edaa8ae6853a7847b8178a18ed356afacbdbf312b2588106
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
 F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e568d2c2307c416902059339c06f19
-F ext/wasm/kvvfs.make 4b2ba6d061f3a52da9f5812f86f4faa80fb4d9456a152f6b0585dccd667a4e22
-F ext/wasm/kvvfs1.html 13bb24190bfb276a57b228499519badcc1bf39ed07e4b37bc2a425ce6418fed1
-F ext/wasm/kvvfs1.js ec1c1d071bb055711f9151df05616111432cf3e6bf7ac7f8dcbcfb56c9d9ed48
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
 F ext/wasm/scratchpad-wasmfs-main.js f0836e3576df7a89390d777bb53e142e559e8a79becfb2a5a976490b05a1c4fa
 F ext/wasm/speedtest1-kvvfs.html c8b65c20e2b35298dc02d8e0a394d5e1eb857fd22e504468388234aee13aef08
-F ext/wasm/speedtest1-wasmfs.html 6a67a6812f03a2058eb5c6ad0c8dea4bf749d0160ed9d6b826dabe7b766c3cf7
-F ext/wasm/speedtest1-worker.html d8881ae802d15fb8adb94049265173e99f350e07e1d4e6f9e1cbd8969fe63a04
-F ext/wasm/speedtest1-worker.js fb5d282c0b8aed18daf41c57f768cbf434f8137dbff707d53dcedcd7d4cb60ef
-F ext/wasm/speedtest1.html fbb8e4d1639028443f3687a683be660beca6927920545cf6b1fdf503104591c0
+F ext/wasm/speedtest1-wasmfs.html 3a6f89fdd025d137ea9122a84a454d5d31cafa8495e7371e984f4d4b8ce58834
+F ext/wasm/speedtest1-worker.html edbfbff9249b33a889fb76e7df9640d83e03f1e0d25b6c9e228f00d629a76ed0
+F ext/wasm/speedtest1-worker.js d26605f9518978ccbefbec2cbcdf90437c00828e3cb0fd69712f58b37f9e071c
+F ext/wasm/speedtest1.html 225ef377f7c42b8044505d9ef1a8c97c8dddb6d8799d322bd654c9f70c0f2f6f
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
@@ -1508,7 +1507,7 @@ F test/speed3.test 694affeb9100526007436334cf7d08f3d74b85ef
 F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
 F test/speed4p.test 377a0c48e5a92e0b11c1c5ebb1bc9d83a7312c922bc0cb05970ef5d6a96d1f0c
-F test/speedtest1.c 4be5c905c7b3ee72d8e54dea3a846b8c3e7f9674cf3d080968e0e6651ba3c302
+F test/speedtest1.c 752fc1cad512f7c94271d3fdb46d6d90c9f6b61d0a4722a28c7028f53952fb1d
 F test/spellfix.test 951a6405d49d1a23d6b78027d3877b4a33eeb8221dcab5704b499755bb4f552e
 F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3
 F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33
@@ -2028,8 +2027,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 9370ce94780e974da03d5c74cf9a5983eed333e7b3bc54e605c5f30b3fa99287 354726aa6c399053785f29104de15091629ce4bc275b9e2205cb3656a9e81cd7
-R 00556834ec19d453fd785f2bebf86235
+P 281d09867134e0a057cfadd9bfcbf0e21b8ac9737a278c41973d33a3101be7bc
+R 6442d22e3df1d96228caf48bf4bfd7a0
 U stephan
-Z 19b45de03e5674211a91148844c56c0b
+Z 5bc762c205d5862d76e828c3121841fc
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 582e7ce8e3..d3459cc1a5 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-281d09867134e0a057cfadd9bfcbf0e21b8ac9737a278c41973d33a3101be7bc
\ No newline at end of file
+ec09f32f7ae2249aaf27388ad2062982afa8bbbb5f88d236d6d9068bf33ad93d
\ No newline at end of file
diff --git a/test/speedtest1.c b/test/speedtest1.c
index d686c49663..d1efdf13a0 100644
--- a/test/speedtest1.c
+++ b/test/speedtest1.c
@@ -2197,7 +2197,6 @@ static int xCompileOptions(void *pCtx, int nVal, char **azVal, char **azCol){
   printf("-- Compile option: %s\n", azVal[0]);
   return SQLITE_OK;
 }
-
 int main(int argc, char **argv){
   int doAutovac = 0;            /* True for --autovacuum */
   int cacheSize = 0;            /* Desired cache size.  0 means default */
@@ -2634,3 +2633,13 @@ int main(int argc, char **argv){
   free( pHeap );
   return 0;
 }
+
+#ifdef SQLITE_SPEEDTEST1_WASM
+/*
+** A workaround for some inconsistent behaviour with how
+** main() does (or does not) get exported to WASM.
+*/
+int wasm_main(int argc, char **argv){
+  return main(argc, argv);
+}
+#endif

From 0e0687ccfc2c898489cdc7ca8116b2dd2a3bcb54 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 19 Sep 2022 13:44:23 +0000
Subject: [PATCH 136/428] Add sqlite3_web_vfs_list() to JS API. Corrected OPFS
 VFS's registering itself as the default VFS. speedtest1-worker now uses the
 xDelete() of both the default VFS and OPFS, to avoid that it starts up with a
 persistent OPFS test db (the native app calls unlink(), but that unlink call
 operates on a different virtual filesystem than the OPFS VFS).

FossilOrigin-Name: 2ec7e09139a510b9fd29e4c97283b20740a00f369193c6fecbb734f187e81b48
---
 ext/wasm/api/sqlite3-api-opfs.js     |  6 +++---
 ext/wasm/api/sqlite3-api-prologue.js | 16 ++++++++++++++++
 ext/wasm/speedtest1-wasmfs.html      |  3 +--
 ext/wasm/speedtest1-worker.html      |  3 +--
 ext/wasm/speedtest1-worker.js        | 10 ++++++++--
 ext/wasm/speedtest1.html             |  3 +--
 manifest                             | 26 +++++++++++++-------------
 manifest.uuid                        |  2 +-
 8 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index e0554e8c0c..62aad0c4bb 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -560,13 +560,13 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
        Returns true if the deletion succeeded and fails if it fails,
        but cannot report the nature of the failure.
     */
-    opfsUtil.deleteEntry = function(fsEntryName,recursive){
+    opfsUtil.deleteEntry = function(fsEntryName,recursive=false){
       return 0===opRun('xDelete', {filename:fsEntryName, recursive});
     };
     /**
        Exactly like deleteEntry() but runs asynchronously.
     */
-    opfsUtil.deleteEntryAsync = async function(fsEntryName,recursive){
+    opfsUtil.deleteEntryAsync = async function(fsEntryName,recursive=false){
       wMsg('xDeleteNoWait', {filename: fsEntryName, recursive});
     };
     /**
@@ -682,7 +682,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
               so we now know that the state object is no longer subject to
               being copied by a pending postMessage() call.*/
             try {
-              const rc = capi.sqlite3_vfs_register(opfsVfs.pointer, opfsVfs.$zName);
+              const rc = capi.sqlite3_vfs_register(opfsVfs.pointer, 0);
               if(rc){
                 opfsVfs.dispose();
                 toss("sqlite3_vfs_register(OPFS) failed with rc",rc);
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index bd9779b7ef..7bc42b3683 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -813,6 +813,22 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     }
   };
 
+  /**
+     Returns an array of the names of all currently-registered sqlite3
+     VFSes.
+  */
+  capi.sqlite3_web_vfs_list = function(){
+    const rc = [];
+    let pVfs = capi.sqlite3_vfs_find(0);
+    while(pVfs){
+      const oVfs = new capi.sqlite3_vfs(pVfs);
+      rc.push(capi.wasm.cstringToJs(oVfs.$zName));
+      pVfs = oVfs.$pNext;
+      oVfs.dispose();
+    }
+    return rc;
+  };
+
   if( self.window===self ){
     /* Features specific to the main window thread... */
 
diff --git a/ext/wasm/speedtest1-wasmfs.html b/ext/wasm/speedtest1-wasmfs.html
index c8e93f6dcf..d0400f7e76 100644
--- a/ext/wasm/speedtest1-wasmfs.html
+++ b/ext/wasm/speedtest1-wasmfs.html
@@ -114,8 +114,7 @@
           const urlArgs = self.SqliteTestUtil.processUrlArgs();
           const argv = ["speedtest1"];
           if(urlArgs.flags){
-            // transform flags=a,b,c to ["--a", "--b", "--c"]
-            argv.push(...(urlArgs.flags.split(',').map((v)=>'--'+v)));
+            argv.push(...(urlArgs.flags.split(',')));
           }else{
             argv.push(
               "--singlethread",
diff --git a/ext/wasm/speedtest1-worker.html b/ext/wasm/speedtest1-worker.html
index bc3f10a6fc..38eff5cb27 100644
--- a/ext/wasm/speedtest1-worker.html
+++ b/ext/wasm/speedtest1-worker.html
@@ -126,7 +126,6 @@
         justify-content: flex-start;
       }
     </style>
-    <script src="common/SqliteTestUtil.js"></script>
     <script>(function(){
       'use strict';
       const E = (sel)=>document.querySelector(sel);
@@ -199,7 +198,7 @@
           eSelectedFlags.appendChild(e);
         });
         const rxStripDash = /^(-+)?/;
-        const comma = flags.map((v)=>v.replace(rxStripDash,'')).join(',');
+        const comma = flags.join(',');
         eLinkMainThread.setAttribute('target', 'speedtest1-main-'+comma);
         eLinkMainThread.href = 'speedtest1.html?flags='+comma;
         eLinkWasmfs.setAttribute('target', 'speedtest1-wasmfs-'+comma);
diff --git a/ext/wasm/speedtest1-worker.js b/ext/wasm/speedtest1-worker.js
index fe43e5646b..b614e1a01c 100644
--- a/ext/wasm/speedtest1-worker.js
+++ b/ext/wasm/speedtest1-worker.js
@@ -45,7 +45,8 @@
 
   const runSpeedtest = function(cliFlagsArray){
     const scope = App.wasm.scopedAllocPush();
-    const dbFile = 0 ? "" : App.pDir+"/speedtest1.db";
+    const dbFile = App.pDir+"/speedtest1.db";
+    App.unlink(dbFile);
     try{
       const argv = [
         "speedtest1.wasm", ...cliFlagsArray, dbFile
@@ -85,12 +86,17 @@
     return S.installOpfsVfs()
       .catch((e)=>console.warn(e.message))
       .then(()=>{
-        App.unlink = S.capi.wasm.xWrap("sqlite3_wasm_vfs_unlink", "int", ["string"]);
+        const vfsUnlink = S.capi.wasm.xWrap("sqlite3_wasm_vfs_unlink", "int", ["string"]);
+        App.unlink = function(fname){
+          vfsUnlink(fname);
+          if(S.opfs) S.opfs.deleteEntry(fname);
+        };
         App.pDir = wasmfsDir(S.wasm);
         App.wasm = S.capi.wasm;
         //if(App.pDir) log("Persistent storage:",pDir);
         //else log("Using transient storage.");
         mPost('ready',true);
+        log("Registered VFSes:", ...S.capi.sqlite3_web_vfs_list());
       });
   });
 })();
diff --git a/ext/wasm/speedtest1.html b/ext/wasm/speedtest1.html
index aca0734cf0..be0be3d83f 100644
--- a/ext/wasm/speedtest1.html
+++ b/ext/wasm/speedtest1.html
@@ -125,8 +125,7 @@
               if(v) argv.push('--'+k, urlParams[k]);
           });
           if(urlParams.flags){
-            // transform flags=a,b,c to ["--a", "--b", "--c"]
-            argv.push(...(urlParams.flags.split(',').map((v)=>'--'+v)));
+            argv.push(...(urlParams.flags.split(',')));
           }else{
             argv.push(
               "--singlethread",
diff --git a/manifest b/manifest
index 16af6e39d6..7ccebd6075 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\skv-vfs\sbranch\sinto\sfiddle-opfs.\sAdjust\svarious\sJS\sAPIs\sand\sapps\sto\sdeal\swith\sthe\snew\smethod\sof\shandling\skvvfs.\sAdjust\sspeedtest1\sJS\sbuild\sto\sinclude\ssqlite3-api.js\sso\sthat\sit\scan\suse\skvvfs\sand\sopfs\sVFSes.\sPermit\spassing\sof\sthe\svfs\sas\sa\sURL\sparameter\sto\scertain\sdemo/test\sapps.\sMilestone:\sspeedtest-worker.html?vfs=opfs\sruns\swith\sthe\sstandalone\sOPFS\simpl.
-D 2022-09-19T13:16:35.953
+C Add\ssqlite3_web_vfs_list()\sto\sJS\sAPI.\sCorrected\sOPFS\sVFS's\sregistering\sitself\sas\sthe\sdefault\sVFS.\sspeedtest1-worker\snow\suses\sthe\sxDelete()\sof\sboth\sthe\sdefault\sVFS\sand\sOPFS,\sto\savoid\sthat\sit\sstarts\sup\swith\sa\spersistent\sOPFS\stest\sdb\s(the\snative\sapp\scalls\sunlink(),\sbut\sthat\sunlink\scall\soperates\son\sa\sdifferent\svirtual\sfilesystem\sthan\sthe\sOPFS\sVFS).
+D 2022-09-19T13:44:23.433
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -484,8 +484,8 @@ F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a
 F ext/wasm/api/sqlite3-api-cleanup.js 8564a6077cdcaea9a9f428a019af8a05887f0131e6a2a1e72a7ff1145fadfe77
 F ext/wasm/api/sqlite3-api-glue.js 366d580c8e5bf7fcf4c6dee6f646c31f5549bd417ea03a59a0acca00e8ecce30
 F ext/wasm/api/sqlite3-api-oo1.js 2d13dddf0d2b4168a9249f124134d37924331e5b55e05dba18b6d661fbeefe48
-F ext/wasm/api/sqlite3-api-opfs.js 580be306be7301fa0b3cb2abd5765561a3d7f4746a7679f95394af50a14671bb
-F ext/wasm/api/sqlite3-api-prologue.js 7b1e4a45f733a6f95551b383eb37cb86754d18214b11f668298f7a83a23ef732
+F ext/wasm/api/sqlite3-api-opfs.js e6b3a168f18b94f01fd21028ffdbaf4e576c53c2f2762032c9ee7d24b7a3bd99
+F ext/wasm/api/sqlite3-api-prologue.js 0d2639387b94c30f492d4aea6e44fb7b16720808678464559458fd2ae3759655
 F ext/wasm/api/sqlite3-api-worker1.js ee4cf149cbacb63d06b536674f822aa5088b7e022cdffc69f1f36cebe2f9fea0
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 4130e2df9587f4e4c3afc04c3549d682c8a5c0cfe5b22819a0a86edb7f01b9bd
@@ -499,8 +499,8 @@ F ext/wasm/common/whwasmutil.js f7282ef36c9625330d4e6e82d1beec6678cd101e95e7108c
 F ext/wasm/demo-123-worker.html e419b66495d209b5211ec64903b4cfb3ca7df20d652b41fcd28bf018a773234f
 F ext/wasm/demo-123.html aa281d33b7eefa755f3122b7b5a18f39a42dc5fb69c8879171bf14b4c37c4ec4
 F ext/wasm/demo-123.js 234655683e35a4543a23de7b10800d76b0369947b33e089e5613171fa7795afb
-F ext/wasm/demo-kvvfs1.html 7d4f28873de67f51ac18c584b7d920825139866a96049a49c424d6f5a0ea5e7f w ext/wasm/kvvfs1.html
-F ext/wasm/demo-kvvfs1.js e884ea35022d772c0d1dd884b40011413696438394f605c6cd4808cfb1642a4a w ext/wasm/kvvfs1.js
+F ext/wasm/demo-kvvfs1.html 7d4f28873de67f51ac18c584b7d920825139866a96049a49c424d6f5a0ea5e7f
+F ext/wasm/demo-kvvfs1.js e884ea35022d772c0d1dd884b40011413696438394f605c6cd4808cfb1642a4a
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js bccf46045be8824752876f3eec01c223be0616ccac184bffd0024cfe7a3262b8
 F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
@@ -513,10 +513,10 @@ F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e5
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
 F ext/wasm/scratchpad-wasmfs-main.js f0836e3576df7a89390d777bb53e142e559e8a79becfb2a5a976490b05a1c4fa
 F ext/wasm/speedtest1-kvvfs.html c8b65c20e2b35298dc02d8e0a394d5e1eb857fd22e504468388234aee13aef08
-F ext/wasm/speedtest1-wasmfs.html 3a6f89fdd025d137ea9122a84a454d5d31cafa8495e7371e984f4d4b8ce58834
-F ext/wasm/speedtest1-worker.html edbfbff9249b33a889fb76e7df9640d83e03f1e0d25b6c9e228f00d629a76ed0
-F ext/wasm/speedtest1-worker.js d26605f9518978ccbefbec2cbcdf90437c00828e3cb0fd69712f58b37f9e071c
-F ext/wasm/speedtest1.html 225ef377f7c42b8044505d9ef1a8c97c8dddb6d8799d322bd654c9f70c0f2f6f
+F ext/wasm/speedtest1-wasmfs.html a5eafc99e108f3b8136e9bb59757865aa45e6f1fa9d412cd4b4852a570cb4e11
+F ext/wasm/speedtest1-worker.html 1d723ae1eb8ddf5eebe7d43de32b5db04d732b674758bc2d684b6952f20b1fce
+F ext/wasm/speedtest1-worker.js d7e02ff74c28c8f2ef19eb6585642d44b7c8e7b83ac19b7848b209a880945706
+F ext/wasm/speedtest1.html f136c6da59d77c5c0c784e0a67795723304ba4b47a45028dfb45132c4625cd4e
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
@@ -2027,8 +2027,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 281d09867134e0a057cfadd9bfcbf0e21b8ac9737a278c41973d33a3101be7bc
-R 6442d22e3df1d96228caf48bf4bfd7a0
+P ec09f32f7ae2249aaf27388ad2062982afa8bbbb5f88d236d6d9068bf33ad93d
+R 51982b0b1e31fbc7ea3b58657a7f12b2
 U stephan
-Z 5bc762c205d5862d76e828c3121841fc
+Z d7c826042daaeccd4155ca97997a92df
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index d3459cc1a5..cd14a7cc1c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ec09f32f7ae2249aaf27388ad2062982afa8bbbb5f88d236d6d9068bf33ad93d
\ No newline at end of file
+2ec7e09139a510b9fd29e4c97283b20740a00f369193c6fecbb734f187e81b48
\ No newline at end of file

From 61418d5a679f11bbf3517431777c14b30252bd75 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 19 Sep 2022 14:56:13 +0000
Subject: [PATCH 137/428] Remove an obsolete file. Update wasmfs build for
 today's changes. Fix the case that OPFS.xTruncate() is passed a BigInt
 instead of a Number.

FossilOrigin-Name: 976053925013bf1975f5f9222e28ba648af28e305bb6bdae600eb24d0e136bec
---
 ext/wasm/speedtest1-kvvfs.html       | 159 ---------------------------
 ext/wasm/speedtest1-wasmfs.html      |  49 ++++-----
 ext/wasm/speedtest1-worker.html      |   4 +-
 ext/wasm/speedtest1.html             |   1 -
 ext/wasm/sqlite3-opfs-async-proxy.js |   2 +-
 ext/wasm/wasmfs.make                 |  15 ++-
 manifest                             |  21 ++--
 manifest.uuid                        |   2 +-
 8 files changed, 45 insertions(+), 208 deletions(-)
 delete mode 100644 ext/wasm/speedtest1-kvvfs.html

diff --git a/ext/wasm/speedtest1-kvvfs.html b/ext/wasm/speedtest1-kvvfs.html
deleted file mode 100644
index 12085d4cb5..0000000000
--- a/ext/wasm/speedtest1-kvvfs.html
+++ /dev/null
@@ -1,159 +0,0 @@
-<!doctype html>
-<html lang="en-us">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
-    <link rel="stylesheet" href="common/emscripten.css"/>
-    <link rel="stylesheet" href="common/testing.css"/>
-    <title>speedtest1-kvvfs.wasm</title>
-  </head>
-  <body>
-    <header id='titlebar'><span>speedtest1-kvvfs.wasm</span></header>
-    <div>See also: <a href='speedtest1-worker.html'>A Worker-thread variant of this page.</a></div>
-    <!-- emscripten bits -->
-    <figure id="module-spinner">
-      <div class="spinner"></div>
-      <div class='center'><strong>Initializing app...</strong></div>
-      <div class='center'>
-        On a slow internet connection this may take a moment.  If this
-        message displays for "a long time", intialization may have
-        failed and the JavaScript console may contain clues as to why.
-      </div>
-    </figure>
-    <div class="emscripten" id="module-status">Downloading...</div>
-    <div class="emscripten">
-      <progress value="0" max="100" id="module-progress" hidden='1'></progress>  
-    </div><!-- /emscripten bits -->
-    <div class='warning'>This page starts running the main exe when it loads, which will
-      block the UI until it finishes! Adding UI controls to manually configure and start it
-      are TODO.</div>
-    </div>
-    <div class='warning'>Achtung: running it with the dev tools open may
-      <em>drastically</em> slow it down. For faster results, keep the dev
-      tools closed when running it!
-    </div>
-    <div>Output is delayed/buffered because we cannot update the UI while the
-      speedtest is running. Output will appear below when ready...
-    <div id='test-output'></div>
-    <script src="common/whwasmutil.js"></script>
-    <script src="common/SqliteTestUtil.js"></script>
-    <script src="speedtest1-kvvfs.js"></script>
-    <script>(function(){
-        const eOut = document.querySelector('#test-output');
-        const log2 = function(cssClass,...args){
-          const ln = document.createElement('div');
-          if(cssClass) ln.classList.add(cssClass);
-          ln.append(document.createTextNode(args.join(' ')));
-          eOut.append(ln);
-        };
-        const logList = [
-        ] /* We can't update DOM while speedtest and kvvfs only works
-             in the main thread, so we queue up main()-time output
-             into logList. */;
-        const dumpLogList = function(){
-          logList.forEach((v)=>log2('',v));
-          logList.length = 0;
-        };
-        const log = (...args)=>{
-          console.log(...args);
-          logList.push(args.join(' '));
-        };
-        const logErr = function(...args){
-          console.error(...args);
-          logList.push('ERROR: '+args.join(' '));
-        };
-
-        const guessStorageSize = function(which=''){
-          let sz = 0;
-          const prefix = 'kvvfs-'+which;
-          [localStorage,sessionStorage].forEach((s)=>{
-            let i;
-            for(i = 0; i < s.length; ++i){
-              const k = s.key(i);
-              if(k.startsWith(prefix)){
-                sz += k.length;
-                sz += s.getItem(k).length;
-              }
-            }
-          });
-          return sz * 2 /* for 16-bit-char encoding */;
-        };
-        const clearStorage = function(){
-            sessionStorage.clear();
-            localStorage.clear();
-        };
-        const runTests = function(EmscriptenModule){
-          console.log("Module inited.",EmscriptenModule);
-            
-          const wasm = {
-            exports: EmscriptenModule.asm,
-            alloc: (n)=>EmscriptenModule._malloc(n),
-            dealloc: (m)=>EmscriptenModule._free(m),
-            memory: EmscriptenModule.asm.memory || EmscriptenModule.wasmMemory
-          };
-          log2('warning',"Clearing session/local storage before test starts.");
-          clearStorage();
-          //console.debug('wasm =',wasm);
-          self.WhWasmUtilInstaller(wasm);
-          const scope = wasm.scopedAllocPush();
-          const dbFile = 0 ? "session" : "local";
-          const urlArgs = self.SqliteTestUtil.processUrlArgs();
-          const argv = ["speedtest1",
-                        "--size", "2",
-                        "--pagesize", "4096" /*1024, 2096 fail with --size > 1.*/
-                       ];
-          if(urlArgs.flags){
-            // transform flags=a,b,c to ["--a", "--b", "--c"]
-            argv.push(...(urlArgs.flags.split(',').map((v)=>'--'+v)));
-          }else{
-            argv.push(
-              "--singlethread",
-              "--nomutex",
-              //"--nosync",
-              "--nomemstat"
-              //  ,"--sqlonly"
-            );
-            //argv.push("--memdb" /* note that memdb trumps the filename arg */);
-          }
-          argv.push("--big-transactions"/*important for tests 410 and 510!*/,
-                    dbFile);
-          if(argv.indexOf('--memdb')>=0){
-              log2('error',"WARNING: --memdb flag trumps db filename.");
-          }
-          console.log("argv =",argv);
-          // These log messages are not emitted to the UI until after main() returns. Fixing that
-          // requires moving the main() call and related cleanup into a timeout handler.
-          log2('',"Starting native app:\n ",argv.join(' '));
-          log2('',"This will take a while and the browser might warn about the runaway JS.",
-               "Give it time...");
-          logList.length = 0;
-          new Promise(function(resolve,reject){
-            setTimeout(function(){
-              try {
-                wasm.xCall('__main_argc_argv', argv.length,
-                           wasm.scopedAllocMainArgv(argv));
-              }catch(e){
-                reject(e);
-              }
-              resolve();
-            }, 50);
-          }).finally(function(){
-            wasm.scopedAllocPop(scope);
-            logList.unshift("Done running native main(). Output:");
-            dumpLogList();
-            log2('',"Approximate",dbFile,"storage usage:",guessStorageSize(),"bytes");
-            log2('warning',"Clearing",dbFile,"storage.");
-            clearStorage(dbFile);
-          });
-        }/*runTests()*/;
-
-        self.sqlite3TestModule.print = log;
-        self.sqlite3TestModule.printErr = logErr;
-        sqlite3Speedtest1InitModule(self.sqlite3TestModule).then(function(M){
-          setTimeout(()=>runTests(M), 100);
-        });
-      })();
-    </script>
-  </body>
-</html>
diff --git a/ext/wasm/speedtest1-wasmfs.html b/ext/wasm/speedtest1-wasmfs.html
index d0400f7e76..37155282cd 100644
--- a/ext/wasm/speedtest1-wasmfs.html
+++ b/ext/wasm/speedtest1-wasmfs.html
@@ -36,7 +36,6 @@
     <div>Output is delayed/buffered because we cannot update the UI while the
       speedtest is running. Output will appear below when ready...
     <div id='test-output'></div>
-    <script src="common/whwasmutil.js"></script>
     <script src="common/SqliteTestUtil.js"></script>
     <script src="speedtest1-wasmfs.js"></script>
     <script>(function(){
@@ -45,7 +44,7 @@
            returns the name of the dir on which OPFS is mounted, else it returns
            an empty string.
         */
-        const opfsDir = function f(wasmUtil){
+        const wasmfsDir = function f(wasmUtil){
           if(undefined !== f._) return f._;
           const pdir = '/persistent';
           if( !self.FileSystemHandle
@@ -66,7 +65,7 @@
             return f._ = "";
           }
         };
-        opfsDir._ = undefined;
+        wasmfsDir._ = undefined;
 
         const eOut = document.querySelector('#test-output');
         const log2 = function(cssClass,...args){
@@ -92,29 +91,24 @@
           logList.push('ERROR: '+args.join(' '));
         };
 
-        const runTests = function(EmscriptenModule){
-          console.log("Module inited.",EmscriptenModule);
-          const wasm = {
-            exports: EmscriptenModule.asm,
-            alloc: (n)=>EmscriptenModule._malloc(n),
-            dealloc: (m)=>EmscriptenModule._free(m),
-            memory: EmscriptenModule.asm.memory || EmscriptenModule.wasmMemory
-          };
-          //console.debug('wasm =',wasm);
-          self.WhWasmUtilInstaller(wasm);
+        const runTests = function(sqlite3){
+          console.log("Module inited.");
+          const wasm = sqlite3.capi.wasm;
           const unlink = wasm.xWrap("sqlite3_wasm_vfs_unlink", "int", ["string"]);
-          const pDir = opfsDir(wasm);
+          const pDir = wasmfsDir(wasm);
           if(pDir) log2('',"Persistent storage:",pDir);
           else{
             log2('error',"Expecting persistent storage in this build.");
             return;
           }
           const scope = wasm.scopedAllocPush();
-          const dbFile = 0 ? "" : pDir+"/speedtest1.db";
-          const urlArgs = self.SqliteTestUtil.processUrlArgs();
+          const dbFile = pDir+"/speedtest1.db";
+          const urlParams = self.SqliteTestUtil.processUrlArgs();
           const argv = ["speedtest1"];
-          if(urlArgs.flags){
-            argv.push(...(urlArgs.flags.split(',')));
+          if(urlParams.flags){
+            argv.push(...(urlParams.flags.split(',')));
+            let i = argv.indexOf('--vfs');
+            if(i>=0) argv.splice(i,2);
           }else{
             argv.push(
               "--singlethread",
@@ -124,8 +118,9 @@
             );
             //"--memdb", // note that memdb trumps the filename arg
           }
+
           if(argv.indexOf('--memdb')>=0){
-              log2('error',"WARNING: --memdb flag trumps db filename.");
+            log2('error',"WARNING: --memdb flag trumps db filename.");
           }
           argv.push("--big-transactions"/*important for tests 410 and 510!*/,
                     dbFile);
@@ -138,19 +133,19 @@
                "Give it time...");
           logList.length = 0;
           setTimeout(function(){
-              wasm.xCall('wasm_main', argv.length,
-                         wasm.scopedAllocMainArgv(argv));
-              wasm.scopedAllocPop(scope);
-              if(pDir) unlink(dbFile);
-              logList.unshift("Done running native main(). Output:");
-              dumpLogList();
-          }, 50);
+            wasm.xCall('wasm_main', argv.length,
+                       wasm.scopedAllocMainArgv(argv));
+            wasm.scopedAllocPop(scope);
+            if(pDir) unlink(dbFile);
+            logList.unshift("Done running native main(). Output:");
+            dumpLogList();
+          }, 25);
         }/*runTests()*/;
 
         self.sqlite3TestModule.print = log;
         self.sqlite3TestModule.printErr = logErr;
         sqlite3Speedtest1InitModule(self.sqlite3TestModule).then(function(M){
-          setTimeout(()=>runTests(M), 100);
+            runTests(M.sqlite3);
         });
       })();
     </script>
diff --git a/ext/wasm/speedtest1-worker.html b/ext/wasm/speedtest1-worker.html
index 38eff5cb27..0884c7429c 100644
--- a/ext/wasm/speedtest1-worker.html
+++ b/ext/wasm/speedtest1-worker.html
@@ -147,11 +147,11 @@
         log2('', ...args);
       };
       const logErr = function(...args){
-        //console.error(...args);
+        console.error(...args);
         log2('error', ...args);
       };
       const logWarn = function(...args){
-        //console.warn(...args);
+        console.warn(...args);
         log2('warning', ...args);
       };
 
diff --git a/ext/wasm/speedtest1.html b/ext/wasm/speedtest1.html
index be0be3d83f..275ba7de49 100644
--- a/ext/wasm/speedtest1.html
+++ b/ext/wasm/speedtest1.html
@@ -36,7 +36,6 @@
     <div>Output is delayed/buffered because we cannot update the UI while the
       speedtest is running. Output will appear below when ready...
     <div id='test-output'></div>
-    <script src="common/whwasmutil.js"></script>
     <script src="common/SqliteTestUtil.js"></script>
     <script src="speedtest1.js"></script>
     <script>(function(){
diff --git a/ext/wasm/sqlite3-opfs-async-proxy.js b/ext/wasm/sqlite3-opfs-async-proxy.js
index 7eb12425cc..634659c732 100644
--- a/ext/wasm/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/sqlite3-opfs-async-proxy.js
@@ -301,7 +301,7 @@ const vfsAsyncImpls = {
     const fh = __openFiles[fid];
     try{
       affirmNotRO('xTruncate', fh);
-      await fh.accessHandle.truncate(size);
+      await fh.accessHandle.truncate(Number(size));
     }catch(e){
       error("xTruncate():",e,fh);
       rc = state.sq3Codes.SQLITE_IOERR_TRUNCATE;
diff --git a/ext/wasm/wasmfs.make b/ext/wasm/wasmfs.make
index cc10e58877..253237a237 100644
--- a/ext/wasm/wasmfs.make
+++ b/ext/wasm/wasmfs.make
@@ -72,6 +72,7 @@ sqlite3-wasmfs.jsflags += -sMEMORY64=0
 sqlite3-wasmfs.jsflags += -sINITIAL_MEMORY=128450560
 sqlite3-wasmfs.fsflags := -pthread -sWASMFS -sPTHREAD_POOL_SIZE=2 -sENVIRONMENT=web,worker
 sqlite3-wasmfs.jsflags += $(sqlite3-wasmfs.fsflags)
+speedtest1-common.eflags += -sEXPORTED_FUNCTIONS=@$(dir.wasm)/EXPORTED_FUNCTIONS.speedtest1
 #sqlite3-wasmfs.jsflags += -sALLOW_MEMORY_GROWTH
 #^^^ using ALLOW_MEMORY_GROWTH produces a warning from emcc:
 #   USE_PTHREADS + ALLOW_MEMORY_GROWTH may run non-wasm code slowly,
@@ -80,12 +81,12 @@ ifneq (0,$(enable_bigint))
 sqlite3-wasmfs.jsflags += -sWASM_BIGINT
 endif
 
-$(sqlite3-wasmfs.js): $(sqlite3-wasmfs.wasm.c) $(sqlite3.c) $(sqlite3-wasmfs.extra.c) \
-    EXPORTED_FUNCTIONS.api $(MAKEFILE) $(MAKEFILE.wasmfs) \
+$(sqlite3-wasmfs.js): $(sqlite3-wasmfs.wasm.c) $(sqlite3-wasm.c) $(sqlite3-wasmfs.extra.c) \
+    EXPORTED_FUNCTIONS.api $(sqlite3-wasm.js) $(MAKEFILE) $(MAKEFILE.wasmfs) \
     $(post-js.js)
 	@echo "Building $@ ..."
 	$(emcc.bin) -o $@ $(emcc_opt) $(emcc.flags) \
-      $(sqlite3-wasmfs.cflags) $(sqlite3-wasmfs.jsflags) $(sqlite3-wasmfs.wasm.c) $(sqlite3-wasmfs.extra.c)
+      $(sqlite3-wasmfs.cflags) $(speedtest1-common.eflags) $(sqlite3-wasmfs.jsflags) $(sqlite3-wasmfs.wasm.c) $(sqlite3-wasmfs.extra.c)
 	chmod -x $(sqlite3-wasmfs.wasm)
 	$(maybe-wasm-strip) $(sqlite3-wasmfs.wasm)
 	@ls -la $@ $(sqlite3-wasmfs.wasm)
@@ -99,17 +100,19 @@ all: wasmfs
 # faster binary.
 speedtest1-wasmfs.js := speedtest1-wasmfs.js
 speedtest1-wasmfs.wasm := $(subst .js,.wasm,$(speedtest1-wasmfs.js))
-speedtest1-wasmfs.eflags := -sENVIRONMENT=web,worker $(sqlite3-wasmfs.fsflags)
+speedtest1-wasmfs.eflags := $(sqlite3-wasmfs.fsflags)
 speedtest1-wasmfs.eflags += $(SQLITE_OPT) -DSQLITE_WASM_WASMFS
+speedtest1-wasmfs.eflags += --post-js=$(sqlite3-wasmfs.js)
 $(speedtest1-wasmfs.js): $(MAKEFILE) $(MAKEFILE.wasmfs)
 #$(speedtest1-wasmfs.js): $(sqlite3-wasmfs.js)
-$(speedtest1-wasmfs.js): $(speedtest1.c) $(sqlite3-wasm.c)
+$(speedtest1-wasmfs.js): $(speedtest1.cs) $(sqlite3-wasmfs.js) \
+  EXPORTED_FUNCTIONS.speedtest1
 	@echo "Building $@ ..."
 	$(emcc.bin) \
         $(speedtest1-wasmfs.eflags) $(speedtest1-common.eflags) \
         $(speedtest1.cflags) \
         $(sqlite3-wasmfs.cflags) \
-        -o $@ $(speedtest1.c) $(sqlite3-wasm.c) -lm
+        -o $@ $(speedtest1.cs) -lm
 	$(maybe-wasm-strip) $(speedtest1-wasmfs.wasm)
 	ls -la $@ $(speedtest1-wasmfs.wasm)
 
diff --git a/manifest b/manifest
index 7ccebd6075..7987e5931d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\ssqlite3_web_vfs_list()\sto\sJS\sAPI.\sCorrected\sOPFS\sVFS's\sregistering\sitself\sas\sthe\sdefault\sVFS.\sspeedtest1-worker\snow\suses\sthe\sxDelete()\sof\sboth\sthe\sdefault\sVFS\sand\sOPFS,\sto\savoid\sthat\sit\sstarts\sup\swith\sa\spersistent\sOPFS\stest\sdb\s(the\snative\sapp\scalls\sunlink(),\sbut\sthat\sunlink\scall\soperates\son\sa\sdifferent\svirtual\sfilesystem\sthan\sthe\sOPFS\sVFS).
-D 2022-09-19T13:44:23.433
+C Remove\san\sobsolete\sfile.\sUpdate\swasmfs\sbuild\sfor\stoday's\schanges.\sFix\sthe\scase\sthat\sOPFS.xTruncate()\sis\spassed\sa\sBigInt\sinstead\sof\sa\sNumber.
+D 2022-09-19T14:56:13.838
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -512,15 +512,14 @@ F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5
 F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e568d2c2307c416902059339c06f19
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
 F ext/wasm/scratchpad-wasmfs-main.js f0836e3576df7a89390d777bb53e142e559e8a79becfb2a5a976490b05a1c4fa
-F ext/wasm/speedtest1-kvvfs.html c8b65c20e2b35298dc02d8e0a394d5e1eb857fd22e504468388234aee13aef08
-F ext/wasm/speedtest1-wasmfs.html a5eafc99e108f3b8136e9bb59757865aa45e6f1fa9d412cd4b4852a570cb4e11
-F ext/wasm/speedtest1-worker.html 1d723ae1eb8ddf5eebe7d43de32b5db04d732b674758bc2d684b6952f20b1fce
+F ext/wasm/speedtest1-wasmfs.html 9d8cd19eab8854d17f7129aa11607cae6f6d9857c505a4aef13000588583d93e
+F ext/wasm/speedtest1-worker.html f7adcc68af76d347741ecd884e0c773f707fa2cdec87cfd9b2e147f5fc2c56c7
 F ext/wasm/speedtest1-worker.js d7e02ff74c28c8f2ef19eb6585642d44b7c8e7b83ac19b7848b209a880945706
-F ext/wasm/speedtest1.html f136c6da59d77c5c0c784e0a67795723304ba4b47a45028dfb45132c4625cd4e
+F ext/wasm/speedtest1.html 512addeb3c27c94901178b7bcbde83a6f95c093f9ebe16a2959a0aa0d828cf1d
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
-F ext/wasm/sqlite3-opfs-async-proxy.js 2e9a95fc6204f53ed871d04bdd0341d1c0d1a49c22d43b38144a5319f865930a
+F ext/wasm/sqlite3-opfs-async-proxy.js 7ce90feb4ed582a7709f6a99a46fd43a240a1c1ad2f9f47efff1bd32136ab09c
 F ext/wasm/sqlite3-worker1-promiser.js 4fd0465688a28a75f1d4ee4406540ba494f49844e3cad0670d0437a001943365
 F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
 F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
@@ -531,7 +530,7 @@ F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d766
 F ext/wasm/testing1.js 507001a970fe8a8eb67b6c8d783e1c1daa3db2719f727c4551af29349410e538
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
 F ext/wasm/testing2.js 25584bcc30f19673ce13a6f301f89f8820a59dfe044e0c4f2913941f4097fe3c
-F ext/wasm/wasmfs.make 21a5cf297954a689e0dc2a95299ae158f681cae5e90c10b99d986097815fd42d
+F ext/wasm/wasmfs.make 0fbe3b4ef4e5e25ed61d7b581c48e6406dd688443d1b8d4daf94d779a8056c54
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
@@ -2027,8 +2026,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 ec09f32f7ae2249aaf27388ad2062982afa8bbbb5f88d236d6d9068bf33ad93d
-R 51982b0b1e31fbc7ea3b58657a7f12b2
+P 2ec7e09139a510b9fd29e4c97283b20740a00f369193c6fecbb734f187e81b48
+R 1715d33dc730c3ab31438d0a66f7aa0a
 U stephan
-Z d7c826042daaeccd4155ca97997a92df
+Z 0f0e9b03805cac5450f028e863da1f77
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index cd14a7cc1c..5c3cd2316b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2ec7e09139a510b9fd29e4c97283b20740a00f369193c6fecbb734f187e81b48
\ No newline at end of file
+976053925013bf1975f5f9222e28ba648af28e305bb6bdae600eb24d0e136bec
\ No newline at end of file

From f815011a085e86117da3e28f8281fb13cf1bcdf9 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 19 Sep 2022 17:09:09 +0000
Subject: [PATCH 138/428] Cut the speedtest1 runtime of the OPFS VFS proxy by
 approximately 3/4ths via xRead/xWrite buffer-copying optimizations. Still
 slower than the WASMFS impl by approx. 1/5th.

FossilOrigin-Name: fb7f287310d74a3e236125ae9c49b859f9263c29ae85161c1bcf9dd0778d8a51
---
 ext/wasm/api/sqlite3-api-opfs.js     | 94 ++++++++++++++++++++++++----
 ext/wasm/common/whwasmutil.js        |  8 +++
 ext/wasm/speedtest1-worker.html      |  5 +-
 ext/wasm/speedtest1-worker.js        |  2 +-
 ext/wasm/sqlite3-opfs-async-proxy.js |  3 +-
 manifest                             | 20 +++---
 manifest.uuid                        |  2 +-
 7 files changed, 107 insertions(+), 27 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index 62aad0c4bb..b7e6887f65 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -134,6 +134,34 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
        by the Promise setup and, on success, installed as sqlite3.opfs.
     */
     const opfsUtil = Object.create(null);
+    /**
+       Not part of the public API. Solely for internal/development
+       use.
+    */
+    opfsUtil.metrics = {
+      dump: function(){
+        let k, n = 0, t = 0;
+        for(k in metrics){
+          const m = metrics[k];
+          n += m.count;
+          t += m.time;
+          m.avgTime = (m.count && m.time) ? (m.time / m.count) : 0;
+          m.avgWait = (m.count && m.wait) ? (m.wait / m.count) : 0;
+        }
+        console.log("metrics for",self.location.href,":",metrics,
+                    "\nTotal of",n,"op(s) for",t,"ms");
+      },
+      reset: function(){
+        let k;
+        const r = (m)=>(m.count = m.time = m.wait = 0);
+        for(k in state.opIds){
+          r(metrics[k] = Object.create(null));
+        }
+        [ // timed routines which are not in state.opIds
+          'xFileControl'
+        ].forEach((k)=>r(metrics[k] = Object.create(null)));
+      }
+    }/*metrics*/;      
 
     /**
        State which we send to the async-api Worker or share with it.
@@ -165,6 +193,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
     state.fbInt64Offset =
       state.fileBufferSize - 8 /*spot in fileHandle.sab to store an int64 result */;
     state.opIds = Object.create(null);
+    const metrics = Object.create(null);
     {
       let i = 0;
       state.opIds.xAccess = i++;
@@ -180,6 +209,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
       state.opIds.xWrite = i++;
       state.opIds.mkdir = i++;
       state.opSAB = new SharedArrayBuffer(i * 4/*sizeof int32*/);
+      opfsUtil.metrics.reset();
     }
 
     state.sq3Codes = Object.create(null);
@@ -207,9 +237,11 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
        given operation's signature in the async API counterpart.
     */
     const opRun = (op,args)=>{
+      const t = performance.now();
       Atomics.store(state.opSABView, state.opIds[op], -1);
       wMsg(op, args);
       Atomics.wait(state.opSABView, state.opIds[op], -1);
+      metrics[op].wait += performance.now() - t;
       return Atomics.load(state.opSABView, state.opIds[op]);
     };
 
@@ -338,7 +370,20 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
       tgt.ondispose.__removeFuncList.push(memKey, pFunc);
       return (n,f)=>callee(tgt, n, f);
     }/*installMethod*/;
-    
+
+    const opTimer = Object.create(null);
+    opTimer.op = undefined;
+    opTimer.start = undefined;
+    const mTimeStart = (op)=>{
+      opTimer.start = performance.now();
+      opTimer.op = op;
+      //metrics[op] || toss("Maintenance required: missing metrics for",op);
+      ++metrics[op].count;
+    };
+    const mTimeEnd = ()=>(
+      metrics[opTimer.op].time += performance.now() - opTimer.start
+    );
+
     /**
        Impls for the sqlite3_io_methods methods. Maintenance reminder:
        members are in alphabetical order to simplify finding them.
@@ -351,6 +396,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
         return 0;
       },
       xClose: function(pFile){
+        mTimeStart('xClose');
         let rc = 0;
         const f = __openFiles[pFile];
         if(f){
@@ -358,22 +404,29 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
           rc = opRun('xClose', pFile);
           if(f.sq3File) f.sq3File.dispose();
         }
+        mTimeEnd();
         return rc;
       },
       xDeviceCharacteristics: function(pFile){
         //debug("xDeviceCharacteristics(",pFile,")");
         return capi.SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN;
       },
-      xFileControl: function(pFile,op,pArg){
-        //debug("xFileControl(",arguments,") is a no-op");
+      xFileControl: function(pFile, opId, pArg){
+        mTimeStart('xFileControl');
+        if(capi.SQLITE_FCNTL_SYNC===opId){
+          return opRun('xSync', {fid:pFile, flags:0});
+        }
+        mTimeEnd();
         return capi.SQLITE_NOTFOUND;
       },
       xFileSize: function(pFile,pSz64){
+        mTimeStart('xFileSize');
         const rc = opRun('xFileSize', pFile);
         if(!isWorkerErrCode(rc)){
           const f = __openFiles[pFile];
-          wasm.setMemValue(pSz64, f.sabViewFileSize.getBigInt64(0) ,'i64');
+          wasm.setMemValue(pSz64, f.sabViewFileSize.getBigInt64(0,true) ,'i64');
         }
+        mTimeEnd();
         return rc;
       },
       xLock: function(pFile,lockType){
@@ -383,26 +436,31 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
       },
       xRead: function(pFile,pDest,n,offset){
         /* int (*xRead)(sqlite3_file*, void*, int iAmt, sqlite3_int64 iOfst) */
+        mTimeStart('xRead');
         const f = __openFiles[pFile];
         let rc;
         try {
           // FIXME(?): block until we finish copying the xRead result buffer. How?
           rc = opRun('xRead',{fid:pFile, n, offset});
           if(0===rc || capi.SQLITE_IOERR_SHORT_READ===rc){
-            let i = 0;
-            for(; i < n; ++i) wasm.setMemValue(pDest + i, f.sabView[i]);
+            // set() seems to be the fastest way to copy this...
+            wasm.heap8u().set(f.sabView.subarray(0, n), pDest);
           }
         }catch(e){
           error("xRead(",arguments,") failed:",e,f);
           rc = capi.SQLITE_IOERR_READ;
         }
+        mTimeEnd();
         return rc;
       },
       xSync: function(pFile,flags){
-        return opRun('xSync', {fid:pFile, flags});
+        return 0; // impl'd in xFileControl(). opRun('xSync', {fid:pFile, flags});
       },
       xTruncate: function(pFile,sz64){
-        return opRun('xTruncate', {fid:pFile, size: sz64});
+        mTimeStart('xTruncate');
+        const rc = opRun('xTruncate', {fid:pFile, size: sz64});
+        mTimeEnd();
+        return rc;
       },
       xUnlock: function(pFile,lockType){
         //2022-09: OPFS handles lock when opened
@@ -411,16 +469,19 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
       },
       xWrite: function(pFile,pSrc,n,offset){
         /* int (*xWrite)(sqlite3_file*, const void*, int iAmt, sqlite3_int64 iOfst) */
+        mTimeStart('xWrite');
         const f = __openFiles[pFile];
+        let rc;
         try {
-          let i = 0;
           // FIXME(?): block from here until we finish the xWrite. How?
-          for(; i < n; ++i) f.sabView[i] = wasm.getMemValue(pSrc+i);
-          return opRun('xWrite',{fid:pFile, n, offset});
+          f.sabView.set(wasm.heap8u().subarray(pSrc, pSrc+n));
+          rc = opRun('xWrite',{fid:pFile, n, offset});
         }catch(e){
           error("xWrite(",arguments,") failed:",e,f);
-          return capi.SQLITE_IOERR_WRITE;
+          rc = capi.SQLITE_IOERR_WRITE;
         }
+        mTimeEnd();
+        return rc;
       }
     }/*ioSyncWrappers*/;
     
@@ -430,8 +491,10 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
     */
     const vfsSyncWrappers = {
       xAccess: function(pVfs,zName,flags,pOut){
+        mTimeStart('xAccess');
         const rc = opRun('xAccess', wasm.cstringToJs(zName));
         wasm.setMemValue(pOut, rc ? 0 : 1, 'i32');
+        mTimeEnd();
         return 0;
       },
       xCurrentTime: function(pVfs,pOut){
@@ -448,9 +511,11 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
         return 0;
       },
       xDelete: function(pVfs, zName, doSyncDir){
+        mTimeStart('xDelete');
         opRun('xDelete', {filename: wasm.cstringToJs(zName), syncDir: doSyncDir});
         /* We're ignoring errors because we cannot yet differentiate
            between harmless and non-harmless failures. */
+        mTimeEnd();
         return 0;
       },
       xFullPathname: function(pVfs,zName,nOut,pOut){
@@ -469,6 +534,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
       },
       //xSleep is optionally defined below
       xOpen: function f(pVfs, zName, pFile, flags, pOutFlags){
+        mTimeStart('xOpen');
         if(!f._){
           f._ = {
             fileTypes: {
@@ -518,6 +584,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
           args.sq3File.$pMethods = opfsIoMethods.pointer;
           args.ba = new Uint8Array(args.sab);
         }
+        mTimeEnd();
         return rc;
       }/*xOpen()*/
     }/*vfsSyncWrappers*/;
@@ -600,7 +667,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
       };
       opfsUtil.OpfsDb.prototype = Object.create(sqlite3.oo1.DB.prototype);
     }
-
+    
     /**
        Potential TODOs:
 
@@ -670,6 +737,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
       }
     }/*sanityCheck()*/;
 
+    
     W.onmessage = function({data}){
       //log("Worker.onmessage:",data);
       switch(data.type){
diff --git a/ext/wasm/common/whwasmutil.js b/ext/wasm/common/whwasmutil.js
index 42f602d00d..46cdf84bb8 100644
--- a/ext/wasm/common/whwasmutil.js
+++ b/ext/wasm/common/whwasmutil.js
@@ -603,6 +603,10 @@ self.WhWasmUtilInstaller = function(target){
      out) the pointer's value, else it will contain an essentially
      random value.
 
+     ACHTUNG: calling this often, e.g. in a loop, can have a noticably
+     painful impact on performance. Rather than doing so, use
+     heapForSize() to fetch the heap object and read directly from it.
+
      See: setMemValue()
   */
   target.getMemValue = function(ptr, type='i8'){
@@ -633,6 +637,10 @@ self.WhWasmUtilInstaller = function(target){
      this function behaves as if the 3rd argument were `i32`.
 
      This function returns itself.
+
+     ACHTUNG: calling this often, e.g. in a loop, can have a noticably
+     painful impact on performance. Rather than doing so, use
+     heapForSize() to fetch the heap object and assign directly to it.
   */
   target.setMemValue = function f(ptr, value, type='i8'){
     if (type.endsWith('*')) type = ptrIR;
diff --git a/ext/wasm/speedtest1-worker.html b/ext/wasm/speedtest1-worker.html
index 0884c7429c..fef673e5e2 100644
--- a/ext/wasm/speedtest1-worker.html
+++ b/ext/wasm/speedtest1-worker.html
@@ -260,9 +260,12 @@
         flags["without"] = "rowid     Use WITHOUT ROWID where appropriate";
         const preselectedFlags = [
           'big-transactions',
-          'memdb',
           'singlethread'
         ];
+        if('opfs'!==urlParams.get('vfs')){
+          preselectedFlags.push('memdb');
+        }
+
         Object.keys(flags).sort().forEach(function(f){
           const opt = document.createElement('option');
           eFlags.appendChild(opt);
diff --git a/ext/wasm/speedtest1-worker.js b/ext/wasm/speedtest1-worker.js
index b614e1a01c..b697d6925d 100644
--- a/ext/wasm/speedtest1-worker.js
+++ b/ext/wasm/speedtest1-worker.js
@@ -45,7 +45,7 @@
 
   const runSpeedtest = function(cliFlagsArray){
     const scope = App.wasm.scopedAllocPush();
-    const dbFile = App.pDir+"/speedtest1.db";
+    const dbFile = App.pDir+"/speedtest1.sqlite3";
     App.unlink(dbFile);
     try{
       const argv = [
diff --git a/ext/wasm/sqlite3-opfs-async-proxy.js b/ext/wasm/sqlite3-opfs-async-proxy.js
index 634659c732..73bfad9d87 100644
--- a/ext/wasm/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/sqlite3-opfs-async-proxy.js
@@ -60,6 +60,7 @@ const logImpl = (level,...args)=>{
 const log =    (...args)=>logImpl(2, ...args);
 const warn =   (...args)=>logImpl(1, ...args);
 const error =  (...args)=>logImpl(0, ...args);
+const metrics = Object.create(null);
 
 warn("This file is very much experimental and under construction.",
      self.location.pathname);
@@ -220,7 +221,7 @@ const vfsAsyncImpls = {
     let sz;
     try{
       sz = await fh.accessHandle.getSize();
-      fh.sabViewFileSize.setBigInt64(0, BigInt(sz));
+      fh.sabViewFileSize.setBigInt64(0, BigInt(sz), true);
       sz = 0;
     }catch(e){
       error("xFileSize():",e, fh);
diff --git a/manifest b/manifest
index 7987e5931d..5af5e35d20 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\san\sobsolete\sfile.\sUpdate\swasmfs\sbuild\sfor\stoday's\schanges.\sFix\sthe\scase\sthat\sOPFS.xTruncate()\sis\spassed\sa\sBigInt\sinstead\sof\sa\sNumber.
-D 2022-09-19T14:56:13.838
+C Cut\sthe\sspeedtest1\sruntime\sof\sthe\sOPFS\sVFS\sproxy\sby\sapproximately\s3/4ths\svia\sxRead/xWrite\sbuffer-copying\soptimizations.\sStill\sslower\sthan\sthe\sWASMFS\simpl\sby\sapprox.\s1/5th.
+D 2022-09-19T17:09:09.850
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -484,7 +484,7 @@ F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a
 F ext/wasm/api/sqlite3-api-cleanup.js 8564a6077cdcaea9a9f428a019af8a05887f0131e6a2a1e72a7ff1145fadfe77
 F ext/wasm/api/sqlite3-api-glue.js 366d580c8e5bf7fcf4c6dee6f646c31f5549bd417ea03a59a0acca00e8ecce30
 F ext/wasm/api/sqlite3-api-oo1.js 2d13dddf0d2b4168a9249f124134d37924331e5b55e05dba18b6d661fbeefe48
-F ext/wasm/api/sqlite3-api-opfs.js e6b3a168f18b94f01fd21028ffdbaf4e576c53c2f2762032c9ee7d24b7a3bd99
+F ext/wasm/api/sqlite3-api-opfs.js 627b2d8fcd37b6479d7f0e8d5ba891d00c1eaf9b8cf99981081c2bf2e7ed8560
 F ext/wasm/api/sqlite3-api-prologue.js 0d2639387b94c30f492d4aea6e44fb7b16720808678464559458fd2ae3759655
 F ext/wasm/api/sqlite3-api-worker1.js ee4cf149cbacb63d06b536674f822aa5088b7e022cdffc69f1f36cebe2f9fea0
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
@@ -495,7 +495,7 @@ F ext/wasm/batch-runner.js 6f5b86e0b5519a9a941d9f17ee9c5ecdc63f452f157602fe7fdf8
 F ext/wasm/common/SqliteTestUtil.js 529161a624265ba84271a52db58da022649832fa1c71309fb1e02cc037327a2b
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 3a5143699c2b73a85b962271e1a9b3241b30d90e30d895e4f55665e648572962
-F ext/wasm/common/whwasmutil.js f7282ef36c9625330d4e6e82d1beec6678cd101e95e7108cd85db587a788c145
+F ext/wasm/common/whwasmutil.js f64f94e2a3e1d8fd2139b4d80f00a3ab504985e38103c45b1ff15ec8b44fcce3
 F ext/wasm/demo-123-worker.html e419b66495d209b5211ec64903b4cfb3ca7df20d652b41fcd28bf018a773234f
 F ext/wasm/demo-123.html aa281d33b7eefa755f3122b7b5a18f39a42dc5fb69c8879171bf14b4c37c4ec4
 F ext/wasm/demo-123.js 234655683e35a4543a23de7b10800d76b0369947b33e089e5613171fa7795afb
@@ -513,13 +513,13 @@ F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e5
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
 F ext/wasm/scratchpad-wasmfs-main.js f0836e3576df7a89390d777bb53e142e559e8a79becfb2a5a976490b05a1c4fa
 F ext/wasm/speedtest1-wasmfs.html 9d8cd19eab8854d17f7129aa11607cae6f6d9857c505a4aef13000588583d93e
-F ext/wasm/speedtest1-worker.html f7adcc68af76d347741ecd884e0c773f707fa2cdec87cfd9b2e147f5fc2c56c7
-F ext/wasm/speedtest1-worker.js d7e02ff74c28c8f2ef19eb6585642d44b7c8e7b83ac19b7848b209a880945706
+F ext/wasm/speedtest1-worker.html 7bd3ede33e08067f59e8d6e3dc25016fc930222b059d66b2554203bf262aba02
+F ext/wasm/speedtest1-worker.js 11e7f68cedd2a83b0e638f94c1d2f58406ba672a7e88b66bff5d4f4284e8ba16
 F ext/wasm/speedtest1.html 512addeb3c27c94901178b7bcbde83a6f95c093f9ebe16a2959a0aa0d828cf1d
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
-F ext/wasm/sqlite3-opfs-async-proxy.js 7ce90feb4ed582a7709f6a99a46fd43a240a1c1ad2f9f47efff1bd32136ab09c
+F ext/wasm/sqlite3-opfs-async-proxy.js 7139530dd8a408f2897115d3ea04dfe03f175df66870b1e8a49733a77a06f970
 F ext/wasm/sqlite3-worker1-promiser.js 4fd0465688a28a75f1d4ee4406540ba494f49844e3cad0670d0437a001943365
 F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
 F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
@@ -2026,8 +2026,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 2ec7e09139a510b9fd29e4c97283b20740a00f369193c6fecbb734f187e81b48
-R 1715d33dc730c3ab31438d0a66f7aa0a
+P 976053925013bf1975f5f9222e28ba648af28e305bb6bdae600eb24d0e136bec
+R 79e6bae24f2a8f4f545c24b5d2562e72
 U stephan
-Z 0f0e9b03805cac5450f028e863da1f77
+Z 251c239274312fdfb8787b5b1f3a9b52
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 5c3cd2316b..6b25039bc8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-976053925013bf1975f5f9222e28ba648af28e305bb6bdae600eb24d0e136bec
\ No newline at end of file
+fb7f287310d74a3e236125ae9c49b859f9263c29ae85161c1bcf9dd0778d8a51
\ No newline at end of file

From aec046a2642b391b9ded1f117b81860de679d605 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 19 Sep 2022 18:22:29 +0000
Subject: [PATCH 139/428] Further metrics and buffer-copy optimizations in the
 OPFS proxy, but with little effect.

FossilOrigin-Name: d1f1fe6f1c60640f7770dfb9245c459a09b8d24ec2ddf664dff77c810bd51f96
---
 ext/wasm/api/sqlite3-api-opfs.js     | 38 ++++++-----
 ext/wasm/sqlite3-opfs-async-proxy.js | 95 ++++++++++++++++++++++------
 manifest                             | 14 ++--
 manifest.uuid                        |  2 +-
 4 files changed, 107 insertions(+), 42 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index b7e6887f65..3fd08d9aec 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -140,16 +140,19 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
     */
     opfsUtil.metrics = {
       dump: function(){
-        let k, n = 0, t = 0;
-        for(k in metrics){
+        let k, n = 0, t = 0, w = 0;
+        for(k in state.opIds){
           const m = metrics[k];
           n += m.count;
           t += m.time;
+          w += m.wait;
           m.avgTime = (m.count && m.time) ? (m.time / m.count) : 0;
           m.avgWait = (m.count && m.wait) ? (m.wait / m.count) : 0;
         }
-        console.log("metrics for",self.location.href,":",metrics,
-                    "\nTotal of",n,"op(s) for",t,"ms");
+        console.log(self.location.href,
+                    "metrics for",self.location.href,":",metrics,
+                    "\nTotal of",n,"op(s) for",t,
+                    "ms (incl. "+w+" ms of waiting on the async side)");
       },
       reset: function(){
         let k;
@@ -157,9 +160,9 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
         for(k in state.opIds){
           r(metrics[k] = Object.create(null));
         }
-        [ // timed routines which are not in state.opIds
-          'xFileControl'
-        ].forEach((k)=>r(metrics[k] = Object.create(null)));
+        //[ // timed routines which are not in state.opIds
+        //  'xFileControl'
+        //].forEach((k)=>r(metrics[k] = Object.create(null)));
       }
     }/*metrics*/;      
 
@@ -209,6 +212,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
       state.opIds.xWrite = i++;
       state.opIds.mkdir = i++;
       state.opSAB = new SharedArrayBuffer(i * 4/*sizeof int32*/);
+      state.opIds.xFileControl = state.opIds.xSync /* special case */;
       opfsUtil.metrics.reset();
     }
 
@@ -413,18 +417,20 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
       },
       xFileControl: function(pFile, opId, pArg){
         mTimeStart('xFileControl');
-        if(capi.SQLITE_FCNTL_SYNC===opId){
-          return opRun('xSync', {fid:pFile, flags:0});
-        }
+        const rc = (capi.SQLITE_FCNTL_SYNC===opId)
+              ? opRun('xSync', {fid:pFile, flags:0})
+              : capi.SQLITE_NOTFOUND;
         mTimeEnd();
-        return capi.SQLITE_NOTFOUND;
+        return rc;
       },
       xFileSize: function(pFile,pSz64){
         mTimeStart('xFileSize');
         const rc = opRun('xFileSize', pFile);
         if(!isWorkerErrCode(rc)){
-          const f = __openFiles[pFile];
-          wasm.setMemValue(pSz64, f.sabViewFileSize.getBigInt64(0,true) ,'i64');
+          wasm.setMemValue(
+            pSz64, __openFiles[pFile].sabViewFileSize.getBigInt64(0,true),
+            'i64'
+          );
         }
         mTimeEnd();
         return rc;
@@ -454,6 +460,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
         return rc;
       },
       xSync: function(pFile,flags){
+        ++metrics.xSync.count;
         return 0; // impl'd in xFileControl(). opRun('xSync', {fid:pFile, flags});
       },
       xTruncate: function(pFile,sz64){
@@ -492,8 +499,9 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
     const vfsSyncWrappers = {
       xAccess: function(pVfs,zName,flags,pOut){
         mTimeStart('xAccess');
-        const rc = opRun('xAccess', wasm.cstringToJs(zName));
-        wasm.setMemValue(pOut, rc ? 0 : 1, 'i32');
+        wasm.setMemValue(
+          pOut, (opRun('xAccess', wasm.cstringToJs(zName)) ? 0 : 1), 'i32'
+        );
         mTimeEnd();
         return 0;
       },
diff --git a/ext/wasm/sqlite3-opfs-async-proxy.js b/ext/wasm/sqlite3-opfs-async-proxy.js
index 73bfad9d87..fb472488bf 100644
--- a/ext/wasm/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/sqlite3-opfs-async-proxy.js
@@ -61,6 +61,25 @@ const log =    (...args)=>logImpl(2, ...args);
 const warn =   (...args)=>logImpl(1, ...args);
 const error =  (...args)=>logImpl(0, ...args);
 const metrics = Object.create(null);
+metrics.reset = ()=>{
+  let k;
+  const r = (m)=>(m.count = m.time = 0);
+  for(k in state.opIds){
+    r(metrics[k] = Object.create(null));
+  }
+};
+metrics.dump = ()=>{
+  let k, n = 0, t = 0, w = 0;
+  for(k in state.opIds){
+    const m = metrics[k];
+    n += m.count;
+    t += m.time;
+    m.avgTime = (m.count && m.time) ? (m.time / m.count) : 0;
+  }
+  console.log(self.location.href,
+              "metrics for",self.location.href,":",metrics,
+              "\nTotal of",n,"op(s) for",t,"ms");
+};
 
 warn("This file is very much experimental and under construction.",
      self.location.pathname);
@@ -123,14 +142,39 @@ const affirmNotRO = function(opName,fh){
   if(fh.readOnly) toss(opName+"(): File is read-only: "+fh.filenameAbs);
 };
 
+
+const opTimer = Object.create(null);
+opTimer.op = undefined;
+opTimer.start = undefined;
+const mTimeStart = (op)=>{
+  opTimer.start = performance.now();
+  opTimer.op = op;
+  //metrics[op] || toss("Maintenance required: missing metrics for",op);
+  ++metrics[op].count;
+};
+const mTimeEnd = ()=>(
+  metrics[opTimer.op].time += performance.now() - opTimer.start
+);
+
 /**
    Asynchronous wrappers for sqlite3_vfs and sqlite3_io_methods
    methods. Maintenance reminder: members are in alphabetical order
    to simplify finding them.
 */
 const vfsAsyncImpls = {
+  mkdir: async function(dirname){
+    let rc = 0;
+    try {
+        await getDirForPath(dirname+"/filepart", true);
+    }catch(e){
+      //error("mkdir failed",filename, e.message);
+      rc = state.sq3Codes.SQLITE_IOERR;
+    }
+    storeAndNotify('mkdir', rc);
+  },
   xAccess: async function(filename){
     log("xAccess(",arguments[0],")");
+    mTimeStart('xAccess');
     /* OPFS cannot support the full range of xAccess() queries sqlite3
        calls for. We can essentially just tell if the file is
        accessible, but if it is it's automatically writable (unless
@@ -150,9 +194,11 @@ const vfsAsyncImpls = {
       rc = state.sq3Codes.SQLITE_IOERR;
     }
     storeAndNotify('xAccess', rc);
+    mTimeEnd();
   },
   xClose: async function(fid){
     const opName = 'xClose';
+    mTimeStart(opName);
     log(opName+"(",arguments[0],")");
     const fh = __openFiles[fid];
     if(fh){
@@ -166,6 +212,7 @@ const vfsAsyncImpls = {
     }else{
       storeAndNotify(opName, state.sq3Codes.SQLITE_NOFOUND);
     }
+    mTimeEnd();
   },
   xDeleteNoWait: async function({filename, syncDir, recursive = false}){
     /* The syncDir flag is, for purposes of the VFS API's semantics,
@@ -202,20 +249,13 @@ const vfsAsyncImpls = {
     return rc;
   },
   xDelete: async function(...args){
+    mTimeStart('xDelete');
     const rc = await vfsAsyncImpls.xDeleteNoWait(...args);
     storeAndNotify('xDelete', rc);
-  },
-  mkdir: async function(dirname){
-    let rc = 0;
-    try {
-        await getDirForPath(dirname+"/filepart", true);
-    }catch(e){
-      //error("mkdir failed",filename, e.message);
-      rc = state.sq3Codes.SQLITE_IOERR;
-    }
-    storeAndNotify('mkdir', rc);
+    mTimeEnd();
   },
   xFileSize: async function(fid){
+    mTimeStart('xFileSize');
     log("xFileSize(",arguments,")");
     const fh = __openFiles[fid];
     let sz;
@@ -228,6 +268,7 @@ const vfsAsyncImpls = {
       sz = state.sq3Codes.SQLITE_IOERR;
     }
     storeAndNotify('xFileSize', sz);
+    mTimeEnd();
   },
   xOpen: async function({
     fid/*sqlite3_file pointer*/,
@@ -237,6 +278,7 @@ const vfsAsyncImpls = {
     create = false, readOnly = false, deleteOnClose = false
   }){
     const opName = 'xOpen';
+    mTimeStart(opName);
     try{
       if(create) readOnly = false;
       log(opName+"(",arguments[0],")");
@@ -245,6 +287,7 @@ const vfsAsyncImpls = {
         [hDir, filenamePart] = await getDirForPath(filename, !!create);
       }catch(e){
         storeAndNotify(opName, state.sql3Codes.SQLITE_NOTFOUND);
+        mTimeEnd();
         return;
       }
       const hFile = await hDir.getFileHandle(filenamePart, {create: !!create});
@@ -256,6 +299,7 @@ const vfsAsyncImpls = {
       fobj.fileHandle = hFile;
       fobj.fileType = fileType;
       fobj.sab = sab;
+      fobj.sabView = new Uint8Array(sab,0,state.fbInt64Offset);
       fobj.sabViewFileSize = new DataView(sab,state.fbInt64Offset,8);
       fobj.create = !!create;
       fobj.readOnly = !!readOnly;
@@ -272,16 +316,20 @@ const vfsAsyncImpls = {
       error(opName,e);
       storeAndNotify(opName, state.sq3Codes.SQLITE_IOERR);
     }
+    mTimeEnd();
   },
   xRead: async function({fid,n,offset}){
+    mTimeStart('xRead');
     log("xRead(",arguments[0],")");
     let rc = 0;
-    const fh = __openFiles[fid];
     try{
-      const aRead = new Uint8Array(fh.sab, 0, n);
-      const nRead = fh.accessHandle.read(aRead, {at: Number(offset)});
+      const fh = __openFiles[fid];
+      const nRead = fh.accessHandle.read(
+        fh.sabView.subarray(0, n),
+        {at: Number(offset)}
+      );
       if(nRead < n){/* Zero-fill remaining bytes */
-        new Uint8Array(fh.sab).fill(0, nRead, n);
+        fh.sabView.fill(0, nRead, n);
         rc = state.sq3Codes.SQLITE_IOERR_SHORT_READ;
       }
     }catch(e){
@@ -289,14 +337,18 @@ const vfsAsyncImpls = {
       rc = state.sq3Codes.SQLITE_IOERR_READ;
     }
     storeAndNotify('xRead',rc);
+    mTimeEnd();
   },
   xSync: async function({fid,flags/*ignored*/}){
+    mTimeStart('xSync');
     log("xSync(",arguments[0],")");
     const fh = __openFiles[fid];
     if(!fh.readOnly && fh.accessHandle) await fh.accessHandle.flush();
     storeAndNotify('xSync',0);
+    mTimeEnd();
   },
   xTruncate: async function({fid,size}){
+    mTimeStart('xTruncate');
     log("xTruncate(",arguments[0],")");
     let rc = 0;
     const fh = __openFiles[fid];
@@ -308,21 +360,25 @@ const vfsAsyncImpls = {
       rc = state.sq3Codes.SQLITE_IOERR_TRUNCATE;
     }
     storeAndNotify('xTruncate',rc);
+    mTimeEnd();
   },
-  xWrite: async function({fid,src,n,offset}){
+  xWrite: async function({fid,n,offset}){
+    mTimeStart('xWrite');
     log("xWrite(",arguments[0],")");
     let rc;
-    const fh = __openFiles[fid];
     try{
+      const fh = __openFiles[fid];
       affirmNotRO('xWrite', fh);
-      const nOut = fh.accessHandle.write(new Uint8Array(fh.sab, 0, n),
-                                         {at: Number(offset)});
-      rc = (nOut===n) ? 0 : state.sq3Codes.SQLITE_IOERR_WRITE;
+      rc = (
+        n === fh.accessHandle.write(fh.sabView.subarray(0, n),
+                                    {at: Number(offset)})
+      ) ? 0 : state.sq3Codes.SQLITE_IOERR_WRITE;
     }catch(e){
       error("xWrite():",e,fh);
       rc = state.sq3Codes.SQLITE_IOERR_WRITE;
     }
     storeAndNotify('xWrite',rc);
+    mTimeEnd();
   }
 };
 
@@ -348,6 +404,7 @@ navigator.storage.getDirectory().then(function(d){
               toss("Maintenance required: missing state.opIds[",k,"]");
             }
           });
+          metrics.reset();
           log("init state",state);
           wMsg('inited');
           break;
diff --git a/manifest b/manifest
index 5af5e35d20..c2229acede 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Cut\sthe\sspeedtest1\sruntime\sof\sthe\sOPFS\sVFS\sproxy\sby\sapproximately\s3/4ths\svia\sxRead/xWrite\sbuffer-copying\soptimizations.\sStill\sslower\sthan\sthe\sWASMFS\simpl\sby\sapprox.\s1/5th.
-D 2022-09-19T17:09:09.850
+C Further\smetrics\sand\sbuffer-copy\soptimizations\sin\sthe\sOPFS\sproxy,\sbut\swith\slittle\seffect.
+D 2022-09-19T18:22:29.467
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -484,7 +484,7 @@ F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a
 F ext/wasm/api/sqlite3-api-cleanup.js 8564a6077cdcaea9a9f428a019af8a05887f0131e6a2a1e72a7ff1145fadfe77
 F ext/wasm/api/sqlite3-api-glue.js 366d580c8e5bf7fcf4c6dee6f646c31f5549bd417ea03a59a0acca00e8ecce30
 F ext/wasm/api/sqlite3-api-oo1.js 2d13dddf0d2b4168a9249f124134d37924331e5b55e05dba18b6d661fbeefe48
-F ext/wasm/api/sqlite3-api-opfs.js 627b2d8fcd37b6479d7f0e8d5ba891d00c1eaf9b8cf99981081c2bf2e7ed8560
+F ext/wasm/api/sqlite3-api-opfs.js df3d085a55be11a0b7bce3d42ea1b721ff8aaba93659d0ec48c3327dde384596
 F ext/wasm/api/sqlite3-api-prologue.js 0d2639387b94c30f492d4aea6e44fb7b16720808678464559458fd2ae3759655
 F ext/wasm/api/sqlite3-api-worker1.js ee4cf149cbacb63d06b536674f822aa5088b7e022cdffc69f1f36cebe2f9fea0
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
@@ -519,7 +519,7 @@ F ext/wasm/speedtest1.html 512addeb3c27c94901178b7bcbde83a6f95c093f9ebe16a2959a0
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
-F ext/wasm/sqlite3-opfs-async-proxy.js 7139530dd8a408f2897115d3ea04dfe03f175df66870b1e8a49733a77a06f970
+F ext/wasm/sqlite3-opfs-async-proxy.js f1a270e7a8adeb80c73e0b345e472e574e694d9eaec6588ce3671438b79eb351
 F ext/wasm/sqlite3-worker1-promiser.js 4fd0465688a28a75f1d4ee4406540ba494f49844e3cad0670d0437a001943365
 F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
 F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
@@ -2026,8 +2026,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 976053925013bf1975f5f9222e28ba648af28e305bb6bdae600eb24d0e136bec
-R 79e6bae24f2a8f4f545c24b5d2562e72
+P fb7f287310d74a3e236125ae9c49b859f9263c29ae85161c1bcf9dd0778d8a51
+R 946ef52a6b1d5b2d6cbf3b063dacd006
 U stephan
-Z 251c239274312fdfb8787b5b1f3a9b52
+Z f42132e655dd81eba8154f54be0c97de
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 6b25039bc8..e76b3ad26d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fb7f287310d74a3e236125ae9c49b859f9263c29ae85161c1bcf9dd0778d8a51
\ No newline at end of file
+d1f1fe6f1c60640f7770dfb9245c459a09b8d24ec2ddf664dff77c810bd51f96
\ No newline at end of file

From c4b87be3e8eea84384d9dd9d2dce2405bcbeae2c Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 20 Sep 2022 01:28:47 +0000
Subject: [PATCH 140/428] OPFS VFS: moved i/o buffer from per-file to the VFS,
 and related refactoring, in prep for experimentation with a new inter-worker
 comms model.

FossilOrigin-Name: d4d63e4580ad8d497310608175308c03c517e051d7865cb66aa0b10356612d7d
---
 ext/wasm/api/sqlite3-api-opfs.js     | 51 +++++++++++++-----------
 ext/wasm/sqlite3-opfs-async-proxy.js | 58 ++++++++++++++--------------
 manifest                             | 14 +++----
 manifest.uuid                        |  2 +-
 4 files changed, 65 insertions(+), 60 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index 3fd08d9aec..ffc7669a7f 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -188,17 +188,22 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
     const state = Object.create(null);
     state.verbose = options.verbose;
     state.fileBufferSize =
-      1024 * 64 + 8 /* size of aFileHandle.sab. 64k = max sqlite3 page
-                       size. The additional bytes are space for
-                       holding BigInt results, since we cannot store
-                       those via the Atomics API (which only works on
-                       an Int32Array). */;
+      1024 * 64 /* size of aFileHandle.sab. 64k = max sqlite3 page
+                   size. */;
+    state.sabOffsetS11n = state.fileBufferSize;
+    state.sabIO = new SharedArrayBuffer(
+      state.fileBufferSize
+        + 4096/* arg/result serialization */
+        + 8 /* to be removed - porting crutch */
+    );
     state.fbInt64Offset =
-      state.fileBufferSize - 8 /*spot in fileHandle.sab to store an int64 result */;
+      state.sabIO.byteLength - 8 /*spot in fileHandle.sab to store an int64 result.
+                                  to be removed. Porting crutch. */;
     state.opIds = Object.create(null);
     const metrics = Object.create(null);
     {
       let i = 0;
+      state.opIds.nothing = i++;
       state.opIds.xAccess = i++;
       state.opIds.xClose = i++;
       state.opIds.xDelete = i++;
@@ -211,7 +216,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
       state.opIds.xTruncate = i++;
       state.opIds.xWrite = i++;
       state.opIds.mkdir = i++;
-      state.opSAB = new SharedArrayBuffer(i * 4/*sizeof int32*/);
+      state.sabOP = new SharedArrayBuffer(i * 4/*sizeof int32*/);
       state.opIds.xFileControl = state.opIds.xSync /* special case */;
       opfsUtil.metrics.reset();
     }
@@ -225,7 +230,9 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
       'SQLITE_IOERR_WRITE', 'SQLITE_IOERR_FSYNC',
       'SQLITE_IOERR_TRUNCATE', 'SQLITE_IOERR_DELETE',
       'SQLITE_IOERR_ACCESS', 'SQLITE_IOERR_CLOSE',
-      'SQLITE_IOERR_DELETE'
+      'SQLITE_IOERR_DELETE',
+      'SQLITE_OPEN_CREATE', 'SQLITE_OPEN_DELETEONCLOSE',
+      'SQLITE_OPEN_READONLY'
     ].forEach(function(k){
       state.sq3Codes[k] = capi[k] || toss("Maintenance required: not found:",k);
       state.sq3Codes._reverse[capi[k]] = k;
@@ -236,17 +243,17 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
     /**
        Runs the given operation in the async worker counterpart, waits
        for its response, and returns the result which the async worker
-       writes to the given op's index in state.opSABView. The 2nd argument
+       writes to the given op's index in state.sabOPView. The 2nd argument
        must be a single object or primitive value, depending on the
        given operation's signature in the async API counterpart.
     */
     const opRun = (op,args)=>{
       const t = performance.now();
-      Atomics.store(state.opSABView, state.opIds[op], -1);
+      Atomics.store(state.sabOPView, state.opIds[op], -1);
       wMsg(op, args);
-      Atomics.wait(state.opSABView, state.opIds[op], -1);
+      Atomics.wait(state.sabOPView, state.opIds[op], -1);
       metrics[op].wait += performance.now() - t;
-      return Atomics.load(state.opSABView, state.opIds[op]);
+      return Atomics.load(state.sabOPView, state.opIds[op]);
     };
 
     /**
@@ -574,10 +581,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
         args.fid = pFile;
         args.filename = zName;
         args.sab = new SharedArrayBuffer(state.fileBufferSize);
-        args.fileType = f._.getFileType(args.filename, flags);
-        args.create = !!(flags & capi.SQLITE_OPEN_CREATE);
-        args.deleteOnClose = !!(flags & capi.SQLITE_OPEN_DELETEONCLOSE);
-        args.readOnly = !!(flags & capi.SQLITE_OPEN_READONLY);
+        args.flags = flags;
         const rc = opRun('xOpen', args);
         if(!rc){
           /* Recall that sqlite3_vfs::xClose() will be called, even on
@@ -586,8 +590,8 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
             wasm.setMemValue(pOutFlags, capi.SQLITE_OPEN_READONLY, 'i32');
           }
           __openFiles[pFile] = args;
-          args.sabView = new Uint8Array(args.sab);
-          args.sabViewFileSize = new DataView(args.sab, state.fbInt64Offset, 8);
+          args.sabView = new Uint8Array(state.sabIO, 0, state.fileBufferSize);
+          args.sabViewFileSize = new DataView(state.sabIO, state.fbInt64Offset, 8);
           args.sq3File = new sqlite3_file(pFile);
           args.sq3File.$pMethods = opfsIoMethods.pointer;
           args.ba = new Uint8Array(args.sab);
@@ -615,7 +619,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
          assume it's sane and use it, otherwise install a JS-based
          one. */
       vfsSyncWrappers.xSleep = function(pVfs,ms){
-        Atomics.wait(state.opSABView, state.opIds.xSleep, 0, ms);
+        Atomics.wait(state.sabOPView, state.opIds.xSleep, 0, ms);
         return 0;
       };
     }
@@ -702,8 +706,8 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
         log("xAccess(",dbFile,") exists ?=",rc);
         rc = vfsSyncWrappers.xOpen(opfsVfs.pointer, zDbFile,
                                    fid, openFlags, pOut);
-        log("open rc =",rc,"state.opSABView[xOpen] =",
-            state.opSABView[state.opIds.xOpen]);
+        log("open rc =",rc,"state.sabOPView[xOpen] =",
+            state.sabOPView[state.opIds.xOpen]);
         if(isWorkerErrCode(rc)){
           error("open failed with code",rc);
           return;
@@ -733,7 +737,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
           log("waking up from xSleep()");
         }
         rc = ioSyncWrappers.xClose(fid);
-        log("xClose rc =",rc,"opSABView =",state.opSABView);
+        log("xClose rc =",rc,"sabOPView =",state.sabOPView);
         log("Deleting file:",dbFile);
         vfsSyncWrappers.xDelete(opfsVfs.pointer, zDbFile, 0x1234);
         vfsSyncWrappers.xAccess(opfsVfs.pointer, zDbFile, 0, pOut);
@@ -767,7 +771,8 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
                 toss("BUG: sqlite3_vfs_find() failed for just-installed OPFS VFS");
               }
               capi.sqlite3_vfs_register.addReference(opfsVfs, opfsIoMethods);
-              state.opSABView = new Int32Array(state.opSAB);
+              state.sabOPView = new Int32Array(state.sabOP);
+              state.sabFileBufView = new Uint8Array(state.sabFileBufView, 0, state.fileBufferSize);
               if(options.sanityChecks){
                 warn("Running sanity checks because of opfs-sanity-check URL arg...");
                 sanityCheck();
diff --git a/ext/wasm/sqlite3-opfs-async-proxy.js b/ext/wasm/sqlite3-opfs-async-proxy.js
index fb472488bf..a1ed4362d3 100644
--- a/ext/wasm/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/sqlite3-opfs-async-proxy.js
@@ -131,8 +131,8 @@ const getDirForPath = async function f(absFilename, createDirs = false){
 */
 const storeAndNotify = (opName, value)=>{
   log(opName+"() is notify()ing w/ value:",value);
-  Atomics.store(state.opSABView, state.opIds[opName], value);
-  Atomics.notify(state.opSABView, state.opIds[opName]);
+  Atomics.store(state.sabOPView, state.opIds[opName], value);
+  Atomics.notify(state.sabOPView, state.opIds[opName]);
 };
 
 /**
@@ -214,6 +214,12 @@ const vfsAsyncImpls = {
     }
     mTimeEnd();
   },
+  xDelete: async function(...args){
+    mTimeStart('xDelete');
+    const rc = await vfsAsyncImpls.xDeleteNoWait(...args);
+    storeAndNotify('xDelete', rc);
+    mTimeEnd();
+  },
   xDeleteNoWait: async function({filename, syncDir, recursive = false}){
     /* The syncDir flag is, for purposes of the VFS API's semantics,
        ignored here. However, if it has the value 0x1234 then: after
@@ -248,12 +254,6 @@ const vfsAsyncImpls = {
     }
     return rc;
   },
-  xDelete: async function(...args){
-    mTimeStart('xDelete');
-    const rc = await vfsAsyncImpls.xDeleteNoWait(...args);
-    storeAndNotify('xDelete', rc);
-    mTimeEnd();
-  },
   xFileSize: async function(fid){
     mTimeStart('xFileSize');
     log("xFileSize(",arguments,")");
@@ -261,6 +261,9 @@ const vfsAsyncImpls = {
     let sz;
     try{
       sz = await fh.accessHandle.getSize();
+      if(!fh.sabViewFileSize){
+        fh.sabViewFileSize = new DataView(state.sabIO,state.fbInt64Offset,8);
+      }
       fh.sabViewFileSize.setBigInt64(0, BigInt(sz), true);
       sz = 0;
     }catch(e){
@@ -272,16 +275,15 @@ const vfsAsyncImpls = {
   },
   xOpen: async function({
     fid/*sqlite3_file pointer*/,
-    sab/*file-specific SharedArrayBuffer*/,
     filename,
-    fileType = undefined /*mainDb, mainJournal, etc.*/,
-    create = false, readOnly = false, deleteOnClose = false
+    flags
   }){
     const opName = 'xOpen';
     mTimeStart(opName);
+    log(opName+"(",arguments[0],")");
+    const deleteOnClose = (state.sq3Codes.SQLITE_OPEN_DELETEONCLOSE & flags);
+    const create = (state.sq3Codes.SQLITE_OPEN_CREATE & flags);
     try{
-      if(create) readOnly = false;
-      log(opName+"(",arguments[0],")");
       let hDir, filenamePart;
       try {
         [hDir, filenamePart] = await getDirForPath(filename, !!create);
@@ -290,20 +292,8 @@ const vfsAsyncImpls = {
         mTimeEnd();
         return;
       }
-      const hFile = await hDir.getFileHandle(filenamePart, {create: !!create});
-      log(opName,"filenamePart =",filenamePart, 'hDir =',hDir);
-      const fobj = __openFiles[fid] = Object.create(null);
-      fobj.filenameAbs = filename;
-      fobj.filenamePart = filenamePart;
-      fobj.dirHandle = hDir;
-      fobj.fileHandle = hFile;
-      fobj.fileType = fileType;
-      fobj.sab = sab;
-      fobj.sabView = new Uint8Array(sab,0,state.fbInt64Offset);
-      fobj.sabViewFileSize = new DataView(sab,state.fbInt64Offset,8);
-      fobj.create = !!create;
-      fobj.readOnly = !!readOnly;
-      fobj.deleteOnClose = !!deleteOnClose;
+      const hFile = await hDir.getFileHandle(filenamePart, {create});
+      const fobj = Object.create(null);
       /**
          wa-sqlite, at this point, grabs a SyncAccessHandle and
          assigns it to the accessHandle prop of the file state
@@ -311,6 +301,14 @@ const vfsAsyncImpls = {
          places that limitation on it.
       */
       fobj.accessHandle = await hFile.createSyncAccessHandle();
+      __openFiles[fid] = fobj;
+      fobj.filenameAbs = filename;
+      fobj.filenamePart = filenamePart;
+      fobj.dirHandle = hDir;
+      fobj.fileHandle = hFile;
+      fobj.sabView = state.sabFileBufView;
+      fobj.readOnly = create ? false : (state.sq3Codes.SQLITE_OPEN_READONLY & flags);
+      fobj.deleteOnClose = deleteOnClose;
       storeAndNotify(opName, 0);
     }catch(e){
       error(opName,e);
@@ -395,8 +393,10 @@ navigator.storage.getDirectory().then(function(d){
           state.verbose = opt.verbose ?? 2;
           state.fileBufferSize = opt.fileBufferSize;
           state.fbInt64Offset = opt.fbInt64Offset;
-          state.opSAB = opt.opSAB;
-          state.opSABView = new Int32Array(state.opSAB);
+          state.sabOP = opt.sabOP;
+          state.sabOPView = new Int32Array(state.sabOP);
+          state.sabIO = opt.sabIO;
+          state.sabFileBufView = new Uint8Array(state.sabIO, 0, state.fileBufferSize);
           state.opIds = opt.opIds;
           state.sq3Codes = opt.sq3Codes;
           Object.keys(vfsAsyncImpls).forEach((k)=>{
diff --git a/manifest b/manifest
index c2229acede..00518b64c8 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Further\smetrics\sand\sbuffer-copy\soptimizations\sin\sthe\sOPFS\sproxy,\sbut\swith\slittle\seffect.
-D 2022-09-19T18:22:29.467
+C OPFS\sVFS:\smoved\si/o\sbuffer\sfrom\sper-file\sto\sthe\sVFS,\sand\srelated\srefactoring,\sin\sprep\sfor\sexperimentation\swith\sa\snew\sinter-worker\scomms\smodel.
+D 2022-09-20T01:28:47.162
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -484,7 +484,7 @@ F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a
 F ext/wasm/api/sqlite3-api-cleanup.js 8564a6077cdcaea9a9f428a019af8a05887f0131e6a2a1e72a7ff1145fadfe77
 F ext/wasm/api/sqlite3-api-glue.js 366d580c8e5bf7fcf4c6dee6f646c31f5549bd417ea03a59a0acca00e8ecce30
 F ext/wasm/api/sqlite3-api-oo1.js 2d13dddf0d2b4168a9249f124134d37924331e5b55e05dba18b6d661fbeefe48
-F ext/wasm/api/sqlite3-api-opfs.js df3d085a55be11a0b7bce3d42ea1b721ff8aaba93659d0ec48c3327dde384596
+F ext/wasm/api/sqlite3-api-opfs.js f8027fb4af1c24fcfad31889f8a5ccfa3b96d6e812d3495b13833bef57034046
 F ext/wasm/api/sqlite3-api-prologue.js 0d2639387b94c30f492d4aea6e44fb7b16720808678464559458fd2ae3759655
 F ext/wasm/api/sqlite3-api-worker1.js ee4cf149cbacb63d06b536674f822aa5088b7e022cdffc69f1f36cebe2f9fea0
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
@@ -519,7 +519,7 @@ F ext/wasm/speedtest1.html 512addeb3c27c94901178b7bcbde83a6f95c093f9ebe16a2959a0
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
-F ext/wasm/sqlite3-opfs-async-proxy.js f1a270e7a8adeb80c73e0b345e472e574e694d9eaec6588ce3671438b79eb351
+F ext/wasm/sqlite3-opfs-async-proxy.js 7ebc36915cd61bd4f067a4823307f4d4eb2678a173aaae470c534e8fe9cda650
 F ext/wasm/sqlite3-worker1-promiser.js 4fd0465688a28a75f1d4ee4406540ba494f49844e3cad0670d0437a001943365
 F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
 F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
@@ -2026,8 +2026,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 fb7f287310d74a3e236125ae9c49b859f9263c29ae85161c1bcf9dd0778d8a51
-R 946ef52a6b1d5b2d6cbf3b063dacd006
+P d1f1fe6f1c60640f7770dfb9245c459a09b8d24ec2ddf664dff77c810bd51f96
+R e5a1ff53ebe902985ab8e87bba2c71fb
 U stephan
-Z f42132e655dd81eba8154f54be0c97de
+Z d05962442428c5dae722ab00dca47e48
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index e76b3ad26d..8d4f713497 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d1f1fe6f1c60640f7770dfb9245c459a09b8d24ec2ddf664dff77c810bd51f96
\ No newline at end of file
+d4d63e4580ad8d497310608175308c03c517e051d7865cb66aa0b10356612d7d
\ No newline at end of file

From 138647a55219b3250cff95bbfc96cc753639ddc4 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 20 Sep 2022 03:31:02 +0000
Subject: [PATCH 141/428] OPFS VFS: further internal refactoring towards
 experimenting with a new comms model.

FossilOrigin-Name: 5ca412ced24b4e3af5f467e710a597ed440badf7b8335346aade11d3cad3d1a1
---
 ext/wasm/api/sqlite3-api-opfs.js     | 136 ++++++++++++++++++---------
 ext/wasm/sqlite3-opfs-async-proxy.js | 104 +++++++++++++++-----
 manifest                             |  14 +--
 manifest.uuid                        |   2 +-
 4 files changed, 184 insertions(+), 72 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index ffc7669a7f..c6b38fa93e 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -128,7 +128,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
       // failure is, e.g., that the remote script is 404.
       promiseReject(new Error("Loading OPFS async Worker failed for unknown reasons."));
     };
-    const wMsg = (type,payload)=>W.postMessage({type,payload});
+    const wMsg = (type,args)=>W.postMessage({type,args});
     /**
        Generic utilities for working with OPFS. This will get filled out
        by the Promise setup and, on success, installed as sqlite3.opfs.
@@ -186,36 +186,48 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
        require a bit of acrobatics but should be feasible.
     */
     const state = Object.create(null);
+    state.littleEndian = true;
     state.verbose = options.verbose;
     state.fileBufferSize =
       1024 * 64 /* size of aFileHandle.sab. 64k = max sqlite3 page
                    size. */;
-    state.sabOffsetS11n = state.fileBufferSize;
+    state.sabS11nOffset = state.fileBufferSize;
+    state.sabS11nSize = 2048;
     state.sabIO = new SharedArrayBuffer(
       state.fileBufferSize
-        + 4096/* arg/result serialization */
-        + 8 /* to be removed - porting crutch */
+        + state.sabS11nSize/* arg/result serialization block */
     );
-    state.fbInt64Offset =
-      state.sabIO.byteLength - 8 /*spot in fileHandle.sab to store an int64 result.
-                                  to be removed. Porting crutch. */;
     state.opIds = Object.create(null);
+    state.rcIds = Object.create(null);
     const metrics = Object.create(null);
     {
       let i = 0;
+      state.opIds.whichOp = i++;
       state.opIds.nothing = i++;
       state.opIds.xAccess = i++;
+      state.rcIds.xAccess = i++;
       state.opIds.xClose = i++;
+      state.rcIds.xClose = i++;
       state.opIds.xDelete = i++;
+      state.rcIds.xDelete = i++;
       state.opIds.xDeleteNoWait = i++;
+      state.rcIds.xDeleteNoWait = i++;
       state.opIds.xFileSize = i++;
+      state.rcIds.xFileSize = i++;
       state.opIds.xOpen = i++;
+      state.rcIds.xOpen = i++;
       state.opIds.xRead = i++;
+      state.rcIds.xRead = i++;
       state.opIds.xSleep = i++;
+      state.rcIds.xSleep = i++;
       state.opIds.xSync = i++;
+      state.rcIds.xSync = i++;
       state.opIds.xTruncate = i++;
+      state.rcIds.xTruncate = i++;
       state.opIds.xWrite = i++;
+      state.rcIds.xWrite = i++;
       state.opIds.mkdir = i++;
+      state.rcIds.mkdir = i++;
       state.sabOP = new SharedArrayBuffer(i * 4/*sizeof int32*/);
       state.opIds.xFileControl = state.opIds.xSync /* special case */;
       opfsUtil.metrics.reset();
@@ -247,7 +259,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
        must be a single object or primitive value, depending on the
        given operation's signature in the async API counterpart.
     */
-    const opRun = (op,args)=>{
+    const opRun = (op,...args)=>{
       const t = performance.now();
       Atomics.store(state.sabOPView, state.opIds[op], -1);
       wMsg(op, args);
@@ -256,6 +268,44 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
       return Atomics.load(state.sabOPView, state.opIds[op]);
     };
 
+    const initS11n = ()=>{
+      // Achtung: this code is 100% duplicated in the other half of this proxy!
+      if(state.s11n) return state.s11n;
+      const jsonDecoder = new TextDecoder(),
+            jsonEncoder = new TextEncoder('utf-8'),
+            viewSz = new DataView(state.sabIO, state.sabS11nOffset, 4),
+            viewJson = new Uint8Array(state.sabIO, state.sabS11nOffset+4, state.sabS11nSize-4);
+      state.s11n = Object.create(null);
+      /**
+         Returns an array of the state serialized by the most recent
+         serialize() operation (here or in the counterpart thread), or
+         null if the serialization buffer is empty.
+      */
+      state.s11n.deserialize = function(){
+        const sz = viewSz.getInt32(0, state.littleEndian);
+        const json = sz ? jsonDecoder.decode(
+          viewJson.slice(0, sz)
+          /* slice() (copy) needed, instead of subarray() (reference),
+             because TextDecoder throws if asked to decode from an
+             SAB. */
+        ) : null;
+        return JSON.parse(json);
+      }
+      /**
+         Serializes all arguments to the shared buffer for consumption
+         by the counterpart thread. This impl currently uses JSON for
+         serialization for simplicy of implementation, but if that
+         proves imperformant then a lower-level approach will be
+         created.
+      */
+      state.s11n.serialize = function(...args){
+        const json = jsonEncoder.encode(JSON.stringify(args));
+        viewSz.setInt32(0, json.byteLength, state.littleEndian);
+        viewJson.set(json);
+      };
+      return state.s11n;
+    };
+
     /**
        Generates a random ASCII string len characters long, intended for
        use as a temporary file name.
@@ -425,7 +475,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
       xFileControl: function(pFile, opId, pArg){
         mTimeStart('xFileControl');
         const rc = (capi.SQLITE_FCNTL_SYNC===opId)
-              ? opRun('xSync', {fid:pFile, flags:0})
+              ? opRun('xSync', pFile, 0)
               : capi.SQLITE_NOTFOUND;
         mTimeEnd();
         return rc;
@@ -434,10 +484,8 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
         mTimeStart('xFileSize');
         const rc = opRun('xFileSize', pFile);
         if(!isWorkerErrCode(rc)){
-          wasm.setMemValue(
-            pSz64, __openFiles[pFile].sabViewFileSize.getBigInt64(0,true),
-            'i64'
-          );
+          const sz = state.s11n.deserialize()[0];
+          wasm.setMemValue(pSz64, BigInt(sz), 'i64');
         }
         mTimeEnd();
         return rc;
@@ -447,14 +495,13 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
         //warn("xLock(",arguments,") is a no-op");
         return 0;
       },
-      xRead: function(pFile,pDest,n,offset){
+      xRead: function(pFile,pDest,n,offset64){
         /* int (*xRead)(sqlite3_file*, void*, int iAmt, sqlite3_int64 iOfst) */
         mTimeStart('xRead');
         const f = __openFiles[pFile];
         let rc;
         try {
-          // FIXME(?): block until we finish copying the xRead result buffer. How?
-          rc = opRun('xRead',{fid:pFile, n, offset});
+          rc = opRun('xRead',pFile, n, Number(offset64));
           if(0===rc || capi.SQLITE_IOERR_SHORT_READ===rc){
             // set() seems to be the fastest way to copy this...
             wasm.heap8u().set(f.sabView.subarray(0, n), pDest);
@@ -468,11 +515,11 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
       },
       xSync: function(pFile,flags){
         ++metrics.xSync.count;
-        return 0; // impl'd in xFileControl(). opRun('xSync', {fid:pFile, flags});
+        return 0; // impl'd in xFileControl()
       },
       xTruncate: function(pFile,sz64){
         mTimeStart('xTruncate');
-        const rc = opRun('xTruncate', {fid:pFile, size: sz64});
+        const rc = opRun('xTruncate', pFile, Number(sz64));
         mTimeEnd();
         return rc;
       },
@@ -481,15 +528,14 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
         //warn("xUnlock(",arguments,") is a no-op");
         return 0;
       },
-      xWrite: function(pFile,pSrc,n,offset){
+      xWrite: function(pFile,pSrc,n,offset64){
         /* int (*xWrite)(sqlite3_file*, const void*, int iAmt, sqlite3_int64 iOfst) */
         mTimeStart('xWrite');
         const f = __openFiles[pFile];
         let rc;
         try {
-          // FIXME(?): block from here until we finish the xWrite. How?
           f.sabView.set(wasm.heap8u().subarray(pSrc, pSrc+n));
-          rc = opRun('xWrite',{fid:pFile, n, offset});
+          rc = opRun('xWrite', pFile, n, Number(offset64));
         }catch(e){
           error("xWrite(",arguments,") failed:",e,f);
           rc = capi.SQLITE_IOERR_WRITE;
@@ -527,7 +573,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
       },
       xDelete: function(pVfs, zName, doSyncDir){
         mTimeStart('xDelete');
-        opRun('xDelete', {filename: wasm.cstringToJs(zName), syncDir: doSyncDir});
+        opRun('xDelete', wasm.cstringToJs(zName), doSyncDir, false);
         /* We're ignoring errors because we cannot yet differentiate
            between harmless and non-harmless failures. */
         mTimeEnd();
@@ -577,24 +623,22 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
         }else if('number'===typeof zName){
           zName = wasm.cstringToJs(zName);
         }
-        const args = Object.create(null);
-        args.fid = pFile;
-        args.filename = zName;
-        args.sab = new SharedArrayBuffer(state.fileBufferSize);
-        args.flags = flags;
-        const rc = opRun('xOpen', args);
+        const fh = Object.create(null);
+        fh.fid = pFile;
+        fh.filename = zName;
+        fh.sab = new SharedArrayBuffer(state.fileBufferSize);
+        fh.flags = flags;
+        const rc = opRun('xOpen', pFile, zName, flags);
         if(!rc){
           /* Recall that sqlite3_vfs::xClose() will be called, even on
              error, unless pFile->pMethods is NULL. */
-          if(args.readOnly){
+          if(fh.readOnly){
             wasm.setMemValue(pOutFlags, capi.SQLITE_OPEN_READONLY, 'i32');
           }
-          __openFiles[pFile] = args;
-          args.sabView = new Uint8Array(state.sabIO, 0, state.fileBufferSize);
-          args.sabViewFileSize = new DataView(state.sabIO, state.fbInt64Offset, 8);
-          args.sq3File = new sqlite3_file(pFile);
-          args.sq3File.$pMethods = opfsIoMethods.pointer;
-          args.ba = new Uint8Array(args.sab);
+          __openFiles[pFile] = fh;
+          fh.sabView = state.sabFileBufView;
+          fh.sq3File = new sqlite3_file(pFile);
+          fh.sq3File.$pMethods = opfsIoMethods.pointer;
         }
         mTimeEnd();
         return rc;
@@ -640,13 +684,17 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
        but cannot report the nature of the failure.
     */
     opfsUtil.deleteEntry = function(fsEntryName,recursive=false){
-      return 0===opRun('xDelete', {filename:fsEntryName, recursive});
+      return 0===opRun('xDelete', fsEntryName, 0, recursive);
     };
     /**
-       Exactly like deleteEntry() but runs asynchronously.
+       Exactly like deleteEntry() but runs asynchronously. This is a
+       "fire and forget" operation: it does not return a promise
+       because the counterpart operation happens in another thread and
+       waiting on that result in a Promise would block the OPFS VFS
+       from acting until it completed.
     */
-    opfsUtil.deleteEntryAsync = async function(fsEntryName,recursive=false){
-      wMsg('xDeleteNoWait', {filename: fsEntryName, recursive});
+    opfsUtil.deleteEntryAsync = function(fsEntryName,recursive=false){
+      wMsg('xDeleteNoWait', [fsEntryName, 0, recursive]);
     };
     /**
        Synchronously creates the given directory name, recursively, in
@@ -753,11 +801,11 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
     W.onmessage = function({data}){
       //log("Worker.onmessage:",data);
       switch(data.type){
-          case 'loaded':
+          case 'opfs-async-loaded':
             /*Pass our config and shared state on to the async worker.*/
-            wMsg('init',state);
+            wMsg('opfs-async-init',state);
             break;
-          case 'inited':{
+          case 'opfs-async-inited':{
             /*Indicates that the async partner has received the 'init',
               so we now know that the state object is no longer subject to
               being copied by a pending postMessage() call.*/
@@ -772,7 +820,9 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
               }
               capi.sqlite3_vfs_register.addReference(opfsVfs, opfsIoMethods);
               state.sabOPView = new Int32Array(state.sabOP);
-              state.sabFileBufView = new Uint8Array(state.sabFileBufView, 0, state.fileBufferSize);
+              state.sabFileBufView = new Uint8Array(state.sabIO, 0, state.fileBufferSize);
+              state.sabS11nView = new Uint8Array(state.sabIO, state.sabS11nOffset, state.sabS11nSize);
+              initS11n();
               if(options.sanityChecks){
                 warn("Running sanity checks because of opfs-sanity-check URL arg...");
                 sanityCheck();
diff --git a/ext/wasm/sqlite3-opfs-async-proxy.js b/ext/wasm/sqlite3-opfs-async-proxy.js
index a1ed4362d3..19d71512c9 100644
--- a/ext/wasm/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/sqlite3-opfs-async-proxy.js
@@ -220,7 +220,7 @@ const vfsAsyncImpls = {
     storeAndNotify('xDelete', rc);
     mTimeEnd();
   },
-  xDeleteNoWait: async function({filename, syncDir, recursive = false}){
+  xDeleteNoWait: async function(filename, syncDir = 0, recursive = false){
     /* The syncDir flag is, for purposes of the VFS API's semantics,
        ignored here. However, if it has the value 0x1234 then: after
        deleting the given file, recursively try to delete any empty
@@ -261,10 +261,7 @@ const vfsAsyncImpls = {
     let sz;
     try{
       sz = await fh.accessHandle.getSize();
-      if(!fh.sabViewFileSize){
-        fh.sabViewFileSize = new DataView(state.sabIO,state.fbInt64Offset,8);
-      }
-      fh.sabViewFileSize.setBigInt64(0, BigInt(sz), true);
+      state.s11n.serialize(Number(sz));
       sz = 0;
     }catch(e){
       error("xFileSize():",e, fh);
@@ -273,11 +270,7 @@ const vfsAsyncImpls = {
     storeAndNotify('xFileSize', sz);
     mTimeEnd();
   },
-  xOpen: async function({
-    fid/*sqlite3_file pointer*/,
-    filename,
-    flags
-  }){
+  xOpen: async function(fid/*sqlite3_file pointer*/, filename, flags){
     const opName = 'xOpen';
     mTimeStart(opName);
     log(opName+"(",arguments[0],")");
@@ -316,7 +309,7 @@ const vfsAsyncImpls = {
     }
     mTimeEnd();
   },
-  xRead: async function({fid,n,offset}){
+  xRead: async function(fid,n,offset){
     mTimeStart('xRead');
     log("xRead(",arguments[0],")");
     let rc = 0;
@@ -337,7 +330,7 @@ const vfsAsyncImpls = {
     storeAndNotify('xRead',rc);
     mTimeEnd();
   },
-  xSync: async function({fid,flags/*ignored*/}){
+  xSync: async function(fid,flags/*ignored*/){
     mTimeStart('xSync');
     log("xSync(",arguments[0],")");
     const fh = __openFiles[fid];
@@ -345,14 +338,14 @@ const vfsAsyncImpls = {
     storeAndNotify('xSync',0);
     mTimeEnd();
   },
-  xTruncate: async function({fid,size}){
+  xTruncate: async function(fid,size){
     mTimeStart('xTruncate');
     log("xTruncate(",arguments[0],")");
     let rc = 0;
     const fh = __openFiles[fid];
     try{
       affirmNotRO('xTruncate', fh);
-      await fh.accessHandle.truncate(Number(size));
+      await fh.accessHandle.truncate(size);
     }catch(e){
       error("xTruncate():",e,fh);
       rc = state.sq3Codes.SQLITE_IOERR_TRUNCATE;
@@ -360,7 +353,7 @@ const vfsAsyncImpls = {
     storeAndNotify('xTruncate',rc);
     mTimeEnd();
   },
-  xWrite: async function({fid,n,offset}){
+  xWrite: async function(fid,n,offset){
     mTimeStart('xWrite');
     log("xWrite(",arguments[0],")");
     let rc;
@@ -380,6 +373,70 @@ const vfsAsyncImpls = {
   }
 };
 
+
+const initS11n = ()=>{
+  // Achtung: this code is 100% duplicated in the other half of this proxy!
+  if(state.s11n) return state.s11n;
+  const jsonDecoder = new TextDecoder(),
+        jsonEncoder = new TextEncoder('utf-8'),
+        viewSz = new DataView(state.sabIO, state.sabS11nOffset, 4),
+        viewJson = new Uint8Array(state.sabIO, state.sabS11nOffset+4, state.sabS11nSize-4);
+  state.s11n = Object.create(null);
+  /**
+     Returns an array of the state serialized by the most recent
+     serialize() operation (here or in the counterpart thread), or
+     null if the serialization buffer is empty.
+  */
+  state.s11n.deserialize = function(){
+    const sz = viewSz.getInt32(0, state.littleEndian);
+    const json = sz ? jsonDecoder.decode(
+      viewJson.slice(0, sz)
+      /* slice() (copy) needed, instead of subarray() (reference),
+         because TextDecoder throws if asked to decode from an
+         SAB. */
+    ) : null;
+    return JSON.parse(json);
+  }
+  /**
+     Serializes all arguments to the shared buffer for consumption
+     by the counterpart thread. This impl currently uses JSON for
+     serialization for simplicy of implementation, but if that
+     proves imperformant then a lower-level approach will be
+     created.
+  */
+  state.s11n.serialize = function(...args){
+    const json = jsonEncoder.encode(JSON.stringify(args));
+    viewSz.setInt32(0, json.byteLength, state.littleEndian);
+    viewJson.set(json);
+  };
+  return state.s11n;
+};
+
+const waitLoop = function(){
+  const opHandlers = Object.create(null);
+  for(let k of Object.keys(state.opIds)){
+    const o = Object.create(null);
+    opHandlers[state.opIds[k]] = o;
+    o.key = k;
+  }
+  const sabOP = state.sabOP;
+  for(;;){
+    try {
+      Atomics.store(sabOP, state.opIds.whichOp, 0);
+      Atomic.wait(sabOP, state.opIds.whichOp);
+      const opId = Atomics.load(sabOP, state.opIds.whichOp);
+      const hnd = opHandlers[opId] ?? toss("No waitLoop handler for whichOp #",opId);
+      const args = state.s11n.deserialize();
+      log("whichOp =",opId,hnd,args);
+      const rc = 0/*TODO: run op*/;
+      Atomics.store(sabOP, state.rcIds[hnd.key], rc);
+      Atomics.notify(sabOP, state.rcIds[hnd.key]);
+    }catch(e){
+      error('in waitLoop():',e.message);
+    }
+  }
+};
+
 navigator.storage.getDirectory().then(function(d){
   const wMsg = (type)=>postMessage({type});
   state.rootDir = d;
@@ -387,33 +444,38 @@ navigator.storage.getDirectory().then(function(d){
   self.onmessage = async function({data}){
     log("self.onmessage()",data);
     switch(data.type){
-        case 'init':{
+        case 'opfs-async-init':{
           /* Receive shared state from synchronous partner */
-          const opt = data.payload;
+          const opt = data.args;
+          state.littleEndian = opt.littleEndian;
           state.verbose = opt.verbose ?? 2;
           state.fileBufferSize = opt.fileBufferSize;
-          state.fbInt64Offset = opt.fbInt64Offset;
+          state.sabS11nOffset = opt.sabS11nOffset;
+          state.sabS11nSize = opt.sabS11nSize;
           state.sabOP = opt.sabOP;
           state.sabOPView = new Int32Array(state.sabOP);
           state.sabIO = opt.sabIO;
           state.sabFileBufView = new Uint8Array(state.sabIO, 0, state.fileBufferSize);
+          state.sabS11nView = new Uint8Array(state.sabIO, state.sabS11nOffset, state.sabS11nSize);
           state.opIds = opt.opIds;
+          state.rcIds = opt.rcIds;
           state.sq3Codes = opt.sq3Codes;
           Object.keys(vfsAsyncImpls).forEach((k)=>{
             if(!Number.isFinite(state.opIds[k])){
               toss("Maintenance required: missing state.opIds[",k,"]");
             }
           });
+          initS11n();
           metrics.reset();
           log("init state",state);
-          wMsg('inited');
+          wMsg('opfs-async-inited');
           break;
         }
         default:{
           let err;
           const m = vfsAsyncImpls[data.type] || toss("Unknown message type:",data.type);
           try {
-            await m(data.payload).catch((e)=>err=e);
+            await m(...data.args).catch((e)=>err=e);
           }catch(e){
             err = e;
           }
@@ -425,5 +487,5 @@ navigator.storage.getDirectory().then(function(d){
         }
     }
   };
-  wMsg('loaded');
+  wMsg('opfs-async-loaded');
 }).catch((e)=>error(e));
diff --git a/manifest b/manifest
index 00518b64c8..13980df6d3 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C OPFS\sVFS:\smoved\si/o\sbuffer\sfrom\sper-file\sto\sthe\sVFS,\sand\srelated\srefactoring,\sin\sprep\sfor\sexperimentation\swith\sa\snew\sinter-worker\scomms\smodel.
-D 2022-09-20T01:28:47.162
+C OPFS\sVFS:\sfurther\sinternal\srefactoring\stowards\sexperimenting\swith\sa\snew\scomms\smodel.
+D 2022-09-20T03:31:02.139
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -484,7 +484,7 @@ F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a
 F ext/wasm/api/sqlite3-api-cleanup.js 8564a6077cdcaea9a9f428a019af8a05887f0131e6a2a1e72a7ff1145fadfe77
 F ext/wasm/api/sqlite3-api-glue.js 366d580c8e5bf7fcf4c6dee6f646c31f5549bd417ea03a59a0acca00e8ecce30
 F ext/wasm/api/sqlite3-api-oo1.js 2d13dddf0d2b4168a9249f124134d37924331e5b55e05dba18b6d661fbeefe48
-F ext/wasm/api/sqlite3-api-opfs.js f8027fb4af1c24fcfad31889f8a5ccfa3b96d6e812d3495b13833bef57034046
+F ext/wasm/api/sqlite3-api-opfs.js 351459d571166ff4cebaccd6b8aad2b0fe5eac54a8c777ba52c31c931a3eb2e2
 F ext/wasm/api/sqlite3-api-prologue.js 0d2639387b94c30f492d4aea6e44fb7b16720808678464559458fd2ae3759655
 F ext/wasm/api/sqlite3-api-worker1.js ee4cf149cbacb63d06b536674f822aa5088b7e022cdffc69f1f36cebe2f9fea0
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
@@ -519,7 +519,7 @@ F ext/wasm/speedtest1.html 512addeb3c27c94901178b7bcbde83a6f95c093f9ebe16a2959a0
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
-F ext/wasm/sqlite3-opfs-async-proxy.js 7ebc36915cd61bd4f067a4823307f4d4eb2678a173aaae470c534e8fe9cda650
+F ext/wasm/sqlite3-opfs-async-proxy.js 462081970a6a46d9b2c386474aacad2d81e6629bb554d6cad5c58515f08c8a38
 F ext/wasm/sqlite3-worker1-promiser.js 4fd0465688a28a75f1d4ee4406540ba494f49844e3cad0670d0437a001943365
 F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
 F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
@@ -2026,8 +2026,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 d1f1fe6f1c60640f7770dfb9245c459a09b8d24ec2ddf664dff77c810bd51f96
-R e5a1ff53ebe902985ab8e87bba2c71fb
+P d4d63e4580ad8d497310608175308c03c517e051d7865cb66aa0b10356612d7d
+R 7fef73d3d6085edd0d87db08b80a36c1
 U stephan
-Z d05962442428c5dae722ab00dca47e48
+Z d9dc6ab88cc2471cfc1f140af8fec063
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 8d4f713497..b2152187c4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d4d63e4580ad8d497310608175308c03c517e051d7865cb66aa0b10356612d7d
\ No newline at end of file
+5ca412ced24b4e3af5f467e710a597ed440badf7b8335346aade11d3cad3d1a1
\ No newline at end of file

From 5e8bb0aa13628208b7baedd720ba4aaaac2cc239 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 20 Sep 2022 08:27:57 +0000
Subject: [PATCH 142/428] An alternative messaging strategy for the OPFS VFS
 proxy which uses only SharedArrayBuffer and Atomics, instead of worker
 messages, for communication (only the initial one-time handshake during
 initialization uses worker messages). It runs speedtest1 approx. 15-20%
 faster but still 20-ish% slower than WASMFS.

FossilOrigin-Name: a83ee3082d89439ea3ad5737e63e25bebb0f91895aca006ce5fecf5b93a2651a
---
 ext/wasm/GNUmakefile                 |  15 +--
 ext/wasm/api/sqlite3-api-opfs.js     |  60 ++++++-----
 ext/wasm/speedtest1-worker.html      | 101 +++++++++---------
 ext/wasm/sqlite3-opfs-async-proxy.js | 146 +++++++++++++++++----------
 manifest                             |  21 ++--
 manifest.uuid                        |   2 +-
 6 files changed, 200 insertions(+), 145 deletions(-)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index e1b6784d38..ae416cb469 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -65,7 +65,7 @@ SQLITE_OPT = \
 
 .PHONY: release
 release:
-	$(MAKE) 'emcc_opt=-Os -g3 -flto'
+	$(MAKE) "emcc_opt=-Os -g3 -flto" fiddle_opt=-Os
 # ^^^^^ target-specific vars, e.g.:
 #   release: emcc_opt=...
 # apparently only work for file targets, not PHONY targets?
@@ -432,19 +432,20 @@ push-fiddle: $(fiddle_files)
 # experimentation shows -O2 to be the clear winner in terms of speed.
 # Note that build times with anything higher than -O0 are somewhat
 # painful.
+
 .PHONY: o0 o1 o2 o3 os oz
 o0:
-	$(MAKE) clean; $(MAKE) -e emcc_opt=-O0
+	$((MAKE) clean; $(MAKE) -e "emcc_opt=-O0 -flto" fiddle_opt=-O0
 o1:
-	$(MAKE) clean; $(MAKE) -e emcc_opt=-O1
+	$(MAKE) clean; $(MAKE) -e "emcc_opt=-O1 -flto" fiddle_opt=-O1
 o2:
-	$(MAKE) clean; $(MAKE) -e emcc_opt=-O2
+	$(MAKE) clean; $(MAKE) -e "emcc_opt=-O2 -flto" fiddle_opt=-O2
 o3:
-	$(MAKE) clean; $(MAKE) -e emcc_opt=-O3
+	$(MAKE) clean; $(MAKE) -e "emcc_opt=-O3 -flto" fiddle_opt=-O3
 os:
-	$(MAKE) clean; $(MAKE) -e emcc_opt=-Os
+	$(MAKE) clean; $(MAKE) -e "emcc_opt=-Os -flto" fiddle_opt=-Os
 oz:
-	$(MAKE) clean; $(MAKE) -e emcc_opt=-Oz
+	$(MAKE) clean; $(MAKE) -e "emcc_opt=-Oz -flto" fiddle_opt=-Oz
 
 ########################################################################
 # Sub-makes...
diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index c6b38fa93e..52777c5f3d 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -128,7 +128,6 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
       // failure is, e.g., that the remote script is 404.
       promiseReject(new Error("Loading OPFS async Worker failed for unknown reasons."));
     };
-    const wMsg = (type,args)=>W.postMessage({type,args});
     /**
        Generic utilities for working with OPFS. This will get filled out
        by the Promise setup and, on success, installed as sqlite3.opfs.
@@ -203,7 +202,6 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
     {
       let i = 0;
       state.opIds.whichOp = i++;
-      state.opIds.nothing = i++;
       state.opIds.xAccess = i++;
       state.rcIds.xAccess = i++;
       state.opIds.xClose = i++;
@@ -228,8 +226,9 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
       state.rcIds.xWrite = i++;
       state.opIds.mkdir = i++;
       state.rcIds.mkdir = i++;
+      state.opIds.xFileControl = i++;
+      state.rcIds.xFileControl = i++;
       state.sabOP = new SharedArrayBuffer(i * 4/*sizeof int32*/);
-      state.opIds.xFileControl = state.opIds.xSync /* special case */;
       opfsUtil.metrics.reset();
     }
 
@@ -260,12 +259,17 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
        given operation's signature in the async API counterpart.
     */
     const opRun = (op,...args)=>{
+      const rcNdx = state.rcIds[op] || toss("Invalid rc ID:",op);
+      const opNdx = state.opIds[op] || toss("Invalid op ID:",op);
+      state.s11n.serialize(...args);
+      Atomics.store(state.sabOPView, rcNdx, -1);
+      Atomics.store(state.sabOPView, state.opIds.whichOp, opNdx);
+      Atomics.notify(state.sabOPView, state.opIds.whichOp) /* async thread will take over here */;
       const t = performance.now();
-      Atomics.store(state.sabOPView, state.opIds[op], -1);
-      wMsg(op, args);
-      Atomics.wait(state.sabOPView, state.opIds[op], -1);
+      Atomics.wait(state.sabOPView, rcNdx, -1);
+      const rc = Atomics.load(state.sabOPView, rcNdx);
       metrics[op].wait += performance.now() - t;
-      return Atomics.load(state.sabOPView, state.opIds[op]);
+      return rc;
     };
 
     const initS11n = ()=>{
@@ -297,11 +301,25 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
          serialization for simplicy of implementation, but if that
          proves imperformant then a lower-level approach will be
          created.
+
+         If passed "too much data" (more that the shared buffer size
+         it will either throw or truncate the data (not certain
+         which)). This routine is only intended for serializing OPFS
+         VFS arguments and (in at least one special case) result
+         values, and the buffer is sized to be able to comfortably
+         handle those.
+
+         If passed no arguments then it zeroes out the serialization
+         state.
       */
       state.s11n.serialize = function(...args){
-        const json = jsonEncoder.encode(JSON.stringify(args));
-        viewSz.setInt32(0, json.byteLength, state.littleEndian);
-        viewJson.set(json);
+        if(args.length){
+          const json = jsonEncoder.encode(JSON.stringify(args));
+          viewSz.setInt32(0, json.byteLength, state.littleEndian);
+          viewJson.set(json);
+        }else{
+          viewSz.setInt32(0, 0, state.littleEndian);
+        }
       };
       return state.s11n;
     };
@@ -552,9 +570,8 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
     const vfsSyncWrappers = {
       xAccess: function(pVfs,zName,flags,pOut){
         mTimeStart('xAccess');
-        wasm.setMemValue(
-          pOut, (opRun('xAccess', wasm.cstringToJs(zName)) ? 0 : 1), 'i32'
-        );
+        const rc = opRun('xAccess', wasm.cstringToJs(zName));
+        wasm.setMemValue( pOut, (rc ? 0 : 1), 'i32' );
         mTimeEnd();
         return 0;
       },
@@ -686,22 +703,12 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
     opfsUtil.deleteEntry = function(fsEntryName,recursive=false){
       return 0===opRun('xDelete', fsEntryName, 0, recursive);
     };
-    /**
-       Exactly like deleteEntry() but runs asynchronously. This is a
-       "fire and forget" operation: it does not return a promise
-       because the counterpart operation happens in another thread and
-       waiting on that result in a Promise would block the OPFS VFS
-       from acting until it completed.
-    */
-    opfsUtil.deleteEntryAsync = function(fsEntryName,recursive=false){
-      wMsg('xDeleteNoWait', [fsEntryName, 0, recursive]);
-    };
     /**
        Synchronously creates the given directory name, recursively, in
        the OPFS filesystem. Returns true if it succeeds or the
        directory already exists, else false.
     */
-    opfsUtil.mkdir = async function(absDirName){
+    opfsUtil.mkdir = function(absDirName){
       return 0===opRun('mkdir', absDirName);
     };
     /**
@@ -736,7 +743,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
          features like getting a directory listing.
     */
     
-    const sanityCheck = async function(){
+    const sanityCheck = function(){
       const scope = wasm.scopedAllocPush();
       const sq3File = new sqlite3_file();
       try{
@@ -791,6 +798,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
         vfsSyncWrappers.xAccess(opfsVfs.pointer, zDbFile, 0, pOut);
         rc = wasm.getMemValue(pOut,'i32');
         if(rc) toss("Expecting 0 from xAccess(",dbFile,") after xDelete().");
+        log("End of OPFS sanity checks.");
       }finally{
         sq3File.dispose();
         wasm.scopedAllocPop(scope);
@@ -803,7 +811,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
       switch(data.type){
           case 'opfs-async-loaded':
             /*Pass our config and shared state on to the async worker.*/
-            wMsg('opfs-async-init',state);
+            W.postMessage({type: 'opfs-async-init',args: state});
             break;
           case 'opfs-async-inited':{
             /*Indicates that the async partner has received the 'init',
diff --git a/ext/wasm/speedtest1-worker.html b/ext/wasm/speedtest1-worker.html
index fef673e5e2..bcbd473422 100644
--- a/ext/wasm/speedtest1-worker.html
+++ b/ext/wasm/speedtest1-worker.html
@@ -212,70 +212,71 @@
         /* TODO? Flags which require values need custom UI
            controls and some of them make little sense here
            (e.g. --script FILE). */
-        flags["autovacuum"] = "Enable AUTOVACUUM mode";
-        flags["big-transactions"] = "Important for tests 410 and 510!";
-        //flags["cachesize"] = "N       Set the cache size to N";
-        flags["checkpoint"] = "Run PRAGMA wal_checkpoint after each test case";
-        flags["exclusive"] = "Enable locking_mode=EXCLUSIVE";
-        flags["explain"] = "Like --sqlonly but with added EXPLAIN keywords";
-        //flags["heap"] = "SZ MIN       Memory allocator uses SZ bytes & min allocation MIN";
-        flags["incrvacuum"] = "Enable incremenatal vacuum mode";
-        //flags["journal"] = "M         Set the journal_mode to M";
-        //flags["key"] = "KEY           Set the encryption key to KEY";
-        //flags["lookaside"] = "N SZ    Configure lookaside for N slots of SZ bytes each";
-        flags["memdb"] = "Use an in-memory database";
-        //flags["mmap"] = "SZ           MMAP the first SZ bytes of the database file";
-        flags["multithread"] = "Set multithreaded mode";
-        flags["nomemstat"] = "Disable memory statistics";
-        flags["nomutex"] = "Open db with SQLITE_OPEN_NOMUTEX";
-        flags["nosync"] = "Set PRAGMA synchronous=OFF";
-        flags["notnull"] = "Add NOT NULL constraints to table columns";
-        //flags["output"] = "FILE       Store SQL output in FILE";
-        //flags["pagesize"] = "N        Set the page size to N";
-        //flags["pcache"] = "N SZ       Configure N pages of pagecache each of size SZ bytes";
-        //flags["primarykey"] = "Use PRIMARY KEY instead of UNIQUE where appropriate";
-        //flags["repeat"] = "N          Repeat each SELECT N times (default: 1)";
-        flags["reprepare"] = "Reprepare each statement upon every invocation";
-        //flags["reserve"] = "N         Reserve N bytes on each database page";
-        //flags["script"] = "FILE       Write an SQL script for the test into FILE";
-        flags["serialized"] = "Set serialized threading mode";
-        flags["singlethread"] = "Set single-threaded mode - disables all mutexing";
-        flags["sqlonly"] = "No-op.  Only show the SQL that would have been run.";
-        flags["shrink"] = "memory     Invoke sqlite3_db_release_memory() frequently.";
-        //flags["size"] = "N            Relative test size.  Default=100";
-        flags["strict"] = "Use STRICT table where appropriate";
-        flags["stats"] = "Show statistics at the end";
-        //flags["temp"] = "N            N from 0 to 9.  0: no temp table. 9: all temp tables";
-        //flags["testset"] = "T         Run test-set T (main, cte, rtree, orm, fp, debug)";
-        flags["trace"] = "Turn on SQL tracing";
-        //flags["threads"] = "N         Use up to N threads for sorting";
+        flags["--autovacuum"] = "Enable AUTOVACUUM mode";
+        flags["--big-transactions"] = "Important for tests 410 and 510!";
+        //flags["--cachesize"] = "N       Set the cache size to N";
+        flags["--checkpoint"] = "Run PRAGMA wal_checkpoint after each test case";
+        flags["--exclusive"] = "Enable locking_mode=EXCLUSIVE";
+        flags["--explain"] = "Like --sqlonly but with added EXPLAIN keywords";
+        //flags["--heap"] = "SZ MIN       Memory allocator uses SZ bytes & min allocation MIN";
+        flags["--incrvacuum"] = "Enable incremenatal vacuum mode";
+        //flags["--journal"] = "M         Set the journal_mode to M";
+        //flags["--key"] = "KEY           Set the encryption key to KEY";
+        //flags["--lookaside"] = "N SZ    Configure lookaside for N slots of SZ bytes each";
+        flags["--memdb"] = "Use an in-memory database";
+        //flags["--mmap"] = "SZ           MMAP the first SZ bytes of the database file";
+        flags["--multithread"] = "Set multithreaded mode";
+        flags["--nomemstat"] = "Disable memory statistics";
+        flags["--nomutex"] = "Open db with SQLITE_OPEN_NOMUTEX";
+        flags["--nosync"] = "Set PRAGMA synchronous=OFF";
+        flags["--notnull"] = "Add NOT NULL constraints to table columns";
+        //flags["--output"] = "FILE       Store SQL output in FILE";
+        //flags["--pagesize"] = "N        Set the page size to N";
+        //flags["--pcache"] = "N SZ       Configure N pages of pagecache each of size SZ bytes";
+        //flags["--primarykey"] = "Use PRIMARY KEY instead of UNIQUE where appropriate";
+        //flags["--repeat"] = "N          Repeat each SELECT N times (default: 1)";
+        flags["--reprepare"] = "Reprepare each statement upon every invocation";
+        //flags["--reserve"] = "N         Reserve N bytes on each database page";
+        //flags["--script"] = "FILE       Write an SQL script for the test into FILE";
+        flags["--serialized"] = "Set serialized threading mode";
+        flags["--singlethread"] = "Set single-threaded mode - disables all mutexing";
+        flags["--sqlonly"] = "No-op.  Only show the SQL that would have been run.";
+        flags["--shrink"] = "memory     Invoke sqlite3_db_release_memory() frequently.";
+        //flags["--size"] = "N            Relative test size.  Default=100";
+        flags["--strict"] = "Use STRICT table where appropriate";
+        flags["--stats"] = "Show statistics at the end";
+        //flags["--temp"] = "N            N from 0 to 9.  0: no temp table. 9: all temp tables";
+        //flags["--testset"] = "T         Run test-set T (main, cte, rtree, orm, fp, debug)";
+        flags["--trace"] = "Turn on SQL tracing";
+        //flags["--threads"] = "N         Use up to N threads for sorting";
         /*
           The core API's WASM build does not support UTF16, but in
           this app it's not an issue because the data are not crossing
           JS/WASM boundaries.
         */
-        flags["utf16be"] = "Set text encoding to UTF-16BE";
-        flags["utf16le"] = "Set text encoding to UTF-16LE";
-        flags["verify"] = "Run additional verification steps.";
-        flags["without"] = "rowid     Use WITHOUT ROWID where appropriate";
+        flags["--utf16be"] = "Set text encoding to UTF-16BE";
+        flags["--utf16le"] = "Set text encoding to UTF-16LE";
+        flags["--verify"] = "Run additional verification steps.";
+        flags["--without"] = "rowid     Use WITHOUT ROWID where appropriate";
         const preselectedFlags = [
-          'big-transactions',
-          'singlethread'
+          '--big-transactions',
+          '--singlethread'
         ];
-        if('opfs'!==urlParams.get('vfs')){
-          preselectedFlags.push('memdb');
+        if(urlParams.has('flags')){
+          preselectedFlags.push(...urlParams.get('flags').split(','));
+        }
+          if('opfs'!==urlParams.get('vfs')){
+          preselectedFlags.push('--memdb');
         }
-
         Object.keys(flags).sort().forEach(function(f){
           const opt = document.createElement('option');
           eFlags.appendChild(opt);
-          const lbl = nbspPad('--'+f)+flags[f];
+          const lbl = nbspPad(f)+flags[f];
           //opt.innerText = lbl;
           opt.innerHTML = lbl;
-          opt.value = '--'+f;
+          opt.value = f;
           if(preselectedFlags.indexOf(f) >= 0) opt.selected = true;
-        });
-        
+        });    
         const cbReverseLog = E('#cb-reverse-log-order');
         const lblReverseLog = E('#lbl-reverse-log-order');
         if(cbReverseLog.checked){
diff --git a/ext/wasm/sqlite3-opfs-async-proxy.js b/ext/wasm/sqlite3-opfs-async-proxy.js
index 19d71512c9..a2e0dc5233 100644
--- a/ext/wasm/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/sqlite3-opfs-async-proxy.js
@@ -63,7 +63,7 @@ const error =  (...args)=>logImpl(0, ...args);
 const metrics = Object.create(null);
 metrics.reset = ()=>{
   let k;
-  const r = (m)=>(m.count = m.time = 0);
+  const r = (m)=>(m.count = m.time = m.wait = 0);
   for(k in state.opIds){
     r(metrics[k] = Object.create(null));
   }
@@ -74,11 +74,15 @@ metrics.dump = ()=>{
     const m = metrics[k];
     n += m.count;
     t += m.time;
+    w += m.wait;
     m.avgTime = (m.count && m.time) ? (m.time / m.count) : 0;
   }
   console.log(self.location.href,
-              "metrics for",self.location.href,":",metrics,
-              "\nTotal of",n,"op(s) for",t,"ms");
+              "metrics for",self.location.href,":\n",
+              JSON.stringify(metrics,0,2)
+              /*dev console can't expand this object!*/,
+              "\nTotal of",n,"op(s) for",t,"ms",
+              "approx",w,"ms spent waiting on OPFS APIs.");
 };
 
 warn("This file is very much experimental and under construction.",
@@ -130,9 +134,9 @@ const getDirForPath = async function f(absFilename, createDirs = false){
    and then Atomics.notify()'s it.
 */
 const storeAndNotify = (opName, value)=>{
-  log(opName+"() is notify()ing w/ value:",value);
-  Atomics.store(state.sabOPView, state.opIds[opName], value);
-  Atomics.notify(state.sabOPView, state.opIds[opName]);
+  log(opName+"() => notify(",state.rcIds[opName],",",value,")");
+  Atomics.store(state.sabOPView, state.rcIds[opName], value);
+  Atomics.notify(state.sabOPView, state.rcIds[opName]);
 };
 
 /**
@@ -155,6 +159,17 @@ const mTimeStart = (op)=>{
 const mTimeEnd = ()=>(
   metrics[opTimer.op].time += performance.now() - opTimer.start
 );
+const waitTimer = Object.create(null);
+waitTimer.op = undefined;
+waitTimer.start = undefined;
+const wTimeStart = (op)=>{
+  waitTimer.start = performance.now();
+  waitTimer.op = op;
+  //metrics[op] || toss("Maintenance required: missing metrics for",op);
+};
+const wTimeEnd = ()=>(
+  metrics[waitTimer.op].wait += performance.now() - waitTimer.start
+);
 
 /**
    Asynchronous wrappers for sqlite3_vfs and sqlite3_io_methods
@@ -163,17 +178,20 @@ const mTimeEnd = ()=>(
 */
 const vfsAsyncImpls = {
   mkdir: async function(dirname){
+    mTimeStart('mkdir');
     let rc = 0;
+    wTimeStart('mkdir');
     try {
         await getDirForPath(dirname+"/filepart", true);
     }catch(e){
       //error("mkdir failed",filename, e.message);
       rc = state.sq3Codes.SQLITE_IOERR;
     }
+    wTimeEnd();
     storeAndNotify('mkdir', rc);
+    mTimeEnd();
   },
   xAccess: async function(filename){
-    log("xAccess(",arguments[0],")");
     mTimeStart('xAccess');
     /* OPFS cannot support the full range of xAccess() queries sqlite3
        calls for. We can essentially just tell if the file is
@@ -187,20 +205,23 @@ const vfsAsyncImpls = {
        accessible, non-0 means not accessible.
     */
     let rc = 0;
+    wTimeStart('xAccess');
     try{
       const [dh, fn] = await getDirForPath(filename);
       await dh.getFileHandle(fn);
     }catch(e){
       rc = state.sq3Codes.SQLITE_IOERR;
     }
+    wTimeEnd();
     storeAndNotify('xAccess', rc);
     mTimeEnd();
   },
   xClose: async function(fid){
     const opName = 'xClose';
     mTimeStart(opName);
-    log(opName+"(",arguments[0],")");
     const fh = __openFiles[fid];
+    let rc = 0;
+    wTimeStart('xClose');
     if(fh){
       delete __openFiles[fid];
       if(fh.accessHandle) await fh.accessHandle.close();
@@ -208,10 +229,11 @@ const vfsAsyncImpls = {
         try{ await fh.dirHandle.removeEntry(fh.filenamePart) }
         catch(e){ warn("Ignoring dirHandle.removeEntry() failure of",fh,e) }
       }
-      storeAndNotify(opName, 0);
     }else{
-      storeAndNotify(opName, state.sq3Codes.SQLITE_NOFOUND);
+      rc = state.sq3Codes.SQLITE_NOTFOUND;
     }
+    wTimeEnd();
+    storeAndNotify(opName, rc);
     mTimeEnd();
   },
   xDelete: async function(...args){
@@ -233,12 +255,11 @@ const vfsAsyncImpls = {
        presumably it will fail if the dir is not empty and that flag
        is false.
     */
-    log("xDelete(",arguments[0],")");
     let rc = 0;
+    wTimeStart('xDelete');
     try {
       while(filename){
         const [hDir, filenamePart] = await getDirForPath(filename, false);
-        //log("Removing:",hDir, filenamePart);
         if(!filenamePart) break;
         await hDir.removeEntry(filenamePart, {recursive});
         if(0x1234 !== syncDir) break;
@@ -252,13 +273,14 @@ const vfsAsyncImpls = {
       //error("Delete failed",filename, e.message);
       rc = state.sq3Codes.SQLITE_IOERR_DELETE;
     }
+    wTimeEnd();
     return rc;
   },
   xFileSize: async function(fid){
     mTimeStart('xFileSize');
-    log("xFileSize(",arguments,")");
     const fh = __openFiles[fid];
     let sz;
+    wTimeStart('xFileSize');
     try{
       sz = await fh.accessHandle.getSize();
       state.s11n.serialize(Number(sz));
@@ -267,15 +289,16 @@ const vfsAsyncImpls = {
       error("xFileSize():",e, fh);
       sz = state.sq3Codes.SQLITE_IOERR;
     }
+    wTimeEnd();
     storeAndNotify('xFileSize', sz);
     mTimeEnd();
   },
   xOpen: async function(fid/*sqlite3_file pointer*/, filename, flags){
     const opName = 'xOpen';
     mTimeStart(opName);
-    log(opName+"(",arguments[0],")");
     const deleteOnClose = (state.sq3Codes.SQLITE_OPEN_DELETEONCLOSE & flags);
     const create = (state.sq3Codes.SQLITE_OPEN_CREATE & flags);
+    wTimeStart('xOpen');
     try{
       let hDir, filenamePart;
       try {
@@ -283,6 +306,7 @@ const vfsAsyncImpls = {
       }catch(e){
         storeAndNotify(opName, state.sql3Codes.SQLITE_NOTFOUND);
         mTimeEnd();
+        wTimeEnd();
         return;
       }
       const hFile = await hDir.getFileHandle(filenamePart, {create});
@@ -294,6 +318,7 @@ const vfsAsyncImpls = {
          places that limitation on it.
       */
       fobj.accessHandle = await hFile.createSyncAccessHandle();
+      wTimeEnd();
       __openFiles[fid] = fobj;
       fobj.filenameAbs = filename;
       fobj.filenamePart = filenamePart;
@@ -304,6 +329,7 @@ const vfsAsyncImpls = {
       fobj.deleteOnClose = deleteOnClose;
       storeAndNotify(opName, 0);
     }catch(e){
+      wTimeEnd();
       error(opName,e);
       storeAndNotify(opName, state.sq3Codes.SQLITE_IOERR);
     }
@@ -311,14 +337,15 @@ const vfsAsyncImpls = {
   },
   xRead: async function(fid,n,offset){
     mTimeStart('xRead');
-    log("xRead(",arguments[0],")");
     let rc = 0;
     try{
       const fh = __openFiles[fid];
+      wTimeStart('xRead');
       const nRead = fh.accessHandle.read(
         fh.sabView.subarray(0, n),
         {at: Number(offset)}
       );
+      wTimeEnd();
       if(nRead < n){/* Zero-fill remaining bytes */
         fh.sabView.fill(0, nRead, n);
         rc = state.sq3Codes.SQLITE_IOERR_SHORT_READ;
@@ -332,17 +359,20 @@ const vfsAsyncImpls = {
   },
   xSync: async function(fid,flags/*ignored*/){
     mTimeStart('xSync');
-    log("xSync(",arguments[0],")");
     const fh = __openFiles[fid];
-    if(!fh.readOnly && fh.accessHandle) await fh.accessHandle.flush();
+    if(!fh.readOnly && fh.accessHandle){
+      wTimeStart('xSync');
+      await fh.accessHandle.flush();
+      wTimeEnd();
+    }
     storeAndNotify('xSync',0);
     mTimeEnd();
   },
   xTruncate: async function(fid,size){
     mTimeStart('xTruncate');
-    log("xTruncate(",arguments[0],")");
     let rc = 0;
     const fh = __openFiles[fid];
+    wTimeStart('xTruncate');
     try{
       affirmNotRO('xTruncate', fh);
       await fh.accessHandle.truncate(size);
@@ -350,13 +380,14 @@ const vfsAsyncImpls = {
       error("xTruncate():",e,fh);
       rc = state.sq3Codes.SQLITE_IOERR_TRUNCATE;
     }
+    wTimeEnd();
     storeAndNotify('xTruncate',rc);
     mTimeEnd();
   },
   xWrite: async function(fid,n,offset){
     mTimeStart('xWrite');
-    log("xWrite(",arguments[0],")");
     let rc;
+    wTimeStart('xWrite');
     try{
       const fh = __openFiles[fid];
       affirmNotRO('xWrite', fh);
@@ -367,13 +398,14 @@ const vfsAsyncImpls = {
     }catch(e){
       error("xWrite():",e,fh);
       rc = state.sq3Codes.SQLITE_IOERR_WRITE;
+    }finally{
+      wTimeEnd();
     }
     storeAndNotify('xWrite',rc);
     mTimeEnd();
   }
 };
 
-
 const initS11n = ()=>{
   // Achtung: this code is 100% duplicated in the other half of this proxy!
   if(state.s11n) return state.s11n;
@@ -403,46 +435,69 @@ const initS11n = ()=>{
      serialization for simplicy of implementation, but if that
      proves imperformant then a lower-level approach will be
      created.
+
+     If passed "too much data" (more that the shared buffer size
+     it will either throw or truncate the data (not certain
+     which)). This routine is only intended for serializing OPFS
+     VFS arguments and (in at least one special case) result
+     values, and the buffer is sized to be able to comfortably
+     handle those.
+
+     If passed no arguments then it zeroes out the serialization
+     state.
   */
   state.s11n.serialize = function(...args){
-    const json = jsonEncoder.encode(JSON.stringify(args));
-    viewSz.setInt32(0, json.byteLength, state.littleEndian);
-    viewJson.set(json);
+    if(args.length){
+      const json = jsonEncoder.encode(JSON.stringify(args));
+      viewSz.setInt32(0, json.byteLength, state.littleEndian);
+      viewJson.set(json);
+    }else{
+      viewSz.setInt32(0, 0, state.littleEndian);
+    }
   };
   return state.s11n;
 };
 
-const waitLoop = function(){
+const waitLoop = async function f(){
   const opHandlers = Object.create(null);
-  for(let k of Object.keys(state.opIds)){
+  for(let k of Object.keys(state.rcIds)){
     const o = Object.create(null);
     opHandlers[state.opIds[k]] = o;
     o.key = k;
+    o.f = vfsAsyncImpls[k];// || toss("No vfsAsyncImpls[",k,"]");
   }
-  const sabOP = state.sabOP;
-  for(;;){
+  let metricsTimer = self.location.port>=1024 ? performance.now() : 0;
+  // ^^^ in dev environment, dump out these metrics one time after a delay.
+  while(true){
     try {
-      Atomics.store(sabOP, state.opIds.whichOp, 0);
-      Atomic.wait(sabOP, state.opIds.whichOp);
-      const opId = Atomics.load(sabOP, state.opIds.whichOp);
+      if('timed-out'===Atomics.wait(state.sabOPView, state.opIds.whichOp, 0, 150)){
+        continue;
+      }
+      const opId = Atomics.load(state.sabOPView, state.opIds.whichOp);
+      Atomics.store(state.sabOPView, state.opIds.whichOp, 0);
       const hnd = opHandlers[opId] ?? toss("No waitLoop handler for whichOp #",opId);
       const args = state.s11n.deserialize();
-      log("whichOp =",opId,hnd,args);
-      const rc = 0/*TODO: run op*/;
-      Atomics.store(sabOP, state.rcIds[hnd.key], rc);
-      Atomics.notify(sabOP, state.rcIds[hnd.key]);
+      //warn("waitLoop() whichOp =",opId, hnd, args);
+      if(hnd.f) await hnd.f(...args);
+      else error("Missing callback for opId",opId);
     }catch(e){
       error('in waitLoop():',e.message);
+    }finally{
+      // We can't call metrics.dump() from the dev console because this
+      // thread is continually tied up in Atomics.wait(), so let's
+      // do, for dev purposes only, a dump one time after 60 seconds.
+      if(metricsTimer && (performance.now() > metricsTimer + 60000)){
+        metrics.dump();
+        metricsTimer = 0;
+      }
     }
-  }
+  };
 };
 
 navigator.storage.getDirectory().then(function(d){
   const wMsg = (type)=>postMessage({type});
   state.rootDir = d;
-  log("state.rootDir =",state.rootDir);
-  self.onmessage = async function({data}){
-    log("self.onmessage()",data);
+  self.onmessage = function({data}){
     switch(data.type){
         case 'opfs-async-init':{
           /* Receive shared state from synchronous partner */
@@ -469,20 +524,7 @@ navigator.storage.getDirectory().then(function(d){
           metrics.reset();
           log("init state",state);
           wMsg('opfs-async-inited');
-          break;
-        }
-        default:{
-          let err;
-          const m = vfsAsyncImpls[data.type] || toss("Unknown message type:",data.type);
-          try {
-            await m(...data.args).catch((e)=>err=e);
-          }catch(e){
-            err = e;
-          }
-          if(err){
-            error("Error handling",data.type+"():",e);
-            storeAndNotify(data.type, state.sq3Codes.SQLITE_ERROR);
-          }
+          waitLoop();
           break;
         }
     }
diff --git a/manifest b/manifest
index 13980df6d3..dadba80e1a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C OPFS\sVFS:\sfurther\sinternal\srefactoring\stowards\sexperimenting\swith\sa\snew\scomms\smodel.
-D 2022-09-20T03:31:02.139
+C An\salternative\smessaging\sstrategy\sfor\sthe\sOPFS\sVFS\sproxy\swhich\suses\sonly\sSharedArrayBuffer\sand\sAtomics,\sinstead\sof\sworker\smessages,\sfor\scommunication\s(only\sthe\sinitial\sone-time\shandshake\sduring\sinitialization\suses\sworker\smessages).\sIt\sruns\sspeedtest1\sapprox.\s15-20%\sfaster\sbut\sstill\s20-ish%\sslower\sthan\sWASMFS.
+D 2022-09-20T08:27:57.073
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle 7fb73f7150ab79d83bb45a67d257553c905c78cd3d693101699243f36c5ae6c3
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile b6a5b642e8b3e587d3edcfeb6b6275acbe4730293f4ad46c4997cd932d57aec5
+F ext/wasm/GNUmakefile b65cd280059febd4f034b856139fde52f7edb7326133f7e0588b8efcf396709c
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 150a793a47205b8009ac934f3b6d6ebf67b965c072339aaa25ce808a19e116cc
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -484,7 +484,7 @@ F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a
 F ext/wasm/api/sqlite3-api-cleanup.js 8564a6077cdcaea9a9f428a019af8a05887f0131e6a2a1e72a7ff1145fadfe77
 F ext/wasm/api/sqlite3-api-glue.js 366d580c8e5bf7fcf4c6dee6f646c31f5549bd417ea03a59a0acca00e8ecce30
 F ext/wasm/api/sqlite3-api-oo1.js 2d13dddf0d2b4168a9249f124134d37924331e5b55e05dba18b6d661fbeefe48
-F ext/wasm/api/sqlite3-api-opfs.js 351459d571166ff4cebaccd6b8aad2b0fe5eac54a8c777ba52c31c931a3eb2e2
+F ext/wasm/api/sqlite3-api-opfs.js 1df64b2a11b7f71ba5c7a5807b4d62727e2c712e537eb563caedc67c5a38d149
 F ext/wasm/api/sqlite3-api-prologue.js 0d2639387b94c30f492d4aea6e44fb7b16720808678464559458fd2ae3759655
 F ext/wasm/api/sqlite3-api-worker1.js ee4cf149cbacb63d06b536674f822aa5088b7e022cdffc69f1f36cebe2f9fea0
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
@@ -513,13 +513,13 @@ F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e5
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
 F ext/wasm/scratchpad-wasmfs-main.js f0836e3576df7a89390d777bb53e142e559e8a79becfb2a5a976490b05a1c4fa
 F ext/wasm/speedtest1-wasmfs.html 9d8cd19eab8854d17f7129aa11607cae6f6d9857c505a4aef13000588583d93e
-F ext/wasm/speedtest1-worker.html 7bd3ede33e08067f59e8d6e3dc25016fc930222b059d66b2554203bf262aba02
+F ext/wasm/speedtest1-worker.html ede59f2c1884bf72e3d650064604b48703c81848250b19b8063d260aa3a2201d
 F ext/wasm/speedtest1-worker.js 11e7f68cedd2a83b0e638f94c1d2f58406ba672a7e88b66bff5d4f4284e8ba16
 F ext/wasm/speedtest1.html 512addeb3c27c94901178b7bcbde83a6f95c093f9ebe16a2959a0aa0d828cf1d
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
-F ext/wasm/sqlite3-opfs-async-proxy.js 462081970a6a46d9b2c386474aacad2d81e6629bb554d6cad5c58515f08c8a38
+F ext/wasm/sqlite3-opfs-async-proxy.js 038ecd8558abc3f46cfedd560093fef4d460af8c0d0009ab84f2abdc10916a6a
 F ext/wasm/sqlite3-worker1-promiser.js 4fd0465688a28a75f1d4ee4406540ba494f49844e3cad0670d0437a001943365
 F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
 F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
@@ -2026,8 +2026,11 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P d4d63e4580ad8d497310608175308c03c517e051d7865cb66aa0b10356612d7d
-R 7fef73d3d6085edd0d87db08b80a36c1
+P 5ca412ced24b4e3af5f467e710a597ed440badf7b8335346aade11d3cad3d1a1
+R eef8f82c266e71b1fc83e097c56f095e
+T *branch * opfs-proxy-atomics
+T *sym-opfs-proxy-atomics *
+T -sym-fiddle-opfs * Cancelled\sby\sbranch.
 U stephan
-Z d9dc6ab88cc2471cfc1f140af8fec063
+Z 1c049de5a4413363c0d5cd656309295d
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index b2152187c4..cf2c4e7642 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5ca412ced24b4e3af5f467e710a597ed440badf7b8335346aade11d3cad3d1a1
\ No newline at end of file
+a83ee3082d89439ea3ad5737e63e25bebb0f91895aca006ce5fecf5b93a2651a
\ No newline at end of file

From c9e2602e8f55d7a40d36ef6080529c7fa96ed11f Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 20 Sep 2022 10:11:52 +0000
Subject: [PATCH 143/428] Remove extraneous result-code SAB slots. Doc
 additions.

FossilOrigin-Name: 88de20712bbe3e11ea74af95edc34e9ab9f346f9aa0a30931e5a9e1f96ce57b0
---
 ext/wasm/GNUmakefile                 |  14 +--
 ext/wasm/api/sqlite3-api-opfs.js     | 133 ++++++++++++++-------------
 ext/wasm/sqlite3-opfs-async-proxy.js |  15 +--
 manifest                             |  19 ++--
 manifest.uuid                        |   2 +-
 5 files changed, 96 insertions(+), 87 deletions(-)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index ae416cb469..cff5af5944 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -434,18 +434,20 @@ push-fiddle: $(fiddle_files)
 # painful.
 
 .PHONY: o0 o1 o2 o3 os oz
+o-xtra :=
+#o-xtra += -flto
 o0:
-	$((MAKE) clean; $(MAKE) -e "emcc_opt=-O0 -flto" fiddle_opt=-O0
+	$(MAKE) clean; $(MAKE) -e "emcc_opt=-O0 $(o-xtra)" fiddle_opt=-O0
 o1:
-	$(MAKE) clean; $(MAKE) -e "emcc_opt=-O1 -flto" fiddle_opt=-O1
+	$(MAKE) clean; $(MAKE) -e "emcc_opt=-O1 $(o-xtra)" fiddle_opt=-O1
 o2:
-	$(MAKE) clean; $(MAKE) -e "emcc_opt=-O2 -flto" fiddle_opt=-O2
+	$(MAKE) clean; $(MAKE) -e "emcc_opt=-O2 $(o-xtra)" fiddle_opt=-O2
 o3:
-	$(MAKE) clean; $(MAKE) -e "emcc_opt=-O3 -flto" fiddle_opt=-O3
+	$(MAKE) clean; $(MAKE) -e "emcc_opt=-O3 $(o-xtra)" fiddle_opt=-O3
 os:
-	$(MAKE) clean; $(MAKE) -e "emcc_opt=-Os -flto" fiddle_opt=-Os
+	$(MAKE) clean; $(MAKE) -e "emcc_opt=-Os $(o-xtra)" fiddle_opt=-Os
 oz:
-	$(MAKE) clean; $(MAKE) -e "emcc_opt=-Oz -flto" fiddle_opt=-Oz
+	$(MAKE) clean; $(MAKE) -e "emcc_opt=-Oz $(o-xtra)" fiddle_opt=-Oz
 
 ########################################################################
 # Sub-makes...
diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index 52777c5f3d..a0630d8e76 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -165,6 +165,38 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
       }
     }/*metrics*/;      
 
+    const pDVfs = capi.sqlite3_vfs_find(null)/*pointer to default VFS*/;
+    const dVfs = pDVfs
+          ? new sqlite3_vfs(pDVfs)
+          : null /* dVfs will be null when sqlite3 is built with
+                    SQLITE_OS_OTHER. Though we cannot currently handle
+                    that case, the hope is to eventually be able to. */;
+    const opfsVfs = new sqlite3_vfs();
+    const opfsIoMethods = new sqlite3_io_methods();
+    opfsVfs.$iVersion = 2/*yes, two*/;
+    opfsVfs.$szOsFile = capi.sqlite3_file.structInfo.sizeof;
+    opfsVfs.$mxPathname = 1024/*sure, why not?*/;
+    opfsVfs.$zName = wasm.allocCString("opfs");
+    // All C-side memory of opfsVfs is zeroed out, but just to be explicit:
+    opfsVfs.$xDlOpen = opfsVfs.$xDlError = opfsVfs.$xDlSym = opfsVfs.$xDlClose = null;
+    opfsVfs.ondispose = [
+      '$zName', opfsVfs.$zName,
+      'cleanup default VFS wrapper', ()=>(dVfs ? dVfs.dispose() : null),
+      'cleanup opfsIoMethods', ()=>opfsIoMethods.dispose()
+    ];
+    /**
+       Pedantic sidebar about opfsVfs.ondispose: the entries in that array
+       are items to clean up when opfsVfs.dispose() is called, but in this
+       environment it will never be called. The VFS instance simply
+       hangs around until the WASM module instance is cleaned up. We
+       "could" _hypothetically_ clean it up by "importing" an
+       sqlite3_os_end() impl into the wasm build, but the shutdown order
+       of the wasm engine and the JS one are undefined so there is no
+       guaranty that the opfsVfs instance would be available in one
+       environment or the other when sqlite3_os_end() is called (_if_ it
+       gets called at all in a wasm build, which is undefined).
+    */
+
     /**
        State which we send to the async-api Worker or share with it.
        This object must initially contain only cloneable or sharable
@@ -187,54 +219,64 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
     const state = Object.create(null);
     state.littleEndian = true;
     state.verbose = options.verbose;
+    /* Size of file I/O buffer block. 64k = max sqlite3 page size. */
     state.fileBufferSize =
-      1024 * 64 /* size of aFileHandle.sab. 64k = max sqlite3 page
-                   size. */;
+      1024 * 64;
     state.sabS11nOffset = state.fileBufferSize;
-    state.sabS11nSize = 2048;
+    /**
+       The size of the block in our SAB for serializing arguments and
+       result values. Need to be large enough to hold serialized
+       values of any of the proxied APIs. Filenames are the largest
+       part but are limited to opfsVfs.$mxPathname bytes.
+    */
+    state.sabS11nSize = opfsVfs.$mxPathname * 2;
+    /**
+       The SAB used for all data I/O (files and arg/result s11n).
+    */
     state.sabIO = new SharedArrayBuffer(
-      state.fileBufferSize
-        + state.sabS11nSize/* arg/result serialization block */
+      state.fileBufferSize/* file i/o block */
+      + state.sabS11nSize/* argument/result serialization block */
     );
     state.opIds = Object.create(null);
-    state.rcIds = Object.create(null);
     const metrics = Object.create(null);
     {
+      /* Indexes for use in our SharedArrayBuffer... */
       let i = 0;
+      /* SAB slot used to communicate which operation is desired
+         between both workers. This worker writes to it and the other
+         listens for changes. */
       state.opIds.whichOp = i++;
+      /* Slot for storing return values. This work listens to that
+         slot and the other worker writes to it. */
+      state.opIds.rc = i++;
+      /* Each function gets an ID which this worker writes to
+         the whichOp slot. The async-api worker uses Atomic.wait()
+         on the whichOp slot to figure out which operation to run
+         next. */
       state.opIds.xAccess = i++;
-      state.rcIds.xAccess = i++;
       state.opIds.xClose = i++;
-      state.rcIds.xClose = i++;
       state.opIds.xDelete = i++;
-      state.rcIds.xDelete = i++;
       state.opIds.xDeleteNoWait = i++;
-      state.rcIds.xDeleteNoWait = i++;
       state.opIds.xFileSize = i++;
-      state.rcIds.xFileSize = i++;
       state.opIds.xOpen = i++;
-      state.rcIds.xOpen = i++;
       state.opIds.xRead = i++;
-      state.rcIds.xRead = i++;
       state.opIds.xSleep = i++;
-      state.rcIds.xSleep = i++;
       state.opIds.xSync = i++;
-      state.rcIds.xSync = i++;
       state.opIds.xTruncate = i++;
-      state.rcIds.xTruncate = i++;
       state.opIds.xWrite = i++;
-      state.rcIds.xWrite = i++;
       state.opIds.mkdir = i++;
-      state.rcIds.mkdir = i++;
       state.opIds.xFileControl = i++;
-      state.rcIds.xFileControl = i++;
       state.sabOP = new SharedArrayBuffer(i * 4/*sizeof int32*/);
       opfsUtil.metrics.reset();
     }
 
+    /**
+       SQLITE_xxx constants to export to the async worker
+       counterpart...
+    */
     state.sq3Codes = Object.create(null);
     state.sq3Codes._reverse = Object.create(null);
-    [ // SQLITE_xxx constants to export to the async worker counterpart...
+    [
       'SQLITE_ERROR', 'SQLITE_IOERR',
       'SQLITE_NOTFOUND', 'SQLITE_MISUSE',
       'SQLITE_IOERR_READ', 'SQLITE_IOERR_SHORT_READ',
@@ -252,22 +294,21 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
     const isWorkerErrCode = (n)=>!!state.sq3Codes._reverse[n];
 
     /**
-       Runs the given operation in the async worker counterpart, waits
-       for its response, and returns the result which the async worker
-       writes to the given op's index in state.sabOPView. The 2nd argument
-       must be a single object or primitive value, depending on the
-       given operation's signature in the async API counterpart.
+       Runs the given operation (by name) in the async worker
+       counterpart, waits for its response, and returns the result
+       which the async worker writes to SAB[state.opIds.rc]. The
+       2nd and subsequent arguments must be the aruguments for the
+       async op.
     */
     const opRun = (op,...args)=>{
-      const rcNdx = state.rcIds[op] || toss("Invalid rc ID:",op);
       const opNdx = state.opIds[op] || toss("Invalid op ID:",op);
       state.s11n.serialize(...args);
-      Atomics.store(state.sabOPView, rcNdx, -1);
+      Atomics.store(state.sabOPView, state.opIds.rc, -1);
       Atomics.store(state.sabOPView, state.opIds.whichOp, opNdx);
       Atomics.notify(state.sabOPView, state.opIds.whichOp) /* async thread will take over here */;
       const t = performance.now();
-      Atomics.wait(state.sabOPView, rcNdx, -1);
-      const rc = Atomics.load(state.sabOPView, rcNdx);
+      Atomics.wait(state.sabOPView, state.opIds.rc, -1);
+      const rc = Atomics.load(state.sabOPView, state.opIds.rc);
       metrics[op].wait += performance.now() - t;
       return rc;
     };
@@ -348,38 +389,6 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
        Map of sqlite3_file pointers to objects constructed by xOpen().
     */
     const __openFiles = Object.create(null);
-    
-    const pDVfs = capi.sqlite3_vfs_find(null)/*pointer to default VFS*/;
-    const dVfs = pDVfs
-          ? new sqlite3_vfs(pDVfs)
-          : null /* dVfs will be null when sqlite3 is built with
-                    SQLITE_OS_OTHER. Though we cannot currently handle
-                    that case, the hope is to eventually be able to. */;
-    const opfsVfs = new sqlite3_vfs();
-    const opfsIoMethods = new sqlite3_io_methods();
-    opfsVfs.$iVersion = 2/*yes, two*/;
-    opfsVfs.$szOsFile = capi.sqlite3_file.structInfo.sizeof;
-    opfsVfs.$mxPathname = 1024/*sure, why not?*/;
-    opfsVfs.$zName = wasm.allocCString("opfs");
-    // All C-side memory of opfsVfs is zeroed out, but just to be explicit:
-    opfsVfs.$xDlOpen = opfsVfs.$xDlError = opfsVfs.$xDlSym = opfsVfs.$xDlClose = null;
-    opfsVfs.ondispose = [
-      '$zName', opfsVfs.$zName,
-      'cleanup default VFS wrapper', ()=>(dVfs ? dVfs.dispose() : null),
-      'cleanup opfsIoMethods', ()=>opfsIoMethods.dispose()
-    ];
-    /**
-       Pedantic sidebar about opfsVfs.ondispose: the entries in that array
-       are items to clean up when opfsVfs.dispose() is called, but in this
-       environment it will never be called. The VFS instance simply
-       hangs around until the WASM module instance is cleaned up. We
-       "could" _hypothetically_ clean it up by "importing" an
-       sqlite3_os_end() impl into the wasm build, but the shutdown order
-       of the wasm engine and the JS one are undefined so there is no
-       guaranty that the opfsVfs instance would be available in one
-       environment or the other when sqlite3_os_end() is called (_if_ it
-       gets called at all in a wasm build, which is undefined).
-    */
 
     /**
        Installs a StructBinder-bound function pointer member of the
@@ -798,7 +807,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
         vfsSyncWrappers.xAccess(opfsVfs.pointer, zDbFile, 0, pOut);
         rc = wasm.getMemValue(pOut,'i32');
         if(rc) toss("Expecting 0 from xAccess(",dbFile,") after xDelete().");
-        log("End of OPFS sanity checks.");
+        warn("End of OPFS sanity checks.");
       }finally{
         sq3File.dispose();
         wasm.scopedAllocPop(scope);
diff --git a/ext/wasm/sqlite3-opfs-async-proxy.js b/ext/wasm/sqlite3-opfs-async-proxy.js
index a2e0dc5233..6caf21597a 100644
--- a/ext/wasm/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/sqlite3-opfs-async-proxy.js
@@ -134,9 +134,9 @@ const getDirForPath = async function f(absFilename, createDirs = false){
    and then Atomics.notify()'s it.
 */
 const storeAndNotify = (opName, value)=>{
-  log(opName+"() => notify(",state.rcIds[opName],",",value,")");
-  Atomics.store(state.sabOPView, state.rcIds[opName], value);
-  Atomics.notify(state.sabOPView, state.rcIds[opName]);
+  log(opName+"() => notify(",state.opIds.rc,",",value,")");
+  Atomics.store(state.sabOPView, state.opIds.rc, value);
+  Atomics.notify(state.sabOPView, state.opIds.rc);
 };
 
 /**
@@ -460,17 +460,19 @@ const initS11n = ()=>{
 
 const waitLoop = async function f(){
   const opHandlers = Object.create(null);
-  for(let k of Object.keys(state.rcIds)){
+  for(let k of Object.keys(state.opIds)){
+    const vi = vfsAsyncImpls[k];
+    if(!vi) continue;
     const o = Object.create(null);
     opHandlers[state.opIds[k]] = o;
     o.key = k;
-    o.f = vfsAsyncImpls[k];// || toss("No vfsAsyncImpls[",k,"]");
+    o.f = vi;// || toss("No vfsAsyncImpls[",k,"]");
   }
   let metricsTimer = self.location.port>=1024 ? performance.now() : 0;
   // ^^^ in dev environment, dump out these metrics one time after a delay.
   while(true){
     try {
-      if('timed-out'===Atomics.wait(state.sabOPView, state.opIds.whichOp, 0, 150)){
+      if('timed-out'===Atomics.wait(state.sabOPView, state.opIds.whichOp, 0, 500)){
         continue;
       }
       const opId = Atomics.load(state.sabOPView, state.opIds.whichOp);
@@ -513,7 +515,6 @@ navigator.storage.getDirectory().then(function(d){
           state.sabFileBufView = new Uint8Array(state.sabIO, 0, state.fileBufferSize);
           state.sabS11nView = new Uint8Array(state.sabIO, state.sabS11nOffset, state.sabS11nSize);
           state.opIds = opt.opIds;
-          state.rcIds = opt.rcIds;
           state.sq3Codes = opt.sq3Codes;
           Object.keys(vfsAsyncImpls).forEach((k)=>{
             if(!Number.isFinite(state.opIds[k])){
diff --git a/manifest b/manifest
index dadba80e1a..4943ef8ef2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C An\salternative\smessaging\sstrategy\sfor\sthe\sOPFS\sVFS\sproxy\swhich\suses\sonly\sSharedArrayBuffer\sand\sAtomics,\sinstead\sof\sworker\smessages,\sfor\scommunication\s(only\sthe\sinitial\sone-time\shandshake\sduring\sinitialization\suses\sworker\smessages).\sIt\sruns\sspeedtest1\sapprox.\s15-20%\sfaster\sbut\sstill\s20-ish%\sslower\sthan\sWASMFS.
-D 2022-09-20T08:27:57.073
+C Remove\sextraneous\sresult-code\sSAB\sslots.\sDoc\sadditions.
+D 2022-09-20T10:11:52.007
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle 7fb73f7150ab79d83bb45a67d257553c905c78cd3d693101699243f36c5ae6c3
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile b65cd280059febd4f034b856139fde52f7edb7326133f7e0588b8efcf396709c
+F ext/wasm/GNUmakefile 5b848d4d20c31b2aac3dcfabaf5deaf56fe9db9ca1299a4dede1bcd27821426b
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 150a793a47205b8009ac934f3b6d6ebf67b965c072339aaa25ce808a19e116cc
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -484,7 +484,7 @@ F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a
 F ext/wasm/api/sqlite3-api-cleanup.js 8564a6077cdcaea9a9f428a019af8a05887f0131e6a2a1e72a7ff1145fadfe77
 F ext/wasm/api/sqlite3-api-glue.js 366d580c8e5bf7fcf4c6dee6f646c31f5549bd417ea03a59a0acca00e8ecce30
 F ext/wasm/api/sqlite3-api-oo1.js 2d13dddf0d2b4168a9249f124134d37924331e5b55e05dba18b6d661fbeefe48
-F ext/wasm/api/sqlite3-api-opfs.js 1df64b2a11b7f71ba5c7a5807b4d62727e2c712e537eb563caedc67c5a38d149
+F ext/wasm/api/sqlite3-api-opfs.js 8611680362619cac2425fd77fa9bff00690c80a17a6b95cdd1a39c2cc33e11d0
 F ext/wasm/api/sqlite3-api-prologue.js 0d2639387b94c30f492d4aea6e44fb7b16720808678464559458fd2ae3759655
 F ext/wasm/api/sqlite3-api-worker1.js ee4cf149cbacb63d06b536674f822aa5088b7e022cdffc69f1f36cebe2f9fea0
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
@@ -519,7 +519,7 @@ F ext/wasm/speedtest1.html 512addeb3c27c94901178b7bcbde83a6f95c093f9ebe16a2959a0
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
-F ext/wasm/sqlite3-opfs-async-proxy.js 038ecd8558abc3f46cfedd560093fef4d460af8c0d0009ab84f2abdc10916a6a
+F ext/wasm/sqlite3-opfs-async-proxy.js e3c5e1b6416e9c08c713c43fa98319b06fac622ecb813f294b047072b089fba6
 F ext/wasm/sqlite3-worker1-promiser.js 4fd0465688a28a75f1d4ee4406540ba494f49844e3cad0670d0437a001943365
 F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
 F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
@@ -2026,11 +2026,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 5ca412ced24b4e3af5f467e710a597ed440badf7b8335346aade11d3cad3d1a1
-R eef8f82c266e71b1fc83e097c56f095e
-T *branch * opfs-proxy-atomics
-T *sym-opfs-proxy-atomics *
-T -sym-fiddle-opfs * Cancelled\sby\sbranch.
+P a83ee3082d89439ea3ad5737e63e25bebb0f91895aca006ce5fecf5b93a2651a
+R bb080f9a3495e6fa47cacc332af06e26
 U stephan
-Z 1c049de5a4413363c0d5cd656309295d
+Z e5fc885edbb6664192b4f06eefccf3e5
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index cf2c4e7642..16e232c3fa 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a83ee3082d89439ea3ad5737e63e25bebb0f91895aca006ce5fecf5b93a2651a
\ No newline at end of file
+88de20712bbe3e11ea74af95edc34e9ab9f346f9aa0a30931e5a9e1f96ce57b0
\ No newline at end of file

From c2ccd676890392b1850bdb17d1f22233fb9c0570 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 20 Sep 2022 10:47:36 +0000
Subject: [PATCH 144/428] OPFS proxy: remove one sanity-checking-only level of
 proxy function to shave off a few microseconds.

FossilOrigin-Name: b534831f3efb8910a17e29956e3e87cc80055ea66e15dbef992b6a556ff042f8
---
 ext/wasm/api/sqlite3-api-opfs.js |  2 +-
 manifest                         | 12 ++++++------
 manifest.uuid                    |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index a0630d8e76..dd61ee0a26 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -443,7 +443,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
       }
       const memKey = tgt.memberKey(name);
       //log("installMethod",tgt, name, sigN);
-      const fProxy = 1
+      const fProxy = 0
       // We can remove this proxy middle-man once the VFS is working
             ? callee.argcProxy(func, sigN)
             : func;
diff --git a/manifest b/manifest
index 4943ef8ef2..a80252bfbe 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sextraneous\sresult-code\sSAB\sslots.\sDoc\sadditions.
-D 2022-09-20T10:11:52.007
+C OPFS\sproxy:\sremove\sone\ssanity-checking-only\slevel\sof\sproxy\sfunction\sto\sshave\soff\sa\sfew\smicroseconds.
+D 2022-09-20T10:47:36.917
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -484,7 +484,7 @@ F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a
 F ext/wasm/api/sqlite3-api-cleanup.js 8564a6077cdcaea9a9f428a019af8a05887f0131e6a2a1e72a7ff1145fadfe77
 F ext/wasm/api/sqlite3-api-glue.js 366d580c8e5bf7fcf4c6dee6f646c31f5549bd417ea03a59a0acca00e8ecce30
 F ext/wasm/api/sqlite3-api-oo1.js 2d13dddf0d2b4168a9249f124134d37924331e5b55e05dba18b6d661fbeefe48
-F ext/wasm/api/sqlite3-api-opfs.js 8611680362619cac2425fd77fa9bff00690c80a17a6b95cdd1a39c2cc33e11d0
+F ext/wasm/api/sqlite3-api-opfs.js 10063ff6bc4065a27c81a71f41eb429b53390b5bc885a6305243bf83e3bd94c4
 F ext/wasm/api/sqlite3-api-prologue.js 0d2639387b94c30f492d4aea6e44fb7b16720808678464559458fd2ae3759655
 F ext/wasm/api/sqlite3-api-worker1.js ee4cf149cbacb63d06b536674f822aa5088b7e022cdffc69f1f36cebe2f9fea0
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
@@ -2026,8 +2026,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 a83ee3082d89439ea3ad5737e63e25bebb0f91895aca006ce5fecf5b93a2651a
-R bb080f9a3495e6fa47cacc332af06e26
+P 88de20712bbe3e11ea74af95edc34e9ab9f346f9aa0a30931e5a9e1f96ce57b0
+R e087e3859232a8d2cb7d73aa59ed1981
 U stephan
-Z e5fc885edbb6664192b4f06eefccf3e5
+Z c97570003be4379736d19c807db44fd0
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 16e232c3fa..3e977d7987 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-88de20712bbe3e11ea74af95edc34e9ab9f346f9aa0a30931e5a9e1f96ce57b0
\ No newline at end of file
+b534831f3efb8910a17e29956e3e87cc80055ea66e15dbef992b6a556ff042f8
\ No newline at end of file

From b8c8d4e4a077d0f877b189a739fc3293bf585aec Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 20 Sep 2022 13:25:39 +0000
Subject: [PATCH 145/428] Speed up de/serialization of func args and return
 values in the OPFS VFS proxy.

FossilOrigin-Name: 5bf235bbe035e4ace7a54851e190742528af6b4266328a1b8bbb9fb3dd7f2118
---
 ext/wasm/api/sqlite3-api-opfs.js     | 125 ++++++++++++++++++++-------
 ext/wasm/sqlite3-opfs-async-proxy.js | 125 +++++++++++++++++++++------
 manifest                             |  14 +--
 manifest.uuid                        |   2 +-
 4 files changed, 200 insertions(+), 66 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index dd61ee0a26..1f50b4631a 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -152,6 +152,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
                     "metrics for",self.location.href,":",metrics,
                     "\nTotal of",n,"op(s) for",t,
                     "ms (incl. "+w+" ms of waiting on the async side)");
+        console.log("Serialization metrics:",JSON.stringify(metrics.s11n,0,2));
       },
       reset: function(){
         let k;
@@ -159,6 +160,11 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
         for(k in state.opIds){
           r(metrics[k] = Object.create(null));
         }
+        let s = metrics.s11n = Object.create(null);
+        s = s.serialize = Object.create(null);
+        s.count = s.time = 0;
+        s = metrics.s11n.deserialize = Object.create(null);
+        s.count = s.time = 0;
         //[ // timed routines which are not in state.opIds
         //  'xFileControl'
         //].forEach((k)=>r(metrics[k] = Object.create(null)));
@@ -314,56 +320,115 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
     };
 
     const initS11n = ()=>{
-      // Achtung: this code is 100% duplicated in the other half of this proxy!
+      /**
+         ACHTUNG: this code is 100% duplicated in the other half of
+         this proxy!
+
+         Historical note: this impl was initially about 5% this size by using
+         using JSON.stringify/parse(), but using fit-to-purpose serialization
+         saves considerable runtime.
+      */
       if(state.s11n) return state.s11n;
-      const jsonDecoder = new TextDecoder(),
-            jsonEncoder = new TextEncoder('utf-8'),
-            viewSz = new DataView(state.sabIO, state.sabS11nOffset, 4),
-            viewJson = new Uint8Array(state.sabIO, state.sabS11nOffset+4, state.sabS11nSize-4);
+      const textDecoder = new TextDecoder(),
+      textEncoder = new TextEncoder('utf-8'),
+      viewU8 = new Uint8Array(state.sabIO, state.sabS11nOffset, state.sabS11nSize),
+      viewDV = new DataView(state.sabIO, state.sabS11nOffset, state.sabS11nSize);
       state.s11n = Object.create(null);
+      const TypeIds = Object.create(null);
+      TypeIds.number  = { id: 1, size: 8, getter: 'getFloat64', setter: 'setFloat64' };
+      TypeIds.bigint  = { id: 2, size: 8, getter: 'getBigInt64', setter: 'setBigInt64' };
+      TypeIds.boolean = { id: 3, size: 4, getter: 'getInt32', setter: 'setInt32' };
+      TypeIds.string =  { id: 4 };
+      const getTypeId = (v)=>{
+        return TypeIds[typeof v] || toss("This value type cannot be serialized.",v);
+      };
+      const getTypeIdById = (tid)=>{
+        switch(tid){
+        case TypeIds.number.id: return TypeIds.number;
+        case TypeIds.bigint.id: return TypeIds.bigint;
+        case TypeIds.boolean.id: return TypeIds.boolean;
+        case TypeIds.string.id: return TypeIds.string;
+        default: toss("Invalid type ID:",tid);
+        }
+      };
       /**
          Returns an array of the state serialized by the most recent
          serialize() operation (here or in the counterpart thread), or
          null if the serialization buffer is empty.
       */
       state.s11n.deserialize = function(){
-        const sz = viewSz.getInt32(0, state.littleEndian);
-        const json = sz ? jsonDecoder.decode(
-          viewJson.slice(0, sz)
-          /* slice() (copy) needed, instead of subarray() (reference),
-             because TextDecoder throws if asked to decode from an
-             SAB. */
-        ) : null;
-        return JSON.parse(json);
-      }
+        ++metrics.s11n.deserialize.count;
+        const t = performance.now();
+        let rc = null;
+        const argc = viewU8[0];
+        if(argc){
+          rc = [];
+          let offset = 1, i, n, v, typeIds = [];
+          for(i = 0; i < argc; ++i, ++offset){
+            typeIds.push(getTypeIdById(viewU8[offset]));
+          }
+          for(i = 0; i < argc; ++i){
+            const t = typeIds[i];
+            if(t.getter){
+              v = viewDV[t.getter](offset, state.littleEndian);
+              offset += t.size;
+            }else{
+              n = viewDV.getInt32(offset, state.littleEndian);
+              offset += 4;
+              v = textDecoder.decode(viewU8.slice(offset, offset+n));
+              offset += n;
+            }
+            rc.push(v);
+          }
+        }
+        //log("deserialize:",argc, rc);
+        metrics.s11n.deserialize.time += performance.now() - t;
+        return rc;
+      };
       /**
          Serializes all arguments to the shared buffer for consumption
-         by the counterpart thread. This impl currently uses JSON for
-         serialization for simplicy of implementation, but if that
-         proves imperformant then a lower-level approach will be
-         created.
+         by the counterpart thread.
 
-         If passed "too much data" (more that the shared buffer size
-         it will either throw or truncate the data (not certain
-         which)). This routine is only intended for serializing OPFS
-         VFS arguments and (in at least one special case) result
-         values, and the buffer is sized to be able to comfortably
-         handle those.
+         This routine is only intended for serializing OPFS VFS
+         arguments and (in at least one special case) result values,
+         and the buffer is sized to be able to comfortably handle
+         those.
 
          If passed no arguments then it zeroes out the serialization
          state.
       */
       state.s11n.serialize = function(...args){
+        ++metrics.s11n.serialize.count;
+        const t = performance.now();
         if(args.length){
-          const json = jsonEncoder.encode(JSON.stringify(args));
-          viewSz.setInt32(0, json.byteLength, state.littleEndian);
-          viewJson.set(json);
+          //log("serialize():",args);
+          let i = 0, offset = 1, typeIds = [];
+          viewU8[0] = args.length & 0xff;
+          for(; i < args.length; ++i, ++offset){
+            typeIds.push(getTypeId(args[i]));
+            viewU8[offset] = typeIds[i].id;
+          }
+          for(i = 0; i < args.length; ++i) {
+            const t = typeIds[i];
+            if(t.setter){
+              viewDV[t.setter](offset, args[i], state.littleEndian);
+              offset += t.size;
+            }else{
+              const s = textEncoder.encode(args[i]);
+              viewDV.setInt32(offset, s.byteLength, state.littleEndian);
+              offset += 4;
+              viewU8.set(s, offset);
+              offset += s.byteLength;
+            }
+          }
+          //log("serialize() result:",viewU8.slice(0,offset));
         }else{
-          viewSz.setInt32(0, 0, state.littleEndian);
+          viewU8[0] = 0;
         }
+        metrics.s11n.serialize.time += performance.now() - t;
       };
       return state.s11n;
-    };
+    }/*initS11n()*/;
 
     /**
        Generates a random ASCII string len characters long, intended for
@@ -762,7 +827,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
         //| capi.SQLITE_OPEN_DELETEONCLOSE
               | capi.SQLITE_OPEN_MAIN_DB;
         const pOut = wasm.scopedAlloc(8);
-        const dbFile = "/sanity/check/file";
+        const dbFile = "/sanity/check/file"+randomFilename(8);
         const zDbFile = wasm.scopedAllocCString(dbFile);
         let rc;
         vfsSyncWrappers.xAccess(opfsVfs.pointer, zDbFile, 0, pOut);
diff --git a/ext/wasm/sqlite3-opfs-async-proxy.js b/ext/wasm/sqlite3-opfs-async-proxy.js
index 6caf21597a..7c5e8430b6 100644
--- a/ext/wasm/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/sqlite3-opfs-async-proxy.js
@@ -67,6 +67,11 @@ metrics.reset = ()=>{
   for(k in state.opIds){
     r(metrics[k] = Object.create(null));
   }
+  let s = metrics.s11n = Object.create(null);
+  s = s.serialize = Object.create(null);
+  s.count = s.time = 0;
+  s = metrics.s11n.deserialize = Object.create(null);
+  s.count = s.time = 0;
 };
 metrics.dump = ()=>{
   let k, n = 0, t = 0, w = 0;
@@ -83,6 +88,7 @@ metrics.dump = ()=>{
               /*dev console can't expand this object!*/,
               "\nTotal of",n,"op(s) for",t,"ms",
               "approx",w,"ms spent waiting on OPFS APIs.");
+  console.log("Serialization metrics:",JSON.stringify(metrics.s11n,0,2));
 };
 
 warn("This file is very much experimental and under construction.",
@@ -408,55 +414,118 @@ const vfsAsyncImpls = {
 
 const initS11n = ()=>{
   // Achtung: this code is 100% duplicated in the other half of this proxy!
+
+  /**
+     Historical note: this impl was initially about 1% this size by using
+     using JSON.stringify/parse(), but using fit-to-purpose serialization
+     saves considerable runtime.
+  */
+
   if(state.s11n) return state.s11n;
-  const jsonDecoder = new TextDecoder(),
-        jsonEncoder = new TextEncoder('utf-8'),
-        viewSz = new DataView(state.sabIO, state.sabS11nOffset, 4),
-        viewJson = new Uint8Array(state.sabIO, state.sabS11nOffset+4, state.sabS11nSize-4);
+  const textDecoder = new TextDecoder(),
+  textEncoder = new TextEncoder('utf-8'),
+  viewU8 = new Uint8Array(state.sabIO, state.sabS11nOffset, state.sabS11nSize),
+  viewDV = new DataView(state.sabIO, state.sabS11nOffset, state.sabS11nSize);
   state.s11n = Object.create(null);
+
+  const TypeIds = Object.create(null);
+  TypeIds.number  = { id: 1, size: 8, getter: 'getFloat64', setter: 'setFloat64' };
+  TypeIds.bigint  = { id: 2, size: 8, getter: 'getBigInt64', setter: 'setBigInt64' };
+  TypeIds.boolean = { id: 3, size: 4, getter: 'getInt32', setter: 'setInt32' };
+  TypeIds.string =  { id: 4 };
+
+  const getTypeId = (v)=>{
+    return TypeIds[typeof v] || toss("This value type cannot be serialized.",v);
+  };
+  const getTypeIdById = (tid)=>{
+    switch(tid){
+    case TypeIds.number.id: return TypeIds.number;
+    case TypeIds.bigint.id: return TypeIds.bigint;
+    case TypeIds.boolean.id: return TypeIds.boolean;
+    case TypeIds.string.id: return TypeIds.string;
+    default: toss("Invalid type ID:",tid);
+    }
+  };
+
   /**
      Returns an array of the state serialized by the most recent
      serialize() operation (here or in the counterpart thread), or
      null if the serialization buffer is empty.
   */
   state.s11n.deserialize = function(){
-    const sz = viewSz.getInt32(0, state.littleEndian);
-    const json = sz ? jsonDecoder.decode(
-      viewJson.slice(0, sz)
-      /* slice() (copy) needed, instead of subarray() (reference),
-         because TextDecoder throws if asked to decode from an
-         SAB. */
-    ) : null;
-    return JSON.parse(json);
-  }
+    ++metrics.s11n.deserialize.count;
+    const t = performance.now();
+    let rc = null;
+    const argc = viewU8[0];
+    if(argc){
+      rc = [];
+      let offset = 1, i, n, v, typeIds = [];
+      for(i = 0; i < argc; ++i, ++offset){
+        typeIds.push(getTypeIdById(viewU8[offset]));
+      }
+      for(i = 0; i < argc; ++i){
+        const t = typeIds[i];
+        if(t.getter){
+          v = viewDV[t.getter](offset, state.littleEndian);
+          offset += t.size;
+        }else{
+          n = viewDV.getInt32(offset, state.littleEndian);
+          offset += 4;
+          v = textDecoder.decode(viewU8.slice(offset, offset+n));
+          offset += n;
+        }
+        rc.push(v);
+      }
+    }
+    //log("deserialize:",argc, rc);
+    metrics.s11n.deserialize.time += performance.now() - t;
+    return rc;
+  };
+
   /**
      Serializes all arguments to the shared buffer for consumption
-     by the counterpart thread. This impl currently uses JSON for
-     serialization for simplicy of implementation, but if that
-     proves imperformant then a lower-level approach will be
-     created.
+     by the counterpart thread.
 
-     If passed "too much data" (more that the shared buffer size
-     it will either throw or truncate the data (not certain
-     which)). This routine is only intended for serializing OPFS
-     VFS arguments and (in at least one special case) result
-     values, and the buffer is sized to be able to comfortably
-     handle those.
+     This routine is only intended for serializing OPFS VFS
+     arguments and (in at least one special case) result values,
+     and the buffer is sized to be able to comfortably handle
+     those.
 
      If passed no arguments then it zeroes out the serialization
      state.
   */
   state.s11n.serialize = function(...args){
+    ++metrics.s11n.serialize.count;
+    const t = performance.now();
     if(args.length){
-      const json = jsonEncoder.encode(JSON.stringify(args));
-      viewSz.setInt32(0, json.byteLength, state.littleEndian);
-      viewJson.set(json);
+      //log("serialize():",args);
+      let i = 0, offset = 1, typeIds = [];
+      viewU8[0] = args.length & 0xff;
+      for(; i < args.length; ++i, ++offset){
+        typeIds.push(getTypeId(args[i]));
+        viewU8[offset] = typeIds[i].id;
+      }
+      for(i = 0; i < args.length; ++i) {
+        const t = typeIds[i];
+        if(t.setter){
+          viewDV[t.setter](offset, args[i], state.littleEndian);
+          offset += t.size;
+        }else{
+          const s = textEncoder.encode(args[i]);
+          viewDV.setInt32(offset, s.byteLength, state.littleEndian);
+          offset += 4;
+          viewU8.set(s, offset);
+          offset += s.byteLength;
+        }
+      }
+      //log("serialize() result:",viewU8.slice(0,offset));
     }else{
-      viewSz.setInt32(0, 0, state.littleEndian);
+      viewU8[0] = 0;
     }
+    metrics.s11n.serialize.time += performance.now() - t;
   };
   return state.s11n;
-};
+}/*initS11n()*/;
 
 const waitLoop = async function f(){
   const opHandlers = Object.create(null);
diff --git a/manifest b/manifest
index a80252bfbe..d5e6c8b22a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C OPFS\sproxy:\sremove\sone\ssanity-checking-only\slevel\sof\sproxy\sfunction\sto\sshave\soff\sa\sfew\smicroseconds.
-D 2022-09-20T10:47:36.917
+C Speed\sup\sde/serialization\sof\sfunc\sargs\sand\sreturn\svalues\sin\sthe\sOPFS\sVFS\sproxy.
+D 2022-09-20T13:25:39.815
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -484,7 +484,7 @@ F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a
 F ext/wasm/api/sqlite3-api-cleanup.js 8564a6077cdcaea9a9f428a019af8a05887f0131e6a2a1e72a7ff1145fadfe77
 F ext/wasm/api/sqlite3-api-glue.js 366d580c8e5bf7fcf4c6dee6f646c31f5549bd417ea03a59a0acca00e8ecce30
 F ext/wasm/api/sqlite3-api-oo1.js 2d13dddf0d2b4168a9249f124134d37924331e5b55e05dba18b6d661fbeefe48
-F ext/wasm/api/sqlite3-api-opfs.js 10063ff6bc4065a27c81a71f41eb429b53390b5bc885a6305243bf83e3bd94c4
+F ext/wasm/api/sqlite3-api-opfs.js ce75aba0cbfb600cf839362012d17b7b2984aeac5189586c9a5a8f37a573a929
 F ext/wasm/api/sqlite3-api-prologue.js 0d2639387b94c30f492d4aea6e44fb7b16720808678464559458fd2ae3759655
 F ext/wasm/api/sqlite3-api-worker1.js ee4cf149cbacb63d06b536674f822aa5088b7e022cdffc69f1f36cebe2f9fea0
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
@@ -519,7 +519,7 @@ F ext/wasm/speedtest1.html 512addeb3c27c94901178b7bcbde83a6f95c093f9ebe16a2959a0
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
-F ext/wasm/sqlite3-opfs-async-proxy.js e3c5e1b6416e9c08c713c43fa98319b06fac622ecb813f294b047072b089fba6
+F ext/wasm/sqlite3-opfs-async-proxy.js 9305d92f32d02983c4528b9c801096cfd8295ca7d24e357d90de9bbcb201d035
 F ext/wasm/sqlite3-worker1-promiser.js 4fd0465688a28a75f1d4ee4406540ba494f49844e3cad0670d0437a001943365
 F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
 F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
@@ -2026,8 +2026,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 88de20712bbe3e11ea74af95edc34e9ab9f346f9aa0a30931e5a9e1f96ce57b0
-R e087e3859232a8d2cb7d73aa59ed1981
+P b534831f3efb8910a17e29956e3e87cc80055ea66e15dbef992b6a556ff042f8
+R 28e069ac7c71e059841784989b21e62c
 U stephan
-Z c97570003be4379736d19c807db44fd0
+Z 483126717a4194dd1997ada5cd19f259
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 3e977d7987..44047c5b0f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b534831f3efb8910a17e29956e3e87cc80055ea66e15dbef992b6a556ff042f8
\ No newline at end of file
+5bf235bbe035e4ace7a54851e190742528af6b4266328a1b8bbb9fb3dd7f2118
\ No newline at end of file

From 0e0aafc69842302d3167e8f64f36529ad58c3c3e Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 20 Sep 2022 14:21:58 +0000
Subject: [PATCH 146/428] Remove an obsolete file.

FossilOrigin-Name: 1e43855498b4329f733bd6e0731841dc884e885de7d2d338d402d05d54309427
---
 ext/wasm/GNUmakefile             |  3 +-
 ext/wasm/batch-runner-kvvfs.html | 65 --------------------------------
 ext/wasm/index.html              |  1 -
 manifest                         | 15 ++++----
 manifest.uuid                    |  2 +-
 5 files changed, 9 insertions(+), 77 deletions(-)
 delete mode 100644 ext/wasm/batch-runner-kvvfs.html

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index cff5af5944..d8cc845230 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -311,8 +311,7 @@ dir.sql := sql
 speedtest1 := ../../speedtest1
 speedtest1.c := ../../test/speedtest1.c
 speedtest1.sql := $(dir.sql)/speedtest1.sql
-speedtest1.cliflags := --size 1 --big-transactions
-#  --------------------^^^^^^^^ small size is needed for batch-runner-kvvfs.html
+speedtest1.cliflags := --size 100 --big-transactions
 $(speedtest1):
 	$(MAKE) -C ../.. speedtest1
 $(speedtest1.sql): $(speedtest1) $(MAKEFILE)
diff --git a/ext/wasm/batch-runner-kvvfs.html b/ext/wasm/batch-runner-kvvfs.html
deleted file mode 100644
index 420bdf4f20..0000000000
--- a/ext/wasm/batch-runner-kvvfs.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!doctype html>
-<html lang="en-us">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
-    <link rel="stylesheet" href="common/emscripten.css"/>
-    <link rel="stylesheet" href="common/testing.css"/>
-    <title>sqlite3-api kvvfs batch SQL runner</title>
-  </head>
-  <body>
-    <header id='titlebar'><span>sqlite3-api kvvfs batch SQL runner</span></header>
-    <!-- emscripten bits -->
-    <figure id="module-spinner">
-      <div class="spinner"></div>
-      <div class='center'><strong>Initializing app...</strong></div>
-      <div class='center'>
-        On a slow internet connection this may take a moment.  If this
-        message displays for "a long time", intialization may have
-        failed and the JavaScript console may contain clues as to why.
-      </div>
-    </figure>
-    <div class="emscripten" id="module-status">Downloading...</div>
-    <div class="emscripten">
-      <progress value="0" max="100" id="module-progress" hidden='1'></progress>  
-    </div><!-- /emscripten bits -->
-    <p>
-      This page is for batch-running extracts from the output
-      of <tt>speedtest1 --script</tt>, as well as other standalone SQL
-      scripts. <span class='warning'>This variant runs with KVVFS and
-      has tiny size limits.</span>
-    </p>
-    <p id='warn-list' class='warning'>ACHTUNG: this file requires a generated input list
-      file. Run "make batch" from this directory to generate it.
-    </p>
-    <p id='warn-opfs' class='warning'>WARNING: if the WASMFS/OPFS layer crashes, this page may
-      become completely unresponsive and need to be closed and
-      reloaded to recover.
-    </p>
-    <hr>
-    <div>
-      <select class='disable-during-eval' id='sql-select'>
-        <option disabled selected>Populated via script code</option>
-      </select>
-      <button class='disable-during-eval' id='sql-run'>Run selected SQL</button>
-      <button class='disable-during-eval' id='sql-run-next'>Run next...</button>
-      <button class='disable-during-eval' id='sql-run-remaining'>Run all remaining...</button>
-      <button class='disable-during-eval' id='export-metrics'>Export metrics (WIP)</button>
-      <button class='disable-during-eval' id='db-reset'>Reset db</button>
-      <button id='output-clear'>Clear output</button>
-      <span class='input-wrapper'>
-        <input type='checkbox' class='disable-during-eval' id='cb-reverse-log-order' checked></input>
-        <label for='cb-reverse-log-order'>Reverse log order</label>
-      </span>
-    </div>
-    <hr>
-    <div id='reverse-log-notice' class='hidden'>(Log output is in reverse order, newest first!)</div>
-    <div id='test-output'></div>
-    <!-- batch-runner.js "should" work with sqlite3-kvvfs so long as
-         its data sets don't violate the the storage limits. -->
-    <script src="sqlite3-kvvfs.js"></script>
-    <script src="common/SqliteTestUtil.js"></script>
-    <script src="batch-runner.js"></script>
-  </body>
-</html>
diff --git a/ext/wasm/index.html b/ext/wasm/index.html
index 06dd0f31e4..e9a8d7bebb 100644
--- a/ext/wasm/index.html
+++ b/ext/wasm/index.html
@@ -47,7 +47,6 @@
         <li><a href='testing-worker1-promiser.html'>testing-worker1-promiser</a>:
           tests for the Promise-based wrapper of the Worker-based API.</li>
         <li><a href='batch-runner.html'>batch-runner</a>: runs batches of SQL exported from speedtest1.</li>
-        <li><a href='batch-runner-kvvfs.html'>batch-runner-kvvfs</a>: KVVFS-specific variant of batch-runner.html.</li>
         <li><a href='speedtest1.html'>speedtest1</a>: a main-thread WASM build of speedtest1.</li>
         <li><a href='speedtest1-worker.html'>speedtest1-worker</a>: an interactive Worker-thread variant of speedtest1.</li>
         <li><a href='speedtest1-wasmfs.html'>speedtest1-wasmfs</a>: a variant of speedtest1 built solely for the wasmfs/opfs feature.</li>
diff --git a/manifest b/manifest
index d5e6c8b22a..a6a7d0a7be 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Speed\sup\sde/serialization\sof\sfunc\sargs\sand\sreturn\svalues\sin\sthe\sOPFS\sVFS\sproxy.
-D 2022-09-20T13:25:39.815
+C Remove\san\sobsolete\sfile.
+D 2022-09-20T14:21:58.678
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle 7fb73f7150ab79d83bb45a67d257553c905c78cd3d693101699243f36c5ae6c3
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile 5b848d4d20c31b2aac3dcfabaf5deaf56fe9db9ca1299a4dede1bcd27821426b
+F ext/wasm/GNUmakefile e6359a72f044a877ac6ca8f2b04fa643664157f84d81a6d9ad09f384a65160d2
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 150a793a47205b8009ac934f3b6d6ebf67b965c072339aaa25ce808a19e116cc
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -489,7 +489,6 @@ F ext/wasm/api/sqlite3-api-prologue.js 0d2639387b94c30f492d4aea6e44fb7b167208086
 F ext/wasm/api/sqlite3-api-worker1.js ee4cf149cbacb63d06b536674f822aa5088b7e022cdffc69f1f36cebe2f9fea0
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 4130e2df9587f4e4c3afc04c3549d682c8a5c0cfe5b22819a0a86edb7f01b9bd
-F ext/wasm/batch-runner-kvvfs.html ef3b2f553abad4f17a2a29ce6526023793a88e8597b7a24b8c7855a030b90a16
 F ext/wasm/batch-runner.html 2857a6db7292ac83d1581af865d643fd34235db2df830d10b43b01388c599e04
 F ext/wasm/batch-runner.js 6f5b86e0b5519a9a941d9f17ee9c5ecdc63f452f157602fe7fdf87f6275a2b49
 F ext/wasm/common/SqliteTestUtil.js 529161a624265ba84271a52db58da022649832fa1c71309fb1e02cc037327a2b
@@ -505,7 +504,7 @@ F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d695
 F ext/wasm/fiddle/fiddle-worker.js bccf46045be8824752876f3eec01c223be0616ccac184bffd0024cfe7a3262b8
 F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
 F ext/wasm/fiddle/fiddle.js 4ffcfc9a235beebaddec689a549e9e0dfad6dca5c1f0b41f03468d7e76480686
-F ext/wasm/index.html de69bc78273fbe024a21dae0f378a87b37ad4cd585ed0cd0a0ed2c5d5afe9fbc
+F ext/wasm/index.html 4b74ea334f0bba9923a61246d807a1873784fcef4d3fb342b698613d0a29fd9c
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 447cc02b598f7792edaa8ae6853a7847b8178a18ed356afacbdbf312b2588106
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
@@ -2026,8 +2025,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 b534831f3efb8910a17e29956e3e87cc80055ea66e15dbef992b6a556ff042f8
-R 28e069ac7c71e059841784989b21e62c
+P 5bf235bbe035e4ace7a54851e190742528af6b4266328a1b8bbb9fb3dd7f2118
+R 41b4a0b0d5548be3b8c342b39c8cce92
 U stephan
-Z 483126717a4194dd1997ada5cd19f259
+Z 524d6845dd279f2ce03cb802d7ae16c8
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 44047c5b0f..a0a90cad10 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5bf235bbe035e4ace7a54851e190742528af6b4266328a1b8bbb9fb3dd7f2118
\ No newline at end of file
+1e43855498b4329f733bd6e0731841dc884e885de7d2d338d402d05d54309427
\ No newline at end of file

From c3b6fdaead863709e532832c1341f1bebce504f2 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Tue, 20 Sep 2022 14:36:53 +0000
Subject: [PATCH 147/428] When compiled with SQLITE_OS_KV_OPTIONAL, the magic
 names ":localStorage:" and ":sessionStorage:" are recognized and converted to
 use the kv-vfs.

FossilOrigin-Name: c5db9262d0388ccb0e84c6a4b4e2e786dd634f13874e4034ba7b175befa4ce90
---
 manifest      | 15 +++++++++------
 manifest.uuid |  2 +-
 src/main.c    | 13 +++++++++++++
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/manifest b/manifest
index d9677a2ca9..2851e8ad5b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\suninitialized\svariable\sin\sthe\sdecoder\skv-vfs.
-D 2022-09-17T18:31:31.300
+C When\scompiled\swith\sSQLITE_OS_KV_OPTIONAL,\sthe\smagic\snames\s":localStorage:"\nand\s":sessionStorage:"\sare\srecognized\sand\sconverted\sto\suse\sthe\skv-vfs.
+D 2022-09-20T14:36:53.844
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -555,7 +555,7 @@ F src/insert.c aea5361767817f917b0f0f647a1f0b1621bd858938ae6ae545c3b6b9814b798f
 F src/json.c 7749b98c62f691697c7ee536b570c744c0583cab4a89200fdd0fc2aa8cc8cbd6
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 853385cc7a604157e137585097949252d5d0c731768e16b044608e5c95c3614b
-F src/main.c e11267cdd380be68d95d4292666636a7f1dff5f17a395f3d55be910d7e9350fb
+F src/main.c b434b8e4aca38419962de3d1c55fb9279807ba6a8802998a427b1635dc8250f6
 F src/malloc.c b7a3430cbe91d3e8e04fc10c2041b3a19794e63556ad2441a13d8dadd9b2bafc
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@ -2004,8 +2004,11 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 852812d1e2ec3c53ad7c6c64662b37d861fefcf1baeee3d58eba88bcb3f6d8df
-R 9c6620d4dc4ed0d3ddc9cc9e79cbabf7
+P 354726aa6c399053785f29104de15091629ce4bc275b9e2205cb3656a9e81cd7
+R 2a2a6e9f98f7c53c15ad912991ea899c
+T *branch * kv-vfs-magic-names
+T *sym-kv-vfs-magic-names *
+T -sym-kv-vfs *
 U drh
-Z 7ef728d647d25bb1b8240f0a67ed5ff5
+Z 6a8bdecbcdd0ef58e91af5aa4ad5d7c2
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 1336748789..66706b769e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-354726aa6c399053785f29104de15091629ce4bc275b9e2205cb3656a9e81cd7
\ No newline at end of file
+c5db9262d0388ccb0e84c6a4b4e2e786dd634f13874e4034ba7b175befa4ce90
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index efa5fc3681..e73fe351ca 100644
--- a/src/main.c
+++ b/src/main.c
@@ -3352,6 +3352,19 @@ static int openDatabase(
     goto opendb_out;
   }
 
+#if SQLITE_OS_UNIX && defined(SQLITE_OS_KV_OPTIONAL)
+  /* Process magic filenames ":localStorage:" and ":sessionStorage:" */
+  if( zFilename && zFilename[0]==':' ){
+    if( strcmp(zFilename, ":localStorage:")==0 ){
+      zFilename = "file:local?vfs=kvvfs";
+      flags |= SQLITE_OPEN_URI;
+    }else if( strcmp(zFilename, ":sessionStorage:")==0 ){
+      zFilename = "file:session?vfs=kvvfs";
+      flags |= SQLITE_OPEN_URI;
+    }
+  }
+#endif /* SQLITE_OS_UNIX && defined(SQLITE_OS_KV_OPTIONAL) */
+
   /* Parse the filename/URI argument
   **
   ** Only allow sensible combinations of bits in the flags argument.  

From 89071030db862b7b9b26f214c3508e607b9b430d Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 20 Sep 2022 14:52:26 +0000
Subject: [PATCH 148/428] Export the sqlite3_uri_...() family of functions to
 wasm.

FossilOrigin-Name: 72bebc848fce5c3b4766017d016ccb2360de2bd0cb3e47e710c80dbcb6b8b707
---
 ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api |  4 ++++
 ext/wasm/api/sqlite3-api-prologue.js        | 12 ++++++++----
 manifest                                    | 15 +++++++--------
 manifest.uuid                               |  2 +-
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api b/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
index f03478b17c..3119d50d03 100644
--- a/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
+++ b/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
@@ -61,6 +61,10 @@ _sqlite3_strglob
 _sqlite3_strlike
 _sqlite3_total_changes
 _sqlite3_total_changes64
+_sqlite3_uri_boolean
+_sqlite3_uri_int64
+_sqlite3_uri_key
+_sqlite3_uri_parameter
 _sqlite3_value_blob
 _sqlite3_value_bytes
 _sqlite3_value_double
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 7bc42b3683..a671080052 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -649,6 +649,9 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     ["sqlite3_strglob", "int", "string","string"],
     ["sqlite3_strlike", "int", "string","string","int"],
     ["sqlite3_total_changes", "int", "sqlite3*"],
+    ["sqlite3_uri_boolean", "int", "string", "string", "int"],
+    ["sqlite3_uri_key", "string", "string", "int"],
+    ["sqlite3_uri_parameter", "string", "string", "string"],
     ["sqlite3_value_blob", "*", "*"],
     ["sqlite3_value_bytes","int", "*"],
     ["sqlite3_value_double","f64", "*"],
@@ -671,10 +674,11 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
      dummy impls, depending on the capabilities of the environment.
   */
   capi.wasm.bindingSignatures.int64 = [
-      ["sqlite3_bind_int64","int", ["sqlite3_stmt*", "int", "i64"]],
-      ["sqlite3_changes64","i64", ["sqlite3*"]],
-      ["sqlite3_column_int64","i64", ["sqlite3_stmt*", "int"]],
-      ["sqlite3_total_changes64", "i64", ["sqlite3*"]]
+    ["sqlite3_bind_int64","int", ["sqlite3_stmt*", "int", "i64"]],
+    ["sqlite3_changes64","i64", ["sqlite3*"]],
+    ["sqlite3_column_int64","i64", ["sqlite3_stmt*", "int"]],
+    ["sqlite3_total_changes64", "i64", ["sqlite3*"]],
+    ["sqlite3_uri_int64", "i64", ["string", "string", "i64"]]
   ];
 
   /**
diff --git a/manifest b/manifest
index 15ba2f0999..8c30d17726 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sopfs-proxy-atomics\sbranch\sinto\sthe\sfiddle-opfs\sbranch.
-D 2022-09-20T14:39:54.222
+C Export\sthe\ssqlite3_uri_...()\sfamily\sof\sfunctions\sto\swasm.
+D 2022-09-20T14:52:26.772
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -476,7 +476,7 @@ F ext/wasm/EXPORTED_FUNCTIONS.fiddle 7fb73f7150ab79d83bb45a67d257553c905c78cd3d6
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
 F ext/wasm/GNUmakefile e6359a72f044a877ac6ca8f2b04fa643664157f84d81a6d9ad09f384a65160d2
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
-F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 150a793a47205b8009ac934f3b6d6ebf67b965c072339aaa25ce808a19e116cc
+F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 8a724a674bd2089eef9676b434c0ab709da00db33f73a94e4987e90169b1cd14
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
 F ext/wasm/api/README.md d876597edd2b9542b6ea031adaaff1c042076fde7b670b1dc6d8a87b28a6631b
 F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba81456260a713ed04900c
@@ -485,7 +485,7 @@ F ext/wasm/api/sqlite3-api-cleanup.js 8564a6077cdcaea9a9f428a019af8a05887f0131e6
 F ext/wasm/api/sqlite3-api-glue.js 366d580c8e5bf7fcf4c6dee6f646c31f5549bd417ea03a59a0acca00e8ecce30
 F ext/wasm/api/sqlite3-api-oo1.js 2d13dddf0d2b4168a9249f124134d37924331e5b55e05dba18b6d661fbeefe48
 F ext/wasm/api/sqlite3-api-opfs.js ce75aba0cbfb600cf839362012d17b7b2984aeac5189586c9a5a8f37a573a929
-F ext/wasm/api/sqlite3-api-prologue.js 0d2639387b94c30f492d4aea6e44fb7b16720808678464559458fd2ae3759655
+F ext/wasm/api/sqlite3-api-prologue.js 6f3a67c4db37e884d33a05e5cf6d9d9bc012226a18c09f33f662fefd99840a63
 F ext/wasm/api/sqlite3-api-worker1.js ee4cf149cbacb63d06b536674f822aa5088b7e022cdffc69f1f36cebe2f9fea0
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 4130e2df9587f4e4c3afc04c3549d682c8a5c0cfe5b22819a0a86edb7f01b9bd
@@ -2025,9 +2025,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 5ca412ced24b4e3af5f467e710a597ed440badf7b8335346aade11d3cad3d1a1 1e43855498b4329f733bd6e0731841dc884e885de7d2d338d402d05d54309427
-R 41b4a0b0d5548be3b8c342b39c8cce92
-T +closed 1e43855498b4329f733bd6e0731841dc884e885de7d2d338d402d05d54309427 Closed\sby\sintegrate-merge.
+P 25a36920d44544547a84161681cd41e292b4a70df60ac3630791873a79237d98
+R 6ffa39d63e3e386cd82927e67533dcb0
 U stephan
-Z 919304ebee6398ab381c09fc060e29a5
+Z 98694450e0cd5d4ad65ed4d27ad0649d
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 49a16c4ea6..9a6bcff385 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-25a36920d44544547a84161681cd41e292b4a70df60ac3630791873a79237d98
\ No newline at end of file
+72bebc848fce5c3b4766017d016ccb2360de2bd0cb3e47e710c80dbcb6b8b707
\ No newline at end of file

From 4cffb644c761494a19067a58e97399800e0b6886 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 20 Sep 2022 16:20:35 +0000
Subject: [PATCH 149/428] Correct a too-strict is-opfs-available check.

FossilOrigin-Name: 1b5f1b4a6c1457f98c258459e23e321fc59793de298fecb84031b87f02156cd5
---
 ext/wasm/api/sqlite3-api-opfs.js |  3 +--
 manifest                         | 12 ++++++------
 manifest.uuid                    |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index 1f50b4631a..4e9b7328ca 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -77,8 +77,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
 */
 sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
   delete sqlite3.installOpfsVfs;
-  if(self.window===self ||
-     !self.SharedArrayBuffer ||
+  if(!self.SharedArrayBuffer ||
      !self.FileSystemHandle ||
      !self.FileSystemDirectoryHandle ||
      !self.FileSystemFileHandle ||
diff --git a/manifest b/manifest
index 54c3edc79b..907cfdd3c5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\skv-vfs-magic-names\sbranch\sinto\sfiddle-opfs\sbranch\sand\smake\ssome\skvvfs-relevant\stweaks.
-D 2022-09-20T16:10:39.081
+C Correct\sa\stoo-strict\sis-opfs-available\scheck.
+D 2022-09-20T16:20:35.278
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -484,7 +484,7 @@ F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a
 F ext/wasm/api/sqlite3-api-cleanup.js 8564a6077cdcaea9a9f428a019af8a05887f0131e6a2a1e72a7ff1145fadfe77
 F ext/wasm/api/sqlite3-api-glue.js 366d580c8e5bf7fcf4c6dee6f646c31f5549bd417ea03a59a0acca00e8ecce30
 F ext/wasm/api/sqlite3-api-oo1.js f974e79d9af8f26bf33928c5730b0988cc706d14f59a5fe36394739b92249841
-F ext/wasm/api/sqlite3-api-opfs.js ce75aba0cbfb600cf839362012d17b7b2984aeac5189586c9a5a8f37a573a929
+F ext/wasm/api/sqlite3-api-opfs.js 10be4156d7db4d6aa8a456b4fb0f31a6e35c61297766e8bb55573fc5c0d56530
 F ext/wasm/api/sqlite3-api-prologue.js 6f3a67c4db37e884d33a05e5cf6d9d9bc012226a18c09f33f662fefd99840a63
 F ext/wasm/api/sqlite3-api-worker1.js 2eeb2a24e1a90322d84a9b88a99919b806623de62792436446099c0988f2030b
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
@@ -2025,8 +2025,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 72bebc848fce5c3b4766017d016ccb2360de2bd0cb3e47e710c80dbcb6b8b707 c5db9262d0388ccb0e84c6a4b4e2e786dd634f13874e4034ba7b175befa4ce90
-R 1f7897feb6769d430b654c4dfafdd719
+P e3d36dcdd37e59f17a07d3611d08744eb86f439fab82a648490dd608bcaa3185
+R 4e567bfc74ed899d5a6221b9c0e9380f
 U stephan
-Z 3da2be5bc057dab3ee54a8c0dcea5576
+Z 34a126210ea63cd6428a245b533d4ca4
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 054082f67b..81185f7008 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e3d36dcdd37e59f17a07d3611d08744eb86f439fab82a648490dd608bcaa3185
\ No newline at end of file
+1b5f1b4a6c1457f98c258459e23e321fc59793de298fecb84031b87f02156cd5
\ No newline at end of file

From 4bc2f6b415cb276f1098c427f16d71c43329dc8f Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 21 Sep 2022 08:39:03 +0000
Subject: [PATCH 150/428] Move fiddle build rules into the wasm-centric build
 files. Add rule to push wasm bits to the wasm test server.

FossilOrigin-Name: 113f8204dc4ac849d5632d3de1680b6e0da871e107ef484c8d7273799bee3d88
---
 Makefile.in                                   | 164 +--------------
 ...NS.fiddle => EXPORTED_FUNCTIONS.fiddle.in} |   0
 ext/wasm/GNUmakefile                          | 191 +++++++++---------
 ext/wasm/api/post-js-header.js                |  13 +-
 ext/wasm/fiddle.make                          | 160 +++++++++++++++
 ext/wasm/wasmfs.make                          |   1 -
 manifest                                      |  21 +-
 manifest.uuid                                 |   2 +-
 8 files changed, 277 insertions(+), 275 deletions(-)
 rename ext/wasm/{EXPORTED_FUNCTIONS.fiddle => EXPORTED_FUNCTIONS.fiddle.in} (100%)
 create mode 100644 ext/wasm/fiddle.make

diff --git a/Makefile.in b/Makefile.in
index bb22039e8f..f570c7d374 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1527,166 +1527,8 @@ sqlite3.dll: $(REAL_LIBOBJ) sqlite3.def
 	$(TCC) -shared -o $@ sqlite3.def \
 		-Wl,"--strip-all" $(REAL_LIBOBJ)
 
-
 #
-# fiddle/wasm section
+# Fiddle app
 #
-# Maintenance reminder: we can/should move this into the wasm-specific
-# GNU Make makefile, but we currently need it here for access to
-# $(SHELL_OPT). The rest of the wasm-related bits are handled via GNU
-# Make in ext/wasm/...
-#
-wasm_dir = ext/wasm
-wasm_dir_abs = $(TOP)/ext/wasm
-# ^^^ some emcc opts require absolute paths
-fiddle_dir = $(wasm_dir)/fiddle
-fiddle_dir_abs = $(TOP)/$(fiddle_dir)
-fiddle_module_js = $(fiddle_dir)/fiddle-module.js
-sqlite3_wasm_c = $(wasm_dir)/api/sqlite3-wasm.c
-$(sqlite3_wasm_c): sqlite3.c
-#emcc_opt = -O0
-#emcc_opt = -O1
-#emcc_opt = -O2
-#emcc_opt = -O3
-emcc_opt = -Oz
-emcc_environment = web
-# WASMFS/OPFS currently (2022-08-23) does not work with fiddle
-# because (A) fiddle is primarily implemented as a Worker and (B) the
-# Emscripten-based Worker loading process does not properly handle the
-# case of nested Workers (necessary for it to load the WASMFS-specific
-# Worker thread).
-emcc_flags_wasmfs =
-# To enable WASMFS/OPFS, uncomment these options:
-#emcc_flags_wasmfs += -sWASMFS -pthread
-#emcc_environment = web,worker
-#emcc_flags_wasmfs += -DSQLITE_WASM_OPFS
-#emcc_flags_wasmfs += -sPTHREAD_POOL_SIZE=2
-#emcc_flags_wasmfs += -sPTHREAD_POOL_SIZE_STRICT=2
-# (Thread pool settings may require tweaking.)
-#/end of WASMFS/OPFS options.
-emcc_flags = $(emcc_opt) \
-        -sALLOW_TABLE_GROWTH \
-        -sABORTING_MALLOC \
-        -sSTRICT_JS \
-        -sENVIRONMENT=$(emcc_environment) \
-        -sMODULARIZE \
-        -sEXPORTED_RUNTIME_METHODS=@$(wasm_dir_abs)/EXPORTED_RUNTIME_METHODS.fiddle \
-        -sDYNAMIC_EXECUTION=0 \
-        --minify 0 \
-        -I. $(SHELL_OPT) \
-        -DSQLITE_THREADSAFE=0 \
-        -DSQLITE_TEMP_STORE=3 \
-        -DSQLITE_OMIT_UTF16 \
-        -DSQLITE_OMIT_DEPRECATED \
-        -DSQLITE_OMIT_SHARED_CACHE \
-        '-DSQLITE_DEFAULT_UNIX_VFS="unix-none"' \
-        $(emcc_flags_wasmfs)
-$(fiddle_module_js): Makefile $(sqlite3_wasm_c) shell.c \
-    $(wasm_dir)/EXPORTED_RUNTIME_METHODS.fiddle \
-    $(wasm_dir)/EXPORTED_FUNCTIONS.fiddle
-	emcc -o $@ $(emcc_flags) \
-        -sEXPORT_NAME=initFiddleModule \
-        -sEXPORTED_FUNCTIONS=@$(wasm_dir_abs)/EXPORTED_FUNCTIONS.fiddle \
-        -DSQLITE_SHELL_FIDDLE \
-        $(sqlite3_wasm_c) shell.c
-	gzip < $@ > $@.gz
-	gzip < $(fiddle_dir)/fiddle-module.wasm > $(fiddle_dir)/fiddle-module.wasm.gz
-$(fiddle_dir)/fiddle.js.gz: $(fiddle_dir)/fiddle.js
-	gzip < $< > $@
-
-fiddle_generated = $(fiddle_module_js) $(fiddle_module_js).gz \
-                   $(fiddle_dir)/fiddle-module.wasm \
-                   $(fiddle_dir)/fiddle-module.wasm.gz \
-                   $(fiddle_dir)/fiddle.js.gz
-
-clean-fiddle:
-	rm -f $(fiddle_generated)
-clean: clean-fiddle
-fiddle: $(fiddle_module_js) $(fiddle_dir)/fiddle.js.gz
-wasm: fiddle
-########################################################################
-# Explanation of the emcc build flags follows. Full docs for these can
-# be found at:
-#
-#  https://github.com/emscripten-core/emscripten/blob/main/src/settings.js
-#
-# -sENVIRONMENT=web: elides bootstrap code related to non-web JS
-#  environments like node.js. Removing this makes the output a tiny
-#  tick larger but hypothetically makes it more portable to
-#  non-browser JS environments.
-#
-# -sMODULARIZE: changes how the generated code is structured to avoid
-#  declaring a global Module object and instead installing a function
-#  which loads and initializes the module. The function is named...
-#
-# -sEXPORT_NAME=jsFunctionName (see -sMODULARIZE)
-#
-# -sEXPORTED_RUNTIME_METHODS=@/absolute/path/to/file: a file
-#  containing a list of emscripten-supplied APIs, one per line, which
-#  must be exported into the generated JS. Must be an absolute path!
-#
-# -sEXPORTED_FUNCTIONS=@/absolute/path/to/file: a file containing a
-#  list of C functions, one per line, which must be exported via wasm
-#  so they're visible to JS. C symbols names in that file must all
-#  start with an underscore for reasons known only to the emcc
-#  developers. e.g., _sqlite3_open_v2 and _sqlite3_finalize. Must be
-#  an absolute path!
-#
-# -sSTRICT_JS ensures that the emitted JS code includes the 'use
-#  strict' option. Note that -sSTRICT is more broadly-scoped and
-#  results in build errors.
-#
-# -sALLOW_TABLE_GROWTH is required for (at a minimum) the UDF-binding
-#  feature. Without it, JS functions cannot be made to proxy C-side
-#  callbacks.
-#
-# -sABORTING_MALLOC causes the JS-bound _malloc() to abort rather than
-#  return 0 on OOM. If set to 0 then all code which uses _malloc()
-#  must, just like in C, check the result before using it, else
-#  they're likely to corrupt the JS/WASM heap by writing to its
-#  address of 0. It is, as of this writing, enabled in Emscripten by
-#  default but we enable it explicitly in case that default changes.
-#
-# -sDYNAMIC_EXECUTION=0 disables eval() and the Function constructor.
-#  If the build runs without these, it's preferable to use this flag
-#  because certain execution environments disallow those constructs.
-#  This flag is not strictly necessary, however.
-#
-# -sWASM_BIGINT is UNTESTED but "should" allow the int64-using C APIs
-#  to work with JS/wasm, insofar as the JS environment supports the
-#  BigInt type. That support requires an extremely recent browser:
-#  Safari didn't get that support until late 2020.
-#
-# --no-entry: for compiling library code with no main(). If this is
-#  not supplied and the code has a main(), it is called as part of the
-#  module init process. Note that main() is #if'd out of shell.c
-#  (renamed) when building in wasm mode.
-#
-# --pre-js/--post-js=FILE relative or absolute paths to JS files to
-#  prepend/append to the emcc-generated bootstrapping JS. It's
-#  easier/faster to develop with separate JS files (reduces rebuilding
-#  requirements) but certain configurations, namely -sMODULARIZE, may
-#  require using at least a --pre-js file. They can be used
-#  individually and need not be paired.
-#
-# -O0..-O3 and -Oz: optimization levels affect not only C-style
-#  optimization but whether or not the resulting generated JS code
-#  gets minified. -O0 compiles _much_ more quickly than -O3 or -Oz,
-#  and doesn't minimize any JS code, so is recommended for
-#  development. -O3 or -Oz are recommended for deployment, but
-#  primarily because -Oz will shrink the wasm file notably. JS-side
-#  minification makes little difference in terms of overall
-#  distributable size.
-#
-# --minify 0: disables minification of the generated JS code,
-#  regardless of optimization level. Minification of the JS has
-#  minimal overall effect in the larger scheme of things and results
-#  in JS files which can neither be edited nor viewed as text files in
-#  Fossil (which flags them as binary because of their extreme line
-#  lengths). Interestingly, whether or not the comments in the
-#  generated JS file get stripped is unaffected by this setting and
-#  depends entirely on the optimization level. Higher optimization
-#  levels reduce the size of the JS considerably even without
-#  minification.
-#
-########################################################################
+fiddle: sqlite3.c shell.c
+	make -C ext/wasm fiddle
diff --git a/ext/wasm/EXPORTED_FUNCTIONS.fiddle b/ext/wasm/EXPORTED_FUNCTIONS.fiddle.in
similarity index 100%
rename from ext/wasm/EXPORTED_FUNCTIONS.fiddle
rename to ext/wasm/EXPORTED_FUNCTIONS.fiddle.in
diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index e97138c2ca..79da723247 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -1,95 +1,11 @@
-# This GNU makefile exists primarily to simplify/speed up development
-# of the sqlite3 WASM components. It is not part of the canonical
-# build process.
-#
-# Maintenance notes: the fiddle build is currently performed in the
-# top-level ../../Makefile.in. It may be moved into this file at some
-# point, as GNU Make has been deemed acceptable for the WASM-related
-# components (whereas POSIX Make is required for the more conventional
-# components).
-SHELL := $(shell which bash 2>/dev/null)
-all:
-emcc_opt ?= -O0
-
-.PHONY: fiddle
-ifneq (,$(wildcard /home/stephan))
-  fiddle_opt ?= $(emcc_opt)
-else
-  fiddle_opt = -Os
-endif
-fiddle:
-	$(MAKE) -C ../.. fiddle -e emcc_opt=$(fiddle_opt)
-all: fiddle
-
-clean:
-	$(MAKE) -C ../../ clean-fiddle
-	-rm -f $(CLEAN_FILES)
-
-MAKEFILE := $(lastword $(MAKEFILE_LIST))
-dir.top := ../..
-# Reminder: some Emscripten flags require absolute paths
-dir.wasm := $(patsubst %/,%,$(dir $(abspath $(MAKEFILE))))
-dir.api := api
-dir.jacc := jaccwabyt
-dir.common := common
-CLEAN_FILES := *~ $(dir.jacc)/*~ $(dir.api)/*~ $(dir.common)/*~
-
-sqlite3.c := $(dir.top)/sqlite3.c
-$(sqlite3.c):
-	$(MAKE) -C $(dir.top) sqlite3.c
-
-SQLITE_OPT = \
-  -DSQLITE_ENABLE_FTS4 \
-  -DSQLITE_ENABLE_RTREE \
-  -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
-  -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION \
-  -DSQLITE_ENABLE_STMTVTAB \
-  -DSQLITE_ENABLE_DBPAGE_VTAB \
-  -DSQLITE_ENABLE_DBSTAT_VTAB \
-  -DSQLITE_ENABLE_BYTECODE_VTAB \
-  -DSQLITE_ENABLE_OFFSET_SQL_FUNC \
-  -DSQLITE_OMIT_LOAD_EXTENSION \
-  -DSQLITE_OMIT_DEPRECATED \
-  -DSQLITE_OMIT_UTF16 \
-  -DSQLITE_OMIT_SHARED_CACHE \
-  -DSQLITE_THREADSAFE=0 \
-  -DSQLITE_TEMP_STORE=3 \
-  -DSQLITE_OS_KV_OPTIONAL=1
-#SQLITE_OPT += -DSQLITE_ENABLE_MEMSYS5
-# ^^^ MEMSYS5 is hypothetically useful for non-Emscripten builds but
-# requires adding more infrastructure and fixing one spot in the
-# sqlite3 internals which calls malloc() early on.
-
-# SQLITE_OMIT_LOAD_EXTENSION: if this is true, sqlite3_vfs::xDlOpen
-# and friends may be NULL.
-
-.PHONY: release
-release:
-	$(MAKE) "emcc_opt=-Os -g3 -flto" fiddle_opt=-Os
-# ^^^^^ target-specific vars, e.g.:
-#   release: emcc_opt=...
-# apparently only work for file targets, not PHONY targets?
-#
-# ^^^ -flto improves runtime speed at -O0 considerably but doubles
-# build time.
-#
-# ^^^^ -O3, -Oz, -Os minify symbol names and there appears to be no
-# way around that except to use -g3, but -g3 causes the binary file
-# size to absolutely explode (approx. 5x larger). This minification
-# utterly breaks the resulting module, making it unsable except as
-# self-contained/self-referential-only code, as ALL of the exported
-# symbols get minified names.
-#
-# However, we have an option for using -Oz or -Os:
-#
-# Build with (-Os -g3) or (-Oz -g3) then use wasm-strip, from the wabt
-# tools package (https://github.com/WebAssembly/wabt), to strip the
-# debugging symbols. That results in a small build with unmangled
-# symbol names. -Oz gives ever-so-slightly better compression than
-# -Os: not quite 1% in some completely unscientific tests. Runtime
-# speed for the unit tests is all over the place either way so it's
-# difficult to say whether -Os gives any speed benefit over -Oz.
 ########################################################################
+# This GNU makefile drives the build of the sqlite3 WASM
+# components. It is not part of the canonical build process.
+########################################################################
+SHELL := $(shell which bash 2>/dev/null)
+MAKEFILE := $(lastword $(MAKEFILE_LIST))
+all:
+release: all
 
 # Emscripten SDK home dir and related binaries...
 EMSDK_HOME ?= $(word 1,$(wildcard $(HOME)/src/emsdk $(HOME)/emsdk))
@@ -117,13 +33,82 @@ ifeq (,$(wasm-strip))
 endif
 endif # 'make clean' check
 
-
 ifeq (,$(wasm-strip))
   maybe-wasm-strip = echo "not wasm-stripping"
 else
   maybe-wasm-strip = $(wasm-strip)
 endif
 
+dir.top := ../..
+# Reminder: some Emscripten flags require absolute paths
+dir.wasm := $(patsubst %/,%,$(dir $(abspath $(MAKEFILE))))
+dir.api := api
+dir.jacc := jaccwabyt
+dir.common := common
+dir.fiddle := fiddle
+CLEAN_FILES := *~ $(dir.jacc)/*~ $(dir.api)/*~ $(dir.common)/*~
+sqlite3.c := $(dir.top)/sqlite3.c
+SQLITE_OPT = \
+  -DSQLITE_ENABLE_FTS4 \
+  -DSQLITE_ENABLE_RTREE \
+  -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
+  -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION \
+  -DSQLITE_ENABLE_STMTVTAB \
+  -DSQLITE_ENABLE_DBPAGE_VTAB \
+  -DSQLITE_ENABLE_DBSTAT_VTAB \
+  -DSQLITE_ENABLE_BYTECODE_VTAB \
+  -DSQLITE_ENABLE_OFFSET_SQL_FUNC \
+  -DSQLITE_OMIT_LOAD_EXTENSION \
+  -DSQLITE_OMIT_DEPRECATED \
+  -DSQLITE_OMIT_UTF16 \
+  -DSQLITE_OMIT_SHARED_CACHE \
+  -DSQLITE_THREADSAFE=0 \
+  -DSQLITE_TEMP_STORE=3 \
+  -DSQLITE_OS_KV_OPTIONAL=1 \
+  '-DSQLITE_DEFAULT_UNIX_VFS="unix-none"'
+#SQLITE_OPT += -DSQLITE_ENABLE_MEMSYS5
+# ^^^ MEMSYS5 is hypothetically useful for non-Emscripten builds but
+# requires adding more infrastructure and fixing one spot in the
+# sqlite3 internals which calls malloc() early on.
+
+# SQLITE_OMIT_LOAD_EXTENSION: if this is true, sqlite3_vfs::xDlOpen
+# and friends may be NULL.
+
+ifneq (,$(filter release,$(MAKECMDGOALS)))
+emcc_opt ?= -Oz -g3 -flto
+else
+emcc_opt ?= -O0 -g
+# ^^^^ build times for -O levels higher than 0 are painful at
+# dev-time.
+endif
+# ^^^ -flto improves runtime speed at -O0 considerably but doubles
+# build time.
+#
+# ^^^^ -O3, -Oz, -Os minify symbol names and there appears to be no
+# way around that except to use -g3, but -g3 causes the binary file
+# size to absolutely explode (approx. 5x larger). This minification
+# utterly breaks the resulting module, making it unsable except as
+# self-contained/self-referential-only code, as ALL of the exported
+# symbols get minified names.
+#
+# However, we have an option for using -Oz or -Os:
+#
+# Build with (-Os -g3) or (-Oz -g3) then use wasm-strip, from the wabt
+# tools package (https://github.com/WebAssembly/wabt), to strip the
+# debugging symbols. That results in a small build with unmangled
+# symbol names. -Oz gives ever-so-slightly better compression than
+# -Os: not quite 1% in some completely unscientific tests. Runtime
+# speed for the unit tests is all over the place either way so it's
+# difficult to say whether -Os gives any speed benefit over -Oz.
+########################################################################
+
+
+$(sqlite3.c):
+	$(MAKE) -C $(dir.top) sqlite3.c
+
+clean:
+	-rm -f $(CLEAN_FILES)
+
 ifeq (release,$(filter release,$(MAKECMDGOALS)))
   ifeq (,$(wasm-strip))
     $(error Cannot make release-quality binary because wasm-strip is not available. \
@@ -181,14 +166,13 @@ emcc.flags =
 #emcc.flags += -v # _very_ loud but also informative about what it's doing
 # -g is needed to keep -O2 and higher from creating broken JS via
 # minification.
-emcc.flags += -g
 
 ########################################################################
 # emcc flags for .c/.o.
 emcc.cflags :=
 emcc.cflags += -std=c99 -fPIC
 # -------------^^^^^^^^ we currently need c99 for WASM-specific sqlite3 APIs.
-emcc.cflags += -I. -I$(dir.top) # $(SQLITE_OPT)
+emcc.cflags += -I. -I$(dir.top)
 
 ########################################################################
 # emcc flags specific to building the final .js/.wasm file...
@@ -392,7 +376,6 @@ $(speedtest1.js): $(MAKEFILE) $(speedtest1.cs) $(post-js.js) \
         $(speedtest1.eflags) $(speedtest1-common.eflags) $(speedtest1.cflags) \
         $(SQLITE_OPT) \
         $(speedtest1.exit-runtime0) \
-        '-DSQLITE_DEFAULT_UNIX_VFS="unix-none"' \
         -o $@ $(speedtest1.cs) -lm
 	$(maybe-wasm-strip) $(speedtest1.wasm)
 	ls -la $@ $(speedtest1.wasm)
@@ -451,6 +434,8 @@ oz:
 ########################################################################
 # Sub-makes...
 
+include fiddle.make
+
 ########################################################################
 # Some platforms do not support the WASMFS build. Raspberry Pi OS is one
 # of them. As such platforms are discovered, add their (uname -m) name
@@ -462,3 +447,19 @@ $(info This platform does not support the WASMFS build.)
 else
 include wasmfs.make
 endif
+
+########################################################################
+# Push files to public wasm-testing.sqlite.org server
+wasm-testing.include = *.wasm *.js *.html \
+    batch-runner.list sql common fiddle jaccwabyt
+wasm-testing.exclude = sql/speedtest1.sql
+wasm-testing.dir     = /jail/sites/wasm-testing
+wasm-testing.dest   ?= wasm-testing:$(wasm-testing.dir)
+# ---------------------^^^^^^^^^^^^ ssh alias
+push:
+	rsync -z -e ssh --ignore-times --chown=stephan:www-data --group -r \
+    $(patsubst %,--exclude=%,$(wasm-testing.exclude)) \
+    $(wasm-testing.include) $(wasm-testing.dest)
+	ssh wasm-testing 'cd $(wasm-testing.dir) && bash .gzip' || \
+    echo "SSH failed: it's likely that stale content will be served via old gzip files." 
+
diff --git a/ext/wasm/api/post-js-header.js b/ext/wasm/api/post-js-header.js
index 1763188a21..f377a6541c 100644
--- a/ext/wasm/api/post-js-header.js
+++ b/ext/wasm/api/post-js-header.js
@@ -10,17 +10,16 @@
 if(!Module.postRun) Module.postRun = [];
 Module.postRun.push(function(Module/*the Emscripten-style module object*/){
   'use strict';
-  /* This function will contain:
+  /* This function will contain at least the following:
 
      - post-js-header.js (this file)
      - sqlite3-api-prologue.js  => Bootstrapping bits to attach the rest to
-     - sqlite3-api-whwasmutil.js  => Replacements for much of Emscripten's glue
-     - sqlite3-api-jaccwabyt.js => Jaccwabyt (C/JS struct binding)
+     - common/whwasmutil.js     => Replacements for much of Emscripten's glue
+     - jaccwaby/jaccwabyt.js    => Jaccwabyt (C/JS struct binding)
      - sqlite3-api-glue.js      => glues previous parts together
-     - sqlite3-api-oo.js        => SQLite3 OO API #1.
-     - sqlite3-api-worker.js    => Worker-based API
+     - sqlite3-api-oo.js        => SQLite3 OO API #1
+     - sqlite3-api-worker1.js   => Worker-based API
+     - sqlite3-api-opfs.js      => OPFS VFS
      - sqlite3-api-cleanup.js   => final API cleanup
      - post-js-footer.js        => closes this postRun() function
-
-     Whew!
   */
diff --git a/ext/wasm/fiddle.make b/ext/wasm/fiddle.make
new file mode 100644
index 0000000000..63a665be5c
--- /dev/null
+++ b/ext/wasm/fiddle.make
@@ -0,0 +1,160 @@
+#!/do/not/make
+#^^^ help emacs select edit mode
+#
+# Intended to include'd by ./GNUmakefile.
+#######################################################################
+MAKEFILE.fiddle := $(lastword $(MAKEFILE_LIST))
+
+########################################################################
+# shell.c and its build flags...
+make-np-0 := make -C  $(dir.top) -n -p
+make-np-1 := sed -e 's/(TOP)/(dir.top)/g'
+$(eval $(shell $(make-np-0) | grep -e '^SHELL_OPT ' | $(make-np-1)))
+$(eval $(shell $(make-np-0) | grep -e '^SHELL_SRC ' | $(make-np-1)))
+# ^^^ can't do that in 1 invocation b/c newlines get stripped
+ifeq (,$(SHELL_OPT))
+$(error Could not parse SHELL_OPT from $(dir.top)/Makefile.)
+endif
+ifeq (,$(SHELL_SRC))
+$(error Could not parse SHELL_SRC from $(dir.top)/Makefile.)
+endif
+$(dir.top)/shell.c: $(SHELL_SRC) $(dir.top)/tool/mkshellc.tcl
+	$(MAKE) -C $(dir.top) shell.c
+# /shell.c
+########################################################################
+
+fiddle.emcc-flags = \
+  $(emcc.cflags) $(emcc_opt) \
+  --minify 0 \
+  -sALLOW_TABLE_GROWTH \
+  -sABORTING_MALLOC \
+  -sSTRICT_JS \
+  -sENVIRONMENT=web,worker \
+  -sMODULARIZE \
+  -sDYNAMIC_EXECUTION=0 \
+  -sEXPORT_NAME=initFiddleModule \
+  -sEXPORTED_RUNTIME_METHODS=@$(dir.wasm)/EXPORTED_RUNTIME_METHODS.fiddle \
+  -sEXPORTED_FUNCTIONS=@$(dir.wasm)/EXPORTED_FUNCTIONS.fiddle \
+  --post-js=$(post-js.js) \
+  $(SQLITE_OPT) $(SHELL_OPT) \
+  -D_POSIX_SOURCE \
+  -DSQLITE_SHELL_FIDDLE
+# -D_POSIX_C_SOURCE is needed for strdup() with emcc
+
+fiddle.EXPORTED_FUNCTIONS.in := \
+    EXPORTED_FUNCTIONS.fiddle.in \
+    EXPORTED_FUNCTIONS.api
+
+EXPORTED_FUNCTIONS.fiddle: $(fiddle.EXPORTED_FUNCTIONS.in) $(MAKEFILE.fiddle)
+	grep -h -v jaccwabyt $(fiddle.EXPORTED_FUNCTIONS.in) | sort -u > $@
+
+fiddle-module.js := $(dir.fiddle)/fiddle-module.js
+fiddle-module.wasm := $(subst .js,.wasm,$(fiddle-module.js))
+fiddle.cs := $(dir.top)/shell.c $(sqlite3-wasm.c)
+
+$(fiddle-module.js): $(MAKEFILE) $(MAKEFILE.fiddle) \
+    EXPORTED_FUNCTIONS.fiddle EXPORTED_RUNTIME_METHODS.fiddle \
+    $(fiddle.cs) $(post-js.js)
+	$(emcc.bin) -o $@ $(fiddle.emcc-flags) $(fiddle.cs)
+	$(maybe-wasm-strip) $(fiddle-module.wasm)
+	gzip < $@ > $@.gz
+	gzip < $(fiddle-module.wasm) > $(fiddle-module.wasm).gz
+
+$(dir.fiddle)/fiddle.js.gz: $(dir.fiddle)/fiddle.js
+	gzip < $< > $@
+
+clean: clean-fiddle
+clean-fiddle:
+	rm -f $(fiddle-module.js) $(fiddle-module.js).gz \
+        $(fiddle-module.wasm) $(fiddle-module.wasm).gz \
+        EXPORTED_FUNCTIONS.fiddle
+.PHONY: fiddle
+fiddle: $(fiddle-module.js) $(dir.fiddle)/fiddle.js.gz
+all: fiddle
+
+########################################################################
+# Explanation of the emcc build flags follows. Full docs for these can
+# be found at:
+#
+#  https://github.com/emscripten-core/emscripten/blob/main/src/settings.js
+#
+# -sENVIRONMENT=web: elides bootstrap code related to non-web JS
+#  environments like node.js. Removing this makes the output a tiny
+#  tick larger but hypothetically makes it more portable to
+#  non-browser JS environments.
+#
+# -sMODULARIZE: changes how the generated code is structured to avoid
+#  declaring a global Module object and instead installing a function
+#  which loads and initializes the module. The function is named...
+#
+# -sEXPORT_NAME=jsFunctionName (see -sMODULARIZE)
+#
+# -sEXPORTED_RUNTIME_METHODS=@/absolute/path/to/file: a file
+#  containing a list of emscripten-supplied APIs, one per line, which
+#  must be exported into the generated JS. Must be an absolute path!
+#
+# -sEXPORTED_FUNCTIONS=@/absolute/path/to/file: a file containing a
+#  list of C functions, one per line, which must be exported via wasm
+#  so they're visible to JS. C symbols names in that file must all
+#  start with an underscore for reasons known only to the emcc
+#  developers. e.g., _sqlite3_open_v2 and _sqlite3_finalize. Must be
+#  an absolute path!
+#
+# -sSTRICT_JS ensures that the emitted JS code includes the 'use
+#  strict' option. Note that -sSTRICT is more broadly-scoped and
+#  results in build errors.
+#
+# -sALLOW_TABLE_GROWTH is required for (at a minimum) the UDF-binding
+#  feature. Without it, JS functions cannot be made to proxy C-side
+#  callbacks.
+#
+# -sABORTING_MALLOC causes the JS-bound _malloc() to abort rather than
+#  return 0 on OOM. If set to 0 then all code which uses _malloc()
+#  must, just like in C, check the result before using it, else
+#  they're likely to corrupt the JS/WASM heap by writing to its
+#  address of 0. It is, as of this writing, enabled in Emscripten by
+#  default but we enable it explicitly in case that default changes.
+#
+# -sDYNAMIC_EXECUTION=0 disables eval() and the Function constructor.
+#  If the build runs without these, it's preferable to use this flag
+#  because certain execution environments disallow those constructs.
+#  This flag is not strictly necessary, however.
+#
+# -sWASM_BIGINT is UNTESTED but "should" allow the int64-using C APIs
+#  to work with JS/wasm, insofar as the JS environment supports the
+#  BigInt type. That support requires an extremely recent browser:
+#  Safari didn't get that support until late 2020.
+#
+# --no-entry: for compiling library code with no main(). If this is
+#  not supplied and the code has a main(), it is called as part of the
+#  module init process. Note that main() is #if'd out of shell.c
+#  (renamed) when building in wasm mode.
+#
+# --pre-js/--post-js=FILE relative or absolute paths to JS files to
+#  prepend/append to the emcc-generated bootstrapping JS. It's
+#  easier/faster to develop with separate JS files (reduces rebuilding
+#  requirements) but certain configurations, namely -sMODULARIZE, may
+#  require using at least a --pre-js file. They can be used
+#  individually and need not be paired.
+#
+# -O0..-O3 and -Oz: optimization levels affect not only C-style
+#  optimization but whether or not the resulting generated JS code
+#  gets minified. -O0 compiles _much_ more quickly than -O3 or -Oz,
+#  and doesn't minimize any JS code, so is recommended for
+#  development. -O3 or -Oz are recommended for deployment, but
+#  primarily because -Oz will shrink the wasm file notably. JS-side
+#  minification makes little difference in terms of overall
+#  distributable size.
+#
+# --minify 0: disables minification of the generated JS code,
+#  regardless of optimization level. Minification of the JS has
+#  minimal overall effect in the larger scheme of things and results
+#  in JS files which can neither be edited nor viewed as text files in
+#  Fossil (which flags them as binary because of their extreme line
+#  lengths). Interestingly, whether or not the comments in the
+#  generated JS file get stripped is unaffected by this setting and
+#  depends entirely on the optimization level. Higher optimization
+#  levels reduce the size of the JS considerably even without
+#  minification.
+#
+########################################################################
diff --git a/ext/wasm/wasmfs.make b/ext/wasm/wasmfs.make
index 253237a237..d65684b637 100644
--- a/ext/wasm/wasmfs.make
+++ b/ext/wasm/wasmfs.make
@@ -26,7 +26,6 @@ sqlite3-wasmfs.cflags += -std=c99 -fPIC -g
 sqlite3-wasmfs.cflags += -pthread
 sqlite3-wasmfs.cflags += -I. -I.. -I$(dir.top)
 sqlite3-wasmfs.cflags += $(SQLITE_OPT) -DSQLITE_WASM_WASMFS
-sqlite3-wasmfs.cflags += '-DSQLITE_DEFAULT_UNIX_VFS="unix-none"'
 
 sqlite3-wasmfs.extra.c :=
 ifeq (1,1)
diff --git a/manifest b/manifest
index 907cfdd3c5..2b32ddbe21 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Correct\sa\stoo-strict\sis-opfs-available\scheck.
-D 2022-09-20T16:20:35.278
+C Move\sfiddle\sbuild\srules\sinto\sthe\swasm-centric\sbuild\sfiles.\sAdd\srule\sto\spush\swasm\sbits\sto\sthe\swasm\stest\sserver.
+D 2022-09-21T08:39:03.936
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in 50e421194df031f669667fdb238c54959ecbea5a0b97dd3ed776cffbeea926d5
+F Makefile.in 2fbc1de74212fba94e0c3eca5549b894c91c1c17fb5e6fd23ca90a616523c5f5
 F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
 F Makefile.msc d547a2fdba38a1c6cd1954977d0b0cc017f5f8fbfbc65287bf8d335808938016
 F README.md 8b8df9ca852aeac4864eb1e400002633ee6db84065bd01b78c33817f97d31f5e
@@ -472,15 +472,15 @@ F ext/session/test_session.c f433f68a8a8c64b0f5bc74dc725078f12483301ad4ae8375205
 F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
-F ext/wasm/EXPORTED_FUNCTIONS.fiddle 7fb73f7150ab79d83bb45a67d257553c905c78cd3d693101699243f36c5ae6c3
+F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 7fb73f7150ab79d83bb45a67d257553c905c78cd3d693101699243f36c5ae6c3 w ext/wasm/EXPORTED_FUNCTIONS.fiddle
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile 0635cb6e90787b2d06ae51d903444214e8030274554a2406136881fed3c1fad6
+F ext/wasm/GNUmakefile 45b2815443729ed7de33acb4a2716038f8a41005529cd96bac81f7f0d97d1ded
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 8a724a674bd2089eef9676b434c0ab709da00db33f73a94e4987e90169b1cd14
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
 F ext/wasm/api/README.md d876597edd2b9542b6ea031adaaff1c042076fde7b670b1dc6d8a87b28a6631b
 F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba81456260a713ed04900c
-F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a4a06cb776c003880b
+F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
 F ext/wasm/api/sqlite3-api-cleanup.js 8564a6077cdcaea9a9f428a019af8a05887f0131e6a2a1e72a7ff1145fadfe77
 F ext/wasm/api/sqlite3-api-glue.js 366d580c8e5bf7fcf4c6dee6f646c31f5549bd417ea03a59a0acca00e8ecce30
 F ext/wasm/api/sqlite3-api-oo1.js f974e79d9af8f26bf33928c5730b0988cc706d14f59a5fe36394739b92249841
@@ -500,6 +500,7 @@ F ext/wasm/demo-123.html aa281d33b7eefa755f3122b7b5a18f39a42dc5fb69c8879171bf14b
 F ext/wasm/demo-123.js 234655683e35a4543a23de7b10800d76b0369947b33e089e5613171fa7795afb
 F ext/wasm/demo-kvvfs1.html 7d4f28873de67f51ac18c584b7d920825139866a96049a49c424d6f5a0ea5e7f
 F ext/wasm/demo-kvvfs1.js e884ea35022d772c0d1dd884b40011413696438394f605c6cd4808cfb1642a4a
+F ext/wasm/fiddle.make 8b1018e8d91b6d3add93813302a4acf2e5693dd9882499e38eccaec73afb1f79
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js bccf46045be8824752876f3eec01c223be0616ccac184bffd0024cfe7a3262b8
 F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
@@ -529,7 +530,7 @@ F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d766
 F ext/wasm/testing1.js 507001a970fe8a8eb67b6c8d783e1c1daa3db2719f727c4551af29349410e538
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
 F ext/wasm/testing2.js 25584bcc30f19673ce13a6f301f89f8820a59dfe044e0c4f2913941f4097fe3c
-F ext/wasm/wasmfs.make 0fbe3b4ef4e5e25ed61d7b581c48e6406dd688443d1b8d4daf94d779a8056c54
+F ext/wasm/wasmfs.make b24fa0199ddf9720ae8b0c7751a5dbdb2501c8d7c57ecf8c2e0a80ebf4b2d00b
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
@@ -2025,8 +2026,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 e3d36dcdd37e59f17a07d3611d08744eb86f439fab82a648490dd608bcaa3185
-R 4e567bfc74ed899d5a6221b9c0e9380f
+P 1b5f1b4a6c1457f98c258459e23e321fc59793de298fecb84031b87f02156cd5
+R 00dda2c5015c98fa272f7dff83ac1143
 U stephan
-Z 34a126210ea63cd6428a245b533d4ca4
+Z c50873d6fe9ef43a35ee904cdd659788
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 81185f7008..de2b0356aa 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1b5f1b4a6c1457f98c258459e23e321fc59793de298fecb84031b87f02156cd5
\ No newline at end of file
+113f8204dc4ac849d5632d3de1680b6e0da871e107ef484c8d7273799bee3d88
\ No newline at end of file

From ebe14230988ce62ceac1afb19da13a51fbfe749d Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 21 Sep 2022 08:41:40 +0000
Subject: [PATCH 151/428] Add a link to fiddle.html in the wasm test app
 index.html.

FossilOrigin-Name: 96c734c07acfbea153d9aaf293a28a2d49d78de19fec4fb90c4c08fb1fd0ddbd
---
 ext/wasm/index.html |  2 ++
 manifest            | 14 +++++++-------
 manifest.uuid       |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ext/wasm/index.html b/ext/wasm/index.html
index e9a8d7bebb..83ee85b71c 100644
--- a/ext/wasm/index.html
+++ b/ext/wasm/index.html
@@ -36,6 +36,8 @@
     </div>
     <div>The tests...
       <ul id='test-list'>
+        <li><a href='fiddle/fiddle.html'>fiddle</a> is an HTML front-end
+          to a wasm build of the sqlite3 shell.</li>
         <li><a href='demo-123.html'>demo-123</a> provides a
           no-nonsense example of adding sqlite3 support to a
           web page. </li>
diff --git a/manifest b/manifest
index 2b32ddbe21..6424e629f0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Move\sfiddle\sbuild\srules\sinto\sthe\swasm-centric\sbuild\sfiles.\sAdd\srule\sto\spush\swasm\sbits\sto\sthe\swasm\stest\sserver.
-D 2022-09-21T08:39:03.936
+C Add\sa\slink\sto\sfiddle.html\sin\sthe\swasm\stest\sapp\sindex.html.
+D 2022-09-21T08:41:40.128
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -472,7 +472,7 @@ F ext/session/test_session.c f433f68a8a8c64b0f5bc74dc725078f12483301ad4ae8375205
 F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
-F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 7fb73f7150ab79d83bb45a67d257553c905c78cd3d693101699243f36c5ae6c3 w ext/wasm/EXPORTED_FUNCTIONS.fiddle
+F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 7fb73f7150ab79d83bb45a67d257553c905c78cd3d693101699243f36c5ae6c3
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
 F ext/wasm/GNUmakefile 45b2815443729ed7de33acb4a2716038f8a41005529cd96bac81f7f0d97d1ded
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
@@ -505,7 +505,7 @@ F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d695
 F ext/wasm/fiddle/fiddle-worker.js bccf46045be8824752876f3eec01c223be0616ccac184bffd0024cfe7a3262b8
 F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
 F ext/wasm/fiddle/fiddle.js 4ffcfc9a235beebaddec689a549e9e0dfad6dca5c1f0b41f03468d7e76480686
-F ext/wasm/index.html 4b74ea334f0bba9923a61246d807a1873784fcef4d3fb342b698613d0a29fd9c
+F ext/wasm/index.html 5cb26db659696ef59e55a2d61a3c1cb924843527b3265e3449d9b718cf041778
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 447cc02b598f7792edaa8ae6853a7847b8178a18ed356afacbdbf312b2588106
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
@@ -2026,8 +2026,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 1b5f1b4a6c1457f98c258459e23e321fc59793de298fecb84031b87f02156cd5
-R 00dda2c5015c98fa272f7dff83ac1143
+P 113f8204dc4ac849d5632d3de1680b6e0da871e107ef484c8d7273799bee3d88
+R 337ac284fad2396684acb37bb3bd23e5
 U stephan
-Z c50873d6fe9ef43a35ee904cdd659788
+Z 31d6498de398e0445783a30c20bccccb
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index de2b0356aa..2c8cf8c72f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-113f8204dc4ac849d5632d3de1680b6e0da871e107ef484c8d7273799bee3d88
\ No newline at end of file
+96c734c07acfbea153d9aaf293a28a2d49d78de19fec4fb90c4c08fb1fd0ddbd
\ No newline at end of file

From 171b168b3e844e324f72cd7a7db9573964191435 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 21 Sep 2022 12:25:40 +0000
Subject: [PATCH 152/428] Added some structure to the wasm demo link list.

FossilOrigin-Name: 777077c4c2249e1ec78390d4f65aaf281c1fbefcef4bcc7609199e995645ceb6
---
 ext/wasm/index.html | 78 ++++++++++++++++++++++++++-------------------
 manifest            | 12 +++----
 manifest.uuid       |  2 +-
 3 files changed, 53 insertions(+), 39 deletions(-)

diff --git a/ext/wasm/index.html b/ext/wasm/index.html
index 83ee85b71c..7b541a6457 100644
--- a/ext/wasm/index.html
+++ b/ext/wasm/index.html
@@ -36,38 +36,52 @@
     </div>
     <div>The tests...
       <ul id='test-list'>
-        <li><a href='fiddle/fiddle.html'>fiddle</a> is an HTML front-end
-          to a wasm build of the sqlite3 shell.</li>
-        <li><a href='demo-123.html'>demo-123</a> provides a
-          no-nonsense example of adding sqlite3 support to a
-          web page. </li>
-        <li><a href='demo-123-worker.html'>demo-123-worker</a> is the
-          same as <code>demo-123</code> but loads and run sqlite3 from
-          a Worker thread.</li>
-        <li><a href='testing1.html'>testing1</a>: sanity tests of the core APIs and surrounding utility code.</li>
-        <li><a href='testing2.html'>testing2</a>: Worker-based test of OO API #1.</li>
-        <li><a href='testing-worker1-promiser.html'>testing-worker1-promiser</a>:
-          tests for the Promise-based wrapper of the Worker-based API.</li>
-        <li><a href='batch-runner.html'>batch-runner</a>: runs batches of SQL exported from speedtest1.</li>
-        <li><a href='speedtest1.html'>speedtest1</a>: a main-thread WASM build of speedtest1.</li>
-        <li><a href='speedtest1-worker.html'>speedtest1-worker</a>: an interactive Worker-thread variant of speedtest1.</li>
-        <li><a href='speedtest1-wasmfs.html'>speedtest1-wasmfs</a>: a variant of speedtest1 built solely for the wasmfs/opfs feature.</li>
-        <li><a href='speedtest1.html?vfs=kvvfs'>speedtest1-kvvfs</a>: speedtest1 with the kvvfs.</li>
-        <li><a href='demo-kvvfs1.html'>demo-kvvfs1</a>: very basic
-          demo of using the key-value vfs for storing a persistent db
-          in JS localStorage or sessionStorage.</li>
-        <li><a href='scratchpad-wasmfs-main.html'>scratchpad-wasmfs-main</a>:
-          experimenting with WASMFS/OPFS-based persistence. Maintenance
-          reminder: we cannot currently (2022-09-15) load WASMFS in a
-          worker due to an Emscripten limitation.</li>
-        <li><a href='test-opfs-vfs.html'>test-opfs-vfs</a>
-          (<a href='test-opfs-vfs.html?opfs-sanity-check&opfs-verbose'>same
-          with verbose output and sanity-checking tests</a>) is an
-          experiment in implementing a syncronous sqlite3 VFS proxy
-          for a fully asynchronous backend interface (namely OPFS),
-          using SharedArrayBuffer and the Atomics APIs to regulate
-          communication between the synchronous interface and the
-          async impl.
+        <li>High-level apps and demos...
+          <ul>
+            <li><a href='fiddle/fiddle.html'>fiddle</a> is an HTML front-end
+              to a wasm build of the sqlite3 shell.</li>
+            <li><a href='demo-123.html'>demo-123</a> provides a
+              no-nonsense example of adding sqlite3 support to a
+              web page. </li>
+            <li><a href='demo-123-worker.html'>demo-123-worker</a> is the
+              same as <code>demo-123</code> but loads and run sqlite3 from
+              a Worker thread.</li>
+            <li><a href='demo-kvvfs1.html'>demo-kvvfs1</a>: very basic
+              demo of using the key-value vfs for storing a persistent db
+              in JS localStorage or sessionStorage.</li>
+          </ul>
+        </li>
+        <li>speedtest1 ports (sqlite3's primary benchmarking tool)...
+          <ul>
+            <li><a href='speedtest1.html'>speedtest1</a>: a main-thread WASM build of speedtest1.</li>
+            <li><a href='speedtest1-wasmfs.html'>speedtest1-wasmfs</a>: a variant of speedtest1 built solely for the wasmfs/opfs feature.</li>
+            <li><a href='speedtest1.html?vfs=kvvfs'>speedtest1-kvvfs</a>: speedtest1 with the kvvfs.</li>
+            <li><a href='speedtest1-worker.html'>speedtest1-worker</a>: an interactive Worker-thread variant of speedtest1.</li>
+            <li><a href='speedtest1-worker.html?vfs=opfs&size=25'>speedtest1-worker-opfs</a>: speedtest1-worker with the
+              OPFS VFS preselected and configured for a moderate workload.</li>
+          </ul>
+        </li>
+        <li>The obligatory "misc." category...
+          <ul>
+            <li><a href='testing1.html'>testing1</a>: sanity tests of the core APIs and surrounding utility code.</li>
+            <li><a href='testing2.html'>testing2</a>: Worker-based test of OO API #1.</li>
+            <li><a href='testing-worker1-promiser.html'>testing-worker1-promiser</a>:
+              tests for the Promise-based wrapper of the Worker-based API.</li>
+            <li><a href='batch-runner.html'>batch-runner</a>: runs batches of SQL exported from speedtest1.</li>
+            <li><a href='scratchpad-wasmfs-main.html'>scratchpad-wasmfs-main</a>:
+              experimenting with WASMFS/OPFS-based persistence. Maintenance
+              reminder: we cannot currently (2022-09-15) load WASMFS in a
+              worker due to an Emscripten limitation.</li>
+            <li><a href='test-opfs-vfs.html'>test-opfs-vfs</a>
+              (<a href='test-opfs-vfs.html?opfs-sanity-check&opfs-verbose'>same
+                with verbose output and sanity-checking tests</a>) is an
+              experiment in implementing a syncronous sqlite3 VFS proxy
+              for a fully asynchronous backend interface (namely OPFS),
+              using SharedArrayBuffer and the Atomics APIs to regulate
+              communication between the synchronous interface and the
+              async impl.
+            </li>
+          </ul>
         </li>
         <!--li><a href='x.html'></a></li-->
       </ul>
diff --git a/manifest b/manifest
index 6424e629f0..6bf77f2f6c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\slink\sto\sfiddle.html\sin\sthe\swasm\stest\sapp\sindex.html.
-D 2022-09-21T08:41:40.128
+C Added\ssome\sstructure\sto\sthe\swasm\sdemo\slink\slist.
+D 2022-09-21T12:25:40.497
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -505,7 +505,7 @@ F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d695
 F ext/wasm/fiddle/fiddle-worker.js bccf46045be8824752876f3eec01c223be0616ccac184bffd0024cfe7a3262b8
 F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
 F ext/wasm/fiddle/fiddle.js 4ffcfc9a235beebaddec689a549e9e0dfad6dca5c1f0b41f03468d7e76480686
-F ext/wasm/index.html 5cb26db659696ef59e55a2d61a3c1cb924843527b3265e3449d9b718cf041778
+F ext/wasm/index.html 8b4b7ea052d558262c8466f94326fb455c21049b2d1d3577ed0a5fce15101ba8
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 447cc02b598f7792edaa8ae6853a7847b8178a18ed356afacbdbf312b2588106
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
@@ -2026,8 +2026,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 113f8204dc4ac849d5632d3de1680b6e0da871e107ef484c8d7273799bee3d88
-R 337ac284fad2396684acb37bb3bd23e5
+P 96c734c07acfbea153d9aaf293a28a2d49d78de19fec4fb90c4c08fb1fd0ddbd
+R 861bbf4cfa9812be3b9491caf1943540
 U stephan
-Z 31d6498de398e0445783a30c20bccccb
+Z 172073e3d6aad2306bf7614651c7edbb
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 2c8cf8c72f..17b72d2509 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-96c734c07acfbea153d9aaf293a28a2d49d78de19fec4fb90c4c08fb1fd0ddbd
\ No newline at end of file
+777077c4c2249e1ec78390d4f65aaf281c1fbefcef4bcc7609199e995645ceb6
\ No newline at end of file

From 72ab400d4db6a429bf2a2758c1c39afc5178f530 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 21 Sep 2022 12:27:35 +0000
Subject: [PATCH 153/428] Doc cleanups and additions. Add a way for the OPFS
 async runner to propagate exception text to the calling thread.

FossilOrigin-Name: 5c5e80652825cf883e6c17809cb98f2bf17d5feac2d263f6f492479154730dab
---
 ext/wasm/api/sqlite3-api-opfs.js     | 115 +++++++++++++++++++--------
 ext/wasm/api/sqlite3-wasm.c          |   8 +-
 ext/wasm/sqlite3-opfs-async-proxy.js | 108 ++++++++++++-------------
 manifest                             |  16 ++--
 manifest.uuid                        |   2 +-
 5 files changed, 149 insertions(+), 100 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index 4e9b7328ca..a117d2725e 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -16,9 +16,7 @@
   Worker, implemented in sqlite3-opfs-async-proxy.js.  This file is
   intended to be appended to the main sqlite3 JS deliverable somewhere
   after sqlite3-api-glue.js and before sqlite3-api-cleanup.js.
-
 */
-
 'use strict';
 self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
 /**
@@ -314,55 +312,98 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
       const t = performance.now();
       Atomics.wait(state.sabOPView, state.opIds.rc, -1);
       const rc = Atomics.load(state.sabOPView, state.opIds.rc);
+      if(rc){
+        const err = state.s11n.deserialize();
+        if(err) error(op+"() async error:",...err);
+      }
       metrics[op].wait += performance.now() - t;
       return rc;
     };
 
     const initS11n = ()=>{
       /**
-         ACHTUNG: this code is 100% duplicated in the other half of
-         this proxy!
+         ACHTUNG: this code is 100% duplicated in the other half of this
+         proxy! The documentation is maintained in the "synchronous half".
 
-         Historical note: this impl was initially about 5% this size by using
-         using JSON.stringify/parse(), but using fit-to-purpose serialization
-         saves considerable runtime.
+         This proxy de/serializes cross-thread function arguments and
+         output-pointer values via the state.sabIO SharedArrayBuffer,
+         using the region defined by (state.sabS11nOffset,
+         state.sabS11nOffset]. Only one dataset is recorded at a time.
+
+         This is not a general-purpose format. It only supports the range
+         of operations, and data sizes, needed by the sqlite3_vfs and
+         sqlite3_io_methods operations.
+
+         The data format can be succinctly summarized as:
+
+         Nt...Td...D
+
+         Where:
+
+         - N = number of entries (1 byte)
+
+         - t = type ID of first argument (1 byte)
+
+         - ...T = type IDs of the 2nd and subsequent arguments (1 byte
+         each).
+
+         - d = raw bytes of first argument (per-type size).
+
+         - ...D = raw bytes of the 2nd and subsequent arguments (per-type
+         size).
+
+         All types except strings have fixed sizes. Strings are stored
+         using their TextEncoder/TextDecoder representations. It would
+         arguably make more sense to store them as Int16Arrays of
+         their JS character values, but how best/fastest to get that
+         in and out of string form us an open point.
+
+         Historical note: this impl was initially about 1% this size by
+         using using JSON.stringify/parse(), but using fit-to-purpose
+         serialization saves considerable runtime.
       */
       if(state.s11n) return state.s11n;
       const textDecoder = new TextDecoder(),
-      textEncoder = new TextEncoder('utf-8'),
-      viewU8 = new Uint8Array(state.sabIO, state.sabS11nOffset, state.sabS11nSize),
-      viewDV = new DataView(state.sabIO, state.sabS11nOffset, state.sabS11nSize);
+            textEncoder = new TextEncoder('utf-8'),
+            viewU8 = new Uint8Array(state.sabIO, state.sabS11nOffset, state.sabS11nSize),
+            viewDV = new DataView(state.sabIO, state.sabS11nOffset, state.sabS11nSize);
       state.s11n = Object.create(null);
+      /* Only arguments and return values of these types may be
+         serialized. This covers the whole range of types needed by the
+         sqlite3_vfs API. */
       const TypeIds = Object.create(null);
       TypeIds.number  = { id: 1, size: 8, getter: 'getFloat64', setter: 'setFloat64' };
       TypeIds.bigint  = { id: 2, size: 8, getter: 'getBigInt64', setter: 'setBigInt64' };
       TypeIds.boolean = { id: 3, size: 4, getter: 'getInt32', setter: 'setInt32' };
       TypeIds.string =  { id: 4 };
-      const getTypeId = (v)=>{
-        return TypeIds[typeof v] || toss("This value type cannot be serialized.",v);
-      };
+
+      const getTypeId = (v)=>(
+        TypeIds[typeof v]
+          || toss("Maintenance required: this value type cannot be serialized.",v)
+      );
       const getTypeIdById = (tid)=>{
         switch(tid){
-        case TypeIds.number.id: return TypeIds.number;
-        case TypeIds.bigint.id: return TypeIds.bigint;
-        case TypeIds.boolean.id: return TypeIds.boolean;
-        case TypeIds.string.id: return TypeIds.string;
-        default: toss("Invalid type ID:",tid);
+            case TypeIds.number.id: return TypeIds.number;
+            case TypeIds.bigint.id: return TypeIds.bigint;
+            case TypeIds.boolean.id: return TypeIds.boolean;
+            case TypeIds.string.id: return TypeIds.string;
+            default: toss("Invalid type ID:",tid);
         }
       };
+
       /**
-         Returns an array of the state serialized by the most recent
-         serialize() operation (here or in the counterpart thread), or
-         null if the serialization buffer is empty.
+         Returns an array of the deserialized state stored by the most
+         recent serialize() operation (from from this thread or the
+         counterpart thread), or null if the serialization buffer is empty.
       */
       state.s11n.deserialize = function(){
         ++metrics.s11n.deserialize.count;
         const t = performance.now();
-        let rc = null;
         const argc = viewU8[0];
+        const rc = argc ? [] : null;
         if(argc){
-          rc = [];
-          let offset = 1, i, n, v, typeIds = [];
+          const typeIds = [];
+          let offset = 1, i, n, v;
           for(i = 0; i < argc; ++i, ++offset){
             typeIds.push(getTypeIdById(viewU8[offset]));
           }
@@ -371,7 +412,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
             if(t.getter){
               v = viewDV[t.getter](offset, state.littleEndian);
               offset += t.size;
-            }else{
+            }else{/*String*/
               n = viewDV.getInt32(offset, state.littleEndian);
               offset += 4;
               v = textDecoder.decode(viewU8.slice(offset, offset+n));
@@ -384,6 +425,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
         metrics.s11n.deserialize.time += performance.now() - t;
         return rc;
       };
+
       /**
          Serializes all arguments to the shared buffer for consumption
          by the counterpart thread.
@@ -397,22 +439,27 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
          state.
       */
       state.s11n.serialize = function(...args){
-        ++metrics.s11n.serialize.count;
         const t = performance.now();
+        ++metrics.s11n.serialize.count;
         if(args.length){
           //log("serialize():",args);
-          let i = 0, offset = 1, typeIds = [];
-          viewU8[0] = args.length & 0xff;
+          const typeIds = [];
+          let i = 0, offset = 1;
+          viewU8[0] = args.length & 0xff /* header = # of args */;
           for(; i < args.length; ++i, ++offset){
+            /* Write the TypeIds.id value into the next args.length
+               bytes. */
             typeIds.push(getTypeId(args[i]));
             viewU8[offset] = typeIds[i].id;
           }
           for(i = 0; i < args.length; ++i) {
+            /* Deserialize the following bytes based on their
+               corresponding TypeIds.id from the header. */
             const t = typeIds[i];
             if(t.setter){
               viewDV[t.setter](offset, args[i], state.littleEndian);
               offset += t.size;
-            }else{
+            }else{/*String*/
               const s = textEncoder.encode(args[i]);
               viewDV.setInt32(offset, s.byteLength, state.littleEndian);
               offset += 4;
@@ -774,7 +821,10 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
        but cannot report the nature of the failure.
     */
     opfsUtil.deleteEntry = function(fsEntryName,recursive=false){
-      return 0===opRun('xDelete', fsEntryName, 0, recursive);
+      mTimeStart('xDelete');
+      const rc = opRun('xDelete', fsEntryName, 0, recursive);
+      mTimeEnd();
+      return 0===rc;
     };
     /**
        Synchronously creates the given directory name, recursively, in
@@ -782,7 +832,10 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
        directory already exists, else false.
     */
     opfsUtil.mkdir = function(absDirName){
-      return 0===opRun('mkdir', absDirName);
+      mTimeStart('mkdir');
+      const rc = opRun('mkdir', absDirName);
+      mTimeEnd();
+      return 0===rc;
     };
     /**
        Synchronously checks whether the given OPFS filesystem exists,
diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index eb8f58b402..5b127cb743 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -9,10 +9,10 @@
 
 /*
 ** WASM_KEEP is identical to EMSCRIPTEN_KEEPALIVE but is not
-** Emscripten-specific. It explicitly includes marked functions for
-** export into the target wasm file without requiring explicit listing
-** of those functions in Emscripten's -sEXPORTED_FUNCTIONS=... list
-** (or equivalent in other build platforms). Any function with neither
+** Emscripten-specific. It explicitly marks functions for export into
+** the target wasm file without requiring explicit listing of those
+** functions in Emscripten's -sEXPORTED_FUNCTIONS=... list (or
+** equivalent in other build platforms). Any function with neither
 ** this attribute nor which is listed as an explicit export will not
 ** be exported from the wasm file (but may still be used internally
 ** within the wasm file).
diff --git a/ext/wasm/sqlite3-opfs-async-proxy.js b/ext/wasm/sqlite3-opfs-async-proxy.js
index 7c5e8430b6..06bc235ab2 100644
--- a/ext/wasm/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/sqlite3-opfs-async-proxy.js
@@ -136,8 +136,8 @@ const getDirForPath = async function f(absFilename, createDirs = false){
 
 
 /**
-   Stores the given value at the array index reserved for the given op
-   and then Atomics.notify()'s it.
+   Stores the given value at state.sabOPView[state.opIds.rc] and then
+   Atomics.notify()'s it.
 */
 const storeAndNotify = (opName, value)=>{
   log(opName+"() => notify(",state.opIds.rc,",",value,")");
@@ -190,10 +190,11 @@ const vfsAsyncImpls = {
     try {
         await getDirForPath(dirname+"/filepart", true);
     }catch(e){
-      //error("mkdir failed",filename, e.message);
+      state.s11n.serialize(e.message);
       rc = state.sq3Codes.SQLITE_IOERR;
+    }finally{
+      wTimeEnd();
     }
-    wTimeEnd();
     storeAndNotify('mkdir', rc);
     mTimeEnd();
   },
@@ -216,9 +217,11 @@ const vfsAsyncImpls = {
       const [dh, fn] = await getDirForPath(filename);
       await dh.getFileHandle(fn);
     }catch(e){
+      state.s11n.serialize(e.message);
       rc = state.sq3Codes.SQLITE_IOERR;
+    }finally{
+      wTimeEnd();
     }
-    wTimeEnd();
     storeAndNotify('xAccess', rc);
     mTimeEnd();
   },
@@ -236,6 +239,7 @@ const vfsAsyncImpls = {
         catch(e){ warn("Ignoring dirHandle.removeEntry() failure of",fh,e) }
       }
     }else{
+      state.s11n.serialize();
       rc = state.sq3Codes.SQLITE_NOTFOUND;
     }
     wTimeEnd();
@@ -274,9 +278,7 @@ const vfsAsyncImpls = {
         filename = filename.join('/');
       }
     }catch(e){
-      /* Ignoring: _presumably_ the file can't be found or a dir is
-         not empty. */
-      //error("Delete failed",filename, e.message);
+      state.s11n.serialize(e.message);
       rc = state.sq3Codes.SQLITE_IOERR_DELETE;
     }
     wTimeEnd();
@@ -292,7 +294,7 @@ const vfsAsyncImpls = {
       state.s11n.serialize(Number(sz));
       sz = 0;
     }catch(e){
-      error("xFileSize():",e, fh);
+      state.s11n.serialize(e.message);
       sz = state.sq3Codes.SQLITE_IOERR;
     }
     wTimeEnd();
@@ -337,6 +339,7 @@ const vfsAsyncImpls = {
     }catch(e){
       wTimeEnd();
       error(opName,e);
+      state.s11n.serialize(e.message);
       storeAndNotify(opName, state.sq3Codes.SQLITE_IOERR);
     }
     mTimeEnd();
@@ -358,6 +361,7 @@ const vfsAsyncImpls = {
       }
     }catch(e){
       error("xRead() failed",e,fh);
+      state.s11n.serialize(e.message);
       rc = state.sq3Codes.SQLITE_IOERR_READ;
     }
     storeAndNotify('xRead',rc);
@@ -366,12 +370,18 @@ const vfsAsyncImpls = {
   xSync: async function(fid,flags/*ignored*/){
     mTimeStart('xSync');
     const fh = __openFiles[fid];
+    let rc = 0;
     if(!fh.readOnly && fh.accessHandle){
-      wTimeStart('xSync');
-      await fh.accessHandle.flush();
-      wTimeEnd();
+      try {
+        wTimeStart('xSync');
+        await fh.accessHandle.flush();
+      }catch(e){
+        state.s11n.serialize(e.message);
+      }finally{
+        wTimeEnd();
+      }
     }
-    storeAndNotify('xSync',0);
+    storeAndNotify('xSync',rc);
     mTimeEnd();
   },
   xTruncate: async function(fid,size){
@@ -384,6 +394,7 @@ const vfsAsyncImpls = {
       await fh.accessHandle.truncate(size);
     }catch(e){
       error("xTruncate():",e,fh);
+      state.s11n.serialize(e.message);
       rc = state.sq3Codes.SQLITE_IOERR_TRUNCATE;
     }
     wTimeEnd();
@@ -403,6 +414,7 @@ const vfsAsyncImpls = {
       ) ? 0 : state.sq3Codes.SQLITE_IOERR_WRITE;
     }catch(e){
       error("xWrite():",e,fh);
+      state.s11n.serialize(e.message);
       rc = state.sq3Codes.SQLITE_IOERR_WRITE;
     }finally{
       wTimeEnd();
@@ -413,53 +425,42 @@ const vfsAsyncImpls = {
 };
 
 const initS11n = ()=>{
-  // Achtung: this code is 100% duplicated in the other half of this proxy!
-
   /**
-     Historical note: this impl was initially about 1% this size by using
-     using JSON.stringify/parse(), but using fit-to-purpose serialization
-     saves considerable runtime.
+     ACHTUNG: this code is 100% duplicated in the other half of this
+     proxy! The documentation is maintained in the "synchronous half".
   */
-
   if(state.s11n) return state.s11n;
   const textDecoder = new TextDecoder(),
   textEncoder = new TextEncoder('utf-8'),
   viewU8 = new Uint8Array(state.sabIO, state.sabS11nOffset, state.sabS11nSize),
   viewDV = new DataView(state.sabIO, state.sabS11nOffset, state.sabS11nSize);
   state.s11n = Object.create(null);
-
   const TypeIds = Object.create(null);
   TypeIds.number  = { id: 1, size: 8, getter: 'getFloat64', setter: 'setFloat64' };
   TypeIds.bigint  = { id: 2, size: 8, getter: 'getBigInt64', setter: 'setBigInt64' };
   TypeIds.boolean = { id: 3, size: 4, getter: 'getInt32', setter: 'setInt32' };
   TypeIds.string =  { id: 4 };
-
-  const getTypeId = (v)=>{
-    return TypeIds[typeof v] || toss("This value type cannot be serialized.",v);
-  };
+  const getTypeId = (v)=>(
+    TypeIds[typeof v]
+      || toss("Maintenance required: this value type cannot be serialized.",v)
+  );
   const getTypeIdById = (tid)=>{
     switch(tid){
-    case TypeIds.number.id: return TypeIds.number;
-    case TypeIds.bigint.id: return TypeIds.bigint;
-    case TypeIds.boolean.id: return TypeIds.boolean;
-    case TypeIds.string.id: return TypeIds.string;
-    default: toss("Invalid type ID:",tid);
+      case TypeIds.number.id: return TypeIds.number;
+      case TypeIds.bigint.id: return TypeIds.bigint;
+      case TypeIds.boolean.id: return TypeIds.boolean;
+      case TypeIds.string.id: return TypeIds.string;
+      default: toss("Invalid type ID:",tid);
     }
   };
-
-  /**
-     Returns an array of the state serialized by the most recent
-     serialize() operation (here or in the counterpart thread), or
-     null if the serialization buffer is empty.
-  */
   state.s11n.deserialize = function(){
     ++metrics.s11n.deserialize.count;
     const t = performance.now();
-    let rc = null;
     const argc = viewU8[0];
+    const rc = argc ? [] : null;
     if(argc){
-      rc = [];
-      let offset = 1, i, n, v, typeIds = [];
+      const typeIds = [];
+      let offset = 1, i, n, v;
       for(i = 0; i < argc; ++i, ++offset){
         typeIds.push(getTypeIdById(viewU8[offset]));
       }
@@ -468,7 +469,7 @@ const initS11n = ()=>{
         if(t.getter){
           v = viewDV[t.getter](offset, state.littleEndian);
           offset += t.size;
-        }else{
+        }else{/*String*/
           n = viewDV.getInt32(offset, state.littleEndian);
           offset += 4;
           v = textDecoder.decode(viewU8.slice(offset, offset+n));
@@ -481,36 +482,28 @@ const initS11n = ()=>{
     metrics.s11n.deserialize.time += performance.now() - t;
     return rc;
   };
-
-  /**
-     Serializes all arguments to the shared buffer for consumption
-     by the counterpart thread.
-
-     This routine is only intended for serializing OPFS VFS
-     arguments and (in at least one special case) result values,
-     and the buffer is sized to be able to comfortably handle
-     those.
-
-     If passed no arguments then it zeroes out the serialization
-     state.
-  */
   state.s11n.serialize = function(...args){
-    ++metrics.s11n.serialize.count;
     const t = performance.now();
+    ++metrics.s11n.serialize.count;
     if(args.length){
       //log("serialize():",args);
-      let i = 0, offset = 1, typeIds = [];
-      viewU8[0] = args.length & 0xff;
+      const typeIds = [];
+      let i = 0, offset = 1;
+      viewU8[0] = args.length & 0xff /* header = # of args */;
       for(; i < args.length; ++i, ++offset){
+        /* Write the TypeIds.id value into the next args.length
+           bytes. */
         typeIds.push(getTypeId(args[i]));
         viewU8[offset] = typeIds[i].id;
       }
       for(i = 0; i < args.length; ++i) {
+        /* Deserialize the following bytes based on their
+           corresponding TypeIds.id from the header. */
         const t = typeIds[i];
         if(t.setter){
           viewDV[t.setter](offset, args[i], state.littleEndian);
           offset += t.size;
-        }else{
+        }else{/*String*/
           const s = textEncoder.encode(args[i]);
           viewDV.setInt32(offset, s.byteLength, state.littleEndian);
           offset += 4;
@@ -548,6 +541,9 @@ const waitLoop = async function f(){
       Atomics.store(state.sabOPView, state.opIds.whichOp, 0);
       const hnd = opHandlers[opId] ?? toss("No waitLoop handler for whichOp #",opId);
       const args = state.s11n.deserialize();
+      state.s11n.serialize()/* clear s11n to keep the caller from
+                               confusing this with an exception string
+                               written by the upcoming operation */;
       //warn("waitLoop() whichOp =",opId, hnd, args);
       if(hnd.f) await hnd.f(...args);
       else error("Missing callback for opId",opId);
diff --git a/manifest b/manifest
index 6bf77f2f6c..d30df61098 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Added\ssome\sstructure\sto\sthe\swasm\sdemo\slink\slist.
-D 2022-09-21T12:25:40.497
+C Doc\scleanups\sand\sadditions.\sAdd\sa\sway\sfor\sthe\sOPFS\sasync\srunner\sto\spropagate\sexception\stext\sto\sthe\scalling\sthread.
+D 2022-09-21T12:27:35.940
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -484,11 +484,11 @@ F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1
 F ext/wasm/api/sqlite3-api-cleanup.js 8564a6077cdcaea9a9f428a019af8a05887f0131e6a2a1e72a7ff1145fadfe77
 F ext/wasm/api/sqlite3-api-glue.js 366d580c8e5bf7fcf4c6dee6f646c31f5549bd417ea03a59a0acca00e8ecce30
 F ext/wasm/api/sqlite3-api-oo1.js f974e79d9af8f26bf33928c5730b0988cc706d14f59a5fe36394739b92249841
-F ext/wasm/api/sqlite3-api-opfs.js 10be4156d7db4d6aa8a456b4fb0f31a6e35c61297766e8bb55573fc5c0d56530
+F ext/wasm/api/sqlite3-api-opfs.js dbbce38b0cd89d1eaf829546e2999241127150a40ff2e0331d842a1f31c756e5
 F ext/wasm/api/sqlite3-api-prologue.js 6f3a67c4db37e884d33a05e5cf6d9d9bc012226a18c09f33f662fefd99840a63
 F ext/wasm/api/sqlite3-api-worker1.js 2eeb2a24e1a90322d84a9b88a99919b806623de62792436446099c0988f2030b
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c 4130e2df9587f4e4c3afc04c3549d682c8a5c0cfe5b22819a0a86edb7f01b9bd
+F ext/wasm/api/sqlite3-wasm.c 9401a3f9bd191a410b4f679b7957c6b7e168a68106f52ddeafa1c776d0364e49
 F ext/wasm/batch-runner.html 2857a6db7292ac83d1581af865d643fd34235db2df830d10b43b01388c599e04
 F ext/wasm/batch-runner.js 6f5b86e0b5519a9a941d9f17ee9c5ecdc63f452f157602fe7fdf87f6275a2b49
 F ext/wasm/common/SqliteTestUtil.js 529161a624265ba84271a52db58da022649832fa1c71309fb1e02cc037327a2b
@@ -519,7 +519,7 @@ F ext/wasm/speedtest1.html 8ae6ece128151d01f90579de69cfa06f021acdb760735250ef745
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
-F ext/wasm/sqlite3-opfs-async-proxy.js 9305d92f32d02983c4528b9c801096cfd8295ca7d24e357d90de9bbcb201d035
+F ext/wasm/sqlite3-opfs-async-proxy.js 0523e3093df2ad2c58691aa65c5e32c0aafb1bbabb6119dd9406d34a8e16dd68
 F ext/wasm/sqlite3-worker1-promiser.js 4fd0465688a28a75f1d4ee4406540ba494f49844e3cad0670d0437a001943365
 F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
 F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
@@ -2026,8 +2026,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 96c734c07acfbea153d9aaf293a28a2d49d78de19fec4fb90c4c08fb1fd0ddbd
-R 861bbf4cfa9812be3b9491caf1943540
+P 777077c4c2249e1ec78390d4f65aaf281c1fbefcef4bcc7609199e995645ceb6
+R 52ae18958684abb42f4ad80857c37c9c
 U stephan
-Z 172073e3d6aad2306bf7614651c7edbb
+Z 4853fab0e74bf411129cdad2e17be435
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 17b72d2509..c688d57d99 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-777077c4c2249e1ec78390d4f65aaf281c1fbefcef4bcc7609199e995645ceb6
\ No newline at end of file
+5c5e80652825cf883e6c17809cb98f2bf17d5feac2d263f6f492479154730dab
\ No newline at end of file

From e8afca3f16c7c2a68e4f18a615f0efc0d3203c1b Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 21 Sep 2022 14:02:47 +0000
Subject: [PATCH 154/428] Correct mistyped --shrink-memory flag in
 speedtest1-worker. Minor OPFS proxy cleanups.

FossilOrigin-Name: 86e2b55ec9483fa5add51a479c6509d73461f1ac6fca5d49e057b1c66f4314d2
---
 ext/wasm/api/sqlite3-api-opfs.js     | 56 ++++++++++++++++------------
 ext/wasm/speedtest1-worker.html      |  2 +-
 ext/wasm/sqlite3-opfs-async-proxy.js | 24 +++++++-----
 manifest                             | 16 ++++----
 manifest.uuid                        |  2 +-
 5 files changed, 58 insertions(+), 42 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index a117d2725e..abdf90d49b 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -99,7 +99,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
     options.proxyUri = callee.defaultProxyUri;
   }
 
-  const thePromise = new Promise(function(promiseResolve, promiseReject){
+  const thePromise = new Promise(function(promiseResolve, promiseReject_){
     const loggers = {
       0:console.error.bind(console),
       1:console.warn.bind(console),
@@ -118,13 +118,6 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
     const sqlite3_vfs = capi.sqlite3_vfs;
     const sqlite3_file = capi.sqlite3_file;
     const sqlite3_io_methods = capi.sqlite3_io_methods;
-    const W = new Worker(options.proxyUri);
-    W._originalOnError = W.onerror /* will be restored later */;
-    W.onerror = function(err){
-      // The error object doesn't contain any useful info when the
-      // failure is, e.g., that the remote script is 404.
-      promiseReject(new Error("Loading OPFS async Worker failed for unknown reasons."));
-    };
     /**
        Generic utilities for working with OPFS. This will get filled out
        by the Promise setup and, on success, installed as sqlite3.opfs.
@@ -200,6 +193,18 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
        gets called at all in a wasm build, which is undefined).
     */
 
+    const promiseReject = function(err){
+      opfsVfs.dispose();
+      return promiseReject_(err);
+    };
+    const W = new Worker(options.proxyUri);
+    W._originalOnError = W.onerror /* will be restored later */;
+    W.onerror = function(err){
+      // The error object doesn't contain any useful info when the
+      // failure is, e.g., that the remote script is 404.
+      promiseReject(new Error("Loading OPFS async Worker failed for unknown reasons."));
+    };
+
     /**
        State which we send to the async-api Worker or share with it.
        This object must initially contain only cloneable or sharable
@@ -220,15 +225,20 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
        require a bit of acrobatics but should be feasible.
     */
     const state = Object.create(null);
-    state.littleEndian = true;
     state.verbose = options.verbose;
+    state.littleEndian = true;
+    /** If true, the async counterpart should log exceptions to
+        the serialization channel. That produces a great deal of
+        noise for seemingly innocuous things like xAccess() checks
+        for missing files. */
+    state.asyncS11nExceptions = false;
     /* Size of file I/O buffer block. 64k = max sqlite3 page size. */
     state.fileBufferSize =
       1024 * 64;
     state.sabS11nOffset = state.fileBufferSize;
     /**
        The size of the block in our SAB for serializing arguments and
-       result values. Need to be large enough to hold serialized
+       result values. Needs to be large enough to hold serialized
        values of any of the proxied APIs. Filenames are the largest
        part but are limited to opfsVfs.$mxPathname bytes.
     */
@@ -278,7 +288,6 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
        counterpart...
     */
     state.sq3Codes = Object.create(null);
-    state.sq3Codes._reverse = Object.create(null);
     [
       'SQLITE_ERROR', 'SQLITE_IOERR',
       'SQLITE_NOTFOUND', 'SQLITE_MISUSE',
@@ -291,11 +300,8 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
       'SQLITE_OPEN_READONLY'
     ].forEach(function(k){
       state.sq3Codes[k] = capi[k] || toss("Maintenance required: not found:",k);
-      state.sq3Codes._reverse[capi[k]] = k;
     });
 
-    const isWorkerErrCode = (n)=>!!state.sq3Codes._reverse[n];
-
     /**
        Runs the given operation (by name) in the async worker
        counterpart, waits for its response, and returns the result
@@ -312,11 +318,11 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
       const t = performance.now();
       Atomics.wait(state.sabOPView, state.opIds.rc, -1);
       const rc = Atomics.load(state.sabOPView, state.opIds.rc);
-      if(rc){
+      metrics[op].wait += performance.now() - t;
+      if(rc && state.asyncS11nExceptions){
         const err = state.s11n.deserialize();
         if(err) error(op+"() async error:",...err);
       }
-      metrics[op].wait += performance.now() - t;
       return rc;
     };
 
@@ -621,7 +627,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
       xFileSize: function(pFile,pSz64){
         mTimeStart('xFileSize');
         const rc = opRun('xFileSize', pFile);
-        if(!isWorkerErrCode(rc)){
+        if(0==rc){
           const sz = state.s11n.deserialize()[0];
           wasm.setMemValue(pSz64, BigInt(sz), 'i64');
         }
@@ -882,6 +888,10 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
         const dbFile = "/sanity/check/file"+randomFilename(8);
         const zDbFile = wasm.scopedAllocCString(dbFile);
         let rc;
+        state.s11n.serialize("This is ä string.");
+        rc = state.s11n.deserialize();
+        log("deserialize() says:",rc);
+        if("This is ä string."!==rc[0]) toss("String d13n error.");
         vfsSyncWrappers.xAccess(opfsVfs.pointer, zDbFile, 0, pOut);
         rc = wasm.getMemValue(pOut,'i32');
         log("xAccess(",dbFile,") exists ?=",rc);
@@ -889,7 +899,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
                                    fid, openFlags, pOut);
         log("open rc =",rc,"state.sabOPView[xOpen] =",
             state.sabOPView[state.opIds.xOpen]);
-        if(isWorkerErrCode(rc)){
+        if(0!==rc){
           error("open failed with code",rc);
           return;
         }
@@ -936,17 +946,17 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
       //log("Worker.onmessage:",data);
       switch(data.type){
           case 'opfs-async-loaded':
-            /*Pass our config and shared state on to the async worker.*/
+            /*Arrives as soon as the asyc proxy finishes loading.
+              Pass our config and shared state on to the async worker.*/
             W.postMessage({type: 'opfs-async-init',args: state});
             break;
           case 'opfs-async-inited':{
-            /*Indicates that the async partner has received the 'init',
-              so we now know that the state object is no longer subject to
-              being copied by a pending postMessage() call.*/
+            /*Indicates that the async partner has received the 'init'
+              and has finished initializing, so the real work can
+              begin...*/
             try {
               const rc = capi.sqlite3_vfs_register(opfsVfs.pointer, 0);
               if(rc){
-                opfsVfs.dispose();
                 toss("sqlite3_vfs_register(OPFS) failed with rc",rc);
               }
               if(opfsVfs.pointer !== capi.sqlite3_vfs_find("opfs")){
diff --git a/ext/wasm/speedtest1-worker.html b/ext/wasm/speedtest1-worker.html
index bcbd473422..b1bc3aace5 100644
--- a/ext/wasm/speedtest1-worker.html
+++ b/ext/wasm/speedtest1-worker.html
@@ -241,7 +241,7 @@
         flags["--serialized"] = "Set serialized threading mode";
         flags["--singlethread"] = "Set single-threaded mode - disables all mutexing";
         flags["--sqlonly"] = "No-op.  Only show the SQL that would have been run.";
-        flags["--shrink"] = "memory     Invoke sqlite3_db_release_memory() frequently.";
+        flags["--shrink-memory"] = "Invoke sqlite3_db_release_memory() frequently.";
         //flags["--size"] = "N            Relative test size.  Default=100";
         flags["--strict"] = "Use STRICT table where appropriate";
         flags["--stats"] = "Show statistics at the end";
diff --git a/ext/wasm/sqlite3-opfs-async-proxy.js b/ext/wasm/sqlite3-opfs-async-proxy.js
index 06bc235ab2..6c0765c63d 100644
--- a/ext/wasm/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/sqlite3-opfs-async-proxy.js
@@ -190,7 +190,7 @@ const vfsAsyncImpls = {
     try {
         await getDirForPath(dirname+"/filepart", true);
     }catch(e){
-      state.s11n.serialize(e.message);
+      state.s11n.storeException(e);
       rc = state.sq3Codes.SQLITE_IOERR;
     }finally{
       wTimeEnd();
@@ -217,7 +217,7 @@ const vfsAsyncImpls = {
       const [dh, fn] = await getDirForPath(filename);
       await dh.getFileHandle(fn);
     }catch(e){
-      state.s11n.serialize(e.message);
+      state.s11n.storeException(e);
       rc = state.sq3Codes.SQLITE_IOERR;
     }finally{
       wTimeEnd();
@@ -278,7 +278,7 @@ const vfsAsyncImpls = {
         filename = filename.join('/');
       }
     }catch(e){
-      state.s11n.serialize(e.message);
+      state.s11n.storeException(e);
       rc = state.sq3Codes.SQLITE_IOERR_DELETE;
     }
     wTimeEnd();
@@ -294,7 +294,7 @@ const vfsAsyncImpls = {
       state.s11n.serialize(Number(sz));
       sz = 0;
     }catch(e){
-      state.s11n.serialize(e.message);
+      state.s11n.storeException(e);
       sz = state.sq3Codes.SQLITE_IOERR;
     }
     wTimeEnd();
@@ -339,7 +339,7 @@ const vfsAsyncImpls = {
     }catch(e){
       wTimeEnd();
       error(opName,e);
-      state.s11n.serialize(e.message);
+      state.s11n.storeException(e);
       storeAndNotify(opName, state.sq3Codes.SQLITE_IOERR);
     }
     mTimeEnd();
@@ -361,7 +361,7 @@ const vfsAsyncImpls = {
       }
     }catch(e){
       error("xRead() failed",e,fh);
-      state.s11n.serialize(e.message);
+      state.s11n.storeException(e);
       rc = state.sq3Codes.SQLITE_IOERR_READ;
     }
     storeAndNotify('xRead',rc);
@@ -376,7 +376,7 @@ const vfsAsyncImpls = {
         wTimeStart('xSync');
         await fh.accessHandle.flush();
       }catch(e){
-        state.s11n.serialize(e.message);
+        state.s11n.storeException(e);
       }finally{
         wTimeEnd();
       }
@@ -394,7 +394,7 @@ const vfsAsyncImpls = {
       await fh.accessHandle.truncate(size);
     }catch(e){
       error("xTruncate():",e,fh);
-      state.s11n.serialize(e.message);
+      state.s11n.storeException(e);
       rc = state.sq3Codes.SQLITE_IOERR_TRUNCATE;
     }
     wTimeEnd();
@@ -414,7 +414,7 @@ const vfsAsyncImpls = {
       ) ? 0 : state.sq3Codes.SQLITE_IOERR_WRITE;
     }catch(e){
       error("xWrite():",e,fh);
-      state.s11n.serialize(e.message);
+      state.s11n.storeException(e);
       rc = state.sq3Codes.SQLITE_IOERR_WRITE;
     }finally{
       wTimeEnd();
@@ -517,6 +517,11 @@ const initS11n = ()=>{
     }
     metrics.s11n.serialize.time += performance.now() - t;
   };
+
+  state.s11n.storeException = state.asyncS11nExceptions
+    ? ((e)=>state.s11n.serialize(e.message))
+    : ()=>{};
+
   return state.s11n;
 }/*initS11n()*/;
 
@@ -570,6 +575,7 @@ navigator.storage.getDirectory().then(function(d){
           /* Receive shared state from synchronous partner */
           const opt = data.args;
           state.littleEndian = opt.littleEndian;
+          state.asyncS11nExceptions = opt.asyncS11nExceptions;
           state.verbose = opt.verbose ?? 2;
           state.fileBufferSize = opt.fileBufferSize;
           state.sabS11nOffset = opt.sabS11nOffset;
diff --git a/manifest b/manifest
index d30df61098..4c5eb3c7e3 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Doc\scleanups\sand\sadditions.\sAdd\sa\sway\sfor\sthe\sOPFS\sasync\srunner\sto\spropagate\sexception\stext\sto\sthe\scalling\sthread.
-D 2022-09-21T12:27:35.940
+C Correct\smistyped\s--shrink-memory\sflag\sin\sspeedtest1-worker.\sMinor\sOPFS\sproxy\scleanups.
+D 2022-09-21T14:02:47.634
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -484,7 +484,7 @@ F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1
 F ext/wasm/api/sqlite3-api-cleanup.js 8564a6077cdcaea9a9f428a019af8a05887f0131e6a2a1e72a7ff1145fadfe77
 F ext/wasm/api/sqlite3-api-glue.js 366d580c8e5bf7fcf4c6dee6f646c31f5549bd417ea03a59a0acca00e8ecce30
 F ext/wasm/api/sqlite3-api-oo1.js f974e79d9af8f26bf33928c5730b0988cc706d14f59a5fe36394739b92249841
-F ext/wasm/api/sqlite3-api-opfs.js dbbce38b0cd89d1eaf829546e2999241127150a40ff2e0331d842a1f31c756e5
+F ext/wasm/api/sqlite3-api-opfs.js d623ea3519cd81fe18e243adfdd07cd1fa4b07ff3b0fd0d2b269beb0e127acb3
 F ext/wasm/api/sqlite3-api-prologue.js 6f3a67c4db37e884d33a05e5cf6d9d9bc012226a18c09f33f662fefd99840a63
 F ext/wasm/api/sqlite3-api-worker1.js 2eeb2a24e1a90322d84a9b88a99919b806623de62792436446099c0988f2030b
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
@@ -513,13 +513,13 @@ F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e5
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
 F ext/wasm/scratchpad-wasmfs-main.js f0836e3576df7a89390d777bb53e142e559e8a79becfb2a5a976490b05a1c4fa
 F ext/wasm/speedtest1-wasmfs.html 9d8cd19eab8854d17f7129aa11607cae6f6d9857c505a4aef13000588583d93e
-F ext/wasm/speedtest1-worker.html ede59f2c1884bf72e3d650064604b48703c81848250b19b8063d260aa3a2201d
+F ext/wasm/speedtest1-worker.html 802cbd09a14b5a7abb4b66bff243d5fd89fd476ffe083554bdfd4c177fb6474c
 F ext/wasm/speedtest1-worker.js 11e7f68cedd2a83b0e638f94c1d2f58406ba672a7e88b66bff5d4f4284e8ba16
 F ext/wasm/speedtest1.html 8ae6ece128151d01f90579de69cfa06f021acdb760735250ef745eba7ed05d49
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
-F ext/wasm/sqlite3-opfs-async-proxy.js 0523e3093df2ad2c58691aa65c5e32c0aafb1bbabb6119dd9406d34a8e16dd68
+F ext/wasm/sqlite3-opfs-async-proxy.js 483b6326e268589ed3749a4d1a60b4ec2afa8ff7c218a09d39430e3bde89862e
 F ext/wasm/sqlite3-worker1-promiser.js 4fd0465688a28a75f1d4ee4406540ba494f49844e3cad0670d0437a001943365
 F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
 F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
@@ -2026,8 +2026,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 777077c4c2249e1ec78390d4f65aaf281c1fbefcef4bcc7609199e995645ceb6
-R 52ae18958684abb42f4ad80857c37c9c
+P 5c5e80652825cf883e6c17809cb98f2bf17d5feac2d263f6f492479154730dab
+R 47f6cfb5732f21f9dd8243259a29763d
 U stephan
-Z 4853fab0e74bf411129cdad2e17be435
+Z efa6548d913df45daccab7f9511bade7
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index c688d57d99..21f4cc3619 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5c5e80652825cf883e6c17809cb98f2bf17d5feac2d263f6f492479154730dab
\ No newline at end of file
+86e2b55ec9483fa5add51a479c6509d73461f1ac6fca5d49e057b1c66f4314d2
\ No newline at end of file

From 65022716b349c82870f13a9004dc6b1071ddfe7d Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 21 Sep 2022 16:21:21 +0000
Subject: [PATCH 155/428] shell.c.in: when building in fiddle mode, define
 _POSIX_SOURCE (ifndef) so that emcc's string.h reveals strdup().

FossilOrigin-Name: fb85b269c43147f153977606dd8ede7b93744bf955e4c1a2b198907fd8a94620
---
 manifest       | 12 ++++++------
 manifest.uuid  |  2 +-
 src/shell.c.in |  8 ++++++++
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/manifest b/manifest
index 4c5eb3c7e3..da44ff671f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Correct\smistyped\s--shrink-memory\sflag\sin\sspeedtest1-worker.\sMinor\sOPFS\sproxy\scleanups.
-D 2022-09-21T14:02:47.634
+C shell.c.in:\swhen\sbuilding\sin\sfiddle\smode,\sdefine\s_POSIX_SOURCE\s(ifndef)\sso\sthat\semcc's\sstring.h\sreveals\sstrdup().
+D 2022-09-21T16:21:21.314
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -615,7 +615,7 @@ F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c d69dfb5b082f9a25e6700e152ddb3d942359b847b1df504eb09f9b4531844f8d
-F src/shell.c.in e7e7c2c69ae86c5ee9e8ad66227203d46ff6dce8700a1b1dababff01c71d33df
+F src/shell.c.in fd57bd685265eda436f98b06adca63c6a6cc170e12c7cd9b0c44826ea65cc6be
 F src/sqlite.h.in b9b7fd73239d94db20332bb6e504688001e5564b655e1318a4427a1caef4b99e
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d
@@ -2026,8 +2026,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 5c5e80652825cf883e6c17809cb98f2bf17d5feac2d263f6f492479154730dab
-R 47f6cfb5732f21f9dd8243259a29763d
+P 86e2b55ec9483fa5add51a479c6509d73461f1ac6fca5d49e057b1c66f4314d2
+R e68dc13d6d9761750c3d366ba59d0406
 U stephan
-Z efa6548d913df45daccab7f9511bade7
+Z b0eba7fb6b60a68e1a0205556e35b01a
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 21f4cc3619..398f422236 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-86e2b55ec9483fa5add51a479c6509d73461f1ac6fca5d49e057b1c66f4314d2
\ No newline at end of file
+fb85b269c43147f153977606dd8ede7b93744bf955e4c1a2b198907fd8a94620
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index d6f3a0aeb6..bef30f5dfc 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -85,6 +85,14 @@
 # define _LARGEFILE_SOURCE 1
 #endif
 
+#if defined(SQLITE_SHELL_FIDDLE) && !defined(_POSIX_SOURCE)
+/*
+** emcc requires _POSIX_SOURCE (or one of several similar defines)
+** to expose strdup().
+*/
+# define _POSIX_SOURCE
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>

From 6110a5d0ab229b40627d09b4118801fca71bc941 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 21 Sep 2022 19:51:25 +0000
Subject: [PATCH 156/428] Put pieces in place for fiddle to support opfs, but
 more cleanup is required in the sqlite3.js/fiddle connection. bigIntEnabled
 now defaults to whether the Emscripten's module has bigint enabled. Add
 wasm-sensible defaults for several SQLITE_ENABLE/OMIT flags in
 sqlite3-wasm.c.

FossilOrigin-Name: 7c7fb7535e86b3960eea7f29ab7e6d5197c166b4ee64ad4a9bc0749f2869badc
---
 ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle |  1 +
 ext/wasm/GNUmakefile                     | 14 +++-----
 ext/wasm/api/sqlite3-api-prologue.js     |  5 ++-
 ext/wasm/api/sqlite3-wasm.c              | 43 +++++++++++++++++++++---
 ext/wasm/fiddle.make                     |  9 +++--
 ext/wasm/fiddle/fiddle-worker.js         | 23 ++++++++++---
 ext/wasm/fiddle/fiddle.html              |  5 ---
 ext/wasm/fiddle/fiddle.js                |  2 +-
 ext/wasm/wasmfs.make                     |  4 +--
 manifest                                 | 28 +++++++--------
 manifest.uuid                            |  2 +-
 11 files changed, 90 insertions(+), 46 deletions(-)

diff --git a/ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle b/ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle
index af2c48a3f4..5e80f703ae 100644
--- a/ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle
+++ b/ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle
@@ -12,3 +12,4 @@ stackAlloc
 stackRestore
 stackSave
 stringToUTF8Array
+wasmMemory
diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 79da723247..83c9ec0ead 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -47,6 +47,7 @@ dir.jacc := jaccwabyt
 dir.common := common
 dir.fiddle := fiddle
 CLEAN_FILES := *~ $(dir.jacc)/*~ $(dir.api)/*~ $(dir.common)/*~
+emcc_enable_bigint ?= 1
 sqlite3.c := $(dir.top)/sqlite3.c
 SQLITE_OPT = \
   -DSQLITE_ENABLE_FTS4 \
@@ -65,7 +66,8 @@ SQLITE_OPT = \
   -DSQLITE_THREADSAFE=0 \
   -DSQLITE_TEMP_STORE=3 \
   -DSQLITE_OS_KV_OPTIONAL=1 \
-  '-DSQLITE_DEFAULT_UNIX_VFS="unix-none"'
+  '-DSQLITE_DEFAULT_UNIX_VFS="unix-none"' \
+  -DSQLITE_USE_URI=1
 #SQLITE_OPT += -DSQLITE_ENABLE_MEMSYS5
 # ^^^ MEMSYS5 is hypothetically useful for non-Emscripten builds but
 # requires adding more infrastructure and fixing one spot in the
@@ -221,11 +223,7 @@ emcc.jsflags += --import-undefined
 #emcc.jsflags += --unresolved-symbols=import-dynamic --experimental-pic
 #emcc.jsflags += --experimental-pic --unresolved-symbols=ingore-all --import-undefined
 #emcc.jsflags += --unresolved-symbols=ignore-all
-enable_bigint ?= 1
-ifneq (0,$(enable_bigint))
-emcc.jsflags += -sWASM_BIGINT
-endif
-emcc.jsflags += -sMEMORY64=0
+emcc.jsflags += -sWASM_BIGINT=$(emcc_enable_bigint)
 # ^^^^ MEMORY64=1 fails to load, erroring with:
 #  invalid memory limits flags 0x5
 #    (enable via --experimental-wasm-memory64)
@@ -333,9 +331,7 @@ speedtest1-common.eflags += -sDYNAMIC_EXECUTION=0
 speedtest1-common.eflags += --minify 0
 speedtest1-common.eflags += -sEXPORT_NAME=sqlite3Speedtest1InitModule
 speedtest1-common.eflags += --post-js=$(post-js.js)
-ifneq (0,$(enable_bigint))
-speedtest1-common.eflags += -sWASM_BIGINT
-endif
+speedtest1-common.eflags += -sWASM_BIGINT=$(emcc_enable_bigint)
 speedtest1.exit-runtime0 := -sEXIT_RUNTIME=0
 speedtest1.exit-runtime1 := -sEXIT_RUNTIME=1
 # Re -sEXIT_RUNTIME=1 vs 0: if it's 1 and speedtest1 crashes, we get
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index a671080052..1e2d387a15 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -147,7 +147,10 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
       Module: undefined/*needed for some test code, not part of the public API*/,
       exports: undefined,
       memory: undefined,
-      bigIntEnabled: !!self.BigInt64Array,
+      bigIntEnabled: (()=>{
+        if('undefined'!==typeof Module) return !!Module.HEAPU64;
+        return !!self.BigInt64Array;
+      })(),
       allocExportName: 'malloc',
       deallocExportName: 'free',
       persistentDirName: '/persistent'
diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index 5b127cb743..e1e5be2483 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -1,11 +1,44 @@
 /*
 ** This file requires access to sqlite3.c static state in order to
-** implement certain WASM-specific features. Unlike the rest of
-** sqlite3.c, this file requires compiling with -std=c99 (or
-** equivalent, or a later C version) because it makes use of features
-** not available in C89.
+** implement certain WASM-specific features, and thus directly
+** includes that file. Unlike the rest of sqlite3.c, this file
+** requires compiling with -std=c99 (or equivalent, or a later C
+** version) because it makes use of features not available in C89.
+**
+** At it's simplest, to build sqlite3.wasm either place this file
+** in the same directory as sqlite3.c/h before compilation or use the
+** -I/path flag to tell the compiler where to find both of those
+** files, then compile this file. For example:
+**
+** emcc -o sqlite3.wasm ... -I/path/to/sqlite3-c-and-h sqlite3-wasm.c
 */
-#include "sqlite3.c"
+
+#ifndef SQLITE_DEFAULT_UNIX_VFS
+# define SQLITE_DEFAULT_UNIX_VFS "unix-none"
+#endif
+#ifndef SQLITE_OMIT_DEPRECATED
+# define SQLITE_OMIT_DEPRECATED
+#endif
+#ifndef SQLITE_OMIT_LOAD_EXTENSION
+# define SQLITE_OMIT_LOAD_EXTENSION
+#endif
+#ifndef SQLITE_OMIT_SHARED_CACHE
+# define SQLITE_OMIT_SHARED_CACHE
+#endif
+#ifndef SQLITE_OMIT_UTF16
+# define SQLITE_OMIT_UTF16
+#endif
+#ifndef SQLITE_OS_KV_OPTIONAL
+# define SQLITE_OS_KV_OPTIONAL 1
+#endif
+#ifndef SQLITE_TEMP_STORE
+# define SQLITE_TEMP_STORE 3
+#endif
+#ifndef SQLITE_THREADSAFE
+# define SQLITE_THREADSAFE 0
+#endif
+
+#include "sqlite3.c" /* yes, .c instead of .h. */
 
 /*
 ** WASM_KEEP is identical to EMSCRIPTEN_KEEPALIVE but is not
diff --git a/ext/wasm/fiddle.make b/ext/wasm/fiddle.make
index 63a665be5c..87018047a4 100644
--- a/ext/wasm/fiddle.make
+++ b/ext/wasm/fiddle.make
@@ -32,12 +32,12 @@ fiddle.emcc-flags = \
   -sENVIRONMENT=web,worker \
   -sMODULARIZE \
   -sDYNAMIC_EXECUTION=0 \
+  -sWASM_BIGINT=$(emcc_enable_bigint) \
   -sEXPORT_NAME=initFiddleModule \
   -sEXPORTED_RUNTIME_METHODS=@$(dir.wasm)/EXPORTED_RUNTIME_METHODS.fiddle \
   -sEXPORTED_FUNCTIONS=@$(dir.wasm)/EXPORTED_FUNCTIONS.fiddle \
   --post-js=$(post-js.js) \
   $(SQLITE_OPT) $(SHELL_OPT) \
-  -D_POSIX_SOURCE \
   -DSQLITE_SHELL_FIDDLE
 # -D_POSIX_C_SOURCE is needed for strdup() with emcc
 
@@ -52,9 +52,13 @@ fiddle-module.js := $(dir.fiddle)/fiddle-module.js
 fiddle-module.wasm := $(subst .js,.wasm,$(fiddle-module.js))
 fiddle.cs := $(dir.top)/shell.c $(sqlite3-wasm.c)
 
+SOAP.js := sqlite3-opfs-async-proxy.js
+$(dir.fiddle)/$(SOAP.js): $(SOAP.js)
+	cp $< $@
+
 $(fiddle-module.js): $(MAKEFILE) $(MAKEFILE.fiddle) \
     EXPORTED_FUNCTIONS.fiddle EXPORTED_RUNTIME_METHODS.fiddle \
-    $(fiddle.cs) $(post-js.js)
+    $(fiddle.cs) $(post-js.js) $(dir.fiddle)/$(SOAP.js)
 	$(emcc.bin) -o $@ $(fiddle.emcc-flags) $(fiddle.cs)
 	$(maybe-wasm-strip) $(fiddle-module.wasm)
 	gzip < $@ > $@.gz
@@ -67,6 +71,7 @@ clean: clean-fiddle
 clean-fiddle:
 	rm -f $(fiddle-module.js) $(fiddle-module.js).gz \
         $(fiddle-module.wasm) $(fiddle-module.wasm).gz \
+        $(dir.fiddle)/$(SOAP.js) \
         EXPORTED_FUNCTIONS.fiddle
 .PHONY: fiddle
 fiddle: $(fiddle-module.js) $(dir.fiddle)/fiddle.js.gz
diff --git a/ext/wasm/fiddle/fiddle-worker.js b/ext/wasm/fiddle/fiddle-worker.js
index 5bc1391753..b76dcf212e 100644
--- a/ext/wasm/fiddle/fiddle-worker.js
+++ b/ext/wasm/fiddle/fiddle-worker.js
@@ -102,8 +102,8 @@
     });
   };
 
-  const stdout = function(){wMsg('stdout', Array.prototype.slice.call(arguments));};
-  const stderr = function(){wMsg('stderr', Array.prototype.slice.call(arguments));};
+  const stdout = (...args)=>wMsg('stdout', args);
+  const stderr = (...args)=>wMsg('stderr', args);
   
   self.onerror = function(/*message, source, lineno, colno, error*/) {
     const err = arguments[4];
@@ -288,7 +288,7 @@
     }
   };
 
-  importScripts('fiddle-module.js');
+  importScripts('fiddle-module.js'+self.location.search);
   /**
      initFiddleModule() is installed via fiddle-module.js due to
      building with:
@@ -296,7 +296,20 @@
      emcc ... -sMODULARIZE=1 -sEXPORT_NAME=initFiddleModule
   */
   initFiddleModule(fiddleModule).then(function(thisModule){
-    thisModule.fsUnlink = thisModule.cwrap('sqlite3_wasm_vfs_unlink','number',['string']);
-    wMsg('fiddle-ready');
+    const S = thisModule.sqlite3;
+    const atEnd = ()=>{
+      thisModule.fsUnlink = thisModule.cwrap('sqlite3_wasm_vfs_unlink','number',['string']);
+      wMsg('fiddle-ready');
+    };
+    if(0){
+      S.installOpfsVfs().finally(function(){
+        if(S.opfs){
+          stdout("OPFS is available.");
+        }
+        atEnd();
+      });
+    }else{
+      atEnd();
+    }
   });
 })();
diff --git a/ext/wasm/fiddle/fiddle.html b/ext/wasm/fiddle/fiddle.html
index 3570b283e3..272f1aca76 100644
--- a/ext/wasm/fiddle/fiddle.html
+++ b/ext/wasm/fiddle/fiddle.html
@@ -273,11 +273,6 @@
         </fieldset>
       </div>
     </div> <!-- #view-split -->
-    <!-- Maintenance notes:
-
-        ... TODO... currently being refactored...
-
-    -->
     <script src="fiddle.js"></script>
   </body>
 </html>
diff --git a/ext/wasm/fiddle/fiddle.js b/ext/wasm/fiddle/fiddle.js
index ec56dd5930..b971233ef9 100644
--- a/ext/wasm/fiddle/fiddle.js
+++ b/ext/wasm/fiddle/fiddle.js
@@ -326,7 +326,7 @@
         }
     }
 
-    SF.worker = new Worker('fiddle-worker.js');
+    SF.worker = new Worker('fiddle-worker.js'+self.location.search);
     SF.worker.onmessage = (ev)=>SF.runMsgHandlers(ev.data);
     SF.addMsgHandler(['stdout', 'stderr'], (ev)=>SF.echo(ev.data));
 
diff --git a/ext/wasm/wasmfs.make b/ext/wasm/wasmfs.make
index d65684b637..ccfd9063b4 100644
--- a/ext/wasm/wasmfs.make
+++ b/ext/wasm/wasmfs.make
@@ -76,9 +76,7 @@ speedtest1-common.eflags += -sEXPORTED_FUNCTIONS=@$(dir.wasm)/EXPORTED_FUNCTIONS
 #^^^ using ALLOW_MEMORY_GROWTH produces a warning from emcc:
 #   USE_PTHREADS + ALLOW_MEMORY_GROWTH may run non-wasm code slowly,
 #   see https://github.com/WebAssembly/design/issues/1271 [-Wpthreads-mem-growth]
-ifneq (0,$(enable_bigint))
-sqlite3-wasmfs.jsflags += -sWASM_BIGINT
-endif
+sqlite3-wasmfs.jsflags += -sWASM_BIGINT=$(emcc_enable_bigint)
 
 $(sqlite3-wasmfs.js): $(sqlite3-wasmfs.wasm.c) $(sqlite3-wasm.c) $(sqlite3-wasmfs.extra.c) \
     EXPORTED_FUNCTIONS.api $(sqlite3-wasm.js) $(MAKEFILE) $(MAKEFILE.wasmfs) \
diff --git a/manifest b/manifest
index da44ff671f..6c44e891e8 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C shell.c.in:\swhen\sbuilding\sin\sfiddle\smode,\sdefine\s_POSIX_SOURCE\s(ifndef)\sso\sthat\semcc's\sstring.h\sreveals\sstrdup().
-D 2022-09-21T16:21:21.314
+C Put\spieces\sin\splace\sfor\sfiddle\sto\ssupport\sopfs,\sbut\smore\scleanup\sis\srequired\sin\sthe\ssqlite3.js/fiddle\sconnection.\sbigIntEnabled\snow\sdefaults\sto\swhether\sthe\sEmscripten's\smodule\shas\sbigint\senabled.\sAdd\swasm-sensible\sdefaults\sfor\sseveral\sSQLITE_ENABLE/OMIT\sflags\sin\ssqlite3-wasm.c.
+D 2022-09-21T19:51:25.111
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -473,8 +473,8 @@ F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 7fb73f7150ab79d83bb45a67d257553c905c78cd3d693101699243f36c5ae6c3
-F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile 45b2815443729ed7de33acb4a2716038f8a41005529cd96bac81f7f0d97d1ded
+F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle 0e88c8cfc3719e4b7e74980d9da664c709e68acf863e48386cda376edfd3bfb0
+F ext/wasm/GNUmakefile 592baa34fba8dc4e272b19c44e768fc1f66c36f96343bb581f02d2fc663192e0
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 8a724a674bd2089eef9676b434c0ab709da00db33f73a94e4987e90169b1cd14
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -485,10 +485,10 @@ F ext/wasm/api/sqlite3-api-cleanup.js 8564a6077cdcaea9a9f428a019af8a05887f0131e6
 F ext/wasm/api/sqlite3-api-glue.js 366d580c8e5bf7fcf4c6dee6f646c31f5549bd417ea03a59a0acca00e8ecce30
 F ext/wasm/api/sqlite3-api-oo1.js f974e79d9af8f26bf33928c5730b0988cc706d14f59a5fe36394739b92249841
 F ext/wasm/api/sqlite3-api-opfs.js d623ea3519cd81fe18e243adfdd07cd1fa4b07ff3b0fd0d2b269beb0e127acb3
-F ext/wasm/api/sqlite3-api-prologue.js 6f3a67c4db37e884d33a05e5cf6d9d9bc012226a18c09f33f662fefd99840a63
+F ext/wasm/api/sqlite3-api-prologue.js 76fcd56005717cf4ef6c57cee4d7679c9a5fa8c060110485c1318f5b548abac8
 F ext/wasm/api/sqlite3-api-worker1.js 2eeb2a24e1a90322d84a9b88a99919b806623de62792436446099c0988f2030b
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c 9401a3f9bd191a410b4f679b7957c6b7e168a68106f52ddeafa1c776d0364e49
+F ext/wasm/api/sqlite3-wasm.c d1c0724136480a459d9dda4b76a665691a172d5cba96729d26d26acf6480bc9b
 F ext/wasm/batch-runner.html 2857a6db7292ac83d1581af865d643fd34235db2df830d10b43b01388c599e04
 F ext/wasm/batch-runner.js 6f5b86e0b5519a9a941d9f17ee9c5ecdc63f452f157602fe7fdf87f6275a2b49
 F ext/wasm/common/SqliteTestUtil.js 529161a624265ba84271a52db58da022649832fa1c71309fb1e02cc037327a2b
@@ -500,11 +500,11 @@ F ext/wasm/demo-123.html aa281d33b7eefa755f3122b7b5a18f39a42dc5fb69c8879171bf14b
 F ext/wasm/demo-123.js 234655683e35a4543a23de7b10800d76b0369947b33e089e5613171fa7795afb
 F ext/wasm/demo-kvvfs1.html 7d4f28873de67f51ac18c584b7d920825139866a96049a49c424d6f5a0ea5e7f
 F ext/wasm/demo-kvvfs1.js e884ea35022d772c0d1dd884b40011413696438394f605c6cd4808cfb1642a4a
-F ext/wasm/fiddle.make 8b1018e8d91b6d3add93813302a4acf2e5693dd9882499e38eccaec73afb1f79
+F ext/wasm/fiddle.make fd56fa21bada6ecbf860686a9a789ebda7cc3d9b60835927000fcb00246ea50f
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
-F ext/wasm/fiddle/fiddle-worker.js bccf46045be8824752876f3eec01c223be0616ccac184bffd0024cfe7a3262b8
-F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
-F ext/wasm/fiddle/fiddle.js 4ffcfc9a235beebaddec689a549e9e0dfad6dca5c1f0b41f03468d7e76480686
+F ext/wasm/fiddle/fiddle-worker.js 3a258f7c79f36958d8f63bceb3dd178bb2dfc6a802329e9349612ecb1d9fcd09
+F ext/wasm/fiddle/fiddle.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
+F ext/wasm/fiddle/fiddle.js dae246414ebd56ecdc09cf95c43b2d50e1332a331832a27915782c7767f92f45
 F ext/wasm/index.html 8b4b7ea052d558262c8466f94326fb455c21049b2d1d3577ed0a5fce15101ba8
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 447cc02b598f7792edaa8ae6853a7847b8178a18ed356afacbdbf312b2588106
@@ -530,7 +530,7 @@ F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d766
 F ext/wasm/testing1.js 507001a970fe8a8eb67b6c8d783e1c1daa3db2719f727c4551af29349410e538
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
 F ext/wasm/testing2.js 25584bcc30f19673ce13a6f301f89f8820a59dfe044e0c4f2913941f4097fe3c
-F ext/wasm/wasmfs.make b24fa0199ddf9720ae8b0c7751a5dbdb2501c8d7c57ecf8c2e0a80ebf4b2d00b
+F ext/wasm/wasmfs.make 52f24bc9c10e404d26bd0b0ee28d450269808a78e359d6ddedc45d31e7b9c29c
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
@@ -2026,8 +2026,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 86e2b55ec9483fa5add51a479c6509d73461f1ac6fca5d49e057b1c66f4314d2
-R e68dc13d6d9761750c3d366ba59d0406
+P fb85b269c43147f153977606dd8ede7b93744bf955e4c1a2b198907fd8a94620
+R 353052de95c54515940c8efa7fbb5d76
 U stephan
-Z b0eba7fb6b60a68e1a0205556e35b01a
+Z 6e975524f2561f74f6e19ffa720f7e6c
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 398f422236..d64a3ada8c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fb85b269c43147f153977606dd8ede7b93744bf955e4c1a2b198907fd8a94620
\ No newline at end of file
+7c7fb7535e86b3960eea7f29ab7e6d5197c166b4ee64ad4a9bc0749f2869badc
\ No newline at end of file

From f75c0c703697a2f1eea678e92f91982b56ca7cbf Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 21 Sep 2022 20:24:12 +0000
Subject: [PATCH 157/428] Reformulate some JS to work around a buggy/broken
 code transformation in one of the Emscripten-driven code optimizers.

FossilOrigin-Name: e1249369d5ec1c582c280b1f578b35d53637fdf1cbd97c16d5ed95b136b83e56
---
 ext/wasm/GNUmakefile             | 26 +++++++++++++-------------
 ext/wasm/api/sqlite3-api-glue.js |  6 ++++--
 manifest                         | 14 +++++++-------
 manifest.uuid                    |  2 +-
 4 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 83c9ec0ead..030b9ac5db 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -79,7 +79,7 @@ SQLITE_OPT = \
 ifneq (,$(filter release,$(MAKECMDGOALS)))
 emcc_opt ?= -Oz -g3 -flto
 else
-emcc_opt ?= -O0 -g
+emcc_opt ?= -O0 -g3
 # ^^^^ build times for -O levels higher than 0 are painful at
 # dev-time.
 endif
@@ -414,18 +414,18 @@ push-fiddle: $(fiddle_files)
 .PHONY: o0 o1 o2 o3 os oz
 o-xtra :=
 #o-xtra += -flto
-o0:
-	$(MAKE) clean; $(MAKE) -e "emcc_opt=-O0 $(o-xtra)" fiddle_opt=-O0
-o1:
-	$(MAKE) clean; $(MAKE) -e "emcc_opt=-O1 $(o-xtra)" fiddle_opt=-O1
-o2:
-	$(MAKE) clean; $(MAKE) -e "emcc_opt=-O2 $(o-xtra)" fiddle_opt=-O2
-o3:
-	$(MAKE) clean; $(MAKE) -e "emcc_opt=-O3 $(o-xtra)" fiddle_opt=-O3
-os:
-	$(MAKE) clean; $(MAKE) -e "emcc_opt=-Os $(o-xtra)" fiddle_opt=-Os
-oz:
-	$(MAKE) clean; $(MAKE) -e "emcc_opt=-Oz $(o-xtra)" fiddle_opt=-Oz
+o0: clean
+	$(MAKE) -e "emcc_opt=-O0 $(o-xtra)" fiddle_opt=-O0
+o1: clean
+	$(MAKE) -e "emcc_opt=-O1 $(o-xtra)" fiddle_opt=-O1
+o2: clean
+	$(MAKE) -e "emcc_opt=-O2 $(o-xtra)" fiddle_opt=-O2
+o3: clean
+	$(MAKE) -e "emcc_opt=-O3 $(o-xtra)" fiddle_opt=-O3
+os: clean
+	$(MAKE) -e "emcc_opt=-Os $(o-xtra)" fiddle_opt=-Os
+oz: clean
+	$(MAKE) -e "emcc_opt=-Oz $(o-xtra)" fiddle_opt=-Oz
 
 ########################################################################
 # Sub-makes...
diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index 67f9403548..847bf7bc2c 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -179,8 +179,10 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
                     'openFlags', 'prepareFlags', 'resultCodes',
                     'syncFlags', 'udfFlags', 'version'
                    ]){
-      for(const [k,v] of Object.entries(wasm.ctype[t])){
-        capi[k] = v;
+      for(const e of Object.entries(wasm.ctype[t])){
+        // ^^^ [k,v] there triggers a buggy code transormation via one
+        // of the Emscripten-driven optimizers.
+        capi[e[0]] = e[1];
       }
     }
     /* Bind all registered C-side structs... */
diff --git a/manifest b/manifest
index 6c44e891e8..e575dac86d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Put\spieces\sin\splace\sfor\sfiddle\sto\ssupport\sopfs,\sbut\smore\scleanup\sis\srequired\sin\sthe\ssqlite3.js/fiddle\sconnection.\sbigIntEnabled\snow\sdefaults\sto\swhether\sthe\sEmscripten's\smodule\shas\sbigint\senabled.\sAdd\swasm-sensible\sdefaults\sfor\sseveral\sSQLITE_ENABLE/OMIT\sflags\sin\ssqlite3-wasm.c.
-D 2022-09-21T19:51:25.111
+C Reformulate\ssome\sJS\sto\swork\saround\sa\sbuggy/broken\scode\stransformation\sin\sone\sof\sthe\sEmscripten-driven\scode\soptimizers.
+D 2022-09-21T20:24:12.588
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 7fb73f7150ab79d83bb45a67d257553c905c78cd3d693101699243f36c5ae6c3
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle 0e88c8cfc3719e4b7e74980d9da664c709e68acf863e48386cda376edfd3bfb0
-F ext/wasm/GNUmakefile 592baa34fba8dc4e272b19c44e768fc1f66c36f96343bb581f02d2fc663192e0
+F ext/wasm/GNUmakefile 34a84e30e6b25e24959a8264e9dec020dffa82d96879dc55ad65d3c31c95d3b1
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 8a724a674bd2089eef9676b434c0ab709da00db33f73a94e4987e90169b1cd14
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -482,7 +482,7 @@ F ext/wasm/api/README.md d876597edd2b9542b6ea031adaaff1c042076fde7b670b1dc6d8a87
 F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba81456260a713ed04900c
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
 F ext/wasm/api/sqlite3-api-cleanup.js 8564a6077cdcaea9a9f428a019af8a05887f0131e6a2a1e72a7ff1145fadfe77
-F ext/wasm/api/sqlite3-api-glue.js 366d580c8e5bf7fcf4c6dee6f646c31f5549bd417ea03a59a0acca00e8ecce30
+F ext/wasm/api/sqlite3-api-glue.js cfff894bdf98a6c579975d09dd45471b0e3399f08a6f9e44a22646e8403196ed
 F ext/wasm/api/sqlite3-api-oo1.js f974e79d9af8f26bf33928c5730b0988cc706d14f59a5fe36394739b92249841
 F ext/wasm/api/sqlite3-api-opfs.js d623ea3519cd81fe18e243adfdd07cd1fa4b07ff3b0fd0d2b269beb0e127acb3
 F ext/wasm/api/sqlite3-api-prologue.js 76fcd56005717cf4ef6c57cee4d7679c9a5fa8c060110485c1318f5b548abac8
@@ -2026,8 +2026,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 fb85b269c43147f153977606dd8ede7b93744bf955e4c1a2b198907fd8a94620
-R 353052de95c54515940c8efa7fbb5d76
+P 7c7fb7535e86b3960eea7f29ab7e6d5197c166b4ee64ad4a9bc0749f2869badc
+R 21b4f88ebebc444a2dca81501f78488d
 U stephan
-Z 6e975524f2561f74f6e19ffa720f7e6c
+Z de96dd791c0a9ecdd14104957785e773
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index d64a3ada8c..28b4a319ca 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7c7fb7535e86b3960eea7f29ab7e6d5197c166b4ee64ad4a9bc0749f2869badc
\ No newline at end of file
+e1249369d5ec1c582c280b1f578b35d53637fdf1cbd97c16d5ed95b136b83e56
\ No newline at end of file

From 80b1f6fcde2a2be6219f4e238b0199daf3ad1923 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Fri, 23 Sep 2022 11:40:43 +0000
Subject: [PATCH 158/428] Fix various compiler warnings in new code on this
 branch.

FossilOrigin-Name: ae49e9efde3012158061def6e0a8d993abbc5933514a21f84bc10f700f61b5e2
---
 ext/recover/sqlite3recover.c | 10 +---------
 manifest                     | 14 +++++++-------
 manifest.uuid                |  2 +-
 src/shell.c.in               |  2 +-
 4 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index a370ca0c46..9993aa42ac 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -526,12 +526,8 @@ static void recoverPageIsUsed(
 ){
   sqlite3_recover *p = (sqlite3_recover*)sqlite3_user_data(pCtx);
   i64 pgno = sqlite3_value_int64(apArg[0]);
-  sqlite3_stmt *pStmt = 0;
-  int bRet;
-
   assert( nArg==1 );
-  bRet = recoverBitmapQuery(p->pUsed, pgno);
-  sqlite3_result_int(pCtx, bRet);
+  sqlite3_result_int(pCtx, recoverBitmapQuery(p->pUsed, pgno));
 }
 
 /*
@@ -572,7 +568,6 @@ static void recoverGetPage(
     }
 
     if( pStmt ){
-      int rc = SQLITE_OK;
       sqlite3_bind_int64(pStmt, 1, pgno);
       if( SQLITE_ROW==sqlite3_step(pStmt) ){
         sqlite3_result_value(pCtx, sqlite3_column_value(pStmt, 0));
@@ -1039,7 +1034,6 @@ static int recoverWriteSchema2(sqlite3_recover *p){
 
   if( pSelect ){
     while( sqlite3_step(pSelect)==SQLITE_ROW ){
-      i64 iRoot = sqlite3_column_int64(pSelect, 0);
       const char *zSql = (const char*)sqlite3_column_text(pSelect, 1);
       int rc = sqlite3_exec(p->dbOut, zSql, 0, 0, 0);
       if( rc==SQLITE_OK ){
@@ -1557,8 +1551,6 @@ static int recoverWriteData(sqlite3_recover *p){
 
           if( bNewCell ){
             if( nVal>=0 ){
-              int iVal = 0;
-
               if( pInsert==0 || nVal!=nInsert ){
                 recoverFinalize(p, pInsert);
                 pInsert = recoverInsertStmt(p, pTab, nVal);
diff --git a/manifest b/manifest
index 92d350697a..3e97238582 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
-D 2022-09-23T11:30:24.654
+C Fix\svarious\scompiler\swarnings\sin\snew\scode\son\sthis\sbranch.
+D 2022-09-23T11:40:43.554
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -397,7 +397,7 @@ F ext/recover/recoverfault2.test 321036336af23e778a87f148c4cc4407f88fbdab1fd72dd
 F ext/recover/recoverold.test 46e9d99b595fac583d4c67f74d7d89c20a435c752ef6eeb3e918b599940c88e0
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
-F ext/recover/sqlite3recover.c 699d14bf128f103f823dbeef0aa4987ae0f8cd822b113fca5be5615ca57f28de
+F ext/recover/sqlite3recover.c e4a31b4f1f7a6d18a9c71774049262cd91c3f256f41ee257fbaa7bc71dbd5622
 F ext/recover/sqlite3recover.h 81108efb8c4618d3d9c6da4df785212b0e4501aa0d25edfc463405fe839a6640
 F ext/recover/test_recover.c 72a765616a3fa9dae2ed537d79b00f365d9f639d347858341b71bda7a3a45f56
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -602,7 +602,7 @@ F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c bb18acf4eded647fef88d4d543c673874dbebff516fbeba90a85e6c13f2a58cd
-F src/shell.c.in 36d5792e35515f2389f175b41486b78b1ad6e571799e3c9b211f47c3629f96e5
+F src/shell.c.in e3efe4cf89be18c96993b714c3784946ef7af9be682ad8f0e97eb1926510befd
 F src/sqlite.h.in b9b7fd73239d94db20332bb6e504688001e5564b655e1318a4427a1caef4b99e
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d
@@ -2013,8 +2013,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 abcbb6abfe08fc590123f0aa1bd72cfdecc75908f078f1348dc0e957de98bf52 38aaf26e082bd95df6b64df43e1772fe6e20c4eb71307dcd97559cac7f11f8f1
-R 6b2b96167d95e43311ba941f50355c02
+P e87fa70ab0f9b95bbcde18567f47906a222a3fd02b4f3c2903d2bb087d361b7c
+R cddb3dc3765037df525a9b042c70398c
 U dan
-Z abbafc4cd8c328672c6dcbf15b485242
+Z 42c3428e8988c9082d113fe0563e38ab
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 696d9dd5ab..2f79bbe0c8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e87fa70ab0f9b95bbcde18567f47906a222a3fd02b4f3c2903d2bb087d361b7c
\ No newline at end of file
+ae49e9efde3012158061def6e0a8d993abbc5933514a21f84bc10f700f61b5e2
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index 739c2d816c..ba9f0b8eb5 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -7261,7 +7261,7 @@ end_ar_command:
 */
 static int recoverSqlCb(void *pCtx, const char *zSql){
   ShellState *pState = (ShellState*)pCtx;
-  raw_printf(stdout, "%s;\n", zSql);
+  utf8_printf(pState->out, "%s;\n", zSql);
   return SQLITE_OK;
 }
 

From 9bbd91b39dbcf1c6657fa7d2b79d5c9be3137293 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Fri, 23 Sep 2022 21:01:10 +0000
Subject: [PATCH 159/428] Internal changes to the recover extension towards a
 step() style interface.

FossilOrigin-Name: 73926d5c8cd1ecece134b5a73b44ee1dfca74dc200606e3f009b06cdecf8cee9
---
 ext/recover/sqlite3recover.c | 344 ++++++++++++++++++++---------------
 manifest                     |  12 +-
 manifest.uuid                |   2 +-
 3 files changed, 208 insertions(+), 150 deletions(-)

diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index 9993aa42ac..74732faca5 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -140,6 +140,23 @@ struct RecoverBitmap {
   u32 aElem[1];                   /* Array of 32-bit bitmasks */
 };
 
+typedef struct RecoverStateW1 RecoverStateW1;
+struct RecoverStateW1 {
+  sqlite3_stmt *pTbls;
+  sqlite3_stmt *pSel;
+  sqlite3_stmt *pInsert;
+  int nInsert;
+
+  RecoverTable *pTab;             /* Table currently being written */
+  int nMax;                       /* Max column count in any schema table */
+  sqlite3_value **apVal;          /* Array of nMax values */
+  int nVal;                       /* Number of valid entries in apVal[] */
+  int bHaveRowid;
+  i64 iRowid;
+  i64 iPrevPage;
+  int iPrevCell;
+};
+
 /*
 ** Main recover handle structure.
 */
@@ -161,14 +178,21 @@ struct sqlite3_recover {
   int errCode;                    /* For sqlite3_recover_errcode() */
   char *zErrMsg;                  /* For sqlite3_recover_errmsg() */
 
+  /* Variables used with eState==RECOVER_STATE_WRITING */
+  RecoverStateW1 w1;
+
   /* Fields used within sqlite3_recover_run() */
   int bRun;                       /* True once _recover_run() has been called */
   sqlite3 *dbOut;                 /* Output database */
   sqlite3_stmt *pGetPage;         /* SELECT against input db sqlite_dbdata */
-  RecoverTable *pTblList;         /* List of tables recovered from schem */
+  RecoverTable *pTblList;         /* List of tables recovered from schema */
   RecoverBitmap *pUsed;           /* Used by recoverLostAndFound() */
 };
 
+#define RECOVER_STATE_INIT          0
+#define RECOVER_STATE_WRITING       1
+#define RECOVER_STATE_LOSTANDFOUND  2
+
 /* 
 ** Default value for SQLITE_RECOVER_ROWIDS (sqlite3_recover.bRecoverRowid).
 */
@@ -1381,10 +1405,26 @@ static void recoverLostAndFound(sqlite3_recover *p){
     int nField = 0;
 
     /* Add all pages that are part of any tree in the recoverable part of
-    ** the input database schema to the bitmap. */
+    ** the input database schema to the bitmap. And, if !p->bFreelistCorrupt, 
+    ** add all pages that appear to be part of the freelist to the bitmap. 
+    */
     sqlite3_stmt *pStmt = recoverPrepare(
         p, p->dbOut,
-        "WITH roots(r) AS ("
+        "WITH trunk(pgno) AS ("
+        "  SELECT read_i32(getpage(1), 8) AS x WHERE x>0"
+        "    UNION"
+        "  SELECT read_i32(getpage(trunk.pgno), 0) AS x FROM trunk WHERE x>0"
+        "),"
+        "trunkdata(pgno, data) AS ("
+        "  SELECT pgno, getpage(pgno) FROM trunk"
+        "),"
+        "freelist(data, n, freepgno) AS ("
+        "  SELECT data, min(16384, read_i32(data, 1)-1), pgno FROM trunkdata"
+        "    UNION ALL"
+        "  SELECT data, n-1, read_i32(data, 2+n) FROM freelist WHERE n>=0"
+        "),"
+        ""
+        "roots(r) AS ("
         "  SELECT 1 UNION ALL"
         "  SELECT rootpage FROM recovery.schema WHERE rootpage>0"
         "),"
@@ -1395,37 +1435,16 @@ static void recoverLostAndFound(sqlite3_recover *p){
         "    WHERE pgno=page"
         ") "
         "SELECT page FROM used"
+        " UNION ALL "
+        "SELECT freepgno FROM freelist WHERE NOT ?"
     );
+    if( pStmt ) sqlite3_bind_int(pStmt, 1, p->bFreelistCorrupt);
     while( pStmt && SQLITE_ROW==sqlite3_step(pStmt) ){
       i64 iPg = sqlite3_column_int64(pStmt, 0);
       recoverBitmapSet(pMap, iPg);
     }
     recoverFinalize(p, pStmt);
 
-    /* Add all pages that appear to be part of the freelist to the bitmap. */
-    if( p->bFreelistCorrupt==0 ){
-      pStmt = recoverPrepare(p, p->dbOut,
-          "WITH trunk(pgno) AS ("
-          "  SELECT read_i32(getpage(1), 8) AS x WHERE x>0"
-          "    UNION"
-          "  SELECT read_i32(getpage(trunk.pgno), 0) AS x FROM trunk WHERE x>0"
-          "),"
-          "trunkdata(pgno, data) AS ("
-          "  SELECT pgno, getpage(pgno) FROM trunk"
-          "),"
-          "freelist(data, n, freepgno) AS ("
-          "  SELECT data, min(16384, read_i32(data, 1)-1), pgno FROM trunkdata"
-          "    UNION ALL"
-          "  SELECT data, n-1, read_i32(data, 2+n) FROM freelist WHERE n>=0"
-          ")"
-          "SELECT freepgno FROM freelist"
-      );
-      while( pStmt && SQLITE_ROW==sqlite3_step(pStmt) ){
-        i64 iPg = sqlite3_column_int64(pStmt, 0);
-        recoverBitmapSet(pMap, iPg);
-      }
-      recoverFinalize(p, pStmt);
-    }
 
     /* Add an entry for each page not already added to the bitmap to 
     ** the recovery.map table. This loop leaves the "parent" column
@@ -1474,38 +1493,31 @@ static void recoverLostAndFound(sqlite3_recover *p){
   }
 }
 
-/*
-** For each table in the recovered schema, this function extracts as much
-** data as possible from the output database and writes it to the input
-** database. Or, if the recover handle is in SQL callback mode, issues
-** equivalent callbacks.
-**
-** It does not recover "orphaned" data into the lost-and-found table.
-** See recoverLostAndFound() for that.
-*/
-static int recoverWriteData(sqlite3_recover *p){
-  RecoverTable *pTbl;
-  int nMax = 0;
-  sqlite3_value **apVal = 0;
-
-  sqlite3_stmt *pTbls = 0;
-  sqlite3_stmt *pSel = 0;
+static int recoverWriteDataInit(sqlite3_recover *p){
+  RecoverStateW1 *p1 = &p->w1;
+  RecoverTable *pTbl = 0;
+  int nByte = 0;
 
   /* Figure out the maximum number of columns for any table in the schema */
+  assert( p1->nMax==0 );
   for(pTbl=p->pTblList; pTbl; pTbl=pTbl->pNext){
-    if( pTbl->nCol>nMax ) nMax = pTbl->nCol;
+    if( pTbl->nCol>p1->nMax ) p1->nMax = pTbl->nCol;
   }
 
-  apVal = (sqlite3_value**)recoverMalloc(p, sizeof(sqlite3_value*) * (nMax+1));
-  if( apVal==0 ) return p->errCode;
+  /* Allocate an array of (sqlite3_value*) in which to accumulate the values
+  ** that will be written to the output database in a single row. */
+  nByte = sizeof(sqlite3_value*) * (p1->nMax+1);
+  p1->apVal = (sqlite3_value**)recoverMalloc(p, nByte);
+  if( p1->apVal==0 ) return p->errCode;
 
-  pTbls = recoverPrepare(p, p->dbOut,
+  /* Prepare the SELECT to loop through schema tables (pTbls) and the SELECT
+  ** to loop through cells that appear to belong to a single table (pSel). */
+  p1->pTbls = recoverPrepare(p, p->dbOut,
       "SELECT rootpage FROM recovery.schema "
       "  WHERE type='table' AND (sql NOT LIKE 'create virtual%')"
       "  ORDER BY (tbl_name='sqlite_sequence') ASC"
   );
-
-  pSel = recoverPrepare(p, p->dbOut, 
+  p1->pSel = recoverPrepare(p, p->dbOut, 
       "WITH RECURSIVE pages(page) AS ("
       "  SELECT ?1"
       "    UNION"
@@ -1517,114 +1529,160 @@ static int recoverWriteData(sqlite3_recover *p){
       "UNION ALL "
       "SELECT 0, 0, 0, 0"
   );
-  if( pSel ){
 
-    /* The outer loop runs once for each table to recover. */
-    while( sqlite3_step(pTbls)==SQLITE_ROW ){
-      i64 iRoot = sqlite3_column_int64(pTbls, 0);
-      RecoverTable *pTab = recoverFindTable(p, iRoot);
-      if( pTab ){
-        int ii;
-        sqlite3_stmt *pInsert = 0;
-        int nInsert = -1;
-        i64 iPrevPage = -1;
-        int iPrevCell = -1;
-        int bHaveRowid = 0;           /* True if iRowid is valid */
-        i64 iRowid = 0;
-        int nVal = -1;
+  return p->errCode;
+}
 
-        if( sqlite3_stricmp("sqlite_sequence", pTab->zTab)==0 ){
-          recoverExec(p, p->dbOut, "DELETE FROM sqlite_sequence");
-          recoverSqlCallback(p, "DELETE FROM sqlite_sequence");
+/*
+** Clean up resources allocated by recoverWriteDataInit() (stuff in 
+** sqlite3_recover.w1).
+*/
+static void recoverWriteDataCleanup(sqlite3_recover *p){
+  RecoverStateW1 *p1 = &p->w1;
+  int ii;
+  for(ii=0; ii<p1->nVal; ii++){
+    sqlite3_value_free(p1->apVal[ii]);
+  }
+  sqlite3_free(p1->apVal);
+  recoverFinalize(p, p1->pInsert);
+  recoverFinalize(p, p1->pTbls);
+  recoverFinalize(p, p1->pSel);
+}
+
+static int recoverWriteDataStep(sqlite3_recover *p){
+  RecoverStateW1 *p1 = &p->w1;
+  sqlite3_stmt *pSel = p1->pSel;
+  sqlite3_value **apVal = p1->apVal;
+
+  if( p1->pTab==0 ){
+    if( sqlite3_step(p1->pTbls)==SQLITE_ROW ){
+      i64 iRoot = sqlite3_column_int64(p1->pTbls, 0);
+      p1->pTab = recoverFindTable(p, iRoot);
+
+      recoverFinalize(p, p1->pInsert);
+      p1->pInsert = 0;
+
+      /* If this table is unknown, return early. The caller will invoke this
+      ** function again and it will move on to the next table.  */
+      if( p1->pTab==0 ) return p->errCode;
+
+      /* If this is the sqlite_sequence table, delete any rows added by
+      ** earlier INSERT statements on tables with AUTOINCREMENT primary
+      ** keys before recovering its contents. The p1->pTbls SELECT statement
+      ** is rigged to deliver "sqlite_sequence" last of all, so we don't
+      ** worry about it being modified after it is recovered. */
+      if( sqlite3_stricmp("sqlite_sequence", p1->pTab->zTab)==0 ){
+        recoverExec(p, p->dbOut, "DELETE FROM sqlite_sequence");
+        recoverSqlCallback(p, "DELETE FROM sqlite_sequence");
+      }
+
+      /* Bind the root page of this table within the original database to 
+      ** SELECT statement p1->pSel. The SELECT statement will then iterate
+      ** through cells that look like they belong to table pTab.  */
+      sqlite3_bind_int64(pSel, 1, iRoot);
+
+      p1->nVal = 0;
+      p1->bHaveRowid = 0;
+      p1->iPrevPage = -1;
+      p1->iPrevCell = -1;
+    }else{
+      return SQLITE_DONE;
+    }
+  }
+  assert( p1->pTab );
+
+  if( p->errCode==SQLITE_OK && sqlite3_step(pSel)==SQLITE_ROW ){
+    RecoverTable *pTab = p1->pTab;
+
+    i64 iPage = sqlite3_column_int64(pSel, 0);
+    int iCell = sqlite3_column_int(pSel, 1);
+    int iField = sqlite3_column_int(pSel, 2);
+    sqlite3_value *pVal = sqlite3_column_value(pSel, 3);
+    int bNewCell = (p1->iPrevPage!=iPage || p1->iPrevCell!=iCell);
+
+    assert( bNewCell==0 || (iField==-1 || iField==0) );
+    assert( bNewCell || iField==p1->nVal || p1->nVal==pTab->nCol );
+
+    if( bNewCell ){
+      int ii = 0;
+      if( p1->nVal>=0 ){
+        if( p1->pInsert==0 || p1->nVal!=p1->nInsert ){
+          recoverFinalize(p, p1->pInsert);
+          p1->pInsert = recoverInsertStmt(p, pTab, p1->nVal);
+          p1->nInsert = p1->nVal;
         }
-
-        sqlite3_bind_int64(pSel, 1, iRoot);
-        while( p->errCode==SQLITE_OK && sqlite3_step(pSel)==SQLITE_ROW ){
-          i64 iPage = sqlite3_column_int64(pSel, 0);
-          int iCell = sqlite3_column_int(pSel, 1);
-          int iField = sqlite3_column_int(pSel, 2);
-          sqlite3_value *pVal = sqlite3_column_value(pSel, 3);
-
-          int bNewCell = (iPrevPage!=iPage || iPrevCell!=iCell);
-          assert( bNewCell==0 || (iField==-1 || iField==0) );
-          assert( bNewCell || iField==nVal || nVal==pTab->nCol );
-
-          if( bNewCell ){
-            if( nVal>=0 ){
-              if( pInsert==0 || nVal!=nInsert ){
-                recoverFinalize(p, pInsert);
-                pInsert = recoverInsertStmt(p, pTab, nVal);
-                nInsert = nVal;
-              }
-              if( nVal>0 ){
-                for(ii=0; ii<pTab->nCol; ii++){
-                  RecoverColumn *pCol = &pTab->aCol[ii];
-		  int iBind = pCol->iBind;
-                  if( iBind>0 ){
-                    if( pCol->bIPK ){
-                      sqlite3_bind_int64(pInsert, iBind, iRowid);
-                    }else if( pCol->iField<nVal ){
-                      recoverBindValue(p, pInsert, iBind, apVal[pCol->iField]);
-                    }
-                  }
-                }
-                if( p->bRecoverRowid && pTab->iRowidBind>0 && bHaveRowid ){
-                  sqlite3_bind_int64(pInsert, pTab->iRowidBind, iRowid);
-                }
-
-                if( SQLITE_ROW==sqlite3_step(pInsert) ){
-                  const char *z = (const char*)sqlite3_column_text(pInsert, 0);
-                  recoverSqlCallback(p, z);
-                }
-                recoverReset(p, pInsert);
-                assert( p->errCode || pInsert );
-                if( pInsert ) sqlite3_clear_bindings(pInsert);
+        if( p1->nVal>0 ){
+          sqlite3_stmt *pInsert = p1->pInsert;
+          for(ii=0; ii<pTab->nCol; ii++){
+            RecoverColumn *pCol = &pTab->aCol[ii];
+            int iBind = pCol->iBind;
+            if( iBind>0 ){
+              if( pCol->bIPK ){
+                sqlite3_bind_int64(pInsert, iBind, p1->iRowid);
+              }else if( pCol->iField<p1->nVal ){
+                recoverBindValue(p, pInsert, iBind, apVal[pCol->iField]);
               }
             }
-
-            for(ii=0; ii<nVal; ii++){
-              sqlite3_value_free(apVal[ii]);
-              apVal[ii] = 0;
-            }
-            nVal = -1;
-            bHaveRowid = 0;
           }
-
-          if( iPage!=0 ){
-            if( iField<0 ){
-              iRowid = sqlite3_column_int64(pSel, 3);
-              assert( nVal==-1 );
-              nVal = 0;
-              bHaveRowid = 1;
-            }else if( iField<pTab->nCol ){
-              assert( apVal[iField]==0 );
-              apVal[iField] = sqlite3_value_dup( pVal );
-              if( apVal[iField]==0 ){
-                recoverError(p, SQLITE_NOMEM, 0);
-              }
-              nVal = iField+1;
-            }
-            iPrevCell = iCell;
-            iPrevPage = iPage;
+          if( p->bRecoverRowid && pTab->iRowidBind>0 && p1->bHaveRowid ){
+            sqlite3_bind_int64(pInsert, pTab->iRowidBind, p1->iRowid);
           }
-        }
-
-        recoverReset(p, pSel);
-        recoverFinalize(p, pInsert);
-        pInsert = 0;
-        for(ii=0; ii<nVal; ii++){
-          sqlite3_value_free(apVal[ii]);
-          apVal[ii] = 0;
+          if( SQLITE_ROW==sqlite3_step(pInsert) ){
+            const char *z = (const char*)sqlite3_column_text(pInsert, 0);
+            recoverSqlCallback(p, z);
+          }
+          recoverReset(p, pInsert);
+          assert( p->errCode || pInsert );
+          if( pInsert ) sqlite3_clear_bindings(pInsert);
         }
       }
+
+      for(ii=0; ii<p1->nVal; ii++){
+        sqlite3_value_free(apVal[ii]);
+        apVal[ii] = 0;
+      }
+      p1->nVal = -1;
+      p1->bHaveRowid = 0;
     }
 
+    if( iPage!=0 ){
+      if( iField<0 ){
+        p1->iRowid = sqlite3_column_int64(pSel, 3);
+        assert( p1->nVal==-1 );
+        p1->nVal = 0;
+        p1->bHaveRowid = 1;
+      }else if( iField<pTab->nCol ){
+        assert( apVal[iField]==0 );
+        apVal[iField] = sqlite3_value_dup( pVal );
+        if( apVal[iField]==0 ){
+          recoverError(p, SQLITE_NOMEM, 0);
+        }
+        p1->nVal = iField+1;
+      }
+      p1->iPrevCell = iCell;
+      p1->iPrevPage = iPage;
+    }
+  }else{
+    recoverReset(p, pSel);
+    p1->pTab = 0;
   }
 
-  recoverFinalize(p, pTbls);
-  recoverFinalize(p, pSel);
+  return p->errCode;
+}
 
-  sqlite3_free(apVal);
+/*
+** For each table in the recovered schema, this function extracts as much
+** data as possible from the output database and writes it to the input
+** database. Or, if the recover handle is in SQL callback mode, issues
+** equivalent callbacks.
+**
+** It does not recover "orphaned" data into the lost-and-found table.
+** See recoverLostAndFound() for that.
+*/
+static int recoverWriteData(sqlite3_recover *p){
+  recoverWriteDataInit(p);
+  while( p->errCode==SQLITE_OK && SQLITE_OK==recoverWriteDataStep(p) );
+  recoverWriteDataCleanup(p);
   return p->errCode;
 }
 
diff --git a/manifest b/manifest
index 3e97238582..7ebf1eb76a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\svarious\scompiler\swarnings\sin\snew\scode\son\sthis\sbranch.
-D 2022-09-23T11:40:43.554
+C Internal\schanges\sto\sthe\srecover\sextension\stowards\sa\sstep()\sstyle\sinterface.
+D 2022-09-23T21:01:10.829
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -397,7 +397,7 @@ F ext/recover/recoverfault2.test 321036336af23e778a87f148c4cc4407f88fbdab1fd72dd
 F ext/recover/recoverold.test 46e9d99b595fac583d4c67f74d7d89c20a435c752ef6eeb3e918b599940c88e0
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
-F ext/recover/sqlite3recover.c e4a31b4f1f7a6d18a9c71774049262cd91c3f256f41ee257fbaa7bc71dbd5622
+F ext/recover/sqlite3recover.c cfb2e7df6ac7405109fa4f04b9b1fea4dbb704f37985f2f34d5526949734817f
 F ext/recover/sqlite3recover.h 81108efb8c4618d3d9c6da4df785212b0e4501aa0d25edfc463405fe839a6640
 F ext/recover/test_recover.c 72a765616a3fa9dae2ed537d79b00f365d9f639d347858341b71bda7a3a45f56
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -2013,8 +2013,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 e87fa70ab0f9b95bbcde18567f47906a222a3fd02b4f3c2903d2bb087d361b7c
-R cddb3dc3765037df525a9b042c70398c
+P ae49e9efde3012158061def6e0a8d993abbc5933514a21f84bc10f700f61b5e2
+R 84e101ee349aff282424e130c05c161d
 U dan
-Z 42c3428e8988c9082d113fe0563e38ab
+Z 2ba1da8e5fc1c584cb2093e5d330b18c
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 2f79bbe0c8..8e7e75e988 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ae49e9efde3012158061def6e0a8d993abbc5933514a21f84bc10f700f61b5e2
\ No newline at end of file
+73926d5c8cd1ecece134b5a73b44ee1dfca74dc200606e3f009b06cdecf8cee9
\ No newline at end of file

From 60d9aa7c59319948535b0ca4cce99b7f389ec447 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sat, 24 Sep 2022 07:36:45 +0000
Subject: [PATCH 160/428] Refactoring towards getting fiddle to support OPFS as
 a first-class citizen. Certain operations, e.g. import, export, and unlink,
 are not OPFS-aware.

FossilOrigin-Name: 1b923ed6438d7fef4508936e0c4bc026a368721698b1539961e3fb3140a185cb
---
 ext/wasm/EXPORTED_FUNCTIONS.fiddle.in |    9 +-
 ext/wasm/api/sqlite3-api-prologue.js  |    9 +-
 ext/wasm/common/whwasmutil.js         |   33 +-
 ext/wasm/fiddle/fiddle-worker.js      |   55 +-
 ext/wasm/fiddle/fiddle.js             | 1351 ++++++++++++-------------
 manifest                              |   22 +-
 manifest.uuid                         |    2 +-
 src/shell.c.in                        |   49 +-
 8 files changed, 776 insertions(+), 754 deletions(-)

diff --git a/ext/wasm/EXPORTED_FUNCTIONS.fiddle.in b/ext/wasm/EXPORTED_FUNCTIONS.fiddle.in
index b96ce4e67c..392e36e842 100644
--- a/ext/wasm/EXPORTED_FUNCTIONS.fiddle.in
+++ b/ext/wasm/EXPORTED_FUNCTIONS.fiddle.in
@@ -1,7 +1,8 @@
-_fiddle_exec
-_fiddle_interrupt
-_fiddle_experiment
-_fiddle_the_db
 _fiddle_db_arg
 _fiddle_db_filename
+_fiddle_exec
+_fiddle_experiment
+_fiddle_interrupt
+_fiddle_main
 _fiddle_reset_db
+_fiddle_the_db
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 1e2d387a15..639ad99c68 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -148,7 +148,11 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
       exports: undefined,
       memory: undefined,
       bigIntEnabled: (()=>{
-        if('undefined'!==typeof Module) return !!Module.HEAPU64;
+        if('undefined'!==typeof Module){
+          /* Emscripten module will contain HEAPU64 when build with
+             -sWASM_BIGINT=1, else it will not. */
+          return !!Module.HEAPU64;
+        }
         return !!self.BigInt64Array;
       })(),
       allocExportName: 'malloc',
@@ -771,7 +775,8 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     return (p && name) ? name.startsWith(p+'/') : false;
   };
 
-  if(0===capi.wasm.exports.sqlite3_vfs_find(0)){
+  // This bit is highly arguable and is incompatible with the fiddle shell.
+  if(false && 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();
diff --git a/ext/wasm/common/whwasmutil.js b/ext/wasm/common/whwasmutil.js
index 46cdf84bb8..e9ab8c5942 100644
--- a/ext/wasm/common/whwasmutil.js
+++ b/ext/wasm/common/whwasmutil.js
@@ -1030,6 +1030,22 @@ self.WhWasmUtilInstaller = function(target){
     (jstr, returnWithLength=false)=>__allocCStr(jstr, returnWithLength,
                                                 target.scopedAlloc, 'scopedAllocCString()');
 
+  // impl for allocMainArgv() and scopedAllocMainArgv().
+  const __allocMainArgv = function(isScoped, list){
+    if(!list.length) toss("Cannot allocate empty array.");
+    const pList = target[
+      isScoped ? 'scopedAlloc' : 'alloc'
+    ](list.length * target.ptrSizeof);
+    let i = 0;
+    list.forEach((e)=>{
+      target.setPtrValue(pList + (target.ptrSizeof * i++),
+                         target[
+                           isScoped ? 'scopedAllocCString' : 'allocCString'
+                         ](""+e));
+    });
+    return pList;
+  };
+
   /**
      Creates an array, using scopedAlloc(), suitable for passing to a
      C-level main() routine. The input is a collection with a length
@@ -1042,16 +1058,13 @@ self.WhWasmUtilInstaller = function(target){
 
      Throws if list.length is falsy or scopedAllocPush() is not active.
   */
-  target.scopedAllocMainArgv = function(list){
-    if(!list.length) toss("Cannot allocate empty array.");
-    const pList = target.scopedAlloc(list.length * target.ptrSizeof);
-    let i = 0;
-    list.forEach((e)=>{
-      target.setPtrValue(pList + (target.ptrSizeof * i++),
-                         target.scopedAllocCString(""+e));
-    });
-    return pList;
-  };
+  target.scopedAllocMainArgv = (list)=>__allocMainArgv(true, list);
+
+  /**
+     Identical to scopedAllocMainArgv() but uses alloc() instead of
+     scopedAllocMainArgv
+  */
+  target.allocMainArgv = (list)=>__allocMainArgv(false, list);
 
   /**
      Wraps function call func() in a scopedAllocPush() and
diff --git a/ext/wasm/fiddle/fiddle-worker.js b/ext/wasm/fiddle/fiddle-worker.js
index b76dcf212e..97774a1019 100644
--- a/ext/wasm/fiddle/fiddle-worker.js
+++ b/ext/wasm/fiddle/fiddle-worker.js
@@ -104,6 +104,8 @@
 
   const stdout = (...args)=>wMsg('stdout', args);
   const stderr = (...args)=>wMsg('stderr', args);
+
+  const fixmeOPFS = "(FIXME: won't work with vanilla OPFS.)";
   
   self.onerror = function(/*message, source, lineno, colno, error*/) {
     const err = arguments[4];
@@ -125,13 +127,43 @@
       if(!f._) f._ = fiddleModule.cwrap('fiddle_db_filename', "string", ['string']);
       return f._();
     },
+    runMain: function f(){
+      if(f.argv) return f.argv.rc;
+      const dbName = "/fiddle.sqlite3";
+      f.argv = [
+        'sqlite3-fiddle.wasm',
+        '-bail', '-safe',
+        dbName
+        /* Reminder: because of how we run fiddle, we have to ensure
+           that any argv strings passed to its main() are valid until
+           the wasm environment shuts down. */
+      ];
+      const capi = fiddleModule.sqlite3.capi;
+      f.argv.pArgv = capi.wasm.allocMainArgv(f.argv);
+      f.argv.rc = capi.wasm.exports.fiddle_main(
+        f.argv.length, f.argv.pArgv
+      );
+      if(f.argv.rc){
+        stderr("Fatal error initializing sqlite3 shell.");
+        fiddleModule.isDead = true;
+        return false;
+      }
+      stdout("SQLite version", capi.sqlite3_libversion(),
+             capi.sqlite3_sourceid().substr(0,19));
+      stdout('Welcome to the "fiddle" shell');
+      stdout('Enter ".help" for usage hints.');
+      return true;
+    },
     /**
        Runs the given text through the shell as if it had been typed
        in by a user. Fires a working/start event before it starts and
        working/end event when it finishes.
     */
     exec: function f(sql){
-      if(!f._) f._ = fiddleModule.cwrap('fiddle_exec', null, ['string']);
+      if(!f._){
+        if(!this.runMain()) return;
+        f._ = fiddleModule.cwrap('fiddle_exec', null, ['string']);
+      }
       if(fiddleModule.isDead){
         stderr("shell module has exit()ed. Cannot run SQL.");
         return;
@@ -140,18 +172,18 @@
       try {
         if(f._running){
           stderr('Cannot run multiple commands concurrently.');
-        }else{
+        }else if(sql){
           f._running = true;
           f._(sql);
         }
-      } finally {
+      }finally{
         delete f._running;
         wMsg('working','end');
       }
     },
     resetDb: function f(){
       if(!f._) f._ = fiddleModule.cwrap('fiddle_reset_db', null);
-      stdout("Resetting database.");
+      stdout("Resetting database.",fixmeOPFS);
       f._();
       stdout("Reset",this.dbFilename());
     },
@@ -189,7 +221,7 @@
           */
         case 'db-export': {
           const fn = Sqlite3Shell.dbFilename();
-          stdout("Exporting",fn+".");
+          stdout("Exporting",fn+".",fixmeOPFS);
           const fn2 = fn ? fn.split(/[/\\]/).pop() : null;
           try{
             if(!fn2) throw new Error("DB appears to be closed.");
@@ -298,18 +330,19 @@
   initFiddleModule(fiddleModule).then(function(thisModule){
     const S = thisModule.sqlite3;
     const atEnd = ()=>{
-      thisModule.fsUnlink = thisModule.cwrap('sqlite3_wasm_vfs_unlink','number',['string']);
+      thisModule.fsUnlink = function(fn){
+        stderr("unlink:",fixmeOPFS);
+        return thisModule.ccall('sqlite3_wasm_vfs_unlink','number',['string']);
+      };
       wMsg('fiddle-ready');
     };
-    if(0){
+    if(1){
       S.installOpfsVfs().finally(function(){
-        if(S.opfs){
-          stdout("OPFS is available.");
-        }
+        if(S.opfs) stdout("OPFS is available.");
         atEnd();
       });
     }else{
       atEnd();
     }
-  });
+  })/*then()*/;
 })();
diff --git a/ext/wasm/fiddle/fiddle.js b/ext/wasm/fiddle/fiddle.js
index b971233ef9..0d8792d55d 100644
--- a/ext/wasm/fiddle/fiddle.js
+++ b/ext/wasm/fiddle/fiddle.js
@@ -15,195 +15,195 @@
   communication between the UI and worker.
 */
 (function(){
+  'use strict';
+  /* Recall that the 'self' symbol, except where locally
+     overwritten, refers to the global window or worker object. */
+
+  const storage = (function(NS/*namespace object in which to store this module*/){
+    /* Pedantic licensing note: this code originated in the Fossil SCM
+       source tree, where it has a different license, but the person who
+       ported it into sqlite is the same one who wrote it for fossil. */
     'use strict';
-    /* Recall that the 'self' symbol, except where locally
-       overwritten, refers to the global window or worker object. */
-
-    const storage = (function(NS/*namespace object in which to store this module*/){
-        /* Pedantic licensing note: this code originated in the Fossil SCM
-           source tree, where it has a different license, but the person who
-           ported it into sqlite is the same one who wrote it for fossil. */
-        'use strict';
-        NS = NS||{};
-
-        /**
-           This module provides a basic wrapper around localStorage
-           or sessionStorage or a dummy proxy object if neither
-           of those are available.
-        */
-        const tryStorage = function f(obj){
-            if(!f.key) f.key = 'storage.access.check';
-            try{
-                obj.setItem(f.key, 'f');
-                const x = obj.getItem(f.key);
-                obj.removeItem(f.key);
-                if(x!=='f') throw new Error(f.key+" failed")
-                return obj;
-            }catch(e){
-                return undefined;
-            }
-        };
-
-        /** Internal storage impl for this module. */
-        const $storage =
-              tryStorage(window.localStorage)
-              || tryStorage(window.sessionStorage)
-              || tryStorage({
-                  // A basic dummy xyzStorage stand-in
-                  $$$:{},
-                  setItem: function(k,v){this.$$$[k]=v},
-                  getItem: function(k){
-                      return this.$$$.hasOwnProperty(k) ? this.$$$[k] : undefined;
-                  },
-                  removeItem: function(k){delete this.$$$[k]},
-                  clear: function(){this.$$$={}}
-              });
-
-        /**
-           For the dummy storage we need to differentiate between
-           $storage and its real property storage for hasOwnProperty()
-           to work properly...
-        */
-        const $storageHolder = $storage.hasOwnProperty('$$$') ? $storage.$$$ : $storage;
-
-        /**
-           A prefix which gets internally applied to all storage module
-           property keys so that localStorage and sessionStorage across the
-           same browser profile instance do not "leak" across multiple apps
-           being hosted by the same origin server. Such cross-polination is
-           still there but, with this key prefix applied, it won't be
-           immediately visible via the storage API.
-
-           With this in place we can justify using localStorage instead of
-           sessionStorage.
-
-           One implication of using localStorage and sessionStorage is that
-           their scope (the same "origin" and client application/profile)
-           allows multiple apps on the same origin to use the same
-           storage. Thus /appA/foo could then see changes made via
-           /appB/foo. The data do not cross user- or browser boundaries,
-           though, so it "might" arguably be called a
-           feature. storageKeyPrefix was added so that we can sandbox that
-           state for each separate app which shares an origin.
-
-           See: https://fossil-scm.org/forum/forumpost/4afc4d34de
-
-           Sidebar: it might seem odd to provide a key prefix and stick all
-           properties in the topmost level of the storage object. We do that
-           because adding a layer of object to sandbox each app would mean
-           (de)serializing that whole tree on every storage property change.
-           e.g. instead of storageObject.projectName.foo we have
-           storageObject[storageKeyPrefix+'foo']. That's soley for
-           efficiency's sake (in terms of battery life and
-           environment-internal storage-level effort).
-        */
-        const storageKeyPrefix = (
-            $storageHolder===$storage/*localStorage or sessionStorage*/
-                ? (
-                    (NS.config ?
-                     (NS.config.projectCode || NS.config.projectName
-                      || NS.config.shortProjectName)
-                     : false)
-                        || window.location.pathname
-                )+'::' : (
-                    '' /* transient storage */
-                )
-        );
-
-        /**
-           A proxy for localStorage or sessionStorage or a
-           page-instance-local proxy, if neither one is availble.
-
-           Which exact storage implementation is uses is unspecified, and
-           apps must not rely on it.
-        */
-        NS.storage = {
-            storageKeyPrefix: storageKeyPrefix,
-            /** Sets the storage key k to value v, implicitly converting
-                it to a string. */
-            set: (k,v)=>$storage.setItem(storageKeyPrefix+k,v),
-            /** Sets storage key k to JSON.stringify(v). */
-            setJSON: (k,v)=>$storage.setItem(storageKeyPrefix+k,JSON.stringify(v)),
-            /** Returns the value for the given storage key, or
-                dflt if the key is not found in the storage. */
-            get: (k,dflt)=>$storageHolder.hasOwnProperty(
-                storageKeyPrefix+k
-            ) ? $storage.getItem(storageKeyPrefix+k) : dflt,
-            /** Returns true if the given key has a value of "true".  If the
-                key is not found, it returns true if the boolean value of dflt
-                is "true". (Remember that JS persistent storage values are all
-                strings.) */
-            getBool: function(k,dflt){
-                return 'true'===this.get(k,''+(!!dflt));
-            },
-            /** Returns the JSON.parse()'d value of the given
-                storage key's value, or dflt is the key is not
-                found or JSON.parse() fails. */
-            getJSON: function f(k,dflt){
-                try {
-                    const x = this.get(k,f);
-                    return x===f ? dflt : JSON.parse(x);
-                }
-                catch(e){return dflt}
-            },
-            /** Returns true if the storage contains the given key,
-                else false. */
-            contains: (k)=>$storageHolder.hasOwnProperty(storageKeyPrefix+k),
-            /** Removes the given key from the storage. Returns this. */
-            remove: function(k){
-                $storage.removeItem(storageKeyPrefix+k);
-                return this;
-            },
-            /** Clears ALL keys from the storage. Returns this. */
-            clear: function(){
-                this.keys().forEach((k)=>$storage.removeItem(/*w/o prefix*/k));
-                return this;
-            },
-            /** Returns an array of all keys currently in the storage. */
-            keys: ()=>Object.keys($storageHolder).filter((v)=>(v||'').startsWith(storageKeyPrefix)),
-            /** Returns true if this storage is transient (only available
-                until the page is reloaded), indicating that fileStorage
-                and sessionStorage are unavailable. */
-            isTransient: ()=>$storageHolder!==$storage,
-            /** Returns a symbolic name for the current storage mechanism. */
-            storageImplName: function(){
-                if($storage===window.localStorage) return 'localStorage';
-                else if($storage===window.sessionStorage) return 'sessionStorage';
-                else return 'transient';
-            },
-
-            /**
-               Returns a brief help text string for the currently-selected
-               storage type.
-            */
-            storageHelpDescription: function(){
-                return {
-                    localStorage: "Browser-local persistent storage with an "+
-                        "unspecified long-term lifetime (survives closing the browser, "+
-                        "but maybe not a browser upgrade).",
-                    sessionStorage: "Storage local to this browser tab, "+
-                        "lost if this tab is closed.",
-                    "transient": "Transient storage local to this invocation of this page."
-                }[this.storageImplName()];
-            }
-        };
-        return NS.storage;
-    })({})/*storage API setup*/;
-
-
-    /** Name of the stored copy of SqliteFiddle.config. */
-    const configStorageKey = 'sqlite3-fiddle-config';
+    NS = NS||{};
 
     /**
-       The SqliteFiddle object is intended to be the primary
-       app-level object for the main-thread side of the sqlite
-       fiddle application. It uses a worker thread to load the
-       sqlite WASM module and communicate with it.
+       This module provides a basic wrapper around localStorage
+       or sessionStorage or a dummy proxy object if neither
+       of those are available.
     */
-    const SF/*local convenience alias*/
-    = window.SqliteFiddle/*canonical name*/ = {
-        /* Config options. */
-        config: {
+    const tryStorage = function f(obj){
+      if(!f.key) f.key = 'storage.access.check';
+      try{
+        obj.setItem(f.key, 'f');
+        const x = obj.getItem(f.key);
+        obj.removeItem(f.key);
+        if(x!=='f') throw new Error(f.key+" failed")
+        return obj;
+      }catch(e){
+        return undefined;
+      }
+    };
+
+    /** Internal storage impl for this module. */
+    const $storage =
+          tryStorage(window.localStorage)
+          || tryStorage(window.sessionStorage)
+          || tryStorage({
+            // A basic dummy xyzStorage stand-in
+            $$$:{},
+            setItem: function(k,v){this.$$$[k]=v},
+            getItem: function(k){
+              return this.$$$.hasOwnProperty(k) ? this.$$$[k] : undefined;
+            },
+            removeItem: function(k){delete this.$$$[k]},
+            clear: function(){this.$$$={}}
+          });
+
+    /**
+       For the dummy storage we need to differentiate between
+       $storage and its real property storage for hasOwnProperty()
+       to work properly...
+    */
+    const $storageHolder = $storage.hasOwnProperty('$$$') ? $storage.$$$ : $storage;
+
+    /**
+       A prefix which gets internally applied to all storage module
+       property keys so that localStorage and sessionStorage across the
+       same browser profile instance do not "leak" across multiple apps
+       being hosted by the same origin server. Such cross-polination is
+       still there but, with this key prefix applied, it won't be
+       immediately visible via the storage API.
+
+       With this in place we can justify using localStorage instead of
+       sessionStorage.
+
+       One implication of using localStorage and sessionStorage is that
+       their scope (the same "origin" and client application/profile)
+       allows multiple apps on the same origin to use the same
+       storage. Thus /appA/foo could then see changes made via
+       /appB/foo. The data do not cross user- or browser boundaries,
+       though, so it "might" arguably be called a
+       feature. storageKeyPrefix was added so that we can sandbox that
+       state for each separate app which shares an origin.
+
+       See: https://fossil-scm.org/forum/forumpost/4afc4d34de
+
+       Sidebar: it might seem odd to provide a key prefix and stick all
+       properties in the topmost level of the storage object. We do that
+       because adding a layer of object to sandbox each app would mean
+       (de)serializing that whole tree on every storage property change.
+       e.g. instead of storageObject.projectName.foo we have
+       storageObject[storageKeyPrefix+'foo']. That's soley for
+       efficiency's sake (in terms of battery life and
+       environment-internal storage-level effort).
+    */
+    const storageKeyPrefix = (
+      $storageHolder===$storage/*localStorage or sessionStorage*/
+        ? (
+          (NS.config ?
+           (NS.config.projectCode || NS.config.projectName
+            || NS.config.shortProjectName)
+           : false)
+            || window.location.pathname
+        )+'::' : (
+          '' /* transient storage */
+        )
+    );
+
+    /**
+       A proxy for localStorage or sessionStorage or a
+       page-instance-local proxy, if neither one is availble.
+
+       Which exact storage implementation is uses is unspecified, and
+       apps must not rely on it.
+    */
+    NS.storage = {
+      storageKeyPrefix: storageKeyPrefix,
+      /** Sets the storage key k to value v, implicitly converting
+          it to a string. */
+      set: (k,v)=>$storage.setItem(storageKeyPrefix+k,v),
+      /** Sets storage key k to JSON.stringify(v). */
+      setJSON: (k,v)=>$storage.setItem(storageKeyPrefix+k,JSON.stringify(v)),
+      /** Returns the value for the given storage key, or
+          dflt if the key is not found in the storage. */
+      get: (k,dflt)=>$storageHolder.hasOwnProperty(
+        storageKeyPrefix+k
+      ) ? $storage.getItem(storageKeyPrefix+k) : dflt,
+      /** Returns true if the given key has a value of "true".  If the
+          key is not found, it returns true if the boolean value of dflt
+          is "true". (Remember that JS persistent storage values are all
+          strings.) */
+      getBool: function(k,dflt){
+        return 'true'===this.get(k,''+(!!dflt));
+      },
+      /** Returns the JSON.parse()'d value of the given
+          storage key's value, or dflt is the key is not
+          found or JSON.parse() fails. */
+      getJSON: function f(k,dflt){
+        try {
+          const x = this.get(k,f);
+          return x===f ? dflt : JSON.parse(x);
+        }
+        catch(e){return dflt}
+      },
+      /** Returns true if the storage contains the given key,
+          else false. */
+      contains: (k)=>$storageHolder.hasOwnProperty(storageKeyPrefix+k),
+      /** Removes the given key from the storage. Returns this. */
+      remove: function(k){
+        $storage.removeItem(storageKeyPrefix+k);
+        return this;
+      },
+      /** Clears ALL keys from the storage. Returns this. */
+      clear: function(){
+        this.keys().forEach((k)=>$storage.removeItem(/*w/o prefix*/k));
+        return this;
+      },
+      /** Returns an array of all keys currently in the storage. */
+      keys: ()=>Object.keys($storageHolder).filter((v)=>(v||'').startsWith(storageKeyPrefix)),
+      /** Returns true if this storage is transient (only available
+          until the page is reloaded), indicating that fileStorage
+          and sessionStorage are unavailable. */
+      isTransient: ()=>$storageHolder!==$storage,
+      /** Returns a symbolic name for the current storage mechanism. */
+      storageImplName: function(){
+        if($storage===window.localStorage) return 'localStorage';
+        else if($storage===window.sessionStorage) return 'sessionStorage';
+        else return 'transient';
+      },
+
+      /**
+         Returns a brief help text string for the currently-selected
+         storage type.
+      */
+      storageHelpDescription: function(){
+        return {
+          localStorage: "Browser-local persistent storage with an "+
+            "unspecified long-term lifetime (survives closing the browser, "+
+            "but maybe not a browser upgrade).",
+          sessionStorage: "Storage local to this browser tab, "+
+            "lost if this tab is closed.",
+          "transient": "Transient storage local to this invocation of this page."
+        }[this.storageImplName()];
+      }
+    };
+    return NS.storage;
+  })({})/*storage API setup*/;
+
+
+  /** Name of the stored copy of SqliteFiddle.config. */
+  const configStorageKey = 'sqlite3-fiddle-config';
+
+  /**
+     The SqliteFiddle object is intended to be the primary
+     app-level object for the main-thread side of the sqlite
+     fiddle application. It uses a worker thread to load the
+     sqlite WASM module and communicate with it.
+  */
+  const SF/*local convenience alias*/
+        = window.SqliteFiddle/*canonical name*/ = {
+          /* Config options. */
+          config: {
             /* If true, SqliteFiddle.echo() will auto-scroll the
                output widget to the bottom when it receives output,
                else it won't. */
@@ -219,24 +219,24 @@
             sideBySide: true,
             /* If true, swap positions of the input/output areas. */
             swapInOut: false
-        },
-        /**
-           Emits the given text, followed by a line break, to the
-           output widget.  If given more than one argument, they are
-           join()'d together with a space between each. As a special
-           case, if passed a single array, that array is used in place
-           of the arguments array (this is to facilitate receiving
-           lists of arguments via worker events).
-        */
-        echo: function f(text) {
+          },
+          /**
+             Emits the given text, followed by a line break, to the
+             output widget.  If given more than one argument, they are
+             join()'d together with a space between each. As a special
+             case, if passed a single array, that array is used in place
+             of the arguments array (this is to facilitate receiving
+             lists of arguments via worker events).
+          */
+          echo: function f(text) {
             /* Maintenance reminder: we currently require/expect a textarea
                output element. It might be nice to extend this to behave
                differently if the output element is a non-textarea element,
                in which case it would need to append the given text as a TEXT
                node and add a line break. */
             if(!f._){
-                f._ = document.getElementById('output');
-                f._.value = ''; // clear browser cache
+              f._ = document.getElementById('output');
+              f._.value = ''; // clear browser cache
             }
             if(arguments.length > 1) text = Array.prototype.slice.call(arguments).join(' ');
             else if(1===arguments.length && Array.isArray(text)) text = text.join(' ');
@@ -246,483 +246,482 @@
             //text = text.replace(/>/g, "&gt;");
             //text = text.replace('\n', '<br>', 'g');
             if(null===text){/*special case: clear output*/
-                f._.value = '';
-                return;
+              f._.value = '';
+              return;
             }else if(this.echo._clearPending){
-                delete this.echo._clearPending;
-                f._.value = '';
+              delete this.echo._clearPending;
+              f._.value = '';
             }
             if(this.config.echoToConsole) console.log(text);
             if(this.jqTerm) this.jqTerm.echo(text);
             f._.value += text + "\n";
             if(this.config.autoScrollOutput){
-                f._.scrollTop = f._.scrollHeight;
+              f._.scrollTop = f._.scrollHeight;
             }
-        },
-        _msgMap: {},
-        /** Adds a worker message handler for messages of the given
-            type. */
-        addMsgHandler: function f(type,callback){
+          },
+          _msgMap: {},
+          /** Adds a worker message handler for messages of the given
+              type. */
+          addMsgHandler: function f(type,callback){
             if(Array.isArray(type)){
-                type.forEach((t)=>this.addMsgHandler(t, callback));
-                return this;
+              type.forEach((t)=>this.addMsgHandler(t, callback));
+              return this;
             }
             (this._msgMap.hasOwnProperty(type)
              ? this._msgMap[type]
              : (this._msgMap[type] = [])).push(callback);
             return this;
-        },
-        /** Given a worker message, runs all handlers for msg.type. */
-        runMsgHandlers: function(msg){
+          },
+          /** Given a worker message, runs all handlers for msg.type. */
+          runMsgHandlers: function(msg){
             const list = (this._msgMap.hasOwnProperty(msg.type)
                           ? this._msgMap[msg.type] : false);
             if(!list){
-                console.warn("No handlers found for message type:",msg);
-                return false;
+              console.warn("No handlers found for message type:",msg);
+              return false;
             }
             //console.debug("runMsgHandlers",msg);
             list.forEach((f)=>f(msg));
             return true;
-        },
-        /** Removes all message handlers for the given message type. */
-        clearMsgHandlers: function(type){
+          },
+          /** Removes all message handlers for the given message type. */
+          clearMsgHandlers: function(type){
             delete this._msgMap[type];
             return this;
-        },
-        /* Posts a message in the form {type, data} to the db worker. Returns this. */
-        wMsg: function(type,data){
+          },
+          /* Posts a message in the form {type, data} to the db worker. Returns this. */
+          wMsg: function(type,data){
             this.worker.postMessage({type, data});
             return this;
-        },
-        /**
-           Prompts for confirmation and, if accepted, deletes
-           all content and tables in the (transient) database.
-        */
-        resetDb: function(){
+          },
+          /**
+             Prompts for confirmation and, if accepted, deletes
+             all content and tables in the (transient) database.
+          */
+          resetDb: function(){
             if(window.confirm("Really destroy all content and tables "
                               +"in the (transient) db?")){
-                this.wMsg('db-reset');
+              this.wMsg('db-reset');
             }
             return this;
-        },
-        /** Stores this object's config in the browser's storage. */
-        storeConfig: function(){
+          },
+          /** Stores this object's config in the browser's storage. */
+          storeConfig: function(){
             storage.setJSON(configStorageKey,this.config);
-        }
-    };
+          }
+        };
 
-    if(1){ /* Restore SF.config */
-        const storedConfig = storage.getJSON(configStorageKey);
-        if(storedConfig){
-            /* Copy all properties to SF.config which are currently in
-               storedConfig. We don't bother copying any other
-               properties: those have been removed from the app in the
-               meantime. */
-            Object.keys(SF.config).forEach(function(k){
-                if(storedConfig.hasOwnProperty(k)){
-                    SF.config[k] = storedConfig[k];
-                }
-            });
+  if(1){ /* Restore SF.config */
+    const storedConfig = storage.getJSON(configStorageKey);
+    if(storedConfig){
+      /* Copy all properties to SF.config which are currently in
+         storedConfig. We don't bother copying any other
+         properties: those have been removed from the app in the
+         meantime. */
+      Object.keys(SF.config).forEach(function(k){
+        if(storedConfig.hasOwnProperty(k)){
+          SF.config[k] = storedConfig[k];
         }
+      });
     }
+  }
 
-    SF.worker = new Worker('fiddle-worker.js'+self.location.search);
-    SF.worker.onmessage = (ev)=>SF.runMsgHandlers(ev.data);
-    SF.addMsgHandler(['stdout', 'stderr'], (ev)=>SF.echo(ev.data));
+  SF.worker = new Worker('fiddle-worker.js'+self.location.search);
+  SF.worker.onmessage = (ev)=>SF.runMsgHandlers(ev.data);
+  SF.addMsgHandler(['stdout', 'stderr'], (ev)=>SF.echo(ev.data));
 
-    /* querySelectorAll() proxy */
-    const EAll = function(/*[element=document,] cssSelector*/){
-        return (arguments.length>1 ? arguments[0] : document)
-            .querySelectorAll(arguments[arguments.length-1]);
-    };
-    /* querySelector() proxy */
-    const E = function(/*[element=document,] cssSelector*/){
-        return (arguments.length>1 ? arguments[0] : document)
-            .querySelector(arguments[arguments.length-1]);
-    };
+  /* querySelectorAll() proxy */
+  const EAll = function(/*[element=document,] cssSelector*/){
+    return (arguments.length>1 ? arguments[0] : document)
+      .querySelectorAll(arguments[arguments.length-1]);
+  };
+  /* querySelector() proxy */
+  const E = function(/*[element=document,] cssSelector*/){
+    return (arguments.length>1 ? arguments[0] : document)
+      .querySelector(arguments[arguments.length-1]);
+  };
 
-    /** Handles status updates from the Module object. */
-    SF.addMsgHandler('module', function f(ev){
-        ev = ev.data;
-        if('status'!==ev.type){
-            console.warn("Unexpected module-type message:",ev);
-            return;
-        }
-        if(!f.ui){
-            f.ui = {
-                status: E('#module-status'),
-                progress: E('#module-progress'),
-                spinner: E('#module-spinner')
-            };
-        }
-        const msg = ev.data;
-        if(f.ui.progres){
-            progress.value = msg.step;
-            progress.max = msg.step + 1/*we don't know how many steps to expect*/;
-        }
-        if(1==msg.step){
-            f.ui.progress.classList.remove('hidden');
-            f.ui.spinner.classList.remove('hidden');
-        }
-        if(msg.text){
-            f.ui.status.classList.remove('hidden');
-            f.ui.status.innerText = msg.text;
-        }else{
-            if(f.ui.progress){
-                f.ui.progress.remove();
-                f.ui.spinner.remove();
-                delete f.ui.progress;
-                delete f.ui.spinner;
-            }
-            f.ui.status.classList.add('hidden');
-            /* The module can post messages about fatal problems,
-               e.g. an exit() being triggered or assertion failure,
-               after the last "load" message has arrived, so
-               leave f.ui.status and message listener intact. */
-        }
-    });
+  /** Handles status updates from the Module object. */
+  SF.addMsgHandler('module', function f(ev){
+    ev = ev.data;
+    if('status'!==ev.type){
+      console.warn("Unexpected module-type message:",ev);
+      return;
+    }
+    if(!f.ui){
+      f.ui = {
+        status: E('#module-status'),
+        progress: E('#module-progress'),
+        spinner: E('#module-spinner')
+      };
+    }
+    const msg = ev.data;
+    if(f.ui.progres){
+      progress.value = msg.step;
+      progress.max = msg.step + 1/*we don't know how many steps to expect*/;
+    }
+    if(1==msg.step){
+      f.ui.progress.classList.remove('hidden');
+      f.ui.spinner.classList.remove('hidden');
+    }
+    if(msg.text){
+      f.ui.status.classList.remove('hidden');
+      f.ui.status.innerText = msg.text;
+    }else{
+      if(f.ui.progress){
+        f.ui.progress.remove();
+        f.ui.spinner.remove();
+        delete f.ui.progress;
+        delete f.ui.spinner;
+      }
+      f.ui.status.classList.add('hidden');
+      /* The module can post messages about fatal problems,
+         e.g. an exit() being triggered or assertion failure,
+         after the last "load" message has arrived, so
+         leave f.ui.status and message listener intact. */
+    }
+  });
 
-    /**
-       The 'fiddle-ready' event is fired (with no payload) when the
-       wasm module has finished loading. Interestingly, that happens
-       _before_ the final module:status event */
-    SF.addMsgHandler('fiddle-ready', function(){
-        SF.clearMsgHandlers('fiddle-ready');
-        self.onSFLoaded();
-    });
+  /**
+     The 'fiddle-ready' event is fired (with no payload) when the
+     wasm module has finished loading. Interestingly, that happens
+     _before_ the final module:status event */
+  SF.addMsgHandler('fiddle-ready', function(){
+    SF.clearMsgHandlers('fiddle-ready');
+    self.onSFLoaded();
+  });
 
-    /**
-       Performs all app initialization which must wait until after the
-       worker module is loaded. This function removes itself when it's
-       called.
+  /**
+     Performs all app initialization which must wait until after the
+     worker module is loaded. This function removes itself when it's
+     called.
+  */
+  self.onSFLoaded = function(){
+    delete this.onSFLoaded;
+    // Unhide all elements which start out hidden
+    EAll('.initially-hidden').forEach((e)=>e.classList.remove('initially-hidden'));
+    E('#btn-reset').addEventListener('click',()=>SF.resetDb());
+    const taInput = E('#input');
+    const btnClearIn = E('#btn-clear');
+    btnClearIn.addEventListener('click',function(){
+      taInput.value = '';
+    },false);
+    // Ctrl-enter and shift-enter both run the current SQL.
+    taInput.addEventListener('keydown',function(ev){
+      if((ev.ctrlKey || ev.shiftKey) && 13 === ev.keyCode){
+        ev.preventDefault();
+        ev.stopPropagation();
+        btnShellExec.click();
+      }
+    }, false);
+    const taOutput = E('#output');
+    const btnClearOut = E('#btn-clear-output');
+    btnClearOut.addEventListener('click',function(){
+      taOutput.value = '';
+      if(SF.jqTerm) SF.jqTerm.clear();
+    },false);
+    const btnShellExec = E('#btn-shell-exec');
+    btnShellExec.addEventListener('click',function(ev){
+      let sql;
+      ev.preventDefault();
+      if(taInput.selectionStart<taInput.selectionEnd){
+        sql = taInput.value.substring(taInput.selectionStart,taInput.selectionEnd).trim();
+      }else{
+        sql = taInput.value.trim();
+      }
+      if(sql) SF.dbExec(sql);
+    },false);
+
+    const btnInterrupt = E("#btn-interrupt");
+    //btnInterrupt.classList.add('hidden');
+    /** To be called immediately before work is sent to the
+        worker. Updates some UI elements. The 'working'/'end'
+        event will apply the inverse, undoing the bits this
+        function does. This impl is not in the 'working'/'start'
+        event handler because that event is given to us
+        asynchronously _after_ we need to have performed this
+        work.
     */
-    self.onSFLoaded = function(){
-        delete this.onSFLoaded;
-        // Unhide all elements which start out hidden
-        EAll('.initially-hidden').forEach((e)=>e.classList.remove('initially-hidden'));
-        E('#btn-reset').addEventListener('click',()=>SF.resetDb());
-        const taInput = E('#input');
-        const btnClearIn = E('#btn-clear');
-        btnClearIn.addEventListener('click',function(){
-            taInput.value = '';
-        },false);
-        // Ctrl-enter and shift-enter both run the current SQL.
-        taInput.addEventListener('keydown',function(ev){
-            if((ev.ctrlKey || ev.shiftKey) && 13 === ev.keyCode){
-                ev.preventDefault();
-                ev.stopPropagation();
-                btnShellExec.click();
-            }
+    const preStartWork = function f(){
+      if(!f._){
+        const title = E('title');
+        f._ = {
+          btnLabel: btnShellExec.innerText,
+          pageTitle: title,
+          pageTitleOrig: title.innerText
+        };
+      }
+      f._.pageTitle.innerText = "[working...] "+f._.pageTitleOrig;
+      btnShellExec.setAttribute('disabled','disabled');
+      btnInterrupt.removeAttribute('disabled','disabled');
+    };
+
+    /* Sends the given text to the db module to evaluate as if it
+       had been entered in the sqlite3 CLI shell. If it's null or
+       empty, this is a no-op. */
+    SF.dbExec = function f(sql){
+      if(null!==sql && this.config.autoClearOutput){
+        this.echo._clearPending = true;
+      }
+      preStartWork();
+      this.wMsg('shellExec',sql);
+    };
+
+    SF.addMsgHandler('working',function f(ev){
+      switch(ev.data){
+          case 'start': /* See notes in preStartWork(). */; return;
+          case 'end':
+            preStartWork._.pageTitle.innerText = preStartWork._.pageTitleOrig;
+            btnShellExec.innerText = preStartWork._.btnLabel;
+            btnShellExec.removeAttribute('disabled');
+            btnInterrupt.setAttribute('disabled','disabled');
+            return;
+      }
+      console.warn("Unhandled 'working' event:",ev.data);
+    });
+
+    /* For each checkbox with data-csstgt, set up a handler which
+       toggles the given CSS class on the element matching
+       E(data-csstgt). */
+    EAll('input[type=checkbox][data-csstgt]')
+      .forEach(function(e){
+        const tgt = E(e.dataset.csstgt);
+        const cssClass = e.dataset.cssclass || 'error';
+        e.checked = tgt.classList.contains(cssClass);
+        e.addEventListener('change', function(){
+          tgt.classList[
+            this.checked ? 'add' : 'remove'
+          ](cssClass)
         }, false);
-        const taOutput = E('#output');
-        const btnClearOut = E('#btn-clear-output');
-        btnClearOut.addEventListener('click',function(){
-            taOutput.value = '';
-            if(SF.jqTerm) SF.jqTerm.clear();
-        },false);
-        const btnShellExec = E('#btn-shell-exec');
-        btnShellExec.addEventListener('click',function(ev){
-            let sql;
-            ev.preventDefault();
-            if(taInput.selectionStart<taInput.selectionEnd){
-                sql = taInput.value.substring(taInput.selectionStart,taInput.selectionEnd).trim();
-            }else{
-                sql = taInput.value.trim();
-            }
-            if(sql) SF.dbExec(sql);
-        },false);
+      });
+    /* For each checkbox with data-config=X, set up a binding to
+       SF.config[X]. These must be set up AFTER data-csstgt
+       checkboxes so that those two states can be synced properly. */
+    EAll('input[type=checkbox][data-config]')
+      .forEach(function(e){
+        const confVal = !!SF.config[e.dataset.config];
+        if(e.checked !== confVal){
+          /* Ensure that data-csstgt mappings (if any) get
+             synced properly. */
+          e.checked = confVal;
+          e.dispatchEvent(new Event('change'));
+        }
+        e.addEventListener('change', function(){
+          SF.config[this.dataset.config] = this.checked;
+          SF.storeConfig();
+        }, false);
+      });
+    /* For each button with data-cmd=X, map a click handler which
+       calls SF.dbExec(X). */
+    const cmdClick = function(){SF.dbExec(this.dataset.cmd);};
+    EAll('button[data-cmd]').forEach(
+      e => e.addEventListener('click', cmdClick, false)
+    );
 
-        const btnInterrupt = E("#btn-interrupt");
-        //btnInterrupt.classList.add('hidden');
-        /** To be called immediately before work is sent to the
-            worker. Updates some UI elements. The 'working'/'end'
-            event will apply the inverse, undoing the bits this
-            function does. This impl is not in the 'working'/'start'
-            event handler because that event is given to us
-            asynchronously _after_ we need to have performed this
-            work.
-        */
-        const preStartWork = function f(){
-            if(!f._){
-                const title = E('title');
-                f._ = {
-                    btnLabel: btnShellExec.innerText,
-                    pageTitle: title,
-                    pageTitleOrig: title.innerText
-                };
-            }
-            f._.pageTitle.innerText = "[working...] "+f._.pageTitleOrig;
-            btnShellExec.setAttribute('disabled','disabled');
-            btnInterrupt.removeAttribute('disabled','disabled');
+    btnInterrupt.addEventListener('click',function(){
+      SF.wMsg('interrupt');
+    });
+
+    /** Initiate a download of the db. */
+    const btnExport = E('#btn-export');
+    const eLoadDb = E('#load-db');
+    const btnLoadDb = E('#btn-load-db');
+    btnLoadDb.addEventListener('click', ()=>eLoadDb.click());
+    /**
+       Enables (if passed true) or disables all UI elements which
+       "might," if timed "just right," interfere with an
+       in-progress db import/export/exec operation.
+    */
+    const enableMutatingElements = function f(enable){
+      if(!f._elems){
+        f._elems = [
+          /* UI elements to disable while import/export are
+             running. Normally the export is fast enough
+             that this won't matter, but we really don't
+             want to be reading (from outside of sqlite) the
+             db when the user taps btnShellExec. */
+          btnShellExec, btnExport, eLoadDb
+        ];
+      }
+      f._elems.forEach( enable
+                        ? (e)=>e.removeAttribute('disabled')
+                        : (e)=>e.setAttribute('disabled','disabled') );
+    };
+    btnExport.addEventListener('click',function(){
+      enableMutatingElements(false);
+      SF.wMsg('db-export');
+    });
+    SF.addMsgHandler('db-export', function(ev){
+      enableMutatingElements(true);
+      ev = ev.data;
+      if(ev.error){
+        SF.echo("Export failed:",ev.error);
+        return;
+      }
+      const blob = new Blob([ev.buffer], {type:"application/x-sqlite3"});
+      const a = document.createElement('a');
+      document.body.appendChild(a);
+      a.href = window.URL.createObjectURL(blob);
+      a.download = ev.filename;
+      a.addEventListener('click',function(){
+        setTimeout(function(){
+          SF.echo("Exported (possibly auto-downloaded):",ev.filename);
+          window.URL.revokeObjectURL(a.href);
+          a.remove();
+        },500);
+      });
+      a.click();
+    });
+    /**
+       Handle load/import of an external db file.
+    */
+    eLoadDb.addEventListener('change',function(){
+      const f = this.files[0];
+      const r = new FileReader();
+      const status = {loaded: 0, total: 0};
+      enableMutatingElements(false);
+      r.addEventListener('loadstart', function(){
+        SF.echo("Loading",f.name,"...");
+      });
+      r.addEventListener('progress', function(ev){
+        SF.echo("Loading progress:",ev.loaded,"of",ev.total,"bytes.");
+      });
+      const that = this;
+      r.addEventListener('load', function(){
+        enableMutatingElements(true);
+        SF.echo("Loaded",f.name+". Opening db...");
+        SF.wMsg('open',{
+          filename: f.name,
+          buffer: this.result
+        });
+      });
+      r.addEventListener('error',function(){
+        enableMutatingElements(true);
+        SF.echo("Loading",f.name,"failed for unknown reasons.");
+      });
+      r.addEventListener('abort',function(){
+        enableMutatingElements(true);
+        SF.echo("Cancelled loading of",f.name+".");
+      });
+      r.readAsArrayBuffer(f);
+    });
+
+    EAll('fieldset.collapsible').forEach(function(fs){
+      const btnToggle = E(fs,'legend > .fieldset-toggle'),
+            content = EAll(fs,':scope > div');
+      btnToggle.addEventListener('click', function(){
+        fs.classList.toggle('collapsed');
+        content.forEach((d)=>d.classList.toggle('hidden'));
+      }, false);
+    });
+
+    /**
+       Given a DOM element, this routine measures its "effective
+       height", which is the bounding top/bottom range of this element
+       and all of its children, recursively. For some DOM structure
+       cases, a parent may have a reported height of 0 even though
+       children have non-0 sizes.
+
+       Returns 0 if !e or if the element really has no height.
+    */
+    const effectiveHeight = function f(e){
+      if(!e) return 0;
+      if(!f.measure){
+        f.measure = function callee(e, depth){
+          if(!e) return;
+          const m = e.getBoundingClientRect();
+          if(0===depth){
+            callee.top = m.top;
+            callee.bottom = m.bottom;
+          }else{
+            callee.top = m.top ? Math.min(callee.top, m.top) : callee.top;
+            callee.bottom = Math.max(callee.bottom, m.bottom);
+          }
+          Array.prototype.forEach.call(e.children,(e)=>callee(e,depth+1));
+          if(0===depth){
+            //console.debug("measure() height:",e.className, callee.top, callee.bottom, (callee.bottom - callee.top));
+            f.extra += callee.bottom - callee.top;
+          }
+          return f.extra;
         };
+      }
+      f.extra = 0;
+      f.measure(e,0);
+      return f.extra;
+    };
 
-        /* Sends the given text to the db module to evaluate as if it
-           had been entered in the sqlite3 CLI shell. If it's null or
-           empty, this is a no-op except that the very first call will
-           initialize the db and output an informational header. */
-        SF.dbExec = function f(sql){
-            if(this.config.autoClearOutput){
-                this.echo._clearPending = true;
-            }
-            preStartWork();
-            this.wMsg('shellExec',sql);
+    /**
+       Returns a function, that, as long as it continues to be invoked,
+       will not be triggered. The function will be called after it stops
+       being called for N milliseconds. If `immediate` is passed, call
+       the callback immediately and hinder future invocations until at
+       least the given time has passed.
+
+       If passed only 1 argument, or passed a falsy 2nd argument,
+       the default wait time set in this function's $defaultDelay
+       property is used.
+
+       Source: underscore.js, by way of https://davidwalsh.name/javascript-debounce-function
+    */
+    const debounce = function f(func, wait, immediate) {
+      var timeout;
+      if(!wait) wait = f.$defaultDelay;
+      return function() {
+        const context = this, args = Array.prototype.slice.call(arguments);
+        const later = function() {
+          timeout = undefined;
+          if(!immediate) func.apply(context, args);
         };
+        const callNow = immediate && !timeout;
+        clearTimeout(timeout);
+        timeout = setTimeout(later, wait);
+        if(callNow) func.apply(context, args);
+      };
+    };
+    debounce.$defaultDelay = 500 /*arbitrary*/;
 
-        SF.addMsgHandler('working',function f(ev){
-            switch(ev.data){
-                case 'start': /* See notes in preStartWork(). */; return;
-                case 'end':
-                    preStartWork._.pageTitle.innerText = preStartWork._.pageTitleOrig;
-                    btnShellExec.innerText = preStartWork._.btnLabel;
-                    btnShellExec.removeAttribute('disabled');
-                    btnInterrupt.setAttribute('disabled','disabled');
-                    return;
-            }
-            console.warn("Unhandled 'working' event:",ev.data);
+    const ForceResizeKludge = (function(){
+      /* Workaround for Safari mayhem regarding use of vh CSS
+         units....  We cannot use vh units to set the main view
+         size because Safari chokes on that, so we calculate
+         that height here. Larger than ~95% is too big for
+         Firefox on Android, causing the input area to move
+         off-screen. */
+      const appViews = EAll('.app-view');
+      const elemsToCount = [
+        /* Elements which we need to always count in the
+           visible body size. */
+        E('body > header'),
+        E('body > footer')
+      ];
+      const resized = function f(){
+        if(f.$disabled) return;
+        const wh = window.innerHeight;
+        var ht;
+        var extra = 0;
+        elemsToCount.forEach((e)=>e ? extra += effectiveHeight(e) : false);
+        ht = wh - extra;
+        appViews.forEach(function(e){
+          e.style.height =
+            e.style.maxHeight = [
+              "calc(", (ht>=100 ? ht : 100), "px",
+              " - 2em"/*fudge value*/,")"
+              /* ^^^^ hypothetically not needed, but both
+                 Chrome/FF on Linux will force scrollbars on the
+                 body if this value is too small. */
+            ].join('');
         });
+      };
+      resized.$disabled = true/*gets deleted when setup is finished*/;
+      window.addEventListener('resize', debounce(resized, 250), false);
+      return resized;
+    })();
 
-        /* For each checkbox with data-csstgt, set up a handler which
-           toggles the given CSS class on the element matching
-           E(data-csstgt). */
-        EAll('input[type=checkbox][data-csstgt]')
-            .forEach(function(e){
-                const tgt = E(e.dataset.csstgt);
-                const cssClass = e.dataset.cssclass || 'error';
-                e.checked = tgt.classList.contains(cssClass);
-                e.addEventListener('change', function(){
-                    tgt.classList[
-                        this.checked ? 'add' : 'remove'
-                    ](cssClass)
-                }, false);
-            });
-        /* For each checkbox with data-config=X, set up a binding to
-           SF.config[X]. These must be set up AFTER data-csstgt
-           checkboxes so that those two states can be synced properly. */
-        EAll('input[type=checkbox][data-config]')
-            .forEach(function(e){
-                const confVal = !!SF.config[e.dataset.config];
-                if(e.checked !== confVal){
-                    /* Ensure that data-csstgt mappings (if any) get
-                       synced properly. */
-                    e.checked = confVal;
-                    e.dispatchEvent(new Event('change'));
-                }
-                e.addEventListener('change', function(){
-                    SF.config[this.dataset.config] = this.checked;
-                    SF.storeConfig();
-                }, false);
-            });
-        /* For each button with data-cmd=X, map a click handler which
-           calls SF.dbExec(X). */
-        const cmdClick = function(){SF.dbExec(this.dataset.cmd);};
-        EAll('button[data-cmd]').forEach(
-            e => e.addEventListener('click', cmdClick, false)
-        );
-
-        btnInterrupt.addEventListener('click',function(){
-            SF.wMsg('interrupt');
-        });
-
-        /** Initiate a download of the db. */
-        const btnExport = E('#btn-export');
-        const eLoadDb = E('#load-db');
-        const btnLoadDb = E('#btn-load-db');
-        btnLoadDb.addEventListener('click', ()=>eLoadDb.click());
-        /**
-           Enables (if passed true) or disables all UI elements which
-           "might," if timed "just right," interfere with an
-           in-progress db import/export/exec operation.
-        */
-        const enableMutatingElements = function f(enable){
-            if(!f._elems){
-                f._elems = [
-                    /* UI elements to disable while import/export are
-                       running. Normally the export is fast enough
-                       that this won't matter, but we really don't
-                       want to be reading (from outside of sqlite) the
-                       db when the user taps btnShellExec. */
-                    btnShellExec, btnExport, eLoadDb
-                ];
-            }
-            f._elems.forEach( enable
-                              ? (e)=>e.removeAttribute('disabled')
-                              : (e)=>e.setAttribute('disabled','disabled') );
-        };
-        btnExport.addEventListener('click',function(){
-            enableMutatingElements(false);
-            SF.wMsg('db-export');
-        });
-        SF.addMsgHandler('db-export', function(ev){
-            enableMutatingElements(true);
-            ev = ev.data;
-            if(ev.error){
-                SF.echo("Export failed:",ev.error);
-                return;
-            }
-            const blob = new Blob([ev.buffer], {type:"application/x-sqlite3"});
-            const a = document.createElement('a');
-            document.body.appendChild(a);
-            a.href = window.URL.createObjectURL(blob);
-            a.download = ev.filename;
-            a.addEventListener('click',function(){
-                setTimeout(function(){
-                    SF.echo("Exported (possibly auto-downloaded):",ev.filename);
-                    window.URL.revokeObjectURL(a.href);
-                    a.remove();
-                },500);
-            });
-            a.click();
-        });
-        /**
-           Handle load/import of an external db file.
-        */
-        eLoadDb.addEventListener('change',function(){
-            const f = this.files[0];
-            const r = new FileReader();
-            const status = {loaded: 0, total: 0};
-            enableMutatingElements(false);
-            r.addEventListener('loadstart', function(){
-                SF.echo("Loading",f.name,"...");
-            });
-            r.addEventListener('progress', function(ev){
-                SF.echo("Loading progress:",ev.loaded,"of",ev.total,"bytes.");
-            });
-            const that = this;
-            r.addEventListener('load', function(){
-                enableMutatingElements(true);
-                SF.echo("Loaded",f.name+". Opening db...");
-                SF.wMsg('open',{
-                    filename: f.name,
-                    buffer: this.result
-                });
-            });
-            r.addEventListener('error',function(){
-                enableMutatingElements(true);
-                SF.echo("Loading",f.name,"failed for unknown reasons.");
-            });
-            r.addEventListener('abort',function(){
-                enableMutatingElements(true);
-                SF.echo("Cancelled loading of",f.name+".");
-            });
-            r.readAsArrayBuffer(f);
-        });
-
-        EAll('fieldset.collapsible').forEach(function(fs){
-            const btnToggle = E(fs,'legend > .fieldset-toggle'),
-                  content = EAll(fs,':scope > div');
-            btnToggle.addEventListener('click', function(){
-                fs.classList.toggle('collapsed');
-                content.forEach((d)=>d.classList.toggle('hidden'));
-            }, false);
-        });
-
-        /**
-           Given a DOM element, this routine measures its "effective
-           height", which is the bounding top/bottom range of this element
-           and all of its children, recursively. For some DOM structure
-           cases, a parent may have a reported height of 0 even though
-           children have non-0 sizes.
-
-           Returns 0 if !e or if the element really has no height.
-        */
-        const effectiveHeight = function f(e){
-            if(!e) return 0;
-            if(!f.measure){
-                f.measure = function callee(e, depth){
-                    if(!e) return;
-                    const m = e.getBoundingClientRect();
-                    if(0===depth){
-                        callee.top = m.top;
-                        callee.bottom = m.bottom;
-                    }else{
-                        callee.top = m.top ? Math.min(callee.top, m.top) : callee.top;
-                        callee.bottom = Math.max(callee.bottom, m.bottom);
-                    }
-                    Array.prototype.forEach.call(e.children,(e)=>callee(e,depth+1));
-                    if(0===depth){
-                        //console.debug("measure() height:",e.className, callee.top, callee.bottom, (callee.bottom - callee.top));
-                        f.extra += callee.bottom - callee.top;
-                    }
-                    return f.extra;
-                };
-            }
-            f.extra = 0;
-            f.measure(e,0);
-            return f.extra;
-        };
-
-        /**
-           Returns a function, that, as long as it continues to be invoked,
-           will not be triggered. The function will be called after it stops
-           being called for N milliseconds. If `immediate` is passed, call
-           the callback immediately and hinder future invocations until at
-           least the given time has passed.
-
-           If passed only 1 argument, or passed a falsy 2nd argument,
-           the default wait time set in this function's $defaultDelay
-           property is used.
-
-           Source: underscore.js, by way of https://davidwalsh.name/javascript-debounce-function
-        */
-        const debounce = function f(func, wait, immediate) {
-            var timeout;
-            if(!wait) wait = f.$defaultDelay;
-            return function() {
-                const context = this, args = Array.prototype.slice.call(arguments);
-                const later = function() {
-                    timeout = undefined;
-                    if(!immediate) func.apply(context, args);
-                };
-                const callNow = immediate && !timeout;
-                clearTimeout(timeout);
-                timeout = setTimeout(later, wait);
-                if(callNow) func.apply(context, args);
-            };
-        };
-        debounce.$defaultDelay = 500 /*arbitrary*/;
-
-        const ForceResizeKludge = (function(){
-            /* Workaround for Safari mayhem regarding use of vh CSS
-               units....  We cannot use vh units to set the main view
-               size because Safari chokes on that, so we calculate
-               that height here. Larger than ~95% is too big for
-               Firefox on Android, causing the input area to move
-               off-screen. */
-            const appViews = EAll('.app-view');
-            const elemsToCount = [
-                /* Elements which we need to always count in the
-                   visible body size. */
-                E('body > header'),
-                E('body > footer')
-            ];
-            const resized = function f(){
-                if(f.$disabled) return;
-                const wh = window.innerHeight;
-                var ht;
-                var extra = 0;
-                elemsToCount.forEach((e)=>e ? extra += effectiveHeight(e) : false);
-                ht = wh - extra;
-                appViews.forEach(function(e){
-                    e.style.height =
-                        e.style.maxHeight = [
-                            "calc(", (ht>=100 ? ht : 100), "px",
-                            " - 2em"/*fudge value*/,")"
-                            /* ^^^^ hypothetically not needed, but both
-                               Chrome/FF on Linux will force scrollbars on the
-                               body if this value is too small. */
-                        ].join('');
-                });
-            };
-            resized.$disabled = true/*gets deleted when setup is finished*/;
-            window.addEventListener('resize', debounce(resized, 250), false);
-            return resized;
-        })();
-
-        /** Set up a selection list of examples */
-        (function(){
-            const xElem = E('#select-examples');
-            const examples = [
-                {name: "Help", sql:
+    /** Set up a selection list of examples */
+    (function(){
+      const xElem = E('#select-examples');
+      const examples = [
+        {name: "Help", sql:
 `-- ================================================
 -- Use ctrl-enter or shift-enter to execute sqlite3
 -- shell commands and SQL.
@@ -756,55 +755,53 @@ SELECT * FROM t;`},
     FROM m2 GROUP BY cy
   )
 SELECT group_concat(rtrim(t),x'0a') as Mandelbrot FROM a;`}
-            ];
-            const newOpt = function(lbl,val){
-                const o = document.createElement('option');
-                o.value = val;
-                if(!val) o.setAttribute('disabled',true);
-                o.appendChild(document.createTextNode(lbl));
-                xElem.appendChild(o);
-            };
-            newOpt("Examples (replaces input!)");
-            examples.forEach((o)=>newOpt(o.name, o.sql));
-            //xElem.setAttribute('disabled',true);
-            xElem.selectedIndex = 0;
-            xElem.addEventListener('change', function(){
-                taInput.value = '-- ' +
-                    this.selectedOptions[0].innerText +
-                    '\n' + this.value;
-                SF.dbExec(this.value);
-            });
-        })()/* example queries */;
+      ];
+      const newOpt = function(lbl,val){
+        const o = document.createElement('option');
+        o.value = val;
+        if(!val) o.setAttribute('disabled',true);
+        o.appendChild(document.createTextNode(lbl));
+        xElem.appendChild(o);
+      };
+      newOpt("Examples (replaces input!)");
+      examples.forEach((o)=>newOpt(o.name, o.sql));
+      //xElem.setAttribute('disabled',true);
+      xElem.selectedIndex = 0;
+      xElem.addEventListener('change', function(){
+        taInput.value = '-- ' +
+          this.selectedOptions[0].innerText +
+          '\n' + this.value;
+        SF.dbExec(this.value);
+      });
+    })()/* example queries */;
 
-        //SF.echo(null/*clear any output generated by the init process*/);
-        if(window.jQuery && window.jQuery.terminal){
-            /* Set up the terminal-style view... */
-            const eTerm = window.jQuery('#view-terminal').empty();
-            SF.jqTerm = eTerm.terminal(SF.dbExec.bind(SF),{
-                prompt: 'sqlite> ',
-                greetings: false /* note that the docs incorrectly call this 'greeting' */
-            });
-            /* Set up a button to toggle the views... */
-            const head = E('header#titlebar');
-            const btnToggleView = document.createElement('button');
-            btnToggleView.appendChild(document.createTextNode("Toggle View"));
-            head.appendChild(btnToggleView);
-            btnToggleView.addEventListener('click',function f(){
-                EAll('.app-view').forEach(e=>e.classList.toggle('hidden'));
-                if(document.body.classList.toggle('terminal-mode')){
-                    ForceResizeKludge();
-                }
-            }, false);
-            btnToggleView.click()/*default to terminal view*/;
+    //SF.echo(null/*clear any output generated by the init process*/);
+    if(window.jQuery && window.jQuery.terminal){
+      /* Set up the terminal-style view... */
+      const eTerm = window.jQuery('#view-terminal').empty();
+      SF.jqTerm = eTerm.terminal(SF.dbExec.bind(SF),{
+        prompt: 'sqlite> ',
+        greetings: false /* note that the docs incorrectly call this 'greeting' */
+      });
+      /* Set up a button to toggle the views... */
+      const head = E('header#titlebar');
+      const btnToggleView = document.createElement('button');
+      btnToggleView.appendChild(document.createTextNode("Toggle View"));
+      head.appendChild(btnToggleView);
+      btnToggleView.addEventListener('click',function f(){
+        EAll('.app-view').forEach(e=>e.classList.toggle('hidden'));
+        if(document.body.classList.toggle('terminal-mode')){
+          ForceResizeKludge();
         }
-        SF.dbExec(null/*init the db and output the header*/);
-        SF.echo('This experimental app is provided in the hope that it',
-                'may prove interesting or useful but is not an officially',
-                'supported deliverable of the sqlite project. It is subject to',
-                'any number of changes or outright removal at any time.\n');
-        delete ForceResizeKludge.$disabled;
-        ForceResizeKludge();
-
-        btnShellExec.click();
-    }/*onSFLoaded()*/;
+      }, false);
+      btnToggleView.click()/*default to terminal view*/;
+    }
+    SF.echo('This experimental app is provided in the hope that it',
+            'may prove interesting or useful but is not an officially',
+            'supported deliverable of the sqlite project. It is subject to',
+            'any number of changes or outright removal at any time.\n');
+    SF.dbExec(null);
+    delete ForceResizeKludge.$disabled;
+    ForceResizeKludge();
+  }/*onSFLoaded()*/;
 })();
diff --git a/manifest b/manifest
index e575dac86d..a911a21d4f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Reformulate\ssome\sJS\sto\swork\saround\sa\sbuggy/broken\scode\stransformation\sin\sone\sof\sthe\sEmscripten-driven\scode\soptimizers.
-D 2022-09-21T20:24:12.588
+C Refactoring\stowards\sgetting\sfiddle\sto\ssupport\sOPFS\sas\sa\sfirst-class\scitizen.\sCertain\soperations,\se.g.\simport,\sexport,\sand\sunlink,\sare\snot\sOPFS-aware.
+D 2022-09-24T07:36:45.332
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -472,7 +472,7 @@ F ext/session/test_session.c f433f68a8a8c64b0f5bc74dc725078f12483301ad4ae8375205
 F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
-F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 7fb73f7150ab79d83bb45a67d257553c905c78cd3d693101699243f36c5ae6c3
+F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 105f6f7f211f49dea8fa6ee8b7b56492d5f9237ab0d1c1b3c970df11e4d0df02
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle 0e88c8cfc3719e4b7e74980d9da664c709e68acf863e48386cda376edfd3bfb0
 F ext/wasm/GNUmakefile 34a84e30e6b25e24959a8264e9dec020dffa82d96879dc55ad65d3c31c95d3b1
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
@@ -485,7 +485,7 @@ F ext/wasm/api/sqlite3-api-cleanup.js 8564a6077cdcaea9a9f428a019af8a05887f0131e6
 F ext/wasm/api/sqlite3-api-glue.js cfff894bdf98a6c579975d09dd45471b0e3399f08a6f9e44a22646e8403196ed
 F ext/wasm/api/sqlite3-api-oo1.js f974e79d9af8f26bf33928c5730b0988cc706d14f59a5fe36394739b92249841
 F ext/wasm/api/sqlite3-api-opfs.js d623ea3519cd81fe18e243adfdd07cd1fa4b07ff3b0fd0d2b269beb0e127acb3
-F ext/wasm/api/sqlite3-api-prologue.js 76fcd56005717cf4ef6c57cee4d7679c9a5fa8c060110485c1318f5b548abac8
+F ext/wasm/api/sqlite3-api-prologue.js a50ba8618e81a10a4fecd70f8723a7295cfcc0babd6df1dd018e7c5db2904aac
 F ext/wasm/api/sqlite3-api-worker1.js 2eeb2a24e1a90322d84a9b88a99919b806623de62792436446099c0988f2030b
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c d1c0724136480a459d9dda4b76a665691a172d5cba96729d26d26acf6480bc9b
@@ -494,7 +494,7 @@ F ext/wasm/batch-runner.js 6f5b86e0b5519a9a941d9f17ee9c5ecdc63f452f157602fe7fdf8
 F ext/wasm/common/SqliteTestUtil.js 529161a624265ba84271a52db58da022649832fa1c71309fb1e02cc037327a2b
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 3a5143699c2b73a85b962271e1a9b3241b30d90e30d895e4f55665e648572962
-F ext/wasm/common/whwasmutil.js f64f94e2a3e1d8fd2139b4d80f00a3ab504985e38103c45b1ff15ec8b44fcce3
+F ext/wasm/common/whwasmutil.js ba863cb5b837654736a6e20636c887016f08639127c08d9d985db474d1cec1a4
 F ext/wasm/demo-123-worker.html e419b66495d209b5211ec64903b4cfb3ca7df20d652b41fcd28bf018a773234f
 F ext/wasm/demo-123.html aa281d33b7eefa755f3122b7b5a18f39a42dc5fb69c8879171bf14b4c37c4ec4
 F ext/wasm/demo-123.js 234655683e35a4543a23de7b10800d76b0369947b33e089e5613171fa7795afb
@@ -502,9 +502,9 @@ F ext/wasm/demo-kvvfs1.html 7d4f28873de67f51ac18c584b7d920825139866a96049a49c424
 F ext/wasm/demo-kvvfs1.js e884ea35022d772c0d1dd884b40011413696438394f605c6cd4808cfb1642a4a
 F ext/wasm/fiddle.make fd56fa21bada6ecbf860686a9a789ebda7cc3d9b60835927000fcb00246ea50f
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
-F ext/wasm/fiddle/fiddle-worker.js 3a258f7c79f36958d8f63bceb3dd178bb2dfc6a802329e9349612ecb1d9fcd09
+F ext/wasm/fiddle/fiddle-worker.js b6aea063c591c672cc575ef726d41d2b486e16bf7623a9775a374fd27b29a133
 F ext/wasm/fiddle/fiddle.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
-F ext/wasm/fiddle/fiddle.js dae246414ebd56ecdc09cf95c43b2d50e1332a331832a27915782c7767f92f45
+F ext/wasm/fiddle/fiddle.js e7c6dee946818d0e6a10c89b640440fd5d93cbb9bddea490b98cf54e8bb67ae6
 F ext/wasm/index.html 8b4b7ea052d558262c8466f94326fb455c21049b2d1d3577ed0a5fce15101ba8
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 447cc02b598f7792edaa8ae6853a7847b8178a18ed356afacbdbf312b2588106
@@ -615,7 +615,7 @@ F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c d69dfb5b082f9a25e6700e152ddb3d942359b847b1df504eb09f9b4531844f8d
-F src/shell.c.in fd57bd685265eda436f98b06adca63c6a6cc170e12c7cd9b0c44826ea65cc6be
+F src/shell.c.in c4625fa9493cf815ff15e62bee5af93e91bbdb1a0c4e2c5a34a3744df3d5daaf
 F src/sqlite.h.in b9b7fd73239d94db20332bb6e504688001e5564b655e1318a4427a1caef4b99e
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d
@@ -2026,8 +2026,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 7c7fb7535e86b3960eea7f29ab7e6d5197c166b4ee64ad4a9bc0749f2869badc
-R 21b4f88ebebc444a2dca81501f78488d
+P e1249369d5ec1c582c280b1f578b35d53637fdf1cbd97c16d5ed95b136b83e56
+R bfb613620806c41d29eb36b1d39427ef
 U stephan
-Z de96dd791c0a9ecdd14104957785e773
+Z 135731a0096fbab4e7ac0c6ece9bf8ed
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 28b4a319ca..ea285c7d79 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e1249369d5ec1c582c280b1f578b35d53637fdf1cbd97c16d5ed95b136b83e56
\ No newline at end of file
+1b923ed6438d7fef4508936e0c4bc026a368721698b1539961e3fb3140a185cb
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index bef30f5dfc..bafcc697f2 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -1172,6 +1172,7 @@ struct ShellState {
   struct {
     const char * zInput; /* Input string from wasm/JS proxy */
     const char * zPos;   /* Cursor pos into zInput */
+    const char * zDefaultDbName; /* Default name for db file */
   } wasm;
 #endif
 };
@@ -12057,6 +12058,7 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
 #ifdef SQLITE_SHELL_FIDDLE
   stdin_is_interactive = 0;
   stdout_is_console = 1;
+  data.wasm.zDefaultDbName = "/fiddle.sqlite3";
 #else
   stdin_is_interactive = isatty(0);
   stdout_is_console = isatty(1);
@@ -12686,7 +12688,7 @@ const char * fiddle_db_filename(const char * zDbName){
 void fiddle_reset_db(void){
   char *zFilename = 0;
   if(0==globalDb){
-    shellState.pAuxDb->zDbFilename = "/fiddle.sqlite3";
+    shellState.pAuxDb->zDbFilename = shellState.wasm.zDefaultDbName;
   }else{
     zFilename =
       sqlite3_mprintf("%s", sqlite3_db_filename(globalDb, "main"));
@@ -12701,48 +12703,19 @@ void fiddle_reset_db(void){
 }
 
 /*
-** Trivial exportable function for emscripten. Needs to be exported using:
-**
-** emcc ..flags... -sEXPORTED_FUNCTIONS=_fiddle_exec -sEXPORTED_RUNTIME_METHODS=ccall,cwrap
-**
-** (Note the underscore before the function name.) It processes zSql
-** as if it were input to the sqlite3 shell and redirects all output
-** to the wasm binding.
+** Trivial exportable function for emscripten. It processes zSql as if
+** it were input to the sqlite3 shell and redirects all output to the
+** wasm binding. If fiddle_main() has not been called by the time this
+** is called, this function calls it with a conservative set of
+** flags.
 */
 void fiddle_exec(const char * zSql){
-  static int once = 0;
-  int rc = 0;
-  if(!once){
-    /* Simulate an argv array for main() */
-    static char * argv[] = {"fiddle",
-                            "-bail",
-                            "-safe"};
-    rc = fiddle_main((int)(sizeof(argv)/sizeof(argv[0])), argv);
-    once = rc ? -1 : 1;
-    memset(&shellState.wasm, 0, sizeof(shellState.wasm));
-    printf(
-        "SQLite version %s %.19s\n" /*extra-version-info*/,
-        sqlite3_libversion(), sqlite3_sourceid()
-    );
-    puts("WASM shell");
-    puts("Enter \".help\" for usage hints.");
-    if(once>0){
-      fiddle_reset_db();
-    }
-    if(shellState.db){
-      printf("Connected to %s.\n", fiddle_db_filename(NULL));
-    }else{
-      fprintf(stderr,"ERROR initializing db!\n");
-      return;
-    }
-  }
-  if(once<0){
-    puts("DB init failed. Not executing SQL.");
-  }else if(zSql && *zSql){
+  if(zSql && *zSql){
+    if('.'==*zSql) puts(zSql);
     shellState.wasm.zInput = zSql;
     shellState.wasm.zPos = zSql;
     process_input(&shellState);
-    memset(&shellState.wasm, 0, sizeof(shellState.wasm));
+    shellState.wasm.zInput = shellState.wasm.zPos = 0;
   }
 }
 #endif /* SQLITE_SHELL_FIDDLE */

From 56fae744d402211a773ef892fbed351c98da7be4 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sat, 24 Sep 2022 10:12:19 +0000
Subject: [PATCH 161/428] Reworked out the OPFS async proxy metrics are fetched
 so that they play more nicely with the tight event-polling loop.

FossilOrigin-Name: ef503ced5c2ca842be9aea9ef13719a378ed3020e884032db09afee1b8eba0a1
---
 ext/wasm/api/sqlite3-api-opfs.js     | 66 ++++++++++++++++++++--------
 ext/wasm/sqlite3-opfs-async-proxy.js | 63 +++++++++++++-------------
 manifest                             | 14 +++---
 manifest.uuid                        |  2 +-
 4 files changed, 86 insertions(+), 59 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index abdf90d49b..f69e162c7e 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -142,7 +142,8 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
                     "metrics for",self.location.href,":",metrics,
                     "\nTotal of",n,"op(s) for",t,
                     "ms (incl. "+w+" ms of waiting on the async side)");
-        console.log("Serialization metrics:",JSON.stringify(metrics.s11n,0,2));
+        console.log("Serialization metrics:",metrics.s11n);
+        opRun('async-metrics');
       },
       reset: function(){
         let k;
@@ -160,7 +161,17 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
         //].forEach((k)=>r(metrics[k] = Object.create(null)));
       }
     }/*metrics*/;      
-
+    const promiseReject = function(err){
+      opfsVfs.dispose();
+      return promiseReject_(err);
+    };
+    const W = new Worker(options.proxyUri);
+    W._originalOnError = W.onerror /* will be restored later */;
+    W.onerror = function(err){
+      // The error object doesn't contain any useful info when the
+      // failure is, e.g., that the remote script is 404.
+      promiseReject(new Error("Loading OPFS async Worker failed for unknown reasons."));
+    };
     const pDVfs = capi.sqlite3_vfs_find(null)/*pointer to default VFS*/;
     const dVfs = pDVfs
           ? new sqlite3_vfs(pDVfs)
@@ -193,18 +204,6 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
        gets called at all in a wasm build, which is undefined).
     */
 
-    const promiseReject = function(err){
-      opfsVfs.dispose();
-      return promiseReject_(err);
-    };
-    const W = new Worker(options.proxyUri);
-    W._originalOnError = W.onerror /* will be restored later */;
-    W.onerror = function(err){
-      // The error object doesn't contain any useful info when the
-      // failure is, e.g., that the remote script is 404.
-      promiseReject(new Error("Loading OPFS async Worker failed for unknown reasons."));
-    };
-
     /**
        State which we send to the async-api Worker or share with it.
        This object must initially contain only cloneable or sharable
@@ -227,11 +226,19 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
     const state = Object.create(null);
     state.verbose = options.verbose;
     state.littleEndian = true;
-    /** If true, the async counterpart should log exceptions to
+    /** Whether the async counterpart should log exceptions to
         the serialization channel. That produces a great deal of
         noise for seemingly innocuous things like xAccess() checks
-        for missing files. */
-    state.asyncS11nExceptions = false;
+        for missing files, so this option may have one of 3 values:
+
+        0 = no exception logging
+
+        1 = only log exceptions for "significant" ops like xOpen(),
+        xRead(), and xWrite().
+
+        2 = log all exceptions.
+    */
+    state.asyncS11nExceptions = 1;
     /* Size of file I/O buffer block. 64k = max sqlite3 page size. */
     state.fileBufferSize =
       1024 * 64;
@@ -270,6 +277,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
       state.opIds.xClose = i++;
       state.opIds.xDelete = i++;
       state.opIds.xDeleteNoWait = i++;
+      state.opIds.xFileControl = i++;
       state.opIds.xFileSize = i++;
       state.opIds.xOpen = i++;
       state.opIds.xRead = i++;
@@ -278,7 +286,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
       state.opIds.xTruncate = i++;
       state.opIds.xWrite = i++;
       state.opIds.mkdir = i++;
-      state.opIds.xFileControl = i++;
+      state.opIds['async-metrics'] = i++;
       state.sabOP = new SharedArrayBuffer(i * 4/*sizeof int32*/);
       opfsUtil.metrics.reset();
     }
@@ -857,6 +865,27 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
        defaulting to 16.
     */
     opfsUtil.randomFilename = randomFilename;
+
+    /**
+       Re-registers the OPFS VFS. This is intended only for odd use
+       cases which have to call sqlite3_shutdown() as part of their
+       initialization process, which will unregister the VFS
+       registered by installOpfsVfs(). If passed a truthy value, the
+       OPFS VFS is registered as the default VFS, else it is not made
+       the default. Returns the result of the the
+       sqlite3_vfs_register() call.
+
+       Design note: the problem of having to re-register things after
+       a shutdown/initialize pair is more general. How to best plug
+       that in to the library is unclear. In particular, we cannot
+       hook in to any C-side calls to sqlite3_initialize(), so we
+       cannot add an after-initialize callback mechanism.
+    */
+    opfsUtil.reregisterVfs = (asDefault=false)=>{
+      return capi.wasm.exports.sqlite3_vfs_register(
+        opfsVfs.pointer, asDefault ? 1 : 0
+      );
+    };
     
     if(sqlite3.oo1){
       opfsUtil.OpfsDb = function(...args){
@@ -940,7 +969,6 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
         wasm.scopedAllocPop(scope);
       }
     }/*sanityCheck()*/;
-
     
     W.onmessage = function({data}){
       //log("Worker.onmessage:",data);
diff --git a/ext/wasm/sqlite3-opfs-async-proxy.js b/ext/wasm/sqlite3-opfs-async-proxy.js
index 6c0765c63d..fa5cd2d289 100644
--- a/ext/wasm/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/sqlite3-opfs-async-proxy.js
@@ -84,11 +84,10 @@ metrics.dump = ()=>{
   }
   console.log(self.location.href,
               "metrics for",self.location.href,":\n",
-              JSON.stringify(metrics,0,2)
-              /*dev console can't expand this object!*/,
+              metrics,
               "\nTotal of",n,"op(s) for",t,"ms",
               "approx",w,"ms spent waiting on OPFS APIs.");
-  console.log("Serialization metrics:",JSON.stringify(metrics.s11n,0,2));
+  console.log("Serialization metrics:",metrics.s11n);
 };
 
 warn("This file is very much experimental and under construction.",
@@ -122,7 +121,7 @@ const getResolvedPath = function(filename,splitIt){
    truthy then each directory element leading to the file is created
    along the way. Throws if any creation or resolution fails.
 */
-const getDirForPath = async function f(absFilename, createDirs = false){
+const getDirForFilename = async function f(absFilename, createDirs = false){
   const path = getResolvedPath(absFilename, true);
   const filename = path.pop();
   let dh = state.rootDir;
@@ -183,14 +182,20 @@ const wTimeEnd = ()=>(
    to simplify finding them.
 */
 const vfsAsyncImpls = {
-  mkdir: async function(dirname){
+  'async-metrics': async ()=>{
+    mTimeStart('async-metrics');
+    metrics.dump();
+    storeAndNotify('async-metrics', 0);
+    mTimeEnd();
+  },
+  mkdir: async (dirname)=>{
     mTimeStart('mkdir');
     let rc = 0;
     wTimeStart('mkdir');
     try {
-        await getDirForPath(dirname+"/filepart", true);
+        await getDirForFilename(dirname+"/filepart", true);
     }catch(e){
-      state.s11n.storeException(e);
+      state.s11n.storeException(2,e);
       rc = state.sq3Codes.SQLITE_IOERR;
     }finally{
       wTimeEnd();
@@ -198,7 +203,7 @@ const vfsAsyncImpls = {
     storeAndNotify('mkdir', rc);
     mTimeEnd();
   },
-  xAccess: async function(filename){
+  xAccess: async (filename)=>{
     mTimeStart('xAccess');
     /* OPFS cannot support the full range of xAccess() queries sqlite3
        calls for. We can essentially just tell if the file is
@@ -214,10 +219,10 @@ const vfsAsyncImpls = {
     let rc = 0;
     wTimeStart('xAccess');
     try{
-      const [dh, fn] = await getDirForPath(filename);
+      const [dh, fn] = await getDirForFilename(filename);
       await dh.getFileHandle(fn);
     }catch(e){
-      state.s11n.storeException(e);
+      state.s11n.storeException(2,e);
       rc = state.sq3Codes.SQLITE_IOERR;
     }finally{
       wTimeEnd();
@@ -269,7 +274,7 @@ const vfsAsyncImpls = {
     wTimeStart('xDelete');
     try {
       while(filename){
-        const [hDir, filenamePart] = await getDirForPath(filename, false);
+        const [hDir, filenamePart] = await getDirForFilename(filename, false);
         if(!filenamePart) break;
         await hDir.removeEntry(filenamePart, {recursive});
         if(0x1234 !== syncDir) break;
@@ -278,7 +283,7 @@ const vfsAsyncImpls = {
         filename = filename.join('/');
       }
     }catch(e){
-      state.s11n.storeException(e);
+      state.s11n.storeException(2,e);
       rc = state.sq3Codes.SQLITE_IOERR_DELETE;
     }
     wTimeEnd();
@@ -294,7 +299,7 @@ const vfsAsyncImpls = {
       state.s11n.serialize(Number(sz));
       sz = 0;
     }catch(e){
-      state.s11n.storeException(e);
+      state.s11n.storeException(2,e);
       sz = state.sq3Codes.SQLITE_IOERR;
     }
     wTimeEnd();
@@ -310,7 +315,7 @@ const vfsAsyncImpls = {
     try{
       let hDir, filenamePart;
       try {
-        [hDir, filenamePart] = await getDirForPath(filename, !!create);
+        [hDir, filenamePart] = await getDirForFilename(filename, !!create);
       }catch(e){
         storeAndNotify(opName, state.sql3Codes.SQLITE_NOTFOUND);
         mTimeEnd();
@@ -339,7 +344,7 @@ const vfsAsyncImpls = {
     }catch(e){
       wTimeEnd();
       error(opName,e);
-      state.s11n.storeException(e);
+      state.s11n.storeException(1,e);
       storeAndNotify(opName, state.sq3Codes.SQLITE_IOERR);
     }
     mTimeEnd();
@@ -361,7 +366,7 @@ const vfsAsyncImpls = {
       }
     }catch(e){
       error("xRead() failed",e,fh);
-      state.s11n.storeException(e);
+      state.s11n.storeException(1,e);
       rc = state.sq3Codes.SQLITE_IOERR_READ;
     }
     storeAndNotify('xRead',rc);
@@ -376,7 +381,7 @@ const vfsAsyncImpls = {
         wTimeStart('xSync');
         await fh.accessHandle.flush();
       }catch(e){
-        state.s11n.storeException(e);
+        state.s11n.storeException(2,e);
       }finally{
         wTimeEnd();
       }
@@ -394,7 +399,7 @@ const vfsAsyncImpls = {
       await fh.accessHandle.truncate(size);
     }catch(e){
       error("xTruncate():",e,fh);
-      state.s11n.storeException(e);
+      state.s11n.storeException(2,e);
       rc = state.sq3Codes.SQLITE_IOERR_TRUNCATE;
     }
     wTimeEnd();
@@ -414,7 +419,7 @@ const vfsAsyncImpls = {
       ) ? 0 : state.sq3Codes.SQLITE_IOERR_WRITE;
     }catch(e){
       error("xWrite():",e,fh);
-      state.s11n.storeException(e);
+      state.s11n.storeException(1,e);
       rc = state.sq3Codes.SQLITE_IOERR_WRITE;
     }finally{
       wTimeEnd();
@@ -519,7 +524,11 @@ const initS11n = ()=>{
   };
 
   state.s11n.storeException = state.asyncS11nExceptions
-    ? ((e)=>state.s11n.serialize(e.message))
+    ? ((priority,e)=>{
+      if(priority<=state.asyncS11nExceptions){
+        state.s11n.serialize(e.message);
+      }
+    })
     : ()=>{};
 
   return state.s11n;
@@ -533,10 +542,8 @@ const waitLoop = async function f(){
     const o = Object.create(null);
     opHandlers[state.opIds[k]] = o;
     o.key = k;
-    o.f = vi;// || toss("No vfsAsyncImpls[",k,"]");
+    o.f = vi || toss("No vfsAsyncImpls[",k,"]");
   }
-  let metricsTimer = self.location.port>=1024 ? performance.now() : 0;
-  // ^^^ in dev environment, dump out these metrics one time after a delay.
   while(true){
     try {
       if('timed-out'===Atomics.wait(state.sabOPView, state.opIds.whichOp, 0, 500)){
@@ -545,7 +552,7 @@ const waitLoop = async function f(){
       const opId = Atomics.load(state.sabOPView, state.opIds.whichOp);
       Atomics.store(state.sabOPView, state.opIds.whichOp, 0);
       const hnd = opHandlers[opId] ?? toss("No waitLoop handler for whichOp #",opId);
-      const args = state.s11n.deserialize();
+      const args = state.s11n.deserialize() || [];
       state.s11n.serialize()/* clear s11n to keep the caller from
                                confusing this with an exception string
                                written by the upcoming operation */;
@@ -554,14 +561,6 @@ const waitLoop = async function f(){
       else error("Missing callback for opId",opId);
     }catch(e){
       error('in waitLoop():',e.message);
-    }finally{
-      // We can't call metrics.dump() from the dev console because this
-      // thread is continually tied up in Atomics.wait(), so let's
-      // do, for dev purposes only, a dump one time after 60 seconds.
-      if(metricsTimer && (performance.now() > metricsTimer + 60000)){
-        metrics.dump();
-        metricsTimer = 0;
-      }
     }
   };
 };
diff --git a/manifest b/manifest
index a911a21d4f..5dc3d9e030 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Refactoring\stowards\sgetting\sfiddle\sto\ssupport\sOPFS\sas\sa\sfirst-class\scitizen.\sCertain\soperations,\se.g.\simport,\sexport,\sand\sunlink,\sare\snot\sOPFS-aware.
-D 2022-09-24T07:36:45.332
+C Reworked\sout\sthe\sOPFS\sasync\sproxy\smetrics\sare\sfetched\sso\sthat\sthey\splay\smore\snicely\swith\sthe\stight\sevent-polling\sloop.
+D 2022-09-24T10:12:19.409
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -484,7 +484,7 @@ F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1
 F ext/wasm/api/sqlite3-api-cleanup.js 8564a6077cdcaea9a9f428a019af8a05887f0131e6a2a1e72a7ff1145fadfe77
 F ext/wasm/api/sqlite3-api-glue.js cfff894bdf98a6c579975d09dd45471b0e3399f08a6f9e44a22646e8403196ed
 F ext/wasm/api/sqlite3-api-oo1.js f974e79d9af8f26bf33928c5730b0988cc706d14f59a5fe36394739b92249841
-F ext/wasm/api/sqlite3-api-opfs.js d623ea3519cd81fe18e243adfdd07cd1fa4b07ff3b0fd0d2b269beb0e127acb3
+F ext/wasm/api/sqlite3-api-opfs.js 5585dc80aea9df54c3d5d3a6c62771bf741f21b23706330ba62571c57ec07abf
 F ext/wasm/api/sqlite3-api-prologue.js a50ba8618e81a10a4fecd70f8723a7295cfcc0babd6df1dd018e7c5db2904aac
 F ext/wasm/api/sqlite3-api-worker1.js 2eeb2a24e1a90322d84a9b88a99919b806623de62792436446099c0988f2030b
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
@@ -519,7 +519,7 @@ F ext/wasm/speedtest1.html 8ae6ece128151d01f90579de69cfa06f021acdb760735250ef745
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
-F ext/wasm/sqlite3-opfs-async-proxy.js 483b6326e268589ed3749a4d1a60b4ec2afa8ff7c218a09d39430e3bde89862e
+F ext/wasm/sqlite3-opfs-async-proxy.js fe4b8268eea9acaec633ebd1dd3f85dae7c461c5c68985ab1075d9560b1db8e8
 F ext/wasm/sqlite3-worker1-promiser.js 4fd0465688a28a75f1d4ee4406540ba494f49844e3cad0670d0437a001943365
 F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
 F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
@@ -2026,8 +2026,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 e1249369d5ec1c582c280b1f578b35d53637fdf1cbd97c16d5ed95b136b83e56
-R bfb613620806c41d29eb36b1d39427ef
+P 1b923ed6438d7fef4508936e0c4bc026a368721698b1539961e3fb3140a185cb
+R 2784cada1344182947069d02e01bbe66
 U stephan
-Z 135731a0096fbab4e7ac0c6ece9bf8ed
+Z 8970d31318ed191d3ed86820eec133d3
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index ea285c7d79..7609818f5d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1b923ed6438d7fef4508936e0c4bc026a368721698b1539961e3fb3140a185cb
\ No newline at end of file
+ef503ced5c2ca842be9aea9ef13719a378ed3020e884032db09afee1b8eba0a1
\ No newline at end of file

From ef11fb915d9574dff1187ae80a7189168b14a309 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sat, 24 Sep 2022 10:15:08 +0000
Subject: [PATCH 162/428] Resolve "already configured" warnings from shell's
 main() when starting it up in fiddle mode.

FossilOrigin-Name: 114ef3552af977b272a0baddeb9a2326484b60acfc75284e43c55530f86b413f
---
 ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api |  1 +
 ext/wasm/api/sqlite3-api-prologue.js        |  1 +
 ext/wasm/common/whwasmutil.js               | 28 ++++++++----
 ext/wasm/fiddle/fiddle-worker.js            | 48 +++++++++++++--------
 manifest                                    | 18 ++++----
 manifest.uuid                               |  2 +-
 6 files changed, 62 insertions(+), 36 deletions(-)

diff --git a/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api b/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
index 3119d50d03..c15599df41 100644
--- a/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
+++ b/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
@@ -54,6 +54,7 @@ _sqlite3_result_error_toobig
 _sqlite3_result_int
 _sqlite3_result_null
 _sqlite3_result_text
+_sqlite3_shutdown
 _sqlite3_sourceid
 _sqlite3_sql
 _sqlite3_step
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 639ad99c68..6a3bbc585b 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -650,6 +650,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     ["sqlite3_result_int",undefined, "*", "int"],
     ["sqlite3_result_null",undefined, "*"],
     ["sqlite3_result_text",undefined, "*", "string", "int", "*"],
+    ["sqlite3_shutdown", undefined],
     ["sqlite3_sourceid", "string"],
     ["sqlite3_sql", "string", "sqlite3_stmt*"],
     ["sqlite3_step", "int", "sqlite3_stmt*"],
diff --git a/ext/wasm/common/whwasmutil.js b/ext/wasm/common/whwasmutil.js
index e9ab8c5942..fa39ad4b93 100644
--- a/ext/wasm/common/whwasmutil.js
+++ b/ext/wasm/common/whwasmutil.js
@@ -1164,21 +1164,27 @@ self.WhWasmUtilInstaller = function(target){
   /** Map of type names to return result conversion functions. */
   cache.xWrap.convert.result = Object.create(null);
 
-  xcv.arg.i64 = (i)=>BigInt(i);
+  if(target.bigIntEnabled){
+    xcv.arg.i64 = (i)=>BigInt(i);
+  }
   xcv.arg.i32 = (i)=>(i | 0);
   xcv.arg.i16 = (i)=>((i | 0) & 0xFFFF);
   xcv.arg.i8  = (i)=>((i | 0) & 0xFF);
   xcv.arg.f32 = xcv.arg.float = (i)=>Number(i).valueOf();
   xcv.arg.f64 = xcv.arg.double = xcv.arg.f32;
   xcv.arg.int = xcv.arg.i32;
-  xcv.result['*'] = xcv.result['pointer'] = xcv.arg[ptrIR];
+  xcv.result['*'] = xcv.result['pointer'] = xcv.arg['**'] = xcv.arg[ptrIR];
+  xcv.result['number'] = (v)=>Number(v);
 
-  for(const t of ['i8', 'i16', 'i32', 'int', 'i64',
-                  'f32', 'float', 'f64', 'double']){
-    xcv.arg[t+'*'] = xcv.result[t+'*'] = xcv.arg[ptrIR]
-    xcv.result[t] = xcv.arg[t] || toss("Missing arg converter:",t);
+  {
+    const copyToResult = ['i8', 'i16', 'i32', 'int',
+                          'f32', 'float', 'f64', 'double'];
+    if(target.bigIntEnabled) copyToResult.push('i64');
+    for(const t of copyToResult){
+      xcv.arg[t+'*'] = xcv.result[t+'*'] = xcv.arg[ptrIR];
+      xcv.result[t] = xcv.arg[t] || toss("Missing arg converter:",t);
+    }
   }
-  xcv.arg['**'] = xcv.arg[ptrIR];
 
   /**
      In order for args of type string to work in various contexts in
@@ -1301,12 +1307,18 @@ self.WhWasmUtilInstaller = function(target){
        type. It's primarily intended to mark output-pointer arguments.
 
      - `i64` (args and results): passes the value to BigInt() to
-       convert it to an int64.
+       convert it to an int64. Only available if bigIntEnabled is
+       true.
 
      - `f32` (`float`), `f64` (`double`) (args and results): pass
        their argument to Number(). i.e. the adaptor does not currently
        distinguish between the two types of floating-point numbers.
 
+     - `number` (results): converts the result to a JS Number using
+       Number(theValue).valueOf(). Note that this is for result
+       conversions only, as it's not possible to generically know
+       which type of number to convert arguments to.
+
      Non-numeric conversions include:
 
      - `string` (args): has two different semantics in order to
diff --git a/ext/wasm/fiddle/fiddle-worker.js b/ext/wasm/fiddle/fiddle-worker.js
index 97774a1019..3ace9ee6b6 100644
--- a/ext/wasm/fiddle/fiddle-worker.js
+++ b/ext/wasm/fiddle/fiddle-worker.js
@@ -128,7 +128,7 @@
       return f._();
     },
     runMain: function f(){
-      if(f.argv) return f.argv.rc;
+      if(f.argv) return 0===f.argv.rc;
       const dbName = "/fiddle.sqlite3";
       f.argv = [
         'sqlite3-fiddle.wasm',
@@ -138,9 +138,16 @@
            that any argv strings passed to its main() are valid until
            the wasm environment shuts down. */
       ];
-      const capi = fiddleModule.sqlite3.capi;
-      f.argv.pArgv = capi.wasm.allocMainArgv(f.argv);
-      f.argv.rc = capi.wasm.exports.fiddle_main(
+      const S = fiddleModule.sqlite3;
+      /* We need to call sqlite3_shutdown() in order to avoid numerous
+         legitimate warnings from the shell about it being initialized
+         after sqlite3_initialize() has been called. This mean ,
+         however, that any initialization done by the JS code may need
+         to be re-done (e.g.  re-registration of dynamically-loaded
+         VFSes). */
+      S.capi.sqlite3_shutdown();
+      f.argv.pArgv = S.capi.wasm.allocMainArgv(f.argv);
+      f.argv.rc = S.capi.wasm.exports.fiddle_main(
         f.argv.length, f.argv.pArgv
       );
       if(f.argv.rc){
@@ -148,10 +155,20 @@
         fiddleModule.isDead = true;
         return false;
       }
-      stdout("SQLite version", capi.sqlite3_libversion(),
-             capi.sqlite3_sourceid().substr(0,19));
-      stdout('Welcome to the "fiddle" shell');
-      stdout('Enter ".help" for usage hints.');
+      stdout("SQLite version", S.capi.sqlite3_libversion(),
+             S.capi.sqlite3_sourceid().substr(0,19));
+      stdout('Welcome to the "fiddle" shell.');
+      if(S.opfs){
+        stdout("\nOPFS is available. To open a persistent db, use:\n\n",
+               "  .open file:name?vfs=opfs\n\nbut note that some",
+               "features (e.g. export) do not yet work with OPFS.");
+        S.opfs.reregisterVfs();
+      }
+      stdout('\nEnter ".help" for usage hints.');
+      this.exec([ // initialization commands...
+        '.nullvalue NULL',
+        '.headers on'
+      ].join('\n'));
       return true;
     },
     /**
@@ -246,6 +263,7 @@
              } */
           const opt = ev.data;
           let buffer = opt.buffer;
+          stderr('open():',fixmeOPFS);
           if(buffer instanceof Uint8Array){
           }else if(buffer instanceof ArrayBuffer){
             buffer = new Uint8Array(buffer);
@@ -330,19 +348,13 @@
   initFiddleModule(fiddleModule).then(function(thisModule){
     const S = thisModule.sqlite3;
     const atEnd = ()=>{
-      thisModule.fsUnlink = function(fn){
+      thisModule.fsUnlink = (fn)=>{
         stderr("unlink:",fixmeOPFS);
-        return thisModule.ccall('sqlite3_wasm_vfs_unlink','number',['string']);
+        return S.capi.wasm.sqlite3_wasm_vfs_unlink(fn);
       };
       wMsg('fiddle-ready');
     };
-    if(1){
-      S.installOpfsVfs().finally(function(){
-        if(S.opfs) stdout("OPFS is available.");
-        atEnd();
-      });
-    }else{
-      atEnd();
-    }
+    if(S.installOpfsVfs) S.installOpfsVfs().finally(atEnd);
+    else atEnd();
   })/*then()*/;
 })();
diff --git a/manifest b/manifest
index 5dc3d9e030..894072615c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Reworked\sout\sthe\sOPFS\sasync\sproxy\smetrics\sare\sfetched\sso\sthat\sthey\splay\smore\snicely\swith\sthe\stight\sevent-polling\sloop.
-D 2022-09-24T10:12:19.409
+C Resolve\s"already\sconfigured"\swarnings\sfrom\sshell's\smain()\swhen\sstarting\sit\sup\sin\sfiddle\smode.
+D 2022-09-24T10:15:08.912
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -476,7 +476,7 @@ F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 105f6f7f211f49dea8fa6ee8b7b56492d5f9237a
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle 0e88c8cfc3719e4b7e74980d9da664c709e68acf863e48386cda376edfd3bfb0
 F ext/wasm/GNUmakefile 34a84e30e6b25e24959a8264e9dec020dffa82d96879dc55ad65d3c31c95d3b1
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
-F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 8a724a674bd2089eef9676b434c0ab709da00db33f73a94e4987e90169b1cd14
+F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 77a5ee8bd209b5e75dd0e822bc3f6e7319dc9b36431463d4175c775170f92126
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
 F ext/wasm/api/README.md d876597edd2b9542b6ea031adaaff1c042076fde7b670b1dc6d8a87b28a6631b
 F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba81456260a713ed04900c
@@ -485,7 +485,7 @@ F ext/wasm/api/sqlite3-api-cleanup.js 8564a6077cdcaea9a9f428a019af8a05887f0131e6
 F ext/wasm/api/sqlite3-api-glue.js cfff894bdf98a6c579975d09dd45471b0e3399f08a6f9e44a22646e8403196ed
 F ext/wasm/api/sqlite3-api-oo1.js f974e79d9af8f26bf33928c5730b0988cc706d14f59a5fe36394739b92249841
 F ext/wasm/api/sqlite3-api-opfs.js 5585dc80aea9df54c3d5d3a6c62771bf741f21b23706330ba62571c57ec07abf
-F ext/wasm/api/sqlite3-api-prologue.js a50ba8618e81a10a4fecd70f8723a7295cfcc0babd6df1dd018e7c5db2904aac
+F ext/wasm/api/sqlite3-api-prologue.js 76db12cce58ec6724ec01a977dfbedabfd4916e915a6e7679ffc24dd52eef64e
 F ext/wasm/api/sqlite3-api-worker1.js 2eeb2a24e1a90322d84a9b88a99919b806623de62792436446099c0988f2030b
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c d1c0724136480a459d9dda4b76a665691a172d5cba96729d26d26acf6480bc9b
@@ -494,7 +494,7 @@ F ext/wasm/batch-runner.js 6f5b86e0b5519a9a941d9f17ee9c5ecdc63f452f157602fe7fdf8
 F ext/wasm/common/SqliteTestUtil.js 529161a624265ba84271a52db58da022649832fa1c71309fb1e02cc037327a2b
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 3a5143699c2b73a85b962271e1a9b3241b30d90e30d895e4f55665e648572962
-F ext/wasm/common/whwasmutil.js ba863cb5b837654736a6e20636c887016f08639127c08d9d985db474d1cec1a4
+F ext/wasm/common/whwasmutil.js 2a8cd8b0c936da5812971aa39c8d989306c2ad8fc841dcd037c3be62737dc652
 F ext/wasm/demo-123-worker.html e419b66495d209b5211ec64903b4cfb3ca7df20d652b41fcd28bf018a773234f
 F ext/wasm/demo-123.html aa281d33b7eefa755f3122b7b5a18f39a42dc5fb69c8879171bf14b4c37c4ec4
 F ext/wasm/demo-123.js 234655683e35a4543a23de7b10800d76b0369947b33e089e5613171fa7795afb
@@ -502,7 +502,7 @@ F ext/wasm/demo-kvvfs1.html 7d4f28873de67f51ac18c584b7d920825139866a96049a49c424
 F ext/wasm/demo-kvvfs1.js e884ea35022d772c0d1dd884b40011413696438394f605c6cd4808cfb1642a4a
 F ext/wasm/fiddle.make fd56fa21bada6ecbf860686a9a789ebda7cc3d9b60835927000fcb00246ea50f
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
-F ext/wasm/fiddle/fiddle-worker.js b6aea063c591c672cc575ef726d41d2b486e16bf7623a9775a374fd27b29a133
+F ext/wasm/fiddle/fiddle-worker.js 462dee066849c6cb1a0347e90d3c010ca8abb1640e63b3ed3813e88ae3558d64
 F ext/wasm/fiddle/fiddle.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
 F ext/wasm/fiddle/fiddle.js e7c6dee946818d0e6a10c89b640440fd5d93cbb9bddea490b98cf54e8bb67ae6
 F ext/wasm/index.html 8b4b7ea052d558262c8466f94326fb455c21049b2d1d3577ed0a5fce15101ba8
@@ -2026,8 +2026,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 1b923ed6438d7fef4508936e0c4bc026a368721698b1539961e3fb3140a185cb
-R 2784cada1344182947069d02e01bbe66
+P ef503ced5c2ca842be9aea9ef13719a378ed3020e884032db09afee1b8eba0a1
+R 8ff71a36ad5ceae355c6a421e1d0952c
 U stephan
-Z 8970d31318ed191d3ed86820eec133d3
+Z e3192f3e3789b47f0628d3187b22766d
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 7609818f5d..467d993c67 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ef503ced5c2ca842be9aea9ef13719a378ed3020e884032db09afee1b8eba0a1
\ No newline at end of file
+114ef3552af977b272a0baddeb9a2326484b60acfc75284e43c55530f86b413f
\ No newline at end of file

From 395012e58e97554665b39d748f8ecd179f09dab8 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sat, 24 Sep 2022 11:32:00 +0000
Subject: [PATCH 163/428] Fiddle: move, rather than copy, data buffers between
 the threads. Fix the case of an uploaded db failing to install because its
 filename is the same as the opened db.

FossilOrigin-Name: bcec4f964a7b02f59be05286ff715bac654a32b19f05a743e402f4cdb207cab8
---
 ext/wasm/fiddle/fiddle-worker.js | 74 ++++++++++++++++++--------------
 ext/wasm/fiddle/fiddle.js        | 12 +++---
 manifest                         | 14 +++---
 manifest.uuid                    |  2 +-
 4 files changed, 56 insertions(+), 46 deletions(-)

diff --git a/ext/wasm/fiddle/fiddle-worker.js b/ext/wasm/fiddle/fiddle-worker.js
index 3ace9ee6b6..827d2cfa90 100644
--- a/ext/wasm/fiddle/fiddle-worker.js
+++ b/ext/wasm/fiddle/fiddle-worker.js
@@ -90,18 +90,13 @@
 "use strict";
 (function(){
   /**
-     Posts a message in the form {type,data} unless passed more than 2
-     args, in which case it posts {type, data:[arg1...argN]}.
-  */
-  const wMsg = function(type,data){
-    postMessage({
-      type,
-      data: arguments.length<3
-        ? data
-        : Array.prototype.slice.call(arguments,1)
-    });
-  };
-
+     Posts a message in the form {type,data}. If passed more than 2
+     args, the 3rd must be an array of "transferable" values to pass
+     as the 2nd argument to postMessage(). */
+  const wMsg =
+        (type,data,transferables)=>{
+          postMessage({type, data}, transferables || []);
+        };
   const stdout = (...args)=>wMsg('stdout', args);
   const stderr = (...args)=>wMsg('stderr', args);
 
@@ -242,10 +237,10 @@
           const fn2 = fn ? fn.split(/[/\\]/).pop() : null;
           try{
             if(!fn2) throw new Error("DB appears to be closed.");
-            wMsg('db-export',{
-              filename: fn2,
-              buffer: fiddleModule.FS.readFile(fn, {encoding:"binary"})
-            });
+            const buffer = fiddleModule.FS.readFile(
+              fn, {encoding:"binary"}
+            ).buffer;
+            wMsg('db-export',{filename: fn2, buffer}, [buffer]);
           }catch(e){
             /* Post a failure message so that UI elements disabled
                during the export can be re-enabled. */
@@ -258,16 +253,17 @@
         }
         case 'open': {
           /* Expects: {
-             buffer: ArrayBuffer | Uint8Array,
-             filename: for logging/informational purposes only
-             } */
+               buffer: ArrayBuffer | Uint8Array,
+               filename: the filename for the db. Any dir part is
+                         stripped.
+              }
+          */
           const opt = ev.data;
           let buffer = opt.buffer;
           stderr('open():',fixmeOPFS);
-          if(buffer instanceof Uint8Array){
-          }else if(buffer instanceof ArrayBuffer){
+          if(buffer instanceof ArrayBuffer){
             buffer = new Uint8Array(buffer);
-          }else{
+          }else if(!(buffer instanceof Uint8Array)){
             stderr("'open' expects {buffer:Uint8Array} containing an uploaded db.");
             return;
           }
@@ -277,18 +273,30 @@
               : ("db-"+((Math.random() * 10000000) | 0)+
                  "-"+((Math.random() * 10000000) | 0)+".sqlite3")
           );
-          /* We cannot delete the existing db file until the new one
-             is installed, which means that we risk overflowing our
-             quota (if any) by having both the previous and current
-             db briefly installed in the virtual filesystem. */
-          fiddleModule.FS.createDataFile("/", fn, buffer, true, true);
-          const oldName = Sqlite3Shell.dbFilename();
-          Sqlite3Shell.exec('.open "/'+fn+'"');
-          if(oldName && oldName !== fn){
-            try{fiddleModule.fsUnlink(oldName);}
-            catch(e){/*ignored*/}
+          try {
+            /* We cannot delete the existing db file until the new one
+               is installed, which means that we risk overflowing our
+               quota (if any) by having both the previous and current
+               db briefly installed in the virtual filesystem. */
+            const fnAbs = '/'+fn;
+            const oldName = Sqlite3Shell.dbFilename();
+            if(oldName && oldName===fnAbs){
+              /* We cannot create the replacement file while the current file
+                 is opened, nor does the shell have a .close command, so we
+                 must temporarily switch to another db... */
+              Sqlite3Shell.exec('.open :memory:');
+              fiddleModule.FS.unlink(fnAbs);
+            }
+            fiddleModule.FS.createDataFile("/", fn, buffer, true, true);
+            Sqlite3Shell.exec('.open "'+fnAbs+'"');
+            if(oldName && oldName!==fnAbs){
+              try{fiddleModule.fsUnlink(oldName)}
+              catch(e){/*ignored*/}
+            }
+            stdout("Replaced DB with",fn+".");
+          }catch(e){
+            stderr("Error installing db",fn+":",e.message);
           }
-          stdout("Replaced DB with",fn+".");
           return;
         }
     };
diff --git a/ext/wasm/fiddle/fiddle.js b/ext/wasm/fiddle/fiddle.js
index 0d8792d55d..4a0bc39116 100644
--- a/ext/wasm/fiddle/fiddle.js
+++ b/ext/wasm/fiddle/fiddle.js
@@ -290,8 +290,8 @@
             return this;
           },
           /* Posts a message in the form {type, data} to the db worker. Returns this. */
-          wMsg: function(type,data){
-            this.worker.postMessage({type, data});
+          wMsg: function(type,data,transferables){
+            this.worker.postMessage({type, data}, transferables || []);
             return this;
           },
           /**
@@ -558,7 +558,8 @@
         SF.echo("Export failed:",ev.error);
         return;
       }
-      const blob = new Blob([ev.buffer], {type:"application/x-sqlite3"});
+      const blob = new Blob([ev.buffer],
+                            {type:"application/x-sqlite3"});
       const a = document.createElement('a');
       document.body.appendChild(a);
       a.href = window.URL.createObjectURL(blob);
@@ -593,7 +594,7 @@
         SF.wMsg('open',{
           filename: f.name,
           buffer: this.result
-        });
+        }, [this.result]);
       });
       r.addEventListener('error',function(){
         enableMutatingElements(true);
@@ -800,7 +801,8 @@ SELECT group_concat(rtrim(t),x'0a') as Mandelbrot FROM a;`}
             'may prove interesting or useful but is not an officially',
             'supported deliverable of the sqlite project. It is subject to',
             'any number of changes or outright removal at any time.\n');
-    SF.dbExec(null);
+    const urlParams = new URL(self.location.href).searchParams;
+    SF.dbExec(urlParams.get('sql') || null);
     delete ForceResizeKludge.$disabled;
     ForceResizeKludge();
   }/*onSFLoaded()*/;
diff --git a/manifest b/manifest
index 894072615c..7947368a89 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Resolve\s"already\sconfigured"\swarnings\sfrom\sshell's\smain()\swhen\sstarting\sit\sup\sin\sfiddle\smode.
-D 2022-09-24T10:15:08.912
+C Fiddle:\smove,\srather\sthan\scopy,\sdata\sbuffers\sbetween\sthe\sthreads.\sFix\sthe\scase\sof\san\suploaded\sdb\sfailing\sto\sinstall\sbecause\sits\sfilename\sis\sthe\ssame\sas\sthe\sopened\sdb.
+D 2022-09-24T11:32:00.293
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -502,9 +502,9 @@ F ext/wasm/demo-kvvfs1.html 7d4f28873de67f51ac18c584b7d920825139866a96049a49c424
 F ext/wasm/demo-kvvfs1.js e884ea35022d772c0d1dd884b40011413696438394f605c6cd4808cfb1642a4a
 F ext/wasm/fiddle.make fd56fa21bada6ecbf860686a9a789ebda7cc3d9b60835927000fcb00246ea50f
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
-F ext/wasm/fiddle/fiddle-worker.js 462dee066849c6cb1a0347e90d3c010ca8abb1640e63b3ed3813e88ae3558d64
+F ext/wasm/fiddle/fiddle-worker.js d3e4d1e442a9a86cc34f8bd646059d848cf3345b5220883379268b03b3c3cdfa
 F ext/wasm/fiddle/fiddle.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
-F ext/wasm/fiddle/fiddle.js e7c6dee946818d0e6a10c89b640440fd5d93cbb9bddea490b98cf54e8bb67ae6
+F ext/wasm/fiddle/fiddle.js aa44051be6e48c53fd23c829177d43f557dcc6f0998ccfcbae7c473ff405f0c6
 F ext/wasm/index.html 8b4b7ea052d558262c8466f94326fb455c21049b2d1d3577ed0a5fce15101ba8
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 447cc02b598f7792edaa8ae6853a7847b8178a18ed356afacbdbf312b2588106
@@ -2026,8 +2026,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 ef503ced5c2ca842be9aea9ef13719a378ed3020e884032db09afee1b8eba0a1
-R 8ff71a36ad5ceae355c6a421e1d0952c
+P 114ef3552af977b272a0baddeb9a2326484b60acfc75284e43c55530f86b413f
+R 2919c32f82c004411030482647bf2402
 U stephan
-Z e3192f3e3789b47f0628d3187b22766d
+Z 37118e27ece07b1ea1fafa2d63837d11
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 467d993c67..e99dea6748 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-114ef3552af977b272a0baddeb9a2326484b60acfc75284e43c55530f86b413f
\ No newline at end of file
+bcec4f964a7b02f59be05286ff715bac654a32b19f05a743e402f4cdb207cab8
\ No newline at end of file

From aee404912877cd2dd0c8d026fd4484deb89c2048 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Sat, 24 Sep 2022 18:05:52 +0000
Subject: [PATCH 164/428] Update things to use sqlite3_recover_step()
 internally.

FossilOrigin-Name: f4b15aad3005237b7ac507eed2b9b07e0f5c9407ab28f2656a21c9845f13d35f
---
 ext/recover/recover1.test    |   2 +-
 ext/recover/sqlite3recover.c | 143 +++++++++++++++++++++++++++++++++--
 manifest                     |  14 ++--
 manifest.uuid                |   2 +-
 4 files changed, 145 insertions(+), 16 deletions(-)

diff --git a/ext/recover/recover1.test b/ext/recover/recover1.test
index 79258b7e8f..58774e8434 100644
--- a/ext/recover/recover1.test
+++ b/ext/recover/recover1.test
@@ -203,7 +203,7 @@ do_test 12.1 {
 do_test 12.2 {
   $R run
   $R run
-} {21}
+} {0}
 
 do_test 12.3 {
   $R finish
diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index 74732faca5..f2dfa3cf08 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -178,20 +178,32 @@ struct sqlite3_recover {
   int errCode;                    /* For sqlite3_recover_errcode() */
   char *zErrMsg;                  /* For sqlite3_recover_errmsg() */
 
+  int eState;
+  int bCloseTransaction;
+
   /* Variables used with eState==RECOVER_STATE_WRITING */
   RecoverStateW1 w1;
 
   /* Fields used within sqlite3_recover_run() */
-  int bRun;                       /* True once _recover_run() has been called */
   sqlite3 *dbOut;                 /* Output database */
   sqlite3_stmt *pGetPage;         /* SELECT against input db sqlite_dbdata */
   RecoverTable *pTblList;         /* List of tables recovered from schema */
   RecoverBitmap *pUsed;           /* Used by recoverLostAndFound() */
 };
 
+/*
+** The various states in which an sqlite3_recover object may exist:
+**
+**   RECOVER_STATE_INIT:
+**    The object is initially created in this state. sqlite3_recover_step()
+**    has yet to be called. This is the only state in which it is permitted
+**    to call sqlite3_recover_config().
+*/
 #define RECOVER_STATE_INIT          0
 #define RECOVER_STATE_WRITING       1
 #define RECOVER_STATE_LOSTANDFOUND  2
+#define RECOVER_STATE_SCHEMA2       3
+#define RECOVER_STATE_DONE          4
 
 /* 
 ** Default value for SQLITE_RECOVER_ROWIDS (sqlite3_recover.bRecoverRowid).
@@ -758,7 +770,7 @@ static int recoverOpenOutput(sqlite3_recover *p){
           "PRAGMA writable_schema = 1;"
           "CREATE TABLE recovery.map(pgno INTEGER PRIMARY KEY, parent INT);" 
           "CREATE TABLE recovery.schema(type, name, tbl_name, rootpage, sql);"
-          );
+      );
       sqlite3_free(zSql);
     }
   }
@@ -1547,6 +1559,7 @@ static void recoverWriteDataCleanup(sqlite3_recover *p){
   recoverFinalize(p, p1->pInsert);
   recoverFinalize(p, p1->pTbls);
   recoverFinalize(p, p1->pSel);
+  memset(p1, 0, sizeof(*p1));
 }
 
 static int recoverWriteDataStep(sqlite3_recover *p){
@@ -1554,7 +1567,7 @@ static int recoverWriteDataStep(sqlite3_recover *p){
   sqlite3_stmt *pSel = p1->pSel;
   sqlite3_value **apVal = p1->apVal;
 
-  if( p1->pTab==0 ){
+  if( p->errCode==SQLITE_OK && p1->pTab==0 ){
     if( sqlite3_step(p1->pTbls)==SQLITE_ROW ){
       i64 iRoot = sqlite3_column_int64(p1->pTbls, 0);
       p1->pTab = recoverFindTable(p, iRoot);
@@ -1589,7 +1602,7 @@ static int recoverWriteDataStep(sqlite3_recover *p){
       return SQLITE_DONE;
     }
   }
-  assert( p1->pTab );
+  assert( p->errCode!=SQLITE_OK || p1->pTab );
 
   if( p->errCode==SQLITE_OK && sqlite3_step(pSel)==SQLITE_ROW ){
     RecoverTable *pTab = p1->pTab;
@@ -1698,8 +1711,7 @@ static void recoverRun(sqlite3_recover *p){
   int rc = SQLITE_OK;
 
   assert( p->errCode==SQLITE_OK );
-  assert( p->bRun==0 );
-  p->bRun = 1;
+  p->eState = 1;
 
   recoverSqlCallback(p, "BEGIN");
   recoverSqlCallback(p, "PRAGMA writable_schema = on");
@@ -1741,6 +1753,100 @@ static void recoverRun(sqlite3_recover *p){
   sqlite3_close(p->dbOut);
 }
 
+static void recoverFinalCleanup(sqlite3_recover *p){
+  RecoverTable *pTab = 0;
+  RecoverTable *pNext = 0;
+
+  recoverWriteDataCleanup(p);
+  for(pTab=p->pTblList; pTab; pTab=pNext){
+    pNext = pTab->pNext;
+    sqlite3_free(pTab);
+  }
+  p->pTblList = 0;
+  sqlite3_finalize(p->pGetPage);
+  p->pGetPage = 0;
+  recoverBitmapFree(p->pUsed);
+  p->pUsed = 0;
+  {
+    int res = sqlite3_close(p->dbOut);
+    assert( res==SQLITE_OK );
+  }
+  p->dbOut = 0;
+}
+
+static void recoverStep(sqlite3_recover *p){
+  assert( p && p->errCode==SQLITE_OK );
+  switch( p->eState ){
+    case RECOVER_STATE_INIT:
+      /* This is the very first call to sqlite3_recover_step() on this object.
+      */
+      recoverSqlCallback(p, "BEGIN");
+      recoverSqlCallback(p, "PRAGMA writable_schema = on");
+
+      /* Open the output database. And register required virtual tables and 
+      ** user functions with the new handle. */
+      recoverOpenOutput(p);
+
+      /* Open transactions on both the input and output databases. */
+      recoverExec(p, p->dbIn, "PRAGMA writable_schema = on");
+      recoverExec(p, p->dbIn, "BEGIN");
+      if( p->errCode==SQLITE_OK ) p->bCloseTransaction = 1;
+      recoverExec(p, p->dbOut, "BEGIN");
+
+      recoverCacheSchema(p);
+      recoverWriteSchema1(p);
+
+      p->eState = RECOVER_STATE_WRITING;
+      break;
+      
+    case RECOVER_STATE_WRITING: {
+      if( p->w1.pTbls==0 ){
+        recoverWriteDataInit(p);
+      }
+      if( SQLITE_DONE==recoverWriteDataStep(p) ){
+        recoverWriteDataCleanup(p);
+        if( p->zLostAndFound ){
+          p->eState = RECOVER_STATE_LOSTANDFOUND;
+        }else{
+          p->eState = RECOVER_STATE_SCHEMA2;
+        }
+      }
+      break;
+    }
+
+    case RECOVER_STATE_LOSTANDFOUND: {
+      recoverLostAndFound(p);
+      p->eState = RECOVER_STATE_SCHEMA2;
+      break;
+    }
+
+    case RECOVER_STATE_SCHEMA2: {
+      int rc = SQLITE_OK;
+
+      recoverWriteSchema2(p);
+      p->eState = RECOVER_STATE_DONE;
+
+      /* If no error has occurred, commit the write transaction on the output
+      ** database. Regardless of whether or not an error has occurred, make
+      ** an attempt to end the read transaction on the input database.  */
+      recoverExec(p, p->dbOut, "COMMIT");
+      rc = sqlite3_exec(p->dbIn, "END", 0, 0, 0);
+      if( p->errCode==SQLITE_OK ) p->errCode = rc;
+
+      recoverSqlCallback(p, "PRAGMA writable_schema = off");
+      recoverSqlCallback(p, "COMMIT");
+      p->eState = RECOVER_STATE_DONE;
+      recoverFinalCleanup(p);
+      break;
+    };
+
+    case RECOVER_STATE_DONE: {
+      /* no-op */
+      break;
+    };
+  }
+}
+
 
 /*
 ** This is a worker function that does the heavy lifting for both init
@@ -1866,14 +1972,24 @@ int sqlite3_recover_config(sqlite3_recover *p, int op, void *pArg){
   return rc;
 }
 
+int sqlite3_recover_step(sqlite3_recover *p){
+  if( p==0 ) return SQLITE_NOMEM;
+  if( p->errCode==SQLITE_OK ) recoverStep(p);
+  if( p->eState==RECOVER_STATE_DONE && p->errCode==SQLITE_OK ){
+    return SQLITE_DONE;
+  }
+  return p->errCode;
+}
+
 /*
 ** Do the configured recovery operation. Return SQLITE_OK if successful, or
 ** else an SQLite error code.
 */
+#if 0
 int sqlite3_recover_run(sqlite3_recover *p){
   if( p ){
     recoverExec(p, p->dbIn, "PRAGMA writable_schema=1");
-    if( p->bRun ) return SQLITE_MISUSE;     /* Has already run */
+    if( p->eState ) return SQLITE_MISUSE;     /* Has already run */
     if( p->errCode==SQLITE_OK ) recoverRun(p);
     if( sqlite3_exec(p->dbIn, "PRAGMA writable_schema=0", 0, 0, 0) ){
       recoverDbError(p, p->dbIn);
@@ -1881,6 +1997,14 @@ int sqlite3_recover_run(sqlite3_recover *p){
   }
   return p ? p->errCode : SQLITE_NOMEM;
 }
+#else
+int sqlite3_recover_run(sqlite3_recover *p){
+  if( p==0 ) return SQLITE_NOMEM;
+  while( SQLITE_OK==sqlite3_recover_step(p) );
+  return p->errCode;
+}
+#endif
+
 
 /*
 ** Free all resources associated with the recover handle passed as the only
@@ -1896,6 +2020,11 @@ int sqlite3_recover_finish(sqlite3_recover *p){
   if( p==0 ){
     rc = SQLITE_NOMEM;
   }else{
+    recoverFinalCleanup(p);
+    if( p->bCloseTransaction && sqlite3_get_autocommit(p->dbIn)==0 ){
+      rc = sqlite3_exec(p->dbIn, "END", 0, 0, 0);
+      if( p->errCode==SQLITE_OK ) p->errCode = rc;
+    }
     rc = p->errCode;
     sqlite3_free(p->zErrMsg);
     sqlite3_free(p->zStateDb);
diff --git a/manifest b/manifest
index 7ebf1eb76a..f482b45299 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Internal\schanges\sto\sthe\srecover\sextension\stowards\sa\sstep()\sstyle\sinterface.
-D 2022-09-23T21:01:10.829
+C Update\sthings\sto\suse\ssqlite3_recover_step()\sinternally.
+D 2022-09-24T18:05:52.914
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -387,7 +387,7 @@ F ext/rbu/rbuvacuum4.test a78898e438a44803eb2bc897ba3323373c9f277418e2d6d76e90f2
 F ext/rbu/sqlite3rbu.c 8737cabdfbee84bb25a7851ecef8b1312be332761238da9be6ddb10c62ad4291
 F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9cd389812
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
-F ext/recover/recover1.test 3f26db7692ed98c0de4fc9511f3d3a2f2c91a137b7e6666f3b85b593438b5d09
+F ext/recover/recover1.test 2b0f048ba572c3ca4e4235b632bf75702975a9656146eab766f6c75861f946a0
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
 F ext/recover/recoverclobber.test 294dcc894124ab4ca3a7b35766630742a3d25810fceac22220beb64f70a33a60
 F ext/recover/recovercorrupt.test e3f3cbe0162ba681518aac9ea0ae8119f32ac93fb0900b5f09b6318966108e54
@@ -397,7 +397,7 @@ F ext/recover/recoverfault2.test 321036336af23e778a87f148c4cc4407f88fbdab1fd72dd
 F ext/recover/recoverold.test 46e9d99b595fac583d4c67f74d7d89c20a435c752ef6eeb3e918b599940c88e0
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
-F ext/recover/sqlite3recover.c cfb2e7df6ac7405109fa4f04b9b1fea4dbb704f37985f2f34d5526949734817f
+F ext/recover/sqlite3recover.c efed077977b195d2ac6c12f1485abf9c7e8c8d282834b05beee7151dabf21e88
 F ext/recover/sqlite3recover.h 81108efb8c4618d3d9c6da4df785212b0e4501aa0d25edfc463405fe839a6640
 F ext/recover/test_recover.c 72a765616a3fa9dae2ed537d79b00f365d9f639d347858341b71bda7a3a45f56
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -2013,8 +2013,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 ae49e9efde3012158061def6e0a8d993abbc5933514a21f84bc10f700f61b5e2
-R 84e101ee349aff282424e130c05c161d
+P 73926d5c8cd1ecece134b5a73b44ee1dfca74dc200606e3f009b06cdecf8cee9
+R 0646ea13d6a7cac9dceb7b54cdbc6bf0
 U dan
-Z 2ba1da8e5fc1c584cb2093e5d330b18c
+Z 958e4f167968f03754a4ebdb81e44d68
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 8e7e75e988..7a6fad060d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-73926d5c8cd1ecece134b5a73b44ee1dfca74dc200606e3f009b06cdecf8cee9
\ No newline at end of file
+f4b15aad3005237b7ac507eed2b9b07e0f5c9407ab28f2656a21c9845f13d35f
\ No newline at end of file

From 351563efe120aa1382136184aa8419d04f84d55f Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Sat, 24 Sep 2022 19:17:20 +0000
Subject: [PATCH 165/428] Add sqlite3_recover_step() to header file
 sqlite3recover.h. Update the API docs in this file.

FossilOrigin-Name: 47f416153035d6bf0ae27587583d2957c87c02caecbd4e7f363bcb2bc27cf159
---
 ext/recover/sqlite3recover.c | 151 +++++++++--------------------------
 ext/recover/sqlite3recover.h | 111 +++++++++++++------------
 manifest                     |  14 ++--
 manifest.uuid                |   2 +-
 4 files changed, 105 insertions(+), 173 deletions(-)

diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index f2dfa3cf08..fb046fbfc8 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -1683,76 +1683,6 @@ static int recoverWriteDataStep(sqlite3_recover *p){
   return p->errCode;
 }
 
-/*
-** For each table in the recovered schema, this function extracts as much
-** data as possible from the output database and writes it to the input
-** database. Or, if the recover handle is in SQL callback mode, issues
-** equivalent callbacks.
-**
-** It does not recover "orphaned" data into the lost-and-found table.
-** See recoverLostAndFound() for that.
-*/
-static int recoverWriteData(sqlite3_recover *p){
-  recoverWriteDataInit(p);
-  while( p->errCode==SQLITE_OK && SQLITE_OK==recoverWriteDataStep(p) );
-  recoverWriteDataCleanup(p);
-  return p->errCode;
-}
-
-/*
-** This function does the work of sqlite3_recover_run(). It is assumed that
-** no error has occurred when this is called. If an error occurs during
-** the recovery operation, an error code and error message are left in
-** the recovery handle.
-*/
-static void recoverRun(sqlite3_recover *p){
-  RecoverTable *pTab = 0;
-  RecoverTable *pNext = 0;
-  int rc = SQLITE_OK;
-
-  assert( p->errCode==SQLITE_OK );
-  p->eState = 1;
-
-  recoverSqlCallback(p, "BEGIN");
-  recoverSqlCallback(p, "PRAGMA writable_schema = on");
-
-  /* Open the output database. And register required virtual tables and 
-  ** user functions with the new handle. */
-  recoverOpenOutput(p);
-
-  /* Open transactions on both the input and output databases. */
-  recoverExec(p, p->dbIn, "BEGIN");
-  recoverExec(p, p->dbOut, "BEGIN");
-
-  recoverCacheSchema(p);
-  recoverWriteSchema1(p);
-  recoverWriteData(p);
-  if( p->zLostAndFound ) recoverLostAndFound(p);
-  recoverWriteSchema2(p);
-
-  /* If no error has occurred, commit the write transaction on the output
-  ** database. Then end the read transaction on the input database, regardless
-  ** of whether or not prior errors have occurred.  */
-  recoverExec(p, p->dbOut, "COMMIT");
-  rc = sqlite3_exec(p->dbIn, "END", 0, 0, 0);
-  if( p->errCode==SQLITE_OK ) p->errCode = rc;
-
-  recoverSqlCallback(p, "PRAGMA writable_schema = off");
-  recoverSqlCallback(p, "COMMIT");
-
-  /* Clean up various resources allocated by this function. */
-  for(pTab=p->pTblList; pTab; pTab=pNext){
-    pNext = pTab->pNext;
-    sqlite3_free(pTab);
-  }
-  p->pTblList = 0;
-  sqlite3_finalize(p->pGetPage);
-  p->pGetPage = 0;
-  recoverBitmapFree(p->pUsed);
-  p->pUsed = 0;
-  sqlite3_close(p->dbOut);
-}
-
 static void recoverFinalCleanup(sqlite3_recover *p){
   RecoverTable *pTab = 0;
   RecoverTable *pNext = 0;
@@ -1937,41 +1867,51 @@ int sqlite3_recover_errcode(sqlite3_recover *p){
 */
 int sqlite3_recover_config(sqlite3_recover *p, int op, void *pArg){
   int rc = SQLITE_OK;
+  if( p==0 ){
+    rc = SQLITE_NOMEM;
+  }else if( p->eState!=RECOVER_STATE_INIT ){
+    rc = SQLITE_MISUSE;
+  }else{
+    switch( op ){
+      case 789:
+        sqlite3_free(p->zStateDb);
+        p->zStateDb = recoverMPrintf(p, "%s", (char*)pArg);
+        break;
 
-  if( p==0 ) return SQLITE_NOMEM;
-  switch( op ){
-    case 789:
-      sqlite3_free(p->zStateDb);
-      p->zStateDb = recoverMPrintf(p, "%s", (char*)pArg);
-      break;
-
-    case SQLITE_RECOVER_LOST_AND_FOUND: {
-      const char *zArg = (const char*)pArg;
-      sqlite3_free(p->zLostAndFound);
-      if( zArg ){
-        p->zLostAndFound = recoverMPrintf(p, "%s", zArg);
-      }else{
-        p->zLostAndFound = 0;
+      case SQLITE_RECOVER_LOST_AND_FOUND: {
+        const char *zArg = (const char*)pArg;
+        sqlite3_free(p->zLostAndFound);
+        if( zArg ){
+          p->zLostAndFound = recoverMPrintf(p, "%s", zArg);
+        }else{
+          p->zLostAndFound = 0;
+        }
+        break;
       }
-      break;
+
+      case SQLITE_RECOVER_FREELIST_CORRUPT:
+        p->bFreelistCorrupt = *(int*)pArg;
+        break;
+
+      case SQLITE_RECOVER_ROWIDS:
+        p->bRecoverRowid = *(int*)pArg;
+        break;
+
+      default:
+        rc = SQLITE_NOTFOUND;
+        break;
     }
-
-    case SQLITE_RECOVER_FREELIST_CORRUPT:
-      p->bFreelistCorrupt = *(int*)pArg;
-      break;
-
-    case SQLITE_RECOVER_ROWIDS:
-      p->bRecoverRowid = *(int*)pArg;
-      break;
-
-    default:
-      rc = SQLITE_NOTFOUND;
-      break;
   }
 
   return rc;
 }
 
+/*
+** Do a unit of work towards the recovery job. Return SQLITE_OK if
+** no error has occurred but database recovery is not finished, SQLITE_DONE
+** if database recovery has been successfully completed, or an SQLite
+** error code if an error has occurred.
+*/
 int sqlite3_recover_step(sqlite3_recover *p){
   if( p==0 ) return SQLITE_NOMEM;
   if( p->errCode==SQLITE_OK ) recoverStep(p);
@@ -1985,25 +1925,10 @@ int sqlite3_recover_step(sqlite3_recover *p){
 ** Do the configured recovery operation. Return SQLITE_OK if successful, or
 ** else an SQLite error code.
 */
-#if 0
 int sqlite3_recover_run(sqlite3_recover *p){
-  if( p ){
-    recoverExec(p, p->dbIn, "PRAGMA writable_schema=1");
-    if( p->eState ) return SQLITE_MISUSE;     /* Has already run */
-    if( p->errCode==SQLITE_OK ) recoverRun(p);
-    if( sqlite3_exec(p->dbIn, "PRAGMA writable_schema=0", 0, 0, 0) ){
-      recoverDbError(p, p->dbIn);
-    }
-  }
-  return p ? p->errCode : SQLITE_NOMEM;
-}
-#else
-int sqlite3_recover_run(sqlite3_recover *p){
-  if( p==0 ) return SQLITE_NOMEM;
   while( SQLITE_OK==sqlite3_recover_step(p) );
-  return p->errCode;
+  return sqlite3_recover_errcode(p);
 }
-#endif
 
 
 /*
diff --git a/ext/recover/sqlite3recover.h b/ext/recover/sqlite3recover.h
index 30771d8804..128d823795 100644
--- a/ext/recover/sqlite3recover.h
+++ b/ext/recover/sqlite3recover.h
@@ -21,20 +21,30 @@
 ** To use the API to recover data from a corrupted database, an
 ** application:
 **
-** 1) Creates an sqlite3_recover handle by calling either
-**    sqlite3_recover_init() or sqlite3_recover_init_sql().
+**   1) Creates an sqlite3_recover handle by calling either
+**      sqlite3_recover_init() or sqlite3_recover_init_sql().
 **
-** 2) Configures the new handle using one or more calls to
-**    sqlite3_recover_config().
+**   2) Configures the new handle using one or more calls to
+**      sqlite3_recover_config().
 **
-** 3) Executes the recovery by calling sqlite3_recover_run() on the handle.
+**   3) Executes the recovery by repeatedly calling sqlite3_recover_step() on
+**      the handle until it returns something other than SQLITE_OK. If it
+**      returns SQLITE_DONE, then the recovery operation completed without 
+**      error. If it returns some other non-SQLITE_OK value, then an error 
+**      has occurred.
 **
-** 4) Retrieves any error code and English language error message using the
-**    sqlite3_recover_errcode() and sqlite3_recover_errmsg() APIs,
-**    respectively.
+**   4) Retrieves any error code and English language error message using the
+**      sqlite3_recover_errcode() and sqlite3_recover_errmsg() APIs,
+**      respectively.
 **
-** 5) Destroys the sqlite3_recover handle and frees all resources
-**    using sqlite3_recover_finish().
+**   5) Destroys the sqlite3_recover handle and frees all resources
+**      using sqlite3_recover_finish().
+**
+** The application may abandon the recovery operation at any point 
+** before it is finished by passing the sqlite3_recover handle to
+** sqlite3_recover_finish(). This is not an error, but the final state
+** of the output database, or the results of running the partial script
+** delivered to the SQL callback, are undefined.
 */
 
 #ifndef _SQLITE_RECOVER_H
@@ -95,10 +105,13 @@ sqlite3_recover *sqlite3_recover_init_sql(
 
 /*
 ** Configure an sqlite3_recover object that has just been created using
-** sqlite3_recover_init() or sqlite3_recover_init_sql(). The second
-** argument passed to this function must be one of the SQLITE_RECOVER_*
-** symbols defined below. Valid values for the third argument depend
-** on the specific SQLITE_RECOVER_* symbol in use.
+** sqlite3_recover_init() or sqlite3_recover_init_sql(). This function
+** may only be called before the first call to sqlite3_recover_step()
+** or sqlite3_recover_run() on the object.
+**
+** The second argument passed to this function must be one of the
+** SQLITE_RECOVER_* symbols defined below. Valid values for the third argument
+** depend on the specific SQLITE_RECOVER_* symbol in use.
 **
 ** SQLITE_OK is returned if the configuration operation was successful,
 ** or an SQLite error code otherwise.
@@ -137,52 +150,49 @@ int sqlite3_recover_config(sqlite3_recover*, int op, void *pArg);
 #define SQLITE_RECOVER_FREELIST_CORRUPT 2
 #define SQLITE_RECOVER_ROWIDS           3
 
-/* 
-** Run the recovery operation. This function does not return until the 
-** recovery operation is completed - either the new database has been
-** created and populated (sqlite3_recover_init()) or all SQL statements have
-** been passed to the callback (sqlite3_recover_init_sql()) - or an error
-** occurs. If the recovery is completed without error, SQLITE_OK
-** is returned. It is not considered an error if data cannot be recovered
+/*
+** Perform a unit of work towards the recovery operation. This function 
+** must normally be called multiple times to complete database recovery.
+**
+** If no error occurs but the recovery operation is not completed, this
+** function returns SQLITE_OK. If recovery has been completed successfully
+** then SQLITE_DONE is returned. If an error has occurred, then an SQLite
+** error code (e.g. SQLITE_IOERR or SQLITE_NOMEM) is returned. It is not
+** considered an error if some or all of the data cannot be recovered
 ** due to database corruption.
 **
-** If an error (for example an out-of-memory or IO error) occurs, then
-** an SQLite error code is returned. The final state of the output database
-** or the results of running any SQL statements already passed to the
-** callback in this case are undefined. An English language error 
-** message corresponding to the error may be available via the 
-** sqlite3_recover_errmsg() API.
+** Once sqlite3_recover_step() has returned a value other than SQLITE_OK,
+** all further such calls on the same recover handle are no-ops that return
+** the same non-SQLITE_OK value.
+*/
+int sqlite3_recover_step(sqlite3_recover*);
+
+/* 
+** Run the recovery operation to completion. Return SQLITE_OK if successful,
+** or an SQLite error code otherwise. Calling this function is the same
+** as executing:
 **
-** This function may only be called once on an sqlite3_recover handle.
-** If it is called more than once, the second and subsequent calls
-** return SQLITE_MISUSE. The error code and error message returned
-** by sqlite3_recover_errcode() and sqlite3_recover_errmsg() are not
-** updated in this case.
+**     while( SQLITE_OK==sqlite3_recover_step(p) );
+**     return sqlite3_recover_errcode(p);
 */
 int sqlite3_recover_run(sqlite3_recover*);
 
 /*
-** If this is called on an sqlite3_recover handle before 
-** sqlite3_recover_run() has been called, or if the call to
-** sqlite3_recover_run() returned SQLITE_OK, then this API always returns
-** a NULL pointer.
+** If an error has been encountered during a prior call to
+** sqlite3_recover_step(), then this function attempts to return a 
+** pointer to a buffer containing an English language explanation of 
+** the error. If no error message is available, or if an out-of memory 
+** error occurs while attempting to allocate a buffer in which to format
+** the error message, NULL is returned.
 **
-** Otherwise, an attempt is made to return a pointer to a buffer containing 
-** an English language error message related to the error that occurred
-** within the sqlite3_recover_run() call. If no error message is available,
-** or if an out-of-memory error occurs while attempting to allocate a buffer
-** for one, NULL may still be returned.
-**
-** The buffer remains valid until the sqlite3_recover handle is destroyed
-** using sqlite3_recover_finish().
+** The returned buffer remains valid until the sqlite3_recover handle is
+** destroyed using sqlite3_recover_finish().
 */
 const char *sqlite3_recover_errmsg(sqlite3_recover*);
 
 /*
-** If this function is called on an sqlite3_recover handle before
-** sqlite3_recover_run() has been called, it always returns SQLITE_OK.
-** Otherwise, it returns a copy of the value returned by the first
-** sqlite3_recover_run() call made on the handle.
+** If this function is called on an sqlite3_recover handle after
+** an error occurs, an SQLite error code is returned. Otherwise, SQLITE_OK.
 */
 int sqlite3_recover_errcode(sqlite3_recover*);
 
@@ -191,10 +201,7 @@ int sqlite3_recover_errcode(sqlite3_recover*);
 ** The results of using a recovery object with any API after it has been
 ** passed to this function are undefined.
 **
-** If this function is called on an sqlite3_recover handle before
-** sqlite3_recover_run() has been called, it always returns SQLITE_OK.
-** Otherwise, it returns a copy of the value returned by the first
-** sqlite3_recover_run() call made on the handle.
+** This function returns the same value as sqlite3_recover_errcode().
 */
 int sqlite3_recover_finish(sqlite3_recover*);
 
diff --git a/manifest b/manifest
index f482b45299..b345ea4aaf 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthings\sto\suse\ssqlite3_recover_step()\sinternally.
-D 2022-09-24T18:05:52.914
+C Add\ssqlite3_recover_step()\sto\sheader\sfile\ssqlite3recover.h.\sUpdate\sthe\sAPI\sdocs\sin\sthis\sfile.
+D 2022-09-24T19:17:20.785
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -397,8 +397,8 @@ F ext/recover/recoverfault2.test 321036336af23e778a87f148c4cc4407f88fbdab1fd72dd
 F ext/recover/recoverold.test 46e9d99b595fac583d4c67f74d7d89c20a435c752ef6eeb3e918b599940c88e0
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
-F ext/recover/sqlite3recover.c efed077977b195d2ac6c12f1485abf9c7e8c8d282834b05beee7151dabf21e88
-F ext/recover/sqlite3recover.h 81108efb8c4618d3d9c6da4df785212b0e4501aa0d25edfc463405fe839a6640
+F ext/recover/sqlite3recover.c 7752d374356a2346b5959161d5512d6f8a0bd7fb259ea81fd2473ad00dd39132
+F ext/recover/sqlite3recover.h 09a0f70b821954fc219d7583d74871e8578e4f1e9267304ec029c2bfc02bd27a
 F ext/recover/test_recover.c 72a765616a3fa9dae2ed537d79b00f365d9f639d347858341b71bda7a3a45f56
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
 F ext/repair/checkfreelist.c e21f06995ff4efdc1622dcceaea4dcba2caa83ca2f31a1607b98a8509168a996
@@ -2013,8 +2013,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 73926d5c8cd1ecece134b5a73b44ee1dfca74dc200606e3f009b06cdecf8cee9
-R 0646ea13d6a7cac9dceb7b54cdbc6bf0
+P f4b15aad3005237b7ac507eed2b9b07e0f5c9407ab28f2656a21c9845f13d35f
+R b60fe138c3457719a54bec9e37633f69
 U dan
-Z 958e4f167968f03754a4ebdb81e44d68
+Z c514b2b66b0aba624f215b19ab2fba51
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 7a6fad060d..0de769690b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f4b15aad3005237b7ac507eed2b9b07e0f5c9407ab28f2656a21c9845f13d35f
\ No newline at end of file
+47f416153035d6bf0ae27587583d2957c87c02caecbd4e7f363bcb2bc27cf159
\ No newline at end of file

From 8d8fc58413a78f932567e7d7021aa96b54270959 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Sat, 24 Sep 2022 19:54:49 +0000
Subject: [PATCH 166/428] Add the SQLITE_RECOVER_SLOWINDEXES option, for
 specifying that indexes should be created and populated along with tables,
 instead of separately at the end of the recovery operation.

FossilOrigin-Name: ad9dba9d1eae786575c7f31e34b342b6f5b26e719bbe27b61609cad8cfd0a505
---
 ext/recover/recoverslowidx.test | 84 +++++++++++++++++++++++++++++++++
 ext/recover/sqlite3recover.c    | 16 +++++--
 ext/recover/sqlite3recover.h    | 18 +++++++
 ext/recover/test_recover.c      | 17 ++++++-
 manifest                        | 17 +++----
 manifest.uuid                   |  2 +-
 6 files changed, 141 insertions(+), 13 deletions(-)
 create mode 100644 ext/recover/recoverslowidx.test

diff --git a/ext/recover/recoverslowidx.test b/ext/recover/recoverslowidx.test
new file mode 100644
index 0000000000..838b771eaf
--- /dev/null
+++ b/ext/recover/recoverslowidx.test
@@ -0,0 +1,84 @@
+# 2022 September 25
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+# 
+# Tests for the SQLITE_RECOVER_SLOWINDEXES option.
+#
+
+if {![info exists testdir]} {
+  set testdir [file join [file dirname [info script]] .. .. test]
+} 
+source [file join [file dirname [info script]] recover_common.tcl]
+source $testdir/tester.tcl
+set testprefix recoverrowid
+
+ifcapable !vtab {
+  finish_test; return
+}
+
+do_execsql_test 1.0 {
+  CREATE TABLE t1(a, b);
+  CREATE INDEX i1 ON t1(a);
+  INSERT INTO t1 VALUES(1, 1), (2, 2), (3, 3), (4, 4);
+}
+
+proc my_sql_hook {sql} {
+  lappend ::lSql $sql
+  return 0
+}
+
+do_test 1.1 {
+  set lSql [list]
+  set R [sqlite3_recover_init_sql db main my_sql_hook]
+  while {[$R step]==0} { }
+  $R finish
+} {}
+
+do_test 1.2 {
+  set lSql
+} [list {*}{
+  {BEGIN}
+  {PRAGMA writable_schema = on}
+  {CREATE TABLE t1(a, b)}
+  {INSERT OR IGNORE INTO 't1'(_rowid_, 'a', 'b') VALUES (1, 1, 1)}
+  {INSERT OR IGNORE INTO 't1'(_rowid_, 'a', 'b') VALUES (2, 2, 2)}
+  {INSERT OR IGNORE INTO 't1'(_rowid_, 'a', 'b') VALUES (3, 3, 3)}
+  {INSERT OR IGNORE INTO 't1'(_rowid_, 'a', 'b') VALUES (4, 4, 4)}
+  {CREATE INDEX i1 ON t1(a)}
+  {PRAGMA writable_schema = off}
+  {COMMIT}
+}]
+
+do_test 1.3 {
+  set lSql [list]
+  set R [sqlite3_recover_init_sql db main my_sql_hook]
+  $R config slowindexes 1
+  while {[$R step]==0} { }
+  $R finish
+} {}
+
+do_test 1.4 {
+  set lSql
+} [list {*}{
+  {BEGIN}
+  {PRAGMA writable_schema = on}
+  {CREATE TABLE t1(a, b)}
+  {CREATE INDEX i1 ON t1(a)}
+  {INSERT OR IGNORE INTO 't1'(_rowid_, 'a', 'b') VALUES (1, 1, 1)}
+  {INSERT OR IGNORE INTO 't1'(_rowid_, 'a', 'b') VALUES (2, 2, 2)}
+  {INSERT OR IGNORE INTO 't1'(_rowid_, 'a', 'b') VALUES (3, 3, 3)}
+  {INSERT OR IGNORE INTO 't1'(_rowid_, 'a', 'b') VALUES (4, 4, 4)}
+  {PRAGMA writable_schema = off}
+  {COMMIT}
+}]
+
+
+finish_test
+
diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index fb046fbfc8..aac1eea306 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -173,6 +173,7 @@ struct sqlite3_recover {
   char *zLostAndFound;            /* Name of lost-and-found table (or NULL) */
   int bFreelistCorrupt;           /* SQLITE_RECOVER_FREELIST_CORRUPT setting */
   int bRecoverRowid;              /* SQLITE_RECOVER_ROWIDS setting */
+  int bSlowIndexes;               /* SQLITE_RECOVER_SLOWINDEXES setting */
 
   /* Error code and error message */
   int errCode;                    /* For sqlite3_recover_errcode() */
@@ -991,16 +992,16 @@ static int recoverWriteSchema1(sqlite3_recover *p){
   sqlite3_stmt *pTblname = 0;
 
   pSelect = recoverPrepare(p, p->dbOut,
-      "WITH dbschema(rootpage, name, sql, tbl, isVirtual, isUnique) AS ("
+      "WITH dbschema(rootpage, name, sql, tbl, isVirtual, isIndex) AS ("
       "  SELECT rootpage, name, sql, "
       "    type='table', "
       "    sql LIKE 'create virtual%',"
-      "    (type='index' AND sql LIKE '%unique%')"
+      "    (type='index' AND (sql LIKE '%unique%' OR ?1))"
       "  FROM recovery.schema"
       ")"
       "SELECT rootpage, tbl, isVirtual, name, sql"
       " FROM dbschema "
-      "  WHERE tbl OR isUnique"
+      "  WHERE tbl OR isIndex"
       "  ORDER BY tbl DESC, name=='sqlite_sequence' DESC"
   );
 
@@ -1010,6 +1011,7 @@ static int recoverWriteSchema1(sqlite3_recover *p){
   );
 
   if( pSelect ){
+    sqlite3_bind_int(pSelect, 1, p->bSlowIndexes);
     while( sqlite3_step(pSelect)==SQLITE_ROW ){
       i64 iRoot = sqlite3_column_int64(pSelect, 0);
       int bTable = sqlite3_column_int(pSelect, 1);
@@ -1064,6 +1066,10 @@ static int recoverWriteSchema2(sqlite3_recover *p){
   sqlite3_stmt *pSelect = 0;
 
   pSelect = recoverPrepare(p, p->dbOut,
+      p->bSlowIndexes ?
+      "SELECT rootpage, sql FROM recovery.schema "
+      "  WHERE type!='table' AND type!='index'"
+      :
       "SELECT rootpage, sql FROM recovery.schema "
       "  WHERE type!='table' AND (type!='index' OR sql NOT LIKE '%unique%')"
   );
@@ -1897,6 +1903,10 @@ int sqlite3_recover_config(sqlite3_recover *p, int op, void *pArg){
         p->bRecoverRowid = *(int*)pArg;
         break;
 
+      case SQLITE_RECOVER_SLOWINDEXES:
+        p->bSlowIndexes = *(int*)pArg;
+        break;
+
       default:
         rc = SQLITE_NOTFOUND;
         break;
diff --git a/ext/recover/sqlite3recover.h b/ext/recover/sqlite3recover.h
index 128d823795..d0a37504e7 100644
--- a/ext/recover/sqlite3recover.h
+++ b/ext/recover/sqlite3recover.h
@@ -145,10 +145,28 @@ int sqlite3_recover_config(sqlite3_recover*, int op, void *pArg);
 **   that are not also INTEGER PRIMARY KEY values. If this option is
 **   clear, then new rowids are assigned to all recovered rows. The
 **   default value is 1 (set).
+**
+** SQLITE_RECOVER_SLOWINDEXES:
+**   The pArg value must actually be a pointer to a value of type
+**   int containing value 0 or 1 cast as a (void*). If this option is clear
+**   (argument is 0), then when creating an output database, the recover 
+**   module creates and populates non-UNIQUE indexes right at the end of the
+**   recovery operation - after all recoverable data has been inserted
+**   into the new database. This is faster overall, but means that the
+**   final call to sqlite3_recover_step() for a recovery operation may
+**   be need to create a large number of indexes, which may be very slow.
+**
+**   Or, if this option is set (argument is 1), then non-UNIQUE indexes
+**   are created in the output database before it is populated with 
+**   recovered data. This is slower overall, but avoids the slow call
+**   to sqlite3_recover_step() at the end of the recovery operation.
+**
+**   The default option value is 0.
 */
 #define SQLITE_RECOVER_LOST_AND_FOUND   1
 #define SQLITE_RECOVER_FREELIST_CORRUPT 2
 #define SQLITE_RECOVER_ROWIDS           3
+#define SQLITE_RECOVER_SLOWINDEXES      4
 
 /*
 ** Perform a unit of work towards the recovery operation. This function 
diff --git a/ext/recover/test_recover.c b/ext/recover/test_recover.c
index d660a5345e..99c7aeca34 100644
--- a/ext/recover/test_recover.c
+++ b/ext/recover/test_recover.c
@@ -89,6 +89,7 @@ static int testRecoverCmd(
     { "errmsg",    0, ""            }, /* 2 */
     { "errcode",   0, ""            }, /* 3 */
     { "finish",  0, ""              }, /* 4 */
+    { "step",  0, ""                }, /* 5 */
     { 0 }
   };
   int rc = TCL_OK;
@@ -115,7 +116,8 @@ static int testRecoverCmd(
         "lostandfound",    /* 1 */
         "freelistcorrupt", /* 2 */
         "rowids",          /* 3 */
-        "invalid",         /* 4 */
+        "slowindexes",     /* 4 */
+        "invalid",         /* 5 */
         0
       };
       int iOp = 0;
@@ -153,6 +155,14 @@ static int testRecoverCmd(
           break;
         }
         case 4: {
+          int iVal = 0;
+          if( Tcl_GetBooleanFromObj(interp, objv[3], &iVal) ) return TCL_ERROR;
+          res = sqlite3_recover_config(pTest->p, 
+              SQLITE_RECOVER_SLOWINDEXES, (void*)&iVal
+          );
+          break;
+        }
+        case 5: {
           res = sqlite3_recover_config(pTest->p, 12345, 0);
           break;
         }
@@ -187,6 +197,11 @@ static int testRecoverCmd(
       if( res ) return TCL_ERROR;
       break;
     }
+    case 5:  assert( sqlite3_stricmp("step", aSub[iSub].zSub)==0 ); {
+      int res = sqlite3_recover_step(pTest->p);
+      Tcl_SetObjResult(interp, Tcl_NewIntObj(res));
+      break;
+    }
   }
 
   return TCL_OK;
diff --git a/manifest b/manifest
index b345ea4aaf..f6cebeee1e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\ssqlite3_recover_step()\sto\sheader\sfile\ssqlite3recover.h.\sUpdate\sthe\sAPI\sdocs\sin\sthis\sfile.
-D 2022-09-24T19:17:20.785
+C Add\sthe\sSQLITE_RECOVER_SLOWINDEXES\soption,\sfor\sspecifying\sthat\sindexes\sshould\sbe\screated\sand\spopulated\salong\swith\stables,\sinstead\sof\sseparately\sat\sthe\send\sof\sthe\srecovery\soperation.
+D 2022-09-24T19:54:49.642
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -396,10 +396,11 @@ F ext/recover/recoverfault.test 3a0a32b9fc216592b97775d69220695b0926980c0f7424b7
 F ext/recover/recoverfault2.test 321036336af23e778a87f148c4cc4407f88fbdab1fd72ddb661669be9020d36b
 F ext/recover/recoverold.test 46e9d99b595fac583d4c67f74d7d89c20a435c752ef6eeb3e918b599940c88e0
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
+F ext/recover/recoverslowidx.test 7e3889e50758c614b9b3e75187eeeea425c0ca8a2387441fc19ae749a96a7949
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
-F ext/recover/sqlite3recover.c 7752d374356a2346b5959161d5512d6f8a0bd7fb259ea81fd2473ad00dd39132
-F ext/recover/sqlite3recover.h 09a0f70b821954fc219d7583d74871e8578e4f1e9267304ec029c2bfc02bd27a
-F ext/recover/test_recover.c 72a765616a3fa9dae2ed537d79b00f365d9f639d347858341b71bda7a3a45f56
+F ext/recover/sqlite3recover.c 7cd26aeb413b5b1cec1ae6213488dcec3e4e822911d3f255272b32cf0f32c406
+F ext/recover/sqlite3recover.h f698ccc94bd4da38761035415ad08c4549a408491ff9fd5f52d34d2214f64e36
+F ext/recover/test_recover.c 61ec931e47abca6b2210f46239cafd9f3060741605e3d3c45a7c7a53f63dd957
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
 F ext/repair/checkfreelist.c e21f06995ff4efdc1622dcceaea4dcba2caa83ca2f31a1607b98a8509168a996
 F ext/repair/checkindex.c 4383e4469c21e5b9ae321d0d63cec53e981af9d7a6564be6374f0eeb93dfc890
@@ -2013,8 +2014,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 f4b15aad3005237b7ac507eed2b9b07e0f5c9407ab28f2656a21c9845f13d35f
-R b60fe138c3457719a54bec9e37633f69
+P 47f416153035d6bf0ae27587583d2957c87c02caecbd4e7f363bcb2bc27cf159
+R 9e568d3e4f6455e4cabb845dec54247e
 U dan
-Z c514b2b66b0aba624f215b19ab2fba51
+Z a8bd0fc6063574ee27e4134a0a1e02e3
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 0de769690b..8f9e8a36bd 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-47f416153035d6bf0ae27587583d2957c87c02caecbd4e7f363bcb2bc27cf159
\ No newline at end of file
+ad9dba9d1eae786575c7f31e34b342b6f5b26e719bbe27b61609cad8cfd0a505
\ No newline at end of file

From 6a643e4bcdc81f835be75377d1c6306f5e23f541 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 26 Sep 2022 11:34:31 +0000
Subject: [PATCH 167/428] wasm: change StructBinder signature for
 sqlite3_file::pMethods from 'P' to 'p' to eliminate an unnecessary and
 inconsistent level of magic.

FossilOrigin-Name: 85f2e877e53899860af4dc6630044b471a9c7c82faba1f4e1e60ae991460b943
---
 ext/wasm/api/sqlite3-wasm.c |  2 +-
 ext/wasm/testing1.js        |  9 +++------
 manifest                    | 14 +++++++-------
 manifest.uuid               |  2 +-
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index e1e5be2483..cf9a1a3db6 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -503,7 +503,7 @@ const char * sqlite3_wasm_enum_json(void){
 
 #define CurrentStruct sqlite3_file
     StructBinder {
-      M(pMethods,"P");
+      M(pMethods,"p");
     } _StructBinder;
 #undef CurrentStruct
 
diff --git a/ext/wasm/testing1.js b/ext/wasm/testing1.js
index 5743719096..e412b9c17d 100644
--- a/ext/wasm/testing1.js
+++ b/ext/wasm/testing1.js
@@ -717,17 +717,14 @@
       //log("sfile",sfile,sfile.constructor.prototype);
       T.assert(0===sfile.$pMethods).assert(iom.pointer > 0);
       //log("iom",iom);
-      /** Some of the following tests require that pMethods has a
-          signature of "P", as opposed to "p". */
-      sfile.$pMethods = iom;
-      T.assert(iom === sfile.$pMethods);
       sfile.$pMethods = iom.pointer;
-      T.assert(iom === sfile.$pMethods)
+      T.assert(iom.pointer === sfile.$pMethods)
         .assert(IOM.resolveToInstance(iom))
         .assert(undefined ===IOM.resolveToInstance(sfile))
         .mustThrow(()=>IOM.resolveToInstance(0,true))
         .assert(S3F.resolveToInstance(sfile.pointer))
-        .assert(undefined===S3F.resolveToInstance(iom));
+        .assert(undefined===S3F.resolveToInstance(iom))
+        .assert(iom===IOM.resolveToInstance(sfile.$pMethods));
       T.assert(0===iom.$iVersion);
       installIOMethods(iom);
       T.assert(1===iom.$iVersion);
diff --git a/manifest b/manifest
index 7947368a89..4778b3cf4b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fiddle:\smove,\srather\sthan\scopy,\sdata\sbuffers\sbetween\sthe\sthreads.\sFix\sthe\scase\sof\san\suploaded\sdb\sfailing\sto\sinstall\sbecause\sits\sfilename\sis\sthe\ssame\sas\sthe\sopened\sdb.
-D 2022-09-24T11:32:00.293
+C wasm:\schange\sStructBinder\ssignature\sfor\ssqlite3_file::pMethods\sfrom\s'P'\sto\s'p'\sto\seliminate\san\sunnecessary\sand\sinconsistent\slevel\sof\smagic.
+D 2022-09-26T11:34:31.822
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -488,7 +488,7 @@ F ext/wasm/api/sqlite3-api-opfs.js 5585dc80aea9df54c3d5d3a6c62771bf741f21b237063
 F ext/wasm/api/sqlite3-api-prologue.js 76db12cce58ec6724ec01a977dfbedabfd4916e915a6e7679ffc24dd52eef64e
 F ext/wasm/api/sqlite3-api-worker1.js 2eeb2a24e1a90322d84a9b88a99919b806623de62792436446099c0988f2030b
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c d1c0724136480a459d9dda4b76a665691a172d5cba96729d26d26acf6480bc9b
+F ext/wasm/api/sqlite3-wasm.c 7010405f1981cd5929568403a618f80398f7acbf76b3eb11c4f23789206eb164
 F ext/wasm/batch-runner.html 2857a6db7292ac83d1581af865d643fd34235db2df830d10b43b01388c599e04
 F ext/wasm/batch-runner.js 6f5b86e0b5519a9a941d9f17ee9c5ecdc63f452f157602fe7fdf87f6275a2b49
 F ext/wasm/common/SqliteTestUtil.js 529161a624265ba84271a52db58da022649832fa1c71309fb1e02cc037327a2b
@@ -527,7 +527,7 @@ F ext/wasm/test-opfs-vfs.js 753c6b86dd8ce0813121add44726a038ba1b83acebdc8414189c
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
 F ext/wasm/testing-worker1-promiser.js 63448fddfd3b8c89ff667d17c8b31c6c2259dd4647ebbbd28f3a921c48e924da
 F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d7669fb17fcae
-F ext/wasm/testing1.js 507001a970fe8a8eb67b6c8d783e1c1daa3db2719f727c4551af29349410e538
+F ext/wasm/testing1.js 7b90ea5f50fbb9529d10f384d2a89ab7aed4d72112fa2765bbdf72a087f47303
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
 F ext/wasm/testing2.js 25584bcc30f19673ce13a6f301f89f8820a59dfe044e0c4f2913941f4097fe3c
 F ext/wasm/wasmfs.make 52f24bc9c10e404d26bd0b0ee28d450269808a78e359d6ddedc45d31e7b9c29c
@@ -2026,8 +2026,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 114ef3552af977b272a0baddeb9a2326484b60acfc75284e43c55530f86b413f
-R 2919c32f82c004411030482647bf2402
+P bcec4f964a7b02f59be05286ff715bac654a32b19f05a743e402f4cdb207cab8
+R 793f9e89b06d2236f21d1ef1114135f2
 U stephan
-Z 37118e27ece07b1ea1fafa2d63837d11
+Z 73b30ac4eb53afa297401f4b1b820a88
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index e99dea6748..27efa67a09 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bcec4f964a7b02f59be05286ff715bac654a32b19f05a743e402f4cdb207cab8
\ No newline at end of file
+85f2e877e53899860af4dc6630044b471a9c7c82faba1f4e1e60ae991460b943
\ No newline at end of file

From 1f095d482d1803deb9fcb60449e9ca1223018d73 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 26 Sep 2022 11:38:58 +0000
Subject: [PATCH 168/428] Get fiddle db export working for OPFS VFS. Add root
 dir handle to the main OPFS VFS worker to enable creation of certain utility
 functions without delegating to the async worker. Add
 sqlite3.capi.sqlite3_wasm_rc_str() to map integer result codes back to their
 SQLITE_xxx counterparts. Minor doc touchups.

FossilOrigin-Name: 9b2244e1c8a40efe6547094a1b57acc8f2173145a8731abb0e36268ce0a8ef41
---
 ext/wasm/EXPORTED_FUNCTIONS.fiddle.in |  3 +-
 ext/wasm/api/sqlite3-api-glue.js      | 13 +++-
 ext/wasm/api/sqlite3-api-opfs.js      | 13 ++--
 ext/wasm/fiddle/fiddle-worker.js      | 89 ++++++++++++++++++++++++---
 ext/wasm/index.html                   | 45 ++++++++------
 ext/wasm/jaccwabyt/jaccwabyt.md       |  4 +-
 manifest                              | 24 ++++----
 manifest.uuid                         |  2 +-
 src/shell.c.in                        | 71 +++++++++++++++------
 9 files changed, 197 insertions(+), 67 deletions(-)

diff --git a/ext/wasm/EXPORTED_FUNCTIONS.fiddle.in b/ext/wasm/EXPORTED_FUNCTIONS.fiddle.in
index 392e36e842..96df7c8713 100644
--- a/ext/wasm/EXPORTED_FUNCTIONS.fiddle.in
+++ b/ext/wasm/EXPORTED_FUNCTIONS.fiddle.in
@@ -5,4 +5,5 @@ _fiddle_experiment
 _fiddle_interrupt
 _fiddle_main
 _fiddle_reset_db
-_fiddle_the_db
+_fiddle_db_handle
+_fiddle_db_is_opfs
diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index 847bf7bc2c..49f736669d 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -185,9 +185,20 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
         capi[e[0]] = e[1];
       }
     }
+    const __rcMap = Object.create(null);
+    for(const t of ['resultCodes']){
+      for(const e of Object.entries(wasm.ctype[t])){
+        __rcMap[e[1]] = e[0];
+      }
+    }
+    /**
+       For the given integer, returns the SQLITE_xxx result code as a
+       string, or undefined if no such mapping is found.
+    */
+    capi.sqlite3_wasm_rc_str = (rc)=>__rcMap[rc];
     /* Bind all registered C-side structs... */
     for(const s of wasm.ctype.structs){
       capi[s.name] = sqlite3.StructBinder(s);
     }
-  }
+  }/*end C constant imports*/
 });
diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index f69e162c7e..2c22c03f7d 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -999,11 +999,14 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
                 warn("Running sanity checks because of opfs-sanity-check URL arg...");
                 sanityCheck();
               }
-              W.onerror = W._originalOnError;
-              delete W._originalOnError;
-              sqlite3.opfs = opfsUtil;
-              log("End of OPFS sqlite3_vfs setup.", opfsVfs);
-              promiseResolve(sqlite3);
+              navigator.storage.getDirectory().then((d)=>{
+                W.onerror = W._originalOnError;
+                delete W._originalOnError;
+                sqlite3.opfs = opfsUtil;
+                opfsUtil.rootDirectory = d;
+                log("End of OPFS sqlite3_vfs setup.", opfsVfs);
+                promiseResolve(sqlite3);
+              });
             }catch(e){
               error(e);
               promiseReject(e);
diff --git a/ext/wasm/fiddle/fiddle-worker.js b/ext/wasm/fiddle/fiddle-worker.js
index 827d2cfa90..5da09257d4 100644
--- a/ext/wasm/fiddle/fiddle-worker.js
+++ b/ext/wasm/fiddle/fiddle-worker.js
@@ -99,7 +99,9 @@
         };
   const stdout = (...args)=>wMsg('stdout', args);
   const stderr = (...args)=>wMsg('stderr', args);
-
+  const toss = (...args)=>{
+    throw new Error(args.join(' '));
+  };
   const fixmeOPFS = "(FIXME: won't work with vanilla OPFS.)";
   
   self.onerror = function(/*message, source, lineno, colno, error*/) {
@@ -136,7 +138,7 @@
       const S = fiddleModule.sqlite3;
       /* We need to call sqlite3_shutdown() in order to avoid numerous
          legitimate warnings from the shell about it being initialized
-         after sqlite3_initialize() has been called. This mean ,
+         after sqlite3_initialize() has been called. This means,
          however, that any initialization done by the JS code may need
          to be re-done (e.g.  re-registration of dynamically-loaded
          VFSes). */
@@ -156,7 +158,7 @@
       if(S.opfs){
         stdout("\nOPFS is available. To open a persistent db, use:\n\n",
                "  .open file:name?vfs=opfs\n\nbut note that some",
-               "features (e.g. export) do not yet work with OPFS.");
+               "features (e.g. upload) do not yet work with OPFS.");
         S.opfs.reregisterVfs();
       }
       stdout('\nEnter ".help" for usage hints.');
@@ -207,6 +209,69 @@
       f._();
     }
   };
+
+  /**
+     Exports the shell's current db file in such a way that it can
+     export DBs hosted in the Emscripten-supplied FS or in native OPFS
+     (and, hypothetically, kvvfs). Throws on error. On success returns
+     a Blob containing the whole db contents.
+
+     Bug: xFileSize() is returning garbage for the default VFS but
+     works in OPFS. Thus for exporting that impl we'll use the
+     fiddleModule.FS API for the time being.
+  */
+  const exportDbFileToBlob = function(){
+    const S = fiddleModule.sqlite3, capi = S.capi, wasm = capi.wasm;
+    const pDb = wasm.xCall("fiddle_db_handle");
+    if(!pDb) toss("No db is opened.");
+    const scope = wasm.scopedAllocPush();
+    try{
+      const ppFile = wasm.scopedAlloc(12/*sizeof(i32 + i64)*/);
+      const pFileSize = ppFile + 4;
+      wasm.setMemValue(ppFile, 0, 'i32');
+      let rc = capi.sqlite3_file_control(
+        pDb, "main", capi.SQLITE_FCNTL_FILE_POINTER, ppFile
+      );
+      if(rc) toss("Cannot get sqlite3_file handle.");
+      const jFile = new capi.sqlite3_file(wasm.getPtrValue(ppFile));
+      const jIom = new capi.sqlite3_io_methods(jFile.$pMethods);
+      console.warn("jIom =",jIom);
+      const xFileSize = wasm.functionEntry(jIom.$xFileSize);
+      const xRead = wasm.functionEntry(jIom.$xRead);
+      wasm.setMemValue(pFileSize, 0n, 'i64');
+      //stderr("nFileSize =",wasm.getMemValue(pFileSize,'i64'),"pFileSize =",pFileSize);
+      rc = xFileSize( jFile.pointer, pFileSize );
+      if(rc) toss("Cannot get db file size.");
+      //stderr("nFileSize =",wasm.getMemValue(pFileSize,'i64'),"pFileSize =",pFileSize);
+      const nFileSize = Number( wasm.getMemValue(pFileSize,'i64') );
+      if(nFileSize <= 0n || nFileSize>=Number.MAX_SAFE_INTEGER){
+        toss("Unexpected DB size:",nFileSize);
+      }
+      //stderr("nFileSize =",nFileSize,"pFileSize =",pFileSize);
+      const nIobuf = 1024 * 4;
+      const iobuf = wasm.scopedAlloc(nIobuf);
+      let nPos = 0;
+      const blobList = [];
+      const heap = wasm.heap8u();
+      for( ; nPos < nFileSize; nPos += nIobuf ){
+        rc = xRead(jFile.pointer, iobuf, nIobuf, BigInt(nPos));
+        if(rc){
+          if(capi.SQLITE_IOERR_SHORT_READ === rc){
+            //stderr('rc =',rc,'nPos =',nPos,'nIobuf =',nIobuf,'nFileSize =',nFileSize);
+            rc = ((nPos + nIobuf) < nFileSize) ? rc : 0/*assume EOF*/;
+          }
+          if(rc) toss("xRead() SQLITE_xxx error #"+rc,capi.sqlite3_wasm_rc_str(rc));
+        }
+        blobList.push(heap.slice(iobuf, iobuf+nIobuf));
+      }
+      return new Blob(blobList);
+    }catch(e){
+      console.error('exportDbFileToBlob()',e);
+      stderr("exportDbFileToBlob():",e.message);
+    }finally{
+      wasm.scopedAllocPop(scope);
+    }
+  }/*exportDbFileToBlob()*/;
   
   self.onmessage = function f(ev){
     ev = ev.data;
@@ -233,14 +298,22 @@
           */
         case 'db-export': {
           const fn = Sqlite3Shell.dbFilename();
-          stdout("Exporting",fn+".",fixmeOPFS);
+          stdout("Exporting",fn+".");
           const fn2 = fn ? fn.split(/[/\\]/).pop() : null;
           try{
             if(!fn2) throw new Error("DB appears to be closed.");
-            const buffer = fiddleModule.FS.readFile(
-              fn, {encoding:"binary"}
-            ).buffer;
-            wMsg('db-export',{filename: fn2, buffer}, [buffer]);
+            if(fiddleModule.sqlite3.capi.wasm.xCall(
+              'fiddle_db_is_opfs'
+            )){
+              exportDbFileToBlob().arrayBuffer().then((buffer)=>{
+                wMsg('db-export',{filename: fn2, buffer}, [buffer]);
+              });
+            }else{
+              const buffer = fiddleModule.FS.readFile(
+                fn, {encoding:"binary"}
+              ).buffer;
+              wMsg('db-export',{filename: fn2, buffer}, [buffer]);
+            }
           }catch(e){
             /* Post a failure message so that UI elements disabled
                during the export can be re-enabled. */
diff --git a/ext/wasm/index.html b/ext/wasm/index.html
index 7b541a6457..ee31306bb7 100644
--- a/ext/wasm/index.html
+++ b/ext/wasm/index.html
@@ -15,40 +15,49 @@
       "make"d first. The intent is that <em>this</em> page be run
       using:</div>
     <blockquote><pre>althttpd -page index.html</pre></blockquote>
-    <div>and the individual tests be started in their own tab.</div>
-    <div>Warnings and Caveats:
+    <div>and the individual tests be started in their own tab.
+      Warnings and Caveats:
       <ul class='warning'>
         <li>Some of these pages require that
-          the web server emit the so-called COOP and COEP headers. The
-          default build of althttpd <em>does not</em>.
+          the web server emit the so-called
+          <a href='https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cross-Origin-Opener-Policy'>COOP</a>
+          and
+          <a href='https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cross-Origin-Embedder-Policy'>COEP</a>
+          headers. The default build
+          of <a href='https://sqlite.org/althttpd'>althttpd</a>
+          <em>does not</em>.
+        </li>
+        <li>Any OPFS-related pages require very recent version of
+          Chrome or Chromium (v102 at least, possibly newer). OPFS
+          support in the other major browsers is pending. Development
+          and testing is currently done against a dev-channel release
+          of Chrome (v107 as of 2022-09-26).
         </li>
-        <li>Any OPFS-related pages require very recent
-          version of Chrome or Chromium (v102 at least, possibly
-          newer). OPFS support in the other major browsers is
-          pending.</li>
         <li>Whether or not WASMFS/OPFS support is enabled on any given
           page may depend on build-time options which are <em>off by
           default</em> because they currently (as of 2022-09-08) break
-          with Worker-based pages. Similarly, WASMFS does not work on
-          some platforms, e.g. Raspberry Pi 4.
+          with Worker-based pages.
+          <!-- Similarly, WASMFS does not work on some platforms,
+               e.g. Raspberry Pi 4 (for which there is no Chrome
+               build, so it's currently a moot point). -->
         </li>
       </ul>
     </div>
-    <div>The tests...
+    <div>The tests and demos...
       <ul id='test-list'>
         <li>High-level apps and demos...
           <ul>
             <li><a href='fiddle/fiddle.html'>fiddle</a> is an HTML front-end
               to a wasm build of the sqlite3 shell.</li>
             <li><a href='demo-123.html'>demo-123</a> provides a
-              no-nonsense example of adding sqlite3 support to a
-              web page. </li>
-            <li><a href='demo-123-worker.html'>demo-123-worker</a> is the
-              same as <code>demo-123</code> but loads and run sqlite3 from
-              a Worker thread.</li>
+              no-nonsense example of adding sqlite3 support to a web
+              page in the UI thread.</li>
+            <li><a href='demo-123-worker.html'>demo-123-worker</a> is
+              the same as <code>demo-123</code> but loads and runs
+              sqlite3 from a Worker thread.</li>
             <li><a href='demo-kvvfs1.html'>demo-kvvfs1</a>: very basic
-              demo of using the key-value vfs for storing a persistent db
-              in JS localStorage or sessionStorage.</li>
+              demo of using the key-value VFS for storing a persistent db
+              in JS <code>localStorage</code> or <code>sessionStorage</code>.</li>
           </ul>
         </li>
         <li>speedtest1 ports (sqlite3's primary benchmarking tool)...
diff --git a/ext/wasm/jaccwabyt/jaccwabyt.md b/ext/wasm/jaccwabyt/jaccwabyt.md
index 2bb39e636f..edcba260a7 100644
--- a/ext/wasm/jaccwabyt/jaccwabyt.md
+++ b/ext/wasm/jaccwabyt/jaccwabyt.md
@@ -809,9 +809,7 @@ common:
   A read-only numeric property which is the "pointer" returned by the
   configured allocator when this object is constructed. After
   `dispose()` (inherited from [StructType][]) is called, this property
-  has the `undefined` value. When passing instances of this struct to
-  C-bound code, `pointer` is the value which must be passed in place
-  of a C-side struct pointer. When calling C-side code which takes a
+  has the `undefined` value. When calling C-side code which takes a
   pointer to a struct of this type, simply pass it `myStruct.pointer`.
 
 <a name='appendices'></a>
diff --git a/manifest b/manifest
index 4778b3cf4b..31376ee0cc 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C wasm:\schange\sStructBinder\ssignature\sfor\ssqlite3_file::pMethods\sfrom\s'P'\sto\s'p'\sto\seliminate\san\sunnecessary\sand\sinconsistent\slevel\sof\smagic.
-D 2022-09-26T11:34:31.822
+C Get\sfiddle\sdb\sexport\sworking\sfor\sOPFS\sVFS.\sAdd\sroot\sdir\shandle\sto\sthe\smain\sOPFS\sVFS\sworker\sto\senable\screation\sof\scertain\sutility\sfunctions\swithout\sdelegating\sto\sthe\sasync\sworker.\sAdd\ssqlite3.capi.sqlite3_wasm_rc_str()\sto\smap\sinteger\sresult\scodes\sback\sto\stheir\sSQLITE_xxx\scounterparts.\sMinor\sdoc\stouchups.
+D 2022-09-26T11:38:58.930
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -472,7 +472,7 @@ F ext/session/test_session.c f433f68a8a8c64b0f5bc74dc725078f12483301ad4ae8375205
 F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
-F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 105f6f7f211f49dea8fa6ee8b7b56492d5f9237ab0d1c1b3c970df11e4d0df02
+F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 48af0d812e2e1099798ae0e27f1d4836d572d0d068c83b3e2088ef4d97c45c2f
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle 0e88c8cfc3719e4b7e74980d9da664c709e68acf863e48386cda376edfd3bfb0
 F ext/wasm/GNUmakefile 34a84e30e6b25e24959a8264e9dec020dffa82d96879dc55ad65d3c31c95d3b1
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
@@ -482,9 +482,9 @@ F ext/wasm/api/README.md d876597edd2b9542b6ea031adaaff1c042076fde7b670b1dc6d8a87
 F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba81456260a713ed04900c
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
 F ext/wasm/api/sqlite3-api-cleanup.js 8564a6077cdcaea9a9f428a019af8a05887f0131e6a2a1e72a7ff1145fadfe77
-F ext/wasm/api/sqlite3-api-glue.js cfff894bdf98a6c579975d09dd45471b0e3399f08a6f9e44a22646e8403196ed
+F ext/wasm/api/sqlite3-api-glue.js fe5ca21ac519e6411f5e7a6403d06fe92c51ef81cca8e07ea8895df8ec9c2e4e
 F ext/wasm/api/sqlite3-api-oo1.js f974e79d9af8f26bf33928c5730b0988cc706d14f59a5fe36394739b92249841
-F ext/wasm/api/sqlite3-api-opfs.js 5585dc80aea9df54c3d5d3a6c62771bf741f21b23706330ba62571c57ec07abf
+F ext/wasm/api/sqlite3-api-opfs.js 151f8bab445915dd4fa8fe3329accc5250351e7bf0af1518cb5cc49886c123d2
 F ext/wasm/api/sqlite3-api-prologue.js 76db12cce58ec6724ec01a977dfbedabfd4916e915a6e7679ffc24dd52eef64e
 F ext/wasm/api/sqlite3-api-worker1.js 2eeb2a24e1a90322d84a9b88a99919b806623de62792436446099c0988f2030b
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
@@ -502,12 +502,12 @@ F ext/wasm/demo-kvvfs1.html 7d4f28873de67f51ac18c584b7d920825139866a96049a49c424
 F ext/wasm/demo-kvvfs1.js e884ea35022d772c0d1dd884b40011413696438394f605c6cd4808cfb1642a4a
 F ext/wasm/fiddle.make fd56fa21bada6ecbf860686a9a789ebda7cc3d9b60835927000fcb00246ea50f
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
-F ext/wasm/fiddle/fiddle-worker.js d3e4d1e442a9a86cc34f8bd646059d848cf3345b5220883379268b03b3c3cdfa
+F ext/wasm/fiddle/fiddle-worker.js 42c31065660e57844afa796bcf120666348c060fc4c656c335151b62da7fc60d
 F ext/wasm/fiddle/fiddle.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
 F ext/wasm/fiddle/fiddle.js aa44051be6e48c53fd23c829177d43f557dcc6f0998ccfcbae7c473ff405f0c6
-F ext/wasm/index.html 8b4b7ea052d558262c8466f94326fb455c21049b2d1d3577ed0a5fce15101ba8
+F ext/wasm/index.html a39d14f6de6bd1294d39522fcf40eca3c9f0b6da44bb8df6948378e9f30468f5
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
-F ext/wasm/jaccwabyt/jaccwabyt.md 447cc02b598f7792edaa8ae6853a7847b8178a18ed356afacbdbf312b2588106
+F ext/wasm/jaccwabyt/jaccwabyt.md 9aa6951b529a8b29f578ec8f0355713c39584c92cf1708f63ba0cf917cb5b68e
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
 F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e568d2c2307c416902059339c06f19
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
@@ -615,7 +615,7 @@ F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c d69dfb5b082f9a25e6700e152ddb3d942359b847b1df504eb09f9b4531844f8d
-F src/shell.c.in c4625fa9493cf815ff15e62bee5af93e91bbdb1a0c4e2c5a34a3744df3d5daaf
+F src/shell.c.in 00a72221c8b2df823f3a9d712457ae8bebe627b5989fefa1ccfe099eafab5139
 F src/sqlite.h.in b9b7fd73239d94db20332bb6e504688001e5564b655e1318a4427a1caef4b99e
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d
@@ -2026,8 +2026,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 bcec4f964a7b02f59be05286ff715bac654a32b19f05a743e402f4cdb207cab8
-R 793f9e89b06d2236f21d1ef1114135f2
+P 85f2e877e53899860af4dc6630044b471a9c7c82faba1f4e1e60ae991460b943
+R 021d11845b25e048635a4d675c2c9f1f
 U stephan
-Z 73b30ac4eb53afa297401f4b1b820a88
+Z 684fe82520a24a3caf4c9fdd7b640f27
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 27efa67a09..2ef99b9942 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-85f2e877e53899860af4dc6630044b471a9c7c82faba1f4e1e60ae991460b943
\ No newline at end of file
+9b2244e1c8a40efe6547094a1b57acc8f2173145a8731abb0e36268ce0a8ef41
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index bafcc697f2..3e5a1c2168 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -12632,27 +12632,13 @@ int fiddle_experiment(int a,int b){
    return a + b;
 }
 
-/* Only for emcc experimentation purposes.
-
-  Define this function in JS using:
-
-  emcc ... --js-library somefile.js
-
-  containing:
-
-mergeInto(LibraryManager.library, {
-    my_foo: function(){
-        console.debug("my_foo()",arguments);
-    }
-});
+/*
+** Returns a pointer to the current DB handle.
 */
-/*extern void my_foo(sqlite3 *);*/
-/* Only for emcc experimentation purposes. */
-sqlite3 * fiddle_the_db(){
-    printf("fiddle_the_db(%p)\n", (const void*)globalDb);
-    /*my_foo(globalDb);*/
+sqlite3 * fiddle_db_handle(){
     return globalDb;
 }
+
 /* Only for emcc experimentation purposes. */
 sqlite3 * fiddle_db_arg(sqlite3 *arg){
     printf("fiddle_db_arg(%p)\n", (const void*)arg);
@@ -12702,6 +12688,55 @@ void fiddle_reset_db(void){
   sqlite3_free(zFilename);
 }
 
+/*
+** This is a bit of a workaround: returns true if the current db uses
+** the "opfs" VFS, else false.
+*/
+int fiddle_db_is_opfs(void){
+  sqlite3_vfs * pVfs = 0;
+  if( 0!=shellState.db ){
+    sqlite3_file_control( shellState.db, "main",
+                          SQLITE_FCNTL_VFS_POINTER, &pVfs );
+  }
+  return pVfs ? 0==strcmp("opfs", pVfs->zName) : 0;
+}
+
+#if 0
+/* TODO: test whether this impl works properly wrt xSize() in the
+** unix-none VFS. The JS impl works fine for OPFS but not unix-none
+** because xSize() is returning a garbage size.
+*/
+int fiddle_export_db( int (*callback)(unsigned const char *zOut, int n) ){
+  sqlite3_int64 nSize = 0;
+  sqlite3_int64 nPos = 0;
+  sqlite3_vfs * pVfs = 0;
+  sqlite3_file * pFile = 0;
+  unsigned char buf[1024 * 4];
+  const int nBuf = (int)sizeof(buf);
+  int rc = shellState.db
+    ? sqlite3_file_control(shellState.db, "main",
+                           SQLITE_FCNTL_VFS_POINTER, &pVfs)
+    : 0;
+  if( rc ) return rc;
+  else if( 0==pVfs ) return SQLITE_NOTFOUND;
+  rc = sqlite3_file_control(shellState.db, "main",
+                            SQLITE_FCNTL_FILE_POINTER, &pFile);
+  if( rc ) return rc;
+  rc = pFile->pMethods->xFileSize(pFile, &nSize);
+  if(rc) return rc;
+  for( ; 0==rc && nPos<nSize; nPos += nBuf ){
+    rc = pFile->pMethods->xRead(pFile, buf, nBuf, nPos);
+    if(SQLITE_IOERR_SHORT_READ == rc){
+      rc = (nPos + nBuf) < nSize ? rc : 0/*assume EOF*/;
+    }
+    if(rc) return rc;
+    nPos += nBuf;
+    rc = callback(buf, nBuf);
+  }
+  return rc;
+}
+#endif
+
 /*
 ** Trivial exportable function for emscripten. It processes zSql as if
 ** it were input to the sqlite3 shell and redirects all output to the

From 278d3faf1ffa6bbd14253865edba3e81631d0cb5 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 26 Sep 2022 13:55:10 +0000
Subject: [PATCH 169/428] Fiddle: replace db export routine with a C-side one
 which works for both Emscripten FS-hosted and OPFS-hosted db files. Minor
 code-adjacent cleanups.

FossilOrigin-Name: 3579a8d6f1f6cd3cd8aad9949536870c5fe7bae8c1778f700dd85d763e266b94
---
 ext/wasm/EXPORTED_FUNCTIONS.fiddle.in |  3 +-
 ext/wasm/api/sqlite3-api-oo1.js       | 45 ---------------
 ext/wasm/api/sqlite3-api-opfs.js      | 14 +++--
 ext/wasm/api/sqlite3-api-prologue.js  | 23 ++++----
 ext/wasm/common/whwasmutil.js         | 17 +++++-
 ext/wasm/fiddle/fiddle-worker.js      | 83 +++++++++++++++++++--------
 manifest                              | 24 ++++----
 manifest.uuid                         |  2 +-
 src/shell.c.in                        | 77 ++++++++++++++-----------
 9 files changed, 149 insertions(+), 139 deletions(-)

diff --git a/ext/wasm/EXPORTED_FUNCTIONS.fiddle.in b/ext/wasm/EXPORTED_FUNCTIONS.fiddle.in
index 96df7c8713..103704df10 100644
--- a/ext/wasm/EXPORTED_FUNCTIONS.fiddle.in
+++ b/ext/wasm/EXPORTED_FUNCTIONS.fiddle.in
@@ -6,4 +6,5 @@ _fiddle_interrupt
 _fiddle_main
 _fiddle_reset_db
 _fiddle_db_handle
-_fiddle_db_is_opfs
+_fiddle_db_vfs
+_fiddle_export_db
diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index 25ca34dda9..e0f812baa7 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -1025,51 +1025,6 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
         this.exec("ROLLBACK to SAVEPOINT oo1; RELEASE SAVEPOINT oo1");
         throw e;
       }
-    },
-    
-    /**
-       This function currently does nothing and always throws.  It
-       WILL BE REMOVED pending other refactoring, to eliminate a hard
-       dependency on Emscripten. This feature will be moved into a
-       higher-level API or a runtime-configurable feature.
-
-       That said, what its replacement should eventually do is...
-
-       Exports a copy of this db's file as a Uint8Array and
-       returns it. It is technically not legal to call this while
-       any prepared statement are currently active because,
-       depending on the platform, it might not be legal to read
-       the db while a statement is locking it. Throws if this db
-       is not open or has any opened statements.
-
-       The resulting buffer can be passed to this class's
-       constructor to restore the DB.
-
-       Maintenance reminder: the corresponding sql.js impl of this
-       feature closes the current db, finalizing any active
-       statements and (seemingly unnecessarily) destroys any UDFs,
-       copies the file, and then re-opens it (without restoring
-       the UDFs). Those gymnastics are not necessary on the tested
-       platform but might be necessary on others. Because of that
-       eventuality, this interface currently enforces that no
-       statements are active when this is run. It will throw if
-       any are.
-    */
-    exportBinaryImage: function(){
-      toss3("exportBinaryImage() is slated for removal for portability reasons.");
-      /***********************
-         The following is currently kept only for reference when
-         porting to some other layer, noting that we may well not be
-         able to implement this, at this level, when using the OPFS
-         VFS because of its exclusive locking policy.
-
-         affirmDbOpen(this);
-         if(this.openStatementCount()>0){
-           toss3("Cannot export with prepared statements active!",
-                 "finalize() all statements and try again.");
-         }
-         return MODCFG.FS.readFile(this.filename, {encoding:"binary"});
-      ***********************/
     }
   }/*DB.prototype*/;
 
diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index 2c22c03f7d..e28e47ab6c 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -637,7 +637,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
         const rc = opRun('xFileSize', pFile);
         if(0==rc){
           const sz = state.s11n.deserialize()[0];
-          wasm.setMemValue(pSz64, BigInt(sz), 'i64');
+          wasm.setMemValue(pSz64, sz, 'i64');
         }
         mTimeEnd();
         return rc;
@@ -820,10 +820,12 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
     }
 
     /* Install the vfs/io_methods into their C-level shared instances... */
-    let inst = installMethod(opfsIoMethods);
-    for(let k of Object.keys(ioSyncWrappers)) inst(k, ioSyncWrappers[k]);
-    inst = installMethod(opfsVfs);
-    for(let k of Object.keys(vfsSyncWrappers)) inst(k, vfsSyncWrappers[k]);
+    for(let k of Object.keys(ioSyncWrappers)){
+      installMethod(opfsIoMethods, k, ioSyncWrappers[k]);
+    }
+    for(let k of Object.keys(vfsSyncWrappers)){
+      installMethod(opfsVfs, k, vfsSyncWrappers[k]);
+    }
 
     /**
        Syncronously deletes the given OPFS filesystem entry, ignoring
@@ -831,7 +833,7 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
        directory", the given name must be an absolute path. If the 2nd
        argument is truthy, deletion is recursive (use with caution!).
 
-       Returns true if the deletion succeeded and fails if it fails,
+       Returns true if the deletion succeeded and false if it fails,
        but cannot report the nature of the failure.
     */
     opfsUtil.deleteEntry = function(fsEntryName,recursive=false){
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 6a3bbc585b..b5cd292fc5 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -784,13 +784,16 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
   }
 
   /**
-     Given an `sqlite3*` and an sqlite3_vfs name, returns a truthy
-     value (see below) if that db handle uses that VFS, else returns
-     false. If pDb is falsy then this function returns a truthy value
-     if the default VFS is that VFS. Results are undefined if pDb is
-     truthy but refers to an invalid pointer.
+     Given an `sqlite3*`, an sqlite3_vfs name, and an optional db
+     name, returns a truthy value (see below) if that db handle uses
+     that VFS, else returns false. If pDb is falsy then the 3rd
+     argument is ignored and this function returns a truthy value if
+     the default VFS name matches that of the 2nd argument. Results
+     are undefined if pDb is truthy but refers to an invalid
+     pointer. The 3rd argument specifies the database name of the
+     given database connection to check, defaulting to the main db.
 
-     The 2nd argument may either be a JS string or a C-string
+     The 2nd and 3rd arguments may either be a JS string or a C-string
      allocated from the wasm environment.
 
      The truthy value it returns is a pointer to the `sqlite3_vfs`
@@ -801,11 +804,9 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
      bad arguments cause a conversion error when passing into
      wasm-space, false is returned.
   */
-  capi.sqlite3_web_db_uses_vfs = function(pDb,vfsName){
+  capi.sqlite3_web_db_uses_vfs = function(pDb,vfsName,dbName="main"){
     try{
-      const pK = ('number'===vfsName)
-            ? capi.wasm.exports.sqlite3_vfs_find(vfsName)
-            : capi.sqlite3_vfs_find(vfsName);
+      const pK = capi.sqlite3_vfs_find(vfsName);
       if(!pK) return false;
       else if(!pDb){
         return capi.sqlite3_vfs_find(0)===pK ? pK : false;
@@ -814,7 +815,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
       try{
         return (
           (0===capi.sqlite3_file_control(
-            pDb, "main", capi.SQLITE_FCNTL_VFS_POINTER, ppVfs
+            pDb, dbName, capi.SQLITE_FCNTL_VFS_POINTER, ppVfs
           )) && (capi.wasm.getPtrValue(ppVfs) === pK)
         ) ? pK : false;
       }finally{
diff --git a/ext/wasm/common/whwasmutil.js b/ext/wasm/common/whwasmutil.js
index fa39ad4b93..662978b20b 100644
--- a/ext/wasm/common/whwasmutil.js
+++ b/ext/wasm/common/whwasmutil.js
@@ -63,7 +63,7 @@
    - WASM-exported "indirect function table" access and
      manipulation. e.g.  creating new WASM-side functions using JS
      functions, analog to Emscripten's addFunction() and
-     removeFunction() but slightly different.
+     uninstallFunction() but slightly different.
 
    - Get/set specific heap memory values, analog to Emscripten's
      getValue() and setValue().
@@ -483,9 +483,12 @@ self.WhWasmUtilInstaller = function(target){
      available slot of this.functionTable(), and returns the
      function's index in that table (which acts as a pointer to that
      function). The returned pointer can be passed to
-     removeFunction() to uninstall it and free up the table slot for
+     uninstallFunction() to uninstall it and free up the table slot for
      reuse.
 
+     If passed (string,function) arguments then it treats the first
+     argument as the signature and second as the function.
+
      As a special case, if the passed-in function is a WASM-exported
      function then the signature argument is ignored and func is
      installed as-is, without requiring re-compilation/re-wrapping.
@@ -499,12 +502,20 @@ self.WhWasmUtilInstaller = function(target){
      Sidebar: this function differs from Emscripten's addFunction()
      _primarily_ in that it does not share that function's
      undocumented behavior of reusing a function if it's passed to
-     addFunction() more than once, which leads to removeFunction()
+     addFunction() more than once, which leads to uninstallFunction()
      breaking clients which do not take care to avoid that case:
 
      https://github.com/emscripten-core/emscripten/issues/17323
   */
   target.installFunction = function f(func, sig){
+    if(2!==arguments.length){
+      toss("installFunction() requires exactly 2 arguments");
+    }
+    if('string'===typeof func && sig instanceof Function){
+      const x = sig;
+      sig = func;
+      func = x;
+    }
     const ft = target.functionTable();
     const oldLen = ft.length;
     let ptr;
diff --git a/ext/wasm/fiddle/fiddle-worker.js b/ext/wasm/fiddle/fiddle-worker.js
index 5da09257d4..dd82914655 100644
--- a/ext/wasm/fiddle/fiddle-worker.js
+++ b/ext/wasm/fiddle/fiddle-worker.js
@@ -103,7 +103,8 @@
     throw new Error(args.join(' '));
   };
   const fixmeOPFS = "(FIXME: won't work with vanilla OPFS.)";
-  
+  let sqlite3 /* gets assigned when the wasm module is loaded */;
+
   self.onerror = function(/*message, source, lineno, colno, error*/) {
     const err = arguments[4];
     if(err && 'ExitStatus'==err.name){
@@ -121,9 +122,18 @@
   const Sqlite3Shell = {
     /** Returns the name of the currently-opened db. */
     dbFilename: function f(){
-      if(!f._) f._ = fiddleModule.cwrap('fiddle_db_filename', "string", ['string']);
+      if(!f._) f._ = sqlite3.capi.wasm.xWrap('fiddle_db_filename', "string", ['string']);
+      return f._(0);
+    },
+    dbHandle: function f(){
+      if(!f._) f._ = sqlite3.capi.wasm.xWrap("fiddle_db_handle", "sqlite3*");
       return f._();
     },
+    dbIsOpfs: function f(){
+      return sqlite3.opfs && sqlite3.capi.sqlite3_web_db_uses_vfs(
+        this.dbHandle(), "opfs"
+      );
+    },
     runMain: function f(){
       if(f.argv) return 0===f.argv.rc;
       const dbName = "/fiddle.sqlite3";
@@ -141,7 +151,8 @@
          after sqlite3_initialize() has been called. This means,
          however, that any initialization done by the JS code may need
          to be re-done (e.g.  re-registration of dynamically-loaded
-         VFSes). */
+         VFSes). We need a more generic approach to running such
+         init-level code. */
       S.capi.sqlite3_shutdown();
       f.argv.pArgv = S.capi.wasm.allocMainArgv(f.argv);
       f.argv.rc = S.capi.wasm.exports.fiddle_main(
@@ -196,6 +207,12 @@
       }
     },
     resetDb: function f(){
+      if(Sqlite3Shell.dbIsOpfs()){
+        /* The problem is that fiddle_reset_db() uses the POSIX APIs
+           for file removal, which cannot see OPFS-hosted files. */
+        stderr("TODO: cannot currently reset an OPFS-hosted db.");
+        return;
+      }
       if(!f._) f._ = fiddleModule.cwrap('fiddle_reset_db', null);
       stdout("Resetting database.",fixmeOPFS);
       f._();
@@ -216,29 +233,30 @@
      (and, hypothetically, kvvfs). Throws on error. On success returns
      a Blob containing the whole db contents.
 
-     Bug: xFileSize() is returning garbage for the default VFS but
-     works in OPFS. Thus for exporting that impl we'll use the
-     fiddleModule.FS API for the time being.
+     Bug/to investigate: xFileSize() is returning garbage for the
+     default VFS but works in OPFS. Thus for exporting that impl we'll
+     use the fiddleModule.FS API for the time being. The equivalent
+     native impl, fiddle_export_db(), works okay with both VFSes, so
+     the bug is apparently in (or via) this code.
   */
-  const exportDbFileToBlob = function(){
+  const brokenExportDbFileToBlob = function(){
     const S = fiddleModule.sqlite3, capi = S.capi, wasm = capi.wasm;
-    const pDb = wasm.xCall("fiddle_db_handle");
+    const pDb = Sqlite3Shell.dbHandle();
     if(!pDb) toss("No db is opened.");
     const scope = wasm.scopedAllocPush();
     try{
       const ppFile = wasm.scopedAlloc(12/*sizeof(i32 + i64)*/);
       const pFileSize = ppFile + 4;
-      wasm.setMemValue(ppFile, 0, 'i32');
+      wasm.setMemValue(ppFile, 0, '*');
       let rc = capi.sqlite3_file_control(
         pDb, "main", capi.SQLITE_FCNTL_FILE_POINTER, ppFile
       );
       if(rc) toss("Cannot get sqlite3_file handle.");
       const jFile = new capi.sqlite3_file(wasm.getPtrValue(ppFile));
       const jIom = new capi.sqlite3_io_methods(jFile.$pMethods);
-      console.warn("jIom =",jIom);
       const xFileSize = wasm.functionEntry(jIom.$xFileSize);
       const xRead = wasm.functionEntry(jIom.$xRead);
-      wasm.setMemValue(pFileSize, 0n, 'i64');
+      wasm.setMemValue(pFileSize, 0, 'i64');
       //stderr("nFileSize =",wasm.getMemValue(pFileSize,'i64'),"pFileSize =",pFileSize);
       rc = xFileSize( jFile.pointer, pFileSize );
       if(rc) toss("Cannot get db file size.");
@@ -272,6 +290,30 @@
       wasm.scopedAllocPop(scope);
     }
   }/*exportDbFileToBlob()*/;
+
+  const exportDbFileToBlob = function f(){
+    if(!f._){
+      f._ = sqlite3.capi.wasm.xWrap('fiddle_export_db', 'int', '*');
+    }
+    const capi = sqlite3.capi;
+    const wasm = capi.wasm;
+    const blobList = [];
+    const heap = wasm.heap8u();
+    const callback = wasm.installFunction('ipi', function(buf, n){
+      blobList.push(heap.slice(buf, buf+n));
+      return 0;
+    });
+    try {
+      const rc = wasm.exports.fiddle_export_db( callback );
+      if(rc) toss("DB export failed with code", capi.sqlite3_wasm_rc_str(rc));
+      return new Blob(blobList);
+    }catch(e){
+      console.error("exportDbFileToBlob():",e.message);
+      throw(e);
+    }finally{
+      wasm.uninstallFunction(callback);
+    }
+  }/*exportDbFileToBlob()*/;
   
   self.onmessage = function f(ev){
     ev = ev.data;
@@ -302,18 +344,9 @@
           const fn2 = fn ? fn.split(/[/\\]/).pop() : null;
           try{
             if(!fn2) throw new Error("DB appears to be closed.");
-            if(fiddleModule.sqlite3.capi.wasm.xCall(
-              'fiddle_db_is_opfs'
-            )){
-              exportDbFileToBlob().arrayBuffer().then((buffer)=>{
-                wMsg('db-export',{filename: fn2, buffer}, [buffer]);
-              });
-            }else{
-              const buffer = fiddleModule.FS.readFile(
-                fn, {encoding:"binary"}
-              ).buffer;
+            exportDbFileToBlob().arrayBuffer().then((buffer)=>{
               wMsg('db-export',{filename: fn2, buffer}, [buffer]);
-            }
+            });
           }catch(e){
             /* Post a failure message so that UI elements disabled
                during the export can be re-enabled. */
@@ -427,15 +460,15 @@
      emcc ... -sMODULARIZE=1 -sEXPORT_NAME=initFiddleModule
   */
   initFiddleModule(fiddleModule).then(function(thisModule){
-    const S = thisModule.sqlite3;
+    sqlite3 = thisModule.sqlite3;
     const atEnd = ()=>{
       thisModule.fsUnlink = (fn)=>{
         stderr("unlink:",fixmeOPFS);
-        return S.capi.wasm.sqlite3_wasm_vfs_unlink(fn);
+        return sqlite3.capi.wasm.sqlite3_wasm_vfs_unlink(fn);
       };
       wMsg('fiddle-ready');
     };
-    if(S.installOpfsVfs) S.installOpfsVfs().finally(atEnd);
+    if(sqlite3.installOpfsVfs) sqlite3.installOpfsVfs().finally(atEnd);
     else atEnd();
   })/*then()*/;
 })();
diff --git a/manifest b/manifest
index 31376ee0cc..40da9686bf 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Get\sfiddle\sdb\sexport\sworking\sfor\sOPFS\sVFS.\sAdd\sroot\sdir\shandle\sto\sthe\smain\sOPFS\sVFS\sworker\sto\senable\screation\sof\scertain\sutility\sfunctions\swithout\sdelegating\sto\sthe\sasync\sworker.\sAdd\ssqlite3.capi.sqlite3_wasm_rc_str()\sto\smap\sinteger\sresult\scodes\sback\sto\stheir\sSQLITE_xxx\scounterparts.\sMinor\sdoc\stouchups.
-D 2022-09-26T11:38:58.930
+C Fiddle:\sreplace\sdb\sexport\sroutine\swith\sa\sC-side\sone\swhich\sworks\sfor\sboth\sEmscripten\sFS-hosted\sand\sOPFS-hosted\sdb\sfiles.\sMinor\scode-adjacent\scleanups.
+D 2022-09-26T13:55:10.137
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -472,7 +472,7 @@ F ext/session/test_session.c f433f68a8a8c64b0f5bc74dc725078f12483301ad4ae8375205
 F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
-F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 48af0d812e2e1099798ae0e27f1d4836d572d0d068c83b3e2088ef4d97c45c2f
+F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle 0e88c8cfc3719e4b7e74980d9da664c709e68acf863e48386cda376edfd3bfb0
 F ext/wasm/GNUmakefile 34a84e30e6b25e24959a8264e9dec020dffa82d96879dc55ad65d3c31c95d3b1
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
@@ -483,9 +483,9 @@ F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba814
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
 F ext/wasm/api/sqlite3-api-cleanup.js 8564a6077cdcaea9a9f428a019af8a05887f0131e6a2a1e72a7ff1145fadfe77
 F ext/wasm/api/sqlite3-api-glue.js fe5ca21ac519e6411f5e7a6403d06fe92c51ef81cca8e07ea8895df8ec9c2e4e
-F ext/wasm/api/sqlite3-api-oo1.js f974e79d9af8f26bf33928c5730b0988cc706d14f59a5fe36394739b92249841
-F ext/wasm/api/sqlite3-api-opfs.js 151f8bab445915dd4fa8fe3329accc5250351e7bf0af1518cb5cc49886c123d2
-F ext/wasm/api/sqlite3-api-prologue.js 76db12cce58ec6724ec01a977dfbedabfd4916e915a6e7679ffc24dd52eef64e
+F ext/wasm/api/sqlite3-api-oo1.js 455fcb28dd77b9781e087aac77392fb78f8ee8e5b125a99c1488604de27a5bb1
+F ext/wasm/api/sqlite3-api-opfs.js e0dfae09aedc6fe414d8d350e7228a6a88de030a0cb19a748ac8269aef9b11db
+F ext/wasm/api/sqlite3-api-prologue.js d39bda7d83aaeb8e15574afe8308221ed11c6f24865ccff06cf0424b665e681e
 F ext/wasm/api/sqlite3-api-worker1.js 2eeb2a24e1a90322d84a9b88a99919b806623de62792436446099c0988f2030b
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 7010405f1981cd5929568403a618f80398f7acbf76b3eb11c4f23789206eb164
@@ -494,7 +494,7 @@ F ext/wasm/batch-runner.js 6f5b86e0b5519a9a941d9f17ee9c5ecdc63f452f157602fe7fdf8
 F ext/wasm/common/SqliteTestUtil.js 529161a624265ba84271a52db58da022649832fa1c71309fb1e02cc037327a2b
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 3a5143699c2b73a85b962271e1a9b3241b30d90e30d895e4f55665e648572962
-F ext/wasm/common/whwasmutil.js 2a8cd8b0c936da5812971aa39c8d989306c2ad8fc841dcd037c3be62737dc652
+F ext/wasm/common/whwasmutil.js 20291bbf4955358d0b5ead58db4c575be269b4976e39c43a93331547e3b86363
 F ext/wasm/demo-123-worker.html e419b66495d209b5211ec64903b4cfb3ca7df20d652b41fcd28bf018a773234f
 F ext/wasm/demo-123.html aa281d33b7eefa755f3122b7b5a18f39a42dc5fb69c8879171bf14b4c37c4ec4
 F ext/wasm/demo-123.js 234655683e35a4543a23de7b10800d76b0369947b33e089e5613171fa7795afb
@@ -502,7 +502,7 @@ F ext/wasm/demo-kvvfs1.html 7d4f28873de67f51ac18c584b7d920825139866a96049a49c424
 F ext/wasm/demo-kvvfs1.js e884ea35022d772c0d1dd884b40011413696438394f605c6cd4808cfb1642a4a
 F ext/wasm/fiddle.make fd56fa21bada6ecbf860686a9a789ebda7cc3d9b60835927000fcb00246ea50f
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
-F ext/wasm/fiddle/fiddle-worker.js 42c31065660e57844afa796bcf120666348c060fc4c656c335151b62da7fc60d
+F ext/wasm/fiddle/fiddle-worker.js 1fe173ba963314df99df9eb8f0f45f1c3a72c056f16510e47787eb1790cb5531
 F ext/wasm/fiddle/fiddle.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
 F ext/wasm/fiddle/fiddle.js aa44051be6e48c53fd23c829177d43f557dcc6f0998ccfcbae7c473ff405f0c6
 F ext/wasm/index.html a39d14f6de6bd1294d39522fcf40eca3c9f0b6da44bb8df6948378e9f30468f5
@@ -615,7 +615,7 @@ F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c d69dfb5b082f9a25e6700e152ddb3d942359b847b1df504eb09f9b4531844f8d
-F src/shell.c.in 00a72221c8b2df823f3a9d712457ae8bebe627b5989fefa1ccfe099eafab5139
+F src/shell.c.in 2980312ab57fc5ccf298d1f0682588ec3832f52a878bea8abe34647d2cf31d05
 F src/sqlite.h.in b9b7fd73239d94db20332bb6e504688001e5564b655e1318a4427a1caef4b99e
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d
@@ -2026,8 +2026,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 85f2e877e53899860af4dc6630044b471a9c7c82faba1f4e1e60ae991460b943
-R 021d11845b25e048635a4d675c2c9f1f
+P 9b2244e1c8a40efe6547094a1b57acc8f2173145a8731abb0e36268ce0a8ef41
+R ee45c68d4b4cfbf2a729d26cea95ac0e
 U stephan
-Z 684fe82520a24a3caf4c9fdd7b640f27
+Z a7778a8aaef90b52f5b829e56bd6cae3
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 2ef99b9942..d8a4d0f939 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9b2244e1c8a40efe6547094a1b57acc8f2173145a8731abb0e36268ce0a8ef41
\ No newline at end of file
+3579a8d6f1f6cd3cd8aad9949536870c5fe7bae8c1778f700dd85d763e266b94
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index 3e5a1c2168..cd3fe88cd5 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -12629,14 +12629,28 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
 #ifdef SQLITE_SHELL_FIDDLE
 /* Only for emcc experimentation purposes. */
 int fiddle_experiment(int a,int b){
-   return a + b;
+  return a + b;
 }
 
 /*
 ** Returns a pointer to the current DB handle.
 */
 sqlite3 * fiddle_db_handle(){
-    return globalDb;
+  return globalDb;
+}
+
+/*
+** Returns a pointer to the given DB name's VFS. If zDbName is 0 then
+** "main" is assumed. Returns 0 if no db with the given name is
+** open.
+*/
+sqlite3_vfs * fiddle_db_vfs(const char *zDbName){
+  sqlite3_vfs * pVfs = 0;
+  if(globalDb){
+    sqlite3_file_control(globalDb, zDbName ? zDbName : "main",
+                         SQLITE_FCNTL_VFS_POINTER, &pVfs);
+  }
+  return pVfs;
 }
 
 /* Only for emcc experimentation purposes. */
@@ -12652,7 +12666,7 @@ sqlite3 * fiddle_db_arg(sqlite3 *arg){
 ** portable enough to make real use of.
 */
 void fiddle_interrupt(void){
-  if(globalDb) sqlite3_interrupt(globalDb);
+  if( globalDb ) sqlite3_interrupt(globalDb);
 }
 
 /*
@@ -12673,7 +12687,7 @@ const char * fiddle_db_filename(const char * zDbName){
 */
 void fiddle_reset_db(void){
   char *zFilename = 0;
-  if(0==globalDb){
+  if( 0==globalDb ){
     shellState.pAuxDb->zDbFilename = shellState.wasm.zDefaultDbName;
   }else{
     zFilename =
@@ -12689,53 +12703,46 @@ void fiddle_reset_db(void){
 }
 
 /*
-** This is a bit of a workaround: returns true if the current db uses
-** the "opfs" VFS, else false.
+** Uses the current database's VFS xRead to stream the db file's
+** contents out to the given callback. The callback gets a single
+** chunk of size n (its 2nd argument) on each call and must return 0
+** on success, non-0 on error. This function returns 0 on success,
+** SQLITE_NOTFOUND if no db is open, or propagates any other non-0
+** code from the callback. Note that this is not thread-friendly: it
+** expects that it will be the only thread reading the db file and
+** takes no measures to ensure that is the case.
 */
-int fiddle_db_is_opfs(void){
-  sqlite3_vfs * pVfs = 0;
-  if( 0!=shellState.db ){
-    sqlite3_file_control( shellState.db, "main",
-                          SQLITE_FCNTL_VFS_POINTER, &pVfs );
-  }
-  return pVfs ? 0==strcmp("opfs", pVfs->zName) : 0;
-}
-
-#if 0
-/* TODO: test whether this impl works properly wrt xSize() in the
-** unix-none VFS. The JS impl works fine for OPFS but not unix-none
-** because xSize() is returning a garbage size.
-*/
-int fiddle_export_db( int (*callback)(unsigned const char *zOut, int n) ){
+int fiddle_export_db( int (*xCallback)(unsigned const char *zOut, int n) ){
   sqlite3_int64 nSize = 0;
   sqlite3_int64 nPos = 0;
-  sqlite3_vfs * pVfs = 0;
   sqlite3_file * pFile = 0;
-  unsigned char buf[1024 * 4];
-  const int nBuf = (int)sizeof(buf);
+  unsigned char buf[1024 * 8];
+  int nBuf = (int)sizeof(buf);
   int rc = shellState.db
     ? sqlite3_file_control(shellState.db, "main",
-                           SQLITE_FCNTL_VFS_POINTER, &pVfs)
-    : 0;
-  if( rc ) return rc;
-  else if( 0==pVfs ) return SQLITE_NOTFOUND;
-  rc = sqlite3_file_control(shellState.db, "main",
-                            SQLITE_FCNTL_FILE_POINTER, &pFile);
+                           SQLITE_FCNTL_FILE_POINTER, &pFile)
+    : SQLITE_NOTFOUND;
   if( rc ) return rc;
   rc = pFile->pMethods->xFileSize(pFile, &nSize);
-  if(rc) return rc;
+  if( rc ) return rc;
+  if(nSize % nBuf){
+    /* DB size is not an even multiple of the buffer size. Reduce
+    ** buffer size so that we do not unduly inflate the db size when
+    ** exporting. */
+    if(0 == nSize % 4096) nBuf = 4096;
+    else if(0 == nSize % 2048) nBuf = 2048;
+    else if(0 == nSize % 1024) nBuf = 1024;
+    else nBuf = 512;
+  }
   for( ; 0==rc && nPos<nSize; nPos += nBuf ){
     rc = pFile->pMethods->xRead(pFile, buf, nBuf, nPos);
     if(SQLITE_IOERR_SHORT_READ == rc){
       rc = (nPos + nBuf) < nSize ? rc : 0/*assume EOF*/;
     }
-    if(rc) return rc;
-    nPos += nBuf;
-    rc = callback(buf, nBuf);
+    if( 0==rc ) rc = xCallback(buf, nBuf);
   }
   return rc;
 }
-#endif
 
 /*
 ** Trivial exportable function for emscripten. It processes zSql as if

From 7e33f8f43b19296152920abfa78d02ab93793af9 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Mon, 26 Sep 2022 20:51:16 +0000
Subject: [PATCH 170/428] Modify implementation of recovery to break recovery
 of the lost_and_found table into multiple steps.

FossilOrigin-Name: adedfd040bb2d1c2dcda0b91c6073f12953e45d9b860a8f217d990e861d66dfb
---
 ext/recover/sqlite3recover.c | 457 +++++++++++++++++++++++------------
 manifest                     |  12 +-
 manifest.uuid                |   2 +-
 3 files changed, 312 insertions(+), 159 deletions(-)

diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index aac1eea306..e492cdf246 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -157,6 +157,22 @@ struct RecoverStateW1 {
   int iPrevCell;
 };
 
+typedef struct RecoverStateLAF RecoverStateLAF;
+struct RecoverStateLAF {
+  RecoverBitmap *pUsed;
+  i64 nPg;                        /* Size of db in pages */
+  sqlite3_stmt *pAllAndParent;
+  sqlite3_stmt *pMapInsert;
+  sqlite3_stmt *pMaxField;
+  sqlite3_stmt *pUsedPages;
+  sqlite3_stmt *pFindRoot;
+  sqlite3_stmt *pInsert;          /* INSERT INTO lost_and_found ... */
+  sqlite3_stmt *pAllPage;
+  sqlite3_stmt *pPageData;
+  sqlite3_value **apVal;
+  int nMaxField;
+};
+
 /*
 ** Main recover handle structure.
 */
@@ -185,11 +201,13 @@ struct sqlite3_recover {
   /* Variables used with eState==RECOVER_STATE_WRITING */
   RecoverStateW1 w1;
 
+  /* Variables used with states RECOVER_STATE_LOSTANDFOUND* */
+  RecoverStateLAF laf;
+
   /* Fields used within sqlite3_recover_run() */
   sqlite3 *dbOut;                 /* Output database */
   sqlite3_stmt *pGetPage;         /* SELECT against input db sqlite_dbdata */
   RecoverTable *pTblList;         /* List of tables recovered from schema */
-  RecoverBitmap *pUsed;           /* Used by recoverLostAndFound() */
 };
 
 /*
@@ -199,12 +217,28 @@ struct sqlite3_recover {
 **    The object is initially created in this state. sqlite3_recover_step()
 **    has yet to be called. This is the only state in which it is permitted
 **    to call sqlite3_recover_config().
+**
+**   RECOVER_STATE_WRITING:
+**
+**   RECOVER_STATE_LOSTANDFOUND1:
+**    State to populate the bitmap of pages used by other tables or the
+**    database freelist.
+**
+**   RECOVER_STATE_LOSTANDFOUND2:
+**    Populate the recovery.map table - used to figure out a "root" page
+**    for each lost page from in the database from which records are
+**    extracted.
+**
+**   RECOVER_STATE_LOSTANDFOUND3:
+**    Populate the lost-and-found table itself.
 */
-#define RECOVER_STATE_INIT          0
-#define RECOVER_STATE_WRITING       1
-#define RECOVER_STATE_LOSTANDFOUND  2
-#define RECOVER_STATE_SCHEMA2       3
-#define RECOVER_STATE_DONE          4
+#define RECOVER_STATE_INIT           0
+#define RECOVER_STATE_WRITING        1
+#define RECOVER_STATE_LOSTANDFOUND1  2
+#define RECOVER_STATE_LOSTANDFOUND2  3
+#define RECOVER_STATE_LOSTANDFOUND3  4
+#define RECOVER_STATE_SCHEMA2        5
+#define RECOVER_STATE_DONE           6
 
 /* 
 ** Default value for SQLITE_RECOVER_ROWIDS (sqlite3_recover.bRecoverRowid).
@@ -320,7 +354,7 @@ static void recoverBitmapSet(RecoverBitmap *pMap, i64 iPg){
 */
 static int recoverBitmapQuery(RecoverBitmap *pMap, i64 iPg){
   int ret = 1;
-  if( iPg<=pMap->nPg ){
+  if( iPg<=pMap->nPg && iPg>0 ){
     int iElem = (iPg / 32);
     int iBit = (iPg % 32);
     ret = (pMap->aElem[iElem] & (((u32)1) << iBit)) ? 1 : 0;
@@ -548,7 +582,7 @@ static void recoverReadI32(
 ** Implementation of SQL scalar function "page_is_used". This function
 ** is used as part of the procedure for locating orphan rows for the
 ** lost-and-found table, and it depends on those routines having populated
-** the sqlite3_recover.pUsed variable.
+** the sqlite3_recover.laf.pUsed variable.
 **
 ** The only argument to this function is a page-number. It returns true 
 ** if the page has already been used somehow during data recovery, or false
@@ -564,7 +598,7 @@ static void recoverPageIsUsed(
   sqlite3_recover *p = (sqlite3_recover*)sqlite3_user_data(pCtx);
   i64 pgno = sqlite3_value_int64(apArg[0]);
   assert( nArg==1 );
-  sqlite3_result_int(pCtx, recoverBitmapQuery(p->pUsed, pgno));
+  sqlite3_result_int(pCtx, recoverBitmapQuery(p->laf.pUsed, pgno));
 }
 
 /*
@@ -600,13 +634,14 @@ static void recoverGetPage(
       pStmt = p->pGetPage = recoverPreparePrintf(
           p, p->dbIn, "SELECT data FROM sqlite_dbpage(%Q) WHERE pgno=?", p->zDb
       );
-    }else{
+    }else if( p->errCode==SQLITE_OK ){
       pStmt = p->pGetPage;
     }
 
     if( pStmt ){
       sqlite3_bind_int64(pStmt, 1, pgno);
       if( SQLITE_ROW==sqlite3_step(pStmt) ){
+        assert( p->errCode==SQLITE_OK );
         sqlite3_result_value(pCtx, sqlite3_column_value(pStmt, 0));
       }
       recoverReset(p, pStmt);
@@ -1312,49 +1347,59 @@ static sqlite3_stmt *recoverLostAndFoundInsert(
   return pRet;
 }
 
-/*
-** Helper function for recoverLostAndFound().
-*/
-static void recoverLostAndFoundPopulate(
+static int recoverLostAndFoundFindRoot(
   sqlite3_recover *p, 
-  sqlite3_stmt *pInsert,
-  int nField
+  i64 iPg,
+  i64 *piRoot
 ){
-  sqlite3_stmt *pStmt = recoverPrepare(p, p->dbOut,
-      "WITH RECURSIVE pages(root, page) AS ("
-      "  SELECT pgno, pgno FROM recovery.map WHERE parent IS NULL"
-      "    UNION"
-      "  SELECT root, child FROM sqlite_dbptr('getpage()'), pages "
-      "    WHERE pgno=page"
-      ") "
-      "SELECT root, page, cell, field, value "
-      "FROM sqlite_dbdata('getpage()') d, pages p WHERE p.page=d.pgno "
-      "  AND NOT page_is_used(page) "
-      "UNION ALL "
-      "SELECT 0, 0, 0, 0, 0"
-  );
+  RecoverStateLAF *pLaf = &p->laf;
+
+  if( pLaf->pFindRoot==0 ){
+    pLaf->pFindRoot = recoverPrepare(p, p->dbOut,
+        "WITH RECURSIVE p(pgno) AS ("
+        "  SELECT ?"
+        "    UNION"
+        "  SELECT parent FROM recovery.map AS m, p WHERE m.pgno=p.pgno"
+        ") "
+        "SELECT p.pgno FROM p, recovery.map m WHERE m.pgno=p.pgno "
+        "    AND m.parent IS NULL"
+    );
+  }
+  if( p->errCode==SQLITE_OK ){
+    sqlite3_bind_int64(pLaf->pFindRoot, 1, iPg);
+    if( sqlite3_step(pLaf->pFindRoot)==SQLITE_ROW ){
+      *piRoot = sqlite3_column_int64(pLaf->pFindRoot, 0);
+    }else{
+      *piRoot = iPg;
+    }
+    recoverReset(p, pLaf->pFindRoot);
+  }
+  return p->errCode;
+}
+
+static void recoverLostAndFoundOnePage(sqlite3_recover *p, i64 iPage){
+  RecoverStateLAF *pLaf = &p->laf;
+  sqlite3_value **apVal = pLaf->apVal;
+  sqlite3_stmt *pPageData = pLaf->pPageData;
+  sqlite3_stmt *pInsert = pLaf->pInsert;
 
-  sqlite3_value **apVal = 0;
   int nVal = -1;
-  i64 iRowid = 0;
+  int iPrevCell = 0;
+  i64 iRoot = 0;
   int bHaveRowid = 0;
-  int ii;
+  i64 iRowid = 0;
+  int ii = 0;
 
-  i64 iPrevRoot = -1;
-  i64 iPrevPage = -1;
-  int iPrevCell = -1;
+  if( recoverLostAndFoundFindRoot(p, iPage, &iRoot) ) return;
+  sqlite3_bind_int64(pPageData, 1, iPage);
+  while( p->errCode==SQLITE_OK && SQLITE_ROW==sqlite3_step(pPageData) ){
+    int iCell = sqlite3_column_int64(pPageData, 0);
+    int iField = sqlite3_column_int64(pPageData, 1);
 
-  apVal = (sqlite3_value**)recoverMalloc(p, nField*sizeof(sqlite3_value*));
-  while( p->errCode==SQLITE_OK && SQLITE_ROW==sqlite3_step(pStmt) ){
-    i64 iRoot = sqlite3_column_int64(pStmt, 0);
-    i64 iPage = sqlite3_column_int64(pStmt, 1);
-    int iCell = sqlite3_column_int64(pStmt, 2);
-    int iField = sqlite3_column_int64(pStmt, 3);
-
-    if( iPrevRoot>0 && (iPrevPage!=iPage || iPrevCell!=iCell) ){
+    if( iPrevCell!=iCell && nVal>=0 ){
       /* Insert the new row */
-      sqlite3_bind_int64(pInsert, 1, iPrevRoot);  /* rootpgno */
-      sqlite3_bind_int64(pInsert, 2, iPrevPage);  /* pgno */
+      sqlite3_bind_int64(pInsert, 1, iRoot);      /* rootpgno */
+      sqlite3_bind_int64(pInsert, 2, iPage);      /* pgno */
       sqlite3_bind_int(pInsert, 3, nVal);         /* nfield */
       if( bHaveRowid ){
         sqlite3_bind_int64(pInsert, 4, iRowid);   /* id */
@@ -1377,13 +1422,15 @@ static void recoverLostAndFoundPopulate(
       nVal = -1;
     }
 
+    if( iCell<0 ) break;
+
     if( iField<0 ){
       assert( nVal==-1 );
-      iRowid = sqlite3_column_int64(pStmt, 4);
+      iRowid = sqlite3_column_int64(pPageData, 2);
       bHaveRowid = 1;
       nVal = 0;
-    }else if( iField<nField && iRoot!=0 ){
-      sqlite3_value *pVal = sqlite3_column_value(pStmt, 4);
+    }else if( iField<pLaf->nMaxField ){
+      sqlite3_value *pVal = sqlite3_column_value(pPageData, 2);
       apVal[iField] = sqlite3_value_dup(pVal);
       assert( iField==nVal || (nVal==-1 && iField==0) );
       nVal = iField+1;
@@ -1392,122 +1439,65 @@ static void recoverLostAndFoundPopulate(
       }
     }
 
-    iPrevRoot = iRoot;
-    iPrevPage = iPage;
     iPrevCell = iCell;
   }
-  recoverFinalize(p, pStmt);
+  recoverReset(p, pPageData);
 
   for(ii=0; ii<nVal; ii++){
     sqlite3_value_free(apVal[ii]);
     apVal[ii] = 0;
   }
-  sqlite3_free(apVal);
 }
 
-/*
-** This function searches for orphaned rows in the input database. If
-** any are found, it creates the lost-and-found table in the output
-** db and writes all orphaned rows to it. Or, if the recover handle is
-** in SQL callback mode, issues equivalent callbacks.
-*/
-static void recoverLostAndFound(sqlite3_recover *p){
-  i64 nPg = 0;
-  RecoverBitmap *pMap = 0;
-
-  nPg = recoverPageCount(p);
-  pMap = p->pUsed = recoverBitmapAlloc(p, nPg);
-  if( pMap ){
-    char *zTab = 0;               /* Name of lost_and_found table */
-    sqlite3_stmt *pInsert = 0;    /* INSERT INTO lost_and_found ... */
-    int nField = 0;
-
-    /* Add all pages that are part of any tree in the recoverable part of
-    ** the input database schema to the bitmap. And, if !p->bFreelistCorrupt, 
-    ** add all pages that appear to be part of the freelist to the bitmap. 
-    */
-    sqlite3_stmt *pStmt = recoverPrepare(
-        p, p->dbOut,
-        "WITH trunk(pgno) AS ("
-        "  SELECT read_i32(getpage(1), 8) AS x WHERE x>0"
-        "    UNION"
-        "  SELECT read_i32(getpage(trunk.pgno), 0) AS x FROM trunk WHERE x>0"
-        "),"
-        "trunkdata(pgno, data) AS ("
-        "  SELECT pgno, getpage(pgno) FROM trunk"
-        "),"
-        "freelist(data, n, freepgno) AS ("
-        "  SELECT data, min(16384, read_i32(data, 1)-1), pgno FROM trunkdata"
-        "    UNION ALL"
-        "  SELECT data, n-1, read_i32(data, 2+n) FROM freelist WHERE n>=0"
-        "),"
-        ""
-        "roots(r) AS ("
-        "  SELECT 1 UNION ALL"
-        "  SELECT rootpage FROM recovery.schema WHERE rootpage>0"
-        "),"
-        "used(page) AS ("
-        "  SELECT r FROM roots"
-        "    UNION"
-        "  SELECT child FROM sqlite_dbptr('getpage()'), used "
-        "    WHERE pgno=page"
-        ") "
-        "SELECT page FROM used"
-        " UNION ALL "
-        "SELECT freepgno FROM freelist WHERE NOT ?"
-    );
-    if( pStmt ) sqlite3_bind_int(pStmt, 1, p->bFreelistCorrupt);
-    while( pStmt && SQLITE_ROW==sqlite3_step(pStmt) ){
-      i64 iPg = sqlite3_column_int64(pStmt, 0);
-      recoverBitmapSet(pMap, iPg);
+static int recoverLostAndFound3Step(sqlite3_recover *p){
+  RecoverStateLAF *pLaf = &p->laf;
+  if( p->errCode==SQLITE_OK ){
+    if( pLaf->pInsert==0 ){
+      return SQLITE_DONE;
+    }else{
+      if( p->errCode==SQLITE_OK ){
+        int res = sqlite3_step(pLaf->pAllPage);
+        if( res==SQLITE_ROW ){
+          i64 iPage = sqlite3_column_int64(pLaf->pAllPage, 0);
+          if( recoverBitmapQuery(pLaf->pUsed, iPage)==0 ){
+            recoverLostAndFoundOnePage(p, iPage);
+          }
+        }else{
+          recoverReset(p, pLaf->pAllPage);
+          return SQLITE_DONE;
+        }
+      }
     }
-    recoverFinalize(p, pStmt);
+  }
+  return SQLITE_OK;
+}
 
+static void recoverLostAndFound3Init(sqlite3_recover *p){
+  RecoverStateLAF *pLaf = &p->laf;
 
-    /* Add an entry for each page not already added to the bitmap to 
-    ** the recovery.map table. This loop leaves the "parent" column
-    ** of each recovery.map row set to NULL - to be filled in below.  */
-    pStmt = recoverPreparePrintf(
-        p, p->dbOut,
+  if( pLaf->nMaxField>0 ){
+    char *zTab = 0;               /* Name of lost_and_found table */
+
+    zTab = recoverLostAndFoundCreate(p, pLaf->nMaxField);
+    pLaf->pInsert = recoverLostAndFoundInsert(p, zTab, pLaf->nMaxField);
+    sqlite3_free(zTab);
+
+    pLaf->pAllPage = recoverPreparePrintf(p, p->dbOut,
         "WITH RECURSIVE seq(ii) AS ("
         "  SELECT 1 UNION ALL SELECT ii+1 FROM seq WHERE ii<%lld"
         ")"
-        "INSERT INTO recovery.map(pgno) "
-        "    SELECT ii FROM seq WHERE NOT page_is_used(ii)", nPg
+        "SELECT ii FROM seq" , p->laf.nPg
+    );
+    pLaf->pPageData = recoverPrepare(p, p->dbOut,
+        "SELECT cell, field, value "
+        "FROM sqlite_dbdata('getpage()') d WHERE d.pgno=? "
+        "UNION ALL "
+        "SELECT -1, -1, -1"
     );
-    sqlite3_step(pStmt);
-    recoverFinalize(p, pStmt);
 
-    /* Set the "parent" column for each row of the recovery.map table */
-    pStmt = recoverPrepare(
-        p, p->dbOut,
-        "UPDATE recovery.map SET parent = ptr.pgno "
-        "    FROM sqlite_dbptr('getpage()') AS ptr "
-        "    WHERE recovery.map.pgno=ptr.child"
+    pLaf->apVal = (sqlite3_value**)recoverMalloc(p, 
+        pLaf->nMaxField*sizeof(sqlite3_value*)
     );
-    sqlite3_step(pStmt);
-    recoverFinalize(p, pStmt);
-      
-    /* Figure out the number of fields in the longest record that will be
-    ** recovered into the lost_and_found table. Set nField to this value. */
-    pStmt = recoverPrepare(
-        p, p->dbOut,
-        "SELECT max(field)+1 FROM sqlite_dbdata('getpage') WHERE pgno IN ("
-        "  SELECT pgno FROM recovery.map"
-        ")"
-    );
-    if( pStmt && SQLITE_ROW==sqlite3_step(pStmt) ){
-      nField = sqlite3_column_int64(pStmt, 0);
-    }
-    recoverFinalize(p, pStmt);
-
-    if( nField>0 ){
-      zTab = recoverLostAndFoundCreate(p, nField);
-      pInsert = recoverLostAndFoundInsert(p, zTab, nField);
-      recoverLostAndFoundPopulate(p, pInsert, nField);
-      recoverFinalize(p, pInsert);
-      sqlite3_free(zTab);
-    }
   }
 }
 
@@ -1689,11 +1679,152 @@ static int recoverWriteDataStep(sqlite3_recover *p){
   return p->errCode;
 }
 
+static void recoverLostAndFound1Init(sqlite3_recover *p){
+  RecoverStateLAF *pLaf = &p->laf;
+  sqlite3_stmt *pStmt = 0;
+
+  assert( p->laf.pUsed==0 );
+  pLaf->nPg = recoverPageCount(p);
+  pLaf->pUsed = recoverBitmapAlloc(p, pLaf->nPg);
+
+  /* Prepare a statement to iterate through all pages that are part of any tree
+  ** in the recoverable part of the input database schema to the bitmap. And,
+  ** if !p->bFreelistCorrupt, add all pages that appear to be part of the
+  ** freelist.  */
+  pStmt = recoverPrepare(
+      p, p->dbOut,
+      "WITH trunk(pgno) AS ("
+      "  SELECT read_i32(getpage(1), 8) AS x WHERE x>0"
+      "    UNION"
+      "  SELECT read_i32(getpage(trunk.pgno), 0) AS x FROM trunk WHERE x>0"
+      "),"
+      "trunkdata(pgno, data) AS ("
+      "  SELECT pgno, getpage(pgno) FROM trunk"
+      "),"
+      "freelist(data, n, freepgno) AS ("
+      "  SELECT data, min(16384, read_i32(data, 1)-1), pgno FROM trunkdata"
+      "    UNION ALL"
+      "  SELECT data, n-1, read_i32(data, 2+n) FROM freelist WHERE n>=0"
+      "),"
+      ""
+      "roots(r) AS ("
+      "  SELECT 1 UNION ALL"
+      "  SELECT rootpage FROM recovery.schema WHERE rootpage>0"
+      "),"
+      "used(page) AS ("
+      "  SELECT r FROM roots"
+      "    UNION"
+      "  SELECT child FROM sqlite_dbptr('getpage()'), used "
+      "    WHERE pgno=page"
+      ") "
+      "SELECT page FROM used"
+      " UNION ALL "
+      "SELECT freepgno FROM freelist WHERE NOT ?"
+  );
+  if( pStmt ) sqlite3_bind_int(pStmt, 1, p->bFreelistCorrupt);
+  pLaf->pUsedPages = pStmt;
+}
+
+static int recoverLostAndFound1Step(sqlite3_recover *p){
+  RecoverStateLAF *pLaf = &p->laf;
+  int rc = p->errCode;
+  if( rc==SQLITE_OK ){
+    rc = sqlite3_step(pLaf->pUsedPages);
+    if( rc==SQLITE_ROW ){
+      i64 iPg = sqlite3_column_int64(pLaf->pUsedPages, 0);
+      recoverBitmapSet(pLaf->pUsed, iPg);
+      rc = SQLITE_OK;
+    }else{
+      recoverFinalize(p, pLaf->pUsedPages);
+      pLaf->pUsedPages = 0;
+    }
+  }
+  return rc;
+}
+
+static void recoverLostAndFound2Init(sqlite3_recover *p){
+  RecoverStateLAF *pLaf = &p->laf;
+
+  assert( p->laf.pAllAndParent==0 );
+  assert( p->laf.pMapInsert==0 );
+  assert( p->laf.pMaxField==0 );
+  assert( p->laf.nMaxField==0 );
+
+  pLaf->pMapInsert = recoverPrepare(p, p->dbOut,
+      "INSERT OR IGNORE INTO recovery.map(pgno, parent) VALUES(?, ?)"
+  );
+  pLaf->pAllAndParent = recoverPreparePrintf(p, p->dbOut,
+      "WITH RECURSIVE seq(ii) AS ("
+      "  SELECT 1 UNION ALL SELECT ii+1 FROM seq WHERE ii<%lld"
+      ")"
+      "SELECT pgno, child FROM sqlite_dbptr('getpage()') "
+      " UNION ALL "
+      "SELECT NULL, ii FROM seq", p->laf.nPg
+  );
+  pLaf->pMaxField = recoverPreparePrintf(p, p->dbOut,
+      "SELECT max(field)+1 FROM sqlite_dbdata('getpage') WHERE pgno = ?"
+  );
+}
+
+static int recoverLostAndFound2Step(sqlite3_recover *p){
+  RecoverStateLAF *pLaf = &p->laf;
+  if( p->errCode==SQLITE_OK ){
+    int res = sqlite3_step(pLaf->pAllAndParent);
+    if( res==SQLITE_ROW ){
+      i64 iChild = sqlite3_column_int(pLaf->pAllAndParent, 1);
+      if( recoverBitmapQuery(pLaf->pUsed, iChild)==0 ){
+        sqlite3_bind_int64(pLaf->pMapInsert, 1, iChild);
+        sqlite3_bind_value(pLaf->pMapInsert, 2, 
+            sqlite3_column_value(pLaf->pAllAndParent, 0)
+        );
+        sqlite3_step(pLaf->pMapInsert);
+        recoverReset(p, pLaf->pMapInsert);
+        sqlite3_bind_int64(pLaf->pMaxField, 1, iChild);
+        if( SQLITE_ROW==sqlite3_step(pLaf->pMaxField) ){
+          int nMax = sqlite3_column_int(pLaf->pMaxField, 0);
+          if( nMax>pLaf->nMaxField ) pLaf->nMaxField = nMax;
+        }
+        recoverReset(p, pLaf->pMaxField);
+      }
+    }else{
+      recoverFinalize(p, pLaf->pAllAndParent);
+      pLaf->pAllAndParent =0;
+      return SQLITE_DONE;
+    }
+  }
+  return p->errCode;
+}
+
+static void recoverLostAndFoundCleanup(sqlite3_recover *p){
+  recoverBitmapFree(p->laf.pUsed);
+  p->laf.pUsed = 0;
+  sqlite3_finalize(p->laf.pUsedPages);
+  sqlite3_finalize(p->laf.pAllAndParent);
+  sqlite3_finalize(p->laf.pMapInsert);
+  sqlite3_finalize(p->laf.pMaxField);
+  sqlite3_finalize(p->laf.pFindRoot);
+  sqlite3_finalize(p->laf.pInsert);
+  sqlite3_finalize(p->laf.pAllPage);
+  sqlite3_finalize(p->laf.pPageData);
+  p->laf.pUsedPages = 0;
+  p->laf.pAllAndParent = 0;
+  p->laf.pMapInsert = 0;
+  p->laf.pMaxField = 0;
+  p->laf.pFindRoot = 0;
+  p->laf.pInsert = 0;
+  p->laf.pAllPage = 0;
+  p->laf.pPageData = 0;
+  sqlite3_free(p->laf.apVal);
+  p->laf.apVal = 0;
+}
+
 static void recoverFinalCleanup(sqlite3_recover *p){
   RecoverTable *pTab = 0;
   RecoverTable *pNext = 0;
 
   recoverWriteDataCleanup(p);
+  recoverLostAndFoundCleanup(p);
+
   for(pTab=p->pTblList; pTab; pTab=pNext){
     pNext = pTab->pNext;
     sqlite3_free(pTab);
@@ -1701,8 +1832,7 @@ static void recoverFinalCleanup(sqlite3_recover *p){
   p->pTblList = 0;
   sqlite3_finalize(p->pGetPage);
   p->pGetPage = 0;
-  recoverBitmapFree(p->pUsed);
-  p->pUsed = 0;
+
   {
     int res = sqlite3_close(p->dbOut);
     assert( res==SQLITE_OK );
@@ -1742,7 +1872,7 @@ static void recoverStep(sqlite3_recover *p){
       if( SQLITE_DONE==recoverWriteDataStep(p) ){
         recoverWriteDataCleanup(p);
         if( p->zLostAndFound ){
-          p->eState = RECOVER_STATE_LOSTANDFOUND;
+          p->eState = RECOVER_STATE_LOSTANDFOUND1;
         }else{
           p->eState = RECOVER_STATE_SCHEMA2;
         }
@@ -1750,9 +1880,32 @@ static void recoverStep(sqlite3_recover *p){
       break;
     }
 
-    case RECOVER_STATE_LOSTANDFOUND: {
-      recoverLostAndFound(p);
-      p->eState = RECOVER_STATE_SCHEMA2;
+    case RECOVER_STATE_LOSTANDFOUND1: {
+      if( p->laf.pUsed==0 ){
+        recoverLostAndFound1Init(p);
+      }
+      if( SQLITE_DONE==recoverLostAndFound1Step(p) ){
+        p->eState = RECOVER_STATE_LOSTANDFOUND2;
+      }
+      break;
+    }
+    case RECOVER_STATE_LOSTANDFOUND2: {
+      if( p->laf.pAllAndParent==0 ){
+        recoverLostAndFound2Init(p);
+      }
+      if( SQLITE_DONE==recoverLostAndFound2Step(p) ){
+        p->eState = RECOVER_STATE_LOSTANDFOUND3;
+      }
+      break;
+    }
+
+    case RECOVER_STATE_LOSTANDFOUND3: {
+      if( p->laf.pInsert==0 ){
+        recoverLostAndFound3Init(p);
+      }
+      if( SQLITE_DONE==recoverLostAndFound3Step(p) ){
+        p->eState = RECOVER_STATE_SCHEMA2;
+      }
       break;
     }
 
diff --git a/manifest b/manifest
index f6cebeee1e..66d4798e47 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\sSQLITE_RECOVER_SLOWINDEXES\soption,\sfor\sspecifying\sthat\sindexes\sshould\sbe\screated\sand\spopulated\salong\swith\stables,\sinstead\sof\sseparately\sat\sthe\send\sof\sthe\srecovery\soperation.
-D 2022-09-24T19:54:49.642
+C Modify\simplementation\sof\srecovery\sto\sbreak\srecovery\sof\sthe\slost_and_found\stable\sinto\smultiple\ssteps.
+D 2022-09-26T20:51:16.327
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -398,7 +398,7 @@ F ext/recover/recoverold.test 46e9d99b595fac583d4c67f74d7d89c20a435c752ef6eeb3e9
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
 F ext/recover/recoverslowidx.test 7e3889e50758c614b9b3e75187eeeea425c0ca8a2387441fc19ae749a96a7949
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
-F ext/recover/sqlite3recover.c 7cd26aeb413b5b1cec1ae6213488dcec3e4e822911d3f255272b32cf0f32c406
+F ext/recover/sqlite3recover.c 5aad3f4e569e8637abdadfeb748ec1b99198d6d45bf983c6b168a527f5891b7f
 F ext/recover/sqlite3recover.h f698ccc94bd4da38761035415ad08c4549a408491ff9fd5f52d34d2214f64e36
 F ext/recover/test_recover.c 61ec931e47abca6b2210f46239cafd9f3060741605e3d3c45a7c7a53f63dd957
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -2014,8 +2014,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 47f416153035d6bf0ae27587583d2957c87c02caecbd4e7f363bcb2bc27cf159
-R 9e568d3e4f6455e4cabb845dec54247e
+P ad9dba9d1eae786575c7f31e34b342b6f5b26e719bbe27b61609cad8cfd0a505
+R d7188e5461609c695208ab621d6c4574
 U dan
-Z a8bd0fc6063574ee27e4134a0a1e02e3
+Z d49040b82cb2efa369225859bd08a957
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 8f9e8a36bd..d70afc5526 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ad9dba9d1eae786575c7f31e34b342b6f5b26e719bbe27b61609cad8cfd0a505
\ No newline at end of file
+adedfd040bb2d1c2dcda0b91c6073f12953e45d9b860a8f217d990e861d66dfb
\ No newline at end of file

From 3d64548491f6e95854b843f978a4ada16eff614c Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 27 Sep 2022 09:17:37 +0000
Subject: [PATCH 171/428] wasm/js: rename /persistent to /opfs to account for
 potential future persistent storage options. Minor flag-handling cleanups in
 the speedtest1 pages. Minor API tweaks in oo1.

FossilOrigin-Name: 4dc972a3656b2a9ec915bfb3f653136560c753ce4024c3f0d0d0c28f66db7a0a
---
 ext/wasm/api/sqlite3-api-oo1.js      |  24 +--
 ext/wasm/api/sqlite3-api-opfs.js     |   7 +-
 ext/wasm/api/sqlite3-api-prologue.js |  13 +-
 ext/wasm/api/sqlite3-wasm.c          |   5 +-
 ext/wasm/common/SqliteTestUtil.js    |   2 +-
 ext/wasm/demo-123.js                 |   9 +-
 ext/wasm/fiddle/fiddle-worker.js     |   2 +-
 ext/wasm/index.html                  |  14 +-
 ext/wasm/speedtest1-wasmfs.html      | 168 ++++++++++----------
 ext/wasm/speedtest1-worker.html      | 222 +++++++++++++-------------
 ext/wasm/speedtest1-worker.js        |   2 +-
 ext/wasm/speedtest1.html             | 227 ++++++++++++++-------------
 manifest                             |  34 ++--
 manifest.uuid                        |   2 +-
 14 files changed, 372 insertions(+), 359 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index e0f812baa7..4f7ffe1cd8 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -495,24 +495,25 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
       }
     },
     /**
-       Similar to this.filename but will return a falsy value for
-       special names like ":memory:". Throws if the DB has been
-       closed. If passed an argument it then it will return the
+       Similar to the this.filename property but will return a falsy
+       value for special names like ":memory:". Throws if the DB has
+       been closed. If passed an argument it then it will return the
        filename of the ATTACHEd db with that name, else it assumes a
-       name of `main`.
+       name of `main`. The argument may be either a JS string or
+       a pointer to a WASM-allocated C-string.
     */
     getFilename: function(dbName='main'){
       return capi.sqlite3_db_filename(affirmDbOpen(this).pointer, dbName);
     },
     /**
        Returns true if this db instance has a name which resolves to a
-       file. If the name is "" or ":memory:", it resolves to false.
+       file. If the name is "" or starts with ":", it resolves to false.
        Note that it is not aware of the peculiarities of URI-style
        names and a URI-style name for a ":memory:" db will fool it.
        Returns false if this db is closed.
     */
     hasFilename: function(){
-      return this.filename && ':memory'!==this.filename;
+      return this.filename && ':'!==this.filename[0];
     },
     /**
        Returns the name of the given 0-based db number, as documented
@@ -525,9 +526,13 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        Compiles the given SQL and returns a prepared Stmt. This is
        the only way to create new Stmt objects. Throws on error.
 
-       The given SQL must be a string, a Uint8Array holding SQL, or a
-       WASM pointer to memory holding the NUL-terminated SQL string.
-       If the SQL contains no statements, an SQLite3Error is thrown.
+       The given SQL must be a string, a Uint8Array holding SQL, a
+       WASM pointer to memory holding the NUL-terminated SQL string,
+       or an array of strings. In the latter case, the array is
+       concatenated together, with no separators, to form the SQL
+       string (arrays are often a convenient way to formulate long
+       statements).  If the SQL contains no statements, an
+       SQLite3Error is thrown.
 
        Design note: the C API permits empty SQL, reporting it as a 0
        result code and a NULL stmt pointer. Supporting that case here
@@ -541,6 +546,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     */
     prepare: function(sql){
       affirmDbOpen(this);
+      if(Array.isArray(sql)) sql = sql.join('');
       const stack = capi.wasm.scopedAllocPush();
       let ppStmt, pStmt;
       try{
diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index e28e47ab6c..a346443f56 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -883,12 +883,15 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
        hook in to any C-side calls to sqlite3_initialize(), so we
        cannot add an after-initialize callback mechanism.
     */
-    opfsUtil.reregisterVfs = (asDefault=false)=>{
+    opfsUtil.registerVfs = (asDefault=false)=>{
       return capi.wasm.exports.sqlite3_vfs_register(
         opfsVfs.pointer, asDefault ? 1 : 0
       );
     };
-    
+
+    //TODO to support fiddle db upload:
+    //opfsUtil.createFile = function(absName, content=undefined){...}
+
     if(sqlite3.oo1){
       opfsUtil.OpfsDb = function(...args){
         const opt = sqlite3.oo1.dbCtorHelper.normalizeArgs(...args);
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index b5cd292fc5..b2d8809377 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -120,7 +120,7 @@
      the `free(3)`-compatible routine for the WASM
      environment. Defaults to `"free"`.
 
-   - `persistentDirName`[^1]: if the environment supports persistent storage, this
+   - `wasmfsOpfsDir`[^1]: if the environment supports persistent storage, this
      directory names the "mount point" for that directory. It must be prefixed
      by `/` and may currently contain only a single directory-name part. Using
      the root directory name is not supported by any current persistent backend.
@@ -157,7 +157,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
       })(),
       allocExportName: 'malloc',
       deallocExportName: 'free',
-      persistentDirName: '/persistent'
+      wasmfsOpfsDir: '/opfs'
     };
     Object.keys(configDefaults).forEach(function(k){
       config[k] = Object.getOwnPropertyDescriptor(apiConfig, k)
@@ -174,7 +174,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
   [
     // If any of these config options are functions, replace them with
     // the result of calling that function...
-    'Module', 'exports', 'memory', 'persistentDirName'
+    'Module', 'exports', 'memory', 'wasmfsOpfsDir'
   ].forEach((k)=>{
     if('function' === typeof config[k]){
       config[k] = config[k]();
@@ -185,8 +185,8 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
       all args with a space between each. */
   const toss = (...args)=>{throw new Error(args.join(' '))};
 
-  if(config.persistentDirName && !/^\/[^/]+$/.test(config.persistentDirName)){
-    toss("config.persistentDirName must be falsy or in the form '/dir-name'.");
+  if(config.wasmfsOpfsDir && !/^\/[^/]+$/.test(config.wasmfsOpfsDir)){
+    toss("config.wasmfsOpfsDir must be falsy or in the form '/dir-name'.");
   }
 
   /**
@@ -727,7 +727,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
   capi.sqlite3_web_persistent_dir = function(){
     if(undefined !== __persistentDir) return __persistentDir;
     // If we have no OPFS, there is no persistent dir
-    const pdir = config.persistentDirName;
+    const pdir = config.wasmfsOpfsDir;
     if(!pdir
        || !self.FileSystemHandle
        || !self.FileSystemDirectoryHandle
@@ -748,7 +748,6 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
         const pVfs = sqlite3.capi.sqlite3_vfs_find("unix-none");
         if(pVfs){
           capi.sqlite3_vfs_register(pVfs,1);
-          console.warn("Installed 'unix-none' as the default sqlite3 VFS.");
         }
         return __persistentDir = pdir;
       }else{
diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index cf9a1a3db6..8750d9b207 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -571,7 +571,7 @@ int sqlite3_wasm_vfs_unlink(const char * zName){
 WASM_KEEP
 int sqlite3_wasm_init_wasmfs(const char *zMountPoint){
   static backend_t pOpfs = 0;
-  if( !zMountPoint || !*zMountPoint ) zMountPoint = "/persistent";
+  if( !zMountPoint || !*zMountPoint ) zMountPoint = "/opfs";
   if( !pOpfs ){
     pOpfs = wasmfs_create_opfs_backend();
     if( pOpfs ){
@@ -595,7 +595,8 @@ int sqlite3_wasm_init_wasmfs(const char *zMountPoint){
 }
 #else
 WASM_KEEP
-int sqlite3_wasm_init_wasmfs(void){
+int sqlite3_wasm_init_wasmfs(const char *zUnused){
+  if(zUnused){/*unused*/}
   return SQLITE_NOTFOUND;
 }
 #endif /* __EMSCRIPTEN__ && SQLITE_WASM_WASMFS */
diff --git a/ext/wasm/common/SqliteTestUtil.js b/ext/wasm/common/SqliteTestUtil.js
index 779f271fb4..277ab55294 100644
--- a/ext/wasm/common/SqliteTestUtil.js
+++ b/ext/wasm/common/SqliteTestUtil.js
@@ -221,7 +221,7 @@
        sqlite3 API.
     */
     sqlite3ApiConfig: {
-      persistentDirName: "/persistent"
+      wasmfsOpfsDir: "/opfs"
     },
     /**
        Intended to be called by apps which need to call the
diff --git a/ext/wasm/demo-123.js b/ext/wasm/demo-123.js
index c7dc4c769c..5ba1f1df77 100644
--- a/ext/wasm/demo-123.js
+++ b/ext/wasm/demo-123.js
@@ -44,7 +44,7 @@
           oo = sqlite3.oo1/*high-level OO API*/;
     log("sqlite3 version",capi.sqlite3_libversion(), capi.sqlite3_sourceid());
     const db = new oo.DB("/mydb.sqlite3");
-    log("transient b =",db.filename);
+    log("transient db =",db.filename);
     /**
        Never(!) rely on garbage collection to clean up DBs and
        (especially) prepared statements. Always wrap their lifetimes
@@ -82,7 +82,12 @@
       }    
 
       log("Insert using a prepared statement...");
-      let q = db.prepare("insert into t(a,b) values(?,?)");
+      let q = db.prepare([
+        // SQL may be a string or array of strings
+        // (concatenated w/o separators).
+        "insert into t(a,b) ",
+        "values(?,?)"
+      ]);
       try {
         for( i = 100; i < 103; ++i ){
           q.bind( [i, i*2] ).step();
diff --git a/ext/wasm/fiddle/fiddle-worker.js b/ext/wasm/fiddle/fiddle-worker.js
index dd82914655..b0c0526f8c 100644
--- a/ext/wasm/fiddle/fiddle-worker.js
+++ b/ext/wasm/fiddle/fiddle-worker.js
@@ -170,7 +170,7 @@
         stdout("\nOPFS is available. To open a persistent db, use:\n\n",
                "  .open file:name?vfs=opfs\n\nbut note that some",
                "features (e.g. upload) do not yet work with OPFS.");
-        S.opfs.reregisterVfs();
+        S.opfs.registerVfs();
       }
       stdout('\nEnter ".help" for usage hints.');
       this.exec([ // initialization commands...
diff --git a/ext/wasm/index.html b/ext/wasm/index.html
index ee31306bb7..20668db20e 100644
--- a/ext/wasm/index.html
+++ b/ext/wasm/index.html
@@ -14,7 +14,7 @@
       builds. All of them require that this directory have been
       "make"d first. The intent is that <em>this</em> page be run
       using:</div>
-    <blockquote><pre>althttpd -page index.html</pre></blockquote>
+    <blockquote><pre>althttpd -enable-sab -page index.html</pre></blockquote>
     <div>and the individual tests be started in their own tab.
       Warnings and Caveats:
       <ul class='warning'>
@@ -23,9 +23,8 @@
           <a href='https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cross-Origin-Opener-Policy'>COOP</a>
           and
           <a href='https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cross-Origin-Embedder-Policy'>COEP</a>
-          headers. The default build
-          of <a href='https://sqlite.org/althttpd'>althttpd</a>
-          <em>does not</em>.
+          headers. <a href='https://sqlite.org/althttpd'>althttpd</a> requires the
+          <code>-enable-sab</code> flag for that.
         </li>
         <li>Any OPFS-related pages require very recent version of
           Chrome or Chromium (v102 at least, possibly newer). OPFS
@@ -37,9 +36,6 @@
           page may depend on build-time options which are <em>off by
           default</em> because they currently (as of 2022-09-08) break
           with Worker-based pages.
-          <!-- Similarly, WASMFS does not work on some platforms,
-               e.g. Raspberry Pi 4 (for which there is no Chrome
-               build, so it's currently a moot point). -->
         </li>
       </ul>
     </div>
@@ -63,9 +59,9 @@
         <li>speedtest1 ports (sqlite3's primary benchmarking tool)...
           <ul>
             <li><a href='speedtest1.html'>speedtest1</a>: a main-thread WASM build of speedtest1.</li>
-            <li><a href='speedtest1-wasmfs.html'>speedtest1-wasmfs</a>: a variant of speedtest1 built solely for the wasmfs/opfs feature.</li>
+            <li><a href='speedtest1-wasmfs.html?flags=--size,25'>speedtest1-wasmfs</a>: a variant of speedtest1 built solely for the wasmfs/opfs feature.</li>
             <li><a href='speedtest1.html?vfs=kvvfs'>speedtest1-kvvfs</a>: speedtest1 with the kvvfs.</li>
-            <li><a href='speedtest1-worker.html'>speedtest1-worker</a>: an interactive Worker-thread variant of speedtest1.</li>
+            <li><a href='speedtest1-worker.html?size=25'>speedtest1-worker</a>: an interactive Worker-thread variant of speedtest1.</li>
             <li><a href='speedtest1-worker.html?vfs=opfs&size=25'>speedtest1-worker-opfs</a>: speedtest1-worker with the
               OPFS VFS preselected and configured for a moderate workload.</li>
           </ul>
diff --git a/ext/wasm/speedtest1-wasmfs.html b/ext/wasm/speedtest1-wasmfs.html
index 37155282cd..6952fc1eed 100644
--- a/ext/wasm/speedtest1-wasmfs.html
+++ b/ext/wasm/speedtest1-wasmfs.html
@@ -39,115 +39,113 @@
     <script src="common/SqliteTestUtil.js"></script>
     <script src="speedtest1-wasmfs.js"></script>
     <script>(function(){
-        /**
-           If this environment contains OPFS, this function initializes it and
-           returns the name of the dir on which OPFS is mounted, else it returns
-           an empty string.
-        */
-        const wasmfsDir = function f(wasmUtil){
-          if(undefined !== f._) return f._;
-          const pdir = '/persistent';
-          if( !self.FileSystemHandle
-              || !self.FileSystemDirectoryHandle
-              || !self.FileSystemFileHandle){
+    /**
+       If this environment contains OPFS, this function initializes it and
+       returns the name of the dir on which OPFS is mounted, else it returns
+       an empty string.
+    */
+    const wasmfsDir = function f(wasmUtil,dirName="/opfs"){
+        if(undefined !== f._) return f._;
+        if( !self.FileSystemHandle
+            || !self.FileSystemDirectoryHandle
+            || !self.FileSystemFileHandle){
             return f._ = "";
-          }
-          try{
+        }
+        try{
             if(0===wasmUtil.xCallWrapped(
-              'sqlite3_wasm_init_wasmfs', 'i32', ['string'], pdir
+                'sqlite3_wasm_init_wasmfs', 'i32', ['string'], dirName
             )){
-              return f._ = pdir;
+                return f._ = dirName;
             }else{
-              return f._ = "";
+                return f._ = "";
             }
-          }catch(e){
+        }catch(e){
             // sqlite3_wasm_init_wasmfs() is not available
             return f._ = "";
-          }
-        };
-        wasmfsDir._ = undefined;
+        }
+    };
+    wasmfsDir._ = undefined;
 
-        const eOut = document.querySelector('#test-output');
-        const log2 = function(cssClass,...args){
-          const ln = document.createElement('div');
-          if(cssClass) ln.classList.add(cssClass);
-          ln.append(document.createTextNode(args.join(' ')));
-          eOut.append(ln);
-          //this.e.output.lastElementChild.scrollIntoViewIfNeeded();
-        };
-        const logList = [];
-        const dumpLogList = function(){
-          logList.forEach((v)=>log2('',v));
-          logList.length = 0;
-        };
-        /* can't update DOM while speedtest is running unless we run
-           speedtest in a worker thread. */;
-        const log = (...args)=>{
-          console.log(...args);
-          logList.push(args.join(' '));
-        };
-        const logErr = function(...args){
-          console.error(...args);
-          logList.push('ERROR: '+args.join(' '));
-        };
+    const eOut = document.querySelector('#test-output');
+    const log2 = function(cssClass,...args){
+        const ln = document.createElement('div');
+        if(cssClass) ln.classList.add(cssClass);
+        ln.append(document.createTextNode(args.join(' ')));
+        eOut.append(ln);
+        //this.e.output.lastElementChild.scrollIntoViewIfNeeded();
+    };
+    const logList = [];
+    const dumpLogList = function(){
+        logList.forEach((v)=>log2('',v));
+        logList.length = 0;
+    };
+    /* can't update DOM while speedtest is running unless we run
+       speedtest in a worker thread. */;
+    const log = (...args)=>{
+        console.log(...args);
+        logList.push(args.join(' '));
+    };
+    const logErr = function(...args){
+        console.error(...args);
+        logList.push('ERROR: '+args.join(' '));
+    };
 
-        const runTests = function(sqlite3){
-          console.log("Module inited.");
-          const wasm = sqlite3.capi.wasm;
-          const unlink = wasm.xWrap("sqlite3_wasm_vfs_unlink", "int", ["string"]);
-          const pDir = wasmfsDir(wasm);
-          if(pDir) log2('',"Persistent storage:",pDir);
-          else{
+    const runTests = function(sqlite3){
+        console.log("Module inited.");
+        const wasm = sqlite3.capi.wasm;
+        const unlink = wasm.xWrap("sqlite3_wasm_vfs_unlink", "int", ["string"]);
+        const pDir = wasmfsDir(wasm);
+        if(pDir) log2('',"Persistent storage:",pDir);
+        else{
             log2('error',"Expecting persistent storage in this build.");
             return;
-          }
-          const scope = wasm.scopedAllocPush();
-          const dbFile = pDir+"/speedtest1.db";
-          const urlParams = self.SqliteTestUtil.processUrlArgs();
-          const argv = ["speedtest1"];
-          if(urlParams.flags){
-            argv.push(...(urlParams.flags.split(',')));
+        }
+        const scope = wasm.scopedAllocPush();
+        const dbFile = pDir+"/speedtest1.db";
+        const urlParams = new URL(self.location.href).searchParams;
+        const argv = ["speedtest1"];
+        if(urlParams.has('flags')){
+            argv.push(...(urlParams.get('flags').split(',')));
             let i = argv.indexOf('--vfs');
             if(i>=0) argv.splice(i,2);
-          }else{
+        }else{
             argv.push(
-              "--singlethread",
-              "--nomutex",
-              "--nosync",
-              "--nomemstat"
+                "--singlethread",
+                "--nomutex",
+                "--nosync",
+                "--nomemstat"
             );
             //"--memdb", // note that memdb trumps the filename arg
-          }
+        }
 
-          if(argv.indexOf('--memdb')>=0){
+        if(argv.indexOf('--memdb')>=0){
             log2('error',"WARNING: --memdb flag trumps db filename.");
-          }
-          argv.push("--big-transactions"/*important for tests 410 and 510!*/,
-                    dbFile);
-          console.log("argv =",argv);
-          // These log messages are not emitted to the UI until after main() returns. Fixing that
-          // requires moving the main() call and related cleanup into a timeout handler.
-          if(pDir) unlink(dbFile);
-          log2('',"Starting native app:\n ",argv.join(' '));
-          log2('',"This will take a while and the browser might warn about the runaway JS.",
-               "Give it time...");
-          logList.length = 0;
-          setTimeout(function(){
+        }
+        argv.push("--big-transactions"/*important for tests 410 and 510!*/,
+                  dbFile);
+        console.log("argv =",argv);
+        // These log messages are not emitted to the UI until after main() returns. Fixing that
+        // requires moving the main() call and related cleanup into a timeout handler.
+        if(pDir) unlink(dbFile);
+        log2('',"Starting native app:\n ",argv.join(' '));
+        log2('',"This will take a while and the browser might warn about the runaway JS.",
+             "Give it time...");
+        logList.length = 0;
+        setTimeout(function(){
             wasm.xCall('wasm_main', argv.length,
                        wasm.scopedAllocMainArgv(argv));
             wasm.scopedAllocPop(scope);
             if(pDir) unlink(dbFile);
             logList.unshift("Done running native main(). Output:");
             dumpLogList();
-          }, 25);
-        }/*runTests()*/;
+        }, 25);
+    }/*runTests()*/;
 
-        self.sqlite3TestModule.print = log;
-        self.sqlite3TestModule.printErr = logErr;
-        sqlite3Speedtest1InitModule(self.sqlite3TestModule).then(function(M){
-            runTests(M.sqlite3);
-        });
-      })();
-    </script>
+    self.sqlite3TestModule.print = log;
+    self.sqlite3TestModule.printErr = logErr;
+    sqlite3Speedtest1InitModule(self.sqlite3TestModule).then(function(M){
+        runTests(M.sqlite3);
+    });
+})();</script>
   </body>
 </html>
diff --git a/ext/wasm/speedtest1-worker.html b/ext/wasm/speedtest1-worker.html
index b1bc3aace5..b5e1089b68 100644
--- a/ext/wasm/speedtest1-worker.html
+++ b/ext/wasm/speedtest1-worker.html
@@ -127,75 +127,75 @@
       }
     </style>
     <script>(function(){
-      'use strict';
-      const E = (sel)=>document.querySelector(sel);
-      const eOut = E('#test-output');
-      const log2 = function(cssClass,...args){
+    'use strict';
+    const E = (sel)=>document.querySelector(sel);
+    const eOut = E('#test-output');
+    const log2 = function(cssClass,...args){
         let ln;
         if(1 || cssClass){
-          ln = document.createElement('div');
-          if(cssClass) ln.classList.add(cssClass);
-          ln.append(document.createTextNode(args.join(' ')));
+            ln = document.createElement('div');
+            if(cssClass) ln.classList.add(cssClass);
+            ln.append(document.createTextNode(args.join(' ')));
         }else{
-          // This doesn't work with the "reverse order" option!
-          ln = document.createTextNode(args.join(' ')+'\n');
+            // This doesn't work with the "reverse order" option!
+            ln = document.createTextNode(args.join(' ')+'\n');
         }
         eOut.append(ln);
-      };
-      const log = (...args)=>{
+    };
+    const log = (...args)=>{
         //console.log(...args);
         log2('', ...args);
-      };
-      const logErr = function(...args){
+    };
+    const logErr = function(...args){
         console.error(...args);
         log2('error', ...args);
-      };
-      const logWarn = function(...args){
+    };
+    const logWarn = function(...args){
         console.warn(...args);
         log2('warning', ...args);
-      };
+    };
 
-      const spacePad = function(str,len=21){
+    const spacePad = function(str,len=21){
         if(str.length===len) return str;
         else if(str.length>len) return str.substr(0,len);
         const a = []; a.length = len - str.length;
         return str+a.join(' ');
-      };
-      // OPTION elements seem to ignore white-space:pre, so do this the hard way...
-      const nbspPad = function(str,len=21){
+    };
+    // OPTION elements seem to ignore white-space:pre, so do this the hard way...
+    const nbspPad = function(str,len=21){
         if(str.length===len) return str;
         else if(str.length>len) return str.substr(0,len);
         const a = []; a.length = len - str.length;
         return str+a.join('&nbsp;');
-      };
+    };
 
-      const W = new Worker("speedtest1-worker.js"+self.location.search);
-      const mPost = function(msgType,payload){
+    const W = new Worker("speedtest1-worker.js"+self.location.search);
+    const mPost = function(msgType,payload){
         W.postMessage({type: msgType, data: payload});
-      };
+    };
 
-      const eFlags = E('#select-flags');
-      const eSelectedFlags = E('#toolbar-selected-flags');
-      const eLinkMainThread = E('#link-main-thread');
-      const eLinkWasmfs = E('#link-wasmfs');
-      const eLinkKvvfs = E('#link-kvvfs');
-      const urlParams = new URL(self.location.href).searchParams;
-      const getSelectedFlags = ()=>{
-          const f = Array.prototype.map.call(eFlags.selectedOptions, (v)=>v.value);
-          [
-              'size', 'vfs'
-          ].forEach(function(k){
-              if(urlParams.has(k)) f.push('--'+k, urlParams.get(k));
-          });
-          return f;
-      };
-      const updateSelectedFlags = function(){
+    const eFlags = E('#select-flags');
+    const eSelectedFlags = E('#toolbar-selected-flags');
+    const eLinkMainThread = E('#link-main-thread');
+    const eLinkWasmfs = E('#link-wasmfs');
+    const eLinkKvvfs = E('#link-kvvfs');
+    const urlParams = new URL(self.location.href).searchParams;
+    const getSelectedFlags = ()=>{
+        const f = Array.prototype.map.call(eFlags.selectedOptions, (v)=>v.value);
+        [
+            'size', 'vfs'
+        ].forEach(function(k){
+            if(urlParams.has(k)) f.push('--'+k, urlParams.get(k));
+        });
+        return f;
+    };
+    const updateSelectedFlags = function(){
         eSelectedFlags.innerText = '';
         const flags = getSelectedFlags();
         flags.forEach(function(f){
-          const e = document.createElement('span');
-          e.innerText = f;
-          eSelectedFlags.appendChild(e);
+            const e = document.createElement('span');
+            e.innerText = f;
+            eSelectedFlags.appendChild(e);
         });
         const rxStripDash = /^(-+)?/;
         const comma = flags.join(',');
@@ -205,9 +205,9 @@
         eLinkWasmfs.href = 'speedtest1-wasmfs.html?flags='+comma;
         eLinkKvvfs.setAttribute('target', 'speedtest1-kvvfs-'+comma);
         eLinkKvvfs.href = 'speedtest1-kvvfs.html?flags='+comma;
-      };
-      eFlags.addEventListener('change', updateSelectedFlags );
-      {
+    };
+    eFlags.addEventListener('change', updateSelectedFlags );
+    {
         const flags = Object.create(null);
         /* TODO? Flags which require values need custom UI
            controls and some of them make little sense here
@@ -259,111 +259,111 @@
         flags["--verify"] = "Run additional verification steps.";
         flags["--without"] = "rowid     Use WITHOUT ROWID where appropriate";
         const preselectedFlags = [
-          '--big-transactions',
-          '--singlethread'
+            '--big-transactions',
+            '--singlethread'
         ];
         if(urlParams.has('flags')){
-          preselectedFlags.push(...urlParams.get('flags').split(','));
+            preselectedFlags.push(...urlParams.get('flags').split(','));
         }
-          if('opfs'!==urlParams.get('vfs')){
-          preselectedFlags.push('--memdb');
+        if('opfs'!==urlParams.get('vfs')){
+            preselectedFlags.push('--memdb');
         }
         Object.keys(flags).sort().forEach(function(f){
-          const opt = document.createElement('option');
-          eFlags.appendChild(opt);
-          const lbl = nbspPad(f)+flags[f];
-          //opt.innerText = lbl;
-          opt.innerHTML = lbl;
-          opt.value = f;
-          if(preselectedFlags.indexOf(f) >= 0) opt.selected = true;
+            const opt = document.createElement('option');
+            eFlags.appendChild(opt);
+            const lbl = nbspPad(f)+flags[f];
+            //opt.innerText = lbl;
+            opt.innerHTML = lbl;
+            opt.value = f;
+            if(preselectedFlags.indexOf(f) >= 0) opt.selected = true;
         });    
         const cbReverseLog = E('#cb-reverse-log-order');
         const lblReverseLog = E('#lbl-reverse-log-order');
         if(cbReverseLog.checked){
-          lblReverseLog.classList.add('warning');
-          eOut.classList.add('reverse');
+            lblReverseLog.classList.add('warning');
+            eOut.classList.add('reverse');
         }
         cbReverseLog.addEventListener('change', function(){
-          if(this.checked){
-            eOut.classList.add('reverse');
-            lblReverseLog.classList.add('warning');
-          }else{
-            eOut.classList.remove('reverse');
-            lblReverseLog.classList.remove('warning');
-          }
+            if(this.checked){
+                eOut.classList.add('reverse');
+                lblReverseLog.classList.add('warning');
+            }else{
+                eOut.classList.remove('reverse');
+                lblReverseLog.classList.remove('warning');
+            }
         }, false);
         updateSelectedFlags();
-      }
-      E('#btn-output-clear').addEventListener('click', ()=>{
+    }
+    E('#btn-output-clear').addEventListener('click', ()=>{
         eOut.innerText = '';
-      });
-      E('#btn-reset-flags').addEventListener('click',()=>{
+    });
+    E('#btn-reset-flags').addEventListener('click',()=>{
         eFlags.value = '';
         updateSelectedFlags();
-      });
-      E('#btn-run').addEventListener('click',function(){
+    });
+    E('#btn-run').addEventListener('click',function(){
         log("Running speedtest1. UI controls will be disabled until it completes.");
         mPost('run', getSelectedFlags());
-      });
+    });
 
-      const eControls = E('#ui-controls');
-      /** Update Emscripten-related UI elements while loading the module. */
-      const updateLoadStatus = function f(text){
+    const eControls = E('#ui-controls');
+    /** Update Emscripten-related UI elements while loading the module. */
+    const updateLoadStatus = function f(text){
         if(!f.last){
-          f.last = { text: '', step: 0 };
-          const E = (cssSelector)=>document.querySelector(cssSelector);
-          f.ui = {
-            status: E('#module-status'),
-            progress: E('#module-progress'),
-            spinner: E('#module-spinner')
-          };
+            f.last = { text: '', step: 0 };
+            const E = (cssSelector)=>document.querySelector(cssSelector);
+            f.ui = {
+                status: E('#module-status'),
+                progress: E('#module-progress'),
+                spinner: E('#module-spinner')
+            };
         }
         if(text === f.last.text) return;
         f.last.text = text;
         if(f.ui.progress){
-          f.ui.progress.value = f.last.step;
-          f.ui.progress.max = f.last.step + 1;
+            f.ui.progress.value = f.last.step;
+            f.ui.progress.max = f.last.step + 1;
         }
         ++f.last.step;
         if(text) {
-          f.ui.status.classList.remove('hidden');
-          f.ui.status.innerText = text;
+            f.ui.status.classList.remove('hidden');
+            f.ui.status.innerText = text;
         }else{
-          if(f.ui.progress){
-            f.ui.progress.remove();
-            f.ui.spinner.remove();
-            delete f.ui.progress;
-            delete f.ui.spinner;
-          }
-          f.ui.status.classList.add('hidden');
+            if(f.ui.progress){
+                f.ui.progress.remove();
+                f.ui.spinner.remove();
+                delete f.ui.progress;
+                delete f.ui.spinner;
+            }
+            f.ui.status.classList.add('hidden');
         }
-      };
+    };
 
-      W.onmessage = function(msg){
+    W.onmessage = function(msg){
         msg = msg.data;
         switch(msg.type){
             case 'ready':
-              log("Worker is ready.");
-              eControls.classList.remove('hidden');
-              break;
+                log("Worker is ready.");
+                eControls.classList.remove('hidden');
+                break;
             case 'stdout': log(msg.data); break;
             case 'stdout': logErr(msg.data); break;
             case 'run-start':
-              eControls.disabled = true;
-              log("Running speedtest1 with argv =",msg.data.join(' '));
-              break;
+                eControls.disabled = true;
+                log("Running speedtest1 with argv =",msg.data.join(' '));
+                break;
             case 'run-end':
-              log("speedtest1 finished.");
-              eControls.disabled = false;
-              // app output is in msg.data
-              break;
+                log("speedtest1 finished.");
+                eControls.disabled = false;
+                // app output is in msg.data
+                break;
             case 'error': logErr(msg.data); break;
             case 'load-status': updateLoadStatus(msg.data); break;
             default:
-              logErr("Unhandled worker message type:",msg);
-              break;
+                logErr("Unhandled worker message type:",msg);
+                break;
         }
-      };
-    })();</script>
+    };
+})();</script>
   </body>
 </html>
diff --git a/ext/wasm/speedtest1-worker.js b/ext/wasm/speedtest1-worker.js
index b697d6925d..78e2db57fb 100644
--- a/ext/wasm/speedtest1-worker.js
+++ b/ext/wasm/speedtest1-worker.js
@@ -8,7 +8,7 @@
   */
   const wasmfsDir = function f(wasmUtil){
     if(undefined !== f._) return f._;
-    const pdir = '/persistent';
+    const pdir = '/opfs';
     if( !self.FileSystemHandle
         || !self.FileSystemDirectoryHandle
         || !self.FileSystemFileHandle){
diff --git a/ext/wasm/speedtest1.html b/ext/wasm/speedtest1.html
index 08195f2b12..6c2853a73a 100644
--- a/ext/wasm/speedtest1.html
+++ b/ext/wasm/speedtest1.html
@@ -39,131 +39,136 @@
     <script src="common/SqliteTestUtil.js"></script>
     <script src="speedtest1.js"></script>
     <script>(function(){
-        /**
-           If this environment contains OPFS, this function initializes it and
-           returns the name of the dir on which OPFS is mounted, else it returns
-           an empty string.
-        */
-        const wasmfsDir = function f(wasmUtil){
-          if(undefined !== f._) return f._;
-          const pdir = '/persistent';
-          if( !self.FileSystemHandle
-              || !self.FileSystemDirectoryHandle
-              || !self.FileSystemFileHandle){
+    /**
+       If this environment contains OPFS, this function initializes it and
+       returns the name of the dir on which OPFS is mounted, else it returns
+       an empty string.
+    */
+    const wasmfsDir = function f(wasmUtil){
+        if(undefined !== f._) return f._;
+        const pdir = '/persistent';
+        if( !self.FileSystemHandle
+            || !self.FileSystemDirectoryHandle
+            || !self.FileSystemFileHandle){
             return f._ = "";
-          }
-          try{
+        }
+        try{
             if(0===wasmUtil.xCallWrapped(
-              'sqlite3_wasm_init_wasmfs', 'i32', ['string'], pdir
+                'sqlite3_wasm_init_wasmfs', 'i32', ['string'], pdir
             )){
-              return f._ = pdir;
+                return f._ = pdir;
             }else{
-              return f._ = "";
+                return f._ = "";
             }
-          }catch(e){
+        }catch(e){
             // sqlite3_wasm_init_wasmfs() is not available
             return f._ = "";
-          }
-        };
-        wasmfsDir._ = undefined;
+        }
+    };
+    wasmfsDir._ = undefined;
 
-        const eOut = document.querySelector('#test-output');
-        const log2 = function(cssClass,...args){
-          const ln = document.createElement('div');
-          if(cssClass) ln.classList.add(cssClass);
-          ln.append(document.createTextNode(args.join(' ')));
-          eOut.append(ln);
-          //this.e.output.lastElementChild.scrollIntoViewIfNeeded();
-        };
-        const logList = [];
-        const dumpLogList = function(){
-          logList.forEach((v)=>log2('',v));
-          logList.length = 0;
-        };
-        /* can't update DOM while speedtest is running unless we run
-           speedtest in a worker thread. */;
-        const log = (...args)=>{
-          console.log(...args);
-          logList.push(args.join(' '));
-        };
-        const logErr = function(...args){
-          console.error(...args);
-          logList.push('ERROR: '+args.join(' '));
-        };
+    const eOut = document.querySelector('#test-output');
+    const log2 = function(cssClass,...args){
+        const ln = document.createElement('div');
+        if(cssClass) ln.classList.add(cssClass);
+        ln.append(document.createTextNode(args.join(' ')));
+        eOut.append(ln);
+        //this.e.output.lastElementChild.scrollIntoViewIfNeeded();
+    };
+    const logList = [];
+    const dumpLogList = function(){
+        logList.forEach((v)=>log2('',v));
+        logList.length = 0;
+    };
+    /* can't update DOM while speedtest is running unless we run
+       speedtest in a worker thread. */;
+    const log = (...args)=>{
+        console.log(...args);
+        logList.push(args.join(' '));
+    };
+    const logErr = function(...args){
+        console.error(...args);
+        logList.push('ERROR: '+args.join(' '));
+    };
 
-        const runTests = function(sqlite3){
-          const capi = sqlite3.capi, wasm = capi.wasm;
-          //console.debug('sqlite3 =',sqlite3);
-          const unlink = wasm.xWrap("sqlite3_wasm_vfs_unlink", "int", ["string"]);
-          const pDir = wasmfsDir(wasm);
-          if(pDir){
+    const runTests = function(sqlite3){
+        const capi = sqlite3.capi, wasm = capi.wasm;
+        //console.debug('sqlite3 =',sqlite3);
+        const unlink = wasm.xWrap("sqlite3_wasm_vfs_unlink", "int", ["string"]);
+        const pDir = wasmfsDir(wasm);
+        if(pDir){
             console.warn("Persistent storage:",pDir);
-          }
-          const scope = wasm.scopedAllocPush();
-          let dbFile = pDir+"/speedtest1.db";
-          const urlParams = self.SqliteTestUtil.processUrlArgs();
-          const argv = ["speedtest1"];
-          if('string'===typeof urlParams.vfs){
-              if(!capi.sqlite3_vfs_find(urlParams.vfs)){
-                  log2('error',"Unknown VFS:",urlParams.vfs);
-                  return;
-              }
-              argv.push("--vfs", urlParams.vfs);
-              log2('',"Using VFS:",urlParams.vfs);
-              if('kvvfs' === urlParams.vfs){
-                  urlParams.size = 2;
-                  dbFile = 'session';
-                  log2('warning',"kvvfs VFS: forcing --size",urlParams.size,
-                       "and filename '"+dbFile+"'.");
-                  capi.sqlite3_web_kvvfs_clear('session');
-              }
-          }
-          [
-              'size'
-          ].forEach(function(k){
-              const v = urlParams[k];
-              if(v) argv.push('--'+k, urlParams[k]);
-          });
-          if(urlParams.flags){
-            argv.push(...(urlParams.flags.split(',')));
-          }else{
-            argv.push(
-              "--singlethread",
-              //"--nomutex",
-              //"--nosync",
-              "--nomemstat"
-            );
-            //"--memdb", // note that memdb trumps the filename arg
-          }
-          argv.push("--big-transactions"/*important for tests 410 and 510!*/,
-                    dbFile);
-          console.log("argv =",argv);
-          // These log messages are not emitted to the UI until after main() returns. Fixing that
-          // requires moving the main() call and related cleanup into a timeout handler.
-          if(pDir) unlink(dbFile);
-          log2('',"Starting native app:\n ",argv.join(' '));
-          log2('',"This will take a while and the browser might warn about the runaway JS.",
-               "Give it time...");
-          logList.length = 0;
-          setTimeout(function(){
-              wasm.xCall('wasm_main', argv.length,
-                         wasm.scopedAllocMainArgv(argv));
-              wasm.scopedAllocPop(scope);
-              if(pDir) unlink(dbFile);
-              logList.unshift("Done running native main(). Output:");
-              dumpLogList();
-          }, 50);
-        }/*runTests()*/;
+        }
+        const scope = wasm.scopedAllocPush();
+        let dbFile = pDir+"/speedtest1.db";
+        const urlParams = new URL(self.location.href).searchParams;
+        const argv = ["speedtest1"];
+        if(urlParams.has('flags')){
+            argv.push(...(urlParams.get('flags').split(',')));
+        }
 
-        self.sqlite3TestModule.print = log;
-        self.sqlite3TestModule.printErr = logErr;
-        sqlite3Speedtest1InitModule(self.sqlite3TestModule)
+        let forceSize = 0;
+        if(urlParams.has('vfs')){
+            const vfs = urlParams.get('vfs');
+            if(!capi.sqlite3_vfs_find(vfs)){
+                log2('error',"Unknown VFS:",vfs);
+                return;
+            }
+            argv.push("--vfs", vfs);
+            log2('',"Using VFS:",vfs);
+            if('kvvfs' === vfs){
+                forceSize = 2;
+                dbFile = 'session';
+                log2('warning',"kvvfs VFS: forcing --size",forceSize,
+                     "and filename '"+dbFile+"'.");
+                capi.sqlite3_web_kvvfs_clear(dbFile);
+            }
+        }
+        if(forceSize){
+            argv.push('--size',forceSize);
+        }else{
+            [
+                'size'
+            ].forEach(function(k){
+                const v = urlParams.get(k);
+                if(v) argv.push('--'+k, urlParams[k]);
+            });
+        }
+        argv.push(
+            "--singlethread",
+            //"--nomutex",
+            //"--nosync",
+            //"--memdb", // note that memdb trumps the filename arg
+            "--nomemstat"
+        );
+        argv.push("--big-transactions"/*important for tests 410 and 510!*/,
+                  dbFile);
+        console.log("argv =",argv);
+        // These log messages are not emitted to the UI until after main() returns. Fixing that
+        // requires moving the main() call and related cleanup into a timeout handler.
+        if(pDir) unlink(dbFile);
+        log2('',"Starting native app:\n ",argv.join(' '));
+        log2('',"This will take a while and the browser might warn about the runaway JS.",
+             "Give it time...");
+        logList.length = 0;
+        setTimeout(function(){
+            wasm.xCall('wasm_main', argv.length,
+                       wasm.scopedAllocMainArgv(argv));
+            wasm.scopedAllocPop(scope);
+            if(pDir) unlink(dbFile);
+            logList.unshift("Done running native main(). Output:");
+            dumpLogList();
+        }, 50);
+    }/*runTests()*/;
+
+    self.sqlite3TestModule.print = log;
+    self.sqlite3TestModule.printErr = logErr;
+    sqlite3Speedtest1InitModule(self.sqlite3TestModule)
         .then((EmscriptenModule)=>{
             return EmscriptenModule.sqlite3.installOpfsVfs()
                 .catch((e)=>{console.warn(e.message)})
                 .then(()=>runTests(EmscriptenModule.sqlite3));
         });
-      })();
-    </script>
-  </body>
+})();</script>
+</body>
 </html>
diff --git a/manifest b/manifest
index 40da9686bf..425e47a2af 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fiddle:\sreplace\sdb\sexport\sroutine\swith\sa\sC-side\sone\swhich\sworks\sfor\sboth\sEmscripten\sFS-hosted\sand\sOPFS-hosted\sdb\sfiles.\sMinor\scode-adjacent\scleanups.
-D 2022-09-26T13:55:10.137
+C wasm/js:\srename\s/persistent\sto\s/opfs\sto\saccount\sfor\spotential\sfuture\spersistent\sstorage\soptions.\sMinor\sflag-handling\scleanups\sin\sthe\sspeedtest1\spages.\sMinor\sAPI\stweaks\sin\soo1.
+D 2022-09-27T09:17:37.806
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -483,39 +483,39 @@ F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba814
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
 F ext/wasm/api/sqlite3-api-cleanup.js 8564a6077cdcaea9a9f428a019af8a05887f0131e6a2a1e72a7ff1145fadfe77
 F ext/wasm/api/sqlite3-api-glue.js fe5ca21ac519e6411f5e7a6403d06fe92c51ef81cca8e07ea8895df8ec9c2e4e
-F ext/wasm/api/sqlite3-api-oo1.js 455fcb28dd77b9781e087aac77392fb78f8ee8e5b125a99c1488604de27a5bb1
-F ext/wasm/api/sqlite3-api-opfs.js e0dfae09aedc6fe414d8d350e7228a6a88de030a0cb19a748ac8269aef9b11db
-F ext/wasm/api/sqlite3-api-prologue.js d39bda7d83aaeb8e15574afe8308221ed11c6f24865ccff06cf0424b665e681e
+F ext/wasm/api/sqlite3-api-oo1.js 97a786b366fcac442e1557c3eedef3afa96877411bd6239094d4db5fd5b3c353
+F ext/wasm/api/sqlite3-api-opfs.js 1128b3cbfbecbe66324d334f4561ccf61f2b08f73075e6c77a053f7ecb71090f
+F ext/wasm/api/sqlite3-api-prologue.js 0ba5ae19021524e02d977668c6b16e951b4ebe0d5f0ff0577e85f4209284a11a
 F ext/wasm/api/sqlite3-api-worker1.js 2eeb2a24e1a90322d84a9b88a99919b806623de62792436446099c0988f2030b
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c 7010405f1981cd5929568403a618f80398f7acbf76b3eb11c4f23789206eb164
+F ext/wasm/api/sqlite3-wasm.c 1409d76529537c2d21a06678df81a3cb5050e212a5ae4cdd9fb42ca5716c65e9
 F ext/wasm/batch-runner.html 2857a6db7292ac83d1581af865d643fd34235db2df830d10b43b01388c599e04
 F ext/wasm/batch-runner.js 6f5b86e0b5519a9a941d9f17ee9c5ecdc63f452f157602fe7fdf87f6275a2b49
-F ext/wasm/common/SqliteTestUtil.js 529161a624265ba84271a52db58da022649832fa1c71309fb1e02cc037327a2b
+F ext/wasm/common/SqliteTestUtil.js c997c12188c97109f344701a58dd627b9c0f98f32cc6a88413f6171f2191531c
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 3a5143699c2b73a85b962271e1a9b3241b30d90e30d895e4f55665e648572962
 F ext/wasm/common/whwasmutil.js 20291bbf4955358d0b5ead58db4c575be269b4976e39c43a93331547e3b86363
 F ext/wasm/demo-123-worker.html e419b66495d209b5211ec64903b4cfb3ca7df20d652b41fcd28bf018a773234f
 F ext/wasm/demo-123.html aa281d33b7eefa755f3122b7b5a18f39a42dc5fb69c8879171bf14b4c37c4ec4
-F ext/wasm/demo-123.js 234655683e35a4543a23de7b10800d76b0369947b33e089e5613171fa7795afb
+F ext/wasm/demo-123.js 9a64c4e535c9d7c8d9a8dd67ca40b42b95baad85049deb84cd447b859e59cc68
 F ext/wasm/demo-kvvfs1.html 7d4f28873de67f51ac18c584b7d920825139866a96049a49c424d6f5a0ea5e7f
 F ext/wasm/demo-kvvfs1.js e884ea35022d772c0d1dd884b40011413696438394f605c6cd4808cfb1642a4a
 F ext/wasm/fiddle.make fd56fa21bada6ecbf860686a9a789ebda7cc3d9b60835927000fcb00246ea50f
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
-F ext/wasm/fiddle/fiddle-worker.js 1fe173ba963314df99df9eb8f0f45f1c3a72c056f16510e47787eb1790cb5531
+F ext/wasm/fiddle/fiddle-worker.js 425b75b1debe1108c10f1373fdd75994a18adbdc0a593e7ff0ecd91cc6498e89
 F ext/wasm/fiddle/fiddle.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
 F ext/wasm/fiddle/fiddle.js aa44051be6e48c53fd23c829177d43f557dcc6f0998ccfcbae7c473ff405f0c6
-F ext/wasm/index.html a39d14f6de6bd1294d39522fcf40eca3c9f0b6da44bb8df6948378e9f30468f5
+F ext/wasm/index.html 63b370619e4f849ac76f1baed435c05edc29dbb6795bc7c1c935561ff667dd27
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 9aa6951b529a8b29f578ec8f0355713c39584c92cf1708f63ba0cf917cb5b68e
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
 F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e568d2c2307c416902059339c06f19
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
 F ext/wasm/scratchpad-wasmfs-main.js f0836e3576df7a89390d777bb53e142e559e8a79becfb2a5a976490b05a1c4fa
-F ext/wasm/speedtest1-wasmfs.html 9d8cd19eab8854d17f7129aa11607cae6f6d9857c505a4aef13000588583d93e
-F ext/wasm/speedtest1-worker.html 802cbd09a14b5a7abb4b66bff243d5fd89fd476ffe083554bdfd4c177fb6474c
-F ext/wasm/speedtest1-worker.js 11e7f68cedd2a83b0e638f94c1d2f58406ba672a7e88b66bff5d4f4284e8ba16
-F ext/wasm/speedtest1.html 8ae6ece128151d01f90579de69cfa06f021acdb760735250ef745eba7ed05d49
+F ext/wasm/speedtest1-wasmfs.html 852504ccf9d095c8f57d4f4f9cc2f912b3b432e300c6b5ed8d6234a37eeb86a6
+F ext/wasm/speedtest1-worker.html 3780a29a6d0467dde34b61bf50a1b2e1a12a4e8498f4835b1293e79a3edcd675
+F ext/wasm/speedtest1-worker.js 08f9e9ffe0082098b2566a56c1b2655a70917b17edcdec9a28cdcc01c097d4df
+F ext/wasm/speedtest1.html 4f4e26b634bb3288f2cad8cf4d458076b33d8bd0f3fd56e089a17bed32df6287
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
@@ -2026,8 +2026,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 9b2244e1c8a40efe6547094a1b57acc8f2173145a8731abb0e36268ce0a8ef41
-R ee45c68d4b4cfbf2a729d26cea95ac0e
+P 3579a8d6f1f6cd3cd8aad9949536870c5fe7bae8c1778f700dd85d763e266b94
+R 786e465dc63fbf42c76f34e46e9a73e9
 U stephan
-Z a7778a8aaef90b52f5b829e56bd6cae3
+Z 0e6490797de722dba8eac0d97289515b
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index d8a4d0f939..3139bd9f92 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3579a8d6f1f6cd3cd8aad9949536870c5fe7bae8c1778f700dd85d763e266b94
\ No newline at end of file
+4dc972a3656b2a9ec915bfb3f653136560c753ce4024c3f0d0d0c28f66db7a0a
\ No newline at end of file

From 5b9973d89849c318b0500de1fa0019181e7bd3c0 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 27 Sep 2022 13:40:12 +0000
Subject: [PATCH 172/428] WASM API renaming. Reworked JS API bootstrap's async
 post-init into a generic mechanism, no longer OPFS-specific.

FossilOrigin-Name: c42a8cb090cad1108dfd6be574202d744c59e053b505bc4c17252dc6b65d26bf
---
 ext/wasm/api/README.md               | 25 ++++++---
 ext/wasm/api/sqlite3-api-opfs.js     | 12 +++--
 ext/wasm/api/sqlite3-api-prologue.js | 78 +++++++++++++++++++++-------
 ext/wasm/api/sqlite3-api-worker1.js  | 12 ++---
 ext/wasm/api/sqlite3-wasm.c          |  8 +--
 ext/wasm/batch-runner.js             |  2 +-
 ext/wasm/scratchpad-wasmfs-main.js   |  2 +-
 ext/wasm/speedtest1-worker.js        |  7 ++-
 ext/wasm/sqlite3-worker1-promiser.js |  5 +-
 ext/wasm/sqlite3-worker1.js          |  7 ++-
 ext/wasm/test-opfs-vfs.js            |  4 +-
 ext/wasm/testing-worker1-promiser.js |  8 +--
 ext/wasm/testing1.js                 |  2 +-
 ext/wasm/testing2.js                 |  4 ++
 manifest                             | 38 +++++++-------
 manifest.uuid                        |  2 +-
 16 files changed, 140 insertions(+), 76 deletions(-)

diff --git a/ext/wasm/api/README.md b/ext/wasm/api/README.md
index 9000697b26..6780c56ae6 100644
--- a/ext/wasm/api/README.md
+++ b/ext/wasm/api/README.md
@@ -66,24 +66,33 @@ browser client:
   thread via the Worker message-passing interface. Like OO API #1,
   this is an optional component, offering one of any number of
   potential implementations for such an API.
-    - `sqlite3-worker1.js`\  
+    - `../sqlite3-worker1.js`\  
       Is not part of the amalgamated sources and is intended to be
       loaded by a client Worker thread. It loads the sqlite3 module
       and runs the Worker #1 API which is implemented in
       `sqlite3-api-worker1.js`.
+    - `../sqlite3-worker1-promiser.js`\  
+      Is likewise not part of the amalgamated sources and provides
+      a Promise-based interface into the Worker #1 API. This is
+      a far user-friendlier way to interface with databases running
+      in a Worker thread.
 - `sqlite3-api-opfs.js`\  
-  is an in-development/experimental sqlite3 VFS wrapper, the goal of
-  which being to use Google Chrome's Origin-Private FileSystem (OPFS)
-  storage layer to provide persistent storage for database files in a
-  browser. It is far from complete.
+  is an sqlite3 VFS implementation which supports Google Chrome's
+  Origin-Private FileSystem (OPFS) as a storage layer to provide
+  persistent storage for database files in a browser. It requires...
+    - `../sqlite3-opfs-async-proxy.js`\  
+      is the asynchronous backend part of the OPFS proxy. It speaks
+      directly to the (async) OPFS API and channels those results back
+      to its synchronous counterpart. This file, because it must be
+      started in its own Worker, is not part of the amalgamation.
 - `sqlite3-api-cleanup.js`\  
   the previous files temporarily create global objects in order to
   communicate their state to the files which follow them, and _this_
   file connects any final components together and cleans up those
   globals. As of this writing, this code ensures that the previous
-  files leave no global symbols installed, and it moves the sqlite3
-  namespace object into the in-scope Emscripten module. Abstracting
-  this for other WASM toolchains is TODO.
+  files leave no more than a single global symbol installed. When
+  adapting the API for non-Emscripten toolchains, this "should"
+  be the only file where changes are needed.
 - `post-js-footer.js`\  
   Emscripten-specific footer for the `--post-js` input. This closes
   off the lexical scope opened by `post-js-header.js`.
diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index a346443f56..5dac799918 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -20,7 +20,7 @@
 'use strict';
 self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
 /**
-   sqlite3.installOpfsVfs() returns a Promise which, on success, installs
+   installOpfsVfs() returns a Promise which, on success, installs
    an sqlite3_vfs named "opfs", suitable for use with all sqlite3 APIs
    which accept a VFS. It uses the Origin-Private FileSystem API for
    all file storage. On error it is rejected with an exception
@@ -32,7 +32,6 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
    - The environment does not support OPFS. That includes when
      this function is called from the main window thread.
 
-
   Significant notes and limitations:
 
   - As of this writing, OPFS is still very much in flux and only
@@ -73,8 +72,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
    object and that object gets a new object installed in its
    `opfs` property, containing several OPFS-specific utilities.
 */
-sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
-  delete sqlite3.installOpfsVfs;
+const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
   if(!self.SharedArrayBuffer ||
      !self.FileSystemHandle ||
      !self.FileSystemDirectoryHandle ||
@@ -1027,5 +1025,9 @@ sqlite3.installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri)
   })/*thePromise*/;
   return thePromise;
 }/*installOpfsVfs()*/;
-sqlite3.installOpfsVfs.defaultProxyUri = "sqlite3-opfs-async-proxy.js";
+installOpfsVfs.defaultProxyUri =
+    //self.location.pathname.replace(/[^/]*$/, "sqlite3-opfs-async-proxy.js");
+  "sqlite3-opfs-async-proxy.js";
+//console.warn("sqlite3.installOpfsVfs.defaultProxyUri =",sqlite3.installOpfsVfs.defaultProxyUri);
+self.sqlite3ApiBootstrap.initializersAsync.push(async (sqlite3)=>installOpfsVfs());
 }/*sqlite3ApiBootstrap.initializers.push()*/);
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index b2d8809377..30e626b67d 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -698,8 +698,8 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     ["sqlite3_wasm_vfs_unlink", "int", "string"]
   ];
 
-  /** State for sqlite3_web_persistent_dir(). */
-  let __persistentDir;
+  /** State for sqlite3_wasmfs_opfs_dir(). */
+  let __persistentDir = undefined;
   /**
      An experiment. Do not use in client code.
 
@@ -713,8 +713,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
 
      This function currently only recognizes the WASMFS/OPFS storage
      combination. "Plain" OPFS is provided via a separate VFS which
-     can optionally be installed (if OPFS is available on the system)
-     using sqlite3.installOpfsVfs().
+     is optionally be installed via sqlite3.asyncPostInit().
 
      TODOs and caveats:
 
@@ -724,7 +723,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
        happen when using the JS-native "opfs" VFS, as opposed to the
        WASMFS/OPFS combination.
   */
-  capi.sqlite3_web_persistent_dir = function(){
+  capi.sqlite3_wasmfs_opfs_dir = function(){
     if(undefined !== __persistentDir) return __persistentDir;
     // If we have no OPFS, there is no persistent dir
     const pdir = config.wasmfsOpfsDir;
@@ -738,17 +737,6 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
       if(pdir && 0===capi.wasm.xCallWrapped(
         'sqlite3_wasm_init_wasmfs', 'i32', ['string'], pdir
       )){
-        /** OPFS does not support locking and will trigger errors if
-            we try to lock. We don't _really_ want to
-            _unconditionally_ install a non-locking sqlite3 VFS as the
-            default, but we do so here for simplicy's sake for the
-            time being. That said: locking is a no-op on all of the
-            current WASM storage, so this isn't (currently) as bad as
-            it may initially seem. */
-        const pVfs = sqlite3.capi.sqlite3_vfs_find("unix-none");
-        if(pVfs){
-          capi.sqlite3_vfs_register(pVfs,1);
-        }
         return __persistentDir = pdir;
       }else{
         return __persistentDir = "";
@@ -762,7 +750,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
   /**
      Experimental and subject to change or removal.
 
-     Returns true if sqlite3.capi.sqlite3_web_persistent_dir() is a
+     Returns true if sqlite3.capi.sqlite3_wasmfs_opfs_dir() is a
      non-empty string and the given name starts with (that string +
      '/'), else returns false.
 
@@ -771,7 +759,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
      kvvfs is available.
   */
   capi.sqlite3_web_filename_is_persistent = function(name){
-    const p = capi.sqlite3_web_persistent_dir();
+    const p = capi.sqlite3_wasmfs_opfs_dir();
     return (p && name) ? name.startsWith(p+'/') : false;
   };
 
@@ -922,11 +910,42 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
 
   }/* main-window-only bits */
 
+
   /* The remainder of the API will be set up in later steps. */
   const sqlite3 = {
     WasmAllocError: WasmAllocError,
     capi,
-    config
+    config,
+    /**
+       Performs any optional asynchronous library-level initialization
+       which might be required. This function returns a Promise which
+       resolves to the sqlite3 namespace object. It _ignores any
+       errors_ in the asynchronous init process, as such components
+       are all optional. If called more than once, the second and
+       subsequent calls are no-ops which return a pre-resolved
+       Promise.
+
+       If called at all, this function must be called by client-level
+       code, which must not use the library until the returned promise
+       resolves.
+
+       Bug: if called while a prior call is still resolving, the 2nd
+       call will resolve prematurely, before the 1st call has finished
+       resolving.
+    */
+    asyncPostInit: async function(){
+      let lip = sqlite3ApiBootstrap.initializersAsync;
+      delete sqlite3ApiBootstrap.initializersAsync;
+      if(!lip || !lip.length) return Promise.resolve(sqlite3);
+      // Is it okay to resolve these in parallel or do we need them
+      // to resolve in order? We currently only have 1, so it
+      // makes no difference.
+      lip = lip.map((f)=>f(sqlite3).catch(()=>{}));
+      //let p = lip.shift();
+      //while(lip.length) p = p.then(lip.shift());
+      //return p.then(()=>sqlite3);
+      return Promise.all(lip).then(()=>sqlite3);
+    }
   };
   sqlite3ApiBootstrap.initializers.forEach((f)=>f(sqlite3));
   delete sqlite3ApiBootstrap.initializers;
@@ -946,8 +965,29 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
   their features (noting that most will also require that certain
   features alread have been installed).  At the end of that process,
   this array is deleted.
+
+  Note that the order of insertion into this array is significant for
+  some pieces. e.g. sqlite3.capi.wasm cannot be fully utilized until
+  the whwasmutil.js part is plugged in.
 */
 self.sqlite3ApiBootstrap.initializers = [];
+/**
+  self.sqlite3ApiBootstrap.initializersAsync is an internal detail
+  used by the sqlite3 API's amalgamation process. It must not be
+  modified by client code except when plugging such code into the
+  amalgamation process.
+
+  Counterpart of self.sqlite3ApiBootstrap.initializers, specifically
+  for initializers which are asynchronous. All functions in this list
+  take the sqlite3 object as their argument and MUST return a
+  Promise. Both the resolved value and rejection cases are ignored.
+
+  This list is not processed until the client calls
+  sqlite3.asyncPostInit(). This means, for example, that intializers
+  added to self.sqlite3ApiBootstrap.initializers may push entries to
+   this list.
+*/
+self.sqlite3ApiBootstrap.initializersAsync = [];
 /**
    Client code may assign sqlite3ApiBootstrap.defaultConfig an
    object-type value before calling sqlite3ApiBootstrap() (without
diff --git a/ext/wasm/api/sqlite3-api-worker1.js b/ext/wasm/api/sqlite3-api-worker1.js
index d9a943971b..d60621ada6 100644
--- a/ext/wasm/api/sqlite3-api-worker1.js
+++ b/ext/wasm/api/sqlite3-api-worker1.js
@@ -154,12 +154,12 @@
     messageId: ...as above...,
     result: {
 
-      persistentDirName: path prefix, if any, of persistent storage.
+      wasmfsOpfsDir: path prefix, if any, of persistent storage.
       An empty string denotes that no persistent storage is available.
 
       bigIntEnabled: bool. True if BigInt support is enabled.
 
-      persistenceEnabled: true if persistent storage is enabled in the
+      wasmfsOpfsEnabled: true if persistent storage is enabled in the
       current environment. Only files stored under persistentDirName
       will persist, however.
 
@@ -183,7 +183,7 @@
       See the sqlite3.oo1.DB constructor for peculiarities and transformations,
 
       persistent [=false]: if true and filename is not one of ("",
-      ":memory:"), prepend sqlite3.capi.sqlite3_web_persistent_dir()
+      ":memory:"), prepend sqlite3.capi.sqlite3_wasmfs_opfs_dir()
       to the given filename so that it is stored in persistent storage
       _if_ the environment supports it.  If persistent storage is not
       supported, the filename is used as-is.
@@ -438,7 +438,7 @@ sqlite3.initWorker1API = function(){
         toss("Throwing because of simulateError flag.");
       }
       const rc = Object.create(null);
-      const pDir = sqlite3.capi.sqlite3_web_persistent_dir();
+      const pDir = sqlite3.capi.sqlite3_wasmfs_opfs_dir();
       if(!args.filename || ':memory:'===args.filename){
         oargs.filename = args.filename || '';
       }else if(pDir){
@@ -521,11 +521,11 @@ sqlite3.initWorker1API = function(){
     'config-get': function(){
       const rc = Object.create(null), src = sqlite3.config;
       [
-        'persistentDirName', 'bigIntEnabled'
+        'wasmfsOpfsDir', 'bigIntEnabled'
       ].forEach(function(k){
         if(Object.getOwnPropertyDescriptor(src, k)) rc[k] = src[k];
       });
-      rc.persistenceEnabled = !!sqlite3.capi.sqlite3_web_persistent_dir();
+      rc.wasmfsOpfsEnabled = !!sqlite3.capi.sqlite3_wasmfs_opfs_dir();
       return rc;
     },
 
diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index 8750d9b207..b5b8825d29 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -543,9 +543,10 @@ int sqlite3_wasm_vfs_unlink(const char * zName){
   return rc;
 }
 
-#if defined(__EMSCRIPTEN__) && defined(SQLITE_WASM_WASMFS)
-#include <emscripten/wasmfs.h>
+#if defined(__EMSCRIPTEN__)
 #include <emscripten/console.h>
+#if defined(SQLITE_WASM_WASMFS)
+#include <emscripten/wasmfs.h>
 
 /*
 ** This function is NOT part of the sqlite3 public API. It is strictly
@@ -596,10 +597,11 @@ int sqlite3_wasm_init_wasmfs(const char *zMountPoint){
 #else
 WASM_KEEP
 int sqlite3_wasm_init_wasmfs(const char *zUnused){
+  emscripten_console_warn("WASMFS OPFS is not compiled in.");
   if(zUnused){/*unused*/}
   return SQLITE_NOTFOUND;
 }
 #endif /* __EMSCRIPTEN__ && SQLITE_WASM_WASMFS */
-
+#endif
 
 #undef WASM_KEEP
diff --git a/ext/wasm/batch-runner.js b/ext/wasm/batch-runner.js
index 7a90ddd13f..24e28f6eac 100644
--- a/ext/wasm/batch-runner.js
+++ b/ext/wasm/batch-runner.js
@@ -361,7 +361,7 @@
         dbFile = 1 ? 'local' : 'session';
         this.logHtml("Using KVVFS storage:",dbFile);
       }else{
-        pDir = capi.sqlite3_web_persistent_dir();
+        pDir = capi.sqlite3_wasmfs_opfs_dir();
         if(pDir){
           dbFile = pDir+"/speedtest.db";
           this.logHtml("Using persistent storage:",dbFile);
diff --git a/ext/wasm/scratchpad-wasmfs-main.js b/ext/wasm/scratchpad-wasmfs-main.js
index bb0edbcfbc..764f72e6df 100644
--- a/ext/wasm/scratchpad-wasmfs-main.js
+++ b/ext/wasm/scratchpad-wasmfs-main.js
@@ -42,7 +42,7 @@
           oo = sqlite3.oo1,
           wasm = capi.wasm;
     stdout("Loaded sqlite3:",capi.sqlite3_libversion(), capi.sqlite3_sourceid());
-    const persistentDir = capi.sqlite3_web_persistent_dir();
+    const persistentDir = capi.sqlite3_wasmfs_opfs_dir();
     if(persistentDir){
       stdout("Persistent storage dir:",persistentDir);
     }else{
diff --git a/ext/wasm/speedtest1-worker.js b/ext/wasm/speedtest1-worker.js
index 78e2db57fb..e6359966d5 100644
--- a/ext/wasm/speedtest1-worker.js
+++ b/ext/wasm/speedtest1-worker.js
@@ -81,11 +81,10 @@
     setStatus: (text)=>mPost('load-status',text)
   };
   self.sqlite3Speedtest1InitModule(EmscriptenModule).then(function(EModule){
-    const S = EModule.sqlite3;
     log("Module inited.");
-    return S.installOpfsVfs()
-      .catch((e)=>console.warn(e.message))
-      .then(()=>{
+    return EModule.sqlite3.asyncPostInit()
+      .then((sqlite3)=>{
+        const S = sqlite3;
         const vfsUnlink = S.capi.wasm.xWrap("sqlite3_wasm_vfs_unlink", "int", ["string"]);
         App.unlink = function(fname){
           vfsUnlink(fname);
diff --git a/ext/wasm/sqlite3-worker1-promiser.js b/ext/wasm/sqlite3-worker1-promiser.js
index 37a4b5962f..c683e2fb7b 100644
--- a/ext/wasm/sqlite3-worker1-promiser.js
+++ b/ext/wasm/sqlite3-worker1-promiser.js
@@ -248,7 +248,10 @@ self.sqlite3Worker1Promiser = function callee(config = callee.defaultConfig){
   };
 }/*sqlite3Worker1Promiser()*/;
 self.sqlite3Worker1Promiser.defaultConfig = {
-  worker: ()=>new Worker('sqlite3-worker1.js'),
+  worker: ()=>{
+    //const p = self.location.pathname.replace(/[^/]*$/, "sqlite3-worker1.js");
+    return new Worker("sqlite3-worker1.js");
+  },
   onerror: (...args)=>console.error('worker1 error',...args),
   dbId: undefined
 };
diff --git a/ext/wasm/sqlite3-worker1.js b/ext/wasm/sqlite3-worker1.js
index ff024d8215..6de8facf90 100644
--- a/ext/wasm/sqlite3-worker1.js
+++ b/ext/wasm/sqlite3-worker1.js
@@ -28,4 +28,9 @@
 */
 "use strict";
 importScripts('sqlite3.js');
-sqlite3InitModule().then((EmscriptenModule)=>EmscriptenModule.sqlite3.initWorker1API());
+sqlite3InitModule().then((EmscriptenModule)=>{
+  EmscriptenModule.sqlite3.asyncPostInit().then((sqlite3)=>{
+    sqlite3.capi.sqlite3_wasmfs_opfs_dir();
+    sqlite3.initWorker1API();
+  });
+});
diff --git a/ext/wasm/test-opfs-vfs.js b/ext/wasm/test-opfs-vfs.js
index 04497c1c14..93e9e0eb64 100644
--- a/ext/wasm/test-opfs-vfs.js
+++ b/ext/wasm/test-opfs-vfs.js
@@ -30,7 +30,7 @@ const tryOpfsVfs = function(sqlite3){
   const error =  (...args)=>console.error(logPrefix,...args);
   log("tryOpfsVfs()");
   const capi = sqlite3.capi;
-  const pVfs = capi.sqlite3_vfs_find("opfs") || toss("Unexpectedly missing 'opfs' VFS.");
+  const pVfs = capi.sqlite3_vfs_find("opfs") || toss("Missing 'opfs' VFS.");
   const oVfs = capi.sqlite3_vfs.instanceForPointer(pVfs) || toss("Unexpected instanceForPointer() result.");;
   log("OPFS VFS:",pVfs, oVfs);
 
@@ -78,7 +78,7 @@ const tryOpfsVfs = function(sqlite3){
 
 importScripts('sqlite3.js');
 self.sqlite3InitModule()
-  .then((EmscriptenModule)=>EmscriptenModule.sqlite3.installOpfsVfs())
+  .then((EmscriptenModule)=>EmscriptenModule.sqlite3.asyncPostInit())
   .then((sqlite3)=>tryOpfsVfs(sqlite3))
   .catch((e)=>{
     console.error("Error initializing module:",e);
diff --git a/ext/wasm/testing-worker1-promiser.js b/ext/wasm/testing-worker1-promiser.js
index 1f2347c6fe..afec417f09 100644
--- a/ext/wasm/testing-worker1-promiser.js
+++ b/ext/wasm/testing-worker1-promiser.js
@@ -77,8 +77,8 @@
       const r = ev.result;
       log('sqlite3.config subset:', r);
       T.assert('boolean' === typeof r.bigIntEnabled)
-        .assert('string'===typeof r.persistentDirName)
-        .assert('boolean' === typeof r.persistenceEnabled);
+        .assert('string'===typeof r.wasmfsOpfsDir)
+        .assert('boolean' === typeof r.wasmfsOpfsEnabled);
       sqConfig = r;
     });
     logHtml('',
@@ -86,12 +86,12 @@
     
     await wtest('open', {
       filename: dbFilename,
-      persistent: sqConfig.persistenceEnabled,
+      persistent: sqConfig.wasmfsOpfsEnabled,
       simulateError: 0 /* if true, fail the 'open' */,
     }, function(ev){
       const r = ev.result;
       log("then open result",r);
-      T.assert(r.persistent === sqConfig.persistenceEnabled)
+      T.assert(r.persistent === sqConfig.wasmfsOpfsEnabled)
         .assert(r.persistent
                ? (dbFilename!==r.filename)
                : (dbFilename==r.filename))
diff --git a/ext/wasm/testing1.js b/ext/wasm/testing1.js
index e412b9c17d..9607e3f379 100644
--- a/ext/wasm/testing1.js
+++ b/ext/wasm/testing1.js
@@ -1019,7 +1019,7 @@
           wasm = capi.wasm;
     log("Loaded module:",capi.sqlite3_libversion(), capi.sqlite3_sourceid());
     log("Build options:",wasm.compileOptionUsed());
-    capi.sqlite3_web_persistent_dir()/*will install OPFS if available, plus a and non-locking VFS*/;
+    capi.sqlite3_wasmfs_opfs_dir()/*will install OPFS if available, plus a and non-locking VFS*/;
     if(1){
       /* Let's grab those last few lines of test coverage for
          sqlite3-api.js... */
diff --git a/ext/wasm/testing2.js b/ext/wasm/testing2.js
index 0a31c470a6..986e683dea 100644
--- a/ext/wasm/testing2.js
+++ b/ext/wasm/testing2.js
@@ -11,6 +11,10 @@
   ***********************************************************************
 
   A basic test script for sqlite3-worker1.js.
+
+  Note that the wrapper interface demonstrated in
+  testing-worker1-promiser.js is much easier to use from client code, as it
+  lacks the message-passing acrobatics demonstrated in this file.
 */
 'use strict';
 (function(){
diff --git a/manifest b/manifest
index 425e47a2af..fed244e6ff 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C wasm/js:\srename\s/persistent\sto\s/opfs\sto\saccount\sfor\spotential\sfuture\spersistent\sstorage\soptions.\sMinor\sflag-handling\scleanups\sin\sthe\sspeedtest1\spages.\sMinor\sAPI\stweaks\sin\soo1.
-D 2022-09-27T09:17:37.806
+C WASM\sAPI\srenaming.\sReworked\sJS\sAPI\sbootstrap's\sasync\spost-init\sinto\sa\sgeneric\smechanism,\sno\slonger\sOPFS-specific.
+D 2022-09-27T13:40:12.824
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -478,19 +478,19 @@ F ext/wasm/GNUmakefile 34a84e30e6b25e24959a8264e9dec020dffa82d96879dc55ad65d3c31
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 77a5ee8bd209b5e75dd0e822bc3f6e7319dc9b36431463d4175c775170f92126
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
-F ext/wasm/api/README.md d876597edd2b9542b6ea031adaaff1c042076fde7b670b1dc6d8a87b28a6631b
+F ext/wasm/api/README.md f54102d74cfde01ebe242fa1411e126a9cda8f19b3ac378afd1103b21abfad05
 F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba81456260a713ed04900c
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
 F ext/wasm/api/sqlite3-api-cleanup.js 8564a6077cdcaea9a9f428a019af8a05887f0131e6a2a1e72a7ff1145fadfe77
 F ext/wasm/api/sqlite3-api-glue.js fe5ca21ac519e6411f5e7a6403d06fe92c51ef81cca8e07ea8895df8ec9c2e4e
 F ext/wasm/api/sqlite3-api-oo1.js 97a786b366fcac442e1557c3eedef3afa96877411bd6239094d4db5fd5b3c353
-F ext/wasm/api/sqlite3-api-opfs.js 1128b3cbfbecbe66324d334f4561ccf61f2b08f73075e6c77a053f7ecb71090f
-F ext/wasm/api/sqlite3-api-prologue.js 0ba5ae19021524e02d977668c6b16e951b4ebe0d5f0ff0577e85f4209284a11a
-F ext/wasm/api/sqlite3-api-worker1.js 2eeb2a24e1a90322d84a9b88a99919b806623de62792436446099c0988f2030b
+F ext/wasm/api/sqlite3-api-opfs.js dce3bd8c0da238bce8f9dd856f22b79424c8eeae8dd0b439ac87ed567e6149c0
+F ext/wasm/api/sqlite3-api-prologue.js 9bcec56baf306d1d9341cbbdea59fe0abc195db0c3ecbbc396ec5098cdbda786
+F ext/wasm/api/sqlite3-api-worker1.js d5d5b7fac4c4731c38c7e03f4f404b2a95c388a2a1d8bcf361caada572f107e0
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c 1409d76529537c2d21a06678df81a3cb5050e212a5ae4cdd9fb42ca5716c65e9
+F ext/wasm/api/sqlite3-wasm.c b756b9c1fee9d0598f715e6df6bf089b750da24aa91bb7ef9277a037d81e7612
 F ext/wasm/batch-runner.html 2857a6db7292ac83d1581af865d643fd34235db2df830d10b43b01388c599e04
-F ext/wasm/batch-runner.js 6f5b86e0b5519a9a941d9f17ee9c5ecdc63f452f157602fe7fdf87f6275a2b49
+F ext/wasm/batch-runner.js b1f443bc63a779aac97ba6d54fc731a707ece2783b94e3b019abbfa79108e9a1
 F ext/wasm/common/SqliteTestUtil.js c997c12188c97109f344701a58dd627b9c0f98f32cc6a88413f6171f2191531c
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 3a5143699c2b73a85b962271e1a9b3241b30d90e30d895e4f55665e648572962
@@ -511,25 +511,25 @@ F ext/wasm/jaccwabyt/jaccwabyt.md 9aa6951b529a8b29f578ec8f0355713c39584c92cf1708
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
 F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e568d2c2307c416902059339c06f19
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
-F ext/wasm/scratchpad-wasmfs-main.js f0836e3576df7a89390d777bb53e142e559e8a79becfb2a5a976490b05a1c4fa
+F ext/wasm/scratchpad-wasmfs-main.js e713a3da53da9194a1cc35d060f0ee5cb0abe907dcbc864d3d6f76fa6eafedf1
 F ext/wasm/speedtest1-wasmfs.html 852504ccf9d095c8f57d4f4f9cc2f912b3b432e300c6b5ed8d6234a37eeb86a6
 F ext/wasm/speedtest1-worker.html 3780a29a6d0467dde34b61bf50a1b2e1a12a4e8498f4835b1293e79a3edcd675
-F ext/wasm/speedtest1-worker.js 08f9e9ffe0082098b2566a56c1b2655a70917b17edcdec9a28cdcc01c097d4df
+F ext/wasm/speedtest1-worker.js 65f50314cc56ebc03f7b5ea774e7d8386600e8a6f27cca02cb05e7e2eb7a0153
 F ext/wasm/speedtest1.html 4f4e26b634bb3288f2cad8cf4d458076b33d8bd0f3fd56e089a17bed32df6287
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
 F ext/wasm/sqlite3-opfs-async-proxy.js fe4b8268eea9acaec633ebd1dd3f85dae7c461c5c68985ab1075d9560b1db8e8
-F ext/wasm/sqlite3-worker1-promiser.js 4fd0465688a28a75f1d4ee4406540ba494f49844e3cad0670d0437a001943365
-F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
+F ext/wasm/sqlite3-worker1-promiser.js cca2b853692e4715b4761c46678f96d80819d4756de557922a815149fb93397e
+F ext/wasm/sqlite3-worker1.js b941db258fd26ae2c7398b640c1ca8d5abac8ec77e54ba5b9526af2297409626
 F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
-F ext/wasm/test-opfs-vfs.js 753c6b86dd8ce0813121add44726a038ba1b83acebdc8414189cb163faf23e6d
+F ext/wasm/test-opfs-vfs.js ba4c20085000b9f6195f62cf3abeeb0ae4703c3b34bc654afa806014a4f09e96
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
-F ext/wasm/testing-worker1-promiser.js 63448fddfd3b8c89ff667d17c8b31c6c2259dd4647ebbbd28f3a921c48e924da
+F ext/wasm/testing-worker1-promiser.js ee1ac4950720c07541e791b7f35bdf420e8ab81a74049cc65394371b0c53c480
 F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d7669fb17fcae
-F ext/wasm/testing1.js 7b90ea5f50fbb9529d10f384d2a89ab7aed4d72112fa2765bbdf72a087f47303
+F ext/wasm/testing1.js 20b37766d29815180e2e932bfc6132b649403ece1f1bf612a4712db131287970
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
-F ext/wasm/testing2.js 25584bcc30f19673ce13a6f301f89f8820a59dfe044e0c4f2913941f4097fe3c
+F ext/wasm/testing2.js 34737da985c4cbd4812b2e7f200942662cae991c5a58ffa5d0350be089d0d410
 F ext/wasm/wasmfs.make 52f24bc9c10e404d26bd0b0ee28d450269808a78e359d6ddedc45d31e7b9c29c
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
@@ -2026,8 +2026,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 3579a8d6f1f6cd3cd8aad9949536870c5fe7bae8c1778f700dd85d763e266b94
-R 786e465dc63fbf42c76f34e46e9a73e9
+P 4dc972a3656b2a9ec915bfb3f653136560c753ce4024c3f0d0d0c28f66db7a0a
+R ebd299190a12161c219ed1951eeaf1b4
 U stephan
-Z 0e6490797de722dba8eac0d97289515b
+Z 4f0d8b1c55221b0d2bac6e925a4d61bf
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 3139bd9f92..cf066b292c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4dc972a3656b2a9ec915bfb3f653136560c753ce4024c3f0d0d0c28f66db7a0a
\ No newline at end of file
+c42a8cb090cad1108dfd6be574202d744c59e053b505bc4c17252dc6b65d26bf
\ No newline at end of file

From 6559e0ab15f20790aefa3f9f727a55adf4c6e559 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 27 Sep 2022 14:31:34 +0000
Subject: [PATCH 173/428] Comment the -O2 wasm builds as being broken
 (mysteriously missing JS bits).

FossilOrigin-Name: f61475ef8244fd1f6553eca9cc2317e5de2cc04443e24afb7b91ebd3fc1bd402
---
 ext/wasm/GNUmakefile                |  1 +
 ext/wasm/api/sqlite3-api-cleanup.js |  2 +-
 ext/wasm/api/sqlite3-api-opfs.js    |  2 +-
 ext/wasm/demo-123.js                |  1 +
 manifest                            | 18 +++++++++---------
 manifest.uuid                       |  2 +-
 6 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 030b9ac5db..6e4a0b6fbd 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -423,6 +423,7 @@ o2: clean
 o3: clean
 	$(MAKE) -e "emcc_opt=-O3 $(o-xtra)" fiddle_opt=-O3
 os: clean
+	@echo "WARNING: -Os can result in a build with mysteriously missing pieces!"
 	$(MAKE) -e "emcc_opt=-Os $(o-xtra)" fiddle_opt=-Os
 oz: clean
 	$(MAKE) -e "emcc_opt=-Oz $(o-xtra)" fiddle_opt=-Oz
diff --git a/ext/wasm/api/sqlite3-api-cleanup.js b/ext/wasm/api/sqlite3-api-cleanup.js
index 0e99edf508..a612681af8 100644
--- a/ext/wasm/api/sqlite3-api-cleanup.js
+++ b/ext/wasm/api/sqlite3-api-cleanup.js
@@ -58,8 +58,8 @@ if('undefined' !== typeof Module){ // presumably an Emscripten build
 
   /* Clean up temporary references to our APIs... */
   delete sqlite3.capi.util /* arguable, but these are (currently) internal-use APIs */;
-  //console.warn("Module.sqlite3 =",Module.sqlite3);
   Module.sqlite3 = sqlite3 /* Currently needed by test code and sqlite3-worker1.js */;
+  //console.warn("Module.sqlite3 =",Module.sqlite3);
 }else{
   console.warn("This is not running in an Emscripten module context, so",
                "self.sqlite3ApiBootstrap() is _not_ being called due to lack",
diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index 5dac799918..104a5cc1ac 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -972,7 +972,7 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
         wasm.scopedAllocPop(scope);
       }
     }/*sanityCheck()*/;
-    
+
     W.onmessage = function({data}){
       //log("Worker.onmessage:",data);
       switch(data.type){
diff --git a/ext/wasm/demo-123.js b/ext/wasm/demo-123.js
index 5ba1f1df77..9c58a3092e 100644
--- a/ext/wasm/demo-123.js
+++ b/ext/wasm/demo-123.js
@@ -257,6 +257,7 @@
     print: log,
     printErr: error
   }).then(function(EmscriptenModule){
+    //console.log('EmscriptenModule.sqlite3 =',EmscriptenModule.sqlite3);
     log("Done initializing. Running demo...");
     try {
       demo1(EmscriptenModule.sqlite3);
diff --git a/manifest b/manifest
index fed244e6ff..8e7f5912b2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C WASM\sAPI\srenaming.\sReworked\sJS\sAPI\sbootstrap's\sasync\spost-init\sinto\sa\sgeneric\smechanism,\sno\slonger\sOPFS-specific.
-D 2022-09-27T13:40:12.824
+C Comment\sthe\s-O2\swasm\sbuilds\sas\sbeing\sbroken\s(mysteriously\smissing\sJS\sbits).
+D 2022-09-27T14:31:34.448
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,17 +474,17 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle 0e88c8cfc3719e4b7e74980d9da664c709e68acf863e48386cda376edfd3bfb0
-F ext/wasm/GNUmakefile 34a84e30e6b25e24959a8264e9dec020dffa82d96879dc55ad65d3c31c95d3b1
+F ext/wasm/GNUmakefile 0baf7702a0e900af6a985ddc889181ded22d05f6442035a0d84f5ab5d55f9bd1
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 77a5ee8bd209b5e75dd0e822bc3f6e7319dc9b36431463d4175c775170f92126
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
 F ext/wasm/api/README.md f54102d74cfde01ebe242fa1411e126a9cda8f19b3ac378afd1103b21abfad05
 F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba81456260a713ed04900c
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
-F ext/wasm/api/sqlite3-api-cleanup.js 8564a6077cdcaea9a9f428a019af8a05887f0131e6a2a1e72a7ff1145fadfe77
+F ext/wasm/api/sqlite3-api-cleanup.js 4bd28e61216690b12d6f77bfce71b011995c29496397cfa77e08198eb8d19aeb
 F ext/wasm/api/sqlite3-api-glue.js fe5ca21ac519e6411f5e7a6403d06fe92c51ef81cca8e07ea8895df8ec9c2e4e
 F ext/wasm/api/sqlite3-api-oo1.js 97a786b366fcac442e1557c3eedef3afa96877411bd6239094d4db5fd5b3c353
-F ext/wasm/api/sqlite3-api-opfs.js dce3bd8c0da238bce8f9dd856f22b79424c8eeae8dd0b439ac87ed567e6149c0
+F ext/wasm/api/sqlite3-api-opfs.js af65e056b9f5bc6182499f7e7767e3d01abc3772a62c8abbcc04e4c7bb0affc6
 F ext/wasm/api/sqlite3-api-prologue.js 9bcec56baf306d1d9341cbbdea59fe0abc195db0c3ecbbc396ec5098cdbda786
 F ext/wasm/api/sqlite3-api-worker1.js d5d5b7fac4c4731c38c7e03f4f404b2a95c388a2a1d8bcf361caada572f107e0
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
@@ -497,7 +497,7 @@ F ext/wasm/common/testing.css 3a5143699c2b73a85b962271e1a9b3241b30d90e30d895e4f5
 F ext/wasm/common/whwasmutil.js 20291bbf4955358d0b5ead58db4c575be269b4976e39c43a93331547e3b86363
 F ext/wasm/demo-123-worker.html e419b66495d209b5211ec64903b4cfb3ca7df20d652b41fcd28bf018a773234f
 F ext/wasm/demo-123.html aa281d33b7eefa755f3122b7b5a18f39a42dc5fb69c8879171bf14b4c37c4ec4
-F ext/wasm/demo-123.js 9a64c4e535c9d7c8d9a8dd67ca40b42b95baad85049deb84cd447b859e59cc68
+F ext/wasm/demo-123.js c8445093856f88ecc51b8ef6a99efc48869e2937d8ae248cc53476ee2dd11efd
 F ext/wasm/demo-kvvfs1.html 7d4f28873de67f51ac18c584b7d920825139866a96049a49c424d6f5a0ea5e7f
 F ext/wasm/demo-kvvfs1.js e884ea35022d772c0d1dd884b40011413696438394f605c6cd4808cfb1642a4a
 F ext/wasm/fiddle.make fd56fa21bada6ecbf860686a9a789ebda7cc3d9b60835927000fcb00246ea50f
@@ -2026,8 +2026,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 4dc972a3656b2a9ec915bfb3f653136560c753ce4024c3f0d0d0c28f66db7a0a
-R ebd299190a12161c219ed1951eeaf1b4
+P c42a8cb090cad1108dfd6be574202d744c59e053b505bc4c17252dc6b65d26bf
+R e4d946fe3ba9ab85a5625004bd1df248
 U stephan
-Z 4f0d8b1c55221b0d2bac6e925a4d61bf
+Z 349a6ed1b952e9385ce6d2315be314bf
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index cf066b292c..2d6cabf93b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c42a8cb090cad1108dfd6be574202d744c59e053b505bc4c17252dc6b65d26bf
\ No newline at end of file
+f61475ef8244fd1f6553eca9cc2317e5de2cc04443e24afb7b91ebd3fc1bd402
\ No newline at end of file

From 489a8a9d3cbf40fb62c082d0a75b0b1d3aaa5159 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 27 Sep 2022 17:03:01 +0000
Subject: [PATCH 174/428] Minor doc correction.

FossilOrigin-Name: 093f6e4b36db294e8e47df2fc75a4bc4fc101e2b6ff0201c912ccd1dcf394479
---
 ext/wasm/demo-123.js |  4 ++--
 manifest             | 12 ++++++------
 manifest.uuid        |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ext/wasm/demo-123.js b/ext/wasm/demo-123.js
index 9c58a3092e..a08bffb64c 100644
--- a/ext/wasm/demo-123.js
+++ b/ext/wasm/demo-123.js
@@ -104,7 +104,7 @@
       log("Query data with exec() using rowMode 'array'...");
       db.exec({
         sql: "select a from t order by a limit 3",
-        rowMode: 'array', // 'array', 'object', or 'stmt' (default)
+        rowMode: 'array', // 'array' (default), 'object', or 'stmt'
         callback: function(row){
           log("row ",++this.counter,"=",row);
         }.bind({counter: 0})
@@ -122,7 +122,7 @@
       log("Query data with exec() using rowMode 'stmt'...");
       db.exec({
         sql: "select a from t order by a limit 3",
-        rowMode: 'stmt', // stmt === the default
+        rowMode: 'stmt',
         callback: function(row){
           log("row ",++this.counter,"get(0) =",row.get(0));
         }.bind({counter: 0})
diff --git a/manifest b/manifest
index 8e7f5912b2..9b1f9573bd 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Comment\sthe\s-O2\swasm\sbuilds\sas\sbeing\sbroken\s(mysteriously\smissing\sJS\sbits).
-D 2022-09-27T14:31:34.448
+C Minor\sdoc\scorrection.
+D 2022-09-27T17:03:01.635
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -497,7 +497,7 @@ F ext/wasm/common/testing.css 3a5143699c2b73a85b962271e1a9b3241b30d90e30d895e4f5
 F ext/wasm/common/whwasmutil.js 20291bbf4955358d0b5ead58db4c575be269b4976e39c43a93331547e3b86363
 F ext/wasm/demo-123-worker.html e419b66495d209b5211ec64903b4cfb3ca7df20d652b41fcd28bf018a773234f
 F ext/wasm/demo-123.html aa281d33b7eefa755f3122b7b5a18f39a42dc5fb69c8879171bf14b4c37c4ec4
-F ext/wasm/demo-123.js c8445093856f88ecc51b8ef6a99efc48869e2937d8ae248cc53476ee2dd11efd
+F ext/wasm/demo-123.js d8490189cd2f7a47940d42174fe562d8b6a5cbab521eec4c602dead055b12414
 F ext/wasm/demo-kvvfs1.html 7d4f28873de67f51ac18c584b7d920825139866a96049a49c424d6f5a0ea5e7f
 F ext/wasm/demo-kvvfs1.js e884ea35022d772c0d1dd884b40011413696438394f605c6cd4808cfb1642a4a
 F ext/wasm/fiddle.make fd56fa21bada6ecbf860686a9a789ebda7cc3d9b60835927000fcb00246ea50f
@@ -2026,8 +2026,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 c42a8cb090cad1108dfd6be574202d744c59e053b505bc4c17252dc6b65d26bf
-R e4d946fe3ba9ab85a5625004bd1df248
+P f61475ef8244fd1f6553eca9cc2317e5de2cc04443e24afb7b91ebd3fc1bd402
+R 1038455075fe2f7dad3cc913763db9e3
 U stephan
-Z 349a6ed1b952e9385ce6d2315be314bf
+Z 68a3ada68256719e5271aa1c9a7ddec7
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 2d6cabf93b..714cc36606 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f61475ef8244fd1f6553eca9cc2317e5de2cc04443e24afb7b91ebd3fc1bd402
\ No newline at end of file
+093f6e4b36db294e8e47df2fc75a4bc4fc101e2b6ff0201c912ccd1dcf394479
\ No newline at end of file

From d98011852d956758475d158a1ad2e1992ff3a647 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 28 Sep 2022 07:53:47 +0000
Subject: [PATCH 175/428] Work around broken -Os wasm builds by adding the -g3
 flag. Unrelated documentation tweaks.

FossilOrigin-Name: f5d6bf8616341037fa3e229edf820d19acef3e0a6207a652b2b143de0a493214
---
 ext/wasm/GNUmakefile                 | 10 ++++--
 ext/wasm/api/sqlite3-api-glue.js     | 10 +++---
 ext/wasm/api/sqlite3-api-prologue.js | 49 ++++++++++++----------------
 manifest                             | 16 ++++-----
 manifest.uuid                        |  2 +-
 5 files changed, 42 insertions(+), 45 deletions(-)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 6e4a0b6fbd..4346b6fcd0 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -412,8 +412,14 @@ push-fiddle: $(fiddle_files)
 # painful.
 
 .PHONY: o0 o1 o2 o3 os oz
-o-xtra :=
-#o-xtra += -flto
+o-xtra := -g3
+# ^^^ -g3 is important to keep higher -O levels from mangling (via
+# minification), or outright removing, otherwise working code.
+
+o-xtra += -flto
+# ^^^^ -flto can have a considerably performance boost at -O0 but
+# doubles the build time and seems to have negligible effect on
+# higher optimization levels.
 o0: clean
 	$(MAKE) -e "emcc_opt=-O0 $(o-xtra)" fiddle_opt=-O0
 o1: clean
diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index 49f736669d..258c08250a 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -27,11 +27,11 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     /*  "The problem" is that the following isn't type-safe.
         OTOH, nothing about WASM pointers is. */
     /**
-       Add the `.pointer` xWrap() signature entry to extend
-       the `pointer` arg handler to check for a `pointer`
-       property. This can be used to permit, e.g., passing
-       an SQLite3.DB instance to a C-style sqlite3_xxx function
-       which takes an `sqlite3*` argument.
+       Add the `.pointer` xWrap() signature entry to extend the
+       `pointer` arg handler to check for a `pointer` property. This
+       can be used to permit, e.g., passing an sqlite3.oo1.DB instance
+       to a C-style sqlite3_xxx function which takes an `sqlite3*`
+       argument.
     */
     const oldP = wasm.xWrap.argAdapter('pointer');
     const adapter = function(v){
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 30e626b67d..efdcab7e41 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -282,7 +282,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
        https://www.sqlite.org/c3ref/open.html
 
        - The flags for use with its 3rd argument are installed in this
-       object using the C-cide names, e.g. SQLITE_OPEN_CREATE.
+       object using their C-side names, e.g. SQLITE_OPEN_CREATE.
 
        - If the combination of flags passed to it are invalid,
        behavior is undefined. Thus is is never okay to call this
@@ -293,18 +293,17 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
        and cache-related flags, but they are retained in this
        API for consistency's sake.
 
-       - The final argument to this function specifies the VFS to
-       use, which is largely (but not entirely!) meaningless in
-       the WASM environment. It should always be null or
-       undefined, and it is safe to elide that argument when
-       calling this function.
+       - The final argument to this function specifies the VFS to use,
+       which is largely (but not entirely!) meaningless in the WASM
+       environment. It may be null, undefined, or 0 to denote the
+       default.
     */
     sqlite3_open_v2: function(filename,dbPtrPtr,flags,vfsStr){}/*installed later*/,
     /**
        The sqlite3_prepare_v3() binding handles two different uses
        with differing JS/WASM semantics:
 
-       1) sqlite3_prepare_v3(pDb, sqlString, -1, prepFlags, ppStmt [, null])
+       1) sqlite3_prepare_v3(pDb, sqlString, -1, prepFlags, ppStmt , null)
 
        2) sqlite3_prepare_v3(pDb, sqlPointer, sqlByteLen, prepFlags, ppStmt, sqlPointerToPointer)
 
@@ -325,44 +324,36 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
 
        (pDb, sqlAsString, -1, prepFlags, ppStmt, null)
 
-       The pzTail argument is ignored in this case because its result
-       is meaningless when a string-type value is passed through
-       (because the string goes through another level of internal
+       The `pzTail` argument is ignored in this case because its
+       result is meaningless when a string-type value is passed
+       through: the string goes through another level of internal
        conversion for WASM's sake and the result pointer would refer
        to that transient conversion's memory, not the passed-in
-       string).
+       string.
 
        If the sql argument is not a string, it must be a _pointer_ to
        a NUL-terminated string which was allocated in the WASM memory
-       (e.g. using cwapi.wasm.alloc() or equivalent). In that case,
+       (e.g. using capi.wasm.alloc() or equivalent). In that case,
        the final argument may be 0/null/undefined or must be a pointer
        to which the "tail" of the compiled SQL is written, as
        documented for the C-side sqlite3_prepare_v3(). In case (2),
        the underlying C function is called with the equivalent of:
 
-       (pDb, sqlAsPointer, (sqlByteLen||-1), prepFlags, ppStmt, pzTail)
+       (pDb, sqlAsPointer, sqlByteLen, prepFlags, ppStmt, pzTail)
 
        It returns its result and compiled statement as documented in
        the C API. Fetching the output pointers (5th and 6th
-       parameters) requires using capi.wasm.getMemValue() (or
-       equivalent) and the pzTail will point to an address relative to
-       the sqlAsPointer value.
+       parameters) requires using `capi.wasm.getMemValue()` (or
+       equivalent) and the `pzTail` will point to an address relative to
+       the `sqlAsPointer` value.
 
        If passed an invalid 2nd argument type, this function will
-       return SQLITE_MISUSE but will unfortunately be able to return
-       any additional error information because we have no way to set
-       the db's error state such that this function could return a
-       non-0 integer and the client could call sqlite3_errcode() or
-       sqlite3_errmsg() to fetch it. See the RFE at:
+       return SQLITE_MISUSE and sqlite3_errmsg() will contain a string
+       describing the problem.
 
-       https://sqlite.org/forum/forumpost/f9eb79b11aefd4fc81d
-
-       The alternative would be to throw an exception for that case,
-       but that would be in strong constrast to the rest of the
-       C-level API and seems likely to cause more confusion.
-
-       Side-note: in the C API the function does not fail if provided
-       an empty string but its result output pointer will be NULL.
+       Side-note: if given an empty string, or one which contains only
+       comments or an empty SQL expression, 0 is returned but the result
+       output pointer will be NULL.
     */
     sqlite3_prepare_v3: function(dbPtr, sql, sqlByteLen, prepFlags,
                                  stmtPtrPtr, strPtrPtr){}/*installed later*/,
diff --git a/manifest b/manifest
index 9b1f9573bd..5a971e1b74 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\sdoc\scorrection.
-D 2022-09-27T17:03:01.635
+C Work\saround\sbroken\s-Os\swasm\sbuilds\sby\sadding\sthe\s-g3\sflag.\sUnrelated\sdocumentation\stweaks.
+D 2022-09-28T07:53:47.790
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle 0e88c8cfc3719e4b7e74980d9da664c709e68acf863e48386cda376edfd3bfb0
-F ext/wasm/GNUmakefile 0baf7702a0e900af6a985ddc889181ded22d05f6442035a0d84f5ab5d55f9bd1
+F ext/wasm/GNUmakefile 984c33a37fa34786d6be2c79ef19421b3c1a054dfdb56ea09313077de4aa19f6
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 77a5ee8bd209b5e75dd0e822bc3f6e7319dc9b36431463d4175c775170f92126
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -482,10 +482,10 @@ F ext/wasm/api/README.md f54102d74cfde01ebe242fa1411e126a9cda8f19b3ac378afd1103b
 F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba81456260a713ed04900c
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
 F ext/wasm/api/sqlite3-api-cleanup.js 4bd28e61216690b12d6f77bfce71b011995c29496397cfa77e08198eb8d19aeb
-F ext/wasm/api/sqlite3-api-glue.js fe5ca21ac519e6411f5e7a6403d06fe92c51ef81cca8e07ea8895df8ec9c2e4e
+F ext/wasm/api/sqlite3-api-glue.js 3b164f0ef690a838da8613a2aaec4fc49d29ad5e8fe39c8cdc0f5281f08f9d0b
 F ext/wasm/api/sqlite3-api-oo1.js 97a786b366fcac442e1557c3eedef3afa96877411bd6239094d4db5fd5b3c353
 F ext/wasm/api/sqlite3-api-opfs.js af65e056b9f5bc6182499f7e7767e3d01abc3772a62c8abbcc04e4c7bb0affc6
-F ext/wasm/api/sqlite3-api-prologue.js 9bcec56baf306d1d9341cbbdea59fe0abc195db0c3ecbbc396ec5098cdbda786
+F ext/wasm/api/sqlite3-api-prologue.js 2a0dedb8127e8983d3199edea55151a45186b462646cb1f2206587ac1ef4eddf
 F ext/wasm/api/sqlite3-api-worker1.js d5d5b7fac4c4731c38c7e03f4f404b2a95c388a2a1d8bcf361caada572f107e0
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c b756b9c1fee9d0598f715e6df6bf089b750da24aa91bb7ef9277a037d81e7612
@@ -2026,8 +2026,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 f61475ef8244fd1f6553eca9cc2317e5de2cc04443e24afb7b91ebd3fc1bd402
-R 1038455075fe2f7dad3cc913763db9e3
+P 093f6e4b36db294e8e47df2fc75a4bc4fc101e2b6ff0201c912ccd1dcf394479
+R f13bcaf00e26043effcfda9235e61887
 U stephan
-Z 68a3ada68256719e5271aa1c9a7ddec7
+Z ec2d0b4aa25d1549f3750ebec3c29f7f
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 714cc36606..3e1ed3faa8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-093f6e4b36db294e8e47df2fc75a4bc4fc101e2b6ff0201c912ccd1dcf394479
\ No newline at end of file
+f5d6bf8616341037fa3e229edf820d19acef3e0a6207a652b2b143de0a493214
\ No newline at end of file

From 5ad3631915e7f96f4647a7ca81c9b9e1d7c9375d Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 28 Sep 2022 13:01:49 +0000
Subject: [PATCH 176/428] Correct duplicate copies of sqlite3-api.js being
 embedded in the wasmfs-based builds.

FossilOrigin-Name: bbfcfba260f39a9c91e82d87e06b1c2cb297c03498b4530aa3e7e01ef9916012
---
 ext/wasm/GNUmakefile       |   2 +-
 ext/wasm/batch-runner.html |  45 +++-
 ext/wasm/batch-runner.js   | 535 ++++++++++++++++++++++++-------------
 ext/wasm/wasmfs.make       |   3 +-
 manifest                   |  18 +-
 manifest.uuid              |   2 +-
 6 files changed, 389 insertions(+), 216 deletions(-)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 4346b6fcd0..0cb05580a7 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -293,7 +293,7 @@ dir.sql := sql
 speedtest1 := ../../speedtest1
 speedtest1.c := ../../test/speedtest1.c
 speedtest1.sql := $(dir.sql)/speedtest1.sql
-speedtest1.cliflags := --size 50 --big-transactions
+speedtest1.cliflags := --size 25 --big-transactions
 $(speedtest1):
 	$(MAKE) -C ../.. speedtest1
 $(speedtest1.sql): $(speedtest1) $(MAKEFILE)
diff --git a/ext/wasm/batch-runner.html b/ext/wasm/batch-runner.html
index 2a6c1405cf..bac80f3459 100644
--- a/ext/wasm/batch-runner.html
+++ b/ext/wasm/batch-runner.html
@@ -32,12 +32,16 @@
     <p id='warn-list' class='warning'>ACHTUNG: this file requires a generated input list
       file. Run "make batch" from this directory to generate it.
     </p>
-    <p id='warn-opfs' class='warning'>WARNING: if the WASMFS/OPFS layer crashes, this page may
-      become completely unresponsive and need to be closed and
-      reloaded to recover.
+    <p id='warn-opfs' class='warning hidden'>WARNING: if the WASMFS/OPFS layer crashes, this page may
+      become completely unresponsive and need to be closed and reloaded to recover.
+    </p>
+    <p id='warn-websql' class='warning hidden'>WARNING: WebSQL's limited API requires that
+      this app split up SQL batches into separate statements for execution. That will
+      only work so long as semicolon characters are <em>only</em> used to terminate
+      SQL statements, and not used within string literals or the like.
     </p>
     <hr>
-    <div>
+    <div id='toolbar'>
       <select class='disable-during-eval' id='sql-select'>
         <option disabled selected>Populated via script code</option>
       </select>
@@ -47,19 +51,40 @@
       <button class='disable-during-eval' id='export-metrics'>Export metrics (WIP)</button>
       <button class='disable-during-eval' id='db-reset'>Reset db</button>
       <button id='output-clear'>Clear output</button>
-      <span class='input-wrapper'>
-        <input type='checkbox' class='disable-during-eval' id='cb-reverse-log-order' checked></input>
-        <label for='cb-reverse-log-order'>Reverse log order</label>
+      <span class='input-wrapper flex-col'>
+        <label for='select-impl'>Storage impl:</label>
+        <select id='select-impl'>
+          <option value='virtualfs'>Virtual filesystem</option>
+          <option value='memdb'>:memory:</option>
+          <option value='wasmfs-opfs'>WASMFS OPFS</option>
+          <option value='websql'>WebSQL</option>
+        </select>
       </span>
     </div>
     <hr>
-    <div id='reverse-log-notice' class='hidden'>(Log output is in reverse order, newest first!)</div>
+      <span class='input-wrapper'>
+        <input type='checkbox' class='disable-during-eval' id='cb-reverse-log-order' checked></input>
+        <label for='cb-reverse-log-order'>Reverse log order (newest first)</label>
+      </span>
     <div id='test-output'></div>
     <!-- batch-runner.js "should" work with sqlite3-kvvfs so long as
          its data sets don't violate the the storage limits. -->
-    <!--script src="sqlite3-kvvfs.js"></script-->
-    <script src="sqlite3.js"></script>
+    <script src="sqlite3-wasmfs.js"></script>
     <script src="common/SqliteTestUtil.js"></script>
     <script src="batch-runner.js"></script>
+    <style>
+      .flex-col {
+          display: flex;
+          flex-direction: column;
+      }
+      #toolbar {
+          display: flex;
+          flex-direction: row;
+          flex-wrap: wrap;
+      }
+      #toolbar > * {
+          margin: 0.25em;
+      }
+    </style>
   </body>
 </html>
diff --git a/ext/wasm/batch-runner.js b/ext/wasm/batch-runner.js
index 24e28f6eac..7b671c9ea1 100644
--- a/ext/wasm/batch-runner.js
+++ b/ext/wasm/batch-runner.js
@@ -19,30 +19,110 @@
   const warn = console.warn.bind(console);
   let sqlite3;
 
+  /** Throws if the given sqlite3 result code is not 0. */
+  const checkSqliteRc = (dbh,rc)=>{
+    if(rc) toss("Prepare failed:",sqlite3.capi.sqlite3_errmsg(dbh));
+  };
+
+  const sqlToDrop = [
+    "SELECT type,name FROM sqlite_schema ",
+    "WHERE name NOT LIKE 'sqlite\\_%' escape '\\' ",
+    "AND name NOT LIKE '\\_%' escape '\\'"
+  ].join('');
+  
+  const clearDbWebSQL = function(db){
+    db.handle.transaction(function(tx){
+      const onErr = (e)=>console.error(e);
+      const callback = function(tx, result){
+        const rows = result.rows;
+        let i, n;
+        i = n = rows.length;
+        while(i--){
+          const row = rows.item(i);
+          const name = JSON.stringify(row.name);
+          const type = row.type;
+          switch(type){
+              case 'table': case 'view': case 'trigger':{
+                const sql2 = 'DROP '+type+' '+name;
+                warn(db.id,':',sql2);
+                tx.executeSql(sql2, [], atEnd, onErr);
+                break;
+              }
+              default:
+                warn("Unhandled db entry type:",type,name);
+                break;
+          }
+        }
+      };
+      tx.executeSql(sqlToDrop, [], callback, onErr);
+      db.handle.changeVersion(db.handle.version, "", ()=>{}, onErr, ()=>{});
+    });
+  };
+
+  const clearDbSqlite = function(db){
+    // This would be SO much easier with the oo1 API, but we specifically want to
+    // inject metrics we can't get via that API, and we cannot reliably (OPFS)
+    // open the same DB twice to clear it using that API, so...
+    let pStmt = 0, pSqlBegin;
+    const capi = sqlite3.capi, wasm = capi.wasm;
+    const scope = wasm.scopedAllocPush();
+    try {
+      const toDrop = [];
+      const ppStmt = wasm.scopedAllocPtr();
+      let rc = capi.sqlite3_prepare_v2(db.handle, sqlToDrop, -1, ppStmt, null);
+      checkSqliteRc(db.handle,rc);
+      pStmt = wasm.getPtrValue(ppStmt);
+      while(capi.SQLITE_ROW===capi.sqlite3_step(pStmt)){
+        toDrop.push(capi.sqlite3_column_text(pStmt,0),
+                    capi.sqlite3_column_text(pStmt,1));
+      }
+      capi.sqlite3_finalize(pStmt);
+      pStmt = 0;
+      while(toDrop.length){
+        const name = toDrop.pop();
+        const type = toDrop.pop();
+        let sql2;
+        switch(type){
+            case 'table': case 'view': case 'trigger':
+              sql2 = 'DROP '+type+' '+name;
+              break;
+            default:
+              warn("Unhandled db entry type:",type,name);
+              continue;
+        }
+        wasm.setPtrValue(ppStmt, 0);
+        warn(db.id,':',sql2);
+        rc = capi.sqlite3_prepare_v2(db.handle, sql2, -1, ppStmt, null);
+        checkSqliteRc(db.handle,rc);
+        pStmt = wasm.getPtrValue(ppStmt);
+        capi.sqlite3_step(pStmt);
+        capi.sqlite3_finalize(pStmt);
+        pStmt = 0;
+      }        
+    }finally{
+      if(pStmt) capi.sqlite3_finalize(pStmt);
+      wasm.scopedAllocPop(scope);
+    }
+  };
+
+  
+  const E = (s)=>document.querySelector(s);
   const App = {
     e: {
-      output: document.querySelector('#test-output'),
-      selSql: document.querySelector('#sql-select'),
-      btnRun: document.querySelector('#sql-run'),
-      btnRunNext: document.querySelector('#sql-run-next'),
-      btnRunRemaining: document.querySelector('#sql-run-remaining'),
-      btnExportMetrics: document.querySelector('#export-metrics'),
-      btnClear: document.querySelector('#output-clear'),
-      btnReset: document.querySelector('#db-reset'),
-      cbReverseLog: document.querySelector('#cb-reverse-log-order')
+      output: E('#test-output'),
+      selSql: E('#sql-select'),
+      btnRun: E('#sql-run'),
+      btnRunNext: E('#sql-run-next'),
+      btnRunRemaining: E('#sql-run-remaining'),
+      btnExportMetrics: E('#export-metrics'),
+      btnClear: E('#output-clear'),
+      btnReset: E('#db-reset'),
+      cbReverseLog: E('#cb-reverse-log-order'),
+      selImpl: E('#select-impl')
     },
     db: Object.create(null),
+    dbs: Object.create(null),
     cache:{},
-    metrics:{
-      /**
-         Map of sql-file to timing metrics. We currently only store
-         the most recent run of each file, but we really should store
-         all runs so that we can average out certain values which vary
-         significantly across runs. e.g. a mandelbrot-generating query
-         will have a wide range of runtimes when run 10 times in a
-         row.         
-      */
-    },
     log: console.log.bind(console),
     warn: console.warn.bind(console),
     cls: function(){this.e.output.innerHTML = ''},
@@ -62,47 +142,159 @@
       if(1) this.logHtml2('error', ...args);
     },
 
-    openDb: function(fn, unlinkFirst=true){
-      if(this.db.ptr){
-        toss("Already have an opened db.");
-      }
+    execSql: async function(name,sql){
+      const db = this.getSelectedDb();
+      const banner = "========================================";
+      this.logHtml(banner,
+                   "Running",name,'('+sql.length,'bytes) using',db.id);
       const capi = this.sqlite3.capi, wasm = capi.wasm;
+      let pStmt = 0, pSqlBegin;
       const stack = wasm.scopedAllocPush();
-      let pDb = 0;
-      try{
-        if(unlinkFirst && fn){
-          if(':'!==fn[0]) capi.wasm.sqlite3_wasm_vfs_unlink(fn);
-          this.clearStorage();
-        }
-        const oFlags = capi.SQLITE_OPEN_CREATE | capi.SQLITE_OPEN_READWRITE;
-        const ppDb = wasm.scopedAllocPtr();
-        const rc = capi.sqlite3_open_v2(fn, ppDb, oFlags, null);
-        pDb = wasm.getPtrValue(ppDb)
-        if(rc){
-          if(pDb) capi.sqlite3_close_v2(pDb);
-          toss("sqlite3_open_v2() failed with code",rc);
-        }
-      }finally{
-        wasm.scopedAllocPop(stack);
+      const metrics = db.metrics = Object.create(null);
+      metrics.prepTotal = metrics.stepTotal = 0;
+      metrics.stmtCount = 0;
+      metrics.malloc = 0;
+      metrics.strcpy = 0;
+      this.blockControls(true);
+      if(this.gotErr){
+        this.logErr("Cannot run SQL: error cleanup is pending.");
+        return;
       }
-      this.db.filename = fn;
-      this.db.ptr = pDb;
-      this.logHtml("Opened db:",fn);
-      return this.db.ptr;
-    },
+      // Run this async so that the UI can be updated for the above header...
+      const dumpMetrics = ()=>{
+        metrics.evalSqlEnd = performance.now();
+        metrics.evalTimeTotal = (metrics.evalSqlEnd - metrics.evalSqlStart);
+        this.logHtml(db.id,"metrics:");//,JSON.stringify(metrics, undefined, ' '));
+        this.logHtml("prepare() count:",metrics.stmtCount);
+        this.logHtml("Time in prepare_v2():",metrics.prepTotal,"ms",
+                     "("+(metrics.prepTotal / metrics.stmtCount),"ms per prepare())");
+        this.logHtml("Time in step():",metrics.stepTotal,"ms",
+                     "("+(metrics.stepTotal / metrics.stmtCount),"ms per step())");
+        this.logHtml("Total runtime:",metrics.evalTimeTotal,"ms");
+        this.logHtml("Overhead (time - prep - step):",
+                     (metrics.evalTimeTotal - metrics.prepTotal - metrics.stepTotal)+"ms");
+        this.logHtml(banner,"End of",name);
+      };
 
-    closeDb: function(unlink=false){
-      if(this.db.ptr){
-        this.sqlite3.capi.sqlite3_close_v2(this.db.ptr);
-        this.logHtml("Closed db",this.db.filename);
-        if(unlink){
-          capi.wasm.sqlite3_wasm_vfs_unlink(this.db.filename);
-          this.clearStorage();
-        }
-        this.db.ptr = this.db.filename = undefined;
+      let runner;
+      if('websql'===db.id){
+        runner = function(resolve, reject){
+          /* WebSQL cannot execute multiple statements, nor can it execute SQL without
+             an explicit transaction. Thus we have to do some fragile surgery on the
+             input SQL. Since we're only expecting carefully curated inputs, the hope is
+             that this will suffice. */
+          metrics.evalSqlStart = performance.now();
+          const sqls = sql.split(/;+\n/);
+          const rxBegin = /^BEGIN/i, rxCommit = /^COMMIT/i, rxComment = /^\s*--/;
+          try {
+            const nextSql = ()=>{
+              let x = sqls.shift();
+              while(x && rxComment.test(x)) x = sqls.shift();
+              return x && x.trim();
+            };
+            const transaction = function(tx){
+              let s;
+              for(;s = nextSql(); s = s.nextSql()){
+                if(rxBegin.test(s)) continue;
+                else if(rxCommit.test(s)) break;
+                ++metrics.stmtCount;
+                const t = performance.now();
+                tx.executeSql(s);
+                metrics.stepTotal += performance.now() - t;
+              }
+            };
+            while(sqls.length){
+              db.handle.transaction(transaction);
+            }
+            resolve(this);
+          }catch(e){
+            this.gotErr = e;
+            reject(e);
+            return;
+          }
+        }.bind(this);
+      }else{/*sqlite3 db...*/
+        runner = function(resolve, reject){
+          metrics.evalSqlStart = performance.now();
+          try {
+            let t;
+            let sqlByteLen = sql.byteLength;
+            const [ppStmt, pzTail] = wasm.scopedAllocPtr(2);
+            t = performance.now();
+            pSqlBegin = wasm.scopedAlloc( sqlByteLen + 1/*SQL + NUL*/) || toss("alloc(",sqlByteLen,") failed");
+            metrics.malloc = performance.now() - t;
+            metrics.byteLength = sqlByteLen;
+            let pSql = pSqlBegin;
+            const pSqlEnd = pSqlBegin + sqlByteLen;
+            t = performance.now();
+            wasm.heap8().set(sql, pSql);
+            wasm.setMemValue(pSql + sqlByteLen, 0);
+            metrics.strcpy = performance.now() - t;
+            let breaker = 0;
+            while(pSql && wasm.getMemValue(pSql,'i8')){
+              wasm.setPtrValue(ppStmt, 0);
+              wasm.setPtrValue(pzTail, 0);
+              t = performance.now();
+              let rc = capi.sqlite3_prepare_v3(
+                db.handle, pSql, sqlByteLen, 0, ppStmt, pzTail
+              );
+              metrics.prepTotal += performance.now() - t;
+              checkSqliteRc(db.handle, rc);
+              pStmt = wasm.getPtrValue(ppStmt);
+              pSql = wasm.getPtrValue(pzTail);
+              sqlByteLen = pSqlEnd - pSql;
+              if(!pStmt) continue/*empty statement*/;
+              ++metrics.stmtCount;
+              t = performance.now();
+              rc = capi.sqlite3_step(pStmt);
+              capi.sqlite3_finalize(pStmt);
+              pStmt = 0;
+              metrics.stepTotal += performance.now() - t;
+              switch(rc){
+                  case capi.SQLITE_ROW:
+                  case capi.SQLITE_DONE: break;
+                  default: checkSqliteRc(db.handle, rc); toss("Not reached.");
+              }
+            }
+            resolve(this);
+          }catch(e){
+            if(pStmt) capi.sqlite3_finalize(pStmt);
+            this.gotErr = e;
+            reject(e);
+            return;
+          }finally{
+            wasm.scopedAllocPop(stack);
+          }
+        }.bind(this);
       }
+      let p;
+      if(1){
+        p = new Promise(function(res,rej){
+          setTimeout(()=>runner(res, rej), 50)/*give UI a chance to output the "running" banner*/;
+        });
+      }else{
+        p = new Promise(runner);
+      }
+      return p.catch(
+        (e)=>this.logErr("Error via execSql("+name+",...):",e.message)
+      ).finally(()=>{
+        dumpMetrics();
+        this.blockControls(false);
+      });
     },
-
+    
+    clearDb: function(){
+      const db = this.getSelectedDb();
+      if('websql'===db.id){
+        this.logErr("TODO: clear websql db.");
+        return;
+      }
+      if(!db.handle) return;
+      const capi = this.sqlite3, wasm = capi.wasm;
+      //const scope = wasm.scopedAllocPush(
+      this.logErr("TODO: clear db");
+    },
+    
     /**
        Loads batch-runner.list and populates the selection list from
        it. Returns a promise which resolves to nothing in particular
@@ -123,7 +315,7 @@
         }
         if(!r.ok) toss("Loading",infile,"failed:",r.statusText);
         txt = await r.text();
-        const warning = document.querySelector('#warn-list');
+        const warning = E('#warn-list');
         if(warning) warning.remove();
       }catch(e){
         this.logErr(e.message);
@@ -169,13 +361,6 @@
       return sql;
     }/*fetchFile()*/,
 
-    /** Throws if the given sqlite3 result code is not 0. */
-    checkRc: function(rc){
-      if(this.db.ptr && rc){
-        toss("Prepare failed:",this.sqlite3.capi.sqlite3_errmsg(this.db.ptr));
-      }
-    },
-
     /** Disable or enable certain UI controls. */
     blockControls: function(disable){
       document.querySelectorAll('.disable-during-eval').forEach((e)=>e.disabled = disable);
@@ -191,11 +376,11 @@
       const rc = [];
       Object.keys(this.metrics).sort().forEach((k)=>{
         const m = this.metrics[k];
-        delete m.evalFileStart;
-        delete m.evalFileEnd;
+        delete m.evalSqlStart;
+        delete m.evalSqlEnd;
         const mk = Object.keys(m).sort();
         if(!rc.length){
-          rc.push(['file', ...mk]);
+          rc.push(['db', ...mk]);
         }
         const row = [k.split('/').pop()/*remove dir prefix from filename*/];
         rc.push(row);
@@ -205,6 +390,10 @@
     },
 
     metricsToBlob: function(colSeparator='\t'){
+      if(1){
+        this.logErr("TODO: re-do metrics dump");
+        return;
+      }
       const ar = [], ma = this.metricsToArrays();
       if(!ma.length){
         this.logErr("Metrics are empty. Run something.");
@@ -239,114 +428,84 @@
     */
     evalFile: async function(fn){
       const sql = await this.fetchFile(fn);
-      const banner = "========================================";
-      this.logHtml(banner,
-                   "Running",fn,'('+sql.length,'bytes)...');
-      const capi = this.sqlite3.capi, wasm = capi.wasm;
-      let pStmt = 0, pSqlBegin;
-      const stack = wasm.scopedAllocPush();
-      const metrics = this.metrics[fn] = Object.create(null);
-      metrics.prepTotal = metrics.stepTotal = 0;
-      metrics.stmtCount = 0;
-      metrics.malloc = 0;
-      metrics.strcpy = 0;
-      this.blockControls(true);
-      if(this.gotErr){
-        this.logErr("Cannot run ["+fn+"]: error cleanup is pending.");
-        return;
-      }
-      // Run this async so that the UI can be updated for the above header...
-      const ff = function(resolve, reject){
-        metrics.evalFileStart = performance.now();
-        try {
-          let t;
-          let sqlByteLen = sql.byteLength;
-          const [ppStmt, pzTail] = wasm.scopedAllocPtr(2);
-          t = performance.now();
-          pSqlBegin = wasm.alloc( sqlByteLen + 1/*SQL + NUL*/) || toss("alloc(",sqlByteLen,") failed");
-          metrics.malloc = performance.now() - t;
-          metrics.byteLength = sqlByteLen;
-          let pSql = pSqlBegin;
-          const pSqlEnd = pSqlBegin + sqlByteLen;
-          t = performance.now();
-          wasm.heap8().set(sql, pSql);
-          wasm.setMemValue(pSql + sqlByteLen, 0);
-          metrics.strcpy = performance.now() - t;
-          let breaker = 0;
-          while(pSql && wasm.getMemValue(pSql,'i8')){
-            wasm.setPtrValue(ppStmt, 0);
-            wasm.setPtrValue(pzTail, 0);
-            t = performance.now();
-            let rc = capi.sqlite3_prepare_v3(
-              this.db.ptr, pSql, sqlByteLen, 0, ppStmt, pzTail
-            );
-            metrics.prepTotal += performance.now() - t;
-            this.checkRc(rc);
-            pStmt = wasm.getPtrValue(ppStmt);
-            pSql = wasm.getPtrValue(pzTail);
-            sqlByteLen = pSqlEnd - pSql;
-            if(!pStmt) continue/*empty statement*/;
-            ++metrics.stmtCount;
-            t = performance.now();
-            rc = capi.sqlite3_step(pStmt);
-            capi.sqlite3_finalize(pStmt);
-            pStmt = 0;
-            metrics.stepTotal += performance.now() - t;
-            switch(rc){
-                case capi.SQLITE_ROW:
-                case capi.SQLITE_DONE: break;
-                default: this.checkRc(rc); toss("Not reached.");
-            }
-          }
-        }catch(e){
-          if(pStmt) capi.sqlite3_finalize(pStmt);
-          this.gotErr = e;
-          //throw e;
-          reject(e);
-          return;
-        }finally{
-          wasm.dealloc(pSqlBegin);
-          wasm.scopedAllocPop(stack);
-          this.blockControls(false);
-        }
-        metrics.evalFileEnd = performance.now();
-        metrics.evalTimeTotal = (metrics.evalFileEnd - metrics.evalFileStart);
-        this.logHtml("Metrics:");//,JSON.stringify(metrics, undefined, ' '));
-        this.logHtml("prepare() count:",metrics.stmtCount);
-        this.logHtml("Time in prepare_v2():",metrics.prepTotal,"ms",
-                     "("+(metrics.prepTotal / metrics.stmtCount),"ms per prepare())");
-        this.logHtml("Time in step():",metrics.stepTotal,"ms",
-                     "("+(metrics.stepTotal / metrics.stmtCount),"ms per step())");
-        this.logHtml("Total runtime:",metrics.evalTimeTotal,"ms");
-        this.logHtml("Overhead (time - prep - step):",
-                     (metrics.evalTimeTotal - metrics.prepTotal - metrics.stepTotal)+"ms");
-        this.logHtml(banner,"End of",fn);
-        resolve(this);
-      }.bind(this);
-      let p;
-      if(1){
-        p = new Promise(function(res,rej){
-          setTimeout(()=>ff(res, rej), 50)/*give UI a chance to output the "running" banner*/;
-        });
-      }else{
-        p = new Promise(ff);
-      }
-      return p.catch((e)=>this.logErr("Error via evalFile("+fn+"):",e.message));
+      return this.execSql(fn,sql);
     }/*evalFile()*/,
 
-    clearStorage: function(){
-      const sz = sqlite3.capi.sqlite3_web_kvvfs_size();
-      const n = sqlite3.capi.sqlite3_web_kvvfs_clear(this.db.filename || '');
-      this.logHtml("Cleared kvvfs local/sessionStorage:",
-                   n,"entries totaling approximately",sz,"bytes.");
+    /**
+       Clears all DB tables in all _opened_ databases. Because of
+       disparities between backends, we cannot simply "unlink" the
+       databases to clean them up.
+    */
+    clearStorage: function(onlySelectedDb=false){
+      const list = onlySelectDb
+            ? [('boolean'===typeof onlySelectDb)
+                ? this.dbs[this.e.selImpl.value]
+                : onlySelectDb]
+            : Object.values(this.dbs);
+      for(let db of list){
+        if(db && db.handle){
+          this.logHtml("Clearing db",db.id);
+          d.clear();
+        }
+      }
     },
 
-    resetDb: function(){
-      if(this.db.ptr){
-        const fn = this.db.filename;
-        this.closeDb(true);
-        this.openDb(fn,false);
+    /**
+       Fetches the handle of the db associated with
+       this.e.selImpl.value, opening it if needed.
+    */
+    getSelectedDb: function(){
+      if(!this.dbs.memdb){
+        for(let opt of this.e.selImpl.options){
+          const d = this.dbs[opt.value] = Object.create(null);
+          d.id = opt.value;
+          switch(d.id){
+              case 'virtualfs':
+                d.filename = 'file:/virtualfs.sqlite3?vfs=unix-none';
+                break;
+              case 'memdb':
+                d.filename = ':memory:';
+                break;
+              case 'wasmfs-opfs':
+                d.filename = 'file:'+(this.sqlite3.capi.sqlite3_wasmfs_opfs_dir())+'/wasmfs-opfs.sqlite3';
+                break;
+              case 'websql':
+                d.filename = 'websql.db';
+                break;
+              default:
+                this.logErr("Unhandled db selection option (see details in the console).",opt);
+                toss("Unhandled db init option");
+          }
+        }
+      }/*first-time init*/
+      const dbId = this.e.selImpl.value;
+      const d = this.dbs[dbId];
+      if(d.handle) return d;
+      if('websql' === dbId){
+        d.handle = self.openDatabase('batch-runner', '0.1', 'foo', 1024 * 1024 * 50);
+        d.clear = ()=>clearDbWebSQL(d);
+      }else{
+        const capi = this.sqlite3.capi, wasm = capi.wasm;
+        const stack = wasm.scopedAllocPush();
+        let pDb = 0;
+        try{
+          const oFlags = capi.SQLITE_OPEN_CREATE | capi.SQLITE_OPEN_READWRITE;
+          const ppDb = wasm.scopedAllocPtr();
+          const rc = capi.sqlite3_open_v2(d.filename, ppDb, oFlags, null);
+          pDb = wasm.getPtrValue(ppDb)
+          if(rc) toss("sqlite3_open_v2() failed with code",rc);
+        }catch(e){
+          if(pDb) capi.sqlite3_close_v2(pDb);
+        }finally{
+          wasm.scopedAllocPop(stack);
+        }
+        d.handle = pDb;
+        d.clear = ()=>clearDbSqlite(d);
       }
+      d.clear();
+      this.logHtml("Opened db:",dbId);
+      console.log("db =",d);
+      return d;
     },
 
     run: function(sqlite3){
@@ -356,38 +515,24 @@
       this.logHtml("Loaded module:",capi.sqlite3_libversion(), capi.sqlite3_sourceid());
       this.logHtml("WASM heap size =",wasm.heap8().length);
       this.loadSqlList();
-      let pDir, dbFile;
-      if(sqlite3.capi.sqlite3_vfs_find('kvvfs')){
-        dbFile = 1 ? 'local' : 'session';
-        this.logHtml("Using KVVFS storage:",dbFile);
+      if(capi.sqlite3_wasmfs_opfs_dir()){
+        E('#warn-opfs').classList.remove('hidden');
       }else{
-        pDir = capi.sqlite3_wasmfs_opfs_dir();
-        if(pDir){
-          dbFile = pDir+"/speedtest.db";
-          this.logHtml("Using persistent storage:",dbFile);
-        }else{
-          dbFile = ':memory:';
-          this.logHtml("Using",dbFile,"storage.");
-        }
+        E('#warn-opfs').remove();
+        E('option[value=wasmfs-opfs]').disabled = true;
       }
-      if(!pDir){
-        document.querySelector('#warn-opfs').remove();
+      if('function' === typeof self.openDatabase){
+        E('#warn-websql').classList.remove('hidden');
+      }else{
+        E('option[value=websql]').disabled = true;
+        E('#warn-websql').remove();
       }
-      this.openDb(dbFile, true);
       const who = this;
-      const eReverseLogNotice = document.querySelector('#reverse-log-notice');
       if(this.e.cbReverseLog.checked){
-        eReverseLogNotice.classList.remove('hidden');
         this.e.output.classList.add('reverse');
       }
       this.e.cbReverseLog.addEventListener('change', function(){
-        if(this.checked){
-          who.e.output.classList.add('reverse');
-          eReverseLogNotice.classList.remove('hidden');
-        }else{
-          who.e.output.classList.remove('reverse');
-          eReverseLogNotice.classList.add('hidden');
-        }
+        who.e.output.classList[this.checked ? 'add' : 'remove']('reverse');
       }, false);
       this.e.btnClear.addEventListener('click', ()=>this.cls(), false);
       this.e.btnRun.addEventListener('click', function(){
@@ -400,7 +545,7 @@
         who.evalFile(who.e.selSql.value);
       }, false);
       this.e.btnReset.addEventListener('click', function(){
-        who.resetDb();
+        who.clearStorage(true);
       }, false);
       this.e.btnExportMetrics.addEventListener('click', function(){
         who.logHtml2('warning',"Triggering download of metrics CSV. Check your downloads folder.");
@@ -408,6 +553,9 @@
         //const m = who.metricsToArrays();
         //console.log("Metrics:",who.metrics, m);
       });
+      this.e.selImpl.addEventListener('change', function(){
+        who.getSelectedDb();
+      });
       this.e.btnRunRemaining.addEventListener('click', async function(){
         let v = who.e.selSql.value;
         const timeStart = performance.now();
@@ -430,6 +578,7 @@
   self.sqlite3TestModule.initSqlite3().then(function(theEmccModule){
     self._MODULE = theEmccModule /* this is only to facilitate testing from the console */;
     sqlite3 = theEmccModule.sqlite3;
+    console.log("App",App);
     App.run(theEmccModule.sqlite3);
   });
 })();
diff --git a/ext/wasm/wasmfs.make b/ext/wasm/wasmfs.make
index ccfd9063b4..daa074513d 100644
--- a/ext/wasm/wasmfs.make
+++ b/ext/wasm/wasmfs.make
@@ -83,7 +83,7 @@ $(sqlite3-wasmfs.js): $(sqlite3-wasmfs.wasm.c) $(sqlite3-wasm.c) $(sqlite3-wasmf
     $(post-js.js)
 	@echo "Building $@ ..."
 	$(emcc.bin) -o $@ $(emcc_opt) $(emcc.flags) \
-      $(sqlite3-wasmfs.cflags) $(speedtest1-common.eflags) $(sqlite3-wasmfs.jsflags) $(sqlite3-wasmfs.wasm.c) $(sqlite3-wasmfs.extra.c)
+      $(sqlite3-wasmfs.cflags) $(sqlite3-wasmfs.jsflags) $(sqlite3-wasmfs.wasm.c) $(sqlite3-wasmfs.extra.c)
 	chmod -x $(sqlite3-wasmfs.wasm)
 	$(maybe-wasm-strip) $(sqlite3-wasmfs.wasm)
 	@ls -la $@ $(sqlite3-wasmfs.wasm)
@@ -99,7 +99,6 @@ speedtest1-wasmfs.js := speedtest1-wasmfs.js
 speedtest1-wasmfs.wasm := $(subst .js,.wasm,$(speedtest1-wasmfs.js))
 speedtest1-wasmfs.eflags := $(sqlite3-wasmfs.fsflags)
 speedtest1-wasmfs.eflags += $(SQLITE_OPT) -DSQLITE_WASM_WASMFS
-speedtest1-wasmfs.eflags += --post-js=$(sqlite3-wasmfs.js)
 $(speedtest1-wasmfs.js): $(MAKEFILE) $(MAKEFILE.wasmfs)
 #$(speedtest1-wasmfs.js): $(sqlite3-wasmfs.js)
 $(speedtest1-wasmfs.js): $(speedtest1.cs) $(sqlite3-wasmfs.js) \
diff --git a/manifest b/manifest
index 5a971e1b74..465c029488 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Work\saround\sbroken\s-Os\swasm\sbuilds\sby\sadding\sthe\s-g3\sflag.\sUnrelated\sdocumentation\stweaks.
-D 2022-09-28T07:53:47.790
+C Correct\sduplicate\scopies\sof\ssqlite3-api.js\sbeing\sembedded\sin\sthe\swasmfs-based\sbuilds.
+D 2022-09-28T13:01:49.194
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle 0e88c8cfc3719e4b7e74980d9da664c709e68acf863e48386cda376edfd3bfb0
-F ext/wasm/GNUmakefile 984c33a37fa34786d6be2c79ef19421b3c1a054dfdb56ea09313077de4aa19f6
+F ext/wasm/GNUmakefile 86ee7562063275779b108957db5bc7fdb18df4f6c506abbe28132b4fb071988e
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 77a5ee8bd209b5e75dd0e822bc3f6e7319dc9b36431463d4175c775170f92126
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -489,8 +489,8 @@ F ext/wasm/api/sqlite3-api-prologue.js 2a0dedb8127e8983d3199edea55151a45186b4626
 F ext/wasm/api/sqlite3-api-worker1.js d5d5b7fac4c4731c38c7e03f4f404b2a95c388a2a1d8bcf361caada572f107e0
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c b756b9c1fee9d0598f715e6df6bf089b750da24aa91bb7ef9277a037d81e7612
-F ext/wasm/batch-runner.html 2857a6db7292ac83d1581af865d643fd34235db2df830d10b43b01388c599e04
-F ext/wasm/batch-runner.js b1f443bc63a779aac97ba6d54fc731a707ece2783b94e3b019abbfa79108e9a1
+F ext/wasm/batch-runner.html 168fda0f66369edec6427991683af3ed3919f3713158b70571d296f9a269a281
+F ext/wasm/batch-runner.js c8d13f673a68e2094264a0284f8775dbda4a12e609d20c501316fe641a05c760
 F ext/wasm/common/SqliteTestUtil.js c997c12188c97109f344701a58dd627b9c0f98f32cc6a88413f6171f2191531c
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 3a5143699c2b73a85b962271e1a9b3241b30d90e30d895e4f55665e648572962
@@ -530,7 +530,7 @@ F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d766
 F ext/wasm/testing1.js 20b37766d29815180e2e932bfc6132b649403ece1f1bf612a4712db131287970
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
 F ext/wasm/testing2.js 34737da985c4cbd4812b2e7f200942662cae991c5a58ffa5d0350be089d0d410
-F ext/wasm/wasmfs.make 52f24bc9c10e404d26bd0b0ee28d450269808a78e359d6ddedc45d31e7b9c29c
+F ext/wasm/wasmfs.make fb4d0b4a6596ec2ed7815508a43b77bd7d14d3910ac387eb795643e33f5a3652
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
@@ -2026,8 +2026,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 093f6e4b36db294e8e47df2fc75a4bc4fc101e2b6ff0201c912ccd1dcf394479
-R f13bcaf00e26043effcfda9235e61887
+P f5d6bf8616341037fa3e229edf820d19acef3e0a6207a652b2b143de0a493214
+R 2d5aa67e77362d00ccd0491d8ca53ec4
 U stephan
-Z ec2d0b4aa25d1549f3750ebec3c29f7f
+Z c9260f6deeb302437c703eb12e2e08ac
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 3e1ed3faa8..85803c958d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f5d6bf8616341037fa3e229edf820d19acef3e0a6207a652b2b143de0a493214
\ No newline at end of file
+bbfcfba260f39a9c91e82d87e06b1c2cb297c03498b4530aa3e7e01ef9916012
\ No newline at end of file

From cb22bd80d28750425101ad1f591aea045f762341 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 28 Sep 2022 17:52:52 +0000
Subject: [PATCH 177/428] More work on batch-runner.html/js to facilitate speed
 comparisons between various VFSes and WebSQL.

FossilOrigin-Name: 3bd1bc240676e56da87fc49f3c67a1edc4fafcf2a2416298d19ae4f80b676a72
---
 ext/wasm/batch-runner.html |  42 ++++++------
 ext/wasm/batch-runner.js   | 130 +++++++++++++++++++++++--------------
 manifest                   |  14 ++--
 manifest.uuid              |   2 +-
 4 files changed, 111 insertions(+), 77 deletions(-)

diff --git a/ext/wasm/batch-runner.html b/ext/wasm/batch-runner.html
index bac80f3459..a07fe930ac 100644
--- a/ext/wasm/batch-runner.html
+++ b/ext/wasm/batch-runner.html
@@ -41,25 +41,27 @@
       SQL statements, and not used within string literals or the like.
     </p>
     <hr>
-    <div id='toolbar'>
-      <select class='disable-during-eval' id='sql-select'>
-        <option disabled selected>Populated via script code</option>
-      </select>
-      <button class='disable-during-eval' id='sql-run'>Run selected SQL</button>
-      <button class='disable-during-eval' id='sql-run-next'>Run next...</button>
-      <button class='disable-during-eval' id='sql-run-remaining'>Run all remaining...</button>
-      <button class='disable-during-eval' id='export-metrics'>Export metrics (WIP)</button>
-      <button class='disable-during-eval' id='db-reset'>Reset db</button>
-      <button id='output-clear'>Clear output</button>
-      <span class='input-wrapper flex-col'>
-        <label for='select-impl'>Storage impl:</label>
-        <select id='select-impl'>
-          <option value='virtualfs'>Virtual filesystem</option>
-          <option value='memdb'>:memory:</option>
-          <option value='wasmfs-opfs'>WASMFS OPFS</option>
-          <option value='websql'>WebSQL</option>
+    <fieldset id='toolbar'>
+      <div>
+        <select class='disable-during-eval' id='sql-select'>
+          <option disabled selected>Populated via script code</option>
         </select>
-      </span>
+        <button class='disable-during-eval' id='sql-run'>Run selected SQL</button>
+        <button class='disable-during-eval' id='sql-run-next'>Run next...</button>
+        <button class='disable-during-eval' id='sql-run-remaining'>Run all remaining...</button>
+        <button class='disable-during-eval' id='export-metrics' disabled>Export metrics (WIP)<br>(broken by refactoring)</button>
+        <button class='disable-during-eval' id='db-reset'>Reset db</button>
+        <button id='output-clear'>Clear output</button>
+        <span class='input-wrapper flex-col'>
+          <label for='select-impl'>Storage impl:</label>
+          <select id='select-impl'>
+            <option value='virtualfs'>Virtual filesystem</option>
+            <option value='memdb'>:memory:</option>
+            <option value='wasmfs-opfs'>WASMFS OPFS</option>
+            <option value='websql'>WebSQL</option>
+          </select>
+        </span>
+      </fieldset>
     </div>
     <hr>
       <span class='input-wrapper'>
@@ -77,12 +79,12 @@
           display: flex;
           flex-direction: column;
       }
-      #toolbar {
+      #toolbar > div {
           display: flex;
           flex-direction: row;
           flex-wrap: wrap;
       }
-      #toolbar > * {
+      #toolbar > div > * {
           margin: 0.25em;
       }
     </style>
diff --git a/ext/wasm/batch-runner.js b/ext/wasm/batch-runner.js
index 7b671c9ea1..26a7cbbba7 100644
--- a/ext/wasm/batch-runner.js
+++ b/ext/wasm/batch-runner.js
@@ -42,14 +42,14 @@
           const name = JSON.stringify(row.name);
           const type = row.type;
           switch(type){
-              case 'table': case 'view': case 'trigger':{
+              case 'index': case 'table':
+              case 'trigger': case 'view': {
                 const sql2 = 'DROP '+type+' '+name;
-                warn(db.id,':',sql2);
-                tx.executeSql(sql2, [], atEnd, onErr);
+                tx.executeSql(sql2, [], ()=>{}, onErr);
                 break;
               }
               default:
-                warn("Unhandled db entry type:",type,name);
+                warn("Unhandled db entry type:",type,'name =',name);
                 break;
           }
         }
@@ -78,17 +78,24 @@
       }
       capi.sqlite3_finalize(pStmt);
       pStmt = 0;
-      while(toDrop.length){
+      let doBreak = !toDrop.length;
+      while(!doBreak){
         const name = toDrop.pop();
         const type = toDrop.pop();
         let sql2;
-        switch(type){
-            case 'table': case 'view': case 'trigger':
-              sql2 = 'DROP '+type+' '+name;
-              break;
-            default:
-              warn("Unhandled db entry type:",type,name);
-              continue;
+        if(name){
+          switch(type){
+              case 'table': case 'view': case 'trigger': case 'index':
+                sql2 = 'DROP '+type+' '+name;
+                break;
+              default:
+                warn("Unhandled db entry type:",type,name);
+                continue;
+          }
+        }else{
+          sql2 = "VACUUM";
+          doBreak = true;
+          break;
         }
         wasm.setPtrValue(ppStmt, 0);
         warn(db.id,':',sql2);
@@ -118,7 +125,8 @@
       btnClear: E('#output-clear'),
       btnReset: E('#db-reset'),
       cbReverseLog: E('#cb-reverse-log-order'),
-      selImpl: E('#select-impl')
+      selImpl: E('#select-impl'),
+      fsToolbar: E('#toolbar')
     },
     db: Object.create(null),
     dbs: Object.create(null),
@@ -161,10 +169,10 @@
         return;
       }
       // Run this async so that the UI can be updated for the above header...
-      const dumpMetrics = ()=>{
+      const endRun = ()=>{
         metrics.evalSqlEnd = performance.now();
         metrics.evalTimeTotal = (metrics.evalSqlEnd - metrics.evalSqlStart);
-        this.logHtml(db.id,"metrics:");//,JSON.stringify(metrics, undefined, ' '));
+        this.logHtml(db.id,"metrics:",JSON.stringify(metrics, undefined, ' '));
         this.logHtml("prepare() count:",metrics.stmtCount);
         this.logHtml("Time in prepare_v2():",metrics.prepTotal,"ms",
                      "("+(metrics.prepTotal / metrics.stmtCount),"ms per prepare())");
@@ -182,35 +190,59 @@
           /* WebSQL cannot execute multiple statements, nor can it execute SQL without
              an explicit transaction. Thus we have to do some fragile surgery on the
              input SQL. Since we're only expecting carefully curated inputs, the hope is
-             that this will suffice. */
-          metrics.evalSqlStart = performance.now();
+             that this will suffice. PS: it also can't run most SQL functions, e.g. even
+             instr() results in "not authorized". */
+          if('string'!==typeof sql){ // assume TypedArray
+            sql = new TextDecoder().decode(sql);
+          }
+          sql = sql.replace(/-- [^\n]+\n/g,''); // comment lines interfere with our split()
           const sqls = sql.split(/;+\n/);
-          const rxBegin = /^BEGIN/i, rxCommit = /^COMMIT/i, rxComment = /^\s*--/;
+          const rxBegin = /^BEGIN/i, rxCommit = /^COMMIT/i;
           try {
             const nextSql = ()=>{
               let x = sqls.shift();
-              while(x && rxComment.test(x)) x = sqls.shift();
+              while(sqls.length && !x) x = sqls.shift();
               return x && x.trim();
             };
+            const who = this;
             const transaction = function(tx){
-              let s;
-              for(;s = nextSql(); s = s.nextSql()){
-                if(rxBegin.test(s)) continue;
-                else if(rxCommit.test(s)) break;
-                ++metrics.stmtCount;
-                const t = performance.now();
-                tx.executeSql(s);
-                metrics.stepTotal += performance.now() - t;
+              try {
+                let s;
+                /* Try to approximate the spirit of the input scripts
+                   by running batches bound by BEGIN/COMMIT statements. */
+                for(s = nextSql(); !!s; s = nextSql()){
+                  if(rxBegin.test(s)) continue;
+                  else if(rxCommit.test(s)) break;
+                  //console.log("websql sql again",sqls.length, s);
+                  ++metrics.stmtCount;
+                  const t = performance.now();
+                  tx.executeSql(s,[], ()=>{}, (t,e)=>{
+                    console.error("WebSQL error",e,"SQL =",s);
+                    who.logErr(e.message);
+                    throw e;
+                  });
+                  metrics.stepTotal += performance.now() - t;
+                }
+              }catch(e){
+                who.logErr("transaction():",e.message);
+                throw e;
               }
             };
-            while(sqls.length){
-              db.handle.transaction(transaction);
-            }
-            resolve(this);
+            const n = sqls.length;
+            const nextBatch = function(){
+              if(sqls.length){
+                console.log("websql sqls.length",sqls.length,'of',n);
+                db.handle.transaction(transaction, reject, nextBatch);
+              }else{
+                resolve(who);
+              }
+            };
+            metrics.evalSqlStart = performance.now();
+            nextBatch();
           }catch(e){
-            this.gotErr = e;
+            //this.gotErr = e;
+            console.error("websql error:",e);
             reject(e);
-            return;
           }
         }.bind(this);
       }else{/*sqlite3 db...*/
@@ -259,9 +291,8 @@
             resolve(this);
           }catch(e){
             if(pStmt) capi.sqlite3_finalize(pStmt);
-            this.gotErr = e;
+            //this.gotErr = e;
             reject(e);
-            return;
           }finally{
             wasm.scopedAllocPop(stack);
           }
@@ -278,7 +309,7 @@
       return p.catch(
         (e)=>this.logErr("Error via execSql("+name+",...):",e.message)
       ).finally(()=>{
-        dumpMetrics();
+        endRun();
         this.blockControls(false);
       });
     },
@@ -363,7 +394,8 @@
 
     /** Disable or enable certain UI controls. */
     blockControls: function(disable){
-      document.querySelectorAll('.disable-during-eval').forEach((e)=>e.disabled = disable);
+      //document.querySelectorAll('.disable-during-eval').forEach((e)=>e.disabled = disable);
+      this.e.fsToolbar.disabled = disable;
     },
 
     /**
@@ -374,8 +406,9 @@
     */
     metricsToArrays: function(){
       const rc = [];
-      Object.keys(this.metrics).sort().forEach((k)=>{
-        const m = this.metrics[k];
+      Object.keys(this.dbs).sort().forEach((k)=>{
+        const d = this.dbs[k];
+        const m = d.metrics;
         delete m.evalSqlStart;
         delete m.evalSqlEnd;
         const mk = Object.keys(m).sort();
@@ -384,16 +417,12 @@
         }
         const row = [k.split('/').pop()/*remove dir prefix from filename*/];
         rc.push(row);
-        mk.forEach((kk)=>row.push(m[kk]));
+        row.push(...mk.map((kk)=>m[kk]));
       });
       return rc;
     },
 
     metricsToBlob: function(colSeparator='\t'){
-      if(1){
-        this.logErr("TODO: re-do metrics dump");
-        return;
-      }
       const ar = [], ma = this.metricsToArrays();
       if(!ma.length){
         this.logErr("Metrics are empty. Run something.");
@@ -437,15 +466,15 @@
        databases to clean them up.
     */
     clearStorage: function(onlySelectedDb=false){
-      const list = onlySelectDb
-            ? [('boolean'===typeof onlySelectDb)
+      const list = onlySelectedDb
+            ? [('boolean'===typeof onlySelectedDb)
                 ? this.dbs[this.e.selImpl.value]
-                : onlySelectDb]
+                : onlySelectedDb]
             : Object.values(this.dbs);
       for(let db of list){
         if(db && db.handle){
           this.logHtml("Clearing db",db.id);
-          d.clear();
+          db.clear();
         }
       }
     },
@@ -467,7 +496,9 @@
                 d.filename = ':memory:';
                 break;
               case 'wasmfs-opfs':
-                d.filename = 'file:'+(this.sqlite3.capi.sqlite3_wasmfs_opfs_dir())+'/wasmfs-opfs.sqlite3';
+                d.filename = 'file:'+(
+                  this.sqlite3.capi.sqlite3_wasmfs_opfs_dir()
+                )+'/wasmfs-opfs.sqlite3b';
                 break;
               case 'websql':
                 d.filename = 'websql.db';
@@ -579,6 +610,7 @@
     self._MODULE = theEmccModule /* this is only to facilitate testing from the console */;
     sqlite3 = theEmccModule.sqlite3;
     console.log("App",App);
+    self.App = App;
     App.run(theEmccModule.sqlite3);
   });
 })();
diff --git a/manifest b/manifest
index 465c029488..c6458d81e7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Correct\sduplicate\scopies\sof\ssqlite3-api.js\sbeing\sembedded\sin\sthe\swasmfs-based\sbuilds.
-D 2022-09-28T13:01:49.194
+C More\swork\son\sbatch-runner.html/js\sto\sfacilitate\sspeed\scomparisons\sbetween\svarious\sVFSes\sand\sWebSQL.
+D 2022-09-28T17:52:52.224
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -489,8 +489,8 @@ F ext/wasm/api/sqlite3-api-prologue.js 2a0dedb8127e8983d3199edea55151a45186b4626
 F ext/wasm/api/sqlite3-api-worker1.js d5d5b7fac4c4731c38c7e03f4f404b2a95c388a2a1d8bcf361caada572f107e0
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c b756b9c1fee9d0598f715e6df6bf089b750da24aa91bb7ef9277a037d81e7612
-F ext/wasm/batch-runner.html 168fda0f66369edec6427991683af3ed3919f3713158b70571d296f9a269a281
-F ext/wasm/batch-runner.js c8d13f673a68e2094264a0284f8775dbda4a12e609d20c501316fe641a05c760
+F ext/wasm/batch-runner.html c363032aba7a525920f61f8be112a29459f73f07e46f0ba3b7730081a617826e
+F ext/wasm/batch-runner.js 756528ff41c0a2d81607fe82d088f305c379279cc84661c9422a7993b3ac544d
 F ext/wasm/common/SqliteTestUtil.js c997c12188c97109f344701a58dd627b9c0f98f32cc6a88413f6171f2191531c
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 3a5143699c2b73a85b962271e1a9b3241b30d90e30d895e4f55665e648572962
@@ -2026,8 +2026,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 f5d6bf8616341037fa3e229edf820d19acef3e0a6207a652b2b143de0a493214
-R 2d5aa67e77362d00ccd0491d8ca53ec4
+P bbfcfba260f39a9c91e82d87e06b1c2cb297c03498b4530aa3e7e01ef9916012
+R 0e9f94b500e19b6ceb4224cc315ebb8b
 U stephan
-Z c9260f6deeb302437c703eb12e2e08ac
+Z cfbdefed825643b9f5c5b839e4caa73f
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 85803c958d..85cfc8afd9 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bbfcfba260f39a9c91e82d87e06b1c2cb297c03498b4530aa3e7e01ef9916012
\ No newline at end of file
+3bd1bc240676e56da87fc49f3c67a1edc4fafcf2a2416298d19ae4f80b676a72
\ No newline at end of file

From 4b884bb4c77cb4b1e5059395212160f4ee48cc53 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 28 Sep 2022 18:10:50 +0000
Subject: [PATCH 178/428] Wasm: expose sqlite3_exec() and use it to simplify
 the db-reset logic in batch-runner.js a bit.

FossilOrigin-Name: 2e2821f782511b9d2274a89a5a922582aba18c7e9dc7ce01080e713942a56d7d
---
 ext/wasm/api/sqlite3-api-prologue.js |  7 +++---
 ext/wasm/batch-runner.js             | 32 +++++++++++++---------------
 manifest                             | 14 ++++++------
 manifest.uuid                        |  2 +-
 4 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index efdcab7e41..e0379a646b 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -611,9 +611,10 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     ["sqlite3_errmsg", "string", "sqlite3*"],
     ["sqlite3_error_offset", "int", "sqlite3*"],
     ["sqlite3_errstr", "string", "int"],
-    //["sqlite3_exec", "int", "sqlite3*", "string", "*", "*", "**"],
-    // ^^^ TODO: we need a wrapper to support passing a function pointer or a function
-    // for the callback.
+    ["sqlite3_exec", "int", "sqlite3*", "string", "*", "*", "**"],
+    // TODO?: ^^^ add a wrapper around sqlite3_exec() which accepts a
+    // JS callback function and handles the (un)installation of that
+    // function before/after the exec call.
     ["sqlite3_expanded_sql", "string", "sqlite3_stmt*"],
     ["sqlite3_extended_errcode", "int", "sqlite3*"],
     ["sqlite3_extended_result_codes", "int", "sqlite3*", "int"],
diff --git a/ext/wasm/batch-runner.js b/ext/wasm/batch-runner.js
index 26a7cbbba7..3762998b69 100644
--- a/ext/wasm/batch-runner.js
+++ b/ext/wasm/batch-runner.js
@@ -67,8 +67,9 @@
     const capi = sqlite3.capi, wasm = capi.wasm;
     const scope = wasm.scopedAllocPush();
     try {
-      const toDrop = [];
+      const toDrop = [/* type, name pairs */];
       const ppStmt = wasm.scopedAllocPtr();
+      // Collect list of tables/etc we can drop...
       let rc = capi.sqlite3_prepare_v2(db.handle, sqlToDrop, -1, ppStmt, null);
       checkSqliteRc(db.handle,rc);
       pStmt = wasm.getPtrValue(ppStmt);
@@ -78,34 +79,31 @@
       }
       capi.sqlite3_finalize(pStmt);
       pStmt = 0;
-      let doBreak = !toDrop.length;
-      while(!doBreak){
+      // Build SQL to delete them...
+      const sqlDrop = [];
+      const doDrop = 0!==toDrop.length;
+      while(doDrop){
         const name = toDrop.pop();
-        const type = toDrop.pop();
-        let sql2;
         if(name){
+          const type = toDrop.pop();
           switch(type){
               case 'table': case 'view': case 'trigger': case 'index':
-                sql2 = 'DROP '+type+' '+name;
+                sqlDrop.push('DROP '+type+' '+name);
                 break;
               default:
                 warn("Unhandled db entry type:",type,name);
                 continue;
           }
         }else{
-          sql2 = "VACUUM";
-          doBreak = true;
+          sqlDrop.push("VACUUM");
           break;
         }
-        wasm.setPtrValue(ppStmt, 0);
-        warn(db.id,':',sql2);
-        rc = capi.sqlite3_prepare_v2(db.handle, sql2, -1, ppStmt, null);
-        checkSqliteRc(db.handle,rc);
-        pStmt = wasm.getPtrValue(ppStmt);
-        capi.sqlite3_step(pStmt);
-        capi.sqlite3_finalize(pStmt);
-        pStmt = 0;
-      }        
+      }
+      if(sqlDrop.length){
+        const sqlClean = sqlDrop.join(';\n');
+        console.log("Cleaning up",db.id,":",sqlClean);
+        capi.sqlite3_exec(db.handle, sqlClean, 0, 0, 0);
+      }
     }finally{
       if(pStmt) capi.sqlite3_finalize(pStmt);
       wasm.scopedAllocPop(scope);
diff --git a/manifest b/manifest
index c6458d81e7..f00fee8550 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C More\swork\son\sbatch-runner.html/js\sto\sfacilitate\sspeed\scomparisons\sbetween\svarious\sVFSes\sand\sWebSQL.
-D 2022-09-28T17:52:52.224
+C Wasm:\sexpose\ssqlite3_exec()\sand\suse\sit\sto\ssimplify\sthe\sdb-reset\slogic\sin\sbatch-runner.js\sa\sbit.
+D 2022-09-28T18:10:50.148
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -485,12 +485,12 @@ F ext/wasm/api/sqlite3-api-cleanup.js 4bd28e61216690b12d6f77bfce71b011995c294963
 F ext/wasm/api/sqlite3-api-glue.js 3b164f0ef690a838da8613a2aaec4fc49d29ad5e8fe39c8cdc0f5281f08f9d0b
 F ext/wasm/api/sqlite3-api-oo1.js 97a786b366fcac442e1557c3eedef3afa96877411bd6239094d4db5fd5b3c353
 F ext/wasm/api/sqlite3-api-opfs.js af65e056b9f5bc6182499f7e7767e3d01abc3772a62c8abbcc04e4c7bb0affc6
-F ext/wasm/api/sqlite3-api-prologue.js 2a0dedb8127e8983d3199edea55151a45186b462646cb1f2206587ac1ef4eddf
+F ext/wasm/api/sqlite3-api-prologue.js ed850804d5cd7a976717e524d719b1f9743405226a879a5170f259dbee31d13c
 F ext/wasm/api/sqlite3-api-worker1.js d5d5b7fac4c4731c38c7e03f4f404b2a95c388a2a1d8bcf361caada572f107e0
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c b756b9c1fee9d0598f715e6df6bf089b750da24aa91bb7ef9277a037d81e7612
 F ext/wasm/batch-runner.html c363032aba7a525920f61f8be112a29459f73f07e46f0ba3b7730081a617826e
-F ext/wasm/batch-runner.js 756528ff41c0a2d81607fe82d088f305c379279cc84661c9422a7993b3ac544d
+F ext/wasm/batch-runner.js 0d5517be51290098bf4a92754e25c552b7c1dc73bb3f2e2b18f16b1008df060f
 F ext/wasm/common/SqliteTestUtil.js c997c12188c97109f344701a58dd627b9c0f98f32cc6a88413f6171f2191531c
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 3a5143699c2b73a85b962271e1a9b3241b30d90e30d895e4f55665e648572962
@@ -2026,8 +2026,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 bbfcfba260f39a9c91e82d87e06b1c2cb297c03498b4530aa3e7e01ef9916012
-R 0e9f94b500e19b6ceb4224cc315ebb8b
+P 3bd1bc240676e56da87fc49f3c67a1edc4fafcf2a2416298d19ae4f80b676a72
+R d0708515df8e5293032059e504723b7d
 U stephan
-Z cfbdefed825643b9f5c5b839e4caa73f
+Z 774d17030f6b3ac9dea357109e6b49c9
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 85cfc8afd9..5f8b8b7792 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3bd1bc240676e56da87fc49f3c67a1edc4fafcf2a2416298d19ae4f80b676a72
\ No newline at end of file
+2e2821f782511b9d2274a89a5a922582aba18c7e9dc7ce01080e713942a56d7d
\ No newline at end of file

From b94a98607a3bd4dd55f4d5ce16f171ba066bafb2 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Thu, 29 Sep 2022 13:17:50 +0000
Subject: [PATCH 179/428] Rework the Emscripten-emitted module loader/init
 function such that it passes on the sqlite3 module, instead of the Emscripten
 module, to the first then() of sqlite3InitModule()'s returned Promise. This
 eliminates any need to mention the Emscripten module object in client-side
 code unless they want to configure it in advance for loading-status reports.

FossilOrigin-Name: 0dbaa0e2b5abf5c23e2039ec90a3055ebb3c063aaf4e556c42546defe6fbb86d
---
 ext/wasm/GNUmakefile                 | 23 ++++++++++------
 ext/wasm/api/extern-post-js.js       | 41 ++++++++++++++++++++++++++++
 ext/wasm/api/sqlite3-api-prologue.js |  3 ++
 ext/wasm/batch-runner.js             |  9 ++----
 ext/wasm/common/SqliteTestUtil.js    |  4 +--
 ext/wasm/demo-123.js                 |  6 ++--
 ext/wasm/demo-kvvfs1.js              | 12 +++-----
 ext/wasm/scratchpad-wasmfs-main.js   |  9 ++----
 ext/wasm/speedtest1-wasmfs.html      |  4 +--
 ext/wasm/speedtest1-worker.js        | 30 +++++++++-----------
 ext/wasm/speedtest1.html             |  7 +----
 ext/wasm/sqlite3-worker1.js          |  8 ++----
 ext/wasm/test-opfs-vfs.js            |  8 ++++--
 ext/wasm/testing1.js                 | 16 +++++------
 ext/wasm/wasmfs.make                 |  6 ++--
 manifest                             | 39 +++++++++++++-------------
 manifest.uuid                        |  2 +-
 17 files changed, 127 insertions(+), 100 deletions(-)
 create mode 100644 ext/wasm/api/extern-post-js.js

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 0cb05580a7..e9652e1da9 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -152,7 +152,6 @@ post-jses := \
   $(dir.api)/post-js-header.js \
   $(sqlite3-api.js) \
   $(dir.api)/post-js-footer.js
-
 $(post-js.js): $(post-jses) $(MAKEFILE)
 	@echo "Making $@..."
 	@for i in $(post-jses); do \
@@ -160,7 +159,9 @@ $(post-js.js): $(post-jses) $(MAKEFILE)
 		cat $$i; \
 		echo "/* END FILE: $$i */"; \
 	done > $@
-
+extern-post-js.js := $(dir.api)/extern-post-js.js
+sqlite3.js.flags.--post-js := --post-js=$(post-js.js) --extern-post-js=$(extern-post-js.js)
+post-jses.deps := $(post-js.js) $(extern-post-js.js)
 
 ########################################################################
 # emcc flags for .c/.o/.wasm/.js.
@@ -204,9 +205,12 @@ emcc.jsflags += -sINITIAL_MEMORY=13107200
 # ^^^^ 64MB is not enough for WASMFS/OPFS test runs using batch-runner.js
 emcc.jsflags += $(emcc.environment)
 #emcc.jsflags += -sTOTAL_STACK=4194304
-emcc.jsflags += -sEXPORT_NAME=sqlite3InitModule
+
+sqlite3.js.init-func := sqlite3InitModule
+# ^^^^ $(sqlite3.js.init-func) symbol name is hard-coded in $(extern-post-js.js)
+
+emcc.jsflags += -sEXPORT_NAME=$(sqlite3.js.init-func)
 emcc.jsflags += -sGLOBAL_BASE=4096 # HYPOTHETICALLY keep func table indexes from overlapping w/ heap addr.
-emcc.jsflags += --post-js=$(post-js.js)
 #emcc.jsflags += -sSTRICT # fails due to missing __syscall_...()
 #emcc.jsflags += -sALLOW_UNIMPLEMENTED_SYSCALLS
 #emcc.jsflags += -sFILESYSTEM=0 # only for experimentation. sqlite3 needs the FS API
@@ -253,6 +257,7 @@ emcc.jsflags += -sWASM_BIGINT=$(emcc_enable_bigint)
 # code get confused and cannot load property (namely, the
 # sqlite3.worker.js generated in conjunction with -sWASMFS).
 sqlite3.js := sqlite3.js
+emcc.jsflags += $(sqlite3.js.flags.--post-js)
 sqlite3.wasm := sqlite3.wasm
 sqlite3-wasm.o := $(dir.api)/sqlite3-wasm.o
 $(sqlite3-wasm.o): emcc.cflags += $(SQLITE_OPT)
@@ -274,9 +279,9 @@ endef
 $(foreach c,$(sqlite3-wasm.c) $(jaccwabyt_test.c),$(eval $(call WASM_C_COMPILE,$(c))))
 $(sqlite3.js): $(MAKEFILE) $(sqlite3.wasm.obj) \
     EXPORTED_FUNCTIONS.api \
-    $(post-js.js)
+    $(post-jses.deps)
 	@echo "Building $@ ..."
-	$(emcc.bin) -o $(sqlite3.js) $(emcc_opt) $(emcc.flags) $(emcc.jsflags) $(sqlite3.wasm.obj)
+	$(emcc.bin) -o $@ $(emcc_opt) $(emcc.flags) $(emcc.jsflags) $(sqlite3.wasm.obj)
 	chmod -x $(sqlite3.wasm)
 	$(maybe-wasm-strip) $(sqlite3.wasm)
 	@ls -la $@ $(sqlite3.wasm)
@@ -329,8 +334,8 @@ speedtest1-common.eflags += $(emcc.exportedRuntimeMethods)
 speedtest1-common.eflags += -sALLOW_TABLE_GROWTH
 speedtest1-common.eflags += -sDYNAMIC_EXECUTION=0
 speedtest1-common.eflags += --minify 0
-speedtest1-common.eflags += -sEXPORT_NAME=sqlite3Speedtest1InitModule
-speedtest1-common.eflags += --post-js=$(post-js.js)
+speedtest1-common.eflags += -sEXPORT_NAME=$(sqlite3.js.init-func)
+speedtest1-common.eflags += $(sqlite3.js.flags.--post-js)
 speedtest1-common.eflags += -sWASM_BIGINT=$(emcc_enable_bigint)
 speedtest1.exit-runtime0 := -sEXIT_RUNTIME=0
 speedtest1.exit-runtime1 := -sEXIT_RUNTIME=1
@@ -365,7 +370,7 @@ $(speedtest1.js): emcc.cflags+=
 # the latter (predictably) results in a slightly faster binary, but we're
 # close enough to the target speed requirements that the 500ms makes a
 # difference.
-$(speedtest1.js): $(MAKEFILE) $(speedtest1.cs) $(post-js.js) \
+$(speedtest1.js): $(MAKEFILE) $(speedtest1.cs) $(post-jses.deps) \
     EXPORTED_FUNCTIONS.speedtest1
 	@echo "Building $@ ..."
 	$(emcc.bin) \
diff --git a/ext/wasm/api/extern-post-js.js b/ext/wasm/api/extern-post-js.js
new file mode 100644
index 0000000000..acb54c3c9a
--- /dev/null
+++ b/ext/wasm/api/extern-post-js.js
@@ -0,0 +1,41 @@
+/* emscripten-js-addenda.js must be appended to the resulting sqlite3.js
+   file. */
+(function(){
+  /**
+     In order to hide the sqlite3InitModule()'s resulting Emscripten
+     module from downstream clients (and simplify our documentation by
+     being able to elide those details), we rewrite
+     sqlite3InitModule() to return the sqlite3 object.
+
+     Unfortunately, we cannot modify the module-loader/exporter-based
+     impls which Emscripten installs at some point in the file above
+     this.
+  */
+  const originalInit = self.sqlite3InitModule;
+  if(!originalInit){
+    throw new Error("Expecting self.sqlite3InitModule to be defined by the Emscripten build.");
+  }
+  self.sqlite3InitModule.ready = originalInit.ready;
+  self.sqlite3InitModule = (...args)=>{
+    //console.warn("Using replaced sqlite3InitModule()",self.location);
+    return originalInit(...args).then((EmscriptenModule)=>{
+      if(self.window!==self &&
+         (EmscriptenModule['ENVIRONMENT_IS_PTHREAD']
+          || EmscriptenModule['_pthread_self']
+          || 'function'===typeof threadAlert
+          || self.location.pathname.endsWith('.worker.js')
+         )){
+        /** Workaround for wasmfs-generated worker, which calls this
+            routine from each individual thread and requires that its
+            argument be returned. All of the criteria above are fragile,
+            based solely on inspection of the offending code, not public
+            Emscripten details. */
+        return EmscriptenModule;
+      }
+      const f = EmscriptenModule.sqlite3.asyncPostInit;
+      delete EmscriptenModule.sqlite3.asyncPostInit;
+      return f();
+    });
+  };
+  //console.warn("Replaced sqlite3InitModule()");
+})();
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index e0379a646b..859c46bd4b 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -924,6 +924,9 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
        Bug: if called while a prior call is still resolving, the 2nd
        call will resolve prematurely, before the 1st call has finished
        resolving.
+
+       In Emscripten-based builds, this function is called
+       automatically and deleted from this object.
     */
     asyncPostInit: async function(){
       let lip = sqlite3ApiBootstrap.initializersAsync;
diff --git a/ext/wasm/batch-runner.js b/ext/wasm/batch-runner.js
index 3762998b69..ad281c2e9d 100644
--- a/ext/wasm/batch-runner.js
+++ b/ext/wasm/batch-runner.js
@@ -604,11 +604,8 @@
     }/*run()*/
   }/*App*/;
 
-  self.sqlite3TestModule.initSqlite3().then(function(theEmccModule){
-    self._MODULE = theEmccModule /* this is only to facilitate testing from the console */;
-    sqlite3 = theEmccModule.sqlite3;
-    console.log("App",App);
-    self.App = App;
-    App.run(theEmccModule.sqlite3);
+  self.sqlite3TestModule.initSqlite3().then(function(sqlite3){
+    self.App = App /* only to facilitate dev console access */;
+    App.run(sqlite3);
   });
 })();
diff --git a/ext/wasm/common/SqliteTestUtil.js b/ext/wasm/common/SqliteTestUtil.js
index 277ab55294..08688fd487 100644
--- a/ext/wasm/common/SqliteTestUtil.js
+++ b/ext/wasm/common/SqliteTestUtil.js
@@ -230,9 +230,7 @@
        object, calls it sqlite3InitModule(), and removes
        self.sqlite3ApiConfig after initialization is done. Returns the
        promise from sqlite3InitModule(), and the next then() handler
-       will get the Emscripten module object as its argument. That
-       module has the sqlite3's main namespace object installed as its
-       `sqlite3` property.
+       will get the sqlite3 API object as its argument.
     */
     initSqlite3: function(){
       self.sqlite3ApiConfig = this.sqlite3ApiConfig;
diff --git a/ext/wasm/demo-123.js b/ext/wasm/demo-123.js
index a08bffb64c..00ea1f5bc0 100644
--- a/ext/wasm/demo-123.js
+++ b/ext/wasm/demo-123.js
@@ -256,11 +256,11 @@
     // like so...
     print: log,
     printErr: error
-  }).then(function(EmscriptenModule){
-    //console.log('EmscriptenModule.sqlite3 =',EmscriptenModule.sqlite3);
+  }).then(function(sqlite3){
+    //console.log('sqlite3 =',sqlite3);
     log("Done initializing. Running demo...");
     try {
-      demo1(EmscriptenModule.sqlite3);
+      demo1(sqlite3);
     }catch(e){
       error("Exception:",e.message);
     }
diff --git a/ext/wasm/demo-kvvfs1.js b/ext/wasm/demo-kvvfs1.js
index a2cff8639d..b358694ce8 100644
--- a/ext/wasm/demo-kvvfs1.js
+++ b/ext/wasm/demo-kvvfs1.js
@@ -41,10 +41,8 @@
     logHtml('error',...args);
   };
   
-  const runTests = function(Module){
-    //log("Module",Module);
-    const sqlite3 = Module.sqlite3,
-          capi = sqlite3.capi,
+  const runTests = function(sqlite3){
+    const capi = sqlite3.capi,
           oo = sqlite3.oo1,
           wasm = capi.wasm;
     log("Loaded module:",capi.sqlite3_libversion(), capi.sqlite3_sourceid());
@@ -115,9 +113,7 @@
     }
   };
 
-  sqlite3InitModule(self.sqlite3TestModule).then(function(theModule){
-    console.warn("Installing Emscripten module as global EM for dev console access.");
-    self.EM = theModule;
-    runTests(theModule);
+  sqlite3InitModule(self.sqlite3TestModule).then((sqlite3)=>{
+    runTests(sqlite3);
   });
 })();
diff --git a/ext/wasm/scratchpad-wasmfs-main.js b/ext/wasm/scratchpad-wasmfs-main.js
index 764f72e6df..e76011274b 100644
--- a/ext/wasm/scratchpad-wasmfs-main.js
+++ b/ext/wasm/scratchpad-wasmfs-main.js
@@ -34,11 +34,8 @@
       });
   };
 
-  const runTests = function(Module){
-    //stdout("Module",Module);
-    self._MODULE = Module /* this is only to facilitate testing from the console */;
-    const sqlite3 = Module.sqlite3,
-          capi = sqlite3.capi,
+  const runTests = function(sqlite3){
+    const capi = sqlite3.capi,
           oo = sqlite3.oo1,
           wasm = capi.wasm;
     stdout("Loaded sqlite3:",capi.sqlite3_libversion(), capi.sqlite3_sourceid());
@@ -60,7 +57,7 @@
       ].forEach((f)=>{
         const n = performance.now();
         stdout(banner1,"Running",f.name+"()...");
-        f(db, sqlite3, Module);
+        f(db, sqlite3);
         stdout(banner2,f.name+"() took ",(performance.now() - n),"ms");
       });
     }finally{
diff --git a/ext/wasm/speedtest1-wasmfs.html b/ext/wasm/speedtest1-wasmfs.html
index 6952fc1eed..e35546702e 100644
--- a/ext/wasm/speedtest1-wasmfs.html
+++ b/ext/wasm/speedtest1-wasmfs.html
@@ -143,9 +143,7 @@
 
     self.sqlite3TestModule.print = log;
     self.sqlite3TestModule.printErr = logErr;
-    sqlite3Speedtest1InitModule(self.sqlite3TestModule).then(function(M){
-        runTests(M.sqlite3);
-    });
+    sqlite3InitModule(self.sqlite3TestModule).then(runTests);
 })();</script>
   </body>
 </html>
diff --git a/ext/wasm/speedtest1-worker.js b/ext/wasm/speedtest1-worker.js
index e6359966d5..1f421b0b86 100644
--- a/ext/wasm/speedtest1-worker.js
+++ b/ext/wasm/speedtest1-worker.js
@@ -80,22 +80,18 @@
     printErr: logErr,
     setStatus: (text)=>mPost('load-status',text)
   };
-  self.sqlite3Speedtest1InitModule(EmscriptenModule).then(function(EModule){
-    log("Module inited.");
-    return EModule.sqlite3.asyncPostInit()
-      .then((sqlite3)=>{
-        const S = sqlite3;
-        const vfsUnlink = S.capi.wasm.xWrap("sqlite3_wasm_vfs_unlink", "int", ["string"]);
-        App.unlink = function(fname){
-          vfsUnlink(fname);
-          if(S.opfs) S.opfs.deleteEntry(fname);
-        };
-        App.pDir = wasmfsDir(S.wasm);
-        App.wasm = S.capi.wasm;
-        //if(App.pDir) log("Persistent storage:",pDir);
-        //else log("Using transient storage.");
-        mPost('ready',true);
-        log("Registered VFSes:", ...S.capi.sqlite3_web_vfs_list());
-      });
+  self.sqlite3InitModule(EmscriptenModule).then((sqlite3)=>{
+    const S = sqlite3;
+    const vfsUnlink = S.capi.wasm.xWrap("sqlite3_wasm_vfs_unlink", "int", ["string"]);
+    App.unlink = function(fname){
+      vfsUnlink(fname);
+      if(S.opfs) S.opfs.deleteEntry(fname);
+    };
+    App.pDir = wasmfsDir(S.wasm);
+    App.wasm = S.capi.wasm;
+    //if(App.pDir) log("Persistent storage:",pDir);
+    //else log("Using transient storage.");
+    mPost('ready',true);
+    log("Registered VFSes:", ...S.capi.sqlite3_web_vfs_list());
   });
 })();
diff --git a/ext/wasm/speedtest1.html b/ext/wasm/speedtest1.html
index 6c2853a73a..358d8ba79e 100644
--- a/ext/wasm/speedtest1.html
+++ b/ext/wasm/speedtest1.html
@@ -163,12 +163,7 @@
 
     self.sqlite3TestModule.print = log;
     self.sqlite3TestModule.printErr = logErr;
-    sqlite3Speedtest1InitModule(self.sqlite3TestModule)
-        .then((EmscriptenModule)=>{
-            return EmscriptenModule.sqlite3.installOpfsVfs()
-                .catch((e)=>{console.warn(e.message)})
-                .then(()=>runTests(EmscriptenModule.sqlite3));
-        });
+    sqlite3InitModule(self.sqlite3TestModule).then(runTests);
 })();</script>
 </body>
 </html>
diff --git a/ext/wasm/sqlite3-worker1.js b/ext/wasm/sqlite3-worker1.js
index 6de8facf90..7ccf79f010 100644
--- a/ext/wasm/sqlite3-worker1.js
+++ b/ext/wasm/sqlite3-worker1.js
@@ -28,9 +28,7 @@
 */
 "use strict";
 importScripts('sqlite3.js');
-sqlite3InitModule().then((EmscriptenModule)=>{
-  EmscriptenModule.sqlite3.asyncPostInit().then((sqlite3)=>{
-    sqlite3.capi.sqlite3_wasmfs_opfs_dir();
-    sqlite3.initWorker1API();
-  });
+sqlite3InitModule().then((sqlite3)=>{
+  sqlite3.capi.sqlite3_wasmfs_opfs_dir();
+  sqlite3.initWorker1API();
 });
diff --git a/ext/wasm/test-opfs-vfs.js b/ext/wasm/test-opfs-vfs.js
index 93e9e0eb64..78f86e380f 100644
--- a/ext/wasm/test-opfs-vfs.js
+++ b/ext/wasm/test-opfs-vfs.js
@@ -28,7 +28,13 @@ const tryOpfsVfs = function(sqlite3){
   const log = (...args)=>console.log(logPrefix,...args);
   const warn =  (...args)=>console.warn(logPrefix,...args);
   const error =  (...args)=>console.error(logPrefix,...args);
+  const opfs = sqlite3.opfs;
   log("tryOpfsVfs()");
+  if(!sqlite3.opfs){
+    const e = toss("OPFS is not available.");
+    error(e);
+    throw e;
+  }
   const capi = sqlite3.capi;
   const pVfs = capi.sqlite3_vfs_find("opfs") || toss("Missing 'opfs' VFS.");
   const oVfs = capi.sqlite3_vfs.instanceForPointer(pVfs) || toss("Unexpected instanceForPointer() result.");;
@@ -38,7 +44,6 @@ const tryOpfsVfs = function(sqlite3){
   const dbFile = "my-persistent.db";
   if(urlArgs.has('delete')) sqlite3.opfs.deleteEntry(dbFile);
 
-  const opfs = sqlite3.opfs;
   const db = new opfs.OpfsDb(dbFile);
   log("db file:",db.filename);
   try{
@@ -78,7 +83,6 @@ const tryOpfsVfs = function(sqlite3){
 
 importScripts('sqlite3.js');
 self.sqlite3InitModule()
-  .then((EmscriptenModule)=>EmscriptenModule.sqlite3.asyncPostInit())
   .then((sqlite3)=>tryOpfsVfs(sqlite3))
   .catch((e)=>{
     console.error("Error initializing module:",e);
diff --git a/ext/wasm/testing1.js b/ext/wasm/testing1.js
index 9607e3f379..5b3d6189db 100644
--- a/ext/wasm/testing1.js
+++ b/ext/wasm/testing1.js
@@ -33,7 +33,7 @@
     return v1>=(v2-factor) && v1<=(v2+factor);
   };
 
-  let sqlite3;
+  let sqlite3 /* loaded later */;
   
   const testBasicSanity = function(db,sqlite3){
     const capi = sqlite3.capi;
@@ -270,7 +270,7 @@
     T.mustThrow(()=>db.exec("select * from foo.bar"));
   };
 
-  const testIntPtr = function(db,S,Module){
+  const testIntPtr = function(db,S){
     const w = S.capi.wasm;
     const stack = w.scopedAllocPush();
     let ptrInt;
@@ -1011,9 +1011,8 @@
         n,"entries totaling approximately",sz,"bytes.");
   };
 
-  const runTests = function(Module){
-    //log("Module",Module);
-    sqlite3 = Module.sqlite3;
+  const runTests = function(_sqlite3){
+    sqlite3 = _sqlite3;
     const capi = sqlite3.capi,
           oo = sqlite3.oo1,
           wasm = capi.wasm;
@@ -1074,7 +1073,7 @@
       ].forEach((f)=>{
         const t = T.counter, n = performance.now();
         logHtml(banner1,"Running",f.name+"()...");
-        f(db, sqlite3, Module);
+        f(db, sqlite3);
         logHtml(banner2,f.name+"():",T.counter - t,'tests in',(performance.now() - n),"ms");
       });
     }finally{
@@ -1085,8 +1084,7 @@
     log('capi.wasm.exports',capi.wasm.exports);
   };
 
-  self.sqlite3TestModule.initSqlite3().then(function(theModule){
-    self._MODULE = theModule /* this is only to facilitate testing from the console */
-    runTests(theModule);
+  self.sqlite3TestModule.initSqlite3().then((S)=>{
+    runTests(S);
   });
 })();
diff --git a/ext/wasm/wasmfs.make b/ext/wasm/wasmfs.make
index daa074513d..20ddcdb9e2 100644
--- a/ext/wasm/wasmfs.make
+++ b/ext/wasm/wasmfs.make
@@ -55,9 +55,9 @@ sqlite3-wasmfs.jsflags += -sUSE_CLOSURE_COMPILER=0
 sqlite3-wasmfs.jsflags += -sIMPORTED_MEMORY
 #sqlite3-wasmfs.jsflags += -sINITIAL_MEMORY=13107200
 #sqlite3-wasmfs.jsflags += -sTOTAL_STACK=4194304
-sqlite3-wasmfs.jsflags += -sEXPORT_NAME=sqlite3InitModule
+sqlite3-wasmfs.jsflags += -sEXPORT_NAME=$(sqlite3.js.init-func)
 sqlite3-wasmfs.jsflags += -sGLOBAL_BASE=4096 # HYPOTHETICALLY keep func table indexes from overlapping w/ heap addr.
-sqlite3-wasmfs.jsflags += --post-js=$(post-js.js)
+sqlite3-wasmfs.jsflags += $(sqlite3.js.flags.--post-js)
 #sqlite3-wasmfs.jsflags += -sFILESYSTEM=0 # only for experimentation. sqlite3 needs the FS API
 #                                Perhaps the wasmfs build doesn't?
 #sqlite3-wasmfs.jsflags += -sABORTING_MALLOC
@@ -80,7 +80,7 @@ sqlite3-wasmfs.jsflags += -sWASM_BIGINT=$(emcc_enable_bigint)
 
 $(sqlite3-wasmfs.js): $(sqlite3-wasmfs.wasm.c) $(sqlite3-wasm.c) $(sqlite3-wasmfs.extra.c) \
     EXPORTED_FUNCTIONS.api $(sqlite3-wasm.js) $(MAKEFILE) $(MAKEFILE.wasmfs) \
-    $(post-js.js)
+    $(post-jses.deps)
 	@echo "Building $@ ..."
 	$(emcc.bin) -o $@ $(emcc_opt) $(emcc.flags) \
       $(sqlite3-wasmfs.cflags) $(sqlite3-wasmfs.jsflags) $(sqlite3-wasmfs.wasm.c) $(sqlite3-wasmfs.extra.c)
diff --git a/manifest b/manifest
index f00fee8550..e54e9ea56d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Wasm:\sexpose\ssqlite3_exec()\sand\suse\sit\sto\ssimplify\sthe\sdb-reset\slogic\sin\sbatch-runner.js\sa\sbit.
-D 2022-09-28T18:10:50.148
+C Rework\sthe\sEmscripten-emitted\smodule\sloader/init\sfunction\ssuch\sthat\sit\spasses\son\sthe\ssqlite3\smodule,\sinstead\sof\sthe\sEmscripten\smodule,\sto\sthe\sfirst\sthen()\sof\ssqlite3InitModule()'s\sreturned\sPromise.\sThis\seliminates\sany\sneed\sto\smention\sthe\sEmscripten\smodule\sobject\sin\sclient-side\scode\sunless\sthey\swant\sto\sconfigure\sit\sin\sadvance\sfor\sloading-status\sreports.
+D 2022-09-29T13:17:50.536
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,32 +474,33 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle 0e88c8cfc3719e4b7e74980d9da664c709e68acf863e48386cda376edfd3bfb0
-F ext/wasm/GNUmakefile 86ee7562063275779b108957db5bc7fdb18df4f6c506abbe28132b4fb071988e
+F ext/wasm/GNUmakefile 7cf6c4346edd6656d5b9f258049ca56af7d7b8b10da3d21edcc3717015bc6511
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 77a5ee8bd209b5e75dd0e822bc3f6e7319dc9b36431463d4175c775170f92126
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
 F ext/wasm/api/README.md f54102d74cfde01ebe242fa1411e126a9cda8f19b3ac378afd1103b21abfad05
+F ext/wasm/api/extern-post-js.js d29d5f615c887b356ff80a77a09a346339644c66d4fea79230d8378e2e2f4914
 F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba81456260a713ed04900c
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
 F ext/wasm/api/sqlite3-api-cleanup.js 4bd28e61216690b12d6f77bfce71b011995c29496397cfa77e08198eb8d19aeb
 F ext/wasm/api/sqlite3-api-glue.js 3b164f0ef690a838da8613a2aaec4fc49d29ad5e8fe39c8cdc0f5281f08f9d0b
 F ext/wasm/api/sqlite3-api-oo1.js 97a786b366fcac442e1557c3eedef3afa96877411bd6239094d4db5fd5b3c353
 F ext/wasm/api/sqlite3-api-opfs.js af65e056b9f5bc6182499f7e7767e3d01abc3772a62c8abbcc04e4c7bb0affc6
-F ext/wasm/api/sqlite3-api-prologue.js ed850804d5cd7a976717e524d719b1f9743405226a879a5170f259dbee31d13c
+F ext/wasm/api/sqlite3-api-prologue.js 47245a1bb279f54c7c1d6b32f13222536ce0196ced9c2bda2d12a0b4ef8c136d
 F ext/wasm/api/sqlite3-api-worker1.js d5d5b7fac4c4731c38c7e03f4f404b2a95c388a2a1d8bcf361caada572f107e0
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c b756b9c1fee9d0598f715e6df6bf089b750da24aa91bb7ef9277a037d81e7612
 F ext/wasm/batch-runner.html c363032aba7a525920f61f8be112a29459f73f07e46f0ba3b7730081a617826e
-F ext/wasm/batch-runner.js 0d5517be51290098bf4a92754e25c552b7c1dc73bb3f2e2b18f16b1008df060f
-F ext/wasm/common/SqliteTestUtil.js c997c12188c97109f344701a58dd627b9c0f98f32cc6a88413f6171f2191531c
+F ext/wasm/batch-runner.js a94dd0005b34cb4e654a799fbe6357a66070510bbbe5d116cf1a8d4f9901bd80
+F ext/wasm/common/SqliteTestUtil.js 647bf014bd30bdd870a7e9001e251d12fc1c9ec9ce176a1004b838a4b33c5c05
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 3a5143699c2b73a85b962271e1a9b3241b30d90e30d895e4f55665e648572962
 F ext/wasm/common/whwasmutil.js 20291bbf4955358d0b5ead58db4c575be269b4976e39c43a93331547e3b86363
 F ext/wasm/demo-123-worker.html e419b66495d209b5211ec64903b4cfb3ca7df20d652b41fcd28bf018a773234f
 F ext/wasm/demo-123.html aa281d33b7eefa755f3122b7b5a18f39a42dc5fb69c8879171bf14b4c37c4ec4
-F ext/wasm/demo-123.js d8490189cd2f7a47940d42174fe562d8b6a5cbab521eec4c602dead055b12414
+F ext/wasm/demo-123.js 35de7c544b9190759fcbf4ca125a674d3f6db03614b9a2175efaa1fbf363ef6f
 F ext/wasm/demo-kvvfs1.html 7d4f28873de67f51ac18c584b7d920825139866a96049a49c424d6f5a0ea5e7f
-F ext/wasm/demo-kvvfs1.js e884ea35022d772c0d1dd884b40011413696438394f605c6cd4808cfb1642a4a
+F ext/wasm/demo-kvvfs1.js d1126c3b08099dc1279f353b298ee90f6d374ab6ca2b4cf412031fc992e51d35
 F ext/wasm/fiddle.make fd56fa21bada6ecbf860686a9a789ebda7cc3d9b60835927000fcb00246ea50f
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js 425b75b1debe1108c10f1373fdd75994a18adbdc0a593e7ff0ecd91cc6498e89
@@ -511,26 +512,26 @@ F ext/wasm/jaccwabyt/jaccwabyt.md 9aa6951b529a8b29f578ec8f0355713c39584c92cf1708
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
 F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e568d2c2307c416902059339c06f19
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
-F ext/wasm/scratchpad-wasmfs-main.js e713a3da53da9194a1cc35d060f0ee5cb0abe907dcbc864d3d6f76fa6eafedf1
-F ext/wasm/speedtest1-wasmfs.html 852504ccf9d095c8f57d4f4f9cc2f912b3b432e300c6b5ed8d6234a37eeb86a6
+F ext/wasm/scratchpad-wasmfs-main.js 1aa32c1035cf1440a226a28fefcbb5762fbbcb020ccbe5895f8736d701695c63
+F ext/wasm/speedtest1-wasmfs.html bc28eb29b69a73864b8d7aae428448f8b7e1de81d8bfb9bba99541322054dbd0
 F ext/wasm/speedtest1-worker.html 3780a29a6d0467dde34b61bf50a1b2e1a12a4e8498f4835b1293e79a3edcd675
-F ext/wasm/speedtest1-worker.js 65f50314cc56ebc03f7b5ea774e7d8386600e8a6f27cca02cb05e7e2eb7a0153
-F ext/wasm/speedtest1.html 4f4e26b634bb3288f2cad8cf4d458076b33d8bd0f3fd56e089a17bed32df6287
+F ext/wasm/speedtest1-worker.js a9e3d052dd1d8016d6e9a641e596e6d99aec04ef8995d7ee9a85a9964eed771a
+F ext/wasm/speedtest1.html e4cb5d722b494104fc1249e7c008ca018f820a784833c51004c958c71038c80f
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
 F ext/wasm/sqlite3-opfs-async-proxy.js fe4b8268eea9acaec633ebd1dd3f85dae7c461c5c68985ab1075d9560b1db8e8
 F ext/wasm/sqlite3-worker1-promiser.js cca2b853692e4715b4761c46678f96d80819d4756de557922a815149fb93397e
-F ext/wasm/sqlite3-worker1.js b941db258fd26ae2c7398b640c1ca8d5abac8ec77e54ba5b9526af2297409626
+F ext/wasm/sqlite3-worker1.js 5266ebc4d709fe23d2d076ae44e6085fbc32b82f26ef514b947312f36b1206a9
 F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
-F ext/wasm/test-opfs-vfs.js ba4c20085000b9f6195f62cf3abeeb0ae4703c3b34bc654afa806014a4f09e96
+F ext/wasm/test-opfs-vfs.js a59ff9210b17d46b0c6fbf6a0ba60143c033327865f2e556e14f06280cef62ac
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
 F ext/wasm/testing-worker1-promiser.js ee1ac4950720c07541e791b7f35bdf420e8ab81a74049cc65394371b0c53c480
 F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d7669fb17fcae
-F ext/wasm/testing1.js 20b37766d29815180e2e932bfc6132b649403ece1f1bf612a4712db131287970
+F ext/wasm/testing1.js 06b9a439ada636c5478c581c86b2b968f799e0468eae54dc5a4565dfd7afbb88
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
 F ext/wasm/testing2.js 34737da985c4cbd4812b2e7f200942662cae991c5a58ffa5d0350be089d0d410
-F ext/wasm/wasmfs.make fb4d0b4a6596ec2ed7815508a43b77bd7d14d3910ac387eb795643e33f5a3652
+F ext/wasm/wasmfs.make d53146b062386b01f7b0b0d498335b33c11548cf3d1706cff472d6cbd42a9c95
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
@@ -2026,8 +2027,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 3bd1bc240676e56da87fc49f3c67a1edc4fafcf2a2416298d19ae4f80b676a72
-R d0708515df8e5293032059e504723b7d
+P 2e2821f782511b9d2274a89a5a922582aba18c7e9dc7ce01080e713942a56d7d
+R 4702b024c44aa8b0e10da8a3cb6edeca
 U stephan
-Z 774d17030f6b3ac9dea357109e6b49c9
+Z 43dbf13bcecc8e2f4da632a6ad6ef70c
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 5f8b8b7792..5e51671dec 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2e2821f782511b9d2274a89a5a922582aba18c7e9dc7ce01080e713942a56d7d
\ No newline at end of file
+0dbaa0e2b5abf5c23e2039ec90a3055ebb3c063aaf4e556c42546defe6fbb86d
\ No newline at end of file

From eb97743cc7141d224a53ae23f08de65a58dd3627 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Thu, 29 Sep 2022 16:54:23 +0000
Subject: [PATCH 180/428] Finish eliminating explicit Emscripten module
 dependencies in test code and fiddle. The only remnant in public code is the
 Emscripten-generated module load/init interface.

FossilOrigin-Name: 7be78dd4efc410f13ff1ceda1fad82b309cc24de2d5106c8bd6b2adeaa13b106
---
 ext/wasm/api/sqlite3-api-cleanup.js  |  4 +-
 ext/wasm/api/sqlite3-api-prologue.js |  9 +---
 ext/wasm/fiddle.make                 |  6 ++-
 ext/wasm/fiddle/fiddle-worker.js     | 39 +++++++--------
 ext/wasm/fiddle/fiddle.js            | 72 +++++++++++++++-------------
 manifest                             | 20 ++++----
 manifest.uuid                        |  2 +-
 7 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-cleanup.js b/ext/wasm/api/sqlite3-api-cleanup.js
index a612681af8..12d7668864 100644
--- a/ext/wasm/api/sqlite3-api-cleanup.js
+++ b/ext/wasm/api/sqlite3-api-cleanup.js
@@ -58,8 +58,8 @@ if('undefined' !== typeof Module){ // presumably an Emscripten build
 
   /* Clean up temporary references to our APIs... */
   delete sqlite3.capi.util /* arguable, but these are (currently) internal-use APIs */;
-  Module.sqlite3 = sqlite3 /* Currently needed by test code and sqlite3-worker1.js */;
-  //console.warn("Module.sqlite3 =",Module.sqlite3);
+  Module.sqlite3 = sqlite3 /* Needed for customized sqlite3InitModule() to be able to
+                              pass the sqlite3 object off to the client. */;
 }else{
   console.warn("This is not running in an Emscripten module context, so",
                "self.sqlite3ApiBootstrap() is _not_ being called due to lack",
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 859c46bd4b..c14756eaa9 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -93,10 +93,6 @@
 
    The config object properties include:
 
-   - `Module`[^1]: Emscripten-style module object. Currently only required
-     by certain test code and is _not_ part of the public interface.
-     (TODO: rename this to EmscriptenModule to be more explicit.)
-
    - `exports`[^1]: the "exports" object for the current WASM
      environment. In an Emscripten build, this should be set to
      `Module['asm']`.
@@ -144,12 +140,11 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
   const config = Object.create(null);
   {
     const configDefaults = {
-      Module: undefined/*needed for some test code, not part of the public API*/,
       exports: undefined,
       memory: undefined,
       bigIntEnabled: (()=>{
         if('undefined'!==typeof Module){
-          /* Emscripten module will contain HEAPU64 when build with
+          /* Emscripten module will contain HEAPU64 when built with
              -sWASM_BIGINT=1, else it will not. */
           return !!Module.HEAPU64;
         }
@@ -174,7 +169,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
   [
     // If any of these config options are functions, replace them with
     // the result of calling that function...
-    'Module', 'exports', 'memory', 'wasmfsOpfsDir'
+    'exports', 'memory', 'wasmfsOpfsDir'
   ].forEach((k)=>{
     if('function' === typeof config[k]){
       config[k] = config[k]();
diff --git a/ext/wasm/fiddle.make b/ext/wasm/fiddle.make
index 87018047a4..a98806f5eb 100644
--- a/ext/wasm/fiddle.make
+++ b/ext/wasm/fiddle.make
@@ -33,7 +33,8 @@ fiddle.emcc-flags = \
   -sMODULARIZE \
   -sDYNAMIC_EXECUTION=0 \
   -sWASM_BIGINT=$(emcc_enable_bigint) \
-  -sEXPORT_NAME=initFiddleModule \
+  -sEXPORT_NAME=$(sqlite3.js.init-func) \
+  $(sqlite3.js.flags.--post-js) \
   -sEXPORTED_RUNTIME_METHODS=@$(dir.wasm)/EXPORTED_RUNTIME_METHODS.fiddle \
   -sEXPORTED_FUNCTIONS=@$(dir.wasm)/EXPORTED_FUNCTIONS.fiddle \
   --post-js=$(post-js.js) \
@@ -58,7 +59,7 @@ $(dir.fiddle)/$(SOAP.js): $(SOAP.js)
 
 $(fiddle-module.js): $(MAKEFILE) $(MAKEFILE.fiddle) \
     EXPORTED_FUNCTIONS.fiddle EXPORTED_RUNTIME_METHODS.fiddle \
-    $(fiddle.cs) $(post-js.js) $(dir.fiddle)/$(SOAP.js)
+    $(fiddle.cs) $(post-jses.deps) $(dir.fiddle)/$(SOAP.js)
 	$(emcc.bin) -o $@ $(fiddle.emcc-flags) $(fiddle.cs)
 	$(maybe-wasm-strip) $(fiddle-module.wasm)
 	gzip < $@ > $@.gz
@@ -72,6 +73,7 @@ clean-fiddle:
 	rm -f $(fiddle-module.js) $(fiddle-module.js).gz \
         $(fiddle-module.wasm) $(fiddle-module.wasm).gz \
         $(dir.fiddle)/$(SOAP.js) \
+        $(dir.fiddle)/fiddle-module.worker.js \
         EXPORTED_FUNCTIONS.fiddle
 .PHONY: fiddle
 fiddle: $(fiddle-module.js) $(dir.fiddle)/fiddle.js.gz
diff --git a/ext/wasm/fiddle/fiddle-worker.js b/ext/wasm/fiddle/fiddle-worker.js
index b0c0526f8c..6a0cf53b72 100644
--- a/ext/wasm/fiddle/fiddle-worker.js
+++ b/ext/wasm/fiddle/fiddle-worker.js
@@ -145,7 +145,7 @@
            that any argv strings passed to its main() are valid until
            the wasm environment shuts down. */
       ];
-      const S = fiddleModule.sqlite3;
+      const capi = sqlite3.capi;
       /* We need to call sqlite3_shutdown() in order to avoid numerous
          legitimate warnings from the shell about it being initialized
          after sqlite3_initialize() has been called. This means,
@@ -153,9 +153,9 @@
          to be re-done (e.g.  re-registration of dynamically-loaded
          VFSes). We need a more generic approach to running such
          init-level code. */
-      S.capi.sqlite3_shutdown();
-      f.argv.pArgv = S.capi.wasm.allocMainArgv(f.argv);
-      f.argv.rc = S.capi.wasm.exports.fiddle_main(
+      capi.sqlite3_shutdown();
+      f.argv.pArgv = capi.wasm.allocMainArgv(f.argv);
+      f.argv.rc = capi.wasm.exports.fiddle_main(
         f.argv.length, f.argv.pArgv
       );
       if(f.argv.rc){
@@ -163,8 +163,8 @@
         fiddleModule.isDead = true;
         return false;
       }
-      stdout("SQLite version", S.capi.sqlite3_libversion(),
-             S.capi.sqlite3_sourceid().substr(0,19));
+      stdout("SQLite version", capi.sqlite3_libversion(),
+             capi.sqlite3_sourceid().substr(0,19));
       stdout('Welcome to the "fiddle" shell.');
       if(S.opfs){
         stdout("\nOPFS is available. To open a persistent db, use:\n\n",
@@ -187,7 +187,7 @@
     exec: function f(sql){
       if(!f._){
         if(!this.runMain()) return;
-        f._ = fiddleModule.cwrap('fiddle_exec', null, ['string']);
+        f._ = sqlite3.capi.wasm.xWrap('fiddle_exec', null, ['string']);
       }
       if(fiddleModule.isDead){
         stderr("shell module has exit()ed. Cannot run SQL.");
@@ -198,6 +198,7 @@
         if(f._running){
           stderr('Cannot run multiple commands concurrently.');
         }else if(sql){
+          if(Array.isArray(sql)) sql = sql.join('');
           f._running = true;
           f._(sql);
         }
@@ -213,7 +214,7 @@
         stderr("TODO: cannot currently reset an OPFS-hosted db.");
         return;
       }
-      if(!f._) f._ = fiddleModule.cwrap('fiddle_reset_db', null);
+      if(!f._) f._ = sqlite3.capi.wasm.xWrap('fiddle_reset_db', null);
       stdout("Resetting database.",fixmeOPFS);
       f._();
       stdout("Reset",this.dbFilename());
@@ -221,7 +222,7 @@
     /* Interrupt can't work: this Worker is tied up working, so won't get the
        interrupt event which would be needed to perform the interrupt. */
     interrupt: function f(){
-      if(!f._) f._ = fiddleModule.cwrap('fiddle_interrupt', null);
+      if(!f._) f._ = sqlite3.capi.wasm.xWrap('fiddle_interrupt', null);
       stdout("Requesting interrupt.");
       f._();
     }
@@ -240,7 +241,7 @@
      the bug is apparently in (or via) this code.
   */
   const brokenExportDbFileToBlob = function(){
-    const S = fiddleModule.sqlite3, capi = S.capi, wasm = capi.wasm;
+    const capi = sqlite3.capi, wasm = capi.wasm;
     const pDb = Sqlite3Shell.dbHandle();
     if(!pDb) toss("No db is opened.");
     const scope = wasm.scopedAllocPush();
@@ -289,7 +290,7 @@
     }finally{
       wasm.scopedAllocPop(scope);
     }
-  }/*exportDbFileToBlob()*/;
+  }/*brokenExportDbFileToBlob()*/;
 
   const exportDbFileToBlob = function f(){
     if(!f._){
@@ -459,16 +460,12 @@
 
      emcc ... -sMODULARIZE=1 -sEXPORT_NAME=initFiddleModule
   */
-  initFiddleModule(fiddleModule).then(function(thisModule){
-    sqlite3 = thisModule.sqlite3;
-    const atEnd = ()=>{
-      thisModule.fsUnlink = (fn)=>{
-        stderr("unlink:",fixmeOPFS);
-        return sqlite3.capi.wasm.sqlite3_wasm_vfs_unlink(fn);
-      };
-      wMsg('fiddle-ready');
+  sqlite3InitModule(fiddleModule).then((_sqlite3)=>{
+    sqlite3 = _sqlite3;
+    fiddleModule.fsUnlink = (fn)=>{
+      stderr("unlink:",fixmeOPFS);
+      return sqlite3.capi.wasm.sqlite3_wasm_vfs_unlink(fn);
     };
-    if(sqlite3.installOpfsVfs) sqlite3.installOpfsVfs().finally(atEnd);
-    else atEnd();
+    wMsg('fiddle-ready');
   })/*then()*/;
 })();
diff --git a/ext/wasm/fiddle/fiddle.js b/ext/wasm/fiddle/fiddle.js
index 4a0bc39116..2a3d1746f3 100644
--- a/ext/wasm/fiddle/fiddle.js
+++ b/ext/wasm/fiddle/fiddle.js
@@ -341,7 +341,7 @@
       .querySelector(arguments[arguments.length-1]);
   };
 
-  /** Handles status updates from the Module object. */
+  /** Handles status updates from the Emscripten Module object. */
   SF.addMsgHandler('module', function f(ev){
     ev = ev.data;
     if('status'!==ev.type){
@@ -722,43 +722,49 @@
     (function(){
       const xElem = E('#select-examples');
       const examples = [
-        {name: "Help", sql:
-`-- ================================================
--- Use ctrl-enter or shift-enter to execute sqlite3
--- shell commands and SQL.
--- If a subset of the text is currently selected,
--- only that part is executed.
--- ================================================
-.help`},
+        {name: "Help", sql: [
+          "-- ================================================\n",
+          "-- Use ctrl-enter or shift-enter to execute sqlite3\n",
+          "-- shell commands and SQL.\n",
+          "-- If a subset of the text is currently selected,\n",
+          "-- only that part is executed.\n",
+          "-- ================================================\n",
+          ".help\n"
+        ]},
               //{name: "Timer on", sql: ".timer on"},
               // ^^^ re-enable if emscripten re-enables getrusage()
-                {name: "Setup table T", sql:`.nullvalue NULL
-CREATE TABLE t(a,b);
-INSERT INTO t(a,b) VALUES('abc',123),('def',456),(NULL,789),('ghi',012);
-SELECT * FROM t;`},
-                {name: "Table list", sql: ".tables"},
-                {name: "Box Mode", sql: ".mode box"},
-                {name: "JSON Mode", sql: ".mode json"},
-                {name: "Mandlebrot", sql: `WITH RECURSIVE
-  xaxis(x) AS (VALUES(-2.0) UNION ALL SELECT x+0.05 FROM xaxis WHERE x<1.2),
-  yaxis(y) AS (VALUES(-1.0) UNION ALL SELECT y+0.1 FROM yaxis WHERE y<1.0),
-  m(iter, cx, cy, x, y) AS (
-    SELECT 0, x, y, 0.0, 0.0 FROM xaxis, yaxis
-    UNION ALL
-    SELECT iter+1, cx, cy, x*x-y*y + cx, 2.0*x*y + cy FROM m 
-     WHERE (x*x + y*y) < 4.0 AND iter<28
-  ),
-  m2(iter, cx, cy) AS (
-    SELECT max(iter), cx, cy FROM m GROUP BY cx, cy
-  ),
-  a(t) AS (
-    SELECT group_concat( substr(' .+*#', 1+min(iter/7,4), 1), '') 
-    FROM m2 GROUP BY cy
-  )
-SELECT group_concat(rtrim(t),x'0a') as Mandelbrot FROM a;`}
+        {name: "Setup table T", sql:[
+          ".nullvalue NULL\n",
+          "CREATE TABLE t(a,b);\n",
+          "INSERT INTO t(a,b) VALUES('abc',123),('def',456),(NULL,789),('ghi',012);\n",
+          "SELECT * FROM t;\n"
+        ]},
+        {name: "Table list", sql: ".tables"},
+        {name: "Box Mode", sql: ".mode box"},
+        {name: "JSON Mode", sql: ".mode json"},
+        {name: "Mandlebrot", sql:[
+          "WITH RECURSIVE",
+          "  xaxis(x) AS (VALUES(-2.0) UNION ALL SELECT x+0.05 FROM xaxis WHERE x<1.2),\n",
+          "  yaxis(y) AS (VALUES(-1.0) UNION ALL SELECT y+0.1 FROM yaxis WHERE y<1.0),\n",
+          "  m(iter, cx, cy, x, y) AS (\n",
+          "    SELECT 0, x, y, 0.0, 0.0 FROM xaxis, yaxis\n",
+          "    UNION ALL\n",
+          "    SELECT iter+1, cx, cy, x*x-y*y + cx, 2.0*x*y + cy FROM m \n",
+          "     WHERE (x*x + y*y) < 4.0 AND iter<28\n",
+          "  ),\n",
+          "  m2(iter, cx, cy) AS (\n",
+          "    SELECT max(iter), cx, cy FROM m GROUP BY cx, cy\n",
+          "  ),\n",
+          "  a(t) AS (\n",
+          "    SELECT group_concat( substr(' .+*#', 1+min(iter/7,4), 1), '') \n",
+          "    FROM m2 GROUP BY cy\n",
+          "  )\n",
+          "SELECT group_concat(rtrim(t),x'0a') as Mandelbrot FROM a;\n",
+        ]}
       ];
       const newOpt = function(lbl,val){
         const o = document.createElement('option');
+        if(Array.isArray(val)) val = val.join('');
         o.value = val;
         if(!val) o.setAttribute('disabled',true);
         o.appendChild(document.createTextNode(lbl));
diff --git a/manifest b/manifest
index e54e9ea56d..8502c199d7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Rework\sthe\sEmscripten-emitted\smodule\sloader/init\sfunction\ssuch\sthat\sit\spasses\son\sthe\ssqlite3\smodule,\sinstead\sof\sthe\sEmscripten\smodule,\sto\sthe\sfirst\sthen()\sof\ssqlite3InitModule()'s\sreturned\sPromise.\sThis\seliminates\sany\sneed\sto\smention\sthe\sEmscripten\smodule\sobject\sin\sclient-side\scode\sunless\sthey\swant\sto\sconfigure\sit\sin\sadvance\sfor\sloading-status\sreports.
-D 2022-09-29T13:17:50.536
+C Finish\seliminating\sexplicit\sEmscripten\smodule\sdependencies\sin\stest\scode\sand\sfiddle.\sThe\sonly\sremnant\sin\spublic\scode\sis\sthe\sEmscripten-generated\smodule\sload/init\sinterface.
+D 2022-09-29T16:54:23.260
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -482,11 +482,11 @@ F ext/wasm/api/README.md f54102d74cfde01ebe242fa1411e126a9cda8f19b3ac378afd1103b
 F ext/wasm/api/extern-post-js.js d29d5f615c887b356ff80a77a09a346339644c66d4fea79230d8378e2e2f4914
 F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba81456260a713ed04900c
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
-F ext/wasm/api/sqlite3-api-cleanup.js 4bd28e61216690b12d6f77bfce71b011995c29496397cfa77e08198eb8d19aeb
+F ext/wasm/api/sqlite3-api-cleanup.js 98905936119a555659b5cf43844211809ab9f436c52a569004e5585d2842b5c2
 F ext/wasm/api/sqlite3-api-glue.js 3b164f0ef690a838da8613a2aaec4fc49d29ad5e8fe39c8cdc0f5281f08f9d0b
 F ext/wasm/api/sqlite3-api-oo1.js 97a786b366fcac442e1557c3eedef3afa96877411bd6239094d4db5fd5b3c353
 F ext/wasm/api/sqlite3-api-opfs.js af65e056b9f5bc6182499f7e7767e3d01abc3772a62c8abbcc04e4c7bb0affc6
-F ext/wasm/api/sqlite3-api-prologue.js 47245a1bb279f54c7c1d6b32f13222536ce0196ced9c2bda2d12a0b4ef8c136d
+F ext/wasm/api/sqlite3-api-prologue.js 97b6073ec313ec4bcbf5d9aeac3ede548485642e56b3e1573beef198f38cc565
 F ext/wasm/api/sqlite3-api-worker1.js d5d5b7fac4c4731c38c7e03f4f404b2a95c388a2a1d8bcf361caada572f107e0
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c b756b9c1fee9d0598f715e6df6bf089b750da24aa91bb7ef9277a037d81e7612
@@ -501,11 +501,11 @@ F ext/wasm/demo-123.html aa281d33b7eefa755f3122b7b5a18f39a42dc5fb69c8879171bf14b
 F ext/wasm/demo-123.js 35de7c544b9190759fcbf4ca125a674d3f6db03614b9a2175efaa1fbf363ef6f
 F ext/wasm/demo-kvvfs1.html 7d4f28873de67f51ac18c584b7d920825139866a96049a49c424d6f5a0ea5e7f
 F ext/wasm/demo-kvvfs1.js d1126c3b08099dc1279f353b298ee90f6d374ab6ca2b4cf412031fc992e51d35
-F ext/wasm/fiddle.make fd56fa21bada6ecbf860686a9a789ebda7cc3d9b60835927000fcb00246ea50f
+F ext/wasm/fiddle.make 1595178ee6e6bb645d2be5b6c349cb3604182106ca3fd6bf3336be51432cfb19
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
-F ext/wasm/fiddle/fiddle-worker.js 425b75b1debe1108c10f1373fdd75994a18adbdc0a593e7ff0ecd91cc6498e89
+F ext/wasm/fiddle/fiddle-worker.js 2a7107b06e5be3b9b063c340ec952f687e37ba6e0aa736b58c280dfb5e16625a
 F ext/wasm/fiddle/fiddle.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
-F ext/wasm/fiddle/fiddle.js aa44051be6e48c53fd23c829177d43f557dcc6f0998ccfcbae7c473ff405f0c6
+F ext/wasm/fiddle/fiddle.js 974b995119ac443685d7d94d3b3c58c6a36540e9eb3fed7069d5653284071715
 F ext/wasm/index.html 63b370619e4f849ac76f1baed435c05edc29dbb6795bc7c1c935561ff667dd27
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 9aa6951b529a8b29f578ec8f0355713c39584c92cf1708f63ba0cf917cb5b68e
@@ -2027,8 +2027,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 2e2821f782511b9d2274a89a5a922582aba18c7e9dc7ce01080e713942a56d7d
-R 4702b024c44aa8b0e10da8a3cb6edeca
+P 0dbaa0e2b5abf5c23e2039ec90a3055ebb3c063aaf4e556c42546defe6fbb86d
+R 5ed3f961358b68dff72339b628086e3f
 U stephan
-Z 43dbf13bcecc8e2f4da632a6ad6ef70c
+Z 127c84518f22055431ece9a85dc4b451
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 5e51671dec..5c3a00deef 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0dbaa0e2b5abf5c23e2039ec90a3055ebb3c063aaf4e556c42546defe6fbb86d
\ No newline at end of file
+7be78dd4efc410f13ff1ceda1fad82b309cc24de2d5106c8bd6b2adeaa13b106
\ No newline at end of file

From b0ccf50cbd0430eefaf50f5b6c2485ee8d68d6d4 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Thu, 29 Sep 2022 17:35:25 +0000
Subject: [PATCH 181/428] Ensure that the wasm builds always, even when passing
 -Ox flags from the CLI, use -g3 to avoid problems caused by symbol
 minification with optimization levels -O2 and higher.

FossilOrigin-Name: 27d24d5d270e272af07d96cf07bdbe79ba07a9c69ba3c70beb76ebf4f90fc97a
---
 ext/wasm/GNUmakefile | 29 ++++++++++++++++++-----------
 ext/wasm/fiddle.make |  2 +-
 ext/wasm/wasmfs.make |  2 +-
 manifest             | 16 ++++++++--------
 manifest.uuid        |  2 +-
 5 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index e9652e1da9..ab687d1e46 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -77,12 +77,17 @@ SQLITE_OPT = \
 # and friends may be NULL.
 
 ifneq (,$(filter release,$(MAKECMDGOALS)))
-emcc_opt ?= -Oz -g3 -flto
+emcc_opt ?= -Oz -flto
 else
-emcc_opt ?= -O0 -g3
+emcc_opt ?= -O0
 # ^^^^ build times for -O levels higher than 0 are painful at
 # dev-time.
 endif
+# When passing emcc_opt from the CLI, += and re-assignment have no
+# effect, so emcc_opt+=-g3 doesn't work. So...
+emcc_opt_full := $(emcc_opt) -g3
+# ^^^ ALWAYS use -g3. See below for why.
+#
 # ^^^ -flto improves runtime speed at -O0 considerably but doubles
 # build time.
 #
@@ -102,6 +107,8 @@ endif
 # -Os: not quite 1% in some completely unscientific tests. Runtime
 # speed for the unit tests is all over the place either way so it's
 # difficult to say whether -Os gives any speed benefit over -Oz.
+#
+# (Much later: -O2 consistently gives the best speeds.)
 ########################################################################
 
 
@@ -273,7 +280,7 @@ define WASM_C_COMPILE
 $(1).o := $$(subst .c,.o,$(1))
 sqlite3.wasm.obj += $$($(1).o)
 $$($(1).o): $$(MAKEFILE) $(1)
-	$$(emcc.bin) $$(emcc_opt) $$(emcc.flags) $$(emcc.cflags) -c $(1) -o $$@
+	$$(emcc.bin) $$(emcc_opt_full) $$(emcc.flags) $$(emcc.cflags) -c $(1) -o $$@
 CLEAN_FILES += $$($(1).o)
 endef
 $(foreach c,$(sqlite3-wasm.c) $(jaccwabyt_test.c),$(eval $(call WASM_C_COMPILE,$(c))))
@@ -281,7 +288,7 @@ $(sqlite3.js): $(MAKEFILE) $(sqlite3.wasm.obj) \
     EXPORTED_FUNCTIONS.api \
     $(post-jses.deps)
 	@echo "Building $@ ..."
-	$(emcc.bin) -o $@ $(emcc_opt) $(emcc.flags) $(emcc.jsflags) $(sqlite3.wasm.obj)
+	$(emcc.bin) -o $@ $(emcc_opt_full) $(emcc.flags) $(emcc.jsflags) $(sqlite3.wasm.obj)
 	chmod -x $(sqlite3.wasm)
 	$(maybe-wasm-strip) $(sqlite3.wasm)
 	@ls -la $@ $(sqlite3.wasm)
@@ -318,7 +325,7 @@ all: batch
 # speedtest1.js...
 # speedtest1-common.eflags = emcc flags used by multiple builds of speedtest1
 # speedtest1.eflags = emcc flags used by main build of speedtest1
-speedtest1-common.eflags := -g $(emcc_opt)
+speedtest1-common.eflags := $(emcc_opt_full)
 speedtest1.eflags :=
 speedtest1.eflags += -sENVIRONMENT=web
 speedtest1-common.eflags += -sINVOKE_RUN=0
@@ -426,18 +433,18 @@ o-xtra += -flto
 # doubles the build time and seems to have negligible effect on
 # higher optimization levels.
 o0: clean
-	$(MAKE) -e "emcc_opt=-O0 $(o-xtra)" fiddle_opt=-O0
+	$(MAKE) -e "emcc_opt=-O0 $(o-xtra)"
 o1: clean
-	$(MAKE) -e "emcc_opt=-O1 $(o-xtra)" fiddle_opt=-O1
+	$(MAKE) -e "emcc_opt=-O1 $(o-xtra)"
 o2: clean
-	$(MAKE) -e "emcc_opt=-O2 $(o-xtra)" fiddle_opt=-O2
+	$(MAKE) -e "emcc_opt=-O2 $(o-xtra)"
 o3: clean
-	$(MAKE) -e "emcc_opt=-O3 $(o-xtra)" fiddle_opt=-O3
+	$(MAKE) -e "emcc_opt=-O3 $(o-xtra)"
 os: clean
 	@echo "WARNING: -Os can result in a build with mysteriously missing pieces!"
-	$(MAKE) -e "emcc_opt=-Os $(o-xtra)" fiddle_opt=-Os
+	$(MAKE) -e "emcc_opt=-Os $(o-xtra)"
 oz: clean
-	$(MAKE) -e "emcc_opt=-Oz $(o-xtra)" fiddle_opt=-Oz
+	$(MAKE) -e "emcc_opt=-Oz $(o-xtra)"
 
 ########################################################################
 # Sub-makes...
diff --git a/ext/wasm/fiddle.make b/ext/wasm/fiddle.make
index a98806f5eb..c3892263a7 100644
--- a/ext/wasm/fiddle.make
+++ b/ext/wasm/fiddle.make
@@ -24,7 +24,7 @@ $(dir.top)/shell.c: $(SHELL_SRC) $(dir.top)/tool/mkshellc.tcl
 ########################################################################
 
 fiddle.emcc-flags = \
-  $(emcc.cflags) $(emcc_opt) \
+  $(emcc.cflags) $(emcc_opt_full) \
   --minify 0 \
   -sALLOW_TABLE_GROWTH \
   -sABORTING_MALLOC \
diff --git a/ext/wasm/wasmfs.make b/ext/wasm/wasmfs.make
index 20ddcdb9e2..b93f2ab0c8 100644
--- a/ext/wasm/wasmfs.make
+++ b/ext/wasm/wasmfs.make
@@ -82,7 +82,7 @@ $(sqlite3-wasmfs.js): $(sqlite3-wasmfs.wasm.c) $(sqlite3-wasm.c) $(sqlite3-wasmf
     EXPORTED_FUNCTIONS.api $(sqlite3-wasm.js) $(MAKEFILE) $(MAKEFILE.wasmfs) \
     $(post-jses.deps)
 	@echo "Building $@ ..."
-	$(emcc.bin) -o $@ $(emcc_opt) $(emcc.flags) \
+	$(emcc.bin) -o $@ $(emcc_opt_full) $(emcc.flags) \
       $(sqlite3-wasmfs.cflags) $(sqlite3-wasmfs.jsflags) $(sqlite3-wasmfs.wasm.c) $(sqlite3-wasmfs.extra.c)
 	chmod -x $(sqlite3-wasmfs.wasm)
 	$(maybe-wasm-strip) $(sqlite3-wasmfs.wasm)
diff --git a/manifest b/manifest
index 8502c199d7..cf04cf881b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Finish\seliminating\sexplicit\sEmscripten\smodule\sdependencies\sin\stest\scode\sand\sfiddle.\sThe\sonly\sremnant\sin\spublic\scode\sis\sthe\sEmscripten-generated\smodule\sload/init\sinterface.
-D 2022-09-29T16:54:23.260
+C Ensure\sthat\sthe\swasm\sbuilds\salways,\seven\swhen\spassing\s-Ox\sflags\sfrom\sthe\sCLI,\suse\s-g3\sto\savoid\sproblems\scaused\sby\ssymbol\sminification\swith\soptimization\slevels\s-O2\sand\shigher.
+D 2022-09-29T17:35:25.209
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle 0e88c8cfc3719e4b7e74980d9da664c709e68acf863e48386cda376edfd3bfb0
-F ext/wasm/GNUmakefile 7cf6c4346edd6656d5b9f258049ca56af7d7b8b10da3d21edcc3717015bc6511
+F ext/wasm/GNUmakefile 4446cf935dcf2eee505b142cc754f5e191cf1fdaebace8934551e38502616cc4
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 77a5ee8bd209b5e75dd0e822bc3f6e7319dc9b36431463d4175c775170f92126
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -501,7 +501,7 @@ F ext/wasm/demo-123.html aa281d33b7eefa755f3122b7b5a18f39a42dc5fb69c8879171bf14b
 F ext/wasm/demo-123.js 35de7c544b9190759fcbf4ca125a674d3f6db03614b9a2175efaa1fbf363ef6f
 F ext/wasm/demo-kvvfs1.html 7d4f28873de67f51ac18c584b7d920825139866a96049a49c424d6f5a0ea5e7f
 F ext/wasm/demo-kvvfs1.js d1126c3b08099dc1279f353b298ee90f6d374ab6ca2b4cf412031fc992e51d35
-F ext/wasm/fiddle.make 1595178ee6e6bb645d2be5b6c349cb3604182106ca3fd6bf3336be51432cfb19
+F ext/wasm/fiddle.make ef1d58c3d349d92a64e74908eceb2b2084e67b4aef0f3b0e46c9d89a04461041
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js 2a7107b06e5be3b9b063c340ec952f687e37ba6e0aa736b58c280dfb5e16625a
 F ext/wasm/fiddle/fiddle.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
@@ -531,7 +531,7 @@ F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d766
 F ext/wasm/testing1.js 06b9a439ada636c5478c581c86b2b968f799e0468eae54dc5a4565dfd7afbb88
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
 F ext/wasm/testing2.js 34737da985c4cbd4812b2e7f200942662cae991c5a58ffa5d0350be089d0d410
-F ext/wasm/wasmfs.make d53146b062386b01f7b0b0d498335b33c11548cf3d1706cff472d6cbd42a9c95
+F ext/wasm/wasmfs.make d8f44636517c3af1317c8bd8c37522810af89476a552695fc17c93fbbb7f0070
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
@@ -2027,8 +2027,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 0dbaa0e2b5abf5c23e2039ec90a3055ebb3c063aaf4e556c42546defe6fbb86d
-R 5ed3f961358b68dff72339b628086e3f
+P 7be78dd4efc410f13ff1ceda1fad82b309cc24de2d5106c8bd6b2adeaa13b106
+R 2804880c8426c1f64b82815d3b92b5d3
 U stephan
-Z 127c84518f22055431ece9a85dc4b451
+Z 18007cf5e3a926a3d20573198e330337
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 5c3a00deef..c0f2a98171 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7be78dd4efc410f13ff1ceda1fad82b309cc24de2d5106c8bd6b2adeaa13b106
\ No newline at end of file
+27d24d5d270e272af07d96cf07bdbe79ba07a9c69ba3c70beb76ebf4f90fc97a
\ No newline at end of file

From f71c954cbc07fa0fc8a59e2a8a5a2a32b8e5d95c Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Thu, 29 Sep 2022 22:08:22 +0000
Subject: [PATCH 182/428] Add JS infrastructure to ostensibly allow us to
 customize the wasm imports, which will hypothetically allow us to eliminate
 the dependency on EM_JS(), but the corresponding Emscripten glue-level
 feature currently breaks fatally with WASMFS builds so it's disabled.

FossilOrigin-Name: 88d9253b0db5494bf1c9b6d24f22524eeec856b89e64a66ffb30d945f0df21d3
---
 ext/wasm/GNUmakefile           | 52 +++++++++++++++++++++++++++-------
 ext/wasm/README.md             |  1 +
 ext/wasm/api/extern-post-js.js |  2 +-
 ext/wasm/api/extern-pre-js.js  |  4 +++
 ext/wasm/api/pre-js.js         | 40 ++++++++++++++++++++++++++
 ext/wasm/common/whwasmutil.js  |  2 +-
 ext/wasm/demo-123.js           |  2 ++
 ext/wasm/fiddle.make           |  7 +++--
 ext/wasm/wasmfs.make           | 21 ++++++++------
 manifest                       | 26 +++++++++--------
 manifest.uuid                  |  2 +-
 11 files changed, 123 insertions(+), 36 deletions(-)
 create mode 100644 ext/wasm/api/extern-pre-js.js
 create mode 100644 ext/wasm/api/pre-js.js

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index ab687d1e46..94cb17a723 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -153,6 +153,10 @@ $(sqlite3-api.js): $(sqlite3-api.jses) $(MAKEFILE)
 		echo "/* END FILE: $$i */"; \
 	done > $@
 
+########################################################################
+# --post-js and --pre-js are emcc flags we use to append/prepend JS to
+# the generated emscripten module file.
+pre-js.js := $(dir.api)/pre-js.js
 post-js.js := post-js.js
 CLEAN_FILES += $(post-js.js)
 post-jses := \
@@ -167,8 +171,28 @@ $(post-js.js): $(post-jses) $(MAKEFILE)
 		echo "/* END FILE: $$i */"; \
 	done > $@
 extern-post-js.js := $(dir.api)/extern-post-js.js
-sqlite3.js.flags.--post-js := --post-js=$(post-js.js) --extern-post-js=$(extern-post-js.js)
-post-jses.deps := $(post-js.js) $(extern-post-js.js)
+extern-pre-js.js := $(dir.api)/extern-pre-js.js
+pre-post-common.flags := \
+  --post-js=$(post-js.js) \
+  --extern-post-js=$(extern-post-js.js) \
+  --extern-pre-js=$(extern-pre-js.js)
+pre-post-jses.deps := $(post-js.js) \
+  $(extern-post-js.js) $(extern-pre-js.js)
+########################################################################
+# call-make-pre-js creates rules for pre-js-$(1).js. $1 = the base
+# name of the JS file on whose behalf this pre-js is for.
+define call-make-pre-js
+pre-post-$(1).flags ?=
+pre-js-$(1).js: $$(pre-js.js) $$(MAKEFILE)
+	cp $$(pre-js.js) $$@
+	echo "Module[xInstantiateWasm].uri = '$(1).wasm';" >> $$@
+CLEAN_FILES += pre-js-$(1).js
+pre-post-$(1).deps := $$(pre-post-jses.deps) pre-js-$(1).js
+pre-post-$(1).flags += --pre-js=pre-js-$(1).js
+endef
+#$(error $(call call-make-pre-js,sqlite3-wasmfs))
+# /post-js and pre-js
+########################################################################
 
 ########################################################################
 # emcc flags for .c/.o/.wasm/.js.
@@ -202,7 +226,7 @@ emcc.exportedRuntimeMethods := \
 emcc.jsflags += $(emcc.exportedRuntimeMethods)
 emcc.jsflags += -sUSE_CLOSURE_COMPILER=0
 emcc.jsflags += -sIMPORTED_MEMORY
-emcc.environment := -sENVIRONMENT=web
+emcc.environment := -sENVIRONMENT=web,worker
 emcc.jsflags += -sALLOW_MEMORY_GROWTH
 # emcc: warning: USE_PTHREADS + ALLOW_MEMORY_GROWTH may run non-wasm code
 #       slowly, see https://github.com/WebAssembly/design/issues/1271
@@ -264,7 +288,6 @@ emcc.jsflags += -sWASM_BIGINT=$(emcc_enable_bigint)
 # code get confused and cannot load property (namely, the
 # sqlite3.worker.js generated in conjunction with -sWASMFS).
 sqlite3.js := sqlite3.js
-emcc.jsflags += $(sqlite3.js.flags.--post-js)
 sqlite3.wasm := sqlite3.wasm
 sqlite3-wasm.o := $(dir.api)/sqlite3-wasm.o
 $(sqlite3-wasm.o): emcc.cflags += $(SQLITE_OPT)
@@ -276,19 +299,25 @@ jaccwabyt_test.c := $(dir.jacc)/jaccwabyt_test.c
 # want to test the release builds with those apps, so we cannot simply
 # elide that file in release builds. That component is critical to the
 # VFS bindings so needs to be tested along with the core APIs.
-define WASM_C_COMPILE
+########################################################################
+# call-wasm-c-compile sets up build rules
+# for $1.o. $1 must be the name of a C file (with extension).
+define call-wasm-c-compile
 $(1).o := $$(subst .c,.o,$(1))
 sqlite3.wasm.obj += $$($(1).o)
 $$($(1).o): $$(MAKEFILE) $(1)
 	$$(emcc.bin) $$(emcc_opt_full) $$(emcc.flags) $$(emcc.cflags) -c $(1) -o $$@
 CLEAN_FILES += $$($(1).o)
 endef
-$(foreach c,$(sqlite3-wasm.c) $(jaccwabyt_test.c),$(eval $(call WASM_C_COMPILE,$(c))))
+$(foreach c,$(sqlite3-wasm.c) $(jaccwabyt_test.c),$(eval $(call call-wasm-c-compile,$(c))))
+$(eval $(call call-make-pre-js,sqlite3))
 $(sqlite3.js): $(MAKEFILE) $(sqlite3.wasm.obj) \
     EXPORTED_FUNCTIONS.api \
-    $(post-jses.deps)
+    $(pre-post-sqlite3.deps)
 	@echo "Building $@ ..."
-	$(emcc.bin) -o $@ $(emcc_opt_full) $(emcc.flags) $(emcc.jsflags) $(sqlite3.wasm.obj)
+	$(emcc.bin) -o $@ $(emcc_opt_full) $(emcc.flags) \
+    $(emcc.jsflags) $(pre-post-common.flags) $(pre-post-sqlite3.flags) \
+    $(sqlite3.wasm.obj)
 	chmod -x $(sqlite3.wasm)
 	$(maybe-wasm-strip) $(sqlite3.wasm)
 	@ls -la $@ $(sqlite3.wasm)
@@ -342,8 +371,8 @@ speedtest1-common.eflags += -sALLOW_TABLE_GROWTH
 speedtest1-common.eflags += -sDYNAMIC_EXECUTION=0
 speedtest1-common.eflags += --minify 0
 speedtest1-common.eflags += -sEXPORT_NAME=$(sqlite3.js.init-func)
-speedtest1-common.eflags += $(sqlite3.js.flags.--post-js)
 speedtest1-common.eflags += -sWASM_BIGINT=$(emcc_enable_bigint)
+speedtest1-common.eflags += $(pre-post-common.flags) 
 speedtest1.exit-runtime0 := -sEXIT_RUNTIME=0
 speedtest1.exit-runtime1 := -sEXIT_RUNTIME=1
 # Re -sEXIT_RUNTIME=1 vs 0: if it's 1 and speedtest1 crashes, we get
@@ -377,11 +406,14 @@ $(speedtest1.js): emcc.cflags+=
 # the latter (predictably) results in a slightly faster binary, but we're
 # close enough to the target speed requirements that the 500ms makes a
 # difference.
-$(speedtest1.js): $(MAKEFILE) $(speedtest1.cs) $(post-jses.deps) \
+$(eval $(call call-make-pre-js,speedtest1))
+$(speedtest1.js): $(MAKEFILE) $(speedtest1.cs) \
+    $(pre-post-speedtest1.deps) \
     EXPORTED_FUNCTIONS.speedtest1
 	@echo "Building $@ ..."
 	$(emcc.bin) \
         $(speedtest1.eflags) $(speedtest1-common.eflags) $(speedtest1.cflags) \
+        $(pre-post-speedtest1.flags) \
         $(SQLITE_OPT) \
         $(speedtest1.exit-runtime0) \
         -o $@ $(speedtest1.cs) -lm
diff --git a/ext/wasm/README.md b/ext/wasm/README.md
index f950013597..103295384b 100644
--- a/ext/wasm/README.md
+++ b/ext/wasm/README.md
@@ -25,6 +25,7 @@ Those parts only need to be run once, but the SDK can be updated using:
 
 ```
 $ git pull
+$ ./emsdk install latest
 $ ./emsdk activate latest
 ```
 
diff --git a/ext/wasm/api/extern-post-js.js b/ext/wasm/api/extern-post-js.js
index acb54c3c9a..25d2d1b328 100644
--- a/ext/wasm/api/extern-post-js.js
+++ b/ext/wasm/api/extern-post-js.js
@@ -1,4 +1,4 @@
-/* emscripten-js-addenda.js must be appended to the resulting sqlite3.js
+/* extern-post-js.js must be appended to the resulting sqlite3.js
    file. */
 (function(){
   /**
diff --git a/ext/wasm/api/extern-pre-js.js b/ext/wasm/api/extern-pre-js.js
new file mode 100644
index 0000000000..26d066d2ee
--- /dev/null
+++ b/ext/wasm/api/extern-pre-js.js
@@ -0,0 +1,4 @@
+/* extern-pre-js.js must be prepended to the resulting sqlite3.js
+   file. This file is currently only used for holding snippets during
+   test and development.
+*/
diff --git a/ext/wasm/api/pre-js.js b/ext/wasm/api/pre-js.js
new file mode 100644
index 0000000000..f373fecec5
--- /dev/null
+++ b/ext/wasm/api/pre-js.js
@@ -0,0 +1,40 @@
+Module['locateFile'] = function(path, prefix) {
+  return prefix + path;
+};
+
+/**
+   Bug warning: this xInstantiateWasm bit must remain disabled
+   until this bug is resolved or wasmfs won't work:
+
+   https://github.com/emscripten-core/emscripten/issues/17951
+*/
+const xInstantiateWasm = 1
+      ? 'emscripten-bug-17951'
+      : 'instantiateWasm';
+Module[xInstantiateWasm] = function callee(imports,onSuccess){
+  imports.foo = function(){};
+  console.warn("instantiateWasm() uri =",callee.uri, self.location.href);
+  const wfetch = ()=>fetch(callee.uri, {credentials: 'same-origin'});
+  const loadWasm = WebAssembly.instantiateStreaming
+        ? function loadWasmStreaming(){
+          return WebAssembly.instantiateStreaming(wfetch(), imports)
+            .then((arg)=>onSuccess(arg.instance, arg.module));
+        }
+        : function loadWasmOldSchool(){ // Safari < v15
+          return wfetch()
+            .then(response => response.arrayBuffer())
+            .then(bytes => WebAssembly.instantiate(bytes, imports))
+            .then((arg)=>onSuccess(arg.instance, arg.module));
+        };
+  loadWasm();
+  return {};
+};
+/*
+  It is literally impossible to get the name of a Worker's own script,
+  so impossible to derive X.wasm from script name X.js. Thus we need,
+  at build-time, to redifine Module['instantiateWasm'].uri by
+  appending it to a build-specific copy of this file with the name of
+  the wasm file. This is apparently why Emscripten hard-codes the name of
+  the wasm file into their glue scripts.
+*/
+Module[xInstantiateWasm].uri = 'sqlite3.wasm';
diff --git a/ext/wasm/common/whwasmutil.js b/ext/wasm/common/whwasmutil.js
index 662978b20b..8b6dbdd83d 100644
--- a/ext/wasm/common/whwasmutil.js
+++ b/ext/wasm/common/whwasmutil.js
@@ -1538,7 +1538,7 @@ self.WhWasmUtilInstaller = function(target){
 
    - `onload(loadResult,config)`: optional callback. The first
      argument is the result object from
-     WebAssembly.instanitate[Streaming](). The 2nd is the config
+     WebAssembly.instantiate[Streaming](). The 2nd is the config
      object passed to this function. Described in more detail below.
 
    - `imports`: optional imports object for
diff --git a/ext/wasm/demo-123.js b/ext/wasm/demo-123.js
index 00ea1f5bc0..37dc7a7af1 100644
--- a/ext/wasm/demo-123.js
+++ b/ext/wasm/demo-123.js
@@ -21,6 +21,7 @@
   */
   let logHtml;
   if(self.window === self /* UI thread */){
+    console.log("Running demo from main UI thread.");
     logHtml = function(cssClass,...args){
       const ln = document.createElement('div');
       if(cssClass) ln.classList.add(cssClass);
@@ -28,6 +29,7 @@
       document.body.append(ln);
     };
   }else{ /* Worker thread */
+    console.log("Running demo from Worker thread.");
     logHtml = function(cssClass,...args){
       postMessage({
         type:'log',
diff --git a/ext/wasm/fiddle.make b/ext/wasm/fiddle.make
index c3892263a7..6ccf8e0294 100644
--- a/ext/wasm/fiddle.make
+++ b/ext/wasm/fiddle.make
@@ -57,10 +57,13 @@ SOAP.js := sqlite3-opfs-async-proxy.js
 $(dir.fiddle)/$(SOAP.js): $(SOAP.js)
 	cp $< $@
 
+$(eval $(call call-make-pre-js,fiddle-module))
 $(fiddle-module.js): $(MAKEFILE) $(MAKEFILE.fiddle) \
     EXPORTED_FUNCTIONS.fiddle EXPORTED_RUNTIME_METHODS.fiddle \
-    $(fiddle.cs) $(post-jses.deps) $(dir.fiddle)/$(SOAP.js)
-	$(emcc.bin) -o $@ $(fiddle.emcc-flags) $(fiddle.cs)
+    $(fiddle.cs) $(pre-post-fiddle.deps) $(dir.fiddle)/$(SOAP.js)
+	$(emcc.bin) -o $@ $(fiddle.emcc-flags) \
+    $(pre-post-common.flags) $(pre-post-fiddle.flags) \
+    $(fiddle.cs)
 	$(maybe-wasm-strip) $(fiddle-module.wasm)
 	gzip < $@ > $@.gz
 	gzip < $(fiddle-module.wasm) > $(fiddle-module.wasm).gz
diff --git a/ext/wasm/wasmfs.make b/ext/wasm/wasmfs.make
index b93f2ab0c8..fa8320e585 100644
--- a/ext/wasm/wasmfs.make
+++ b/ext/wasm/wasmfs.make
@@ -22,7 +22,7 @@ sqlite3-wasmfs.flags =
 ########################################################################
 # emcc flags for .c/.o.
 sqlite3-wasmfs.cflags :=
-sqlite3-wasmfs.cflags += -std=c99 -fPIC -g
+sqlite3-wasmfs.cflags += -std=c99 -fPIC
 sqlite3-wasmfs.cflags += -pthread
 sqlite3-wasmfs.cflags += -I. -I.. -I$(dir.top)
 sqlite3-wasmfs.cflags += $(SQLITE_OPT) -DSQLITE_WASM_WASMFS
@@ -57,7 +57,6 @@ sqlite3-wasmfs.jsflags += -sIMPORTED_MEMORY
 #sqlite3-wasmfs.jsflags += -sTOTAL_STACK=4194304
 sqlite3-wasmfs.jsflags += -sEXPORT_NAME=$(sqlite3.js.init-func)
 sqlite3-wasmfs.jsflags += -sGLOBAL_BASE=4096 # HYPOTHETICALLY keep func table indexes from overlapping w/ heap addr.
-sqlite3-wasmfs.jsflags += $(sqlite3.js.flags.--post-js)
 #sqlite3-wasmfs.jsflags += -sFILESYSTEM=0 # only for experimentation. sqlite3 needs the FS API
 #                                Perhaps the wasmfs build doesn't?
 #sqlite3-wasmfs.jsflags += -sABORTING_MALLOC
@@ -70,20 +69,22 @@ sqlite3-wasmfs.jsflags += -sLLD_REPORT_UNDEFINED
 sqlite3-wasmfs.jsflags += -sMEMORY64=0
 sqlite3-wasmfs.jsflags += -sINITIAL_MEMORY=128450560
 sqlite3-wasmfs.fsflags := -pthread -sWASMFS -sPTHREAD_POOL_SIZE=2 -sENVIRONMENT=web,worker
+# -sPTHREAD_POOL_SIZE values of 2 or higher trigger that bug.
 sqlite3-wasmfs.jsflags += $(sqlite3-wasmfs.fsflags)
-speedtest1-common.eflags += -sEXPORTED_FUNCTIONS=@$(dir.wasm)/EXPORTED_FUNCTIONS.speedtest1
 #sqlite3-wasmfs.jsflags += -sALLOW_MEMORY_GROWTH
 #^^^ using ALLOW_MEMORY_GROWTH produces a warning from emcc:
 #   USE_PTHREADS + ALLOW_MEMORY_GROWTH may run non-wasm code slowly,
 #   see https://github.com/WebAssembly/design/issues/1271 [-Wpthreads-mem-growth]
 sqlite3-wasmfs.jsflags += -sWASM_BIGINT=$(emcc_enable_bigint)
-
+$(eval $(call call-make-pre-js,sqlite3-wasmfs))
+sqlite3-wasmfs.jsflags += $(pre-post-common.flags) $(pre-post-sqlite3-wasmfs.flags)
 $(sqlite3-wasmfs.js): $(sqlite3-wasmfs.wasm.c) $(sqlite3-wasm.c) $(sqlite3-wasmfs.extra.c) \
-    EXPORTED_FUNCTIONS.api $(sqlite3-wasm.js) $(MAKEFILE) $(MAKEFILE.wasmfs) \
-    $(post-jses.deps)
+    EXPORTED_FUNCTIONS.api $(MAKEFILE) $(MAKEFILE.wasmfs) \
+    $(pre-post-sqlite3-wasmfs.deps)
 	@echo "Building $@ ..."
 	$(emcc.bin) -o $@ $(emcc_opt_full) $(emcc.flags) \
-      $(sqlite3-wasmfs.cflags) $(sqlite3-wasmfs.jsflags) $(sqlite3-wasmfs.wasm.c) $(sqlite3-wasmfs.extra.c)
+      $(sqlite3-wasmfs.cflags) $(sqlite3-wasmfs.jsflags) \
+     $(sqlite3-wasmfs.wasm.c) $(sqlite3-wasmfs.extra.c)
 	chmod -x $(sqlite3-wasmfs.wasm)
 	$(maybe-wasm-strip) $(sqlite3-wasmfs.wasm)
 	@ls -la $@ $(sqlite3-wasmfs.wasm)
@@ -99,13 +100,15 @@ speedtest1-wasmfs.js := speedtest1-wasmfs.js
 speedtest1-wasmfs.wasm := $(subst .js,.wasm,$(speedtest1-wasmfs.js))
 speedtest1-wasmfs.eflags := $(sqlite3-wasmfs.fsflags)
 speedtest1-wasmfs.eflags += $(SQLITE_OPT) -DSQLITE_WASM_WASMFS
-$(speedtest1-wasmfs.js): $(MAKEFILE) $(MAKEFILE.wasmfs)
-#$(speedtest1-wasmfs.js): $(sqlite3-wasmfs.js)
+$(eval $(call call-make-pre-js,speedtest1-wasmfs))
 $(speedtest1-wasmfs.js): $(speedtest1.cs) $(sqlite3-wasmfs.js) \
+  $(MAKEFILE) $(MAKEFILE.wasmfs) \
+  $(pre-post-speedtest1-wasmfs.deps) \
   EXPORTED_FUNCTIONS.speedtest1
 	@echo "Building $@ ..."
 	$(emcc.bin) \
         $(speedtest1-wasmfs.eflags) $(speedtest1-common.eflags) \
+        $(pre-post-speedtest1-wasmfs.flags) \
         $(speedtest1.cflags) \
         $(sqlite3-wasmfs.cflags) \
         -o $@ $(speedtest1.cs) -lm
diff --git a/manifest b/manifest
index cf04cf881b..603810bdef 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthat\sthe\swasm\sbuilds\salways,\seven\swhen\spassing\s-Ox\sflags\sfrom\sthe\sCLI,\suse\s-g3\sto\savoid\sproblems\scaused\sby\ssymbol\sminification\swith\soptimization\slevels\s-O2\sand\shigher.
-D 2022-09-29T17:35:25.209
+C Add\sJS\sinfrastructure\sto\sostensibly\sallow\sus\sto\scustomize\sthe\swasm\simports,\swhich\swill\shypothetically\sallow\sus\sto\seliminate\sthe\sdependency\son\sEM_JS(),\sbut\sthe\scorresponding\sEmscripten\sglue-level\sfeature\scurrently\sbreaks\sfatally\swith\sWASMFS\sbuilds\sso\sit's\sdisabled.
+D 2022-09-29T22:08:22.784
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,14 +474,16 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle 0e88c8cfc3719e4b7e74980d9da664c709e68acf863e48386cda376edfd3bfb0
-F ext/wasm/GNUmakefile 4446cf935dcf2eee505b142cc754f5e191cf1fdaebace8934551e38502616cc4
-F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
+F ext/wasm/GNUmakefile b313a82060c733c990b91afa981e10f5e21a0b33a483f33b739ce932ed6bc725
+F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 77a5ee8bd209b5e75dd0e822bc3f6e7319dc9b36431463d4175c775170f92126
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
 F ext/wasm/api/README.md f54102d74cfde01ebe242fa1411e126a9cda8f19b3ac378afd1103b21abfad05
-F ext/wasm/api/extern-post-js.js d29d5f615c887b356ff80a77a09a346339644c66d4fea79230d8378e2e2f4914
+F ext/wasm/api/extern-post-js.js b0df294159c290bec06cd67cce1a882d61944959ffe66a2f4ccbcb337e357781
+F ext/wasm/api/extern-pre-js.js 20143b16b672d0a576fbf768a786d12ee1f84e222126477072389b992542a5b2
 F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba81456260a713ed04900c
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
+F ext/wasm/api/pre-js.js 04cb47eeeb421b7c41481f131bfa395ce9afa7f05c680f697269ea9d9f582518
 F ext/wasm/api/sqlite3-api-cleanup.js 98905936119a555659b5cf43844211809ab9f436c52a569004e5585d2842b5c2
 F ext/wasm/api/sqlite3-api-glue.js 3b164f0ef690a838da8613a2aaec4fc49d29ad5e8fe39c8cdc0f5281f08f9d0b
 F ext/wasm/api/sqlite3-api-oo1.js 97a786b366fcac442e1557c3eedef3afa96877411bd6239094d4db5fd5b3c353
@@ -495,13 +497,13 @@ F ext/wasm/batch-runner.js a94dd0005b34cb4e654a799fbe6357a66070510bbbe5d116cf1a8
 F ext/wasm/common/SqliteTestUtil.js 647bf014bd30bdd870a7e9001e251d12fc1c9ec9ce176a1004b838a4b33c5c05
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 3a5143699c2b73a85b962271e1a9b3241b30d90e30d895e4f55665e648572962
-F ext/wasm/common/whwasmutil.js 20291bbf4955358d0b5ead58db4c575be269b4976e39c43a93331547e3b86363
+F ext/wasm/common/whwasmutil.js fe7f0622cf06fb7df1158d6ca317e399c23a12aaac14870ddf7742efbbd60bda
 F ext/wasm/demo-123-worker.html e419b66495d209b5211ec64903b4cfb3ca7df20d652b41fcd28bf018a773234f
 F ext/wasm/demo-123.html aa281d33b7eefa755f3122b7b5a18f39a42dc5fb69c8879171bf14b4c37c4ec4
-F ext/wasm/demo-123.js 35de7c544b9190759fcbf4ca125a674d3f6db03614b9a2175efaa1fbf363ef6f
+F ext/wasm/demo-123.js 536579fd587974c2511c5bf82034b253d4fdeceabb726927ad7599ef6b7578e8
 F ext/wasm/demo-kvvfs1.html 7d4f28873de67f51ac18c584b7d920825139866a96049a49c424d6f5a0ea5e7f
 F ext/wasm/demo-kvvfs1.js d1126c3b08099dc1279f353b298ee90f6d374ab6ca2b4cf412031fc992e51d35
-F ext/wasm/fiddle.make ef1d58c3d349d92a64e74908eceb2b2084e67b4aef0f3b0e46c9d89a04461041
+F ext/wasm/fiddle.make d343d44c58bca06ac0ec0296207f6441560bff89f1e587bbaf843b73c2ca5d76
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js 2a7107b06e5be3b9b063c340ec952f687e37ba6e0aa736b58c280dfb5e16625a
 F ext/wasm/fiddle/fiddle.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
@@ -531,7 +533,7 @@ F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d766
 F ext/wasm/testing1.js 06b9a439ada636c5478c581c86b2b968f799e0468eae54dc5a4565dfd7afbb88
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
 F ext/wasm/testing2.js 34737da985c4cbd4812b2e7f200942662cae991c5a58ffa5d0350be089d0d410
-F ext/wasm/wasmfs.make d8f44636517c3af1317c8bd8c37522810af89476a552695fc17c93fbbb7f0070
+F ext/wasm/wasmfs.make 3cce1820006196de140f90f2da4b4ea657083fb5bfee7d125be43f7a85748c8f
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
@@ -2027,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 7be78dd4efc410f13ff1ceda1fad82b309cc24de2d5106c8bd6b2adeaa13b106
-R 2804880c8426c1f64b82815d3b92b5d3
+P 27d24d5d270e272af07d96cf07bdbe79ba07a9c69ba3c70beb76ebf4f90fc97a
+R e715779808f61e9926a53ef0cba366ca
 U stephan
-Z 18007cf5e3a926a3d20573198e330337
+Z ef9d6a37e9ad2048fe7dc4931182a2c4
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index c0f2a98171..351fdb16a8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-27d24d5d270e272af07d96cf07bdbe79ba07a9c69ba3c70beb76ebf4f90fc97a
\ No newline at end of file
+88d9253b0db5494bf1c9b6d24f22524eeec856b89e64a66ffb30d945f0df21d3
\ No newline at end of file

From 53d4e01d063ebee14ff06706b58faba0d07df136 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Fri, 30 Sep 2022 10:55:28 +0000
Subject: [PATCH 183/428] wasm: expose sqlite3_de/serialize(),
 sqlite3_malloc/free() and friends, noting that the former explicitly lies on
 use of the latter for memory management so is not generically safe for use in
 wasm.

FossilOrigin-Name: fbc0edb5d31aa0dea92460e853f15f08c642451a7878994116b530cf172325cc
---
 ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api |   7 +
 ext/wasm/api/sqlite3-api-glue.js            |   3 +-
 ext/wasm/api/sqlite3-api-prologue.js        |  18 +-
 ext/wasm/api/sqlite3-wasm.c                 | 298 +++++++++++---------
 manifest                                    |  18 +-
 manifest.uuid                               |   2 +-
 6 files changed, 196 insertions(+), 150 deletions(-)

diff --git a/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api b/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
index c15599df41..6acbec788a 100644
--- a/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
+++ b/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
@@ -27,6 +27,7 @@ _sqlite3_data_count
 _sqlite3_db_filename
 _sqlite3_db_handle
 _sqlite3_db_name
+_sqlite3_deserialize
 _sqlite3_errmsg
 _sqlite3_error_offset
 _sqlite3_errstr
@@ -36,14 +37,19 @@ _sqlite3_extended_errcode
 _sqlite3_extended_result_codes
 _sqlite3_file_control
 _sqlite3_finalize
+_sqlite3_free
 _sqlite3_initialize
 _sqlite3_interrupt
 _sqlite3_libversion
 _sqlite3_libversion_number
+_sqlite3_malloc
+_sqlite3_malloc64
 _sqlite3_open
 _sqlite3_open_v2
 _sqlite3_prepare_v2
 _sqlite3_prepare_v3
+_sqlite3_realloc
+_sqlite3_realloc64
 _sqlite3_reset
 _sqlite3_result_blob
 _sqlite3_result_double
@@ -54,6 +60,7 @@ _sqlite3_result_error_toobig
 _sqlite3_result_int
 _sqlite3_result_null
 _sqlite3_result_text
+_sqlite3_serialize
 _sqlite3_shutdown
 _sqlite3_sourceid
 _sqlite3_sql
diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index 258c08250a..004262e257 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -177,7 +177,8 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     for(const t of ['access', 'blobFinalizers', 'dataTypes',
                     'encodings', 'fcntl', 'flock', 'ioCap',
                     'openFlags', 'prepareFlags', 'resultCodes',
-                    'syncFlags', 'udfFlags', 'version'
+                    'serialize', 'syncFlags', 'udfFlags',
+                    'version'
                    ]){
       for(const e of Object.entries(wasm.ctype[t])){
         // ^^^ [k,v] there triggers a buggy code transormation via one
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index c14756eaa9..ddefc53bd8 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -368,7 +368,10 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     */
     util:{
       isInt32, isTypedArray, isBindableTypedArray, isSQLableTypedArray,
-      affirmBindableTypedArray, typedArrayToString
+      affirmBindableTypedArray, typedArrayToString,
+      isMainWindow: ()=>{
+        return self.window===self && self.document;
+      }
     },
     
     /**
@@ -603,6 +606,11 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     ["sqlite3_db_filename", "string", "sqlite3*", "string"],
     ["sqlite3_db_handle", "sqlite3*", "sqlite3_stmt*"],
     ["sqlite3_db_name", "string", "sqlite3*", "int"],
+    ["sqlite3_deserialize", "int", "sqlite3*", "string", "*", "i64", "i64", "int"]
+    /* Careful! Short version: de/serialize() are problematic because they
+       might use a different allocator that the user for managing the
+       deserialized block. de/serialize() are ONLY safe to use with
+       sqlite3_malloc(), sqlite3_free(), and its 64-bit variants. */,
     ["sqlite3_errmsg", "string", "sqlite3*"],
     ["sqlite3_error_offset", "int", "sqlite3*"],
     ["sqlite3_errstr", "string", "int"],
@@ -615,6 +623,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     ["sqlite3_extended_result_codes", "int", "sqlite3*", "int"],
     ["sqlite3_file_control", "int", "sqlite3*", "string", "int", "*"],
     ["sqlite3_finalize", "int", "sqlite3_stmt*"],
+    ["sqlite3_free", undefined,"*"],
     ["sqlite3_initialize", undefined],
     ["sqlite3_interrupt", undefined, "sqlite3*"
      /* ^^^ we cannot actually currently support this because JS is
@@ -622,11 +631,13 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
         from 2 SharedWorkers concurrently. */],
     ["sqlite3_libversion", "string"],
     ["sqlite3_libversion_number", "int"],
+    ["sqlite3_malloc", "*","int"],
     ["sqlite3_open", "int", "string", "*"],
     ["sqlite3_open_v2", "int", "string", "*", "int", "string"],
     /* sqlite3_prepare_v2() and sqlite3_prepare_v3() are handled
        separately due to us requiring two different sets of semantics
        for those, depending on how their SQL argument is provided. */
+    ["sqlite3_realloc", "*","*","int"],
     ["sqlite3_reset", "int", "sqlite3_stmt*"],
     ["sqlite3_result_blob",undefined, "*", "*", "int", "*"],
     ["sqlite3_result_double",undefined, "*", "f64"],
@@ -637,6 +648,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     ["sqlite3_result_int",undefined, "*", "int"],
     ["sqlite3_result_null",undefined, "*"],
     ["sqlite3_result_text",undefined, "*", "string", "int", "*"],
+    ["sqlite3_serialize","*", "sqlite3*", "string", "*", "int"],
     ["sqlite3_shutdown", undefined],
     ["sqlite3_sourceid", "string"],
     ["sqlite3_sql", "string", "sqlite3_stmt*"],
@@ -672,6 +684,8 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     ["sqlite3_bind_int64","int", ["sqlite3_stmt*", "int", "i64"]],
     ["sqlite3_changes64","i64", ["sqlite3*"]],
     ["sqlite3_column_int64","i64", ["sqlite3_stmt*", "int"]],
+    ["sqlite3_malloc64", "*","i64"],
+    ["sqlite3_realloc64", "*","*", "i64"],
     ["sqlite3_total_changes64", "i64", ["sqlite3*"]],
     ["sqlite3_uri_int64", "i64", ["string", "string", "i64"]]
   ];
@@ -817,7 +831,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     return rc;
   };
 
-  if( self.window===self ){
+  if( capi.util.isMainWindow() ){
     /* Features specific to the main window thread... */
 
     /**
diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index b5b8825d29..da8f5c32e7 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -13,6 +13,24 @@
 ** emcc -o sqlite3.wasm ... -I/path/to/sqlite3-c-and-h sqlite3-wasm.c
 */
 
+/*
+** Threading and file locking: JS is single-threaded. Each Worker
+** thread is a separate instance of the JS engine so can never access
+** the same db handle as another thread, thus multi-threading support
+** is unnecessary in the library. Because the filesystems are virtual
+** and local to a given wasm runtime instance, two Workers can never
+** access the same db file at once, with the exception of OPFS. As of
+** this writing (2022-09-30), OPFS exclusively locks a file when
+** opening it, so two Workers can never open the same OPFS-backed file
+** at once. That situation will change if and when lower-level locking
+** features are added to OPFS (as is currently planned, per folks
+** involved with its development).
+**
+** Summary: except for the case of future OPFS, which supports
+** locking, and any similar future filesystems, threading and file
+** locking support are unnecessary in the wasm build.
+*/
+#undef SQLITE_OMIT_DESERIALIZE
 #ifndef SQLITE_DEFAULT_UNIX_VFS
 # define SQLITE_DEFAULT_UNIX_VFS "unix-none"
 #endif
@@ -144,10 +162,137 @@ const char * sqlite3_wasm_enum_json(void){
   outf("%s\"%s\": \"%s\"", (n++ ? ", " : ""), #KEY, KEY)
 #define _DefGroup CloseBrace(1)
 
-  DefGroup(version) {
-    DefInt(SQLITE_VERSION_NUMBER);
-    DefStr(SQLITE_VERSION);
-    DefStr(SQLITE_SOURCE_ID);
+  /* The following groups are sorted alphabetic by group name. */
+  DefGroup(access){
+    DefInt(SQLITE_ACCESS_EXISTS);
+    DefInt(SQLITE_ACCESS_READWRITE);
+    DefInt(SQLITE_ACCESS_READ)/*docs say this is unused*/;
+  } _DefGroup;
+
+  DefGroup(blobFinalizers) {
+    /* SQLITE_STATIC/TRANSIENT need to be handled explicitly as
+    ** integers to avoid casting-related warnings. */
+    out("\"SQLITE_STATIC\":0, \"SQLITE_TRANSIENT\":-1");
+  } _DefGroup;
+
+  DefGroup(dataTypes) {
+    DefInt(SQLITE_INTEGER);
+    DefInt(SQLITE_FLOAT);
+    DefInt(SQLITE_TEXT);
+    DefInt(SQLITE_BLOB);
+    DefInt(SQLITE_NULL);
+  } _DefGroup;
+
+  DefGroup(encodings) {
+    /* Noting that the wasm binding only aims to support UTF-8. */
+    DefInt(SQLITE_UTF8);
+    DefInt(SQLITE_UTF16LE);
+    DefInt(SQLITE_UTF16BE);
+    DefInt(SQLITE_UTF16);
+    /*deprecated DefInt(SQLITE_ANY); */
+    DefInt(SQLITE_UTF16_ALIGNED);
+  } _DefGroup;
+
+  DefGroup(fcntl) {
+    DefInt(SQLITE_FCNTL_LOCKSTATE);
+    DefInt(SQLITE_FCNTL_GET_LOCKPROXYFILE);
+    DefInt(SQLITE_FCNTL_SET_LOCKPROXYFILE);
+    DefInt(SQLITE_FCNTL_LAST_ERRNO);
+    DefInt(SQLITE_FCNTL_SIZE_HINT);
+    DefInt(SQLITE_FCNTL_CHUNK_SIZE);
+    DefInt(SQLITE_FCNTL_FILE_POINTER);
+    DefInt(SQLITE_FCNTL_SYNC_OMITTED);
+    DefInt(SQLITE_FCNTL_WIN32_AV_RETRY);
+    DefInt(SQLITE_FCNTL_PERSIST_WAL);
+    DefInt(SQLITE_FCNTL_OVERWRITE);
+    DefInt(SQLITE_FCNTL_VFSNAME);
+    DefInt(SQLITE_FCNTL_POWERSAFE_OVERWRITE);
+    DefInt(SQLITE_FCNTL_PRAGMA);
+    DefInt(SQLITE_FCNTL_BUSYHANDLER);
+    DefInt(SQLITE_FCNTL_TEMPFILENAME);
+    DefInt(SQLITE_FCNTL_MMAP_SIZE);
+    DefInt(SQLITE_FCNTL_TRACE);
+    DefInt(SQLITE_FCNTL_HAS_MOVED);
+    DefInt(SQLITE_FCNTL_SYNC);
+    DefInt(SQLITE_FCNTL_COMMIT_PHASETWO);
+    DefInt(SQLITE_FCNTL_WIN32_SET_HANDLE);
+    DefInt(SQLITE_FCNTL_WAL_BLOCK);
+    DefInt(SQLITE_FCNTL_ZIPVFS);
+    DefInt(SQLITE_FCNTL_RBU);
+    DefInt(SQLITE_FCNTL_VFS_POINTER);
+    DefInt(SQLITE_FCNTL_JOURNAL_POINTER);
+    DefInt(SQLITE_FCNTL_WIN32_GET_HANDLE);
+    DefInt(SQLITE_FCNTL_PDB);
+    DefInt(SQLITE_FCNTL_BEGIN_ATOMIC_WRITE);
+    DefInt(SQLITE_FCNTL_COMMIT_ATOMIC_WRITE);
+    DefInt(SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE);
+    DefInt(SQLITE_FCNTL_LOCK_TIMEOUT);
+    DefInt(SQLITE_FCNTL_DATA_VERSION);
+    DefInt(SQLITE_FCNTL_SIZE_LIMIT);
+    DefInt(SQLITE_FCNTL_CKPT_DONE);
+    DefInt(SQLITE_FCNTL_RESERVE_BYTES);
+    DefInt(SQLITE_FCNTL_CKPT_START);
+    DefInt(SQLITE_FCNTL_EXTERNAL_READER);
+    DefInt(SQLITE_FCNTL_CKSM_FILE);
+  } _DefGroup;
+
+  DefGroup(flock) {
+    DefInt(SQLITE_LOCK_NONE);
+    DefInt(SQLITE_LOCK_SHARED);
+    DefInt(SQLITE_LOCK_RESERVED);
+    DefInt(SQLITE_LOCK_PENDING);
+    DefInt(SQLITE_LOCK_EXCLUSIVE);
+  } _DefGroup;
+
+  DefGroup(ioCap) {
+    DefInt(SQLITE_IOCAP_ATOMIC);
+    DefInt(SQLITE_IOCAP_ATOMIC512);
+    DefInt(SQLITE_IOCAP_ATOMIC1K);
+    DefInt(SQLITE_IOCAP_ATOMIC2K);
+    DefInt(SQLITE_IOCAP_ATOMIC4K);
+    DefInt(SQLITE_IOCAP_ATOMIC8K);
+    DefInt(SQLITE_IOCAP_ATOMIC16K);
+    DefInt(SQLITE_IOCAP_ATOMIC32K);
+    DefInt(SQLITE_IOCAP_ATOMIC64K);
+    DefInt(SQLITE_IOCAP_SAFE_APPEND);
+    DefInt(SQLITE_IOCAP_SEQUENTIAL);
+    DefInt(SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN);
+    DefInt(SQLITE_IOCAP_POWERSAFE_OVERWRITE);
+    DefInt(SQLITE_IOCAP_IMMUTABLE);
+    DefInt(SQLITE_IOCAP_BATCH_ATOMIC);
+  } _DefGroup;
+
+  DefGroup(openFlags) {
+    /* Noting that not all of these will have any effect in
+    ** WASM-space. */
+    DefInt(SQLITE_OPEN_READONLY);
+    DefInt(SQLITE_OPEN_READWRITE);
+    DefInt(SQLITE_OPEN_CREATE);
+    DefInt(SQLITE_OPEN_URI);
+    DefInt(SQLITE_OPEN_MEMORY);
+    DefInt(SQLITE_OPEN_NOMUTEX);
+    DefInt(SQLITE_OPEN_FULLMUTEX);
+    DefInt(SQLITE_OPEN_SHAREDCACHE);
+    DefInt(SQLITE_OPEN_PRIVATECACHE);
+    DefInt(SQLITE_OPEN_EXRESCODE);
+    DefInt(SQLITE_OPEN_NOFOLLOW);
+    /* OPEN flags for use with VFSes... */
+    DefInt(SQLITE_OPEN_MAIN_DB);
+    DefInt(SQLITE_OPEN_MAIN_JOURNAL);
+    DefInt(SQLITE_OPEN_TEMP_DB);
+    DefInt(SQLITE_OPEN_TEMP_JOURNAL);
+    DefInt(SQLITE_OPEN_TRANSIENT_DB);
+    DefInt(SQLITE_OPEN_SUBJOURNAL);
+    DefInt(SQLITE_OPEN_SUPER_JOURNAL);
+    DefInt(SQLITE_OPEN_WAL);
+    DefInt(SQLITE_OPEN_DELETEONCLOSE);
+    DefInt(SQLITE_OPEN_EXCLUSIVE);
+  } _DefGroup;
+
+  DefGroup(prepareFlags) {
+    DefInt(SQLITE_PREPARE_PERSISTENT);
+    DefInt(SQLITE_PREPARE_NORMALIZE);
+    DefInt(SQLITE_PREPARE_NO_VTAB);
   } _DefGroup;
 
   DefGroup(resultCodes) {
@@ -182,7 +327,6 @@ const char * sqlite3_wasm_enum_json(void){
     DefInt(SQLITE_WARNING);
     DefInt(SQLITE_ROW);
     DefInt(SQLITE_DONE);
-
     // Extended Result Codes
     DefInt(SQLITE_ERROR_MISSING_COLLSEQ);
     DefInt(SQLITE_ERROR_RETRY);
@@ -261,61 +405,10 @@ const char * sqlite3_wasm_enum_json(void){
     //DefInt(SQLITE_OK_SYMLINK) /* internal use only */;
   } _DefGroup;
 
-  DefGroup(dataTypes) {
-    DefInt(SQLITE_INTEGER);
-    DefInt(SQLITE_FLOAT);
-    DefInt(SQLITE_TEXT);
-    DefInt(SQLITE_BLOB);
-    DefInt(SQLITE_NULL);
-  } _DefGroup;
-
-  DefGroup(encodings) {
-    /* Noting that the wasm binding only aims to support UTF-8. */
-    DefInt(SQLITE_UTF8);
-    DefInt(SQLITE_UTF16LE);
-    DefInt(SQLITE_UTF16BE);
-    DefInt(SQLITE_UTF16);
-    /*deprecated DefInt(SQLITE_ANY); */
-    DefInt(SQLITE_UTF16_ALIGNED);
-  } _DefGroup;
-
-  DefGroup(blobFinalizers) {
-    /* SQLITE_STATIC/TRANSIENT need to be handled explicitly as
-    ** integers to avoid casting-related warnings. */
-    out("\"SQLITE_STATIC\":0, \"SQLITE_TRANSIENT\":-1");
-  } _DefGroup;
-
-  DefGroup(udfFlags) {
-    DefInt(SQLITE_DETERMINISTIC);
-    DefInt(SQLITE_DIRECTONLY);
-    DefInt(SQLITE_INNOCUOUS);
-  } _DefGroup;
-
-  DefGroup(openFlags) {
-    /* Noting that not all of these will have any effect in
-    ** WASM-space. */
-    DefInt(SQLITE_OPEN_READONLY);
-    DefInt(SQLITE_OPEN_READWRITE);
-    DefInt(SQLITE_OPEN_CREATE);
-    DefInt(SQLITE_OPEN_URI);
-    DefInt(SQLITE_OPEN_MEMORY);
-    DefInt(SQLITE_OPEN_NOMUTEX);
-    DefInt(SQLITE_OPEN_FULLMUTEX);
-    DefInt(SQLITE_OPEN_SHAREDCACHE);
-    DefInt(SQLITE_OPEN_PRIVATECACHE);
-    DefInt(SQLITE_OPEN_EXRESCODE);
-    DefInt(SQLITE_OPEN_NOFOLLOW);
-    /* OPEN flags for use with VFSes... */
-    DefInt(SQLITE_OPEN_MAIN_DB);
-    DefInt(SQLITE_OPEN_MAIN_JOURNAL);
-    DefInt(SQLITE_OPEN_TEMP_DB);
-    DefInt(SQLITE_OPEN_TEMP_JOURNAL);
-    DefInt(SQLITE_OPEN_TRANSIENT_DB);
-    DefInt(SQLITE_OPEN_SUBJOURNAL);
-    DefInt(SQLITE_OPEN_SUPER_JOURNAL);
-    DefInt(SQLITE_OPEN_WAL);
-    DefInt(SQLITE_OPEN_DELETEONCLOSE);
-    DefInt(SQLITE_OPEN_EXCLUSIVE);
+  DefGroup(serialize){
+    DefInt(SQLITE_DESERIALIZE_FREEONCLOSE);
+    DefInt(SQLITE_DESERIALIZE_READONLY);
+    DefInt(SQLITE_DESERIALIZE_RESIZEABLE);
   } _DefGroup;
 
   DefGroup(syncFlags) {
@@ -324,85 +417,16 @@ const char * sqlite3_wasm_enum_json(void){
     DefInt(SQLITE_SYNC_DATAONLY);
   } _DefGroup;
 
-  DefGroup(prepareFlags) {
-    DefInt(SQLITE_PREPARE_PERSISTENT);
-    DefInt(SQLITE_PREPARE_NORMALIZE);
-    DefInt(SQLITE_PREPARE_NO_VTAB);
+  DefGroup(udfFlags) {
+    DefInt(SQLITE_DETERMINISTIC);
+    DefInt(SQLITE_DIRECTONLY);
+    DefInt(SQLITE_INNOCUOUS);
   } _DefGroup;
 
-  DefGroup(flock) {
-    DefInt(SQLITE_LOCK_NONE);
-    DefInt(SQLITE_LOCK_SHARED);
-    DefInt(SQLITE_LOCK_RESERVED);
-    DefInt(SQLITE_LOCK_PENDING);
-    DefInt(SQLITE_LOCK_EXCLUSIVE);
-  } _DefGroup;
-
-  DefGroup(ioCap) {
-    DefInt(SQLITE_IOCAP_ATOMIC);
-    DefInt(SQLITE_IOCAP_ATOMIC512);
-    DefInt(SQLITE_IOCAP_ATOMIC1K);
-    DefInt(SQLITE_IOCAP_ATOMIC2K);
-    DefInt(SQLITE_IOCAP_ATOMIC4K);
-    DefInt(SQLITE_IOCAP_ATOMIC8K);
-    DefInt(SQLITE_IOCAP_ATOMIC16K);
-    DefInt(SQLITE_IOCAP_ATOMIC32K);
-    DefInt(SQLITE_IOCAP_ATOMIC64K);
-    DefInt(SQLITE_IOCAP_SAFE_APPEND);
-    DefInt(SQLITE_IOCAP_SEQUENTIAL);
-    DefInt(SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN);
-    DefInt(SQLITE_IOCAP_POWERSAFE_OVERWRITE);
-    DefInt(SQLITE_IOCAP_IMMUTABLE);
-    DefInt(SQLITE_IOCAP_BATCH_ATOMIC);
-  } _DefGroup;
-
-  DefGroup(fcntl) {
-    DefInt(SQLITE_FCNTL_LOCKSTATE);
-    DefInt(SQLITE_FCNTL_GET_LOCKPROXYFILE);
-    DefInt(SQLITE_FCNTL_SET_LOCKPROXYFILE);
-    DefInt(SQLITE_FCNTL_LAST_ERRNO);
-    DefInt(SQLITE_FCNTL_SIZE_HINT);
-    DefInt(SQLITE_FCNTL_CHUNK_SIZE);
-    DefInt(SQLITE_FCNTL_FILE_POINTER);
-    DefInt(SQLITE_FCNTL_SYNC_OMITTED);
-    DefInt(SQLITE_FCNTL_WIN32_AV_RETRY);
-    DefInt(SQLITE_FCNTL_PERSIST_WAL);
-    DefInt(SQLITE_FCNTL_OVERWRITE);
-    DefInt(SQLITE_FCNTL_VFSNAME);
-    DefInt(SQLITE_FCNTL_POWERSAFE_OVERWRITE);
-    DefInt(SQLITE_FCNTL_PRAGMA);
-    DefInt(SQLITE_FCNTL_BUSYHANDLER);
-    DefInt(SQLITE_FCNTL_TEMPFILENAME);
-    DefInt(SQLITE_FCNTL_MMAP_SIZE);
-    DefInt(SQLITE_FCNTL_TRACE);
-    DefInt(SQLITE_FCNTL_HAS_MOVED);
-    DefInt(SQLITE_FCNTL_SYNC);
-    DefInt(SQLITE_FCNTL_COMMIT_PHASETWO);
-    DefInt(SQLITE_FCNTL_WIN32_SET_HANDLE);
-    DefInt(SQLITE_FCNTL_WAL_BLOCK);
-    DefInt(SQLITE_FCNTL_ZIPVFS);
-    DefInt(SQLITE_FCNTL_RBU);
-    DefInt(SQLITE_FCNTL_VFS_POINTER);
-    DefInt(SQLITE_FCNTL_JOURNAL_POINTER);
-    DefInt(SQLITE_FCNTL_WIN32_GET_HANDLE);
-    DefInt(SQLITE_FCNTL_PDB);
-    DefInt(SQLITE_FCNTL_BEGIN_ATOMIC_WRITE);
-    DefInt(SQLITE_FCNTL_COMMIT_ATOMIC_WRITE);
-    DefInt(SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE);
-    DefInt(SQLITE_FCNTL_LOCK_TIMEOUT);
-    DefInt(SQLITE_FCNTL_DATA_VERSION);
-    DefInt(SQLITE_FCNTL_SIZE_LIMIT);
-    DefInt(SQLITE_FCNTL_CKPT_DONE);
-    DefInt(SQLITE_FCNTL_RESERVE_BYTES);
-    DefInt(SQLITE_FCNTL_CKPT_START);
-    DefInt(SQLITE_FCNTL_EXTERNAL_READER);
-    DefInt(SQLITE_FCNTL_CKSM_FILE);
-  } _DefGroup;
-
-  DefGroup(access){
-    DefInt(SQLITE_ACCESS_EXISTS);
-    DefInt(SQLITE_ACCESS_READWRITE);
-    DefInt(SQLITE_ACCESS_READ)/*docs say this is unused*/;
+  DefGroup(version) {
+    DefInt(SQLITE_VERSION_NUMBER);
+    DefStr(SQLITE_VERSION);
+    DefStr(SQLITE_SOURCE_ID);
   } _DefGroup;
   
 #undef DefGroup
diff --git a/manifest b/manifest
index 603810bdef..6e07dec0b6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sJS\sinfrastructure\sto\sostensibly\sallow\sus\sto\scustomize\sthe\swasm\simports,\swhich\swill\shypothetically\sallow\sus\sto\seliminate\sthe\sdependency\son\sEM_JS(),\sbut\sthe\scorresponding\sEmscripten\sglue-level\sfeature\scurrently\sbreaks\sfatally\swith\sWASMFS\sbuilds\sso\sit's\sdisabled.
-D 2022-09-29T22:08:22.784
+C wasm:\sexpose\ssqlite3_de/serialize(),\ssqlite3_malloc/free()\sand\sfriends,\snoting\sthat\sthe\sformer\sexplicitly\slies\son\suse\sof\sthe\slatter\sfor\smemory\smanagement\sso\sis\snot\sgenerically\ssafe\sfor\suse\sin\swasm.
+D 2022-09-30T10:55:28.630
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -476,7 +476,7 @@ F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34ce
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle 0e88c8cfc3719e4b7e74980d9da664c709e68acf863e48386cda376edfd3bfb0
 F ext/wasm/GNUmakefile b313a82060c733c990b91afa981e10f5e21a0b33a483f33b739ce932ed6bc725
 F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
-F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 77a5ee8bd209b5e75dd0e822bc3f6e7319dc9b36431463d4175c775170f92126
+F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 8b7f9344964880421721b5cc7daf2d6c420e4a15d3e02d431cb042a79fe9264e
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
 F ext/wasm/api/README.md f54102d74cfde01ebe242fa1411e126a9cda8f19b3ac378afd1103b21abfad05
 F ext/wasm/api/extern-post-js.js b0df294159c290bec06cd67cce1a882d61944959ffe66a2f4ccbcb337e357781
@@ -485,13 +485,13 @@ F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba814
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
 F ext/wasm/api/pre-js.js 04cb47eeeb421b7c41481f131bfa395ce9afa7f05c680f697269ea9d9f582518
 F ext/wasm/api/sqlite3-api-cleanup.js 98905936119a555659b5cf43844211809ab9f436c52a569004e5585d2842b5c2
-F ext/wasm/api/sqlite3-api-glue.js 3b164f0ef690a838da8613a2aaec4fc49d29ad5e8fe39c8cdc0f5281f08f9d0b
+F ext/wasm/api/sqlite3-api-glue.js 81b06946223181727b9a1d731b4f3c2ba97a33ae43bc0bbda7e8fa02400a207e
 F ext/wasm/api/sqlite3-api-oo1.js 97a786b366fcac442e1557c3eedef3afa96877411bd6239094d4db5fd5b3c353
 F ext/wasm/api/sqlite3-api-opfs.js af65e056b9f5bc6182499f7e7767e3d01abc3772a62c8abbcc04e4c7bb0affc6
-F ext/wasm/api/sqlite3-api-prologue.js 97b6073ec313ec4bcbf5d9aeac3ede548485642e56b3e1573beef198f38cc565
+F ext/wasm/api/sqlite3-api-prologue.js dfc9065bd9d300fd712db2e6c69d19d51eaa43613cb6edb4612fc3a588ccc2df
 F ext/wasm/api/sqlite3-api-worker1.js d5d5b7fac4c4731c38c7e03f4f404b2a95c388a2a1d8bcf361caada572f107e0
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c b756b9c1fee9d0598f715e6df6bf089b750da24aa91bb7ef9277a037d81e7612
+F ext/wasm/api/sqlite3-wasm.c 336389b23c9b83763177499e49a0967949c392b2f7d84fbbb52ad6678e159f18
 F ext/wasm/batch-runner.html c363032aba7a525920f61f8be112a29459f73f07e46f0ba3b7730081a617826e
 F ext/wasm/batch-runner.js a94dd0005b34cb4e654a799fbe6357a66070510bbbe5d116cf1a8d4f9901bd80
 F ext/wasm/common/SqliteTestUtil.js 647bf014bd30bdd870a7e9001e251d12fc1c9ec9ce176a1004b838a4b33c5c05
@@ -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 27d24d5d270e272af07d96cf07bdbe79ba07a9c69ba3c70beb76ebf4f90fc97a
-R e715779808f61e9926a53ef0cba366ca
+P 88d9253b0db5494bf1c9b6d24f22524eeec856b89e64a66ffb30d945f0df21d3
+R 4c948bf2f5f40778abbc8384f6bd98eb
 U stephan
-Z ef9d6a37e9ad2048fe7dc4931182a2c4
+Z cb568b9e06886e80ca2b65ac2606f3dd
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 351fdb16a8..b1613cc99e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-88d9253b0db5494bf1c9b6d24f22524eeec856b89e64a66ffb30d945f0df21d3
\ No newline at end of file
+fbc0edb5d31aa0dea92460e853f15f08c642451a7878994116b530cf172325cc
\ No newline at end of file

From f6c686c9f4dc33c66e103d0af437aaf5ae2c20b6 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Fri, 30 Sep 2022 11:01:44 +0000
Subject: [PATCH 184/428] Add oo1.JsStorageDb() as a convenience wrapper for
 oo1.DB(...,'kvvfs'). Minor doc cleanups.

FossilOrigin-Name: 8a7998709f859a562cf6829485cb9921f8823af0efabe003741348ab1169fb89
---
 ext/wasm/api/pre-js.js               | 19 ++++++++++---------
 ext/wasm/api/sqlite3-api-oo1.js      | 21 ++++++++++++++++++++-
 ext/wasm/api/sqlite3-api-opfs.js     |  3 ++-
 ext/wasm/common/whwasmutil.js        |  2 +-
 ext/wasm/demo-kvvfs1.js              | 11 +++--------
 ext/wasm/sqlite3-opfs-async-proxy.js |  3 +--
 manifest                             | 22 +++++++++++-----------
 manifest.uuid                        |  2 +-
 8 files changed, 49 insertions(+), 34 deletions(-)

diff --git a/ext/wasm/api/pre-js.js b/ext/wasm/api/pre-js.js
index f373fecec5..502ecf348f 100644
--- a/ext/wasm/api/pre-js.js
+++ b/ext/wasm/api/pre-js.js
@@ -12,15 +12,15 @@ const xInstantiateWasm = 1
       ? 'emscripten-bug-17951'
       : 'instantiateWasm';
 Module[xInstantiateWasm] = function callee(imports,onSuccess){
-  imports.foo = function(){};
+  imports.env.foo = function(){};
   console.warn("instantiateWasm() uri =",callee.uri, self.location.href);
   const wfetch = ()=>fetch(callee.uri, {credentials: 'same-origin'});
   const loadWasm = WebAssembly.instantiateStreaming
-        ? function loadWasmStreaming(){
+        ? async ()=>{
           return WebAssembly.instantiateStreaming(wfetch(), imports)
             .then((arg)=>onSuccess(arg.instance, arg.module));
         }
-        : function loadWasmOldSchool(){ // Safari < v15
+        : async ()=>{ // Safari < v15
           return wfetch()
             .then(response => response.arrayBuffer())
             .then(bytes => WebAssembly.instantiate(bytes, imports))
@@ -30,11 +30,12 @@ Module[xInstantiateWasm] = function callee(imports,onSuccess){
   return {};
 };
 /*
-  It is literally impossible to get the name of a Worker's own script,
-  so impossible to derive X.wasm from script name X.js. Thus we need,
-  at build-time, to redifine Module['instantiateWasm'].uri by
-  appending it to a build-specific copy of this file with the name of
-  the wasm file. This is apparently why Emscripten hard-codes the name of
-  the wasm file into their glue scripts.
+  It is literally impossible to reliably get the name of _this_ script
+  at runtime, so impossible to derive X.wasm from script name
+  X.js. Thus we need, at build-time, to redefine
+  Module[xInstantiateWasm].uri by appending it to a build-specific
+  copy of this file with the name of the wasm file. This is apparently
+  why Emscripten hard-codes the name of the wasm file into their glue
+  scripts.
 */
 Module[xInstantiateWasm].uri = 'sqlite3.wasm';
diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index 4f7ffe1cd8..1daf6eb00a 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -1638,7 +1638,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     Object.defineProperty(Stmt.prototype, 'pointer', prop);
     Object.defineProperty(DB.prototype, 'pointer', prop);
   }
-  
+
   /** The OO API's public namespace. */
   sqlite3.oo1 = {
     version: {
@@ -1650,5 +1650,24 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     dbCtorHelper
   }/*oo1 object*/;
 
+  if(util.isMainWindow()){
+    /**
+       Functionally equivalent to DB(storageName,'c','kvvfs') except
+       that it throws if the given storage name is not one of 'local'
+       or 'session'.
+    */
+    sqlite3.oo1.JsStorageDb = function(storageName='session'){
+      if('session'!==storageName && 'local'!==storageName){
+        toss3("JsStorageDb db name must be one of 'session' or 'local'.");
+      }
+      dbCtorHelper.call(this, {
+        filename: storageName,
+        flags: 'c',
+        vfs: "kvvfs"
+      });
+    };
+    sqlite3.oo1.JsStorageDb.prototype = Object.create(DB.prototype);
+  }
+
 });
 
diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index 104a5cc1ac..9588fc8a20 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -74,6 +74,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
 */
 const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
   if(!self.SharedArrayBuffer ||
+     !self.Atomics ||
      !self.FileSystemHandle ||
      !self.FileSystemDirectoryHandle ||
      !self.FileSystemFileHandle ||
@@ -109,7 +110,7 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
     const log =    (...args)=>logImpl(2, ...args);
     const warn =   (...args)=>logImpl(1, ...args);
     const error =  (...args)=>logImpl(0, ...args);
-    warn("The OPFS VFS feature is very much experimental and under construction.");
+    //warn("The OPFS VFS feature is very much experimental and under construction.");
     const toss = function(...args){throw new Error(args.join(' '))};
     const capi = sqlite3.capi;
     const wasm = capi.wasm;
diff --git a/ext/wasm/common/whwasmutil.js b/ext/wasm/common/whwasmutil.js
index 8b6dbdd83d..39a214be00 100644
--- a/ext/wasm/common/whwasmutil.js
+++ b/ext/wasm/common/whwasmutil.js
@@ -1542,7 +1542,7 @@ self.WhWasmUtilInstaller = function(target){
      object passed to this function. Described in more detail below.
 
    - `imports`: optional imports object for
-     WebAssembly.instantiate[Streaming](). The default is am empty set
+     WebAssembly.instantiate[Streaming](). The default is an empty set
      of imports. If the module requires any imports, this object
      must include them.
 
diff --git a/ext/wasm/demo-kvvfs1.js b/ext/wasm/demo-kvvfs1.js
index b358694ce8..55a573df47 100644
--- a/ext/wasm/demo-kvvfs1.js
+++ b/ext/wasm/demo-kvvfs1.js
@@ -52,15 +52,10 @@
       return;
     }
     
-    const dbStorage = 1 ? 'session' : 'local';
+    const dbStorage = 0 ? 'session' : 'local';
     const theStore = 's'===dbStorage[0] ? sessionStorage : localStorage;
-    /**
-       The names ':sessionStorage:' and ':localStorage:' are handled
-       via the DB class constructor, not the C level. In the C API,
-       the names "local" and "session" are the current (2022-09-12)
-       names for those keys, but that is subject to change.
-    */
-    const db = new oo.DB( dbStorage, 'c', 'kvvfs' );
+    const db = new oo.JsStorageDb( dbStorage );
+    // Or: oo.DB(dbStorage, 'c', 'kvvfs')
 
     document.querySelector('#btn-clear-storage').addEventListener('click',function(){
       const sz = capi.sqlite3_web_kvvfs_clear();
diff --git a/ext/wasm/sqlite3-opfs-async-proxy.js b/ext/wasm/sqlite3-opfs-async-proxy.js
index fa5cd2d289..025cd97a4e 100644
--- a/ext/wasm/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/sqlite3-opfs-async-proxy.js
@@ -90,8 +90,7 @@ metrics.dump = ()=>{
   console.log("Serialization metrics:",metrics.s11n);
 };
 
-warn("This file is very much experimental and under construction.",
-     self.location.pathname);
+//warn("This file is very much experimental and under construction.",self.location.pathname);
 
 /**
    Map of sqlite3_file pointers (integers) to metadata related to a
diff --git a/manifest b/manifest
index 6e07dec0b6..f8405588d8 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C wasm:\sexpose\ssqlite3_de/serialize(),\ssqlite3_malloc/free()\sand\sfriends,\snoting\sthat\sthe\sformer\sexplicitly\slies\son\suse\sof\sthe\slatter\sfor\smemory\smanagement\sso\sis\snot\sgenerically\ssafe\sfor\suse\sin\swasm.
-D 2022-09-30T10:55:28.630
+C Add\soo1.JsStorageDb()\sas\sa\sconvenience\swrapper\sfor\soo1.DB(...,'kvvfs').\sMinor\sdoc\scleanups.
+D 2022-09-30T11:01:44.089
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -483,11 +483,11 @@ F ext/wasm/api/extern-post-js.js b0df294159c290bec06cd67cce1a882d61944959ffe66a2
 F ext/wasm/api/extern-pre-js.js 20143b16b672d0a576fbf768a786d12ee1f84e222126477072389b992542a5b2
 F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba81456260a713ed04900c
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
-F ext/wasm/api/pre-js.js 04cb47eeeb421b7c41481f131bfa395ce9afa7f05c680f697269ea9d9f582518
+F ext/wasm/api/pre-js.js 2db711eb637991b383fc6b5c0f3df65ec48a7201e5730e304beba8de2d3f9b0b
 F ext/wasm/api/sqlite3-api-cleanup.js 98905936119a555659b5cf43844211809ab9f436c52a569004e5585d2842b5c2
 F ext/wasm/api/sqlite3-api-glue.js 81b06946223181727b9a1d731b4f3c2ba97a33ae43bc0bbda7e8fa02400a207e
-F ext/wasm/api/sqlite3-api-oo1.js 97a786b366fcac442e1557c3eedef3afa96877411bd6239094d4db5fd5b3c353
-F ext/wasm/api/sqlite3-api-opfs.js af65e056b9f5bc6182499f7e7767e3d01abc3772a62c8abbcc04e4c7bb0affc6
+F ext/wasm/api/sqlite3-api-oo1.js c4eacee840d43503f0d46c83cb6ad530a32744e5204c162092588954be377858
+F ext/wasm/api/sqlite3-api-opfs.js 1b097808b7b081b0f0700cf97d49ef19760e401706168edff9cd45cf9169f541
 F ext/wasm/api/sqlite3-api-prologue.js dfc9065bd9d300fd712db2e6c69d19d51eaa43613cb6edb4612fc3a588ccc2df
 F ext/wasm/api/sqlite3-api-worker1.js d5d5b7fac4c4731c38c7e03f4f404b2a95c388a2a1d8bcf361caada572f107e0
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
@@ -497,12 +497,12 @@ F ext/wasm/batch-runner.js a94dd0005b34cb4e654a799fbe6357a66070510bbbe5d116cf1a8
 F ext/wasm/common/SqliteTestUtil.js 647bf014bd30bdd870a7e9001e251d12fc1c9ec9ce176a1004b838a4b33c5c05
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 3a5143699c2b73a85b962271e1a9b3241b30d90e30d895e4f55665e648572962
-F ext/wasm/common/whwasmutil.js fe7f0622cf06fb7df1158d6ca317e399c23a12aaac14870ddf7742efbbd60bda
+F ext/wasm/common/whwasmutil.js d2557d6ef1ebaaf3c9a0cea2231fd398b0d8ca8129b51580af1c92f8d04335e0
 F ext/wasm/demo-123-worker.html e419b66495d209b5211ec64903b4cfb3ca7df20d652b41fcd28bf018a773234f
 F ext/wasm/demo-123.html aa281d33b7eefa755f3122b7b5a18f39a42dc5fb69c8879171bf14b4c37c4ec4
 F ext/wasm/demo-123.js 536579fd587974c2511c5bf82034b253d4fdeceabb726927ad7599ef6b7578e8
 F ext/wasm/demo-kvvfs1.html 7d4f28873de67f51ac18c584b7d920825139866a96049a49c424d6f5a0ea5e7f
-F ext/wasm/demo-kvvfs1.js d1126c3b08099dc1279f353b298ee90f6d374ab6ca2b4cf412031fc992e51d35
+F ext/wasm/demo-kvvfs1.js a66ec114727902f59dd7bcb56f0916df710205f2f3c4a8b2dc8084d2844ee5a0
 F ext/wasm/fiddle.make d343d44c58bca06ac0ec0296207f6441560bff89f1e587bbaf843b73c2ca5d76
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js 2a7107b06e5be3b9b063c340ec952f687e37ba6e0aa736b58c280dfb5e16625a
@@ -522,7 +522,7 @@ F ext/wasm/speedtest1.html e4cb5d722b494104fc1249e7c008ca018f820a784833c51004c95
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
-F ext/wasm/sqlite3-opfs-async-proxy.js fe4b8268eea9acaec633ebd1dd3f85dae7c461c5c68985ab1075d9560b1db8e8
+F ext/wasm/sqlite3-opfs-async-proxy.js 7367733ce409c8106b6c49e8ef2b55440e9974a64f39e0c97f5e3a4587d1fc2a
 F ext/wasm/sqlite3-worker1-promiser.js cca2b853692e4715b4761c46678f96d80819d4756de557922a815149fb93397e
 F ext/wasm/sqlite3-worker1.js 5266ebc4d709fe23d2d076ae44e6085fbc32b82f26ef514b947312f36b1206a9
 F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
@@ -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 88d9253b0db5494bf1c9b6d24f22524eeec856b89e64a66ffb30d945f0df21d3
-R 4c948bf2f5f40778abbc8384f6bd98eb
+P fbc0edb5d31aa0dea92460e853f15f08c642451a7878994116b530cf172325cc
+R 47cf7d28be8b5fd2480bc52e04702404
 U stephan
-Z cb568b9e06886e80ca2b65ac2606f3dd
+Z 217ef4a9980c95c281b52f854fd12e42
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index b1613cc99e..f94ec10c3f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fbc0edb5d31aa0dea92460e853f15f08c642451a7878994116b530cf172325cc
\ No newline at end of file
+8a7998709f859a562cf6829485cb9921f8823af0efabe003741348ab1169fb89
\ No newline at end of file

From dc6ae60226accb043be78771d2033ba34cad3bbe Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Fri, 30 Sep 2022 12:10:36 +0000
Subject: [PATCH 185/428] Expose sqlite3_msize() to wasm.

FossilOrigin-Name: aa6ad34f3b693b554be58ee2895f79397162c5b8877c709653c8508fc625e8f4
---
 ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api |  1 +
 ext/wasm/api/sqlite3-api-prologue.js        |  1 +
 manifest                                    | 14 +++++++-------
 manifest.uuid                               |  2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api b/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
index 6acbec788a..0854d5a1c9 100644
--- a/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
+++ b/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
@@ -44,6 +44,7 @@ _sqlite3_libversion
 _sqlite3_libversion_number
 _sqlite3_malloc
 _sqlite3_malloc64
+_sqlite3_msize
 _sqlite3_open
 _sqlite3_open_v2
 _sqlite3_prepare_v2
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index ddefc53bd8..8443d66eef 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -685,6 +685,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     ["sqlite3_changes64","i64", ["sqlite3*"]],
     ["sqlite3_column_int64","i64", ["sqlite3_stmt*", "int"]],
     ["sqlite3_malloc64", "*","i64"],
+    ["sqlite3_msize", "i64", "*"],
     ["sqlite3_realloc64", "*","*", "i64"],
     ["sqlite3_total_changes64", "i64", ["sqlite3*"]],
     ["sqlite3_uri_int64", "i64", ["string", "string", "i64"]]
diff --git a/manifest b/manifest
index f8405588d8..350f1b1483 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\soo1.JsStorageDb()\sas\sa\sconvenience\swrapper\sfor\soo1.DB(...,'kvvfs').\sMinor\sdoc\scleanups.
-D 2022-09-30T11:01:44.089
+C Expose\ssqlite3_msize()\sto\swasm.
+D 2022-09-30T12:10:36.196
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -476,7 +476,7 @@ F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34ce
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle 0e88c8cfc3719e4b7e74980d9da664c709e68acf863e48386cda376edfd3bfb0
 F ext/wasm/GNUmakefile b313a82060c733c990b91afa981e10f5e21a0b33a483f33b739ce932ed6bc725
 F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
-F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 8b7f9344964880421721b5cc7daf2d6c420e4a15d3e02d431cb042a79fe9264e
+F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api c6b05641d733227a995cc05a2ba7ddc9ef2323081ae0cae5ed1d1f83d5b54b36
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
 F ext/wasm/api/README.md f54102d74cfde01ebe242fa1411e126a9cda8f19b3ac378afd1103b21abfad05
 F ext/wasm/api/extern-post-js.js b0df294159c290bec06cd67cce1a882d61944959ffe66a2f4ccbcb337e357781
@@ -488,7 +488,7 @@ F ext/wasm/api/sqlite3-api-cleanup.js 98905936119a555659b5cf43844211809ab9f436c5
 F ext/wasm/api/sqlite3-api-glue.js 81b06946223181727b9a1d731b4f3c2ba97a33ae43bc0bbda7e8fa02400a207e
 F ext/wasm/api/sqlite3-api-oo1.js c4eacee840d43503f0d46c83cb6ad530a32744e5204c162092588954be377858
 F ext/wasm/api/sqlite3-api-opfs.js 1b097808b7b081b0f0700cf97d49ef19760e401706168edff9cd45cf9169f541
-F ext/wasm/api/sqlite3-api-prologue.js dfc9065bd9d300fd712db2e6c69d19d51eaa43613cb6edb4612fc3a588ccc2df
+F ext/wasm/api/sqlite3-api-prologue.js 304e883ff1b06f668ebb7bbdc80152b0a9f395bbd34acfd5f7a8ef84e8f17466
 F ext/wasm/api/sqlite3-api-worker1.js d5d5b7fac4c4731c38c7e03f4f404b2a95c388a2a1d8bcf361caada572f107e0
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 336389b23c9b83763177499e49a0967949c392b2f7d84fbbb52ad6678e159f18
@@ -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 fbc0edb5d31aa0dea92460e853f15f08c642451a7878994116b530cf172325cc
-R 47cf7d28be8b5fd2480bc52e04702404
+P 8a7998709f859a562cf6829485cb9921f8823af0efabe003741348ab1169fb89
+R 6289539b45a526ce95fc98c2c59f8773
 U stephan
-Z 217ef4a9980c95c281b52f854fd12e42
+Z 68420fe602124bac34ea19b4b762f3c8
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f94ec10c3f..cc329fd806 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8a7998709f859a562cf6829485cb9921f8823af0efabe003741348ab1169fb89
\ No newline at end of file
+aa6ad34f3b693b554be58ee2895f79397162c5b8877c709653c8508fc625e8f4
\ No newline at end of file

From cb57716c6537b65faf302461b2cb06b1c5a07a3a Mon Sep 17 00:00:00 2001
From: drh <>
Date: Fri, 30 Sep 2022 14:35:18 +0000
Subject: [PATCH 186/428] Improvements to the "demoDelete" method in the
 demovfs, suggested by [forum:/forumpost/cad18961c2|forum post cad18961c2].

FossilOrigin-Name: d76a301e22e0572262917dfe9557a5051339a65416a473dd2d9989a49975403e
---
 manifest           | 12 ++++++------
 manifest.uuid      |  2 +-
 src/test_demovfs.c | 22 ++++++++++++----------
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/manifest b/manifest
index 62a60b44d4..d586c46b1e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\smisuse\sof\sthe\ssqlite3_set_auxdata()\sinterface\sin\sthe\sICU\sextension.
-D 2022-09-28T19:14:01.801
+C Improvements\sto\sthe\s"demoDelete"\smethod\sin\sthe\sdemovfs,\ssuggested\sby\n[forum:/forumpost/cad18961c2|forum\spost\scad18961c2].
+D 2022-09-30T14:35:18.306
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -615,7 +615,7 @@ F src/test_blob.c ae4a0620b478548afb67963095a7417cd06a4ec0a56adb453542203bfdcb31
 F src/test_btree.c 8b2dc8b8848cf3a4db93f11578f075e82252a274
 F src/test_config.c 8264637b06a3c1f0727c88d1ea32dcf7986b9e7e358a970cae87cdac8a5b2708
 F src/test_delete.c e2fe07646dff6300b48d49b2fee2fe192ed389e834dd635e3b3bac0ce0bf9f8f
-F src/test_demovfs.c 86142ba864d4297d54c5b2e972e74f3141ae4b30f05b3a95824184ed2d3d7f91
+F src/test_demovfs.c 7b3be8cdf07d00f025309fbb2453cb5f0fd9ed74f40543c7f4353dcac2879aa7
 F src/test_devsym.c aff2255ea290d7718da08af30cdf18e470ff7325a5eff63e0057b1496ed66593
 F src/test_fs.c ba1e1dc18fd3159fdba0b9c4256f14032159785320dfbd6776eb9973cb75d480
 F src/test_func.c 24df3a346c012b1fc9e1001d346db6054deb426db0a7437e92490630e71c9b0a
@@ -2000,8 +2000,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 584de6a996c78b8e41bdfcd05a8e2a3844664c6b4efedb5883c8b8af388462b5
-R d79b3651cd76ebe372f6bfce59942639
+P f25cf63471cbed1edb27591e57fead62550d4046dbdcb61312288f0f6f24c646
+R 1d883d051102da05e54bf9f370b714ba
 U drh
-Z 79f3fdc2db5301812c92ae8ca64cb084
+Z fa066d9d8da6a5ee78227c4b8bbd23f3
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 7c940e14ae..aab65d7179 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f25cf63471cbed1edb27591e57fead62550d4046dbdcb61312288f0f6f24c646
\ No newline at end of file
+d76a301e22e0572262917dfe9557a5051339a65416a473dd2d9989a49975403e
\ No newline at end of file
diff --git a/src/test_demovfs.c b/src/test_demovfs.c
index eaba208732..49f2814464 100644
--- a/src/test_demovfs.c
+++ b/src/test_demovfs.c
@@ -462,21 +462,23 @@ static int demoDelete(sqlite3_vfs *pVfs, const char *zPath, int dirSync){
   if( rc==0 && dirSync ){
     int dfd;                      /* File descriptor open on directory */
     int i;                        /* Iterator variable */
+    char *zSlash;
     char zDir[MAXPATHNAME+1];     /* Name of directory containing file zPath */
 
     /* Figure out the directory name from the path of the file deleted. */
     sqlite3_snprintf(MAXPATHNAME, zDir, "%s", zPath);
     zDir[MAXPATHNAME] = '\0';
-    for(i=strlen(zDir); i>1 && zDir[i]!='/'; i++);
-    zDir[i] = '\0';
-
-    /* Open a file-descriptor on the directory. Sync. Close. */
-    dfd = open(zDir, O_RDONLY, 0);
-    if( dfd<0 ){
-      rc = -1;
-    }else{
-      rc = fsync(dfd);
-      close(dfd);
+    zSlash = strrchr(zPath,'/');
+    if( zSlash ){
+      /* Open a file-descriptor on the directory. Sync. Close. */
+      zSlash[0] = 0;
+      dfd = open(zDir, O_RDONLY, 0);
+      if( dfd<0 ){
+        rc = -1;
+      }else{
+        rc = fsync(dfd);
+        close(dfd);
+      }
     }
   }
   return (rc==0 ? SQLITE_OK : SQLITE_IOERR_DELETE);

From 359d62395ec5423b5ac906dd9fda300d679d34b7 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Fri, 30 Sep 2022 15:24:58 +0000
Subject: [PATCH 187/428] batch-runner.js: force WebSQL batches to not abort
 for a failed statement (necessary for apples-to-apples-ish benchmark
 comparisons).

FossilOrigin-Name: 60f0c5cb04d2baf8431e523434d8753e39377f4b2c6bad225c2e5487a4be419b
---
 ext/wasm/batch-runner.js | 17 +++++++++++++----
 manifest                 | 12 ++++++------
 manifest.uuid            |  2 +-
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/ext/wasm/batch-runner.js b/ext/wasm/batch-runner.js
index ad281c2e9d..36083e62f1 100644
--- a/ext/wasm/batch-runner.js
+++ b/ext/wasm/batch-runner.js
@@ -184,6 +184,7 @@
 
       let runner;
       if('websql'===db.id){
+        const who = this;
         runner = function(resolve, reject){
           /* WebSQL cannot execute multiple statements, nor can it execute SQL without
              an explicit transaction. Thus we have to do some fragile surgery on the
@@ -217,7 +218,8 @@
                   tx.executeSql(s,[], ()=>{}, (t,e)=>{
                     console.error("WebSQL error",e,"SQL =",s);
                     who.logErr(e.message);
-                    throw e;
+                    //throw e;
+                    return false;
                   });
                   metrics.stepTotal += performance.now() - t;
                 }
@@ -230,7 +232,11 @@
             const nextBatch = function(){
               if(sqls.length){
                 console.log("websql sqls.length",sqls.length,'of',n);
-                db.handle.transaction(transaction, reject, nextBatch);
+                db.handle.transaction(transaction, (e)=>{
+                  who.logErr("Ignoring and contiuing:",e.message)
+                  //reject(e);
+                  return false;
+                }, nextBatch);
               }else{
                 resolve(who);
               }
@@ -240,7 +246,8 @@
           }catch(e){
             //this.gotErr = e;
             console.error("websql error:",e);
-            reject(e);
+            who.logErr(e.message);
+            //reject(e);
           }
         }.bind(this);
       }else{/*sqlite3 db...*/
@@ -292,6 +299,7 @@
             //this.gotErr = e;
             reject(e);
           }finally{
+            capi.sqlite3_exec(db.handle,"rollback;",0,0,0);
             wasm.scopedAllocPop(stack);
           }
         }.bind(this);
@@ -604,7 +612,8 @@
     }/*run()*/
   }/*App*/;
 
-  self.sqlite3TestModule.initSqlite3().then(function(sqlite3){
+  self.sqlite3TestModule.initSqlite3().then(function(sqlite3_){
+    sqlite3 = sqlite3_;
     self.App = App /* only to facilitate dev console access */;
     App.run(sqlite3);
   });
diff --git a/manifest b/manifest
index 350f1b1483..6855cfc147 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Expose\ssqlite3_msize()\sto\swasm.
-D 2022-09-30T12:10:36.196
+C batch-runner.js:\sforce\sWebSQL\sbatches\sto\snot\sabort\sfor\sa\sfailed\sstatement\s(necessary\sfor\sapples-to-apples-ish\sbenchmark\scomparisons).
+D 2022-09-30T15:24:58.096
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -493,7 +493,7 @@ F ext/wasm/api/sqlite3-api-worker1.js d5d5b7fac4c4731c38c7e03f4f404b2a95c388a2a1
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 336389b23c9b83763177499e49a0967949c392b2f7d84fbbb52ad6678e159f18
 F ext/wasm/batch-runner.html c363032aba7a525920f61f8be112a29459f73f07e46f0ba3b7730081a617826e
-F ext/wasm/batch-runner.js a94dd0005b34cb4e654a799fbe6357a66070510bbbe5d116cf1a8d4f9901bd80
+F ext/wasm/batch-runner.js ce92650a6681586c89bef26ceae96674a55ca5a9727815202ca62e1a00ff5015
 F ext/wasm/common/SqliteTestUtil.js 647bf014bd30bdd870a7e9001e251d12fc1c9ec9ce176a1004b838a4b33c5c05
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 3a5143699c2b73a85b962271e1a9b3241b30d90e30d895e4f55665e648572962
@@ -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 8a7998709f859a562cf6829485cb9921f8823af0efabe003741348ab1169fb89
-R 6289539b45a526ce95fc98c2c59f8773
+P aa6ad34f3b693b554be58ee2895f79397162c5b8877c709653c8508fc625e8f4
+R ee4d9e4b75d1595fd50d7230f8809959
 U stephan
-Z 68420fe602124bac34ea19b4b762f3c8
+Z d21afcaefd67f3605743128101420e02
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index cc329fd806..6464846c21 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-aa6ad34f3b693b554be58ee2895f79397162c5b8877c709653c8508fc625e8f4
\ No newline at end of file
+60f0c5cb04d2baf8431e523434d8753e39377f4b2c6bad225c2e5487a4be419b
\ No newline at end of file

From 07c0b722530b67cf9c56129da386e809efa5bdc2 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Fri, 30 Sep 2022 15:46:08 +0000
Subject: [PATCH 188/428] Add oo1.JsStorageDb.clearStorage/storageSize()
 methods, copies of capi.sqlite3_web_kvvfs_clear/size().

FossilOrigin-Name: 1e09efe7fa15b8908f8b8353164a8361de778e27ea6c0b11c402bf4e1c56333d
---
 ext/wasm/api/sqlite3-api-oo1.js | 32 ++++++++++++++++++++++++++++++--
 ext/wasm/demo-kvvfs1.js         | 10 +++++-----
 manifest                        | 14 +++++++-------
 manifest.uuid                   |  2 +-
 4 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index 1daf6eb00a..19e9e61f08 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -426,6 +426,14 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
   DB.checkRc = checkSqlite3Rc;
 
   DB.prototype = {
+    /** Returns true if this db handle is open, else false. */
+    isOpen: function(){
+      return !!this.pointer;
+    },
+    /** Throws if this given DB has been closed, else returns `this`. */
+    affirmOpen: function(){
+      return affirmDbOpen(this);
+    },
     /**
        Finalizes all open statements and closes this database
        connection. This is a no-op if the db has already been
@@ -1666,8 +1674,28 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
         vfs: "kvvfs"
       });
     };
-    sqlite3.oo1.JsStorageDb.prototype = Object.create(DB.prototype);
-  }
+    const jdb = sqlite3.oo1.JsStorageDb;
+    jdb.prototype = Object.create(DB.prototype);
+    /** Equivalent to sqlite3_web_kvvfs_clear(). */
+    jdb.clearStorage = capi.sqlite3_web_kvvfs_clear;
+    /**
+       Clears this database instance's storage or throws if this
+       instance has been closed. Returns the number of
+       database blocks which were cleaned up.
+    */
+    jdb.prototype.clearStorage = function(){
+      return jdb.clearStorage(affirmDbOpen(this).filename);
+    };
+    /** Equivalent to sqlite3_web_kvvfs_size(). */
+    jdb.storageSize = capi.sqlite3_web_kvvfs_size;
+    /**
+       Returns the _approximate_ number of bytes this database takes
+       up in its storage or throws if this instance has been closed.
+    */
+    jdb.prototype.storageSize = function(){
+      return jdb.storageSize(affirmDbOpen(this).filename);
+    };
+  }/*main-window-only bits*/
 
 });
 
diff --git a/ext/wasm/demo-kvvfs1.js b/ext/wasm/demo-kvvfs1.js
index 55a573df47..0621cb2dca 100644
--- a/ext/wasm/demo-kvvfs1.js
+++ b/ext/wasm/demo-kvvfs1.js
@@ -56,10 +56,10 @@
     const theStore = 's'===dbStorage[0] ? sessionStorage : localStorage;
     const db = new oo.JsStorageDb( dbStorage );
     // Or: oo.DB(dbStorage, 'c', 'kvvfs')
-
+    log("db.storageSize():",db.storageSize());
     document.querySelector('#btn-clear-storage').addEventListener('click',function(){
-      const sz = capi.sqlite3_web_kvvfs_clear();
-      log("kvvfs localStorage and sessionStorage cleared:",sz,"entries.");
+      const sz = db.clearStorage();
+      log("kvvfs",db.filename+"Storage cleared:",sz,"entries.");
     });
     document.querySelector('#btn-clear-log').addEventListener('click',function(){
       eOutput.innerText = '';
@@ -96,8 +96,8 @@
       }
     });
     document.querySelector('#btn-storage-size').addEventListener('click',function(){
-      log("sqlite3_web_kvvfs_size(",dbStorage,") says", capi.sqlite3_web_kvvfs_size(dbStorage),
-         "bytes");
+      log("size.storageSize(",dbStorage,") says", db.storageSize(),
+          "bytes");
     });
     log("Storage backend:",db.filename);
     if(0===db.selectValue('select count(*) from sqlite_master')){
diff --git a/manifest b/manifest
index 6855cfc147..b84de07c49 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C batch-runner.js:\sforce\sWebSQL\sbatches\sto\snot\sabort\sfor\sa\sfailed\sstatement\s(necessary\sfor\sapples-to-apples-ish\sbenchmark\scomparisons).
-D 2022-09-30T15:24:58.096
+C Add\soo1.JsStorageDb.clearStorage/storageSize()\smethods,\scopies\sof\scapi.sqlite3_web_kvvfs_clear/size().
+D 2022-09-30T15:46:08.196
 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 98905936119a555659b5cf43844211809ab9f436c52a569004e5585d2842b5c2
 F ext/wasm/api/sqlite3-api-glue.js 81b06946223181727b9a1d731b4f3c2ba97a33ae43bc0bbda7e8fa02400a207e
-F ext/wasm/api/sqlite3-api-oo1.js c4eacee840d43503f0d46c83cb6ad530a32744e5204c162092588954be377858
+F ext/wasm/api/sqlite3-api-oo1.js 9caed0757a5e039ed92467e827fd3ca347fa08f19fe086fcbdd14a4ebe9c2f01
 F ext/wasm/api/sqlite3-api-opfs.js 1b097808b7b081b0f0700cf97d49ef19760e401706168edff9cd45cf9169f541
 F ext/wasm/api/sqlite3-api-prologue.js 304e883ff1b06f668ebb7bbdc80152b0a9f395bbd34acfd5f7a8ef84e8f17466
 F ext/wasm/api/sqlite3-api-worker1.js d5d5b7fac4c4731c38c7e03f4f404b2a95c388a2a1d8bcf361caada572f107e0
@@ -502,7 +502,7 @@ F ext/wasm/demo-123-worker.html e419b66495d209b5211ec64903b4cfb3ca7df20d652b41fc
 F ext/wasm/demo-123.html aa281d33b7eefa755f3122b7b5a18f39a42dc5fb69c8879171bf14b4c37c4ec4
 F ext/wasm/demo-123.js 536579fd587974c2511c5bf82034b253d4fdeceabb726927ad7599ef6b7578e8
 F ext/wasm/demo-kvvfs1.html 7d4f28873de67f51ac18c584b7d920825139866a96049a49c424d6f5a0ea5e7f
-F ext/wasm/demo-kvvfs1.js a66ec114727902f59dd7bcb56f0916df710205f2f3c4a8b2dc8084d2844ee5a0
+F ext/wasm/demo-kvvfs1.js 105596bd2ccd0b1deb5fde8e99b536e8242d4bb5932fac0c8403ff3a6bc547e8
 F ext/wasm/fiddle.make d343d44c58bca06ac0ec0296207f6441560bff89f1e587bbaf843b73c2ca5d76
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js 2a7107b06e5be3b9b063c340ec952f687e37ba6e0aa736b58c280dfb5e16625a
@@ -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 aa6ad34f3b693b554be58ee2895f79397162c5b8877c709653c8508fc625e8f4
-R ee4d9e4b75d1595fd50d7230f8809959
+P 60f0c5cb04d2baf8431e523434d8753e39377f4b2c6bad225c2e5487a4be419b
+R 2f56b5a6214af7809c3a763a0bc16b9d
 U stephan
-Z d21afcaefd67f3605743128101420e02
+Z 221cd5b9b95b0e9d6b36653a70003bd2
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 6464846c21..0041f243b3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-60f0c5cb04d2baf8431e523434d8753e39377f4b2c6bad225c2e5487a4be419b
\ No newline at end of file
+1e09efe7fa15b8908f8b8353164a8361de778e27ea6c0b11c402bf4e1c56333d
\ No newline at end of file

From d18f1bbfe06e40713de908cd894d9857f6c11606 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Fri, 30 Sep 2022 16:49:03 +0000
Subject: [PATCH 189/428] Add sqlite3.version object. Add more state to the
 Worker #1 config-get response, including sqlite3.version.

FossilOrigin-Name: 711f458d188a0dbe6612069c856ade29323ab426dfa4f80e7b82757ccc474cb8
---
 ext/wasm/api/sqlite3-api-glue.js     |  5 ++++
 ext/wasm/api/sqlite3-api-prologue.js | 11 ++++++---
 ext/wasm/api/sqlite3-api-worker1.js  | 37 ++++++++++++++++++----------
 manifest                             | 16 ++++++------
 manifest.uuid                        |  2 +-
 5 files changed, 45 insertions(+), 26 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index 004262e257..2082f427b9 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -202,4 +202,9 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
       capi[s.name] = sqlite3.StructBinder(s);
     }
   }/*end C constant imports*/
+
+  sqlite3.version = Object.assign(Object.create(null),{
+    library: sqlite3.capi.sqlite3_libversion(),
+    sourceId: sqlite3.capi.sqlite3_sourceid()
+  });
 });
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 8443d66eef..760c4b0b4a 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -927,13 +927,16 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
        subsequent calls are no-ops which return a pre-resolved
        Promise.
 
-       If called at all, this function must be called by client-level
-       code, which must not use the library until the returned promise
-       resolves.
+       Ideally this function is called as part of the Promise chain
+       which handles the loading and bootstrapping of the API.  If not
+       then it must be called by client-level code, which must not use
+       the library until the returned promise resolves.
 
        Bug: if called while a prior call is still resolving, the 2nd
        call will resolve prematurely, before the 1st call has finished
-       resolving.
+       resolving. The current build setup precludes that possibility,
+       so it's only a hypothetical problem if/when this function
+       ever needs to be invoked by clients.
 
        In Emscripten-based builds, this function is called
        automatically and deleted from this object.
diff --git a/ext/wasm/api/sqlite3-api-worker1.js b/ext/wasm/api/sqlite3-api-worker1.js
index d60621ada6..5f1e310ba4 100644
--- a/ext/wasm/api/sqlite3-api-worker1.js
+++ b/ext/wasm/api/sqlite3-api-worker1.js
@@ -154,15 +154,20 @@
     messageId: ...as above...,
     result: {
 
-      wasmfsOpfsDir: path prefix, if any, of persistent storage.
-      An empty string denotes that no persistent storage is available.
+      version: sqlite3.version object
 
       bigIntEnabled: bool. True if BigInt support is enabled.
 
-      wasmfsOpfsEnabled: true if persistent storage is enabled in the
-      current environment. Only files stored under persistentDirName
-      will persist, however.
+      wasmfsOpfsDir: path prefix, if any, _intended_ for use with
+      OPFS persistent storage.
 
+      wasmfsOpfsEnabled: true if persistent storage is enabled in the
+      current environment. Only files stored under wasmfsOpfsDir
+      will persist using that mechanism, however. It is legal to use
+      the non-WASMFS OPFS VFS to open a database via a URI-style
+      db filename.
+
+      vfses: result of sqlite3.capi.sqlite3_web_vfs_list()
    }
   }
   ```
@@ -180,7 +185,8 @@
     args:{
 
       filename [=":memory:" or "" (unspecified)]: the db filename.
-      See the sqlite3.oo1.DB constructor for peculiarities and transformations,
+      See the sqlite3.oo1.DB constructor for peculiarities and
+      transformations,
 
       persistent [=false]: if true and filename is not one of ("",
       ":memory:"), prepend sqlite3.capi.sqlite3_wasmfs_opfs_dir()
@@ -188,6 +194,9 @@
       _if_ the environment supports it.  If persistent storage is not
       supported, the filename is used as-is.
 
+      // TODO?: ^^^^ maybe rework that, now that we have the non-WASMFS
+      // OFPS.
+
     }
   }
   ```
@@ -211,6 +220,7 @@
       persistent: true if the given filename resides in the
       known-persistent storage, else false. This determination is
       independent of the `persistent` input argument.
+
    }
   }
   ```
@@ -448,7 +458,8 @@ sqlite3.initWorker1API = function(){
       }
       const db = wState.open(oargs);
       rc.filename = db.filename;
-      rc.persistent = !!pDir && db.filename.startsWith(pDir);
+      rc.persistent = (!!pDir && db.filename.startsWith(pDir))
+        || sqlite3.capi.sqlite3_web_db_uses_vfs(db.pointer, "opfs");
       rc.dbId = getDbId(db);
       return rc;
     },
@@ -526,6 +537,8 @@ sqlite3.initWorker1API = function(){
         if(Object.getOwnPropertyDescriptor(src, k)) rc[k] = src[k];
       });
       rc.wasmfsOpfsEnabled = !!sqlite3.capi.sqlite3_wasmfs_opfs_dir();
+      rc.version = sqlite3.version;
+      rc.vfses = sqlite3.capi.sqlite3_web_vfs_list();
       return rc;
     },
 
@@ -542,12 +555,10 @@ sqlite3.initWorker1API = function(){
          mimetype: 'application/x-sqlite3'
        }
 
-       TODO is to determine how/whether this feature can support
-       exports of ":memory:" and "" (temp file) DBs. The latter is
-       ostensibly easy because the file is (potentially) on disk, but
-       the former does not have a structure which maps directly to a
-       db file image. We can VACUUM INTO a :memory:/temp db into a
-       file for that purpose, though.
+       2022-09-30: we have shell.c:fiddle_export_db() which works fine
+       for disk-based databases (even if it's a virtual disk like an
+       Emscripten VFS). sqlite3_serialize() can return this for
+       :memory: and temp databases.
     */
     export: function(ev){
       toss("export() requires reimplementing for portability reasons.");
diff --git a/manifest b/manifest
index b84de07c49..3b4a64f8fd 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\soo1.JsStorageDb.clearStorage/storageSize()\smethods,\scopies\sof\scapi.sqlite3_web_kvvfs_clear/size().
-D 2022-09-30T15:46:08.196
+C Add\ssqlite3.version\sobject.\sAdd\smore\sstate\sto\sthe\sWorker\s#1\sconfig-get\sresponse,\sincluding\ssqlite3.version.
+D 2022-09-30T16:49:03.804
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -485,11 +485,11 @@ F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba814
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
 F ext/wasm/api/pre-js.js 2db711eb637991b383fc6b5c0f3df65ec48a7201e5730e304beba8de2d3f9b0b
 F ext/wasm/api/sqlite3-api-cleanup.js 98905936119a555659b5cf43844211809ab9f436c52a569004e5585d2842b5c2
-F ext/wasm/api/sqlite3-api-glue.js 81b06946223181727b9a1d731b4f3c2ba97a33ae43bc0bbda7e8fa02400a207e
+F ext/wasm/api/sqlite3-api-glue.js 90206acd5cf556bd8a7a9275619aa680c9075ad8072ed1e18f47fc1d5cfbcf26
 F ext/wasm/api/sqlite3-api-oo1.js 9caed0757a5e039ed92467e827fd3ca347fa08f19fe086fcbdd14a4ebe9c2f01
 F ext/wasm/api/sqlite3-api-opfs.js 1b097808b7b081b0f0700cf97d49ef19760e401706168edff9cd45cf9169f541
-F ext/wasm/api/sqlite3-api-prologue.js 304e883ff1b06f668ebb7bbdc80152b0a9f395bbd34acfd5f7a8ef84e8f17466
-F ext/wasm/api/sqlite3-api-worker1.js d5d5b7fac4c4731c38c7e03f4f404b2a95c388a2a1d8bcf361caada572f107e0
+F ext/wasm/api/sqlite3-api-prologue.js 3a93497a9bc542c7202f32063cd070aa9c4cd03171a5e354cf99dd4357585b7a
+F ext/wasm/api/sqlite3-api-worker1.js 2e8a037a76d20c7653e5a392d9830f17a22ce6736ffd0597aa39b69d1c01ad2c
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 336389b23c9b83763177499e49a0967949c392b2f7d84fbbb52ad6678e159f18
 F ext/wasm/batch-runner.html c363032aba7a525920f61f8be112a29459f73f07e46f0ba3b7730081a617826e
@@ -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 60f0c5cb04d2baf8431e523434d8753e39377f4b2c6bad225c2e5487a4be419b
-R 2f56b5a6214af7809c3a763a0bc16b9d
+P 1e09efe7fa15b8908f8b8353164a8361de778e27ea6c0b11c402bf4e1c56333d
+R 4c776ad1a7aec6f0bcde0b14554ad6b2
 U stephan
-Z 221cd5b9b95b0e9d6b36653a70003bd2
+Z 125edfcbc5b4725eac67cee184f7f0b1
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 0041f243b3..3f354628d9 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1e09efe7fa15b8908f8b8353164a8361de778e27ea6c0b11c402bf4e1c56333d
\ No newline at end of file
+711f458d188a0dbe6612069c856ade29323ab426dfa4f80e7b82757ccc474cb8
\ No newline at end of file

From ad658b2d829b64767c8fc776865237af7f6e45d0 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Fri, 30 Sep 2022 20:15:21 +0000
Subject: [PATCH 190/428] Better handle a case of database corruption where a
 b-tree page is one of its own ancestor pages.

FossilOrigin-Name: a24e46804893a7e6e8f3130abca882f9a3aa3b7b2b82aa39a0a20856172766d5
---
 manifest      | 14 +++++++-------
 manifest.uuid |  2 +-
 src/btree.c   |  5 +++++
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/manifest b/manifest
index d586c46b1e..b8f140f6ee 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improvements\sto\sthe\s"demoDelete"\smethod\sin\sthe\sdemovfs,\ssuggested\sby\n[forum:/forumpost/cad18961c2|forum\spost\scad18961c2].
-D 2022-09-30T14:35:18.306
+C Better\shandle\sa\scase\sof\sdatabase\scorruption\swhere\sa\sb-tree\spage\sis\sone\sof\sits\sown\sancestor\spages.
+D 2022-09-30T20:15:21.312
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -528,7 +528,7 @@ F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
 F src/backup.c a2891172438e385fdbe97c11c9745676bec54f518d4447090af97189fd8e52d7
 F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d
 F src/btmutex.c 6ffb0a22c19e2f9110be0964d0731d2ef1c67b5f7fabfbaeb7b9dabc4b7740ca
-F src/btree.c aad3381b25b0aa56838b35f86fbae9fb10ab8670ba130b413e6e3652cb732d74
+F src/btree.c ba16b9cfcf3579f7de3210e0432460db5489ed38e87938fc8b344e8d6c35693f
 F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
 F src/btreeInt.h 8ce1332edd89dfd2461d561ac10a0ab5601c8e06200cb5230596c3caaf54482e
 F src/build.c 898884afd67d953808cb687babc15b66a10213f99fe2ce7db98960e959881f98
@@ -2000,8 +2000,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 f25cf63471cbed1edb27591e57fead62550d4046dbdcb61312288f0f6f24c646
-R 1d883d051102da05e54bf9f370b714ba
-U drh
-Z fa066d9d8da6a5ee78227c4b8bbd23f3
+P d76a301e22e0572262917dfe9557a5051339a65416a473dd2d9989a49975403e
+R e8314eb757cc4ada0bb75e65c98de883
+U dan
+Z 158277225d44d067719ed83df0eaf966
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index aab65d7179..49ca832c03 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d76a301e22e0572262917dfe9557a5051339a65416a473dd2d9989a49975403e
\ No newline at end of file
+a24e46804893a7e6e8f3130abca882f9a3aa3b7b2b82aa39a0a20856172766d5
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index a08ed95d14..6dc92a950e 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -8774,6 +8774,11 @@ static int balance(BtCursor *pCur){
       }else{
         break;
       }
+    }else if( sqlite3PagerPageRefcount(pPage->pDbPage)>1 ){
+      /* The page being written is not a root page, and there is currently
+      ** more than one reference to it. This only happens if the page is one 
+      ** of its own ancestor pages. Corruption. */
+      rc = SQLITE_CORRUPT_BKPT;
     }else{
       MemPage * const pParent = pCur->apPage[iPage-1];
       int const iIdx = pCur->aiIdx[iPage-1];

From e67a0f40e419f4945d8157cb047ae302bf1f2852 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Fri, 30 Sep 2022 20:35:37 +0000
Subject: [PATCH 191/428] Add JS wrapper for sqlite3_exec() which knows how to
 handle a JS callback. Add some console.error() reporting of module-load
 failures, as they otherwise often get silently swallowed up by the loader's
 mechanisms. Add 'flexible-string' JS-to-WASM argument converter which
 performs more X-to-string conversions than the 'string' arg converter does.

FossilOrigin-Name: 96818aa83f4ccc574f558231249ecbdd39763b4351cf4cf6d33f53774a3ee5e6
---
 ext/wasm/api/extern-post-js.js       |   5 +-
 ext/wasm/api/sqlite3-api-cleanup.js  |   3 +
 ext/wasm/api/sqlite3-api-glue.js     | 192 ++++++++++++++++++++-------
 ext/wasm/api/sqlite3-api-prologue.js |  50 +++++--
 ext/wasm/testing1.js                 |  24 +++-
 ext/wasm/testing2.js                 |   2 +
 manifest                             |  22 +--
 manifest.uuid                        |   2 +-
 8 files changed, 227 insertions(+), 73 deletions(-)

diff --git a/ext/wasm/api/extern-post-js.js b/ext/wasm/api/extern-post-js.js
index 25d2d1b328..5ebb5a31e7 100644
--- a/ext/wasm/api/extern-post-js.js
+++ b/ext/wasm/api/extern-post-js.js
@@ -15,7 +15,6 @@
   if(!originalInit){
     throw new Error("Expecting self.sqlite3InitModule to be defined by the Emscripten build.");
   }
-  self.sqlite3InitModule.ready = originalInit.ready;
   self.sqlite3InitModule = (...args)=>{
     //console.warn("Using replaced sqlite3InitModule()",self.location);
     return originalInit(...args).then((EmscriptenModule)=>{
@@ -35,7 +34,11 @@
       const f = EmscriptenModule.sqlite3.asyncPostInit;
       delete EmscriptenModule.sqlite3.asyncPostInit;
       return f();
+    }).catch((e)=>{
+      console.error("Exception loading sqlite3 module:",e);
+      throw e;
     });
   };
+  self.sqlite3InitModule.ready = originalInit.ready;
   //console.warn("Replaced sqlite3InitModule()");
 })();
diff --git a/ext/wasm/api/sqlite3-api-cleanup.js b/ext/wasm/api/sqlite3-api-cleanup.js
index 12d7668864..c2a3425891 100644
--- a/ext/wasm/api/sqlite3-api-cleanup.js
+++ b/ext/wasm/api/sqlite3-api-cleanup.js
@@ -46,6 +46,9 @@ if('undefined' !== typeof Module){ // presumably an Emscripten build
   let sqlite3;
   try{
     sqlite3 = self.sqlite3ApiBootstrap();
+  }catch(e){
+    console.error("sqlite3ApiBootstrap() error:",e);
+    throw e;
   }finally{
     delete self.sqlite3ApiBootstrap;
     if(rmApiConfig) delete self.sqlite3ApiConfig;
diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index 2082f427b9..347c03bc44 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -33,20 +33,27 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        to a C-style sqlite3_xxx function which takes an `sqlite3*`
        argument.
     */
-    const oldP = wasm.xWrap.argAdapter('pointer');
+    const xPointer = wasm.xWrap.argAdapter('pointer');
     const adapter = function(v){
-      if(v && 'object'===typeof v && v.constructor){
+      if(v && v.constructor){
         const x = v.pointer;
         if(Number.isInteger(x)) return x;
-        else toss("Invalid (object) type for pointer-type argument.");
+        else toss("Invalid (object) type for .pointer-type argument.");
       }
-      return oldP(v);
+      return xPointer(v);
     };
     wasm.xWrap.argAdapter('.pointer', adapter);
   } /* ".pointer" xWrap() argument adapter */
 
-  // WhWasmUtil.xWrap() bindings...
-  {
+  if(1){/* Convert Arrays and certain TypedArrays to strings for
+           'flexible-string'-type arguments */
+    const xString = wasm.xWrap.argAdapter('string');
+    wasm.xWrap.argAdapter(
+      'flexible-string', (v)=>xString(util.arrayToString(v))
+    );
+  }
+  
+  if(1){// WhWasmUtil.xWrap() bindings...
     /**
        Add some descriptive xWrap() aliases for '*' intended to
        (A) initially improve readability/correctness of capi.signatures
@@ -107,51 +114,139 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
   }/*xWrap() bindings*/;
 
   /**
-     Scope-local holder of the two impls of sqlite3_prepare_v2/v3().
+     Internal helper to assist in validating call argument counts in
+     the hand-written sqlite3_xyz() wrappers. We do this only for
+     consistency with non-special-case wrappings.
   */
-  const __prepare = Object.create(null);
-  /**
-     This binding expects a JS string as its 2nd argument and
-     null as its final argument. In order to compile multiple
-     statements from a single string, the "full" impl (see
-     below) must be used.
-  */
-  __prepare.basic = wasm.xWrap('sqlite3_prepare_v3',
-                               "int", ["sqlite3*", "string",
-                                       "int"/*ignored for this impl!*/,
-                                       "int", "**",
-                                       "**"/*MUST be 0 or null or undefined!*/]);
-  /**
-     Impl which requires that the 2nd argument be a pointer
-     to the SQL string, instead of being converted to a
-     string. This variant is necessary for cases where we
-     require a non-NULL value for the final argument
-     (exec()'ing multiple statements from one input
-     string). For simpler cases, where only the first
-     statement in the SQL string is required, the wrapper
-     named sqlite3_prepare_v2() is sufficient and easier to
-     use because it doesn't require dealing with pointers.
-  */
-  __prepare.full = wasm.xWrap('sqlite3_prepare_v3',
-                              "int", ["sqlite3*", "*", "int", "int",
-                                      "**", "**"]);
-
-  /* Documented in the api object's initializer. */
-  capi.sqlite3_prepare_v3 = function f(pDb, sql, sqlLen, prepFlags, ppStmt, pzTail){
-    if(util.isSQLableTypedArray(sql)) sql = util.typedArrayToString(sql);
-    switch(typeof sql){
-        case 'string': return __prepare.basic(pDb, sql, -1, prepFlags, ppStmt, null);
-        case 'number': return __prepare.full(pDb, sql, sqlLen, prepFlags, ppStmt, pzTail);
-        default:
-          return util.sqlite3_wasm_db_error(
-            pDb, capi.SQLITE_MISUSE,
-            "Invalid SQL argument type for sqlite3_prepare_v2/v3()."
-          );
-    }
+  const __dbArgcMismatch = (pDb,f,n)=>{
+    return sqlite3.util.sqlite3_wasm_db_error(pDb, capi.SQLITE_MISUSE,
+                                              f+"() requires "+n+" argument"+
+                                              (1===n?'':'s')+".");
   };
 
-  capi.sqlite3_prepare_v2 =
-    (pDb, sql, sqlLen, ppStmt, pzTail)=>capi.sqlite3_prepare_v3(pDb, sql, sqlLen, 0, ppStmt, pzTail);
+  /**
+     Helper for flexible-string conversions which require a
+     byte-length counterpart argument. Passed a value and its
+     ostensible length, this function returns [V,N], where V
+     is either v or a transformed copy of v and N is either n,
+     -1, or the byte length of v (if it's a byte array).
+  */
+  const __flexiString = function(v,n){
+    if('string'===typeof v){
+      n = -1;
+    }else if(util.isSQLableTypedArray(v)){
+      n = v.byteLength;
+      v = util.typedArrayToString(v);
+    }else if(Array.isArray(v)){
+      v = v.join('');
+      n = -1;
+    }
+    return [v, n];
+  };
+
+  if(1){/* Special-case handling of sqlite3_exec() */
+    const __exec = wasm.xWrap("sqlite3_exec", "int",
+                              ["sqlite3*", "flexible-string", "*", "*", "**"]);
+    /* Documented in the api object's initializer. */
+    capi.sqlite3_exec = function(pDb, sql, callback, pVoid, pErrMsg){
+      if(5!==arguments.length){
+        return __dbArgcMismatch(pDb,"sqlite3_exec",5);
+      }else if('function' !== typeof callback){
+        return __exec(pDb, sql, callback, pVoid, pErrMsg);
+      }
+      /* Wrap the callback in a WASM-bound function and convert the callback's
+         `(char**)` arguments to arrays of strings... */
+      const wasm = capi.wasm;
+      const cbwrap = function(pVoid, nCols, pColVals, pColNames){
+        let rc = capi.SQLITE_ERROR;
+        try {
+          let aVals = [], aNames = [], i = 0, offset = 0;
+          for( ; i < nCols; offset += (wasm.ptrSizeof * ++i) ){
+            aVals.push( wasm.cstringToJs(wasm.getPtrValue(pColVals + offset)) );
+            aNames.push( wasm.cstringToJs(wasm.getPtrValue(pColNames + offset)) );
+          }
+          rc = callback(pVoid, nCols, aVals, aNames) | 0;
+          /* The first 2 args of the callback are useless for JS but
+             we want the JS mapping of the C API to be as close to the
+             C API as possible. */
+        }catch(e){
+          /* If we set the db error state here, the higher-level exec() call
+             replaces it with its own, so we have no way of reporting the
+             exception message except the console. We must not propagate
+             exceptions through the C API. */
+        }
+        return rc;
+      };
+      let pFunc, rc;
+      try{
+        pFunc = wasm.installFunction("ipipp", cbwrap);
+        rc = __exec(pDb, sql, pFunc, pVoid, pErrMsg);
+      }catch(e){
+        rc = util.sqlite3_wasm_db_error(pDb, capi.SQLITE_ERROR,
+                                        "Error running exec(): "+e.message);
+      }finally{
+        if(pFunc) wasm.uninstallFunction(pFunc);
+      }
+      return rc;
+    };
+  }/*sqlite3_exec() proxy*/;
+
+  if(1){/* Special-case handling of sqlite3_prepare_v2() and
+      sqlite3_prepare_v3() */
+    /**
+       Scope-local holder of the two impls of sqlite3_prepare_v2/v3().
+    */
+    const __prepare = Object.create(null);
+    /**
+       This binding expects a JS string as its 2nd argument and
+       null as its final argument. In order to compile multiple
+       statements from a single string, the "full" impl (see
+       below) must be used.
+    */
+    __prepare.basic = wasm.xWrap('sqlite3_prepare_v3',
+                                 "int", ["sqlite3*", "string",
+                                         "int"/*ignored for this impl!*/,
+                                         "int", "**",
+                                         "**"/*MUST be 0 or null or undefined!*/]);
+    /**
+       Impl which requires that the 2nd argument be a pointer
+       to the SQL string, instead of being converted to a
+       string. This variant is necessary for cases where we
+       require a non-NULL value for the final argument
+       (exec()'ing multiple statements from one input
+       string). For simpler cases, where only the first
+       statement in the SQL string is required, the wrapper
+       named sqlite3_prepare_v2() is sufficient and easier to
+       use because it doesn't require dealing with pointers.
+    */
+    __prepare.full = wasm.xWrap('sqlite3_prepare_v3',
+                                "int", ["sqlite3*", "*", "int", "int",
+                                        "**", "**"]);
+
+    /* Documented in the api object's initializer. */
+    capi.sqlite3_prepare_v3 = function f(pDb, sql, sqlLen, prepFlags, ppStmt, pzTail){
+      if(6!==arguments.length){
+        return __dbArgcMismatch(pDb,"sqlite3_prepare_v3",6);
+      }
+      const [xSql, xSqlLen] = __flexiString(sql, sqlLen);
+      switch(typeof xSql){
+          case 'string': return __prepare.basic(pDb, xSql, xSqlLen, prepFlags, ppStmt, null);
+          case 'number': return __prepare.full(pDb, xSql, xSqlLen, prepFlags, ppStmt, pzTail);
+          default:
+            return util.sqlite3_wasm_db_error(
+              pDb, capi.SQLITE_MISUSE,
+              "Invalid SQL argument type for sqlite3_prepare_v2/v3()."
+            );
+      }
+    };
+
+    /* Documented in the api object's initializer. */
+    capi.sqlite3_prepare_v2 = function(pDb, sql, sqlLen, ppStmt, pzTail){
+      return (5==arguments.length)
+        ? capi.sqlite3_prepare_v3(pDb, sql, sqlLen, 0, ppStmt, pzTail)
+        : __dbArgcMismatch(pDb,"sqlite3_prepare_v2",5);
+    };
+  }/*sqlite3_prepare_v2/v3()*/;
 
   /**
      Install JS<->C struct bindings for the non-opaque struct types we
@@ -208,3 +303,4 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     sourceId: sqlite3.capi.sqlite3_sourceid()
   });
 });
+
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 760c4b0b4a..b738485cb8 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -243,6 +243,17 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     );
   };
 
+  /**
+     If v is-a Array, its join('') result is returned.  If
+     isSQLableTypedArray(v) then typedArrayToString(v) is
+     returned. Else v is returned as-is.
+  */
+  const arrayToString = function(v){
+    if(isSQLableTypedArray(v)) return typedArrayToString(v);
+    else if(Array.isArray(v)) return v.join('');
+    return v;
+  };
+
   /**
      An Error subclass specifically for reporting Wasm-level malloc()
      failure and enabling clients to unambiguously identify such
@@ -350,15 +361,34 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
        comments or an empty SQL expression, 0 is returned but the result
        output pointer will be NULL.
     */
-    sqlite3_prepare_v3: function(dbPtr, sql, sqlByteLen, prepFlags,
-                                 stmtPtrPtr, strPtrPtr){}/*installed later*/,
+    sqlite3_prepare_v3: (dbPtr, sql, sqlByteLen, prepFlags,
+                         stmtPtrPtr, strPtrPtr)=>{}/*installed later*/,
 
     /**
        Equivalent to calling sqlite3_prapare_v3() with 0 as its 4th argument.
     */
-    sqlite3_prepare_v2: function(dbPtr, sql, sqlByteLen, stmtPtrPtr,
-                                 strPtrPtr){}/*installed later*/,
+    sqlite3_prepare_v2: (dbPtr, sql, sqlByteLen,
+                         stmtPtrPtr,strPtrPtr)=>{}/*installed later*/,
 
+    /**
+       This binding enables the callback argument to be a JavaScript.
+
+       If the callback is a function, then for the duration of the
+       sqlite3_exec() call, it installs a WASM-bound function which
+       acts as a proxy for the given callback. That proxy will
+       also perform a conversion of the callback's arguments from
+       `(char**)` to JS arrays of strings. However, for API
+       consistency's sake it will still honor the C-level
+       callback parameter order and will call it like:
+
+       `callback(pVoid, colCount, listOfValues, listOfColNames)`
+
+       If the callback is not a JS function then this binding performs
+       no translation of the callback, but the sql argument is still
+       converted to a WASM string for the call using the
+       "flexible-string" argument converter.
+    */
+    sqlite3_exec: (pDb, sql, callback, pVoid, pErrMsg)=>{}/*installed later*/,
     /**
        Various internal-use utilities are added here as needed. They
        are bound to an object only so that we have access to them in
@@ -367,8 +397,9 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
        removed.
     */
     util:{
-      isInt32, isTypedArray, isBindableTypedArray, isSQLableTypedArray,
-      affirmBindableTypedArray, typedArrayToString,
+      affirmBindableTypedArray, arrayToString, isBindableTypedArray,
+      isInt32, isSQLableTypedArray, isTypedArray, 
+      typedArrayToString,
       isMainWindow: ()=>{
         return self.window===self && self.document;
       }
@@ -614,10 +645,9 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     ["sqlite3_errmsg", "string", "sqlite3*"],
     ["sqlite3_error_offset", "int", "sqlite3*"],
     ["sqlite3_errstr", "string", "int"],
-    ["sqlite3_exec", "int", "sqlite3*", "string", "*", "*", "**"],
-    // TODO?: ^^^ add a wrapper around sqlite3_exec() which accepts a
-    // JS callback function and handles the (un)installation of that
-    // function before/after the exec call.
+    /*["sqlite3_exec", "int", "sqlite3*", "string", "*", "*", "**"
+      Handled seperately to perform translation of the callback
+      into a WASM-usable one. ],*/
     ["sqlite3_expanded_sql", "string", "sqlite3_stmt*"],
     ["sqlite3_extended_errcode", "int", "sqlite3*"],
     ["sqlite3_extended_result_codes", "int", "sqlite3*", "int"],
diff --git a/ext/wasm/testing1.js b/ext/wasm/testing1.js
index 5b3d6189db..916f81babc 100644
--- a/ext/wasm/testing1.js
+++ b/ext/wasm/testing1.js
@@ -186,7 +186,7 @@
     // Custom db error message handling via sqlite3_prepare_v2/v3()
     if(capi.wasm.exports.sqlite3_wasm_db_error){
       log("Testing custom error message via prepare_v3()...");
-      let rc = capi.sqlite3_prepare_v3(db.pointer, [/*invalid*/], -1, 0, null, null);
+      let rc = capi.sqlite3_prepare_v3(db.pointer, {/*invalid*/}, -1, 0, null, null);
       T.assert(capi.SQLITE_MISUSE === rc)
         .assert(0 === capi.sqlite3_errmsg(db.pointer).indexOf("Invalid SQL"));
       log("errmsg =",capi.sqlite3_errmsg(db.pointer));
@@ -253,7 +253,7 @@
     const resultRows = [];
     db.exec({
       sql:new TextEncoder('utf-8').encode([
-        // ^^^ testing string-vs-typedarray handling in execMulti()
+        // ^^^ testing string-vs-typedarray handling in exec()
         "attach 'session' as foo;" /* name 'session' is magic for kvvfs! */,
         "create table foo.bar(a);",
         "insert into foo.bar(a) values(1),(2),(3);",
@@ -266,6 +266,26 @@
     T.assert(3===resultRows.length)
       .assert(2===resultRows[1]);
     T.assert(2===db.selectValue('select a from foo.bar where a>1 order by a'));
+    let colCount = 0, rowCount = 0;
+    const execCallback = function(pVoid, nCols, aVals, aNames){
+      colCount = nCols;
+      ++rowCount;
+      T.assert(2===aVals.length)
+        .assert(2===aNames.length)
+        .assert(+(aVals[1]) === 2 * +(aVals[0]));
+    };
+    const capi = sqlite3.capi;
+    let rc = capi.sqlite3_exec(
+      db.pointer, "select a, a*2 from foo.bar", execCallback,
+      0, 0
+    );
+    T.assert(0===rc).assert(3===rowCount).assert(2===colCount);
+    rc = capi.sqlite3_exec(
+      db.pointer, "select a from foo.bar", ()=>{
+        toss("Testing throwing from exec() callback.");
+      }, 0, 0
+    );
+    T.assert(capi.SQLITE_ABORT === rc);
     db.exec("detach foo");
     T.mustThrow(()=>db.exec("select * from foo.bar"));
   };
diff --git a/ext/wasm/testing2.js b/ext/wasm/testing2.js
index 986e683dea..7163fe1204 100644
--- a/ext/wasm/testing2.js
+++ b/ext/wasm/testing2.js
@@ -247,7 +247,9 @@
     runOneTest('close',{unlink:true},function(ev){
       ev = ev.result;
       T.assert(undefined === ev.filename);
+      logHtml('warning',"This is the final test.");
     });
+    logHtml('warning',"Finished posting tests. Waiting on async results.");
   };
 
   const runTests = function(){
diff --git a/manifest b/manifest
index 3b4a64f8fd..6f4fcd270a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\ssqlite3.version\sobject.\sAdd\smore\sstate\sto\sthe\sWorker\s#1\sconfig-get\sresponse,\sincluding\ssqlite3.version.
-D 2022-09-30T16:49:03.804
+C Add\sJS\swrapper\sfor\ssqlite3_exec()\swhich\sknows\show\sto\shandle\sa\sJS\scallback.\sAdd\ssome\sconsole.error()\sreporting\sof\smodule-load\sfailures,\sas\sthey\sotherwise\soften\sget\ssilently\sswallowed\sup\sby\sthe\sloader's\smechanisms.\sAdd\s'flexible-string'\sJS-to-WASM\sargument\sconverter\swhich\sperforms\smore\sX-to-string\sconversions\sthan\sthe\s'string'\sarg\sconverter\sdoes.
+D 2022-09-30T20:35:37.991
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -479,16 +479,16 @@ F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api c6b05641d733227a995cc05a2ba7ddc9ef2323081ae0cae5ed1d1f83d5b54b36
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
 F ext/wasm/api/README.md f54102d74cfde01ebe242fa1411e126a9cda8f19b3ac378afd1103b21abfad05
-F ext/wasm/api/extern-post-js.js b0df294159c290bec06cd67cce1a882d61944959ffe66a2f4ccbcb337e357781
+F ext/wasm/api/extern-post-js.js dc68cbf552d8ea085181400a6963907c32e0b088b03ffd8969b1869fea246629
 F ext/wasm/api/extern-pre-js.js 20143b16b672d0a576fbf768a786d12ee1f84e222126477072389b992542a5b2
 F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba81456260a713ed04900c
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
 F ext/wasm/api/pre-js.js 2db711eb637991b383fc6b5c0f3df65ec48a7201e5730e304beba8de2d3f9b0b
-F ext/wasm/api/sqlite3-api-cleanup.js 98905936119a555659b5cf43844211809ab9f436c52a569004e5585d2842b5c2
-F ext/wasm/api/sqlite3-api-glue.js 90206acd5cf556bd8a7a9275619aa680c9075ad8072ed1e18f47fc1d5cfbcf26
+F ext/wasm/api/sqlite3-api-cleanup.js 5d22d1d3818ecacb23bfa223d5970cd0617d8cdbb48c8bc4bbd463f05b021a99
+F ext/wasm/api/sqlite3-api-glue.js ead29e6008ba148e7c67ad2bd928819dc72313ad2dcd34510cc61e089ee01c4e
 F ext/wasm/api/sqlite3-api-oo1.js 9caed0757a5e039ed92467e827fd3ca347fa08f19fe086fcbdd14a4ebe9c2f01
 F ext/wasm/api/sqlite3-api-opfs.js 1b097808b7b081b0f0700cf97d49ef19760e401706168edff9cd45cf9169f541
-F ext/wasm/api/sqlite3-api-prologue.js 3a93497a9bc542c7202f32063cd070aa9c4cd03171a5e354cf99dd4357585b7a
+F ext/wasm/api/sqlite3-api-prologue.js cac3bc095171dca4aaf3611e0dd60a850c8e9fbeeeba8f21792ed1948d24dacc
 F ext/wasm/api/sqlite3-api-worker1.js 2e8a037a76d20c7653e5a392d9830f17a22ce6736ffd0597aa39b69d1c01ad2c
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 336389b23c9b83763177499e49a0967949c392b2f7d84fbbb52ad6678e159f18
@@ -530,9 +530,9 @@ F ext/wasm/test-opfs-vfs.js a59ff9210b17d46b0c6fbf6a0ba60143c033327865f2e556e14f
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
 F ext/wasm/testing-worker1-promiser.js ee1ac4950720c07541e791b7f35bdf420e8ab81a74049cc65394371b0c53c480
 F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d7669fb17fcae
-F ext/wasm/testing1.js 06b9a439ada636c5478c581c86b2b968f799e0468eae54dc5a4565dfd7afbb88
+F ext/wasm/testing1.js 5584e9b68f797dbc0f6161360f2c6840169533813d92c74d355a3e78dd5bb539
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
-F ext/wasm/testing2.js 34737da985c4cbd4812b2e7f200942662cae991c5a58ffa5d0350be089d0d410
+F ext/wasm/testing2.js 88f40ef3cd8201bdadd120a711c36bbf0ce56cc0eab1d5e7debb71fed7822494
 F ext/wasm/wasmfs.make 3cce1820006196de140f90f2da4b4ea657083fb5bfee7d125be43f7a85748c8f
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
@@ -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 1e09efe7fa15b8908f8b8353164a8361de778e27ea6c0b11c402bf4e1c56333d
-R 4c776ad1a7aec6f0bcde0b14554ad6b2
+P 711f458d188a0dbe6612069c856ade29323ab426dfa4f80e7b82757ccc474cb8
+R 84d8e08f60a70faceba1089503bc1c19
 U stephan
-Z 125edfcbc5b4725eac67cee184f7f0b1
+Z f9cd8bd536b2dd8409558133f7a063eb
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 3f354628d9..255400f97e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-711f458d188a0dbe6612069c856ade29323ab426dfa4f80e7b82757ccc474cb8
\ No newline at end of file
+96818aa83f4ccc574f558231249ecbdd39763b4351cf4cf6d33f53774a3ee5e6
\ No newline at end of file

From 0a803bd984e7a24451c1bf33fae5c71eec41e052 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Fri, 30 Sep 2022 20:48:22 +0000
Subject: [PATCH 192/428] Add NEVER() to two error-detection tests that were
 made unreachable by the previous check-in.

FossilOrigin-Name: 5166acf3f00404597e77910aee88920ab833af8447766f50bf4f70525606cf95
---
 manifest      | 14 +++++++-------
 manifest.uuid |  2 +-
 src/btree.c   | 11 ++---------
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/manifest b/manifest
index b8f140f6ee..184fbf3db6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Better\shandle\sa\scase\sof\sdatabase\scorruption\swhere\sa\sb-tree\spage\sis\sone\sof\sits\sown\sancestor\spages.
-D 2022-09-30T20:15:21.312
+C Add\sNEVER()\sto\stwo\serror-detection\stests\sthat\swere\smade\sunreachable\sby\nthe\sprevious\scheck-in.
+D 2022-09-30T20:48:22.942
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -528,7 +528,7 @@ F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
 F src/backup.c a2891172438e385fdbe97c11c9745676bec54f518d4447090af97189fd8e52d7
 F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d
 F src/btmutex.c 6ffb0a22c19e2f9110be0964d0731d2ef1c67b5f7fabfbaeb7b9dabc4b7740ca
-F src/btree.c ba16b9cfcf3579f7de3210e0432460db5489ed38e87938fc8b344e8d6c35693f
+F src/btree.c 9c1aa101325abca2e7f1e5c24eee990cead2183d0b793db1199d4a57b0be6315
 F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
 F src/btreeInt.h 8ce1332edd89dfd2461d561ac10a0ab5601c8e06200cb5230596c3caaf54482e
 F src/build.c 898884afd67d953808cb687babc15b66a10213f99fe2ce7db98960e959881f98
@@ -2000,8 +2000,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 d76a301e22e0572262917dfe9557a5051339a65416a473dd2d9989a49975403e
-R e8314eb757cc4ada0bb75e65c98de883
-U dan
-Z 158277225d44d067719ed83df0eaf966
+P a24e46804893a7e6e8f3130abca882f9a3aa3b7b2b82aa39a0a20856172766d5
+R 8bfaaa610b5d0f34ae8d80b099fa1f85
+U drh
+Z 2f23c91e3b0fb20186493d1c2a872ed4
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 49ca832c03..76127b97a2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a24e46804893a7e6e8f3130abca882f9a3aa3b7b2b82aa39a0a20856172766d5
\ No newline at end of file
+5166acf3f00404597e77910aee88920ab833af8447766f50bf4f70525606cf95
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index 6dc92a950e..e1696b9bfb 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -4954,7 +4954,7 @@ static int accessPayload(
   assert( pPage );
   assert( eOp==0 || eOp==1 );
   assert( pCur->eState==CURSOR_VALID );
-  if( pCur->ix>=pPage->nCell ){
+  if( NEVER(pCur->ix>=pPage->nCell) ){
     return SQLITE_CORRUPT_PAGE(pPage);
   }
   assert( cursorHoldsMutex(pCur) );
@@ -6077,14 +6077,7 @@ static SQLITE_NOINLINE int btreeNext(BtCursor *pCur){
 
   pPage = pCur->pPage;
   idx = ++pCur->ix;
-  if( !pPage->isInit || sqlite3FaultSim(412) ){
-    /* The only known way for this to happen is for there to be a
-    ** recursive SQL function that does a DELETE operation as part of a
-    ** SELECT which deletes content out from under an active cursor
-    ** in a corrupt database file where the table being DELETE-ed from
-    ** has pages in common with the table being queried.  See TH3
-    ** module cov1/btree78.test testcase 220 (2018-06-08) for an
-    ** example. */
+  if( NEVER(!pPage->isInit) || sqlite3FaultSim(412) ){
     return SQLITE_CORRUPT_BKPT;
   }
 

From 2d3261fe86fe44db2e5c7c1b2c2c9a1631f4a6c3 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Fri, 30 Sep 2022 20:53:36 +0000
Subject: [PATCH 193/428] Fix a bug in the demoDelete fix from
 [d76a301e22e05722].

FossilOrigin-Name: 7e761a02530ffbb055a766eb6c995f11fc2adbabb9a52502124f672fdcff0d10
---
 manifest           | 12 ++++++------
 manifest.uuid      |  2 +-
 src/test_demovfs.c |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/manifest b/manifest
index 184fbf3db6..6bb1c440b2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sNEVER()\sto\stwo\serror-detection\stests\sthat\swere\smade\sunreachable\sby\nthe\sprevious\scheck-in.
-D 2022-09-30T20:48:22.942
+C Fix\sa\sbug\sin\sthe\sdemoDelete\sfix\sfrom\s[d76a301e22e05722].
+D 2022-09-30T20:53:36.120
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -615,7 +615,7 @@ F src/test_blob.c ae4a0620b478548afb67963095a7417cd06a4ec0a56adb453542203bfdcb31
 F src/test_btree.c 8b2dc8b8848cf3a4db93f11578f075e82252a274
 F src/test_config.c 8264637b06a3c1f0727c88d1ea32dcf7986b9e7e358a970cae87cdac8a5b2708
 F src/test_delete.c e2fe07646dff6300b48d49b2fee2fe192ed389e834dd635e3b3bac0ce0bf9f8f
-F src/test_demovfs.c 7b3be8cdf07d00f025309fbb2453cb5f0fd9ed74f40543c7f4353dcac2879aa7
+F src/test_demovfs.c 7cc7623d1025d1e92c51da20fd25060759733b7a356a121545a3b7d2faa8a0f1
 F src/test_devsym.c aff2255ea290d7718da08af30cdf18e470ff7325a5eff63e0057b1496ed66593
 F src/test_fs.c ba1e1dc18fd3159fdba0b9c4256f14032159785320dfbd6776eb9973cb75d480
 F src/test_func.c 24df3a346c012b1fc9e1001d346db6054deb426db0a7437e92490630e71c9b0a
@@ -2000,8 +2000,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 a24e46804893a7e6e8f3130abca882f9a3aa3b7b2b82aa39a0a20856172766d5
-R 8bfaaa610b5d0f34ae8d80b099fa1f85
+P 5166acf3f00404597e77910aee88920ab833af8447766f50bf4f70525606cf95
+R 6c12ece1941670ef2f49e367d800c0c1
 U drh
-Z 2f23c91e3b0fb20186493d1c2a872ed4
+Z 385aaa082b1d75a68fdcc7e487d480fa
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 76127b97a2..a127fb8b80 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5166acf3f00404597e77910aee88920ab833af8447766f50bf4f70525606cf95
\ No newline at end of file
+7e761a02530ffbb055a766eb6c995f11fc2adbabb9a52502124f672fdcff0d10
\ No newline at end of file
diff --git a/src/test_demovfs.c b/src/test_demovfs.c
index 49f2814464..29307675bd 100644
--- a/src/test_demovfs.c
+++ b/src/test_demovfs.c
@@ -468,7 +468,7 @@ static int demoDelete(sqlite3_vfs *pVfs, const char *zPath, int dirSync){
     /* Figure out the directory name from the path of the file deleted. */
     sqlite3_snprintf(MAXPATHNAME, zDir, "%s", zPath);
     zDir[MAXPATHNAME] = '\0';
-    zSlash = strrchr(zPath,'/');
+    zSlash = strrchr(zDir,'/');
     if( zSlash ){
       /* Open a file-descriptor on the directory. Sync. Close. */
       zSlash[0] = 0;

From 1337a2291dae22b42431204f4b8fb06f30b7afbe Mon Sep 17 00:00:00 2001
From: drh <>
Date: Fri, 30 Sep 2022 20:59:09 +0000
Subject: [PATCH 194/428] New test cases in fuzzdata8.db

FossilOrigin-Name: aa367a3c974041323edb759855f0b83803439ceef2846da2d73eadd80efeaac4
---
 manifest          |  12 ++++++------
 manifest.uuid     |   2 +-
 test/fuzzdata8.db | Bin 3283968 -> 3293184 bytes
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/manifest b/manifest
index 6bb1c440b2..cbdfaad8cb 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sbug\sin\sthe\sdemoDelete\sfix\sfrom\s[d76a301e22e05722].
-D 2022-09-30T20:53:36.120
+C New\stest\scases\sin\sfuzzdata8.db
+D 2022-09-30T20:59:09.967
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1112,7 +1112,7 @@ F test/fuzzdata4.db b502c7d5498261715812dd8b3c2005bad08b3a26e6489414bd13926cd3e4
 F test/fuzzdata5.db e35f64af17ec48926481cfaf3b3855e436bd40d1cfe2d59a9474cb4b748a52a5
 F test/fuzzdata6.db 92a80e4afc172c24f662a10a612d188fb272de4a9bd19e017927c95f737de6d7
 F test/fuzzdata7.db 0166b56fd7a6b9636a1d60ef0a060f86ddaecf99400a666bb6e5bbd7199ad1f2
-F test/fuzzdata8.db ca9a97f401b06b0d5376139ec7e1f9e773e13345a9a2d9ccc0032cdbfedea230
+F test/fuzzdata8.db 652953c44494e176b9cbf8e37eb020e69fdd2395114fb1554377be328c08ff0e
 F test/fuzzer1.test 3d4c4b7e547aba5e5511a2991e3e3d07166cfbb8
 F test/fuzzer2.test a85ef814ce071293bce1ad8dffa217cbbaad4c14
 F test/fuzzerfault.test f64c4aef4c9e9edf1d6dc0d3f1e65dcc81e67c996403c88d14f09b74807a42bc
@@ -2000,8 +2000,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 5166acf3f00404597e77910aee88920ab833af8447766f50bf4f70525606cf95
-R 6c12ece1941670ef2f49e367d800c0c1
+P 7e761a02530ffbb055a766eb6c995f11fc2adbabb9a52502124f672fdcff0d10
+R 2ed590521c06c3e3aa9ca21e94c7fcbe
 U drh
-Z 385aaa082b1d75a68fdcc7e487d480fa
+Z f5898bf6ec0ce9d69f912d0173ce9ebb
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index a127fb8b80..8438e6741c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7e761a02530ffbb055a766eb6c995f11fc2adbabb9a52502124f672fdcff0d10
\ No newline at end of file
+aa367a3c974041323edb759855f0b83803439ceef2846da2d73eadd80efeaac4
\ No newline at end of file
diff --git a/test/fuzzdata8.db b/test/fuzzdata8.db
index de7799f945f521444c9788aa2f933692ca84a6ba..7e8649c3266a62e60c94cafbc1a9ac181ac37a87 100644
GIT binary patch
delta 9423
zcmZ`<349dA(%+uh**j!6+1%GA1d=f4ZcYdx2@nN2l0Z1*%#s7-kSqiQ<Veh*TtWaz
zd4ME}9D)y!qg6o3Q&i*%9{5ni;PZS6B=|iQpTJkMAV$#r{i-%I+tdB;s_K7r*QDl^
zcS%jnQBoh}h|=k7^}0Vk*408P7p0TRbhYJ+%gN$$W^p;YxLm)uoLgLOSX^#gTy9!i
zZeCn&SzK;iTyEP}9^gApmciD&F$wU?@ql2`i`q^EEF>nK&Jgy<WS#D@H75g5I-vxj
z*ijrPK`6l}PLvRoP?Ru~aFhs?NR%kL=4AAYuS^Sw4H4Sv!L~Q%mu}40R{c%DR#)8|
zoz5Cn_YmsPy4k4Bb+b_G>t^V5mTOen7qgEnGSp#v+oNg@>iKF<)HBp<)RWX6sK=?@
zQJ1J$sPolK)R}5JYEex?-C0dV9ie(q2di$>235fkepMyZ|5XLlmsB40_i8fgZ`CB!
zU#MMCpHmZ2f3!$Vz^@Nf7wY%bIMgj_Eb8NG4C<pQy1?43MxuUQ4M)9S4MV+M4MqK|
z8iM)>H3;<zwG-;aY5?llDq6%^p;}OnSJBqi(W(*k5Y>RXNW}?T3sn~NU^RxpuYM{)
zom;mEb&t9QsNHq*QFnRlI*mbzMTtXkp~Rykpmat_MA6!GMM*+QMoB^GMz2%e7;YqC
zI`Rz(+v6*+5>r!FU6o$<&uX~PS6Id>ZVQmBd@ylCeILHF6+QCPdaiD|UiS*bFR|r9
zT!GMsR=v+ZLG+3{O`*GI@#6{D3;4by9eg~$m?`TH<f3p744uSBL2IrO4J|=JJXFo)
z!?4%Y$C+5CyRuTb`ANU^?WqJu2`_<t9<Ohh$2(D;hNAFr4vk{@1-wq-o*2t$Pg+L#
z*zTEWWr`QaR=gFN6Dn_g*1ahDpk3kfK`a$Qg58ScR?okGxncJ*KFM5}rlk2FfeXv{
z&BO~;fqW#Fq1}Sh?+W+2EThwvtSlTQwOmQ_R^X*4Gh?jB{re5bU%}rCZDE2P>{kRc
z<aHN{Kv~Fl(Q6|?^GIHVdY{z<mqzlraN#RHM4Q4@xDXMZ3YU|EIq-eT_k;d=v1_a!
zo7*zl?N0MlY7;BZQWVdvsg;436(XQ2Td)UWlhoTyJPNqC3W-qjRFD}`rt>!2?{oAc
z@HX<{@N2mcLMows5FcZ>X$$Zc3Hh*n6(8DAix5X|6Z%6@J#SztvcTu$gPF8)Xx=7-
zz{E;HAQot@=i`}F?4p|xiLR|W&nMc@1F2~l>0>=g_e>Bb3gOxvk2f{dZ!S3f9G`U4
z3Wr1Zr0{g5!tGYjn3`yhYIar9(xLc2d=fMr<fG6sIvo^;@}V&P6dxLvf#&vPrh2l*
zW_j?h?%m7L5g8V!UBicl77fY2cTm2ox?)<@_?gwyXH?|4uy<&#HAX>Hg2M)H|J&t=
zb4yAEugssA())gw*EOPF!H@!1wc9l)zobt;S5gvqpSFg;hDm}24t#I04-#D6T=xtq
z9OSA_b0u9&N)b|A*_MLAeX}h?3i=Q3TQKs^SJ+jyrO%Lp{E`Bf|7TZ)t8g&hO)kT0
zXc-vfVkh)+!RY{NG^8fkgSeTloWjA-Y!Ra2>>g{U)Uup19${x&dKcW=e{i;CME{b0
zmYEe*-Wgt;Q}Ub?SN>2}vXGoQ+dFkug@1H7e$gIl>pP^d=+>BCSpA+p2I6PLM1VcB
zlhJq!D_ro|;$WO$3pDj995kqZNwx)wLr6G0`DSzgl;(&gCbbu=juk^O?&A}Kx{wrT
z3=yL{Bg9+QO-;r54=d`cO%TmCw4lT_Atz~4MG_SKpbyQ|rk|YOyKqPeLMbWqPh2QV
z!FB@+`jn*H?V>>ig9?Y-54(@)!$+jtvZdd=H=l4#^Ue`mGp0ZEKzXuPC=({62(D=l
zJecg2)3k1HdIra=PW3}6>)Er+Z@l68eTEGil#NVk`5(AXcZ!0;AMib)?J?d)3uE~%
z1U`S6FQ;uEVO*2np!s23ii0zSDtMty7)Kpv`O5|iQnHRP89F9|I(ia;(La+>=cDm0
z{1L+aiXGno-#z@B^qp2dn`NvzXj&tDLBIZzkH#wkuFv=(+B!EwX&;lGzCM@_B2XVK
z<j|MD<BJ%^%78Z~x)4^KwQ~@+H_Sv!f8d|PM_FiJ#&o5wpZHb+RhRjxboLeg8pqAh
z>n@g4Bw;H<>we|u6Ye@vy#X9@_+@B3&K!ZAHhvRG;{~zdAFPqqU*~5MVx;ZEc_V>c
zXL%FUhY7*7D-k|phzS}R`2;9x5QahAzXc;Wn~=3`;|0W91pjElCQ2c{gtl-(n!&>A
zigiTR9o7}E^%e9nHRjgM((9TTEi;s1Ca`weIJ~Y}uX_W$>8w8!bkP!;<%RBbGxfUn
zW^3S&Fj`*YP^`4}S9uYk_E`Q00<9N?)mnbD!D)kXl%8-387v6^_W-^#O$ryz8A;$D
z?Y9$56u!B9G_(P)$G@8|3cIwY?b_3^+)e&&zQ(7*k0pEzqohLqZech`2P_fV96JFT
zrwilFfZFlGL})b<1K3v!qe&|GIw3h0_2)kzWl+-@c_;P>E)W*15r&a0*zFa(u>7dt
zgm)M4VIU7cI>S*NuscKXXdE9+Jg_?}d?3`nhemfp(?Z@0o-LT&YO=zENE%!iER<-}
zo)4EV2;p!jS%_mYx`X2zek^3C2wkBiQYinOgx}Dpw#Q8lY^oFnK%bMsYtR~k2)$nk
zr@$2xZUkXzm<1X$a0XT1n>tw(!JV$8xXN59(9|3qXVO*(E)UGBTY|!+!NUd)%(kTU
zA3U@GS7>E&Wr}Nf{=i`c$S6tEDrQWqcs*0dOiKBkE>{1~7-e(yAL??u3WvD7aw^m=
zusKI~T|6>t&m4E^E&fbKCe3lB`y1gO$zE6Qf|3yh1%vTk{@}i@?usJz>Xnp~;zIVq
zYp>Sl;KCA@h6k^_z1)hc3{HPy?FzNuC4|DtTC<UKgZ36{H^|#>FoM#D3xfEdps>JU
zgZm?)&Jn6+Jn&$3Wf>5jiA0*Zu+bLHScAbgU0B}0^Sv=`3oF3&rmza~jx%=pTfAUo
zh!d2_{5&Yy$Lr}Mi9#)F4)Mo|mfVZB2*pskPY8fr7lfe{U31dR&DQIV^wr{aDzT%d
zwH;gd&1C9vLvb9xT?^bM%=YMsT_t=UxNPH}@Q0YT{;F^RpBDydF%q$^NH_zF1f>c#
zW+<cRrtZRchD3s6W<nSgHehh#D(nnO6VLy76;7rZIl^Y6{vo~YIQTY4=Th8ZwKANx
zos5B^w*;A{_7hrI61&bJJViGQ6e?K~2bkpZ8wT@r)b%aD24Q%VOxPHL*Uq7W(ZJ2o
z>y9OA^E&5WkI~p!0(h&0pXje+1T#xIgQF*(LUF5fh9!y6)<dYLPm~L98};+_x}Tuk
z9_Yt0MmrH$yFNdqZZ0Jc3fBo2kJm}y*w(2B?NuclVM#KqP81ZHRxO-j(N8|=a6;ip
zM;z1-br_&@q3|V*pDTR9kZx<6LW618eBlR{@Zj5kYwy}zWGCh4U^`t@Bd9D9psmH)
zpAJ%m{YD}|`>#R~Em<M#WQh#!rThR|STF2lq3Mcn@}?2n9_M>N8zb;Ecb)Kwk(;mA
zz0+HxtF!dy4Y&c~JWZqP9tOuo;Swhz@>Fm)@Nu+rqtMFYYQ?mW12s4JQrfghn81>B
zs^2QyFd8$p5J=C2rnk^#_A~q_u%BS!C_N(R2`CwY0O6krvv2cCH~RW#f=aY7$f8Xi
z+z%r`Ti|fGKw;NFemd;>n!m0EL3cQCT*%Pcb*Jseg(3nqKM4yU?jRpZ<GvCinEeNZ
z;d*X?UUyQ`X0Zffiz5Re@G9Sv=AID_VS*9)L$GKfZ-kw13PoH7cGVNyLBd<w^&qG}
z!gDn8i0~ala;W>f;KIb<;YZT>M}@~2(hHi`31evKap6f5w@9x$RjCb9rg3=Q3;Mc+
z$l<oX81^tB*$uxTn_d2ecl;Hi*>uY%!Wcq&YwYZziRXmRS<(kq4-%%*s#akwOZvj@
zDn0~Go)CO=*_XmxBe@4wUlZcshsSvP9|=2<PP{0rXUM&9`W;?|ftkV#iV6Ey6QdGn
zx++ZO`ae^u>Ztu!;WFV05chq6NybUTe-plE%>xt#d0J7B4Eqat`v!{CNCrXi72NRk
zI%1tm*O<gGv!2oGwn6-Rj$ZV8hv;O;zy_z-mt*z1mGjo_uFRsfPVthS=xJ4ixL!*f
z0rBEw^UxLZRXmD3H6NQ~QW`JzW4K}*zXZJBg*JfeQ_H#ip@sp3zTlQ}{gHry9TfT<
zy_hV9vSc{qg*YFkiv$s)d<5i0IG57L6>&C8MnYbUGoEfdY4H*$&6CDJX^Uk#@cGh?
zhM2Gj8k#9y)RR%v@^WA_p{^Y9MI&d_>vjzH12GhcR~hbp1Tq%LF=HZ4?k9fAl5wzo
zfQY;?P>it<6D=Mt{)2F1u$33`?{#*Cs?#E}V7CZ2oitK>h9wiAxFEcgmX8rPvX~c}
zc7%7O-Acu?thpSmiAJ5^fnp}&HTrhB_=wS9;dHexPeK6caB`1mfybwc&vKP7WvOPW
zOcPHrTqzDU5w5G&_vpzgF`XroXzo%gZX}+WEjr-R(^f0ERv;nmQb`D;)RF|K@-Y%z
zejaxOc|)aYcyXN=rY(~Pz!9lOW||{TXUSw3SI0a;ADu5QV96BNw#qt!j;;~6vSccF
z7m2u!P{ngBnFg&5)=6~g5)oMPAhbSh&4V6K%TB0z)fzx6R*28C=II5Pm2mrtyWnBL
z$uzBAJjF6qBcb+LYb1?(Lj2N5X3zt^PGbr6ZV;bi$V{-mLvkSRP^UxmdZWm(q#BAJ
zH&sB@c-;I=+axxyWEME?Pv`=HqfEFEvkfAYmYFK4d7Jp0NpI8Ze%8*<8FaxVaS`qw
zKQg3fJF17arm9#NX@S-AEg70M-JB0^&spo398RP6ir=tgE**76e4fzbABkxUe0o4k
zCiB48Gu8=thoja*&9W#xboyDm0#&WXZBX=Ll!cCcUEEB_!{Ez{4TfI#8d7N9Vew6t
z%%`KS<1cVHJ<33L9TA5zWC0}?qoxvCbyQqyAdA3#zad{6_!C0o-WR_lq=q(qV#E`E
zQ6x7E?muUAYCtj>QVaPNQD^TM8F1v!!TYKB9C-wqzAy&Er8mSNXn8!Urv|~tLe<yC
zZklK7VE4`_9!jr^!>HOSE@Fv_879VzrG&2|muPT&gc`mPbBtU7W~824v}v|`gm4S-
z@y9lgkHV}M7&Q{)!dN?<+Aab^mVhrP$_4f3j3rQ07F7egqBt|MZ}b`%_p$h#X1p%Y
zvNUS12K&Ec>7PyZJh=^YvVRFLqdqZuErFaj#cB=sFp6-WCuBK2bwPA9(0C&<mJVg4
zGy~TOH}8IofEZ2i3@^FquO^9OxknN0N=oL&6cWg*jBtU{81*y_=p_9_$ST<Vxm^bP
zfhgncX#^8G)*)?XNIh*oBL<Q`gYMvE&DL0!(OFkR`zK-*^n62n>-GdzAj|2jYoPtS
zSPV5=VqJfpMB^VZ5bdApTH5}FHW*H+6i#i3K2CEJq!a@eq}Qz-h_?5@#$;)qdHu^X
zREJ*omA3djbXAHpf|wf~D_8A$-72kFIwa!EP3vAYsDXOj6=;eK%D8Qja`O0oL1Hn5
z!i5v2nb7v1(9^V^TROm4pUhISkZ2T7_cCal7*dKABc}+51H<xQ(OZ@(Iv`zog)u&r
znWd!SUSAQ#Z)kg#6vUFJVdp2IBjNQ(XCJz;r&P|8XJF^~&;_t1UCgEj^Q4`D9M)f+
zn}OgIXe^RenwwVnRHt6Iu@Y~&VN$V_ZrZqFxEhS?uAOUA>A#AlB!=67_G_g266uDK
zJO}Nwx&_1f4UtxOc%3N_KD`!Zrai_;M~!3?J>3w)BQ-x6Q;qBTKvW3bWr~X<(B_Oy
z(VXxCJ>APFqw{|;f6(x%lt{Zxmd+Bg8626hQ|R=m(i1G%LVZt2?+|*-CuK2YD>!mv
zk-@4ZWUy`2{kH2QhUT|1-Klk+^a~*`!lM83O)&qMq(Z5cv%=A73?5`I#)Q!E3#36N
z5=viMEDd3}=W+O#z<VQ5qAfiv0y=%D5f@^j1=mhoj&U^DmrFmAe}H#k%u96l3TX&S
zc7pej7;U2^?PbX>>U}h3BcaM+X{<k>c2n=Nn3;rHW=Tu^H(mzs%9u5@VZAhsW%eXN
z{M%LujvbY3G`CTDizR!ZDOx`s4nKiuXv!w(NtWz`joHY%ZOv9av@Dde>87pHd@~87
z@h?l~3AY0wze3$R%)S1A*hZDUu9^NgeHDE3UBB&rRbpB48u)5l|AwNiMl)?YC<U|R
z0QIS^_ejG7u15OcKc#hqIhaP{&$(8zP`KGVP4mVf@U3vY>$fJLHG`o3yWkQ!<*3xh
zNW$sP7O9A}QEYcOGb7dQ$;yJfFZ5lg@}acTg1h<F^U`GQpR2p55m5NKw2ONKTfPY^
zw>l%BG?-1Gxvkoy-=g|2r5h|cLiOKj-)~d>4_X+#3)@ozir~fEfFN4=f6{IfhXt_h
z8f_?a;5BIv!@Yz39fRhpQVf(PFh&?3!5H_+a)pVD(d)Kon-7H^HOU_k?!=m*YBX)K
z$m0n29zJz)-Ew(0ooAD0+DI(D6fQeha%z9HJk-F&>2(d-;#BC81o<ICPVY~YorH7g
zb<0QjZ};yae`nwlu*5qCuaoFFLAEodGs`(O9v{`xRyW!x$>Rz4A&&Gh)hja2>R)gs
zSMEloH2EVV^GQ17U$+E9o1Nw9G)2zC6aPwk0IkoFXENkdt<@w#r{>F(j9emCo3(+u
z!i|3NI`e1iN2s0kx>r5g*jT)h&GbZn*~4&Waj^3=e=}<$)HX=|nIWG;^Omq|D7s%>
zvi5Lz5e+Mre_%)}G#5p*&<{)GHv+h>xU#FUr$jh7LGEq-_tIHv7v!)9f4_w#1+PsH
z1IpyR+yxxqOK3V~41sam1LTH$Qx>f$m+Oq=Yv?pQaugjmRepgb-%x#(Jln)!E#T12
ze(D#?k+f=e<O&9A>cjLfepuvA?V$7(%6}SGh5fdFfjrT~CF^xBMr#98d|*1meTP3^
zgr+hsfp%RYKVsr|y>63c2^T$4F9#Fzm8Z-qX2+L9wR?c~j9_0QPcvU$Gebo#c|oJy
zMEc?yc^C=!0Xu7}D4UX;RPDwC*}kw~+_=bJvZNj6hiLnsCuJ})Kc;~9ds7J1^pVYA
zSj#(TTBFR^I04OMz}_Ng$qsot%l#kr_A})FD>fIzi}8oIu)AfJ{6h76HBVoK4Gp$P
z8vBZzXCe|Ee;9pX{$G<r715Jjv6o<&@uvJZ_Y-#V8?4?FGX+{9CR(G!M+tO0BQJ*f
ziAV{X&&#7Q#r)5p*H+>+s67}nl9sm0&*Dvo#ZEhYAz#5w@Qs_lUx%hoW5z>ET}%?J
z{8IjemY<L}GUNuma3&t<)owAqPA{C6;~B=L17Bz3awwe_mkEn@nA>iXTLi_?|HUyj
z27C~+{I3v=A&iZM;&E|!Flv>tK!?%c?Hjj@;+WNV#Zlh_E*qAyzLQrNi2@ti<Od8k
z<4a>yncCXrD~!R0FKKM1b+rzjx=i7X3_bOeoJNQlif3~}>4;zC9W1fX+G|20?pS<+
zk;>QP4;f;G+NQvP`-+r3M%?zc+#h%^9bi&kVM!;b`k4s>TYKPqh<nX(p3VwTRx%_I
zyl3oTG|H}g%QAKskeyQ4+HtX=)Z<i6vsOoDTKBZH^fFANu=;|#8*Fp2QyMJc>uGL;
z@)kpas6JYmW;VF>x~rw>;E3?_hSvI^0r1j$j^7%Rlp7qL18pJH`xGBQs3S$W!jMq#
zd4=!kWkGSWBn<LXl{cU!J-iaC@D&O5x)t0RheMMw44JVzKTx|pmcEmwykxX^^t#U`
zr{BO2_}Yzby0fQJ#Bxp?A_}}+!^AzioWlrhZBxR?{{0bU8oAq|!TTUP2~(o7nl(<y
z(BAOHfOmWdlHny~CvEAcq+%Il?dihKAe{{FOb1mfdst(J2T#FR_IA{;<#bY!g6A0*
zTyWacXjX}Gj3x2l`dRJ;MSOSwEgY#}T1$Z9WzjAuni#Q(zB@)yO(c~Ls!(2LIDDUH
z>$0}iIgU=4q%^Sv%T+rf`h#nfoS?zNOr1oV?~BMKG_SvMNXvk><hA*oyWYmLU#o$%
z=SMsYZTU(+Sg-dyMN5m7=dt|J5fgtGCZQuHRk>m^q~R&+$)2=%pOVd(%W<Sc6d87V
z3`z&%(Z<P28Ns-`6DSr<?~6D~KYLQ?$`a3=AXD!G*`$HQ0_GovOYaDBt7f>2jv#j^
zKbo*&a&Vv0hvD$Os;&E;TBrJlPrZJh_5j~`_gi#hi~C(d>t9!}WStH9mz0x$?p#Sr
zo3&wk-U%<~E_i+$_UZ^Pw<A2iU-LS``%sx>B$>3=Ib{y9^gbS=X548{?cH%7a8u>j
zo*L)kTfiIkN37G_+83IOm90>8Fc2$QL$G4)p8?<uHfcW>K=VL(0MtxZY9Q~Da!L!%
z3I2Gv2kala+dw=So~Q-rxBi>=LVTeT58YVL8BpdZ0FD0)ub@A-D>jDo14l3(0$LVg
z$*Ac2fJDHsJpsEuWIVL=znXRW!|JhYwHCXh2z~#m;%3NwP`of=HZ*#bseln&0;{G(
zIBDKkjN!d*++h#=n=l!4SC|aGGoB0Y^hMEM`=Yp`FNWOqg^Au5?S7RdLp%Dy<^It`
z56pG<Ww-%oyy1U?Zp2;aM&60;{yWi)`fGHfJE9wN8{O{=F!pYAO&Ypkh_3W+(0T7d
zH{ninWp|=0|7&y=9nn?Zg>GU;bpB=5<JK}8kN7744ZbON;hTCVzG-*jd+@LEP49@W
zsv|x>4fyWDhes_x4LpGOs{fYXXWh;3v+v^fhyI%1=XB)vxgGJ%>xj?K0}pq^ci7!#
zGW68ee%?(kwU%e5A<UU53+e7nVMho>uC_B!w3*Rf_t+Kz871dye4oJ3iSN7DV-W-{
zyb~VRFgs!}d`>*wwbc%UzIM&+#scdywioRB*gcf3b*Dh_$A*NPi3wV^MVKIOX#{TF
zb+$*K_E<Q+M4h9Q&_(CmDog61`2Up8=%*%692OsSHkB6tqD&)nN`PmTpEMTVo<<TK
z@U6SI8Ed*L+uc5f!~X=aEm`Xh`S5lE-G)a`Oj2-Th;onC*;2@V$K<?4yRBE<of)!>
z?(V1T_oMF5kmb;RF*4>3q_{KJ*;YVPzETYc@(@kuJSQ3QIF(A2_gT%(TJ6TRl1f{Z
z?S$?O@RTrE#Bj{DM{3#B5AzVAOpr%!H1tB7Ka&WUzcx_iiu*VsJY+Pi-Q}#+`grXB
E0anY1KL7v#

delta 7625
zcmZ`;30Ra>_n-SNvoM3qz_2qgAmZ|_GlF7nSXP#rLoTJcK;n{1GHzL!fV||ADT;Ee
zG(pX@EU}c+qNQJ&l^eEwnO0P`_%92pugpsS=cPX5Lwld+9G-WXdw=&VzkBYXwDe6@
z`obHmGTD=0vA7ml{=Ons%3Z|-i+YD%R#Z{MDvG#@BEF(Xs3;OEimVkywu&NqMUkVT
zD59dsSyANLT@)EU!j{3-UA_!Be<U)7<)Q0n<N{{rYb+LP{K6@VRvn8ZX-5)8;wJHs
zM3cmjcu8VO;z;625=atBl1P$q)v=VBU)bj}7a?>l0@p6z`7RcVQ}`3GGo^eU-Nl#B
zB^_Nphje85Z1a8jEQ=-L5~{m>yIF~=oW8eiEaz#A2aKMiXBpR!zRT!AdYq9<dbrV@
z^gyE<>0Bd+v}$xEooNI~Cm8|KZbK&>VQ4hNABIZ0*^o(pYnYh6Fgla|%*Z1BiP3@d
zNh6c=J0(U2{W)UzNxx;Jl77?hkv?RkkbccbCcV!{B>jRx?r`ol;z&PZ#FE}<cuB7@
zVn{z^xJj2AWDDnf!%2F&5kY#iVJAJpu#&#j5J}%;(1M*e8XV~x3?HLE*BfLqXW#M?
z(%s4*ARQ>bpLC~17tu$ON|Hw6CrKyCAZbsMNz#ENi=-oo`F&@SE_e|oTY}%>v#_s7
zwY?teR$eSv>Wksi$?_>k{89SS{_{Gqe1>3o0n!({`a;@W@^x7JwzQf-;6%G**!Paq
z3z`;5E*z37bztzxb5apDeIdng>^$thU+P<Zja&>*c$Kl}IV*i{r4>e8fbb2{Yk24<
zsVC1x{06o4@@M$vc`1eNeh2?K=~ieOB}L*Zw@A?pDs{OxKKF+d;<$)Eps;t!5Lj{2
zEkfF^c>C@Gc_aPkA~Y}Mvd|wPH!>*Z<!LzAD*qvhVZm~)2x%!!4$Irg^O^W7*^Yrn
zOZXmYj&KKIhfCTFYPqabKg-*&GFqO+7>CUxBpZXevyvSuB{>GOV&#uG#zS?DlmVfa
z<l#^^Teg9>R=TkTDG<^SJX=d|^&!$?Y)F)|t#;0`&%!jzzN+x`yKEaql+O|@uR>uC
z-(tiLW;lpX^eCSxSl*gzVm!#1@nE{!ie;&K2}5_P^eux%kFwH?3mcs1qQ8kpJIUR6
zW{1E)sXca-<<mA60pTk7p=wFG7K+=;%fSDYyaMu$aBlqldfCP?C+Jh8`yjMi5^&)F
zxr}$XCjNCn=&+m*`@WMSp-xnW;@&~>F^4!?upI1fVw%Rx*maOZ=`B|<0QqUs(<Z1|
zXo^p;LESLvI{4ltt%kby<SZ;0AZ=zQTsMTg^7~K{(u-lkD18)e9wU$Am<Q6s?sypT
zl03pR;z8_IC~vU|a|Fu~2yaR0ixgmuoY;;=@IvToS;MZ=<OZI_g2yXAg6oUri9Cyg
z!WyYx^(|64`hS;Jk<Uly-C;v4-FxqmZB}uvU^$#=F5q;FQOz_=gu>PG&v>C!cJM3-
zJiVmOs2KA5JWGbAv2rD@UM#<E6Xpq)pP|_u)dFNRGhO1_G`0L5WUJ(hj40OPOa;%j
zcGqB^)$&1}rNPPpvX0qn<>Nf_Ll`|?7;?;$29-lSRw&pgpTYF?@@E`Nud0oU!T1{a
zTb^Y=c)b({f2^lS(tn9@W65UO;8}ZUYH;3!gSX1{Hr4@}Q<V@7tCM%|EDHilq=7hO
zm%NK-9id;fyCdwAWrVsx(hR7(AYDYV=v!9tKEZP6TA+oW#9#Kyu}th-dq?@b;CW5{
zPRu0iT_8{`rD6L6awE?qGeLVpX^dQewQtCG@=QkIh<wRrQ%z^*bcfon<@VtIQW^#B
zqg)!|Sy^D9kCJ6bV9H!*v@t8VcgtPy6{Z+1Zr89jD2-#3P7!Sonm+FVFE`2E%<#~$
zxk(N&C{0oxfV4eQ9Hu#xM6SM39wCVL3zlQ5xr)V*nx7N}QIT>l?0Z4pOKhM>d!b~K
zWP=@F$stjpp}ImKOFm%U4~EKvl88xX<+B{i#sH`IDUE~D?KuCOyoh5tu>VDQG!`_;
zYwh9#g5~%`bCU69Dt3QDD4$QM=(@_Z`<O_(i8B`{EjwHd(Oi7;qCA?h9%hRAcV{Y}
z@a!5`873ks7L+QU^@N?pQY;*6mczKzuH0*5y<ug#k_O){lH7kYXB1BIDC;=Z2TmN4
zG`QG9o{2=A7wlYl3Do+ODPrDZ1?3Bf7?kfB>s9@`oPY^_<s05{t*&>|gSsAomDA-s
z9F(b`jrE88ADpq!=b-amTqP^<4#6T=wn6$^o<8_Zj^gFmb=A2_e~}!w{JyH46LYaF
zSNTpL0xa&Wtg|rzBCl7bIBs4x-{1wyBlGE#?ugeb12}O2*<&CSo{g&p|EY-6^>NmL
z44)XT_H7A*L7+#+oyBv5lsKLZhP+ts{a6xGD8z4pyhQI3e0Z2LmuEvD&*x3Y4aXu1
z859($qoJT7Vg^VP)a}*2_(Y7mLpdj~e2jQ5DutoHP<hHGih^bPh!!B$yOdu!F+@Oy
z0XuBV#7@(cQ#>0EPtQ<@HHsBq1hZoPeaf>;97<o^4*hQQW<l|P6ymxri2<BEUwMpY
zBO(9#gaRxoRW|T!6x41{$igm$a*}u4LFOc@-Wh~^F7YLNeX+98X0?l!vgalffE+mX
zZzTdAu2dcu$2^m3*ic`o9OuN_XsWSr(Qv+n$5tyjJR667mpJ!x@Yth@2flmM=>-2W
zX9m<6#A%(&hzp9toC@D>Vv&${k2)KkdQpitGo%1KNdnQ*I%NjW3Sn$Hw-6t!Q6Avg
zov>|%^ESL=v$B<E<DqbqLOa1$<uuQVpt0IH8K-SmfM*k+@lj_UT=R<Nh2j^TkvO4F
zd7O7lyxw2vA2!5a2<gLPI$`!M<v7nxx*f_McP3%l3(6TAy9-|qw;RK-aKEyVV^hF=
zh~hPGZ@ayC@qi-oY%1hGY@Yzd<Lm-Xe?zI}*);Hs%;*47qwJJ}J*^59jJHoj$5CaY
zU5F4YznH~CH+&#kEn(n)&)V56gYMqi)u51UfR*zjx|!Ath?D8@j4IER1Wfrr`HE-7
zI4Vxv#PG<kN;U_lK2bWcFob)hdLeIL@;WG8nk+!OWc3FqZnSNK&{N3~IOa2D3u7}O
zoR=B{eQvaN#=JAiYdo8UqcYSj4EE(DTe0q}GL&Ppk)2DP#<2LDQe|axAu!U~&z$%}
zhG{=5XBfK&Yd^G&V-QLbhr`IzHm?b!JICfhzX{1F+sq6!^CwVvN!iHmh1$<-G4S2z
zN;EV)oZQQV5ayxyOIsJyv-iQy9mx_DWT?Z@5Y!T$-H+^UpMw$ACM`DMgc(|$YHyoJ
zCG*d{%xE)hw~&cut-N5%xMbS$qLOb1ZAhvcr^Twku@VSJC;OrDv~3uaj!!Oyx@6G-
zbzi2eg0a6T8%^VNfQBW>yG+>sVWt0TvQ6wV&?zk`T!vvKrHVoCuawy)@Zm^sH!-#l
zkBe%6gPKc8sW>!C&9;gzs<K)z0%5enV?)#cUXWFh7tMOL0@=O3Aq?^+Ci+3INq!U~
zgX+(WJqSBLackgyIoWo388HmU<fvOXwg{UqC{gTxLAUa<X=|!UEzZTzd{HTeUY{!m
zE-zpiXTDhi&77JKrB9~%|925Jf5$*d%TkwOvsI<ZXh{Wde0|Ch?0bXS*($mPOVuE<
zeGoPbQg=J5o||bz36?L+<PYMC!Rl?y@$jM|qn%(`VSbhanY42IvKOsJq+t00YLlY7
zUA9OOGwMSsFR<nC=~4SEX!^gn6F6YF`ZDKSk*ntt(dfY*<Dq6!YymVxdllFh6`uzs
z2O^4b;7Iia&Q{qySMREK1wCK+3Y$l((L7rTJ3frN9bQTDUWXeB)FPg(f*l{nJpfOR
zRC?l`B6UZU7$aCV&LnU;)XY|wJJzlU8_|Mg!$f)%fXQ>z9DDV$5r&7@-K<Qz;s<lo
zj-0rf><1{!Q!m-rBhWmjOAM@ApX7x5*Vv=r)F1H<yrxur)5add6V*P6sClh#Hs$rp
z$+1{xPfKIa<W22tI$<52=ws8!`R5()RDYyqVwdIWNygTLr+eyDoKdN+=Go&IenCCN
z@bDTnmtz~i(>IkEY^_QRR)c}p{l_RYzxMS&=i};m#%iI&A=kqE?^Oc|oT3xnoX*8T
z>N#I5j;mD%+nE=i*{0sgiI39sn<*WmRIJIcjiwFezO?R8vfa@HX}xWCfP07fBYOf0
z7x<pRoptK1Jlg_=3w>shrBadgBo;pC+rUsiqmF5br>$7H)HjP^#3SmGmIvFQaJg?4
zR_{}%^W0M%A^mly3Wv|BF6?_iJ;1Z4p*BSr2m4ktJ5GH=UCXoWu%Rc>Zqt6J01X?}
zp1AplI^V%!G5vk@V<v7Q#5*vs-O-0#hS-F9fB&qOFs*~|eE;wDAE`Xgc0#z+|2c%V
z+8o%_sK)T@ISd>Aw^;RE{u;ddOLYz7p3lbg)Bfc=4B6tCZaQNZgqQi>XfY;`F{7dK
zY|Jp6dQQF0#^P|tPilyFJxkwV_ikMS!Q5QP`%LJ7`gwIn1WSNMPMadWxUz#m#XGOn
ziS_j5OR#*aHxUYA_zdhTXtd~;QLt;5c(w-xm-%-u3T};}=v8>SYh(zX>Khr26BD$Z
zb}><~JZ-Xuj)T&*=Q;5e8t-4Q->3PA7&#k^OXO^*Woi@bVzOX)(kwo7d{frmVd8;R
zLyaV?Rkg89+)qC{2oGgybMZc1o8@9D_+2l}!?V}x^R%H>(I;4{&Fs{1@eSHNjJ;7m
zK=U#&Rj@oXs^#%bH)&_BqMr`9qv^gQjtyyU&VKYE(MY48n)_B4thrSi$Hc=l)iD%?
znd>?Z?~m8IpnALZo{c+^1N|;W#6XjqmvH(pEsqXu%iWP!S*Xq8*xTk;lNnB%piQ=k
z8G_|s=0sU=X_~gi@$S0YjC8^BV$hr$Xl@4{ovsBrv4JLg5BqK5?F?OE?H7){5Br~t
z?+Kv?w8d5X5<(b1NBfpz|Azgc#0GqKp7v^_m`SNUn?}lnJr8QvIzC)7$7oL^cK3fD
zr9e}mOMrokv|Zu{G{GsTJ#34Gu}?>8)&1<bSh`p%x3Q0)-H4=7IJQ!If@dG2uv(jI
z7dr@+y?>5VxlK#L;+;v$I4G@*7hv4*q#fol=`_iw)hptEudmf6*~Kiu@>GgBG13oa
zaAG69J_EJm#SF~at}V2SL=c-zOZf5VE-i*R&OYKWItiBN;>>42&urkX*QPtZTs70^
zC|I5_c{dZEs@I0I$j@o8uO^J2+NtC0Ku7TGj*p?rMLWZ@uVH?ySpe<Pz{dSwXDIx}
z9t)+DGzVC#BoAgE&^VV!oA3rJjh2YR8nmZ*@f#ZLJLva8YF|*!rSE%^e^2At_b7Z|
zdb$bLSG$rh^|Y2}r}NRcGvo`$549dcB2Q+~C^0beEA3(N91Zd#tbE=#6&k^pVshex
z47yy<DxmTqB84rSK8p63->ia}i$6ix9^dU)An1?NLr;Vo+gbG=h@>w4`Tjppd&)Ns
z8p?egVYyxZ5R00%4IKL!KYc%)_|+X@dj&uJkCx7H&R-zh-uBQ{=q(Xx_76nP`74CM
z_t4c4jb@zl0_2ZPqeGFPQ!B;!8x;0WTZ%O2Y`Xg$!*}^z)QO1Hm)V#K>%ID2R_DcM
zMjHycV)Y+5tMfdq=F*xnkA!}ELJfz<lk{xHERa7}9E!K4=-YY5uq<84q>^QgOevkN
zzsoTW%4(wqVJK67-aKbCjEuSw2g>>jJQJb#7cL%L%~A6q?Iq90I47Vl=jfbS_`W+H
zle6`&dCuks_Kq4~H8wR4gSq+%-f8ci-6K0YXFP4Buu=?mfo*<%YIQ`yI_%q9Kfo~u
z3VHf;hgB0SzZT?xr+4sLXsnDL2+zFb`Mr9eeo5r1N9e-BN2ExGp24&<s>j0>@;CT>
zNcZxr9rU|Re-%n|5+*|NNIe$|hwD@uM?tMEJ_#CoNQ2DBWAM=J`ZKl&U9fyKCFc@d
z5N@^wa7Te2;zcTYUC~gO6|X#B=N-<l(Hn?o_4SG4O@4R9K;hl|WZD$<mAviFZf1|u
z3x(rii4UU#JFsDz-j&)QRVRkD2lZG&dmOx0f1bB>3!1IZIPjG6ML2o3PA8gp_|)sp
z#@u=OVV;QFpRD(RkdzRKL+0zWvn4|Q(iA_0CM9mhH%fKG&H^}iiT)fXdT6ASsxt3b
zymOge%QGL8ZBM)j{0p=U6Bg~&skr~<#J&vkrt5pnP0*EA)vtZlWjysfwLqHtCEgEB
z6Z8SFu2b+4ESRHjqV7j)Oc_^TYTp{uR{aONHAv^IwY_lvNxdiMD59CD-RjDMok6SK
z%6M3_Tp!P<BhnUVCm^6F@uNL@7SB4j1=-~akOxhWQfrWMYmi4w!zrynHt0XvSy$Y1
zQooK9scY=gpD*(ofBUqs#is!XbHM|+;iteG3@bm=sk<12e$jzrK<-?Q1z(ucc5MqU
z`wDn1Hq2=auUl()Eq?9Z8s2$*j*aE)?h}~DB6=M08QE>kNzHKAH4r$ZAAY{nTk#j}
z>iWbrrdNBy{yF+q2<?fYKGs}nI<_nTXaSqe*S%nWu{ID&tMpRHiw+z&WAo0IaOe&0
z-vUjb981VF<MZp5hkYP@mYxn>ItJedeVq<a^RI*n_)BcS#j(ENiJ?<K!vbm-g}#Z*
z1d7_DQ1>nu#Dc^C87B``j^SsUp*xD<+rB`6WBnk1LE>DfsnDkZ1@JIfF*VVPd1VyB
z^_c;xv9J4wFzJ6qm|WjBo^NRDiyN=*ivg{DK`HWAj@j|%yugb*yScS5`Ufafy8RU@
z*OL7P{{y~TuD~~>Exu4&eEC<$cWY~WLoeg|F9!^}0$=yP@C_n-xBUY?>JhZzgOP3V
zjcSYUj;rGv-5TGREAWkNjn7Oqe0gx7KPQeLbcO$b?#?UFjc<#ts4cn)S4T%}!M_=F
zQfqWAL@@bEbaPB}1%z(uKl1yuEBSr;75skp)%kr!YksGH&isuo+!|dA56o<h?o6P`
zZoS4#{=7fA)LGO$n_x~MnS(nw#~)-!T<zu{w1uN8%i@{~Y=PF#<ogT`C;c2)M{N-J
z^iV=t_1wf;;FAu)9%i}&!<W*70qU+U<@-S0Z-Jrwyg+Bj|F<>c&y5Khwk6sjZ%HB*
z;1<`tP<A+>BZSuJ!*-Vh4W8Wx`3ZrK@RS@(qt>FubwB2(1g0~b8VIgvA&vQ$SJ4p%
zx`Nj_SWjFY8w_*eZ2G*UDiHhb<^6LTojqxff=hGt8_dB<q2D39_b=9M^aa~<tPFQf
z)9YJ6-^8(n(0ne**9IsR&lXoX)K1W6uPF)c#hlK;V;nP3ou|Len^rb^H?9g)kLXV`
z+z|*4<EV+@x!0X!?xig#_cG+V1qGY67g_wVOrYIsJ?e46BLr}-&01CGEi=bh@c)KO
BQLX?0


From 7bc6a818f0246ecd3748dc896872b3cfa94a62f9 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Fri, 30 Sep 2022 22:40:57 +0000
Subject: [PATCH 195/428] Remove one of the NEVER() macros added by
 [5166acf3f0040459] because it is reachable after all.

FossilOrigin-Name: bd8ae5febbb8d3122f1e2e09b9fcdd6ac20c075ae1cf60bcdbd36080f3736417
---
 manifest          |  14 +++++++-------
 manifest.uuid     |   2 +-
 src/btree.c       |   2 +-
 test/fuzzdata8.db | Bin 3293184 -> 3298304 bytes
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index cbdfaad8cb..29aa8d8ae2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C New\stest\scases\sin\sfuzzdata8.db
-D 2022-09-30T20:59:09.967
+C Remove\sone\sof\sthe\sNEVER()\smacros\sadded\sby\s[5166acf3f0040459]\sbecause\sit\nis\sreachable\safter\sall.
+D 2022-09-30T22:40:57.814
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -528,7 +528,7 @@ F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
 F src/backup.c a2891172438e385fdbe97c11c9745676bec54f518d4447090af97189fd8e52d7
 F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d
 F src/btmutex.c 6ffb0a22c19e2f9110be0964d0731d2ef1c67b5f7fabfbaeb7b9dabc4b7740ca
-F src/btree.c 9c1aa101325abca2e7f1e5c24eee990cead2183d0b793db1199d4a57b0be6315
+F src/btree.c ef9c126d6dc5dff8ff76abc807dfef5b8aac42144e3be11cbcd9cb6eaecef580
 F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
 F src/btreeInt.h 8ce1332edd89dfd2461d561ac10a0ab5601c8e06200cb5230596c3caaf54482e
 F src/build.c 898884afd67d953808cb687babc15b66a10213f99fe2ce7db98960e959881f98
@@ -1112,7 +1112,7 @@ F test/fuzzdata4.db b502c7d5498261715812dd8b3c2005bad08b3a26e6489414bd13926cd3e4
 F test/fuzzdata5.db e35f64af17ec48926481cfaf3b3855e436bd40d1cfe2d59a9474cb4b748a52a5
 F test/fuzzdata6.db 92a80e4afc172c24f662a10a612d188fb272de4a9bd19e017927c95f737de6d7
 F test/fuzzdata7.db 0166b56fd7a6b9636a1d60ef0a060f86ddaecf99400a666bb6e5bbd7199ad1f2
-F test/fuzzdata8.db 652953c44494e176b9cbf8e37eb020e69fdd2395114fb1554377be328c08ff0e
+F test/fuzzdata8.db 653423800b7671e67caa740e977d80e1360f0d69e9992851f3ea5c4a69a2724a
 F test/fuzzer1.test 3d4c4b7e547aba5e5511a2991e3e3d07166cfbb8
 F test/fuzzer2.test a85ef814ce071293bce1ad8dffa217cbbaad4c14
 F test/fuzzerfault.test f64c4aef4c9e9edf1d6dc0d3f1e65dcc81e67c996403c88d14f09b74807a42bc
@@ -2000,8 +2000,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 7e761a02530ffbb055a766eb6c995f11fc2adbabb9a52502124f672fdcff0d10
-R 2ed590521c06c3e3aa9ca21e94c7fcbe
+P aa367a3c974041323edb759855f0b83803439ceef2846da2d73eadd80efeaac4
+R a1d3c0131d04144023f8eda3431f858a
 U drh
-Z f5898bf6ec0ce9d69f912d0173ce9ebb
+Z 6c2a7fe31c25c65cdf8db45166d1307a
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 8438e6741c..522f0d3435 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-aa367a3c974041323edb759855f0b83803439ceef2846da2d73eadd80efeaac4
\ No newline at end of file
+bd8ae5febbb8d3122f1e2e09b9fcdd6ac20c075ae1cf60bcdbd36080f3736417
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index e1696b9bfb..c54fd2e7c8 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -4954,7 +4954,7 @@ static int accessPayload(
   assert( pPage );
   assert( eOp==0 || eOp==1 );
   assert( pCur->eState==CURSOR_VALID );
-  if( NEVER(pCur->ix>=pPage->nCell) ){
+  if( pCur->ix>=pPage->nCell ){
     return SQLITE_CORRUPT_PAGE(pPage);
   }
   assert( cursorHoldsMutex(pCur) );
diff --git a/test/fuzzdata8.db b/test/fuzzdata8.db
index 7e8649c3266a62e60c94cafbc1a9ac181ac37a87..aff7e27340cd560731ada86f167851c766694516 100644
GIT binary patch
delta 6621
zcmZ{o30zdw9>?e0Wp;#tVP{}KWO3#$GlJj_C6>7W0`AL<fcwHInwcr+opMDC<zMCk
zYUUc4%D+-ed%o1%=(W7uiprPudK%PgUwr3M&&N}n&*%JR=G=SF|9k%DfBxs(Q&Dk-
zRO~uKs-rEj8jX2_=6@gaI%hW$Tj}w8h~LBbJ*?lu`8~YfqxE}qevjVoG59@3zsKbF
znEjprzo(Pm6X^E@`8^iDC)n=^@q4U(PpID$=J$mAJrRCSq~8<e_eA?WF^4_2`hzBF
zYcVlXHE#g(A=^(3(}McLw##IRd6m+aR#z&0s6MLnraDvUMYUMzNp+OcgX#b!lWK3J
zJ5{%mPBleIqZ+GpqZ*;OshSj*Mq|3INK}7P1ghUCPO7a+D%G1x3e_7*GS!cjE>tfo
zovAMQK#8Yce^=~O-&5kKzO7LIm@X(WRNqvhss2TYq<Tb&pxUT}Q{AqFQGHekp}I~9
zq`Fe+MD=kcfa)}bcGy&+7^r#_J=GD4j%ty@Q!P|Dss##5b?8$qXrm>TmN;7Mw8Ybr
zKuc#@5^3o|OA;-~w4~6IN=sK-9N2<RdxhFq9^`j+?gje|XA1sQ;T%91_aulv&-8}|
zv!gF;T<FM!=w;4eQVQ`$j7haGvN{-l%2^4=pL1}~COfi0P@G1!seEvaV29xf#VL>g
z`S*{@sD1-M#{xK>Crhw(v^)Uh#f}khYowz9)~<1Mf!15juFyK#VTR*r)LeBRr=+$w
z4Eim1jscfe=s{%g);S_z+%-oiv<`99KwWo7cUUbs%R$O@SYYx>XN+!Qx-7d(-Qe>&
zJ43zK>4dUh9S=a+VT%^}e&jI1TfaKy!^vD{Z)zwahml=yV7ntJVB$pM7<Xxp5*jHQ
z4aBF)@vwfivqyA>>~y8mBB$E3hxWJo>;ntzLyHCv?q&3X_iSt^{BwPPJz!YQ(Ci^O
z_F{Wsu6-i3oePeD0c)Jjp2Kn;EE-lYaJYIYyTG0@JbQ3aPC-g?hS!;#>P$&?7AL3L
z)$fv0TG9S%%G7D<Pk3>Sb5zoN?~Hk+y^O<h1`h3?GqS^vykXf74av5br`!AF4ux4a
zLi)gtD(6ICUU$ZJ8aT8dXIP<q;803a?t;38s0cPW#SZbmnPXyIy^JFU7CvmBTUzFw
z<1L>(CuKouN{XGfottMbgzBea;-PG(F$S`xNIKZvLkNN6%XB<=#?ZeT-{Pz=>|a#i
z!GK_ReJW#u$cLg#aP(}H0dD&Z0T$Y`E_0>DbESQAlbsWt#i@{89Tx``pPPa}cr_)?
zNJCsh$aM|5e$bb5ndo<L3d?Cun`;hC>PcKsS>osk&DWhqxVYZYLNcH}!P%&WLT+uQ
z(4XfxP1QnrYbI7^3b#1IV_6?zlaA;hAV-*H7`b|pqUAKtE~2+&Am#`UGyHJ+@F?(p
z5mpQKE5@r$VcJ0ipDz;o5w+RTAP0wifj0*WVJsN~S)ta)aY>$_uw*P`MOs(jnnGbd
zOU6N#%^HteFBrW9JSE~-@H87|gQHa3S8EH8#IP~KO^!@J<4b`t1npj7kB--Kntj9D
zL9|na9~pi;H8&B+SzRKg%n+`yq!{+j79{LeCfJO`fcXoB7YXmBcTIxqhpb6Z_N@>A
zja?&MIAxLW97`rceoll3ODcq|ESUoJ`y!ICt0G)t4O3;=C3lx6x*?y5d==kZE-ck)
zO}wV^r70939WMM`Fv6N@VGBQff2LwYd7W^P;Y+Eh8StB8dJ8YC7t&cW6Z@?&onYX(
zje-SkZ8Vv{zS@)kjS2~c)Jl>7Wj;oPueOr_$a+*Phdr+d;i?m7fhCHo#`T+o*({k2
z<Cif@@yR;j2^My(HI2kEJA_><@qu@{&>53=30GM%2U==PQ*g#U0a!8@S~i-ppyz9n
z70O;Q1z>5Tu!S|0=h(gKjPgQ!QAi4=9TG0G%)F6Mxy2NPaW4zkb>vYz;_Ebyp!bBZ
zjUfvl=oIM#S;smZ!{1H{JWC#f{5ASgD4U??aOP>DmL&_pGAf}91di4Zf$Cmb0X)U}
zNoY7PY}0cAoaTFoUvBP>PXvog2-x4#rmDGk(XMWanbS1Gx<$tBsxMvqd|LfPjb&N{
z#(W^$V98<}9VTukc<x6bje#p42`OX=_<F}$A?tYbCa72$%|WMV@oOk+(d~x3J<&!S
z_ldBRkP7f+#fCuNhqS4fbzS%iODb`6g1D2w@$_gdHhv)#Fk~r`o6$1}mfaL;v_t{d
zC~dZC_%gw`?}Y1w__6-7ZUTY4D82|rUDa7tkPL=A3E8F5m+rC*)bdB*y)A4bPeJ`B
zx)8YasSpg!YodFr2tF3dKGSto$8|XzXoz-zCqXPig%g*sWCfC0HUoj6&!U#AI6i_}
zlh{Yccj7eP^;Tm|_1#j!FQbpI-Z>$fKv`h)NSdKzgK$Qu2n<;RzTjv(RA1E<LPc?O
z1vEzU259^&=4lxJv#?EdUKeOy5q(I-{+3kzzst6hJD}6rC-7SI2{APU`rHu8Rq!ID
zxZ4S-#*4h@VxaDJR4f)GiD_Cskkj03X9UWqhv#xd7yjfFd6r*AX={)?X3HgzH7U{#
za$WRB3~-Cz5wac*d=w->(2;1}oo<8>9G5QcWXJ|=`$-5S{}0_^lvQ8PR$W;OZNCX+
z(EC&2<ed(zX4ESHZH$-?6)(iv|GyJ;|BHc`_O3pIZCa5Uqh0dA#mzD2u-^bNRm+EP
znwr7X_ioraSUhZ~e`$^q%xV6iPJK779U_h(hUcCtQ7oKht$JHJB+{PiH@>1(f;i3B
zP#+cC{f<XU$kR=EBFm9Y@bP*5Txk7g*xUGUk$8kLZO)W4X_}GUJ&K`ja;OKIgRKG_
z4-C(OB`1w#IB1mkGNap)ktuhRyMdf9+`zW6VlYd#Lc`^-k?>lS^+DX~5ldK72Mr&F
zJpnI_5_;j$60sqW592i3=1@2p>dM6`!_KunC6v=_okXi#FlC;YuHUhGxMHQb9lYsm
zH~e6pn9T6osQ;cvZh?4PM_z!od0j(b(`LFJJ-$I72v>d$H(<{S@r;h_#<y#24w{&s
zv6a(#eIz;*8})H<1X``Jsp=r?!MFSBBs%y%7~ZM9CMIInD)AB_d%=<sI~`|Ni|bjk
z4}C9-rwE?iAZ9XTKUn(3(hT;DNHf@r=z7zBfrjSiwjOBOBK|-~11vE(>tWGXq5>Wh
zZ-O&3nJ|dGX$!>(_2Ljc3CI1r#bFG;i<*ClPRBqI>k@Qh>GHBLE(4bAGqgfnAKe%T
zY7oC62f@48wjU2Pio;lP2)s*egE04yc!(v3(fg!rD?$0XIIcaOn$Ww_HkY9BS#d>s
z1%kKA_B7TW7iY4}%gGS`rb&deH$^k{J1L%I$tzGF!%cwW>xmwxpBA5C$*Zun7frjZ
zCrlhPZxegrj&tH71Bt-+_r(the}EDnL)Sh-UvdYr73Kc+x$R;48u%93e`&fVvMhNW
zd=>UjA#az?fUPZJ2uqHmPqDv6YNy)kaMowy2Ev?3!}zQADi(5g8fL14@do%-+fTPU
z6R0zTq56xELY#h6d{9RsvEkoh9&0{I@B3>;_iiqCW+r5P!gWFU2eH9OqM?P6rtzoN
zby1=qmz5g%ll0EhP_@e%37!x(0sC<h?erPs^wMpXyoH=u{XUCakVK>CJnZcjkOzDE
z1q9=y2<d>HkKr_X)vO`o;CSgE!=Iz=HNy#;WTT0Z(ZPgBMu$?ORI2A=In4`;+HXDM
zl-?oy-<~c|Y*;T!;|YI}KK2f*N|ff~LRp$?CUJPHw`5_-yG>bAftI&(np$;s%D8-h
z^e7?kH$5y_2_MgCR*i129yn0?Ld$pNG%t^(|C4cio)pCBudL#g1p27DZgs`FVbTP`
zU!tb2B3G#P>l(aYEOkY3r1YMS`6wN-e=~+aYY^+enT1joftISE0Ic>(a~aa2-Zh2b
zj8bWej_<;0-cSuC!R;B+2E!+tMktA#<`uVU8>npqo}VeX8U90R>{HC%$?6H3ebV;~
zxeg~@2=4`XPe{vajz{ES_&n)f4EYC~$ct>ocNa*n2k^;sYM0ZN65;5R(gTLiSIkqA
zXcC+C->MjB^_n>t^ptdn|BM>=0_xA|LSg*g0I4=xpNSRArDZzuC3G4dH5$iPOV6|9
zU&yVO=Ii+sPIK({cB*$vQCM~$YBd8D)!`gWD2i%OU#I>_%U88)!+&Y2mnQ3ZI{){?
zsD_a~Fq`3T(aSU`7V`<1v`<>9=bfBphw2GCo<Ago5X1M+8Waboc_~b-16rqppeAXi
z;oncsQRuSyyqb3taZi&}L;~7qW8an*PftlMcO`@6aCivaxk%Sp@*OM+RX0FKCD1WH
zq=NTLeJE5+mJFb+aab_zq{Ntcfx1acTZ_cPW@#_W|43W=1+qVg?FYim_~S3I?@28A
z6}b=8k^T)f*P5d+_NtVnClXG$E`7%s&6;|PBGREuqRoWBoEy>_{%88WOJLnW+jM9F
zTa20%pCr)rC&>@ht7ul($;hMWBJ;DBZniaM1}cx*Mxuw4x6n$9F$g<p<*#X$y8Zig
z7V59qCP4EtTQXGX<;z&oCT(FDGlw6)A5SxEkWu#<e*CSJzz`mMopr13liwndTEE28
zUAzx$tL_Ihju1WMkB=Lxf^27r0lfX=Rw6Yxk0nO*O|_c|1_j8gb@Ux#vsIqPoA-}Z
zWHg7$-!QzE_9I|JrNx1EeMB9D7o+4fLOMbIe7*oj#K`+t5{Q-YLL%L*Y;e-q9527i
zkRYh64;+kniSj`mq5Gpzfe+yzr~EQYLZIw>CLGLdfr}vSRm+Ds&m~te#0uW`gTgU7
zP5zu^LhV4_5yNZ7$A+OhQ+}H@g=M7mNJ~pErfVpy<K10hx1F6{YmC^0{rbo!8M+{F
zS@KMS*3D^t^rVBOkNW{=sSX|l``@zsQaeb#&0A<cqR{)SBY>b~i2OA})1A-n{1U&)
zldUX?f$S0T>rjy%F$u~>$(iUalIgbC2KBn|C}`>77_3&0!&4*W{W@bePIGNq`fd6F
zUz^T_4IVj<<>^_4*$&>MaN%I1wTNJg)fG;fnj(wU)NYOk?<{r-T@U4TtZriW9<(X}
zyc0rcDhzftVDk*Q8%sLZyq((_#0wFfamX|BK~~q@tscE3f~A5j!71f3eU<3~A6tXc
zFmr)?mL*AGkCyvFo+Bava~H{UQA>vWl`(e6n;f|VPglr_o}}TB74l0APtRD)U27_>
z<8k6@xt=8ssN5Gh5bTSk1Qm-e(@s3`NMt{PSu^Eh>iTCEYO*^g-Qj6si3n}kk&i=b
zsr)c(N^w7no_X?ihDaTlz~YD){0EGyBg`)OYrQs|zF9rf8&6!4dohL*YJwgTnbY8a
zTPt_)8rD_G#e}5aL)aZC;U&CwR8C?^#@%$8_t5=SrR&jwj`Zy4v2&`&dUb?smcP-H
z?s)W){2;@thg^LRR$7(+4W_q!F#Cazai7Gk|8|`wSpA7Smyj&T4t8AtI*wK7`G;yY
z`)<4k?!jw!-h&<S`gg=@AJCkRct6PVbR_d|U)KU+eCV7_$++8{>S^A?;JPB8Jy>D&
z|G{0`6uChi&Vg`Zp1ce4jt0g-^?dov?;QZzfgS4QN8m)6Gzcnc<O;|Nc3o71a$<WN
z41%DaU9BKoh)7fe^Yiw~!4N-}9`<xicE1nuCK;gajfhhGKGbDq$PloE(4BwtV%7+G
zUj`%s4cGI~_%7o{Po#@FXDF;2$Cj&MGMeDuY%Ui=av^_l<b0^}%QJvRZXv9l9%;p_
zN*cROi7vXY&i|7z8Fo*Y6x<!ig?Eod(f!9_c*n6Aac3;__(+!P6_$+bI2JQp874lD
z`fbdgaE-l(Yuw#j<L~C0aDOgOM=tLjuK!N@i5<E6yS~xmk<G6D3_qIEmHr9cq<iQl
z-%U5=Zn~-Wr<>N1Zu&iRGdj{8RlTN8{MmoPRdx@T?{2O+cXQ3XKUaB2u6Z4~+9&?}
zj$G{%zxN*#e-`C?>`znq!h2Ks<M*WUMfXqTPjpP>i#zfy>B!eU^D8>?U3azWwSCm-
zp7ne7G?iqiNAU}2S%wF8g#VQwP0K+H<n3hWCQ)NnfGn1>)zqHA;N<UIo9JN&e0(Y*
zu6BOpQ23~eyN5c#>FM&T@opD^#+7VeX#Ck#z&`0ph5Wy36MkQVpm}$s9<o+M+SEp$
zg37ZI$&j~6E<C)%t*~S{<VU!!;T5Mljvhv8%quWI#x;}RbeDT=dzx5zrx(dM$n1W=
zK>A`;sN2WzOX=-vYFwf3-dQSl(>F}I9Kr4R@&L85D#$*ixBii5TWs#m3|Wf@X2?zL
z&;uD#4Q)50Y<Gdu&9=t84(dzg@(oMe$1pwBeSslQqqso+8>@O*J)tqzpm<K+OR&M^
zE@bFYh2^oJD0SIvr#wcG>F(xq+J4mI&m{s~uQsC`<~~OOkLk2Ejn+!Fjn)4FcU|Zv

delta 5950
zcmZ{o30PIt7RT>C!<~`oGF&bfE{GuD8SZ5ebAr+)Eg><7RL)gY98hp7OB3|m5=BH&
zR^|k1&L&Q*N-Zs4&WdF{rwV(%%E|(JPi^$=Lp>ujzHj~S$3Exm_1kN&z4kt*WYaNH
zQgVz`IszR!owZW;=bvS9rxfBSReTEZDU45HeG2DOc%P#8DF&Zn^eHBvV)iK(pJMeX
zem<q0Px1FD0X`+rrv&+wV4q_1DIq>3)Te~`lyIM7_bCxR#o<#T_bSfX-4>=%H;Y)Q
zM{6Zm_c(uIEF2p5IxmvhI{jRZHov5Hr#e&ZMs>2<m1=?d0M+4Y7pl2x2GuOJGu6&&
z8dX6}rP^Lip=wt>RD)GFRlO?fbe5k~k?McdPE@~Blc|2AcBJ~1nn3k)HJ<8aHIC}+
zkJMQD^P%dZ`hglvwLy)ddQx>#J*LuFSq`ZYRNq#^sn)AuRJW?3R9CAZRF|qjRLj+N
zRDG%+)#)l7s%4aFrkbZ3sXn6`s6M6Ysb;Hmz?Ob0OZCZ@8_`KEidr-^7qu8_vDDgA
zi=)<oT0FG`Y8|O1QcI$ijE&gIRZ`to=*6>~uHyNsouf0bw6E|TM>s6X5mp+A9{dIi
z<4pa_XR17>TRxNC(iw5E@F>IQQ1`juy%t&xu1n_2^`ZJc1Ya8~_9PnK0FZ-1ui<q?
z2xZCBkQrio0cYn6DoX}JrrlPC3k!tlEExouPFoDFIc@e5P@WTqg3@4~1j#eRZPm^&
zJBCgYu5)Avns@m}5_C-ywitK=r`z^)3y6M}@FT+yrtXFTIbn#yjwQk+mJElja|H=g
zRKaN`M$D-YUMKuedY2cn9<jwkkxBG}x+J?B3o3;bEExegy~7pEUn;C&$w;W(79NjD
zuLu`dQ@$*_<#c(32XYwuTloG;VU9s>=5?jJ3MfDtoc=~I!@~8#YJT+g4Aq44Yr+|Z
zSE#Eo@SAEmj;A*XX)Gzgo@JIp46Jxv2!!umwOGJaZi$6Dm4rZIDT#%mVn&4T*AYL+
zTp&(`EvJMqEr??wFoLVZrFFt2mW+epbD25#(jH+JOUA?IMV5j1%p1ZcmP`OI3hgmr
zzi^o)h0s`SDZmK_1z^cUXnfU@2@iZA*`Vl6iyw|UEUactlX|<nuH1euFT@N8?ue;J
zg)=NuGzdypTOu&}q;S<hCgZ;1cEbpIKN8k5WC{cvA>ASKK)VC@+j)U!$yCT$XdDGa
zc}5NkFALQynFfJ_V>^KV5aSb2*;OxqGSWC2O;?1qM$XFVZb8gEYdX$~7iSZ2eWXvc
z&;dTXDMht#x&~N0)10nF)6Eyt=I5#c$Ax3$x5Ae!nSn!+#B~Hu`iZFwT>3%iNS=q{
zZc#SKJm^>nCG#B|w3EaeP}FGH4B1;8W*l}?*g(h&P@EYR3_TvvCt~Jp;XRhj#3AY8
z1_B4u9D1z#Rp`%<SxBxsCJ-zlVwIlE2KQinmge{(!DzF1m5>swy=cfIkR8DffWemy
zHVvdRLrNiQl;c7h&p<tY2Hs$CEtvzgpBsYVyIVpKG%R#<(-4YTDEh*Xq|NMH*tx@z
z3`)8<0M&4DHcM0_6P+dk0bfMS({PFj>Z8T(2Hua;-R!1in-;q{gnyAf{_=)A2Z17g
z#~_gUMFrr5L=hM=4~l~vE~vb0$c2)TjuNPI@FuAHB60}~_ZQb{!Rr7GWsW@>_J2v)
zUqiNz+yx!ivV`Yju@G5Bp!?6lR1JIpQrvZfEWk5%(ak{3oroyx|A3gP=i70*>n)5x
z8I7=Fr0B+<GDV){U!t@XNM<<u5y%{EcY$2vcoqE~7H<-=2zGuJAVI)BhvDupf(Z_L
zOx(bbN^EW?`jfvxx0+=w)|0eQE{5hHu?V`|5)R)TKslpbSpv<WVh)sSjB@>T5H)}1
zKxE5MtFSpjb4G`xz?oH%C$Z-cF;UM4ak{F$H1-}?qlkM=D|by+13BHlwZ-qjMP6|r
zF;%~uuLf|sMcQp?5JyLDT=u43_2+aqpf(~X{cc3^$-?@4k>v=$l~cwk(DZfaS$uS?
zxR0^Ck|Af%LL+;+jD(soAqq4E*#tP~AC?KT51WgyPoek*V_4ofLr#%XKprK0iOoe~
z5KCT#9T!6f!P^nGhj7hQF`p$XV8^GSvtVPP&=vPTC+_g)Lpa^q$rMh8nt5V{sdiDZ
zYU6ZkM$;xY6qJc+#x><ntHHFogEx&$!SiKe0>iJO@vA|uT)bl-YoU2sQZTGs6=8uF
zmKpuw(yw7Ad|;_~%s|%T*=lDpEzPeur_y!3&k=%k#^`7QO}3~+Z4zF?vpozFo&4LT
z538HSI80hAULa%x1a^)ZkCWDmOIflJi%*J22%gw1W-w$E1on)g6>OVGE7)dqzwbIt
zQ}Zil7qsjWZxgZwW}7<I!c10DL9y@_I9AAnLezC<2<Gh-pD>b8+<riOis9E$_uIjH
z$6v&nSi?}d!8{+`8D?)YH9>TD!!r=@p7;ZK9lS3(x8u&k;!`Zy0p2;zKG^T5xQ8Wm
z=zYn#hM;^~9M+OgJJCDeIfbBkyI9uJunW8u&LvoVPAp`Z-3bu$zD0x+M6zPf^WtHa
z?19=yE)NbarMuAh%i=36*$ZpB(z4rh$ihKGz1S7kH;OY&Bn)G|7C$BYHcI>ky0@8n
zkh_RYDED$rX-U&Jp?Ie2m-=RrWyxDmT;lo{WN$K<u<1WyFiZAfvFbWbs>ix&aN<wm
zGQ#Xn#hA;k3KsfpFcoT(aR7?TT}NAj2{f2NP<bsl7snInAp;4=9Y!gewIaRmVCVD{
zw<jY5GC$`!plp?Pm`MaQhDzi3cNce1?a(hws^j0GcfJP|n{0Mag4tN?87|R5A4V=x
zy2FxxAm`G4-$yP^qFHnlwx;-H!<L?YK{&dTwA08tINesQYRK3(P1?=yM`(X1;E-E#
zf)dLZAkWSiP|A=-8F?qC+o&BrWIUEBeMtCIOZuykSo@$fobbo#W2a$3hBO_Y?<GyK
zk|_KxTMA^!nfhF*zn+igbk*AGlyTk==~+U~)(@3zgm-be1w&ez9~&lJ)AO;M?v0`J
z{{$SKF9k5hj~DQ241HAFx00}Cw3J8qbJW#8kt@)~bsj!`R!Tx~g7lGrxtIo7znO!f
zDS%DJ!U8FiKx0LKA68D2rZD7^c2@zx2{WVu10Tof-qjq%!<`aondy_21J(AN?oE&8
z8>nv+o+_0*41a+-`xLV_uttJbpLB~MpTVJxVO=46u{5vhV0bo$l}X<+q!A8f+Z*s)
zx%7@7A5WL|RN7M<?0;2y(DbjeX=(>r#3uf~DH58zRu1~CkoNFbsDrCed%_R`!?*fL
z)mg?2ELkbdHIOf$-O~|6aQJ%ZHI{sd+$L$dkx$@s2Y&CT@_-b9MLQ$P87Qd?;~;N9
z#18G0`fqAqS1$_trGBq8#>jW%bXy`d$4DQT#PHYX<?B#8l8?psgVG!$pUmmjYmso_
zsiRUbG2K{hQt9@%D^zO(+Gc=&<5HpN`z4cAT1;Nk>TVovIW7$#e&5p0nnsNr-!WmT
zI{^ash6U4;i*%JG%`h`WI{-CEU|@bo1n)P-5GZ*;GJ(D-IS^CNON^E8M8l+~z1cDM
zs<f5m|3iDb1zG2#dV+90=HN#5n#7XZ$bGBL^pCKr+8TjTO;V<jh?sX<y2+R=Ki3AT
z0-efu+D$M_{#jbc-=w|#0*iM$$3r7HBekOV5`m<4vJWcPh*sPXDi5KX%+GpGTa3R#
z>3-)RRKn%ev@y^efbAmW8?;K@`ThEDP<zRl2Mu$b2~ZI!U&MS~Ud=F;J9y>e7+PTi
z%!aq|ib;-Thz^R|8y4KBzS)s_zrYg)iov<yen7(rVIgOD^iU0C9ZNXy_KKd5)ZsLi
z@K`+7WhEF8BbOV9468cI<9NgNp{j(|MEM7XC-jxcxU4iV8C}Nk8V1jZaw;Jv$eGUf
z$APlEjU{F*jS=GLX=Pa_x|-AEa}2RSX{~=>%+8Q^8|az0VX*%r*e6qdgC*^t=oS+O
z)@J{i5dBu*r#P**T)_~3@O~T+hK@(&uUIC)1>{RHtZH~vD0=$JXIV>N=hQB#sc9qW
z9tw-?o+Q}pV#imT!&hR@9QiOqf{@FV3r%`Ar~6S!gTNfmgV0zR)Caa75B#M%Prk#`
z_bqD(dY32r5e)RoHy9EM#lBA8;P?5mjU{1_HC}!PO47ndLs6lef!?t)Jr;*Uts#uo
z#V*NxwdP@XWP-fiVD@mjPsXL)p?^@^Y;fa_sd6^U+o%f%c;mx_-F3DB1RFcL!$^I-
zeWX^}t&!lJ$QIE3P+rU$Mx<*mtxoXfh0szM@7{q8C2|T&qN>jJYY*b-@b>t`HhDK|
zNcW`E8>1nxgw4l-c`|*OalsW^Kq_XG%O_Y811?GK0olpne%P;4rkh$U<jjwBLG~E?
zdOW&RR*fVDpI9aDVtD$BYVA-}Y8#FtYUEm$#6#&e`(xl*BE@Q0bem4VLyy~g63i@>
z4`}<JwPRIQ`}n&&^(;w*<}CXQ&@@AS6jpZgEJvkGUdNE6)=bIwFm-Cpv|qkq)Th!{
ztXI0>q3d#2#*|Mz#Zi-Br$;Zh3Le(1l}8eqmTf`ZKtV6yCk=8uOFV5MQ|^Jhph2d#
zhD>V>*{B6By*1=j`3ECO!~NIghZvrIDzJ9hU20SRoKtVhoIU`>p`OFI#^^apu=1un
zg^;e074JR`bUG_g`B8J*tu0>nd+=If*rPRG&(?S?^P1Tj&+49LAf2&?&HWrPKX}rq
zrnil!_BrGsaDOkK*j-}t{Q+KGZ(pWOYcDudCU1i5{r=HVIbS~Z`v`!JV7+#^Hyl!>
zKJ-{Emq2E``;3;HBU<v|VF>W|G=XqBJWfl{uUZ-(ftZ)&7)a{s`55Fn8KCCf@KJax
z(QReOqYxNO-vAn3WX+KMjb9wlv^@oN=NJzvf}2L?F<3l|ovP*T5P~1L-EM|F4mmH{
zr$fzhc>>T3&V@ze?KaF@Msv76!%ffEeg7s;p13DZo@|@Y{n}1O_WdU#r}bn!b$2q1
z_;{}SO_ua;JsE@CG*>eI$dx`ceoy}m-@tqL2DRlI+?H?1{rR40%{TNe-~Wriu)p$k
zw(tWem-07U-g~%4wB;JvmMj1MT%%fZjlPF#OlvM}jp4pBcQ1y|qjcl`hHm^lbQ9Xr
z6}F|Dcz?P{t?7zd)3sE9;?{JV+%#%qDc97$E$P$lE$P$mDe2GNzob9cx}?u&&Gme1
zu9l_$LTj$u?k1zYo3`9De=nbw{Lb2!&MDMh#GUKI{y~tI=Kuz>H!$=>r?bumvP8<#
zN_;GXW6YkF^rHt{IT9XSJ>C8!eAdO&MO)xN@U1kDn?T)swg=Std-}7b?nKD>r#|-g
zy$BjM+l`P}W~WDWoplbBo(NBX>^eCYXWKj~OXfmOC-*0KDbo{8KQ`*DD(1-ULW1La
zdlt3S3E$meBw!zx=Rp(cjunZXVuqhZZ=YA?4mo#s&)iI3HR-+tcjn6vYn_!r))Axa
zk4oF<_OxfneB4<g*SAnV#*hWjd_BV1hLj$}b=GpIogq&J3V8t2x_eGDWFd;>@&~LI
zXYE^!wF1RPc`Lyky*;@M{b&(5BOpTCKwB^m5M&<ra0Y!38uJx#K)0+_C?|PNQo;iU
NeN~;URO{pA{{eI+6WRa(


From ae589b69db0ac266f09b9e60be2eaee5e3c8e601 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Fri, 30 Sep 2022 23:02:11 +0000
Subject: [PATCH 196/428] Tweaks to the Worker1 and Promiser APIs prompted by
 documenting them.

FossilOrigin-Name: c68b9aa160e2c1197ae7eb06a634017ac2b281393074afa4582762d5458c6889
---
 ext/wasm/api/sqlite3-api-worker1.js  | 18 ++++--------------
 ext/wasm/sqlite3-worker1-promiser.js | 17 +++++++++++++----
 ext/wasm/testing-worker1-promiser.js |  7 +------
 manifest                             | 16 ++++++++--------
 manifest.uuid                        |  2 +-
 5 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-worker1.js b/ext/wasm/api/sqlite3-api-worker1.js
index 5f1e310ba4..c3b1fb59db 100644
--- a/ext/wasm/api/sqlite3-api-worker1.js
+++ b/ext/wasm/api/sqlite3-api-worker1.js
@@ -159,7 +159,7 @@
       bigIntEnabled: bool. True if BigInt support is enabled.
 
       wasmfsOpfsDir: path prefix, if any, _intended_ for use with
-      OPFS persistent storage.
+      WASMFS OPFS persistent storage.
 
       wasmfsOpfsEnabled: true if persistent storage is enabled in the
       current environment. Only files stored under wasmfsOpfsDir
@@ -188,15 +188,6 @@
       See the sqlite3.oo1.DB constructor for peculiarities and
       transformations,
 
-      persistent [=false]: if true and filename is not one of ("",
-      ":memory:"), prepend sqlite3.capi.sqlite3_wasmfs_opfs_dir()
-      to the given filename so that it is stored in persistent storage
-      _if_ the environment supports it.  If persistent storage is not
-      supported, the filename is used as-is.
-
-      // TODO?: ^^^^ maybe rework that, now that we have the non-WASMFS
-      // OFPS.
-
     }
   }
   ```
@@ -218,8 +209,7 @@
       Only the `open` operation includes it in the `result` property.
 
       persistent: true if the given filename resides in the
-      known-persistent storage, else false. This determination is
-      independent of the `persistent` input argument.
+      known-persistent storage, else false.
 
    }
   }
@@ -239,7 +229,7 @@
 
       unlink: if truthy, the associated db will be unlinked (removed)
       from the virtual filesystems. Failure to unlink is silently
-      ignored.
+      ignored. Does not currently work for all storage backends.
 
     }
   }
@@ -324,7 +314,7 @@
     layer won't emit a result value of `undefined`.)
 
   The callback proxy must not recurse into this interface. An exec()
-  call will type up the Worker thread, causing any recursion attempt
+  call will tie up the Worker thread, causing any recursion attempt
   to wait until the first exec() is completed.
 
   The response is the input options object (or a synthesized one if
diff --git a/ext/wasm/sqlite3-worker1-promiser.js b/ext/wasm/sqlite3-worker1-promiser.js
index c683e2fb7b..0b611e0c98 100644
--- a/ext/wasm/sqlite3-worker1-promiser.js
+++ b/ext/wasm/sqlite3-worker1-promiser.js
@@ -32,10 +32,10 @@
    It requires a configuration object with the following properties:
 
    - `worker` (required): a Worker instance which loads
-   `sqlite3-worker1.js` or a functional equivalent. Note that this
-   function replaces the worker.onmessage property. This property
-   may alternately be a function, in which case this function
-   re-assigns this property with the result of calling that
+   `sqlite3-worker1.js` or a functional equivalent. Note that the
+   promiser factory replaces the worker.onmessage property. This
+   config option may alternately be a function, in which case this
+   function re-assigns this property with the result of calling that
    function, enabling delayed instantiation of a Worker.
 
    - `onready` (optional, but...): this callback is called with no
@@ -147,6 +147,14 @@
 */
 self.sqlite3Worker1Promiser = function callee(config = callee.defaultConfig){
   // Inspired by: https://stackoverflow.com/a/52439530
+  if(1===arguments.length && 'function'===typeof arguments[0]){
+    const f = config;
+    config = Object.assign(Object.create(null), callee.defaultConfig);
+    config.onready = f;
+  }
+  /* Maintenance reminder: when passed a config object, the reference
+     must be used as-is, instead of normalizing it to another object,
+     so that we can communicate the dbId through it. */
   const handlerMap = Object.create(null);
   const noop = function(){};
   const err = config.onerror || noop;
@@ -156,6 +164,7 @@ self.sqlite3Worker1Promiser = function callee(config = callee.defaultConfig){
     return msg.type+'#'+(idTypeMap[msg.type] = (idTypeMap[msg.type]||0) + 1);
   };
   const toss = (...args)=>{throw new Error(args.join(' '))};
+  if(!config.worker) config.worker = callee.defaultConfig.worker;
   if('function'===typeof config.worker) config.worker = config.worker();
   config.worker.onmessage = function(ev){
     ev = ev.data;
diff --git a/ext/wasm/testing-worker1-promiser.js b/ext/wasm/testing-worker1-promiser.js
index afec417f09..9ae16fd6a8 100644
--- a/ext/wasm/testing-worker1-promiser.js
+++ b/ext/wasm/testing-worker1-promiser.js
@@ -86,16 +86,11 @@
     
     await wtest('open', {
       filename: dbFilename,
-      persistent: sqConfig.wasmfsOpfsEnabled,
       simulateError: 0 /* if true, fail the 'open' */,
     }, function(ev){
       const r = ev.result;
       log("then open result",r);
-      T.assert(r.persistent === sqConfig.wasmfsOpfsEnabled)
-        .assert(r.persistent
-               ? (dbFilename!==r.filename)
-               : (dbFilename==r.filename))
-        .assert(ev.dbId === r.dbId)
+      T.assert(ev.dbId === r.dbId)
         .assert(ev.messageId)
         .assert(promiserConfig.dbId === ev.dbId);
     }).then(runTests2);
diff --git a/manifest b/manifest
index 6f4fcd270a..ec71e0e2fe 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sJS\swrapper\sfor\ssqlite3_exec()\swhich\sknows\show\sto\shandle\sa\sJS\scallback.\sAdd\ssome\sconsole.error()\sreporting\sof\smodule-load\sfailures,\sas\sthey\sotherwise\soften\sget\ssilently\sswallowed\sup\sby\sthe\sloader's\smechanisms.\sAdd\s'flexible-string'\sJS-to-WASM\sargument\sconverter\swhich\sperforms\smore\sX-to-string\sconversions\sthan\sthe\s'string'\sarg\sconverter\sdoes.
-D 2022-09-30T20:35:37.991
+C Tweaks\sto\sthe\sWorker1\sand\sPromiser\sAPIs\sprompted\sby\sdocumenting\sthem.
+D 2022-09-30T23:02:11.824
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -489,7 +489,7 @@ F ext/wasm/api/sqlite3-api-glue.js ead29e6008ba148e7c67ad2bd928819dc72313ad2dcd3
 F ext/wasm/api/sqlite3-api-oo1.js 9caed0757a5e039ed92467e827fd3ca347fa08f19fe086fcbdd14a4ebe9c2f01
 F ext/wasm/api/sqlite3-api-opfs.js 1b097808b7b081b0f0700cf97d49ef19760e401706168edff9cd45cf9169f541
 F ext/wasm/api/sqlite3-api-prologue.js cac3bc095171dca4aaf3611e0dd60a850c8e9fbeeeba8f21792ed1948d24dacc
-F ext/wasm/api/sqlite3-api-worker1.js 2e8a037a76d20c7653e5a392d9830f17a22ce6736ffd0597aa39b69d1c01ad2c
+F ext/wasm/api/sqlite3-api-worker1.js 5fb9d178be5215107fc97eb67b9364d0ade3d4a90194b07a630afe6103c83408
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 336389b23c9b83763177499e49a0967949c392b2f7d84fbbb52ad6678e159f18
 F ext/wasm/batch-runner.html c363032aba7a525920f61f8be112a29459f73f07e46f0ba3b7730081a617826e
@@ -523,12 +523,12 @@ F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f129
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
 F ext/wasm/sqlite3-opfs-async-proxy.js 7367733ce409c8106b6c49e8ef2b55440e9974a64f39e0c97f5e3a4587d1fc2a
-F ext/wasm/sqlite3-worker1-promiser.js cca2b853692e4715b4761c46678f96d80819d4756de557922a815149fb93397e
+F ext/wasm/sqlite3-worker1-promiser.js 4769b7a0a3d5fa1594ca555e8a3050c17f000fdebdabbc77c31a339ec914c405
 F ext/wasm/sqlite3-worker1.js 5266ebc4d709fe23d2d076ae44e6085fbc32b82f26ef514b947312f36b1206a9
 F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
 F ext/wasm/test-opfs-vfs.js a59ff9210b17d46b0c6fbf6a0ba60143c033327865f2e556e14f06280cef62ac
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
-F ext/wasm/testing-worker1-promiser.js ee1ac4950720c07541e791b7f35bdf420e8ab81a74049cc65394371b0c53c480
+F ext/wasm/testing-worker1-promiser.js 4de504b3c79564f0b3975c5e652b4bc16e37d2cc2e29b3a06233a17df5ad8eed
 F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d7669fb17fcae
 F ext/wasm/testing1.js 5584e9b68f797dbc0f6161360f2c6840169533813d92c74d355a3e78dd5bb539
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
@@ -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 711f458d188a0dbe6612069c856ade29323ab426dfa4f80e7b82757ccc474cb8
-R 84d8e08f60a70faceba1089503bc1c19
+P 96818aa83f4ccc574f558231249ecbdd39763b4351cf4cf6d33f53774a3ee5e6
+R 572b0ac83bec64a69d8e85421a244ded
 U stephan
-Z f9cd8bd536b2dd8409558133f7a063eb
+Z 43e7dcdb92d55bec08378952a610d517
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 255400f97e..a616962c42 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-96818aa83f4ccc574f558231249ecbdd39763b4351cf4cf6d33f53774a3ee5e6
\ No newline at end of file
+c68b9aa160e2c1197ae7eb06a634017ac2b281393074afa4582762d5458c6889
\ No newline at end of file

From 8c1a4b89af13be96c7416f9d2357b1b188580e82 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Fri, 30 Sep 2022 23:49:43 +0000
Subject: [PATCH 197/428] Remove a couple of weird quirks of the Worker1 and
 Promiser APIs. The Worker1 (now undocumented) unlink capability needs to be
 reevaluated to work equivalently for all storage backends.

FossilOrigin-Name: 9f2b331a32cbaadfd20d04c9908171355322c1aa1d9d6df3628f3b2fb4391ec1
---
 ext/wasm/api/sqlite3-api-worker1.js  | 10 ++----
 ext/wasm/sqlite3-worker1-promiser.js | 46 +++++++---------------------
 ext/wasm/testing-worker1-promiser.js |  8 ++---
 manifest                             | 16 +++++-----
 manifest.uuid                        |  2 +-
 5 files changed, 26 insertions(+), 56 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-worker1.js b/ext/wasm/api/sqlite3-api-worker1.js
index c3b1fb59db..69bb8ced61 100644
--- a/ext/wasm/api/sqlite3-api-worker1.js
+++ b/ext/wasm/api/sqlite3-api-worker1.js
@@ -225,13 +225,7 @@
     type: "close",
     messageId: ...as above...
     dbId: ...as above...
-    args: OPTIONAL: {
-
-      unlink: if truthy, the associated db will be unlinked (removed)
-      from the virtual filesystems. Failure to unlink is silently
-      ignored. Does not currently work for all storage backends.
-
-    }
+    args: none
   }
   ```
 
@@ -460,6 +454,8 @@ sqlite3.initWorker1API = function(){
         filename: db && db.filename
       };
       if(db){
+        // Keep the "unlink" flag undocumented until we figure out how
+        // to apply it consistently, independent of the db storage.
         wState.close(db, ((ev.args && 'object'===typeof ev.args)
                           ? !!ev.args.unlink : false));
       }
diff --git a/ext/wasm/sqlite3-worker1-promiser.js b/ext/wasm/sqlite3-worker1-promiser.js
index 0b611e0c98..5705698b83 100644
--- a/ext/wasm/sqlite3-worker1-promiser.js
+++ b/ext/wasm/sqlite3-worker1-promiser.js
@@ -45,11 +45,6 @@
    the simplest way to tell the worker to kick off work at the
    earliest opportunity.
 
-   - `onerror` (optional): a callback to pass error-type events from
-   the worker. The object passed to it will be the error message
-   payload from the worker. This is _not_ the same as the
-   worker.onerror property!
-
    - `onunhandled` (optional): a callback which gets passed the
    message event object for any worker.onmessage() events which
    are not handled by this proxy. Ideally that "should" never
@@ -62,21 +57,6 @@
    so that dispatching can work. If not defined, a default generator
    is used (which should be sufficient for most or all cases).
 
-   - `dbId` (optional): is the database ID to be used by the
-   worker. This must initially be unset or a falsy value. The
-   first `open` message sent to the worker will cause this config
-   entry to be assigned to the ID of the opened database. That ID
-   "should" be set as the `dbId` property of the messages sent in
-   future requests, so that the worker uses that database.
-   However, if the worker is not given an explicit dbId, it will
-   use the first-opened database by default. If client code needs
-   to work with multiple database IDs, the client-level code will
-   need to juggle those themselves. A `close` message will clear
-   this property if it matches the ID of the closed db. Potential
-   TODO: add a config callback specifically for reporting `open`
-   and `close` message results, so that clients may track those
-   values.
-
    - `debug` (optional): a console.debug()-style function for logging
    information about messages.
 
@@ -110,14 +90,9 @@
    const sq3Promiser = sqlite3Worker1Promiser(config);
    sq3Promiser('open', {filename:"/foo.db"}).then(function(msg){
      console.log("open response",msg); // => {type:'open', result: {filename:'/foo.db'}, ...}
-     // Recall that config.dbId will be set for the first 'open'
-     // call and cleared for a matching 'close' call.
    });
    sq3Promiser({type:'close'}).then((msg)=>{
      console.log("close response",msg); // => {type:'close', result: {filename:'/foo.db'}, ...}
-     // Recall that config.dbId will be used by default for the message's dbId if
-     // none is explicitly provided, and a 'close' op will clear config.dbId if it
-     // closes that exact db.
    });
    ```
 
@@ -151,13 +126,14 @@ self.sqlite3Worker1Promiser = function callee(config = callee.defaultConfig){
     const f = config;
     config = Object.assign(Object.create(null), callee.defaultConfig);
     config.onready = f;
+  }else{
+    config = Object.assign(Object.create(null), callee.defaultConfig, config);
   }
-  /* Maintenance reminder: when passed a config object, the reference
-     must be used as-is, instead of normalizing it to another object,
-     so that we can communicate the dbId through it. */
   const handlerMap = Object.create(null);
   const noop = function(){};
-  const err = config.onerror || noop;
+  const err = config.onerror
+        || noop /* config.onerror is intentionally undocumented
+                   pending finding a less ambiguous name */;
   const debug = config.debug || noop;
   const idTypeMap = config.generateMessageId ? undefined : Object.create(null);
   const genMsgId = config.generateMessageId || function(msg){
@@ -166,6 +142,7 @@ self.sqlite3Worker1Promiser = function callee(config = callee.defaultConfig){
   const toss = (...args)=>{throw new Error(args.join(' '))};
   if(!config.worker) config.worker = callee.defaultConfig.worker;
   if('function'===typeof config.worker) config.worker = config.worker();
+  let dbId;
   config.worker.onmessage = function(ev){
     ev = ev.data;
     debug('worker1.onmessage',ev);
@@ -191,10 +168,10 @@ self.sqlite3Worker1Promiser = function callee(config = callee.defaultConfig){
           msgHandler.reject(ev);
           return;
         case 'open':
-          if(!config.dbId) config.dbId = ev.dbId;
+          if(!dbId) dbId = ev.dbId;
           break;
         case 'close':
-          if(config.dbId === ev.dbId) config.dbId = undefined;
+          if(ev.dbId===dbId) dbId = undefined;
           break;
         default:
           break;
@@ -214,7 +191,7 @@ self.sqlite3Worker1Promiser = function callee(config = callee.defaultConfig){
     }else{
       toss("Invalid arugments for sqlite3Worker1Promiser()-created factory.");
     }
-    if(!msg.dbId) msg.dbId = config.dbId;
+    if(!msg.dbId) msg.dbId = dbId;
     msg.messageId = genMsgId(msg);
     msg.departureTime = performance.now();
     const proxy = Object.create(null);
@@ -249,7 +226,7 @@ self.sqlite3Worker1Promiser = function callee(config = callee.defaultConfig){
       proxy.resolve = resolve;
       proxy.reject = reject;
       handlerMap[msg.messageId] = proxy;
-      debug("Posting",msg.type,"message to Worker dbId="+(config.dbId||'default')+':',msg);
+      debug("Posting",msg.type,"message to Worker dbId="+(dbId||'default')+':',msg);
       config.worker.postMessage(msg);
     });
     if(rowCallbackId) p = p.finally(()=>delete handlerMap[rowCallbackId]);
@@ -261,6 +238,5 @@ self.sqlite3Worker1Promiser.defaultConfig = {
     //const p = self.location.pathname.replace(/[^/]*$/, "sqlite3-worker1.js");
     return new Worker("sqlite3-worker1.js");
   },
-  onerror: (...args)=>console.error('worker1 error',...args),
-  dbId: undefined
+  onerror: (...args)=>console.error('worker1 promiser error',...args)
 };
diff --git a/ext/wasm/testing-worker1-promiser.js b/ext/wasm/testing-worker1-promiser.js
index 9ae16fd6a8..259d20fddc 100644
--- a/ext/wasm/testing-worker1-promiser.js
+++ b/ext/wasm/testing-worker1-promiser.js
@@ -91,8 +91,8 @@
       const r = ev.result;
       log("then open result",r);
       T.assert(ev.dbId === r.dbId)
-        .assert(ev.messageId)
-        .assert(promiserConfig.dbId === ev.dbId);
+        .assert(ev.messageId);
+      promiserConfig.dbId = ev.dbId;
     }).then(runTests2);
   };
 
@@ -248,8 +248,7 @@
     });
 
     /***** close() tests must come last. *****/
-    await wtest('close',{unlink:true},function(ev){
-      T.assert(!promiserConfig.dbId);
+    await wtest('close',{},function(ev){
       T.assert('string' === typeof ev.result.filename);
     });
 
@@ -258,6 +257,5 @@
     }).finally(()=>logHtml('',"That's all, folks!"));
   }/*runTests2()*/;
 
-  
   log("Init complete, but async init bits may still be running.");
 })();
diff --git a/manifest b/manifest
index ec71e0e2fe..0791fffc9f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Tweaks\sto\sthe\sWorker1\sand\sPromiser\sAPIs\sprompted\sby\sdocumenting\sthem.
-D 2022-09-30T23:02:11.824
+C Remove\sa\scouple\sof\sweird\squirks\sof\sthe\sWorker1\sand\sPromiser\sAPIs.\sThe\sWorker1\s(now\sundocumented)\sunlink\scapability\sneeds\sto\sbe\sreevaluated\sto\swork\sequivalently\sfor\sall\sstorage\sbackends.
+D 2022-09-30T23:49:43.818
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -489,7 +489,7 @@ F ext/wasm/api/sqlite3-api-glue.js ead29e6008ba148e7c67ad2bd928819dc72313ad2dcd3
 F ext/wasm/api/sqlite3-api-oo1.js 9caed0757a5e039ed92467e827fd3ca347fa08f19fe086fcbdd14a4ebe9c2f01
 F ext/wasm/api/sqlite3-api-opfs.js 1b097808b7b081b0f0700cf97d49ef19760e401706168edff9cd45cf9169f541
 F ext/wasm/api/sqlite3-api-prologue.js cac3bc095171dca4aaf3611e0dd60a850c8e9fbeeeba8f21792ed1948d24dacc
-F ext/wasm/api/sqlite3-api-worker1.js 5fb9d178be5215107fc97eb67b9364d0ade3d4a90194b07a630afe6103c83408
+F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 336389b23c9b83763177499e49a0967949c392b2f7d84fbbb52ad6678e159f18
 F ext/wasm/batch-runner.html c363032aba7a525920f61f8be112a29459f73f07e46f0ba3b7730081a617826e
@@ -523,12 +523,12 @@ F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f129
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
 F ext/wasm/sqlite3-opfs-async-proxy.js 7367733ce409c8106b6c49e8ef2b55440e9974a64f39e0c97f5e3a4587d1fc2a
-F ext/wasm/sqlite3-worker1-promiser.js 4769b7a0a3d5fa1594ca555e8a3050c17f000fdebdabbc77c31a339ec914c405
+F ext/wasm/sqlite3-worker1-promiser.js 8f5aca965f2b3e8096347d3db02f4502774c4390b1b62f11ae0f4869787feeac
 F ext/wasm/sqlite3-worker1.js 5266ebc4d709fe23d2d076ae44e6085fbc32b82f26ef514b947312f36b1206a9
 F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
 F ext/wasm/test-opfs-vfs.js a59ff9210b17d46b0c6fbf6a0ba60143c033327865f2e556e14f06280cef62ac
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
-F ext/wasm/testing-worker1-promiser.js 4de504b3c79564f0b3975c5e652b4bc16e37d2cc2e29b3a06233a17df5ad8eed
+F ext/wasm/testing-worker1-promiser.js bd788e33c1807e0a6dda9c9a9d784bd3350ca49c9dd8ae2cc8719b506b6e013e
 F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d7669fb17fcae
 F ext/wasm/testing1.js 5584e9b68f797dbc0f6161360f2c6840169533813d92c74d355a3e78dd5bb539
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
@@ -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 96818aa83f4ccc574f558231249ecbdd39763b4351cf4cf6d33f53774a3ee5e6
-R 572b0ac83bec64a69d8e85421a244ded
+P c68b9aa160e2c1197ae7eb06a634017ac2b281393074afa4582762d5458c6889
+R 049b4866f034ceed644fe53d6e8f46f9
 U stephan
-Z 43e7dcdb92d55bec08378952a610d517
+Z f5dc0abfcbfb5f7170f7523cda76f56b
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index a616962c42..f6edc810d1 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c68b9aa160e2c1197ae7eb06a634017ac2b281393074afa4582762d5458c6889
\ No newline at end of file
+9f2b331a32cbaadfd20d04c9908171355322c1aa1d9d6df3628f3b2fb4391ec1
\ No newline at end of file

From 6167d5cf17876c7b6cd6b6b0ab789b82d33b41bc Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sat, 1 Oct 2022 12:04:49 +0000
Subject: [PATCH 198/428] Note two wasm-related potential TODOs.

FossilOrigin-Name: 5636e82864457d870754ee7125c307dc5d2195197a5c0266579da9f102938b89
---
 ext/wasm/api/sqlite3-api-prologue.js | 12 ++++++++++--
 ext/wasm/sqlite3-worker1-promiser.js | 10 +++++-----
 manifest                             | 14 +++++++-------
 manifest.uuid                        |  2 +-
 4 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index b738485cb8..a6e055ff40 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -611,13 +611,21 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
   */
   capi.wasm.bindingSignatures = [
     // Please keep these sorted by function name!
-    ["sqlite3_bind_blob","int", "sqlite3_stmt*", "int", "*", "int", "*"],
+    ["sqlite3_bind_blob","int", "sqlite3_stmt*", "int", "*", "int", "*"
+     /* We should arguably write a custom wrapper which knows how
+        to handle Blob, TypedArrays, and JS strings. */
+    ],
     ["sqlite3_bind_double","int", "sqlite3_stmt*", "int", "f64"],
     ["sqlite3_bind_int","int", "sqlite3_stmt*", "int", "int"],
     ["sqlite3_bind_null",undefined, "sqlite3_stmt*", "int"],
     ["sqlite3_bind_parameter_count", "int", "sqlite3_stmt*"],
     ["sqlite3_bind_parameter_index","int", "sqlite3_stmt*", "string"],
-    ["sqlite3_bind_text","int", "sqlite3_stmt*", "int", "string", "int", "int"],
+    ["sqlite3_bind_text","int", "sqlite3_stmt*", "int", "string", "int", "int"
+     /* We should arguably create a hand-written binding
+        which does more flexible text conversion, along the lines of
+        sqlite3_prepare_v3(). The slightly problematic part is the
+        final argument (text destructor). */
+    ],
     ["sqlite3_close_v2", "int", "sqlite3*"],
     ["sqlite3_changes", "int", "sqlite3*"],
     ["sqlite3_clear_bindings","int", "sqlite3_stmt*"],
diff --git a/ext/wasm/sqlite3-worker1-promiser.js b/ext/wasm/sqlite3-worker1-promiser.js
index 5705698b83..46abc642bf 100644
--- a/ext/wasm/sqlite3-worker1-promiser.js
+++ b/ext/wasm/sqlite3-worker1-promiser.js
@@ -104,7 +104,10 @@
    the callback is called one time for each row of the result set,
    passed the same worker message format as the worker API emits:
 
-     {type:typeString, row:VALUE, rowNumber:1-based-#}
+     {type:typeString,
+      row:VALUE,
+      rowNumber:1-based-#,
+      columnNames: array}
 
    Where `typeString` is an internally-synthesized message type string
    used temporarily for worker message dispatching. It can be ignored
@@ -234,9 +237,6 @@ self.sqlite3Worker1Promiser = function callee(config = callee.defaultConfig){
   };
 }/*sqlite3Worker1Promiser()*/;
 self.sqlite3Worker1Promiser.defaultConfig = {
-  worker: ()=>{
-    //const p = self.location.pathname.replace(/[^/]*$/, "sqlite3-worker1.js");
-    return new Worker("sqlite3-worker1.js");
-  },
+  worker: ()=>new Worker("sqlite3-worker1.js"),
   onerror: (...args)=>console.error('worker1 promiser error',...args)
 };
diff --git a/manifest b/manifest
index 0791fffc9f..e7b7ef95cf 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sa\scouple\sof\sweird\squirks\sof\sthe\sWorker1\sand\sPromiser\sAPIs.\sThe\sWorker1\s(now\sundocumented)\sunlink\scapability\sneeds\sto\sbe\sreevaluated\sto\swork\sequivalently\sfor\sall\sstorage\sbackends.
-D 2022-09-30T23:49:43.818
+C Note\stwo\swasm-related\spotential\sTODOs.
+D 2022-10-01T12:04:49.570
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -488,7 +488,7 @@ F ext/wasm/api/sqlite3-api-cleanup.js 5d22d1d3818ecacb23bfa223d5970cd0617d8cdbb4
 F ext/wasm/api/sqlite3-api-glue.js ead29e6008ba148e7c67ad2bd928819dc72313ad2dcd34510cc61e089ee01c4e
 F ext/wasm/api/sqlite3-api-oo1.js 9caed0757a5e039ed92467e827fd3ca347fa08f19fe086fcbdd14a4ebe9c2f01
 F ext/wasm/api/sqlite3-api-opfs.js 1b097808b7b081b0f0700cf97d49ef19760e401706168edff9cd45cf9169f541
-F ext/wasm/api/sqlite3-api-prologue.js cac3bc095171dca4aaf3611e0dd60a850c8e9fbeeeba8f21792ed1948d24dacc
+F ext/wasm/api/sqlite3-api-prologue.js 04e0c929deeb28c9a2509d8004dfe3214992b988d277c4f50afa84953689c23c
 F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 336389b23c9b83763177499e49a0967949c392b2f7d84fbbb52ad6678e159f18
@@ -523,7 +523,7 @@ F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f129
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
 F ext/wasm/sqlite3-opfs-async-proxy.js 7367733ce409c8106b6c49e8ef2b55440e9974a64f39e0c97f5e3a4587d1fc2a
-F ext/wasm/sqlite3-worker1-promiser.js 8f5aca965f2b3e8096347d3db02f4502774c4390b1b62f11ae0f4869787feeac
+F ext/wasm/sqlite3-worker1-promiser.js c88d712805d0fe99b4d5171ebf665f281c4a4a915ba20e283456cf1919aa9508
 F ext/wasm/sqlite3-worker1.js 5266ebc4d709fe23d2d076ae44e6085fbc32b82f26ef514b947312f36b1206a9
 F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
 F ext/wasm/test-opfs-vfs.js a59ff9210b17d46b0c6fbf6a0ba60143c033327865f2e556e14f06280cef62ac
@@ -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 c68b9aa160e2c1197ae7eb06a634017ac2b281393074afa4582762d5458c6889
-R 049b4866f034ceed644fe53d6e8f46f9
+P 9f2b331a32cbaadfd20d04c9908171355322c1aa1d9d6df3628f3b2fb4391ec1
+R e1a4db7681d0b6f0e817818894cccc93
 U stephan
-Z f5dc0abfcbfb5f7170f7523cda76f56b
+Z f54e8c9426807c11ccd8ec22ac465fb2
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f6edc810d1..8c2a11e06b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9f2b331a32cbaadfd20d04c9908171355322c1aa1d9d6df3628f3b2fb4391ec1
\ No newline at end of file
+5636e82864457d870754ee7125c307dc5d2195197a5c0266579da9f102938b89
\ No newline at end of file

From 7424aeff41362573938ff595e4eec5cdb126d29b Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sat, 1 Oct 2022 13:17:53 +0000
Subject: [PATCH 199/428] Replace the Parse.disableVtab field with
 Parse.prepFlags for increased generality, a small size reduction, and a small
 performance increase.

FossilOrigin-Name: b7da0bcdf70e53ab1ec00a0694e17c7429e23bc6eb3f39b622d06a930aa2f6a3
---
 manifest        | 18 +++++++++---------
 manifest.uuid   |  2 +-
 src/build.c     |  4 ++--
 src/prepare.c   |  2 +-
 src/sqliteInt.h |  2 +-
 src/trigger.c   |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/manifest b/manifest
index 29aa8d8ae2..1bac28833e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sone\sof\sthe\sNEVER()\smacros\sadded\sby\s[5166acf3f0040459]\sbecause\sit\nis\sreachable\safter\sall.
-D 2022-09-30T22:40:57.814
+C Replace\sthe\sParse.disableVtab\sfield\swith\sParse.prepFlags\sfor\sincreased\ngenerality,\sa\ssmall\ssize\sreduction,\sand\sa\ssmall\sperformance\sincrease.
+D 2022-10-01T13:17:53.450
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -531,7 +531,7 @@ F src/btmutex.c 6ffb0a22c19e2f9110be0964d0731d2ef1c67b5f7fabfbaeb7b9dabc4b7740ca
 F src/btree.c ef9c126d6dc5dff8ff76abc807dfef5b8aac42144e3be11cbcd9cb6eaecef580
 F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
 F src/btreeInt.h 8ce1332edd89dfd2461d561ac10a0ab5601c8e06200cb5230596c3caaf54482e
-F src/build.c 898884afd67d953808cb687babc15b66a10213f99fe2ce7db98960e959881f98
+F src/build.c 6e3ee380a4f0ff95de4b53bf510f66600cff08e4e04b92e95fae789072563f8f
 F src/callback.c 4cd7225b26a97f7de5fee5ae10464bed5a78f2adefe19534cc2095b3a8ca484a
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c 93e4b5f4faf6d3f688988a116773259a4fbfb4ddac0e9bf9d0ae0429390c2543
@@ -583,7 +583,7 @@ F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
 F src/pcache1.c dee95e3cd2b61e6512dc814c5ab76d5eb36f0bfc9441dbb4260fccc0d12bbddc
 F src/pragma.c 9bf7d8a2a9ad3bc36df3ec0d61817a44c38a1da527d59c26c203047f906e334a
 F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
-F src/prepare.c 971d5819a4bda88038c2283d71fc0a2974ffc3dd480f9bd941341017abacfd1b
+F src/prepare.c 0e61df99f063f12896a89c893fd3f8868e9fb13252c05e3e4e8cea7422094d0a
 F src/printf.c e99ee9741e79ae3873458146f59644276657340385ade4e76a5f5d1c25793764
 F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
@@ -593,7 +593,7 @@ F src/shell.c.in e7e7c2c69ae86c5ee9e8ad66227203d46ff6dce8700a1b1dababff01c71d33d
 F src/sqlite.h.in b9b7fd73239d94db20332bb6e504688001e5564b655e1318a4427a1caef4b99e
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d
-F src/sqliteInt.h 94e7fc2a5f0fa5d1f0af84513fd2d1c70a9f6e772556b9dfef16feee63291eae
+F src/sqliteInt.h 7571703e6d11cd0e0283be68e9b6baceefedf10e3bbac5869d12183e031c5254
 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -654,7 +654,7 @@ F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
 F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
 F src/tokenize.c 1305797eab3542a0896b552c6e7669c972c1468e11e92b370533c1f37a37082b
 F src/treeview.c 07787f67cd297a6d09d04b8d70c06769c60c9c1d9080378f93929c16f8fd3298
-F src/trigger.c bc70c58e713dcfb6cabe5cc0bed71aedb02c3e9e128c6089a78aca945ba4d720
+F src/trigger.c 4163ada044af89d51caba1cb713a73165347b2ec05fe84a283737c134d61fcd5
 F src/update.c c52a7991bece0453d22c77c08469512ee2f1391c12503fd347d1c939220c5877
 F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
@@ -2000,8 +2000,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 aa367a3c974041323edb759855f0b83803439ceef2846da2d73eadd80efeaac4
-R a1d3c0131d04144023f8eda3431f858a
+P bd8ae5febbb8d3122f1e2e09b9fcdd6ac20c075ae1cf60bcdbd36080f3736417
+R b431f195d6909dd213769258d329fb1f
 U drh
-Z 6c2a7fe31c25c65cdf8db45166d1307a
+Z 5ff8e8c9111016b6f28cef573224105e
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 522f0d3435..ceab8edde4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bd8ae5febbb8d3122f1e2e09b9fcdd6ac20c075ae1cf60bcdbd36080f3736417
\ No newline at end of file
+b7da0bcdf70e53ab1ec00a0694e17c7429e23bc6eb3f39b622d06a930aa2f6a3
\ No newline at end of file
diff --git a/src/build.c b/src/build.c
index 094cf7d61b..be6b01eb08 100644
--- a/src/build.c
+++ b/src/build.c
@@ -453,7 +453,7 @@ Table *sqlite3LocateTable(
     /* If zName is the not the name of a table in the schema created using
     ** CREATE, then check to see if it is the name of an virtual table that
     ** can be an eponymous virtual table. */
-    if( pParse->disableVtab==0 && db->init.busy==0 ){
+    if( (pParse->prepFlags & SQLITE_PREPARE_NO_VTAB)==0 && db->init.busy==0 ){
       Module *pMod = (Module*)sqlite3HashFind(&db->aModule, zName);
       if( pMod==0 && sqlite3_strnicmp(zName, "pragma_", 7)==0 ){
         pMod = sqlite3PragmaVtabRegister(db, zName);
@@ -466,7 +466,7 @@ Table *sqlite3LocateTable(
 #endif
     if( flags & LOCATE_NOERR ) return 0;
     pParse->checkSchema = 1;
-  }else if( IsVirtual(p) && pParse->disableVtab ){
+  }else if( IsVirtual(p) && (pParse->prepFlags & SQLITE_PREPARE_NO_VTAB)!=0 ){
     p = 0;
   }
 
diff --git a/src/prepare.c b/src/prepare.c
index f66c366b99..cd90bc4bad 100644
--- a/src/prepare.c
+++ b/src/prepare.c
@@ -705,7 +705,7 @@ static int sqlite3Prepare(
     sParse.disableLookaside++;
     DisableLookaside;
   }
-  sParse.disableVtab = (prepFlags & SQLITE_PREPARE_NO_VTAB)!=0;
+  sParse.prepFlags = prepFlags & 0xff;
 
   /* Check to verify that it is possible to get a read lock on all
   ** database schemas.  The inability to get a read lock indicates that
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 148ba75949..436e428dcf 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -3604,7 +3604,7 @@ struct Parse {
   u8 hasCompound;      /* Need to invoke convertCompoundSelectToSubquery() */
   u8 okConstFactor;    /* OK to factor out constants */
   u8 disableLookaside; /* Number of times lookaside has been disabled */
-  u8 disableVtab;      /* Disable all virtual tables for this parse */
+  u8 prepFlags;        /* SQLITE_PREPARE_* flags */
   u8 withinRJSubrtn;   /* Nesting level for RIGHT JOIN body subroutines */
 #if defined(SQLITE_DEBUG) || defined(SQLITE_COVERAGE_TEST)
   u8 earlyCleanup;     /* OOM inside sqlite3ParserAddCleanup() */
diff --git a/src/trigger.c b/src/trigger.c
index 1c62fc231b..ca64d6145b 100644
--- a/src/trigger.c
+++ b/src/trigger.c
@@ -1191,7 +1191,7 @@ static TriggerPrg *codeRowTrigger(
   sSubParse.zAuthContext = pTrigger->zName;
   sSubParse.eTriggerOp = pTrigger->op;
   sSubParse.nQueryLoop = pParse->nQueryLoop;
-  sSubParse.disableVtab = pParse->disableVtab;
+  sSubParse.prepFlags = pParse->prepFlags;
 
   v = sqlite3GetVdbe(&sSubParse);
   if( v ){

From c9099d2d73559e1f640c0e70723dd776e57c9695 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sat, 1 Oct 2022 13:38:27 +0000
Subject: [PATCH 200/428] Tweak sqlite3-worker1.js to be able to load either
 sqlite3.js or sqlite3-wasmfs.js, noting that the latter still does not load
 in a Worker because of an Emscripten loader bug.

FossilOrigin-Name: 000ef7059bfb54dc4f829b81a8d8c927c0382980218d8a3d60cd2c4d89151c90
---
 ext/fts3/fts3.c                      |   4 +-
 ext/fts3/fts3Int.h                   |   2 +-
 ext/fts3/fts3_porter.c               |   2 +-
 ext/fts3/fts3_tokenizer1.c           |   2 +-
 ext/fts3/fts3_write.c                |  62 +++++++++--------
 ext/icu/icu.c                        |   5 +-
 ext/wasm/sqlite3-worker1-promiser.js |   2 +-
 ext/wasm/sqlite3-worker1.js          |  15 ++--
 manifest                             |  48 ++++++-------
 manifest.uuid                        |   2 +-
 src/btree.c                          |  16 ++---
 src/expr.c                           |   1 +
 src/malloc.c                         |  28 ++++++--
 src/select.c                         |  50 +-------------
 src/test_demovfs.c                   |  22 +++---
 src/trigger.c                        |  17 +++++
 src/vdbe.c                           |  10 ++-
 src/where.c                          | 100 +++++++++++++--------------
 test/fuzzdata8.db                    | Bin 3283968 -> 3298304 bytes
 test/fuzzinvariants.c                |  14 ++++
 test/join.test                       |  76 ++++++++++++++++++++
 21 files changed, 284 insertions(+), 194 deletions(-)

diff --git a/ext/fts3/fts3.c b/ext/fts3/fts3.c
index 3b73fbba1d..c43eac4914 100644
--- a/ext/fts3/fts3.c
+++ b/ext/fts3/fts3.c
@@ -2888,7 +2888,7 @@ static int fts3TermSelectMerge(
     **
     ** Similar padding is added in the fts3DoclistOrMerge() function.
     */
-    pTS->aaOutput[0] = sqlite3_malloc(nDoclist + FTS3_VARINT_MAX + 1);
+    pTS->aaOutput[0] = sqlite3_malloc64((i64)nDoclist + FTS3_VARINT_MAX + 1);
     pTS->anOutput[0] = nDoclist;
     if( pTS->aaOutput[0] ){
       memcpy(pTS->aaOutput[0], aDoclist, nDoclist);
@@ -4745,7 +4745,7 @@ static int fts3EvalIncrPhraseNext(
       if( bEof==0 ){
         int nList = 0;
         int nByte = a[p->nToken-1].nList;
-        char *aDoclist = sqlite3_malloc(nByte+FTS3_BUFFER_PADDING);
+        char *aDoclist = sqlite3_malloc64((i64)nByte+FTS3_BUFFER_PADDING);
         if( !aDoclist ) return SQLITE_NOMEM;
         memcpy(aDoclist, a[p->nToken-1].pList, nByte+1);
         memset(&aDoclist[nByte], 0, FTS3_BUFFER_PADDING);
diff --git a/ext/fts3/fts3Int.h b/ext/fts3/fts3Int.h
index 0626486edf..e821d6be31 100644
--- a/ext/fts3/fts3Int.h
+++ b/ext/fts3/fts3Int.h
@@ -558,7 +558,7 @@ struct Fts3MultiSegReader {
   int nAdvance;                   /* How many seg-readers to advance */
   Fts3SegFilter *pFilter;         /* Pointer to filter object */
   char *aBuffer;                  /* Buffer to merge doclists in */
-  int nBuffer;                    /* Allocated size of aBuffer[] in bytes */
+  i64 nBuffer;                    /* Allocated size of aBuffer[] in bytes */
 
   int iColFilter;                 /* If >=0, filter for this column */
   int bRestart;
diff --git a/ext/fts3/fts3_porter.c b/ext/fts3/fts3_porter.c
index 8fb4c25daa..fbe7913020 100644
--- a/ext/fts3/fts3_porter.c
+++ b/ext/fts3/fts3_porter.c
@@ -621,7 +621,7 @@ static int porterNext(
       if( n>c->nAllocated ){
         char *pNew;
         c->nAllocated = n+20;
-        pNew = sqlite3_realloc(c->zToken, c->nAllocated);
+        pNew = sqlite3_realloc64(c->zToken, c->nAllocated);
         if( !pNew ) return SQLITE_NOMEM;
         c->zToken = pNew;
       }
diff --git a/ext/fts3/fts3_tokenizer1.c b/ext/fts3/fts3_tokenizer1.c
index deea06d92b..78e5889da5 100644
--- a/ext/fts3/fts3_tokenizer1.c
+++ b/ext/fts3/fts3_tokenizer1.c
@@ -185,7 +185,7 @@ static int simpleNext(
       if( n>c->nTokenAllocated ){
         char *pNew;
         c->nTokenAllocated = n+20;
-        pNew = sqlite3_realloc(c->pToken, c->nTokenAllocated);
+        pNew = sqlite3_realloc64(c->pToken, c->nTokenAllocated);
         if( !pNew ) return SQLITE_NOMEM;
         c->pToken = pNew;
       }
diff --git a/ext/fts3/fts3_write.c b/ext/fts3/fts3_write.c
index f1a4bd6bba..6a727eaf5f 100644
--- a/ext/fts3/fts3_write.c
+++ b/ext/fts3/fts3_write.c
@@ -649,7 +649,7 @@ static int fts3PendingListAppendVarint(
 
   /* Allocate or grow the PendingList as required. */
   if( !p ){
-    p = sqlite3_malloc(sizeof(*p) + 100);
+    p = sqlite3_malloc64(sizeof(*p) + 100);
     if( !p ){
       return SQLITE_NOMEM;
     }
@@ -658,14 +658,14 @@ static int fts3PendingListAppendVarint(
     p->nData = 0;
   }
   else if( p->nData+FTS3_VARINT_MAX+1>p->nSpace ){
-    int nNew = p->nSpace * 2;
-    p = sqlite3_realloc(p, sizeof(*p) + nNew);
+    i64 nNew = p->nSpace * 2;
+    p = sqlite3_realloc64(p, sizeof(*p) + nNew);
     if( !p ){
       sqlite3_free(*pp);
       *pp = 0;
       return SQLITE_NOMEM;
     }
-    p->nSpace = nNew;
+    p->nSpace = (int)nNew;
     p->aData = (char *)&p[1];
   }
 
@@ -1222,7 +1222,7 @@ int sqlite3Fts3ReadBlock(
     int nByte = sqlite3_blob_bytes(p->pSegments);
     *pnBlob = nByte;
     if( paBlob ){
-      char *aByte = sqlite3_malloc(nByte + FTS3_NODE_PADDING);
+      char *aByte = sqlite3_malloc64((i64)nByte + FTS3_NODE_PADDING);
       if( !aByte ){
         rc = SQLITE_NOMEM;
       }else{
@@ -1339,7 +1339,7 @@ static int fts3SegReaderNext(
         int nTerm = fts3HashKeysize(pElem);
         if( (nTerm+1)>pReader->nTermAlloc ){
           sqlite3_free(pReader->zTerm);
-          pReader->zTerm = (char*)sqlite3_malloc((nTerm+1)*2);
+          pReader->zTerm = (char*)sqlite3_malloc64(((i64)nTerm+1)*2);
           if( !pReader->zTerm ) return SQLITE_NOMEM;
           pReader->nTermAlloc = (nTerm+1)*2;
         }
@@ -1347,7 +1347,7 @@ static int fts3SegReaderNext(
         pReader->zTerm[nTerm] = '\0';
         pReader->nTerm = nTerm;
 
-        aCopy = (char*)sqlite3_malloc(nCopy);
+        aCopy = (char*)sqlite3_malloc64(nCopy);
         if( !aCopy ) return SQLITE_NOMEM;
         memcpy(aCopy, pList->aData, nCopy);
         pReader->nNode = pReader->nDoclist = nCopy;
@@ -1634,7 +1634,7 @@ int sqlite3Fts3SegReaderNew(
     nExtra = nRoot + FTS3_NODE_PADDING;
   }
 
-  pReader = (Fts3SegReader *)sqlite3_malloc(sizeof(Fts3SegReader) + nExtra);
+  pReader = (Fts3SegReader *)sqlite3_malloc64(sizeof(Fts3SegReader) + nExtra);
   if( !pReader ){
     return SQLITE_NOMEM;
   }
@@ -1726,7 +1726,7 @@ int sqlite3Fts3SegReaderPending(
         if( nElem==nAlloc ){
           Fts3HashElem **aElem2;
           nAlloc += 16;
-          aElem2 = (Fts3HashElem **)sqlite3_realloc(
+          aElem2 = (Fts3HashElem **)sqlite3_realloc64(
               aElem, nAlloc*sizeof(Fts3HashElem *)
           );
           if( !aElem2 ){
@@ -2060,7 +2060,7 @@ static int fts3NodeAddTerm(
         ** this is not expected to be a serious problem. 
         */
         assert( pTree->aData==(char *)&pTree[1] );
-        pTree->aData = (char *)sqlite3_malloc(nReq);
+        pTree->aData = (char *)sqlite3_malloc64(nReq);
         if( !pTree->aData ){
           return SQLITE_NOMEM;
         }
@@ -2078,7 +2078,7 @@ static int fts3NodeAddTerm(
 
       if( isCopyTerm ){
         if( pTree->nMalloc<nTerm ){
-          char *zNew = sqlite3_realloc(pTree->zMalloc, nTerm*2);
+          char *zNew = sqlite3_realloc64(pTree->zMalloc, (i64)nTerm*2);
           if( !zNew ){
             return SQLITE_NOMEM;
           }
@@ -2104,7 +2104,7 @@ static int fts3NodeAddTerm(
   ** now. Instead, the term is inserted into the parent of pTree. If pTree 
   ** has no parent, one is created here.
   */
-  pNew = (SegmentNode *)sqlite3_malloc(sizeof(SegmentNode) + p->nNodeSize);
+  pNew = (SegmentNode *)sqlite3_malloc64(sizeof(SegmentNode) + p->nNodeSize);
   if( !pNew ){
     return SQLITE_NOMEM;
   }
@@ -2242,7 +2242,7 @@ static int fts3SegWriterAdd(
 ){
   int nPrefix;                    /* Size of term prefix in bytes */
   int nSuffix;                    /* Size of term suffix in bytes */
-  int nReq;                       /* Number of bytes required on leaf page */
+  i64 nReq;                       /* Number of bytes required on leaf page */
   int nData;
   SegmentWriter *pWriter = *ppWriter;
 
@@ -2251,13 +2251,13 @@ static int fts3SegWriterAdd(
     sqlite3_stmt *pStmt;
 
     /* Allocate the SegmentWriter structure */
-    pWriter = (SegmentWriter *)sqlite3_malloc(sizeof(SegmentWriter));
+    pWriter = (SegmentWriter *)sqlite3_malloc64(sizeof(SegmentWriter));
     if( !pWriter ) return SQLITE_NOMEM;
     memset(pWriter, 0, sizeof(SegmentWriter));
     *ppWriter = pWriter;
 
     /* Allocate a buffer in which to accumulate data */
-    pWriter->aData = (char *)sqlite3_malloc(p->nNodeSize);
+    pWriter->aData = (char *)sqlite3_malloc64(p->nNodeSize);
     if( !pWriter->aData ) return SQLITE_NOMEM;
     pWriter->nSize = p->nNodeSize;
 
@@ -2332,7 +2332,7 @@ static int fts3SegWriterAdd(
   ** the buffer to make it large enough.
   */
   if( nReq>pWriter->nSize ){
-    char *aNew = sqlite3_realloc(pWriter->aData, nReq);
+    char *aNew = sqlite3_realloc64(pWriter->aData, nReq);
     if( !aNew ) return SQLITE_NOMEM;
     pWriter->aData = aNew;
     pWriter->nSize = nReq;
@@ -2357,7 +2357,7 @@ static int fts3SegWriterAdd(
   */
   if( isCopyTerm ){
     if( nTerm>pWriter->nMalloc ){
-      char *zNew = sqlite3_realloc(pWriter->zMalloc, nTerm*2);
+      char *zNew = sqlite3_realloc64(pWriter->zMalloc, (i64)nTerm*2);
       if( !zNew ){
         return SQLITE_NOMEM;
       }
@@ -2665,12 +2665,12 @@ static void fts3ColumnFilter(
 static int fts3MsrBufferData(
   Fts3MultiSegReader *pMsr,       /* Multi-segment-reader handle */
   char *pList,
-  int nList
+  i64 nList
 ){
   if( nList>pMsr->nBuffer ){
     char *pNew;
     pMsr->nBuffer = nList*2;
-    pNew = (char *)sqlite3_realloc(pMsr->aBuffer, pMsr->nBuffer);
+    pNew = (char *)sqlite3_realloc64(pMsr->aBuffer, pMsr->nBuffer);
     if( !pNew ) return SQLITE_NOMEM;
     pMsr->aBuffer = pNew;
   }
@@ -2726,7 +2726,7 @@ int sqlite3Fts3MsrIncrNext(
       fts3SegReaderSort(pMsr->apSegment, nMerge, j, xCmp);
 
       if( nList>0 && fts3SegReaderIsPending(apSegment[0]) ){
-        rc = fts3MsrBufferData(pMsr, pList, nList+1);
+        rc = fts3MsrBufferData(pMsr, pList, (i64)nList+1);
         if( rc!=SQLITE_OK ) return rc;
         assert( (pMsr->aBuffer[nList] & 0xFE)==0x00 );
         pList = pMsr->aBuffer;
@@ -2863,11 +2863,11 @@ int sqlite3Fts3MsrIncrRestart(Fts3MultiSegReader *pCsr){
   return SQLITE_OK;
 }
 
-static int fts3GrowSegReaderBuffer(Fts3MultiSegReader *pCsr, int nReq){
+static int fts3GrowSegReaderBuffer(Fts3MultiSegReader *pCsr, i64 nReq){
   if( nReq>pCsr->nBuffer ){
     char *aNew;
     pCsr->nBuffer = nReq*2;
-    aNew = sqlite3_realloc(pCsr->aBuffer, pCsr->nBuffer);
+    aNew = sqlite3_realloc64(pCsr->aBuffer, pCsr->nBuffer);
     if( !aNew ){
       return SQLITE_NOMEM;
     }
@@ -2958,7 +2958,8 @@ int sqlite3Fts3SegReaderStep(
     ){
       pCsr->nDoclist = apSegment[0]->nDoclist;
       if( fts3SegReaderIsPending(apSegment[0]) ){
-        rc = fts3MsrBufferData(pCsr, apSegment[0]->aDoclist, pCsr->nDoclist);
+        rc = fts3MsrBufferData(pCsr, apSegment[0]->aDoclist,
+                               (i64)pCsr->nDoclist);
         pCsr->aDoclist = pCsr->aBuffer;
       }else{
         pCsr->aDoclist = apSegment[0]->aDoclist;
@@ -3011,7 +3012,8 @@ int sqlite3Fts3SegReaderStep(
 
           nByte = sqlite3Fts3VarintLen(iDelta) + (isRequirePos?nList+1:0);
 
-          rc = fts3GrowSegReaderBuffer(pCsr, nByte+nDoclist+FTS3_NODE_PADDING);
+          rc = fts3GrowSegReaderBuffer(pCsr, 
+                                   (i64)nByte+nDoclist+FTS3_NODE_PADDING);
           if( rc ) return rc;
 
           if( isFirst ){
@@ -3037,7 +3039,7 @@ int sqlite3Fts3SegReaderStep(
         fts3SegReaderSort(apSegment, nMerge, j, xCmp);
       }
       if( nDoclist>0 ){
-        rc = fts3GrowSegReaderBuffer(pCsr, nDoclist+FTS3_NODE_PADDING);
+        rc = fts3GrowSegReaderBuffer(pCsr, (i64)nDoclist+FTS3_NODE_PADDING);
         if( rc ) return rc;
         memset(&pCsr->aBuffer[nDoclist], 0, FTS3_NODE_PADDING);
         pCsr->aDoclist = pCsr->aBuffer;
@@ -3750,7 +3752,7 @@ struct NodeReader {
 static void blobGrowBuffer(Blob *pBlob, int nMin, int *pRc){
   if( *pRc==SQLITE_OK && nMin>pBlob->nAlloc ){
     int nAlloc = nMin;
-    char *a = (char *)sqlite3_realloc(pBlob->a, nAlloc);
+    char *a = (char *)sqlite3_realloc64(pBlob->a, nAlloc);
     if( a ){
       pBlob->nAlloc = nAlloc;
       pBlob->a = a;
@@ -4547,7 +4549,7 @@ static int fts3RepackSegdirLevel(
       if( nIdx>=nAlloc ){
         int *aNew;
         nAlloc += 16;
-        aNew = sqlite3_realloc(aIdx, nAlloc*sizeof(int));
+        aNew = sqlite3_realloc64(aIdx, nAlloc*sizeof(int));
         if( !aNew ){
           rc = SQLITE_NOMEM;
           break;
@@ -4921,7 +4923,7 @@ int sqlite3Fts3Incrmerge(Fts3Table *p, int nMerge, int nMin){
 
   /* Allocate space for the cursor, filter and writer objects */
   const int nAlloc = sizeof(*pCsr) + sizeof(*pFilter) + sizeof(*pWriter);
-  pWriter = (IncrmergeWriter *)sqlite3_malloc(nAlloc);
+  pWriter = (IncrmergeWriter *)sqlite3_malloc64(nAlloc);
   if( !pWriter ) return SQLITE_NOMEM;
   pFilter = (Fts3SegFilter *)&pWriter[1];
   pCsr = (Fts3MultiSegReader *)&pFilter[1];
@@ -5557,7 +5559,7 @@ int sqlite3Fts3DeferredTokenList(
     return SQLITE_OK;
   }
 
-  pRet = (char *)sqlite3_malloc(p->pList->nData);
+  pRet = (char *)sqlite3_malloc64(p->pList->nData);
   if( !pRet ) return SQLITE_NOMEM;
 
   nSkip = sqlite3Fts3GetVarint(p->pList->aData, &dummy);
@@ -5577,7 +5579,7 @@ int sqlite3Fts3DeferToken(
   int iCol                        /* Column that token must appear in (or -1) */
 ){
   Fts3DeferredToken *pDeferred;
-  pDeferred = sqlite3_malloc(sizeof(*pDeferred));
+  pDeferred = sqlite3_malloc64(sizeof(*pDeferred));
   if( !pDeferred ){
     return SQLITE_NOMEM;
   }
diff --git a/ext/icu/icu.c b/ext/icu/icu.c
index 92d7c5438e..e745ab0253 100644
--- a/ext/icu/icu.c
+++ b/ext/icu/icu.c
@@ -299,8 +299,9 @@ static void icuRegexpFunc(sqlite3_context *p, int nArg, sqlite3_value **apArg){
 
     if( U_SUCCESS(status) ){
       sqlite3_set_auxdata(p, 0, pExpr, icuRegexpDelete);
-    }else{
-      assert(!pExpr);
+      pExpr = sqlite3_get_auxdata(p, 0);
+    }
+    if( !pExpr ){
       icuFunctionError(p, "uregex_open", status);
       return;
     }
diff --git a/ext/wasm/sqlite3-worker1-promiser.js b/ext/wasm/sqlite3-worker1-promiser.js
index 46abc642bf..71e2e33135 100644
--- a/ext/wasm/sqlite3-worker1-promiser.js
+++ b/ext/wasm/sqlite3-worker1-promiser.js
@@ -237,6 +237,6 @@ self.sqlite3Worker1Promiser = function callee(config = callee.defaultConfig){
   };
 }/*sqlite3Worker1Promiser()*/;
 self.sqlite3Worker1Promiser.defaultConfig = {
-  worker: ()=>new Worker("sqlite3-worker1.js"),
+  worker: ()=>new Worker("sqlite3-worker1.js"+self.location.search),
   onerror: (...args)=>console.error('worker1 promiser error',...args)
 };
diff --git a/ext/wasm/sqlite3-worker1.js b/ext/wasm/sqlite3-worker1.js
index 7ccf79f010..167c6a5c79 100644
--- a/ext/wasm/sqlite3-worker1.js
+++ b/ext/wasm/sqlite3-worker1.js
@@ -27,8 +27,13 @@
   above in order to know when the module has completed initialization.
 */
 "use strict";
-importScripts('sqlite3.js');
-sqlite3InitModule().then((sqlite3)=>{
-  sqlite3.capi.sqlite3_wasmfs_opfs_dir();
-  sqlite3.initWorker1API();
-});
+(()=>{
+  const urlParams = new URL(self.location.href).searchParams;
+  importScripts(urlParams.has('wasmfs')
+                ? 'sqlite3-wasmfs.js'
+                : 'sqlite3.js');
+  sqlite3InitModule().then((sqlite3)=>{
+    sqlite3.capi.sqlite3_wasmfs_opfs_dir();
+    sqlite3.initWorker1API();
+  });
+})();
diff --git a/manifest b/manifest
index e7b7ef95cf..1fb4beac82 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Note\stwo\swasm-related\spotential\sTODOs.
-D 2022-10-01T12:04:49.570
+C Tweak\ssqlite3-worker1.js\sto\sbe\sable\sto\sload\seither\ssqlite3.js\sor\ssqlite3-wasmfs.js,\snoting\sthat\sthe\slatter\sstill\sdoes\snot\sload\sin\sa\sWorker\sbecause\sof\san\sEmscripten\sloader\sbug.
+D 2022-10-01T13:38:27.672
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -85,25 +85,25 @@ F ext/fts3/README.content b9078d0843a094d86af0d48dffbff13c906702b4c3558012e67b9c
 F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a
 F ext/fts3/README.tokenizers b92bdeb8b46503f0dd301d364efc5ef59ef9fa8e2758b8e742f39fa93a2e422d
 F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
-F ext/fts3/fts3.c b20bd583991e740c1e14371896f3ab61d7b6c033740646366bbf6667191bc4e2
+F ext/fts3/fts3.c 46c116ee0868fc09520d61a1b747c62343c71c399ba67a3d0395b0be29b1a19f
 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
-F ext/fts3/fts3Int.h dafdc371f9fbab175744b06cfe019d5f040cdfdbd11fea752f5dc28d45b04c05
+F ext/fts3/fts3Int.h ae2a44b04cddb5fb35cac4ea5f7f819b2894fd258186465777a19f7acfdf84ed
 F ext/fts3/fts3_aux.c f0dc9bd98582615b7750218899bd0c729879b6bbf94d1be57ca1833ff49afc6f
 F ext/fts3/fts3_expr.c 903bfb9433109fffb10e910d7066c49cbf8eeae316adc93f0499c4da7dfc932a
 F ext/fts3/fts3_hash.c 8b6e31bfb0844c27dc6092c2620bdb1fca17ed613072db057d96952c6bdb48b7
 F ext/fts3/fts3_hash.h 39cf6874dc239d6b4e30479b1975fe5b22a3caaf
 F ext/fts3/fts3_icu.c 305ce7fb6036484085b5556a9c8e62acdc7763f0f4cdf5fd538212a9f3720116
-F ext/fts3/fts3_porter.c 3565faf04b626cddf85f03825e86056a4562c009
+F ext/fts3/fts3_porter.c e19807ce0ae31c1c6e9898e89ecc93183d7ec224ea101af039722a4f49e5f2b8
 F ext/fts3/fts3_snippet.c f9a8149173553113f3c495a503843e30028b5dc3723d0ca798c5ad6142e130e6
 F ext/fts3/fts3_term.c f45a1e7c6ef464abb1231245d123dae12266b69e05cc56e14045b76591ae92d1
 F ext/fts3/fts3_test.c d8d7b2734f894e8a489987447658e374cdd3a3bc8575c401decf1911cb7c6454
 F ext/fts3/fts3_tokenize_vtab.c a95feda3590f3c3e17672fe35b67ea6112471aeea4c07ef7744a6606b66549aa
 F ext/fts3/fts3_tokenizer.c 6d8fc150c48238955d5182bf661498db0dd473c8a2a80e00c16994a646fa96e7
 F ext/fts3/fts3_tokenizer.h 64c6ef6c5272c51ebe60fc607a896e84288fcbc3
-F ext/fts3/fts3_tokenizer1.c 5c98225a53705e5ee34824087478cf477bdb7004
+F ext/fts3/fts3_tokenizer1.c c1de4ae28356ad98ccb8b2e3388a7fdcce7607b5523738c9afb6275dab765154
 F ext/fts3/fts3_unicode.c de426ff05c1c2e7bce161cf6b706638419c3a1d9c2667de9cb9dc0458c18e226
 F ext/fts3/fts3_unicode2.c 416eb7e1e81142703520d284b768ca2751d40e31fa912cae24ba74860532bf0f
-F ext/fts3/fts3_write.c 85279b980f99253c296006503a13f92957ec49b716123083f021acc74545ecfc
+F ext/fts3/fts3_write.c 4fb644df0ff840267e47a724286c7a1fa5540273a7ce15756dd5913a101ec302
 F ext/fts3/fts3speed.tcl b54caf6a18d38174f1a6e84219950d85e98bb1e9
 F ext/fts3/tool/fts3cov.sh c331d006359456cf6f8f953e37f2b9c7d568f3863f00bb5f7eb87fea4ac01b73
 F ext/fts3/tool/fts3view.c 413c346399159df81f86c4928b7c4a455caab73bfbc8cd68f950f632e5751674
@@ -239,7 +239,7 @@ F ext/fts5/tool/loadfts5.tcl 95b03429ee6b138645703c6ca192c3ac96eaf093
 F ext/fts5/tool/mkfts5c.tcl 3eba8e9bee4221ed165f3304b51b2a74a705f4ec5df3d044573a2be539534af8
 F ext/fts5/tool/showfts5.tcl d54da0e067306663e2d5d523965ca487698e722c
 F ext/icu/README.txt 7ab7ced8ae78e3a645b57e78570ff589d4c672b71370f5aa9e1cd7024f400fc9
-F ext/icu/icu.c 91c021c7e3e8bbba286960810fa303295c622e323567b2e6def4ce58e4466e60
+F ext/icu/icu.c c074519b46baa484bb5396c7e01e051034da8884bad1a1cb7f09bbe6be3f0282
 F ext/icu/sqliteicu.h fa373836ed5a1ee7478bdf8a1650689294e41d0c89c1daab26e9ae78a32075a8
 F ext/lsm1/Makefile a553b728bba6c11201b795188c5708915cc4290f02b7df6ba7e8c4c943fd5cd9
 F ext/lsm1/Makefile.msc f8c878b467232226de288da320e1ac71c131f5ec91e08b21f502303347260013
@@ -523,8 +523,8 @@ F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f129
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
 F ext/wasm/sqlite3-opfs-async-proxy.js 7367733ce409c8106b6c49e8ef2b55440e9974a64f39e0c97f5e3a4587d1fc2a
-F ext/wasm/sqlite3-worker1-promiser.js c88d712805d0fe99b4d5171ebf665f281c4a4a915ba20e283456cf1919aa9508
-F ext/wasm/sqlite3-worker1.js 5266ebc4d709fe23d2d076ae44e6085fbc32b82f26ef514b947312f36b1206a9
+F ext/wasm/sqlite3-worker1-promiser.js 307d7837420ca6a9d3780dfc81194f1c0715637e6d9540e935514086b96913d8
+F ext/wasm/sqlite3-worker1.js 466e9bd39409ab03f3e00999887aaffc11e95b416e2689596e3d7f1516673fdf
 F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
 F ext/wasm/test-opfs-vfs.js a59ff9210b17d46b0c6fbf6a0ba60143c033327865f2e556e14f06280cef62ac
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
@@ -556,7 +556,7 @@ F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
 F src/backup.c a2891172438e385fdbe97c11c9745676bec54f518d4447090af97189fd8e52d7
 F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d
 F src/btmutex.c 6ffb0a22c19e2f9110be0964d0731d2ef1c67b5f7fabfbaeb7b9dabc4b7740ca
-F src/btree.c 138804ba7c054533573e87facdfcf9f8aa003c7123152dda8d9281f837ab2622
+F src/btree.c ef9c126d6dc5dff8ff76abc807dfef5b8aac42144e3be11cbcd9cb6eaecef580
 F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
 F src/btreeInt.h 8ce1332edd89dfd2461d561ac10a0ab5601c8e06200cb5230596c3caaf54482e
 F src/build.c 898884afd67d953808cb687babc15b66a10213f99fe2ce7db98960e959881f98
@@ -567,7 +567,7 @@ F src/date.c 94ce83b4cd848a387680a5f920c9018c16655db778c4d36525af0a0f34679ac5
 F src/dbpage.c 5808e91bc27fa3981b028000f8fadfdc10ce9e59a34ce7dc4e035a69be3906ec
 F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
 F src/delete.c 86573edae75e3d3e9a8b590d87db8e47222103029df4f3e11fa56044459b514e
-F src/expr.c 24e828db6b2fab8aabfb5d2c0d83dbdfc5a1972b1147fa893350e317ab7e282f
+F src/expr.c 1cbdd76eeedb729ea9060df03e3e6b74a302784a13bfa38794a8194f894641ea
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 722f20779f5342a787922deded3628d8c74b5249cab04098cf17ee2f2aaff002
 F src/func.c 8f72e88cccdee22185133c10f96ccd61dc34c5ea4b1fa9a73c237ef59b2e64f1
@@ -581,7 +581,7 @@ F src/json.c 7749b98c62f691697c7ee536b570c744c0583cab4a89200fdd0fc2aa8cc8cbd6
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 853385cc7a604157e137585097949252d5d0c731768e16b044608e5c95c3614b
 F src/main.c b434b8e4aca38419962de3d1c55fb9279807ba6a8802998a427b1635dc8250f6
-F src/malloc.c b7a3430cbe91d3e8e04fc10c2041b3a19794e63556ad2441a13d8dadd9b2bafc
+F src/malloc.c dfddca1e163496c0a10250cedeafaf56dff47673e0f15888fb0925340a8e3f90
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
 F src/mem2.c c8bfc9446fd0798bddd495eb5d9dbafa7d4b7287d8c22d50a83ac9daa26d8a75
@@ -617,7 +617,7 @@ F src/printf.c e99ee9741e79ae3873458146f59644276657340385ade4e76a5f5d1c25793764
 F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c d69dfb5b082f9a25e6700e152ddb3d942359b847b1df504eb09f9b4531844f8d
+F src/select.c bb18acf4eded647fef88d4d543c673874dbebff516fbeba90a85e6c13f2a58cd
 F src/shell.c.in 2980312ab57fc5ccf298d1f0682588ec3832f52a878bea8abe34647d2cf31d05
 F src/sqlite.h.in b9b7fd73239d94db20332bb6e504688001e5564b655e1318a4427a1caef4b99e
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -644,7 +644,7 @@ F src/test_blob.c ae4a0620b478548afb67963095a7417cd06a4ec0a56adb453542203bfdcb31
 F src/test_btree.c 8b2dc8b8848cf3a4db93f11578f075e82252a274
 F src/test_config.c 8264637b06a3c1f0727c88d1ea32dcf7986b9e7e358a970cae87cdac8a5b2708
 F src/test_delete.c e2fe07646dff6300b48d49b2fee2fe192ed389e834dd635e3b3bac0ce0bf9f8f
-F src/test_demovfs.c 86142ba864d4297d54c5b2e972e74f3141ae4b30f05b3a95824184ed2d3d7f91
+F src/test_demovfs.c 7cc7623d1025d1e92c51da20fd25060759733b7a356a121545a3b7d2faa8a0f1
 F src/test_devsym.c aff2255ea290d7718da08af30cdf18e470ff7325a5eff63e0057b1496ed66593
 F src/test_fs.c ba1e1dc18fd3159fdba0b9c4256f14032159785320dfbd6776eb9973cb75d480
 F src/test_func.c 24df3a346c012b1fc9e1001d346db6054deb426db0a7437e92490630e71c9b0a
@@ -683,13 +683,13 @@ F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
 F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
 F src/tokenize.c 1305797eab3542a0896b552c6e7669c972c1468e11e92b370533c1f37a37082b
 F src/treeview.c 07787f67cd297a6d09d04b8d70c06769c60c9c1d9080378f93929c16f8fd3298
-F src/trigger.c 61bea163b1fa3039bc572ed8312461b978e5c527e5301f302b078f4c1ccdec6a
+F src/trigger.c bc70c58e713dcfb6cabe5cc0bed71aedb02c3e9e128c6089a78aca945ba4d720
 F src/update.c c52a7991bece0453d22c77c08469512ee2f1391c12503fd347d1c939220c5877
 F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 F src/util.c 0be191521ff6d2805995f4910f0b6231b42843678b2efdc1abecaf39929a673f
 F src/vacuum.c bb346170b0b54c6683bba4a5983aea40485597fdf605c87ec8bc2e199fe88cd8
-F src/vdbe.c d27ec9a57f752fc2acf6a64d43bbf6072d2415efc976184f6d8a146e65819d3b
+F src/vdbe.c 0d1e3c658d98a7bb7201532ea7a3e4d59bf9165421c780d5f84c361e372f1179
 F src/vdbe.h 64619af62603dc3c4f5ff6ff6d2c8f389abd667a29ce6007ed44bd22b3211cd0
 F src/vdbeInt.h 17b7461ffcf9ee760d1341731715a419f6b8c763089a7ece25c2e8098d702b3f
 F src/vdbeapi.c fc3183daf72808b4311b228989120fdbc2dc44972fb0d77d5c453460cc0e5b2c
@@ -704,7 +704,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d
 F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
-F src/where.c 424c42590b71968a9b81cd890df2671902028613fee38a50ed4c2f7ca65315d3
+F src/where.c 63e712bcad47f70e94c2150976cd7da5040933699e3938d4189d064acbe40891
 F src/whereInt.h 70cd30de9ed784aa33fa6bd1245f060617de7a00d992469b6d8e419eed915743
 F src/wherecode.c 6bb1cf9d0a4e3e04dab0bf0ea4a8d936a0dcc05a7e2207beeda6c61aea6dd341
 F src/whereexpr.c 55a39f42aaf982574fbf52906371a84cceed98a994422198dfd03db4fce4cc46
@@ -1141,11 +1141,11 @@ F test/fuzzdata4.db b502c7d5498261715812dd8b3c2005bad08b3a26e6489414bd13926cd3e4
 F test/fuzzdata5.db e35f64af17ec48926481cfaf3b3855e436bd40d1cfe2d59a9474cb4b748a52a5
 F test/fuzzdata6.db 92a80e4afc172c24f662a10a612d188fb272de4a9bd19e017927c95f737de6d7
 F test/fuzzdata7.db 0166b56fd7a6b9636a1d60ef0a060f86ddaecf99400a666bb6e5bbd7199ad1f2
-F test/fuzzdata8.db ca9a97f401b06b0d5376139ec7e1f9e773e13345a9a2d9ccc0032cdbfedea230
+F test/fuzzdata8.db 653423800b7671e67caa740e977d80e1360f0d69e9992851f3ea5c4a69a2724a
 F test/fuzzer1.test 3d4c4b7e547aba5e5511a2991e3e3d07166cfbb8
 F test/fuzzer2.test a85ef814ce071293bce1ad8dffa217cbbaad4c14
 F test/fuzzerfault.test f64c4aef4c9e9edf1d6dc0d3f1e65dcc81e67c996403c88d14f09b74807a42bc
-F test/fuzzinvariants.c c1c7ae6be4c5fe4e5b845ce2b166c17a3d0f8ef545ab0248c9990505010070da
+F test/fuzzinvariants.c d7bb4a0fcc0ac344bcb72f1b86e4ae0acba5ea26dddde8160ee3db6520f10c64
 F test/gcfault.test dd28c228a38976d6336a3fc42d7e5f1ad060cb8c
 F test/gencol1.test cc0dbb0ee116e5602e18ea7d47f2a0f76b26e09a823b7c36ef254370c2b0f3c1
 F test/genesis.tcl 1e2e2e8e5cc4058549a154ff1892fe5c9de19f98
@@ -1209,7 +1209,7 @@ F test/ioerr4.test f130fe9e71008577b342b8874d52984bd04ede2c
 F test/ioerr5.test 2edfa4fb0f896f733071303b42224df8bedd9da4
 F test/ioerr6.test a395a6ab144b26a9e3e21059a1ab6a7149cca65b
 F test/istrue.test e7f285bb70282625c258e866ce6337d4c762922f5a300e1b50f958aef6e7d9c9
-F test/join.test 21dbc65ab2476b10ae3ed1dcf64a99fb9a40473caa22f4cec2d6a829933c1442
+F test/join.test e32cb9b1491eed682489e2cde33a22a4eb7611fe5aa3b0aa4b275fe27ab3f3ac
 F test/join2.test 466b07233820f5deee66a6c3bf6e4500c8bbf7b83649e67606f5f649c07928c0
 F test/join3.test 6f0c774ff1ba0489e6c88a3e77b9d3528fb4fda0
 F test/join4.test 1a352e4e267114444c29266ce79e941af5885916
@@ -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 9f2b331a32cbaadfd20d04c9908171355322c1aa1d9d6df3628f3b2fb4391ec1
-R e1a4db7681d0b6f0e817818894cccc93
+P 5636e82864457d870754ee7125c307dc5d2195197a5c0266579da9f102938b89
+R 993ef66f3fd9ce234bc978415f38aac9
 U stephan
-Z f54e8c9426807c11ccd8ec22ac465fb2
+Z e29500eccf112ba55345d53a058a1e30
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 8c2a11e06b..db57858bad 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5636e82864457d870754ee7125c307dc5d2195197a5c0266579da9f102938b89
\ No newline at end of file
+000ef7059bfb54dc4f829b81a8d8c927c0382980218d8a3d60cd2c4d89151c90
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index 577de2bee2..c54fd2e7c8 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -1547,7 +1547,7 @@ static int defragmentPage(MemPage *pPage, int nMaxFrag){
           if( iFree2+sz2 > usableSize ) return SQLITE_CORRUPT_PAGE(pPage);
           memmove(&data[iFree+sz+sz2], &data[iFree+sz], iFree2-(iFree+sz));
           sz += sz2;
-        }else if( NEVER(iFree+sz>usableSize) ){
+        }else if( iFree+sz>usableSize ){
           return SQLITE_CORRUPT_PAGE(pPage);
         }
 
@@ -6077,14 +6077,7 @@ static SQLITE_NOINLINE int btreeNext(BtCursor *pCur){
 
   pPage = pCur->pPage;
   idx = ++pCur->ix;
-  if( !pPage->isInit || sqlite3FaultSim(412) ){
-    /* The only known way for this to happen is for there to be a
-    ** recursive SQL function that does a DELETE operation as part of a
-    ** SELECT which deletes content out from under an active cursor
-    ** in a corrupt database file where the table being DELETE-ed from
-    ** has pages in common with the table being queried.  See TH3
-    ** module cov1/btree78.test testcase 220 (2018-06-08) for an
-    ** example. */
+  if( NEVER(!pPage->isInit) || sqlite3FaultSim(412) ){
     return SQLITE_CORRUPT_BKPT;
   }
 
@@ -8774,6 +8767,11 @@ static int balance(BtCursor *pCur){
       }else{
         break;
       }
+    }else if( sqlite3PagerPageRefcount(pPage->pDbPage)>1 ){
+      /* The page being written is not a root page, and there is currently
+      ** more than one reference to it. This only happens if the page is one 
+      ** of its own ancestor pages. Corruption. */
+      rc = SQLITE_CORRUPT_BKPT;
     }else{
       MemPage * const pParent = pCur->apPage[iPage-1];
       int const iIdx = pCur->aiIdx[iPage-1];
diff --git a/src/expr.c b/src/expr.c
index 8572512926..baa0fe6476 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -3223,6 +3223,7 @@ void sqlite3CodeRhsOfIN(
     sqlite3VdbeChangeP4(v, addr, (void *)pKeyInfo, P4_KEYINFO);
   }
   if( addrOnce ){
+    sqlite3VdbeAddOp1(v, OP_NullRow, iTab);
     sqlite3VdbeJumpHere(v, addrOnce);
     /* Subroutine return */
     assert( ExprUseYSub(pExpr) );
diff --git a/src/malloc.c b/src/malloc.c
index 3fcedf8a37..af83743fc0 100644
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -270,18 +270,34 @@ static void mallocWithAlarm(int n, void **pp){
   *pp = p;
 }
 
+/*
+** Maximum size of any single memory allocation.
+**
+** This is not a limit on the total amount of memory used.  This is
+** a limit on the size parameter to sqlite3_malloc() and sqlite3_realloc().
+**
+** The upper bound is slightly less than 2GiB:  0x7ffffeff == 2,147,483,391
+** This provides a 256-byte safety margin for defense against 32-bit 
+** signed integer overflow bugs when computing memory allocation sizes.
+** Parnoid applications might want to reduce the maximum allocation size
+** further for an even larger safety margin.  0x3fffffff or 0x0fffffff
+** or even smaller would be reasonable upper bounds on the size of a memory
+** allocations for most applications.
+*/
+#ifndef SQLITE_MAX_ALLOCATION_SIZE
+# define SQLITE_MAX_ALLOCATION_SIZE  2147483391
+#endif
+#if SQLITE_MAX_ALLOCATION_SIZE>2147483391
+# error Maximum size for SQLITE_MAX_ALLOCATION_SIZE is 2147483391
+#endif
+
 /*
 ** Allocate memory.  This routine is like sqlite3_malloc() except that it
 ** assumes the memory subsystem has already been initialized.
 */
 void *sqlite3Malloc(u64 n){
   void *p;
-  if( n==0 || n>=0x7fffff00 ){
-    /* A memory allocation of a number of bytes which is near the maximum
-    ** signed integer value might cause an integer overflow inside of the
-    ** xMalloc().  Hence we limit the maximum size to 0x7fffff00, giving
-    ** 255 bytes of overhead.  SQLite itself will never use anything near
-    ** this amount.  The only way to reach the limit is with sqlite3_malloc() */
+  if( n==0 || n>SQLITE_MAX_ALLOCATION_SIZE ){
     p = 0;
   }else if( sqlite3GlobalConfig.bMemstat ){
     sqlite3_mutex_enter(mem0.mutex);
diff --git a/src/select.c b/src/select.c
index 950d0db62b..2876f48ab8 100644
--- a/src/select.c
+++ b/src/select.c
@@ -3724,7 +3724,7 @@ static int multiSelectOrderBy(
 ** the left operands of a RIGHT JOIN.  In either case, we need to potentially
 ** bypass the substituted expression with OP_IfNullRow.
 **
-** Suppose the original expression integer constant.  Even though the table
+** Suppose the original expression is an integer constant. Even though the table
 ** has the nullRow flag set, because the expression is an integer constant,
 ** it will not be NULLed out.  So instead, we insert an OP_IfNullRow opcode
 ** that checks to see if the nullRow flag is set on the table.  If the nullRow
@@ -4181,19 +4181,13 @@ static void renumberCursors(
 **        See also (3) for restrictions on LEFT JOIN.
 **
 **  (27)  The subquery may not contain a FULL or RIGHT JOIN unless it
-**        is the first element of the parent query.  This must be the
-**        the case if:
-**        (27a) the subquery is not compound query, and
+**        is the first element of the parent query.  Two subcases:
+**        (27a) the subquery is not a compound query.
 **        (27b) the subquery is a compound query and the RIGHT JOIN occurs
 **              in any arm of the compound query.  (See also (17g).)
 **
 **  (28)  The subquery is not a MATERIALIZED CTE.
 **
-**  (29)  Either the subquery is not the right-hand operand of a join with an
-**        ON or USING clause nor the right-hand operand of a NATURAL JOIN, or
-**        the right-most table within the FROM clause of the subquery
-**        is not part of an outer join.
-**
 **
 ** In this routine, the "p" parameter is a pointer to the outer query.
 ** The subquery is p->pSrc->a[iFrom].  isAgg is true if the outer query
@@ -4297,15 +4291,6 @@ static int flattenSubquery(
     }
     isOuterJoin = 1;
   }
-#ifdef SQLITE_EXTRA_IFNULLROW
-  else if( iFrom>0 && !isAgg ){
-    /* Setting isOuterJoin to -1 causes OP_IfNullRow opcodes to be generated for
-    ** every reference to any result column from subquery in a join, even
-    ** though they are not necessary.  This will stress-test the OP_IfNullRow 
-    ** opcode. */
-    isOuterJoin = -1;
-  }
-#endif
 
   assert( pSubSrc->nSrc>0 );  /* True by restriction (7) */
   if( iFrom>0 && (pSubSrc->a[0].fg.jointype & JT_LTORJ)!=0 ){
@@ -4315,35 +4300,6 @@ static int flattenSubquery(
     return 0;       /* (28) */
   }
 
-  /* Restriction (29): 
-  **
-  ** We do not want two constraints on the same term of the flattened
-  ** query where one constraint has EP_InnerON and the other is EP_OuterON.
-  ** To prevent this, one or the other of the following conditions must be
-  ** false:
-  **
-  **   (29a)  The right-most entry in the FROM clause of the subquery
-  **          must not be part of an outer join.
-  **
-  **   (29b)  The subquery itself must not be the right operand of a 
-  **          NATURAL join or a join that as an ON or USING clause.
-  **
-  ** These conditions are sufficient to keep an EP_OuterON from being
-  ** flattened into an EP_InnerON.  Restrictions (3a) and (27a) prevent
-  ** an EP_InnerON from being flattened into an EP_OuterON.
-  */
-  if( pSubSrc->nSrc>=2
-   && (pSubSrc->a[pSubSrc->nSrc-1].fg.jointype & JT_OUTER)!=0
-  ){
-    if( (pSubitem->fg.jointype & JT_NATURAL)!=0
-     || pSubitem->fg.isUsing
-     || NEVER(pSubitem->u3.pOn!=0) /* ON clause already shifted into WHERE */
-     || pSubitem->fg.isOn
-    ){
-      return 0;
-    }
-  }
-
   /* Restriction (17): If the sub-query is a compound SELECT, then it must
   ** use only the UNION ALL operator. And none of the simple select queries
   ** that make up the compound SELECT are allowed to be aggregate or distinct
diff --git a/src/test_demovfs.c b/src/test_demovfs.c
index eaba208732..29307675bd 100644
--- a/src/test_demovfs.c
+++ b/src/test_demovfs.c
@@ -462,21 +462,23 @@ static int demoDelete(sqlite3_vfs *pVfs, const char *zPath, int dirSync){
   if( rc==0 && dirSync ){
     int dfd;                      /* File descriptor open on directory */
     int i;                        /* Iterator variable */
+    char *zSlash;
     char zDir[MAXPATHNAME+1];     /* Name of directory containing file zPath */
 
     /* Figure out the directory name from the path of the file deleted. */
     sqlite3_snprintf(MAXPATHNAME, zDir, "%s", zPath);
     zDir[MAXPATHNAME] = '\0';
-    for(i=strlen(zDir); i>1 && zDir[i]!='/'; i++);
-    zDir[i] = '\0';
-
-    /* Open a file-descriptor on the directory. Sync. Close. */
-    dfd = open(zDir, O_RDONLY, 0);
-    if( dfd<0 ){
-      rc = -1;
-    }else{
-      rc = fsync(dfd);
-      close(dfd);
+    zSlash = strrchr(zDir,'/');
+    if( zSlash ){
+      /* Open a file-descriptor on the directory. Sync. Close. */
+      zSlash[0] = 0;
+      dfd = open(zDir, O_RDONLY, 0);
+      if( dfd<0 ){
+        rc = -1;
+      }else{
+        rc = fsync(dfd);
+        close(dfd);
+      }
     }
   }
   return (rc==0 ? SQLITE_OK : SQLITE_IOERR_DELETE);
diff --git a/src/trigger.c b/src/trigger.c
index 3b7d0d9e88..1c62fc231b 100644
--- a/src/trigger.c
+++ b/src/trigger.c
@@ -351,6 +351,23 @@ void sqlite3FinishTrigger(
     Vdbe *v;
     char *z;
 
+    /* If this is a new CREATE TABLE statement, and if shadow tables
+    ** are read-only, and the trigger makes a change to a shadow table,
+    ** then raise an error - do not allow the trigger to be created. */
+    if( sqlite3ReadOnlyShadowTables(db) ){
+      TriggerStep *pStep;
+      for(pStep=pTrig->step_list; pStep; pStep=pStep->pNext){
+        if( pStep->zTarget!=0
+         && sqlite3ShadowTableName(db, pStep->zTarget)
+        ){
+          sqlite3ErrorMsg(pParse, 
+            "trigger \"%s\" may not write to shadow table \"%s\"",
+            pTrig->zName, pStep->zTarget);
+          goto triggerfinish_cleanup;
+        }
+      }
+    }
+
     /* Make an entry in the sqlite_schema table */
     v = sqlite3GetVdbe(pParse);
     if( v==0 ) goto triggerfinish_cleanup;
diff --git a/src/vdbe.c b/src/vdbe.c
index 686ebf175f..ebf52e67af 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -4897,12 +4897,16 @@ case OP_SeekHit: {
 /* Opcode: IfNotOpen P1 P2 * * *
 ** Synopsis: if( !csr[P1] ) goto P2
 **
-** If cursor P1 is not open, jump to instruction P2. Otherwise, fall through.
+** If cursor P1 is not open or if P1 is set to a NULL row using the
+** OP_NullRow opcode, then jump to instruction P2. Otherwise, fall through.
 */
 case OP_IfNotOpen: {        /* jump */
+  VdbeCursor *pCur;
+
   assert( pOp->p1>=0 && pOp->p1<p->nCursor );
-  VdbeBranchTaken(p->apCsr[pOp->p1]==0, 2);
-  if( !p->apCsr[pOp->p1] ){
+  pCur = p->apCsr[pOp->p1];
+  VdbeBranchTaken(pCur==0 || pCur->nullRow, 2);
+  if( pCur==0 || pCur->nullRow ){
     goto jump_to_p2_and_check_for_interrupt;
   }
   break;
diff --git a/src/where.c b/src/where.c
index 3e90fa9a7c..b0c0ea7d4e 100644
--- a/src/where.c
+++ b/src/where.c
@@ -743,6 +743,43 @@ static void whereTraceIndexInfoOutputs(sqlite3_index_info *p){
 #define whereTraceIndexInfoOutputs(A)
 #endif
 
+/*
+** We know that pSrc is an operand of an outer join.  Return true if
+** pTerm is a constraint that is compatible with that join.
+**
+** pTerm must be EP_OuterON if pSrc is the right operand of an
+** outer join.  pTerm can be either EP_OuterON or EP_InnerON if pSrc
+** is the left operand of a RIGHT join.
+**
+** See https://sqlite.org/forum/forumpost/206d99a16dd9212f
+** for an example of a WHERE clause constraints that may not be used on
+** the right table of a RIGHT JOIN because the constraint implies a
+** not-NULL condition on the left table of the RIGHT JOIN.
+*/
+static int constraintCompatibleWithOuterJoin(
+  const WhereTerm *pTerm,       /* WHERE clause term to check */
+  const SrcItem *pSrc           /* Table we are trying to access */
+){
+  assert( (pSrc->fg.jointype&(JT_LEFT|JT_LTORJ|JT_RIGHT))!=0 ); /* By caller */
+  testcase( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))==JT_LEFT );
+  testcase( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))==JT_LTORJ );
+  testcase( ExprHasProperty(pTerm->pExpr, EP_OuterON) )
+  testcase( ExprHasProperty(pTerm->pExpr, EP_InnerON) );
+  if( !ExprHasProperty(pTerm->pExpr, EP_OuterON|EP_InnerON)
+   || pTerm->pExpr->w.iJoin != pSrc->iCursor
+  ){
+    return 0;
+  }
+  if( (pSrc->fg.jointype & (JT_LEFT|JT_RIGHT))!=0
+   && ExprHasProperty(pTerm->pExpr, EP_InnerON)
+  ){
+    return 0;
+  }
+  return 1;
+}
+ 
+
+
 #ifndef SQLITE_OMIT_AUTOMATIC_INDEX
 /*
 ** Return TRUE if the WHERE clause term pTerm is of a form where it
@@ -758,16 +795,10 @@ static int termCanDriveIndex(
   if( pTerm->leftCursor!=pSrc->iCursor ) return 0;
   if( (pTerm->eOperator & (WO_EQ|WO_IS))==0 ) return 0;
   assert( (pSrc->fg.jointype & JT_RIGHT)==0 );
-  if( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))!=0 ){
-    testcase( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))==JT_LEFT );
-    testcase( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))==JT_LTORJ );
-    testcase( ExprHasProperty(pTerm->pExpr, EP_OuterON) )
-    testcase( ExprHasProperty(pTerm->pExpr, EP_InnerON) );
-    if( !ExprHasProperty(pTerm->pExpr, EP_OuterON|EP_InnerON)
-     || pTerm->pExpr->w.iJoin != pSrc->iCursor
-    ){
-      return 0;  /* See tag-20191211-001 */
-    }
+  if( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))!=0
+   && !constraintCompatibleWithOuterJoin(pTerm,pSrc)
+  ){
+    return 0;  /* See https://sqlite.org/forum/forumpost/51e6959f61 */
   }
   if( (pTerm->prereqRight & notReady)!=0 ) return 0;
   assert( (pTerm->eOperator & (WO_OR|WO_AND))==0 );
@@ -1179,22 +1210,10 @@ static sqlite3_index_info *allocateIndexInfo(
     assert( (pTerm->eOperator & (WO_OR|WO_AND))==0 );
     assert( pTerm->u.x.leftColumn>=XN_ROWID );
     assert( pTerm->u.x.leftColumn<pTab->nCol );
-
-    /* tag-20191211-002: WHERE-clause constraints are not useful to the
-    ** right-hand table of a LEFT JOIN nor to the either table of a
-    ** RIGHT JOIN.  See tag-20191211-001 for the
-    ** equivalent restriction for ordinary tables. */
-    if( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))!=0 ){
-      testcase( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))==JT_LEFT );
-      testcase( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))==JT_RIGHT );
-      testcase( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))==JT_LTORJ );
-      testcase( ExprHasProperty(pTerm->pExpr, EP_OuterON) );
-      testcase( ExprHasProperty(pTerm->pExpr, EP_InnerON) );
-      if( !ExprHasProperty(pTerm->pExpr, EP_OuterON|EP_InnerON)
-       || pTerm->pExpr->w.iJoin != pSrc->iCursor
-      ){
-        continue;
-      }
+    if( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))!=0
+     && !constraintCompatibleWithOuterJoin(pTerm,pSrc)
+    ){
+      continue;
     }
     nTerm++;
     pTerm->wtFlags |= TERM_OK;
@@ -2852,32 +2871,11 @@ static int whereLoopAddBtreeIndex(
     ** to mix with a lower range bound from some other source */
     if( pTerm->wtFlags & TERM_LIKEOPT && pTerm->eOperator==WO_LT ) continue;
 
-    /* tag-20191211-001:  Do not allow constraints from the WHERE clause to
-    ** be used by the right table of a LEFT JOIN nor by the left table of a
-    ** RIGHT JOIN.  Only constraints in the ON clause are allowed.
-    ** See tag-20191211-002 for the vtab equivalent.  
-    **
-    ** 2022-06-06: See https://sqlite.org/forum/forumpost/206d99a16dd9212f
-    ** for an example of a WHERE clause constraints that may not be used on
-    ** the right table of a RIGHT JOIN because the constraint implies a
-    ** not-NULL condition on the left table of the RIGHT JOIN.
-    **
-    ** 2022-06-10: The same condition applies to termCanDriveIndex() above.
-    ** https://sqlite.org/forum/forumpost/51e6959f61
-    */
-    if( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))!=0 ){
-      testcase( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))==JT_LEFT );
-      testcase( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))==JT_RIGHT );
-      testcase( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))==JT_LTORJ );
-      testcase( ExprHasProperty(pTerm->pExpr, EP_OuterON) )
-      testcase( ExprHasProperty(pTerm->pExpr, EP_InnerON) );
-      if( !ExprHasProperty(pTerm->pExpr, EP_OuterON|EP_InnerON)
-       || pTerm->pExpr->w.iJoin != pSrc->iCursor
-      ){
-        continue;
-      }
+    if( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))!=0
+     && !constraintCompatibleWithOuterJoin(pTerm,pSrc)
+    ){
+      continue;
     }
-
     if( IsUniqueIndex(pProbe) && saved_nEq==pProbe->nKeyCol-1 ){
       pBuilder->bldFlags1 |= SQLITE_BLDF1_UNIQUE;
     }else{
diff --git a/test/fuzzdata8.db b/test/fuzzdata8.db
index de7799f945f521444c9788aa2f933692ca84a6ba..aff7e27340cd560731ada86f167851c766694516 100644
GIT binary patch
delta 10092
zcmZ`<349bq)}QKQ?vPB*$vuHU61sZ2XL17}2@r+l$U!*d%#edyG7u1uBQe7&h!Czk
z50FF=L2v;%N(D4oMMbXQ!LEuJT)b9+g#FfQ1-{n<B7)BES8uv&s;mC>>ec_fdOfu-
zze8%b9VHFXwm6;6x<U8b$GV25ig7w;xvs8aSp`{E!7Z!cmsJSMD#T?K`ehY{WfjI{
z6{cks=4BO@Wfj)_6#?GkWCd*77uywnJRT52`ZDW@fF;DJ)9E7~nx@k|y!K=OmM&NV
zu>@hUVF|_(f+ZA77?yA>5m@Y4BC$kaiDqk0#?1P{g7B6QD@yAIu<ncfu_yN>*M0-D
z#Zf<Br?W)YKY%j4ejZ9w{alnn{cN4ie3d!($L=Fbt&jTp;^TF`9F!0E`k<WY>y5J9
z*9+x+zHF5D__9#;@nxWN`_fS+`_fRx`BG8ZeQuN%p9?#`?o&|y?2}Rc$460i_)<__
z^d+PG%9n)lystaTkA2-xF8!x30l)s?bD;dt7mxC^4^?kD>5D=6mM<FR8@@=C2Yq&w
zyL}NTpY?^Ke8Lxka*Zz#<qBUHln?p>P)_rqVk{Lt6Us6l>f18PXFxf^C!#F%2`GpA
zc$CB9d>noa^bwS~^-EFqs$Y!KRlf*j_lK{sSS)c^;;}feBw*=^r5lz+ELxi$Sdy?L
zV@bi%lU-wy!EPWCI`S2X*y}B@5My&zeYK$bdkvf)Kv(dp%M9cvDTKJ7p}*7(0h_<y
zDAvysbT31~Bi3AqFQENd^?TBKBB-u3mF<};O(YOhAPpet;FY9hTzNK-i}W5CK1GU#
z_FOdv+Jb2UR4<Ssu-7%mxwueQRh4?<lYaBtT?MvM$q7LVC82Sl6pH0ZD6-o{REqgW
z@PyKPV$EaSX&Dvcvoq7mRS%A>dMYy~Ro(n-ctQ3;rz+)xTt>q}T&nqI&%b`TV9yFE
z$yAl5ruiR%^DCsS!~@lVQk0mXRl(_Z=)Df}*mN~33r9(<P}4k>c<av081HudS^@bh
zrF)?xf(Aj*6>5UKY+3~B5~;hOjRdWuB^esL79(65E#<=bFQhPS3O~X5NP8+=P7V>l
z`-wCV1_^SHI6pR*d92Ho=C0BvR*|Ku?weC92M<ppp}IE>3dAO<x0<+BaBZWBQ2Ru%
z2~uWBR_m{G^ds;zNp|?Tf`*YQ=o~7=>Tl=*JVi7gcC41d8|x6_*zI%>6g5bCt}+X}
zp;8E!RspTsX&6kdqLi4SwLwbYQn8DkGzyot`ka(##T7_R%Sa#ZR<kpKPNsIP#_dT>
z^{Wd`KO-gG&_YX?lw?m=D_t%Xm8li&QBALES~?W}TS|iFLsB$qMyG?~a48%no|3{N
zGEm*_%v5*Q_$)VGWoK95LS&esZmkp^UR08Q@6dclP36q$iF0aZ&92OGVDHdcXNZRA
zt~M*Y^)H7l-sMy)C3Vr{lz#U)JdRNV3rY$cH7>`{{L=md9Z5;xdD0RFo2F1R9Q;-v
zG?Y4eI_@bc9O|e^b0l3%N}(x^-sXZ~1A3cF3I+`uP%!%Uci2^LbN`Zp{L%u4|7S;~
zqi`73CYR$qv<(S%@RRyF;B<f`22zuPg2g$GoWfzyYNj#p(OyfJ)bgBi31Rm(_ba$}
z(6HX-QG-ecn&(tjduDrZPRa9A9Qnf?$uv22o@d6~O8@9^{9;g?bwEjB(akYEu;yJM
z77}L1MnX_#7lYv@Rygmq#=`_^4K(&I96EGRX>T(WhY>qG{zgmyl;y}qF10VLiIc<8
z?h_J&yOR`X3X@~HA;g>7O-;r5k0=_TO%T;Kyr9%EDJN-4WfBy9CxmBe(@)OtS6EVt
zP)ZB^6Q|`V*ltKc|I(DZmuP6g(87}YV9znZJ}Tv=F8%7g@q}ZhXFhezp7p@giewKh
zr;}2sW9HQRlRZkB*6odz!7*!6{ZPvL^eOi%Z)AS|5hI57Hsj9vAGl6;iH4T<r9RN{
zuw-S0aZ+~zpS>hiu#OMWuE{UZ`XFw_VVSfVp6j3!nC&C!vfhl8tRq~8j>}-SK7?|@
zQyKMMme3|0A>z;2@pbUtBfY`iZkKxVoJ9xCYw73g%L`Hr-VtzoDwSya+yrI)jRJdZ
zm=sK)A%^C#m%fpTIL^X>Cnu&5R(}*ELj1l6BP;t(dIlfmp>qY-gE_vJ+6h!&mS(Vd
zSEQ?=I9t$NtYApO7LL{bEG;79HKcky*cAI^Xgbavfn8Q<3pgiIx$$qjfi+x{<`80F
zog*a!f!!ZTMreqjA*=_XpK`<qjZIQlC~Bl5ApT#}0HMvuTDR~5;w^%|HDeRCP<n*5
zi8M`b=5@t7qUc(5#p}EU{f$kz^>YPXE2nvea?N#h**vnoM$o+uo^;;t3A&??x0s*H
zuAd|5-kqm`Kf-B#P4j0KR`;{Al(3*U={o}L7wH<!zggk5UOmcAgwhP21b}O>)Qu(C
z=~)8_{H^^Cf{wzwK#GA5kOaJLy-0U!PX}pF$B8%iyY;G+3jZmUVmUPx^7qh@;5=xK
z)aKX)P&wT>PX^RYq?4iDK=cr_hK?nv;O&CsSTsm_pOiywH{_kT^<p3_UQ0)iEZF0r
z9(eR94TX0WOA(+9Mmob$ZLlXpb!!|SL)@?@%RU4e-bJOmpm~Yp0r&Ih-D<P!!6XgN
z52K|Twdcd-^VAN9lW9Dckqx%5r18)@h4z59C|dC=3BRsUZLb>~*jz;iL;sWXRcH@G
zgq|<xDR9Kv4M3Min4u{HXHfmEv5Q%yu5>lUQSL~A=GK^aqqakEd!S!^KG^OYHe$$-
z-sZGH!-f~&4y{VAN^y+LA2Ol<86|0E<?P9ouVvEAq?BLjV$J^y(N@Qx;SQIhu*Bg}
zQlW0KHFT86AtAH&$#JFL<j-Ve(i}&+zY$&}dmQ}=N=FqG48ywoVFMi5sw(&Go0OE|
zK=#6WkJjg~!cvEZ2k$(6U8<uTPJe9a0d?PW4Tn{ACIjgSoo$w$kas|D0JXmu3<<%(
z5rHFy4MIYlPpfB7y}zca9Eik4Ax)j%Y>nY8A>f@wA8nMRe(1L8N^rbES3}-$E{Oe-
zKn)xT1$COV5Q_Fo0(&Tt*72q=zpZG_z36#b3}yRi0PH?bhcjH7lO}PVpgS@^v)dUY
z2v<57i~WW(b-SQAUfQ7<ZZmp&T#4PKQh&H?mDc-BOxu6exPi~nA)1XuZYZK>U@29r
zVRME$hHc5F6FCwEwmDrRps*2*6L(=ZP@5&`_q%W!%gCWy4Z;J0?l^e2#^f@Lu-Z9M
z3nyct=uN7y)Pb~(Cvh8W^a-|U2(98tJfM@$ZyYAoGsoA`T7=<NGhuTW-iHpS2E906
z&>c(E=5^M;AGMgZD|o8u_w46!)Wnl+VCy5LFbtK>@FWpBdeH{9zJk7G5Ecr$@1Zj&
z(2rxBb}F#+cy@aI0!Hqq*NCV^#Yte>-lZ4oTTPGfBpKEuQkA9E&{I6Flb6{-q41<F
z9vX(*^iZ~hUSJ6e=;s{ixvn`pghec(-|<8O?<U-PR~H~VsXv4Sv8A=t#}f)2ZI(f7
zsE-~n5GQp0Op93QO1g_D3b>X_gIQq%-N!@o6?*c95<4D~dO-(AC6>E^erymI3A(rY
zX>|1w`(YCXK%%>OZ2f~^+e|NsTIin&u0|=Ib!(#SJnmL>3pr4GT`FVETj(U7q%&a~
zy>2jMY9^4L3C(Zfk_DZS#z4>sE}pR?R3M;cPzv@>>AYLK(v!XRDfJP}46<0W8{=Ul
zXfw3fDTCcZq*<{0OX-?s1le%#IL*-7WwXxXw1`0M_jEDDACkgZ{1-HmJ8+1O6vV}X
z?xa(j#Ul_`92E$GKS_O9?iqR*9gHj;hNY7w1MGT(7KwQ9vGf5~Fnv?I9|{deB#}iO
zq2F*Mhq=yC2Ra6~G@30sN+0G(UufMx$FZ{G^l_uORM4HO(grElI6Ut;p?(Q+xb+W)
zZ6Tz0<1ff&mw%LOe}rfrd;ViOj*xyDJ3Cn7S^61I`oo%`bOx(#r|Wn!0QOW%VQ}&U
z^|BQg=mG<|2i9Dr@$lWlQqXS>JCIGjNH=oiUO4@>q`;6&I-8-x{@KX+2sHmhr-_4}
zD)Z@B(9iTT5epFaUjUs<D6{`UzvWGXRTX(!Rgnw_(Y*abWM&{kq4)|0e0`5t7O=HO
zIl?4xf^It`yld;rzO~7roHzu#DT3lax<jLrWNm}oLpVH-B%I&|Xg;?uJh@ORgy@Mh
zm{dZ-L30ny|H6c4X&tmYB?-4q9cFE1i@`ODFJa5es7wNGPzj!?v<o0inhz~hRWypY
zNAoA6v_ryhSpAsP9Xj5nJ%4Z2cFmJ0TBjwDTS3Qy>vNh-RBiA31N?KaGMd(aQi#if
zo+QRF2~Sh*N;i0O&~BS^&`ztr(Wr7i?!;b`X)U}d(LT_UW-s7SNqe4^dIU_GgmHEy
z#@YTzJV8_wVEq)D9i8cSG}MK@Mq_lZpV9r^#RHyWabfW9^#P86l7eCRLkrLwVJJ8W
zI*$k2;hw3K_9`jpKcZy#ppn{7S~z>d2_+|GdMJk2$w{;veTDX2QHd4)t0_~bX_xS~
zsr0@cH)G#hA^5F}Ujxi^e^h<{S0OpDWg49X+*35J%T2d;GcbjwT~T&EDcJ!D*Q_yd
z7({BJw&V6tJ2@GHT`jCGg@%V?5}<mkIR^3uC<fRbCWk;vy+MSsOuT*aT_F@ozC!{1
z1A^i8shkBO?~Ss+p<_`dxW3F3V8fYppQ9|9qwJiML?>bJ3i%E3@lg9U1}*Zd$?-SB
zO>#j;F5tQQV`AJQ_;^A0j&<Fhs$LjM)KwsrwYA{6<kWhM43T`g+=zJ!8$;y*q9Ev2
zEySi-tS(f(BoL8RN6H%w!~g*a@-)-vm5Y3OLHEQWY?8@Xf;^BDN21}}2cB=j8^Q63
z`Rsvk{b0hLb2)SUOf?47;P7wQ#bi00Cu1QmEc8LPl*-7$;~+0GbUAxWmFMwfJmkfO
zCa}#X%^m_}dCqZA)@GgsQoeI%V{Aku3(u4<3S=TPzZ4ilm?KAi!5|t1-OiDIAo>FN
zCr+GzKqdh>W=Leo1LaS6483*?meH>bkz>uo#EM7Ce<Pv?TU9~+y`epz`m~H*x@V+|
zO&Kje#goZUTwpI_731X1JedN`JMBGK&ocQV-ZT|=J8t?(ZYbs=UuADq$PXFx7=G5h
zGz9^q!^yp}86KM<KP^swG0SIW>P-0*CsyK6GvJ!f@-91BEvNHjCd*xJ!9e$^d9n>I
zJ!!FkV<kGw-98cqDRrbPRC_rmTz(cK*1X})8hBxY9HH&Y`@t3^py!+~&*I4}m{89>
z#QwTSUd+R`)t1q0Y^}VFCtmO@l`+co$!B>o8`>K!Q`n40WZ=mhXn)d@2fdzDLZSK<
zO8~1}DL>7dY6>uB!X1TYv=Jf6EUiI4#dC8<L*3JsC>Fn7zF;5^u!G(%;|cR@lAqzo
zd<c4*<UroxE{EB*CRyak0w{jWSP9h=@n|x0i`>YQg<!j{Yj+47V?;O6TQ5Udxv`3w
zw#&~Lg#bbKgO=UNV2dxwOYv;;p*}^6_ZMwT^;rd78?0Gm&d_w}66ay{;&rxZb{4Zw
z{)#6{*qAHwvxFW0P)_6ElY??HSqk1haiNgc61@>>S40cY<p=o+RJR+pL(vP-W;Xsc
zc`G5c;LVE*fxh?ZQ&?V${02|z*qCeh3$&z1>)Gxj@^Fqk#K^_y8H80ImDlNs4_x=@
z^R<CLCM^Cv`2r!!So6mQ%s&-Hi6h{?vxZO&NG3=A3i*}MAKfuB;K-kW=M(uE@-Q@i
zZU})(ugk&E_E>Zu4T6`4>MspFwRL?2_Uww5pzNAFg8ACzr94@V@lUJ?6J1|MJ)*(!
z5~lx3&M}BxFkb4T*_x)ihlp5@kFVT1F&bmC!06FP&T&C(MyCuMc?`V4(GF-hYbb@<
z^5|OF9W9zLHi%gZ6aFDTqbaXDv@MU`r@{U&S@nCBJxgu@o#x-btC?4hSw|q}4Y@`G
zK7t|KX9;Owr_ReR4w|k<#j)X>GfgiB;?dHN5fGyho|2p{_OsC`^5Ub2b{!)NVhai6
zRYf{LZHj)91$1$KPsn=M^I4DrK?kD^x26$7*m#?BD@Qi4&NFf#`90{{R$0?ECJl9#
zM(F%lu7*CZ%WvMAz)JMNItxJOIk^~WpO16=eiBW;*+7hcs*khI&$YpDN@Z|rQ_OLe
z+trz(7efTyx*@20H*8LJ?l(2RG}{*}=)TalzMHL1agHLUryj2G*#zBctywxG;>?Xt
zzM}U93A!uL92J~#OCuFz?E&iK1+o#&pD@mWj(>-rW&>T$gPdhkmYRh$qq?)pp=okh
z8Rj!XWoQYE$b+SCnycC1bmz;Q;pxmQH5E^ysw{uSI<uU?JlPDpJ`NuZuSJFSXPf&t
zD|pfbyUv9#hUe4e-t17Gb621kF6f?_jo?&hDsrweZC&m4VZv~86;`=mO0hHDxMk%?
zUnp|BcIr-L|15SUapE(mzvq}x>b!0s&qL?jo*}St6Z)eEHy8uqldBOX)@z*esDW%}
zryFA>B<9CsYj9s5j1FVFjq&jWIzr=8v_*J<o$hN;aPfaMz2EqXGm-V2=KP3|9bn6h
zo6cs<aIWXcPUc<je4DUiUS}3ZUIbfi95Psq6B+Dp%=MPzB%0>evDwVB(D@@FyI|>m
zrDj-k%;|$Ni)ewPGdVnFUyKc76Bj#&8c76uahbD(6Sv{;FM;QJpp&)rGE-di;Rf7@
ziDuk8@i~UE5cH_?KV&a>mc+iu_N;W4@MIr&9*WhD0nU9q+0Q(GjonO`+TtAVH>d;5
zvm$m5VdlBc<^Bo=o>j4HS>s0MOrCo=2@>A2IN{h)r<LV4Ip5^TE6^MxOoW#8#K@*^
zaX!wIS7CE+<lT-|ivVp)oW0qWZO%m|VrL02InNPs4?;f7TsuvDe}mY;)B%n;emi{)
zyo(&a9C*da^W=5#);j(LMcWJ})^W%g!jl%}^*P=pjZ+;>?Eb$yHxRBhjU}9Qtm2_?
zt7)dT8h;1xO2<2XZ31dD7#h9_DP_}-I{O<)B-_>IEaI()u-%c&j8vC9D+}^I7rHa`
z1LrO?!Cd<}=QQ!{HQjwtQ23d1xA-Qud<Rx-3yp-b5WXwRZPzA!lnED{*Lm_T6Ta5I
zk1^pp&5TaKj?{o6cp*0+m{t9sbB|Gs5p+8=+ECe$tIoZgcpUp{gVvv%u~62PGr+`1
z&ahumDve^CpnHCizvWS*@;(vYTRYqr%bLx~1R|cor{3T2s4|Z&v?_C~B%WQeD>j~d
za3Dq*t`{AGu2I{ZDtn}>@&F-c4kRj}c+M1bkB;$I59+RbqZhm33y5)epTs6mC5SVA
z@~G(RijQh;t0!x6DiewL5sq}0395p#`V`LODm|GqP5IEkeU=XS*UTZ%5yVSurmEy&
zK5A7^0Bgum=5VB4Yc++i8TrZ-gV-J4g=hoyfa?R54W`dGj`Af6x>wxV*qB;XOzgxU
z#m$N5aIk-|{H?r^FzZm|2aa5T*5@O7L(zT8BkNl1MJ%FN`HmxBKx<KC8~dPCc|AbH
zbkgP;>?sirO;Y-qzFt1p*8@51{$Hyw;pMRkFt}XVCw_?od;`tL3}G-~M}X3pZ_Hw~
z6-vE<d<$JhMvY+;W+>0`<U1x*EAxzEvY<PBqo0OlN))T!6Sb0q+J*=LCXR^Or5)q{
zjpcIV>WE(sELJ8PMcn=`#ApLEd|(zQUc#S|6U)V}tj8nDLq?Gbx-FU}9PC7c5<*Nr
zJYn)lg6^eotq!ox06}Y&nWq0+JKKj|^Er)n6WI%El@TPM6Fd8FW%=~vq#75d3-(8Z
zVBn%$;K}!}C`^lg9#_D?{g?utZ;fG4+g~w(ew}1vX-x`e6=hVD9(#*qr8|`!y!aFL
z_6y|yGcFh8iwP~y^LrGYTxG&OZKbclrbcTNi+fqgGZKYOY*D`F%vN2q&F93W?19~c
z!0b1a$Hf2P+du+q_Qp<!c8HD9IPtFpdY)01LBnL^gstb4G3aCdr^i@ZXXT*oQ0!<{
z)~-B_l{Rw_>+-pB1!LgrH-5)7#3!*6p{+hP307TDK4ujsl&3k)DzNis5|Chn%!b$4
z`O``Q*5NCkZiYvpY+-yREZu49xJ7S~42S=x$XN~Gh1f^`2+}yhS&dLUAs!Fz?FuH4
zttRjch+n~Q&>FlmGw)P~71ONWC@Zy;<faZ~s@`gSahy+O)=uRLr?={HIsqH%Y!Y)A
z?M)mz^}UitNEaxcCk|($epGhyTJrTOO~jbROASo9s(iqaAgF5&9J0Si-D@BiB;6Ny
zFB@!BU*<^&RR6$5fVDGl5yZc0JICe*sH?Qxo99eW1d9$*zvj6x2asLPh;<X<!kIf%
zJ<VIfGt;uu($dS(k;0nuuAZ>n!B1~A+c&b@NcBw)y@C*<&NS)Wg6^lXbg)Ib`$2m{
z@L+iHUE42>N$PdchSP{*o+qRL!fYw(6%HxS>!IJW%Tx{JNetwts;@(By1fdj@f9BP
zxKxadW1-m)5e4np(h#kBJbOD$ebHb}6?C6YOTUgE@OBzpY*!z(h!^pFuGIma9ue~1
z-Jv50Ywu7a$bkcq<r=+P6TovnKLwqlx`sDQ%E-nlOsY)`Lpr>q?qY2N)l|%^tvg-V
z4V)+K-Pq6?buVwoaATInnh3U9zJg6DQt>>~9nOaarLnA1^%zfjfa3?HFBD1k09H6!
zMaPx|#VcYQP&7Gm3wvjr>NAowHndWGi4*ZXw6*8Dy3h%1(iF8>%cIrpj2r}xF-lhr
z7W!(+TK^K6OIY3@^|0mxt@673Zar?{Ilyaqwfx8jp(9@%2pa|W6RfOQeU`%v+i#e_
zCfSGF1cPbN-@y3PD@J`f9<Ltn!&>*Ny*X0_4uLPyt!c2wtygc;8f%)SmJ@t&cqhUP
zK!hK$Paju%@Feq2bXj+yYu3<Z--eF#x?N-2G>!GX9pp~+KSp*i#WjEvwZ8%M-CGyx
z`)w&b{-w+X?>X0-Y;&9I9l{!3Q}Ino9^_wAPXeyuDpuC24Vr%^xPEtm^Q*4^?cfI7
z4$i-v1-FCyK%HwKS*-6_bv`lQdpy>cd8anDKRgTs7gLYztqomv6L{l+$PL<R4uaNV
zbsH2N3d96!3BE}2&j4@+TeP450<A-o!B9I(t%bZx>M6}8C;81_Fa-U>)dBKJd!lBS
zU;8VEKtdrVe0uWkGoa2_0h<19uVg=Ts#XpYXSNWG{@a#dCbQ_<fJ8uRJpsEv;M}b2
zznXT2!J6@Wjb<fd2z&1*)y0uQC|(jd51Ksc3_!yzh1Js|Ls{N<G~InJ46Td*#7Ii+
zGLqqUnsMo!Ycb-F*J9-DYccB9S{T`1VqCBAWc2N8;c#h&(ySRu5h`!&pP(Ce7rOCx
zqML9hx`}^`uIzSno?GaC-T0I4L`QnDL;KbKoHz#YRsIRSs=M$_z7yY+JMm5ZV|>$Y
z$2a{hd^2vxr)@KWrx-szjRt1@3BKyP@OkgVH~UU}bN(0~{z>IG;+%UsK0gi2y9-~R
zoA~ZWd<*`R*caYS><`{W?2G=G*cabU>`QLPxAb;=ekQ2B9bb#9!>G^Ec7NUtF11u-
zYJXnBe@9vC*`6&CM+ifb4&tC_E2q7OwEBRIQSvpS@5-^s@3}T&{sYdxZI5r97dZ?*
zBkpW%zhj#D)vGQSX8u?3ePQ=MT*LXlx>BI{ANsC0JQB2Rk2FHw^2k`N(}$t%m>u8l
z&sR&?(z7lfPac8d|5HC@pBUZon4r{Im$Tv@)tQ7%4{)#c)5eNh(@0{2zjpOAk-ltI
zr_0NU4`K7i*15tyxaB#w<Eaz96I?G*@6kG21^I6qLvIpq`%kWJ99hlw3{(&JQ4ius
z19V=DioF9VM&LT@8feZ}YXCtWX6d5)BuCaVXQ}!gujyG!+gR5z=Qec*VY>p{r5xrj
uYzu;-G&kypd6+OR*ew|Jxv2A}5&`|!CZ=9-9Y=(R4f=JvL+i9YR{lRERa$uf

delta 7640
zcmZ`;30PER_n-GJvoM1&GVBZtim1%pW)#F7P0Lafaw*M)N!&FVw=y+BF1e;C%Bj=@
zQ`6MMjZ>+mUz+BMZC|Dp_VrbMW<q^`H7os}OMOOY^E~IwbKkl5eShy+e($+w3O2vb
z3f?%zO5&X{CX-{n>CaEda;c3NV^SX13iFEdSaBX#oW~dE3B`G0ah|z2&r+OcEzYwQ
z=Y<sK*^BcWd-FnrC)pC%yvN-PZk!B_U|Hxm75Xf*^5rIzIeOms`72I`k~AR+BMB#Q
zk~AfWAaRjIl0=b2lf;n3lEjh3<BHP>lmBh!YD}}4gFrgwgJX~TMw-cF7k<ZVPbhkt
zuA+-(kZxKuopfl?G~@T8sU}m%ZB+KU_prGpM-e?>USGu1By;qRq^If~NRQLolOCaG
zk{+nHBi&oiAf2hFlUDRLq*HW1={Vg-I$YOChv+IT@tdxYuG1yb-|Ggbf9tJDf2F6A
z{!(v2`kbCZdhUmMGx|EIdq^MG6G^|XyGb9_6G*?S$CEy&$C7?SCzsgw>QSV(>yf0_
z>n_r(^a#?6^>ETfIvK-0Tep**q=%3ms#{49(#@nF(M8e^>a=0|13E|g{zRS8S5KX6
zX75@wmvlza9MZm`S)^OdzlCm+M3N*D4@ojfGm_>cDI_gOQb}5p827g(NyA&{wZwQ#
zZWH^KRO8R;jG}zORFw}G$4ciR_9yQ*)@y6TqRE2k4M<+#=n6^Wr28=c1Mf-(zOzl@
z;oyhfPEb4F>%e}A-WCkL+~v)~+JAc^ICcXL&GL3F>mcRBMwdJsotL~<&9uXin-IL;
z`z{{+ueT%5h5P~)Rnk}Z%?)n?UHuB4E8a&SYbnim;9+kBgAz^ZjJtmGW^-J~ZxHC5
z&<~cK3l|}2PqcM!uC$&Wx&?KMxK#9nNHq-dd1)ffFiXFQVo)$$$wS(Tox`Fg(rhOF
zOtxd-RAa6}`AO~w>~MHDfKnvMP}7IEU`bPHDq|eh4f0wTR9^C0p~NdiU}~iFImdV?
zEB7{o?6;(W5L)4VxE>`C${cvTf_~8Yc^6=Htkl+Q<xB@nOf?-W4ffn)SvRO?s$hBt
z0_l9c0b3ZMAZ~15G(|8SpJCuT!Wpq(xY`V7ewJEPg-S&X4z3nsFubR?6KBMQ1<rQS
z-p5m|qzs-}!Pnc{99v4#1q%y-V5zjY%<JtA`OT#z;Q3Zs23aS$aQwBWWZ{?{wDI0&
zAbYP@z<Ir-Lf+;W{l^EgPe?h&-b3KvWp5Uo=`2Ozfj-h{n>bA{9qD0!o5+j+wvmKs
z^&h_va+17Tp~fj!Ky7r41u6%4?}Muj?@I7wc$*kz%qK^1avuYDIApt|Phf7ImJjQm
z)P~@OVbTbWIbrz@DH{5{B@HsHNt5)I9)bLAQVe9B@(#d^fV9aXOczWiA-E}_D^ldu
zaAFgh&;{AwNh-FPC{^<;5}YpSMO>RNjpkVt1j@bL${zL>q32ic3c@g6YX|Eh>Du*_
zWHE~~1k;HWV^bIEEpFszECg0c*YIY6WaC*JI6HY;qpVAx@GKr`hf5{6a)I=oMR-~;
zU4y#tuzDavnc*+@D-(*ILbgJ>#fX1R_C#=QY0?3^tdx%MED4tPk~D1lf^>#w9tfh-
z1^rGtlc1!((+s)mrLQr0t@IVgl1nS1A~3pK`krUaAh^~W1;4GO2-B`dgyY-|lFqZ{
zP+M((5c_VHsw}Jp)FsN<IG|G6!LwBGE%f%retV=nJZlNv%EDX1K}kZW?Bksbl{dY&
zkPLj>EIuQcj&=vy_&L0ONQz`)>x##VW`grw=?5`|u&05q%$tPG4@)&X^BS4k844n#
zT&y@IJ;5^xg_F{4i$yU4AiW(dZ!c4vJ>U&Tyd((>v>}oNF-)ETH5O)u@V!zRzRhHv
z83CYTh2J}Z@@Zxih1p-w8SZZn`)Z{O<3<hZYNc!j1#$8mNZRj>!X%p<%T?7#g9LGw
zU^=ZBJ6HgTIdNeS7AkeZt~aFvL=m$00L&djF|^}bDO;3jsy5(Dl@1%%eWB!tSH!qW
z(j|_yMIR@72#VkP7|y;T&F5G;9C}k4in+DY3s!NCU^+9}SY)J;qwO{dMYAbK9rsxF
zAQS0`v1cOXtIQb?X5g#0q@j$pHxkveH%0!EXB}X9kmx91kV|>i5q9Q#BjI$N6vRbV
zd8UPRhULj}5_~_O40(q?!*GmKUc<32aQ3KIg<I{VDM$o*)5;aig$lPkUd&pZTl6f3
zC(2hD>s0ou6oWAy`7&?ou4x&XU(<ZBe3F!feNtq!upW@}qdgM39I?;D6_Oln6HJ0>
z3nU+RcEQW(vWsK)mGzN(h~%oJ&y?;Qor#5g<R1iL!TcO~jfDviI#?cWduYjQofk|m
z&Zb-1Ar6*%abhnrKyL_KiYf!o`H%}$QRdzZH;z-f*1NqAXicLo;gwuDif4TxE7CO!
z=jO>2&%~Uuu7&vgSa}A|`azc4m5l37hXfepKCKLe-0G0Y;GL;#D|1K3V$@{$iokL(
zWLH=ML(g>iHH#<;rfq}jftcsWKXYO>0T}@7ge3)A70Bm#HW0QJ$wU#l><(dO%vmbG
z&cyz7*JIG_0aq&I+mukKOpEp5*b;d)&jv$I&zM}yTPd&O*$}AM7L$r;FUaS3+v8+T
zvg#9l$l+q&!uQt5^DJhoXe!(_mH?!~>C18mJikGHSsb=KQ@5bDQ9i?okJ3`Z;g)Vc
zj;A-v={y^OT^HI9aj^Pz*$F?qWVeH7iM<(A>O^3z3n}sQgPa0aUtyt;wOE-3ubq;k
zjg-g*XPiJBR4Gs9SpbF?ar5xGJ@Oo$Jpo&m*&oHn-;g)+Y$OCwrt@IGe1T_qP*Y|f
zixUsZz_U?M^O8LaI((qIApcE!D2_TTzs%c4_w)oj1NwOakUTJ=6}CMlpW(SNk3r$f
z_Bc#BDSvHY<8WWF$uNe2kLC3o8xP?}DPFS<G&z8`K9xnDO@N%|t)n1+gjK*v7vwUY
zO$6uQW-TCWh?SDAqgjUBk=D^@yC|=>3L%2&x=})8;G9%tE(6cU=GI0r^yKC?I)!94
zET0{cVOY~Aj-}zrrOxp&nDD*)Ezk0CNSg8r!;_&(TMo|uB)4Kg2zE+zLDs?eHBhi9
zUVtX5@+0KeShhg+Yw;mC?3%oZu_+MDN{oOm513nH)(!bxo=wFe8OkO)TGQjrSoxdW
zpJUUIU5TH_FrO)<W;O$SgU#KHg+F7M6rz01*i%^XnT6;pJ5C%3gD+TI29S0fdm6fp
zia*zAWuTS6gg}I{p3Q`cuPhPp!*#hSR6ifz$$${#A^#gon&H`JVCRl_FXUz@15uAr
z=JIS7vM1d(2I1etEim8&8Jd%n&K8j>=WCseXftd#kBLUf{OqO?@pQh0#XkmWzr=8y
z*jfRO&4pmocn_3Zund5Lk?{pk886zP@|%PeFg#3IZy2uyR4<I*W5E7DR`6Goy~6GQ
z9bccqg&33*N*Q$iMV@8=ABY6^6~^Y_nOMcgLHX^tMC{)|X=@f8RBP2^1j1;A)gu)j
z-po=&UNoxKVq`Pj{TO78j`e_69{&=C-mhF^>^a!^Ww;9A`{FHkwh_T_*n`R@j?Krq
zCQ2ClE9eGZHf&9msmZ<o>Y6I~(CNB-_|68F)E7+)p)N|vfr3{PJ%8Oq`JXY6P`}kh
zSQlq3MqA2-Giwu0V%H%`YqJ<Gm`eMQ?ftMWSJ`VT-8DrI6HNa$lHZTZ0?MPz_Wb-j
zy@_C2X55wzDYSFzk~htIs9^dLD&m@E+_6X=)2s3nUSLb%;wkG?sQpjWS?o1V*~i(J
zWons3G@8HtNGKl@nG4lTT{0XDi_U_%hePtQ_ax;F&Qj7YQ){EO0d180E!O2LO?kE)
zc6=7~7`z?lx)0Y)Q}TGW0(N{6H3wduBzMI9Pb)jZ#0bH(ehPuppnQR{)b_%%px#t4
zts6~4J{Y@DNw=0Q8KgUj-HjTx4Su>%X~~Hz$+CdL66Lmqy$E&F(;{Ha+BiGRT4fD`
z^S?#gu)|8_eG6NSXUp7PqUIOe(<ra^#YbYLH7SWftt+v$;hr^kwu?n2=ijh>SXQT`
zVA^`+9Aj(2*)DMcPTrub<k`y@JgFRIcw&o^$+30d?3zdnwoM@hD@WgZp3@YX-?`hP
zeV1~Bu?m=LlPX{~uj-I%7wz!=BrXaPuec*|#9pPZmAP>H0p$@+e2JFd0D;?K3YIss
z45b6+nWT0wcblyik~&)+hwyimpV&qSJnP<$I}a<5@N5$V=DDe&I;K!X^(qFQbFX8l
z-B5<r$J1sEEOJj}7_wbiSU<1@0!!U1u<Rpc63@NX5|ZDuD{z9T4($4=a+qgZp&~&T
z0S8wyD^9qeyuh<<u&yJ~ZtWqv0M%7WN8C`O%(k&eO#YAZ1ruK(#5>Tp&DMq8fmn-L
z56{&4Fs+2(Y|pP%bqde3oe(VW{0p)-TWnbSUnPQPyD+GGj<d3Ho^pKhrm~80yW3*&
z1<z6*`fajJGMupof=fKd>Wv9x%%)IsDPjOlVCsDq7KJ;kYBuk9o$kYS8Et(2%uLAo
zN@#(aL){U=VxT5U9WTDQyoFAMd$d|9R?(er!P3pHSjdgwn_<@&l{UQ(g#`6B&-SC>
zF}@F=kfKr)y#rg@gl5BQT|=AVXi42^6=Ma{R)aM(?31qU=ES#YzJI_WpX!F(W}F2^
z#Bvr?Gu2U6F<vmeY7`$DzMrLj$i%}d`s;C6(On(R#6$Gh5m=n5&cJ7Ss8by*0e{F=
zojiN5YJl3`EV>0#nUS3uE*PRd#n`c`p{k3CiGpeIkow^VhpCs$qK95{hthRR9G<6!
zbJkOfMLmfgHO{RxEFZ0oVB!f{>NE;tjeVVgPo7fKP?@NHY~jwPL$_NY5l|b>dvVfO
zHH$&b((q6$nXXRd*aya4V;N4IsgAXX%>>gwjD=F+c7eLe_R*S0^<=^Hrr%f_Xl)yw
zDpdWPSWSz4jNLZzR)&sZ^*YBsfkUrGcZBTa>VndPG1(ZsQ2m}`|Aa%?vDNs|67`)>
zF@;il8qJgf`(IMK+df-3U2je#_T>MD5}-EV5TN&Jb&vQdEpQ$xPFNyg_|{OhteZ6x
z3)ZMb7WO$b85B1Jhi_0f^6U!~HmftNVhh1^;P-h-4ybXMzcX$L2L&b30*n|Kx5IcR
zx<GQVY+3ZLReRMjRxwpDy_R4sjP$@{POPDyzlMsDVlzxVsLr#BL=YPcOL*|qF*SnO
zF1={eTM4FJQN|e1m<7U*tCMWsteB#=6igcp-c7;Rj;jM%=)Y*PZ%2)s(5mG$UrTWA
zjgFwoMg5v*-@)uiqX4Q_!NUEgH3TkOBcWiHY6Ekr*NJUERXK-9hwwTx%@&ITzE-#L
z;$@oc2k7=`Vpou_Bp-a0zohc)Dhl5lp00(pWsW#ZtW~qD^fEN!hI)+)vHw`%)V<`&
zRGKCNru?ElFJ7TpeuCw@-4mb&+zAFLKF1)fiB=3H>l6oWiqeMAA@hq_Fp}}VP`Kay
z80N-kFVmniBpjQ>X+IK6-TwXe|AUJ2?h#O3<ZcN|6SU7TPt;!KIQuoc_(?J`Y<P&}
zZM<mHl4<NZ1e;qH--F;{k(U2d<m^8~5ZsIJ1!*Yb>^C82coMw_#c0%0vHt>r9!ZOk
z7M(^{zhZEl$H6c>SzBUZ3ao9VjWgSCZ6B)3=xD9|$eHaoXgjx86*|4>vBs2hct+9M
zGG>CD8Df8YRMWQcjA3E2oI*v*Dv6RhUHgb*928cB^}*~+ZMX5JQ9U^90qmWny}>gP
z@~?Bz;HV3m4M}e~zrg7|wWS=rTLwM}kH+|3+IKu>@c{c)i7p+U7=`{m+F9OiZP&Ja
z+qUT==_rNevHmpJ;^8Nhg~Y7Et~uIaj@eKcpiQ!wRl)RgZaO$~{N16Zq-k&1e%$$M
z*$C~n$WyP-fq@sjp$we?+8R~l!D8t$Ud_{7JZl2oCTQ<KL3+$+$e*NTVqly`)o~b9
zSfb;groFe1F+2>9PSmzrLNvkj`S|qP^nqZV#fLklY1zC;Wv`<t1X82r-IcC^3~O5X
zqFGf{>_~&*9T5<Ck{?UQqPCp3Jdt7aI$aPL5lM`g>f3?U1zH>GdX%2+*Bq47G0m~>
zHf=X=$?zL3&?s;g@Oe0Pfky8%(Qwff-WD^LXeW50ZjY*UfoyL~DE2GS=xmFHoJ9#9
z$Q~2B0gtWJbSv{=-?iE<PIS^t38jUu;rK+kR>3nj6mE-s5Iif?W(F)etrPLkL$O^M
zW)*4&jAPJ|RNAe1>K!~)Jas(ky2Z|d+L>A}SkuY>BIYjCUZG}3Lrl%?!qmJWrv2KF
zR<obpv|i|hhpuQHIa?mBL~U0`D(v)|wFbt+^7YzCMh%e0KwAL;J%^uHYpFbI-56xr
zT_DdHAiWJiN)18Q7>1J@g8W+h$;#T`{wvyjoJiechqk-WrT^*EK)p|W5RCF4#&uTz
zF@`1AG-@*Xp<Al&G>|)&V(!nzvTYi}YkL>GdK;!UgqP6}UcF!2HH7EzO}DUg?Beo0
z%|hCrbn9&!+mpKDjt=0vs-4(f;41zDcv)5KD#NWE;m|^DGi2`%qrTN5>OR)*0B8pr
zjGsHfAzkfF)wNatS*gA=MsPk+9}k@&Jj`DU^68iqBS62aAM66j^R;A1>*)Ukv`P)2
z{2wu+@Oo>XgJWI689^@s)z4BVGW&993Q*Xdg36CLKjz9lvQ8E(AI48JVs{9`4}3l!
z$GSnzv#~Rv{6%ddPy`QvWfNjun6-*xxGK{}W%hl46DK|Hij$s=1N#2P&UoP7&gj+9
z8I&V`B$*W-8sK}AXAd=W#$&#pthn!r)`JtfllA)k4Z4T#Lf5Y`y6nd2a_)`pk%s8{
z-$D033K-BB9c%YTB=;eFkNyolY7#V}gTamQ4QY(;@q6PN+7REcyYLNfh_61=GXKCg
zi0}pe2Hz8R;Tzc)UtVK;qwbB5T7iF3=$MB1>X~3{V|=(T;3Mzm61oY0OYjr#CiqEr
z5&V<)Ciuw>37-C?`4e5RA-Z}Zn9>m44PUL*+`&lxtl!Dhp4YA|!5mLA9d~YsKEja5
zI-G;-O&k?kCdUk5E7WcV;Wy)OOo)FCbwc3c(U_#N8L<z;m+k%SjdTZwZ>9Tv)KOi;
zcY(?<e}DdIUu($ur@7hhClgd}iM2x3!dR-oO^%sRcp|1HWLIhfaIVX*^XwVOk$j)y
z`7D1DwHHl}S(u~wCNZ4Q)4!~qHD=%0MoaAN@preej<~e7KgfynpP^%JsW0-QJ16KC
zdjF(T3T`jb?l&eYfNn>vu0MFU#^-O&u|nKgpjFkQevo7HpzcbXyAe_<py|&?sF<lu
z0|I#f(>wc5b4*8NiS_|+*x6{{IEqoJ(Y7+&(bGSGqfUl%W_X-&oYuoUz>s^$FIdc-
d$mXk4fDW*=sHOQ&62b!(b7`fk(3s=d{|DnSTG{{r

diff --git a/test/fuzzinvariants.c b/test/fuzzinvariants.c
index a601e7aa45..90f1fad492 100644
--- a/test/fuzzinvariants.c
+++ b/test/fuzzinvariants.c
@@ -129,6 +129,19 @@ int fuzz_invariant(
       return SQLITE_CORRUPT;
     }
     sqlite3_finalize(pCk);
+    if( sqlite3_strlike("%group%by%order%by%desc%",sqlite3_sql(pStmt),0)==0 ){
+      /* dbsqlfuzz crash-647c162051c9b23ce091b7bbbe5125ce5f00e922
+      ** Original statement is:
+      **
+      **    SELECT a,c,d,b,'' FROM t1 GROUP BY 1 HAVING d<>345 ORDER BY a DESC;
+      **
+      ** The values of c, d, and b are indeterminate and change when the
+      ** enclosed in the test query because the DESC is dropped.
+      **
+      **    SELECT * FROM (...) WHERE "a"==0
+      */
+      goto not_a_fault;
+    }
     rc = sqlite3_prepare_v2(db, 
             "SELECT 1 FROM bytecode(?1) WHERE opcode='VOpen'", -1, &pCk, 0);
     if( rc==SQLITE_OK ){
@@ -143,6 +156,7 @@ int fuzz_invariant(
       printf("invariant-error ignored due to the use of virtual tables\n");
     }
   }
+not_a_fault:
   sqlite3_finalize(pTestStmt);
   return SQLITE_OK;
 }
diff --git a/test/join.test b/test/join.test
index 82dbd447f9..f0ac0be8b1 100644
--- a/test/join.test
+++ b/test/join.test
@@ -1130,5 +1130,81 @@ do_execsql_test join-27.5 {
     ) AS t99 ON b IN (1,2,3);
 } {}
 
+db null NULL
+do_execsql_test join-27.6 {
+  INSERT INTO t1 VALUES(3,4,NULL);
+  INSERT INTO t2 VALUES(1,2);
+  WITH t99(b) AS (
+    SELECT coalesce(b,3) FROM t2 AS x LEFT JOIN t1 ON c IN (SELECT x FROM t3)
+  )
+  SELECT d, e, b FROM t2 JOIN t99 ON b IN (1,2,3) ORDER BY +d;
+} {NULL NULL 3 NULL NULL 3 1 2 3 1 2 3}
+do_execsql_test join-27.7 {
+  SELECT d, e, b2
+    FROM t2 
+         JOIN (SELECT coalesce(b,3) AS b2 FROM t2 AS x LEFT JOIN t1
+                ON c IN (SELECT x FROM t3)) AS t99
+            ON b2 IN (1,2,3) ORDER BY +d;
+} {NULL NULL 3 NULL NULL 3 1 2 3 1 2 3}
+
+do_execsql_test join-27.8 {
+  DELETE FROM t1;
+  DELETE FROM t2 WHERE d IS NOT NULL;
+  DELETE FROM t3;
+  SELECT * FROM t2 JOIN (SELECT b FROM t2 LEFT JOIN t1
+                       ON c IN (SELECT x FROM t3)) AS t99 ON b IN (1,2,3);
+} {}
+
+do_execsql_test join-27.9 {
+  DELETE FROM t1;
+  DELETE FROM t2;
+  DELETE FROM t3;
+  INSERT INTO t1 VALUES(4,3,5);
+  INSERT INTO t2 VALUES(1,2);
+  INSERT INTO t3 VALUES(5);
+  SELECT * FROM t2 JOIN (SELECT b FROM t2 LEFT JOIN t1
+                       ON c IN (SELECT x FROM t3)) AS t99 ON b IS NULL;
+} {}
+do_execsql_test join-27.10 {
+  WITH t99(b) AS (
+    SELECT b FROM t2 AS x LEFT JOIN t1 ON c IN (SELECT x FROM t3)
+  )
+  SELECT d, e, b FROM t2 JOIN t99 ON b IS NULL;
+} {}
+
+
+# 2022-09-19 https://sqlite.org/forum/forumpost/96b9e5709cf47cda
+# Performance regression relative to version 3.38.0 that resulted from
+# a new query flattener restriction that was added to fixes the join-27.*
+# tests above.  The restriction needed to be removed and the join-27.*
+# problem fixed another way.
+#
+reset_db
+do_execsql_test join-28.1 {
+  CREATE TABLE t1(a INTEGER PRIMARY KEY, b INT, c INT);
+  CREATE TABLE t2(d INTEGER PRIMARY KEY, e INT);
+  CREATE VIEW t3(a,b,c,d,e) AS SELECT * FROM t1 LEFT JOIN t2 ON d=c;
+  CREATE TABLE t4(x INT, y INT);
+  INSERT INTO t1 VALUES(1,2,3);
+  INSERT INTO t2 VALUES(1,5);
+  INSERT INTO t4 VALUES(1,4);
+  SELECT a, b, y FROM t4 JOIN t3 ON a=x;
+} {1 2 4}
+do_eqp_test join-28.2 {
+  SELECT a, b, y FROM t4 JOIN t3 ON a=x;
+} {
+  QUERY PLAN
+  |--SCAN t4
+  `--SEARCH t1 USING INTEGER PRIMARY KEY (rowid=?)
+}
+# ^^^^^^^ Without the fix (if the query flattening optimization does not
+# run) the query plan above would look like this:
+#
+#   QUERY PLAN
+#   |--MATERIALIZE t3
+#   |  |--SCAN t1
+#   |  `--SEARCH t2 USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN
+#   |--SCAN t4
+#   `--SEARCH t3 USING AUTOMATIC COVERING INDEX (a=?)
 
 finish_test

From 32781427d7496d713f9f81e70021a7e20f7586b1 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sat, 1 Oct 2022 16:01:41 +0000
Subject: [PATCH 201/428] Fiddle: fix makefile dependency issue and duplicate
 inclusion of post-js.js. Reimplement db export using sqlite3_serialize().

FossilOrigin-Name: 29db7de79232c21d19b91bb0fc253114e02e21dd9bf90619453dbe72a4c8bf7f
---
 ext/wasm/api/sqlite3-api-glue.js     |  2 +-
 ext/wasm/api/sqlite3-api-prologue.js | 47 ++++++++++++-
 ext/wasm/api/sqlite3-wasm.c          | 78 ++++++++++++++++++++++
 ext/wasm/fiddle.make                 |  5 +-
 ext/wasm/fiddle/fiddle-worker.js     | 98 ++--------------------------
 manifest                             | 22 +++----
 manifest.uuid                        |  2 +-
 src/os_kv.c                          | 12 ++--
 8 files changed, 151 insertions(+), 115 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index 347c03bc44..ab9424acab 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -291,7 +291,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        For the given integer, returns the SQLITE_xxx result code as a
        string, or undefined if no such mapping is found.
     */
-    capi.sqlite3_wasm_rc_str = (rc)=>__rcMap[rc];
+    capi.sqlite3_web_rc_str = (rc)=>__rcMap[rc];
     /* Bind all registered C-side structs... */
     for(const s of wasm.ctype.structs){
       capi[s.name] = sqlite3.StructBinder(s);
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index a6e055ff40..121b3d4ffa 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -870,6 +870,51 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     return rc;
   };
 
+  /**
+     Serializes the given `sqlite3*` pointer to a Uint8Array, as per
+     sqlite3_serialize(). On success it returns a Uint8Array. On
+     error it throws with a description of the problem.
+  */
+  capi.sqlite3_web_db_export = function(pDb){
+    if(!pDb) toss('Invalid sqlite3* argument.');
+    const wasm = capi.wasm;
+    if(!wasm.bigIntEnabled) toss('BigInt64 support is not enabled.');
+    const scope = wasm.scopedAllocPush();
+    let pOut;
+    try{
+      const pSize = wasm.scopedAlloc(8/*i64*/ + wasm.ptrSizeof);
+      const ppOut = pSize + 8;
+      /**
+         Maintenance reminder, since this cost a full hour of grief
+         and confusion: if the order of pSize/ppOut are reversed in
+         that memory block, fetching the value of pSize after the
+         export reads a garbage size because it's not on an 8-byte
+         memory boundary!
+      */
+      wasm.setPtrValue(ppOut, 0);
+      wasm.setMemValue(pSize, 0, 'i64');
+      let rc = wasm.exports.sqlite3_wasm_db_serialize(
+        pDb, ppOut, pSize, 0
+      );
+      if(rc){
+        toss("Database serialization failed with code",
+             sqlite3.capi.sqlite3_web_rc_str(rc));
+      }
+      const pOut = wasm.getPtrValue(ppOut);
+      const nOut = wasm.getMemValue(pSize, 'i64');
+      rc = nOut
+        ? wasm.heap8u().slice(pOut, pOut + Number(nOut))
+        : new Uint8Array();
+      return rc;
+    }catch(e){
+      console.error('internal error?',e);
+      throw w;
+    }finally{
+      if(pOut) wasm.exports.sqlite3_free(pOut);
+      wasm.scopedAllocPop(scope);
+    }
+  };
+  
   if( capi.util.isMainWindow() ){
     /* Features specific to the main window thread... */
 
@@ -945,7 +990,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
           }
         }
       });
-      return sz * 2 /* because JS uses UC16 encoding */;
+      return sz * 2 /* because JS uses 2-byte char encoding */;
     };
 
   }/* main-window-only bits */
diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index da8f5c32e7..a66b51a8fc 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -406,6 +406,7 @@ const char * sqlite3_wasm_enum_json(void){
   } _DefGroup;
 
   DefGroup(serialize){
+    DefInt(SQLITE_SERIALIZE_NOCOPY);
     DefInt(SQLITE_DESERIALIZE_FREEONCLOSE);
     DefInt(SQLITE_DESERIALIZE_READONLY);
     DefInt(SQLITE_DESERIALIZE_RESIZEABLE);
@@ -567,6 +568,83 @@ int sqlite3_wasm_vfs_unlink(const char * zName){
   return rc;
 }
 
+/*
+** Uses the current database's VFS xRead to stream the db file's
+** contents out to the given callback. The callback gets a single
+** chunk of size n (its 2nd argument) on each call and must return 0
+** on success, non-0 on error. This function returns 0 on success,
+** SQLITE_NOTFOUND if no db is open, or propagates any other non-0
+** code from the callback. Note that this is not thread-friendly: it
+** expects that it will be the only thread reading the db file and
+** takes no measures to ensure that is the case.
+**
+** This implementation appears to work fine, but
+** sqlite3_wasm_db_serialize() is arguably the better way to achieve
+** this.
+*/
+WASM_KEEP
+int sqlite3_wasm_db_export_chunked( sqlite3* pDb,
+                                    int (*xCallback)(unsigned const char *zOut, int n) ){
+  sqlite3_int64 nSize = 0;
+  sqlite3_int64 nPos = 0;
+  sqlite3_file * pFile = 0;
+  unsigned char buf[1024 * 8];
+  int nBuf = (int)sizeof(buf);
+  int rc = pDb
+    ? sqlite3_file_control(pDb, "main",
+                           SQLITE_FCNTL_FILE_POINTER, &pFile)
+    : SQLITE_NOTFOUND;
+  if( rc ) return rc;
+  rc = pFile->pMethods->xFileSize(pFile, &nSize);
+  if( rc ) return rc;
+  if(nSize % nBuf){
+    /* DB size is not an even multiple of the buffer size. Reduce
+    ** buffer size so that we do not unduly inflate the db size
+    ** with zero-padding when exporting. */
+    if(0 == nSize % 4096) nBuf = 4096;
+    else if(0 == nSize % 2048) nBuf = 2048;
+    else if(0 == nSize % 1024) nBuf = 1024;
+    else nBuf = 512;
+  }
+  for( ; 0==rc && nPos<nSize; nPos += nBuf ){
+    rc = pFile->pMethods->xRead(pFile, buf, nBuf, nPos);
+    if(SQLITE_IOERR_SHORT_READ == rc){
+      rc = (nPos + nBuf) < nSize ? rc : 0/*assume EOF*/;
+    }
+    if( 0==rc ) rc = xCallback(buf, nBuf);
+  }
+  return rc;
+}
+
+/*
+** A proxy for sqlite3_serialize() which serializes the "main" schema
+** of pDb, placing the serialized output in pOut and nOut. nOut may be
+** NULL. If pDb or pOut are NULL then SQLITE_MISUSE is returned. If
+** allocation of the serialized copy fails, SQLITE_NOMEM is returned.
+** On success, 0 is returned and `*pOut` will contain a pointer to the
+** memory unless mFlags includes SQLITE_SERIALIZE_NOCOPY and the
+** database has no contiguous memory representation, in which case
+** `*pOut` will be NULL but 0 will be returned.
+**
+** If `*pOut` is not NULL, the caller is responsible for passing it to
+** sqlite3_free() to free it.
+*/
+WASM_KEEP
+int sqlite3_wasm_db_serialize( sqlite3* pDb, unsigned char **pOut, sqlite3_int64 * nOut,
+                               unsigned int mFlags ){
+  unsigned char * z;
+  if( !pDb || !pOut ) return SQLITE_MISUSE;
+  if(nOut) *nOut = 0;
+  z = sqlite3_serialize(pDb, "main", nOut, mFlags);
+  if( z || (SQLITE_SERIALIZE_NOCOPY & mFlags) ){
+    *pOut = z;
+    return 0;
+  }else{
+    return SQLITE_NOMEM;
+  }
+}
+
+
 #if defined(__EMSCRIPTEN__)
 #include <emscripten/console.h>
 #if defined(SQLITE_WASM_WASMFS)
diff --git a/ext/wasm/fiddle.make b/ext/wasm/fiddle.make
index 6ccf8e0294..585add4270 100644
--- a/ext/wasm/fiddle.make
+++ b/ext/wasm/fiddle.make
@@ -37,7 +37,6 @@ fiddle.emcc-flags = \
   $(sqlite3.js.flags.--post-js) \
   -sEXPORTED_RUNTIME_METHODS=@$(dir.wasm)/EXPORTED_RUNTIME_METHODS.fiddle \
   -sEXPORTED_FUNCTIONS=@$(dir.wasm)/EXPORTED_FUNCTIONS.fiddle \
-  --post-js=$(post-js.js) \
   $(SQLITE_OPT) $(SHELL_OPT) \
   -DSQLITE_SHELL_FIDDLE
 # -D_POSIX_C_SOURCE is needed for strdup() with emcc
@@ -60,9 +59,9 @@ $(dir.fiddle)/$(SOAP.js): $(SOAP.js)
 $(eval $(call call-make-pre-js,fiddle-module))
 $(fiddle-module.js): $(MAKEFILE) $(MAKEFILE.fiddle) \
     EXPORTED_FUNCTIONS.fiddle EXPORTED_RUNTIME_METHODS.fiddle \
-    $(fiddle.cs) $(pre-post-fiddle.deps) $(dir.fiddle)/$(SOAP.js)
+    $(fiddle.cs) $(pre-post-fiddle-module.deps) $(dir.fiddle)/$(SOAP.js)
 	$(emcc.bin) -o $@ $(fiddle.emcc-flags) \
-    $(pre-post-common.flags) $(pre-post-fiddle.flags) \
+    $(pre-post-common.flags) $(pre-post-fiddle-module.flags) \
     $(fiddle.cs)
 	$(maybe-wasm-strip) $(fiddle-module.wasm)
 	gzip < $@ > $@.gz
diff --git a/ext/wasm/fiddle/fiddle-worker.js b/ext/wasm/fiddle/fiddle-worker.js
index 6a0cf53b72..ef2e3fcb5b 100644
--- a/ext/wasm/fiddle/fiddle-worker.js
+++ b/ext/wasm/fiddle/fiddle-worker.js
@@ -227,94 +227,6 @@
       f._();
     }
   };
-
-  /**
-     Exports the shell's current db file in such a way that it can
-     export DBs hosted in the Emscripten-supplied FS or in native OPFS
-     (and, hypothetically, kvvfs). Throws on error. On success returns
-     a Blob containing the whole db contents.
-
-     Bug/to investigate: xFileSize() is returning garbage for the
-     default VFS but works in OPFS. Thus for exporting that impl we'll
-     use the fiddleModule.FS API for the time being. The equivalent
-     native impl, fiddle_export_db(), works okay with both VFSes, so
-     the bug is apparently in (or via) this code.
-  */
-  const brokenExportDbFileToBlob = function(){
-    const capi = sqlite3.capi, wasm = capi.wasm;
-    const pDb = Sqlite3Shell.dbHandle();
-    if(!pDb) toss("No db is opened.");
-    const scope = wasm.scopedAllocPush();
-    try{
-      const ppFile = wasm.scopedAlloc(12/*sizeof(i32 + i64)*/);
-      const pFileSize = ppFile + 4;
-      wasm.setMemValue(ppFile, 0, '*');
-      let rc = capi.sqlite3_file_control(
-        pDb, "main", capi.SQLITE_FCNTL_FILE_POINTER, ppFile
-      );
-      if(rc) toss("Cannot get sqlite3_file handle.");
-      const jFile = new capi.sqlite3_file(wasm.getPtrValue(ppFile));
-      const jIom = new capi.sqlite3_io_methods(jFile.$pMethods);
-      const xFileSize = wasm.functionEntry(jIom.$xFileSize);
-      const xRead = wasm.functionEntry(jIom.$xRead);
-      wasm.setMemValue(pFileSize, 0, 'i64');
-      //stderr("nFileSize =",wasm.getMemValue(pFileSize,'i64'),"pFileSize =",pFileSize);
-      rc = xFileSize( jFile.pointer, pFileSize );
-      if(rc) toss("Cannot get db file size.");
-      //stderr("nFileSize =",wasm.getMemValue(pFileSize,'i64'),"pFileSize =",pFileSize);
-      const nFileSize = Number( wasm.getMemValue(pFileSize,'i64') );
-      if(nFileSize <= 0n || nFileSize>=Number.MAX_SAFE_INTEGER){
-        toss("Unexpected DB size:",nFileSize);
-      }
-      //stderr("nFileSize =",nFileSize,"pFileSize =",pFileSize);
-      const nIobuf = 1024 * 4;
-      const iobuf = wasm.scopedAlloc(nIobuf);
-      let nPos = 0;
-      const blobList = [];
-      const heap = wasm.heap8u();
-      for( ; nPos < nFileSize; nPos += nIobuf ){
-        rc = xRead(jFile.pointer, iobuf, nIobuf, BigInt(nPos));
-        if(rc){
-          if(capi.SQLITE_IOERR_SHORT_READ === rc){
-            //stderr('rc =',rc,'nPos =',nPos,'nIobuf =',nIobuf,'nFileSize =',nFileSize);
-            rc = ((nPos + nIobuf) < nFileSize) ? rc : 0/*assume EOF*/;
-          }
-          if(rc) toss("xRead() SQLITE_xxx error #"+rc,capi.sqlite3_wasm_rc_str(rc));
-        }
-        blobList.push(heap.slice(iobuf, iobuf+nIobuf));
-      }
-      return new Blob(blobList);
-    }catch(e){
-      console.error('exportDbFileToBlob()',e);
-      stderr("exportDbFileToBlob():",e.message);
-    }finally{
-      wasm.scopedAllocPop(scope);
-    }
-  }/*brokenExportDbFileToBlob()*/;
-
-  const exportDbFileToBlob = function f(){
-    if(!f._){
-      f._ = sqlite3.capi.wasm.xWrap('fiddle_export_db', 'int', '*');
-    }
-    const capi = sqlite3.capi;
-    const wasm = capi.wasm;
-    const blobList = [];
-    const heap = wasm.heap8u();
-    const callback = wasm.installFunction('ipi', function(buf, n){
-      blobList.push(heap.slice(buf, buf+n));
-      return 0;
-    });
-    try {
-      const rc = wasm.exports.fiddle_export_db( callback );
-      if(rc) toss("DB export failed with code", capi.sqlite3_wasm_rc_str(rc));
-      return new Blob(blobList);
-    }catch(e){
-      console.error("exportDbFileToBlob():",e.message);
-      throw(e);
-    }finally{
-      wasm.uninstallFunction(callback);
-    }
-  }/*exportDbFileToBlob()*/;
   
   self.onmessage = function f(ev){
     ev = ev.data;
@@ -344,11 +256,13 @@
           stdout("Exporting",fn+".");
           const fn2 = fn ? fn.split(/[/\\]/).pop() : null;
           try{
-            if(!fn2) throw new Error("DB appears to be closed.");
-            exportDbFileToBlob().arrayBuffer().then((buffer)=>{
-              wMsg('db-export',{filename: fn2, buffer}, [buffer]);
-            });
+            if(!fn2) toss("DB appears to be closed.");
+            const buffer = sqlite3.capi.sqlite3_web_db_export(
+              Sqlite3Shell.dbHandle()
+            );
+            wMsg('db-export',{filename: fn2, buffer: buffer.buffer}, [buffer.buffer]);
           }catch(e){
+            console.error("Export failed:",e);
             /* Post a failure message so that UI elements disabled
                during the export can be re-enabled. */
             wMsg('db-export',{
diff --git a/manifest b/manifest
index 2ff0e775e9..b5ccfef55a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\strunk\sinto\sfiddle-opfs\sbranch.
-D 2022-10-01T13:45:14.035
+C Fiddle:\sfix\smakefile\sdependency\sissue\sand\sduplicate\sinclusion\sof\spost-js.js.\sReimplement\sdb\sexport\susing\ssqlite3_serialize().
+D 2022-10-01T16:01:41.242
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -485,13 +485,13 @@ F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba814
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
 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 ead29e6008ba148e7c67ad2bd928819dc72313ad2dcd34510cc61e089ee01c4e
+F ext/wasm/api/sqlite3-api-glue.js b15a51b88aaa472d36bf82d5123dbfdafe8ddf6ca75fba934510e4a20bbe4adb
 F ext/wasm/api/sqlite3-api-oo1.js 9caed0757a5e039ed92467e827fd3ca347fa08f19fe086fcbdd14a4ebe9c2f01
 F ext/wasm/api/sqlite3-api-opfs.js 1b097808b7b081b0f0700cf97d49ef19760e401706168edff9cd45cf9169f541
-F ext/wasm/api/sqlite3-api-prologue.js 04e0c929deeb28c9a2509d8004dfe3214992b988d277c4f50afa84953689c23c
+F ext/wasm/api/sqlite3-api-prologue.js d7904da82691f68b9ffb081c072cf4725716154284a63447f2d1dce40ab4b85f
 F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c 336389b23c9b83763177499e49a0967949c392b2f7d84fbbb52ad6678e159f18
+F ext/wasm/api/sqlite3-wasm.c 61c6bf8404a07f3d5f2861fbc1d3596474cecfc38801fb3a38c560fe847f79a5
 F ext/wasm/batch-runner.html c363032aba7a525920f61f8be112a29459f73f07e46f0ba3b7730081a617826e
 F ext/wasm/batch-runner.js ce92650a6681586c89bef26ceae96674a55ca5a9727815202ca62e1a00ff5015
 F ext/wasm/common/SqliteTestUtil.js 647bf014bd30bdd870a7e9001e251d12fc1c9ec9ce176a1004b838a4b33c5c05
@@ -503,9 +503,9 @@ F ext/wasm/demo-123.html aa281d33b7eefa755f3122b7b5a18f39a42dc5fb69c8879171bf14b
 F ext/wasm/demo-123.js 536579fd587974c2511c5bf82034b253d4fdeceabb726927ad7599ef6b7578e8
 F ext/wasm/demo-kvvfs1.html 7d4f28873de67f51ac18c584b7d920825139866a96049a49c424d6f5a0ea5e7f
 F ext/wasm/demo-kvvfs1.js 105596bd2ccd0b1deb5fde8e99b536e8242d4bb5932fac0c8403ff3a6bc547e8
-F ext/wasm/fiddle.make d343d44c58bca06ac0ec0296207f6441560bff89f1e587bbaf843b73c2ca5d76
+F ext/wasm/fiddle.make 3f4efd62bc2a9c883bfcea52ae2755114a62d444d6d042df287f4aef301d6c6c
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
-F ext/wasm/fiddle/fiddle-worker.js 2a7107b06e5be3b9b063c340ec952f687e37ba6e0aa736b58c280dfb5e16625a
+F ext/wasm/fiddle/fiddle-worker.js ebf6e95fe031738cd9f79d1ccdf6d80640a2884a43f7006a5e3459995f93069b
 F ext/wasm/fiddle/fiddle.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
 F ext/wasm/fiddle/fiddle.js 974b995119ac443685d7d94d3b3c58c6a36540e9eb3fed7069d5653284071715
 F ext/wasm/index.html 63b370619e4f849ac76f1baed435c05edc29dbb6795bc7c1c935561ff667dd27
@@ -599,7 +599,7 @@ F src/notify.c 89a97dc854c3aa62ad5f384ef50c5a4a11d70fcc69f86de3e991573421130ed6
 F src/os.c 0eb831ba3575af5277e47f4edd14fdfc90025c67eb25ce5cda634518d308d4e9
 F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
-F src/os_kv.c cf02a39ab3271d237890c7de03a49e5ecc19c930b8f4ad6afd43651dc05c9400
+F src/os_kv.c 88872a68ba37e4ed4306eb6fa78d559dcc675761ce1f6458ba710e1c10a2d667
 F src/os_setup.h 0711dbc4678f3ac52d7fe736951b6384a0615387c4ba5135a4764e4e31f4b6a6
 F src/os_unix.c 287aa5f5691a2b356780c63e83abaa33549add84227b8313395f04088486d79c
 F src/os_win.c 8d129ae3e59e0fa900e20d0ad789e96f2e08177f0b00b53cdda65c40331e0902
@@ -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 000ef7059bfb54dc4f829b81a8d8c927c0382980218d8a3d60cd2c4d89151c90 b7da0bcdf70e53ab1ec00a0694e17c7429e23bc6eb3f39b622d06a930aa2f6a3
-R 5df8cd3132a0539ad9a559117068898c
+P 64ebcbe41615a6d7776597564105ea7638e4a9095a764ea558c2620640429cf8
+R 624d71ac921985ea3965d7f2eda6af5a
 U stephan
-Z 7ab2cbdb07e5b8371b60f5611bb9584c
+Z 9261b853936f36a4eb842018d682a85c
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index cee93bde1c..be02a92425 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-64ebcbe41615a6d7776597564105ea7638e4a9095a764ea558c2620640429cf8
\ No newline at end of file
+29db7de79232c21d19b91bb0fc253114e02e21dd9bf90619453dbe72a4c8bf7f
\ No newline at end of file
diff --git a/src/os_kv.c b/src/os_kv.c
index fb8eae6270..8de687ff11 100644
--- a/src/os_kv.c
+++ b/src/os_kv.c
@@ -195,12 +195,12 @@ static void kvstorageMakeKey(
 ** be exported from the wasm file (but may still be used internally
 ** within the wasm file).
 **
-** The functions in this file (sqlite3-wasm.c) which require exporting
-** are marked with this flag. They may also be added to any explicit
-** build-time export list but need not be. All of these APIs are
-** intended for use only within the project's own JS/WASM code, and
-** not by client code, so an argument can be made for reducing their
-** visibility by not including them in any build-time export lists.
+** The functions in this filewhich require exporting are marked with
+** this flag. They may also be added to any explicit build-time export
+** list but need not be. All of these APIs are intended for use only
+** within the project's own JS/WASM code, and not by client code, so
+** an argument can be made for reducing their visibility by not
+** including them in any build-time export lists.
 **
 ** 2022-09-11: it's not yet _proven_ that this approach works in
 ** non-Emscripten builds. If not, such builds will need to export

From 3afad4d432c65aeacd038758d21f523c453c4a67 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sat, 1 Oct 2022 18:47:42 +0000
Subject: [PATCH 202/428] wasm: correct a memleak caused by a shadowed var in
 the previous checkin. Add a stack-like allocator, sqlite3.capi.wasm.pstack,
 as a faster way of managing short-lived pointers (like the one which got
 shadowed).

FossilOrigin-Name: 1fa019c88deac6b6e5155b620bdab1d7145846290daafb9adbefcf4f0fe542cf
---
 ext/wasm/api/sqlite3-api-prologue.js | 106 +++++++++++++++++++++------
 ext/wasm/api/sqlite3-wasm.c          | 105 ++++++++++++++++++++++++++
 ext/wasm/testing1.js                 |  38 +++++++++-
 manifest                             |  16 ++--
 manifest.uuid                        |   2 +-
 5 files changed, 232 insertions(+), 35 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 121b3d4ffa..0e4a72ab65 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -738,30 +738,92 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     ["sqlite3_wasm_vfs_unlink", "int", "string"]
   ];
 
+
+  /**
+     sqlite3.capi.wasm.pstack (pseudo-stack) holds a special-case
+     stack-style allocator intended only for use with _small_ data of
+     not more than (in total) a few kb in size, managed as if it were
+     stack-based.
+
+     It has only a single intended usage:
+
+     ```
+     const stackPos = pstack.pointer;
+     try{
+       const ptr = pstack.alloc(8);
+       // ==> pstack.pointer === ptr
+       const otherPtr = pstack.alloc(8);
+       // ==> pstack.pointer === otherPtr
+       ...
+     }finally{
+       pstack.restore(stackPos);
+       // ==> pstack.pointer === stackPos
+     }
+     ```
+
+     This allocator is much faster than a general-purpose one but is
+     limited to usage patterns like the one shown above.
+
+     It operates from a static range of memory which lives outside of
+     space managed by Emscripten's stack-management, so does not
+     collide with Emscripten-provided stack allocation APIs. The
+     memory lives in the WASM heap and can be used with routines such
+     as wasm.setMemValue() and any wasm.heap8u().slice().
+  */
+  capi.wasm.pstack = Object.assign(Object.create(null),{
+    /**
+       Sets the current ppstack position to the given pointer.
+       Results are undefined if the passed-in value did not come from
+       this.pointer.
+    */
+    restore: capi.wasm.exports.sqlite3_wasm_pstack_restore,
+    /**
+       Attempts to allocate the given number of bytes from the
+       pstack. On success, it zeroes out a block of memory of the
+       given size, adjusts the pstack pointer, and returns a pointer
+       to the memory. On error, returns 0. The memory must eventually
+       be released using restore().
+
+       This method always adjusts the given value to be a multiple
+       of 8 in order to keep alignment guarantees.
+    */
+    alloc: capi.wasm.exports.sqlite3_wasm_pstack_alloc
+  });
+  /**
+     sqlite3.capi.wasm.pstack.pointer resolves to the current pstack
+     position pointer. This value is intended _only_ to be passed to restore().
+  */
+  Object.defineProperty(capi.wasm.pstack, 'pointer', {
+    configurable: false, iterable: true, writeable: false,
+    get: capi.wasm.exports.sqlite3_wasm_pstack_ptr
+    //Whether or not a setter as an alternative to restore() is
+    //clearer or would just lead to confusion is unclear.
+    //set: capi.wasm.exports.sqlite3_wasm_pstack_restore
+  });
+  /**
+     sqlite3.capi.wasm.pstack.remaining resolves to the amount of
+     space remaining in the pstack.
+  */
+  Object.defineProperty(capi.wasm.pstack, 'remaining', {
+    configurable: false, iterable: true, writeable: false,
+    get: capi.wasm.exports.sqlite3_wasm_pstack_remaining
+  });
+
+
   /** State for sqlite3_wasmfs_opfs_dir(). */
   let __persistentDir = undefined;
   /**
-     An experiment. Do not use in client code.
-
-     If the wasm environment has a persistent storage directory,
-     its path is returned by this function. If it does not then
-     it returns "" (noting that "" is a falsy value).
+     If the wasm environment has a WASMFS/OPFS-backed persistent
+     storage directory, its path is returned by this function. If it
+     does not then it returns "" (noting that "" is a falsy value).
 
      The first time this is called, this function inspects the current
-     environment to determine whether persistence filesystem support
-     is available and, if it is, enables it (if needed).
+     environment to determine whether persistence support is available
+     and, if it is, enables it (if needed).
 
      This function currently only recognizes the WASMFS/OPFS storage
-     combination. "Plain" OPFS is provided via a separate VFS which
-     is optionally be installed via sqlite3.asyncPostInit().
-
-     TODOs and caveats:
-
-     - If persistent storage is available at the root of the virtual
-       filesystem, this interface cannot currently distinguish that
-       from the lack of persistence. That can (in the mean time)
-       happen when using the JS-native "opfs" VFS, as opposed to the
-       WASMFS/OPFS combination.
+     combination and its path refers to storage rooted in the
+     Emscripten-managed virtual filesystem.
   */
   capi.sqlite3_wasmfs_opfs_dir = function(){
     if(undefined !== __persistentDir) return __persistentDir;
@@ -879,10 +941,10 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     if(!pDb) toss('Invalid sqlite3* argument.');
     const wasm = capi.wasm;
     if(!wasm.bigIntEnabled) toss('BigInt64 support is not enabled.');
-    const scope = wasm.scopedAllocPush();
+    const stack = wasm.pstack.pointer();
     let pOut;
     try{
-      const pSize = wasm.scopedAlloc(8/*i64*/ + wasm.ptrSizeof);
+      const pSize = wasm.pstack.alloc(8/*i64*/ + wasm.ptrSizeof);
       const ppOut = pSize + 8;
       /**
          Maintenance reminder, since this cost a full hour of grief
@@ -891,8 +953,6 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
          export reads a garbage size because it's not on an 8-byte
          memory boundary!
       */
-      wasm.setPtrValue(ppOut, 0);
-      wasm.setMemValue(pSize, 0, 'i64');
       let rc = wasm.exports.sqlite3_wasm_db_serialize(
         pDb, ppOut, pSize, 0
       );
@@ -900,7 +960,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
         toss("Database serialization failed with code",
              sqlite3.capi.sqlite3_web_rc_str(rc));
       }
-      const pOut = wasm.getPtrValue(ppOut);
+      pOut = wasm.getPtrValue(ppOut);
       const nOut = wasm.getMemValue(pSize, 'i64');
       rc = nOut
         ? wasm.heap8u().slice(pOut, pOut + Number(nOut))
@@ -911,7 +971,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
       throw w;
     }finally{
       if(pOut) wasm.exports.sqlite3_free(pOut);
-      wasm.scopedAllocPop(scope);
+      wasm.pstack.restore(stack);
     }
   };
   
diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index a66b51a8fc..4cb8cc2643 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -56,6 +56,7 @@
 # define SQLITE_THREADSAFE 0
 #endif
 
+#include <assert.h>
 #include "sqlite3.c" /* yes, .c instead of .h. */
 
 /*
@@ -85,6 +86,110 @@
 // See also:
 //__attribute__((export_name("theExportedName"), used, visibility("default")))
 
+
+#if 0
+/*
+** An EXPERIMENT in implementing a stack-based allocator analog to
+** Emscripten's stackSave(), stackAlloc(), stackRestore().
+** Unfortunately, this cannot work together with Emscripten because
+** Emscripten defines its own native one and we'd stomp on each
+** other's memory. Other than that complication, basic tests show it
+** to work just fine.
+**
+** Another option is to malloc() a chunk of our own and call that our
+** "stack".
+*/
+WASM_KEEP void * sqlite3_wasm_stack_end(void){
+  extern void __heap_base
+    /* see https://stackoverflow.com/questions/10038964 */;
+  return &__heap_base;
+}
+WASM_KEEP void * sqlite3_wasm_stack_begin(void){
+  extern void __data_end;
+  return &__data_end;
+}
+static void * sq3StackPtr = 0;
+WASM_KEEP void * sqlite3_wasm_stack_ptr(void){
+  if(!sq3StackPtr) sq3StackPtr = sqlite3_wasm_stack_end();
+  return sq3StackPtr;
+}
+WASM_KEEP void sqlite3_wasm_stack_restore(void * p){
+  sq3StackPtr = p;
+}
+WASM_KEEP void * sqlite3_wasm_stack_alloc(int n){
+  if(n<=0) return 0;
+  n = (n + 7) & ~7 /* align to 8-byte boundary */;
+  unsigned char * const p = (unsigned char *)sqlite3_wasm_stack_ptr();
+  unsigned const char * const b = (unsigned const char *)sqlite3_wasm_stack_begin();
+  if(b + n >= p || b + n < b/*overflow*/) return 0;
+  return sq3StackPtr = p - n;
+}
+#endif /* stack allocator experiment */
+
+/*
+** State for the "pseudo-stack" allocator implemented in
+** sqlite3_wasm_pstack_xyz(). In order to avoid colliding with
+** Emscripten-controled stack space, it carves out a bit of stack
+** memory to use for that purpose. This memory ends up in the
+** WASM-managed memory, such that routines which manipulate the wasm
+** heap can also be used to manipulate this memory.
+*/
+static unsigned char PStack_mem[512 * 8] = {0};
+static struct {
+  unsigned char const * pBegin;  /* Start (inclusive) of memory range */
+  unsigned char const * pEnd;    /* One-after-the-end of memory range */
+  unsigned char * pPos;          /* Current "stack pointer" */
+} PStack = {
+  &PStack_mem[0],
+  &PStack_mem[0] + sizeof(PStack_mem),
+  &PStack_mem[0] + sizeof(PStack_mem)
+};
+/*
+** Returns the current pstack position.
+*/
+WASM_KEEP void * sqlite3_wasm_pstack_ptr(void){
+  return PStack.pPos;
+}
+/*
+** Sets the pstack position poitner to p. Results are undefined if the
+** given value did not come from sqlite3_wasm_pstack_ptr().
+*/
+WASM_KEEP void sqlite3_wasm_pstack_restore(unsigned char * p){
+  assert(p>=PStack.pBegin && p<=PStack.pEnd && p>=PStack.pPos);
+  assert(0==(p & 0x7));
+  if(p>=PStack.pBegin && p<=PStack.pEnd /*&& p>=PStack.pPos*/){
+    PStack.pPos = p;
+  }
+}
+/*
+** Allocate and zero out n bytes from the pstack. Returns a pointer to
+** the memory on success, 0 on error (including a negative n value). n
+** is always adjusted to be a multiple of 8 and returned memory is
+** always zeroed out before returning (because this keeps the client
+** JS code from having to do so, and most uses of the pstack will
+** call for doing so).
+*/
+WASM_KEEP void * sqlite3_wasm_pstack_alloc(int n){
+  if( n<=0 ) return 0;
+  //if( n & 0x7 ) n += 8 - (n & 0x7) /* align to 8-byte boundary */;
+  n = (n + 7) & ~7 /* align to 8-byte boundary */;
+  unsigned char * const p = PStack.pPos;
+  unsigned const char * const b = PStack.pBegin;
+  if( b + n > p || b + n <= b/*overflow*/ ) return 0;
+  memset((PStack.pPos = p - n), 0, (unsigned int)n);
+  return PStack.pPos;
+}
+/*
+** Return the number of bytes left which can be
+** sqlite3_wasm_pstack_alloc()'d.
+*/
+WASM_KEEP int sqlite3_wasm_pstack_remaining(void){
+  assert(PStack.pPos >= PStack.pBegin);
+  assert(PStack.pPos <= PStack.pEnd);
+  return (int)(PStack.pPos - PStack.pBegin);
+}
+
+
 /*
 ** This function is NOT part of the sqlite3 public API. It is strictly
 ** for use by the sqlite project's own JS/WASM bindings.
diff --git a/ext/wasm/testing1.js b/ext/wasm/testing1.js
index 916f81babc..ffe63c537c 100644
--- a/ext/wasm/testing1.js
+++ b/ext/wasm/testing1.js
@@ -875,7 +875,7 @@
 
     log("cstrncpy()...");
     {
-      w.scopedAllocPush();
+      const scope = w.scopedAllocPush();
       try {
         let cStr = w.scopedAllocCString("hello");
         const n = w.cstrlen(cStr);
@@ -892,7 +892,7 @@
           assert(chr('!') === w.getMemValue(cpy+2)).
           assert(chr('l') === w.getMemValue(cpy+3));
       }finally{
-        w.scopedAllocPop();
+        w.scopedAllocPop(scope);
       }
     }
 
@@ -1024,6 +1024,38 @@
     }
   }/*testWasmUtil()*/;
 
+
+  /**
+     Tests for sqlite3.capi.wasm.pstack().
+   */
+  const testPstack = function(db,sqlite3){
+    const w = sqlite3.capi.wasm, P = w.pstack;
+    const stack = P.pointer;
+    T.assert(0===stack % 8 /* must be 8-byte aligned */);
+    try{
+      const quota = P.remaining;
+      log("pstack quota",quota);
+      T.assert(quota >= 4096)
+        .assert(0 === P.alloc(0))
+        .assert(0 === P.alloc(-1));
+      let p1 = P.alloc(12);
+      T.assert(p1 === stack - 16/*8-byte aligned*/)
+        .assert(P.pointer === p1);
+      let p2 = P.alloc(7);
+      T.assert(p2 === p1-8/*8-byte aligned, stack grows downwards*/)
+        .assert(0 === P.alloc(quota))
+        .assert(24 === stack - p2)
+        .assert(P.pointer === p2);
+      let n = quota - (stack - p2);
+      let p3 = P.alloc(n);
+      T.assert(p3 === stack-quota)
+        .assert(0 === P.alloc(1));
+    }finally{
+      P.restore(stack);
+      T.assert(P.pointer === stack);
+    }
+  }/*testPstack()*/;
+
   const clearKvvfs = function(){
     const sz = sqlite3.capi.sqlite3_web_kvvfs_size();
     const n = sqlite3.capi.sqlite3_web_kvvfs_clear('');
@@ -1089,7 +1121,7 @@
       [
         testWasmUtil, testBasicSanity, testUDF,
         testAttach, testIntPtr, testStructStuff,
-        testSqliteStructs        
+        testSqliteStructs, testPstack
       ].forEach((f)=>{
         const t = T.counter, n = performance.now();
         logHtml(banner1,"Running",f.name+"()...");
diff --git a/manifest b/manifest
index b5ccfef55a..4898d8f756 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fiddle:\sfix\smakefile\sdependency\sissue\sand\sduplicate\sinclusion\sof\spost-js.js.\sReimplement\sdb\sexport\susing\ssqlite3_serialize().
-D 2022-10-01T16:01:41.242
+C wasm:\scorrect\sa\smemleak\scaused\sby\sa\sshadowed\svar\sin\sthe\sprevious\scheckin.\sAdd\sa\sstack-like\sallocator,\ssqlite3.capi.wasm.pstack,\sas\sa\sfaster\sway\sof\smanaging\sshort-lived\spointers\s(like\sthe\sone\swhich\sgot\sshadowed).
+D 2022-10-01T18:47:42.149
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -488,10 +488,10 @@ F ext/wasm/api/sqlite3-api-cleanup.js 5d22d1d3818ecacb23bfa223d5970cd0617d8cdbb4
 F ext/wasm/api/sqlite3-api-glue.js b15a51b88aaa472d36bf82d5123dbfdafe8ddf6ca75fba934510e4a20bbe4adb
 F ext/wasm/api/sqlite3-api-oo1.js 9caed0757a5e039ed92467e827fd3ca347fa08f19fe086fcbdd14a4ebe9c2f01
 F ext/wasm/api/sqlite3-api-opfs.js 1b097808b7b081b0f0700cf97d49ef19760e401706168edff9cd45cf9169f541
-F ext/wasm/api/sqlite3-api-prologue.js d7904da82691f68b9ffb081c072cf4725716154284a63447f2d1dce40ab4b85f
+F ext/wasm/api/sqlite3-api-prologue.js 895b5f9ee425b8ba4a5fc5c85f144da9e2b785fea9226830f068d5c3b71e0fba
 F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c 61c6bf8404a07f3d5f2861fbc1d3596474cecfc38801fb3a38c560fe847f79a5
+F ext/wasm/api/sqlite3-wasm.c 43216a5266780f5f6ca3972684be5cd9113b624e43a5f5923c06a0c386e65857
 F ext/wasm/batch-runner.html c363032aba7a525920f61f8be112a29459f73f07e46f0ba3b7730081a617826e
 F ext/wasm/batch-runner.js ce92650a6681586c89bef26ceae96674a55ca5a9727815202ca62e1a00ff5015
 F ext/wasm/common/SqliteTestUtil.js 647bf014bd30bdd870a7e9001e251d12fc1c9ec9ce176a1004b838a4b33c5c05
@@ -530,7 +530,7 @@ F ext/wasm/test-opfs-vfs.js a59ff9210b17d46b0c6fbf6a0ba60143c033327865f2e556e14f
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
 F ext/wasm/testing-worker1-promiser.js bd788e33c1807e0a6dda9c9a9d784bd3350ca49c9dd8ae2cc8719b506b6e013e
 F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d7669fb17fcae
-F ext/wasm/testing1.js 5584e9b68f797dbc0f6161360f2c6840169533813d92c74d355a3e78dd5bb539
+F ext/wasm/testing1.js 419e029ee4ae3cf98dd4c20aebdb111afe743b54ed8856e5f59775c3241fd21f
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
 F ext/wasm/testing2.js 88f40ef3cd8201bdadd120a711c36bbf0ce56cc0eab1d5e7debb71fed7822494
 F ext/wasm/wasmfs.make 3cce1820006196de140f90f2da4b4ea657083fb5bfee7d125be43f7a85748c8f
@@ -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 64ebcbe41615a6d7776597564105ea7638e4a9095a764ea558c2620640429cf8
-R 624d71ac921985ea3965d7f2eda6af5a
+P 29db7de79232c21d19b91bb0fc253114e02e21dd9bf90619453dbe72a4c8bf7f
+R bd74fd06e0648815273bfbe7fab3eb12
 U stephan
-Z 9261b853936f36a4eb842018d682a85c
+Z 599287064c24d1dab9b272142121f171
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index be02a92425..d85382de39 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-29db7de79232c21d19b91bb0fc253114e02e21dd9bf90619453dbe72a4c8bf7f
\ No newline at end of file
+1fa019c88deac6b6e5155b620bdab1d7145846290daafb9adbefcf4f0fe542cf
\ No newline at end of file

From f446af57b51166af9cc9355d67275f3ccdf4f63c Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sat, 1 Oct 2022 18:55:10 +0000
Subject: [PATCH 203/428] Pedantic constness tweak.

FossilOrigin-Name: c8a173cf16d2567bf9b13f52904077a2e7209776c76613c7bff59cd66e24bf11
---
 ext/wasm/api/sqlite3-wasm.c |  6 +++---
 manifest                    | 12 ++++++------
 manifest.uuid               |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index 4cb8cc2643..a2de8ca710 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -136,9 +136,9 @@ WASM_KEEP void * sqlite3_wasm_stack_alloc(int n){
 */
 static unsigned char PStack_mem[512 * 8] = {0};
 static struct {
-  unsigned char const * pBegin;  /* Start (inclusive) of memory range */
-  unsigned char const * pEnd;    /* One-after-the-end of memory range */
-  unsigned char * pPos;          /* Current "stack pointer" */
+  unsigned const char * const pBegin;/* Start (inclusive) of memory */
+  unsigned const char * const pEnd;  /* One-after-the-end of memory */
+  unsigned char * pPos;              /* Current stack pointer */
 } PStack = {
   &PStack_mem[0],
   &PStack_mem[0] + sizeof(PStack_mem),
diff --git a/manifest b/manifest
index 4898d8f756..ff71979e91 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C wasm:\scorrect\sa\smemleak\scaused\sby\sa\sshadowed\svar\sin\sthe\sprevious\scheckin.\sAdd\sa\sstack-like\sallocator,\ssqlite3.capi.wasm.pstack,\sas\sa\sfaster\sway\sof\smanaging\sshort-lived\spointers\s(like\sthe\sone\swhich\sgot\sshadowed).
-D 2022-10-01T18:47:42.149
+C Pedantic\sconstness\stweak.
+D 2022-10-01T18:55:10.530
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -491,7 +491,7 @@ F ext/wasm/api/sqlite3-api-opfs.js 1b097808b7b081b0f0700cf97d49ef19760e401706168
 F ext/wasm/api/sqlite3-api-prologue.js 895b5f9ee425b8ba4a5fc5c85f144da9e2b785fea9226830f068d5c3b71e0fba
 F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c 43216a5266780f5f6ca3972684be5cd9113b624e43a5f5923c06a0c386e65857
+F ext/wasm/api/sqlite3-wasm.c d72aecf0e50a4403402095ef4e8d6a814fdc2256589944c1dc974c70d2f65b7e
 F ext/wasm/batch-runner.html c363032aba7a525920f61f8be112a29459f73f07e46f0ba3b7730081a617826e
 F ext/wasm/batch-runner.js ce92650a6681586c89bef26ceae96674a55ca5a9727815202ca62e1a00ff5015
 F ext/wasm/common/SqliteTestUtil.js 647bf014bd30bdd870a7e9001e251d12fc1c9ec9ce176a1004b838a4b33c5c05
@@ -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 29db7de79232c21d19b91bb0fc253114e02e21dd9bf90619453dbe72a4c8bf7f
-R bd74fd06e0648815273bfbe7fab3eb12
+P 1fa019c88deac6b6e5155b620bdab1d7145846290daafb9adbefcf4f0fe542cf
+R 2c97da3c3d7ce21103ef6ff81fa2f604
 U stephan
-Z 599287064c24d1dab9b272142121f171
+Z 0bcedaf6559a7f7aaaa984c6907036c1
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index d85382de39..fbdc5db101 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1fa019c88deac6b6e5155b620bdab1d7145846290daafb9adbefcf4f0fe542cf
\ No newline at end of file
+c8a173cf16d2567bf9b13f52904077a2e7209776c76613c7bff59cd66e24bf11
\ No newline at end of file

From f064a3bbe450ba2d18a6daec6293302902887f8e Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sat, 1 Oct 2022 19:21:52 +0000
Subject: [PATCH 204/428] Correct fiddle db export breakage caused by a
 post-testing API change made in [1fa019c88dea].

FossilOrigin-Name: e73cc44ec36c7585ebb914bdeed5b39480fca7c7a8d3c4426bfe769c87b98d17
---
 ext/wasm/api/sqlite3-api-prologue.js |  2 +-
 manifest                             | 12 ++++++------
 manifest.uuid                        |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 0e4a72ab65..b00eeb8633 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -941,7 +941,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     if(!pDb) toss('Invalid sqlite3* argument.');
     const wasm = capi.wasm;
     if(!wasm.bigIntEnabled) toss('BigInt64 support is not enabled.');
-    const stack = wasm.pstack.pointer();
+    const stack = wasm.pstack.pointer;
     let pOut;
     try{
       const pSize = wasm.pstack.alloc(8/*i64*/ + wasm.ptrSizeof);
diff --git a/manifest b/manifest
index ff71979e91..8e269668d8 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Pedantic\sconstness\stweak.
-D 2022-10-01T18:55:10.530
+C Correct\sfiddle\sdb\sexport\sbreakage\scaused\sby\sa\spost-testing\sAPI\schange\smade\sin\s[1fa019c88dea].
+D 2022-10-01T19:21:52.215
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -488,7 +488,7 @@ F ext/wasm/api/sqlite3-api-cleanup.js 5d22d1d3818ecacb23bfa223d5970cd0617d8cdbb4
 F ext/wasm/api/sqlite3-api-glue.js b15a51b88aaa472d36bf82d5123dbfdafe8ddf6ca75fba934510e4a20bbe4adb
 F ext/wasm/api/sqlite3-api-oo1.js 9caed0757a5e039ed92467e827fd3ca347fa08f19fe086fcbdd14a4ebe9c2f01
 F ext/wasm/api/sqlite3-api-opfs.js 1b097808b7b081b0f0700cf97d49ef19760e401706168edff9cd45cf9169f541
-F ext/wasm/api/sqlite3-api-prologue.js 895b5f9ee425b8ba4a5fc5c85f144da9e2b785fea9226830f068d5c3b71e0fba
+F ext/wasm/api/sqlite3-api-prologue.js 8692571345efc0f6844092e5ffa86cbd72af0fa23696599c04cc28d64c5d1d11
 F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c d72aecf0e50a4403402095ef4e8d6a814fdc2256589944c1dc974c70d2f65b7e
@@ -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 1fa019c88deac6b6e5155b620bdab1d7145846290daafb9adbefcf4f0fe542cf
-R 2c97da3c3d7ce21103ef6ff81fa2f604
+P c8a173cf16d2567bf9b13f52904077a2e7209776c76613c7bff59cd66e24bf11
+R d4bf3165ea62de5a9f288d66d4a2cd95
 U stephan
-Z 0bcedaf6559a7f7aaaa984c6907036c1
+Z a03f054bd345e55a260c4a080b874912
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index fbdc5db101..6eb12af986 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c8a173cf16d2567bf9b13f52904077a2e7209776c76613c7bff59cd66e24bf11
\ No newline at end of file
+e73cc44ec36c7585ebb914bdeed5b39480fca7c7a8d3c4426bfe769c87b98d17
\ No newline at end of file

From 7d34b8d6281c942382765f94e860a1e4f7d3a043 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sat, 1 Oct 2022 20:27:29 +0000
Subject: [PATCH 205/428] Performance optimization in sqlite3_prepare()
 (discovered while working on the stmt-cache branch).

FossilOrigin-Name: cd494240cc6184bb028d1f1049086f57c0a71a43d7ed1405fd4205240e1b9e61
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/prepare.c |  4 +++-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/manifest b/manifest
index 1bac28833e..3c60d28601 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Replace\sthe\sParse.disableVtab\sfield\swith\sParse.prepFlags\sfor\sincreased\ngenerality,\sa\ssmall\ssize\sreduction,\sand\sa\ssmall\sperformance\sincrease.
-D 2022-10-01T13:17:53.450
+C Performance\soptimization\sin\ssqlite3_prepare()\s(discovered\swhile\sworking\non\sthe\sstmt-cache\sbranch).
+D 2022-10-01T20:27:29.944
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -583,7 +583,7 @@ F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
 F src/pcache1.c dee95e3cd2b61e6512dc814c5ab76d5eb36f0bfc9441dbb4260fccc0d12bbddc
 F src/pragma.c 9bf7d8a2a9ad3bc36df3ec0d61817a44c38a1da527d59c26c203047f906e334a
 F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
-F src/prepare.c 0e61df99f063f12896a89c893fd3f8868e9fb13252c05e3e4e8cea7422094d0a
+F src/prepare.c 1b02be0441eda4579471fea097f678effcbb77ef0c39ab3f703c837822bcd674
 F src/printf.c e99ee9741e79ae3873458146f59644276657340385ade4e76a5f5d1c25793764
 F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
@@ -2000,8 +2000,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 bd8ae5febbb8d3122f1e2e09b9fcdd6ac20c075ae1cf60bcdbd36080f3736417
-R b431f195d6909dd213769258d329fb1f
+P b7da0bcdf70e53ab1ec00a0694e17c7429e23bc6eb3f39b622d06a930aa2f6a3
+R 68c35546ee03b20dc6a84c9cc1198497
 U drh
-Z 5ff8e8c9111016b6f28cef573224105e
+Z a1645f59fc204ccbfb7697554bfc7188
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index ceab8edde4..5c99b340dd 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b7da0bcdf70e53ab1ec00a0694e17c7429e23bc6eb3f39b622d06a930aa2f6a3
\ No newline at end of file
+cd494240cc6184bb028d1f1049086f57c0a71a43d7ed1405fd4205240e1b9e61
\ No newline at end of file
diff --git a/src/prepare.c b/src/prepare.c
index cd90bc4bad..1e7a1222ba 100644
--- a/src/prepare.c
+++ b/src/prepare.c
@@ -746,7 +746,9 @@ static int sqlite3Prepare(
     }
   }
 
-  sqlite3VtabUnlockList(db);
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+  if( db->pDisconnect ) sqlite3VtabUnlockList(db);
+#endif
 
   if( nBytes>=0 && (nBytes==0 || zSql[nBytes-1]!=0) ){
     char *zSqlCopy;

From 193ee11fe1f7ce00ecb9c65dd95e4d0f779400e5 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sun, 2 Oct 2022 00:09:40 +0000
Subject: [PATCH 206/428] General internal cleanups in the oo1 API.

FossilOrigin-Name: f9db664f756f3707afcb5dce87f6d946625848f27ea84337af68de72d4ad6c6b
---
 ext/wasm/api/sqlite3-api-oo1.js      | 109 +++++++++++++--------------
 ext/wasm/api/sqlite3-api-prologue.js |  23 +++++-
 ext/wasm/testing1.js                 |   2 +-
 manifest                             |  16 ++--
 manifest.uuid                        |   2 +-
 5 files changed, 84 insertions(+), 68 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index 19e9e61f08..627af2e8a5 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -16,6 +16,7 @@
 */
 self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
   const toss = (...args)=>{throw new Error(args.join(' '))};
+  const toss3 = (...args)=>{throw new sqlite3.SQLite3Error(...args)};
 
   const capi = sqlite3.capi, util = capi.util;
   /* What follows is colloquially known as "OO API #1". It is a
@@ -53,28 +54,11 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
   const getOwnOption = (opts, p, dflt)=>
         opts.hasOwnProperty(p) ? opts[p] : dflt;
 
-  /**
-     An Error subclass specifically for reporting DB-level errors and
-     enabling clients to unambiguously identify such exceptions.
-  */
-  class SQLite3Error extends Error {
-    /**
-       Constructs this object with a message equal to all arguments
-       concatenated with a space between each one.
-    */
-    constructor(...args){
-      super(args.join(' '));
-      this.name = 'SQLite3Error';
-    }
-  };
-  const toss3 = (...args)=>{throw new SQLite3Error(...args)};
-  sqlite3.SQLite3Error = SQLite3Error;
-
   // Documented in DB.checkRc()
   const checkSqlite3Rc = function(dbPtr, sqliteResultCode){
     if(sqliteResultCode){
       if(dbPtr instanceof DB) dbPtr = dbPtr.pointer;
-      throw new SQLite3Error(
+      toss3(
         "sqlite result code",sqliteResultCode+":",
         (dbPtr
          ? capi.sqlite3_errmsg(dbPtr)
@@ -183,13 +167,14 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
      If passed an object, any additional properties it has are copied
      as-is into the new object.
   */
-  dbCtorHelper.normalizeArgs = function(filename,flags = 'c',vfs = null){
+  dbCtorHelper.normalizeArgs = function(filename=':memory:',flags = 'c',vfs = null){
     const arg = {};
     if(1===arguments.length && 'object'===typeof arguments[0]){
       const x = arguments[0];
       Object.keys(x).forEach((k)=>arg[k] = x[k]);
       if(undefined===arg.flags) arg.flags = 'c';
       if(undefined===arg.vfs) arg.vfs = null;
+      if(undefined===arg.filename) arg.filename = ':memory:';
     }else{
       arg.filename = filename;
       arg.flags = flags;
@@ -232,7 +217,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
 
      The final argument is analogous to the final argument of
      sqlite3_open_v2(): the name of an sqlite3 VFS. Pass a falsy value,
-     or not at all, to use the default. If passed a value, it must
+     or none at all, to use the default. If passed a value, it must
      be the string name of a VFS
 
      The constructor optionally (and preferably) takes its arguments
@@ -554,15 +539,16 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     */
     prepare: function(sql){
       affirmDbOpen(this);
-      if(Array.isArray(sql)) sql = sql.join('');
-      const stack = capi.wasm.scopedAllocPush();
+      const stack = capi.wasm.pstack.pointer;
       let ppStmt, pStmt;
       try{
-        ppStmt = capi.wasm.scopedAllocPtr()/* output (sqlite3_stmt**) arg */;
+        ppStmt = capi.wasm.pstack.alloc(8)/* output (sqlite3_stmt**) arg */;
         DB.checkRc(this, capi.sqlite3_prepare_v2(this.pointer, sql, -1, ppStmt, null));
         pStmt = capi.wasm.getPtrValue(ppStmt);
       }
-      finally {capi.wasm.scopedAllocPop(stack)}
+      finally {
+        capi.wasm.pstack.restore(stack);
+      }
       if(!pStmt) toss3("Cannot prepare empty SQL.");
       const stmt = new Stmt(this, pStmt, BindTypes);
       __stmtMap.get(this)[pStmt] = stmt;
@@ -977,7 +963,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        SQLITE_{typename} constants. Passing the undefined value is
        the same as not passing a value.
 
-       Throws on error (e.g. malformedSQL).
+       Throws on error (e.g. malformed SQL).
     */
     selectValue: function(sql,bind,asType){
       let stmt, rc;
@@ -1157,7 +1143,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
           }
         }
       };
-    }
+    }/* static init */
     affirmSupportedBindType(val);
     ndx = affirmParamIndex(stmt,ndx);
     let rc = 0;
@@ -1171,15 +1157,24 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
         case BindTypes.number: {
           let m;
           if(util.isInt32(val)) m = capi.sqlite3_bind_int;
-          else if(capi.wasm.bigIntEnabled && ('bigint'===typeof val)){
+          else if('bigint'===typeof val){
             if(val<f._minInt || val>f._maxInt){
-              toss3("BigInt value is out of range for int64: "+val);
+              toss3("BigInt value is out of range for storing as int64: "+val);
+            }else if(capi.wasm.bigIntEnabled){
+              m = capi.sqlite3_bind_int64;
+            }else if(val >= Number.MIN_SAFE_INTEGER && val <= Number.MAX_SAFE_INTEGER){
+              val = Number(val);
+              m = capi.sqlite3_bind_double;
+            }else{
+              toss3("BigInt value is out of range for storing as double: "+val);
+            }
+          }else{ // !int32, !bigint
+            val = Number(val);
+            if(capi.wasm.bigIntEnabled && Number.isInteger(val)){
+              m = capi.sqlite3_bind_int64;
+            }else{
+              m = capi.sqlite3_bind_double;
             }
-            m = capi.sqlite3_bind_int64;
-          }else if(Number.isInteger(val)){
-            m = capi.sqlite3_bind_int64;
-          }else{
-            m = capi.sqlite3_bind_double;
           }
           rc = m(stmt.pointer, ndx, val);
           break;
@@ -1283,31 +1278,32 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        - null is bound as NULL.
 
        - undefined as a standalone value is a no-op intended to
-       simplify certain client-side use cases: passing undefined
-       as a value to this function will not actually bind
-       anything and this function will skip confirmation that
-       binding is even legal. (Those semantics simplify certain
-       client-side uses.) Conversely, a value of undefined as an
-       array or object property when binding an array/object
-       (see below) is treated the same as null.
+         simplify certain client-side use cases: passing undefined as
+         a value to this function will not actually bind anything and
+         this function will skip confirmation that binding is even
+         legal. (Those semantics simplify certain client-side uses.)
+         Conversely, a value of undefined as an array or object
+         property when binding an array/object (see below) is treated
+         the same as null.
 
-       - Numbers are bound as either doubles or integers: doubles
-       if they are larger than 32 bits, else double or int32,
-       depending on whether they have a fractional part. (It is,
-       as of this writing, illegal to call (from JS) a WASM
-       function which either takes or returns an int64.)
-       Booleans are bound as integer 0 or 1. It is not expected
-       the distinction of binding doubles which have no
-       fractional parts is integers is significant for the
-       majority of clients due to sqlite3's data typing
-       model. If capi.wasm.bigIntEnabled is true then this
-       routine will bind BigInt values as 64-bit integers.
+       - Numbers are bound as either doubles or integers: doubles if
+         they are larger than 32 bits, else double or int32, depending
+         on whether they have a fractional part. Booleans are bound as
+         integer 0 or 1. It is not expected the distinction of binding
+         doubles which have no fractional parts is integers is
+         significant for the majority of clients due to sqlite3's data
+         typing model. If [BigInt] support is enabled then this
+         routine will bind BigInt values as 64-bit integers if they'll
+         fit in 64 bits. If that support disabled, it will store the
+         BigInt as an int32 or a double if it can do so without loss
+         of precision. If the BigInt is _too BigInt_ then it will
+         throw.
 
        - Strings are bound as strings (use bindAsBlob() to force
-       blob binding).
+         blob binding).
 
        - Uint8Array and Int8Array instances are bound as blobs.
-       (TODO: binding the other TypedArray types.)
+         (TODO: binding the other TypedArray types.)
 
        If passed an array, each element of the array is bound at
        the parameter index equal to the array index plus 1
@@ -1458,7 +1454,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        This is intended to simplify use cases such as:
 
        ```
-       aDb.prepare("insert in foo(a) values(?)").bind(123).stepFinalize();
+       aDb.prepare("insert into foo(a) values(?)").bind(123).stepFinalize();
        ```
     */
     stepFinalize: function(){
@@ -1595,7 +1591,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     },
     // Design note: the only reason most of these getters have a 'get'
     // prefix is for consistency with getVALUE_TYPE().  The latter
-    // arguablly really need that prefix for API readability and the
+    // arguably really need that prefix for API readability and the
     // rest arguably don't, but consistency is a powerful thing.
     /**
        Returns the result column name of the given index, or
@@ -1616,9 +1612,8 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        cannot have result columns. This object's columnCount member
        holds the number of columns.
     */
-    getColumnNames: function(tgt){
+    getColumnNames: function(tgt=[]){
       affirmColIndex(affirmStmtOpen(this),0);
-      if(!tgt) tgt = [];
       for(let i = 0; i < this.columnCount; ++i){
         tgt.push(capi.sqlite3_column_name(this.pointer, i));
       }
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index b00eeb8633..97376be6c8 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -785,7 +785,9 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
        be released using restore().
 
        This method always adjusts the given value to be a multiple
-       of 8 in order to keep alignment guarantees.
+       of 8 bytes because failing to do so can lead to incorrect
+       results when reading and writing 64-bit values from/to the WASM
+       heap.
     */
     alloc: capi.wasm.exports.sqlite3_wasm_pstack_alloc
   });
@@ -809,6 +811,24 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     get: capi.wasm.exports.sqlite3_wasm_pstack_remaining
   });
 
+  /**
+     An Error subclass specifically for reporting DB-level errors and
+     enabling clients to unambiguously identify such exceptions.
+     The C-level APIs never throw, but some of the higher-level
+     C-style APIs do and the object-oriented APIs use exceptions
+     exclusively to report errors.
+  */
+  class SQLite3Error extends Error {
+    /**
+       Constructs this object with a message equal to all arguments
+       concatenated with a space between each one.
+    */
+    constructor(...args){
+      super(args.join(' '));
+      this.name = 'SQLite3Error';
+    }
+  };
+
 
   /** State for sqlite3_wasmfs_opfs_dir(). */
   let __persistentDir = undefined;
@@ -1059,6 +1079,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
   /* The remainder of the API will be set up in later steps. */
   const sqlite3 = {
     WasmAllocError: WasmAllocError,
+    SQLite3Error: SQLite3Error,
     capi,
     config,
     /**
diff --git a/ext/wasm/testing1.js b/ext/wasm/testing1.js
index ffe63c537c..dd61ab2814 100644
--- a/ext/wasm/testing1.js
+++ b/ext/wasm/testing1.js
@@ -354,7 +354,7 @@
         T.assert(g64(pMin) === minMaxI64[0]).
           assert(minMaxI64[0] === db.selectValue("select ?",g64(pMin))).
           assert(minMaxI64[1] === db.selectValue("select ?",g64(pMax)));
-        const rxRange = /out of range for int64/;
+        const rxRange = /out of range for storing as int64/;
         T.mustThrowMatching(()=>{db.prepare("select ?").bind(minMaxI64[0] - BigInt(1))},
                           rxRange).
           mustThrowMatching(()=>{db.prepare("select ?").bind(minMaxI64[1] + BigInt(1))},
diff --git a/manifest b/manifest
index 8e269668d8..44d3de74a9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Correct\sfiddle\sdb\sexport\sbreakage\scaused\sby\sa\spost-testing\sAPI\schange\smade\sin\s[1fa019c88dea].
-D 2022-10-01T19:21:52.215
+C General\sinternal\scleanups\sin\sthe\soo1\sAPI.
+D 2022-10-02T00:09:40.160
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -486,9 +486,9 @@ 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 b15a51b88aaa472d36bf82d5123dbfdafe8ddf6ca75fba934510e4a20bbe4adb
-F ext/wasm/api/sqlite3-api-oo1.js 9caed0757a5e039ed92467e827fd3ca347fa08f19fe086fcbdd14a4ebe9c2f01
+F ext/wasm/api/sqlite3-api-oo1.js 7667d320f6b9fb5252050a2f9c0b1769e11b84dbc0763b999baf65b451b14369
 F ext/wasm/api/sqlite3-api-opfs.js 1b097808b7b081b0f0700cf97d49ef19760e401706168edff9cd45cf9169f541
-F ext/wasm/api/sqlite3-api-prologue.js 8692571345efc0f6844092e5ffa86cbd72af0fa23696599c04cc28d64c5d1d11
+F ext/wasm/api/sqlite3-api-prologue.js a93bd69969eb8b8f9c4cb34e5d86dcbbe5adbeeea39c1cce57194256c5f28434
 F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c d72aecf0e50a4403402095ef4e8d6a814fdc2256589944c1dc974c70d2f65b7e
@@ -530,7 +530,7 @@ F ext/wasm/test-opfs-vfs.js a59ff9210b17d46b0c6fbf6a0ba60143c033327865f2e556e14f
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
 F ext/wasm/testing-worker1-promiser.js bd788e33c1807e0a6dda9c9a9d784bd3350ca49c9dd8ae2cc8719b506b6e013e
 F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d7669fb17fcae
-F ext/wasm/testing1.js 419e029ee4ae3cf98dd4c20aebdb111afe743b54ed8856e5f59775c3241fd21f
+F ext/wasm/testing1.js 51ef1ced0669f804787ce96f19dcf64367550a7923a998514be56076326988d7
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
 F ext/wasm/testing2.js 88f40ef3cd8201bdadd120a711c36bbf0ce56cc0eab1d5e7debb71fed7822494
 F ext/wasm/wasmfs.make 3cce1820006196de140f90f2da4b4ea657083fb5bfee7d125be43f7a85748c8f
@@ -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 c8a173cf16d2567bf9b13f52904077a2e7209776c76613c7bff59cd66e24bf11
-R d4bf3165ea62de5a9f288d66d4a2cd95
+P e73cc44ec36c7585ebb914bdeed5b39480fca7c7a8d3c4426bfe769c87b98d17
+R 4b53a976c2062b810a77639258e8be02
 U stephan
-Z a03f054bd345e55a260c4a080b874912
+Z f0b55570286779c7113ac4ef57233011
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 6eb12af986..1d593beead 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e73cc44ec36c7585ebb914bdeed5b39480fca7c7a8d3c4426bfe769c87b98d17
\ No newline at end of file
+f9db664f756f3707afcb5dce87f6d946625848f27ea84337af68de72d4ad6c6b
\ No newline at end of file

From 6479c5a359e932a76225a903f1a6655cda8c277d Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sun, 2 Oct 2022 01:48:14 +0000
Subject: [PATCH 207/428] Document the roles of the new (this past week) JS
 files added to the build process.

FossilOrigin-Name: 8b3bc7313aff551e5ee0b7aeb927095cf19b9b96abbdd922066c130656b8aa7d
---
 ext/wasm/api/README.md | 19 +++++++++++++++++++
 manifest               | 12 ++++++------
 manifest.uuid          |  2 +-
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/ext/wasm/api/README.md b/ext/wasm/api/README.md
index 6780c56ae6..fd85e215b4 100644
--- a/ext/wasm/api/README.md
+++ b/ext/wasm/api/README.md
@@ -108,3 +108,22 @@ The non-JS outlier file is `sqlite3-wasm.c`: it is a proxy for
 WASM-specific helper functions, at least one of which requires access
 to private/static `sqlite3.c` internals. `sqlite3.wasm` is compiled
 from this file rather than `sqlite3.c`.
+
+The following files are part of the build process but are injected
+into the build-generated `sqlite3.js` along with `sqlite3-api.js`.
+
+- `extern-pre-js.js`\  
+  Emscripten-specific header for Emscripten's `--extern-pre-js`
+  flag. As of this writing, that file is only used for experimentation
+  purposes and holds no code relevant to the production deliverables.
+- `pre-js.js`\  
+  Emscripten-specific header for Emscripten's `--pre-js` flag. This
+  file is intended as a place to override certain Emscripten behavior
+  before it starts up, but corner-case Emscripten bugs keep that from
+  being a reality.
+- `extern-post-js.js`\  
+  Emscripten-specific header for Emscripten's `--extern-post-js`
+  flag. This file overwrites the Emscripten-installed
+  `sqlite3InitModule()` function with one which, after the module is
+  loaded, also initializes the asynchronous parts of the sqlite3
+  module. For example, the OPFS VFS support.
diff --git a/manifest b/manifest
index 44d3de74a9..d3947b8c26 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C General\sinternal\scleanups\sin\sthe\soo1\sAPI.
-D 2022-10-02T00:09:40.160
+C Document\sthe\sroles\sof\sthe\snew\s(this\spast\sweek)\sJS\sfiles\sadded\sto\sthe\sbuild\sprocess.
+D 2022-10-02T01:48:14.286
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -478,7 +478,7 @@ F ext/wasm/GNUmakefile b313a82060c733c990b91afa981e10f5e21a0b33a483f33b739ce932e
 F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api c6b05641d733227a995cc05a2ba7ddc9ef2323081ae0cae5ed1d1f83d5b54b36
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
-F ext/wasm/api/README.md f54102d74cfde01ebe242fa1411e126a9cda8f19b3ac378afd1103b21abfad05
+F ext/wasm/api/README.md b6d19392984fdd428ae7260512d45742160c06baefed9da703da3fdeb68e7124
 F ext/wasm/api/extern-post-js.js dc68cbf552d8ea085181400a6963907c32e0b088b03ffd8969b1869fea246629
 F ext/wasm/api/extern-pre-js.js 20143b16b672d0a576fbf768a786d12ee1f84e222126477072389b992542a5b2
 F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba81456260a713ed04900c
@@ -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 e73cc44ec36c7585ebb914bdeed5b39480fca7c7a8d3c4426bfe769c87b98d17
-R 4b53a976c2062b810a77639258e8be02
+P f9db664f756f3707afcb5dce87f6d946625848f27ea84337af68de72d4ad6c6b
+R 8201c0f212d8f73dc23b363b8bdcd606
 U stephan
-Z f0b55570286779c7113ac4ef57233011
+Z 7616e552f06f17aa339add7ed573ed79
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 1d593beead..29067e24bf 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f9db664f756f3707afcb5dce87f6d946625848f27ea84337af68de72d4ad6c6b
\ No newline at end of file
+8b3bc7313aff551e5ee0b7aeb927095cf19b9b96abbdd922066c130656b8aa7d
\ No newline at end of file

From 63e9ec2f9c7042fc8fb3f858144ee9ebe5408f69 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sun, 2 Oct 2022 03:11:13 +0000
Subject: [PATCH 208/428] More fleshing out of sqlite3.capi.wasm.pstack.

FossilOrigin-Name: eb5726677a727a958df11f1fba078d30c7c0ba2a9bdb158e8641b35b5f971af3
---
 ext/wasm/api/sqlite3-api-glue.js     | 59 +++++++++++++++++--
 ext/wasm/api/sqlite3-api-oo1.js      | 88 ++++++++++++++--------------
 ext/wasm/api/sqlite3-api-prologue.js | 22 +++++--
 ext/wasm/api/sqlite3-wasm.c          | 12 ++--
 ext/wasm/common/whwasmutil.js        | 45 ++++++++++----
 ext/wasm/testing1.js                 | 41 +++++++++++--
 manifest                             | 22 +++----
 manifest.uuid                        |  2 +-
 8 files changed, 205 insertions(+), 86 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index ab9424acab..b6ec1695e1 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -55,10 +55,11 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
   
   if(1){// WhWasmUtil.xWrap() bindings...
     /**
-       Add some descriptive xWrap() aliases for '*' intended to
-       (A) initially improve readability/correctness of capi.signatures
-       and (B) eventually perhaps provide some sort of type-safety
-       in their conversions.
+       Add some descriptive xWrap() aliases for '*' intended to (A)
+       initially improve readability/correctness of capi.signatures
+       and (B) eventually perhaps provide automatic conversion from
+       higher-level representations, e.g. capi.sqlite3_vfs to
+       `sqlite3_vfs*` via capi.sqlite3_vfs.pointer.
     */
     const aPtr = wasm.xWrap.argAdapter('*');
     wasm.xWrap.argAdapter('sqlite3*', aPtr)('sqlite3_stmt*', aPtr);
@@ -248,6 +249,56 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     };
   }/*sqlite3_prepare_v2/v3()*/;
 
+  if(1){// Extend wasm.pstack, now that the wasm utils are installed
+    /**
+       Allocates n chunks, each sz bytes, as a single memory block and
+       returns the addresses as an array of n element, each holding
+       the address of one chunk.
+
+       Throws a WasmAllocError if allocation fails.
+
+       Example:
+
+       ```
+       const [p1, p2, p3] = wasm.pstack.allocChunks(3,4);
+       ```
+    */
+    wasm.pstack.allocChunks = (n,sz)=>{
+      const mem = wasm.pstack.alloc(n * sz);
+      const rc = [];
+      let i = 0, offset = 0;
+      for(; i < n; offset = (sz * ++i)){
+        rc.push(mem + offset);
+      }
+      return rc;
+    };
+
+    /**
+       A convenience wrapper for allocChunks() which sizes each chunks
+       as either 8 bytes (safePtrSize is truthy) or wasm.ptrSizeof (if
+       safePtrSize is truthy).
+
+       How it returns its result differs depending on its first
+       argument: if it's 1, it returns a single pointer value. If it's
+       more than 1, it returns the same as allocChunks().
+
+       When one of the pointers refers to a 64-bit value, e.g. a
+       double or int64, and that value must be written or fetch,
+       e.g. using wasm.setMemValue() or wasm.getMemValue(), it is
+       important that the pointer in question be aligned to an 8-byte
+       boundary or else it will not be fetched or written properly and
+       will corrupt or read neighboring memory.
+
+       However, when all pointers involved are "small", it is safe to
+       pass a falsy value to save to memory.
+    */
+    wasm.pstack.allocPtr = (n=1,safePtrSize=true) =>{
+      return 1===n
+        ? wasm.pstack.alloc(safePtrSize ? 8 : wasm.ptrSizeof)
+        : wasm.pstack.allocChunks(n, safePtrSize ? 8 : wasm.ptrSizeof);
+    };
+  }/*wasm.pstack filler*/
+
   /**
      Install JS<->C struct bindings for the non-opaque struct types we
      need... */
diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index 627af2e8a5..07f0657fa4 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -18,7 +18,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
   const toss = (...args)=>{throw new Error(args.join(' '))};
   const toss3 = (...args)=>{throw new sqlite3.SQLite3Error(...args)};
 
-  const capi = sqlite3.capi, util = capi.util;
+  const capi = sqlite3.capi, wasm = capi.wasm, util = capi.util;
   /* What follows is colloquially known as "OO API #1". It is a
      binding of the sqlite3 API which is designed to be run within
      the same thread (main or worker) as the one in which the
@@ -33,7 +33,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
      accessor and store their real values in this map. Keys = DB/Stmt
      objects, values = pointer values. This also unifies how those are
      accessed, for potential use downstream via custom
-     capi.wasm.xWrap() function signatures which know how to extract
+     wasm.xWrap() function signatures which know how to extract
      it.
   */
   const __ptrMap = new WeakMap();
@@ -72,7 +72,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
      being-construct DB object as its "this". See the DB constructor
      for the argument docs. This is split into a separate function
      in order to enable simple creation of special-case DB constructors,
-     e.g. a hypothetical LocalStorageDB or OpfsDB.
+     e.g. JsStorageDB and OpfsDB.
 
      Expects to be passed a configuration object with the following
      properties:
@@ -123,7 +123,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
       console.error("Invalid DB ctor args",opt,arguments);
       toss3("Invalid arguments for DB constructor.");
     }
-    let fnJs = ('number'===typeof fn) ? capi.wasm.cstringToJs(fn) : fn;
+    let fnJs = ('number'===typeof fn) ? wasm.cstringToJs(fn) : fn;
     const vfsCheck = ctor._name2vfs[fnJs];
     if(vfsCheck){
       vfsName = vfsCheck.vfs;
@@ -136,20 +136,20 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     if( flagsStr.indexOf('w')>=0 ) oflags |= capi.SQLITE_OPEN_READWRITE;
     if( 0===oflags ) oflags |= capi.SQLITE_OPEN_READONLY;
     oflags |= capi.SQLITE_OPEN_EXRESCODE;
-    const stack = capi.wasm.scopedAllocPush();
+    const scope = wasm.scopedAllocPush();
     try {
-      const ppDb = capi.wasm.scopedAllocPtr() /* output (sqlite3**) arg */;
+      const ppDb = wasm.allocPtr() /* output (sqlite3**) arg */;
       const pVfsName = vfsName ? (
-        ('number'===typeof vfsName ? vfsName : capi.wasm.scopedAllocCString(vfsName))
+        ('number'===typeof vfsName ? vfsName : wasm.scopedAllocCString(vfsName))
       ): 0;
       const rc = capi.sqlite3_open_v2(fn, ppDb, oflags, pVfsName);
-      ptr = capi.wasm.getPtrValue(ppDb);
+      ptr = wasm.getPtrValue(ppDb);
       checkSqlite3Rc(ptr, rc);
     }catch( e ){
       if( ptr ) capi.sqlite3_close_v2(ptr);
       throw e;
     }finally{
-      capi.wasm.scopedAllocPop(stack);
+      wasm.scopedAllocPop(scope);
     }
     this.filename = fnJs;
     __ptrMap.set(this, ptr);
@@ -265,7 +265,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     blob: 5
   };
   BindTypes['undefined'] == BindTypes.null;
-  if(capi.wasm.bigIntEnabled){
+  if(wasm.bigIntEnabled){
     BindTypes.bigint = BindTypes.number;
   }
 
@@ -454,7 +454,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
           if(s && s.pointer) s.finalize();
         });
         Object.values(__udfMap.get(this)).forEach(
-          capi.wasm.uninstallFunction.bind(capi.wasm)
+          wasm.uninstallFunction.bind(capi.wasm)
         );
         __ptrMap.delete(this);
         __stmtMap.delete(this);
@@ -539,15 +539,15 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     */
     prepare: function(sql){
       affirmDbOpen(this);
-      const stack = capi.wasm.pstack.pointer;
+      const stack = wasm.pstack.pointer;
       let ppStmt, pStmt;
       try{
-        ppStmt = capi.wasm.pstack.alloc(8)/* output (sqlite3_stmt**) arg */;
+        ppStmt = wasm.pstack.alloc(8)/* output (sqlite3_stmt**) arg */;
         DB.checkRc(this, capi.sqlite3_prepare_v2(this.pointer, sql, -1, ppStmt, null));
-        pStmt = capi.wasm.getPtrValue(ppStmt);
+        pStmt = wasm.getPtrValue(ppStmt);
       }
       finally {
-        capi.wasm.pstack.restore(stack);
+        wasm.pstack.restore(stack);
       }
       if(!pStmt) toss3("Cannot prepare empty SQL.");
       const stmt = new Stmt(this, pStmt, BindTypes);
@@ -846,7 +846,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
           let i, pVal, valType, arg;
           const tgt = [];
           for(i = 0; i < argc; ++i){
-            pVal = capi.wasm.getPtrValue(pArgv + (capi.wasm.ptrSizeof * i));
+            pVal = wasm.getPtrValue(pArgv + (wasm.ptrSizeof * i));
             /**
                Curiously: despite ostensibly requiring 8-byte
                alignment, the pArgv array is parcelled into chunks of
@@ -868,7 +868,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
                   const pBlob = capi.sqlite3_value_blob(pVal);
                   arg = new Uint8Array(n);
                   let i;
-                  const heap = n ? capi.wasm.heap8() : false;
+                  const heap = n ? wasm.heap8() : false;
                   for(i = 0; i < n; ++i) arg[i] = heap[pBlob+i];
                   break;
                 }
@@ -902,10 +902,10 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
                   capi.sqlite3_result_null(pCx);
                   break;
                 }else if(util.isBindableTypedArray(val)){
-                  const pBlob = capi.wasm.allocFromTypedArray(val);
+                  const pBlob = wasm.allocFromTypedArray(val);
                   capi.sqlite3_result_blob(pCx, pBlob, val.byteLength,
                                           capi.SQLITE_TRANSIENT);
-                  capi.wasm.dealloc(pBlob);
+                  wasm.dealloc(pBlob);
                   break;
                 }
                 // else fall through
@@ -925,7 +925,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
           }
         }
       };
-      const pUdf = capi.wasm.installFunction(wrapper, "v(iii)");
+      const pUdf = wasm.installFunction(wrapper, "v(iii)");
       let fFlags = 0 /*flags for sqlite3_create_function_v2()*/;
       if(getOwnOption(opt, 'deterministic')) fFlags |= capi.SQLITE_DETERMINISTIC;
       if(getOwnOption(opt, 'directOnly')) fFlags |= capi.SQLITE_DIRECTONLY;
@@ -938,12 +938,12 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
           capi.SQLITE_UTF8 | fFlags, null/*pApp*/, pUdf,
           null/*xStep*/, null/*xFinal*/, null/*xDestroy*/));
       }catch(e){
-        capi.wasm.uninstallFunction(pUdf);
+        wasm.uninstallFunction(pUdf);
         throw e;
       }
       const udfMap = __udfMap.get(this);
       if(udfMap[name]){
-        try{capi.wasm.uninstallFunction(udfMap[name])}
+        try{wasm.uninstallFunction(udfMap[name])}
         catch(e){/*ignore*/}
       }
       udfMap[name] = pUdf;
@@ -1049,7 +1049,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
         case BindTypes.string:
           return t;
         case BindTypes.bigint:
-          if(capi.wasm.bigIntEnabled) return t;
+          if(wasm.bigIntEnabled) return t;
           /* else fall through */
         default:
           //console.log("isSupportedBindType",t,v);
@@ -1109,7 +1109,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
   const bindOne = function f(stmt,ndx,bindType,val){
     affirmUnlocked(stmt, 'bind()');
     if(!f._){
-      if(capi.wasm.bigIntEnabled){
+      if(wasm.bigIntEnabled){
         f._maxInt = BigInt("0x7fffffffffffffff");
         f._minInt = ~f._maxInt;
       }
@@ -1120,25 +1120,25 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
         string: function(stmt, ndx, val, asBlob){
           if(1){
             /* _Hypothetically_ more efficient than the impl in the 'else' block. */
-            const stack = capi.wasm.scopedAllocPush();
+            const stack = wasm.scopedAllocPush();
             try{
-              const n = capi.wasm.jstrlen(val);
-              const pStr = capi.wasm.scopedAlloc(n);
-              capi.wasm.jstrcpy(val, capi.wasm.heap8u(), pStr, n, false);
+              const n = wasm.jstrlen(val);
+              const pStr = wasm.scopedAlloc(n);
+              wasm.jstrcpy(val, wasm.heap8u(), pStr, n, false);
               const f = asBlob ? capi.sqlite3_bind_blob : capi.sqlite3_bind_text;
               return f(stmt.pointer, ndx, pStr, n, capi.SQLITE_TRANSIENT);
             }finally{
-              capi.wasm.scopedAllocPop(stack);
+              wasm.scopedAllocPop(stack);
             }
           }else{
-            const bytes = capi.wasm.jstrToUintArray(val,false);
-            const pStr = capi.wasm.alloc(bytes.length || 1);
-            capi.wasm.heap8u().set(bytes.length ? bytes : [0], pStr);
+            const bytes = wasm.jstrToUintArray(val,false);
+            const pStr = wasm.alloc(bytes.length || 1);
+            wasm.heap8u().set(bytes.length ? bytes : [0], pStr);
             try{
               const f = asBlob ? capi.sqlite3_bind_blob : capi.sqlite3_bind_text;
               return f(stmt.pointer, ndx, pStr, bytes.length, capi.SQLITE_TRANSIENT);
             }finally{
-              capi.wasm.dealloc(pStr);
+              wasm.dealloc(pStr);
             }
           }
         }
@@ -1160,7 +1160,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
           else if('bigint'===typeof val){
             if(val<f._minInt || val>f._maxInt){
               toss3("BigInt value is out of range for storing as int64: "+val);
-            }else if(capi.wasm.bigIntEnabled){
+            }else if(wasm.bigIntEnabled){
               m = capi.sqlite3_bind_int64;
             }else if(val >= Number.MIN_SAFE_INTEGER && val <= Number.MAX_SAFE_INTEGER){
               val = Number(val);
@@ -1170,7 +1170,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
             }
           }else{ // !int32, !bigint
             val = Number(val);
-            if(capi.wasm.bigIntEnabled && Number.isInteger(val)){
+            if(wasm.bigIntEnabled && Number.isInteger(val)){
               m = capi.sqlite3_bind_int64;
             }else{
               m = capi.sqlite3_bind_double;
@@ -1190,22 +1190,22 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
                   "that it be a string, Uint8Array, or Int8Array.");
           }else if(1){
             /* _Hypothetically_ more efficient than the impl in the 'else' block. */
-            const stack = capi.wasm.scopedAllocPush();
+            const stack = wasm.scopedAllocPush();
             try{
-              const pBlob = capi.wasm.scopedAlloc(val.byteLength || 1);
-              capi.wasm.heap8().set(val.byteLength ? val : [0], pBlob)
+              const pBlob = wasm.scopedAlloc(val.byteLength || 1);
+              wasm.heap8().set(val.byteLength ? val : [0], pBlob)
               rc = capi.sqlite3_bind_blob(stmt.pointer, ndx, pBlob, val.byteLength,
                                          capi.SQLITE_TRANSIENT);
             }finally{
-              capi.wasm.scopedAllocPop(stack);
+              wasm.scopedAllocPop(stack);
             }
           }else{
-            const pBlob = capi.wasm.allocFromTypedArray(val);
+            const pBlob = wasm.allocFromTypedArray(val);
             try{
               rc = capi.sqlite3_bind_blob(stmt.pointer, ndx, pBlob, val.byteLength,
                                          capi.SQLITE_TRANSIENT);
             }finally{
-              capi.wasm.dealloc(pBlob);
+              wasm.dealloc(pBlob);
             }
           }
           break;
@@ -1518,7 +1518,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
              : asType){
           case capi.SQLITE_NULL: return null;
           case capi.SQLITE_INTEGER:{
-            if(capi.wasm.bigIntEnabled){
+            if(wasm.bigIntEnabled){
               const rc = capi.sqlite3_column_int64(this.pointer, ndx);
               if(rc>=Number.MIN_SAFE_INTEGER && rc<=Number.MAX_SAFE_INTEGER){
                 /* Coerce "normal" number ranges to normal number values,
@@ -1549,8 +1549,8 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
             const n = capi.sqlite3_column_bytes(this.pointer, ndx),
                   ptr = capi.sqlite3_column_blob(this.pointer, ndx),
                   rc = new Uint8Array(n);
-            //heap = n ? capi.wasm.heap8() : false;
-            if(n) rc.set(capi.wasm.heap8u().slice(ptr, ptr+n), 0);
+            //heap = n ? wasm.heap8() : false;
+            if(n) rc.set(wasm.heap8u().slice(ptr, ptr+n), 0);
             //for(let i = 0; i < n; ++i) rc[i] = heap[ptr + i];
             if(n && this.db._blobXfer instanceof Array){
               /* This is an optimization soley for the
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 97376be6c8..59533815fb 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -265,6 +265,9 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
       this.name = 'WasmAllocError';
     }
   };
+  WasmAllocError.toss = (...args)=>{
+    throw new WasmAllocError(args.join(' '));
+  };
 
   /** 
       The main sqlite3 binding API gets installed into this object,
@@ -733,6 +736,9 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
      Functions which are intended solely for API-internal use by the
      WASM components, not client code. These get installed into
      capi.wasm.
+
+     TODO: get rid of sqlite3_wasm_vfs_unlink(). It is ill-conceived
+     and only rarely actually useful.
   */
   capi.wasm.bindingSignatures.wasm = [
     ["sqlite3_wasm_vfs_unlink", "int", "string"]
@@ -781,15 +787,21 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
        Attempts to allocate the given number of bytes from the
        pstack. On success, it zeroes out a block of memory of the
        given size, adjusts the pstack pointer, and returns a pointer
-       to the memory. On error, returns 0. The memory must eventually
-       be released using restore().
+       to the memory. On error, returns throws a WasmAllocError. The
+       memory must eventually be released using restore().
 
        This method always adjusts the given value to be a multiple
        of 8 bytes because failing to do so can lead to incorrect
        results when reading and writing 64-bit values from/to the WASM
        heap.
     */
-    alloc: capi.wasm.exports.sqlite3_wasm_pstack_alloc
+    alloc: (n)=>{
+      return capi.wasm.exports.sqlite3_wasm_pstack_alloc(n)
+        || WasmAllocError.toss("Could not allocate",n,
+                               "bytes from the pstack.");
+    }
+    // More methods get added after the capi.wasm object is populated
+    // by WhWasmUtilInstaller.
   });
   /**
      sqlite3.capi.wasm.pstack.pointer resolves to the current pstack
@@ -828,7 +840,9 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
       this.name = 'SQLite3Error';
     }
   };
-
+  SQLite3Error.toss = (...args)=>{
+    throw new SQLite3Error(args.join(' '));
+  };
 
   /** State for sqlite3_wasmfs_opfs_dir(). */
   let __persistentDir = undefined;
diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index a2de8ca710..b9454155d7 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -59,6 +59,10 @@
 #include <assert.h>
 #include "sqlite3.c" /* yes, .c instead of .h. */
 
+#if defined(__EMSCRIPTEN__)
+#  include <emscripten/console.h>
+#endif
+
 /*
 ** WASM_KEEP is identical to EMSCRIPTEN_KEEPALIVE but is not
 ** Emscripten-specific. It explicitly marks functions for export into
@@ -667,6 +671,9 @@ WASM_KEEP
 int sqlite3_wasm_vfs_unlink(const char * zName){
   int rc = SQLITE_MISUSE /* ??? */;
   sqlite3_vfs * const pVfs = sqlite3_vfs_find(0);
+#if defined(__EMSCRIPTEN__)
+  emscripten_console_warn("sqlite3_wasm_vfs_unlink() will be removed.");
+#endif
   if( zName && pVfs && pVfs->xDelete ){
     rc = pVfs->xDelete(pVfs, zName, 1);
   }
@@ -750,9 +757,7 @@ int sqlite3_wasm_db_serialize( sqlite3* pDb, unsigned char **pOut, sqlite3_int64
 }
 
 
-#if defined(__EMSCRIPTEN__)
-#include <emscripten/console.h>
-#if defined(SQLITE_WASM_WASMFS)
+#if defined(__EMSCRIPTEN__) && defined(SQLITE_WASM_WASMFS)
 #include <emscripten/wasmfs.h>
 
 /*
@@ -809,6 +814,5 @@ int sqlite3_wasm_init_wasmfs(const char *zUnused){
   return SQLITE_NOTFOUND;
 }
 #endif /* __EMSCRIPTEN__ && SQLITE_WASM_WASMFS */
-#endif
 
 #undef WASM_KEEP
diff --git a/ext/wasm/common/whwasmutil.js b/ext/wasm/common/whwasmutil.js
index 39a214be00..6b08d4f78e 100644
--- a/ext/wasm/common/whwasmutil.js
+++ b/ext/wasm/common/whwasmutil.js
@@ -1091,28 +1091,36 @@ self.WhWasmUtilInstaller = function(target){
   };
 
   /** Internal impl for allocPtr() and scopedAllocPtr(). */
-  const __allocPtr = function(howMany, method){
+  const __allocPtr = function(howMany, safePtrSize, method){
     __affirmAlloc(target, method);
-    let m = target[method](howMany * ptrSizeof);
-    target.setMemValue(m, 0, ptrIR)
+    const pIr = safePtrSize ? 'i64' : ptrIR;
+    let m = target[method](howMany * (safePtrSize ? 8 : ptrSizeof));
+    target.setMemValue(m, 0, pIr)
     if(1===howMany){
       return m;
     }
     const a = [m];
     for(let i = 1; i < howMany; ++i){
-      m += ptrSizeof;
+      m += (safePtrSize ? 8 : ptrSizeof);
       a[i] = m;
-      target.setMemValue(m, 0, ptrIR);
+      target.setMemValue(m, 0, pIr);
     }
     return a;
   };
 
   /**
-     Allocates a single chunk of memory capable of holding `howMany`
-     pointers and zeroes them out. If `howMany` is 1 then the memory
-     chunk is returned directly, else an array of pointer addresses is
-     returned, which can optionally be used with "destructuring
-     assignment" like this:
+     Allocates one or more pointers as a single chunk of memory and
+     zeroes them out.
+
+     The first argument is the number of pointers to allocate. The
+     second specifies whether they should use a "safe" pointer size (8
+     bytes) or whether they may use the default pointer size
+     (typically 4 but also possibly 8).
+
+     How the result is returned depends on its first argument: if
+     passed 1, it returns the allocated memory address. If passed more
+     than one then an array of pointer addresses is returned, which
+     can optionally be used with "destructuring assignment" like this:
 
      ```
      const [p1, p2, p3] = allocPtr(3);
@@ -1121,14 +1129,27 @@ self.WhWasmUtilInstaller = function(target){
      ACHTUNG: when freeing the memory, pass only the _first_ result
      value to dealloc(). The others are part of the same memory chunk
      and must not be freed separately.
+
+     The reason for the 2nd argument is..
+
+     When one of the pointers will refer to a 64-bit value, e.g. a
+     double or int64, an that value must be written or fetch,
+     e.g. using setMemValue() or getMemValue(), it is important that
+     the pointer in question be aligned to an 8-byte boundary or else
+     it will not be fetched or written properly and will corrupt or
+     read neighboring memory. It i only safe to pass false when the
+     client code is certain that it will only get/fetch 4-byte values
+     (or smaller).
   */
-  target.allocPtr = (howMany=1)=>__allocPtr(howMany, 'alloc');
+  target.allocPtr =
+    (howMany=1, safePtrSize=true)=>__allocPtr(howMany, safePtrSize, 'alloc');
 
   /**
      Identical to allocPtr() except that it allocates using scopedAlloc()
      instead of alloc().
   */
-  target.scopedAllocPtr = (howMany=1)=>__allocPtr(howMany, 'scopedAlloc');
+  target.scopedAllocPtr =
+    (howMany=1, safePtrSize=true)=>__allocPtr(howMany, safePtrSize, 'scopedAlloc');
 
   /**
      If target.exports[name] exists, it is returned, else an
diff --git a/ext/wasm/testing1.js b/ext/wasm/testing1.js
index dd61ab2814..053fb6f277 100644
--- a/ext/wasm/testing1.js
+++ b/ext/wasm/testing1.js
@@ -1030,31 +1030,60 @@
    */
   const testPstack = function(db,sqlite3){
     const w = sqlite3.capi.wasm, P = w.pstack;
+    const isAllocErr = (e)=>e instanceof sqlite3.WasmAllocError;
     const stack = P.pointer;
     T.assert(0===stack % 8 /* must be 8-byte aligned */);
     try{
       const quota = P.remaining;
       log("pstack quota",quota);
       T.assert(quota >= 4096)
-        .assert(0 === P.alloc(0))
-        .assert(0 === P.alloc(-1));
+        .mustThrowMatching(()=>P.alloc(0), isAllocErr)
+        .mustThrowMatching(()=>P.alloc(-1), isAllocErr);
       let p1 = P.alloc(12);
       T.assert(p1 === stack - 16/*8-byte aligned*/)
         .assert(P.pointer === p1);
       let p2 = P.alloc(7);
       T.assert(p2 === p1-8/*8-byte aligned, stack grows downwards*/)
-        .assert(0 === P.alloc(quota))
+        .mustThrowMatching(()=>P.alloc(quota), isAllocErr)
         .assert(24 === stack - p2)
         .assert(P.pointer === p2);
       let n = quota - (stack - p2);
       let p3 = P.alloc(n);
       T.assert(p3 === stack-quota)
-        .assert(0 === P.alloc(1));
+        .mustThrowMatching(()=>P.alloc(1), isAllocErr);
     }finally{
       P.restore(stack);
-      T.assert(P.pointer === stack);
     }
-  }/*testPstack()*/;
+
+    T.assert(P.pointer === stack);
+    try {
+      const [p1, p2, p3] = P.allocChunks(3,4);
+      T.assert(P.pointer === stack-16/*always rounded to multiple of 8*/)
+        .assert(p2 === p1 + 4)
+        .assert(p3 === p2 + 4);
+      T.mustThrowMatching(()=>P.allocChunks(1024, 1024 * 16),
+                          (e)=>e instanceof sqlite3.WasmAllocError)
+    }finally{
+      P.restore(stack);
+    }
+
+    T.assert(P.pointer === stack);
+    try {
+      let [p1, p2, p3] = P.allocPtr(3,false);
+      let sPos = stack-16/*always rounded to multiple of 8*/;
+      T.assert(P.pointer === sPos)
+        .assert(p2 === p1 + 4)
+        .assert(p3 === p2 + 4);
+      [p1, p2, p3] = P.allocPtr(3);
+      T.assert(P.pointer === sPos-24/*3 x 8 bytes*/)
+        .assert(p2 === p1 + 8)
+        .assert(p3 === p2 + 8);
+      p1 = P.allocPtr();
+      T.assert('number'===typeof p1);
+    }finally{
+      P.restore(stack);
+    }
+}/*testPstack()*/;
 
   const clearKvvfs = function(){
     const sz = sqlite3.capi.sqlite3_web_kvvfs_size();
diff --git a/manifest b/manifest
index d3947b8c26..c9a71476e0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Document\sthe\sroles\sof\sthe\snew\s(this\spast\sweek)\sJS\sfiles\sadded\sto\sthe\sbuild\sprocess.
-D 2022-10-02T01:48:14.286
+C More\sfleshing\sout\sof\ssqlite3.capi.wasm.pstack.
+D 2022-10-02T03:11:13.806
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -485,19 +485,19 @@ F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba814
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
 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 b15a51b88aaa472d36bf82d5123dbfdafe8ddf6ca75fba934510e4a20bbe4adb
-F ext/wasm/api/sqlite3-api-oo1.js 7667d320f6b9fb5252050a2f9c0b1769e11b84dbc0763b999baf65b451b14369
+F ext/wasm/api/sqlite3-api-glue.js 474a5e0bf8016e22aefee44ca45408f08f4159c0b782295ac1d86c4556e91d9a
+F ext/wasm/api/sqlite3-api-oo1.js 066e67f3033e1b300140d431557c468f5cd0a4c17253f156e05b8a2e2c802da7
 F ext/wasm/api/sqlite3-api-opfs.js 1b097808b7b081b0f0700cf97d49ef19760e401706168edff9cd45cf9169f541
-F ext/wasm/api/sqlite3-api-prologue.js a93bd69969eb8b8f9c4cb34e5d86dcbbe5adbeeea39c1cce57194256c5f28434
+F ext/wasm/api/sqlite3-api-prologue.js 9b0c5150f0129b3dc558fec0bfc9c8bf7ebda402b58965bcf98b2ed117b55239
 F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c d72aecf0e50a4403402095ef4e8d6a814fdc2256589944c1dc974c70d2f65b7e
+F ext/wasm/api/sqlite3-wasm.c 2a0f9e4bf1b141a787918951360601128d6a0a190a31a8e5cfe237c99fa640c6
 F ext/wasm/batch-runner.html c363032aba7a525920f61f8be112a29459f73f07e46f0ba3b7730081a617826e
 F ext/wasm/batch-runner.js ce92650a6681586c89bef26ceae96674a55ca5a9727815202ca62e1a00ff5015
 F ext/wasm/common/SqliteTestUtil.js 647bf014bd30bdd870a7e9001e251d12fc1c9ec9ce176a1004b838a4b33c5c05
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 3a5143699c2b73a85b962271e1a9b3241b30d90e30d895e4f55665e648572962
-F ext/wasm/common/whwasmutil.js d2557d6ef1ebaaf3c9a0cea2231fd398b0d8ca8129b51580af1c92f8d04335e0
+F ext/wasm/common/whwasmutil.js cdb33775fdc55c9b1cbb617d22d24b4a29dc9c1389b827a5b14886a291480d70
 F ext/wasm/demo-123-worker.html e419b66495d209b5211ec64903b4cfb3ca7df20d652b41fcd28bf018a773234f
 F ext/wasm/demo-123.html aa281d33b7eefa755f3122b7b5a18f39a42dc5fb69c8879171bf14b4c37c4ec4
 F ext/wasm/demo-123.js 536579fd587974c2511c5bf82034b253d4fdeceabb726927ad7599ef6b7578e8
@@ -530,7 +530,7 @@ F ext/wasm/test-opfs-vfs.js a59ff9210b17d46b0c6fbf6a0ba60143c033327865f2e556e14f
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
 F ext/wasm/testing-worker1-promiser.js bd788e33c1807e0a6dda9c9a9d784bd3350ca49c9dd8ae2cc8719b506b6e013e
 F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d7669fb17fcae
-F ext/wasm/testing1.js 51ef1ced0669f804787ce96f19dcf64367550a7923a998514be56076326988d7
+F ext/wasm/testing1.js bdea170b16189028c1f63023c620df52ddf31ed416bad56d729c60031b1e27ae
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
 F ext/wasm/testing2.js 88f40ef3cd8201bdadd120a711c36bbf0ce56cc0eab1d5e7debb71fed7822494
 F ext/wasm/wasmfs.make 3cce1820006196de140f90f2da4b4ea657083fb5bfee7d125be43f7a85748c8f
@@ -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 f9db664f756f3707afcb5dce87f6d946625848f27ea84337af68de72d4ad6c6b
-R 8201c0f212d8f73dc23b363b8bdcd606
+P 8b3bc7313aff551e5ee0b7aeb927095cf19b9b96abbdd922066c130656b8aa7d
+R a0d2cb1d1b18288fcfda68347c547fdd
 U stephan
-Z 7616e552f06f17aa339add7ed573ed79
+Z 5fc153c99e29258d724616b67e70d32b
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 29067e24bf..fa1c36d777 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8b3bc7313aff551e5ee0b7aeb927095cf19b9b96abbdd922066c130656b8aa7d
\ No newline at end of file
+eb5726677a727a958df11f1fba078d30c7c0ba2a9bdb158e8641b35b5f971af3
\ No newline at end of file

From 9fdce595ebc88dd3a5c5a94a72981279e094423c Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sun, 2 Oct 2022 03:14:38 +0000
Subject: [PATCH 209/428] Doc typo fixes.

FossilOrigin-Name: e528675da3971907666c7d2d09763975a105ec585dc5122145f65905d535bed8
---
 ext/wasm/api/sqlite3-api-glue.js | 10 +++++-----
 ext/wasm/common/whwasmutil.js    |  4 ++--
 manifest                         | 14 +++++++-------
 manifest.uuid                    |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index b6ec1695e1..28bba5a74d 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -276,21 +276,21 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     /**
        A convenience wrapper for allocChunks() which sizes each chunks
        as either 8 bytes (safePtrSize is truthy) or wasm.ptrSizeof (if
-       safePtrSize is truthy).
+       safePtrSize is falsy).
 
        How it returns its result differs depending on its first
        argument: if it's 1, it returns a single pointer value. If it's
        more than 1, it returns the same as allocChunks().
 
-       When one of the pointers refers to a 64-bit value, e.g. a
-       double or int64, and that value must be written or fetch,
+       When a returned pointers will refer to a 64-bit value, e.g. a
+       double or int64, and that value must be written or fetched,
        e.g. using wasm.setMemValue() or wasm.getMemValue(), it is
        important that the pointer in question be aligned to an 8-byte
        boundary or else it will not be fetched or written properly and
        will corrupt or read neighboring memory.
 
-       However, when all pointers involved are "small", it is safe to
-       pass a falsy value to save to memory.
+       However, when all pointers involved point to "small" data, it
+       is safe to pass a falsy value to save to memory.
     */
     wasm.pstack.allocPtr = (n=1,safePtrSize=true) =>{
       return 1===n
diff --git a/ext/wasm/common/whwasmutil.js b/ext/wasm/common/whwasmutil.js
index 6b08d4f78e..6e8fa00dc2 100644
--- a/ext/wasm/common/whwasmutil.js
+++ b/ext/wasm/common/whwasmutil.js
@@ -1132,8 +1132,8 @@ self.WhWasmUtilInstaller = function(target){
 
      The reason for the 2nd argument is..
 
-     When one of the pointers will refer to a 64-bit value, e.g. a
-     double or int64, an that value must be written or fetch,
+     When one of the returned pointers will refer to a 64-bit value,
+     e.g. a double or int64, an that value must be written or fetched,
      e.g. using setMemValue() or getMemValue(), it is important that
      the pointer in question be aligned to an 8-byte boundary or else
      it will not be fetched or written properly and will corrupt or
diff --git a/manifest b/manifest
index c9a71476e0..2f055f89b0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C More\sfleshing\sout\sof\ssqlite3.capi.wasm.pstack.
-D 2022-10-02T03:11:13.806
+C Doc\stypo\sfixes.
+D 2022-10-02T03:14:38.605
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -485,7 +485,7 @@ F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba814
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
 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 474a5e0bf8016e22aefee44ca45408f08f4159c0b782295ac1d86c4556e91d9a
+F ext/wasm/api/sqlite3-api-glue.js 20b98987dd0c6d02ca308e0cf9299750d618459e0876b354380b87ae2dc5cba0
 F ext/wasm/api/sqlite3-api-oo1.js 066e67f3033e1b300140d431557c468f5cd0a4c17253f156e05b8a2e2c802da7
 F ext/wasm/api/sqlite3-api-opfs.js 1b097808b7b081b0f0700cf97d49ef19760e401706168edff9cd45cf9169f541
 F ext/wasm/api/sqlite3-api-prologue.js 9b0c5150f0129b3dc558fec0bfc9c8bf7ebda402b58965bcf98b2ed117b55239
@@ -497,7 +497,7 @@ F ext/wasm/batch-runner.js ce92650a6681586c89bef26ceae96674a55ca5a9727815202ca62
 F ext/wasm/common/SqliteTestUtil.js 647bf014bd30bdd870a7e9001e251d12fc1c9ec9ce176a1004b838a4b33c5c05
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 3a5143699c2b73a85b962271e1a9b3241b30d90e30d895e4f55665e648572962
-F ext/wasm/common/whwasmutil.js cdb33775fdc55c9b1cbb617d22d24b4a29dc9c1389b827a5b14886a291480d70
+F ext/wasm/common/whwasmutil.js af9bb6586d8a2ab7c55c7f1554bb6b0328a7bd6a86ea5fa9ef5273a738156ac3
 F ext/wasm/demo-123-worker.html e419b66495d209b5211ec64903b4cfb3ca7df20d652b41fcd28bf018a773234f
 F ext/wasm/demo-123.html aa281d33b7eefa755f3122b7b5a18f39a42dc5fb69c8879171bf14b4c37c4ec4
 F ext/wasm/demo-123.js 536579fd587974c2511c5bf82034b253d4fdeceabb726927ad7599ef6b7578e8
@@ -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 8b3bc7313aff551e5ee0b7aeb927095cf19b9b96abbdd922066c130656b8aa7d
-R a0d2cb1d1b18288fcfda68347c547fdd
+P eb5726677a727a958df11f1fba078d30c7c0ba2a9bdb158e8641b35b5f971af3
+R c02b54a31af3ce39f04c3d79de05d508
 U stephan
-Z 5fc153c99e29258d724616b67e70d32b
+Z a6c5eed947d3361089be1f642079a7a3
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index fa1c36d777..2e83e50aa0 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-eb5726677a727a958df11f1fba078d30c7c0ba2a9bdb158e8641b35b5f971af3
\ No newline at end of file
+e528675da3971907666c7d2d09763975a105ec585dc5122145f65905d535bed8
\ No newline at end of file

From 9892883e9e285bd8f5445ad51be9f6ce8b6cc92b Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sun, 2 Oct 2022 18:47:39 +0000
Subject: [PATCH 210/428] js: implement a hand-written wrapper for
 sqlite3_create_function_v2() which converts, if necessary, JS-function-type
 args to WASM function wrappers. Replace DB.createFunction() impl with the new
 one.

FossilOrigin-Name: 435ab33384017967e46f52b70bee851a85a28808990a0e58dd5288f606b89c9c
---
 ext/wasm/api/README.md               |  10 +-
 ext/wasm/api/sqlite3-api-glue.js     | 177 +++++++++++++++++++++++++++
 ext/wasm/api/sqlite3-api-oo1.js      | 137 ++-------------------
 ext/wasm/api/sqlite3-api-prologue.js | 105 +++++++++++++---
 ext/wasm/common/whwasmutil.js        |  55 ++++++---
 manifest                             |  20 +--
 manifest.uuid                        |   2 +-
 7 files changed, 324 insertions(+), 182 deletions(-)

diff --git a/ext/wasm/api/README.md b/ext/wasm/api/README.md
index fd85e215b4..b612bfcc22 100644
--- a/ext/wasm/api/README.md
+++ b/ext/wasm/api/README.md
@@ -47,13 +47,9 @@ browser client:
   independent spinoff project, conceived for the sqlite3 project but
   maintained separately.
 - `sqlite3-api-glue.js`\  
-  Invokes the function exposed by `sqlite3-api-prologue.js`, passing
-  it a configuration object to configure it for the current WASM
-  toolchain (noting that it currently requires Emscripten), then
-  removes that function from the global scope. The result of this file
-  is a global-scope `sqlite3` object which acts as a namespace for the
-  API's functionality. This object gets removed from the global scope
-  after the following files have attached their own features to it.
+  Invokes functionality exposed by the previous two files to
+  flesh out low-level parts of `sqlite3-api-prologue.js`. Most of
+  these pieces related to the `sqlite3.capi.wasm` object.
 - `sqlite3-api-oo1.js`\  
   Provides a high-level object-oriented wrapper to the lower-level C
   API, colloquially known as OO API #1. Its API is similar to other
diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index 28bba5a74d..268824d6d0 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -192,6 +192,183 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     };
   }/*sqlite3_exec() proxy*/;
 
+  if(1){/* Special-case handling of sqlite3_create_function_v2() */
+    const sqlite3CreateFunction = wasm.xWrap(
+      "sqlite3_create_function_v2", "int",
+      ["sqlite3*", "string", "int", "int", "*",
+       "*", "*", "*", "*"]
+    );
+    const __setResult = function(pCx, val){
+      switch(typeof val) {
+          case 'boolean':
+            capi.sqlite3_result_int(pCx, val ? 1 : 0);
+            break;
+          case 'number': {
+            (util.isInt32(val)
+             ? capi.sqlite3_result_int
+             : capi.sqlite3_result_double)(pCx, val);
+            break;
+          }
+          case 'string':
+            capi.sqlite3_result_text(pCx, val, -1, capi.SQLITE_TRANSIENT);
+            break;
+          case 'object':
+            if(null===val) {
+              capi.sqlite3_result_null(pCx);
+              break;
+            }else if(util.isBindableTypedArray(val)){
+              const pBlob = wasm.allocFromTypedArray(val);
+              capi.sqlite3_result_blob(pCx, pBlob, val.byteLength,
+                                       capi.SQLITE_TRANSIENT);
+              wasm.dealloc(pBlob);
+              break;
+            }
+            // else fall through
+          default:
+            toss3("Don't not how to handle this UDF result value:",val);
+      };
+    }/*__setResult()*/;
+    const __extractArgs = function(argc, pArgv){
+      let i, pVal, valType, arg;
+      const tgt = [];
+      for(i = 0; i < argc; ++i){
+        pVal = wasm.getPtrValue(pArgv + (wasm.ptrSizeof * i));
+        /**
+           Curiously: despite ostensibly requiring 8-byte
+           alignment, the pArgv array is parcelled into chunks of
+           4 bytes (1 pointer each). The values those point to
+           have 8-byte alignment but the individual argv entries
+           do not.
+        */            
+        valType = capi.sqlite3_value_type(pVal);
+        switch(valType){
+            case capi.SQLITE_INTEGER:
+            case capi.SQLITE_FLOAT:
+              arg = capi.sqlite3_value_double(pVal);
+              break;
+            case capi.SQLITE_TEXT:
+              arg = capi.sqlite3_value_text(pVal);
+              break;
+            case capi.SQLITE_BLOB:{
+              const n = capi.sqlite3_value_bytes(pVal);
+              const pBlob = capi.sqlite3_value_blob(pVal);
+              arg = new Uint8Array(n);
+              let i;
+              const heap = n ? wasm.heap8() : false;
+              for(i = 0; i < n; ++i) arg[i] = heap[pBlob+i];
+              break;
+            }
+            case capi.SQLITE_NULL:
+              arg = null; break;
+            default:
+              toss3("Unhandled sqlite3_value_type()",valType,
+                    "is possibly indicative of incorrect",
+                    "pointer size assumption.");
+        }
+        tgt.push(arg);
+      }
+      return tgt;
+    }/*__extractArgs()*/;
+
+    const __setCxErr = (pCx, e)=>{
+      if(e instanceof capi.WasmAllocError){
+        capi.sqlite3_result_error_nomem(pCx);
+      }else{
+        capi.sqlite3_result_error(pCx, e.message, -1);
+      }
+    };
+    
+    const __xFunc = function(callback){
+      return function(pCx, argc, pArgv){
+        try{__setResult(pCx, callback(...__extractArgs(argc, pArgv)))}
+        catch(e){ __setCxErr(pCx, e) }
+      };
+    };
+
+    const __xStep = function(callback){
+      return function(pCx, argc, pArgv){
+        try{ callback(...__extractArgs(argc, pArgv)) }
+        catch(e){ __setCxErr(pCx, e) }
+      };
+    };
+
+    const __xFinal = function(callback){
+      return function(pCx){
+        try{ __setResult(pCx, callback()) }
+        catch(e){ __setCxErr(pCx, e) }
+      };
+    };
+
+    const __xDestroy = function(callback){
+      return function(pVoid){
+        try{ callback(pVoid) }
+        catch(e){
+          console.error("UDF xDestroy method threw:",e);
+        }
+      };
+    };
+    /* Documented in the api object's initializer. */
+    capi.sqlite3_create_function_v2 = function f(
+      pDb, funcName, nArg, eTextRep, pApp,
+      xFunc,   //void (*xFunc)(sqlite3_context*,int,sqlite3_value**)
+      xStep,   //void (*xStep)(sqlite3_context*,int,sqlite3_value**)
+      xFinal,  //void (*xFinal)(sqlite3_context*)
+      xDestroy //void (*xDestroy)(void*)
+    ){
+      if(9!==arguments.length){
+        return __dbArgcMismatch(pDb,"sqlite3_create_function_v2",9);
+      }
+      if(!f._sigs){
+        f._wrap = Object.assign(Object.create(null), {
+          xFunc:    {sig:'v(pip)', f:__xFunc},
+          xStep:    {sig:'v(pip)', f:__xStep},
+          xFinal:   {sig:'v(p)',   f:__xFinal},
+          xDestroy: {sig:'v(p)',   f:__xDestroy}
+        });
+      }
+      const callbacks = [];
+      /* Wrap the callbacks in a WASM-bound functions... */
+      const wasm = capi.wasm;
+      const funcArgs = [], uninstall = [/*funcs to uninstall on error*/],
+            theFuncs = {xFunc, xStep, xFinal, xDestroy};
+      let rc;
+      try{
+        let k;
+        for(k in theFuncs){
+          let fArg = theFuncs[k];
+          if('function'===typeof fArg){
+            const w = f._wrap[k];
+            fArg = wasm.installFunction(w.sig, w.f(fArg));
+            uninstall.push(fArg);
+          }
+          funcArgs.push(fArg);
+        }
+        rc = sqlite3CreateFunction(pDb, funcName, nArg, eTextRep,
+                                   pApp, ...funcArgs);
+      }catch(e){
+        console.error("sqlite3_create_function_v2() setup threw:",e);
+        for(let v of uninstall){
+          wasm.uninstallFunction(v);
+        }
+        rc = util.sqlite3_wasm_db_error(pDb, capi.SQLITE_ERROR,
+                                        "Creation of UDF threw: "+e.message);
+      }
+      return rc;
+    };
+
+    capi.sqlite3_create_function = function(
+      pDb, funcName, nArg, eTextRep, pApp,
+      xFunc, xStep, xFinal
+    ){
+      if(8!==arguments.length){
+        return __dbArgcMismatch(pDb,"sqlite3_create_function",8);
+      }
+      return capi.sqlite3_create_function_v2(pDb, funcName, nArg, eTextRep,
+                                             pApp, xFunc, xStep, xFinal, 0);
+
+    };
+  }/*sqlite3_create_function_v2() proxy*/;
+
   if(1){/* Special-case handling of sqlite3_prepare_v2() and
       sqlite3_prepare_v3() */
     /**
diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index 07f0657fa4..f701c463f0 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -37,12 +37,6 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
      it.
   */
   const __ptrMap = new WeakMap();
-  /**
-     Map of DB instances to objects, each object being a map of UDF
-     names to wasm function _pointers_ added to that DB handle via
-     createFunction().
-  */
-  const __udfMap = new WeakMap();
   /**
      Map of DB instances to objects, each object being a map of Stmt
      wasm pointers to Stmt objects.
@@ -154,7 +148,6 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     this.filename = fnJs;
     __ptrMap.set(this, ptr);
     __stmtMap.set(this, Object.create(null));
-    __udfMap.set(this, Object.create(null));
   };
 
   /**
@@ -453,12 +446,8 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
         Object.keys(__stmtMap.get(this)).forEach((k,s)=>{
           if(s && s.pointer) s.finalize();
         });
-        Object.values(__udfMap.get(this)).forEach(
-          wasm.uninstallFunction.bind(capi.wasm)
-        );
         __ptrMap.delete(this);
         __stmtMap.delete(this);
-        __udfMap.delete(this);
         capi.sqlite3_close_v2(pDb);
         if(this.onclose && (this.onclose.after instanceof Function)){
           try{this.onclose.after(this)}
@@ -785,15 +774,11 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
 
        On success, returns this object. Throws on error.
 
-       When called from SQL, arguments to the UDF, and its result,
-       will be converted between JS and SQL with as much fidelity
-       as is feasible, triggering an exception if a type
-       conversion cannot be determined. Some freedom is afforded
-       to numeric conversions due to friction between the JS and C
-       worlds: integers which are larger than 32 bits will be
-       treated as doubles, as JS does not support 64-bit integers
-       and it is (as of this writing) illegal to use WASM
-       functions which take or return 64-bit integers from JS.
+       When called from SQL arguments to the UDF, and its result,
+       will be converted between JS and SQL with as much fidelity as
+       is feasible, triggering an exception if a type conversion
+       cannot be determined. The docs for sqlite3_create_function_v2()
+       describe the conversions in more detail.
 
        The optional options object may contain flags to modify how
        the function is defined:
@@ -813,11 +798,6 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        - .deterministic = SQLITE_DETERMINISTIC
        - .directOnly = SQLITE_DIRECTONLY
        - .innocuous = SQLITE_INNOCUOUS
-
-       Maintenance reminder: the ability to add new
-       WASM-accessible functions to the runtime requires that the
-       WASM build is compiled with emcc's `-sALLOW_TABLE_GROWTH`
-       flag.
     */
     createFunction: function f(name, callback,opt){
       switch(arguments.length){
@@ -840,113 +820,16 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
       }else if('string' !== typeof name){
         toss3("Invalid arguments: missing function name.");
       }
-      if(!f._extractArgs){
-        /* Static init */
-        f._extractArgs = function(argc, pArgv){
-          let i, pVal, valType, arg;
-          const tgt = [];
-          for(i = 0; i < argc; ++i){
-            pVal = wasm.getPtrValue(pArgv + (wasm.ptrSizeof * i));
-            /**
-               Curiously: despite ostensibly requiring 8-byte
-               alignment, the pArgv array is parcelled into chunks of
-               4 bytes (1 pointer each). The values those point to
-               have 8-byte alignment but the individual argv entries
-               do not.
-            */            
-            valType = capi.sqlite3_value_type(pVal);
-            switch(valType){
-                case capi.SQLITE_INTEGER:
-                case capi.SQLITE_FLOAT:
-                  arg = capi.sqlite3_value_double(pVal);
-                  break;
-                case capi.SQLITE_TEXT:
-                  arg = capi.sqlite3_value_text(pVal);
-                  break;
-                case capi.SQLITE_BLOB:{
-                  const n = capi.sqlite3_value_bytes(pVal);
-                  const pBlob = capi.sqlite3_value_blob(pVal);
-                  arg = new Uint8Array(n);
-                  let i;
-                  const heap = n ? wasm.heap8() : false;
-                  for(i = 0; i < n; ++i) arg[i] = heap[pBlob+i];
-                  break;
-                }
-                case capi.SQLITE_NULL:
-                  arg = null; break;
-                default:
-                  toss3("Unhandled sqlite3_value_type()",valType,
-                        "is possibly indicative of incorrect",
-                        "pointer size assumption.");
-            }
-            tgt.push(arg);
-          }
-          return tgt;
-        }/*_extractArgs()*/;
-        f._setResult = function(pCx, val){
-          switch(typeof val) {
-              case 'boolean':
-                capi.sqlite3_result_int(pCx, val ? 1 : 0);
-                break;
-              case 'number': {
-                (util.isInt32(val)
-                 ? capi.sqlite3_result_int
-                 : capi.sqlite3_result_double)(pCx, val);
-                break;
-              }
-              case 'string':
-                capi.sqlite3_result_text(pCx, val, -1, capi.SQLITE_TRANSIENT);
-                break;
-              case 'object':
-                if(null===val) {
-                  capi.sqlite3_result_null(pCx);
-                  break;
-                }else if(util.isBindableTypedArray(val)){
-                  const pBlob = wasm.allocFromTypedArray(val);
-                  capi.sqlite3_result_blob(pCx, pBlob, val.byteLength,
-                                          capi.SQLITE_TRANSIENT);
-                  wasm.dealloc(pBlob);
-                  break;
-                }
-                // else fall through
-              default:
-                toss3("Don't not how to handle this UDF result value:",val);
-          };
-        }/*_setResult()*/;
-      }/*static init*/
-      const wrapper = function(pCx, argc, pArgv){
-        try{
-          f._setResult(pCx, callback.apply(null, f._extractArgs(argc, pArgv)));
-        }catch(e){
-          if(e instanceof capi.WasmAllocError){
-            capi.sqlite3_result_error_nomem(pCx);
-          }else{
-            capi.sqlite3_result_error(pCx, e.message, -1);
-          }
-        }
-      };
-      const pUdf = wasm.installFunction(wrapper, "v(iii)");
       let fFlags = 0 /*flags for sqlite3_create_function_v2()*/;
       if(getOwnOption(opt, 'deterministic')) fFlags |= capi.SQLITE_DETERMINISTIC;
       if(getOwnOption(opt, 'directOnly')) fFlags |= capi.SQLITE_DIRECTONLY;
       if(getOwnOption(opt, 'innocuous')) fFlags |= capi.SQLITE_INNOCUOUS;
       name = name.toLowerCase();
-      try {
-        DB.checkRc(this, capi.sqlite3_create_function_v2(
-          this.pointer, name,
-          (opt.hasOwnProperty('arity') ? +opt.arity : callback.length),
-          capi.SQLITE_UTF8 | fFlags, null/*pApp*/, pUdf,
-          null/*xStep*/, null/*xFinal*/, null/*xDestroy*/));
-      }catch(e){
-        wasm.uninstallFunction(pUdf);
-        throw e;
-      }
-      const udfMap = __udfMap.get(this);
-      if(udfMap[name]){
-        try{wasm.uninstallFunction(udfMap[name])}
-        catch(e){/*ignore*/}
-      }
-      udfMap[name] = pUdf;
+      DB.checkRc(this, capi.sqlite3_create_function_v2(
+        this.pointer, name,
+        (opt.hasOwnProperty('arity') ? +opt.arity : callback.length),
+        capi.SQLITE_UTF8 | fFlags, null/*pApp*/, callback,
+        null/*xStep*/, null/*xFinal*/, null/*xDestroy*/));
       return this;
     }/*createFunction()*/,
     /**
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 59533815fb..fd66eccfd6 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -285,29 +285,94 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
   */
   const capi = {
     /**
-       When using sqlite3_open_v2() it is important to keep the following
-       in mind:
+       sqlite3_create_function_v2() differs from its native
+       counterpart only in the following ways:
 
-       https://www.sqlite.org/c3ref/open.html
+       1) The fourth argument (`eTextRep`) argument must not specify
+       any encoding other than sqlite.SQLITE_UTF8. The JS API does not
+       currently support any other encoding and likely never
+       will. This function does not replace that argument on its own
+       because it may contain other flags.
 
-       - The flags for use with its 3rd argument are installed in this
-       object using their C-side names, e.g. SQLITE_OPEN_CREATE.
+       2) Any of the four final arguments may be either WASM pointers
+       (assumed to be function pointers) or JS Functions. In the
+       latter case, each gets bound to WASM using
+       sqlite3.capi.wasm.installFunction() and that wrapper is passed
+       on to the native implementation.
 
-       - If the combination of flags passed to it are invalid,
-       behavior is undefined. Thus is is never okay to call this
-       with fewer than 3 arguments, as JS will default the
-       missing arguments to `undefined`, which will result in a
-       flag value of 0. Most of the available SQLITE_OPEN_xxx
-       flags are meaningless in the WASM build, e.g. the mutext-
-       and cache-related flags, but they are retained in this
-       API for consistency's sake.
+       The semantics of JS functions are:
 
-       - The final argument to this function specifies the VFS to use,
-       which is largely (but not entirely!) meaningless in the WASM
-       environment. It may be null, undefined, or 0 to denote the
-       default.
+       xFunc: is passed `(arrayOfValues)`.  Its return value becomes
+       the new SQL function's result.
+
+       xStep: is passed `(arrayOfValues)`.  Its return value is
+       ignored.
+
+       xFinal: is passed no arguments. Its return value becomes the
+       new aggragate SQL function's result.
+
+       xDestroy: is passed `(void*)`. Its return value is ignored. The
+       pointer passed to it is the one from the 5th argument to
+       sqlite3_create_function_v2().
+
+       Note that JS callback implementations have different call
+       signatures than their native counterparts (namely, they do not
+       get passed an `sqlite3_context*` argument) because practice has
+       shown that this is almost always more convenient and desirable
+       in JS code. Clients which need access to the full range of
+       native arguments will have to create a WASM-bound function
+       themselves (using wasm.installFunction() or equivalent) and
+       pass that function's WASM pointer to this function, rather than
+       passing a JS function. Be warned, however, that working with
+       UDFs at that level from JS is quite tedious.
+
+       For xFunc(), xStep(), and xFinal():
+
+       - When called from SQL, arguments to the UDF, and its result,
+         will be converted between JS and SQL with as much fidelity as
+         is feasible, triggering an exception if a type conversion
+         cannot be determined. Some freedom is afforded to numeric
+         conversions due to friction between the JS and C worlds:
+         integers which are larger than 32 bits will be treated as
+         doubles. TODO: use BigInt support if enabled. That feature
+         was added after this functionality was implemented.
+
+       If any JS-side functions throw, those exceptions are
+       intercepted and converted to database-side errors with
+       the exception of xFinal(): any exception from it is
+       ignored, possibly generating a console.error() message.
+       Destructors must not throw.
+
+       Once installed, there is currently no way to uninstall the
+       bound methods from WASM. They can be uninstalled from the
+       database as documented in the C API, but this wrapper currently
+       has no infrastructure in place to also free the WASM-bound JS
+       wrappers, effectively resulting in a memory leak if the client
+       uninstalls the UDF. Improving that is a potential TODO, but
+       removing client-installed UDFs is rare in practice.
+
+       Maintenance reminder: the ability to add new
+       WASM-accessible functions to the runtime requires that the
+       WASM build is compiled with emcc's `-sALLOW_TABLE_GROWTH`
+       flag.
     */
-    sqlite3_open_v2: function(filename,dbPtrPtr,flags,vfsStr){}/*installed later*/,
+    sqlite3_create_function_v2: function(
+      pDb, funcName, nArg, eTextRep, pApp,
+      xFunc,   //function(arrayOfValues)
+      xStep,   //function(arrayOfValues)
+      xFinal,  //function()
+      xDestroy //function(void*)
+    ){/*installed later*/},
+    /**
+       Equivalent to passing the same arguments to
+       sqlite3_create_function_v2(), with 0 as the final argument.
+    */
+    sqlite3_create_function:function(
+      pDb, funcName, nArg, eTextRep, pApp,
+      xFunc,   //function(arrayOfValues)
+      xStep,   //function(arrayOfValues)
+      xFinal   //function()
+    ){/*installed later*/},
     /**
        The sqlite3_prepare_v3() binding handles two different uses
        with differing JS/WASM semantics:
@@ -642,8 +707,8 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     ["sqlite3_column_type","int", "sqlite3_stmt*", "int"],
     ["sqlite3_compileoption_get", "string", "int"],
     ["sqlite3_compileoption_used", "int", "string"],
-    ["sqlite3_create_function_v2", "int",
-     "sqlite3*", "string", "int", "int", "*", "*", "*", "*", "*"],
+    /* sqlite3_create_function_v2() is handled separate to simplify conversion
+       of its callback argument */
     ["sqlite3_data_count", "int", "sqlite3_stmt*"],
     ["sqlite3_db_filename", "string", "sqlite3*", "string"],
     ["sqlite3_db_handle", "sqlite3*", "sqlite3_stmt*"],
diff --git a/ext/wasm/common/whwasmutil.js b/ext/wasm/common/whwasmutil.js
index 6e8fa00dc2..ed3d7714bc 100644
--- a/ext/wasm/common/whwasmutil.js
+++ b/ext/wasm/common/whwasmutil.js
@@ -15,11 +15,17 @@
 
   https://fossil.wanderinghorse.net/r/jaccwabyt
 
+  and sqlite3:
+
+  https://sqlite.org
+
+  This file is kept in sync between both of those trees.
+
   Maintenance reminder: If you're reading this in a tree other than
-  the Jaccwabyt tree, note that this copy may be replaced with
+  one of those listed above, note that this copy may be replaced with
   upstream copies of that one from time to time. Thus the code
-  installed by this function "should not" be edited outside of that
-  project, else it risks getting overwritten.
+  installed by this function "should not" be edited outside of those
+  projects, else it risks getting overwritten.
 */
 /**
    This function is intended to simplify porting around various bits
@@ -109,8 +115,8 @@
      following symbols:
 
      - `memory`: a WebAssembly.Memory object representing the WASM
-       memory. _Alternately_, the `memory` property can be set on the
-       target instance, in particular if the WASM heap memory is
+       memory. _Alternately_, the `memory` property can be set as
+       `target.memory`, in particular if the WASM heap memory is
        initialized in JS an _imported_ into WASM, as opposed to being
        initialized in WASM and exported to JS.
 
@@ -132,7 +138,11 @@
    false. If it is false, certain BigInt-related features will trigger
    an exception if invoked. This property, if not set when this is
    called, will get a default value of true only if the BigInt64Array
-   constructor is available, else it will default to false.
+   constructor is available, else it will default to false. Note that
+   having the BigInt type is not sufficient for full int64 integration
+   with WASM: the target WASM file must also have been built with
+   that support. In Emscripten that's done using the `-sWASM_BIGINT`
+   flag.
 
    Some optional APIs require that the target have the following
    methods:
@@ -295,7 +305,7 @@ self.WhWasmUtilInstaller = function(target){
      an integer as the first argument and unsigned is truthy then
      the "U" (unsigned) variant of that view is returned, else the
      signed variant is returned. If passed a TypedArray value, the
-     2nd argument is ignores. Note that Float32Array and
+     2nd argument is ignored. Note that Float32Array and
      Float64Array views are not supported by this function.
 
      Note that growth of the heap will invalidate any references to
@@ -511,7 +521,7 @@ self.WhWasmUtilInstaller = function(target){
     if(2!==arguments.length){
       toss("installFunction() requires exactly 2 arguments");
     }
-    if('string'===typeof func && sig instanceof Function){
+    if('string'===typeof func){
       const x = sig;
       sig = func;
       func = x;
@@ -1137,7 +1147,7 @@ self.WhWasmUtilInstaller = function(target){
      e.g. using setMemValue() or getMemValue(), it is important that
      the pointer in question be aligned to an 8-byte boundary or else
      it will not be fetched or written properly and will corrupt or
-     read neighboring memory. It i only safe to pass false when the
+     read neighboring memory. It is only safe to pass false when the
      client code is certain that it will only get/fetch 4-byte values
      (or smaller).
   */
@@ -1239,12 +1249,12 @@ self.WhWasmUtilInstaller = function(target){
     return v ? xcv.arg[ptrIR](v) : null;
   };
   xcv.result.string = (i)=>target.cstringToJs(i);
-  xcv.result['string:free'] = function(i){
+  xcv.result['string:free'] = (i)=>{
     try { return i ? target.cstringToJs(i) : null }
     finally{ target.dealloc(i) }
   };
   xcv.result.json = (i)=>JSON.parse(target.cstringToJs(i));
-  xcv.result['json:free'] = function(i){
+  xcv.result['json:free'] = (i)=>{
     try{ return i ? JSON.parse(target.cstringToJs(i)) : null }
     finally{ target.dealloc(i) }
   }
@@ -1374,14 +1384,26 @@ self.WhWasmUtilInstaller = function(target){
        C-string, ownership of which has just been transfered to the
        caller. It copies the C-string to a JS string, frees the
        C-string, and returns the JS string. If such a result value is
-       NULL, the JS result is `null`.
+       NULL, the JS result is `null`. Achtung: when using an API which
+       returns results from a specific allocator, e.g. `my_malloc()`,
+       this conversion _is not legal_. Instead, an equivalent conversion
+       which uses the appropriate deallocator is required. For example:  
+
+```js
+   target.xWrap.resultAdaptor('string:my_free',(i)=>{
+      try { return i ? target.cstringToJs(i) : null }
+      finally{ target.exports.my_free(i) }
+   };
+```
 
      - `json` (results): treats the result as a const C-string and
        returns the result of passing the converted-to-JS string to
        JSON.parse(). Returns `null` if the C-string is a NULL pointer.
 
      - `json:free` (results): works exactly like `string:free` but
-       returns the same thing as the `json` adapter.
+       returns the same thing as the `json` adapter. Note the
+       warning in `string:free` regarding maching allocators and
+       deallocators.
 
      The type names for results and arguments are validated when
      xWrap() is called and any unknown names will trigger an
@@ -1532,11 +1554,10 @@ self.WhWasmUtilInstaller = function(target){
      type name, as documented for xWrap() (use a falsy value or an
      empty array for nullary functions). The 4th+ arguments are
      arguments for the call, with the special case that if the 4th
-     argument is an array, it is used as the arguments for the call
-     (again, falsy or an empty array for nullary functions). Returns
-     the converted result of the call.
+     argument is an array, it is used as the arguments for the
+     call. Returns the converted result of the call.
 
-     This is just a thin wrapp around xWrap(). If the given function
+     This is just a thin wrapper around xWrap(). If the given function
      is to be called more than once, it's more efficient to use
      xWrap() to create a wrapper, then to call that wrapper as many
      times as needed. For one-shot calls, however, this variant is
diff --git a/manifest b/manifest
index 2f055f89b0..c522e4391c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Doc\stypo\sfixes.
-D 2022-10-02T03:14:38.605
+C js:\simplement\sa\shand-written\swrapper\sfor\ssqlite3_create_function_v2()\swhich\sconverts,\sif\snecessary,\sJS-function-type\sargs\sto\sWASM\sfunction\swrappers.\sReplace\sDB.createFunction()\simpl\swith\sthe\snew\sone.
+D 2022-10-02T18:47:39.889
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -478,17 +478,17 @@ F ext/wasm/GNUmakefile b313a82060c733c990b91afa981e10f5e21a0b33a483f33b739ce932e
 F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api c6b05641d733227a995cc05a2ba7ddc9ef2323081ae0cae5ed1d1f83d5b54b36
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
-F ext/wasm/api/README.md b6d19392984fdd428ae7260512d45742160c06baefed9da703da3fdeb68e7124
+F ext/wasm/api/README.md 1e350b611465566cfa2e5eccf7c9b29a34f48ee38bbf6d5fb086dd06ce32b3ff
 F ext/wasm/api/extern-post-js.js dc68cbf552d8ea085181400a6963907c32e0b088b03ffd8969b1869fea246629
 F ext/wasm/api/extern-pre-js.js 20143b16b672d0a576fbf768a786d12ee1f84e222126477072389b992542a5b2
 F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba81456260a713ed04900c
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
 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 20b98987dd0c6d02ca308e0cf9299750d618459e0876b354380b87ae2dc5cba0
-F ext/wasm/api/sqlite3-api-oo1.js 066e67f3033e1b300140d431557c468f5cd0a4c17253f156e05b8a2e2c802da7
+F ext/wasm/api/sqlite3-api-glue.js d834733fbdc216beb65382655e61a436e29018412005aab413ff022d4e5c25eb
+F ext/wasm/api/sqlite3-api-oo1.js 48d2269544301cd97726ef2d9a82e4384350d12dcf832fa417f211811ae5272d
 F ext/wasm/api/sqlite3-api-opfs.js 1b097808b7b081b0f0700cf97d49ef19760e401706168edff9cd45cf9169f541
-F ext/wasm/api/sqlite3-api-prologue.js 9b0c5150f0129b3dc558fec0bfc9c8bf7ebda402b58965bcf98b2ed117b55239
+F ext/wasm/api/sqlite3-api-prologue.js 32795679b72a5ad685c58a9599d10dac04787907f623825408d539b703e080a4
 F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 2a0f9e4bf1b141a787918951360601128d6a0a190a31a8e5cfe237c99fa640c6
@@ -497,7 +497,7 @@ F ext/wasm/batch-runner.js ce92650a6681586c89bef26ceae96674a55ca5a9727815202ca62
 F ext/wasm/common/SqliteTestUtil.js 647bf014bd30bdd870a7e9001e251d12fc1c9ec9ce176a1004b838a4b33c5c05
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 3a5143699c2b73a85b962271e1a9b3241b30d90e30d895e4f55665e648572962
-F ext/wasm/common/whwasmutil.js af9bb6586d8a2ab7c55c7f1554bb6b0328a7bd6a86ea5fa9ef5273a738156ac3
+F ext/wasm/common/whwasmutil.js 427eb8b695bd5f38497601a6bda933e83d1a5900b75f5f1af8dbb381898d2ee4
 F ext/wasm/demo-123-worker.html e419b66495d209b5211ec64903b4cfb3ca7df20d652b41fcd28bf018a773234f
 F ext/wasm/demo-123.html aa281d33b7eefa755f3122b7b5a18f39a42dc5fb69c8879171bf14b4c37c4ec4
 F ext/wasm/demo-123.js 536579fd587974c2511c5bf82034b253d4fdeceabb726927ad7599ef6b7578e8
@@ -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 eb5726677a727a958df11f1fba078d30c7c0ba2a9bdb158e8641b35b5f971af3
-R c02b54a31af3ce39f04c3d79de05d508
+P e528675da3971907666c7d2d09763975a105ec585dc5122145f65905d535bed8
+R 905afd6e962345097748ac52db8a0889
 U stephan
-Z a6c5eed947d3361089be1f642079a7a3
+Z 8de102f5519af227a27849d21742ab64
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 2e83e50aa0..e0800ed178 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e528675da3971907666c7d2d09763975a105ec585dc5122145f65905d535bed8
\ No newline at end of file
+435ab33384017967e46f52b70bee851a85a28808990a0e58dd5288f606b89c9c
\ No newline at end of file

From 92ede964e109695fec79262f8ff007f0c9873187 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sun, 2 Oct 2022 20:08:53 +0000
Subject: [PATCH 211/428] JS: clean up create_function() wrapper and add
 support for create_window_function(). Eliminate an extraneous blob copy when
 a UDF returns a blob. Make use of newfound JS-fu to clean up how
 sqlite3ApiBootstrap() config is initialized.

FossilOrigin-Name: d3bad9347c5423fa7f19ae729461636f1043c99a1f01f168efa10bebefb1cdd1
---
 ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api |   2 +
 ext/wasm/api/sqlite3-api-glue.js            | 159 +++++++++++++-------
 ext/wasm/api/sqlite3-api-prologue.js        |  71 ++++-----
 manifest                                    |  16 +-
 manifest.uuid                               |   2 +-
 5 files changed, 152 insertions(+), 98 deletions(-)

diff --git a/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api b/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
index 0854d5a1c9..22ca64cf85 100644
--- a/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
+++ b/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
@@ -22,7 +22,9 @@ _sqlite3_column_text
 _sqlite3_column_type
 _sqlite3_compileoption_get
 _sqlite3_compileoption_used
+_sqlite3_create_function
 _sqlite3_create_function_v2
+_sqlite3_create_window_function
 _sqlite3_data_count
 _sqlite3_db_filename
 _sqlite3_db_handle
diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index 268824d6d0..5ca6f4ec22 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -149,9 +149,9 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     const __exec = wasm.xWrap("sqlite3_exec", "int",
                               ["sqlite3*", "flexible-string", "*", "*", "**"]);
     /* Documented in the api object's initializer. */
-    capi.sqlite3_exec = function(pDb, sql, callback, pVoid, pErrMsg){
-      if(5!==arguments.length){
-        return __dbArgcMismatch(pDb,"sqlite3_exec",5);
+    capi.sqlite3_exec = function f(pDb, sql, callback, pVoid, pErrMsg){
+      if(f.length!==arguments.length){
+        return __dbArgcMismatch(pDb,"sqlite3_exec",f.length);
       }else if('function' !== typeof callback){
         return __exec(pDb, sql, callback, pVoid, pErrMsg);
       }
@@ -192,11 +192,20 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     };
   }/*sqlite3_exec() proxy*/;
 
-  if(1){/* Special-case handling of sqlite3_create_function_v2() */
+  if(1){/* Special-case handling of sqlite3_create_function_v2()
+           and sqlite3_create_window_function() */
     const sqlite3CreateFunction = wasm.xWrap(
       "sqlite3_create_function_v2", "int",
-      ["sqlite3*", "string", "int", "int", "*",
-       "*", "*", "*", "*"]
+      ["sqlite3*", "string"/*funcName*/, "int"/*nArg*/,
+       "int"/*eTextRep*/, "*"/*pApp*/,
+       "*"/*xStep*/,"*"/*xFinal*/, "*"/*xValue*/, "*"/*xDestroy*/]
+    );
+    const sqlite3CreateWindowFunction = wasm.xWrap(
+      "sqlite3_create_window_function", "int",
+      ["sqlite3*", "string"/*funcName*/, "int"/*nArg*/,
+       "int"/*eTextRep*/, "*"/*pApp*/,
+       "*"/*xStep*/,"*"/*xFinal*/, "*"/*xValue*/,
+       "*"/*xInverse*/, "*"/*xDestroy*/]
     );
     const __setResult = function(pCx, val){
       switch(typeof val) {
@@ -213,14 +222,15 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
             capi.sqlite3_result_text(pCx, val, -1, capi.SQLITE_TRANSIENT);
             break;
           case 'object':
-            if(null===val) {
+            if(null===val/*yes, typeof null === 'object'*/) {
               capi.sqlite3_result_null(pCx);
               break;
             }else if(util.isBindableTypedArray(val)){
               const pBlob = wasm.allocFromTypedArray(val);
-              capi.sqlite3_result_blob(pCx, pBlob, val.byteLength,
-                                       capi.SQLITE_TRANSIENT);
-              wasm.dealloc(pBlob);
+              capi.sqlite3_result_blob(
+                pCx, pBlob, val.byteLength,
+                wasm.exports[sqlite3.config.deallocExportName]
+              );
               break;
             }
             // else fall through
@@ -277,22 +287,27 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
         capi.sqlite3_result_error(pCx, e.message, -1);
       }
     };
-    
+
+    /* TODO: pass on the pCx pointer to all callbacks. This requires
+       fixing test code and updating oodles of docs. Once that is in place,
+       export sqlite3_aggregate_context().
+    */
+
     const __xFunc = function(callback){
       return function(pCx, argc, pArgv){
-        try{__setResult(pCx, callback(...__extractArgs(argc, pArgv)))}
+        try{ __setResult(pCx, callback(...__extractArgs(argc, pArgv))) }
         catch(e){ __setCxErr(pCx, e) }
       };
     };
 
-    const __xStep = function(callback){
+    const __xInverseAndStep = function(callback){
       return function(pCx, argc, pArgv){
         try{ callback(...__extractArgs(argc, pArgv)) }
         catch(e){ __setCxErr(pCx, e) }
       };
     };
 
-    const __xFinal = function(callback){
+    const __xFinalAndValue = function(callback){
       return function(pCx){
         try{ __setResult(pCx, callback()) }
         catch(e){ __setCxErr(pCx, e) }
@@ -302,11 +317,34 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     const __xDestroy = function(callback){
       return function(pVoid){
         try{ callback(pVoid) }
-        catch(e){
-          console.error("UDF xDestroy method threw:",e);
-        }
+        catch(e){ console.error("UDF xDestroy method threw:",e) }
       };
     };
+
+    const __xMap = Object.assign(Object.create(null), {
+      xFunc:    {sig:'v(pip)', f:__xFunc},
+      xStep:    {sig:'v(pip)', f:__xInverseAndStep},
+      xInverse: {sig:'v(pip)', f:__xInverseAndStep},
+      xFinal:   {sig:'v(p)',   f:__xFinalAndValue},
+      xValue:   {sig:'v(p)',   f:__xFinalAndValue},
+      xDestroy: {sig:'v(p)',   f:__xDestroy}
+    });
+
+    const __xWrapFuncs = function(theFuncs, tgtUninst){
+      const rc = []
+      let k;
+      for(k in theFuncs){
+        let fArg = theFuncs[k];
+        if('function'===typeof fArg){
+          const w = __xMap[k];
+          fArg = wasm.installFunction(w.sig, w.f(fArg));
+          tgtUninst.push(fArg);
+        }
+        rc.push(fArg);
+      }
+      return rc;
+    };
+
     /* Documented in the api object's initializer. */
     capi.sqlite3_create_function_v2 = function f(
       pDb, funcName, nArg, eTextRep, pApp,
@@ -315,34 +353,16 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
       xFinal,  //void (*xFinal)(sqlite3_context*)
       xDestroy //void (*xDestroy)(void*)
     ){
-      if(9!==arguments.length){
-        return __dbArgcMismatch(pDb,"sqlite3_create_function_v2",9);
+      if(f.length!==arguments.length){
+        return __dbArgcMismatch(pDb,"sqlite3_create_function_v2",f.length);
       }
-      if(!f._sigs){
-        f._wrap = Object.assign(Object.create(null), {
-          xFunc:    {sig:'v(pip)', f:__xFunc},
-          xStep:    {sig:'v(pip)', f:__xStep},
-          xFinal:   {sig:'v(p)',   f:__xFinal},
-          xDestroy: {sig:'v(p)',   f:__xDestroy}
-        });
-      }
-      const callbacks = [];
       /* Wrap the callbacks in a WASM-bound functions... */
       const wasm = capi.wasm;
-      const funcArgs = [], uninstall = [/*funcs to uninstall on error*/],
-            theFuncs = {xFunc, xStep, xFinal, xDestroy};
+      const uninstall = [/*funcs to uninstall on error*/];
       let rc;
       try{
-        let k;
-        for(k in theFuncs){
-          let fArg = theFuncs[k];
-          if('function'===typeof fArg){
-            const w = f._wrap[k];
-            fArg = wasm.installFunction(w.sig, w.f(fArg));
-            uninstall.push(fArg);
-          }
-          funcArgs.push(fArg);
-        }
+        const funcArgs =  __xWrapFuncs({xFunc, xStep, xFinal, xDestroy},
+                                       uninstall);
         rc = sqlite3CreateFunction(pDb, funcName, nArg, eTextRep,
                                    pApp, ...funcArgs);
       }catch(e){
@@ -356,21 +376,52 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
       return rc;
     };
 
-    capi.sqlite3_create_function = function(
+    capi.sqlite3_create_function = function f(
       pDb, funcName, nArg, eTextRep, pApp,
       xFunc, xStep, xFinal
     ){
-      if(8!==arguments.length){
-        return __dbArgcMismatch(pDb,"sqlite3_create_function",8);
-      }
-      return capi.sqlite3_create_function_v2(pDb, funcName, nArg, eTextRep,
-                                             pApp, xFunc, xStep, xFinal, 0);
-
+      return (f.length===arguments.length)
+        ? capi.sqlite3_create_function_v2(pDb, funcName, nArg, eTextRep,
+                                          pApp, xFunc, xStep, xFinal, 0)
+        : __dbArgcMismatch(pDb,"sqlite3_create_function",f.length);
     };
-  }/*sqlite3_create_function_v2() proxy*/;
+
+    /* Documented in the api object's initializer. */
+    capi.sqlite3_create_window_function = function f(
+      pDb, funcName, nArg, eTextRep, pApp,
+      xStep,   //void (*xStep)(sqlite3_context*,int,sqlite3_value**)
+      xFinal,  //void (*xFinal)(sqlite3_context*)
+      xValue,  //void (*xFinal)(sqlite3_context*)
+      xInverse,//void (*xStep)(sqlite3_context*,int,sqlite3_value**)
+      xDestroy //void (*xDestroy)(void*)
+    ){
+      if(f.length!==arguments.length){
+        return __dbArgcMismatch(pDb,"sqlite3_create_window_function",f.length);
+      }
+      /* Wrap the callbacks in a WASM-bound functions... */
+      const wasm = capi.wasm;
+      const uninstall = [/*funcs to uninstall on error*/];
+      let rc;
+      try{
+        const funcArgs = __xWrapFuncs({xStep, xFinal, xValue, xInverse, xDestroy},
+                                      uninstall);
+        rc = sqlite3CreateFunction(pDb, funcName, nArg, eTextRep,
+                                   pApp, ...funcArgs);
+      }catch(e){
+        console.error("sqlite3_create_function_v2() setup threw:",e);
+        for(let v of uninstall){
+          wasm.uninstallFunction(v);
+        }
+        rc = util.sqlite3_wasm_db_error(pDb, capi.SQLITE_ERROR,
+                                        "Creation of UDF threw: "+e.message);
+      }
+      return rc;
+    };
+
+  }/*sqlite3_create_function_v2() and sqlite3_create_window_function() proxies*/;
 
   if(1){/* Special-case handling of sqlite3_prepare_v2() and
-      sqlite3_prepare_v3() */
+           sqlite3_prepare_v3() */
     /**
        Scope-local holder of the two impls of sqlite3_prepare_v2/v3().
     */
@@ -403,8 +454,8 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
 
     /* Documented in the api object's initializer. */
     capi.sqlite3_prepare_v3 = function f(pDb, sql, sqlLen, prepFlags, ppStmt, pzTail){
-      if(6!==arguments.length){
-        return __dbArgcMismatch(pDb,"sqlite3_prepare_v3",6);
+      if(f.length!==arguments.length){
+        return __dbArgcMismatch(pDb,"sqlite3_prepare_v3",f.length);
       }
       const [xSql, xSqlLen] = __flexiString(sql, sqlLen);
       switch(typeof xSql){
@@ -419,10 +470,10 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     };
 
     /* Documented in the api object's initializer. */
-    capi.sqlite3_prepare_v2 = function(pDb, sql, sqlLen, ppStmt, pzTail){
-      return (5==arguments.length)
+    capi.sqlite3_prepare_v2 = function f(pDb, sql, sqlLen, ppStmt, pzTail){
+      return (f.length===arguments.length)
         ? capi.sqlite3_prepare_v3(pDb, sql, sqlLen, 0, ppStmt, pzTail)
-        : __dbArgcMismatch(pDb,"sqlite3_prepare_v2",5);
+        : __dbArgcMismatch(pDb,"sqlite3_prepare_v2",f.length);
     };
   }/*sqlite3_prepare_v2/v3()*/;
 
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index fd66eccfd6..9f40699439 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -136,35 +136,21 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
                  "Config and external initializers are ignored on calls after the first.");
     return sqlite3ApiBootstrap.sqlite3;
   }
-  apiConfig = apiConfig || {};
-  const config = Object.create(null);
-  {
-    const configDefaults = {
-      exports: undefined,
-      memory: undefined,
-      bigIntEnabled: (()=>{
-        if('undefined'!==typeof Module){
-          /* Emscripten module will contain HEAPU64 when built with
-             -sWASM_BIGINT=1, else it will not. */
-          return !!Module.HEAPU64;
-        }
-        return !!self.BigInt64Array;
-      })(),
-      allocExportName: 'malloc',
-      deallocExportName: 'free',
-      wasmfsOpfsDir: '/opfs'
-    };
-    Object.keys(configDefaults).forEach(function(k){
-      config[k] = Object.getOwnPropertyDescriptor(apiConfig, k)
-        ? apiConfig[k] : configDefaults[k];
-    });
-    // Copy over any properties apiConfig defines but configDefaults does not...
-    Object.keys(apiConfig).forEach(function(k){
-      if(!Object.getOwnPropertyDescriptor(config, k)){
-        config[k] = apiConfig[k];
+  const config = Object.assign(Object.create(null),{
+    exports: undefined,
+    memory: undefined,
+    bigIntEnabled: (()=>{
+      if('undefined'!==typeof Module){
+        /* Emscripten module will contain HEAPU64 when built with
+           -sWASM_BIGINT=1, else it will not. */
+        return !!Module.HEAPU64;
       }
-    });
-  }
+      return !!self.BigInt64Array;
+    })(),
+    allocExportName: 'malloc',
+    deallocExportName: 'free',
+    wasmfsOpfsDir: '/opfs'
+  }, apiConfig || {});
 
   [
     // If any of these config options are functions, replace them with
@@ -302,10 +288,10 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
 
        The semantics of JS functions are:
 
-       xFunc: is passed `(arrayOfValues)`.  Its return value becomes
+       xFunc: is passed `(arrayOfValues)`. Its return value becomes
        the new SQL function's result.
 
-       xStep: is passed `(arrayOfValues)`.  Its return value is
+       xStep: is passed `(arrayOfValues)`. Its return value is
        ignored.
 
        xFinal: is passed no arguments. Its return value becomes the
@@ -373,6 +359,21 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
       xStep,   //function(arrayOfValues)
       xFinal   //function()
     ){/*installed later*/},
+    /**
+       The sqlite3_create_window_function() JS wrapper differs from
+       its native implementation in the exact same way that
+       sqlite3_create_function_v2() does. The additional function,
+       xInverse(), is treated identically to xStep() by the wrapping
+       layer.
+    */
+    sqlite3_create_window_function: function(
+      pDb, funcName, nArg, eTextRep, pApp,
+      xStep,   //function(arrayOfValues)
+      xFinal,  //function()
+      xValue,  //function()
+      xInverse,//function(arrayOfValues)
+      xDestroy //function(void*)
+    ){/*installed later*/},
     /**
        The sqlite3_prepare_v3() binding handles two different uses
        with differing JS/WASM semantics:
@@ -577,10 +578,10 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
   */
   capi.wasm.allocFromTypedArray = function(srcTypedArray){
     affirmBindableTypedArray(srcTypedArray);
-    const pRet = this.alloc(srcTypedArray.byteLength || 1);
-    this.heapForSize(srcTypedArray.constructor).set(srcTypedArray.byteLength ? srcTypedArray : [0], pRet);
+    const pRet = capi.wasm.alloc(srcTypedArray.byteLength || 1);
+    capi.wasm.heapForSize(srcTypedArray.constructor).set(srcTypedArray.byteLength ? srcTypedArray : [0], pRet);
     return pRet;
-  }.bind(capi.wasm);
+  };
 
   const keyAlloc = config.allocExportName || 'malloc',
         keyDealloc =  config.deallocExportName || 'free';
@@ -590,10 +591,10 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
   }
 
   capi.wasm.alloc = function(n){
-    const m = this.exports[keyAlloc](n);
+    const m = capi.wasm.exports[keyAlloc](n);
     if(!m) throw new WasmAllocError("Failed to allocate "+n+" bytes.");
     return m;
-  }.bind(capi.wasm)
+  };
 
   capi.wasm.dealloc = (m)=>capi.wasm.exports[keyDealloc](m);
 
diff --git a/manifest b/manifest
index c522e4391c..f77b9db145 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C js:\simplement\sa\shand-written\swrapper\sfor\ssqlite3_create_function_v2()\swhich\sconverts,\sif\snecessary,\sJS-function-type\sargs\sto\sWASM\sfunction\swrappers.\sReplace\sDB.createFunction()\simpl\swith\sthe\snew\sone.
-D 2022-10-02T18:47:39.889
+C JS:\sclean\sup\screate_function()\swrapper\sand\sadd\ssupport\sfor\screate_window_function().\sEliminate\san\sextraneous\sblob\scopy\swhen\sa\sUDF\sreturns\sa\sblob.\sMake\suse\sof\snewfound\sJS-fu\sto\sclean\sup\show\ssqlite3ApiBootstrap()\sconfig\sis\sinitialized.
+D 2022-10-02T20:08:53.027
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -476,7 +476,7 @@ F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34ce
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle 0e88c8cfc3719e4b7e74980d9da664c709e68acf863e48386cda376edfd3bfb0
 F ext/wasm/GNUmakefile b313a82060c733c990b91afa981e10f5e21a0b33a483f33b739ce932ed6bc725
 F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
-F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api c6b05641d733227a995cc05a2ba7ddc9ef2323081ae0cae5ed1d1f83d5b54b36
+F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api e35ddfbfcde83571a1169a910dbcb59bf598a3a8f5283b42d88555b9ccaa6042
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
 F ext/wasm/api/README.md 1e350b611465566cfa2e5eccf7c9b29a34f48ee38bbf6d5fb086dd06ce32b3ff
 F ext/wasm/api/extern-post-js.js dc68cbf552d8ea085181400a6963907c32e0b088b03ffd8969b1869fea246629
@@ -485,10 +485,10 @@ F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba814
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
 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 d834733fbdc216beb65382655e61a436e29018412005aab413ff022d4e5c25eb
+F ext/wasm/api/sqlite3-api-glue.js d1587736ed73fcb44e32f1ff1933e4c91a2d3b3c39acef0d13c0b3fd6859a7b1
 F ext/wasm/api/sqlite3-api-oo1.js 48d2269544301cd97726ef2d9a82e4384350d12dcf832fa417f211811ae5272d
 F ext/wasm/api/sqlite3-api-opfs.js 1b097808b7b081b0f0700cf97d49ef19760e401706168edff9cd45cf9169f541
-F ext/wasm/api/sqlite3-api-prologue.js 32795679b72a5ad685c58a9599d10dac04787907f623825408d539b703e080a4
+F ext/wasm/api/sqlite3-api-prologue.js d71ad817cdef8a9b3b64a394b781a8f64872d4983eac583167e29f9f96ef8e4e
 F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 2a0f9e4bf1b141a787918951360601128d6a0a190a31a8e5cfe237c99fa640c6
@@ -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 e528675da3971907666c7d2d09763975a105ec585dc5122145f65905d535bed8
-R 905afd6e962345097748ac52db8a0889
+P 435ab33384017967e46f52b70bee851a85a28808990a0e58dd5288f606b89c9c
+R 8d670d2cae99839795cb81bda9741460
 U stephan
-Z 8de102f5519af227a27849d21742ab64
+Z 74556b5dc28de703cf507dc7ef6550bd
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index e0800ed178..aca6ce8b8a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-435ab33384017967e46f52b70bee851a85a28808990a0e58dd5288f606b89c9c
\ No newline at end of file
+d3bad9347c5423fa7f19ae729461636f1043c99a1f01f168efa10bebefb1cdd1
\ No newline at end of file

From 65e6522f8f1dc60d8dc1caac3dd92cdf707947a3 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sun, 2 Oct 2022 20:13:46 +0000
Subject: [PATCH 212/428] Minor doc typo fix in sqlite.h.in.

FossilOrigin-Name: 372802aaa22a830bf498bb0d9561ae02b32e5e191c4d7d771ea152140f6685a1
---
 manifest        | 14 +++++++-------
 manifest.uuid   |  2 +-
 src/sqlite.h.in |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index 3c60d28601..50270d8b40 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Performance\soptimization\sin\ssqlite3_prepare()\s(discovered\swhile\sworking\non\sthe\sstmt-cache\sbranch).
-D 2022-10-01T20:27:29.944
+C Minor\sdoc\stypo\sfix\sin\ssqlite.h.in.
+D 2022-10-02T20:13:46.207
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -590,7 +590,7 @@ F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c bb18acf4eded647fef88d4d543c673874dbebff516fbeba90a85e6c13f2a58cd
 F src/shell.c.in e7e7c2c69ae86c5ee9e8ad66227203d46ff6dce8700a1b1dababff01c71d33df
-F src/sqlite.h.in b9b7fd73239d94db20332bb6e504688001e5564b655e1318a4427a1caef4b99e
+F src/sqlite.h.in 3f4695457fcb41ea8a44c6d09fc2a591bbeda44b13bda86618f3ce0071bbca7c
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d
 F src/sqliteInt.h 7571703e6d11cd0e0283be68e9b6baceefedf10e3bbac5869d12183e031c5254
@@ -2000,8 +2000,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 b7da0bcdf70e53ab1ec00a0694e17c7429e23bc6eb3f39b622d06a930aa2f6a3
-R 68c35546ee03b20dc6a84c9cc1198497
-U drh
-Z a1645f59fc204ccbfb7697554bfc7188
+P cd494240cc6184bb028d1f1049086f57c0a71a43d7ed1405fd4205240e1b9e61
+R 63d9c2979689d3960bbd738edf79070f
+U stephan
+Z 0ea9b225897586b46dcecb74f7edb744
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 5c99b340dd..4b7393393e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cd494240cc6184bb028d1f1049086f57c0a71a43d7ed1405fd4205240e1b9e61
\ No newline at end of file
+372802aaa22a830bf498bb0d9561ae02b32e5e191c4d7d771ea152140f6685a1
\ No newline at end of file
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index d862c4fc00..df61f3c196 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -5628,7 +5628,7 @@ void sqlite3_value_free(sqlite3_value*);
 **
 ** ^The sqlite3_aggregate_context(C,N) routine returns a NULL pointer 
 ** when first called if N is less than or equal to zero or if a memory
-** allocate error occurs.
+** allocation error occurs.
 **
 ** ^(The amount of space allocated by sqlite3_aggregate_context(C,N) is
 ** determined by the N parameter on first successful call.  Changing the

From 510a9d1c6456a959f316353737f60e9300e600e4 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sun, 2 Oct 2022 22:50:04 +0000
Subject: [PATCH 213/428] More cleanups in the UDF argument and result
 handling, in particular int64. Consolidate some duplicate int64/bigint range
 checking code. Expose the UDF low-level utilities (arg/result conversion) to
 client code. Add the sqlite3_context pointer to the JS-side UDF wrappers for
 API consistency.

FossilOrigin-Name: 10ab77af952abf09f93f342a9d07a3b133f2c4c0a3588df3390cd3a923cafae4
---
 ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api |   5 +
 ext/wasm/api/sqlite3-api-glue.js            | 146 ++++++++++++++-----
 ext/wasm/api/sqlite3-api-oo1.js             |  45 +++---
 ext/wasm/api/sqlite3-api-prologue.js        | 147 ++++++++++++++------
 ext/wasm/demo-123.js                        |   2 +-
 ext/wasm/testing1.js                        |  29 ++--
 manifest                                    |  22 +--
 manifest.uuid                               |   2 +-
 8 files changed, 274 insertions(+), 124 deletions(-)

diff --git a/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api b/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
index 22ca64cf85..014812946d 100644
--- a/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
+++ b/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
@@ -1,3 +1,4 @@
+_sqlite3_aggregate_context
 _sqlite3_bind_blob
 _sqlite3_bind_double
 _sqlite3_bind_int
@@ -61,6 +62,7 @@ _sqlite3_result_error_code
 _sqlite3_result_error_nomem
 _sqlite3_result_error_toobig
 _sqlite3_result_int
+_sqlite3_result_int64
 _sqlite3_result_null
 _sqlite3_result_text
 _sqlite3_serialize
@@ -76,9 +78,12 @@ _sqlite3_uri_boolean
 _sqlite3_uri_int64
 _sqlite3_uri_key
 _sqlite3_uri_parameter
+_sqlite3_user_data
 _sqlite3_value_blob
 _sqlite3_value_bytes
 _sqlite3_value_double
+_sqlite3_value_int
+_sqlite3_value_int64
 _sqlite3_value_text
 _sqlite3_value_type
 _sqlite3_vfs_find
diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index 5ca6f4ec22..f80bade385 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -19,6 +19,7 @@
 self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
   'use strict';
   const toss = (...args)=>{throw new Error(args.join(' '))};
+  const toss3 = sqlite3.SQLite3Error.toss;
   const capi = sqlite3.capi, wasm = capi.wasm, util = capi.util;
   self.WhWasmUtilInstaller(capi.wasm);
   delete self.WhWasmUtilInstaller;
@@ -62,8 +63,15 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        `sqlite3_vfs*` via capi.sqlite3_vfs.pointer.
     */
     const aPtr = wasm.xWrap.argAdapter('*');
-    wasm.xWrap.argAdapter('sqlite3*', aPtr)('sqlite3_stmt*', aPtr);
-    wasm.xWrap.resultAdapter('sqlite3*', aPtr)('sqlite3_stmt*', aPtr);
+    wasm.xWrap.argAdapter('sqlite3*', aPtr)
+    ('sqlite3_stmt*', aPtr)
+    ('sqlite3_context*', aPtr)
+    ('sqlite3_value*', aPtr)
+    ('void*', aPtr);
+    wasm.xWrap.resultAdapter('sqlite3*', aPtr)
+    ('sqlite3_stmt*', aPtr)
+    ('sqlite3_context*', aPtr)
+    ('void*', aPtr);
 
     /**
        Populate api object with sqlite3_...() by binding the "raw" wasm
@@ -207,38 +215,53 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        "*"/*xStep*/,"*"/*xFinal*/, "*"/*xValue*/,
        "*"/*xInverse*/, "*"/*xDestroy*/]
     );
-    const __setResult = function(pCx, val){
+
+    const __setUdfResult = function(pCtx, val){
+      //console.warn("setUdfResult",typeof val, val);
       switch(typeof val) {
           case 'boolean':
-            capi.sqlite3_result_int(pCx, val ? 1 : 0);
+            capi.sqlite3_result_int(pCtx, val ? 1 : 0);
+            break;
+          case 'bigint':
+            if(wasm.bigIntEnabled){
+              if(util.bigIntFits64(val)) capi.sqlite3_result_int64(pCtx, val);
+              else toss3("BigInt value",val.toString(),"is too BigInt for int64.");
+            }else if(util.bigIntFits32(val)){
+              capi.sqlite3_result_int(pCtx, Number(val));
+            }else if(util.bigIntFitsDouble(val)){
+              capi.sqlite3_result_double(pCtx, Number(val));
+            }else{
+              toss3("BigInt value",val.toString(),"is too BigInt.");
+            }
             break;
           case 'number': {
             (util.isInt32(val)
              ? capi.sqlite3_result_int
-             : capi.sqlite3_result_double)(pCx, val);
+             : capi.sqlite3_result_double)(pCtx, val);
             break;
           }
           case 'string':
-            capi.sqlite3_result_text(pCx, val, -1, capi.SQLITE_TRANSIENT);
+            capi.sqlite3_result_text(pCtx, val, -1, capi.SQLITE_TRANSIENT);
             break;
           case 'object':
             if(null===val/*yes, typeof null === 'object'*/) {
-              capi.sqlite3_result_null(pCx);
+              capi.sqlite3_result_null(pCtx);
               break;
             }else if(util.isBindableTypedArray(val)){
               const pBlob = wasm.allocFromTypedArray(val);
               capi.sqlite3_result_blob(
-                pCx, pBlob, val.byteLength,
+                pCtx, pBlob, val.byteLength,
                 wasm.exports[sqlite3.config.deallocExportName]
               );
               break;
             }
             // else fall through
           default:
-            toss3("Don't not how to handle this UDF result value:",val);
+          toss3("Don't not how to handle this UDF result value:",(typeof val), val);
       };
-    }/*__setResult()*/;
-    const __extractArgs = function(argc, pArgv){
+    }/*__setUdfResult()*/;
+
+    const __convertUdfArgs = function(argc, pArgv){
       let i, pVal, valType, arg;
       const tgt = [];
       for(i = 0; i < argc; ++i){
@@ -253,6 +276,12 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
         valType = capi.sqlite3_value_type(pVal);
         switch(valType){
             case capi.SQLITE_INTEGER:
+              if(wasm.bigIntEnabled){
+                arg = capi.sqlite3_value_int64(pVal);
+                if(util.bigIntFitsDouble(arg)) arg = Number(arg);
+              }
+              else arg = capi.sqlite3_value_double(pVal)/*yes, double, for larger integers*/;
+              break;
             case capi.SQLITE_FLOAT:
               arg = capi.sqlite3_value_double(pVal);
               break;
@@ -262,10 +291,10 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
             case capi.SQLITE_BLOB:{
               const n = capi.sqlite3_value_bytes(pVal);
               const pBlob = capi.sqlite3_value_blob(pVal);
-              arg = new Uint8Array(n);
-              let i;
-              const heap = n ? wasm.heap8() : false;
-              for(i = 0; i < n; ++i) arg[i] = heap[pBlob+i];
+              if(n && !pBlob) sqlite3.WasmAllocError.toss(
+                "Cannot allocate memory for blob argument of",n,"byte(s)"
+              );
+              arg = n ? wasm.heap8u().slice(pBlob, pBlob + Number(n)) : null;
               break;
             }
             case capi.SQLITE_NULL:
@@ -278,39 +307,37 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
         tgt.push(arg);
       }
       return tgt;
-    }/*__extractArgs()*/;
+    }/*__convertUdfArgs()*/;
 
-    const __setCxErr = (pCx, e)=>{
-      if(e instanceof capi.WasmAllocError){
-        capi.sqlite3_result_error_nomem(pCx);
+    const __setUdfError = (pCtx, e)=>{
+      if(e instanceof sqlite3.WasmAllocError){
+        capi.sqlite3_result_error_nomem(pCtx);
       }else{
-        capi.sqlite3_result_error(pCx, e.message, -1);
+        capi.sqlite3_result_error(pCtx, e.message, -1);
       }
     };
 
-    /* TODO: pass on the pCx pointer to all callbacks. This requires
-       fixing test code and updating oodles of docs. Once that is in place,
-       export sqlite3_aggregate_context().
-    */
-
     const __xFunc = function(callback){
-      return function(pCx, argc, pArgv){
-        try{ __setResult(pCx, callback(...__extractArgs(argc, pArgv))) }
-        catch(e){ __setCxErr(pCx, e) }
+      return function(pCtx, argc, pArgv){
+        try{ __setUdfResult(pCtx, callback(pCtx, ...__convertUdfArgs(argc, pArgv))) }
+        catch(e){
+          //console.error('xFunc() caught:',e);
+          __setUdfError(pCtx, e);
+        }
       };
     };
 
     const __xInverseAndStep = function(callback){
-      return function(pCx, argc, pArgv){
-        try{ callback(...__extractArgs(argc, pArgv)) }
-        catch(e){ __setCxErr(pCx, e) }
+      return function(pCtx, argc, pArgv){
+        try{ callback(pCtx, ...__convertUdfArgs(argc, pArgv)) }
+        catch(e){ __setUdfError(pCtx, e) }
       };
     };
 
     const __xFinalAndValue = function(callback){
-      return function(pCx){
-        try{ __setResult(pCx, callback()) }
-        catch(e){ __setCxErr(pCx, e) }
+      return function(pCtx){
+        try{ __setUdfResult(pCtx, callback(pCtx)) }
+        catch(e){ __setUdfError(pCtx, e) }
       };
     };
 
@@ -417,6 +444,57 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
       }
       return rc;
     };
+    /**
+       A helper for UDFs implemented in JS and bound to WASM by the
+       client. Given a JS value, setUdfResult(pCtx,X) calls one of the
+       sqlite3_result_xyz(pCtx,...)  routines, depending on X's data
+       type:
+
+       - `null`: sqlite3_result_null()
+       - `boolean`: sqlite3_result_int()
+       - `number': sqlite3_result_int() or sqlite3_result_double()
+       - `string`: sqlite3_result_text()
+       - Uint8Array or Int8Array: sqlite3_result_blob()
+
+       Anything else triggers sqlite3_result_error().
+    */
+    capi.sqlite3_create_function_v2.setUdfResult =
+      capi.sqlite3_create_function.setUdfResult =
+      capi.sqlite3_create_window_function.setUdfResult = __setUdfResult;
+
+    /**
+       A helper for UDFs implemented in JS and bound to WASM by the
+       client. When passed the
+       (argc,argv) values from the UDF-related functions which receive
+       them (xFunc, xStep, xInverse), it creates a JS array
+       representing those arguments, converting each to JS in a manner
+       appropriate to its data type: numeric, text, blob
+       (Uint8Array()), or null.
+
+       Results are undefined if it's passed anything other than those
+       two arguments from those specific contexts.
+
+       Thus an argc of 4 will result in a length-4 array containing
+       the converted values from the corresponding argv.
+
+       The conversion will throw only on allocation error or an internal
+       error.
+    */
+    capi.sqlite3_create_function_v2.convertUdfArgs =
+      capi.sqlite3_create_function.convertUdfArgs =
+      capi.sqlite3_create_window_function.convertUdfArgs = __convertUdfArgs;
+
+    /**
+       A helper for UDFs implemented in JS and bound to WASM by the
+       client. It expects to be a passed `(sqlite3_context*, Error)`
+       (i.e. an exception object). And it sets the current UDF's
+       result to sqlite3_result_error_nomem() or sqlite3_result_error(),
+       depending on whether the 2nd argument is a
+       sqlite3.WasmAllocError object or not.
+    */
+    capi.sqlite3_create_function_v2.setUdfError =
+      capi.sqlite3_create_function.setUdfError =
+      capi.sqlite3_create_window_function.setUdfError = __setUdfError;
 
   }/*sqlite3_create_function_v2() and sqlite3_create_window_function() proxies*/;
 
diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index f701c463f0..e6685d35a7 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -784,12 +784,21 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        the function is defined:
 
        - .arity: the number of arguments which SQL calls to this
-       function expect or require. The default value is the
-       callback's length property (i.e. the number of declared
-       parameters it has). A value of -1 means that the function
-       is variadic and may accept any number of arguments, up to
-       sqlite3's compile-time limits. sqlite3 will enforce the
-       argument count if is zero or greater.
+       function expect or require. The default value is
+       `callback.length` (i.e. the number of declared parameters it
+       has) **MINUS 1** (see below for why). As a special case, if
+       callback.length is 0, its arity is also 0 instead of -1. A
+       negative arity value means that the function is variadic and
+       may accept any number of arguments, up to sqlite3's
+       compile-time limits. sqlite3 will enforce the argument count if
+       is zero or greater.
+
+       The callback always receives a pointer to an `sqlite3_context`
+       object as its first argument. Any arguments after that are from
+       SQL code. The leading context argument does _not_ count towards
+       the function's arity. See the docs for
+       sqlite3.capi.sqlite3_create_function_v2() for why that argument
+       is needed in the interface.
 
        The following properties correspond to flags documented at:
 
@@ -827,7 +836,9 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
       name = name.toLowerCase();
       DB.checkRc(this, capi.sqlite3_create_function_v2(
         this.pointer, name,
-        (opt.hasOwnProperty('arity') ? +opt.arity : callback.length),
+        (opt.hasOwnProperty('arity')
+         ? +opt.arity
+         : (callback.length ? callback.length-1/*for pCtx arg*/ : 0)),
         capi.SQLITE_UTF8 | fFlags, null/*pApp*/, callback,
         null/*xStep*/, null/*xFinal*/, null/*xDestroy*/));
       return this;
@@ -992,10 +1003,9 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
   const bindOne = function f(stmt,ndx,bindType,val){
     affirmUnlocked(stmt, 'bind()');
     if(!f._){
-      if(wasm.bigIntEnabled){
-        f._maxInt = BigInt("0x7fffffffffffffff");
-        f._minInt = ~f._maxInt;
-      }
+      f._tooBigInt = (v)=>toss3(
+        "BigInt value is too big to store without precision loss:", v
+      );
       /* Reminder: when not in BigInt mode, it's impossible for
          JS to represent a number out of the range we can bind,
          so we have no range checking. */
@@ -1041,15 +1051,15 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
           let m;
           if(util.isInt32(val)) m = capi.sqlite3_bind_int;
           else if('bigint'===typeof val){
-            if(val<f._minInt || val>f._maxInt){
-              toss3("BigInt value is out of range for storing as int64: "+val);
+            if(!util.bigIntFits64(val)){
+              f._tooBigInt(val);
             }else if(wasm.bigIntEnabled){
               m = capi.sqlite3_bind_int64;
-            }else if(val >= Number.MIN_SAFE_INTEGER && val <= Number.MAX_SAFE_INTEGER){
+            }else if(util.bigIntFitsDouble(val)){
               val = Number(val);
               m = capi.sqlite3_bind_double;
             }else{
-              toss3("BigInt value is out of range for storing as double: "+val);
+              f._tooBigInt(val);
             }
           }else{ // !int32, !bigint
             val = Number(val);
@@ -1298,8 +1308,9 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
           case capi.SQLITE_ROW: return this._mayGet = true;
           default:
             this._mayGet = false;
-            console.warn("sqlite3_step() rc=",rc,"SQL =",
-                         capi.sqlite3_sql(this.pointer));
+            console.warn("sqlite3_step() rc=",rc,
+                         capi.sqlite3_web_rc_str(rc),
+                         "SQL =", capi.sqlite3_sql(this.pointer));
             DB.checkRc(this.db.pointer, rc);
       }
     },
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 9f40699439..f21655b823 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -176,10 +176,39 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
      double-type DB operations for integer values in order to keep
      more precision.
   */
-  const isInt32 = function(n){
+  const isInt32 = (n)=>{
     return ('bigint'!==typeof n /*TypeError: can't convert BigInt to number*/)
       && !!(n===(n|0) && n<=2147483647 && n>=-2147483648);
   };
+  /**
+     Returns true if the given BigInt value is small enough to fit
+     into an int64 value, else false.
+  */
+  const bigIntFits64 = function f(b){
+    if(!f._max){
+      f._max = BigInt("0x7fffffffffffffff");
+      f._min = ~f._max;
+    }
+    return b >= f._min && b <= f._max;
+  };
+
+  /**
+     Returns true if the given BigInt value is small enough to fit
+     into an int32, else false.
+  */
+  const bigIntFits32 = (b)=>(b >= (-0x7fffffffn - 1n) && b <= 0x7fffffffn);
+
+  /**
+     Returns true if the given BigInt value is small enough to fit
+     into a double value without loss of precision, else false.
+  */
+  const bigIntFitsDouble = function f(b){
+    if(!f._min){
+      f._min = Number.MIN_SAFE_INTEGER;
+      f._max = Number.MAX_SAFE_INTEGER;
+    }
+    return b >= f._min && b <= f._max;
+  };
 
   /** Returns v if v appears to be a TypedArray, else false. */
   const isTypedArray = (v)=>{
@@ -288,29 +317,52 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
 
        The semantics of JS functions are:
 
-       xFunc: is passed `(arrayOfValues)`. Its return value becomes
+       xFunc: is passed `(pCtx, ...values)`. Its return value becomes
        the new SQL function's result.
 
-       xStep: is passed `(arrayOfValues)`. Its return value is
+       xStep: is passed `(pCtx, ...values)`. Its return value is
        ignored.
 
-       xFinal: is passed no arguments. Its return value becomes the
-       new aggragate SQL function's result.
+       xFinal: is passed `(pCtx)`. Its return value becomes the new
+       aggregate SQL function's result.
 
        xDestroy: is passed `(void*)`. Its return value is ignored. The
        pointer passed to it is the one from the 5th argument to
        sqlite3_create_function_v2().
 
-       Note that JS callback implementations have different call
-       signatures than their native counterparts (namely, they do not
-       get passed an `sqlite3_context*` argument) because practice has
-       shown that this is almost always more convenient and desirable
-       in JS code. Clients which need access to the full range of
-       native arguments will have to create a WASM-bound function
-       themselves (using wasm.installFunction() or equivalent) and
-       pass that function's WASM pointer to this function, rather than
-       passing a JS function. Be warned, however, that working with
-       UDFs at that level from JS is quite tedious.
+       Note that:
+
+       - `pCtx` in the above descriptions is a `sqlite3_context*`. 99
+         times out of a hundred, or maybe more, that initial argument
+         will be irrelevant for JS UDF bindings, but it needs to be
+         there so that the cases where it _is_ relevant, in particular
+         with window and aggregate functions, have full access to the
+         underlying sqlite3 APIs.
+
+       - When wrapping JS functions, the remaining arguments arrive as
+         positional arguments, not as an array of arguments, because
+         that allows callback definitions to be more JS-idiomatic than
+         C-like, for example `(pCtx,a,b)=>a+b` is more intuitive and
+         legible than `(pCtx,args)=>args[0]+args[1]`. For cases where
+         an array of arguments would be more convenient, the callbacks
+         simply need to be declared like `(pCtx,...args)=>{...}`, in
+         which case `args` will be an array.
+
+       - If a JS wrapper throws, it gets translated to
+         sqlite3_result_error() or sqlite3_result_error_nomem(),
+         depending on whether the exception is an
+         sqlite3.WasmAllocError object or not.
+
+       - When passing on WASM function pointers, arguments are _not_
+         converted or reformulated. They are passed on as-is in raw
+         pointer form using their native C signatures. Only JS
+         functions passed in to this routine, and thus wrapped by this
+         routine, get automatic conversions of arguments and result
+         values. The routines which perform those conversions are
+         exposed for client-side use as
+         sqlite3_create_function_v2.convertUdfArgs() and
+         sqlite3_create_function_v2.setUdfResult(). sqlite3_create_function()
+         and sqlite3_create_window_function() have those same methods.
 
        For xFunc(), xStep(), and xFinal():
 
@@ -323,19 +375,26 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
          doubles. TODO: use BigInt support if enabled. That feature
          was added after this functionality was implemented.
 
-       If any JS-side functions throw, those exceptions are
-       intercepted and converted to database-side errors with
-       the exception of xFinal(): any exception from it is
-       ignored, possibly generating a console.error() message.
-       Destructors must not throw.
+       If any JS-side bound functions throw, those exceptions are
+       intercepted and converted to database-side errors with the
+       exception of xDestroy(): any exception from it is ignored,
+       possibly generating a console.error() message.  Destructors
+       must not throw.
 
        Once installed, there is currently no way to uninstall the
-       bound methods from WASM. They can be uninstalled from the
-       database as documented in the C API, but this wrapper currently
-       has no infrastructure in place to also free the WASM-bound JS
-       wrappers, effectively resulting in a memory leak if the client
-       uninstalls the UDF. Improving that is a potential TODO, but
-       removing client-installed UDFs is rare in practice.
+       automatically-converted WASM-bound JS functions from WASM. They
+       can be uninstalled from the database as documented in the C
+       API, but this wrapper currently has no infrastructure in place
+       to also free the WASM-bound JS wrappers, effectively resulting
+       in a memory leak if the client uninstalls the UDF. Improving that
+       is a potential TODO, but removing client-installed UDFs is rare
+       in practice. If this factor is relevant for a given client,
+       they can create WASM-bound JS functions themselves, hold on to their
+       pointers, and pass the pointers in to here. Later on, they can
+       free those pointers (using `wasm.uninstallFunction()` or
+       equivalent).
+
+       C reference: https://www.sqlite.org/c3ref/create_function.html
 
        Maintenance reminder: the ability to add new
        WASM-accessible functions to the runtime requires that the
@@ -344,10 +403,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     */
     sqlite3_create_function_v2: function(
       pDb, funcName, nArg, eTextRep, pApp,
-      xFunc,   //function(arrayOfValues)
-      xStep,   //function(arrayOfValues)
-      xFinal,  //function()
-      xDestroy //function(void*)
+      xFunc, xStep, xFinal, xDestroy
     ){/*installed later*/},
     /**
        Equivalent to passing the same arguments to
@@ -355,9 +411,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     */
     sqlite3_create_function:function(
       pDb, funcName, nArg, eTextRep, pApp,
-      xFunc,   //function(arrayOfValues)
-      xStep,   //function(arrayOfValues)
-      xFinal   //function()
+      xFunc, xStep, xFinal
     ){/*installed later*/},
     /**
        The sqlite3_create_window_function() JS wrapper differs from
@@ -368,11 +422,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     */
     sqlite3_create_window_function: function(
       pDb, funcName, nArg, eTextRep, pApp,
-      xStep,   //function(arrayOfValues)
-      xFinal,  //function()
-      xValue,  //function()
-      xInverse,//function(arrayOfValues)
-      xDestroy //function(void*)
+      xStep, xFinal, xValue, xInverse, xDestroy
     ){/*installed later*/},
     /**
        The sqlite3_prepare_v3() binding handles two different uses
@@ -466,7 +516,9 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
        removed.
     */
     util:{
-      affirmBindableTypedArray, arrayToString, isBindableTypedArray,
+      affirmBindableTypedArray, arrayToString,
+      bigIntFits32, bigIntFits64, bigIntFitsDouble,
+      isBindableTypedArray,
       isInt32, isSQLableTypedArray, isTypedArray, 
       typedArrayToString,
       isMainWindow: ()=>{
@@ -680,6 +732,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
   */
   capi.wasm.bindingSignatures = [
     // Please keep these sorted by function name!
+    ["sqlite3_aggregate_context","void*", "sqlite3_context*", "int"],
     ["sqlite3_bind_blob","int", "sqlite3_stmt*", "int", "*", "int", "*"
      /* We should arguably write a custom wrapper which knows how
         to handle Blob, TypedArrays, and JS strings. */
@@ -766,11 +819,13 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     ["sqlite3_uri_boolean", "int", "string", "string", "int"],
     ["sqlite3_uri_key", "string", "string", "int"],
     ["sqlite3_uri_parameter", "string", "string", "string"],
-    ["sqlite3_value_blob", "*", "*"],
-    ["sqlite3_value_bytes","int", "*"],
-    ["sqlite3_value_double","f64", "*"],
-    ["sqlite3_value_text", "string", "*"],
-    ["sqlite3_value_type", "int", "*"],
+    ["sqlite3_user_data","void*", "sqlite3_context*"],
+    ["sqlite3_value_blob", "*", "sqlite3_value*"],
+    ["sqlite3_value_bytes","int", "sqlite3_value*"],
+    ["sqlite3_value_double","f64", "sqlite3_value*"],
+    ["sqlite3_value_int","int", "sqlite3_value*"],
+    ["sqlite3_value_text", "string", "sqlite3_value*"],
+    ["sqlite3_value_type", "int", "sqlite3_value*"],
     ["sqlite3_vfs_find", "*", "string"],
     ["sqlite3_vfs_register", "int", "*", "int"]
   ]/*capi.wasm.bindingSignatures*/;
@@ -794,8 +849,10 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     ["sqlite3_malloc64", "*","i64"],
     ["sqlite3_msize", "i64", "*"],
     ["sqlite3_realloc64", "*","*", "i64"],
+    ["sqlite3_result_int64",undefined, "*", "i64"],
     ["sqlite3_total_changes64", "i64", ["sqlite3*"]],
-    ["sqlite3_uri_int64", "i64", ["string", "string", "i64"]]
+    ["sqlite3_uri_int64", "i64", ["string", "string", "i64"]],
+    ["sqlite3_value_int64","i64", "sqlite3_value*"],
   ];
 
   /**
diff --git a/ext/wasm/demo-123.js b/ext/wasm/demo-123.js
index 37dc7a7af1..67c1094f02 100644
--- a/ext/wasm/demo-123.js
+++ b/ext/wasm/demo-123.js
@@ -160,7 +160,7 @@
       log("Create a scalar UDF...");
       db.createFunction({
         name: 'twice',
-        callback: function(arg){ // note the call arg count
+        callback: function(pCx, arg){ // note the call arg count
           return arg + arg;
         }
       });
diff --git a/ext/wasm/testing1.js b/ext/wasm/testing1.js
index 053fb6f277..7c20fdbbbd 100644
--- a/ext/wasm/testing1.js
+++ b/ext/wasm/testing1.js
@@ -194,38 +194,37 @@
   }/*testBasicSanity()*/;
 
   const testUDF = function(db){
-    db.createFunction("foo",function(a,b){return a+b});
+    db.createFunction("foo",(pCx,a,b)=>a+b);
     T.assert(7===db.selectValue("select foo(3,4)")).
       assert(5===db.selectValue("select foo(3,?)",2)).
       assert(5===db.selectValue("select foo(?,?2)",[1,4])).
       assert(5===db.selectValue("select foo($a,$b)",{$a:0,$b:5}));
     db.createFunction("bar", {
       arity: -1,
-      callback: function(){
+      callback: function(pCx){
         var rc = 0;
-        for(let i = 0; i < arguments.length; ++i) rc += arguments[i];
+        for(let i = 1; i < arguments.length; ++i) rc += arguments[i];
         return rc;
       }
     }).createFunction({
       name: "asis",
-      callback: (arg)=>arg
+      callback: (pCx,arg)=>arg
     });
-    
+
     //log("Testing DB::selectValue() w/ UDF...");
     T.assert(0===db.selectValue("select bar()")).
       assert(1===db.selectValue("select bar(1)")).
       assert(3===db.selectValue("select bar(1,2)")).
       assert(-1===db.selectValue("select bar(1,2,-4)")).
-      assert('hi'===db.selectValue("select asis('hi')"));
-    
-    T.assert('hi' === db.selectValue("select ?",'hi')).
-      assert(null===db.selectValue("select null")).
-      assert(null === db.selectValue("select ?",null)).
-      assert(null === db.selectValue("select ?",[null])).
-      assert(null === db.selectValue("select $a",{$a:null})).
+      assert('hi' === db.selectValue("select asis('hi')")).
+      assert('hi' === db.selectValue("select ?",'hi')).
+      assert(null === db.selectValue("select null")).
+      assert(null === db.selectValue("select asis(null)")).
+      assert(1 === db.selectValue("select ?",1)).
+      assert(2 === db.selectValue("select ?",[2])).
+      assert(3 === db.selectValue("select $a",{$a:3})).
       assert(eqApprox(3.1,db.selectValue("select 3.0 + 0.1"))).
-      assert(eqApprox(1.3,db.selectValue("select asis(1 + 0.3)")))
-    ;
+      assert(eqApprox(1.3,db.selectValue("select asis(1 + 0.3)")));
 
     //log("Testing binding and UDF propagation of blobs...");
     let blobArg = new Uint8Array(2);
@@ -354,7 +353,7 @@
         T.assert(g64(pMin) === minMaxI64[0]).
           assert(minMaxI64[0] === db.selectValue("select ?",g64(pMin))).
           assert(minMaxI64[1] === db.selectValue("select ?",g64(pMax)));
-        const rxRange = /out of range for storing as int64/;
+        const rxRange = /too big/;
         T.mustThrowMatching(()=>{db.prepare("select ?").bind(minMaxI64[0] - BigInt(1))},
                           rxRange).
           mustThrowMatching(()=>{db.prepare("select ?").bind(minMaxI64[1] + BigInt(1))},
diff --git a/manifest b/manifest
index f77b9db145..2c0461c342 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C JS:\sclean\sup\screate_function()\swrapper\sand\sadd\ssupport\sfor\screate_window_function().\sEliminate\san\sextraneous\sblob\scopy\swhen\sa\sUDF\sreturns\sa\sblob.\sMake\suse\sof\snewfound\sJS-fu\sto\sclean\sup\show\ssqlite3ApiBootstrap()\sconfig\sis\sinitialized.
-D 2022-10-02T20:08:53.027
+C More\scleanups\sin\sthe\sUDF\sargument\sand\sresult\shandling,\sin\sparticular\sint64.\sConsolidate\ssome\sduplicate\sint64/bigint\srange\schecking\scode.\sExpose\sthe\sUDF\slow-level\sutilities\s(arg/result\sconversion)\sto\sclient\scode.\sAdd\sthe\ssqlite3_context\spointer\sto\sthe\sJS-side\sUDF\swrappers\sfor\sAPI\sconsistency.
+D 2022-10-02T22:50:04.828
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -476,7 +476,7 @@ F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34ce
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle 0e88c8cfc3719e4b7e74980d9da664c709e68acf863e48386cda376edfd3bfb0
 F ext/wasm/GNUmakefile b313a82060c733c990b91afa981e10f5e21a0b33a483f33b739ce932ed6bc725
 F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
-F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api e35ddfbfcde83571a1169a910dbcb59bf598a3a8f5283b42d88555b9ccaa6042
+F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 9b16040f37805ee7c30f922a970a57d3f2a822d0675a8f5d70f15061e300c4ce
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
 F ext/wasm/api/README.md 1e350b611465566cfa2e5eccf7c9b29a34f48ee38bbf6d5fb086dd06ce32b3ff
 F ext/wasm/api/extern-post-js.js dc68cbf552d8ea085181400a6963907c32e0b088b03ffd8969b1869fea246629
@@ -485,10 +485,10 @@ F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba814
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
 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 d1587736ed73fcb44e32f1ff1933e4c91a2d3b3c39acef0d13c0b3fd6859a7b1
-F ext/wasm/api/sqlite3-api-oo1.js 48d2269544301cd97726ef2d9a82e4384350d12dcf832fa417f211811ae5272d
+F ext/wasm/api/sqlite3-api-glue.js b962bad752b62366651dae26c0b969d297f81e17879685025fb12130786509cb
+F ext/wasm/api/sqlite3-api-oo1.js 484f9ea5c7140d07745f4b534a1f6dd67120c65ef34abcf7cdb3a388d73f5ef4
 F ext/wasm/api/sqlite3-api-opfs.js 1b097808b7b081b0f0700cf97d49ef19760e401706168edff9cd45cf9169f541
-F ext/wasm/api/sqlite3-api-prologue.js d71ad817cdef8a9b3b64a394b781a8f64872d4983eac583167e29f9f96ef8e4e
+F ext/wasm/api/sqlite3-api-prologue.js bf270c17e759814decf57f6dd29fee9b5e44dd89a798a1ba9ba1e34d6f76ceaf
 F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 2a0f9e4bf1b141a787918951360601128d6a0a190a31a8e5cfe237c99fa640c6
@@ -500,7 +500,7 @@ F ext/wasm/common/testing.css 3a5143699c2b73a85b962271e1a9b3241b30d90e30d895e4f5
 F ext/wasm/common/whwasmutil.js 427eb8b695bd5f38497601a6bda933e83d1a5900b75f5f1af8dbb381898d2ee4
 F ext/wasm/demo-123-worker.html e419b66495d209b5211ec64903b4cfb3ca7df20d652b41fcd28bf018a773234f
 F ext/wasm/demo-123.html aa281d33b7eefa755f3122b7b5a18f39a42dc5fb69c8879171bf14b4c37c4ec4
-F ext/wasm/demo-123.js 536579fd587974c2511c5bf82034b253d4fdeceabb726927ad7599ef6b7578e8
+F ext/wasm/demo-123.js 9fbc5cd3af842d361e9f8353ae4af9f471c2b2517e55446474406620485b9ee6
 F ext/wasm/demo-kvvfs1.html 7d4f28873de67f51ac18c584b7d920825139866a96049a49c424d6f5a0ea5e7f
 F ext/wasm/demo-kvvfs1.js 105596bd2ccd0b1deb5fde8e99b536e8242d4bb5932fac0c8403ff3a6bc547e8
 F ext/wasm/fiddle.make 3f4efd62bc2a9c883bfcea52ae2755114a62d444d6d042df287f4aef301d6c6c
@@ -530,7 +530,7 @@ F ext/wasm/test-opfs-vfs.js a59ff9210b17d46b0c6fbf6a0ba60143c033327865f2e556e14f
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
 F ext/wasm/testing-worker1-promiser.js bd788e33c1807e0a6dda9c9a9d784bd3350ca49c9dd8ae2cc8719b506b6e013e
 F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d7669fb17fcae
-F ext/wasm/testing1.js bdea170b16189028c1f63023c620df52ddf31ed416bad56d729c60031b1e27ae
+F ext/wasm/testing1.js 0f87073086eff3a152f013874f1c9a710e63d2e069f90dfeb8333ffe82476d04
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
 F ext/wasm/testing2.js 88f40ef3cd8201bdadd120a711c36bbf0ce56cc0eab1d5e7debb71fed7822494
 F ext/wasm/wasmfs.make 3cce1820006196de140f90f2da4b4ea657083fb5bfee7d125be43f7a85748c8f
@@ -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 435ab33384017967e46f52b70bee851a85a28808990a0e58dd5288f606b89c9c
-R 8d670d2cae99839795cb81bda9741460
+P d3bad9347c5423fa7f19ae729461636f1043c99a1f01f168efa10bebefb1cdd1
+R 46b070d886b6400d4ed82000c86b9d6e
 U stephan
-Z 74556b5dc28de703cf507dc7ef6550bd
+Z fc77e81a038294d78aff4ec7221b0be3
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index aca6ce8b8a..e633b1fc49 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d3bad9347c5423fa7f19ae729461636f1043c99a1f01f168efa10bebefb1cdd1
\ No newline at end of file
+10ab77af952abf09f93f342a9d07a3b133f2c4c0a3588df3390cd3a923cafae4
\ No newline at end of file

From ef9cd12ec4d14c836e198171eef3e04f674bb039 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 3 Oct 2022 08:21:06 +0000
Subject: [PATCH 214/428] Minor JS API tweaks prompted by documenting them.

FossilOrigin-Name: a82e6faaa642b09d241232c4daa67134d4dfa24bf3ca3725740346ca5269b381
---
 ext/wasm/api/sqlite3-api-glue.js     | 46 ++++++++++++++--------------
 ext/wasm/api/sqlite3-api-prologue.js |  6 ++--
 ext/wasm/api/sqlite3-wasm.c          | 10 +++---
 ext/wasm/common/whwasmutil.js        | 29 ++++++++++++------
 ext/wasm/jaccwabyt/jaccwabyt.js      | 18 +++++------
 ext/wasm/jaccwabyt/jaccwabyt.md      |  8 ++---
 manifest                             | 22 ++++++-------
 manifest.uuid                        |  2 +-
 8 files changed, 76 insertions(+), 65 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index f80bade385..bbd5b446f0 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -50,7 +50,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
            'flexible-string'-type arguments */
     const xString = wasm.xWrap.argAdapter('string');
     wasm.xWrap.argAdapter(
-      'flexible-string', (v)=>xString(util.arrayToString(v))
+      'flexible-string', (v)=>xString(util.flexibleString(v))
     );
   }
   
@@ -216,8 +216,8 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        "*"/*xInverse*/, "*"/*xDestroy*/]
     );
 
-    const __setUdfResult = function(pCtx, val){
-      //console.warn("setUdfResult",typeof val, val);
+    const __udfSetResult = function(pCtx, val){
+      //console.warn("udfSetResult",typeof val, val);
       switch(typeof val) {
           case 'boolean':
             capi.sqlite3_result_int(pCtx, val ? 1 : 0);
@@ -259,9 +259,9 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
           default:
           toss3("Don't not how to handle this UDF result value:",(typeof val), val);
       };
-    }/*__setUdfResult()*/;
+    }/*__udfSetResult()*/;
 
-    const __convertUdfArgs = function(argc, pArgv){
+    const __udfConvertArgs = function(argc, pArgv){
       let i, pVal, valType, arg;
       const tgt = [];
       for(i = 0; i < argc; ++i){
@@ -307,9 +307,9 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
         tgt.push(arg);
       }
       return tgt;
-    }/*__convertUdfArgs()*/;
+    }/*__udfConvertArgs()*/;
 
-    const __setUdfError = (pCtx, e)=>{
+    const __udfSetError = (pCtx, e)=>{
       if(e instanceof sqlite3.WasmAllocError){
         capi.sqlite3_result_error_nomem(pCtx);
       }else{
@@ -319,25 +319,25 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
 
     const __xFunc = function(callback){
       return function(pCtx, argc, pArgv){
-        try{ __setUdfResult(pCtx, callback(pCtx, ...__convertUdfArgs(argc, pArgv))) }
+        try{ __udfSetResult(pCtx, callback(pCtx, ...__udfConvertArgs(argc, pArgv))) }
         catch(e){
           //console.error('xFunc() caught:',e);
-          __setUdfError(pCtx, e);
+          __udfSetError(pCtx, e);
         }
       };
     };
 
     const __xInverseAndStep = function(callback){
       return function(pCtx, argc, pArgv){
-        try{ callback(pCtx, ...__convertUdfArgs(argc, pArgv)) }
-        catch(e){ __setUdfError(pCtx, e) }
+        try{ callback(pCtx, ...__udfConvertArgs(argc, pArgv)) }
+        catch(e){ __udfSetError(pCtx, e) }
       };
     };
 
     const __xFinalAndValue = function(callback){
       return function(pCtx){
-        try{ __setUdfResult(pCtx, callback(pCtx)) }
-        catch(e){ __setUdfError(pCtx, e) }
+        try{ __udfSetResult(pCtx, callback(pCtx)) }
+        catch(e){ __udfSetError(pCtx, e) }
       };
     };
 
@@ -446,7 +446,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     };
     /**
        A helper for UDFs implemented in JS and bound to WASM by the
-       client. Given a JS value, setUdfResult(pCtx,X) calls one of the
+       client. Given a JS value, udfSetResult(pCtx,X) calls one of the
        sqlite3_result_xyz(pCtx,...)  routines, depending on X's data
        type:
 
@@ -458,9 +458,9 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
 
        Anything else triggers sqlite3_result_error().
     */
-    capi.sqlite3_create_function_v2.setUdfResult =
-      capi.sqlite3_create_function.setUdfResult =
-      capi.sqlite3_create_window_function.setUdfResult = __setUdfResult;
+    capi.sqlite3_create_function_v2.udfSetResult =
+      capi.sqlite3_create_function.udfSetResult =
+      capi.sqlite3_create_window_function.udfSetResult = __udfSetResult;
 
     /**
        A helper for UDFs implemented in JS and bound to WASM by the
@@ -480,9 +480,9 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        The conversion will throw only on allocation error or an internal
        error.
     */
-    capi.sqlite3_create_function_v2.convertUdfArgs =
-      capi.sqlite3_create_function.convertUdfArgs =
-      capi.sqlite3_create_window_function.convertUdfArgs = __convertUdfArgs;
+    capi.sqlite3_create_function_v2.udfConvertArgs =
+      capi.sqlite3_create_function.udfConvertArgs =
+      capi.sqlite3_create_window_function.udfConvertArgs = __udfConvertArgs;
 
     /**
        A helper for UDFs implemented in JS and bound to WASM by the
@@ -492,9 +492,9 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        depending on whether the 2nd argument is a
        sqlite3.WasmAllocError object or not.
     */
-    capi.sqlite3_create_function_v2.setUdfError =
-      capi.sqlite3_create_function.setUdfError =
-      capi.sqlite3_create_window_function.setUdfError = __setUdfError;
+    capi.sqlite3_create_function_v2.udfSetError =
+      capi.sqlite3_create_function.udfSetError =
+      capi.sqlite3_create_window_function.udfSetError = __udfSetError;
 
   }/*sqlite3_create_function_v2() and sqlite3_create_window_function() proxies*/;
 
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index f21655b823..83e47cc93c 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -260,10 +260,10 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
 
   /**
      If v is-a Array, its join('') result is returned.  If
-     isSQLableTypedArray(v) then typedArrayToString(v) is
+     isSQLableTypedArray(v) is true then typedArrayToString(v) is
      returned. Else v is returned as-is.
   */
-  const arrayToString = function(v){
+  const flexibleString = function(v){
     if(isSQLableTypedArray(v)) return typedArrayToString(v);
     else if(Array.isArray(v)) return v.join('');
     return v;
@@ -516,7 +516,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
        removed.
     */
     util:{
-      affirmBindableTypedArray, arrayToString,
+      affirmBindableTypedArray, flexibleString,
       bigIntFits32, bigIntFits64, bigIntFitsDouble,
       isBindableTypedArray,
       isInt32, isSQLableTypedArray, isTypedArray, 
diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index b9454155d7..59001379e6 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -615,9 +615,9 @@ const char * sqlite3_wasm_enum_json(void){
     StructBinder {
       M(iVersion,"i");
       M(xClose,"i(p)");
-      M(xRead,"i(ppij)");
-      M(xWrite,"i(ppij)");
-      M(xTruncate,"i(pj)");
+      M(xRead,"i(ppiI)");
+      M(xWrite,"i(ppiI)");
+      M(xTruncate,"i(pI)");
       M(xSync,"i(pi)");
       M(xFileSize,"i(pp)");
       M(xLock,"i(pi)");
@@ -630,8 +630,8 @@ const char * sqlite3_wasm_enum_json(void){
       M(xShmLock,"i(piii)");
       M(xShmBarrier,"v(p)");
       M(xShmUnmap,"i(pi)");
-      M(xFetch,"i(pjip)");
-      M(xUnfetch,"i(pjp)");
+      M(xFetch,"i(pIip)");
+      M(xUnfetch,"i(pIp)");
     } _StructBinder;
 #undef CurrentStruct
 
diff --git a/ext/wasm/common/whwasmutil.js b/ext/wasm/common/whwasmutil.js
index ed3d7714bc..b127595660 100644
--- a/ext/wasm/common/whwasmutil.js
+++ b/ext/wasm/common/whwasmutil.js
@@ -377,17 +377,19 @@ self.WhWasmUtilInstaller = function(target){
 
      - Emscripten: `x...`, where the first x is a letter representing
        the result type and subsequent letters represent the argument
-       types. See below.
+       types. Functions with no arguments have only a single
+       letter. See below.
 
      - Jaccwabyt: `x(...)` where `x` is the letter representing the
        result type and letters in the parens (if any) represent the
-       argument types. See below.
+       argument types. Functions with no arguments use `x()`. See
+       below.
 
      Supported letters:
 
      - `i` = int32
      - `p` = int32 ("pointer")
-     - `j` = int64
+     - `j` or `I` = int64
      - `f` = float32
      - `d` = float64
      - `v` = void, only legal for use as the result type
@@ -402,6 +404,9 @@ self.WhWasmUtilInstaller = function(target){
 
      Sidebar: this code is developed together with Jaccwabyt, thus the
      support for its signature format.
+
+     The arguments may be supplied in either order: (func,sig) or
+     (sig,func).
   */
   target.jsFuncToWasm = function f(func, sig){
     /** Attribution: adapted up from Emscripten-generated glue code,
@@ -410,9 +415,14 @@ self.WhWasmUtilInstaller = function(target){
     if(!f._){/*static init...*/
       f._ = {
         // Map of signature letters to type IR values
-        sigTypes: Object.create(null),
+        sigTypes: Object.assign(Object.create(null),{
+          i: 'i32', p: 'i32', P: 'i32', s: 'i32',
+          j: 'i64', I: 'i64', f: 'f32', d: 'f64'
+        }),
         // Map of type IR values to WASM type code values
-        typeCodes: Object.create(null),
+        typeCodes: Object.assign(Object.create(null),{
+          f64: 0x7c, f32: 0x7d, i64: 0x7e, i32: 0x7f
+        }),
         /** Encodes n, which must be <2^14 (16384), into target array
             tgt, as a little-endian value, using the given method
             ('push' or 'unshift'). */
@@ -452,11 +462,12 @@ self.WhWasmUtilInstaller = function(target){
             invalid. */
         pushSigType: (dest, letter)=>dest.push(f._.typeCodes[f._.letterType(letter)])
       };
-      f._.sigTypes.i = f._.sigTypes.p = f._.sigTypes.P = f._.sigTypes.s = 'i32';
-      f._.sigTypes.j = 'i64'; f._.sigTypes.f = 'f32'; f._.sigTypes.d = 'f64';
-      f._.typeCodes['i32'] = 0x7f; f._.typeCodes['i64'] = 0x7e;
-      f._.typeCodes['f32'] = 0x7d; f._.typeCodes['f64'] = 0x7c;
     }/*static init*/
+    if('string'===typeof func){
+      const x = sig;
+      sig = func;
+      func = x;
+    }
     const sigParams = f._.sigParams(sig);
     const wasmCode = [0x01/*count: 1*/, 0x60/*function*/];
     f._.uleb128Encode(wasmCode, 'push', sigParams.length);
diff --git a/ext/wasm/jaccwabyt/jaccwabyt.js b/ext/wasm/jaccwabyt/jaccwabyt.js
index 14c93b3a2e..ce0d8dd1f1 100644
--- a/ext/wasm/jaccwabyt/jaccwabyt.js
+++ b/ext/wasm/jaccwabyt/jaccwabyt.js
@@ -123,7 +123,7 @@ self.Jaccwabyt = function StructBinderFactory(config){
     switch(sigLetter(s)){
         case 'i': return 'i32';
         case 'p': case 'P': case 's': return ptrIR;
-        case 'j': return 'i64';
+        case 'j': case 'I': return 'i64';
         case 'f': return 'float';
         case 'd': return 'double';
     }
@@ -135,7 +135,7 @@ self.Jaccwabyt = function StructBinderFactory(config){
     switch(sigLetter(s)){
         case 'i': return 4;
         case 'p': case 'P': case 's': return ptrSizeof;
-        case 'j': return 8;
+        case 'j': case 'I': return 8;
         case 'f': return 4 /* C-side floats, not JS-side */;
         case 'd': return 8;
     }
@@ -168,7 +168,7 @@ self.Jaccwabyt = function StructBinderFactory(config){
           break;
         }
         case 'i': return 'getInt32';
-        case 'j': return affirmBigIntArray() && 'getBigInt64';
+        case 'j': case 'I': return affirmBigIntArray() && 'getBigInt64';
         case 'f': return 'getFloat32';
         case 'd': return 'getFloat64';
     }
@@ -186,7 +186,7 @@ self.Jaccwabyt = function StructBinderFactory(config){
           break;
         }
         case 'i': return 'setInt32';
-        case 'j': return affirmBigIntArray() && 'setBigInt64';
+        case 'j': case 'I': return affirmBigIntArray() && 'setBigInt64';
         case 'f': return 'setFloat32';
         case 'd': return 'setFloat64';
     }
@@ -200,7 +200,7 @@ self.Jaccwabyt = function StructBinderFactory(config){
   const sigDVSetWrapper = function(s){
     switch(sigLetter(s)) {
         case 'i': case 'f': case 'd': return Number;
-        case 'j': return affirmBigIntArray() && BigInt;
+        case 'j': case 'I': return affirmBigIntArray() && BigInt;
         case 'p': case 'P': case 's':
           switch(ptrSizeof){
               case 4: return Number;
@@ -361,7 +361,7 @@ self.Jaccwabyt = function StructBinderFactory(config){
      framework's native format or in Emscripten format.
   */
   const __memberSignature = function f(obj,memberName,emscriptenFormat=false){
-    if(!f._) f._ = (x)=>x.replace(/[^vipPsjrd]/g,'').replace(/[pPs]/g,'i');
+    if(!f._) f._ = (x)=>x.replace(/[^viIpPsjrd]/g,'').replace(/[pPs]/g,'i');
     const m = __lookupMember(obj.structInfo, memberName, true);
     return emscriptenFormat ? f._(m.signature) : m.signature;
   };
@@ -571,7 +571,7 @@ self.Jaccwabyt = function StructBinderFactory(config){
         direct reuse in each accessor function. */
       f._ = {getters: {}, setters: {}, sw:{}};
       const a = ['i','p','P','s','f','d','v()'];
-      if(bigIntEnabled) a.push('j');
+      if(bigIntEnabled) a.push('j','I');
       a.forEach(function(v){
         //const ir = sigIR(v);
         f._.getters[v] = sigDVGetter(v) /* DataView[MethodName] values for GETTERS */;
@@ -579,8 +579,8 @@ self.Jaccwabyt = function StructBinderFactory(config){
         f._.sw[v] = sigDVSetWrapper(v)  /* BigInt or Number ctor to wrap around values
                                            for conversion */;
       });
-      const rxSig1 = /^[ipPsjfd]$/,
-            rxSig2 = /^[vipPsjfd]\([ipPsjfd]*\)$/;
+      const rxSig1 = /^[iIpPsjfd]$/,
+            rxSig2 = /^[viIpPsjfd]\([iIpPsjfd]*\)$/;
       f.sigCheck = function(obj, name, key,sig){
         if(Object.prototype.hasOwnProperty.call(obj, key)){
           toss(obj.structName,'already has a property named',key+'.');
diff --git a/ext/wasm/jaccwabyt/jaccwabyt.md b/ext/wasm/jaccwabyt/jaccwabyt.md
index edcba260a7..023d7973b2 100644
--- a/ext/wasm/jaccwabyt/jaccwabyt.md
+++ b/ext/wasm/jaccwabyt/jaccwabyt.md
@@ -275,10 +275,10 @@ supported letters are:
 
 - **`v`** = `void` (only used as return type for function pointer members)
 - **`i`** = `int32` (4 bytes)
-- **`j`** = `int64` (8 bytes) is only really usable if this code is built
-  with BigInt support (e.g. using the Emscripten `-sWASM_BIGINT` build
-  flag). Without that, this API may throw when encountering the `j`
-  signature entry.
+- **`j`** or **`I`** = `int64` (8 bytes) is only really usable if this
+  code is built with BigInt support (e.g. using the Emscripten
+  `-sWASM_BIGINT` build flag). Without that, this API may throw when
+  encountering this signature entry.
 - **`f`** = `float` (4 bytes)
 - **`d`** = `double` (8 bytes)
 - **`p`** = `int32` (but see below!)
diff --git a/manifest b/manifest
index 2c0461c342..6a03f73bab 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C More\scleanups\sin\sthe\sUDF\sargument\sand\sresult\shandling,\sin\sparticular\sint64.\sConsolidate\ssome\sduplicate\sint64/bigint\srange\schecking\scode.\sExpose\sthe\sUDF\slow-level\sutilities\s(arg/result\sconversion)\sto\sclient\scode.\sAdd\sthe\ssqlite3_context\spointer\sto\sthe\sJS-side\sUDF\swrappers\sfor\sAPI\sconsistency.
-D 2022-10-02T22:50:04.828
+C Minor\sJS\sAPI\stweaks\sprompted\sby\sdocumenting\sthem.
+D 2022-10-03T08:21:06.951
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -485,19 +485,19 @@ F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba814
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
 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 b962bad752b62366651dae26c0b969d297f81e17879685025fb12130786509cb
+F ext/wasm/api/sqlite3-api-glue.js df974b8a8374ec5f0e25b6a891401f07804471008a1a655717bb86cf7fc899ff
 F ext/wasm/api/sqlite3-api-oo1.js 484f9ea5c7140d07745f4b534a1f6dd67120c65ef34abcf7cdb3a388d73f5ef4
 F ext/wasm/api/sqlite3-api-opfs.js 1b097808b7b081b0f0700cf97d49ef19760e401706168edff9cd45cf9169f541
-F ext/wasm/api/sqlite3-api-prologue.js bf270c17e759814decf57f6dd29fee9b5e44dd89a798a1ba9ba1e34d6f76ceaf
+F ext/wasm/api/sqlite3-api-prologue.js b827e2353799b54fffaa9577f51ebf08b8dedc58dcabe344c73be977235da227
 F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c 2a0f9e4bf1b141a787918951360601128d6a0a190a31a8e5cfe237c99fa640c6
+F ext/wasm/api/sqlite3-wasm.c 074c1c80b52bd808baf1228adc3336b3aeb2649579d041fc199ead747b5892aa
 F ext/wasm/batch-runner.html c363032aba7a525920f61f8be112a29459f73f07e46f0ba3b7730081a617826e
 F ext/wasm/batch-runner.js ce92650a6681586c89bef26ceae96674a55ca5a9727815202ca62e1a00ff5015
 F ext/wasm/common/SqliteTestUtil.js 647bf014bd30bdd870a7e9001e251d12fc1c9ec9ce176a1004b838a4b33c5c05
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 3a5143699c2b73a85b962271e1a9b3241b30d90e30d895e4f55665e648572962
-F ext/wasm/common/whwasmutil.js 427eb8b695bd5f38497601a6bda933e83d1a5900b75f5f1af8dbb381898d2ee4
+F ext/wasm/common/whwasmutil.js 0ea155094dc9b18ee97a37b7b26e0601fee4822f5f1d2f5853a57542b45598d9
 F ext/wasm/demo-123-worker.html e419b66495d209b5211ec64903b4cfb3ca7df20d652b41fcd28bf018a773234f
 F ext/wasm/demo-123.html aa281d33b7eefa755f3122b7b5a18f39a42dc5fb69c8879171bf14b4c37c4ec4
 F ext/wasm/demo-123.js 9fbc5cd3af842d361e9f8353ae4af9f471c2b2517e55446474406620485b9ee6
@@ -509,8 +509,8 @@ F ext/wasm/fiddle/fiddle-worker.js ebf6e95fe031738cd9f79d1ccdf6d80640a2884a43f70
 F ext/wasm/fiddle/fiddle.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
 F ext/wasm/fiddle/fiddle.js 974b995119ac443685d7d94d3b3c58c6a36540e9eb3fed7069d5653284071715
 F ext/wasm/index.html 63b370619e4f849ac76f1baed435c05edc29dbb6795bc7c1c935561ff667dd27
-F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
-F ext/wasm/jaccwabyt/jaccwabyt.md 9aa6951b529a8b29f578ec8f0355713c39584c92cf1708f63ba0cf917cb5b68e
+F ext/wasm/jaccwabyt/jaccwabyt.js db2c75f12426760eb921c281eef7fd139f23cd61d16d8638689ee162e90ef2f6
+F ext/wasm/jaccwabyt/jaccwabyt.md 48088122e9d23b1b385bb7bcf48a2d83f926b470d6928b6b3f9b41c2de94830c
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
 F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e568d2c2307c416902059339c06f19
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
@@ -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 d3bad9347c5423fa7f19ae729461636f1043c99a1f01f168efa10bebefb1cdd1
-R 46b070d886b6400d4ed82000c86b9d6e
+P 10ab77af952abf09f93f342a9d07a3b133f2c4c0a3588df3390cd3a923cafae4
+R 12182f4e06ca014e75dafbecebb22765
 U stephan
-Z fc77e81a038294d78aff4ec7221b0be3
+Z 53ad4d279050a64639e6682eb9a83efd
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index e633b1fc49..78e90e96de 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-10ab77af952abf09f93f342a9d07a3b133f2c4c0a3588df3390cd3a923cafae4
\ No newline at end of file
+a82e6faaa642b09d241232c4daa67134d4dfa24bf3ca3725740346ca5269b381
\ No newline at end of file

From bdfd7ea03a4764dcfaa091303c2b8bbf3fd323a0 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 3 Oct 2022 08:30:22 +0000
Subject: [PATCH 215/428] Partial revert of [a82e6faaa642] to remove the 'I'
 alias for 'j' wasm function signature letter. In hindsight, that change seems
 premature.

FossilOrigin-Name: dcd46af9141f4edf816010923941a76d0edd3f18cfe429c52f599ad2a0d52651
---
 ext/wasm/api/sqlite3-wasm.c     | 10 +++++-----
 ext/wasm/common/whwasmutil.js   |  4 ++--
 ext/wasm/jaccwabyt/jaccwabyt.js | 18 +++++++++---------
 ext/wasm/jaccwabyt/jaccwabyt.md |  8 ++++----
 manifest                        | 18 +++++++++---------
 manifest.uuid                   |  2 +-
 6 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index 59001379e6..b9454155d7 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -615,9 +615,9 @@ const char * sqlite3_wasm_enum_json(void){
     StructBinder {
       M(iVersion,"i");
       M(xClose,"i(p)");
-      M(xRead,"i(ppiI)");
-      M(xWrite,"i(ppiI)");
-      M(xTruncate,"i(pI)");
+      M(xRead,"i(ppij)");
+      M(xWrite,"i(ppij)");
+      M(xTruncate,"i(pj)");
       M(xSync,"i(pi)");
       M(xFileSize,"i(pp)");
       M(xLock,"i(pi)");
@@ -630,8 +630,8 @@ const char * sqlite3_wasm_enum_json(void){
       M(xShmLock,"i(piii)");
       M(xShmBarrier,"v(p)");
       M(xShmUnmap,"i(pi)");
-      M(xFetch,"i(pIip)");
-      M(xUnfetch,"i(pIp)");
+      M(xFetch,"i(pjip)");
+      M(xUnfetch,"i(pjp)");
     } _StructBinder;
 #undef CurrentStruct
 
diff --git a/ext/wasm/common/whwasmutil.js b/ext/wasm/common/whwasmutil.js
index b127595660..a0da492b08 100644
--- a/ext/wasm/common/whwasmutil.js
+++ b/ext/wasm/common/whwasmutil.js
@@ -389,7 +389,7 @@ self.WhWasmUtilInstaller = function(target){
 
      - `i` = int32
      - `p` = int32 ("pointer")
-     - `j` or `I` = int64
+     - `j` = int64
      - `f` = float32
      - `d` = float64
      - `v` = void, only legal for use as the result type
@@ -417,7 +417,7 @@ self.WhWasmUtilInstaller = function(target){
         // Map of signature letters to type IR values
         sigTypes: Object.assign(Object.create(null),{
           i: 'i32', p: 'i32', P: 'i32', s: 'i32',
-          j: 'i64', I: 'i64', f: 'f32', d: 'f64'
+          j: 'i64', f: 'f32', d: 'f64'
         }),
         // Map of type IR values to WASM type code values
         typeCodes: Object.assign(Object.create(null),{
diff --git a/ext/wasm/jaccwabyt/jaccwabyt.js b/ext/wasm/jaccwabyt/jaccwabyt.js
index ce0d8dd1f1..14c93b3a2e 100644
--- a/ext/wasm/jaccwabyt/jaccwabyt.js
+++ b/ext/wasm/jaccwabyt/jaccwabyt.js
@@ -123,7 +123,7 @@ self.Jaccwabyt = function StructBinderFactory(config){
     switch(sigLetter(s)){
         case 'i': return 'i32';
         case 'p': case 'P': case 's': return ptrIR;
-        case 'j': case 'I': return 'i64';
+        case 'j': return 'i64';
         case 'f': return 'float';
         case 'd': return 'double';
     }
@@ -135,7 +135,7 @@ self.Jaccwabyt = function StructBinderFactory(config){
     switch(sigLetter(s)){
         case 'i': return 4;
         case 'p': case 'P': case 's': return ptrSizeof;
-        case 'j': case 'I': return 8;
+        case 'j': return 8;
         case 'f': return 4 /* C-side floats, not JS-side */;
         case 'd': return 8;
     }
@@ -168,7 +168,7 @@ self.Jaccwabyt = function StructBinderFactory(config){
           break;
         }
         case 'i': return 'getInt32';
-        case 'j': case 'I': return affirmBigIntArray() && 'getBigInt64';
+        case 'j': return affirmBigIntArray() && 'getBigInt64';
         case 'f': return 'getFloat32';
         case 'd': return 'getFloat64';
     }
@@ -186,7 +186,7 @@ self.Jaccwabyt = function StructBinderFactory(config){
           break;
         }
         case 'i': return 'setInt32';
-        case 'j': case 'I': return affirmBigIntArray() && 'setBigInt64';
+        case 'j': return affirmBigIntArray() && 'setBigInt64';
         case 'f': return 'setFloat32';
         case 'd': return 'setFloat64';
     }
@@ -200,7 +200,7 @@ self.Jaccwabyt = function StructBinderFactory(config){
   const sigDVSetWrapper = function(s){
     switch(sigLetter(s)) {
         case 'i': case 'f': case 'd': return Number;
-        case 'j': case 'I': return affirmBigIntArray() && BigInt;
+        case 'j': return affirmBigIntArray() && BigInt;
         case 'p': case 'P': case 's':
           switch(ptrSizeof){
               case 4: return Number;
@@ -361,7 +361,7 @@ self.Jaccwabyt = function StructBinderFactory(config){
      framework's native format or in Emscripten format.
   */
   const __memberSignature = function f(obj,memberName,emscriptenFormat=false){
-    if(!f._) f._ = (x)=>x.replace(/[^viIpPsjrd]/g,'').replace(/[pPs]/g,'i');
+    if(!f._) f._ = (x)=>x.replace(/[^vipPsjrd]/g,'').replace(/[pPs]/g,'i');
     const m = __lookupMember(obj.structInfo, memberName, true);
     return emscriptenFormat ? f._(m.signature) : m.signature;
   };
@@ -571,7 +571,7 @@ self.Jaccwabyt = function StructBinderFactory(config){
         direct reuse in each accessor function. */
       f._ = {getters: {}, setters: {}, sw:{}};
       const a = ['i','p','P','s','f','d','v()'];
-      if(bigIntEnabled) a.push('j','I');
+      if(bigIntEnabled) a.push('j');
       a.forEach(function(v){
         //const ir = sigIR(v);
         f._.getters[v] = sigDVGetter(v) /* DataView[MethodName] values for GETTERS */;
@@ -579,8 +579,8 @@ self.Jaccwabyt = function StructBinderFactory(config){
         f._.sw[v] = sigDVSetWrapper(v)  /* BigInt or Number ctor to wrap around values
                                            for conversion */;
       });
-      const rxSig1 = /^[iIpPsjfd]$/,
-            rxSig2 = /^[viIpPsjfd]\([iIpPsjfd]*\)$/;
+      const rxSig1 = /^[ipPsjfd]$/,
+            rxSig2 = /^[vipPsjfd]\([ipPsjfd]*\)$/;
       f.sigCheck = function(obj, name, key,sig){
         if(Object.prototype.hasOwnProperty.call(obj, key)){
           toss(obj.structName,'already has a property named',key+'.');
diff --git a/ext/wasm/jaccwabyt/jaccwabyt.md b/ext/wasm/jaccwabyt/jaccwabyt.md
index 023d7973b2..edcba260a7 100644
--- a/ext/wasm/jaccwabyt/jaccwabyt.md
+++ b/ext/wasm/jaccwabyt/jaccwabyt.md
@@ -275,10 +275,10 @@ supported letters are:
 
 - **`v`** = `void` (only used as return type for function pointer members)
 - **`i`** = `int32` (4 bytes)
-- **`j`** or **`I`** = `int64` (8 bytes) is only really usable if this
-  code is built with BigInt support (e.g. using the Emscripten
-  `-sWASM_BIGINT` build flag). Without that, this API may throw when
-  encountering this signature entry.
+- **`j`** = `int64` (8 bytes) is only really usable if this code is built
+  with BigInt support (e.g. using the Emscripten `-sWASM_BIGINT` build
+  flag). Without that, this API may throw when encountering the `j`
+  signature entry.
 - **`f`** = `float` (4 bytes)
 - **`d`** = `double` (8 bytes)
 - **`p`** = `int32` (but see below!)
diff --git a/manifest b/manifest
index 6a03f73bab..5911be300e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\sJS\sAPI\stweaks\sprompted\sby\sdocumenting\sthem.
-D 2022-10-03T08:21:06.951
+C Partial\srevert\sof\s[a82e6faaa642]\sto\sremove\sthe\s'I'\salias\sfor\s'j'\swasm\sfunction\ssignature\sletter.\sIn\shindsight,\sthat\schange\sseems\spremature.
+D 2022-10-03T08:30:22.681
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -491,13 +491,13 @@ F ext/wasm/api/sqlite3-api-opfs.js 1b097808b7b081b0f0700cf97d49ef19760e401706168
 F ext/wasm/api/sqlite3-api-prologue.js b827e2353799b54fffaa9577f51ebf08b8dedc58dcabe344c73be977235da227
 F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c 074c1c80b52bd808baf1228adc3336b3aeb2649579d041fc199ead747b5892aa
+F ext/wasm/api/sqlite3-wasm.c 2a0f9e4bf1b141a787918951360601128d6a0a190a31a8e5cfe237c99fa640c6
 F ext/wasm/batch-runner.html c363032aba7a525920f61f8be112a29459f73f07e46f0ba3b7730081a617826e
 F ext/wasm/batch-runner.js ce92650a6681586c89bef26ceae96674a55ca5a9727815202ca62e1a00ff5015
 F ext/wasm/common/SqliteTestUtil.js 647bf014bd30bdd870a7e9001e251d12fc1c9ec9ce176a1004b838a4b33c5c05
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 3a5143699c2b73a85b962271e1a9b3241b30d90e30d895e4f55665e648572962
-F ext/wasm/common/whwasmutil.js 0ea155094dc9b18ee97a37b7b26e0601fee4822f5f1d2f5853a57542b45598d9
+F ext/wasm/common/whwasmutil.js 8a0557f2b8b0e2c2671072e9d8869c1591db59995de81eb8eca47d6c5d8457d9
 F ext/wasm/demo-123-worker.html e419b66495d209b5211ec64903b4cfb3ca7df20d652b41fcd28bf018a773234f
 F ext/wasm/demo-123.html aa281d33b7eefa755f3122b7b5a18f39a42dc5fb69c8879171bf14b4c37c4ec4
 F ext/wasm/demo-123.js 9fbc5cd3af842d361e9f8353ae4af9f471c2b2517e55446474406620485b9ee6
@@ -509,8 +509,8 @@ F ext/wasm/fiddle/fiddle-worker.js ebf6e95fe031738cd9f79d1ccdf6d80640a2884a43f70
 F ext/wasm/fiddle/fiddle.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
 F ext/wasm/fiddle/fiddle.js 974b995119ac443685d7d94d3b3c58c6a36540e9eb3fed7069d5653284071715
 F ext/wasm/index.html 63b370619e4f849ac76f1baed435c05edc29dbb6795bc7c1c935561ff667dd27
-F ext/wasm/jaccwabyt/jaccwabyt.js db2c75f12426760eb921c281eef7fd139f23cd61d16d8638689ee162e90ef2f6
-F ext/wasm/jaccwabyt/jaccwabyt.md 48088122e9d23b1b385bb7bcf48a2d83f926b470d6928b6b3f9b41c2de94830c
+F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
+F ext/wasm/jaccwabyt/jaccwabyt.md 9aa6951b529a8b29f578ec8f0355713c39584c92cf1708f63ba0cf917cb5b68e
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
 F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e568d2c2307c416902059339c06f19
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
@@ -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 10ab77af952abf09f93f342a9d07a3b133f2c4c0a3588df3390cd3a923cafae4
-R 12182f4e06ca014e75dafbecebb22765
+P a82e6faaa642b09d241232c4daa67134d4dfa24bf3ca3725740346ca5269b381
+R 1cdb3ca834e236e54389a61ca1f0d059
 U stephan
-Z 53ad4d279050a64639e6682eb9a83efd
+Z ee5810e1e70af12e58974dd2bc072e0d
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 78e90e96de..14f055aaae 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a82e6faaa642b09d241232c4daa67134d4dfa24bf3ca3725740346ca5269b381
\ No newline at end of file
+dcd46af9141f4edf816010923941a76d0edd3f18cfe429c52f599ad2a0d52651
\ No newline at end of file

From 7ff8da876d147f8bc15814bc172e78c43a5afb8f Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 3 Oct 2022 09:21:37 +0000
Subject: [PATCH 216/428] OPFS VFS now lazily opens its sync access handle, as
 a step towards experimenting with relinquishing it during idle times to help
 avoid cross-tab and page-reload locking issues.

FossilOrigin-Name: a984e1ba435731413a541f86c50232bc7d6e33aff6ba4cca90f89188e7b82a2c
---
 ext/wasm/api/sqlite3-api-glue.js     | 56 ++++++++++++----------------
 ext/wasm/common/whwasmutil.js        | 10 ++---
 ext/wasm/sqlite3-opfs-async-proxy.js | 48 +++++++++++++++++-------
 manifest                             | 16 ++++----
 manifest.uuid                        |  2 +-
 5 files changed, 72 insertions(+), 60 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index bbd5b446f0..e31618d5eb 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -24,27 +24,32 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
   self.WhWasmUtilInstaller(capi.wasm);
   delete self.WhWasmUtilInstaller;
 
+  /**
+     Install JS<->C struct bindings for the non-opaque struct types we
+     need... */
+  sqlite3.StructBinder = self.Jaccwabyt({
+    heap: 0 ? wasm.memory : wasm.heap8u,
+    alloc: wasm.alloc,
+    dealloc: wasm.dealloc,
+    functionTable: wasm.functionTable,
+    bigIntEnabled: wasm.bigIntEnabled,
+    memberPrefix: '$'
+  });
+  delete self.Jaccwabyt;
+
   if(0){
-    /*  "The problem" is that the following isn't type-safe.
-        OTOH, nothing about WASM pointers is. */
-    /**
-       Add the `.pointer` xWrap() signature entry to extend the
-       `pointer` arg handler to check for a `pointer` property. This
-       can be used to permit, e.g., passing an sqlite3.oo1.DB instance
-       to a C-style sqlite3_xxx function which takes an `sqlite3*`
-       argument.
-    */
-    const xPointer = wasm.xWrap.argAdapter('pointer');
-    const adapter = function(v){
-      if(v && v.constructor){
-        const x = v.pointer;
-        if(Number.isInteger(x)) return x;
-        else toss("Invalid (object) type for .pointer-type argument.");
+    /*  "The problem" is that the following isn't even remotely
+        type-safe. OTOH, nothing about WASM pointers is. */
+    const argPointer = wasm.xWrap.argAdapter('*');
+    wasm.xWrap.argAdapter('StructType', (v)=>{
+      if(v && v.constructor && v instanceof StructBinder.StructType){
+        v = v.pointer;
       }
-      return xPointer(v);
-    };
-    wasm.xWrap.argAdapter('.pointer', adapter);
-  } /* ".pointer" xWrap() argument adapter */
+      return (v === (v | 0) /* v is a 32-bit integer */)
+        ? argPointer(v)
+        : toss("Invalid (object) type for StructType-type argument.");
+    });
+  }
 
   if(1){/* Convert Arrays and certain TypedArrays to strings for
            'flexible-string'-type arguments */
@@ -605,19 +610,6 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     };
   }/*wasm.pstack filler*/
 
-  /**
-     Install JS<->C struct bindings for the non-opaque struct types we
-     need... */
-  sqlite3.StructBinder = self.Jaccwabyt({
-    heap: 0 ? wasm.memory : wasm.heap8u,
-    alloc: wasm.alloc,
-    dealloc: wasm.dealloc,
-    functionTable: wasm.functionTable,
-    bigIntEnabled: wasm.bigIntEnabled,
-    memberPrefix: '$'
-  });
-  delete self.Jaccwabyt;
-
   {/* Import C-level constants and structs... */
     const cJson = wasm.xCall('sqlite3_wasm_enum_json');
     if(!cJson){
diff --git a/ext/wasm/common/whwasmutil.js b/ext/wasm/common/whwasmutil.js
index a0da492b08..c98b7cea4d 100644
--- a/ext/wasm/common/whwasmutil.js
+++ b/ext/wasm/common/whwasmutil.js
@@ -371,16 +371,16 @@ self.WhWasmUtilInstaller = function(target){
   /**
      Creates a WASM function which wraps the given JS function and
      returns the JS binding of that WASM function. The signature
-     argument must be the Jaccwabyt-format or Emscripten
+     string must be the Jaccwabyt-format or Emscripten
      addFunction()-format function signature string. In short: in may
      have one of the following formats:
 
-     - Emscripten: `x...`, where the first x is a letter representing
+     - Emscripten: `"x..."`, where the first x is a letter representing
        the result type and subsequent letters represent the argument
        types. Functions with no arguments have only a single
        letter. See below.
 
-     - Jaccwabyt: `x(...)` where `x` is the letter representing the
+     - Jaccwabyt: `"x(...)"` where `x` is the letter representing the
        result type and letters in the parens (if any) represent the
        argument types. Functions with no arguments use `x()`. See
        below.
@@ -451,9 +451,9 @@ self.WhWasmUtilInstaller = function(target){
                   // is not yet documented on MDN. 
         sigToWasm: function(sig){
           const rc = {parameters:[], results: []};
-          if('v'!==sig[0]) rc.results.push(f._.letterType(sig[0]));
+          if('v'!==sig[0]) rc.results.push(f.sigTypes(sig[0]));
           for(const x of f._.sigParams(sig)){
-            rc.parameters.push(f._.letterType(x));
+            rc.parameters.push(f._.typeCodes(x));
           }
           return rc;
         },************/
diff --git a/ext/wasm/sqlite3-opfs-async-proxy.js b/ext/wasm/sqlite3-opfs-async-proxy.js
index 025cd97a4e..b19568d637 100644
--- a/ext/wasm/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/sqlite3-opfs-async-proxy.js
@@ -25,6 +25,13 @@
   access to the sqlite3 JS/WASM bits, so any bits which it needs (most
   notably SQLITE_xxx integer codes) have to be imported into it via an
   initialization process.
+
+  Potential TODOs:
+
+  - When idle for "a long time", close the sync access handle in order
+  to release the lock, then re-open it on demand. Similarly, delay
+  fetching of the sync access handle until we need it. The intent
+  would be to help multi-tab access to a db avoid locking issues.
 */
 'use strict';
 const toss = function(...args){throw new Error(args.join(' '))};
@@ -132,6 +139,17 @@ const getDirForFilename = async function f(absFilename, createDirs = false){
   return [dh, filename];
 };
 
+/**
+   Returns the sync access handle associated with the given file
+   handle object (which must be a valid handle object), lazily opening
+   it if needed.
+*/
+const getSyncHandle = async (f)=>(
+  f.accessHandle || (
+    f.accessHandle =
+      await f.fileHandle.createSyncAccessHandle()
+  )
+);
 
 /**
    Stores the given value at state.sabOPView[state.opIds.rc] and then
@@ -294,7 +312,7 @@ const vfsAsyncImpls = {
     let sz;
     wTimeStart('xFileSize');
     try{
-      sz = await fh.accessHandle.getSize();
+      sz = await (await getSyncHandle(fh)).getSize();
       state.s11n.serialize(Number(sz));
       sz = 0;
     }catch(e){
@@ -322,23 +340,24 @@ const vfsAsyncImpls = {
         return;
       }
       const hFile = await hDir.getFileHandle(filenamePart, {create});
-      const fobj = Object.create(null);
       /**
          wa-sqlite, at this point, grabs a SyncAccessHandle and
          assigns it to the accessHandle prop of the file state
          object, but only for certain cases and it's unclear why it
          places that limitation on it.
       */
-      fobj.accessHandle = await hFile.createSyncAccessHandle();
       wTimeEnd();
+      const fobj = Object.assign(Object.create(null),{
+        filenameAbs: filename,
+        filenamePart: filenamePart,
+        dirHandle: hDir,
+        fileHandle: hFile,
+        sabView: state.sabFileBufView,
+        readOnly: create
+          ? false : (state.sq3Codes.SQLITE_OPEN_READONLY & flags),
+        deleteOnClose: deleteOnClose
+      });
       __openFiles[fid] = fobj;
-      fobj.filenameAbs = filename;
-      fobj.filenamePart = filenamePart;
-      fobj.dirHandle = hDir;
-      fobj.fileHandle = hFile;
-      fobj.sabView = state.sabFileBufView;
-      fobj.readOnly = create ? false : (state.sq3Codes.SQLITE_OPEN_READONLY & flags);
-      fobj.deleteOnClose = deleteOnClose;
       storeAndNotify(opName, 0);
     }catch(e){
       wTimeEnd();
@@ -354,7 +373,7 @@ const vfsAsyncImpls = {
     try{
       const fh = __openFiles[fid];
       wTimeStart('xRead');
-      const nRead = fh.accessHandle.read(
+      const nRead = (await getSyncHandle(fh)).read(
         fh.sabView.subarray(0, n),
         {at: Number(offset)}
       );
@@ -395,7 +414,7 @@ const vfsAsyncImpls = {
     wTimeStart('xTruncate');
     try{
       affirmNotRO('xTruncate', fh);
-      await fh.accessHandle.truncate(size);
+      await (await getSyncHandle(fh)).truncate(size);
     }catch(e){
       error("xTruncate():",e,fh);
       state.s11n.storeException(2,e);
@@ -413,8 +432,9 @@ const vfsAsyncImpls = {
       const fh = __openFiles[fid];
       affirmNotRO('xWrite', fh);
       rc = (
-        n === fh.accessHandle.write(fh.sabView.subarray(0, n),
-                                    {at: Number(offset)})
+        n === (await getSyncHandle(fh))
+          .write(fh.sabView.subarray(0, n),
+                 {at: Number(offset)})
       ) ? 0 : state.sq3Codes.SQLITE_IOERR_WRITE;
     }catch(e){
       error("xWrite():",e,fh);
diff --git a/manifest b/manifest
index 5911be300e..636679809f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Partial\srevert\sof\s[a82e6faaa642]\sto\sremove\sthe\s'I'\salias\sfor\s'j'\swasm\sfunction\ssignature\sletter.\sIn\shindsight,\sthat\schange\sseems\spremature.
-D 2022-10-03T08:30:22.681
+C OPFS\sVFS\snow\slazily\sopens\sits\ssync\saccess\shandle,\sas\sa\sstep\stowards\sexperimenting\swith\srelinquishing\sit\sduring\sidle\stimes\sto\shelp\savoid\scross-tab\sand\spage-reload\slocking\sissues.
+D 2022-10-03T09:21:37.209
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -485,7 +485,7 @@ F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba814
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
 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 df974b8a8374ec5f0e25b6a891401f07804471008a1a655717bb86cf7fc899ff
+F ext/wasm/api/sqlite3-api-glue.js 5391338550ef9fafb3a7a6d060b8c19a190c47c01fa14e032c6e30dd96742c02
 F ext/wasm/api/sqlite3-api-oo1.js 484f9ea5c7140d07745f4b534a1f6dd67120c65ef34abcf7cdb3a388d73f5ef4
 F ext/wasm/api/sqlite3-api-opfs.js 1b097808b7b081b0f0700cf97d49ef19760e401706168edff9cd45cf9169f541
 F ext/wasm/api/sqlite3-api-prologue.js b827e2353799b54fffaa9577f51ebf08b8dedc58dcabe344c73be977235da227
@@ -497,7 +497,7 @@ F ext/wasm/batch-runner.js ce92650a6681586c89bef26ceae96674a55ca5a9727815202ca62
 F ext/wasm/common/SqliteTestUtil.js 647bf014bd30bdd870a7e9001e251d12fc1c9ec9ce176a1004b838a4b33c5c05
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 3a5143699c2b73a85b962271e1a9b3241b30d90e30d895e4f55665e648572962
-F ext/wasm/common/whwasmutil.js 8a0557f2b8b0e2c2671072e9d8869c1591db59995de81eb8eca47d6c5d8457d9
+F ext/wasm/common/whwasmutil.js bc8522a071f4754af7b50f53807b95f691d2f9e44fc3b3e8c65dff6ef2485c0d
 F ext/wasm/demo-123-worker.html e419b66495d209b5211ec64903b4cfb3ca7df20d652b41fcd28bf018a773234f
 F ext/wasm/demo-123.html aa281d33b7eefa755f3122b7b5a18f39a42dc5fb69c8879171bf14b4c37c4ec4
 F ext/wasm/demo-123.js 9fbc5cd3af842d361e9f8353ae4af9f471c2b2517e55446474406620485b9ee6
@@ -522,7 +522,7 @@ F ext/wasm/speedtest1.html e4cb5d722b494104fc1249e7c008ca018f820a784833c51004c95
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
-F ext/wasm/sqlite3-opfs-async-proxy.js 7367733ce409c8106b6c49e8ef2b55440e9974a64f39e0c97f5e3a4587d1fc2a
+F ext/wasm/sqlite3-opfs-async-proxy.js 4894fc7767d3ac3cd4b9e377585ad0f07f0fc7da7cf47b8fd302454082908715
 F ext/wasm/sqlite3-worker1-promiser.js 307d7837420ca6a9d3780dfc81194f1c0715637e6d9540e935514086b96913d8
 F ext/wasm/sqlite3-worker1.js 466e9bd39409ab03f3e00999887aaffc11e95b416e2689596e3d7f1516673fdf
 F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
@@ -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 a82e6faaa642b09d241232c4daa67134d4dfa24bf3ca3725740346ca5269b381
-R 1cdb3ca834e236e54389a61ca1f0d059
+P dcd46af9141f4edf816010923941a76d0edd3f18cfe429c52f599ad2a0d52651
+R 3c3f3eb77f5b518716e3c0c05a085b7f
 U stephan
-Z ee5810e1e70af12e58974dd2bc072e0d
+Z f31e491aa10bb32231c16589c3c07643
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 14f055aaae..f589fca814 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dcd46af9141f4edf816010923941a76d0edd3f18cfe429c52f599ad2a0d52651
\ No newline at end of file
+a984e1ba435731413a541f86c50232bc7d6e33aff6ba4cca90f89188e7b82a2c
\ No newline at end of file

From 33ded6edaf990270b484605f859797ce5583d54c Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 3 Oct 2022 11:23:47 +0000
Subject: [PATCH 217/428] Add journal=MODE to the list of supported URL flags
 for speedtest1-worker.html.

FossilOrigin-Name: 5c43e8d2ec23f28fdce63874d9d4c8ccbb4a8f81030b19d65ff5711a7c32697e
---
 ext/wasm/speedtest1-worker.html |  4 ++--
 manifest                        | 12 ++++++------
 manifest.uuid                   |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ext/wasm/speedtest1-worker.html b/ext/wasm/speedtest1-worker.html
index b5e1089b68..87c504f4bb 100644
--- a/ext/wasm/speedtest1-worker.html
+++ b/ext/wasm/speedtest1-worker.html
@@ -31,7 +31,7 @@
         <div id='toolbar-select'>
           <select id='select-flags' size='10' multiple></select>
           <div>The following flags can be passed as URL parameters:
-            vfs=NAME, size=N
+            vfs=NAME, size=N, journal=MODE
           </div>
         </div>
         <div class='toolbar-inner-vertical'>
@@ -183,7 +183,7 @@
     const getSelectedFlags = ()=>{
         const f = Array.prototype.map.call(eFlags.selectedOptions, (v)=>v.value);
         [
-            'size', 'vfs'
+            'size', 'vfs', 'journal'
         ].forEach(function(k){
             if(urlParams.has(k)) f.push('--'+k, urlParams.get(k));
         });
diff --git a/manifest b/manifest
index 636679809f..55695edc1f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C OPFS\sVFS\snow\slazily\sopens\sits\ssync\saccess\shandle,\sas\sa\sstep\stowards\sexperimenting\swith\srelinquishing\sit\sduring\sidle\stimes\sto\shelp\savoid\scross-tab\sand\spage-reload\slocking\sissues.
-D 2022-10-03T09:21:37.209
+C Add\sjournal=MODE\sto\sthe\slist\sof\ssupported\sURL\sflags\sfor\sspeedtest1-worker.html.
+D 2022-10-03T11:23:47.443
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -516,7 +516,7 @@ F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e5
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
 F ext/wasm/scratchpad-wasmfs-main.js 1aa32c1035cf1440a226a28fefcbb5762fbbcb020ccbe5895f8736d701695c63
 F ext/wasm/speedtest1-wasmfs.html bc28eb29b69a73864b8d7aae428448f8b7e1de81d8bfb9bba99541322054dbd0
-F ext/wasm/speedtest1-worker.html 3780a29a6d0467dde34b61bf50a1b2e1a12a4e8498f4835b1293e79a3edcd675
+F ext/wasm/speedtest1-worker.html 59538e3b9456320322e4280bd993d0a35a074795c30465ed60d1e1532a620015
 F ext/wasm/speedtest1-worker.js a9e3d052dd1d8016d6e9a641e596e6d99aec04ef8995d7ee9a85a9964eed771a
 F ext/wasm/speedtest1.html e4cb5d722b494104fc1249e7c008ca018f820a784833c51004c958c71038c80f
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
@@ -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 dcd46af9141f4edf816010923941a76d0edd3f18cfe429c52f599ad2a0d52651
-R 3c3f3eb77f5b518716e3c0c05a085b7f
+P a984e1ba435731413a541f86c50232bc7d6e33aff6ba4cca90f89188e7b82a2c
+R 21cc3050e6217e8423f4278520aeac9f
 U stephan
-Z f31e491aa10bb32231c16589c3c07643
+Z c1aed4bb1f5e7222d859541f8a82e5f6
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f589fca814..9162ec001c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a984e1ba435731413a541f86c50232bc7d6e33aff6ba4cca90f89188e7b82a2c
\ No newline at end of file
+5c43e8d2ec23f28fdce63874d9d4c8ccbb4a8f81030b19d65ff5711a7c32697e
\ No newline at end of file

From 5f0b67cb7a032861ff30a1ce570603a7eb57c0dc Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 3 Oct 2022 11:33:35 +0000
Subject: [PATCH 218/428] Experimentally relinquish the OPFS VFS sync access
 handle when the db is idle and reacquire it on demand, the goal being to help
 alleviate cross-tab locking issues.

FossilOrigin-Name: 2703ac9842335962e488e597168d70b1389b95a6ad39edf70a211b95979b4708
---
 ext/wasm/sqlite3-opfs-async-proxy.js | 86 ++++++++++++++++++++++------
 ext/wasm/test-opfs-vfs.js            | 22 +++----
 manifest                             | 14 ++---
 manifest.uuid                        |  2 +-
 4 files changed, 87 insertions(+), 37 deletions(-)

diff --git a/ext/wasm/sqlite3-opfs-async-proxy.js b/ext/wasm/sqlite3-opfs-async-proxy.js
index b19568d637..b951873ea5 100644
--- a/ext/wasm/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/sqlite3-opfs-async-proxy.js
@@ -142,14 +142,28 @@ const getDirForFilename = async function f(absFilename, createDirs = false){
 /**
    Returns the sync access handle associated with the given file
    handle object (which must be a valid handle object), lazily opening
-   it if needed.
+   it if needed. Timestamps the handle for use in relinquishing it
+   during idle time.
 */
-const getSyncHandle = async (f)=>(
-  f.accessHandle || (
-    f.accessHandle =
-      await f.fileHandle.createSyncAccessHandle()
-  )
-);
+const getSyncHandle = async (fh)=>{
+  if(!fh.syncHandle){
+    //const t = performance.now();
+    //warn("Creating sync handle for",fh.filenameAbs);
+    fh.syncHandle = await fh.fileHandle.createSyncAccessHandle();
+    //warn("Got sync handle for",fh.filenameAbs,'in',performance.now() - t,'ms');
+  }
+  fh.syncHandleTime = performance.now();
+  return fh.syncHandle;
+};
+
+const closeSyncHandle = async (fh)=>{
+  if(fh.syncHandle){
+    //warn("Closing sync handle for",fh.filenameAbs);
+    const h = fh.syncHandle;
+    delete fh.syncHandle;
+    return h.close();
+  }
+};
 
 /**
    Stores the given value at state.sabOPView[state.opIds.rc] and then
@@ -255,7 +269,7 @@ const vfsAsyncImpls = {
     wTimeStart('xClose');
     if(fh){
       delete __openFiles[fid];
-      if(fh.accessHandle) await fh.accessHandle.close();
+      await closeSyncHandle(fh);
       if(fh.deleteOnClose){
         try{ await fh.dirHandle.removeEntry(fh.filenamePart) }
         catch(e){ warn("Ignoring dirHandle.removeEntry() failure of",fh,e) }
@@ -342,12 +356,12 @@ const vfsAsyncImpls = {
       const hFile = await hDir.getFileHandle(filenamePart, {create});
       /**
          wa-sqlite, at this point, grabs a SyncAccessHandle and
-         assigns it to the accessHandle prop of the file state
+         assigns it to the syncHandle prop of the file state
          object, but only for certain cases and it's unclear why it
          places that limitation on it.
       */
       wTimeEnd();
-      const fobj = Object.assign(Object.create(null),{
+      __openFiles[fid] = Object.assign(Object.create(null),{
         filenameAbs: filename,
         filenamePart: filenamePart,
         dirHandle: hDir,
@@ -357,7 +371,6 @@ const vfsAsyncImpls = {
           ? false : (state.sq3Codes.SQLITE_OPEN_READONLY & flags),
         deleteOnClose: deleteOnClose
       });
-      __openFiles[fid] = fobj;
       storeAndNotify(opName, 0);
     }catch(e){
       wTimeEnd();
@@ -370,8 +383,8 @@ const vfsAsyncImpls = {
   xRead: async function(fid,n,offset){
     mTimeStart('xRead');
     let rc = 0;
+    const fh = __openFiles[fid];
     try{
-      const fh = __openFiles[fid];
       wTimeStart('xRead');
       const nRead = (await getSyncHandle(fh)).read(
         fh.sabView.subarray(0, n),
@@ -394,10 +407,10 @@ const vfsAsyncImpls = {
     mTimeStart('xSync');
     const fh = __openFiles[fid];
     let rc = 0;
-    if(!fh.readOnly && fh.accessHandle){
+    if(!fh.readOnly && fh.syncHandle){
       try {
         wTimeStart('xSync');
-        await fh.accessHandle.flush();
+        await fh.syncHandle.flush();
       }catch(e){
         state.s11n.storeException(2,e);
       }finally{
@@ -563,23 +576,58 @@ const waitLoop = async function f(){
     o.key = k;
     o.f = vi || toss("No vfsAsyncImpls[",k,"]");
   }
+  /**
+     waitTime is how long (ms) to wait for each Atomics.wait().
+     We need to wait up periodically to give the thread a chance
+     to do other things.
+  */
+  const waitTime = 250;
+  /**
+     relinquishTime defines the_approximate_ number of ms
+     after which a db sync access handle will be relinquished
+     so that we do not hold a persistent lock on it. When the following loop
+     times out while waiting, every (approximate) increment of this
+     value it will relinquish any db handles which have been idle for
+     at least this much time.
+
+     Reaquisition of a sync handle seems to take an average of
+     0.6-0.9ms on this dev machine but takes anywhere from 1-3ms
+     every once in a while (maybe 1 time in 5 or 10).
+  */
+  const relinquishTime = 1000;
+  let lastOpTime = performance.now();
+  let now;
   while(true){
     try {
-      if('timed-out'===Atomics.wait(state.sabOPView, state.opIds.whichOp, 0, 500)){
+      if('timed-out'===Atomics.wait(
+        state.sabOPView, state.opIds.whichOp, 0, waitTime
+      )){
+        if(relinquishTime &&
+           (lastOpTime + relinquishTime <= (now = performance.now()))){
+          for(const fh of Object.values(__openFiles)){
+            if(fh.syncHandle && (
+              now - relinquishTime >= fh.syncHandleTime
+            )){
+              //warn("Relinquishing for timeout:",fh.filenameAbs);
+              closeSyncHandle(fh)/*async!*/;
+            }
+          }
+        }
         continue;
       }
+      lastOpTime = performance.now();
       const opId = Atomics.load(state.sabOPView, state.opIds.whichOp);
       Atomics.store(state.sabOPView, state.opIds.whichOp, 0);
       const hnd = opHandlers[opId] ?? toss("No waitLoop handler for whichOp #",opId);
       const args = state.s11n.deserialize() || [];
-      state.s11n.serialize()/* clear s11n to keep the caller from
-                               confusing this with an exception string
-                               written by the upcoming operation */;
+      state.s11n.serialize(/* clear s11n to keep the caller from
+                              confusing this with an exception string
+                              written by the upcoming operation */);
       //warn("waitLoop() whichOp =",opId, hnd, args);
       if(hnd.f) await hnd.f(...args);
       else error("Missing callback for opId",opId);
     }catch(e){
-      error('in waitLoop():',e.message);
+      error('in waitLoop():',e);
     }
   };
 };
diff --git a/ext/wasm/test-opfs-vfs.js b/ext/wasm/test-opfs-vfs.js
index 78f86e380f..755b73a97c 100644
--- a/ext/wasm/test-opfs-vfs.js
+++ b/ext/wasm/test-opfs-vfs.js
@@ -11,18 +11,9 @@
   ***********************************************************************
 
   A testing ground for the OPFS VFS.
-
-  Summary of how this works:
-
-  This file uses the sqlite3.StructBinder-created struct wrappers for
-  sqlite3_vfs, sqlite3_io_methods, ans sqlite3_file to set up a
-  conventional sqlite3_vfs (except that it's implemented in JS). The
-  methods which require OPFS APIs use a separate worker (hereafter called the
-  OPFS worker) to access that functionality. This worker and that one
-  use SharedArrayBuffer.
 */
 'use strict';
-const tryOpfsVfs = function(sqlite3){
+const tryOpfsVfs = async function(sqlite3){
   const toss = function(...args){throw new Error(args.join(' '))};
   const logPrefix = "OPFS tester:";
   const log = (...args)=>console.log(logPrefix,...args);
@@ -40,17 +31,27 @@ const tryOpfsVfs = function(sqlite3){
   const oVfs = capi.sqlite3_vfs.instanceForPointer(pVfs) || toss("Unexpected instanceForPointer() result.");;
   log("OPFS VFS:",pVfs, oVfs);
 
+  const wait = async (ms)=>{
+    return new Promise((resolve)=>setTimeout(resolve, ms));
+  };
+  const waitForRelinquish = async ()=>{
+    log("Waiting briefly to test sync handle relinquishing...");
+    return wait(1500);
+  };
+
   const urlArgs = new URL(self.location.href).searchParams;
   const dbFile = "my-persistent.db";
   if(urlArgs.has('delete')) sqlite3.opfs.deleteEntry(dbFile);
 
   const db = new opfs.OpfsDb(dbFile);
   log("db file:",db.filename);
+  await waitForRelinquish();
   try{
     if(opfs.entryExists(dbFile)){
       let n = db.selectValue("select count(*) from sqlite_schema");
       log("Persistent data found. sqlite_schema entry count =",n);
     }
+    await waitForRelinquish();
     db.transaction((db)=>{
       db.exec({
         sql:[
@@ -62,6 +63,7 @@ const tryOpfsVfs = function(sqlite3){
                (performance.now() |0) / 4]
       });
     });
+    await waitForRelinquish();
     log("count(*) from t =",db.selectValue("select count(*) from t"));
 
     // Some sanity checks of the opfs utility functions...
diff --git a/manifest b/manifest
index 55695edc1f..1e61d92d7e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sjournal=MODE\sto\sthe\slist\sof\ssupported\sURL\sflags\sfor\sspeedtest1-worker.html.
-D 2022-10-03T11:23:47.443
+C Experimentally\srelinquish\sthe\sOPFS\sVFS\ssync\saccess\shandle\swhen\sthe\sdb\sis\sidle\sand\sreacquire\sit\son\sdemand,\sthe\sgoal\sbeing\sto\shelp\salleviate\scross-tab\slocking\sissues.
+D 2022-10-03T11:33:35.536
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -522,11 +522,11 @@ F ext/wasm/speedtest1.html e4cb5d722b494104fc1249e7c008ca018f820a784833c51004c95
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
-F ext/wasm/sqlite3-opfs-async-proxy.js 4894fc7767d3ac3cd4b9e377585ad0f07f0fc7da7cf47b8fd302454082908715
+F ext/wasm/sqlite3-opfs-async-proxy.js d571a40230f54b99863f469e050cc4d4317e90239e64026d8d574689956ff76c
 F ext/wasm/sqlite3-worker1-promiser.js 307d7837420ca6a9d3780dfc81194f1c0715637e6d9540e935514086b96913d8
 F ext/wasm/sqlite3-worker1.js 466e9bd39409ab03f3e00999887aaffc11e95b416e2689596e3d7f1516673fdf
 F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
-F ext/wasm/test-opfs-vfs.js a59ff9210b17d46b0c6fbf6a0ba60143c033327865f2e556e14f06280cef62ac
+F ext/wasm/test-opfs-vfs.js 623de926913fa8cb7bac170f105a0c397f1951aba52d9f54792aadce7892a3c2
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
 F ext/wasm/testing-worker1-promiser.js bd788e33c1807e0a6dda9c9a9d784bd3350ca49c9dd8ae2cc8719b506b6e013e
 F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d7669fb17fcae
@@ -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 a984e1ba435731413a541f86c50232bc7d6e33aff6ba4cca90f89188e7b82a2c
-R 21cc3050e6217e8423f4278520aeac9f
+P 5c43e8d2ec23f28fdce63874d9d4c8ccbb4a8f81030b19d65ff5711a7c32697e
+R 1a27bfc63f0ef541783eed07221dd339
 U stephan
-Z c1aed4bb1f5e7222d859541f8a82e5f6
+Z 39513e5d3a3cf9877958a5d88a7ecd20
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 9162ec001c..4f33119d84 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5c43e8d2ec23f28fdce63874d9d4c8ccbb4a8f81030b19d65ff5711a7c32697e
\ No newline at end of file
+2703ac9842335962e488e597168d70b1389b95a6ad39edf70a211b95979b4708
\ No newline at end of file

From a4c357f94c8c5408c18e1f020a6267985c889254 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 3 Oct 2022 11:42:45 +0000
Subject: [PATCH 219/428] Reimplement fiddle_reset_db() so that it works with
 all VFSes.

FossilOrigin-Name: 18462052903bfeb037dd9af3a1fe1898d141eff5d6f527721858120553de808d
---
 ext/wasm/fiddle/fiddle-worker.js |  8 +-------
 manifest                         | 14 +++++++-------
 manifest.uuid                    |  2 +-
 src/shell.c.in                   | 23 ++++++-----------------
 4 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/ext/wasm/fiddle/fiddle-worker.js b/ext/wasm/fiddle/fiddle-worker.js
index ef2e3fcb5b..f78a4d3be1 100644
--- a/ext/wasm/fiddle/fiddle-worker.js
+++ b/ext/wasm/fiddle/fiddle-worker.js
@@ -208,14 +208,8 @@
       }
     },
     resetDb: function f(){
-      if(Sqlite3Shell.dbIsOpfs()){
-        /* The problem is that fiddle_reset_db() uses the POSIX APIs
-           for file removal, which cannot see OPFS-hosted files. */
-        stderr("TODO: cannot currently reset an OPFS-hosted db.");
-        return;
-      }
       if(!f._) f._ = sqlite3.capi.wasm.xWrap('fiddle_reset_db', null);
-      stdout("Resetting database.",fixmeOPFS);
+      stdout("Resetting database.");
       f._();
       stdout("Reset",this.dbFilename());
     },
diff --git a/manifest b/manifest
index 1e61d92d7e..11baf122fc 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Experimentally\srelinquish\sthe\sOPFS\sVFS\ssync\saccess\shandle\swhen\sthe\sdb\sis\sidle\sand\sreacquire\sit\son\sdemand,\sthe\sgoal\sbeing\sto\shelp\salleviate\scross-tab\slocking\sissues.
-D 2022-10-03T11:33:35.536
+C Reimplement\sfiddle_reset_db()\sso\sthat\sit\sworks\swith\sall\sVFSes.
+D 2022-10-03T11:42:45.345
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -505,7 +505,7 @@ F ext/wasm/demo-kvvfs1.html 7d4f28873de67f51ac18c584b7d920825139866a96049a49c424
 F ext/wasm/demo-kvvfs1.js 105596bd2ccd0b1deb5fde8e99b536e8242d4bb5932fac0c8403ff3a6bc547e8
 F ext/wasm/fiddle.make 3f4efd62bc2a9c883bfcea52ae2755114a62d444d6d042df287f4aef301d6c6c
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
-F ext/wasm/fiddle/fiddle-worker.js ebf6e95fe031738cd9f79d1ccdf6d80640a2884a43f7006a5e3459995f93069b
+F ext/wasm/fiddle/fiddle-worker.js 531859a471924a0ea48afa218e6877f0c164ca324d51e15843ed6ecc1c65c7ee
 F ext/wasm/fiddle/fiddle.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
 F ext/wasm/fiddle/fiddle.js 974b995119ac443685d7d94d3b3c58c6a36540e9eb3fed7069d5653284071715
 F ext/wasm/index.html 63b370619e4f849ac76f1baed435c05edc29dbb6795bc7c1c935561ff667dd27
@@ -618,7 +618,7 @@ F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c bb18acf4eded647fef88d4d543c673874dbebff516fbeba90a85e6c13f2a58cd
-F src/shell.c.in 2980312ab57fc5ccf298d1f0682588ec3832f52a878bea8abe34647d2cf31d05
+F src/shell.c.in 1c3c4694470c1f61d667a96b29ffa8036d34391efbbdd251692b06f34b46e393
 F src/sqlite.h.in b9b7fd73239d94db20332bb6e504688001e5564b655e1318a4427a1caef4b99e
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d
@@ -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 5c43e8d2ec23f28fdce63874d9d4c8ccbb4a8f81030b19d65ff5711a7c32697e
-R 1a27bfc63f0ef541783eed07221dd339
+P 2703ac9842335962e488e597168d70b1389b95a6ad39edf70a211b95979b4708
+R 0bcb919ac67ff690a464f41cfdc2aecd
 U stephan
-Z 39513e5d3a3cf9877958a5d88a7ecd20
+Z 78ecb20703c7cf55fa5a9c67c82bb309
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 4f33119d84..ccfe9b233b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2703ac9842335962e488e597168d70b1389b95a6ad39edf70a211b95979b4708
\ No newline at end of file
+18462052903bfeb037dd9af3a1fe1898d141eff5d6f527721858120553de808d
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index cd3fe88cd5..7b68b8512f 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -12680,26 +12680,15 @@ const char * fiddle_db_filename(const char * zDbName){
 }
 
 /*
-** Closes, unlinks, and reopens the db using its current filename (or
-** the default if the db is currently closed). It is assumed, for
-** purposes of the fiddle build, that the file is in a transient
-** virtual filesystem within the browser.
+** Completely wipes out the contents of the currently-opened database
+** but leaves its storage intact for reuse.
 */
 void fiddle_reset_db(void){
-  char *zFilename = 0;
-  if( 0==globalDb ){
-    shellState.pAuxDb->zDbFilename = shellState.wasm.zDefaultDbName;
-  }else{
-    zFilename =
-      sqlite3_mprintf("%s", sqlite3_db_filename(globalDb, "main"));
-    shell_check_oom(zFilename);
-    close_db(globalDb);
-    shellDeleteFile(zFilename);
-    shellState.db = 0;
-    shellState.pAuxDb->zDbFilename = zFilename;
+  if( globalDb ){
+    int rc = sqlite3_db_config(globalDb, SQLITE_DBCONFIG_RESET_DATABASE, 1, 0);
+    if( 0==rc ) rc = sqlite3_exec(globalDb, "VACUUM", 0, 0, 0);
+    sqlite3_db_config(globalDb, SQLITE_DBCONFIG_RESET_DATABASE, 0, 0);
   }
-  open_db(&shellState, 0);
-  sqlite3_free(zFilename);
 }
 
 /*

From 4f5bbedb3aad0095caef387dc66e884bfc1f1675 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 3 Oct 2022 13:03:41 +0000
Subject: [PATCH 220/428] Export sqlite3_trace_v2() to wasm and use it to
 ensure that the new per-VFS post-open SQL support in the DB ctor works.
 Default opfs vfs to journal_mode=truncate, as it's faster in that mode. Add
 't' DB open-mode flag to enable SQL tracing to console.log().

FossilOrigin-Name: 508f7f6d63e52f61fae5abe817579a4e130fa7fbd18733d741d521a5bdabb7ce
---
 ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api |  1 +
 ext/wasm/api/sqlite3-api-glue.js            |  2 +-
 ext/wasm/api/sqlite3-api-oo1.js             | 88 +++++++++++++++------
 ext/wasm/api/sqlite3-api-opfs.js            |  9 ++-
 ext/wasm/api/sqlite3-api-prologue.js        |  1 +
 ext/wasm/api/sqlite3-wasm.c                 | 29 +++++++
 ext/wasm/sqlite3-opfs-async-proxy.js        |  6 +-
 ext/wasm/test-opfs-vfs.js                   |  2 +-
 manifest                                    | 26 +++---
 manifest.uuid                               |  2 +-
 10 files changed, 122 insertions(+), 44 deletions(-)

diff --git a/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api b/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
index 014812946d..506775d2fe 100644
--- a/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
+++ b/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
@@ -74,6 +74,7 @@ _sqlite3_strglob
 _sqlite3_strlike
 _sqlite3_total_changes
 _sqlite3_total_changes64
+_sqlite3_trace_v2
 _sqlite3_uri_boolean
 _sqlite3_uri_int64
 _sqlite3_uri_key
diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index e31618d5eb..a4c9627bdd 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -621,7 +621,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     for(const t of ['access', 'blobFinalizers', 'dataTypes',
                     'encodings', 'fcntl', 'flock', 'ioCap',
                     'openFlags', 'prepareFlags', 'resultCodes',
-                    'serialize', 'syncFlags', 'udfFlags',
+                    'serialize', 'syncFlags', 'trace', 'udfFlags',
                     'version'
                    ]){
       for(const e of Object.entries(wasm.ctype[t])){
diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index e6685d35a7..37c2928406 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -61,6 +61,25 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     }
   };
 
+  /**
+     sqlite3_trace_v2() callback which gets installed by the DB ctor
+     if its open-flags contain "t".
+  */
+  const __dbTraceToConsole =
+        wasm.installFunction('i(ippp)', function(t,c,p,x){
+          if(capi.SQLITE_TRACE_STMT===t){
+            // x == SQL, p == sqlite3_stmt*
+            console.log("SQL TRACE #"+(++this.counter),
+                        wasm.cstringToJs(x));
+          }
+        }.bind({counter: 0}));
+
+  /**
+     A map of sqlite3_vfs pointers to SQL code to run when the DB
+     constructor opens a database with the given VFS.
+  */
+  const __vfsPostOpenSql = Object.create(null);
+
   /**
      A proxy for DB class constructors. It must be called with the
      being-construct DB object as its "this". See the DB constructor
@@ -101,12 +120,10 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
             ? (n)=>toss3("The VFS for",n,"is only available in the main window thread.")
             : false;
       ctor._name2vfs[':localStorage:'] = {
-        vfs: 'kvvfs',
-        filename: isWorkerThread || (()=>'local')
+        vfs: 'kvvfs', filename: isWorkerThread || (()=>'local')
       };
       ctor._name2vfs[':sessionStorage:'] = {
-        vfs: 'kvvfs',
-        filename: isWorkerThread || (()=>'session')
+        vfs: 'kvvfs', filename: isWorkerThread || (()=>'session')
       };
     }
     const opt = ctor.normalizeArgs(...args);
@@ -123,7 +140,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
       vfsName = vfsCheck.vfs;
       fn = fnJs = vfsCheck.filename(fnJs);
     }
-    let ptr, oflags = 0;
+    let pDb, oflags = 0;
     if( flagsStr.indexOf('c')>=0 ){
       oflags |= capi.SQLITE_OPEN_CREATE | capi.SQLITE_OPEN_READWRITE;
     }
@@ -132,24 +149,48 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     oflags |= capi.SQLITE_OPEN_EXRESCODE;
     const scope = wasm.scopedAllocPush();
     try {
-      const ppDb = wasm.allocPtr() /* output (sqlite3**) arg */;
+      const pPtr = wasm.allocPtr() /* output (sqlite3**) arg */;
       const pVfsName = vfsName ? (
         ('number'===typeof vfsName ? vfsName : wasm.scopedAllocCString(vfsName))
       ): 0;
-      const rc = capi.sqlite3_open_v2(fn, ppDb, oflags, pVfsName);
-      ptr = wasm.getPtrValue(ppDb);
-      checkSqlite3Rc(ptr, rc);
+      let rc = capi.sqlite3_open_v2(fn, pPtr, oflags, pVfsName);
+      pDb = wasm.getPtrValue(pPtr);
+      checkSqlite3Rc(pDb, rc);
+      if(flagsStr.indexOf('t')>=0){
+        capi.sqlite3_trace_v2(pDb, capi.SQLITE_TRACE_STMT,
+                              __dbTraceToConsole, 0);
+      }
+      // Check for per-VFS post-open SQL...
+      wasm.setPtrValue(pPtr, 0);
+      if(0===capi.sqlite3_file_control(
+        pDb, "main", capi.SQLITE_FCNTL_VFS_POINTER, pPtr
+      )){
+        const postInitSql = __vfsPostOpenSql[wasm.getPtrValue(pPtr)];
+        if(postInitSql){
+          rc = capi.sqlite3_exec(pDb, postInitSql, 0, 0, 0);
+          checkSqlite3Rc(pDb, rc);
+        }
+      }      
     }catch( e ){
-      if( ptr ) capi.sqlite3_close_v2(ptr);
+      if( pDb ) capi.sqlite3_close_v2(pDb);
       throw e;
     }finally{
       wasm.scopedAllocPop(scope);
     }
     this.filename = fnJs;
-    __ptrMap.set(this, ptr);
+    __ptrMap.set(this, pDb);
     __stmtMap.set(this, Object.create(null));
   };
 
+  /**
+     Sets SQL which should be exec()'d on a DB instance after it is
+     opened with the given VFS pointer. This is intended only for use
+     by DB subclasses or sqlite3_vfs implementations.
+  */
+  dbCtorHelper.setVfsPostOpenSql = function(pVfs, sql){
+    __vfsPostOpenSql[pVfs] = sql;
+  };
+
   /**
      A helper for DB constructors. It accepts either a single
      config-style object or up to 3 arguments (filename, dbOpenFlags,
@@ -175,7 +216,6 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     }
     return arg;
   };
-  
   /**
      The DB class provides a high-level OO wrapper around an sqlite3
      db handle.
@@ -193,14 +233,18 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
      database. It must be string containing a sequence of letters (in
      any order, but case sensitive) specifying the mode:
 
-     - "c" => create if it does not exist, else fail if it does not
+     - "c": create if it does not exist, else fail if it does not
        exist. Implies the "w" flag.
 
-     - "w" => write. Implies "r": a db cannot be write-only.
+     - "w": write. Implies "r": a db cannot be write-only.
 
-     - "r" => read-only if neither "w" nor "c" are provided, else it
+     - "r": read-only if neither "w" nor "c" are provided, else it
        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).
+
      If "w" is not provided, the db is implicitly read-only, noting that
      "rc" is meaningless
 
@@ -229,16 +273,10 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
      `sqlite3*` pointer value. That property can also be used to check
      whether this DB instance is still open.
 
-
-     EXPERIMENTAL: 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. In this mode, only a single database is permitted
-     in each storage object. This feature is experimental and subject
-     to any number of changes (including outright removal). This
-     support requires the kvvfs sqlite3 VFS, the existence of which
-     can be determined at runtime by checking for a non-0 return value
-     from sqlite3.capi.sqlite3_vfs_find("kvvfs").
+     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.
   */
   const DB = function(...args){
     dbCtorHelper.apply(this, args);
diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index 9588fc8a20..42c0e11662 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -898,8 +898,14 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
         sqlite3.oo1.dbCtorHelper.call(this, opt);
       };
       opfsUtil.OpfsDb.prototype = Object.create(sqlite3.oo1.DB.prototype);
+      sqlite3.oo1.dbCtorHelper.setVfsPostOpenSql(
+        opfsVfs.pointer,
+        /* Truncate journal mode is faster than delete or wal for
+           OPFS, per speedtest1. */
+        "pragma journal_mode=truncate"
+      );
     }
-    
+
     /**
        Potential TODOs:
 
@@ -907,7 +913,6 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
          publish an interface for proxying the higher-level OPFS
          features like getting a directory listing.
     */
-    
     const sanityCheck = function(){
       const scope = wasm.scopedAllocPush();
       const sq3File = new sqlite3_file();
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 83e47cc93c..377f671fce 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -815,6 +815,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     ["sqlite3_step", "int", "sqlite3_stmt*"],
     ["sqlite3_strglob", "int", "string","string"],
     ["sqlite3_strlike", "int", "string","string","int"],
+    ["sqlite3_trace_v2", "int", "sqlite3*", "int", "*", "*"],
     ["sqlite3_total_changes", "int", "sqlite3*"],
     ["sqlite3_uri_boolean", "int", "string", "string", "int"],
     ["sqlite3_uri_key", "string", "string", "int"],
diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index b9454155d7..99196db159 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -527,6 +527,13 @@ const char * sqlite3_wasm_enum_json(void){
     DefInt(SQLITE_SYNC_DATAONLY);
   } _DefGroup;
 
+  DefGroup(trace) {
+    DefInt(SQLITE_TRACE_STMT);
+    DefInt(SQLITE_TRACE_PROFILE);
+    DefInt(SQLITE_TRACE_ROW);
+    DefInt(SQLITE_TRACE_CLOSE);
+  } _DefGroup;
+
   DefGroup(udfFlags) {
     DefInt(SQLITE_DETERMINISTIC);
     DefInt(SQLITE_DIRECTONLY);
@@ -680,6 +687,28 @@ int sqlite3_wasm_vfs_unlink(const char * zName){
   return rc;
 }
 
+/*
+** This function is NOT part of the sqlite3 public API. It is strictly
+** for use by the sqlite project's own JS/WASM bindings.
+**
+** This function resets the given db pointer's database as described at
+**
+** https://www.sqlite.org/c3ref/c_dbconfig_defensive.html#sqlitedbconfigresetdatabase
+**
+** Returns 0 on success, an SQLITE_xxx code on error. Returns
+** SQLITE_MISUSE if pDb is NULL.
+*/
+WASM_KEEP
+int sqlite3_wasm_db_reset(sqlite3*pDb){
+  int rc = SQLITE_MISUSE;
+  if( pDb ){
+    rc = sqlite3_db_config(pDb, SQLITE_DBCONFIG_RESET_DATABASE, 1, 0);
+    if( 0==rc ) rc = sqlite3_exec(pDb, "VACUUM", 0, 0, 0);
+    sqlite3_db_config(pDb, SQLITE_DBCONFIG_RESET_DATABASE, 0, 0);
+  }
+  return rc;
+}
+
 /*
 ** Uses the current database's VFS xRead to stream the db file's
 ** contents out to the given callback. The callback gets a single
diff --git a/ext/wasm/sqlite3-opfs-async-proxy.js b/ext/wasm/sqlite3-opfs-async-proxy.js
index b951873ea5..0abc3ee233 100644
--- a/ext/wasm/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/sqlite3-opfs-async-proxy.js
@@ -609,7 +609,11 @@ const waitLoop = async function f(){
               now - relinquishTime >= fh.syncHandleTime
             )){
               //warn("Relinquishing for timeout:",fh.filenameAbs);
-              closeSyncHandle(fh)/*async!*/;
+              await closeSyncHandle(fh)
+              /* Testing shows that we have to wait on this async
+                 op to finish, else we might try to re-open it
+                 before the close has run. The FS layer does not
+                 retain the order those operations, apparently. */;
             }
           }
         }
diff --git a/ext/wasm/test-opfs-vfs.js b/ext/wasm/test-opfs-vfs.js
index 755b73a97c..2b22a7e96c 100644
--- a/ext/wasm/test-opfs-vfs.js
+++ b/ext/wasm/test-opfs-vfs.js
@@ -43,7 +43,7 @@ const tryOpfsVfs = async function(sqlite3){
   const dbFile = "my-persistent.db";
   if(urlArgs.has('delete')) sqlite3.opfs.deleteEntry(dbFile);
 
-  const db = new opfs.OpfsDb(dbFile);
+  const db = new opfs.OpfsDb(dbFile,'ct');
   log("db file:",db.filename);
   await waitForRelinquish();
   try{
diff --git a/manifest b/manifest
index 11baf122fc..5a7dbf25a4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Reimplement\sfiddle_reset_db()\sso\sthat\sit\sworks\swith\sall\sVFSes.
-D 2022-10-03T11:42:45.345
+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
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -476,7 +476,7 @@ F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34ce
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle 0e88c8cfc3719e4b7e74980d9da664c709e68acf863e48386cda376edfd3bfb0
 F ext/wasm/GNUmakefile b313a82060c733c990b91afa981e10f5e21a0b33a483f33b739ce932ed6bc725
 F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
-F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 9b16040f37805ee7c30f922a970a57d3f2a822d0675a8f5d70f15061e300c4ce
+F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 89983a8d122c35a90c65ec667844b95a78bcd04f3198a99c1e0c8368c1a0b03a
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
 F ext/wasm/api/README.md 1e350b611465566cfa2e5eccf7c9b29a34f48ee38bbf6d5fb086dd06ce32b3ff
 F ext/wasm/api/extern-post-js.js dc68cbf552d8ea085181400a6963907c32e0b088b03ffd8969b1869fea246629
@@ -485,13 +485,13 @@ F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba814
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
 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 5391338550ef9fafb3a7a6d060b8c19a190c47c01fa14e032c6e30dd96742c02
-F ext/wasm/api/sqlite3-api-oo1.js 484f9ea5c7140d07745f4b534a1f6dd67120c65ef34abcf7cdb3a388d73f5ef4
-F ext/wasm/api/sqlite3-api-opfs.js 1b097808b7b081b0f0700cf97d49ef19760e401706168edff9cd45cf9169f541
-F ext/wasm/api/sqlite3-api-prologue.js b827e2353799b54fffaa9577f51ebf08b8dedc58dcabe344c73be977235da227
+F ext/wasm/api/sqlite3-api-glue.js b6e7ae7bfe272a8623a8cae4a84830697314c743cadd14e4c167650455f0fff9
+F ext/wasm/api/sqlite3-api-oo1.js 1cf37b2b6e1fb35f9c425380aad198b66a36cdcc65e399e68085509096eca5b0
+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
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c 2a0f9e4bf1b141a787918951360601128d6a0a190a31a8e5cfe237c99fa640c6
+F ext/wasm/api/sqlite3-wasm.c 3bb9fe3de3bb536fdae01934760e651c7c20e7066b9415895042555d62ecd7c0
 F ext/wasm/batch-runner.html c363032aba7a525920f61f8be112a29459f73f07e46f0ba3b7730081a617826e
 F ext/wasm/batch-runner.js ce92650a6681586c89bef26ceae96674a55ca5a9727815202ca62e1a00ff5015
 F ext/wasm/common/SqliteTestUtil.js 647bf014bd30bdd870a7e9001e251d12fc1c9ec9ce176a1004b838a4b33c5c05
@@ -522,11 +522,11 @@ F ext/wasm/speedtest1.html e4cb5d722b494104fc1249e7c008ca018f820a784833c51004c95
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
-F ext/wasm/sqlite3-opfs-async-proxy.js d571a40230f54b99863f469e050cc4d4317e90239e64026d8d574689956ff76c
+F ext/wasm/sqlite3-opfs-async-proxy.js 5c6748361f2eb2ee0f2941890917fd9f2d9271de80ec1b65695fb023435b8375
 F ext/wasm/sqlite3-worker1-promiser.js 307d7837420ca6a9d3780dfc81194f1c0715637e6d9540e935514086b96913d8
 F ext/wasm/sqlite3-worker1.js 466e9bd39409ab03f3e00999887aaffc11e95b416e2689596e3d7f1516673fdf
 F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
-F ext/wasm/test-opfs-vfs.js 623de926913fa8cb7bac170f105a0c397f1951aba52d9f54792aadce7892a3c2
+F ext/wasm/test-opfs-vfs.js 0115d56f3f2a6475040dffe75a6851a353b1690708795944cf0fe1890bc7ff54
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
 F ext/wasm/testing-worker1-promiser.js bd788e33c1807e0a6dda9c9a9d784bd3350ca49c9dd8ae2cc8719b506b6e013e
 F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d7669fb17fcae
@@ -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 2703ac9842335962e488e597168d70b1389b95a6ad39edf70a211b95979b4708
-R 0bcb919ac67ff690a464f41cfdc2aecd
+P 18462052903bfeb037dd9af3a1fe1898d141eff5d6f527721858120553de808d
+R 362ba5dc75c0e8e6f26510dab6893d04
 U stephan
-Z 78ecb20703c7cf55fa5a9c67c82bb309
+Z 8b3cb31b700bd695aa51a5be567b8bc8
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index ccfe9b233b..909d73bfff 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-18462052903bfeb037dd9af3a1fe1898d141eff5d6f527721858120553de808d
\ No newline at end of file
+508f7f6d63e52f61fae5abe817579a4e130fa7fbd18733d741d521a5bdabb7ce
\ No newline at end of file

From 3044e77b4a892adc4f7e8609c460b598d8366c82 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 3 Oct 2022 13:45:03 +0000
Subject: [PATCH 221/428] Add the --vfs option to speedtest1.

FossilOrigin-Name: aeb884029ac1c68f0d7361dda0a545cff19ed265b608c1e329a1926397c5c8a3
---
 manifest          | 14 +++++++-------
 manifest.uuid     |  2 +-
 test/speedtest1.c |  8 +++++++-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index 50270d8b40..36bda4a254 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\sdoc\stypo\sfix\sin\ssqlite.h.in.
-D 2022-10-02T20:13:46.207
+C Add\sthe\s--vfs\soption\sto\sspeedtest1.
+D 2022-10-03T13:45:03.604
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1480,7 +1480,7 @@ F test/speed3.test 694affeb9100526007436334cf7d08f3d74b85ef
 F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
 F test/speed4p.test 377a0c48e5a92e0b11c1c5ebb1bc9d83a7312c922bc0cb05970ef5d6a96d1f0c
-F test/speedtest1.c 8bf7ebac9ac316feed6656951249db531dc380c73fb3e3b22e224ffda96beff6
+F test/speedtest1.c 8a9f6b6f6b5b1a18739b9a2eca8dd3ad131f28946c14eb5ae33fefeeada466b7
 F test/spellfix.test 951a6405d49d1a23d6b78027d3877b4a33eeb8221dcab5704b499755bb4f552e
 F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3
 F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33
@@ -2000,8 +2000,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 cd494240cc6184bb028d1f1049086f57c0a71a43d7ed1405fd4205240e1b9e61
-R 63d9c2979689d3960bbd738edf79070f
-U stephan
-Z 0ea9b225897586b46dcecb74f7edb744
+P 372802aaa22a830bf498bb0d9561ae02b32e5e191c4d7d771ea152140f6685a1
+R bb0d587e0921cce1f37f5122ed804b2c
+U drh
+Z 3f01ed1217459ee72edb7ee3c272f0cd
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 4b7393393e..d991ba1f14 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-372802aaa22a830bf498bb0d9561ae02b32e5e191c4d7d771ea152140f6685a1
\ No newline at end of file
+aeb884029ac1c68f0d7361dda0a545cff19ed265b608c1e329a1926397c5c8a3
\ No newline at end of file
diff --git a/test/speedtest1.c b/test/speedtest1.c
index b115a57e2b..c4ae8bdd5d 100644
--- a/test/speedtest1.c
+++ b/test/speedtest1.c
@@ -44,6 +44,7 @@ static const char zHelp[] =
   "  --utf16be           Set text encoding to UTF-16BE\n"
   "  --utf16le           Set text encoding to UTF-16LE\n"
   "  --verify            Run additional verification steps.\n"
+  "  --vfs NAME          Specify the VFS to use.\n"
   "  --without-rowid     Use WITHOUT ROWID where appropriate\n"
 ;
 
@@ -2184,6 +2185,7 @@ int main(int argc, char **argv){
   int doTrace = 0;              /* True for --trace */
   const char *zEncoding = 0;    /* --utf16be or --utf16le */
   const char *zDbName = 0;      /* Name of the test database */
+  const char *zVfs = 0;         /* VFS to use.  NULL means use the default */
 
   void *pHeap = 0;              /* Allocated heap space */
   void *pLook = 0;              /* Allocated lookaside space */
@@ -2357,6 +2359,9 @@ int main(int argc, char **argv){
         }else{
           g.zWR = "STRICT";
         }
+      }else if( strcmp(z,"vfs")==0 ){
+        if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]);
+        zVfs = argv[++i];
       }else if( strcmp(z, "help")==0 || strcmp(z,"?")==0 ){
         printf(zHelp, argv[0]);
         exit(0);
@@ -2395,7 +2400,8 @@ int main(int argc, char **argv){
   sqlite3_initialize();
 
   /* Open the database and the input file */
-  if( sqlite3_open(memDb ? ":memory:" : zDbName, &g.db) ){
+  if( sqlite3_open_v2(memDb ? ":memory:" : zDbName, &g.db,
+                      SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, zVfs) ){
     fatal_error("Cannot open database file: %s\n", zDbName);
   }
 #if SQLITE_VERSION_NUMBER>=3006001

From 57956a9c86d19aa9728d58e015fa87b0acd5a99a Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 3 Oct 2022 13:46:20 +0000
Subject: [PATCH 222/428] Resolve/remove a TODO.

FossilOrigin-Name: 2ea35fea3bac2637e935643edfa7913b792e529de3a8980dbb8678d98ed5bcf9
---
 ext/wasm/api/sqlite3-api-oo1.js | 23 +++++++++++++----------
 manifest                        | 12 ++++++------
 manifest.uuid                   |  2 +-
 3 files changed, 20 insertions(+), 17 deletions(-)

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

From 277c7d3516688b01941a2ca14a9e29c426ded5f3 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 3 Oct 2022 13:56:52 +0000
Subject: [PATCH 223/428] Copy all of the fiddle-opfs changes to speedtest1
 into trunk.

FossilOrigin-Name: f3d31c9982cab517a3907a28c571225cee614ee78375c70eb2efb9a2b6b4b042
---
 manifest          |  12 ++---
 manifest.uuid     |   2 +-
 test/speedtest1.c | 115 ++++++++++++++++++++++++++++++++++------------
 3 files changed, 93 insertions(+), 36 deletions(-)

diff --git a/manifest b/manifest
index 36bda4a254..b9cd970f84 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\s--vfs\soption\sto\sspeedtest1.
-D 2022-10-03T13:45:03.604
+C Copy\sall\sof\sthe\sfiddle-opfs\schanges\sto\sspeedtest1\sinto\strunk.
+D 2022-10-03T13:56:52.781
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1480,7 +1480,7 @@ F test/speed3.test 694affeb9100526007436334cf7d08f3d74b85ef
 F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
 F test/speed4p.test 377a0c48e5a92e0b11c1c5ebb1bc9d83a7312c922bc0cb05970ef5d6a96d1f0c
-F test/speedtest1.c 8a9f6b6f6b5b1a18739b9a2eca8dd3ad131f28946c14eb5ae33fefeeada466b7
+F test/speedtest1.c 752fc1cad512f7c94271d3fdb46d6d90c9f6b61d0a4722a28c7028f53952fb1d
 F test/spellfix.test 951a6405d49d1a23d6b78027d3877b4a33eeb8221dcab5704b499755bb4f552e
 F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3
 F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33
@@ -2000,8 +2000,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 372802aaa22a830bf498bb0d9561ae02b32e5e191c4d7d771ea152140f6685a1
-R bb0d587e0921cce1f37f5122ed804b2c
+P aeb884029ac1c68f0d7361dda0a545cff19ed265b608c1e329a1926397c5c8a3
+R 9ef7b22777f981a0530dc8b380258dc2
 U drh
-Z 3f01ed1217459ee72edb7ee3c272f0cd
+Z 4bdd14d37dfc0c4e0295fe6f5fd60fb3
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index d991ba1f14..1ce7bd9cf2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-aeb884029ac1c68f0d7361dda0a545cff19ed265b608c1e329a1926397c5c8a3
\ No newline at end of file
+f3d31c9982cab517a3907a28c571225cee614ee78375c70eb2efb9a2b6b4b042
\ No newline at end of file
diff --git a/test/speedtest1.c b/test/speedtest1.c
index c4ae8bdd5d..d1efdf13a0 100644
--- a/test/speedtest1.c
+++ b/test/speedtest1.c
@@ -7,6 +7,7 @@ static const char zHelp[] =
   "Usage: %s [--options] DATABASE\n"
   "Options:\n"
   "  --autovacuum        Enable AUTOVACUUM mode\n"
+  "  --big-transactions  Add BEGIN/END around large tests which normally don't\n"
   "  --cachesize N       Set the cache size to N\n"
   "  --checkpoint        Run PRAGMA wal_checkpoint after each test case\n"
   "  --exclusive         Enable locking_mode=EXCLUSIVE\n"
@@ -20,6 +21,7 @@ static const char zHelp[] =
   "  --mmap SZ           MMAP the first SZ bytes of the database file\n"
   "  --multithread       Set multithreaded mode\n"
   "  --nomemstat         Disable memory statistics\n"
+  "  --nomutex           Open db with SQLITE_OPEN_NOMUTEX\n"
   "  --nosync            Set PRAGMA synchronous=OFF\n"
   "  --notnull           Add NOT NULL constraints to table columns\n"
   "  --output FILE       Store SQL output in FILE\n"
@@ -43,8 +45,8 @@ static const char zHelp[] =
   "  --threads N         Use up to N threads for sorting\n"
   "  --utf16be           Set text encoding to UTF-16BE\n"
   "  --utf16le           Set text encoding to UTF-16LE\n"
-  "  --verify            Run additional verification steps.\n"
-  "  --vfs NAME          Specify the VFS to use.\n"
+  "  --verify            Run additional verification steps\n"
+  "  --vfs NAME          Use the given (preinstalled) VFS\n"
   "  --without-rowid     Use WITHOUT ROWID where appropriate\n"
 ;
 
@@ -98,6 +100,7 @@ static struct Global {
   int nRepeat;               /* Repeat selects this many times */
   int doCheckpoint;          /* Run PRAGMA wal_checkpoint after each trans */
   int nReserve;              /* Reserve bytes */
+  int doBigTransactions;     /* Enable transactions on tests 410 and 510 */
   const char *zWR;           /* Might be WITHOUT ROWID */
   const char *zNN;           /* Might be NOT NULL */
   const char *zPK;           /* Might be UNIQUE or PRIMARY KEY */
@@ -373,10 +376,12 @@ int speedtest1_numbername(unsigned int n, char *zOut, int nOut){
 #define NAMEWIDTH 60
 static const char zDots[] =
   ".......................................................................";
+static int iTestNumber = 0;  /* Current test # for begin/end_test(). */
 void speedtest1_begin_test(int iTestNum, const char *zTestName, ...){
   int n = (int)strlen(zTestName);
   char *zName;
   va_list ap;
+  iTestNumber = iTestNum;
   va_start(ap, zTestName);
   zName = sqlite3_vmprintf(zTestName, ap);
   va_end(ap);
@@ -385,6 +390,11 @@ void speedtest1_begin_test(int iTestNum, const char *zTestName, ...){
     zName[NAMEWIDTH] = 0;
     n = NAMEWIDTH;
   }
+  if( g.pScript ){
+    fprintf(g.pScript,"-- begin test %d %.*s\n", iTestNumber, n, zName)
+      /* maintenance reminder: ^^^ code in ext/wasm expects %d to be
+      ** field #4 (as in: cut -d' ' -f4). */;
+  }
   if( g.bSqlOnly ){
     printf("/* %4d - %s%.*s */\n", iTestNum, zName, NAMEWIDTH-n, zDots);
   }else{
@@ -405,6 +415,10 @@ void speedtest1_exec(const char*,...);
 void speedtest1_end_test(void){
   sqlite3_int64 iElapseTime = speedtest1_timestamp() - g.iStart;
   if( g.doCheckpoint ) speedtest1_exec("PRAGMA wal_checkpoint;");
+  assert( iTestNumber > 0 );
+  if( g.pScript ){
+    fprintf(g.pScript,"-- end test %d\n", iTestNumber);
+  }
   if( !g.bSqlOnly ){
     g.iTotal += iElapseTime;
     printf("%4d.%03ds\n", (int)(iElapseTime/1000), (int)(iElapseTime%1000));
@@ -413,6 +427,7 @@ void speedtest1_end_test(void){
     sqlite3_finalize(g.pStmt);
     g.pStmt = 0;
   }
+  iTestNumber = 0;
 }
 
 /* Report end of testing */
@@ -1106,12 +1121,24 @@ void testset_main(void){
   speedtest1_exec("COMMIT");
   speedtest1_end_test();
   speedtest1_begin_test(410, "%d SELECTS on an IPK", n);
+  if( g.doBigTransactions ){
+    /* Historical note: tests 410 and 510 have historically not used
+    ** explicit transactions. The --big-transactions flag was added
+    ** 2022-09-08 to support the WASM/OPFS build, as the run-times
+    ** approach 1 minute for each of these tests if they're not in an
+    ** explicit transaction. The run-time effect of --big-transaciions
+    ** on native builds is negligible. */
+    speedtest1_exec("BEGIN");
+  }
   speedtest1_prepare("SELECT b FROM t5 WHERE a=?1; --  %d times",n);
   for(i=1; i<=n; i++){
     x1 = swizzle(i,maxb);
     sqlite3_bind_int(g.pStmt, 1, (sqlite3_int64)x1);
     speedtest1_run();
   }
+  if( g.doBigTransactions ){
+    speedtest1_exec("COMMIT");
+  }
   speedtest1_end_test();
 
   sz = n = g.szTest*700;
@@ -1133,6 +1160,10 @@ void testset_main(void){
   speedtest1_exec("COMMIT");
   speedtest1_end_test();
   speedtest1_begin_test(510, "%d SELECTS on a TEXT PK", n);
+  if( g.doBigTransactions ){
+    /* See notes for test 410. */
+    speedtest1_exec("BEGIN");
+  }
   speedtest1_prepare("SELECT b FROM t6 WHERE a=?1; --  %d times",n);
   for(i=1; i<=n; i++){
     x1 = swizzle(i,maxb);
@@ -1140,6 +1171,9 @@ void testset_main(void){
     sqlite3_bind_text(g.pStmt, 1, zNum, -1, SQLITE_STATIC);
     speedtest1_run();
   }
+  if( g.doBigTransactions ){
+    speedtest1_exec("COMMIT");
+  }
   speedtest1_end_test();
   speedtest1_begin_test(520, "%d SELECT DISTINCT", n);
   speedtest1_exec("SELECT DISTINCT b FROM t5;");
@@ -2163,7 +2197,6 @@ static int xCompileOptions(void *pCtx, int nVal, char **azVal, char **azCol){
   printf("-- Compile option: %s\n", azVal[0]);
   return SQLITE_OK;
 }
-
 int main(int argc, char **argv){
   int doAutovac = 0;            /* True for --autovacuum */
   int cacheSize = 0;            /* Desired cache size.  0 means default */
@@ -2181,11 +2214,13 @@ int main(int argc, char **argv){
   int nThread = 0;              /* --threads value */
   int mmapSize = 0;             /* How big of a memory map to use */
   int memDb = 0;                /* --memdb.  Use an in-memory database */
+  int openFlags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE
+    ;                           /* SQLITE_OPEN_xxx flags. */
   char *zTSet = "main";         /* Which --testset torun */
+  const char * zVfs = 0;        /* --vfs NAME */
   int doTrace = 0;              /* True for --trace */
   const char *zEncoding = 0;    /* --utf16be or --utf16le */
   const char *zDbName = 0;      /* Name of the test database */
-  const char *zVfs = 0;         /* VFS to use.  NULL means use the default */
 
   void *pHeap = 0;              /* Allocated heap space */
   void *pLook = 0;              /* Allocated lookaside space */
@@ -2194,10 +2229,19 @@ int main(int argc, char **argv){
   int i;                        /* Loop counter */
   int rc;                       /* API return code */
 
+#ifdef SQLITE_SPEEDTEST1_WASM
+  /* Resetting all state is important for the WASM build, which may
+  ** call main() multiple times. */
+  memset(&g, 0, sizeof(g));
+  iTestNumber = 0;
+#endif
 #ifdef SQLITE_CKSUMVFS_STATIC
   sqlite3_register_cksumvfs(0);
 #endif
-
+  /*
+  ** Confirms that argc has at least N arguments following argv[i]. */
+#define ARGC_VALUE_CHECK(N)                                       \
+  if( i>=argc-(N) ) fatal_error("missing argument on %s\n", argv[i])
   /* Display the version of SQLite being tested */
   printf("-- Speedtest1 for SQLite %s %.48s\n",
          sqlite3_libversion(), sqlite3_sourceid());
@@ -2214,10 +2258,11 @@ int main(int argc, char **argv){
       do{ z++; }while( z[0]=='-' );
       if( strcmp(z,"autovacuum")==0 ){
         doAutovac = 1;
+      }else if( strcmp(z,"big-transactions")==0 ){
+        g.doBigTransactions = 1;
       }else if( strcmp(z,"cachesize")==0 ){
-        if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]);
-        i++;
-        cacheSize = integerValue(argv[i]);
+        ARGC_VALUE_CHECK(1);
+        cacheSize = integerValue(argv[++i]);
       }else if( strcmp(z,"exclusive")==0 ){
         doExclusive = 1;
       }else if( strcmp(z,"checkpoint")==0 ){
@@ -2226,20 +2271,20 @@ int main(int argc, char **argv){
         g.bSqlOnly = 1;
         g.bExplain = 1;
       }else if( strcmp(z,"heap")==0 ){
-        if( i>=argc-2 ) fatal_error("missing arguments on %s\n", argv[i]);
+        ARGC_VALUE_CHECK(2);
         nHeap = integerValue(argv[i+1]);
         mnHeap = integerValue(argv[i+2]);
         i += 2;
       }else if( strcmp(z,"incrvacuum")==0 ){
         doIncrvac = 1;
       }else if( strcmp(z,"journal")==0 ){
-        if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]);
+        ARGC_VALUE_CHECK(1);
         zJMode = argv[++i];
       }else if( strcmp(z,"key")==0 ){
-        if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]);
+        ARGC_VALUE_CHECK(1);
         zKey = argv[++i];
       }else if( strcmp(z,"lookaside")==0 ){
-        if( i>=argc-2 ) fatal_error("missing arguments on %s\n", argv[i]);
+        ARGC_VALUE_CHECK(2);
         nLook = integerValue(argv[i+1]);
         szLook = integerValue(argv[i+2]);
         i += 2;
@@ -2253,9 +2298,11 @@ int main(int argc, char **argv){
 #endif
 #if SQLITE_VERSION_NUMBER>=3007017
       }else if( strcmp(z, "mmap")==0 ){
-        if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]);
+        ARGC_VALUE_CHECK(1);
         mmapSize = integerValue(argv[++i]);
  #endif
+      }else if( strcmp(z,"nomutex")==0 ){
+        openFlags |= SQLITE_OPEN_NOMUTEX;
       }else if( strcmp(z,"nosync")==0 ){
         noSync = 1;
       }else if( strcmp(z,"notnull")==0 ){
@@ -2265,7 +2312,7 @@ int main(int argc, char **argv){
         fatal_error("The --output option is not supported with"
                     " -DSPEEDTEST_OMIT_HASH\n");
 #else
-        if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]);
+        ARGC_VALUE_CHECK(1);
         i++;
         if( strcmp(argv[i],"-")==0 ){
           g.hashFile = stdout;
@@ -2277,10 +2324,10 @@ int main(int argc, char **argv){
         }
 #endif
       }else if( strcmp(z,"pagesize")==0 ){
-        if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]);
+        ARGC_VALUE_CHECK(1);
         pageSize = integerValue(argv[++i]);
       }else if( strcmp(z,"pcache")==0 ){
-        if( i>=argc-2 ) fatal_error("missing arguments on %s\n", argv[i]);
+        ARGC_VALUE_CHECK(2);
         nPCache = integerValue(argv[i+1]);
         szPCache = integerValue(argv[i+2]);
         doPCache = 1;
@@ -2288,9 +2335,8 @@ int main(int argc, char **argv){
       }else if( strcmp(z,"primarykey")==0 ){
         g.zPK = "PRIMARY KEY";
       }else if( strcmp(z,"repeat")==0 ){
-        if( i>=argc-1 ) fatal_error("missing arguments on %s\n", argv[i]);
-        g.nRepeat = integerValue(argv[i+1]);
-        i += 1;
+        ARGC_VALUE_CHECK(1);
+        g.nRepeat = integerValue(argv[++i]);
       }else if( strcmp(z,"reprepare")==0 ){
         g.bReprepare = 1;
 #if SQLITE_VERSION_NUMBER>=3006000
@@ -2300,7 +2346,7 @@ int main(int argc, char **argv){
         sqlite3_config(SQLITE_CONFIG_SINGLETHREAD);
 #endif
       }else if( strcmp(z,"script")==0 ){
-        if( i>=argc-1 ) fatal_error("missing arguments on %s\n", argv[i]);
+        ARGC_VALUE_CHECK(1);
         if( g.pScript ) fclose(g.pScript);
         g.pScript = fopen(argv[++i], "wb");
         if( g.pScript==0 ){
@@ -2311,24 +2357,24 @@ int main(int argc, char **argv){
       }else if( strcmp(z,"shrink-memory")==0 ){
         g.bMemShrink = 1;
       }else if( strcmp(z,"size")==0 ){
-        if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]);
+        ARGC_VALUE_CHECK(1);
         g.szTest = integerValue(argv[++i]);
       }else if( strcmp(z,"stats")==0 ){
         showStats = 1;
       }else if( strcmp(z,"temp")==0 ){
-        if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]);
+        ARGC_VALUE_CHECK(1);
         i++;
         if( argv[i][0]<'0' || argv[i][0]>'9' || argv[i][1]!=0 ){
           fatal_error("argument to --temp should be integer between 0 and 9");
         }
         g.eTemp = argv[i][0] - '0';
       }else if( strcmp(z,"testset")==0 ){
-        if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]);
+        ARGC_VALUE_CHECK(1);
         zTSet = argv[++i];
       }else if( strcmp(z,"trace")==0 ){
         doTrace = 1;
       }else if( strcmp(z,"threads")==0 ){
-        if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]);
+        ARGC_VALUE_CHECK(1);
         nThread = integerValue(argv[++i]);
       }else if( strcmp(z,"utf16le")==0 ){
         zEncoding = "utf16le";
@@ -2339,8 +2385,11 @@ int main(int argc, char **argv){
 #ifndef SPEEDTEST_OMIT_HASH
         HashInit();
 #endif
+      }else if( strcmp(z,"vfs")==0 ){
+        ARGC_VALUE_CHECK(1);
+        zVfs = argv[++i];
       }else if( strcmp(z,"reserve")==0 ){
-        if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]);
+        ARGC_VALUE_CHECK(1);
         g.nReserve = atoi(argv[++i]);
       }else if( strcmp(z,"without-rowid")==0 ){
         if( strstr(g.zWR,"WITHOUT")!=0 ){
@@ -2359,9 +2408,6 @@ int main(int argc, char **argv){
         }else{
           g.zWR = "STRICT";
         }
-      }else if( strcmp(z,"vfs")==0 ){
-        if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]);
-        zVfs = argv[++i];
       }else if( strcmp(z, "help")==0 || strcmp(z,"?")==0 ){
         printf(zHelp, argv[0]);
         exit(0);
@@ -2376,6 +2422,7 @@ int main(int argc, char **argv){
                   argv[i], argv[0]);
     }
   }
+#undef ARGC_VALUE_CHECK
   if( zDbName!=0 ) unlink(zDbName);
 #if SQLITE_VERSION_NUMBER>=3006001
   if( nHeap>0 ){
@@ -2401,7 +2448,7 @@ int main(int argc, char **argv){
 
   /* Open the database and the input file */
   if( sqlite3_open_v2(memDb ? ":memory:" : zDbName, &g.db,
-                      SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, zVfs) ){
+                      openFlags, zVfs) ){
     fatal_error("Cannot open database file: %s\n", zDbName);
   }
 #if SQLITE_VERSION_NUMBER>=3006001
@@ -2586,3 +2633,13 @@ int main(int argc, char **argv){
   free( pHeap );
   return 0;
 }
+
+#ifdef SQLITE_SPEEDTEST1_WASM
+/*
+** A workaround for some inconsistent behaviour with how
+** main() does (or does not) get exported to WASM.
+*/
+int wasm_main(int argc, char **argv){
+  return main(argc, argv);
+}
+#endif

From 16292a5e52cc4f6b1375bd1dbefe048a10f7e14f Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 3 Oct 2022 15:22:59 +0000
Subject: [PATCH 224/428] Adjust the --help output for speedtest1 to clarify
 that the argument to the --cachesize option is in pages, not bytes.

FossilOrigin-Name: d7c2be6bdc3402e5a339d0f7b76d2c25f3a444dcbf54a77c1ccb790d1195a7cf
---
 manifest          | 12 ++++++------
 manifest.uuid     |  2 +-
 test/speedtest1.c |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index b9cd970f84..8484e05492 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Copy\sall\sof\sthe\sfiddle-opfs\schanges\sto\sspeedtest1\sinto\strunk.
-D 2022-10-03T13:56:52.781
+C Adjust\sthe\s--help\soutput\sfor\sspeedtest1\sto\sclarify\sthat\sthe\sargument\sto\nthe\s--cachesize\soption\sis\sin\spages,\snot\sbytes.
+D 2022-10-03T15:22:59.408
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1480,7 +1480,7 @@ F test/speed3.test 694affeb9100526007436334cf7d08f3d74b85ef
 F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
 F test/speed4p.test 377a0c48e5a92e0b11c1c5ebb1bc9d83a7312c922bc0cb05970ef5d6a96d1f0c
-F test/speedtest1.c 752fc1cad512f7c94271d3fdb46d6d90c9f6b61d0a4722a28c7028f53952fb1d
+F test/speedtest1.c 8677e29942ed0b8b5212e46c05e3debfe48bcaaebde4aa8ddc797cd73b8937d2
 F test/spellfix.test 951a6405d49d1a23d6b78027d3877b4a33eeb8221dcab5704b499755bb4f552e
 F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3
 F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33
@@ -2000,8 +2000,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 aeb884029ac1c68f0d7361dda0a545cff19ed265b608c1e329a1926397c5c8a3
-R 9ef7b22777f981a0530dc8b380258dc2
+P f3d31c9982cab517a3907a28c571225cee614ee78375c70eb2efb9a2b6b4b042
+R 7f8d304b6a07de2cc69260c5f709e3b7
 U drh
-Z 4bdd14d37dfc0c4e0295fe6f5fd60fb3
+Z c497b618e9e71dda49eb7a2e8b6f56d4
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 1ce7bd9cf2..3bd31ec276 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f3d31c9982cab517a3907a28c571225cee614ee78375c70eb2efb9a2b6b4b042
\ No newline at end of file
+d7c2be6bdc3402e5a339d0f7b76d2c25f3a444dcbf54a77c1ccb790d1195a7cf
\ No newline at end of file
diff --git a/test/speedtest1.c b/test/speedtest1.c
index d1efdf13a0..27eb5dfd06 100644
--- a/test/speedtest1.c
+++ b/test/speedtest1.c
@@ -7,8 +7,8 @@ static const char zHelp[] =
   "Usage: %s [--options] DATABASE\n"
   "Options:\n"
   "  --autovacuum        Enable AUTOVACUUM mode\n"
-  "  --big-transactions  Add BEGIN/END around large tests which normally don't\n"
-  "  --cachesize N       Set the cache size to N\n"
+  "  --big-transactions  Add BEGIN/END around all large tests\n"
+  "  --cachesize N       Set PRAGMA cache_size=N. Note: N is pages, not bytes\n"
   "  --checkpoint        Run PRAGMA wal_checkpoint after each test case\n"
   "  --exclusive         Enable locking_mode=EXCLUSIVE\n"
   "  --explain           Like --sqlonly but with added EXPLAIN keywords\n"

From 4b074692f45fb57ec8bd3b718cbb920ff2a40a69 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 3 Oct 2022 18:05:27 +0000
Subject: [PATCH 225/428] Omit WAL mode from the wasm build.

FossilOrigin-Name: 88efe2a62b81e5ee9119f54204e397fda59666a327158c7b7c972e84a716869e
---
 ext/wasm/GNUmakefile        |  1 +
 ext/wasm/api/sqlite3-wasm.c |  3 +++
 manifest                    | 18 +++++++++---------
 manifest.uuid               |  2 +-
 src/prepare.c               |  4 +++-
 src/sqlite.h.in             |  2 +-
 6 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 94cb17a723..f6d2a50c93 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -63,6 +63,7 @@ SQLITE_OPT = \
   -DSQLITE_OMIT_DEPRECATED \
   -DSQLITE_OMIT_UTF16 \
   -DSQLITE_OMIT_SHARED_CACHE \
+  -DSQLITE_OMIT_WAL \
   -DSQLITE_THREADSAFE=0 \
   -DSQLITE_TEMP_STORE=3 \
   -DSQLITE_OS_KV_OPTIONAL=1 \
diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index 99196db159..aaf6a78563 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -55,6 +55,9 @@
 #ifndef SQLITE_THREADSAFE
 # define SQLITE_THREADSAFE 0
 #endif
+#ifndef SQLITE_OMIT_WAL
+# define SQLITE_OMIT_WAL
+#endif
 
 #include <assert.h>
 #include "sqlite3.c" /* yes, .c instead of .h. */
diff --git a/manifest b/manifest
index 3cbe51eb84..48a1fe6ab0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Resolve/remove\sa\sTODO.
-D 2022-10-03T13:46:20.085
+C Omit\sWAL\smode\sfrom\sthe\swasm\sbuild.
+D 2022-10-03T18:05:27.610
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle 0e88c8cfc3719e4b7e74980d9da664c709e68acf863e48386cda376edfd3bfb0
-F ext/wasm/GNUmakefile b313a82060c733c990b91afa981e10f5e21a0b33a483f33b739ce932ed6bc725
+F ext/wasm/GNUmakefile 8ab74ed186a15d956a21b28fa0800b84af2b8a289392ae2dff8126ff033bd3f9
 F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 89983a8d122c35a90c65ec667844b95a78bcd04f3198a99c1e0c8368c1a0b03a
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -491,7 +491,7 @@ F ext/wasm/api/sqlite3-api-opfs.js 3d17da752181d67847bd2e3d1f4662df31c5023a1bed5
 F ext/wasm/api/sqlite3-api-prologue.js 915e3119d2c3cd53afb9575d1681646f3cbebbfc62cdae8bc199d08e7fd566f1
 F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c 3bb9fe3de3bb536fdae01934760e651c7c20e7066b9415895042555d62ecd7c0
+F ext/wasm/api/sqlite3-wasm.c 3838ad650c9f92803e810f09a1253b25252a6533b09620b3450194d72084094f
 F ext/wasm/batch-runner.html c363032aba7a525920f61f8be112a29459f73f07e46f0ba3b7730081a617826e
 F ext/wasm/batch-runner.js ce92650a6681586c89bef26ceae96674a55ca5a9727815202ca62e1a00ff5015
 F ext/wasm/common/SqliteTestUtil.js 647bf014bd30bdd870a7e9001e251d12fc1c9ec9ce176a1004b838a4b33c5c05
@@ -612,14 +612,14 @@ F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
 F src/pcache1.c dee95e3cd2b61e6512dc814c5ab76d5eb36f0bfc9441dbb4260fccc0d12bbddc
 F src/pragma.c 9bf7d8a2a9ad3bc36df3ec0d61817a44c38a1da527d59c26c203047f906e334a
 F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
-F src/prepare.c 0e61df99f063f12896a89c893fd3f8868e9fb13252c05e3e4e8cea7422094d0a
+F src/prepare.c 1b02be0441eda4579471fea097f678effcbb77ef0c39ab3f703c837822bcd674
 F src/printf.c e99ee9741e79ae3873458146f59644276657340385ade4e76a5f5d1c25793764
 F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c bb18acf4eded647fef88d4d543c673874dbebff516fbeba90a85e6c13f2a58cd
 F src/shell.c.in 1c3c4694470c1f61d667a96b29ffa8036d34391efbbdd251692b06f34b46e393
-F src/sqlite.h.in b9b7fd73239d94db20332bb6e504688001e5564b655e1318a4427a1caef4b99e
+F src/sqlite.h.in 3f4695457fcb41ea8a44c6d09fc2a591bbeda44b13bda86618f3ce0071bbca7c
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d
 F src/sqliteInt.h 13e1876c4694958683eac18974ebfc71ac0793f643c0956fb0ff6b8a15337dc0
@@ -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 508f7f6d63e52f61fae5abe817579a4e130fa7fbd18733d741d521a5bdabb7ce
-R 3b5fbcc1c629d848c68bef8adf981232
+P 2ea35fea3bac2637e935643edfa7913b792e529de3a8980dbb8678d98ed5bcf9
+R 4e7ff28ad053bdee7ff28b0243888886
 U stephan
-Z f7f0cb7970f025a32d66b1e06bd3b81b
+Z 9e8543639097e90c8529ba696f0d6371
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 933deb8fef..d705215e2d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2ea35fea3bac2637e935643edfa7913b792e529de3a8980dbb8678d98ed5bcf9
\ No newline at end of file
+88efe2a62b81e5ee9119f54204e397fda59666a327158c7b7c972e84a716869e
\ No newline at end of file
diff --git a/src/prepare.c b/src/prepare.c
index cd90bc4bad..1e7a1222ba 100644
--- a/src/prepare.c
+++ b/src/prepare.c
@@ -746,7 +746,9 @@ static int sqlite3Prepare(
     }
   }
 
-  sqlite3VtabUnlockList(db);
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+  if( db->pDisconnect ) sqlite3VtabUnlockList(db);
+#endif
 
   if( nBytes>=0 && (nBytes==0 || zSql[nBytes-1]!=0) ){
     char *zSqlCopy;
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index d862c4fc00..df61f3c196 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -5628,7 +5628,7 @@ void sqlite3_value_free(sqlite3_value*);
 **
 ** ^The sqlite3_aggregate_context(C,N) routine returns a NULL pointer 
 ** when first called if N is less than or equal to zero or if a memory
-** allocate error occurs.
+** allocation error occurs.
 **
 ** ^(The amount of space allocated by sqlite3_aggregate_context(C,N) is
 ** determined by the N parameter on first successful call.  Changing the

From d234902b7c2ff88435f84f741b74e959c764daaf Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 3 Oct 2022 18:07:25 +0000
Subject: [PATCH 226/428] Add configurable cache_size to batch-runner and
 speedtest1-worker. Add SQL tracing to demo-123.js just for demonstration's
 sake.

FossilOrigin-Name: 2ab065133bec19f71a1dc382946fdbd020920b2e38a526f4126a3a1e8df5de87
---
 ext/wasm/batch-runner.html      |  2 --
 ext/wasm/batch-runner.js        | 60 ++++++++-------------------------
 ext/wasm/demo-123.js            |  2 +-
 ext/wasm/speedtest1-worker.html |  6 ++--
 manifest                        | 18 +++++-----
 manifest.uuid                   |  2 +-
 6 files changed, 28 insertions(+), 62 deletions(-)

diff --git a/ext/wasm/batch-runner.html b/ext/wasm/batch-runner.html
index a07fe930ac..e7a2b1e082 100644
--- a/ext/wasm/batch-runner.html
+++ b/ext/wasm/batch-runner.html
@@ -69,8 +69,6 @@
         <label for='cb-reverse-log-order'>Reverse log order (newest first)</label>
       </span>
     <div id='test-output'></div>
-    <!-- batch-runner.js "should" work with sqlite3-kvvfs so long as
-         its data sets don't violate the the storage limits. -->
     <script src="sqlite3-wasmfs.js"></script>
     <script src="common/SqliteTestUtil.js"></script>
     <script src="batch-runner.js"></script>
diff --git a/ext/wasm/batch-runner.js b/ext/wasm/batch-runner.js
index 36083e62f1..c40157bb59 100644
--- a/ext/wasm/batch-runner.js
+++ b/ext/wasm/batch-runner.js
@@ -18,6 +18,11 @@
   const toss = function(...args){throw new Error(args.join(' '))};
   const warn = console.warn.bind(console);
   let sqlite3;
+  const urlParams = new URL(self.location.href).searchParams;
+  const cacheSize = (()=>{
+    if(urlParams.has('cachesize')) return +urlParams.get('cachesize');
+    return 200;
+  })();
 
   /** Throws if the given sqlite3 result code is not 0. */
   const checkSqliteRc = (dbh,rc)=>{
@@ -63,51 +68,8 @@
     // This would be SO much easier with the oo1 API, but we specifically want to
     // inject metrics we can't get via that API, and we cannot reliably (OPFS)
     // open the same DB twice to clear it using that API, so...
-    let pStmt = 0, pSqlBegin;
-    const capi = sqlite3.capi, wasm = capi.wasm;
-    const scope = wasm.scopedAllocPush();
-    try {
-      const toDrop = [/* type, name pairs */];
-      const ppStmt = wasm.scopedAllocPtr();
-      // Collect list of tables/etc we can drop...
-      let rc = capi.sqlite3_prepare_v2(db.handle, sqlToDrop, -1, ppStmt, null);
-      checkSqliteRc(db.handle,rc);
-      pStmt = wasm.getPtrValue(ppStmt);
-      while(capi.SQLITE_ROW===capi.sqlite3_step(pStmt)){
-        toDrop.push(capi.sqlite3_column_text(pStmt,0),
-                    capi.sqlite3_column_text(pStmt,1));
-      }
-      capi.sqlite3_finalize(pStmt);
-      pStmt = 0;
-      // Build SQL to delete them...
-      const sqlDrop = [];
-      const doDrop = 0!==toDrop.length;
-      while(doDrop){
-        const name = toDrop.pop();
-        if(name){
-          const type = toDrop.pop();
-          switch(type){
-              case 'table': case 'view': case 'trigger': case 'index':
-                sqlDrop.push('DROP '+type+' '+name);
-                break;
-              default:
-                warn("Unhandled db entry type:",type,name);
-                continue;
-          }
-        }else{
-          sqlDrop.push("VACUUM");
-          break;
-        }
-      }
-      if(sqlDrop.length){
-        const sqlClean = sqlDrop.join(';\n');
-        console.log("Cleaning up",db.id,":",sqlClean);
-        capi.sqlite3_exec(db.handle, sqlClean, 0, 0, 0);
-      }
-    }finally{
-      if(pStmt) capi.sqlite3_finalize(pStmt);
-      wasm.scopedAllocPop(scope);
-    }
+    const rc = sqlite3.capi.wasm.exports.sqlite3_wasm_db_reset(db.handle);
+    App.logHtml("reset db rc =",rc,db.id, db.filename);
   };
 
   
@@ -521,6 +483,10 @@
       if('websql' === dbId){
         d.handle = self.openDatabase('batch-runner', '0.1', 'foo', 1024 * 1024 * 50);
         d.clear = ()=>clearDbWebSQL(d);
+        d.handle.transaction(function(tx){
+          tx.executeSql("PRAGMA cache_size="+cacheSize);
+          App.logHtml(dbId,"cache_size =",cacheSize);
+        });
       }else{
         const capi = this.sqlite3.capi, wasm = capi.wasm;
         const stack = wasm.scopedAllocPush();
@@ -531,6 +497,8 @@
           const rc = capi.sqlite3_open_v2(d.filename, ppDb, oFlags, null);
           pDb = wasm.getPtrValue(ppDb)
           if(rc) toss("sqlite3_open_v2() failed with code",rc);
+          capi.sqlite3_exec(pDb, "PRAGMA cache_size="+cacheSize, 0, 0, 0);
+          this.logHtml(dbId,"cache_size =",cacheSize);
         }catch(e){
           if(pDb) capi.sqlite3_close_v2(pDb);
         }finally{
@@ -540,7 +508,7 @@
         d.clear = ()=>clearDbSqlite(d);
       }
       d.clear();
-      this.logHtml("Opened db:",dbId);
+      this.logHtml("Opened db:",dbId,d.filename);
       console.log("db =",d);
       return d;
     },
diff --git a/ext/wasm/demo-123.js b/ext/wasm/demo-123.js
index 67c1094f02..ff36aaf4e2 100644
--- a/ext/wasm/demo-123.js
+++ b/ext/wasm/demo-123.js
@@ -45,7 +45,7 @@
     const capi = sqlite3.capi/*C-style API*/,
           oo = sqlite3.oo1/*high-level OO API*/;
     log("sqlite3 version",capi.sqlite3_libversion(), capi.sqlite3_sourceid());
-    const db = new oo.DB("/mydb.sqlite3");
+    const db = new oo.DB("/mydb.sqlite3",'ct');
     log("transient db =",db.filename);
     /**
        Never(!) rely on garbage collection to clean up DBs and
diff --git a/ext/wasm/speedtest1-worker.html b/ext/wasm/speedtest1-worker.html
index 87c504f4bb..2c05fe6b15 100644
--- a/ext/wasm/speedtest1-worker.html
+++ b/ext/wasm/speedtest1-worker.html
@@ -31,7 +31,7 @@
         <div id='toolbar-select'>
           <select id='select-flags' size='10' multiple></select>
           <div>The following flags can be passed as URL parameters:
-            vfs=NAME, size=N, journal=MODE
+            vfs=NAME, size=N, journal=MODE, cachesize=BYTES
           </div>
         </div>
         <div class='toolbar-inner-vertical'>
@@ -183,7 +183,7 @@
     const getSelectedFlags = ()=>{
         const f = Array.prototype.map.call(eFlags.selectedOptions, (v)=>v.value);
         [
-            'size', 'vfs', 'journal'
+            'size', 'vfs', 'journal', 'cachesize'
         ].forEach(function(k){
             if(urlParams.has(k)) f.push('--'+k, urlParams.get(k));
         });
@@ -214,7 +214,7 @@
            (e.g. --script FILE). */
         flags["--autovacuum"] = "Enable AUTOVACUUM mode";
         flags["--big-transactions"] = "Important for tests 410 and 510!";
-        //flags["--cachesize"] = "N       Set the cache size to N";
+        //flags["--cachesize"] = "N       Set the cache size to N pages";
         flags["--checkpoint"] = "Run PRAGMA wal_checkpoint after each test case";
         flags["--exclusive"] = "Enable locking_mode=EXCLUSIVE";
         flags["--explain"] = "Like --sqlonly but with added EXPLAIN keywords";
diff --git a/manifest b/manifest
index 48a1fe6ab0..94681f80a7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Omit\sWAL\smode\sfrom\sthe\swasm\sbuild.
-D 2022-10-03T18:05:27.610
+C Add\sconfigurable\scache_size\sto\sbatch-runner\sand\sspeedtest1-worker.\sAdd\sSQL\stracing\sto\sdemo-123.js\sjust\sfor\sdemonstration's\ssake.
+D 2022-10-03T18:07:25.896
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -492,15 +492,15 @@ F ext/wasm/api/sqlite3-api-prologue.js 915e3119d2c3cd53afb9575d1681646f3cbebbfc6
 F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 3838ad650c9f92803e810f09a1253b25252a6533b09620b3450194d72084094f
-F ext/wasm/batch-runner.html c363032aba7a525920f61f8be112a29459f73f07e46f0ba3b7730081a617826e
-F ext/wasm/batch-runner.js ce92650a6681586c89bef26ceae96674a55ca5a9727815202ca62e1a00ff5015
+F ext/wasm/batch-runner.html cf1a410c92bad50fcec2ddc71390b4e9df63a6ea1bef12a5163a66a0af4d78d9
+F ext/wasm/batch-runner.js 5bae81684728b6be157d1f92b39824153f0fd019345b39f2ab8930f7ee2a57d8
 F ext/wasm/common/SqliteTestUtil.js 647bf014bd30bdd870a7e9001e251d12fc1c9ec9ce176a1004b838a4b33c5c05
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 3a5143699c2b73a85b962271e1a9b3241b30d90e30d895e4f55665e648572962
 F ext/wasm/common/whwasmutil.js bc8522a071f4754af7b50f53807b95f691d2f9e44fc3b3e8c65dff6ef2485c0d
 F ext/wasm/demo-123-worker.html e419b66495d209b5211ec64903b4cfb3ca7df20d652b41fcd28bf018a773234f
 F ext/wasm/demo-123.html aa281d33b7eefa755f3122b7b5a18f39a42dc5fb69c8879171bf14b4c37c4ec4
-F ext/wasm/demo-123.js 9fbc5cd3af842d361e9f8353ae4af9f471c2b2517e55446474406620485b9ee6
+F ext/wasm/demo-123.js d563cf9d725692ccd940c46df1c026d87863e0544942a2ba2015f17fba3f6f74
 F ext/wasm/demo-kvvfs1.html 7d4f28873de67f51ac18c584b7d920825139866a96049a49c424d6f5a0ea5e7f
 F ext/wasm/demo-kvvfs1.js 105596bd2ccd0b1deb5fde8e99b536e8242d4bb5932fac0c8403ff3a6bc547e8
 F ext/wasm/fiddle.make 3f4efd62bc2a9c883bfcea52ae2755114a62d444d6d042df287f4aef301d6c6c
@@ -516,7 +516,7 @@ F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e5
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
 F ext/wasm/scratchpad-wasmfs-main.js 1aa32c1035cf1440a226a28fefcbb5762fbbcb020ccbe5895f8736d701695c63
 F ext/wasm/speedtest1-wasmfs.html bc28eb29b69a73864b8d7aae428448f8b7e1de81d8bfb9bba99541322054dbd0
-F ext/wasm/speedtest1-worker.html 59538e3b9456320322e4280bd993d0a35a074795c30465ed60d1e1532a620015
+F ext/wasm/speedtest1-worker.html 88cfde771f3d0f155e9db18dc146f6d9407c77f9b69612d56469da5cfb4b509e
 F ext/wasm/speedtest1-worker.js a9e3d052dd1d8016d6e9a641e596e6d99aec04ef8995d7ee9a85a9964eed771a
 F ext/wasm/speedtest1.html e4cb5d722b494104fc1249e7c008ca018f820a784833c51004c958c71038c80f
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
@@ -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 2ea35fea3bac2637e935643edfa7913b792e529de3a8980dbb8678d98ed5bcf9
-R 4e7ff28ad053bdee7ff28b0243888886
+P 88efe2a62b81e5ee9119f54204e397fda59666a327158c7b7c972e84a716869e
+R e4cfca7fa8dc0ddfc724eef315a64084
 U stephan
-Z 9e8543639097e90c8529ba696f0d6371
+Z 9051d6662324e24de6581c6cede89762
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index d705215e2d..3a5b0baa56 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-88efe2a62b81e5ee9119f54204e397fda59666a327158c7b7c972e84a716869e
\ No newline at end of file
+2ab065133bec19f71a1dc382946fdbd020920b2e38a526f4126a3a1e8df5de87
\ No newline at end of file

From 8d9e5955136a790d94fcc10c25fc677905402500 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 3 Oct 2022 22:38:00 +0000
Subject: [PATCH 227/428] Minor JS doc updates and typo fixes.

FossilOrigin-Name: 3cfcc14dfd220536141aeffb902fdc8db1cea055b2a0609b88e092fc3df94688
---
 ext/wasm/api/sqlite3-api-glue.js     |  4 ++--
 ext/wasm/api/sqlite3-api-prologue.js | 36 ++++++++++++++--------------
 manifest                             | 14 +++++------
 manifest.uuid                        |  2 +-
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index a4c9627bdd..27d75682a1 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -457,7 +457,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
 
        - `null`: sqlite3_result_null()
        - `boolean`: sqlite3_result_int()
-       - `number': sqlite3_result_int() or sqlite3_result_double()
+       - `number`: sqlite3_result_int() or sqlite3_result_double()
        - `string`: sqlite3_result_text()
        - Uint8Array or Int8Array: sqlite3_result_blob()
 
@@ -474,7 +474,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        them (xFunc, xStep, xInverse), it creates a JS array
        representing those arguments, converting each to JS in a manner
        appropriate to its data type: numeric, text, blob
-       (Uint8Array()), or null.
+       (Uint8Array), or null.
 
        Results are undefined if it's passed anything other than those
        two arguments from those specific contexts.
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 377f671fce..adf56b3a0a 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -304,7 +304,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
        counterpart only in the following ways:
 
        1) The fourth argument (`eTextRep`) argument must not specify
-       any encoding other than sqlite.SQLITE_UTF8. The JS API does not
+       any encoding other than sqlite3.SQLITE_UTF8. The JS API does not
        currently support any other encoding and likely never
        will. This function does not replace that argument on its own
        because it may contain other flags.
@@ -332,21 +332,22 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
 
        Note that:
 
-       - `pCtx` in the above descriptions is a `sqlite3_context*`. 99
-         times out of a hundred, or maybe more, that initial argument
-         will be irrelevant for JS UDF bindings, but it needs to be
-         there so that the cases where it _is_ relevant, in particular
-         with window and aggregate functions, have full access to the
-         underlying sqlite3 APIs.
+       - `pCtx` in the above descriptions is a `sqlite3_context*`. At
+         least 99 times out of a hundred, that initial argument will
+         be irrelevant for JS UDF bindings, but it needs to be there
+         so that the cases where it _is_ relevant, in particular with
+         window and aggregate functions, have full access to the
+         lower-level sqlite3 APIs.
 
-       - When wrapping JS functions, the remaining arguments arrive as
-         positional arguments, not as an array of arguments, because
-         that allows callback definitions to be more JS-idiomatic than
-         C-like, for example `(pCtx,a,b)=>a+b` is more intuitive and
-         legible than `(pCtx,args)=>args[0]+args[1]`. For cases where
-         an array of arguments would be more convenient, the callbacks
-         simply need to be declared like `(pCtx,...args)=>{...}`, in
-         which case `args` will be an array.
+       - When wrapping JS functions, the remaining arguments are passd
+         to them as positional arguments, not as an array of
+         arguments, because that allows callback definitions to be
+         more JS-idiomatic than C-like. For example `(pCtx,a,b)=>a+b`
+         is more intuitive and legible than
+         `(pCtx,args)=>args[0]+args[1]`. For cases where an array of
+         arguments would be more convenient, the callbacks simply need
+         to be declared like `(pCtx,...args)=>{...}`, in which case
+         `args` will be an array.
 
        - If a JS wrapper throws, it gets translated to
          sqlite3_result_error() or sqlite3_result_error_nomem(),
@@ -371,9 +372,8 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
          is feasible, triggering an exception if a type conversion
          cannot be determined. Some freedom is afforded to numeric
          conversions due to friction between the JS and C worlds:
-         integers which are larger than 32 bits will be treated as
-         doubles. TODO: use BigInt support if enabled. That feature
-         was added after this functionality was implemented.
+         integers which are larger than 32 bits may be treated as
+         doubles or BigInts.
 
        If any JS-side bound functions throw, those exceptions are
        intercepted and converted to database-side errors with the
diff --git a/manifest b/manifest
index 94681f80a7..0bb7c8dadb 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sconfigurable\scache_size\sto\sbatch-runner\sand\sspeedtest1-worker.\sAdd\sSQL\stracing\sto\sdemo-123.js\sjust\sfor\sdemonstration's\ssake.
-D 2022-10-03T18:07:25.896
+C Minor\sJS\sdoc\supdates\sand\stypo\sfixes.
+D 2022-10-03T22:38:00.357
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -485,10 +485,10 @@ F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba814
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
 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-glue.js 24a283a49759914f2433b3118865145efbb2f67f52643e445065e02ccecc081b
 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-prologue.js 61f28bf7a51479c7b401e2da636b2a0710de77d86f68961445d572a3761dd170
 F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 3838ad650c9f92803e810f09a1253b25252a6533b09620b3450194d72084094f
@@ -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 88efe2a62b81e5ee9119f54204e397fda59666a327158c7b7c972e84a716869e
-R e4cfca7fa8dc0ddfc724eef315a64084
+P 2ab065133bec19f71a1dc382946fdbd020920b2e38a526f4126a3a1e8df5de87
+R 1dacfb5e365c4f4cd2a2faf9c5eccc99
 U stephan
-Z 9051d6662324e24de6581c6cede89762
+Z 5fe50f9b4908846a058264def7451aab
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 3a5b0baa56..8ef0f8848f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2ab065133bec19f71a1dc382946fdbd020920b2e38a526f4126a3a1e8df5de87
\ No newline at end of file
+3cfcc14dfd220536141aeffb902fdc8db1cea055b2a0609b88e092fc3df94688
\ No newline at end of file

From faf6a07965afce83e4563053b35ea2a11c870676 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 3 Oct 2022 22:51:24 +0000
Subject: [PATCH 228/428] Add a --cachesize flag to the speedtest1-worker-opfs
 link in index.html because opfs is much faster with that.

FossilOrigin-Name: 5b8f8e33afc47c9f0c64dbe34643d7d1c37a0a82afb4656e714a86ef54a9ce6f
---
 ext/wasm/index.html |  2 +-
 manifest            | 12 ++++++------
 manifest.uuid       |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ext/wasm/index.html b/ext/wasm/index.html
index 20668db20e..2cd966a1ee 100644
--- a/ext/wasm/index.html
+++ b/ext/wasm/index.html
@@ -62,7 +62,7 @@
             <li><a href='speedtest1-wasmfs.html?flags=--size,25'>speedtest1-wasmfs</a>: a variant of speedtest1 built solely for the wasmfs/opfs feature.</li>
             <li><a href='speedtest1.html?vfs=kvvfs'>speedtest1-kvvfs</a>: speedtest1 with the kvvfs.</li>
             <li><a href='speedtest1-worker.html?size=25'>speedtest1-worker</a>: an interactive Worker-thread variant of speedtest1.</li>
-            <li><a href='speedtest1-worker.html?vfs=opfs&size=25'>speedtest1-worker-opfs</a>: speedtest1-worker with the
+            <li><a href='speedtest1-worker.html?vfs=opfs&size=25&cachesize=-4096'>speedtest1-worker-opfs</a>: speedtest1-worker with the
               OPFS VFS preselected and configured for a moderate workload.</li>
           </ul>
         </li>
diff --git a/manifest b/manifest
index 0bb7c8dadb..d0ffe85065 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\sJS\sdoc\supdates\sand\stypo\sfixes.
-D 2022-10-03T22:38:00.357
+C Add\sa\s--cachesize\sflag\sto\sthe\sspeedtest1-worker-opfs\slink\sin\sindex.html\sbecause\sopfs\sis\smuch\sfaster\swith\sthat.
+D 2022-10-03T22:51:24.381
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -508,7 +508,7 @@ F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d695
 F ext/wasm/fiddle/fiddle-worker.js 531859a471924a0ea48afa218e6877f0c164ca324d51e15843ed6ecc1c65c7ee
 F ext/wasm/fiddle/fiddle.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
 F ext/wasm/fiddle/fiddle.js 974b995119ac443685d7d94d3b3c58c6a36540e9eb3fed7069d5653284071715
-F ext/wasm/index.html 63b370619e4f849ac76f1baed435c05edc29dbb6795bc7c1c935561ff667dd27
+F ext/wasm/index.html 067171cadf2acbb8a0a87d20480c0d47d740dccda55045bed05505efe80cc245
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 9aa6951b529a8b29f578ec8f0355713c39584c92cf1708f63ba0cf917cb5b68e
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
@@ -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 2ab065133bec19f71a1dc382946fdbd020920b2e38a526f4126a3a1e8df5de87
-R 1dacfb5e365c4f4cd2a2faf9c5eccc99
+P 3cfcc14dfd220536141aeffb902fdc8db1cea055b2a0609b88e092fc3df94688
+R c3ddc7f08af0e1dfea53de525fac120d
 U stephan
-Z 5fe50f9b4908846a058264def7451aab
+Z c791e943ea41f9bead968e082bef6c31
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 8ef0f8848f..ca5bfae10c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3cfcc14dfd220536141aeffb902fdc8db1cea055b2a0609b88e092fc3df94688
\ No newline at end of file
+5b8f8e33afc47c9f0c64dbe34643d7d1c37a0a82afb4656e714a86ef54a9ce6f
\ No newline at end of file

From 88838f6b95fc468e7df46d0cb223dace60cf6f79 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 3 Oct 2022 23:13:05 +0000
Subject: [PATCH 229/428] Set default page cache size to 16mb in wasm builds.
 Fix an off-by-one counter in sqlite3_wasm_enum_json(). Minor coding style
 conformance tweaks.

FossilOrigin-Name: 72a9e589cc318ec50941739e2edf2c0636284b316c3bf87b71fd363b37619da3
---
 ext/wasm/api/sqlite3-wasm.c | 59 ++++++++++++++++++++++++++-----------
 manifest                    | 12 ++++----
 manifest.uuid               |  2 +-
 3 files changed, 49 insertions(+), 24 deletions(-)

diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index aaf6a78563..f7acbc29c4 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -58,6 +58,26 @@
 #ifndef SQLITE_OMIT_WAL
 # define SQLITE_OMIT_WAL
 #endif
+#ifndef SQLITE_DEFAULT_CACHE_SIZE
+/*
+** The OPFS impls benefit tremendously from an increased cache size
+** when working on large workloads, e.g. speedtest1 --size 50 or
+** higher. On smaller workloads, e.g. speedtest1 --size 25, they
+** clearly benefit from having 4mb of cache, but not as much as a
+** larger cache benefits the larger workloads. Speed differences
+** between 2x and nearly 3x have been measured with ample page cache.
+*/
+# define SQLITE_DEFAULT_CACHE_SIZE -16777216
+#endif
+
+#if 0
+/*
+** TODO: experiment with this when back on the opfs-capable machine.
+*/
+#ifndef SQLITE_DEFAULT_PAGE_SIZE
+# define SQLITE_DEFAULT_PAGE_SIZE 8192 /*4096*/
+#endif
+#endif
 
 #include <assert.h>
 #include "sqlite3.c" /* yes, .c instead of .h. */
@@ -140,6 +160,11 @@ WASM_KEEP void * sqlite3_wasm_stack_alloc(int n){
 ** memory to use for that purpose. This memory ends up in the
 ** WASM-managed memory, such that routines which manipulate the wasm
 ** heap can also be used to manipulate this memory.
+**
+** This particular allocator is intended for small allocations such as
+** storage for output pointers. We cannot reasonably size it large
+** enough for general-purpose string conversions because some of our
+** tests use input files (strings) of 16MB+.
 */
 static unsigned char PStack_mem[512 * 8] = {0};
 static struct {
@@ -239,35 +264,35 @@ int sqlite3_wasm_db_error(sqlite3*db, int err_code, const char *zMsg){
 */
 WASM_KEEP
 const char * sqlite3_wasm_enum_json(void){
-  static char strBuf[1024 * 12] = {0} /* where the JSON goes */;
-  int n = 0, childCount = 0, structCount = 0
+  static char azBuffer[1024 * 12] = {0} /* where the JSON goes */;
+  int n = 0, nChildren = 0, nStruct = 0
     /* output counters for figuring out where commas go */;
-  char * pos = &strBuf[1] /* skip first byte for now to help protect
+  char * zPos = &azBuffer[1] /* skip first byte for now to help protect
                           ** against a small race condition */;
-  char const * const zEnd = pos + sizeof(strBuf) /* one-past-the-end */;
-  if(strBuf[0]) return strBuf;
-  /* Leave strBuf[0] at 0 until the end to help guard against a tiny
+  char const * const zEnd = &azBuffer[0] + sizeof(azBuffer) /* one-past-the-end */;
+  if(azBuffer[0]) return azBuffer;
+  /* Leave azBuffer[0] at 0 until the end to help guard against a tiny
   ** race condition. If this is called twice concurrently, they might
-  ** end up both writing to strBuf, but they'll both write the same
+  ** end up both writing to azBuffer, but they'll both write the same
   ** thing, so that's okay. If we set byte 0 up front then the 2nd
   ** instance might return and use the string before the 1st instance
   ** is done filling it. */
 
 /* Core output macros... */
-#define lenCheck assert(pos < zEnd - 128 \
+#define lenCheck assert(zPos < zEnd - 128 \
   && "sqlite3_wasm_enum_json() buffer is too small."); \
-  if(pos >= zEnd - 128) return 0
+  if( zPos >= zEnd - 128 ) return 0
 #define outf(format,...) \
-  pos += snprintf(pos, ((size_t)(zEnd - pos)), format, __VA_ARGS__); \
+  zPos += snprintf(zPos, ((size_t)(zEnd - zPos)), format, __VA_ARGS__); \
   lenCheck
 #define out(TXT) outf("%s",TXT)
 #define CloseBrace(LEVEL) \
-  assert(LEVEL<5); memset(pos, '}', LEVEL); pos+=LEVEL; lenCheck
+  assert(LEVEL<5); memset(zPos, '}', LEVEL); zPos+=LEVEL; lenCheck
 
 /* Macros for emitting maps of integer- and string-type macros to
 ** their values. */
 #define DefGroup(KEY) n = 0; \
-  outf("%s\"" #KEY "\": {",(childCount++ ? "," : ""));
+  outf("%s\"" #KEY "\": {",(nChildren++ ? "," : ""));
 #define DefInt(KEY)                                     \
   outf("%s\"%s\": %d", (n++ ? ", " : ""), #KEY, (int)KEY)
 #define DefStr(KEY)                                     \
@@ -575,7 +600,7 @@ const char * sqlite3_wasm_enum_json(void){
   /** Macros for emitting StructBinder description. */
 #define StructBinder__(TYPE)                 \
   n = 0;                                     \
-  outf("%s{", (structCount++ ? ", " : ""));  \
+  outf("%s{", (nStruct++ ? ", " : ""));  \
   out("\"name\": \"" # TYPE "\",");         \
   outf("\"sizeof\": %d", (int)sizeof(TYPE)); \
   out(",\"members\": {");
@@ -591,7 +616,7 @@ const char * sqlite3_wasm_enum_json(void){
        (int)sizeof(((CurrentStruct*)0)->MEMBER),              \
        SIG)
 
-  structCount = 0;
+  nStruct = 0;
   out(", \"structs\": ["); {
 
 #define CurrentStruct sqlite3_vfs
@@ -654,9 +679,9 @@ const char * sqlite3_wasm_enum_json(void){
   } out( "]"/*structs*/);
 
   out("}"/*top-level object*/);
-  *pos = 0;
-  strBuf[0] = '{'/*end of the race-condition workaround*/;
-  return strBuf;
+  *zPos = 0;
+  azBuffer[0] = '{'/*end of the race-condition workaround*/;
+  return azBuffer;
 #undef StructBinder
 #undef StructBinder_
 #undef StructBinder__
diff --git a/manifest b/manifest
index d0ffe85065..3e7ab37952 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\s--cachesize\sflag\sto\sthe\sspeedtest1-worker-opfs\slink\sin\sindex.html\sbecause\sopfs\sis\smuch\sfaster\swith\sthat.
-D 2022-10-03T22:51:24.381
+C Set\sdefault\spage\scache\ssize\sto\s16mb\sin\swasm\sbuilds.\sFix\san\soff-by-one\scounter\sin\ssqlite3_wasm_enum_json().\sMinor\scoding\sstyle\sconformance\stweaks.
+D 2022-10-03T23:13:05.622
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -491,7 +491,7 @@ F ext/wasm/api/sqlite3-api-opfs.js 3d17da752181d67847bd2e3d1f4662df31c5023a1bed5
 F ext/wasm/api/sqlite3-api-prologue.js 61f28bf7a51479c7b401e2da636b2a0710de77d86f68961445d572a3761dd170
 F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c 3838ad650c9f92803e810f09a1253b25252a6533b09620b3450194d72084094f
+F ext/wasm/api/sqlite3-wasm.c 1ed1356752c02a991b2d16c32e3e5c138a03526bb60182f2a751ec5372ecba12
 F ext/wasm/batch-runner.html cf1a410c92bad50fcec2ddc71390b4e9df63a6ea1bef12a5163a66a0af4d78d9
 F ext/wasm/batch-runner.js 5bae81684728b6be157d1f92b39824153f0fd019345b39f2ab8930f7ee2a57d8
 F ext/wasm/common/SqliteTestUtil.js 647bf014bd30bdd870a7e9001e251d12fc1c9ec9ce176a1004b838a4b33c5c05
@@ -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 3cfcc14dfd220536141aeffb902fdc8db1cea055b2a0609b88e092fc3df94688
-R c3ddc7f08af0e1dfea53de525fac120d
+P 5b8f8e33afc47c9f0c64dbe34643d7d1c37a0a82afb4656e714a86ef54a9ce6f
+R 9e18661e1500a3e4cdfa05bc23635f3f
 U stephan
-Z c791e943ea41f9bead968e082bef6c31
+Z e3d9878d6daf198d0150d0ecad381b11
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index ca5bfae10c..3874ec261e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5b8f8e33afc47c9f0c64dbe34643d7d1c37a0a82afb4656e714a86ef54a9ce6f
\ No newline at end of file
+72a9e589cc318ec50941739e2edf2c0636284b316c3bf87b71fd363b37619da3
\ No newline at end of file

From 3c272ba380084e48e583c13898aeac1aa3cc4f86 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 4 Oct 2022 00:54:00 +0000
Subject: [PATCH 230/428] Add a test/debug mechanism to shut down the OPFS
 async listener so that it can be inspected (it normally can't be because its
 tight event-listening loop ties up the thread) and then restarted.

FossilOrigin-Name: 7d0bcff4e9b899cd25b393b9f0a02c5dcee2e229f0a0fa01719c7dcd7dcbe7c1
---
 ext/wasm/api/sqlite3-api-opfs.js     | 20 +++++++++++++++++--
 ext/wasm/sqlite3-opfs-async-proxy.js | 29 ++++++++++++++++++++++++----
 manifest                             | 14 +++++++-------
 manifest.uuid                        |  2 +-
 4 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index 42c0e11662..7b85ac06c8 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -142,7 +142,7 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
                     "\nTotal of",n,"op(s) for",t,
                     "ms (incl. "+w+" ms of waiting on the async side)");
         console.log("Serialization metrics:",metrics.s11n);
-        opRun('async-metrics');
+        W.postMessage({type:'opfs-async-metrics'});
       },
       reset: function(){
         let k;
@@ -285,7 +285,8 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
       state.opIds.xTruncate = i++;
       state.opIds.xWrite = i++;
       state.opIds.mkdir = i++;
-      state.opIds['async-metrics'] = i++;
+      state.opIds['opfs-async-metrics'] = i++;
+      state.opIds['opfs-async-shutdown'] = i++;
       state.sabOP = new SharedArrayBuffer(i * 4/*sizeof int32*/);
       opfsUtil.metrics.reset();
     }
@@ -888,6 +889,20 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
       );
     };
 
+    /**
+       Only for test/development use.
+    */
+    opfsUtil.debug = {
+      asyncShutdown: ()=>{
+        warn("Shutting down OPFS async listener. OPFS will no longer work.");
+        opRun('opfs-async-shutdown');
+      },
+      asyncRestart: ()=>{
+        warn("Attempting to restart OPFS async listener. Might work, might not.");
+        W.postMessage({type: 'opfs-async-restart'});
+      }
+    };
+
     //TODO to support fiddle db upload:
     //opfsUtil.createFile = function(absName, content=undefined){...}
 
@@ -1028,6 +1043,7 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
             break;
       }
     };
+
   })/*thePromise*/;
   return thePromise;
 }/*installOpfsVfs()*/;
diff --git a/ext/wasm/sqlite3-opfs-async-proxy.js b/ext/wasm/sqlite3-opfs-async-proxy.js
index 0abc3ee233..58bbf79284 100644
--- a/ext/wasm/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/sqlite3-opfs-async-proxy.js
@@ -207,18 +207,29 @@ const wTimeEnd = ()=>(
   metrics[waitTimer.op].wait += performance.now() - waitTimer.start
 );
 
+/**
+   Set to true by the 'opfs-async-shutdown' command to quite the wait loop.
+   This is only intended for debugging purposes: we cannot inspect this
+   file's state while the tight waitLoop() is running.
+*/
+let flagAsyncShutdown = false;
+
 /**
    Asynchronous wrappers for sqlite3_vfs and sqlite3_io_methods
    methods. Maintenance reminder: members are in alphabetical order
    to simplify finding them.
 */
 const vfsAsyncImpls = {
-  'async-metrics': async ()=>{
-    mTimeStart('async-metrics');
+  'opfs-async-metrics': async ()=>{
+    mTimeStart('opfs-async-metrics');
     metrics.dump();
-    storeAndNotify('async-metrics', 0);
+    storeAndNotify('opfs-async-metrics', 0);
     mTimeEnd();
   },
+  'opfs-async-shutdown': async ()=>{
+    flagAsyncShutdown = true;
+    storeAndNotify('opfs-async-shutdown', 0);
+  },
   mkdir: async (dirname)=>{
     mTimeStart('mkdir');
     let rc = 0;
@@ -597,7 +608,7 @@ const waitLoop = async function f(){
   const relinquishTime = 1000;
   let lastOpTime = performance.now();
   let now;
-  while(true){
+  while(!flagAsyncShutdown){
     try {
       if('timed-out'===Atomics.wait(
         state.sabOPView, state.opIds.whichOp, 0, waitTime
@@ -669,6 +680,16 @@ navigator.storage.getDirectory().then(function(d){
           waitLoop();
           break;
         }
+        case 'opfs-async-restart':
+          if(flagAsyncShutdown){
+            warn("Restarting after opfs-async-shutdown. Might or might not work.");
+            flagAsyncShutdown = false;
+            waitLoop();
+          }
+          break;
+        case 'opfs-async-metrics':
+          metrics.dump();
+          break;
     }
   };
   wMsg('opfs-async-loaded');
diff --git a/manifest b/manifest
index 3e7ab37952..53cf33f4a3 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Set\sdefault\spage\scache\ssize\sto\s16mb\sin\swasm\sbuilds.\sFix\san\soff-by-one\scounter\sin\ssqlite3_wasm_enum_json().\sMinor\scoding\sstyle\sconformance\stweaks.
-D 2022-10-03T23:13:05.622
+C Add\sa\stest/debug\smechanism\sto\sshut\sdown\sthe\sOPFS\sasync\slistener\sso\sthat\sit\scan\sbe\sinspected\s(it\snormally\scan't\sbe\sbecause\sits\stight\sevent-listening\sloop\sties\sup\sthe\sthread)\sand\sthen\srestarted.
+D 2022-10-04T00:54:00.533
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -487,7 +487,7 @@ F ext/wasm/api/pre-js.js 2db711eb637991b383fc6b5c0f3df65ec48a7201e5730e304beba8d
 F ext/wasm/api/sqlite3-api-cleanup.js 5d22d1d3818ecacb23bfa223d5970cd0617d8cdbb48c8bc4bbd463f05b021a99
 F ext/wasm/api/sqlite3-api-glue.js 24a283a49759914f2433b3118865145efbb2f67f52643e445065e02ccecc081b
 F ext/wasm/api/sqlite3-api-oo1.js ac1e08d36bdfb5aa0a2d75b7d4c892fd51819d34c932370c3282810672bcc086
-F ext/wasm/api/sqlite3-api-opfs.js 3d17da752181d67847bd2e3d1f4662df31c5023a1bed5424ebcdeb89770046af
+F ext/wasm/api/sqlite3-api-opfs.js d82870cffef9eef6511c650759c3798b59f10c8338587789abd84be2d9d845c3
 F ext/wasm/api/sqlite3-api-prologue.js 61f28bf7a51479c7b401e2da636b2a0710de77d86f68961445d572a3761dd170
 F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
@@ -522,7 +522,7 @@ F ext/wasm/speedtest1.html e4cb5d722b494104fc1249e7c008ca018f820a784833c51004c95
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
-F ext/wasm/sqlite3-opfs-async-proxy.js 5c6748361f2eb2ee0f2941890917fd9f2d9271de80ec1b65695fb023435b8375
+F ext/wasm/sqlite3-opfs-async-proxy.js 3f8086e543a576a556c17f8ee7c75009fb8e2d3f9bbb9c0de6b9c285dd7f5634
 F ext/wasm/sqlite3-worker1-promiser.js 307d7837420ca6a9d3780dfc81194f1c0715637e6d9540e935514086b96913d8
 F ext/wasm/sqlite3-worker1.js 466e9bd39409ab03f3e00999887aaffc11e95b416e2689596e3d7f1516673fdf
 F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
@@ -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 5b8f8e33afc47c9f0c64dbe34643d7d1c37a0a82afb4656e714a86ef54a9ce6f
-R 9e18661e1500a3e4cdfa05bc23635f3f
+P 72a9e589cc318ec50941739e2edf2c0636284b316c3bf87b71fd363b37619da3
+R b598562b6232b1a22591d878d099e519
 U stephan
-Z e3d9878d6daf198d0150d0ecad381b11
+Z 962cbcc757fdf40c47c3a7056efb3d7c
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 3874ec261e..912cd619c4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-72a9e589cc318ec50941739e2edf2c0636284b316c3bf87b71fd363b37619da3
\ No newline at end of file
+7d0bcff4e9b899cd25b393b9f0a02c5dcee2e229f0a0fa01719c7dcd7dcbe7c1
\ No newline at end of file

From 2b776ee2d6d550ab4b106603c0664251bc12259f Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 4 Oct 2022 01:11:10 +0000
Subject: [PATCH 231/428] Minor cleanups and additions in
 sqlite3.capi.wasm.pstack.

FossilOrigin-Name: 97bd670d3859bd3f2e62c15065b238b85ef614f26479e56a14be42c5784aedf4
---
 ext/wasm/api/sqlite3-api-glue.js     |  50 --------
 ext/wasm/api/sqlite3-api-prologue.js | 163 +++++++++++++++++++--------
 ext/wasm/api/sqlite3-wasm.c          |  51 +++++----
 ext/wasm/testing1.js                 |  13 ++-
 manifest                             |  18 +--
 manifest.uuid                        |   2 +-
 6 files changed, 159 insertions(+), 138 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index 27d75682a1..2347a40c01 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -560,56 +560,6 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     };
   }/*sqlite3_prepare_v2/v3()*/;
 
-  if(1){// Extend wasm.pstack, now that the wasm utils are installed
-    /**
-       Allocates n chunks, each sz bytes, as a single memory block and
-       returns the addresses as an array of n element, each holding
-       the address of one chunk.
-
-       Throws a WasmAllocError if allocation fails.
-
-       Example:
-
-       ```
-       const [p1, p2, p3] = wasm.pstack.allocChunks(3,4);
-       ```
-    */
-    wasm.pstack.allocChunks = (n,sz)=>{
-      const mem = wasm.pstack.alloc(n * sz);
-      const rc = [];
-      let i = 0, offset = 0;
-      for(; i < n; offset = (sz * ++i)){
-        rc.push(mem + offset);
-      }
-      return rc;
-    };
-
-    /**
-       A convenience wrapper for allocChunks() which sizes each chunks
-       as either 8 bytes (safePtrSize is truthy) or wasm.ptrSizeof (if
-       safePtrSize is falsy).
-
-       How it returns its result differs depending on its first
-       argument: if it's 1, it returns a single pointer value. If it's
-       more than 1, it returns the same as allocChunks().
-
-       When a returned pointers will refer to a 64-bit value, e.g. a
-       double or int64, and that value must be written or fetched,
-       e.g. using wasm.setMemValue() or wasm.getMemValue(), it is
-       important that the pointer in question be aligned to an 8-byte
-       boundary or else it will not be fetched or written properly and
-       will corrupt or read neighboring memory.
-
-       However, when all pointers involved point to "small" data, it
-       is safe to pass a falsy value to save to memory.
-    */
-    wasm.pstack.allocPtr = (n=1,safePtrSize=true) =>{
-      return 1===n
-        ? wasm.pstack.alloc(safePtrSize ? 8 : wasm.ptrSizeof)
-        : wasm.pstack.allocChunks(n, safePtrSize ? 8 : wasm.ptrSizeof);
-    };
-  }/*wasm.pstack filler*/
-
   {/* Import C-level constants and structs... */
     const cJson = wasm.xCall('sqlite3_wasm_enum_json');
     if(!cJson){
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index adf56b3a0a..59537a4995 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -610,12 +610,14 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     }/*wasm*/
   }/*capi*/;
 
+  const wasm = capi.wasm;
+
   /**
-     capi.wasm.alloc()'s srcTypedArray.byteLength bytes,
+     wasm.alloc()'s srcTypedArray.byteLength bytes,
      populates them with the values from the source
      TypedArray, and returns the pointer to that memory. The
      returned pointer must eventually be passed to
-     capi.wasm.dealloc() to clean it up.
+     wasm.dealloc() to clean it up.
 
      As a special case, to avoid further special cases where
      this is used, if srcTypedArray.byteLength is 0, it
@@ -628,27 +630,27 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
      Int8Array types and will throw if srcTypedArray is of
      any other type.
   */
-  capi.wasm.allocFromTypedArray = function(srcTypedArray){
+  wasm.allocFromTypedArray = function(srcTypedArray){
     affirmBindableTypedArray(srcTypedArray);
-    const pRet = capi.wasm.alloc(srcTypedArray.byteLength || 1);
-    capi.wasm.heapForSize(srcTypedArray.constructor).set(srcTypedArray.byteLength ? srcTypedArray : [0], pRet);
+    const pRet = wasm.alloc(srcTypedArray.byteLength || 1);
+    wasm.heapForSize(srcTypedArray.constructor).set(srcTypedArray.byteLength ? srcTypedArray : [0], pRet);
     return pRet;
   };
 
   const keyAlloc = config.allocExportName || 'malloc',
         keyDealloc =  config.deallocExportName || 'free';
   for(const key of [keyAlloc, keyDealloc]){
-    const f = capi.wasm.exports[key];
+    const f = wasm.exports[key];
     if(!(f instanceof Function)) toss("Missing required exports[",key,"] function.");
   }
 
-  capi.wasm.alloc = function(n){
-    const m = capi.wasm.exports[keyAlloc](n);
+  wasm.alloc = function(n){
+    const m = wasm.exports[keyAlloc](n);
     if(!m) throw new WasmAllocError("Failed to allocate "+n+" bytes.");
     return m;
   };
 
-  capi.wasm.dealloc = (m)=>capi.wasm.exports[keyDealloc](m);
+  wasm.dealloc = (m)=>wasm.exports[keyDealloc](m);
 
   /**
      Reports info about compile-time options using
@@ -679,7 +681,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
      "SQLITE_" prefix. When it returns an object of all options,
      the prefix is elided.
   */
-  capi.wasm.compileOptionUsed = function f(optName){
+  wasm.compileOptionUsed = function f(optName){
     if(!arguments.length){
       if(f._result) return f._result;
       else if(!f._opt){
@@ -720,7 +722,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
      is an array with 2+ elements:
 
      [ "c-side name",
-       "result type" (capi.wasm.xWrap() syntax),
+       "result type" (wasm.xWrap() syntax),
        [arg types in xWrap() syntax]
        // ^^^ this needn't strictly be an array: it can be subsequent
        // elements instead: [x,y,z] is equivalent to x,y,z
@@ -730,7 +732,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
      result/argument type strings gets plugged in at a later phase in
      the API initialization process.
   */
-  capi.wasm.bindingSignatures = [
+  wasm.bindingSignatures = [
     // Please keep these sorted by function name!
     ["sqlite3_aggregate_context","void*", "sqlite3_context*", "int"],
     ["sqlite3_bind_blob","int", "sqlite3_stmt*", "int", "*", "int", "*"
@@ -829,13 +831,13 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     ["sqlite3_value_type", "int", "sqlite3_value*"],
     ["sqlite3_vfs_find", "*", "string"],
     ["sqlite3_vfs_register", "int", "*", "int"]
-  ]/*capi.wasm.bindingSignatures*/;
+  ]/*wasm.bindingSignatures*/;
 
-  if(false && capi.wasm.compileOptionUsed('SQLITE_ENABLE_NORMALIZE')){
+  if(false && wasm.compileOptionUsed('SQLITE_ENABLE_NORMALIZE')){
     /* ^^^ "the problem" is that this is an option feature and the
        build-time function-export list does not currently take
        optional features into account. */
-    capi.wasm.bindingSignatures.push(["sqlite3_normalized_sql", "string", "sqlite3_stmt*"]);
+    wasm.bindingSignatures.push(["sqlite3_normalized_sql", "string", "sqlite3_stmt*"]);
   }
   
   /**
@@ -843,7 +845,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
      the others because we need to conditionally bind them or apply
      dummy impls, depending on the capabilities of the environment.
   */
-  capi.wasm.bindingSignatures.int64 = [
+  wasm.bindingSignatures.int64 = [
     ["sqlite3_bind_int64","int", ["sqlite3_stmt*", "int", "i64"]],
     ["sqlite3_changes64","i64", ["sqlite3*"]],
     ["sqlite3_column_int64","i64", ["sqlite3_stmt*", "int"]],
@@ -859,18 +861,18 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
   /**
      Functions which are intended solely for API-internal use by the
      WASM components, not client code. These get installed into
-     capi.wasm.
+     wasm.
 
      TODO: get rid of sqlite3_wasm_vfs_unlink(). It is ill-conceived
      and only rarely actually useful.
   */
-  capi.wasm.bindingSignatures.wasm = [
+  wasm.bindingSignatures.wasm = [
     ["sqlite3_wasm_vfs_unlink", "int", "string"]
   ];
 
 
   /**
-     sqlite3.capi.wasm.pstack (pseudo-stack) holds a special-case
+     sqlite3.wasm.pstack (pseudo-stack) holds a special-case
      stack-style allocator intended only for use with _small_ data of
      not more than (in total) a few kb in size, managed as if it were
      stack-based.
@@ -900,13 +902,13 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
      memory lives in the WASM heap and can be used with routines such
      as wasm.setMemValue() and any wasm.heap8u().slice().
   */
-  capi.wasm.pstack = Object.assign(Object.create(null),{
+  wasm.pstack = Object.assign(Object.create(null),{
     /**
        Sets the current ppstack position to the given pointer.
        Results are undefined if the passed-in value did not come from
        this.pointer.
     */
-    restore: capi.wasm.exports.sqlite3_wasm_pstack_restore,
+    restore: wasm.exports.sqlite3_wasm_pstack_restore,
     /**
        Attempts to allocate the given number of bytes from the
        pstack. On success, it zeroes out a block of memory of the
@@ -920,31 +922,89 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
        heap.
     */
     alloc: (n)=>{
-      return capi.wasm.exports.sqlite3_wasm_pstack_alloc(n)
+      return wasm.exports.sqlite3_wasm_pstack_alloc(n)
         || WasmAllocError.toss("Could not allocate",n,
                                "bytes from the pstack.");
+    },
+    /**
+       Allocates n chunks, each sz bytes, as a single memory block and
+       returns the addresses as an array of n element, each holding
+       the address of one chunk.
+
+       Throws a WasmAllocError if allocation fails.
+
+       Example:
+
+       ```
+       const [p1, p2, p3] = wasm.pstack.allocChunks(3,4);
+       ```
+    */
+    allocChunks: (n,sz)=>{
+      const mem = wasm.pstack.alloc(n * sz);
+      const r 
+= [];
+      let i = 0, offset = 0;
+      for(; i < n; offset = (sz * ++i)){
+        rc.push(mem + offset);
+      }
+      return rc;
+    },
+    /**
+       A convenience wrapper for allocChunks() which sizes each chunks
+       as either 8 bytes (safePtrSize is truthy) or wasm.ptrSizeof (if
+       safePtrSize is falsy).
+
+       How it returns its result differs depending on its first
+       argument: if it's 1, it returns a single pointer value. If it's
+       more than 1, it returns the same as allocChunks().
+
+       When a returned pointers will refer to a 64-bit value, e.g. a
+       double or int64, and that value must be written or fetched,
+       e.g. using wasm.setMemValue() or wasm.getMemValue(), it is
+       important that the pointer in question be aligned to an 8-byte
+       boundary or else it will not be fetched or written properly and
+       will corrupt or read neighboring memory.
+
+       However, when all pointers involved point to "small" data, it
+       is safe to pass a falsy value to save to memory.
+    */
+    allocPtr: (n=1,safePtrSize=true)=>{
+      return 1===n
+        ? wasm.pstack.alloc(safePtrSize ? 8 : wasm.ptrSizeof)
+        : wasm.pstack.allocChunks(n, safePtrSize ? 8 : wasm.ptrSizeof);
     }
-    // More methods get added after the capi.wasm object is populated
-    // by WhWasmUtilInstaller.
-  });
+  })/*wasm.pstack*/;
+  Object.defineProperties(wasm.pstack, {
+    /**
+       sqlite3.wasm.pstack.pointer resolves to the current pstack
+       position pointer. This value is intended _only_ to be passed to
+       restore().
+    */
+    pointer: {
+      configurable: false, iterable: true, writeable: false,
+      get: wasm.exports.sqlite3_wasm_pstack_ptr
+      //Whether or not a setter as an alternative to restore() is
+      //clearer or would just lead to confusion is unclear.
+      //set: wasm.exports.sqlite3_wasm_pstack_restore
+    },
+    /**
+      Resolves to the total number of bytes available in the pstack,
+      including any space which is currently allocated. This value is
+      a compile-time constant.
+    */
+    quota: {
+      configurable: false, iterable: true, writeable: false,
+      get: wasm.exports.sqlite3_wasm_pstack_quota
+    }    
+  })/*wasm.pstack properties*/;
+
   /**
-     sqlite3.capi.wasm.pstack.pointer resolves to the current pstack
-     position pointer. This value is intended _only_ to be passed to restore().
-  */
-  Object.defineProperty(capi.wasm.pstack, 'pointer', {
-    configurable: false, iterable: true, writeable: false,
-    get: capi.wasm.exports.sqlite3_wasm_pstack_ptr
-    //Whether or not a setter as an alternative to restore() is
-    //clearer or would just lead to confusion is unclear.
-    //set: capi.wasm.exports.sqlite3_wasm_pstack_restore
-  });
-  /**
-     sqlite3.capi.wasm.pstack.remaining resolves to the amount of
+     sqlite3.wasm.pstack.remaining resolves to the amount of
      space remaining in the pstack.
   */
-  Object.defineProperty(capi.wasm.pstack, 'remaining', {
+  Object.defineProperty(wasm.pstack, 'remaining', {
     configurable: false, iterable: true, writeable: false,
-    get: capi.wasm.exports.sqlite3_wasm_pstack_remaining
+    get: wasm.exports.sqlite3_wasm_pstack_remaining
   });
 
   /**
@@ -994,7 +1054,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
       return __persistentDir = "";
     }
     try{
-      if(pdir && 0===capi.wasm.xCallWrapped(
+      if(pdir && 0===wasm.xCallWrapped(
         'sqlite3_wasm_init_wasmfs', 'i32', ['string'], pdir
       )){
         return __persistentDir = pdir;
@@ -1024,10 +1084,10 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
   };
 
   // This bit is highly arguable and is incompatible with the fiddle shell.
-  if(false && 0===capi.wasm.exports.sqlite3_vfs_find(0)){
+  if(false && 0===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();
+    wasm.exports.sqlite3_initialize();
   }
 
   /**
@@ -1058,15 +1118,15 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
       else if(!pDb){
         return capi.sqlite3_vfs_find(0)===pK ? pK : false;
       }
-      const ppVfs = capi.wasm.allocPtr();
+      const ppVfs = wasm.allocPtr();
       try{
         return (
           (0===capi.sqlite3_file_control(
             pDb, dbName, capi.SQLITE_FCNTL_VFS_POINTER, ppVfs
-          )) && (capi.wasm.getPtrValue(ppVfs) === pK)
+          )) && (wasm.getPtrValue(ppVfs) === pK)
         ) ? pK : false;
       }finally{
-        capi.wasm.dealloc(ppVfs);
+        wasm.dealloc(ppVfs);
       }
     }catch(e){
       /* Ignore - probably bad args to a wasm-bound function. */
@@ -1083,7 +1143,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     let pVfs = capi.sqlite3_vfs_find(0);
     while(pVfs){
       const oVfs = new capi.sqlite3_vfs(pVfs);
-      rc.push(capi.wasm.cstringToJs(oVfs.$zName));
+      rc.push(wasm.cstringToJs(oVfs.$zName));
       pVfs = oVfs.$pNext;
       oVfs.dispose();
     }
@@ -1097,7 +1157,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
   */
   capi.sqlite3_web_db_export = function(pDb){
     if(!pDb) toss('Invalid sqlite3* argument.');
-    const wasm = capi.wasm;
+    const wasm = wasm;
     if(!wasm.bigIntEnabled) toss('BigInt64 support is not enabled.');
     const stack = wasm.pstack.pointer;
     let pOut;
@@ -1278,7 +1338,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
 
   Note that the order of insertion into this array is significant for
   some pieces. e.g. sqlite3.capi.wasm cannot be fully utilized until
-  the whwasmutil.js part is plugged in.
+  the whwasmutil.js part is plugged in via sqlite3-api-glue.js.
 */
 self.sqlite3ApiBootstrap.initializers = [];
 /**
@@ -1290,12 +1350,15 @@ self.sqlite3ApiBootstrap.initializers = [];
   Counterpart of self.sqlite3ApiBootstrap.initializers, specifically
   for initializers which are asynchronous. All functions in this list
   take the sqlite3 object as their argument and MUST return a
-  Promise. Both the resolved value and rejection cases are ignored.
+  Promise. The resolved value and ignored and rejection will kill the
+  asyncPostInit() process but will be otherwise ignored because the
+  post-synchronous-init async initialization parts are (as of this
+  writing) all optional.
 
   This list is not processed until the client calls
   sqlite3.asyncPostInit(). This means, for example, that intializers
   added to self.sqlite3ApiBootstrap.initializers may push entries to
-   this list.
+  this list.
 */
 self.sqlite3ApiBootstrap.initializersAsync = [];
 /**
diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index f7acbc29c4..7ed58dbe08 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -135,13 +135,13 @@ WASM_KEEP void * sqlite3_wasm_stack_begin(void){
   extern void __data_end;
   return &__data_end;
 }
-static void * sq3StackPtr = 0;
+static void * pWasmStackPtr = 0;
 WASM_KEEP void * sqlite3_wasm_stack_ptr(void){
-  if(!sq3StackPtr) sq3StackPtr = sqlite3_wasm_stack_end();
-  return sq3StackPtr;
+  if(!pWasmStackPtr) pWasmStackPtr = sqlite3_wasm_stack_end();
+  return pWasmStackPtr;
 }
 WASM_KEEP void sqlite3_wasm_stack_restore(void * p){
-  sq3StackPtr = p;
+  pWasmStackPtr = p;
 }
 WASM_KEEP void * sqlite3_wasm_stack_alloc(int n){
   if(n<=0) return 0;
@@ -149,7 +149,7 @@ WASM_KEEP void * sqlite3_wasm_stack_alloc(int n){
   unsigned char * const p = (unsigned char *)sqlite3_wasm_stack_ptr();
   unsigned const char * const b = (unsigned const char *)sqlite3_wasm_stack_begin();
   if(b + n >= p || b + n < b/*overflow*/) return 0;
-  return sq3StackPtr = p - n;
+  return pWasmStackPtr = p - n;
 }
 #endif /* stack allocator experiment */
 
@@ -205,10 +205,9 @@ WASM_KEEP void * sqlite3_wasm_pstack_alloc(int n){
   if( n<=0 ) return 0;
   //if( n & 0x7 ) n += 8 - (n & 0x7) /* align to 8-byte boundary */;
   n = (n + 7) & ~7 /* align to 8-byte boundary */;
-  unsigned char * const p = PStack.pPos;
-  unsigned const char * const b = PStack.pBegin;
-  if( b + n > p || b + n <= b/*overflow*/ ) return 0;
-  memset((PStack.pPos = p - n), 0, (unsigned int)n);
+  if( PStack.pBegin + n > PStack.pPos /*not enough space left*/
+      || PStack.pBegin + n <= PStack.pBegin /*overflow*/ ) return 0;
+  memset((PStack.pPos = PStack.pPos - n), 0, (unsigned int)n);
   return PStack.pPos;
 }
 /*
@@ -221,6 +220,14 @@ WASM_KEEP int sqlite3_wasm_pstack_remaining(void){
   return (int)(PStack.pPos - PStack.pBegin);
 }
 
+/*
+** Return the total number of bytes available in the pstack, including
+** any space which is currently allocated. This value is a
+** compile-time constant.
+*/
+WASM_KEEP int sqlite3_wasm_pstack_quota(void){
+  return (int)(PStack.pEnd - PStack.pBegin);
+}
 
 /*
 ** This function is NOT part of the sqlite3 public API. It is strictly
@@ -254,26 +261,26 @@ int sqlite3_wasm_db_error(sqlite3*db, int err_code, const char *zMsg){
 ** variadic macros.
 **
 ** Returns a string containing a JSON-format "enum" of C-level
-** constants intended to be imported into the JS environment. The JSON
-** is initialized the first time this function is called and that
-** result is reused for all future calls.
+** constants and struct-related metadata intended to be imported into
+** the JS environment. The JSON is initialized the first time this
+** function is called and that result is reused for all future calls.
 **
 ** If this function returns NULL then it means that the internal
-** buffer is not large enough for the generated JSON. In debug builds
-** that will trigger an assert().
+** buffer is not large enough for the generated JSON and needs to be
+** increased. In debug builds that will trigger an assert().
 */
 WASM_KEEP
 const char * sqlite3_wasm_enum_json(void){
-  static char azBuffer[1024 * 12] = {0} /* where the JSON goes */;
+  static char aBuffer[1024 * 12] = {0} /* where the JSON goes */;
   int n = 0, nChildren = 0, nStruct = 0
     /* output counters for figuring out where commas go */;
-  char * zPos = &azBuffer[1] /* skip first byte for now to help protect
+  char * zPos = &aBuffer[1] /* skip first byte for now to help protect
                           ** against a small race condition */;
-  char const * const zEnd = &azBuffer[0] + sizeof(azBuffer) /* one-past-the-end */;
-  if(azBuffer[0]) return azBuffer;
-  /* Leave azBuffer[0] at 0 until the end to help guard against a tiny
+  char const * const zEnd = &aBuffer[0] + sizeof(aBuffer) /* one-past-the-end */;
+  if(aBuffer[0]) return aBuffer;
+  /* Leave aBuffer[0] at 0 until the end to help guard against a tiny
   ** race condition. If this is called twice concurrently, they might
-  ** end up both writing to azBuffer, but they'll both write the same
+  ** end up both writing to aBuffer, but they'll both write the same
   ** thing, so that's okay. If we set byte 0 up front then the 2nd
   ** instance might return and use the string before the 1st instance
   ** is done filling it. */
@@ -680,8 +687,8 @@ const char * sqlite3_wasm_enum_json(void){
 
   out("}"/*top-level object*/);
   *zPos = 0;
-  azBuffer[0] = '{'/*end of the race-condition workaround*/;
-  return azBuffer;
+  aBuffer[0] = '{'/*end of the race-condition workaround*/;
+  return aBuffer;
 #undef StructBinder
 #undef StructBinder_
 #undef StructBinder__
diff --git a/ext/wasm/testing1.js b/ext/wasm/testing1.js
index 7c20fdbbbd..5ef6d15b0b 100644
--- a/ext/wasm/testing1.js
+++ b/ext/wasm/testing1.js
@@ -1033,9 +1033,10 @@
     const stack = P.pointer;
     T.assert(0===stack % 8 /* must be 8-byte aligned */);
     try{
-      const quota = P.remaining;
-      log("pstack quota",quota);
-      T.assert(quota >= 4096)
+      const remaining = P.remaining;
+      log("pstack quota, remaining",P.quota,remaining);
+      T.assert(P.quota >= 4096)
+        .assert(remaining === P.quota)
         .mustThrowMatching(()=>P.alloc(0), isAllocErr)
         .mustThrowMatching(()=>P.alloc(-1), isAllocErr);
       let p1 = P.alloc(12);
@@ -1043,12 +1044,12 @@
         .assert(P.pointer === p1);
       let p2 = P.alloc(7);
       T.assert(p2 === p1-8/*8-byte aligned, stack grows downwards*/)
-        .mustThrowMatching(()=>P.alloc(quota), isAllocErr)
+        .mustThrowMatching(()=>P.alloc(remaining), isAllocErr)
         .assert(24 === stack - p2)
         .assert(P.pointer === p2);
-      let n = quota - (stack - p2);
+      let n = remaining - (stack - p2);
       let p3 = P.alloc(n);
-      T.assert(p3 === stack-quota)
+      T.assert(p3 === stack-remaining)
         .mustThrowMatching(()=>P.alloc(1), isAllocErr);
     }finally{
       P.restore(stack);
diff --git a/manifest b/manifest
index 53cf33f4a3..e266d2ee97 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\stest/debug\smechanism\sto\sshut\sdown\sthe\sOPFS\sasync\slistener\sso\sthat\sit\scan\sbe\sinspected\s(it\snormally\scan't\sbe\sbecause\sits\stight\sevent-listening\sloop\sties\sup\sthe\sthread)\sand\sthen\srestarted.
-D 2022-10-04T00:54:00.533
+C Minor\scleanups\sand\sadditions\sin\ssqlite3.capi.wasm.pstack.
+D 2022-10-04T01:11:10.003
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -485,13 +485,13 @@ F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba814
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
 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 24a283a49759914f2433b3118865145efbb2f67f52643e445065e02ccecc081b
+F ext/wasm/api/sqlite3-api-glue.js a5a1bd620e2e2c26b6e843cf439548b35c5bb5ed21b24b89a412e0b0a8592c42
 F ext/wasm/api/sqlite3-api-oo1.js ac1e08d36bdfb5aa0a2d75b7d4c892fd51819d34c932370c3282810672bcc086
 F ext/wasm/api/sqlite3-api-opfs.js d82870cffef9eef6511c650759c3798b59f10c8338587789abd84be2d9d845c3
-F ext/wasm/api/sqlite3-api-prologue.js 61f28bf7a51479c7b401e2da636b2a0710de77d86f68961445d572a3761dd170
+F ext/wasm/api/sqlite3-api-prologue.js 8f7e46105f9bea362894725531d6f8aa52981f5ef3f1679dd8caa7c85c135566
 F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c 1ed1356752c02a991b2d16c32e3e5c138a03526bb60182f2a751ec5372ecba12
+F ext/wasm/api/sqlite3-wasm.c 0c8cb242b80b8de27b74f05ed781f427958e04c9339c4720f30c3a7e78ee6242
 F ext/wasm/batch-runner.html cf1a410c92bad50fcec2ddc71390b4e9df63a6ea1bef12a5163a66a0af4d78d9
 F ext/wasm/batch-runner.js 5bae81684728b6be157d1f92b39824153f0fd019345b39f2ab8930f7ee2a57d8
 F ext/wasm/common/SqliteTestUtil.js 647bf014bd30bdd870a7e9001e251d12fc1c9ec9ce176a1004b838a4b33c5c05
@@ -530,7 +530,7 @@ F ext/wasm/test-opfs-vfs.js 0115d56f3f2a6475040dffe75a6851a353b1690708795944cf0f
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
 F ext/wasm/testing-worker1-promiser.js bd788e33c1807e0a6dda9c9a9d784bd3350ca49c9dd8ae2cc8719b506b6e013e
 F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d7669fb17fcae
-F ext/wasm/testing1.js 0f87073086eff3a152f013874f1c9a710e63d2e069f90dfeb8333ffe82476d04
+F ext/wasm/testing1.js 15fc3dca6b2fc22c1458cca2cc2c484281dfc91f01c048ad4e38d5d3924ea961
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
 F ext/wasm/testing2.js 88f40ef3cd8201bdadd120a711c36bbf0ce56cc0eab1d5e7debb71fed7822494
 F ext/wasm/wasmfs.make 3cce1820006196de140f90f2da4b4ea657083fb5bfee7d125be43f7a85748c8f
@@ -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 72a9e589cc318ec50941739e2edf2c0636284b316c3bf87b71fd363b37619da3
-R b598562b6232b1a22591d878d099e519
+P 7d0bcff4e9b899cd25b393b9f0a02c5dcee2e229f0a0fa01719c7dcd7dcbe7c1
+R 7320921a42fda536d083483db8ee576c
 U stephan
-Z 962cbcc757fdf40c47c3a7056efb3d7c
+Z 3678381f6d3f10154c88d71945cdf539
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 912cd619c4..4ef3731f59 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7d0bcff4e9b899cd25b393b9f0a02c5dcee2e229f0a0fa01719c7dcd7dcbe7c1
\ No newline at end of file
+97bd670d3859bd3f2e62c15065b238b85ef614f26479e56a14be42c5784aedf4
\ No newline at end of file

From 2716cd25280c157c85350e24b9c7fedd8bdb07f9 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 4 Oct 2022 01:21:34 +0000
Subject: [PATCH 232/428] Minor pstack doc update.

FossilOrigin-Name: 6b4fb7c4e399ecc948ad41f5fa3139a9293cc822cd7efa2b83dc5fb1660b3ec6
---
 ext/wasm/api/sqlite3-api-prologue.js |  6 ++++--
 manifest                             | 12 ++++++------
 manifest.uuid                        |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 59537a4995..516f53f52e 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -977,8 +977,10 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
   Object.defineProperties(wasm.pstack, {
     /**
        sqlite3.wasm.pstack.pointer resolves to the current pstack
-       position pointer. This value is intended _only_ to be passed to
-       restore().
+       position pointer. This value is intended _only_ to be saved
+       for passing to restore(). Writing to this memory, without
+       first reserving it via wasm.pstack.alloc() and friends, leads
+       to undefined results.
     */
     pointer: {
       configurable: false, iterable: true, writeable: false,
diff --git a/manifest b/manifest
index e266d2ee97..3b6d598353 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\scleanups\sand\sadditions\sin\ssqlite3.capi.wasm.pstack.
-D 2022-10-04T01:11:10.003
+C Minor\spstack\sdoc\supdate.
+D 2022-10-04T01:21:34.715
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -488,7 +488,7 @@ F ext/wasm/api/sqlite3-api-cleanup.js 5d22d1d3818ecacb23bfa223d5970cd0617d8cdbb4
 F ext/wasm/api/sqlite3-api-glue.js a5a1bd620e2e2c26b6e843cf439548b35c5bb5ed21b24b89a412e0b0a8592c42
 F ext/wasm/api/sqlite3-api-oo1.js ac1e08d36bdfb5aa0a2d75b7d4c892fd51819d34c932370c3282810672bcc086
 F ext/wasm/api/sqlite3-api-opfs.js d82870cffef9eef6511c650759c3798b59f10c8338587789abd84be2d9d845c3
-F ext/wasm/api/sqlite3-api-prologue.js 8f7e46105f9bea362894725531d6f8aa52981f5ef3f1679dd8caa7c85c135566
+F ext/wasm/api/sqlite3-api-prologue.js baf88cf253a35153674b068b5125238993ea2a7804152d238b5e40140b506ef5
 F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 0c8cb242b80b8de27b74f05ed781f427958e04c9339c4720f30c3a7e78ee6242
@@ -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 7d0bcff4e9b899cd25b393b9f0a02c5dcee2e229f0a0fa01719c7dcd7dcbe7c1
-R 7320921a42fda536d083483db8ee576c
+P 97bd670d3859bd3f2e62c15065b238b85ef614f26479e56a14be42c5784aedf4
+R 507991812d835888d4cf650d3fac598a
 U stephan
-Z 3678381f6d3f10154c88d71945cdf539
+Z 20bbab2b0ec42159d665e1e1931c635b
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 4ef3731f59..2c42dd2eb4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-97bd670d3859bd3f2e62c15065b238b85ef614f26479e56a14be42c5784aedf4
\ No newline at end of file
+6b4fb7c4e399ecc948ad41f5fa3139a9293cc822cd7efa2b83dc5fb1660b3ec6
\ No newline at end of file

From f6b6188bdd930921257a72ea3eab99160120040f Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 4 Oct 2022 08:58:22 +0000
Subject: [PATCH 233/428] Update the 'start in speedtest kvvfs' link in
 speedtest1-worker to account for recent changes.

FossilOrigin-Name: f4d5ba412e0c1a031430a32c9ed1e11a09af33f9883150e660cc05e49fe56e6a
---
 ext/wasm/speedtest1-worker.html |  8 ++++----
 manifest                        | 12 ++++++------
 manifest.uuid                   |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ext/wasm/speedtest1-worker.html b/ext/wasm/speedtest1-worker.html
index 2c05fe6b15..2e9ea2c343 100644
--- a/ext/wasm/speedtest1-worker.html
+++ b/ext/wasm/speedtest1-worker.html
@@ -38,13 +38,13 @@
           <div id='toolbar-selected-flags'></div>
           <div class='toolbar-inner-vertical'>
             <span>&rarr; <a id='link-main-thread' href='#' target='speedtest-main'
-                            title='Start speedtest1.html with the selected flags'>speedtest1.html</a>
+                            title='Start speedtest1.html with the selected flags'>speedtest1</a>
             </span>
             <span>&rarr; <a id='link-wasmfs' href='#' target='speedtest-wasmfs'
-                            title='Start speedtest1-wasmfs.html with the selected flags'>speedtest1-wasmfs.html</a>
+                            title='Start speedtest1-wasmfs.html with the selected flags'>speedtest1-wasmfs</a>
             </span>
             <span>&rarr; <a id='link-kvvfs' href='#' target='speedtest-kvvfs'
-                            title='Start speedtest1-kvvfs.html with the selected flags'>speedtest1-kvvfs.html</a>
+                            title='Start kvvfs speedtest1 with the selected flags'>speedtest1-kvvfs</a>
             </span>
           </div>
         </div>
@@ -204,7 +204,7 @@
         eLinkWasmfs.setAttribute('target', 'speedtest1-wasmfs-'+comma);
         eLinkWasmfs.href = 'speedtest1-wasmfs.html?flags='+comma;
         eLinkKvvfs.setAttribute('target', 'speedtest1-kvvfs-'+comma);
-        eLinkKvvfs.href = 'speedtest1-kvvfs.html?flags='+comma;
+        eLinkKvvfs.href = 'speedtest1.html?vfs=kvvfs&flags='+comma;
     };
     eFlags.addEventListener('change', updateSelectedFlags );
     {
diff --git a/manifest b/manifest
index 3b6d598353..6d4b632460 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\spstack\sdoc\supdate.
-D 2022-10-04T01:21:34.715
+C Update\sthe\s'start\sin\sspeedtest\skvvfs'\slink\sin\sspeedtest1-worker\sto\saccount\sfor\srecent\schanges.
+D 2022-10-04T08:58:22.077
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -516,7 +516,7 @@ F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e5
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
 F ext/wasm/scratchpad-wasmfs-main.js 1aa32c1035cf1440a226a28fefcbb5762fbbcb020ccbe5895f8736d701695c63
 F ext/wasm/speedtest1-wasmfs.html bc28eb29b69a73864b8d7aae428448f8b7e1de81d8bfb9bba99541322054dbd0
-F ext/wasm/speedtest1-worker.html 88cfde771f3d0f155e9db18dc146f6d9407c77f9b69612d56469da5cfb4b509e
+F ext/wasm/speedtest1-worker.html 17f5b3f0ddb361ea0fdfd58703e42d65b1564c297930ec5fff2cd267e6e252d9
 F ext/wasm/speedtest1-worker.js a9e3d052dd1d8016d6e9a641e596e6d99aec04ef8995d7ee9a85a9964eed771a
 F ext/wasm/speedtest1.html e4cb5d722b494104fc1249e7c008ca018f820a784833c51004c958c71038c80f
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
@@ -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 97bd670d3859bd3f2e62c15065b238b85ef614f26479e56a14be42c5784aedf4
-R 507991812d835888d4cf650d3fac598a
+P 6b4fb7c4e399ecc948ad41f5fa3139a9293cc822cd7efa2b83dc5fb1660b3ec6
+R 0b82b28db72e951b49c91c31da521211
 U stephan
-Z 20bbab2b0ec42159d665e1e1931c635b
+Z c1a19f484dc6300f67e1f220bff1c32f
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 2c42dd2eb4..653faefc80 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6b4fb7c4e399ecc948ad41f5fa3139a9293cc822cd7efa2b83dc5fb1660b3ec6
\ No newline at end of file
+f4d5ba412e0c1a031430a32c9ed1e11a09af33f9883150e660cc05e49fe56e6a
\ No newline at end of file

From c7fb48d4b6144b0f89fe05e7790c0e8d309494a3 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 4 Oct 2022 09:12:05 +0000
Subject: [PATCH 234/428] OPFS async proxy: add a wait-and-retry policy to the
 get-sync-handle step to help account for cross-tab locking.

FossilOrigin-Name: 45c48c63d311052105d102189208495b2b53fa3c4174884ecf63b757aa4016e5
---
 ext/wasm/api/sqlite3-api-opfs.js     | 16 ++++++--
 ext/wasm/sqlite3-opfs-async-proxy.js | 58 ++++++++++++++++++++--------
 manifest                             | 14 +++----
 manifest.uuid                        |  2 +-
 4 files changed, 63 insertions(+), 27 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index 7b85ac06c8..90f1616809 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -915,9 +915,19 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
       opfsUtil.OpfsDb.prototype = Object.create(sqlite3.oo1.DB.prototype);
       sqlite3.oo1.dbCtorHelper.setVfsPostOpenSql(
         opfsVfs.pointer,
-        /* Truncate journal mode is faster than delete or wal for
-           OPFS, per speedtest1. */
-        "pragma journal_mode=truncate"
+        [
+          /* Truncate journal mode is faster than delete or wal for
+             this vfs, per speedtest1. */
+          "pragma journal_mode=truncate;",
+          /*
+            This vfs benefits hugely from cache on moderate/large
+            speedtest1 --size 50 and --size 100 workloads. We currently
+            rely on setting a non-default cache size when building
+            sqlite3.wasm. If that policy changes, the cache can
+            be set here.
+          */
+          //"pragma cache_size=-8388608;"
+        ].join('')
       );
     }
 
diff --git a/ext/wasm/sqlite3-opfs-async-proxy.js b/ext/wasm/sqlite3-opfs-async-proxy.js
index 58bbf79284..b2b77fd4ea 100644
--- a/ext/wasm/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/sqlite3-opfs-async-proxy.js
@@ -144,13 +144,38 @@ const getDirForFilename = async function f(absFilename, createDirs = false){
    handle object (which must be a valid handle object), lazily opening
    it if needed. Timestamps the handle for use in relinquishing it
    during idle time.
+
+   In order to help alleviate cross-tab contention for a dabase,
+   if an exception is thrown while acquiring the handle, this routine
+   will wait briefly and try again, up to 3 times. If acquisition
+   still fails at that point it will give up and propagate the
+   exception.
 */
 const getSyncHandle = async (fh)=>{
   if(!fh.syncHandle){
-    //const t = performance.now();
-    //warn("Creating sync handle for",fh.filenameAbs);
-    fh.syncHandle = await fh.fileHandle.createSyncAccessHandle();
-    //warn("Got sync handle for",fh.filenameAbs,'in',performance.now() - t,'ms');
+    const t = performance.now();
+    log("Acquiring sync handle for",fh.filenameAbs);
+    const maxTries = 3;
+    let i = 1, ms = 300;
+    for(; true; ms *= ++i){
+      try {
+        //if(1===i) toss("Just testing.");
+        //TODO? A config option which tells it to throw here
+        //randomly every now and then.
+        fh.syncHandle = await fh.fileHandle.createSyncAccessHandle();
+        break;
+      }catch(e){
+        if(i === maxTries){
+          toss("Error getting sync handle.",maxTries,
+               "attempts failed. ",fh.filenameAbs, ":", e.message);
+          throw e;
+        }
+        error("Error getting sync handle. Waiting",ms,
+              "ms and trying again.",fh.filenameAbs,e);
+        Atomics.wait(state.sabOPView, state.opIds.xSleep, 0, ms);
+      }
+    }
+    log("Got sync handle for",fh.filenameAbs,'in',performance.now() - t,'ms');
   }
   fh.syncHandleTime = performance.now();
   return fh.syncHandle;
@@ -589,23 +614,24 @@ const waitLoop = async function f(){
   }
   /**
      waitTime is how long (ms) to wait for each Atomics.wait().
-     We need to wait up periodically to give the thread a chance
+     We need to wake up periodically to give the thread a chance
      to do other things.
   */
-  const waitTime = 250;
+  const waitTime = 200;
   /**
-     relinquishTime defines the_approximate_ number of ms
-     after which a db sync access handle will be relinquished
-     so that we do not hold a persistent lock on it. When the following loop
-     times out while waiting, every (approximate) increment of this
-     value it will relinquish any db handles which have been idle for
-     at least this much time.
+     relinquishTime defines the_approximate_ number of ms after which
+     a db sync access handle will be relinquished so that we do not
+     hold a persistent lock on it. When the following loop times out
+     while waiting, every (approximate) increment of this value it
+     will relinquish any db handles which have been idle for at least
+     this much time.
 
      Reaquisition of a sync handle seems to take an average of
-     0.6-0.9ms on this dev machine but takes anywhere from 1-3ms
-     every once in a while (maybe 1 time in 5 or 10).
+     0.6-0.9ms on this dev machine but takes anywhere from 1-3ms every
+     once in a while (maybe 1 time in 5 or 10). Outliers as long as
+     7ms have been witnessed, but they're rare.
   */
-  const relinquishTime = 1000;
+  const relinquishTime = 750;
   let lastOpTime = performance.now();
   let now;
   while(!flagAsyncShutdown){
@@ -619,7 +645,7 @@ const waitLoop = async function f(){
             if(fh.syncHandle && (
               now - relinquishTime >= fh.syncHandleTime
             )){
-              //warn("Relinquishing for timeout:",fh.filenameAbs);
+              log("Relinquishing for timeout:",fh.filenameAbs);
               await closeSyncHandle(fh)
               /* Testing shows that we have to wait on this async
                  op to finish, else we might try to re-open it
diff --git a/manifest b/manifest
index 6d4b632460..7021f02f69 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\s'start\sin\sspeedtest\skvvfs'\slink\sin\sspeedtest1-worker\sto\saccount\sfor\srecent\schanges.
-D 2022-10-04T08:58:22.077
+C OPFS\sasync\sproxy:\sadd\sa\swait-and-retry\spolicy\sto\sthe\sget-sync-handle\sstep\sto\shelp\saccount\sfor\scross-tab\slocking.
+D 2022-10-04T09:12:05.870
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -487,7 +487,7 @@ F ext/wasm/api/pre-js.js 2db711eb637991b383fc6b5c0f3df65ec48a7201e5730e304beba8d
 F ext/wasm/api/sqlite3-api-cleanup.js 5d22d1d3818ecacb23bfa223d5970cd0617d8cdbb48c8bc4bbd463f05b021a99
 F ext/wasm/api/sqlite3-api-glue.js a5a1bd620e2e2c26b6e843cf439548b35c5bb5ed21b24b89a412e0b0a8592c42
 F ext/wasm/api/sqlite3-api-oo1.js ac1e08d36bdfb5aa0a2d75b7d4c892fd51819d34c932370c3282810672bcc086
-F ext/wasm/api/sqlite3-api-opfs.js d82870cffef9eef6511c650759c3798b59f10c8338587789abd84be2d9d845c3
+F ext/wasm/api/sqlite3-api-opfs.js 8727adb9d69758c8c1adfc68b5445138b2e48da3a44ab5e67e4e13a7668c582f
 F ext/wasm/api/sqlite3-api-prologue.js baf88cf253a35153674b068b5125238993ea2a7804152d238b5e40140b506ef5
 F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
@@ -522,7 +522,7 @@ F ext/wasm/speedtest1.html e4cb5d722b494104fc1249e7c008ca018f820a784833c51004c95
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
-F ext/wasm/sqlite3-opfs-async-proxy.js 3f8086e543a576a556c17f8ee7c75009fb8e2d3f9bbb9c0de6b9c285dd7f5634
+F ext/wasm/sqlite3-opfs-async-proxy.js 6c96f9598a251a44b3ff435cab85ba74b199a7d35f0d50c64625f2e3deb199db
 F ext/wasm/sqlite3-worker1-promiser.js 307d7837420ca6a9d3780dfc81194f1c0715637e6d9540e935514086b96913d8
 F ext/wasm/sqlite3-worker1.js 466e9bd39409ab03f3e00999887aaffc11e95b416e2689596e3d7f1516673fdf
 F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
@@ -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 6b4fb7c4e399ecc948ad41f5fa3139a9293cc822cd7efa2b83dc5fb1660b3ec6
-R 0b82b28db72e951b49c91c31da521211
+P f4d5ba412e0c1a031430a32c9ed1e11a09af33f9883150e660cc05e49fe56e6a
+R ef7e5c2872567f2db1aff569fb1ba87c
 U stephan
-Z c1a19f484dc6300f67e1f220bff1c32f
+Z adf5485abd70bc27cf1b4b2e2c0adea5
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 653faefc80..9bb9c8ece5 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f4d5ba412e0c1a031430a32c9ed1e11a09af33f9883150e660cc05e49fe56e6a
\ No newline at end of file
+45c48c63d311052105d102189208495b2b53fa3c4174884ecf63b757aa4016e5
\ No newline at end of file

From 98e120fca0f6902bb8a9a8a394de577d6b9f0e7e Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 4 Oct 2022 09:12:43 +0000
Subject: [PATCH 235/428] Update ext/wasm/api/README.md to account for recent
 changes.

FossilOrigin-Name: 9d488081fc82a9abe3e81c7897fe6b29b6b337f62d0c62cb9cec7517bd54b53f
---
 ext/wasm/api/README.md | 30 +++++++++++++++++-------------
 manifest               | 12 ++++++------
 manifest.uuid          |  2 +-
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/ext/wasm/api/README.md b/ext/wasm/api/README.md
index b612bfcc22..edac17fa1e 100644
--- a/ext/wasm/api/README.md
+++ b/ext/wasm/api/README.md
@@ -23,8 +23,6 @@ The overall idea is that the following files get concatenated
 together, in the listed order, the resulting file is loaded by a
 browser client:
 
-- `post-js-header.js`\  
-  Emscripten-specific header for the `--post-js` input.
 - `sqlite3-api-prologue.js`\  
   Contains the initial bootstrap setup of the sqlite3 API
   objects. This is exposed as a function, rather than objects, so that
@@ -81,17 +79,17 @@ browser client:
       directly to the (async) OPFS API and channels those results back
       to its synchronous counterpart. This file, because it must be
       started in its own Worker, is not part of the amalgamation.
-- `sqlite3-api-cleanup.js`\  
-  the previous files temporarily create global objects in order to
-  communicate their state to the files which follow them, and _this_
-  file connects any final components together and cleans up those
-  globals. As of this writing, this code ensures that the previous
-  files leave no more than a single global symbol installed. When
-  adapting the API for non-Emscripten toolchains, this "should"
-  be the only file where changes are needed.
-- `post-js-footer.js`\  
-  Emscripten-specific footer for the `--post-js` input. This closes
-  off the lexical scope opened by `post-js-header.js`.
+- **`api/sqlite3-api-cleanup.js`**\  
+  The previous files do not immediately extend the library. Instead
+  they add callback functions to be called during its
+  bootstrapping. Some also temporarily create global objects in order
+  to communicate their state to the files which follow them. This file
+  cleans up any dangling globals and runs the API bootstrapping
+  process, which is what finally executes the initialization code
+  installed by the previous files. As of this writing, this code
+  ensures that the previous files leave no more than a single global
+  symbol installed. When adapting the API for non-Emscripten
+  toolchains, this "should" be the only file where changes are needed.
 
 The build process glues those files together, resulting in
 `sqlite3-api.js`, which is everything except for the `post-js-*.js`
@@ -117,6 +115,12 @@ into the build-generated `sqlite3.js` along with `sqlite3-api.js`.
   file is intended as a place to override certain Emscripten behavior
   before it starts up, but corner-case Emscripten bugs keep that from
   being a reality.
+- `post-js-header.js`\  
+  Emscripten-specific header for the `--post-js` input. It opens up
+  a lexical scope by starting a post-run handler for Emscripten.
+- `post-js-footer.js`\  
+  Emscripten-specific footer for the `--post-js` input. This closes
+  off the lexical scope opened by `post-js-header.js`.
 - `extern-post-js.js`\  
   Emscripten-specific header for Emscripten's `--extern-post-js`
   flag. This file overwrites the Emscripten-installed
diff --git a/manifest b/manifest
index 7021f02f69..f51ab3e2d8 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C OPFS\sasync\sproxy:\sadd\sa\swait-and-retry\spolicy\sto\sthe\sget-sync-handle\sstep\sto\shelp\saccount\sfor\scross-tab\slocking.
-D 2022-10-04T09:12:05.870
+C Update\sext/wasm/api/README.md\sto\saccount\sfor\srecent\schanges.
+D 2022-10-04T09:12:43.030
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -478,7 +478,7 @@ F ext/wasm/GNUmakefile 8ab74ed186a15d956a21b28fa0800b84af2b8a289392ae2dff8126ff0
 F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 89983a8d122c35a90c65ec667844b95a78bcd04f3198a99c1e0c8368c1a0b03a
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
-F ext/wasm/api/README.md 1e350b611465566cfa2e5eccf7c9b29a34f48ee38bbf6d5fb086dd06ce32b3ff
+F ext/wasm/api/README.md 62758e8dd98741d41505f69130cc767013d2e871ebb9e4313d8f8b97d95071d8
 F ext/wasm/api/extern-post-js.js dc68cbf552d8ea085181400a6963907c32e0b088b03ffd8969b1869fea246629
 F ext/wasm/api/extern-pre-js.js 20143b16b672d0a576fbf768a786d12ee1f84e222126477072389b992542a5b2
 F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba81456260a713ed04900c
@@ -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 f4d5ba412e0c1a031430a32c9ed1e11a09af33f9883150e660cc05e49fe56e6a
-R ef7e5c2872567f2db1aff569fb1ba87c
+P 45c48c63d311052105d102189208495b2b53fa3c4174884ecf63b757aa4016e5
+R 246e96ac4ce43b2c873ef32e1a101b10
 U stephan
-Z adf5485abd70bc27cf1b4b2e2c0adea5
+Z 7e94572339a06ebe488761e9bcb54eef
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 9bb9c8ece5..40b5e5eb37 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-45c48c63d311052105d102189208495b2b53fa3c4174884ecf63b757aa4016e5
\ No newline at end of file
+9d488081fc82a9abe3e81c7897fe6b29b6b337f62d0c62cb9cec7517bd54b53f
\ No newline at end of file

From a4b2f419382c95cd2f4924d0394f37b3d2f0cfce Mon Sep 17 00:00:00 2001
From: drh <>
Date: Tue, 4 Oct 2022 10:35:10 +0000
Subject: [PATCH 236/428] Change the name of the autoconf-generated
 configuration file from "config.h" to "sqlite_cfg.h" to work around a bug in
 a dependency checker, reported in
 [https://twitter.com/josecastillo/status/1577136108097314816|a tweet from
 Jose Castillo].

FossilOrigin-Name: 897e187cad981126fc5f6ea8e382e937825af10b0c9589b0a23b9fbaa4ca58b8
---
 Makefile.in                    |  8 ++++----
 configure                      |  4 ++--
 configure.ac                   |  2 +-
 manifest                       | 24 ++++++++++++------------
 manifest.uuid                  |  2 +-
 config.h.in => sqlite_cfg.h.in | 25 ++++++++++++++++++-------
 src/ctime.c                    |  2 +-
 src/sqliteInt.h                |  2 +-
 tool/mkctimec.tcl              |  2 +-
 9 files changed, 41 insertions(+), 30 deletions(-)
 rename config.h.in => sqlite_cfg.h.in (82%)

diff --git a/Makefile.in b/Makefile.in
index cc4943f2c4..9be48816ee 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,7 +35,7 @@ TCC += -I${TOP}/ext/fts3 -I${TOP}/ext/async -I${TOP}/ext/session
 TCC += -I${TOP}/ext/userauth
 
 # Define this for the autoconf-based build, so that the code knows it can
-# include the generated config.h
+# include the generated sqlite_cfg.h
 #
 TCC += -D_HAVE_SQLITE_CONFIG_H -DBUILD_sqlite
 
@@ -377,7 +377,7 @@ SRC += \
   opcodes.h \
   parse.c \
   parse.h \
-  config.h \
+  sqlite_cfg.h \
   shell.c \
   sqlite3.h
 
@@ -555,7 +555,7 @@ HDR = \
    $(TOP)/src/vdbeInt.h \
    $(TOP)/src/vxworks.h \
    $(TOP)/src/whereInt.h \
-   config.h
+   sqlite_cfg.h
 
 # Header files used by extensions
 #
@@ -1501,7 +1501,7 @@ clean:
 	rm -f threadtest5
 
 distclean:	clean
-	rm -f config.h config.log config.status libtool Makefile sqlite3.pc \
+	rm -f sqlite_cfg.h config.log config.status libtool Makefile sqlite3.pc \
 		$(TESTPROGS)
 
 #
diff --git a/configure b/configure
index e9f135f87e..4a32d5e561 100755
--- a/configure
+++ b/configure
@@ -11875,7 +11875,7 @@ fi
 
 #########
 # Output the config header
-ac_config_headers="$ac_config_headers config.h"
+ac_config_headers="$ac_config_headers sqlite_cfg.h"
 
 
 #########
@@ -12838,7 +12838,7 @@ for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+    "sqlite_cfg.h") CONFIG_HEADERS="$CONFIG_HEADERS sqlite_cfg.h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "sqlite3.pc") CONFIG_FILES="$CONFIG_FILES sqlite3.pc" ;;
 
diff --git a/configure.ac b/configure.ac
index cc805a00d5..5f905db40c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -806,7 +806,7 @@ AC_SUBST(AMALGAMATION_LINE_MACROS)
 
 #########
 # Output the config header
-AC_CONFIG_HEADERS(config.h)
+AC_CONFIG_HEADERS(sqlite_cfg.h)
 
 #########
 # Generate the output files.
diff --git a/manifest b/manifest
index 8484e05492..d690941a1f 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Adjust\sthe\s--help\soutput\sfor\sspeedtest1\sto\sclarify\sthat\sthe\sargument\sto\nthe\s--cachesize\soption\sis\sin\spages,\snot\sbytes.
-D 2022-10-03T15:22:59.408
+C Change\sthe\sname\sof\sthe\sautoconf-generated\sconfiguration\sfile\sfrom\s"config.h"\nto\s"sqlite_cfg.h"\sto\swork\saround\sa\sbug\sin\sa\sdependency\schecker,\sreported\nin\s[https://twitter.com/josecastillo/status/1577136108097314816|a\stweet\sfrom\sJose\sCastillo].
+D 2022-10-04T10:35:10.544
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in 525bccb89e36a927f9312a231f054a2dc029f6af75901c7fc1a781d51b260323
+F Makefile.in 42efe1354fea12f5c68891939f7c7356353d345aaa7c73d36242499f9cf6e60f
 F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
 F Makefile.msc d547a2fdba38a1c6cd1954977d0b0cc017f5f8fbfbc65287bf8d335808938016
 F README.md 8b8df9ca852aeac4864eb1e400002633ee6db84065bd01b78c33817f97d31f5e
@@ -32,10 +32,9 @@ F autoconf/tea/win/makefile.vc 2c478a9a962e48b2bf9062734e04d7c63c556e21709541917
 F autoconf/tea/win/nmakehlp.c b01f822eabbe1ed2b64e70882d97d48402b42d2689a1ea00342d1a1a7eaa19cb
 F autoconf/tea/win/rules.vc c511f222b80064096b705dbeb97060ee1d6b6d63
 F config.guess 883205ddf25b46f10c181818bf42c09da9888884af96f79e1719264345053bd6
-F config.h.in 6376abec766e9a0785178b1823b5a587e9f1ccbc
 F config.sub c2d0260f17f3e4bc0b6808fccf1b291cb5e9126c14fc5890efc77b9fd0175559
-F configure f959db96f314b3b91b3d658eebbc0a96b9542f1265c4de97e885aedb6bdcead5 x
-F configure.ac 3ef6eeff4387585bfcab76b0c3f6e15a0618587bb90245dd5d44e4378141bb35
+F configure b93755fe94b3e9b2015f3c2d6c63928e8899b0a7c54e042deb843498094179da x
+F configure.ac 48dc6bfee293eef05910faf085760f2fd79b680aa47b50e8e6a22ca40bb026bb
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/F2FS.txt c1d4a0ae9711cfe0e1d8b019d154f1c29e0d3abfe820787ba1e9ed7691160fcd
 F doc/json-enhancements.md e356fc834781f1f1aa22ee300027a270b2c960122468499bf347bb123ce1ea4f
@@ -521,6 +520,7 @@ F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
 F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
+F sqlite_cfg.h.in baf2e409c63d4e7a765e17769b6ff17c5a82bbd9cbf1e284fd2e4cefaff3fcf2 w config.h.in
 F src/alter.c 0390ca1d69ec3626cfa9f153114b7ab233e6b2bada6a9eb91361ed385fe90deb
 F src/analyze.c aabdf3769c7fd9954a8ec508eb7041ae174b66f88d12c47199fabbea9a646467
 F src/attach.c 4431f82f0247bf3aaf91589acafdff77d1882235c95407b36da1585c765fbbc8
@@ -534,7 +534,7 @@ F src/btreeInt.h 8ce1332edd89dfd2461d561ac10a0ab5601c8e06200cb5230596c3caaf54482
 F src/build.c 6e3ee380a4f0ff95de4b53bf510f66600cff08e4e04b92e95fae789072563f8f
 F src/callback.c 4cd7225b26a97f7de5fee5ae10464bed5a78f2adefe19534cc2095b3a8ca484a
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
-F src/ctime.c 93e4b5f4faf6d3f688988a116773259a4fbfb4ddac0e9bf9d0ae0429390c2543
+F src/ctime.c 428b47a2548c7c2c2f885189b42fdcc178fb03c276a2d58b3008b10da29373d5
 F src/date.c 94ce83b4cd848a387680a5f920c9018c16655db778c4d36525af0a0f34679ac5
 F src/dbpage.c 5808e91bc27fa3981b028000f8fadfdc10ce9e59a34ce7dc4e035a69be3906ec
 F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
@@ -593,7 +593,7 @@ F src/shell.c.in e7e7c2c69ae86c5ee9e8ad66227203d46ff6dce8700a1b1dababff01c71d33d
 F src/sqlite.h.in 3f4695457fcb41ea8a44c6d09fc2a591bbeda44b13bda86618f3ce0071bbca7c
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d
-F src/sqliteInt.h 7571703e6d11cd0e0283be68e9b6baceefedf10e3bbac5869d12183e031c5254
+F src/sqliteInt.h 1d27d00dcaafed614d6ed8738d6c41a81acf12fe50fe4c677427b1c56d8a81da
 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -1926,7 +1926,7 @@ F tool/max-limits.c cbb635fbb37ae4d05f240bfb5b5270bb63c54439
 F tool/merge-test.tcl de76b62f2de2a92d4c1ca4f976bce0aea6899e0229e250479b229b2a1914b176
 F tool/mkautoconfamal.sh f62353eb6c06ab264da027fd4507d09914433dbdcab9cb011cdc18016f1ab3b8
 F tool/mkccode.tcl 86463e68ce9c15d3041610fedd285ce32a5cf7a58fc88b3202b8b76837650dbe x
-F tool/mkctimec.tcl 8f472681f6041cf0ec26a1799feda39e55370614a6090d66fa5044f9f52d22c6 x
+F tool/mkctimec.tcl 0e309dfc8bb01cd385deeb010df4ca76dee3ab4e8ec0588233b3f152679122e8 x
 F tool/mkkeywordhash.c 35bfc41adacc4aa6ef6fca7fd0c63e0ec0534b78daf4d0cfdebe398216bbffc3
 F tool/mkmsvcmin.tcl 6ecab9fe22c2c8de4d82d4c46797bda3d2deac8e763885f5a38d0c44a895ab33
 F tool/mkopcodec.tcl 33d20791e191df43209b77d37f0ff0904620b28465cca6990cf8d60da61a07ef
@@ -2000,8 +2000,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 f3d31c9982cab517a3907a28c571225cee614ee78375c70eb2efb9a2b6b4b042
-R 7f8d304b6a07de2cc69260c5f709e3b7
+P d7c2be6bdc3402e5a339d0f7b76d2c25f3a444dcbf54a77c1ccb790d1195a7cf
+R 4713eb8f98a8aeab7d0d3163e5e46206
 U drh
-Z c497b618e9e71dda49eb7a2e8b6f56d4
+Z cc19c5c21171ef2d2de636f9d251ad05
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 3bd31ec276..81b40ebe86 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d7c2be6bdc3402e5a339d0f7b76d2c25f3a444dcbf54a77c1ccb790d1195a7cf
\ No newline at end of file
+897e187cad981126fc5f6ea8e382e937825af10b0c9589b0a23b9fbaa4ca58b8
\ No newline at end of file
diff --git a/config.h.in b/sqlite_cfg.h.in
similarity index 82%
rename from config.h.in
rename to sqlite_cfg.h.in
index f2ba7d4fc4..3adea09936 100644
--- a/config.h.in
+++ b/sqlite_cfg.h.in
@@ -1,4 +1,4 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
+/* sqlite_cfg.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
@@ -45,16 +45,16 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
-/* Define to 1 if you have the pread() function. */
+/* Define to 1 if you have the `pread' function. */
 #undef HAVE_PREAD
 
-/* Define to 1 if you have the pread64() function. */
+/* Define to 1 if you have the `pread64' function. */
 #undef HAVE_PREAD64
 
-/* Define to 1 if you have the pwrite() function. */
+/* Define to 1 if you have the `pwrite' function. */
 #undef HAVE_PWRITE
 
-/* Define to 1 if you have the pwrite64() function. */
+/* Define to 1 if you have the `pwrite64' function. */
 #undef HAVE_PWRITE64
 
 /* Define to 1 if you have the <stdint.h> header file. */
@@ -63,7 +63,7 @@
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
-/* Define to 1 if you have the strchrnul() function */
+/* Define to 1 if you have the `strchrnul' function. */
 #undef HAVE_STRCHRNUL
 
 /* Define to 1 if you have the <strings.h> header file. */
@@ -99,9 +99,12 @@
 /* Define to 1 if you have the `usleep' function. */
 #undef HAVE_USLEEP
 
-/* Define to 1 if you have the utime() library function. */
+/* Define to 1 if you have the `utime' function. */
 #undef HAVE_UTIME
 
+/* Define to 1 if you have the <zlib.h> header file. */
+#undef HAVE_ZLIB_H
+
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
 #undef LT_OBJDIR
@@ -118,12 +121,20 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
+/* Enable large inode numbers on Mac OS X 10.5.  */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
 
diff --git a/src/ctime.c b/src/ctime.c
index 7eb43f20a7..eb425e5887 100644
--- a/src/ctime.c
+++ b/src/ctime.c
@@ -28,7 +28,7 @@
 ** autoconf-based build
 */
 #if defined(_HAVE_SQLITE_CONFIG_H) && !defined(SQLITECONFIG_H)
-#include "config.h"
+#include "sqlite_cfg.h"
 #define SQLITECONFIG_H 1
 #endif
 
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 436e428dcf..f2741114f6 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -208,7 +208,7 @@
 ** autoconf-based build
 */
 #if defined(_HAVE_SQLITE_CONFIG_H) && !defined(SQLITECONFIG_H)
-#include "config.h"
+#include "sqlite_cfg.h"
 #define SQLITECONFIG_H 1
 #endif
 
diff --git a/tool/mkctimec.tcl b/tool/mkctimec.tcl
index 1120bc1316..73c28d36bc 100755
--- a/tool/mkctimec.tcl
+++ b/tool/mkctimec.tcl
@@ -43,7 +43,7 @@ set ::headCode "
 ** autoconf-based build
 */
 #if defined(_HAVE_SQLITE_CONFIG_H) && !defined(SQLITECONFIG_H)
-#include \"config.h\"
+#include \"sqlite_cfg.h\"
 #define SQLITECONFIG_H 1
 #endif
 

From ed3182f233690989b332f64548d03ef9eb791a5c Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 4 Oct 2022 11:14:23 +0000
Subject: [PATCH 237/428] Tweaks to the opfs async wait/relinquish times.

FossilOrigin-Name: 35f33c23e5849de1c43c4499ee0a7fa11d26ae34949c1e820c3fa8e8873f9c2b
---
 ext/wasm/api/sqlite3-api-opfs.js     |  2 +-
 ext/wasm/sqlite3-opfs-async-proxy.js |  4 ++--
 manifest                             | 14 +++++++-------
 manifest.uuid                        |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index 90f1616809..1a329c8e51 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -918,7 +918,7 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
         [
           /* Truncate journal mode is faster than delete or wal for
              this vfs, per speedtest1. */
-          "pragma journal_mode=truncate;",
+          "pragma journal_mode=truncate;"
           /*
             This vfs benefits hugely from cache on moderate/large
             speedtest1 --size 50 and --size 100 workloads. We currently
diff --git a/ext/wasm/sqlite3-opfs-async-proxy.js b/ext/wasm/sqlite3-opfs-async-proxy.js
index b2b77fd4ea..d9310d025f 100644
--- a/ext/wasm/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/sqlite3-opfs-async-proxy.js
@@ -617,7 +617,7 @@ const waitLoop = async function f(){
      We need to wake up periodically to give the thread a chance
      to do other things.
   */
-  const waitTime = 200;
+  const waitTime = 500;
   /**
      relinquishTime defines the_approximate_ number of ms after which
      a db sync access handle will be relinquished so that we do not
@@ -631,7 +631,7 @@ const waitLoop = async function f(){
      once in a while (maybe 1 time in 5 or 10). Outliers as long as
      7ms have been witnessed, but they're rare.
   */
-  const relinquishTime = 750;
+  const relinquishTime = 500;
   let lastOpTime = performance.now();
   let now;
   while(!flagAsyncShutdown){
diff --git a/manifest b/manifest
index f51ab3e2d8..629bbcb37d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sext/wasm/api/README.md\sto\saccount\sfor\srecent\schanges.
-D 2022-10-04T09:12:43.030
+C Tweaks\sto\sthe\sopfs\sasync\swait/relinquish\stimes.
+D 2022-10-04T11:14:23.298
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -487,7 +487,7 @@ F ext/wasm/api/pre-js.js 2db711eb637991b383fc6b5c0f3df65ec48a7201e5730e304beba8d
 F ext/wasm/api/sqlite3-api-cleanup.js 5d22d1d3818ecacb23bfa223d5970cd0617d8cdbb48c8bc4bbd463f05b021a99
 F ext/wasm/api/sqlite3-api-glue.js a5a1bd620e2e2c26b6e843cf439548b35c5bb5ed21b24b89a412e0b0a8592c42
 F ext/wasm/api/sqlite3-api-oo1.js ac1e08d36bdfb5aa0a2d75b7d4c892fd51819d34c932370c3282810672bcc086
-F ext/wasm/api/sqlite3-api-opfs.js 8727adb9d69758c8c1adfc68b5445138b2e48da3a44ab5e67e4e13a7668c582f
+F ext/wasm/api/sqlite3-api-opfs.js 0db417af18fdcd39171366d9ac9e7bf57c5236aea4d2de26c759e65a22b7c446
 F ext/wasm/api/sqlite3-api-prologue.js baf88cf253a35153674b068b5125238993ea2a7804152d238b5e40140b506ef5
 F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
@@ -522,7 +522,7 @@ F ext/wasm/speedtest1.html e4cb5d722b494104fc1249e7c008ca018f820a784833c51004c95
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
-F ext/wasm/sqlite3-opfs-async-proxy.js 6c96f9598a251a44b3ff435cab85ba74b199a7d35f0d50c64625f2e3deb199db
+F ext/wasm/sqlite3-opfs-async-proxy.js 0861d0eff1ffb441b4ad98781a37825252ae2f08482cc5b29c27f34bcf952049
 F ext/wasm/sqlite3-worker1-promiser.js 307d7837420ca6a9d3780dfc81194f1c0715637e6d9540e935514086b96913d8
 F ext/wasm/sqlite3-worker1.js 466e9bd39409ab03f3e00999887aaffc11e95b416e2689596e3d7f1516673fdf
 F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
@@ -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 45c48c63d311052105d102189208495b2b53fa3c4174884ecf63b757aa4016e5
-R 246e96ac4ce43b2c873ef32e1a101b10
+P 9d488081fc82a9abe3e81c7897fe6b29b6b337f62d0c62cb9cec7517bd54b53f
+R 616ce8132e7f98fd04bd3d25f88d4168
 U stephan
-Z 7e94572339a06ebe488761e9bcb54eef
+Z da44b1ca0ef51fa028d53641db451066
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 40b5e5eb37..db383fdaae 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9d488081fc82a9abe3e81c7897fe6b29b6b337f62d0c62cb9cec7517bd54b53f
\ No newline at end of file
+35f33c23e5849de1c43c4499ee0a7fa11d26ae34949c1e820c3fa8e8873f9c2b
\ No newline at end of file

From 2eca06141feae3d241776e59b798b4aa1ce128b6 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Tue, 4 Oct 2022 14:50:46 +0000
Subject: [PATCH 238/428] Attempt to clarify the operation of the xLock and
 xUnlock VFS I/O methods. Assert() statements added to prove that they behave
 as the documentation says.

FossilOrigin-Name: 3efa811251d4510a074231a1e0b667783cc5f90777466b9dcae675cd9892b423
---
 manifest        | 16 ++++++++--------
 manifest.uuid   |  2 +-
 src/os.c        |  2 ++
 src/sqlite.h.in | 30 ++++++++++++++++++++----------
 4 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/manifest b/manifest
index d690941a1f..60a41be11a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sthe\sname\sof\sthe\sautoconf-generated\sconfiguration\sfile\sfrom\s"config.h"\nto\s"sqlite_cfg.h"\sto\swork\saround\sa\sbug\sin\sa\sdependency\schecker,\sreported\nin\s[https://twitter.com/josecastillo/status/1577136108097314816|a\stweet\sfrom\sJose\sCastillo].
-D 2022-10-04T10:35:10.544
+C Attempt\sto\sclarify\sthe\soperation\sof\sthe\sxLock\sand\sxUnlock\sVFS\sI/O\smethods.\nAssert()\sstatements\sadded\sto\sprove\sthat\sthey\sbehave\sas\sthe\sdocumentation\ssays.
+D 2022-10-04T14:50:46.626
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -520,7 +520,7 @@ F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
 F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
-F sqlite_cfg.h.in baf2e409c63d4e7a765e17769b6ff17c5a82bbd9cbf1e284fd2e4cefaff3fcf2 w config.h.in
+F sqlite_cfg.h.in baf2e409c63d4e7a765e17769b6ff17c5a82bbd9cbf1e284fd2e4cefaff3fcf2
 F src/alter.c 0390ca1d69ec3626cfa9f153114b7ab233e6b2bada6a9eb91361ed385fe90deb
 F src/analyze.c aabdf3769c7fd9954a8ec508eb7041ae174b66f88d12c47199fabbea9a646467
 F src/attach.c 4431f82f0247bf3aaf91589acafdff77d1882235c95407b36da1585c765fbbc8
@@ -568,7 +568,7 @@ F src/mutex_noop.c 9d4309c075ba9cc7249e19412d3d62f7f94839c4
 F src/mutex_unix.c dd2b3f1cc1863079bc1349ac0fec395a500090c4fe4e11ab775310a49f2f956d
 F src/mutex_w32.c caa50e1c0258ac4443f52e00fe8aaea73b6d0728bd8856bedfff822cae418541
 F src/notify.c 89a97dc854c3aa62ad5f384ef50c5a4a11d70fcc69f86de3e991573421130ed6
-F src/os.c 0eb831ba3575af5277e47f4edd14fdfc90025c67eb25ce5cda634518d308d4e9
+F src/os.c 81c9c1c52eab711e27e33fd51fe5788488d3a02bc1a71439857abbee5d0d2c97
 F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
 F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
@@ -590,7 +590,7 @@ F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c bb18acf4eded647fef88d4d543c673874dbebff516fbeba90a85e6c13f2a58cd
 F src/shell.c.in e7e7c2c69ae86c5ee9e8ad66227203d46ff6dce8700a1b1dababff01c71d33df
-F src/sqlite.h.in 3f4695457fcb41ea8a44c6d09fc2a591bbeda44b13bda86618f3ce0071bbca7c
+F src/sqlite.h.in bcc51bb43c54676dccbad07051c6d463212707f50363d64f1831440749e91ddb
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d
 F src/sqliteInt.h 1d27d00dcaafed614d6ed8738d6c41a81acf12fe50fe4c677427b1c56d8a81da
@@ -2000,8 +2000,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 d7c2be6bdc3402e5a339d0f7b76d2c25f3a444dcbf54a77c1ccb790d1195a7cf
-R 4713eb8f98a8aeab7d0d3163e5e46206
+P 897e187cad981126fc5f6ea8e382e937825af10b0c9589b0a23b9fbaa4ca58b8
+R e2ac55c08c3f1d2d33e5a2d4f6cdf937
 U drh
-Z cc19c5c21171ef2d2de636f9d251ad05
+Z d8fbc7d6453f3413769ceb23c01d9355
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 81b40ebe86..f7cb13b05b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-897e187cad981126fc5f6ea8e382e937825af10b0c9589b0a23b9fbaa4ca58b8
\ No newline at end of file
+3efa811251d4510a074231a1e0b667783cc5f90777466b9dcae675cd9892b423
\ No newline at end of file
diff --git a/src/os.c b/src/os.c
index 13c9abcab4..e2914e03c0 100644
--- a/src/os.c
+++ b/src/os.c
@@ -106,9 +106,11 @@ int sqlite3OsFileSize(sqlite3_file *id, i64 *pSize){
 }
 int sqlite3OsLock(sqlite3_file *id, int lockType){
   DO_OS_MALLOC_TEST(id);
+  assert( lockType>=SQLITE_LOCK_SHARED && lockType<=SQLITE_LOCK_EXCLUSIVE );
   return id->pMethods->xLock(id, lockType);
 }
 int sqlite3OsUnlock(sqlite3_file *id, int lockType){
+  assert( lockType==SQLITE_LOCK_NONE || lockType==SQLITE_LOCK_SHARED );
   return id->pMethods->xUnlock(id, lockType);
 }
 int sqlite3OsCheckReservedLock(sqlite3_file *id, int *pResOut){
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index df61f3c196..03a3e5cc01 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -670,13 +670,17 @@ int sqlite3_exec(
 **
 ** SQLite uses one of these integer values as the second
 ** argument to calls it makes to the xLock() and xUnlock() methods
-** of an [sqlite3_io_methods] object.
+** of an [sqlite3_io_methods] object.  These values are ordered from
+** lest restrictive to most restrictive.
+**
+** The argument to xLock() is always SHARED or higher.  The argument to
+** xUnlock is either SHARED or NONE.
 */
-#define SQLITE_LOCK_NONE          0
-#define SQLITE_LOCK_SHARED        1
-#define SQLITE_LOCK_RESERVED      2
-#define SQLITE_LOCK_PENDING       3
-#define SQLITE_LOCK_EXCLUSIVE     4
+#define SQLITE_LOCK_NONE          0       /* xUnlock() only */
+#define SQLITE_LOCK_SHARED        1       /* xLock() or xUnlock() */
+#define SQLITE_LOCK_RESERVED      2       /* xLock() only */
+#define SQLITE_LOCK_PENDING       3       /* xLock() only */
+#define SQLITE_LOCK_EXCLUSIVE     4       /* xLock() only */
 
 /*
 ** CAPI3REF: Synchronization Type Flags
@@ -754,7 +758,14 @@ struct sqlite3_file {
 ** <li> [SQLITE_LOCK_PENDING], or
 ** <li> [SQLITE_LOCK_EXCLUSIVE].
 ** </ul>
-** xLock() increases the lock. xUnlock() decreases the lock.
+** xLock() upgrades the database file lock.  In other words, xLock() moves the
+** database file lock in the direction NONE toward EXCLUSIVE. The argument to
+** xLock() is always on of SHARED, RESERVED, PENDING, or EXCLUSIVE, never
+** SQLITE_LOCK_NONE.  If the database file lock is already at or above the
+** requested lock, then the call to xLock() is a no-op.
+** xUnlock() downgrades the database file lock to either SHARED or NONE.
+*  If the lock is already at or below the requested lock state, then the call
+** to xUnlock() is a no-op. 
 ** The xCheckReservedLock() method checks whether any database connection,
 ** either in this process or in some other process, is holding a RESERVED,
 ** PENDING, or EXCLUSIVE lock on the file.  It returns true
@@ -859,9 +870,8 @@ struct sqlite3_io_methods {
 ** opcode causes the xFileControl method to write the current state of
 ** the lock (one of [SQLITE_LOCK_NONE], [SQLITE_LOCK_SHARED],
 ** [SQLITE_LOCK_RESERVED], [SQLITE_LOCK_PENDING], or [SQLITE_LOCK_EXCLUSIVE])
-** into an integer that the pArg argument points to. This capability
-** is used during testing and is only available when the SQLITE_TEST
-** compile-time option is used.
+** into an integer that the pArg argument points to.
+** This capability is only available if SQLite is compiled with [SQLITE_DEBUG].
 **
 ** <li>[[SQLITE_FCNTL_SIZE_HINT]]
 ** The [SQLITE_FCNTL_SIZE_HINT] opcode is used by SQLite to give the VFS

From 9a55773b2f2b5e94afa59ced504e2078af2c565b Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 4 Oct 2022 17:06:51 +0000
Subject: [PATCH 239/428] Replace time-based auto-unlock of opfs sync handles
 with lock acquisition/release via sqlite3_io_methods::xLock/xUnlock().

FossilOrigin-Name: 2625b7cfe1640c1d7e779ec1f37db970541598c0dc3e22e5eecf3c772d95ad40
---
 ext/wasm/api/sqlite3-api-opfs.js     | 67 ++++++++++++++++++------
 ext/wasm/api/sqlite3-api-prologue.js | 15 +++++-
 ext/wasm/sqlite3-opfs-async-proxy.js | 78 ++++++++++++++--------------
 ext/wasm/test-opfs-vfs.js            |  7 ---
 manifest                             | 18 +++----
 manifest.uuid                        |  2 +-
 6 files changed, 115 insertions(+), 72 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index 1a329c8e51..40e615eb86 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -169,6 +169,7 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
     W.onerror = function(err){
       // The error object doesn't contain any useful info when the
       // failure is, e.g., that the remote script is 404.
+      error("Error initializing OPFS asyncer:",err);
       promiseReject(new Error("Loading OPFS async Worker failed for unknown reasons."));
     };
     const pDVfs = capi.sqlite3_vfs_find(null)/*pointer to default VFS*/;
@@ -202,7 +203,6 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
        environment or the other when sqlite3_os_end() is called (_if_ it
        gets called at all in a wasm build, which is undefined).
     */
-
     /**
        State which we send to the async-api Worker or share with it.
        This object must initially contain only cloneable or sharable
@@ -224,7 +224,12 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
     */
     const state = Object.create(null);
     state.verbose = options.verbose;
-    state.littleEndian = true;
+    state.littleEndian = (()=>{
+      const buffer = new ArrayBuffer(2);
+      new DataView(buffer).setInt16(0, 256, true /* littleEndian */);
+      // Int16Array uses the platform's endianness.
+      return new Int16Array(buffer)[0] === 256;
+    })();
     /** Whether the async counterpart should log exceptions to
         the serialization channel. That produces a great deal of
         noise for seemingly innocuous things like xAccess() checks
@@ -265,7 +270,7 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
          between both workers. This worker writes to it and the other
          listens for changes. */
       state.opIds.whichOp = i++;
-      /* Slot for storing return values. This work listens to that
+      /* Slot for storing return values. This worker listens to that
          slot and the other worker writes to it. */
       state.opIds.rc = i++;
       /* Each function gets an ID which this worker writes to
@@ -278,11 +283,13 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
       state.opIds.xDeleteNoWait = i++;
       state.opIds.xFileControl = i++;
       state.opIds.xFileSize = i++;
+      state.opIds.xLock = i++;
       state.opIds.xOpen = i++;
       state.opIds.xRead = i++;
       state.opIds.xSleep = i++;
       state.opIds.xSync = i++;
       state.opIds.xTruncate = i++;
+      state.opIds.xUnlock = i++;
       state.opIds.xWrite = i++;
       state.opIds.mkdir = i++;
       state.opIds['opfs-async-metrics'] = i++;
@@ -290,7 +297,6 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
       state.sabOP = new SharedArrayBuffer(i * 4/*sizeof int32*/);
       opfsUtil.metrics.reset();
     }
-
     /**
        SQLITE_xxx constants to export to the async worker
        counterpart...
@@ -304,10 +310,17 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
       'SQLITE_IOERR_TRUNCATE', 'SQLITE_IOERR_DELETE',
       'SQLITE_IOERR_ACCESS', 'SQLITE_IOERR_CLOSE',
       'SQLITE_IOERR_DELETE',
+      'SQLITE_LOCK_NONE',
+      'SQLITE_LOCK_SHARED',
+      'SQLITE_LOCK_RESERVED',
+      'SQLITE_LOCK_PENDING',
+      'SQLITE_LOCK_EXCLUSIVE',
       'SQLITE_OPEN_CREATE', 'SQLITE_OPEN_DELETEONCLOSE',
       'SQLITE_OPEN_READONLY'
-    ].forEach(function(k){
-      state.sq3Codes[k] = capi[k] || toss("Maintenance required: not found:",k);
+    ].forEach((k)=>{
+      if(undefined === (state.sq3Codes[k] = capi[k])){
+        toss("Maintenance required: not found:",k);
+      }
     });
 
     /**
@@ -605,7 +618,8 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
       xCheckReservedLock: function(pFile,pOut){
         // Exclusive lock is automatically acquired when opened
         //warn("xCheckReservedLock(",arguments,") is a no-op");
-        wasm.setMemValue(pOut,1,'i32');
+        const f = __openFiles[pFile];
+        wasm.setMemValue(pOut, f.lockMode ? 1 : 0, 'i32');
         return 0;
       },
       xClose: function(pFile){
@@ -643,9 +657,17 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
         return rc;
       },
       xLock: function(pFile,lockType){
-        //2022-09: OPFS handles lock when opened
-        //warn("xLock(",arguments,") is a no-op");
-        return 0;
+        mTimeStart('xLock');
+        const f = __openFiles[pFile];
+        let rc = 0;
+        if( capi.SQLITE_LOCK_NONE === f.lockType ) {
+          rc = opRun('xLock', pFile, lockType);
+          if( 0===rc ) f.lockType = lockType;
+        }else{
+          f.lockType = lockType;
+        }
+        mTimeEnd();
+        return rc;
       },
       xRead: function(pFile,pDest,n,offset64){
         /* int (*xRead)(sqlite3_file*, void*, int iAmt, sqlite3_int64 iOfst) */
@@ -676,9 +698,16 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
         return rc;
       },
       xUnlock: function(pFile,lockType){
-        //2022-09: OPFS handles lock when opened
-        //warn("xUnlock(",arguments,") is a no-op");
-        return 0;
+        mTimeStart('xUnlock');
+        const f = __openFiles[pFile];
+        let rc = 0;
+        if( capi.SQLITE_LOCK_NONE === lockType
+          && f.lockType ){
+          rc = opRun('xUnlock', pFile, lockType);
+        }
+        if( 0===rc ) f.lockType = lockType;
+        mTimeEnd();
+        return rc;
       },
       xWrite: function(pFile,pSrc,n,offset64){
         /* int (*xWrite)(sqlite3_file*, const void*, int iAmt, sqlite3_int64 iOfst) */
@@ -696,7 +725,7 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
         return rc;
       }
     }/*ioSyncWrappers*/;
-    
+
     /**
        Impls for the sqlite3_vfs methods. Maintenance reminder: members
        are in alphabetical order to simplify finding them.
@@ -790,6 +819,7 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
           fh.sabView = state.sabFileBufView;
           fh.sq3File = new sqlite3_file(pFile);
           fh.sq3File.$pMethods = opfsIoMethods.pointer;
+          fh.lockType = capi.SQLITE_LOCK_NONE;
         }
         mTimeEnd();
         return rc;
@@ -1061,5 +1091,12 @@ installOpfsVfs.defaultProxyUri =
     //self.location.pathname.replace(/[^/]*$/, "sqlite3-opfs-async-proxy.js");
   "sqlite3-opfs-async-proxy.js";
 //console.warn("sqlite3.installOpfsVfs.defaultProxyUri =",sqlite3.installOpfsVfs.defaultProxyUri);
-self.sqlite3ApiBootstrap.initializersAsync.push(async (sqlite3)=>installOpfsVfs());
+self.sqlite3ApiBootstrap.initializersAsync.push(async (sqlite3)=>{
+  try{
+    return installOpfsVfs();
+  }catch(e){
+    console.error("installOpfsVfs() exception:",e);
+    throw e;
+  }
+});
 }/*sqlite3ApiBootstrap.initializers.push()*/);
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 516f53f52e..5b80c439bb 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -1312,14 +1312,25 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
       // Is it okay to resolve these in parallel or do we need them
       // to resolve in order? We currently only have 1, so it
       // makes no difference.
-      lip = lip.map((f)=>f(sqlite3).catch(()=>{}));
+      lip = lip.map((f)=>f(sqlite3).catch((e)=>{
+        console.error("An async sqlite3 initializer failed:",e);
+      }));
       //let p = lip.shift();
       //while(lip.length) p = p.then(lip.shift());
       //return p.then(()=>sqlite3);
       return Promise.all(lip).then(()=>sqlite3);
     }
   };
-  sqlite3ApiBootstrap.initializers.forEach((f)=>f(sqlite3));
+  try{
+    sqlite3ApiBootstrap.initializers.forEach((f)=>{
+      f(sqlite3);
+    });
+  }catch(e){
+    /* If we don't report this here, it can get completely swallowed
+       up and disappear into the abyss of Promises and Workers. */
+    console.error("sqlite3 bootstrap initializer threw:",e);
+    throw e;
+  }
   delete sqlite3ApiBootstrap.initializers;
   sqlite3ApiBootstrap.sqlite3 = sqlite3;
   return sqlite3;
diff --git a/ext/wasm/sqlite3-opfs-async-proxy.js b/ext/wasm/sqlite3-opfs-async-proxy.js
index d9310d025f..fd4c7f2b80 100644
--- a/ext/wasm/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/sqlite3-opfs-async-proxy.js
@@ -41,6 +41,9 @@ if(self.window === self){
 }else if(!navigator.storage.getDirectory){
   toss("This API requires navigator.storage.getDirectory.");
 }
+
+//warn("This file is very much experimental and under construction.",self.location.pathname);
+
 /**
    Will hold state copied to this object from the syncronous side of
    this API.
@@ -97,8 +100,6 @@ metrics.dump = ()=>{
   console.log("Serialization metrics:",metrics.s11n);
 };
 
-//warn("This file is very much experimental and under construction.",self.location.pathname);
-
 /**
    Map of sqlite3_file pointers (integers) to metadata related to a
    given OPFS file handles. The pointers are, in this side of the
@@ -142,8 +143,7 @@ const getDirForFilename = async function f(absFilename, createDirs = false){
 /**
    Returns the sync access handle associated with the given file
    handle object (which must be a valid handle object), lazily opening
-   it if needed. Timestamps the handle for use in relinquishing it
-   during idle time.
+   it if needed.
 
    In order to help alleviate cross-tab contention for a dabase,
    if an exception is thrown while acquiring the handle, this routine
@@ -177,13 +177,12 @@ const getSyncHandle = async (fh)=>{
     }
     log("Got sync handle for",fh.filenameAbs,'in',performance.now() - t,'ms');
   }
-  fh.syncHandleTime = performance.now();
   return fh.syncHandle;
 };
 
 const closeSyncHandle = async (fh)=>{
   if(fh.syncHandle){
-    //warn("Closing sync handle for",fh.filenameAbs);
+    log("Closing sync handle for",fh.filenameAbs);
     const h = fh.syncHandle;
     delete fh.syncHandle;
     return h.close();
@@ -239,6 +238,7 @@ const wTimeEnd = ()=>(
 */
 let flagAsyncShutdown = false;
 
+
 /**
    Asynchronous wrappers for sqlite3_vfs and sqlite3_io_methods
    methods. Maintenance reminder: members are in alphabetical order
@@ -373,6 +373,20 @@ const vfsAsyncImpls = {
     storeAndNotify('xFileSize', sz);
     mTimeEnd();
   },
+  xLock: async function(fid,lockType){
+    mTimeStart('xLock');
+    const fh = __openFiles[fid];
+    let rc = 0;
+    if( !fh.syncHandle ){
+      try { await getSyncHandle(fh) }
+      catch(e){
+        state.s11n.storeException(1,e);
+        rc = state.sq3Codes.SQLITE_IOERR;
+      }
+    }
+    storeAndNotify('xLock',rc);
+    mTimeEnd();
+  },
   xOpen: async function(fid/*sqlite3_file pointer*/, filename, flags){
     const opName = 'xOpen';
     mTimeStart(opName);
@@ -473,6 +487,23 @@ const vfsAsyncImpls = {
     storeAndNotify('xTruncate',rc);
     mTimeEnd();
   },
+  xUnlock: async function(fid,lockType){
+    mTimeStart('xUnlock');
+    let rc = 0;
+    const fh = __openFiles[fid];
+    if( state.sq3Codes.SQLITE_LOCK_NONE===lockType
+        && fh.syncHandle ){
+      try { await closeSyncHandle(fh) }
+      catch(e){
+        state.s11n.storeException(1,e);
+        rc = state.sq3Codes.SQLITE_IOERR;
+        /* Maybe we want to not report this? "Destructors do not
+           throw." */
+      }
+    }
+    storeAndNotify('xUnlock',rc);
+    mTimeEnd();
+  },
   xWrite: async function(fid,n,offset){
     mTimeStart('xWrite');
     let rc;
@@ -495,7 +526,7 @@ const vfsAsyncImpls = {
     storeAndNotify('xWrite',rc);
     mTimeEnd();
   }
-};
+}/*vfsAsyncImpls*/;
 
 const initS11n = ()=>{
   /**
@@ -617,21 +648,7 @@ const waitLoop = async function f(){
      We need to wake up periodically to give the thread a chance
      to do other things.
   */
-  const waitTime = 500;
-  /**
-     relinquishTime defines the_approximate_ number of ms after which
-     a db sync access handle will be relinquished so that we do not
-     hold a persistent lock on it. When the following loop times out
-     while waiting, every (approximate) increment of this value it
-     will relinquish any db handles which have been idle for at least
-     this much time.
-
-     Reaquisition of a sync handle seems to take an average of
-     0.6-0.9ms on this dev machine but takes anywhere from 1-3ms every
-     once in a while (maybe 1 time in 5 or 10). Outliers as long as
-     7ms have been witnessed, but they're rare.
-  */
-  const relinquishTime = 500;
+  const waitTime = 1000;
   let lastOpTime = performance.now();
   let now;
   while(!flagAsyncShutdown){
@@ -639,21 +656,6 @@ const waitLoop = async function f(){
       if('timed-out'===Atomics.wait(
         state.sabOPView, state.opIds.whichOp, 0, waitTime
       )){
-        if(relinquishTime &&
-           (lastOpTime + relinquishTime <= (now = performance.now()))){
-          for(const fh of Object.values(__openFiles)){
-            if(fh.syncHandle && (
-              now - relinquishTime >= fh.syncHandleTime
-            )){
-              log("Relinquishing for timeout:",fh.filenameAbs);
-              await closeSyncHandle(fh)
-              /* Testing shows that we have to wait on this async
-                 op to finish, else we might try to re-open it
-                 before the close has run. The FS layer does not
-                 retain the order those operations, apparently. */;
-            }
-          }
-        }
         continue;
       }
       lastOpTime = performance.now();
@@ -719,4 +721,4 @@ navigator.storage.getDirectory().then(function(d){
     }
   };
   wMsg('opfs-async-loaded');
-}).catch((e)=>error(e));
+}).catch((e)=>error("error initializing OPFS asyncer:",e));
diff --git a/ext/wasm/test-opfs-vfs.js b/ext/wasm/test-opfs-vfs.js
index 2b22a7e96c..583871b7d1 100644
--- a/ext/wasm/test-opfs-vfs.js
+++ b/ext/wasm/test-opfs-vfs.js
@@ -34,10 +34,6 @@ const tryOpfsVfs = async function(sqlite3){
   const wait = async (ms)=>{
     return new Promise((resolve)=>setTimeout(resolve, ms));
   };
-  const waitForRelinquish = async ()=>{
-    log("Waiting briefly to test sync handle relinquishing...");
-    return wait(1500);
-  };
 
   const urlArgs = new URL(self.location.href).searchParams;
   const dbFile = "my-persistent.db";
@@ -45,13 +41,11 @@ const tryOpfsVfs = async function(sqlite3){
 
   const db = new opfs.OpfsDb(dbFile,'ct');
   log("db file:",db.filename);
-  await waitForRelinquish();
   try{
     if(opfs.entryExists(dbFile)){
       let n = db.selectValue("select count(*) from sqlite_schema");
       log("Persistent data found. sqlite_schema entry count =",n);
     }
-    await waitForRelinquish();
     db.transaction((db)=>{
       db.exec({
         sql:[
@@ -63,7 +57,6 @@ const tryOpfsVfs = async function(sqlite3){
                (performance.now() |0) / 4]
       });
     });
-    await waitForRelinquish();
     log("count(*) from t =",db.selectValue("select count(*) from t"));
 
     // Some sanity checks of the opfs utility functions...
diff --git a/manifest b/manifest
index 629bbcb37d..2bda31e933 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Tweaks\sto\sthe\sopfs\sasync\swait/relinquish\stimes.
-D 2022-10-04T11:14:23.298
+C Replace\stime-based\sauto-unlock\sof\sopfs\ssync\shandles\swith\slock\sacquisition/release\svia\ssqlite3_io_methods::xLock/xUnlock().
+D 2022-10-04T17:06:51.812
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -487,8 +487,8 @@ F ext/wasm/api/pre-js.js 2db711eb637991b383fc6b5c0f3df65ec48a7201e5730e304beba8d
 F ext/wasm/api/sqlite3-api-cleanup.js 5d22d1d3818ecacb23bfa223d5970cd0617d8cdbb48c8bc4bbd463f05b021a99
 F ext/wasm/api/sqlite3-api-glue.js a5a1bd620e2e2c26b6e843cf439548b35c5bb5ed21b24b89a412e0b0a8592c42
 F ext/wasm/api/sqlite3-api-oo1.js ac1e08d36bdfb5aa0a2d75b7d4c892fd51819d34c932370c3282810672bcc086
-F ext/wasm/api/sqlite3-api-opfs.js 0db417af18fdcd39171366d9ac9e7bf57c5236aea4d2de26c759e65a22b7c446
-F ext/wasm/api/sqlite3-api-prologue.js baf88cf253a35153674b068b5125238993ea2a7804152d238b5e40140b506ef5
+F ext/wasm/api/sqlite3-api-opfs.js 78fd272d6ec4fe6da93910b978f693fff63beed8e0e5e7dab42a25dbdfefca4b
+F ext/wasm/api/sqlite3-api-prologue.js 587e6aa373bd85e83bcc3fb82b3636b01aaf2caefa39679e02574e766560d711
 F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 0c8cb242b80b8de27b74f05ed781f427958e04c9339c4720f30c3a7e78ee6242
@@ -522,11 +522,11 @@ F ext/wasm/speedtest1.html e4cb5d722b494104fc1249e7c008ca018f820a784833c51004c95
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
-F ext/wasm/sqlite3-opfs-async-proxy.js 0861d0eff1ffb441b4ad98781a37825252ae2f08482cc5b29c27f34bcf952049
+F ext/wasm/sqlite3-opfs-async-proxy.js 40fc1f779e18e08b31404ef832381ffd36b9d11447007aaf96223198324e4467
 F ext/wasm/sqlite3-worker1-promiser.js 307d7837420ca6a9d3780dfc81194f1c0715637e6d9540e935514086b96913d8
 F ext/wasm/sqlite3-worker1.js 466e9bd39409ab03f3e00999887aaffc11e95b416e2689596e3d7f1516673fdf
 F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
-F ext/wasm/test-opfs-vfs.js 0115d56f3f2a6475040dffe75a6851a353b1690708795944cf0fe1890bc7ff54
+F ext/wasm/test-opfs-vfs.js 56c3d725044c668fa7910451e96c1195d25ad95825f9ac79f747a7759d1973d0
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
 F ext/wasm/testing-worker1-promiser.js bd788e33c1807e0a6dda9c9a9d784bd3350ca49c9dd8ae2cc8719b506b6e013e
 F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d7669fb17fcae
@@ -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 9d488081fc82a9abe3e81c7897fe6b29b6b337f62d0c62cb9cec7517bd54b53f
-R 616ce8132e7f98fd04bd3d25f88d4168
+P 35f33c23e5849de1c43c4499ee0a7fa11d26ae34949c1e820c3fa8e8873f9c2b
+R 447ab40d8f9d9bacdb3bbf1fc5e8416f
 U stephan
-Z da44b1ca0ef51fa028d53641db451066
+Z 1f6ebc0e7b8d0de3ff6621f210427c47
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index db383fdaae..b47bd0f8b4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-35f33c23e5849de1c43c4499ee0a7fa11d26ae34949c1e820c3fa8e8873f9c2b
\ No newline at end of file
+2625b7cfe1640c1d7e779ec1f37db970541598c0dc3e22e5eecf3c772d95ad40
\ No newline at end of file

From 041cc06139b0a6878c5dc850d9abf7bc79d76e1f Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Tue, 4 Oct 2022 19:43:12 +0000
Subject: [PATCH 240/428] Better handling for databases with corrupt headers.

FossilOrigin-Name: 17f68d803685405d880025134c71bac01077962d677f2902a608952d0b9cdb5a
---
 ext/recover/sqlite3recover.c | 269 ++++++++++++++++++++++++++++++++++-
 manifest                     |  12 +-
 manifest.uuid                |   2 +-
 3 files changed, 275 insertions(+), 8 deletions(-)

diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index e492cdf246..dd294dcc7b 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -28,6 +28,7 @@ __declspec(dllexport)
 int sqlite3_dbdata_init(sqlite3*, char**, const sqlite3_api_routines*);
 
 typedef unsigned int u32;
+typedef unsigned char u8;
 typedef sqlite3_int64 i64;
 
 typedef struct RecoverTable RecoverTable;
@@ -240,11 +241,30 @@ struct sqlite3_recover {
 #define RECOVER_STATE_SCHEMA2        5
 #define RECOVER_STATE_DONE           6
 
+
+/*
+** Global variables used by this extension.
+*/
+typedef struct RecoverGlobal RecoverGlobal;
+struct RecoverGlobal {
+  const sqlite3_io_methods *pMethods;
+};
+static RecoverGlobal recover_g;
+
+/*
+** Use this static SQLite mutex to protect the globals during the
+** first call to sqlite3_recover_step().
+*/ 
+#define RECOVER_MUTEX_ID SQLITE_MUTEX_STATIC_APP2
+
+
+
 /* 
 ** Default value for SQLITE_RECOVER_ROWIDS (sqlite3_recover.bRecoverRowid).
 */
 #define RECOVER_ROWID_DEFAULT 1
 
+
 /*
 ** Like strlen(). But handles NULL pointer arguments.
 */
@@ -1840,6 +1860,247 @@ static void recoverFinalCleanup(sqlite3_recover *p){
   p->dbOut = 0;
 }
 
+static int recoverVfsClose(sqlite3_file*);
+static int recoverVfsRead(sqlite3_file*, void*, int iAmt, sqlite3_int64 iOfst);
+static int recoverVfsWrite(sqlite3_file*, const void*, int, sqlite3_int64);
+static int recoverVfsTruncate(sqlite3_file*, sqlite3_int64 size);
+static int recoverVfsSync(sqlite3_file*, int flags);
+static int recoverVfsFileSize(sqlite3_file*, sqlite3_int64 *pSize);
+static int recoverVfsLock(sqlite3_file*, int);
+static int recoverVfsUnlock(sqlite3_file*, int);
+static int recoverVfsCheckReservedLock(sqlite3_file*, int *pResOut);
+static int recoverVfsFileControl(sqlite3_file*, int op, void *pArg);
+static int recoverVfsSectorSize(sqlite3_file*);
+static int recoverVfsDeviceCharacteristics(sqlite3_file*);
+static int recoverVfsShmMap(sqlite3_file*, int, int, int, void volatile**);
+static int recoverVfsShmLock(sqlite3_file*, int offset, int n, int flags);
+static void recoverVfsShmBarrier(sqlite3_file*);
+static int recoverVfsShmUnmap(sqlite3_file*, int deleteFlag);
+
+static sqlite3_io_methods recover_methods = {
+  2, /* iVersion */
+  recoverVfsClose,
+  recoverVfsRead,
+  recoverVfsWrite,
+  recoverVfsTruncate,
+  recoverVfsSync,
+  recoverVfsFileSize,
+  recoverVfsLock,
+  recoverVfsUnlock,
+  recoverVfsCheckReservedLock,
+  recoverVfsFileControl,
+  recoverVfsSectorSize,
+  recoverVfsDeviceCharacteristics,
+  recoverVfsShmMap,
+  recoverVfsShmLock,
+  recoverVfsShmBarrier,
+  recoverVfsShmUnmap,
+  0, 0
+};
+
+static int recoverVfsClose(sqlite3_file *pFd){
+  assert( pFd->pMethods!=&recover_methods );
+  return pFd->pMethods->xClose(pFd);
+}
+
+static u32 recoverGetU16(const u8 *a){
+  return (((u32)a[0])<<8) + ((u32)a[1]);
+}
+static u32 recoverGetU32(const u8 *a){
+  return (((u32)a[0])<<24) + (((u32)a[1])<<16) + (((u32)a[2])<<8) + ((u32)a[3]);
+}
+
+static void recoverPutU16(u8 *a, u32 v){
+  a[0] = (v>>8) & 0x00FF;
+  a[1] = (v>>0) & 0x00FF;
+}
+static u32 recoverPutU32(u8 *a, u32 v){
+  a[0] = (v>>24) & 0x00FF;
+  a[1] = (v>>16) & 0x00FF;
+  a[2] = (v>>8) & 0x00FF;
+  a[3] = (v>>0) & 0x00FF;
+}
+
+static int recoverVfsRead(sqlite3_file *pFd, void *aBuf, int nByte, i64 iOff){
+  int rc = SQLITE_OK;
+  if( pFd->pMethods==&recover_methods ){
+    pFd->pMethods = recover_g.pMethods;
+    rc = pFd->pMethods->xRead(pFd, aBuf, nByte, iOff);
+    if( rc==SQLITE_OK && iOff==0 && nByte>=100 ){
+      /* Ensure that the database has a valid header file. The only fields
+      ** that really matter to recovery are:
+      **
+      **   + Database page size (16-bits at offset 16)
+      **   + Size of db in pages (32-bits at offset 28)
+      **   + Database encoding (32-bits at offset 56)
+      **
+      ** Also preserved are:
+      **
+      **   + first freelist page (32-bits at offset 32)
+      **   + size of freelist (32-bits at offset 36)
+      **
+      ** We also try to preserve the auto-vacuum, incr-value, user-version
+      ** and application-id fields - all 32 bit quantities at offsets 
+      ** 52, 60, 64 and 68. All other fields are set to known good values.
+      */
+      const int aPreserve[] = {32, 36, 52, 60, 64, 68};
+      u8 aHdr[100] = {
+        0x53, 0x51, 0x4c, 0x69, 0x74, 0x65, 0x20, 0x66, 
+        0x6f, 0x72, 0x6d, 0x61, 0x74, 0x20, 0x33, 0x00,
+        0xFF, 0xFF, 0x01, 0x01, 0x00, 0x40, 0x20, 0x20,
+        0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,
+        0x00, 0x00, 0x10, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x2e, 0x5b, 0x30
+      };
+      u8 *a = (u8*)aBuf;
+
+      u32 pgsz = recoverGetU16(&a[16]);
+      u32 enc = recoverGetU32(&a[56]);
+      u32 dbsz = 0;
+      i64 dbFileSize = 0;
+      int ii;
+
+      if( pgsz==0x01 ) pgsz = 65536;
+      rc = pFd->pMethods->xFileSize(pFd, &dbFileSize);
+
+      dbsz = dbFileSize / pgsz;
+      if( enc!=SQLITE_UTF8 && enc!=SQLITE_UTF16BE && enc!=SQLITE_UTF16LE ){
+        enc = SQLITE_UTF8;
+      }
+
+      recoverPutU32(&aHdr[28], dbsz);
+      recoverPutU32(&aHdr[56], enc);
+      if( pgsz==65536 ) pgsz = 1;
+      recoverPutU16(&aHdr[16], pgsz);
+      for(ii=0; ii<sizeof(aPreserve)/sizeof(aPreserve[0]); ii++){
+        memcpy(&aHdr[aPreserve[ii]], &a[aPreserve[ii]], 4);
+      }
+      memcpy(aBuf, aHdr, sizeof(aHdr));
+    }
+    pFd->pMethods = &recover_methods;
+  }else{
+    rc = pFd->pMethods->xRead(pFd, aBuf, nByte, iOff);
+  }
+  return rc;
+}
+
+#define RECOVER_VFS_WRAPPER(code)                         \
+  int rc = SQLITE_OK;                                     \
+  if( pFd->pMethods==&recover_methods ){                  \
+    pFd->pMethods = recover_g.pMethods;                   \
+    rc = code;                                            \
+    pFd->pMethods = &recover_methods;                     \
+  }else{                                                  \
+    rc = code;                                            \
+  }                                                       \
+  return rc;                                              
+
+static int recoverVfsWrite(
+  sqlite3_file *pFd, const void *aBuf, int nByte, i64 iOff
+){
+  RECOVER_VFS_WRAPPER (
+      pFd->pMethods->xWrite(pFd, aBuf, nByte, iOff)
+  );
+}
+static int recoverVfsTruncate(sqlite3_file *pFd, sqlite3_int64 size){
+  RECOVER_VFS_WRAPPER (
+      pFd->pMethods->xTruncate(pFd, size)
+  );
+}
+
+static int recoverVfsSync(sqlite3_file *pFd, int flags){
+  RECOVER_VFS_WRAPPER (
+      pFd->pMethods->xSync(pFd, flags)
+  );
+}
+static int recoverVfsFileSize(sqlite3_file *pFd, sqlite3_int64 *pSize){
+  RECOVER_VFS_WRAPPER (
+      pFd->pMethods->xFileSize(pFd, pSize)
+  );
+}
+static int recoverVfsLock(sqlite3_file *pFd, int eLock){
+  RECOVER_VFS_WRAPPER (
+      pFd->pMethods->xLock(pFd, eLock)
+  );
+}
+static int recoverVfsUnlock(sqlite3_file *pFd, int eLock){
+  RECOVER_VFS_WRAPPER (
+      pFd->pMethods->xUnlock(pFd, eLock)
+  );
+}
+static int recoverVfsCheckReservedLock(sqlite3_file *pFd, int *pResOut){
+  RECOVER_VFS_WRAPPER (
+      pFd->pMethods->xCheckReservedLock(pFd, pResOut)
+  );
+}
+static int recoverVfsFileControl(sqlite3_file *pFd, int op, void *pArg){
+  RECOVER_VFS_WRAPPER (
+      pFd->pMethods->xFileControl(pFd, op, pArg)
+  );
+}
+static int recoverVfsSectorSize(sqlite3_file *pFd){
+  RECOVER_VFS_WRAPPER (
+      pFd->pMethods->xSectorSize(pFd)
+  );
+}
+static int recoverVfsDeviceCharacteristics(sqlite3_file *pFd){
+  RECOVER_VFS_WRAPPER (
+      pFd->pMethods->xDeviceCharacteristics(pFd)
+  );
+}
+static int recoverVfsShmMap(
+  sqlite3_file *pFd, int iPg, int pgsz, int bExtend, void volatile **pp
+){
+  RECOVER_VFS_WRAPPER (
+      pFd->pMethods->xShmMap(pFd, iPg, pgsz, bExtend, pp)
+  );
+}
+static int recoverVfsShmLock(sqlite3_file *pFd, int offset, int n, int flags){
+  RECOVER_VFS_WRAPPER (
+      pFd->pMethods->xShmLock(pFd, offset, n, flags)
+  );
+}
+static void recoverVfsShmBarrier(sqlite3_file *pFd){
+  if( pFd->pMethods==&recover_methods ){
+    pFd->pMethods = recover_g.pMethods;
+    pFd->pMethods->xShmBarrier(pFd);
+    pFd->pMethods = &recover_methods;
+  }else{
+    pFd->pMethods->xShmBarrier(pFd);
+  }
+}
+static int recoverVfsShmUnmap(sqlite3_file *pFd, int deleteFlag){
+  RECOVER_VFS_WRAPPER (
+      pFd->pMethods->xShmUnmap(pFd, deleteFlag)
+  );
+}
+
+static void recoverInstallWrapper(sqlite3_recover *p){
+  sqlite3_file *pFd = 0;
+  assert( recover_g.pMethods==0 );
+  sqlite3_file_control(p->dbIn, p->zDb, SQLITE_FCNTL_FILE_POINTER, (void*)&pFd);
+  if( pFd ){
+    recover_g.pMethods = pFd->pMethods;
+    pFd->pMethods = &recover_methods;
+  }
+}
+static void recoverUninstallWrapper(sqlite3_recover *p){
+  if( recover_g.pMethods ){
+    sqlite3_file *pFd = 0;
+    sqlite3_file_control(p->dbIn, p->zDb,SQLITE_FCNTL_FILE_POINTER,(void*)&pFd);
+    assert( pFd );
+    pFd->pMethods = recover_g.pMethods;
+    recover_g.pMethods = 0;
+  }
+}
+
 static void recoverStep(sqlite3_recover *p){
   assert( p && p->errCode==SQLITE_OK );
   switch( p->eState ){
@@ -1853,6 +2114,9 @@ static void recoverStep(sqlite3_recover *p){
       ** user functions with the new handle. */
       recoverOpenOutput(p);
 
+      sqlite3_mutex_enter( sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_APP2) );
+      recoverInstallWrapper(p);
+
       /* Open transactions on both the input and output databases. */
       recoverExec(p, p->dbIn, "PRAGMA writable_schema = on");
       recoverExec(p, p->dbIn, "BEGIN");
@@ -1860,8 +2124,11 @@ static void recoverStep(sqlite3_recover *p){
       recoverExec(p, p->dbOut, "BEGIN");
 
       recoverCacheSchema(p);
-      recoverWriteSchema1(p);
 
+      recoverUninstallWrapper(p);
+      sqlite3_mutex_leave( sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_APP2) );
+
+      recoverWriteSchema1(p);
       p->eState = RECOVER_STATE_WRITING;
       break;
       
diff --git a/manifest b/manifest
index 66d4798e47..d3de1f076b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Modify\simplementation\sof\srecovery\sto\sbreak\srecovery\sof\sthe\slost_and_found\stable\sinto\smultiple\ssteps.
-D 2022-09-26T20:51:16.327
+C Better\shandling\sfor\sdatabases\swith\scorrupt\sheaders.
+D 2022-10-04T19:43:12.989
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -398,7 +398,7 @@ F ext/recover/recoverold.test 46e9d99b595fac583d4c67f74d7d89c20a435c752ef6eeb3e9
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
 F ext/recover/recoverslowidx.test 7e3889e50758c614b9b3e75187eeeea425c0ca8a2387441fc19ae749a96a7949
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
-F ext/recover/sqlite3recover.c 5aad3f4e569e8637abdadfeb748ec1b99198d6d45bf983c6b168a527f5891b7f
+F ext/recover/sqlite3recover.c 9c4d742223c519ef7322c51cb8997ca1046ca1971c06b617d455ec0bf0a9b390
 F ext/recover/sqlite3recover.h f698ccc94bd4da38761035415ad08c4549a408491ff9fd5f52d34d2214f64e36
 F ext/recover/test_recover.c 61ec931e47abca6b2210f46239cafd9f3060741605e3d3c45a7c7a53f63dd957
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -2014,8 +2014,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 ad9dba9d1eae786575c7f31e34b342b6f5b26e719bbe27b61609cad8cfd0a505
-R d7188e5461609c695208ab621d6c4574
+P adedfd040bb2d1c2dcda0b91c6073f12953e45d9b860a8f217d990e861d66dfb
+R bababa544bff189a544b5800da5cb030
 U dan
-Z d49040b82cb2efa369225859bd08a957
+Z 620b6c10a3ee6d6290114869c2142ea0
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index d70afc5526..f42c857e04 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-adedfd040bb2d1c2dcda0b91c6073f12953e45d9b860a8f217d990e861d66dfb
\ No newline at end of file
+17f68d803685405d880025134c71bac01077962d677f2902a608952d0b9cdb5a
\ No newline at end of file

From adc686043e09883de2d2e4a46ca1a35b4c1edbc8 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Wed, 5 Oct 2022 16:58:28 +0000
Subject: [PATCH 241/428] Improve handling of corruption in the sqlite_schema
 table b-tree structure.

FossilOrigin-Name: 2be0dba12fb9b98cd9632f1ff3f30aeb29661a2e121b68c2f3335617b027797b
---
 ext/recover/recovercorrupt.test | 12 ++++--
 ext/recover/sqlite3recover.c    | 75 +++++++++++++++++++++++++++------
 manifest                        | 16 +++----
 manifest.uuid                   |  2 +-
 4 files changed, 79 insertions(+), 26 deletions(-)

diff --git a/ext/recover/recovercorrupt.test b/ext/recover/recovercorrupt.test
index 54a94e1b0c..290ba63b0c 100644
--- a/ext/recover/recovercorrupt.test
+++ b/ext/recover/recovercorrupt.test
@@ -18,6 +18,8 @@ source $testdir/tester.tcl
 
 set testprefix recovercorrupt
 
+database_may_be_corrupt
+
 do_execsql_test 1.0 {
   PRAGMA page_size = 512;
   CREATE TABLE t1(a INTEGER PRIMARY KEY, b, c);
@@ -46,19 +48,21 @@ proc toggle_bit {blob bit} {
 
 
 db_save_and_close
-for {set ii 200} {$ii < 10000} {incr ii} {
+for {set ii 0} {$ii < 10000} {incr ii} {
   db_restore_and_reopen
   db func toggle_bit toggle_bit
-  set pg [expr {($ii / 512)+1}]
-  set byte [expr {$ii % 512}]
+  set bitsperpage [expr 512*8]
+
+  set pg [expr {($ii / $bitsperpage)+1}]
+  set byte [expr {$ii % $bitsperpage}]
   db eval {
     UPDATE sqlite_dbpage SET data = toggle_bit(data, $byte) WHERE pgno=$pg
   }
 
-  do_test 1.2.$ii {
     set R [sqlite3_recover_init db main test.db2]
     $R config lostandfound lost_and_found
     $R run
+  do_test 1.2.$ii {
     $R finish
   } {}
 }
diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index dd294dcc7b..ea08d141cc 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -192,6 +192,10 @@ struct sqlite3_recover {
   int bRecoverRowid;              /* SQLITE_RECOVER_ROWIDS setting */
   int bSlowIndexes;               /* SQLITE_RECOVER_SLOWINDEXES setting */
 
+  int pgsz;
+  u8 *pPage1Disk;
+  u8 *pPage1Cache;
+
   /* Error code and error message */
   int errCode;                    /* For sqlite3_recover_errcode() */
   char *zErrMsg;                  /* For sqlite3_recover_errmsg() */
@@ -248,6 +252,7 @@ struct sqlite3_recover {
 typedef struct RecoverGlobal RecoverGlobal;
 struct RecoverGlobal {
   const sqlite3_io_methods *pMethods;
+  sqlite3_recover *p;
 };
 static RecoverGlobal recover_g;
 
@@ -661,8 +666,20 @@ static void recoverGetPage(
     if( pStmt ){
       sqlite3_bind_int64(pStmt, 1, pgno);
       if( SQLITE_ROW==sqlite3_step(pStmt) ){
+        int bDone = 0;
         assert( p->errCode==SQLITE_OK );
-        sqlite3_result_value(pCtx, sqlite3_column_value(pStmt, 0));
+        if( pgno==1 ){
+          const u8 *aPg = sqlite3_column_blob(pStmt, 0);
+          int nPg = sqlite3_column_bytes(pStmt, 0);
+          if( nPg==p->pgsz && 0==memcmp(p->pPage1Cache, aPg, nPg) ){
+            sqlite3_result_blob(pCtx, p->pPage1Disk, nPg, SQLITE_STATIC);
+            bDone = 1;
+          }
+        }
+        
+        if( !bDone ){
+          sqlite3_result_value(pCtx, sqlite3_column_value(pStmt, 0));
+        }
       }
       recoverReset(p, pStmt);
     }
@@ -1914,7 +1931,7 @@ static void recoverPutU16(u8 *a, u32 v){
   a[0] = (v>>8) & 0x00FF;
   a[1] = (v>>0) & 0x00FF;
 }
-static u32 recoverPutU32(u8 *a, u32 v){
+static void recoverPutU32(u8 *a, u32 v){
   a[0] = (v>>24) & 0x00FF;
   a[1] = (v>>16) & 0x00FF;
   a[2] = (v>>8) & 0x00FF;
@@ -1926,7 +1943,10 @@ static int recoverVfsRead(sqlite3_file *pFd, void *aBuf, int nByte, i64 iOff){
   if( pFd->pMethods==&recover_methods ){
     pFd->pMethods = recover_g.pMethods;
     rc = pFd->pMethods->xRead(pFd, aBuf, nByte, iOff);
-    if( rc==SQLITE_OK && iOff==0 && nByte>=100 ){
+    if( nByte==16 ){
+      sqlite3_randomness(16, aBuf);
+    }else
+    if( rc==SQLITE_OK && iOff==0 && nByte>=108 ){
       /* Ensure that the database has a valid header file. The only fields
       ** that really matter to recovery are:
       **
@@ -1942,9 +1962,12 @@ static int recoverVfsRead(sqlite3_file *pFd, void *aBuf, int nByte, i64 iOff){
       ** We also try to preserve the auto-vacuum, incr-value, user-version
       ** and application-id fields - all 32 bit quantities at offsets 
       ** 52, 60, 64 and 68. All other fields are set to known good values.
+      **
+      ** Byte offset 105 should also contain the page-size as a 16-bit 
+      ** integer.
       */
       const int aPreserve[] = {32, 36, 52, 60, 64, 68};
-      u8 aHdr[100] = {
+      u8 aHdr[108] = {
         0x53, 0x51, 0x4c, 0x69, 0x74, 0x65, 0x20, 0x66, 
         0x6f, 0x72, 0x6d, 0x61, 0x74, 0x20, 0x33, 0x00,
         0xFF, 0xFF, 0x01, 0x01, 0x00, 0x40, 0x20, 0x20,
@@ -1957,7 +1980,9 @@ static int recoverVfsRead(sqlite3_file *pFd, void *aBuf, int nByte, i64 iOff){
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x2e, 0x5b, 0x30
+        0x00, 0x2e, 0x5b, 0x30,
+
+        0x0D, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00
       };
       u8 *a = (u8*)aBuf;
 
@@ -1966,23 +1991,44 @@ static int recoverVfsRead(sqlite3_file *pFd, void *aBuf, int nByte, i64 iOff){
       u32 dbsz = 0;
       i64 dbFileSize = 0;
       int ii;
+      sqlite3_recover *p = recover_g.p;
 
       if( pgsz==0x01 ) pgsz = 65536;
       rc = pFd->pMethods->xFileSize(pFd, &dbFileSize);
 
-      dbsz = dbFileSize / pgsz;
+      if( pgsz ){
+        dbsz = dbFileSize / pgsz;
+      }
       if( enc!=SQLITE_UTF8 && enc!=SQLITE_UTF16BE && enc!=SQLITE_UTF16LE ){
         enc = SQLITE_UTF8;
       }
 
-      recoverPutU32(&aHdr[28], dbsz);
-      recoverPutU32(&aHdr[56], enc);
-      if( pgsz==65536 ) pgsz = 1;
-      recoverPutU16(&aHdr[16], pgsz);
-      for(ii=0; ii<sizeof(aPreserve)/sizeof(aPreserve[0]); ii++){
-        memcpy(&aHdr[aPreserve[ii]], &a[aPreserve[ii]], 4);
+      sqlite3_free(p->pPage1Cache);
+      p->pPage1Cache = 0;
+      p->pPage1Disk = 0;
+
+      p->pgsz = nByte;
+      p->pPage1Cache = (u8*)recoverMalloc(p, nByte*2);
+      if( p->pPage1Cache ){
+        p->pPage1Disk = &p->pPage1Cache[nByte];
+        memcpy(p->pPage1Disk, aBuf, nByte);
+
+        recoverPutU32(&aHdr[28], dbsz);
+        recoverPutU32(&aHdr[56], enc);
+        recoverPutU16(&aHdr[105], pgsz);
+        if( pgsz==65536 ) pgsz = 1;
+        recoverPutU16(&aHdr[16], pgsz);
+        for(ii=0; ii<sizeof(aPreserve)/sizeof(aPreserve[0]); ii++){
+          memcpy(&aHdr[aPreserve[ii]], &a[aPreserve[ii]], 4);
+        }
+        memcpy(aBuf, aHdr, sizeof(aHdr));
+        memset(&((u8*)aBuf)[sizeof(aHdr)], 0, nByte-sizeof(aHdr));
+
+        memcpy(p->pPage1Cache, aBuf, nByte);
+      }else{
+        rc = p->errCode;
       }
-      memcpy(aBuf, aHdr, sizeof(aHdr));
+
     }
     pFd->pMethods = &recover_methods;
   }else{
@@ -2088,6 +2134,7 @@ static void recoverInstallWrapper(sqlite3_recover *p){
   sqlite3_file_control(p->dbIn, p->zDb, SQLITE_FCNTL_FILE_POINTER, (void*)&pFd);
   if( pFd ){
     recover_g.pMethods = pFd->pMethods;
+    recover_g.p = p;
     pFd->pMethods = &recover_methods;
   }
 }
@@ -2098,6 +2145,7 @@ static void recoverUninstallWrapper(sqlite3_recover *p){
     assert( pFd );
     pFd->pMethods = recover_g.pMethods;
     recover_g.pMethods = 0;
+    recover_g.p = 0;
   }
 }
 
@@ -2384,6 +2432,7 @@ int sqlite3_recover_finish(sqlite3_recover *p){
     sqlite3_free(p->zErrMsg);
     sqlite3_free(p->zStateDb);
     sqlite3_free(p->zLostAndFound);
+    sqlite3_free(p->pPage1Cache);
     sqlite3_free(p);
   }
   return rc;
diff --git a/manifest b/manifest
index aaf7917e93..c168d21c56 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\slatest\strunk\schanges.
-D 2022-10-04T19:47:17.725
+C Improve\shandling\sof\scorruption\sin\sthe\ssqlite_schema\stable\sb-tree\sstructure.
+D 2022-10-05T16:58:28.898
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -389,7 +389,7 @@ F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f5974282
 F ext/recover/recover1.test 2b0f048ba572c3ca4e4235b632bf75702975a9656146eab766f6c75861f946a0
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
 F ext/recover/recoverclobber.test 294dcc894124ab4ca3a7b35766630742a3d25810fceac22220beb64f70a33a60
-F ext/recover/recovercorrupt.test e3f3cbe0162ba681518aac9ea0ae8119f32ac93fb0900b5f09b6318966108e54
+F ext/recover/recovercorrupt.test 69af3d68aedc2cf1c3c41dbd6afb45b3cebadb57796d513550b5fd1e2a8b3fba
 F ext/recover/recovercorrupt2.test a131d8005337c092e2dfa3b84909ed67ae82d22399a8cfb8c984b2939969ca42
 F ext/recover/recoverfault.test 3a0a32b9fc216592b97775d69220695b0926980c0f7424b7a59144e47d7cb568
 F ext/recover/recoverfault2.test 321036336af23e778a87f148c4cc4407f88fbdab1fd72ddb661669be9020d36b
@@ -397,7 +397,7 @@ F ext/recover/recoverold.test 46e9d99b595fac583d4c67f74d7d89c20a435c752ef6eeb3e9
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
 F ext/recover/recoverslowidx.test 7e3889e50758c614b9b3e75187eeeea425c0ca8a2387441fc19ae749a96a7949
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
-F ext/recover/sqlite3recover.c 9c4d742223c519ef7322c51cb8997ca1046ca1971c06b617d455ec0bf0a9b390
+F ext/recover/sqlite3recover.c c40381677e18f841be9e878591bf68cab043e99b408374561179829d0b041095
 F ext/recover/sqlite3recover.h f698ccc94bd4da38761035415ad08c4549a408491ff9fd5f52d34d2214f64e36
 F ext/recover/test_recover.c 61ec931e47abca6b2210f46239cafd9f3060741605e3d3c45a7c7a53f63dd957
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -534,7 +534,7 @@ F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
 F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
-F sqlite_cfg.h.in baf2e409c63d4e7a765e17769b6ff17c5a82bbd9cbf1e284fd2e4cefaff3fcf2 w config.h.in
+F sqlite_cfg.h.in baf2e409c63d4e7a765e17769b6ff17c5a82bbd9cbf1e284fd2e4cefaff3fcf2
 F src/alter.c 0390ca1d69ec3626cfa9f153114b7ab233e6b2bada6a9eb91361ed385fe90deb
 F src/analyze.c aabdf3769c7fd9954a8ec508eb7041ae174b66f88d12c47199fabbea9a646467
 F src/attach.c 4431f82f0247bf3aaf91589acafdff77d1882235c95407b36da1585c765fbbc8
@@ -2014,8 +2014,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 17f68d803685405d880025134c71bac01077962d677f2902a608952d0b9cdb5a 3efa811251d4510a074231a1e0b667783cc5f90777466b9dcae675cd9892b423
-R a7e16b1f572172e278e4e3a2a9c939da
+P b0feecaa84b88f534edb49056cf7e92256f4a687c8b4c44e1d1186709a304378
+R c8e986f8000e60f0f5539ba1d6775390
 U dan
-Z 733ee477925392618f80fcf6c31db3f8
+Z 4a7b8684cf08c1b2ec449e50db6581b5
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 55d6dceb0f..665a625d5c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b0feecaa84b88f534edb49056cf7e92256f4a687c8b4c44e1d1186709a304378
\ No newline at end of file
+2be0dba12fb9b98cd9632f1ff3f30aeb29661a2e121b68c2f3335617b027797b
\ No newline at end of file

From 73ac958c749a383208f78af79e637ecc2f593f5a Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Thu, 6 Oct 2022 14:10:11 +0000
Subject: [PATCH 242/428] Fix a problem that occurred when using a bloom filter
 to optimize an (ipk = ?) lookup in the case where the RHS of the expression
 is a TEXT value. First reported by [forum:/forumpost/f61a8b7053|forum post
 f61a8b7053].

FossilOrigin-Name: 8e14c351b29bb434ac4e2510681e95716424a73e340d39feff4919f0431c2e00
---
 manifest         | 15 ++++++-----
 manifest.uuid    |  2 +-
 src/wherecode.c  |  4 +++
 test/bloom1.test | 70 ++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 83 insertions(+), 8 deletions(-)
 create mode 100644 test/bloom1.test

diff --git a/manifest b/manifest
index 60a41be11a..7e2d4a4dba 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Attempt\sto\sclarify\sthe\soperation\sof\sthe\sxLock\sand\sxUnlock\sVFS\sI/O\smethods.\nAssert()\sstatements\sadded\sto\sprove\sthat\sthey\sbehave\sas\sthe\sdocumentation\ssays.
-D 2022-10-04T14:50:46.626
+C Fix\sa\sproblem\sthat\soccurred\swhen\susing\sa\sbloom\sfilter\sto\soptimize\san\s(ipk\s=\s?)\slookup\sin\sthe\scase\swhere\sthe\sRHS\sof\sthe\sexpression\sis\sa\sTEXT\svalue.\sFirst\sreported\sby\s[forum:/forumpost/f61a8b7053|forum\spost\sf61a8b7053].
+D 2022-10-06T14:10:11.073
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -677,7 +677,7 @@ F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
 F src/where.c 63e712bcad47f70e94c2150976cd7da5040933699e3938d4189d064acbe40891
 F src/whereInt.h 70cd30de9ed784aa33fa6bd1245f060617de7a00d992469b6d8e419eed915743
-F src/wherecode.c 6bb1cf9d0a4e3e04dab0bf0ea4a8d936a0dcc05a7e2207beeda6c61aea6dd341
+F src/wherecode.c 7ec238362d5fab3a67e3a77704f1cfdd2172f6da6f03065706922c114d8f39c3
 F src/whereexpr.c 55a39f42aaf982574fbf52906371a84cceed98a994422198dfd03db4fce4cc46
 F src/window.c 928e215840e2f2d9a2746e018c9643ef42c66c4ab6630ef0df7fa388fa145e86
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
@@ -781,6 +781,7 @@ F test/bind2.test 918bc35135f4141809ead7585909cde57d44db90a7a62aef540127148f91aa
 F test/bindxfer.test efecd12c580c14df5f4ad3b3e83c667744a4f7e0
 F test/bitvec.test 75894a880520164d73b1305c1c3f96882615e142
 F test/blob.test e7ac6c7d3a985cc4678c64f325292529a69ae252
+F test/bloom1.test 5318eb0648dff073ca9b9a54387ec2c0a7a07ed3490461fe2db0d074b2eb0e7f
 F test/boundary1.tcl 6421b2d920d8b09539503a8673339d32f7609eb1
 F test/boundary1.test 66d7f4706ccdb42d58eafdb081de07b0eb42d77b
 F test/boundary2.tcl e34ef4e930cf1083150d4d2c603e146bd3b76bcb
@@ -2000,8 +2001,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 897e187cad981126fc5f6ea8e382e937825af10b0c9589b0a23b9fbaa4ca58b8
-R e2ac55c08c3f1d2d33e5a2d4f6cdf937
-U drh
-Z d8fbc7d6453f3413769ceb23c01d9355
+P 3efa811251d4510a074231a1e0b667783cc5f90777466b9dcae675cd9892b423
+R 24754a870bbabf6f9b268855f112e8aa
+U dan
+Z 222c3385a356b2c2fe407bcca5d59288
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f7cb13b05b..6bd184c518 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3efa811251d4510a074231a1e0b667783cc5f90777466b9dcae675cd9892b423
\ No newline at end of file
+8e14c351b29bb434ac4e2510681e95716424a73e340d39feff4919f0431c2e00
\ No newline at end of file
diff --git a/src/wherecode.c b/src/wherecode.c
index 4c34ea0dc6..67df73c663 100644
--- a/src/wherecode.c
+++ b/src/wherecode.c
@@ -1422,6 +1422,8 @@ static SQLITE_NOINLINE void filterPullDown(
       testcase( pTerm->wtFlags & TERM_VIRTUAL );
       regRowid = sqlite3GetTempReg(pParse);
       regRowid = codeEqualityTerm(pParse, pTerm, pLevel, 0, 0, regRowid);
+      sqlite3VdbeAddOp2(pParse->pVdbe, OP_MustBeInt, regRowid, addrNxt);
+      VdbeCoverage(pParse->pVdbe);
       sqlite3VdbeAddOp4Int(pParse->pVdbe, OP_Filter, pLevel->regFilter,
                            addrNxt, regRowid, 1);
       VdbeCoverage(pParse->pVdbe);
@@ -1683,6 +1685,8 @@ Bitmask sqlite3WhereCodeOneLoopStart(
     if( iRowidReg!=iReleaseReg ) sqlite3ReleaseTempReg(pParse, iReleaseReg);
     addrNxt = pLevel->addrNxt;
     if( pLevel->regFilter ){
+      sqlite3VdbeAddOp2(v, OP_MustBeInt, iRowidReg, addrNxt);
+      VdbeCoverage(v);
       sqlite3VdbeAddOp4Int(v, OP_Filter, pLevel->regFilter, addrNxt,
                            iRowidReg, 1);
       VdbeCoverage(v);
diff --git a/test/bloom1.test b/test/bloom1.test
new file mode 100644
index 0000000000..12b53ddf14
--- /dev/null
+++ b/test/bloom1.test
@@ -0,0 +1,70 @@
+# 2022 October 06
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+#
+# Tests for queries that use bloom filters
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+source $testdir/lock_common.tcl
+source $testdir/malloc_common.tcl
+
+set testprefix bloom1
+
+# Tests 1.*  verify that the bloom filter code correctly handles the
+# case where the RHS of an (<ipk-column> = ?) expression must be coerced
+# to an integer before the comparison made.
+#
+do_execsql_test 1.0 {
+  CREATE TABLE t1(a, b);
+  CREATE TABLE t2(c INTEGER PRIMARY KEY, d);
+}
+
+do_execsql_test 1.1 {
+  INSERT INTO t1 VALUES('hello', 'world');
+  INSERT INTO t2 VALUES(14, 'fourteen');
+}
+
+do_execsql_test 1.2 {
+  ANALYZE sqlite_schema;
+  INSERT INTO sqlite_stat1 VALUES('t2','idx1','6 6');
+  ANALYZE sqlite_schema;
+}
+
+do_execsql_test 1.3 {
+  SELECT 'affinity!' FROM t1 CROSS JOIN t2 WHERE t2.c = '14';
+} {affinity!}
+
+
+reset_db
+do_execsql_test 1.4 {
+  CREATE TABLE t1(a, b TEXT);
+  CREATE TABLE t2(c INTEGER PRIMARY KEY, d);
+  CREATE TABLE t3(e INTEGER PRIMARY KEY, f);
+
+  ANALYZE sqlite_schema;
+  INSERT INTO sqlite_stat1 VALUES('t1','idx1','600 6');
+  INSERT INTO sqlite_stat1 VALUES('t2','idx1','6 6');
+  INSERT INTO sqlite_stat1 VALUES('t3','idx2','6 6');
+  ANALYZE sqlite_schema;
+
+  INSERT INTO t1 VALUES(1, '123');
+  INSERT INTO t2 VALUES(123, 'one');
+  INSERT INTO t3 VALUES(123, 'two');
+}
+
+do_execsql_test 1.5 {
+  SELECT 'result' FROM t1, t2, t3 
+  WHERE t2.c=t1.b AND t2.d!='silly'
+    AND t3.e=t1.b AND t3.f!='silly'
+} {result}
+
+finish_test
+

From 4df12ce5a8ae7c71444988fec15e7eb08e87a3da Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Thu, 6 Oct 2022 17:20:12 +0000
Subject: [PATCH 243/428] Add code to determine the database page-size by
 searching for well-formed pages.

FossilOrigin-Name: 0dbd0ccef532e076fa82c9fad4dc9fe632c0ef43e3483cc288cbb7eca336a9b9
---
 ext/recover/recover1.test    |   1 -
 ext/recover/sqlite3recover.c | 169 +++++++++++++++++++++++++++++++++--
 manifest                     |  14 +--
 manifest.uuid                |   2 +-
 4 files changed, 170 insertions(+), 16 deletions(-)

diff --git a/ext/recover/recover1.test b/ext/recover/recover1.test
index 58774e8434..aadc5b556e 100644
--- a/ext/recover/recover1.test
+++ b/ext/recover/recover1.test
@@ -86,7 +86,6 @@ do_execsql_test 1.0 {
   )
   INSERT INTO t1 SELECT i*2, hex(randomblob(250)) FROM s;
   INSERT INTO t2 SELECT * FROM t1;
-
 }
 
 do_recover_test 1
diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index ea08d141cc..3c70542989 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -1877,6 +1877,123 @@ static void recoverFinalCleanup(sqlite3_recover *p){
   p->dbOut = 0;
 }
 
+static u32 recoverGetU16(const u8 *a){
+  return (((u32)a[0])<<8) + ((u32)a[1]);
+}
+static u32 recoverGetU32(const u8 *a){
+  return (((u32)a[0])<<24) + (((u32)a[1])<<16) + (((u32)a[2])<<8) + ((u32)a[3]);
+}
+static int recoverGetVarint(const u8 *a, i64 *pVal){
+  sqlite3_int64 v = 0;
+  int i;
+  for(i=0; i<8; i++){
+    v = (v<<7) + (a[i]&0x7f);
+    if( (a[i]&0x80)==0 ){ *pVal = v; return i+1; }
+  }
+  v = (v<<8) + (a[i]&0xff);
+  *pVal = v;
+  return 9;
+}
+
+/*
+** The second argument points to a buffer n bytes in size. If this buffer
+** or a prefix thereof appears to contain a well-formed SQLite b-tree page, 
+** return the page-size in bytes. Otherwise, if the buffer does not 
+** appear to contain a well-formed b-tree page, return 0.
+*/
+static int recoverIsValidPage(u8 *aTmp, const u8 *a, int n){
+  u8 *aUsed = aTmp;
+  int nFrag = 0;
+  int nActual = 0;
+  int iFree = 0;
+  int nCell = 0;                  /* Number of cells on page */
+  int iCellOff = 0;               /* Offset of cell array in page */
+  int iContent = 0;
+  int eType = 0;
+  int ii = 0;
+
+  eType = (int)a[0];
+  if( eType!=0x02 && eType!=0x05 && eType!=0x0A && eType!=0x0D ) return 0;
+
+  iFree = (int)recoverGetU16(&a[1]);
+  nCell = (int)recoverGetU16(&a[3]);
+  iContent = (int)recoverGetU16(&a[5]);
+  if( iContent==0 ) iContent = 65536;
+  nFrag = (int)a[7];
+
+  if( iContent>n ) return 0;
+
+  memset(aUsed, 0, n);
+  memset(aUsed, 0xFF, iContent);
+
+  /* Follow the free-list. This is the same format for all b-tree pages. */
+  if( iFree && iFree<=iContent ) return 0;
+  while( iFree ){
+    int iNext = 0;
+    int nByte = 0;
+    if( iFree>(n-4) ) return 0;
+    iNext = recoverGetU16(&a[iFree]);
+    nByte = recoverGetU16(&a[iFree+2]);
+    if( iFree+nByte>n ) return 0;
+    if( iNext<iFree+nByte ) return 0;
+    memset(&aUsed[iFree], 0xFF, nByte);
+    iFree = iNext;
+  }
+
+  /* Run through the cells */
+  if( eType==0x02 || eType==0x05 ){
+    iCellOff = 12;
+  }else{
+    iCellOff = 8;
+  }
+  if( (iCellOff + 2*nCell)>iContent ) return 0;
+  for(ii=0; ii<nCell; ii++){
+    int iByte;
+    i64 nPayload = 0;
+    int nByte = 0;
+    int iOff = recoverGetU16(&a[iCellOff + 2*ii]);
+    if( iOff<iContent || iOff>n ){
+      return 0;
+    }
+    if( eType==0x05 || eType==0x02 ) nByte += 4;
+    nByte += recoverGetVarint(&a[iOff+nByte], &nPayload);
+    if( eType==0x0D ){
+      i64 dummy = 0;
+      nByte += recoverGetVarint(&a[iOff+nByte], &dummy);
+    }
+    if( eType!=0x05 ){
+      int X = (eType==0x0D) ? n-35 : (((n-12)*64/255)-23);
+      int M = ((n-12)*32/255)-23;
+      int K = M+((nPayload-M)%(n-4));
+
+      if( nPayload<X ){
+        nByte += nPayload;
+      }else if( K<=X ){
+        nByte += K+4;
+      }else{
+        nByte += M+4;
+      }
+    }
+
+    if( iOff+nByte>n ){
+      return 0;
+    }
+    for(iByte=iOff; iByte<(iOff+nByte); iByte++){
+      if( aUsed[iByte]!=0 ){
+        return 0;
+      }
+      aUsed[iByte] = 0xFF;
+    }
+  }
+
+  nActual = 0;
+  for(ii=0; ii<n; ii++){
+    if( aUsed[ii]==0 ) nActual++;
+  }
+  return (nActual==nFrag);
+}
+
+
 static int recoverVfsClose(sqlite3_file*);
 static int recoverVfsRead(sqlite3_file*, void*, int iAmt, sqlite3_int64 iOfst);
 static int recoverVfsWrite(sqlite3_file*, const void*, int, sqlite3_int64);
@@ -1920,13 +2037,6 @@ static int recoverVfsClose(sqlite3_file *pFd){
   return pFd->pMethods->xClose(pFd);
 }
 
-static u32 recoverGetU16(const u8 *a){
-  return (((u32)a[0])<<8) + ((u32)a[1]);
-}
-static u32 recoverGetU32(const u8 *a){
-  return (((u32)a[0])<<24) + (((u32)a[1])<<16) + (((u32)a[2])<<8) + ((u32)a[3]);
-}
-
 static void recoverPutU16(u8 *a, u32 v){
   a[0] = (v>>8) & 0x00FF;
   a[1] = (v>>0) & 0x00FF;
@@ -1938,6 +2048,43 @@ static void recoverPutU32(u8 *a, u32 v){
   a[3] = (v>>0) & 0x00FF;
 }
 
+static int recoverVfsDetectPagesize(sqlite3_file *pFd, i64 nSz, u32 *pPgsz){
+  int rc = SQLITE_OK;
+  const int nMin = 512;
+  const int nMax = 65536;
+  const int nMaxBlk = 4;
+  u32 pgsz = 0;
+  int iBlk = 0;
+  u8 *aPg = 0;
+  u8 *aTmp = 0;
+
+  aPg = (u8*)sqlite3_malloc(2*nMax);
+  if( aPg==0 ) return SQLITE_NOMEM;
+  aTmp = &aPg[nMax];
+
+  for(iBlk=0; rc==SQLITE_OK && iBlk<((nSz+nMax-1)/nMax); iBlk++){
+    int nByte = (nSz>=((iBlk+1)*nMax)) ? nMax : (nSz % nMax);
+    memset(aPg, 0, nMax);
+    rc = pFd->pMethods->xRead(pFd, aPg, nByte, iBlk*nMax);
+    if( rc==SQLITE_OK ){
+      int pgsz2;
+      for(pgsz2=(pgsz ? pgsz*2 : nMin); pgsz2<=nMax; pgsz2=pgsz2*2){
+        int iOff;
+        for(iOff=0; iOff<nMax; iOff+=pgsz2){
+          if( recoverIsValidPage(aTmp, &aPg[iOff], pgsz2) ){
+            pgsz = pgsz2;
+            break;
+          }
+        }
+      }
+    }
+  }
+
+  *pPgsz = pgsz;
+  sqlite3_free(aPg);
+  return rc;
+}
+
 static int recoverVfsRead(sqlite3_file *pFd, void *aBuf, int nByte, i64 iOff){
   int rc = SQLITE_OK;
   if( pFd->pMethods==&recover_methods ){
@@ -1996,6 +2143,14 @@ static int recoverVfsRead(sqlite3_file *pFd, void *aBuf, int nByte, i64 iOff){
       if( pgsz==0x01 ) pgsz = 65536;
       rc = pFd->pMethods->xFileSize(pFd, &dbFileSize);
 
+      if( rc==SQLITE_OK ){
+        u32 pgsz2 = 0;
+        rc = recoverVfsDetectPagesize(pFd, dbFileSize, &pgsz2);
+        if( pgsz2!=0 ){
+          pgsz = pgsz2;
+        }
+      }
+
       if( pgsz ){
         dbsz = dbFileSize / pgsz;
       }
diff --git a/manifest b/manifest
index c168d21c56..4d01f35c31 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improve\shandling\sof\scorruption\sin\sthe\ssqlite_schema\stable\sb-tree\sstructure.
-D 2022-10-05T16:58:28.898
+C Add\scode\sto\sdetermine\sthe\sdatabase\spage-size\sby\ssearching\sfor\swell-formed\spages.
+D 2022-10-06T17:20:12.045
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -386,7 +386,7 @@ F ext/rbu/rbuvacuum4.test a78898e438a44803eb2bc897ba3323373c9f277418e2d6d76e90f2
 F ext/rbu/sqlite3rbu.c 8737cabdfbee84bb25a7851ecef8b1312be332761238da9be6ddb10c62ad4291
 F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9cd389812
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
-F ext/recover/recover1.test 2b0f048ba572c3ca4e4235b632bf75702975a9656146eab766f6c75861f946a0
+F ext/recover/recover1.test d9844f37b2e6da021816d699424d4aaf85712f50a9a207bf5f85f8ea7b48eb9b
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
 F ext/recover/recoverclobber.test 294dcc894124ab4ca3a7b35766630742a3d25810fceac22220beb64f70a33a60
 F ext/recover/recovercorrupt.test 69af3d68aedc2cf1c3c41dbd6afb45b3cebadb57796d513550b5fd1e2a8b3fba
@@ -397,7 +397,7 @@ F ext/recover/recoverold.test 46e9d99b595fac583d4c67f74d7d89c20a435c752ef6eeb3e9
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
 F ext/recover/recoverslowidx.test 7e3889e50758c614b9b3e75187eeeea425c0ca8a2387441fc19ae749a96a7949
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
-F ext/recover/sqlite3recover.c c40381677e18f841be9e878591bf68cab043e99b408374561179829d0b041095
+F ext/recover/sqlite3recover.c 1b68d2593b83a130cea794c8921ad7af564cfafd848ccc80e4b9a0e893942c51
 F ext/recover/sqlite3recover.h f698ccc94bd4da38761035415ad08c4549a408491ff9fd5f52d34d2214f64e36
 F ext/recover/test_recover.c 61ec931e47abca6b2210f46239cafd9f3060741605e3d3c45a7c7a53f63dd957
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -2014,8 +2014,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 b0feecaa84b88f534edb49056cf7e92256f4a687c8b4c44e1d1186709a304378
-R c8e986f8000e60f0f5539ba1d6775390
+P 2be0dba12fb9b98cd9632f1ff3f30aeb29661a2e121b68c2f3335617b027797b
+R 428f4add1572ea8a473b960c2888f37e
 U dan
-Z 4a7b8684cf08c1b2ec449e50db6581b5
+Z 0bbefdeff86a57418ac328248f517762
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 665a625d5c..3fa25f41b4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2be0dba12fb9b98cd9632f1ff3f30aeb29661a2e121b68c2f3335617b027797b
\ No newline at end of file
+0dbd0ccef532e076fa82c9fad4dc9fe632c0ef43e3483cc288cbb7eca336a9b9
\ No newline at end of file

From 88a0637f5781420a2811ba09dc20e3af2f4e7df0 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Thu, 6 Oct 2022 21:00:23 +0000
Subject: [PATCH 244/428] Ensure the page-size, auto-vacuum and other settings
 are copied into the recovered database.

FossilOrigin-Name: 078520f2825bcb82d01b30209409e9bf8b6c99084c192345df41c9f531d08f51
---
 ext/recover/recover1.test       |  14 ++
 ext/recover/recoverslowidx.test |  12 +-
 ext/recover/sqlite3recover.c    | 224 ++++++++++++++++++++------------
 manifest                        |  16 +--
 manifest.uuid                   |   2 +-
 5 files changed, 172 insertions(+), 96 deletions(-)

diff --git a/ext/recover/recover1.test b/ext/recover/recover1.test
index aadc5b556e..99ddc1f4b3 100644
--- a/ext/recover/recover1.test
+++ b/ext/recover/recover1.test
@@ -36,6 +36,12 @@ proc compare_dbs {db1 db2} {
   foreach tbl [$db1 eval {SELECT name FROM sqlite_master WHERE type='table'}] {
     compare_result $db1 $db2 "SELECT * FROM $tbl"
   }
+
+  compare_result $db1 $db2 "PRAGMA page_size"
+  compare_result $db1 $db2 "PRAGMA auto_vacuum"
+  compare_result $db1 $db2 "PRAGMA encoding"
+  compare_result $db1 $db2 "PRAGMA user_version"
+  compare_result $db1 $db2 "PRAGMA application_id"
 }
 
 proc do_recover_test {tn} {
@@ -186,11 +192,19 @@ do_recover_test 10
 #-------------------------------------------------------------------------
 reset_db
 do_execsql_test 11.1 {
+  PRAGMA page_size = 4096;
   PRAGMA encoding='utf16';
+  PRAGMA auto_vacuum = 2;
+  PRAGMA user_version = 45;
+  PRAGMA application_id = 22;
+
   CREATE TABLE u1(u, v);
   INSERT INTO u1 VALUES('edvin marton', 'bond');
   INSERT INTO u1 VALUES(1, 4.0);
 }
+do_execsql_test 11.1a {
+  PRAGMA auto_vacuum;
+} {2}
 
 do_recover_test 11 
 
diff --git a/ext/recover/recoverslowidx.test b/ext/recover/recoverslowidx.test
index 838b771eaf..4dfb7e5f53 100644
--- a/ext/recover/recoverslowidx.test
+++ b/ext/recover/recoverslowidx.test
@@ -17,7 +17,7 @@ if {![info exists testdir]} {
 } 
 source [file join [file dirname [info script]] recover_common.tcl]
 source $testdir/tester.tcl
-set testprefix recoverrowid
+set testprefix recoverslowidx
 
 ifcapable !vtab {
   finish_test; return
@@ -46,6 +46,11 @@ do_test 1.2 {
 } [list {*}{
   {BEGIN}
   {PRAGMA writable_schema = on}
+  {PRAGMA encoding = 'UTF-8'}
+  {PRAGMA page_size = '1024'}
+  {PRAGMA auto_vacuum = '0'}
+  {PRAGMA user_version = '0'}
+  {PRAGMA application_id = '0'}
   {CREATE TABLE t1(a, b)}
   {INSERT OR IGNORE INTO 't1'(_rowid_, 'a', 'b') VALUES (1, 1, 1)}
   {INSERT OR IGNORE INTO 't1'(_rowid_, 'a', 'b') VALUES (2, 2, 2)}
@@ -69,6 +74,11 @@ do_test 1.4 {
 } [list {*}{
   {BEGIN}
   {PRAGMA writable_schema = on}
+  {PRAGMA encoding = 'UTF-8'}
+  {PRAGMA page_size = '1024'}
+  {PRAGMA auto_vacuum = '0'}
+  {PRAGMA user_version = '0'}
+  {PRAGMA application_id = '0'}
   {CREATE TABLE t1(a, b)}
   {CREATE INDEX i1 ON t1(a)}
   {INSERT OR IGNORE INTO 't1'(_rowid_, 'a', 'b') VALUES (1, 1, 1)}
diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index 3c70542989..4b61d6b3ec 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -801,6 +801,120 @@ static void recoverEscapeCrnl(
   sqlite3_result_value(context, argv[0]);
 }
 
+/*
+** This function is a no-op if recover handle p already contains an error
+** (if p->errCode!=SQLITE_OK). A copy of the error code is returned in
+** this case. 
+**
+** Otherwise, attempt to populate temporary table "recovery.schema" with the
+** parts of the database schema that can be extracted from the input database.
+**
+** If no error occurs, SQLITE_OK is returned. Otherwise, an error code
+** and error message are left in the recover handle and a copy of the
+** error code returned. It is not considered an error if part of all of
+** the database schema cannot be recovered due to corruption.
+*/
+static int recoverCacheSchema(sqlite3_recover *p){
+  return recoverExec(p, p->dbOut,
+    "WITH RECURSIVE pages(p) AS ("
+    "  SELECT 1"
+    "    UNION"
+    "  SELECT child FROM sqlite_dbptr('getpage()'), pages WHERE pgno=p"
+    ")"
+    "INSERT INTO recovery.schema SELECT"
+    "  max(CASE WHEN field=0 THEN value ELSE NULL END),"
+    "  max(CASE WHEN field=1 THEN value ELSE NULL END),"
+    "  max(CASE WHEN field=2 THEN value ELSE NULL END),"
+    "  max(CASE WHEN field=3 THEN value ELSE NULL END),"
+    "  max(CASE WHEN field=4 THEN value ELSE NULL END)"
+    "FROM sqlite_dbdata('getpage()') WHERE pgno IN ("
+    "  SELECT p FROM pages"
+    ") GROUP BY pgno, cell"
+  );
+}
+
+/*
+** If this recover handle is not in SQL callback mode (i.e. was not created 
+** using sqlite3_recover_init_sql()) of if an error has already occurred, 
+** this function is a no-op. Otherwise, issue a callback with SQL statement
+** zSql as the parameter. 
+**
+** If the callback returns non-zero, set the recover handle error code to
+** the value returned (so that the caller will abandon processing).
+*/
+static void recoverSqlCallback(sqlite3_recover *p, const char *zSql){
+  if( p->errCode==SQLITE_OK && p->xSql ){
+    int res = p->xSql(p->pSqlCtx, zSql);
+    if( res ){
+      recoverError(p, SQLITE_ERROR, "callback returned an error - %d", res);
+    }
+  }
+}
+
+/*
+** Transfer the following settings from the input database to the output
+** database:
+**
+**   + page-size,
+**   + auto-vacuum settings,
+**   + database encoding,
+**   + user-version (PRAGMA user_version), and
+**   + application-id (PRAGMA application_id), and
+*/
+static void recoverTransferSettings(sqlite3_recover *p){
+  const char *aPragma[] = {
+    "encoding",
+    "page_size",
+    "auto_vacuum",
+    "user_version",
+    "application_id"
+  };
+  int ii;
+
+  /* Truncate the output database to 0 pages in size. This is done by 
+  ** opening a new, empty, temp db, then using the backup API to clobber 
+  ** any existing output db with a copy of it. */
+  if( p->errCode==SQLITE_OK ){
+    sqlite3 *db2 = 0;
+    int rc = sqlite3_open("", &db2);
+    if( rc!=SQLITE_OK ){
+      recoverDbError(p, db2);
+      return;
+    }
+
+    for(ii=0; ii<sizeof(aPragma)/sizeof(aPragma[0]); ii++){
+      const char *zPrag = aPragma[ii];
+      sqlite3_stmt *p1 = 0;
+      p1 = recoverPreparePrintf(p, p->dbIn, "PRAGMA %Q.%s", p->zDb, zPrag);
+      if( p->errCode==SQLITE_OK && sqlite3_step(p1)==SQLITE_ROW ){
+        const char *zArg = (const char*)sqlite3_column_text(p1, 0);
+        char *z2 = recoverMPrintf(p, "PRAGMA %s = %Q", zPrag, zArg);
+        recoverSqlCallback(p, z2);
+        recoverExec(p, db2, z2);
+        sqlite3_free(z2);
+        if( zArg==0 ){
+          recoverError(p, SQLITE_NOMEM, 0);
+        }
+      }
+      recoverFinalize(p, p1);
+    }
+    recoverExec(p, db2, "CREATE TABLE t1(a); DROP TABLE t1;");
+
+    if( p->errCode==SQLITE_OK ){
+      sqlite3 *db = p->dbOut;
+      sqlite3_backup *pBackup = sqlite3_backup_init(db, "main", db2, "main");
+      if( pBackup ){
+        sqlite3_backup_step(pBackup, -1);
+        p->errCode = sqlite3_backup_finish(pBackup);
+      }else{
+        recoverDbError(p, db);
+      }
+    }
+
+    sqlite3_close(db2);
+  }
+}
+
 /*
 ** This function is a no-op if recover handle p already contains an error
 ** (if p->errCode!=SQLITE_OK). A copy of the error code is returned in
@@ -833,19 +947,8 @@ static int recoverOpenOutput(sqlite3_recover *p){
 
   assert( p->dbOut==0 );
 
-  if( p->errCode==SQLITE_OK ){
-    if( sqlite3_open_v2(p->zUri, &db, flags, 0) ){
-      recoverDbError(p, db);
-    }else{
-      char *zSql = recoverMPrintf(p, "ATTACH %Q AS recovery;", p->zStateDb);
-      recoverExec(p, db, zSql);
-      recoverExec(p, db,
-          "PRAGMA writable_schema = 1;"
-          "CREATE TABLE recovery.map(pgno INTEGER PRIMARY KEY, parent INT);" 
-          "CREATE TABLE recovery.schema(type, name, tbl_name, rootpage, sql);"
-      );
-      sqlite3_free(zSql);
-    }
+  if( sqlite3_open_v2(p->zUri, &db, flags, 0) ){
+    recoverDbError(p, db);
   }
 
   /* Register the sqlite_dbdata and sqlite_dbptr virtual table modules.
@@ -863,62 +966,22 @@ static int recoverOpenOutput(sqlite3_recover *p){
     );
   }
 
-  /* Truncate the output database to 0 pages in size. This is done by 
-  ** opening a new, empty, temp db, then using the backup API to clobber 
-  ** any existing output db with a copy of it. */
-  if( p->errCode==SQLITE_OK ){
-    sqlite3 *db2 = 0;
-    int rc = sqlite3_open("", &db2);
-    if( rc==SQLITE_OK ){
-      sqlite3_backup *pBackup = sqlite3_backup_init(db, "main", db2, "main");
-      if( pBackup ){
-        sqlite3_backup_step(pBackup, -1);
-        p->errCode = sqlite3_backup_finish(pBackup);
-      }else{
-        recoverDbError(p, db);
-      }
-    }else{
-      recoverDbError(p, db2);
-    }
-    sqlite3_close(db2);
-  }
-
   p->dbOut = db;
   return p->errCode;
 }
 
-/*
-** This function is a no-op if recover handle p already contains an error
-** (if p->errCode!=SQLITE_OK). A copy of the error code is returned in
-** this case. 
-**
-** Otherwise, attempt to populate temporary table "recovery.schema" with the
-** parts of the database schema that can be extracted from the input database.
-**
-** If no error occurs, SQLITE_OK is returned. Otherwise, an error code
-** and error message are left in the recover handle and a copy of the
-** error code returned. It is not considered an error if part of all of
-** the database schema cannot be recovered due to corruption.
-*/
-static int recoverCacheSchema(sqlite3_recover *p){
-  return recoverExec(p, p->dbOut,
-    "WITH RECURSIVE pages(p) AS ("
-    "  SELECT 1"
-    "    UNION"
-    "  SELECT child FROM sqlite_dbptr('getpage()'), pages WHERE pgno=p"
-    ")"
-    "INSERT INTO recovery.schema SELECT"
-    "  max(CASE WHEN field=0 THEN value ELSE NULL END),"
-    "  max(CASE WHEN field=1 THEN value ELSE NULL END),"
-    "  max(CASE WHEN field=2 THEN value ELSE NULL END),"
-    "  max(CASE WHEN field=3 THEN value ELSE NULL END),"
-    "  max(CASE WHEN field=4 THEN value ELSE NULL END)"
-    "FROM sqlite_dbdata('getpage()') WHERE pgno IN ("
-    "  SELECT p FROM pages"
-    ") GROUP BY pgno, cell"
+static void recoverOpenRecovery(sqlite3_recover *p){
+  char *zSql = recoverMPrintf(p, "ATTACH %Q AS recovery;", p->zStateDb);
+  recoverExec(p, p->dbOut, zSql);
+  recoverExec(p, p->dbOut,
+      "PRAGMA writable_schema = 1;"
+      "CREATE TABLE recovery.map(pgno INTEGER PRIMARY KEY, parent INT);" 
+      "CREATE TABLE recovery.schema(type, name, tbl_name, rootpage, sql);"
   );
+  sqlite3_free(zSql);
 }
 
+
 /*
 ** This function is a no-op if recover handle p already contains an error
 ** (if p->errCode!=SQLITE_OK).
@@ -1022,24 +1085,6 @@ static void recoverAddTable(
   }
 }
 
-/*
-** If this recover handle is not in SQL callback mode (i.e. was not created 
-** using sqlite3_recover_init_sql()) of if an error has already occurred, 
-** this function is a no-op. Otherwise, issue a callback with SQL statement
-** zSql as the parameter. 
-**
-** If the callback returns non-zero, set the recover handle error code to
-** the value returned (so that the caller will abandon processing).
-*/
-static void recoverSqlCallback(sqlite3_recover *p, const char *zSql){
-  if( p->errCode==SQLITE_OK && p->xSql ){
-    int res = p->xSql(p->pSqlCtx, zSql);
-    if( res ){
-      recoverError(p, SQLITE_ERROR, "callback returned an error - %d", res);
-    }
-  }
-}
-
 /*
 ** This function is called after recoverCacheSchema() has cached those parts
 ** of the input database schema that could be recovered in temporary table
@@ -2057,12 +2102,16 @@ static int recoverVfsDetectPagesize(sqlite3_file *pFd, i64 nSz, u32 *pPgsz){
   int iBlk = 0;
   u8 *aPg = 0;
   u8 *aTmp = 0;
+  int nBlk = 0;
 
   aPg = (u8*)sqlite3_malloc(2*nMax);
   if( aPg==0 ) return SQLITE_NOMEM;
   aTmp = &aPg[nMax];
 
-  for(iBlk=0; rc==SQLITE_OK && iBlk<((nSz+nMax-1)/nMax); iBlk++){
+  nBlk = (nSz+nMax-1)/nMax;
+  if( nBlk>nMaxBlk ) nBlk = nMaxBlk;
+
+  for(iBlk=0; rc==SQLITE_OK && iBlk<nBlk; iBlk++){
     int nByte = (nSz>=((iBlk+1)*nMax)) ? nMax : (nSz % nMax);
     memset(aPg, 0, nMax);
     rc = pFd->pMethods->xRead(pFd, aPg, nByte, iBlk*nMax);
@@ -2313,24 +2362,27 @@ static void recoverStep(sqlite3_recover *p){
       recoverSqlCallback(p, "BEGIN");
       recoverSqlCallback(p, "PRAGMA writable_schema = on");
 
+      sqlite3_mutex_enter( sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_APP2) );
+      recoverInstallWrapper(p);
+
       /* Open the output database. And register required virtual tables and 
       ** user functions with the new handle. */
       recoverOpenOutput(p);
 
-      sqlite3_mutex_enter( sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_APP2) );
-      recoverInstallWrapper(p);
-
       /* Open transactions on both the input and output databases. */
       recoverExec(p, p->dbIn, "PRAGMA writable_schema = on");
       recoverExec(p, p->dbIn, "BEGIN");
       if( p->errCode==SQLITE_OK ) p->bCloseTransaction = 1;
-      recoverExec(p, p->dbOut, "BEGIN");
-
+      recoverExec(p, p->dbIn, "SELECT 1 FROM sqlite_schema");
+      recoverTransferSettings(p);
+      recoverOpenRecovery(p);
       recoverCacheSchema(p);
 
       recoverUninstallWrapper(p);
       sqlite3_mutex_leave( sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_APP2) );
 
+      recoverExec(p, p->dbOut, "BEGIN");
+
       recoverWriteSchema1(p);
       p->eState = RECOVER_STATE_WRITING;
       break;
diff --git a/manifest b/manifest
index 4d01f35c31..bb0cc53623 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\scode\sto\sdetermine\sthe\sdatabase\spage-size\sby\ssearching\sfor\swell-formed\spages.
-D 2022-10-06T17:20:12.045
+C Ensure\sthe\spage-size,\sauto-vacuum\sand\sother\ssettings\sare\scopied\sinto\sthe\srecovered\sdatabase.
+D 2022-10-06T21:00:23.727
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -386,7 +386,7 @@ F ext/rbu/rbuvacuum4.test a78898e438a44803eb2bc897ba3323373c9f277418e2d6d76e90f2
 F ext/rbu/sqlite3rbu.c 8737cabdfbee84bb25a7851ecef8b1312be332761238da9be6ddb10c62ad4291
 F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9cd389812
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
-F ext/recover/recover1.test d9844f37b2e6da021816d699424d4aaf85712f50a9a207bf5f85f8ea7b48eb9b
+F ext/recover/recover1.test 6b59ef31e3c0beef8b66e112d50af160e6f7ad8df95bee10192a9e44169d03ec
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
 F ext/recover/recoverclobber.test 294dcc894124ab4ca3a7b35766630742a3d25810fceac22220beb64f70a33a60
 F ext/recover/recovercorrupt.test 69af3d68aedc2cf1c3c41dbd6afb45b3cebadb57796d513550b5fd1e2a8b3fba
@@ -395,9 +395,9 @@ F ext/recover/recoverfault.test 3a0a32b9fc216592b97775d69220695b0926980c0f7424b7
 F ext/recover/recoverfault2.test 321036336af23e778a87f148c4cc4407f88fbdab1fd72ddb661669be9020d36b
 F ext/recover/recoverold.test 46e9d99b595fac583d4c67f74d7d89c20a435c752ef6eeb3e918b599940c88e0
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
-F ext/recover/recoverslowidx.test 7e3889e50758c614b9b3e75187eeeea425c0ca8a2387441fc19ae749a96a7949
+F ext/recover/recoverslowidx.test f356bb9fba7ffd6fc50e045e419464f0129ac6e24decf6e919584f79c3493727
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
-F ext/recover/sqlite3recover.c 1b68d2593b83a130cea794c8921ad7af564cfafd848ccc80e4b9a0e893942c51
+F ext/recover/sqlite3recover.c dcd00bbb95150b3d2a1ae75abd194fa863e4ed86971a3589da226c716fb5a6c0
 F ext/recover/sqlite3recover.h f698ccc94bd4da38761035415ad08c4549a408491ff9fd5f52d34d2214f64e36
 F ext/recover/test_recover.c 61ec931e47abca6b2210f46239cafd9f3060741605e3d3c45a7c7a53f63dd957
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -2014,8 +2014,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 2be0dba12fb9b98cd9632f1ff3f30aeb29661a2e121b68c2f3335617b027797b
-R 428f4add1572ea8a473b960c2888f37e
+P 0dbd0ccef532e076fa82c9fad4dc9fe632c0ef43e3483cc288cbb7eca336a9b9
+R c47f69833d79cdde413f6662a615cd06
 U dan
-Z 0bbefdeff86a57418ac328248f517762
+Z b397112aade8ffe2182cfeaa2f331f80
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 3fa25f41b4..5806dd4688 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0dbd0ccef532e076fa82c9fad4dc9fe632c0ef43e3483cc288cbb7eca336a9b9
\ No newline at end of file
+078520f2825bcb82d01b30209409e9bf8b6c99084c192345df41c9f531d08f51
\ No newline at end of file

From 8a2254fa1ffd4bb083670aad50d095721bc079f7 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Fri, 7 Oct 2022 15:55:35 +0000
Subject: [PATCH 245/428] Improved tracing output for showing all registers
 used by the OP_SeekGE opcode.  This applies to debugging builds only.

FossilOrigin-Name: 0aa6dee7f72279114a47cbb69fdbda0b916a2c365f7a147946869f167bd018b7
---
 manifest      | 14 +++++++-------
 manifest.uuid |  2 +-
 src/vdbe.c    |  8 +++++++-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index 7e2d4a4dba..a75bc14a8f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\sthat\soccurred\swhen\susing\sa\sbloom\sfilter\sto\soptimize\san\s(ipk\s=\s?)\slookup\sin\sthe\scase\swhere\sthe\sRHS\sof\sthe\sexpression\sis\sa\sTEXT\svalue.\sFirst\sreported\sby\s[forum:/forumpost/f61a8b7053|forum\spost\sf61a8b7053].
-D 2022-10-06T14:10:11.073
+C Improved\stracing\soutput\sfor\sshowing\sall\sregisters\sused\sby\sthe\nOP_SeekGE\sopcode.\s\sThis\sapplies\sto\sdebugging\sbuilds\sonly.
+D 2022-10-07T15:55:35.220
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -660,7 +660,7 @@ F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 F src/util.c 0be191521ff6d2805995f4910f0b6231b42843678b2efdc1abecaf39929a673f
 F src/vacuum.c bb346170b0b54c6683bba4a5983aea40485597fdf605c87ec8bc2e199fe88cd8
-F src/vdbe.c 0d1e3c658d98a7bb7201532ea7a3e4d59bf9165421c780d5f84c361e372f1179
+F src/vdbe.c 34846c9ef200eff7ed07155ce64bef751ee72dd631a497c7577350e7709583aa
 F src/vdbe.h 64619af62603dc3c4f5ff6ff6d2c8f389abd667a29ce6007ed44bd22b3211cd0
 F src/vdbeInt.h 17b7461ffcf9ee760d1341731715a419f6b8c763089a7ece25c2e8098d702b3f
 F src/vdbeapi.c fc3183daf72808b4311b228989120fdbc2dc44972fb0d77d5c453460cc0e5b2c
@@ -2001,8 +2001,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 3efa811251d4510a074231a1e0b667783cc5f90777466b9dcae675cd9892b423
-R 24754a870bbabf6f9b268855f112e8aa
-U dan
-Z 222c3385a356b2c2fe407bcca5d59288
+P 8e14c351b29bb434ac4e2510681e95716424a73e340d39feff4919f0431c2e00
+R c90008f816e3229c412b35647f403e13
+U drh
+Z 9f1360d8af6b1aae16a9d54a400e1988
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 6bd184c518..7fc252ac93 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8e14c351b29bb434ac4e2510681e95716424a73e340d39feff4919f0431c2e00
\ No newline at end of file
+0aa6dee7f72279114a47cbb69fdbda0b916a2c365f7a147946869f167bd018b7
\ No newline at end of file
diff --git a/src/vdbe.c b/src/vdbe.c
index ebf52e67af..c2c829b1a5 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -4652,7 +4652,13 @@ case OP_SeekGT: {       /* jump, in3, group */
 
     r.aMem = &aMem[pOp->p3];
 #ifdef SQLITE_DEBUG
-    { int i; for(i=0; i<r.nField; i++) assert( memIsValid(&r.aMem[i]) ); }
+    {
+      int i;
+      for(i=0; i<r.nField; i++){
+        assert( memIsValid(&r.aMem[i]) );
+        if( i>0 ) REGISTER_TRACE(pOp->p3+i, &r.aMem[i]);
+      }
+    }
 #endif
     r.eqSeen = 0;
     rc = sqlite3BtreeIndexMoveto(pC->uc.pCursor, &r, &res);

From 73c586bcbfb4adbd275c46cc151198b099a90a70 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Fri, 7 Oct 2022 18:57:15 +0000
Subject: [PATCH 246/428] Fix a problem causing the seek-scan optimization to
 skip over valid rows that could occur when it is used with expressions of the
 form (a IN (?,?..) AND b >= ?). dbsqlfuzz
 ab1db6dc0efb04cba1cd3431ee6da4894fdc4520.

FossilOrigin-Name: 63d9efe277759d4daa29794846b60c6f55491496618f423f61468df72d0a4633
---
 manifest            | 17 ++++-----
 manifest.uuid       |  2 +-
 src/vdbe.c          | 85 ++++++++++++++++++++++++++++++++-------------
 src/wherecode.c     |  5 +++
 test/seekscan1.test | 63 +++++++++++++++++++++++++++++++++
 5 files changed, 138 insertions(+), 34 deletions(-)
 create mode 100644 test/seekscan1.test

diff --git a/manifest b/manifest
index a75bc14a8f..cdd6fae9bf 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\stracing\soutput\sfor\sshowing\sall\sregisters\sused\sby\sthe\nOP_SeekGE\sopcode.\s\sThis\sapplies\sto\sdebugging\sbuilds\sonly.
-D 2022-10-07T15:55:35.220
+C Fix\sa\sproblem\scausing\sthe\sseek-scan\soptimization\sto\sskip\sover\svalid\srows\sthat\scould\soccur\swhen\sit\sis\sused\swith\sexpressions\sof\sthe\sform\s(a\sIN\s(?,?..)\sAND\sb\s>=\s?).\sdbsqlfuzz\sab1db6dc0efb04cba1cd3431ee6da4894fdc4520.
+D 2022-10-07T18:57:15.710
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -660,7 +660,7 @@ F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 F src/util.c 0be191521ff6d2805995f4910f0b6231b42843678b2efdc1abecaf39929a673f
 F src/vacuum.c bb346170b0b54c6683bba4a5983aea40485597fdf605c87ec8bc2e199fe88cd8
-F src/vdbe.c 34846c9ef200eff7ed07155ce64bef751ee72dd631a497c7577350e7709583aa
+F src/vdbe.c a26eef5a6c0ebb97f83ec18bd483e0d17f0c6b079e7650085f2ef6a82fd78d99
 F src/vdbe.h 64619af62603dc3c4f5ff6ff6d2c8f389abd667a29ce6007ed44bd22b3211cd0
 F src/vdbeInt.h 17b7461ffcf9ee760d1341731715a419f6b8c763089a7ece25c2e8098d702b3f
 F src/vdbeapi.c fc3183daf72808b4311b228989120fdbc2dc44972fb0d77d5c453460cc0e5b2c
@@ -677,7 +677,7 @@ F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
 F src/where.c 63e712bcad47f70e94c2150976cd7da5040933699e3938d4189d064acbe40891
 F src/whereInt.h 70cd30de9ed784aa33fa6bd1245f060617de7a00d992469b6d8e419eed915743
-F src/wherecode.c 7ec238362d5fab3a67e3a77704f1cfdd2172f6da6f03065706922c114d8f39c3
+F src/wherecode.c bb88be457df3a6a01c844074ab79a9ba74279e73185f1362383aa697e3cae5dc
 F src/whereexpr.c 55a39f42aaf982574fbf52906371a84cceed98a994422198dfd03db4fce4cc46
 F src/window.c 928e215840e2f2d9a2746e018c9643ef42c66c4ab6630ef0df7fa388fa145e86
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
@@ -1408,6 +1408,7 @@ F test/schema6.test e4bd1f23d368695eb9e7b51ef6e02ca0642ea2ab4a52579959826b5e7dce
 F test/schemafault.test 1936bceca55ac82c5efbcc9fc91a1933e45c8d1e1d106b9a7e56c972a5a2a51e
 F test/securedel.test 2f70b2449186a1921bd01ec9da407fbfa98c3a7a5521854c300c194b2ff09384
 F test/securedel2.test 2d54c28e46eb1fd6902089958b20b1b056c6f1c5
+F test/seekscan1.test d79c97de5bb1dd1fd466687f3014add514fddf8248c57baf51d749c7dfd573d8
 F test/select1.test 692e84cfa29c405854c69e8a4027183d64c22952866a123fabbce741a379e889
 F test/select2.test 352480e0e9c66eda9c3044e412abdf5be0215b56
 F test/select3.test 8d04b66df7475275a65f7e4a786d6a724c30bd9929f8ae5bd59c8d3d6e75e6cd
@@ -2001,8 +2002,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 8e14c351b29bb434ac4e2510681e95716424a73e340d39feff4919f0431c2e00
-R c90008f816e3229c412b35647f403e13
-U drh
-Z 9f1360d8af6b1aae16a9d54a400e1988
+P 0aa6dee7f72279114a47cbb69fdbda0b916a2c365f7a147946869f167bd018b7
+R 9de0d5489b8b6fdeba7d984032a52e92
+U dan
+Z eb03544a31e11a7d40cf257fa4d437b7
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 7fc252ac93..617778f89b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0aa6dee7f72279114a47cbb69fdbda0b916a2c365f7a147946869f167bd018b7
\ No newline at end of file
+63d9efe277759d4daa29794846b60c6f55491496618f423f61468df72d0a4633
\ No newline at end of file
diff --git a/src/vdbe.c b/src/vdbe.c
index c2c829b1a5..1797aca006 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -4721,7 +4721,7 @@ seek_not_found:
 }
 
 
-/* Opcode: SeekScan  P1 P2 * * *
+/* Opcode: SeekScan  P1 P2 * * P5
 ** Synopsis: Scan-ahead up to P1 rows
 **
 ** This opcode is a prefix opcode to OP_SeekGE.  In other words, this
@@ -4731,8 +4731,8 @@ seek_not_found:
 ** This opcode uses the P1 through P4 operands of the subsequent
 ** OP_SeekGE.  In the text that follows, the operands of the subsequent
 ** OP_SeekGE opcode are denoted as SeekOP.P1 through SeekOP.P4.   Only
-** the P1 and P2 operands of this opcode are also used, and  are called
-** This.P1 and This.P2.
+** the P1, P2 and P5 operands of this opcode are also used, and  are called
+** This.P1, This.P2 and This.P5.
 **
 ** This opcode helps to optimize IN operators on a multi-column index
 ** where the IN operator is on the later terms of the index by avoiding
@@ -4742,29 +4742,51 @@ seek_not_found:
 **
 ** The SeekGE.P3 and SeekGE.P4 operands identify an unpacked key which
 ** is the desired entry that we want the cursor SeekGE.P1 to be pointing
-** to.  Call this SeekGE.P4/P5 row the "target".
+** to.  Call this SeekGE.P3/P4 row the "target".
 **
 ** If the SeekGE.P1 cursor is not currently pointing to a valid row,
 ** then this opcode is a no-op and control passes through into the OP_SeekGE.
 **
 ** If the SeekGE.P1 cursor is pointing to a valid row, then that row
 ** might be the target row, or it might be near and slightly before the
-** target row.  This opcode attempts to position the cursor on the target
-** row by, perhaps by invoking sqlite3BtreeStep() on the cursor
-** between 0 and This.P1 times.
+** target row, or it might be after the target row.  If the cursor is
+** currently before the target row, then this opcode attempts to position
+** the cursor on or after the target row by invoking sqlite3BtreeStep()
+** on the cursor between 1 and This.P1 times.
 **
-** There are three possible outcomes from this opcode:<ol>
+** The This.P5 parameter is a flag that indicates what to do if the
+** cursor ends up pointing at a valid row that is past the target
+** row.  If This.P5 is false (0) then a jump is made to SeekGE.P2.  If
+** This.P5 is true (non-zero) then a jump is made to This.P2.  The P5==0
+** case occurs when there are no inequality constraints to the right of
+** the IN constraing.  The jump to SeekGE.P2 ends the loop.  The P5!=0 case
+** occurs when there are inequality constraints to the right of the IN
+** operator.  In that case, the This.P2 will point either directly to or
+** to setup code prior to the OP_IdxGT or OP_IdxGE opcode that checks for
+** loop terminate.
 **
-** <li> If after This.P1 steps, the cursor is still pointing to a place that
-**      is earlier in the btree than the target row, then fall through
-**      into the subsquence OP_SeekGE opcode.
+** Possible outcomes from this opcode:<ol>
 **
-** <li> If the cursor is successfully moved to the target row by 0 or more
-**      sqlite3BtreeNext() calls, then jump to This.P2, which will land just
-**      past the OP_IdxGT or OP_IdxGE opcode that follows the OP_SeekGE.
+** <li> If the cursor is initally not pointed to any valid row, then
+**      fall through into the subsequent OP_SeekGE opcode.
 **
-** <li> If the cursor ends up past the target row (indicating that the target
-**      row does not exist in the btree) then jump to SeekOP.P2. 
+** <li> If the cursor is left pointing to a row that is before the target
+**      row, even after making as many as This.P1 calls to
+**      sqlite3BtreeNext(), then also fall through into OP_SeekGE.
+**
+** <li> If the cursor is left pointing at the target row, either because it
+**      was at the target row to begin with or because one or more
+**      sqlite3BtreeNext() calls moved the cursor to the target row,
+**      then jump to This.P2..,
+**
+** <li> If the cursor started out before the target row and a call to
+**      to sqlite3BtreeNext() moved the cursor off the end of the index
+**      (indicating that the target row definitely does not exist in the
+**      btree) then jump to SeekGE.P2, ending the loop.
+**
+** <li> If the cursor ends up on a valid row that is past the target row 
+**      (indicating that the target row does not exist in the btree) then
+**      jump to SeekOP.P2 if This.P5==0 or to This.P2 if This.P5>0.
 ** </ol>
 */
 case OP_SeekScan: {
@@ -4775,14 +4797,25 @@ case OP_SeekScan: {
 
   assert( pOp[1].opcode==OP_SeekGE );
 
-  /* pOp->p2 points to the first instruction past the OP_IdxGT that
-  ** follows the OP_SeekGE.  */
+  /* If pOp->p5 is clear, then pOp->p2 points to the first instruction past the
+  ** OP_IdxGT that follows the OP_SeekGE. Otherwise, it points to the first
+  ** opcode past the OP_SeekGE itself.  */
   assert( pOp->p2>=(int)(pOp-aOp)+2 );
-  assert( aOp[pOp->p2-1].opcode==OP_IdxGT || aOp[pOp->p2-1].opcode==OP_IdxGE );
-  testcase( aOp[pOp->p2-1].opcode==OP_IdxGE );
-  assert( pOp[1].p1==aOp[pOp->p2-1].p1 );
-  assert( pOp[1].p2==aOp[pOp->p2-1].p2 );
-  assert( pOp[1].p3==aOp[pOp->p2-1].p3 );
+#ifdef SQLITE_DEBUG
+  if( pOp->p5==0 ){
+    /* There are no inequality constraints following the IN constraint. */
+    assert( pOp[1].p1==aOp[pOp->p2-1].p1 );
+    assert( pOp[1].p2==aOp[pOp->p2-1].p2 );
+    assert( pOp[1].p3==aOp[pOp->p2-1].p3 );
+    assert( aOp[pOp->p2-1].opcode==OP_IdxGT 
+         || aOp[pOp->p2-1].opcode==OP_IdxGE );
+    testcase( aOp[pOp->p2-1].opcode==OP_IdxGE );
+  }else{
+    /* There are inequality constraints.  */
+    assert( pOp->p2==(int)(pOp-aOp)+2 );
+    assert( aOp[pOp->p2-1].opcode==OP_SeekGE );
+  }
+#endif
 
   assert( pOp->p1>0 );
   pC = p->apCsr[pOp[1].p1];
@@ -4816,8 +4849,9 @@ case OP_SeekScan: {
   while(1){
     rc = sqlite3VdbeIdxKeyCompare(db, pC, &r, &res);
     if( rc ) goto abort_due_to_error;
-    if( res>0 ){
+    if( res>0 && pOp->p5==0 ){
       seekscan_search_fail:
+      /* Jump to SeekGE.P2, ending the loop */
 #ifdef SQLITE_DEBUG
       if( db->flags&SQLITE_VdbeTrace ){
         printf("... %d steps and then skip\n", pOp->p1 - nStep);
@@ -4827,7 +4861,8 @@ case OP_SeekScan: {
       pOp++;
       goto jump_to_p2;
     }
-    if( res==0 ){
+    if( res>=0 ){
+      /* Jump to This.P2, bypassing the OP_SeekGE opcode */
 #ifdef SQLITE_DEBUG
       if( db->flags&SQLITE_VdbeTrace ){
         printf("... %d steps and then success\n", pOp->p1 - nStep);
diff --git a/src/wherecode.c b/src/wherecode.c
index 67df73c663..85d9be5011 100644
--- a/src/wherecode.c
+++ b/src/wherecode.c
@@ -2038,6 +2038,11 @@ Bitmask sqlite3WhereCodeOneLoopStart(
         ** guess. */
         addrSeekScan = sqlite3VdbeAddOp1(v, OP_SeekScan, 
                                          (pIdx->aiRowLogEst[0]+9)/10);
+        if( pRangeStart ){
+          sqlite3VdbeChangeP5(v, 1);
+          sqlite3VdbeChangeP2(v, addrSeekScan, sqlite3VdbeCurrentAddr(v)+1);
+          addrSeekScan = 0;
+        }
         VdbeCoverage(v);
       }
       sqlite3VdbeAddOp4Int(v, op, iIdxCur, addrNxt, regBase, nConstraint);
diff --git a/test/seekscan1.test b/test/seekscan1.test
new file mode 100644
index 0000000000..e68d71449d
--- /dev/null
+++ b/test/seekscan1.test
@@ -0,0 +1,63 @@
+# 2022 October 7
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+# This file implements regression tests for SQLite library.
+#
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+set testprefix seekscan1
+
+do_execsql_test 1.0 {
+  CREATE TABLE t1(a TEXT, b INT, c INT NOT NULL, PRIMARY KEY(a,b,c));
+  WITH RECURSIVE c(x) AS (VALUES(0) UNION ALL SELECT x+1 FROM c WHERE x<1997)
+    INSERT INTO t1(a,b,c) SELECT printf('xyz%d',x/10),x/6,x FROM c;
+  INSERT INTO t1 VALUES('abc',234,6);
+  INSERT INTO t1 VALUES('abc',345,7);
+  ANALYZE;
+}
+
+do_execsql_test 1.1 {
+  SELECT a,b,c FROM t1 
+  WHERE b IN (234, 345) AND c BETWEEN 6 AND 6.5 AND a='abc' 
+  ORDER BY a, b;
+} {
+  abc 234 6
+}
+
+do_execsql_test 1.2 {
+  SELECT a,b,c FROM t1 
+  WHERE b IN (234, 345) AND c BETWEEN 6 AND 7 AND a='abc' 
+  ORDER BY a, b;
+} {
+  abc 234 6
+  abc 345 7
+}
+
+do_execsql_test 1.3 {
+  SELECT a,b,c FROM t1 
+  WHERE b IN (234, 345) AND c >=6 AND a='abc' 
+  ORDER BY a, b;
+} {
+  abc 234 6
+  abc 345 7
+}
+
+do_execsql_test 1.4 {
+  SELECT a,b,c FROM t1 
+  WHERE b IN (234, 345) AND c<=7 AND a='abc' 
+  ORDER BY a, b;
+} {
+  abc 234 6
+  abc 345 7
+}
+
+
+finish_test

From 211a1a7281a6855b5a73fb6a6d3e74144845dc5f Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sat, 8 Oct 2022 17:27:05 +0000
Subject: [PATCH 247/428] When casting an odd-length BLOB into a TEXT with
 encoding UTF16, omit the last byte.  dbsqlfuzz
 c5df68b5bbdf6c9f3c1851e41e88f49ac05c9969

FossilOrigin-Name: 1e2796b3741a4c0b966e6c01a7d62dea8de9d1f4bededea3d7ba7004dabc2ffe
---
 manifest      | 14 +++++++-------
 manifest.uuid |  2 +-
 src/vdbemem.c |  1 +
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/manifest b/manifest
index cdd6fae9bf..8b3405b19b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\scausing\sthe\sseek-scan\soptimization\sto\sskip\sover\svalid\srows\sthat\scould\soccur\swhen\sit\sis\sused\swith\sexpressions\sof\sthe\sform\s(a\sIN\s(?,?..)\sAND\sb\s>=\s?).\sdbsqlfuzz\sab1db6dc0efb04cba1cd3431ee6da4894fdc4520.
-D 2022-10-07T18:57:15.710
+C When\scasting\san\sodd-length\sBLOB\sinto\sa\sTEXT\swith\sencoding\sUTF16,\somit\sthe\nlast\sbyte.\s\sdbsqlfuzz\sc5df68b5bbdf6c9f3c1851e41e88f49ac05c9969
+D 2022-10-08T17:27:05.762
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -666,7 +666,7 @@ F src/vdbeInt.h 17b7461ffcf9ee760d1341731715a419f6b8c763089a7ece25c2e8098d702b3f
 F src/vdbeapi.c fc3183daf72808b4311b228989120fdbc2dc44972fb0d77d5c453460cc0e5b2c
 F src/vdbeaux.c c719cebaffa75e166f16a405b3dee96e7150d60fc563ab2dea716b60c6a51312
 F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
-F src/vdbemem.c c3ce80af15e2ff5c2824a8db881681cbf511376f13613da020bac6d320c535b1
+F src/vdbemem.c a9a3556bbdc8f3022f75136054c3ed02cbac15a73ec55cff2ea27bf5bb773dcc
 F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
 F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
 F src/vdbevtab.c f99b275366c5fc5e2d99f734729880994ab9500bdafde7fae3b02d562b9d323c
@@ -2002,8 +2002,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 0aa6dee7f72279114a47cbb69fdbda0b916a2c365f7a147946869f167bd018b7
-R 9de0d5489b8b6fdeba7d984032a52e92
-U dan
-Z eb03544a31e11a7d40cf257fa4d437b7
+P 63d9efe277759d4daa29794846b60c6f55491496618f423f61468df72d0a4633
+R e0f7913bc96b580aa6941cfc15392c69
+U drh
+Z 28ed4e90d35f287e1294ec9151009f9d
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 617778f89b..c9edd03197 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-63d9efe277759d4daa29794846b60c6f55491496618f423f61468df72d0a4633
\ No newline at end of file
+1e2796b3741a4c0b966e6c01a7d62dea8de9d1f4bededea3d7ba7004dabc2ffe
\ No newline at end of file
diff --git a/src/vdbemem.c b/src/vdbemem.c
index c6c938cb5c..3e9813ebe1 100644
--- a/src/vdbemem.c
+++ b/src/vdbemem.c
@@ -832,6 +832,7 @@ int sqlite3VdbeMemCast(Mem *pMem, u8 aff, u8 encoding){
       sqlite3ValueApplyAffinity(pMem, SQLITE_AFF_TEXT, encoding);
       assert( pMem->flags & MEM_Str || pMem->db->mallocFailed );
       pMem->flags &= ~(MEM_Int|MEM_Real|MEM_IntReal|MEM_Blob|MEM_Zero);
+      if( encoding!=SQLITE_UTF8 ) pMem->n &= ~1;
       return sqlite3VdbeChangeEncoding(pMem, encoding);
     }
   }

From d6555726ed43a97ea2da6029caeb8ccaedcbc9dc Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sun, 9 Oct 2022 11:42:12 +0000
Subject: [PATCH 248/428] Add -DSQLITE_OS_KV_OPTIONAL to speedtest1 flags for
 kvvfs testing purposes.

FossilOrigin-Name: 92b500da70a3dc64e910c232a2cac7620b6609162c2a5058b269d3b83d763c02
---
 Makefile.in         |  3 +-
 ext/wasm/kvvfs.make | 82 +++++++++++++++++++++++++++++++++++++++++++++
 manifest            | 13 +++----
 manifest.uuid       |  2 +-
 4 files changed, 92 insertions(+), 8 deletions(-)
 create mode 100644 ext/wasm/kvvfs.make

diff --git a/Makefile.in b/Makefile.in
index f570c7d374..895520c570 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -635,6 +635,7 @@ FUZZCHECK_OPT += -DSQLITE_ENABLE_DBSTAT_VTAB
 FUZZCHECK_OPT += -DSQLITE_ENABLE_BYTECODE_VTAB
 FUZZCHECK_SRC = $(TOP)/test/fuzzcheck.c $(TOP)/test/ossfuzz.c $(TOP)/test/fuzzinvariants.c
 DBFUZZ_OPT =
+ST_OPT = -DSQLITE_OS_KV_OPTIONAL
 
 # This is the default Makefile target.  The objects listed here
 # are what get build when you type just "make" with no arguments.
@@ -1392,7 +1393,7 @@ LogEst$(TEXE):	$(TOP)/tool/logest.c sqlite3.h
 wordcount$(TEXE):	$(TOP)/test/wordcount.c sqlite3.lo
 	$(LTLINK) -o $@ $(TOP)/test/wordcount.c sqlite3.lo $(TLIBS)
 
-speedtest1$(TEXE):	$(TOP)/test/speedtest1.c sqlite3.c
+speedtest1$(TEXE):	$(TOP)/test/speedtest1.c sqlite3.c Makefile
 	$(LTLINK) $(ST_OPT) -o $@ $(TOP)/test/speedtest1.c sqlite3.c $(TLIBS)
 
 startup$(TEXE):	$(TOP)/test/startup.c sqlite3.c
diff --git a/ext/wasm/kvvfs.make b/ext/wasm/kvvfs.make
new file mode 100644
index 0000000000..83a2691370
--- /dev/null
+++ b/ext/wasm/kvvfs.make
@@ -0,0 +1,82 @@
+#!/usr/bin/make
+#^^^^ help emacs select makefile mode
+#
+# This is a sub-make for building a standalone kvvfs-based
+# sqlite3.wasm.  It is intended to be "include"d from the main
+# GNUMakefile.
+#
+# Notable potential TODOs:
+#
+# - Trim down a custom sqlite3-api.js for this build. We can elimate
+#   the jaccwabyt dependency, for example, because this build won't
+#   make use of the VFS bits. Similarly, we can eliminate or replace
+#   parts of the OO1 API, or provide a related API which manages
+#   singletons of the localStorage/sessionStorage instances.
+#
+########################################################################
+MAKEFILE.kvvfs := $(lastword $(MAKEFILE_LIST))
+
+kvvfs.js     := sqlite3-kvvfs.js
+kvvfs.wasm   := sqlite3-kvvfs.wasm
+kvvfs.wasm.c := $(dir.api)/sqlite3-wasm.c
+
+CLEAN_FILES += $(kvvfs.js) $(kvvfs.wasm)
+
+########################################################################
+# emcc flags for .c/.o/.wasm.
+kvvfs.flags =
+#kvvfs.flags += -v # _very_ loud but also informative about what it's doing
+
+########################################################################
+# emcc flags for .c/.o.
+kvvfs.cflags :=
+kvvfs.cflags += -std=c99 -fPIC
+kvvfs.cflags += -I. -I$(dir.top)
+kvvfs.cflags += -DSQLITE_OS_KV=1 $(SQLITE_OPT)
+
+########################################################################
+# emcc flags specific to building the final .js/.wasm file...
+kvvfs.jsflags := -fPIC
+kvvfs.jsflags += --no-entry
+kvvfs.jsflags += -sENVIRONMENT=web
+kvvfs.jsflags += -sMODULARIZE
+kvvfs.jsflags += -sSTRICT_JS
+kvvfs.jsflags += -sDYNAMIC_EXECUTION=0
+kvvfs.jsflags += -sNO_POLYFILL
+kvvfs.jsflags += -sEXPORTED_FUNCTIONS=@$(dir.api)/EXPORTED_FUNCTIONS.sqlite3-api
+kvvfs.jsflags += -sEXPORTED_RUNTIME_METHODS=FS,wasmMemory,allocateUTF8OnStack
+                                            # wasmMemory ==> for -sIMPORTED_MEMORY
+                                            # allocateUTF8OnStack ==> kvvfs internals
+kvvfs.jsflags += -sUSE_CLOSURE_COMPILER=0
+kvvfs.jsflags += -sIMPORTED_MEMORY
+#kvvfs.jsflags += -sINITIAL_MEMORY=13107200
+#kvvfs.jsflags += -sTOTAL_STACK=4194304
+kvvfs.jsflags += -sEXPORT_NAME=sqlite3InitModule
+kvvfs.jsflags += -sGLOBAL_BASE=4096 # HYPOTHETICALLY keep func table indexes from overlapping w/ heap addr.
+kvvfs.jsflags += --post-js=$(post-js.js)
+#kvvfs.jsflags += -sFILESYSTEM=0 # only for experimentation. sqlite3 needs the FS API
+#                                Perhaps the kvvfs build doesn't?
+#kvvfs.jsflags += -sABORTING_MALLOC
+kvvfs.jsflags += -sALLOW_MEMORY_GROWTH
+kvvfs.jsflags += -sALLOW_TABLE_GROWTH
+kvvfs.jsflags += -Wno-limited-postlink-optimizations
+# ^^^^^ it likes to warn when we have "limited optimizations" via the -g3 flag.
+kvvfs.jsflags += -sERROR_ON_UNDEFINED_SYMBOLS=0
+kvvfs.jsflags += -sLLD_REPORT_UNDEFINED
+#kvvfs.jsflags += --import-undefined
+kvvfs.jsflags += -sMEMORY64=0
+ifneq (0,$(enable_bigint))
+kvvfs.jsflags += -sWASM_BIGINT
+endif
+
+$(kvvfs.js): $(MAKEFILE) $(MAKEFILE.kvvfs) $(kvvfs.wasm.c) \
+    EXPORTED_FUNCTIONS.api \
+    $(post-js.js)
+	$(emcc.bin) -o $@ $(emcc_opt) $(emcc.flags) $(kvvfs.cflags) $(kvvfs.jsflags) $(kvvfs.wasm.c)
+	chmod -x $(kvvfs.wasm)
+ifneq (,$(wasm-strip))
+	$(wasm-strip) $(kvvfs.wasm)
+endif
+	@ls -la $@ $(kvvfs.wasm)
+
+kvvfs: $(kvvfs.js)
diff --git a/manifest b/manifest
index 2bda31e933..badd503248 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Replace\stime-based\sauto-unlock\sof\sopfs\ssync\shandles\swith\slock\sacquisition/release\svia\ssqlite3_io_methods::xLock/xUnlock().
-D 2022-10-04T17:06:51.812
+C Add\s-DSQLITE_OS_KV_OPTIONAL\sto\sspeedtest1\sflags\sfor\skvvfs\stesting\spurposes.
+D 2022-10-09T11:42:12.888
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in 2fbc1de74212fba94e0c3eca5549b894c91c1c17fb5e6fd23ca90a616523c5f5
+F Makefile.in c6ec4ad6d44bab836eb7b2c142c43388b79c3729cdfd770450dc73df126620f5
 F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
 F Makefile.msc d547a2fdba38a1c6cd1954977d0b0cc017f5f8fbfbc65287bf8d335808938016
 F README.md 8b8df9ca852aeac4864eb1e400002633ee6db84065bd01b78c33817f97d31f5e
@@ -513,6 +513,7 @@ F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab26
 F ext/wasm/jaccwabyt/jaccwabyt.md 9aa6951b529a8b29f578ec8f0355713c39584c92cf1708f63ba0cf917cb5b68e
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
 F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e568d2c2307c416902059339c06f19
+F ext/wasm/kvvfs.make 7cc9cf10e744c3ba523c3eaf5c4af47028f3a5bb76db304ea8044a9b2a9d496f
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
 F ext/wasm/scratchpad-wasmfs-main.js 1aa32c1035cf1440a226a28fefcbb5762fbbcb020ccbe5895f8736d701695c63
 F ext/wasm/speedtest1-wasmfs.html bc28eb29b69a73864b8d7aae428448f8b7e1de81d8bfb9bba99541322054dbd0
@@ -2029,8 +2030,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 35f33c23e5849de1c43c4499ee0a7fa11d26ae34949c1e820c3fa8e8873f9c2b
-R 447ab40d8f9d9bacdb3bbf1fc5e8416f
+P 2625b7cfe1640c1d7e779ec1f37db970541598c0dc3e22e5eecf3c772d95ad40
+R 7aaffd9c020ac6e72a26849a8062d65e
 U stephan
-Z 1f6ebc0e7b8d0de3ff6621f210427c47
+Z 7690e0fae23fd2c65e8199412cec0d90
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index b47bd0f8b4..7a8500c47f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2625b7cfe1640c1d7e779ec1f37db970541598c0dc3e22e5eecf3c772d95ad40
\ No newline at end of file
+92b500da70a3dc64e910c232a2cac7620b6609162c2a5058b269d3b83d763c02
\ No newline at end of file

From d35b5587df9b6e68ac5a1a1907a95ce6e3abee51 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sun, 9 Oct 2022 13:19:27 +0000
Subject: [PATCH 249/428] Refactor os_kv.c so that the kvvfs read/write/delete
 methods can be swapped out at runtime by JS implementations. This eliminates
 the kvvfs dependency on Emscripten. Checkin part 1 of 2, to account for
 cherrypicking.

FossilOrigin-Name: ea370b9b05f7ed7eaa154ba58019f6642217eabc18517e721567adf948d93980
---
 manifest      |  12 +--
 manifest.uuid |   2 +-
 src/os_kv.c   | 273 +++++++++++---------------------------------------
 3 files changed, 64 insertions(+), 223 deletions(-)

diff --git a/manifest b/manifest
index badd503248..fa53ea2b90 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\s-DSQLITE_OS_KV_OPTIONAL\sto\sspeedtest1\sflags\sfor\skvvfs\stesting\spurposes.
-D 2022-10-09T11:42:12.888
+C Refactor\sos_kv.c\sso\sthat\sthe\skvvfs\sread/write/delete\smethods\scan\sbe\sswapped\sout\sat\sruntime\sby\sJS\simplementations.\sThis\seliminates\sthe\skvvfs\sdependency\son\sEmscripten.\sCheckin\spart\s1\sof\s2,\sto\saccount\sfor\scherrypicking.
+D 2022-10-09T13:19:27.791
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -600,7 +600,7 @@ F src/notify.c 89a97dc854c3aa62ad5f384ef50c5a4a11d70fcc69f86de3e991573421130ed6
 F src/os.c 0eb831ba3575af5277e47f4edd14fdfc90025c67eb25ce5cda634518d308d4e9
 F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
-F src/os_kv.c 88872a68ba37e4ed4306eb6fa78d559dcc675761ce1f6458ba710e1c10a2d667
+F src/os_kv.c c3d991bfb6207560d3416bbf241cade7113e4ce852781c53b7e40a3d6ac25fcb
 F src/os_setup.h 0711dbc4678f3ac52d7fe736951b6384a0615387c4ba5135a4764e4e31f4b6a6
 F src/os_unix.c 287aa5f5691a2b356780c63e83abaa33549add84227b8313395f04088486d79c
 F src/os_win.c 8d129ae3e59e0fa900e20d0ad789e96f2e08177f0b00b53cdda65c40331e0902
@@ -2030,8 +2030,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 2625b7cfe1640c1d7e779ec1f37db970541598c0dc3e22e5eecf3c772d95ad40
-R 7aaffd9c020ac6e72a26849a8062d65e
+P 92b500da70a3dc64e910c232a2cac7620b6609162c2a5058b269d3b83d763c02
+R 4791c9c6d2e81be0b277d92f5c368eb4
 U stephan
-Z 7690e0fae23fd2c65e8199412cec0d90
+Z 01e42f1c0aeb881a7fdcbb6522393054
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 7a8500c47f..b931ddc8fb 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-92b500da70a3dc64e910c232a2cac7620b6609162c2a5058b269d3b83d763c02
\ No newline at end of file
+ea370b9b05f7ed7eaa154ba58019f6642217eabc18517e721567adf948d93980
\ No newline at end of file
diff --git a/src/os_kv.c b/src/os_kv.c
index 8de687ff11..ecccacf61e 100644
--- a/src/os_kv.c
+++ b/src/os_kv.c
@@ -23,14 +23,14 @@
 
 /* SQLITE_KV_TRACE() is used for tracing calls to kvstorage routines. */
 #if 0
-#define SQLITE_KV_TRACE(X)  printf X;
+#define SQLITE_KV_TRACE(X)  printf X
 #else
 #define SQLITE_KV_TRACE(X)
 #endif
 
 /* SQLITE_KV_LOG() is used for tracing calls to the VFS interface */
 #if 0
-#define SQLITE_KV_LOG(X)  printf X;
+#define SQLITE_KV_LOG(X)  printf X
 #else
 #define SQLITE_KV_LOG(X)
 #endif
@@ -166,6 +166,9 @@ static sqlite3_io_methods kvvfs_jrnl_io_methods = {
 
 /* Forward declarations for the low-level storage engine
 */
+static int kvstorageWrite(const char*, const char *zKey, const char *zData);
+static int kvstorageDelete(const char*, const char *zKey);
+static int kvstorageRead(const char*, const char *zKey, char *zBuf, int nBuf);
 #define KVSTORAGE_KEY_SZ  32
 
 /* Expand the key name with an appropriate prefix and put the result
@@ -180,206 +183,6 @@ static void kvstorageMakeKey(
   sqlite3_snprintf(KVSTORAGE_KEY_SZ, zKeyOut, "kvvfs-%s-%s", zClass, zKeyIn);
 }
 
-#ifdef __EMSCRIPTEN__
-/* Provide Emscripten-based impls of kvstorageWrite/Read/Delete()... */
-#include <emscripten.h>
-#include <emscripten/console.h>
-
-/*
-** WASM_KEEP is identical to EMSCRIPTEN_KEEPALIVE but is not
-** Emscripten-specific. It explicitly includes marked functions for
-** export into the target wasm file without requiring explicit listing
-** of those functions in Emscripten's -sEXPORTED_FUNCTIONS=... list
-** (or equivalent in other build platforms). Any function with neither
-** this attribute nor which is listed as an explicit export will not
-** be exported from the wasm file (but may still be used internally
-** within the wasm file).
-**
-** The functions in this filewhich require exporting are marked with
-** this flag. They may also be added to any explicit build-time export
-** list but need not be. All of these APIs are intended for use only
-** within the project's own JS/WASM code, and not by client code, so
-** an argument can be made for reducing their visibility by not
-** including them in any build-time export lists.
-**
-** 2022-09-11: it's not yet _proven_ that this approach works in
-** non-Emscripten builds. If not, such builds will need to export
-** those using the --export=... wasm-ld flag (or equivalent). As of
-** this writing we are tied to Emscripten for various reasons
-** and cannot test the library with other build environments.
-*/
-#define WASM_KEEP __attribute__((used,visibility("default")))
-/*
-** An internal level of indirection for accessing the static
-** kvstorageMakeKey() from EM_JS()-generated functions. This must be
-** made available for export via Emscripten but is not intended to be
-** used from client code. If called with a NULL zKeyOut it is a no-op.
-** It returns KVSTORAGE_KEY_SZ, so JS code (which cannot see that
-** constant) may call it with NULL arguments to get the size of the
-** allocation they'll need for a kvvfs key.
-**
-** Maintenance reminder: Emscripten will install this in the Module
-** init scope and will prefix its name with "_".
-*/
-WASM_KEEP
-int sqlite3_wasm__kvvfsMakeKey(const char *zClass, const char *zKeyIn,
-                               char *zKeyOut){
-  if( 0!=zKeyOut ) kvstorageMakeKey(zClass, zKeyIn, zKeyOut);
-  return KVSTORAGE_KEY_SZ;
-}
-/*
-** Internal helper for kvstorageWrite/Read/Delete() which creates a
-** storage key for the given zClass/zKeyIn combination. Returns a
-** pointer to the key: a C string allocated on the WASM stack, or 0 if
-** allocation fails. It is up to the caller to save/restore the stack
-** before/after this operation.
-*/
-EM_JS(const char *, kvstorageMakeKeyOnJSStack,
-      (const char *zClass, const char *zKeyIn),{
-  if( 0==zClass || 0==zKeyIn) return 0;
-  const zXKey = stackAlloc(_sqlite3_wasm__kvvfsMakeKey(0,0,0));
-  if(zXKey) _sqlite3_wasm__kvvfsMakeKey(zClass, zKeyIn, zXKey);
-  return zXKey;
-});
-
-/*
-** JS impl of kvstorageWrite(). Main docs are in the C impl. This impl
-** writes zData to the global sessionStorage (if zClass starts with
-** 's') or localStorage, using a storage key derived from zClass and
-** zKey.
-*/
-EM_JS(int, kvstorageWrite,
-      (const char *zClass, const char *zKey, const char *zData),{
-  const stack = stackSave();
-  try {
-    const zXKey = kvstorageMakeKeyOnJSStack(zClass,zKey);
-    if(!zXKey) return 1/*OOM*/;
-    const jKey = UTF8ToString(zXKey);
-    /**
-       We could simplify this function and eliminate the
-       kvstorageMakeKey() symbol acrobatics if we'd simply hard-code
-       the key algo into the 3 functions which need it:
-
-       const jKey = "kvvfs-"+UTF8ToString(zClass)+"-"+UTF8ToString(zKey);
-    */
-    ((115/*=='s'*/===getValue(zClass))
-     ? sessionStorage : localStorage).setItem(jKey, UTF8ToString(zData));
-  }catch(e){
-    console.error("kvstorageWrite()",e);
-    return 1; // Can't access SQLITE_xxx from here
-  }finally{
-    stackRestore(stack);
-  }
-  return 0;
-});
-
-/*
-** JS impl of kvstorageDelete(). Main docs are in the C impl. This
-** impl generates a key derived from zClass and zKey, and removes the
-** matching entry (if any) from global sessionStorage (if zClass
-** starts with 's') or localStorage.
-*/
-EM_JS(int, kvstorageDelete,
-      (const char *zClass, const char *zKey),{
-  const stack = stackSave();
-  try {
-    const zXKey = kvstorageMakeKeyOnJSStack(zClass,zKey);
-    if(!zXKey) return 1/*OOM*/;
-    const jKey = UTF8ToString(zXKey);
-    ((115/*=='s'*/===getValue(zClass))
-     ? sessionStorage : localStorage).removeItem(jKey);
-  }catch(e){
-    console.error("kvstorageDelete()",e);
-    return 1;
-  }finally{
-    stackRestore(stack);
-  }
-  return 0;
-});
-
-/*
-** JS impl of kvstorageRead(). Main docs are in the C impl. This impl
-** reads its data from the global sessionStorage (if zClass starts
-** with 's') or localStorage, using a storage key derived from zClass
-** and zKey.
-*/
-EM_JS(int, kvstorageRead,
-      (const char *zClass, const char *zKey, char *zBuf, int nBuf),{
-  const stack = stackSave();
-  try {
-    const zXKey = kvstorageMakeKeyOnJSStack(zClass,zKey);
-    if(!zXKey) return -3/*OOM*/;
-    const jKey = UTF8ToString(zXKey);
-    const jV = ((115/*=='s'*/===getValue(zClass))
-                ? sessionStorage : localStorage).getItem(jKey);
-    if(!jV) return -1;
-    const nV = jV.length /* Note that we are relying 100% on v being
-                            ASCII so that jV.length is equal to the
-                            C-string's byte length. */;
-    if(nBuf<=0) return nV;
-    else if(1===nBuf){
-      setValue(zBuf, 0);
-      return nV;
-    }
-    const zV = allocateUTF8OnStack(jV);
-    if(nBuf > nV + 1) nBuf = nV + 1;
-    HEAPU8.copyWithin(zBuf, zV, zV + nBuf - 1);
-    setValue( zBuf + nBuf - 1, 0 );
-    return nBuf - 1;
-  }catch(e){
-    console.error("kvstorageRead()",e);
-    return -2;
-  }finally{
-    stackRestore(stack);
-  }
-});
-
-/*
-** This function exists for (1) WASM testing purposes and (2) as a
-** hook to get Emscripten to export several EM_JS()-generated
-** functions (if we don't reference them from exported C functions
-** then they get stripped away at build time). It is not part of the
-** public API and its signature and semantics may change at any time.
-** It's not even part of the private API, for that matter - it's part
-** of the Emscripten C/JS/WASM glue.
-*/
-WASM_KEEP
-int sqlite3__wasm_emjs_kvvfs(int whichOp){
-  int rc = 0;
-  const char * zClass =
-    "sezzion" /*don't collide with "session" records!*/;
-  const char * zKey = "hello";
-  switch( whichOp ){
-    case 0: break;
-    case 1:
-      rc = kvstorageWrite(zClass, zKey, "world");
-      break;
-    case 2: {
-      char buffer[128] = {0};
-      char * zBuf = &buffer[0];
-      rc = kvstorageRead(zClass, zKey, zBuf, (int)sizeof(buffer));
-      emscripten_console_logf("kvstorageRead()=%d %s\n", rc, zBuf);
-      break;
-    }
-    case 3:
-      kvstorageDelete(zClass, zKey);
-      break;
-    case 4:
-      kvstorageMakeKeyOnJSStack(0,0);
-      break;
-    default: break;
-  }
-  return rc;
-}
-
-#undef WASM_KEEP
-#else /* end ifdef __EMSCRIPTEN__ */
-/* Forward declarations for the low-level storage engine
-*/
-static int kvstorageWrite(const char*, const char *zKey, const char *zData);
-static int kvstorageDelete(const char*, const char *zKey);
-static int kvstorageRead(const char*, const char *zKey, char *zBuf, int nBuf);
-
 /* Write content into a key.  zClass is the particular namespace of the
 ** underlying key/value store to use - either "local" or "session".
 **
@@ -474,7 +277,45 @@ static int kvstorageRead(
     return (int)n;
   }
 }
-#endif /* ifdef __EMSCRIPTEN__ */
+
+/*
+** An internal level of indirection which enables us to replace the
+** kvvfs i/o methods with JavaScript implementations in WASM builds.
+** Maintenance reminder: if this struct changes in any way, the JSON
+** rendering of its structure must be updated in
+** sqlite3_wasm_enum_json(). There are no binary compatibility
+** concerns, so it does not need an iVersion member. This file is
+** necessarily always compiled together with sqlite3_wasm_enum_json(),
+** and JS code dynamically creates the mapping of members based on
+** that JSON description.
+*/
+typedef struct sqlite3_kvvfs_methods sqlite3_kvvfs_methods;
+struct sqlite3_kvvfs_methods {
+  int (*xRead)(const char *zClass, const char *zKey, char *zBuf, int nBuf);
+  int (*xWrite)(const char *zClass, const char *zKey, const char *zData);
+  int (*xDelete)(const char *zClass, const char *zKey);
+  const int nKeySize;
+};
+
+/*
+** This object holds the kvvfs I/O methods which may be swapped out
+** for JavaScript-side implementations in WASM builds. In such builds
+** it cannot be const, but in native builds it should be so that
+** the compiler can hopefully optimize this level of indirection out.
+** That said, kvvfs is intended primarily for use in WASM builds.
+**
+** Note that this is not explicitly flagged as static because the
+** amalgamation build will tag it with SQLITE_PRIVATE.
+*/
+#ifndef SQLITE_WASM
+const
+#endif
+sqlite3_kvvfs_methods sqlite3KvvfsMethods = {
+kvstorageRead,
+kvstorageWrite,
+kvstorageDelete,
+KVSTORAGE_KEY_SZ
+};
 
 /****** Utility subroutines ************************************************/
 
@@ -632,13 +473,13 @@ static void kvvfsDecodeJournal(
 static sqlite3_int64 kvvfsReadFileSize(KVVfsFile *pFile){
   char zData[50];
   zData[0] = 0;
-  kvstorageRead(pFile->zClass, "sz", zData, sizeof(zData)-1);
+  sqlite3KvvfsMethods.xRead(pFile->zClass, "sz", zData, sizeof(zData)-1);
   return strtoll(zData, 0, 0);
 }
 static int kvvfsWriteFileSize(KVVfsFile *pFile, sqlite3_int64 sz){
   char zData[50];
   sqlite3_snprintf(sizeof(zData), zData, "%lld", sz);
-  return kvstorageWrite(pFile->zClass, "sz", zData);
+  return sqlite3KvvfsMethods.xWrite(pFile->zClass, "sz", zData);
 }
 
 /****** sqlite3_io_methods methods ******************************************/
@@ -717,7 +558,7 @@ static int kvvfsReadDb(
     pgno = 1;
   }
   sqlite3_snprintf(sizeof(zKey), zKey, "%u", pgno);
-  got = kvstorageRead(pFile->zClass, zKey, aData, sizeof(aData)-1);
+  got = sqlite3KvvfsMethods.xRead(pFile->zClass, zKey, aData, sizeof(aData)-1);
   if( got<0 ){
     n = 0;
   }else{
@@ -791,7 +632,7 @@ static int kvvfsWriteDb(
   pgno = 1 + iOfst/iAmt;
   sqlite3_snprintf(sizeof(zKey), zKey, "%u", pgno);
   kvvfsEncode(zBuf, iAmt, aData);
-  if( kvstorageWrite(pFile->zClass, zKey, aData) ){
+  if( sqlite3KvvfsMethods.xWrite(pFile->zClass, zKey, aData) ){
     return SQLITE_IOERR;
   }
   if( iOfst+iAmt > pFile->szDb ){
@@ -807,7 +648,7 @@ static int kvvfsTruncateJrnl(sqlite3_file *pProtoFile, sqlite_int64 size){
   KVVfsFile *pFile = (KVVfsFile *)pProtoFile;
   SQLITE_KV_LOG(("xTruncate('%s-journal',%lld)\n", pFile->zClass, size));
   assert( size==0 );
-  kvstorageDelete(pFile->zClass, "jrnl");
+  sqlite3KvvfsMethods.xDelete(pFile->zClass, "jrnl");
   sqlite3_free(pFile->aJrnl);
   pFile->aJrnl = 0;
   pFile->nJrnl = 0;
@@ -826,7 +667,7 @@ static int kvvfsTruncateDb(sqlite3_file *pProtoFile, sqlite_int64 size){
     pgnoMax = 2 + pFile->szDb/pFile->szPage;
     while( pgno<=pgnoMax ){
       sqlite3_snprintf(sizeof(zKey), zKey, "%u", pgno);
-      kvstorageDelete(pFile->zClass, zKey);
+      sqlite3KvvfsMethods.xDelete(pFile->zClass, zKey);
       pgno++;
     }
     pFile->szDb = size;
@@ -858,7 +699,7 @@ static int kvvfsSyncJrnl(sqlite3_file *pProtoFile, int flags){
   }while( n>0 );
   zOut[i++] = ' ';
   kvvfsEncode(pFile->aJrnl, pFile->nJrnl, &zOut[i]);
-  i = kvstorageWrite(pFile->zClass, "jrnl", zOut);
+  i = sqlite3KvvfsMethods.xWrite(pFile->zClass, "jrnl", zOut);
   sqlite3_free(zOut);
   return i ? SQLITE_IOERR : SQLITE_OK;
 }
@@ -1004,10 +845,10 @@ static int kvvfsOpen(
 */
 static int kvvfsDelete(sqlite3_vfs *pVfs, const char *zPath, int dirSync){
   if( strcmp(zPath, "local-journal")==0 ){
-    kvstorageDelete("local", "jrnl");
+    sqlite3KvvfsMethods.xDelete("local", "jrnl");
   }else
   if( strcmp(zPath, "session-journal")==0 ){
-    kvstorageDelete("session", "jrnl");
+    sqlite3KvvfsMethods.xDelete("session", "jrnl");
   }
   return SQLITE_OK;
 }
@@ -1024,16 +865,16 @@ static int kvvfsAccess(
 ){
   SQLITE_KV_LOG(("xAccess(\"%s\")\n", zPath));
   if( strcmp(zPath, "local-journal")==0 ){
-    *pResOut = kvstorageRead("local", "jrnl", 0, 0)>0;
+    *pResOut = sqlite3KvvfsMethods.xRead("local", "jrnl", 0, 0)>0;
   }else
   if( strcmp(zPath, "session-journal")==0 ){
-    *pResOut = kvstorageRead("session", "jrnl", 0, 0)>0;
+    *pResOut = sqlite3KvvfsMethods.xRead("session", "jrnl", 0, 0)>0;
   }else
   if( strcmp(zPath, "local")==0 ){
-    *pResOut = kvstorageRead("local", "sz", 0, 0)>0;
+    *pResOut = sqlite3KvvfsMethods.xRead("local", "sz", 0, 0)>0;
   }else
   if( strcmp(zPath, "session")==0 ){
-    *pResOut = kvstorageRead("session", "sz", 0, 0)>0;
+    *pResOut = sqlite3KvvfsMethods.xRead("session", "sz", 0, 0)>0;
   }else
   {
     *pResOut = 0;

From 4fbf90ee11aea78557c40c4614a2d5ea95f3bea8 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sun, 9 Oct 2022 13:26:15 +0000
Subject: [PATCH 250/428] Refactor kvvfs JS bits to make use of
 [ea370b9b05f7ed7eaa]. At main-thread startup, if kvvfs is available, replace
 the kvvfs I/O methods with JS impls. Checkin part 2 of 2, to account for
 cherrypicking [ea370b9b05f7ed7eaa] into the kv-vfs branch.

FossilOrigin-Name: a9047e020a097b2259bc9935b63ca1c538a3a7f1d050e15f0d0a08cfb84acc7c
---
 ext/wasm/api/sqlite3-api-glue.js     | 86 ++++++++++++++++++++++++++++
 ext/wasm/api/sqlite3-api-prologue.js |  2 +-
 ext/wasm/api/sqlite3-wasm.c          | 45 ++++++++++++++-
 manifest                             | 16 +++---
 manifest.uuid                        |  2 +-
 5 files changed, 140 insertions(+), 11 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index 2347a40c01..519d678c62 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -597,6 +597,92 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     }
   }/*end C constant imports*/
 
+  if( util.isMainWindow()
+      && 0!==capi.sqlite3_vfs_find("kvvfs") ){/* kvvfs-specific glue */
+    const kvvfsMethods = new capi.sqlite3_kvvfs_methods(
+      wasm.exports.sqlite3_wasm_kvvfs_methods()
+    );
+    delete capi.sqlite3_kvvfs_methods;
+
+    const kvvfsMakeKey = wasm.exports.sqlite3_wasm_kvvfsMakeKeyOnPstack,
+          pstack = wasm.pstack,
+          pAllocRaw = wasm.exports.sqlite3_wasm_pstack_alloc;
+
+    const kvvfsStorage = (zClass)=>
+          ((115/*=='s'*/===wasm.getMemValue(zClass))
+           ? sessionStorage : localStorage);
+    
+    const kvvfsImpls = {
+      xRead: (zClass, zKey, zBuf, nBuf)=>{
+        const stack = pstack.pointer,
+              astack = wasm.scopedAllocPush();
+        try {
+          const zXKey = kvvfsMakeKey(zClass,zKey);
+          if(!zXKey) return -3/*OOM*/;
+          const jKey = wasm.cstringToJs(zXKey);
+          const jV = kvvfsStorage(zClass).getItem(jKey);
+          if(!jV) return -1;
+          const nV = jV.length /* Note that we are relying 100% on v being
+                                  ASCII so that jV.length is equal to the
+                                  C-string's byte length. */;
+          if(nBuf<=0) return nV;
+          else if(1===nBuf){
+            wasm.setMemValue(zBuf, 0);
+            return nV;
+          }
+          const zV = wasm.scopedAllocCString(jV);
+          if(nBuf > nV + 1) nBuf = nV + 1;
+          wasm.heap8u().copyWithin(zBuf, zV, zV + nBuf - 1);
+          wasm.setMemValue(zBuf + nBuf - 1, 0);
+          return nBuf - 1;
+        }catch(e){
+          console.error("kvstorageRead()",e);
+          return -2;
+        }finally{
+          pstack.restore(stack);
+          wasm.scopedAllocPop(astack);
+        }
+      },
+      xWrite: (zClass, zKey, zData)=>{
+        const stack = pstack.pointer;
+        try {
+          const zXKey = kvvfsMakeKey(zClass,zKey);
+          if(!zXKey) return 1/*OOM*/;
+          const jKey = wasm.cstringToJs(zXKey);
+          kvvfsStorage(zClass).setItem(jKey, wasm.cstringToJs(zData));
+          return 0;
+        }catch(e){
+          console.error("kvstorageWrite()",e);
+          return capi.SQLITE_IOERR;
+        }finally{
+          pstack.restore(stack);
+        }
+      },
+      xDelete: (zClass, zKey)=>{
+        const stack = pstack.pointer;
+        try {
+          const zXKey = kvvfsMakeKey(zClass,zKey);
+          if(!zXKey) return 1/*OOM*/;
+          kvvfsStorage(zClass).removeItem(wasm.cstringToJs(zXKey));
+          return 0;
+        }catch(e){
+          console.error("kvstorageDelete()",e);
+          return capi.SQLITE_IOERR;
+        }finally{
+          pstack.restore(stack);
+        }
+      }
+    }/*kvvfsImpls*/;
+    for(let k of Object.keys(kvvfsImpls)){
+      kvvfsMethods[kvvfsMethods.memberKey(k)] =
+        wasm.installFunction(
+          kvvfsMethods.memberSignature(k),
+          kvvfsImpls[k]
+        );
+    }
+    console.warn('kvvfs stuff',kvvfsMethods);
+  }/*kvvfs*/
+
   sqlite3.version = Object.assign(Object.create(null),{
     library: sqlite3.capi.sqlite3_libversion(),
     sourceId: sqlite3.capi.sqlite3_sourceid()
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 5b80c439bb..8e2dda1d74 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -1313,7 +1313,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
       // to resolve in order? We currently only have 1, so it
       // makes no difference.
       lip = lip.map((f)=>f(sqlite3).catch((e)=>{
-        console.error("An async sqlite3 initializer failed:",e);
+        console.error("Ignoring error: an async sqlite3 initializer failed:",e);
       }));
       //let p = lip.shift();
       //while(lip.length) p = p.then(lip.shift());
diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index 7ed58dbe08..cfeb99e922 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -13,6 +13,8 @@
 ** emcc -o sqlite3.wasm ... -I/path/to/sqlite3-c-and-h sqlite3-wasm.c
 */
 
+#define SQLITE_WASM
+
 /*
 ** Threading and file locking: JS is single-threaded. Each Worker
 ** thread is a separate instance of the JS engine so can never access
@@ -87,7 +89,7 @@
 #endif
 
 /*
-** WASM_KEEP is identical to EMSCRIPTEN_KEEPALIVE but is not
+** SQLITE_WASM_KEEP is identical to EMSCRIPTEN_KEEPALIVE but is not
 ** Emscripten-specific. It explicitly marks functions for export into
 ** the target wasm file without requiring explicit listing of those
 ** functions in Emscripten's -sEXPORTED_FUNCTIONS=... list (or
@@ -683,6 +685,14 @@ const char * sqlite3_wasm_enum_json(void){
     } _StructBinder;
 #undef CurrentStruct
 
+#define CurrentStruct sqlite3_kvvfs_methods
+    StructBinder {
+      M(xRead,"i(sspi)");
+      M(xWrite,"i(sss)");
+      M(xDelete,"i(ss)");
+      M(nKeySize,"i");
+    } _StructBinder;
+
   } out( "]"/*structs*/);
 
   out("}"/*top-level object*/);
@@ -820,6 +830,39 @@ int sqlite3_wasm_db_serialize( sqlite3* pDb, unsigned char **pOut, sqlite3_int64
   }
 }
 
+/*
+** This function is NOT part of the sqlite3 public API. It is strictly
+** for use by the sqlite project's own JS/WASM bindings.
+**
+** Allocates sqlite3KvvfsMethods.nKeySize bytes from
+** sqlite3_wasm_pstack_alloc() and returns 0 if that allocation fails,
+** else it passes that string to kvstorageMakeKey() and returns a
+** NUL-terminated pointer to that string. It is up to the caller to
+** use sqlite3_wasm_pstack_restore() to free the returned pointer.
+*/
+WASM_KEEP
+char * sqlite3_wasm_kvvfsMakeKeyOnPstack(const char *zClass,
+                                         const char *zKeyIn){
+  assert(sqlite3KvvfsMethods.nKeySize>24);
+  char *zKeyOut =
+    (char *)sqlite3_wasm_pstack_alloc(sqlite3KvvfsMethods.nKeySize);
+  if(zKeyOut){
+    kvstorageMakeKey(zClass, zKeyIn, zKeyOut);
+  }
+  return zKeyOut;
+}
+
+/*
+** This function is NOT part of the sqlite3 public API. It is strictly
+** for use by the sqlite project's own JS/WASM bindings.
+**
+** Returns the pointer to the singleton object which holds the kvvfs
+** I/O methods and associated state.
+*/
+WASM_KEEP
+sqlite3_kvvfs_methods * sqlite3_wasm_kvvfs_methods(void){
+  return &sqlite3KvvfsMethods;
+}
 
 #if defined(__EMSCRIPTEN__) && defined(SQLITE_WASM_WASMFS)
 #include <emscripten/wasmfs.h>
diff --git a/manifest b/manifest
index fa53ea2b90..b9dae4ebf9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Refactor\sos_kv.c\sso\sthat\sthe\skvvfs\sread/write/delete\smethods\scan\sbe\sswapped\sout\sat\sruntime\sby\sJS\simplementations.\sThis\seliminates\sthe\skvvfs\sdependency\son\sEmscripten.\sCheckin\spart\s1\sof\s2,\sto\saccount\sfor\scherrypicking.
-D 2022-10-09T13:19:27.791
+C Refactor\skvvfs\sJS\sbits\sto\smake\suse\sof\s[ea370b9b05f7ed7eaa].\sAt\smain-thread\sstartup,\sif\skvvfs\sis\savailable,\sreplace\sthe\skvvfs\sI/O\smethods\swith\sJS\simpls.\sCheckin\spart\s2\sof\s2,\sto\saccount\sfor\scherrypicking\s[ea370b9b05f7ed7eaa]\sinto\sthe\skv-vfs\sbranch.
+D 2022-10-09T13:26:15.854
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -485,13 +485,13 @@ F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba814
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
 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 a5a1bd620e2e2c26b6e843cf439548b35c5bb5ed21b24b89a412e0b0a8592c42
+F ext/wasm/api/sqlite3-api-glue.js 4e1403add52666f4cf36fc580ddb15b65bb8f9ccb446095f953aad6c9da2f324
 F ext/wasm/api/sqlite3-api-oo1.js ac1e08d36bdfb5aa0a2d75b7d4c892fd51819d34c932370c3282810672bcc086
 F ext/wasm/api/sqlite3-api-opfs.js 78fd272d6ec4fe6da93910b978f693fff63beed8e0e5e7dab42a25dbdfefca4b
-F ext/wasm/api/sqlite3-api-prologue.js 587e6aa373bd85e83bcc3fb82b3636b01aaf2caefa39679e02574e766560d711
+F ext/wasm/api/sqlite3-api-prologue.js 2c860a257fc554bc6958c08c8e268e7f3d69813fd9e359032636a55c8e6f4405
 F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c 0c8cb242b80b8de27b74f05ed781f427958e04c9339c4720f30c3a7e78ee6242
+F ext/wasm/api/sqlite3-wasm.c ea456d398bda1c5f4b2c4a54512de7b9ca4513c2b0ab326b99a46fb51cef0b42
 F ext/wasm/batch-runner.html cf1a410c92bad50fcec2ddc71390b4e9df63a6ea1bef12a5163a66a0af4d78d9
 F ext/wasm/batch-runner.js 5bae81684728b6be157d1f92b39824153f0fd019345b39f2ab8930f7ee2a57d8
 F ext/wasm/common/SqliteTestUtil.js 647bf014bd30bdd870a7e9001e251d12fc1c9ec9ce176a1004b838a4b33c5c05
@@ -2030,8 +2030,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 92b500da70a3dc64e910c232a2cac7620b6609162c2a5058b269d3b83d763c02
-R 4791c9c6d2e81be0b277d92f5c368eb4
+P ea370b9b05f7ed7eaa154ba58019f6642217eabc18517e721567adf948d93980
+R 029b3fdb077b2976ef8970d4e1e5751b
 U stephan
-Z 01e42f1c0aeb881a7fdcbb6522393054
+Z 32c9ba8da7697e38b9e7f056e3e7c363
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index b931ddc8fb..f8b61d4efe 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ea370b9b05f7ed7eaa154ba58019f6642217eabc18517e721567adf948d93980
\ No newline at end of file
+a9047e020a097b2259bc9935b63ca1c538a3a7f1d050e15f0d0a08cfb84acc7c
\ No newline at end of file

From 392fd3ce37f8c95ebf04425dc679a6fd6f70ef95 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sun, 9 Oct 2022 13:35:14 +0000
Subject: [PATCH 251/428] Remove ext/wasm/kvvfs.make which was inadvertently
 resurrected in [92b500da70a3].

FossilOrigin-Name: 2e7fa085fc0b1202c6502d89e2603ae76a93451754b07b32ab4f0211f213f980
---
 ext/wasm/kvvfs.make | 82 ---------------------------------------------
 manifest            | 11 +++---
 manifest.uuid       |  2 +-
 3 files changed, 6 insertions(+), 89 deletions(-)
 delete mode 100644 ext/wasm/kvvfs.make

diff --git a/ext/wasm/kvvfs.make b/ext/wasm/kvvfs.make
deleted file mode 100644
index 83a2691370..0000000000
--- a/ext/wasm/kvvfs.make
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/make
-#^^^^ help emacs select makefile mode
-#
-# This is a sub-make for building a standalone kvvfs-based
-# sqlite3.wasm.  It is intended to be "include"d from the main
-# GNUMakefile.
-#
-# Notable potential TODOs:
-#
-# - Trim down a custom sqlite3-api.js for this build. We can elimate
-#   the jaccwabyt dependency, for example, because this build won't
-#   make use of the VFS bits. Similarly, we can eliminate or replace
-#   parts of the OO1 API, or provide a related API which manages
-#   singletons of the localStorage/sessionStorage instances.
-#
-########################################################################
-MAKEFILE.kvvfs := $(lastword $(MAKEFILE_LIST))
-
-kvvfs.js     := sqlite3-kvvfs.js
-kvvfs.wasm   := sqlite3-kvvfs.wasm
-kvvfs.wasm.c := $(dir.api)/sqlite3-wasm.c
-
-CLEAN_FILES += $(kvvfs.js) $(kvvfs.wasm)
-
-########################################################################
-# emcc flags for .c/.o/.wasm.
-kvvfs.flags =
-#kvvfs.flags += -v # _very_ loud but also informative about what it's doing
-
-########################################################################
-# emcc flags for .c/.o.
-kvvfs.cflags :=
-kvvfs.cflags += -std=c99 -fPIC
-kvvfs.cflags += -I. -I$(dir.top)
-kvvfs.cflags += -DSQLITE_OS_KV=1 $(SQLITE_OPT)
-
-########################################################################
-# emcc flags specific to building the final .js/.wasm file...
-kvvfs.jsflags := -fPIC
-kvvfs.jsflags += --no-entry
-kvvfs.jsflags += -sENVIRONMENT=web
-kvvfs.jsflags += -sMODULARIZE
-kvvfs.jsflags += -sSTRICT_JS
-kvvfs.jsflags += -sDYNAMIC_EXECUTION=0
-kvvfs.jsflags += -sNO_POLYFILL
-kvvfs.jsflags += -sEXPORTED_FUNCTIONS=@$(dir.api)/EXPORTED_FUNCTIONS.sqlite3-api
-kvvfs.jsflags += -sEXPORTED_RUNTIME_METHODS=FS,wasmMemory,allocateUTF8OnStack
-                                            # wasmMemory ==> for -sIMPORTED_MEMORY
-                                            # allocateUTF8OnStack ==> kvvfs internals
-kvvfs.jsflags += -sUSE_CLOSURE_COMPILER=0
-kvvfs.jsflags += -sIMPORTED_MEMORY
-#kvvfs.jsflags += -sINITIAL_MEMORY=13107200
-#kvvfs.jsflags += -sTOTAL_STACK=4194304
-kvvfs.jsflags += -sEXPORT_NAME=sqlite3InitModule
-kvvfs.jsflags += -sGLOBAL_BASE=4096 # HYPOTHETICALLY keep func table indexes from overlapping w/ heap addr.
-kvvfs.jsflags += --post-js=$(post-js.js)
-#kvvfs.jsflags += -sFILESYSTEM=0 # only for experimentation. sqlite3 needs the FS API
-#                                Perhaps the kvvfs build doesn't?
-#kvvfs.jsflags += -sABORTING_MALLOC
-kvvfs.jsflags += -sALLOW_MEMORY_GROWTH
-kvvfs.jsflags += -sALLOW_TABLE_GROWTH
-kvvfs.jsflags += -Wno-limited-postlink-optimizations
-# ^^^^^ it likes to warn when we have "limited optimizations" via the -g3 flag.
-kvvfs.jsflags += -sERROR_ON_UNDEFINED_SYMBOLS=0
-kvvfs.jsflags += -sLLD_REPORT_UNDEFINED
-#kvvfs.jsflags += --import-undefined
-kvvfs.jsflags += -sMEMORY64=0
-ifneq (0,$(enable_bigint))
-kvvfs.jsflags += -sWASM_BIGINT
-endif
-
-$(kvvfs.js): $(MAKEFILE) $(MAKEFILE.kvvfs) $(kvvfs.wasm.c) \
-    EXPORTED_FUNCTIONS.api \
-    $(post-js.js)
-	$(emcc.bin) -o $@ $(emcc_opt) $(emcc.flags) $(kvvfs.cflags) $(kvvfs.jsflags) $(kvvfs.wasm.c)
-	chmod -x $(kvvfs.wasm)
-ifneq (,$(wasm-strip))
-	$(wasm-strip) $(kvvfs.wasm)
-endif
-	@ls -la $@ $(kvvfs.wasm)
-
-kvvfs: $(kvvfs.js)
diff --git a/manifest b/manifest
index b9dae4ebf9..e5a01e2bed 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Refactor\skvvfs\sJS\sbits\sto\smake\suse\sof\s[ea370b9b05f7ed7eaa].\sAt\smain-thread\sstartup,\sif\skvvfs\sis\savailable,\sreplace\sthe\skvvfs\sI/O\smethods\swith\sJS\simpls.\sCheckin\spart\s2\sof\s2,\sto\saccount\sfor\scherrypicking\s[ea370b9b05f7ed7eaa]\sinto\sthe\skv-vfs\sbranch.
-D 2022-10-09T13:26:15.854
+C Remove\sext/wasm/kvvfs.make\swhich\swas\sinadvertently\sresurrected\sin\s[92b500da70a3].
+D 2022-10-09T13:35:14.995
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -513,7 +513,6 @@ F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab26
 F ext/wasm/jaccwabyt/jaccwabyt.md 9aa6951b529a8b29f578ec8f0355713c39584c92cf1708f63ba0cf917cb5b68e
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
 F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e568d2c2307c416902059339c06f19
-F ext/wasm/kvvfs.make 7cc9cf10e744c3ba523c3eaf5c4af47028f3a5bb76db304ea8044a9b2a9d496f
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
 F ext/wasm/scratchpad-wasmfs-main.js 1aa32c1035cf1440a226a28fefcbb5762fbbcb020ccbe5895f8736d701695c63
 F ext/wasm/speedtest1-wasmfs.html bc28eb29b69a73864b8d7aae428448f8b7e1de81d8bfb9bba99541322054dbd0
@@ -2030,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 ea370b9b05f7ed7eaa154ba58019f6642217eabc18517e721567adf948d93980
-R 029b3fdb077b2976ef8970d4e1e5751b
+P a9047e020a097b2259bc9935b63ca1c538a3a7f1d050e15f0d0a08cfb84acc7c
+R 883cefae3468ecd65dfcaec537518f1d
 U stephan
-Z 32c9ba8da7697e38b9e7f056e3e7c363
+Z 3463e4479bd983b8852d635dda178090
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f8b61d4efe..9158166ba2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a9047e020a097b2259bc9935b63ca1c538a3a7f1d050e15f0d0a08cfb84acc7c
\ No newline at end of file
+2e7fa085fc0b1202c6502d89e2603ae76a93451754b07b32ab4f0211f213f980
\ No newline at end of file

From ff891b4e1c2a05bb2c1ac4add05b0c20a5ba86b4 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sun, 9 Oct 2022 15:12:37 +0000
Subject: [PATCH 252/428] Minor cleaups in the post-init async phase of sqlite3
 module initialization.

FossilOrigin-Name: 2e024a6b533524b7732cea8aa27b16363e17b4c32731ddf31085e91fc728c1af
---
 ext/wasm/api/sqlite3-api-opfs.js     |  4 ++-
 ext/wasm/api/sqlite3-api-prologue.js | 39 +++++++++++++++++-----------
 manifest                             | 14 +++++-----
 manifest.uuid                        |  2 +-
 4 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index 40e615eb86..98defe4fbc 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -1093,7 +1093,9 @@ installOpfsVfs.defaultProxyUri =
 //console.warn("sqlite3.installOpfsVfs.defaultProxyUri =",sqlite3.installOpfsVfs.defaultProxyUri);
 self.sqlite3ApiBootstrap.initializersAsync.push(async (sqlite3)=>{
   try{
-    return installOpfsVfs();
+    return installOpfsVfs().catch((e)=>{
+      console.warn("Ignoring inability to install OPFS sqlite3_vfs:",e);
+    });
   }catch(e){
     console.error("installOpfsVfs() exception:",e);
     throw e;
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 8e2dda1d74..61bbeabb15 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -1285,9 +1285,11 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     /**
        Performs any optional asynchronous library-level initialization
        which might be required. This function returns a Promise which
-       resolves to the sqlite3 namespace object. It _ignores any
-       errors_ in the asynchronous init process, as such components
-       are all optional. If called more than once, the second and
+       resolves to the sqlite3 namespace object. Any error in the
+       async init will be fatal to the init as a whole, but init
+       routines are themselves welcome to install dummy catch()
+       handlers which are not fatal if their failure should be
+       considered non-fatal. If called more than once, the second and
        subsequent calls are no-ops which return a pre-resolved
        Promise.
 
@@ -1312,9 +1314,13 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
       // Is it okay to resolve these in parallel or do we need them
       // to resolve in order? We currently only have 1, so it
       // makes no difference.
-      lip = lip.map((f)=>f(sqlite3).catch((e)=>{
-        console.error("Ignoring error: an async sqlite3 initializer failed:",e);
-      }));
+      lip = lip.map((f)=>{
+        const p = (f instanceof Promise) ? f : f(sqlite3);
+        return p.catch((e)=>{
+          console.error("an async sqlite3 initializer failed:",e);
+          throw e;
+        });
+      });
       //let p = lip.shift();
       //while(lip.length) p = p.then(lip.shift());
       //return p.then(()=>sqlite3);
@@ -1350,8 +1356,9 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
   this array is deleted.
 
   Note that the order of insertion into this array is significant for
-  some pieces. e.g. sqlite3.capi.wasm cannot be fully utilized until
-  the whwasmutil.js part is plugged in via sqlite3-api-glue.js.
+  some pieces. e.g. sqlite3.capi and sqlite3.capi.wasm cannot be fully
+  utilized until the whwasmutil.js part is plugged in via
+  sqlite3-api-glue.js.
 */
 self.sqlite3ApiBootstrap.initializers = [];
 /**
@@ -1360,13 +1367,15 @@ self.sqlite3ApiBootstrap.initializers = [];
   modified by client code except when plugging such code into the
   amalgamation process.
 
-  Counterpart of self.sqlite3ApiBootstrap.initializers, specifically
-  for initializers which are asynchronous. All functions in this list
-  take the sqlite3 object as their argument and MUST return a
-  Promise. The resolved value and ignored and rejection will kill the
-  asyncPostInit() process but will be otherwise ignored because the
-  post-synchronous-init async initialization parts are (as of this
-  writing) all optional.
+  The counterpart of self.sqlite3ApiBootstrap.initializers,
+  specifically for initializers which are asynchronous. All entries in
+  this list must be either async functions, non-async functions which
+  return a Promise, or a Promise. Each function in the list is called
+  with the sqlite3 ojbect as its only argument.
+
+  The resolved value of any Promise is ignored and rejection will kill
+  the asyncPostInit() process (at an indeterminate point because all
+  of them are run asynchronously in parallel).
 
   This list is not processed until the client calls
   sqlite3.asyncPostInit(). This means, for example, that intializers
diff --git a/manifest b/manifest
index e5a01e2bed..8b6b64fcdf 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sext/wasm/kvvfs.make\swhich\swas\sinadvertently\sresurrected\sin\s[92b500da70a3].
-D 2022-10-09T13:35:14.995
+C Minor\scleaups\sin\sthe\spost-init\sasync\sphase\sof\ssqlite3\smodule\sinitialization.
+D 2022-10-09T15:12:37.430
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -487,8 +487,8 @@ F ext/wasm/api/pre-js.js 2db711eb637991b383fc6b5c0f3df65ec48a7201e5730e304beba8d
 F ext/wasm/api/sqlite3-api-cleanup.js 5d22d1d3818ecacb23bfa223d5970cd0617d8cdbb48c8bc4bbd463f05b021a99
 F ext/wasm/api/sqlite3-api-glue.js 4e1403add52666f4cf36fc580ddb15b65bb8f9ccb446095f953aad6c9da2f324
 F ext/wasm/api/sqlite3-api-oo1.js ac1e08d36bdfb5aa0a2d75b7d4c892fd51819d34c932370c3282810672bcc086
-F ext/wasm/api/sqlite3-api-opfs.js 78fd272d6ec4fe6da93910b978f693fff63beed8e0e5e7dab42a25dbdfefca4b
-F ext/wasm/api/sqlite3-api-prologue.js 2c860a257fc554bc6958c08c8e268e7f3d69813fd9e359032636a55c8e6f4405
+F ext/wasm/api/sqlite3-api-opfs.js 5a8ab3b76880c8ada8710ca9ba1ca5b160872edfd8bd5322e4f179a7f41cc616
+F ext/wasm/api/sqlite3-api-prologue.js daf288df965cab1e8eabee4451f6ba3beb03d5a579722b0b0f90e5203962f515
 F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c ea456d398bda1c5f4b2c4a54512de7b9ca4513c2b0ab326b99a46fb51cef0b42
@@ -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 a9047e020a097b2259bc9935b63ca1c538a3a7f1d050e15f0d0a08cfb84acc7c
-R 883cefae3468ecd65dfcaec537518f1d
+P 2e7fa085fc0b1202c6502d89e2603ae76a93451754b07b32ab4f0211f213f980
+R b8107455a191243f8c2c52386f30d345
 U stephan
-Z 3463e4479bd983b8852d635dda178090
+Z 2aa81e852e2755790733e84c20b847cc
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 9158166ba2..78d2a21e8a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2e7fa085fc0b1202c6502d89e2603ae76a93451754b07b32ab4f0211f213f980
\ No newline at end of file
+2e024a6b533524b7732cea8aa27b16363e17b4c32731ddf31085e91fc728c1af
\ No newline at end of file

From d8897d971b2011a6e3990ecb87c9158611773571 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sun, 9 Oct 2022 17:03:48 +0000
Subject: [PATCH 253/428] Remove a now-unnecessary --cachesize flag for the
 OPFS sqlite3_vfs speedtest1-worker.html invocation.

FossilOrigin-Name: 08b516d6953256cfb8792cfee9e6ed7450fd55d84196b66b77409cfaee3c8729
---
 ext/wasm/index.html |  2 +-
 manifest            | 12 ++++++------
 manifest.uuid       |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ext/wasm/index.html b/ext/wasm/index.html
index 2cd966a1ee..20668db20e 100644
--- a/ext/wasm/index.html
+++ b/ext/wasm/index.html
@@ -62,7 +62,7 @@
             <li><a href='speedtest1-wasmfs.html?flags=--size,25'>speedtest1-wasmfs</a>: a variant of speedtest1 built solely for the wasmfs/opfs feature.</li>
             <li><a href='speedtest1.html?vfs=kvvfs'>speedtest1-kvvfs</a>: speedtest1 with the kvvfs.</li>
             <li><a href='speedtest1-worker.html?size=25'>speedtest1-worker</a>: an interactive Worker-thread variant of speedtest1.</li>
-            <li><a href='speedtest1-worker.html?vfs=opfs&size=25&cachesize=-4096'>speedtest1-worker-opfs</a>: speedtest1-worker with the
+            <li><a href='speedtest1-worker.html?vfs=opfs&size=25'>speedtest1-worker-opfs</a>: speedtest1-worker with the
               OPFS VFS preselected and configured for a moderate workload.</li>
           </ul>
         </li>
diff --git a/manifest b/manifest
index 8b6b64fcdf..a4123aff51 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\scleaups\sin\sthe\spost-init\sasync\sphase\sof\ssqlite3\smodule\sinitialization.
-D 2022-10-09T15:12:37.430
+C Remove\sa\snow-unnecessary\s--cachesize\sflag\sfor\sthe\sOPFS\ssqlite3_vfs\sspeedtest1-worker.html\sinvocation.
+D 2022-10-09T17:03:48.263
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -508,7 +508,7 @@ F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d695
 F ext/wasm/fiddle/fiddle-worker.js 531859a471924a0ea48afa218e6877f0c164ca324d51e15843ed6ecc1c65c7ee
 F ext/wasm/fiddle/fiddle.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
 F ext/wasm/fiddle/fiddle.js 974b995119ac443685d7d94d3b3c58c6a36540e9eb3fed7069d5653284071715
-F ext/wasm/index.html 067171cadf2acbb8a0a87d20480c0d47d740dccda55045bed05505efe80cc245
+F ext/wasm/index.html 63b370619e4f849ac76f1baed435c05edc29dbb6795bc7c1c935561ff667dd27
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 9aa6951b529a8b29f578ec8f0355713c39584c92cf1708f63ba0cf917cb5b68e
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
@@ -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 2e7fa085fc0b1202c6502d89e2603ae76a93451754b07b32ab4f0211f213f980
-R b8107455a191243f8c2c52386f30d345
+P 2e024a6b533524b7732cea8aa27b16363e17b4c32731ddf31085e91fc728c1af
+R d71dcaf655ffcada18f8500250d201c3
 U stephan
-Z 2aa81e852e2755790733e84c20b847cc
+Z 7b071018ad07083bcc9a349a6de12492
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 78d2a21e8a..814881f577 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2e024a6b533524b7732cea8aa27b16363e17b4c32731ddf31085e91fc728c1af
\ No newline at end of file
+08b516d6953256cfb8792cfee9e6ed7450fd55d84196b66b77409cfaee3c8729
\ No newline at end of file

From 50661c5e3174613685dbf40c8036cd397877b717 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sun, 9 Oct 2022 17:08:36 +0000
Subject: [PATCH 254/428] Remove some extraneous debug output.

FossilOrigin-Name: 56ff42053f7b73b380c103a84f29e285cfbfb6e18a25b3a50a6d78e32610914e
---
 ext/wasm/api/sqlite3-api-glue.js |  1 -
 manifest                         | 12 ++++++------
 manifest.uuid                    |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index 519d678c62..6f7301ece6 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -680,7 +680,6 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
           kvvfsImpls[k]
         );
     }
-    console.warn('kvvfs stuff',kvvfsMethods);
   }/*kvvfs*/
 
   sqlite3.version = Object.assign(Object.create(null),{
diff --git a/manifest b/manifest
index a4123aff51..941d84fc61 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sa\snow-unnecessary\s--cachesize\sflag\sfor\sthe\sOPFS\ssqlite3_vfs\sspeedtest1-worker.html\sinvocation.
-D 2022-10-09T17:03:48.263
+C Remove\ssome\sextraneous\sdebug\soutput.
+D 2022-10-09T17:08:36.884
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -485,7 +485,7 @@ F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba814
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
 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 4e1403add52666f4cf36fc580ddb15b65bb8f9ccb446095f953aad6c9da2f324
+F ext/wasm/api/sqlite3-api-glue.js 3b2a43c7b2ceb2b60f5f4a1afefbd93508c2fe0f2e667eea278afe570be4b606
 F ext/wasm/api/sqlite3-api-oo1.js ac1e08d36bdfb5aa0a2d75b7d4c892fd51819d34c932370c3282810672bcc086
 F ext/wasm/api/sqlite3-api-opfs.js 5a8ab3b76880c8ada8710ca9ba1ca5b160872edfd8bd5322e4f179a7f41cc616
 F ext/wasm/api/sqlite3-api-prologue.js daf288df965cab1e8eabee4451f6ba3beb03d5a579722b0b0f90e5203962f515
@@ -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 2e024a6b533524b7732cea8aa27b16363e17b4c32731ddf31085e91fc728c1af
-R d71dcaf655ffcada18f8500250d201c3
+P 08b516d6953256cfb8792cfee9e6ed7450fd55d84196b66b77409cfaee3c8729
+R 7e182cfb7c10cb8b3ac675a3158817af
 U stephan
-Z 7b071018ad07083bcc9a349a6de12492
+Z 9fd199323718b411b75fc96a664d948d
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 814881f577..6a5deb99bb 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-08b516d6953256cfb8792cfee9e6ed7450fd55d84196b66b77409cfaee3c8729
\ No newline at end of file
+56ff42053f7b73b380c103a84f29e285cfbfb6e18a25b3a50a6d78e32610914e
\ No newline at end of file

From 005c9d829593365b734d2885ddfe04ab85ffbc4f Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 10 Oct 2022 12:02:53 +0000
Subject: [PATCH 255/428] Improved detection of database corrupting when moving
 pages on an autovacuumed database when creating a new btree. dbsqlfuzz
 9a55397eae13cec64aebf1fd35489c3a90bdaac5

FossilOrigin-Name: 327965bc71023d9380a9d6805062659108dab4bfcd386b7aba813754f270d33a
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/btree.c   |  3 +++
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/manifest b/manifest
index 8b3405b19b..59f182ca28 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\scasting\san\sodd-length\sBLOB\sinto\sa\sTEXT\swith\sencoding\sUTF16,\somit\sthe\nlast\sbyte.\s\sdbsqlfuzz\sc5df68b5bbdf6c9f3c1851e41e88f49ac05c9969
-D 2022-10-08T17:27:05.762
+C Improved\sdetection\sof\sdatabase\scorrupting\swhen\smoving\spages\son\san\nautovacuumed\sdatabase\swhen\screating\sa\snew\sbtree.\ndbsqlfuzz\s9a55397eae13cec64aebf1fd35489c3a90bdaac5
+D 2022-10-10T12:02:53.891
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -528,7 +528,7 @@ F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
 F src/backup.c a2891172438e385fdbe97c11c9745676bec54f518d4447090af97189fd8e52d7
 F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d
 F src/btmutex.c 6ffb0a22c19e2f9110be0964d0731d2ef1c67b5f7fabfbaeb7b9dabc4b7740ca
-F src/btree.c ef9c126d6dc5dff8ff76abc807dfef5b8aac42144e3be11cbcd9cb6eaecef580
+F src/btree.c 74fc5f6a0577df703d6f98d0c51ee0d8d91d22dbc0ba86e42e056517e2b45576
 F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
 F src/btreeInt.h 8ce1332edd89dfd2461d561ac10a0ab5601c8e06200cb5230596c3caaf54482e
 F src/build.c 6e3ee380a4f0ff95de4b53bf510f66600cff08e4e04b92e95fae789072563f8f
@@ -2002,8 +2002,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 63d9efe277759d4daa29794846b60c6f55491496618f423f61468df72d0a4633
-R e0f7913bc96b580aa6941cfc15392c69
+P 1e2796b3741a4c0b966e6c01a7d62dea8de9d1f4bededea3d7ba7004dabc2ffe
+R 87396513be591e6dc5cb0d1c97d70179
 U drh
-Z 28ed4e90d35f287e1294ec9151009f9d
+Z bc3536edefe4a38a9e628abd562bbf72
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index c9edd03197..c5ea5a3715 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1e2796b3741a4c0b966e6c01a7d62dea8de9d1f4bededea3d7ba7004dabc2ffe
\ No newline at end of file
+327965bc71023d9380a9d6805062659108dab4bfcd386b7aba813754f270d33a
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index c54fd2e7c8..1c48d6e8c8 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -3743,6 +3743,9 @@ static int modifyPagePointer(MemPage *pPage, Pgno iFrom, Pgno iTo, u8 eType){
           }
         }
       }else{
+        if( pCell+4 > pPage->aData+pPage->pBt->usableSize ){
+          return SQLITE_CORRUPT_PAGE(pPage);
+        }
         if( get4byte(pCell)==iFrom ){
           put4byte(pCell, iTo);
           break;

From 49d77ee6426de5516957dc486205837fd1af3d95 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 10 Oct 2022 18:25:05 +0000
Subject: [PATCH 256/428] An attempt to enhance PRAGMA integrity check so that
 it does data type checking on non-STRICT tables.  Specifically:  (1) Columns
 with TEXT affinity should not contain numeric values, and (2) columns with
 numeric affinity should not contain text values that can be converted to
 numeric.

FossilOrigin-Name: 8b1e7f0524637728cebe81c7d3ff8ad8a5a55782eac6409b425dad538024f596
---
 manifest             |  21 ++++----
 manifest.uuid        |   2 +-
 src/pragma.c         | 115 +++++++++++++++++++++++++++++++++++++------
 src/update.c         |   9 ++--
 src/vdbe.c           |  69 +++++++++++++++++++++-----
 test/memsubsys1.test |   2 +-
 6 files changed, 177 insertions(+), 41 deletions(-)

diff --git a/manifest b/manifest
index 59f182ca28..f227e86d95 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\sdetection\sof\sdatabase\scorrupting\swhen\smoving\spages\son\san\nautovacuumed\sdatabase\swhen\screating\sa\snew\sbtree.\ndbsqlfuzz\s9a55397eae13cec64aebf1fd35489c3a90bdaac5
-D 2022-10-10T12:02:53.891
+C An\sattempt\sto\senhance\sPRAGMA\sintegrity\scheck\sso\sthat\sit\sdoes\sdata\stype\nchecking\son\snon-STRICT\stables.\s\sSpecifically:\s\s(1)\sColumns\swith\sTEXT\saffinity\nshould\snot\scontain\snumeric\svalues,\sand\s(2)\scolumns\swith\snumeric\saffinity\sshould\nnot\scontain\stext\svalues\sthat\scan\sbe\sconverted\sto\snumeric.
+D 2022-10-10T18:25:05.328
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -581,7 +581,7 @@ F src/parse.y 8e67d820030d2655b9942ffe61c1e7e6b96cea2f2f72183533299393907d0564
 F src/pcache.c f4268f7f73c6a3db12ce22fd25bc68dc42315d19599414ab1207d7cf32f79197
 F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
 F src/pcache1.c dee95e3cd2b61e6512dc814c5ab76d5eb36f0bfc9441dbb4260fccc0d12bbddc
-F src/pragma.c 9bf7d8a2a9ad3bc36df3ec0d61817a44c38a1da527d59c26c203047f906e334a
+F src/pragma.c f9df5f90b20cbfc8a25f2e9129b185d8eba37ecd74ce156df814e1aaf8ce1183
 F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 F src/prepare.c 1b02be0441eda4579471fea097f678effcbb77ef0c39ab3f703c837822bcd674
 F src/printf.c e99ee9741e79ae3873458146f59644276657340385ade4e76a5f5d1c25793764
@@ -655,12 +655,12 @@ F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
 F src/tokenize.c 1305797eab3542a0896b552c6e7669c972c1468e11e92b370533c1f37a37082b
 F src/treeview.c 07787f67cd297a6d09d04b8d70c06769c60c9c1d9080378f93929c16f8fd3298
 F src/trigger.c 4163ada044af89d51caba1cb713a73165347b2ec05fe84a283737c134d61fcd5
-F src/update.c c52a7991bece0453d22c77c08469512ee2f1391c12503fd347d1c939220c5877
+F src/update.c 832cfcf09edcfcc383032b6cc63eb578dc0658c9380e58e1d26f703bba3c5339
 F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 F src/util.c 0be191521ff6d2805995f4910f0b6231b42843678b2efdc1abecaf39929a673f
 F src/vacuum.c bb346170b0b54c6683bba4a5983aea40485597fdf605c87ec8bc2e199fe88cd8
-F src/vdbe.c a26eef5a6c0ebb97f83ec18bd483e0d17f0c6b079e7650085f2ef6a82fd78d99
+F src/vdbe.c af03458e12f39cddd6f355ff325059db5431dbe45233fff5a18a7eb0065e535c
 F src/vdbe.h 64619af62603dc3c4f5ff6ff6d2c8f389abd667a29ce6007ed44bd22b3211cd0
 F src/vdbeInt.h 17b7461ffcf9ee760d1341731715a419f6b8c763089a7ece25c2e8098d702b3f
 F src/vdbeapi.c fc3183daf72808b4311b228989120fdbc2dc44972fb0d77d5c453460cc0e5b2c
@@ -1262,7 +1262,7 @@ F test/memdb1.test 2c4e9cc10d21c6bf4e217d72b7f6b8ba9b2605971bb2c5e6df76018e189f9
 F test/memjournal.test 70f3a00c7f84ee2978ad14e831231caa1e7f23915a2c54b4f775a021d5740c6c
 F test/memjournal2.test 6b9083cfaab9a3281ec545c3da2487999e8025fb7501bbae10f713f80c56454c
 F test/memleak.test 10b9c6c57e19fc68c32941495e9ba1c50123f6e2
-F test/memsubsys1.test 9e7555a22173b8f1c96c281ce289b338fcba2abe8b157f8798ca195bbf1d347e
+F test/memsubsys1.test 86b8158752af9188ed5b32a30674a1ef71183e6bc4e6808e815cd658ca9058a6
 F test/memsubsys2.test 3e4a8d0c05fd3e5fa92017c64666730a520c7e08
 F test/merge1.test 2de6d6ef8d25402764b1aab49d8f9d7f89208c89a6674e437f76de4c812157b8
 F test/minmax.test fe638b55d77d2375531a8f549b338eafcd9adfbd2f72df37ed77d9b26ca0a71a
@@ -2002,8 +2002,11 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 1e2796b3741a4c0b966e6c01a7d62dea8de9d1f4bededea3d7ba7004dabc2ffe
-R 87396513be591e6dc5cb0d1c97d70179
+P 327965bc71023d9380a9d6805062659108dab4bfcd386b7aba813754f270d33a
+R 482ab94cca7e794e7641d30e6ad55424
+T *branch * integrity_check_datatypes
+T *sym-integrity_check_datatypes *
+T -sym-trunk *
 U drh
-Z bc3536edefe4a38a9e628abd562bbf72
+Z 974e346bb8769b9c6b996ee2e6df90d2
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index c5ea5a3715..548a45a671 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-327965bc71023d9380a9d6805062659108dab4bfcd386b7aba813754f270d33a
\ No newline at end of file
+8b1e7f0524637728cebe81c7d3ff8ad8a5a55782eac6409b425dad538024f596
\ No newline at end of file
diff --git a/src/pragma.c b/src/pragma.c
index 9d46a10dcd..018fed5efd 100644
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -1778,11 +1778,11 @@ void sqlite3Pragma(
         assert( sqlite3NoTempsInRange(pParse,1,7+j) );
         sqlite3VdbeAddOp2(v, OP_Rewind, iDataCur, 0); VdbeCoverage(v);
         loopTop = sqlite3VdbeAddOp2(v, OP_AddImm, 7, 1);
+        /* Sanity check on record header decoding */
+        sqlite3VdbeAddOp3(v, OP_Column, iDataCur, pTab->nNVCol-1,3);
+        sqlite3VdbeChangeP5(v, OPFLAG_TYPEOFARG);
+        VdbeComment((v, "(right-most column)"));
         if( !isQuick ){
-          /* Sanity check on record header decoding */
-          sqlite3VdbeAddOp3(v, OP_Column, iDataCur, pTab->nNVCol-1,3);
-          sqlite3VdbeChangeP5(v, OPFLAG_TYPEOFARG);
-          VdbeComment((v, "(right-most column)"));
           if( pPk ){
             /* Verify WITHOUT ROWID keys are in ascending order */
             int a1;
@@ -1802,22 +1802,60 @@ void sqlite3Pragma(
             }
           }
         }
-        /* Verify that all NOT NULL columns really are NOT NULL.  At the
-        ** same time verify the type of the content of STRICT tables */
+        /* Verify datatypes for all columns:
+        **
+        **   (1) NOT NULL columns may not contain a NULL
+        **   (2) Datatype must be exact for non-ANY columns in STRICT tables
+        **   (3) Datatype for TEXT columns in non-STRICT tables must be
+        **       NULL, TEXT, or BLOB.
+        **   (4) Datatype for numeric columns in non-STRICT tables must not
+        **       be a TEXT value that can be losslessly converted to numeric.
+        */
         bStrict = (pTab->tabFlags & TF_Strict)!=0;
         for(j=0; j<pTab->nCol; j++){
           char *zErr;
-          Column *pCol = pTab->aCol + j;
+          Column *pCol = pTab->aCol + j;  /* The column to be checked */
           int doError, jmp2;
+          int p1, p3, p4;    /* Operands to the OP_IsType opcode */
+          int doTypeCheck;   /* Data type check (other than NOT NULL) needed */
+
           if( j==pTab->iPKey ) continue;
-          if( pCol->notNull==0 && !bStrict ) continue;
-          doError = bStrict ? sqlite3VdbeMakeLabel(pParse) : 0;
-          sqlite3ExprCodeGetColumnOfTable(v, pTab, iDataCur, j, 3);
-          if( sqlite3VdbeGetLastOp(v)->opcode==OP_Column ){
-            sqlite3VdbeChangeP5(v, OPFLAG_TYPEOFARG);
+          if( bStrict ){
+            doTypeCheck = pCol->eCType>COLTYPE_ANY;
+          }else{
+            doTypeCheck = pCol->affinity>SQLITE_AFF_BLOB;
           }
+          if( pCol->notNull==0 && !doTypeCheck ) continue;
+          p4 = 0x10;
+          if( pCol->colFlags & COLFLAG_VIRTUAL ){
+            sqlite3ExprCodeGetColumnOfTable(v, pTab, iDataCur, j, 3);
+            p1 = -1;
+            p3 = 3;
+          }else{
+            if( pCol->iDflt ){
+              sqlite3_value *pDfltValue = 0;
+              sqlite3ValueFromExpr(db, sqlite3ColumnExpr(pTab,pCol), ENC(db),
+                                   pCol->affinity, &pDfltValue);
+              if( pDfltValue ){
+                p4 = sqlite3_value_type(pDfltValue);
+                sqlite3ValueFree(pDfltValue);
+              }
+            }
+            p1 = iDataCur;
+            if( !HasRowid(pTab) ){
+              testcase( j!=sqlite3TableColumnToStorage(pTab, j) );
+              p3 = sqlite3TableColumnToIndex(sqlite3PrimaryKeyIndex(pTab), j);
+            }else{
+              p3 = sqlite3TableColumnToStorage(pTab,j);
+              testcase( p3!=j);
+            }
+          }
+          doError = doTypeCheck ? sqlite3VdbeMakeLabel(pParse) : 0;
           if( pCol->notNull ){
-            jmp2 = sqlite3VdbeAddOp1(v, OP_NotNull, 3); VdbeCoverage(v);
+            /* (1) NOT NULL columns may not contain a NULL */
+            jmp2 = sqlite3VdbeAddOp4Int(v, OP_IsType, p1, 0, p3, p4);
+            sqlite3VdbeChangeP5(v, 0x0f);
+            VdbeCoverage(v);
             zErr = sqlite3MPrintf(db, "NULL value in %s.%s", pTab->zName,
                                 pCol->zCnName);
             sqlite3VdbeAddOp4(v, OP_String8, 0, 3, 0, zErr, P4_DYNAMIC);
@@ -1828,9 +1866,19 @@ void sqlite3Pragma(
             }
             sqlite3VdbeJumpHere(v, jmp2);
           }
-          if( bStrict && pCol->eCType!=COLTYPE_ANY ){
-            jmp2 = sqlite3VdbeAddOp3(v, OP_IsNullOrType, 3, 0, 
-                                     sqlite3StdTypeMap[pCol->eCType-1]);
+          if( bStrict && doTypeCheck ){
+            /* (2) Datatype must be exact for non-ANY columns in STRICT tables*/
+            static unsigned char aStdTypeMask[] = {
+               0x1f,    /* ANY */
+               0x18,    /* BLOB */
+               0x11,    /* INT */
+               0x11,    /* INTEGER */
+               0x13,    /* REAL */
+               0x14     /* TEXT */
+            };
+            jmp2 = sqlite3VdbeAddOp4Int(v, OP_IsType, p1, 0, p3, p4);
+            assert( pCol->eCType>=1 && pCol->eCType<=sizeof(aStdTypeMask) );
+            sqlite3VdbeChangeP5(v, aStdTypeMask[pCol->eCType-1]);
             VdbeCoverage(v);
             zErr = sqlite3MPrintf(db, "non-%s value in %s.%s",
                                   sqlite3StdType[pCol->eCType-1],
@@ -1840,6 +1888,41 @@ void sqlite3Pragma(
             integrityCheckResultRow(v);
             sqlite3VdbeJumpHere(v, jmp2);
           }
+          if( !bStrict && pCol->affinity==SQLITE_AFF_TEXT ){
+            /* (3) Datatype for TEXT columns in non-STRICT tables must be
+            **     NULL, TEXT, or BLOB. */
+            jmp2 = sqlite3VdbeAddOp4Int(v, OP_IsType, p1, 0, p3, p4);
+            sqlite3VdbeChangeP5(v, 0x1c); /* NULL, TEXT, or BLOB */
+            VdbeCoverage(v);
+            zErr = sqlite3MPrintf(db, "NUMERIC value in %s.%s",
+                                  pTab->zName, pTab->aCol[j].zCnName);
+            sqlite3VdbeAddOp4(v, OP_String8, 0, 3, 0, zErr, P4_DYNAMIC);
+            sqlite3VdbeResolveLabel(v, doError);
+            integrityCheckResultRow(v);
+            sqlite3VdbeJumpHere(v, jmp2);
+          }
+          if( !bStrict && pCol->affinity>=SQLITE_AFF_NUMERIC ){
+            /* (4) Datatype for numeric columns in non-STRICT tables must not
+            **     be a TEXT value that can be converted to numeric. */
+            int jmp3;
+            jmp2 = sqlite3VdbeAddOp4Int(v, OP_IsType, p1, 0, p3, p4);
+            sqlite3VdbeChangeP5(v, 0x1b); /* NULL, INT, FLOAT, or BLOB */
+            VdbeCoverage(v);
+            if( p1>=0 ){
+              sqlite3ExprCodeGetColumnOfTable(v, pTab, iDataCur, j, 3);
+            }
+            sqlite3VdbeAddOp4(v, OP_Affinity, 3, 1, 0, "C", P4_STATIC);
+            jmp3 = sqlite3VdbeAddOp4Int(v, OP_IsType, -1, 0, 3, p4);
+            sqlite3VdbeChangeP5(v, 0x1c); /* NULL, TEXT, or BLOB */
+            VdbeCoverage(v);
+            zErr = sqlite3MPrintf(db, "TEXT value in %s.%s",
+                                  pTab->zName, pTab->aCol[j].zCnName);
+            sqlite3VdbeAddOp4(v, OP_String8, 0, 3, 0, zErr, P4_DYNAMIC);
+            sqlite3VdbeResolveLabel(v, doError);
+            integrityCheckResultRow(v);
+            sqlite3VdbeJumpHere(v, jmp2);
+            sqlite3VdbeJumpHere(v, jmp3);         
+          }
         }
         /* Verify CHECK constraints */
         if( pTab->pCheck && (db->flags & SQLITE_IgnoreChecks)==0 ){
diff --git a/src/update.c b/src/update.c
index 3fd78a0b5a..a90dfaaeab 100644
--- a/src/update.c
+++ b/src/update.c
@@ -59,11 +59,14 @@ static void updateVirtualTable(
 ** it has been converted into REAL.
 */
 void sqlite3ColumnDefault(Vdbe *v, Table *pTab, int i, int iReg){
+  Column *pCol = &pTab->aCol[i];
   assert( pTab!=0 );
-  if( !IsView(pTab) ){
+  assert( pTab->nCol>i );
+  pCol = &pTab->aCol[i];
+  if( pCol->iDflt ){
     sqlite3_value *pValue = 0;
     u8 enc = ENC(sqlite3VdbeDb(v));
-    Column *pCol = &pTab->aCol[i];
+    assert( !IsView(pTab) );
     VdbeComment((v, "%s.%s", pTab->zName, pCol->zCnName));
     assert( i<pTab->nCol );
     sqlite3ValueFromExpr(sqlite3VdbeDb(v), 
@@ -74,7 +77,7 @@ void sqlite3ColumnDefault(Vdbe *v, Table *pTab, int i, int iReg){
     }
   }
 #ifndef SQLITE_OMIT_FLOATING_POINT
-  if( pTab->aCol[i].affinity==SQLITE_AFF_REAL && !IsVirtual(pTab) ){
+  if( pCol->affinity==SQLITE_AFF_REAL && !IsVirtual(pTab) ){
     sqlite3VdbeAddOp1(v, OP_RealAffinity, iReg);
   }
 #endif
diff --git a/src/vdbe.c b/src/vdbe.c
index 1797aca006..4d21eec117 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -2588,19 +2588,66 @@ case OP_IsNull: {            /* same as TK_ISNULL, jump, in1 */
   break;
 }
 
-/* Opcode: IsNullOrType P1 P2 P3 * *
-** Synopsis: if typeof(r[P1]) IN (P3,5) goto P2
+/* Opcode: IsType P1 P2 P3 P4 P5
+** Synopsis: if typeof(P1.P3) in P5 goto P2
+**
+** Jump to P2 if the type of a column in a btree is one of the types specified
+** by the P5 bitmask.
+**
+** P1 is normally a cursor on a btree for which the row decode cache is
+** valid through at least column P3.  In other words, there should have been
+** a prior OP_Column for column P3 or greater.  If the cursor is not valid,
+** then this opcode might give spurious results.
+** The the btree row has fewer than P3 columns, then use P4 as the
+** datatype.
+**
+** If P1 is -1, then P3 is a register number and the datatype is taken
+** from the value in that register.
+**
+** P5 is a bitmask of data types.  SQLITE_INTEGER is the least significant
+** (0x01) bit. SQLITE_FLOAT is the 0x02 bit. SQLITE_TEXT is 0x04.
+** SQLITE_BLOB is 0x08.  SQLITE_NULL is 0x10.
+**
+** Take the jump to address P2 if and only if the datatype of the
+** value determined by P1 and P3 corresponds to one of the bits in the
+** P5 bitmask.
 **
-** Jump to P2 if the value in register P1 is NULL or has a datatype P3.
-** P3 is an integer which should be one of SQLITE_INTEGER, SQLITE_FLOAT,
-** SQLITE_BLOB, SQLITE_NULL, or SQLITE_TEXT.
 */
-case OP_IsNullOrType: {      /* jump, in1 */
-  int doTheJump;
-  pIn1 = &aMem[pOp->p1];
-  doTheJump = (pIn1->flags & MEM_Null)!=0 || sqlite3_value_type(pIn1)==pOp->p3;
-  VdbeBranchTaken( doTheJump, 2);
-  if( doTheJump ) goto jump_to_p2;
+case OP_IsType: {
+  VdbeCursor *pC;
+  u16 typeMask;
+  u32 serialType;
+
+  assert( pOp->p1>=(-1) && pOp->p1<p->nCursor );
+  assert( pOp->p1>=0 || (pOp->p3>=0 && pOp->p3<=(p->nMem+1 - p->nCursor)) );
+  if( pOp->p1>=0 ){
+    pC = p->apCsr[pOp->p1];
+    assert( pC!=0 );
+    assert( pOp->p3>=0 );
+    if( pOp->p3<(u32)pC->nHdrParsed ){
+      serialType = pC->aType[pOp->p3];
+      if( serialType==0 ){
+        typeMask = 0x10;   /* SQLITE_NULL */
+      }else if( serialType==7 ){
+        typeMask = 0x02;   /* SQLITE_FLOAT */
+      }else if( serialType<12 ){
+        typeMask = 0x01;   /* SQLITE_INTEGER */
+      }else if( serialType&1 ){
+        typeMask = 0x04;   /* SQLITE_TEXT */
+      }else{
+        typeMask = 0x08;   /* SQLITE_BLOB */
+      }
+    }else{
+      typeMask = 1 << (pOp->p4.i - 1);
+    }
+  }else{
+    assert( memIsValid(&aMem[pOp->p3]) );
+    typeMask = 1 << (sqlite3_value_type((sqlite3_value*)&aMem[pOp->p3])-1);
+  }
+  VdbeBranchTaken( (typeMask & pOp->p5)!=0, 2);
+  if( typeMask & pOp->p5 ){
+    goto jump_to_p2;
+  }
   break;
 }
 
diff --git a/test/memsubsys1.test b/test/memsubsys1.test
index 41bc115269..fda35a918b 100644
--- a/test/memsubsys1.test
+++ b/test/memsubsys1.test
@@ -174,7 +174,7 @@ do_test memsubsys1-4.4 {
 } 0
 do_test memsubsys1-4.5 {
   set maxreq [lindex [sqlite3_status SQLITE_STATUS_MALLOC_SIZE 0] 2]
-  expr {$maxreq<7000}
+  expr {$maxreq<9000}
 } 1
 
 db close

From db6940ab457adfaa02c102f6f9d9e80e1853d984 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 10 Oct 2022 19:38:01 +0000
Subject: [PATCH 257/428] Fix corner-case bugs in the new integrity_check
 logic.  All tests pass now.

FossilOrigin-Name: dbab9d52a842085da67f5d0b8e96c665adc16331accf380b4c234e9b05bdb7fb
---
 manifest      | 15 ++++++---------
 manifest.uuid |  2 +-
 src/pragma.c  | 23 +++++++++++++++++------
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/manifest b/manifest
index f227e86d95..b625b28410 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C An\sattempt\sto\senhance\sPRAGMA\sintegrity\scheck\sso\sthat\sit\sdoes\sdata\stype\nchecking\son\snon-STRICT\stables.\s\sSpecifically:\s\s(1)\sColumns\swith\sTEXT\saffinity\nshould\snot\scontain\snumeric\svalues,\sand\s(2)\scolumns\swith\snumeric\saffinity\sshould\nnot\scontain\stext\svalues\sthat\scan\sbe\sconverted\sto\snumeric.
-D 2022-10-10T18:25:05.328
+C Fix\scorner-case\sbugs\sin\sthe\snew\sintegrity_check\slogic.\s\sAll\stests\spass\snow.
+D 2022-10-10T19:38:01.004
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -581,7 +581,7 @@ F src/parse.y 8e67d820030d2655b9942ffe61c1e7e6b96cea2f2f72183533299393907d0564
 F src/pcache.c f4268f7f73c6a3db12ce22fd25bc68dc42315d19599414ab1207d7cf32f79197
 F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
 F src/pcache1.c dee95e3cd2b61e6512dc814c5ab76d5eb36f0bfc9441dbb4260fccc0d12bbddc
-F src/pragma.c f9df5f90b20cbfc8a25f2e9129b185d8eba37ecd74ce156df814e1aaf8ce1183
+F src/pragma.c a0078de9888c070ef6c73a57d3f3583ba564d8d006e2b88260ec2a9d20f373aa
 F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 F src/prepare.c 1b02be0441eda4579471fea097f678effcbb77ef0c39ab3f703c837822bcd674
 F src/printf.c e99ee9741e79ae3873458146f59644276657340385ade4e76a5f5d1c25793764
@@ -2002,11 +2002,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 327965bc71023d9380a9d6805062659108dab4bfcd386b7aba813754f270d33a
-R 482ab94cca7e794e7641d30e6ad55424
-T *branch * integrity_check_datatypes
-T *sym-integrity_check_datatypes *
-T -sym-trunk *
+P 8b1e7f0524637728cebe81c7d3ff8ad8a5a55782eac6409b425dad538024f596
+R cb674d2c5f9d411ede3d4b1200338633
 U drh
-Z 974e346bb8769b9c6b996ee2e6df90d2
+Z b390e30b2deecf15f9935ccee6736a14
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 548a45a671..fdb5087226 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8b1e7f0524637728cebe81c7d3ff8ad8a5a55782eac6409b425dad538024f596
\ No newline at end of file
+dbab9d52a842085da67f5d0b8e96c665adc16331accf380b4c234e9b05bdb7fb
\ No newline at end of file
diff --git a/src/pragma.c b/src/pragma.c
index 018fed5efd..c7f349740d 100644
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -1752,8 +1752,9 @@ void sqlite3Pragma(
         int loopTop;
         int iDataCur, iIdxCur;
         int r1 = -1;
-        int bStrict;
+        int bStrict;            /* True for a STRICT table */
         int r2;                 /* Previous key for WITHOUT ROWID tables */
+        int mxCol;              /* Maximum non-virtual column number */
 
         if( !IsOrdinaryTable(pTab) ) continue;
         if( pObjTab && pObjTab!=pTab ) continue;
@@ -1778,10 +1779,20 @@ void sqlite3Pragma(
         assert( sqlite3NoTempsInRange(pParse,1,7+j) );
         sqlite3VdbeAddOp2(v, OP_Rewind, iDataCur, 0); VdbeCoverage(v);
         loopTop = sqlite3VdbeAddOp2(v, OP_AddImm, 7, 1);
-        /* Sanity check on record header decoding */
-        sqlite3VdbeAddOp3(v, OP_Column, iDataCur, pTab->nNVCol-1,3);
-        sqlite3VdbeChangeP5(v, OPFLAG_TYPEOFARG);
-        VdbeComment((v, "(right-most column)"));
+
+        /* Fetch the right-most column from the table.  This will cause
+        ** the entire record header to be parsed and sanity checked.  It
+        ** will also prepopulate the  */
+        mxCol = pTab->nCol-1;
+        while( mxCol>=0
+            && ((pTab->aCol[mxCol].colFlags & COLFLAG_VIRTUAL)!=0
+                || pTab->iPKey==mxCol) ) mxCol--;
+        if( mxCol>=0 ){
+          sqlite3ExprCodeGetColumnOfTable(v, pTab, iDataCur, mxCol, 3);
+          if( sqlite3VdbeGetLastOp(v)->opcode==OP_Column ){
+            sqlite3VdbeChangeP5(v, OPFLAG_TYPEOFARG);
+          }
+        }
         if( !isQuick ){
           if( pPk ){
             /* Verify WITHOUT ROWID keys are in ascending order */
@@ -1826,7 +1837,7 @@ void sqlite3Pragma(
             doTypeCheck = pCol->affinity>SQLITE_AFF_BLOB;
           }
           if( pCol->notNull==0 && !doTypeCheck ) continue;
-          p4 = 0x10;
+          p4 = SQLITE_NULL;
           if( pCol->colFlags & COLFLAG_VIRTUAL ){
             sqlite3ExprCodeGetColumnOfTable(v, pTab, iDataCur, j, 3);
             p1 = -1;

From c9ef12f62bfbf808e606dd69d578ef9df3cc9e5a Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 10 Oct 2022 21:21:04 +0000
Subject: [PATCH 258/428] Code clean-up for the integrity_check enhancement.

FossilOrigin-Name: a140173102febe9ef8064ee9b95bee489db54caba149e577d69e4d75161bf390
---
 manifest      | 16 +++++++--------
 manifest.uuid |  2 +-
 src/pragma.c  | 56 +++++++++++++++++++++++++--------------------------
 src/update.c  |  2 +-
 src/vdbe.c    |  4 ++--
 5 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/manifest b/manifest
index b625b28410..e7eaf6f1d2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\scorner-case\sbugs\sin\sthe\snew\sintegrity_check\slogic.\s\sAll\stests\spass\snow.
-D 2022-10-10T19:38:01.004
+C Code\sclean-up\sfor\sthe\sintegrity_check\senhancement.
+D 2022-10-10T21:21:04.220
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -581,7 +581,7 @@ F src/parse.y 8e67d820030d2655b9942ffe61c1e7e6b96cea2f2f72183533299393907d0564
 F src/pcache.c f4268f7f73c6a3db12ce22fd25bc68dc42315d19599414ab1207d7cf32f79197
 F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
 F src/pcache1.c dee95e3cd2b61e6512dc814c5ab76d5eb36f0bfc9441dbb4260fccc0d12bbddc
-F src/pragma.c a0078de9888c070ef6c73a57d3f3583ba564d8d006e2b88260ec2a9d20f373aa
+F src/pragma.c 444f596c9e9123d19451ad762917f0f7545e4acecb10f67e09a19f01289cefce
 F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 F src/prepare.c 1b02be0441eda4579471fea097f678effcbb77ef0c39ab3f703c837822bcd674
 F src/printf.c e99ee9741e79ae3873458146f59644276657340385ade4e76a5f5d1c25793764
@@ -655,12 +655,12 @@ F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
 F src/tokenize.c 1305797eab3542a0896b552c6e7669c972c1468e11e92b370533c1f37a37082b
 F src/treeview.c 07787f67cd297a6d09d04b8d70c06769c60c9c1d9080378f93929c16f8fd3298
 F src/trigger.c 4163ada044af89d51caba1cb713a73165347b2ec05fe84a283737c134d61fcd5
-F src/update.c 832cfcf09edcfcc383032b6cc63eb578dc0658c9380e58e1d26f703bba3c5339
+F src/update.c 5b0302c47cf31b533d5dff04c497ca1d8b9d89c39727e633fbe7b882fd5ac5aa
 F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 F src/util.c 0be191521ff6d2805995f4910f0b6231b42843678b2efdc1abecaf39929a673f
 F src/vacuum.c bb346170b0b54c6683bba4a5983aea40485597fdf605c87ec8bc2e199fe88cd8
-F src/vdbe.c af03458e12f39cddd6f355ff325059db5431dbe45233fff5a18a7eb0065e535c
+F src/vdbe.c 387270d575129b0c6ab0d19dad6de5abc1576ce6cc97f30d233ee13775ea4527
 F src/vdbe.h 64619af62603dc3c4f5ff6ff6d2c8f389abd667a29ce6007ed44bd22b3211cd0
 F src/vdbeInt.h 17b7461ffcf9ee760d1341731715a419f6b8c763089a7ece25c2e8098d702b3f
 F src/vdbeapi.c fc3183daf72808b4311b228989120fdbc2dc44972fb0d77d5c453460cc0e5b2c
@@ -2002,8 +2002,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 8b1e7f0524637728cebe81c7d3ff8ad8a5a55782eac6409b425dad538024f596
-R cb674d2c5f9d411ede3d4b1200338633
+P dbab9d52a842085da67f5d0b8e96c665adc16331accf380b4c234e9b05bdb7fb
+R 27cc3a1e54ea78f4322ce43e3f2008e7
 U drh
-Z b390e30b2deecf15f9935ccee6736a14
+Z 5bcdf356b09ea5213e990a91977b44f5
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index fdb5087226..045f2700c3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dbab9d52a842085da67f5d0b8e96c665adc16331accf380b4c234e9b05bdb7fb
\ No newline at end of file
+a140173102febe9ef8064ee9b95bee489db54caba149e577d69e4d75161bf390
\ No newline at end of file
diff --git a/src/pragma.c b/src/pragma.c
index c7f349740d..7976f83c6f 100644
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -1782,7 +1782,9 @@ void sqlite3Pragma(
 
         /* Fetch the right-most column from the table.  This will cause
         ** the entire record header to be parsed and sanity checked.  It
-        ** will also prepopulate the  */
+        ** will also prepopulate the cursor column cache that is used
+        ** by the OP_IsType code, so it is a required step.
+        */
         mxCol = pTab->nCol-1;
         while( mxCol>=0
             && ((pTab->aCol[mxCol].colFlags & COLFLAG_VIRTUAL)!=0
@@ -1793,6 +1795,7 @@ void sqlite3Pragma(
             sqlite3VdbeChangeP5(v, OPFLAG_TYPEOFARG);
           }
         }
+
         if( !isQuick ){
           if( pPk ){
             /* Verify WITHOUT ROWID keys are in ascending order */
@@ -1826,9 +1829,10 @@ void sqlite3Pragma(
         for(j=0; j<pTab->nCol; j++){
           char *zErr;
           Column *pCol = pTab->aCol + j;  /* The column to be checked */
-          int doError, jmp2;
-          int p1, p3, p4;    /* Operands to the OP_IsType opcode */
-          int doTypeCheck;   /* Data type check (other than NOT NULL) needed */
+          int labelError;               /* Jump here to report an error */
+          int labelOk;                  /* Jump here if all looks ok */
+          int p1, p3, p4;               /* Operands to the OP_IsType opcode */
+          int doTypeCheck;              /* Check datatypes (besides NOT NULL) */
 
           if( j==pTab->iPKey ) continue;
           if( bStrict ){
@@ -1837,6 +1841,8 @@ void sqlite3Pragma(
             doTypeCheck = pCol->affinity>SQLITE_AFF_BLOB;
           }
           if( pCol->notNull==0 && !doTypeCheck ) continue;
+
+          /* Compute the operands that will be needed for OP_IsType */
           p4 = SQLITE_NULL;
           if( pCol->colFlags & COLFLAG_VIRTUAL ){
             sqlite3ExprCodeGetColumnOfTable(v, pTab, iDataCur, j, 3);
@@ -1861,21 +1867,23 @@ void sqlite3Pragma(
               testcase( p3!=j);
             }
           }
-          doError = doTypeCheck ? sqlite3VdbeMakeLabel(pParse) : 0;
+
+          labelError = sqlite3VdbeMakeLabel(pParse);
+          labelOk = sqlite3VdbeMakeLabel(pParse);
           if( pCol->notNull ){
             /* (1) NOT NULL columns may not contain a NULL */
-            jmp2 = sqlite3VdbeAddOp4Int(v, OP_IsType, p1, 0, p3, p4);
+            int jmp2 = sqlite3VdbeAddOp4Int(v, OP_IsType, p1, labelOk, p3, p4);
             sqlite3VdbeChangeP5(v, 0x0f);
             VdbeCoverage(v);
             zErr = sqlite3MPrintf(db, "NULL value in %s.%s", pTab->zName,
                                 pCol->zCnName);
             sqlite3VdbeAddOp4(v, OP_String8, 0, 3, 0, zErr, P4_DYNAMIC);
-            if( bStrict && pCol->eCType!=COLTYPE_ANY ){
-              sqlite3VdbeGoto(v, doError);
+            if( doTypeCheck ){
+              sqlite3VdbeGoto(v, labelError);
+              sqlite3VdbeJumpHere(v, jmp2);
             }else{
-              integrityCheckResultRow(v);
+              /* VDBE byte code will fall thru */
             }
-            sqlite3VdbeJumpHere(v, jmp2);
           }
           if( bStrict && doTypeCheck ){
             /* (2) Datatype must be exact for non-ANY columns in STRICT tables*/
@@ -1887,7 +1895,7 @@ void sqlite3Pragma(
                0x13,    /* REAL */
                0x14     /* TEXT */
             };
-            jmp2 = sqlite3VdbeAddOp4Int(v, OP_IsType, p1, 0, p3, p4);
+            sqlite3VdbeAddOp4Int(v, OP_IsType, p1, labelOk, p3, p4);
             assert( pCol->eCType>=1 && pCol->eCType<=sizeof(aStdTypeMask) );
             sqlite3VdbeChangeP5(v, aStdTypeMask[pCol->eCType-1]);
             VdbeCoverage(v);
@@ -1895,45 +1903,35 @@ void sqlite3Pragma(
                                   sqlite3StdType[pCol->eCType-1],
                                   pTab->zName, pTab->aCol[j].zCnName);
             sqlite3VdbeAddOp4(v, OP_String8, 0, 3, 0, zErr, P4_DYNAMIC);
-            sqlite3VdbeResolveLabel(v, doError);
-            integrityCheckResultRow(v);
-            sqlite3VdbeJumpHere(v, jmp2);
-          }
-          if( !bStrict && pCol->affinity==SQLITE_AFF_TEXT ){
+          }else if( !bStrict && pCol->affinity==SQLITE_AFF_TEXT ){
             /* (3) Datatype for TEXT columns in non-STRICT tables must be
             **     NULL, TEXT, or BLOB. */
-            jmp2 = sqlite3VdbeAddOp4Int(v, OP_IsType, p1, 0, p3, p4);
+            sqlite3VdbeAddOp4Int(v, OP_IsType, p1, labelOk, p3, p4);
             sqlite3VdbeChangeP5(v, 0x1c); /* NULL, TEXT, or BLOB */
             VdbeCoverage(v);
             zErr = sqlite3MPrintf(db, "NUMERIC value in %s.%s",
                                   pTab->zName, pTab->aCol[j].zCnName);
             sqlite3VdbeAddOp4(v, OP_String8, 0, 3, 0, zErr, P4_DYNAMIC);
-            sqlite3VdbeResolveLabel(v, doError);
-            integrityCheckResultRow(v);
-            sqlite3VdbeJumpHere(v, jmp2);
-          }
-          if( !bStrict && pCol->affinity>=SQLITE_AFF_NUMERIC ){
+          }else if( !bStrict && pCol->affinity>=SQLITE_AFF_NUMERIC ){
             /* (4) Datatype for numeric columns in non-STRICT tables must not
             **     be a TEXT value that can be converted to numeric. */
-            int jmp3;
-            jmp2 = sqlite3VdbeAddOp4Int(v, OP_IsType, p1, 0, p3, p4);
+            sqlite3VdbeAddOp4Int(v, OP_IsType, p1, labelOk, p3, p4);
             sqlite3VdbeChangeP5(v, 0x1b); /* NULL, INT, FLOAT, or BLOB */
             VdbeCoverage(v);
             if( p1>=0 ){
               sqlite3ExprCodeGetColumnOfTable(v, pTab, iDataCur, j, 3);
             }
             sqlite3VdbeAddOp4(v, OP_Affinity, 3, 1, 0, "C", P4_STATIC);
-            jmp3 = sqlite3VdbeAddOp4Int(v, OP_IsType, -1, 0, 3, p4);
+            sqlite3VdbeAddOp4Int(v, OP_IsType, -1, labelOk, 3, p4);
             sqlite3VdbeChangeP5(v, 0x1c); /* NULL, TEXT, or BLOB */
             VdbeCoverage(v);
             zErr = sqlite3MPrintf(db, "TEXT value in %s.%s",
                                   pTab->zName, pTab->aCol[j].zCnName);
             sqlite3VdbeAddOp4(v, OP_String8, 0, 3, 0, zErr, P4_DYNAMIC);
-            sqlite3VdbeResolveLabel(v, doError);
-            integrityCheckResultRow(v);
-            sqlite3VdbeJumpHere(v, jmp2);
-            sqlite3VdbeJumpHere(v, jmp3);         
           }
+          sqlite3VdbeResolveLabel(v, labelError);
+          integrityCheckResultRow(v);
+          sqlite3VdbeResolveLabel(v, labelOk);
         }
         /* Verify CHECK constraints */
         if( pTab->pCheck && (db->flags & SQLITE_IgnoreChecks)==0 ){
diff --git a/src/update.c b/src/update.c
index a90dfaaeab..809b306539 100644
--- a/src/update.c
+++ b/src/update.c
@@ -59,7 +59,7 @@ static void updateVirtualTable(
 ** it has been converted into REAL.
 */
 void sqlite3ColumnDefault(Vdbe *v, Table *pTab, int i, int iReg){
-  Column *pCol = &pTab->aCol[i];
+  Column *pCol;
   assert( pTab!=0 );
   assert( pTab->nCol>i );
   pCol = &pTab->aCol[i];
diff --git a/src/vdbe.c b/src/vdbe.c
index 4d21eec117..3cfb828660 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -2613,7 +2613,7 @@ case OP_IsNull: {            /* same as TK_ISNULL, jump, in1 */
 ** P5 bitmask.
 **
 */
-case OP_IsType: {
+case OP_IsType: {        /* jump */
   VdbeCursor *pC;
   u16 typeMask;
   u32 serialType;
@@ -2624,7 +2624,7 @@ case OP_IsType: {
     pC = p->apCsr[pOp->p1];
     assert( pC!=0 );
     assert( pOp->p3>=0 );
-    if( pOp->p3<(u32)pC->nHdrParsed ){
+    if( pOp->p3<pC->nHdrParsed ){
       serialType = pC->aType[pOp->p3];
       if( serialType==0 ){
         typeMask = 0x10;   /* SQLITE_NULL */

From 7d23d157bba50d9fedeb32badeac75d4cb78eeee Mon Sep 17 00:00:00 2001
From: drh <>
Date: Tue, 11 Oct 2022 12:02:42 +0000
Subject: [PATCH 259/428] Improved the ability of the CLI to handle very long
 input lines. Potentially a fix for the bug reported by
 [forum:/forumpost/fa4bb2941a|forum post fa4bb2941a].

FossilOrigin-Name: d0e107ee00101f42b4c9bf372625311d04b83c96a4a9caacac866ea03d8e7fa4
---
 manifest       | 13 +++++-----
 manifest.uuid  |  2 +-
 src/shell.c.in | 67 +++++++++++++++++++++++++-------------------------
 3 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/manifest b/manifest
index 48c96294aa..c8deb59a44 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\sthe\s"PRAGMA\sintegrity_check"\sstatement\sso\sthat\sit\sverifies\sdatatype\nconstraints\son\snon-STRICT\stables:\s\s(1)\sColumns\swith\sTEXT\saffinity\sshould\snot\ncontain\snumeric\svalues,\sand\s(2)\scolumns\swith\sNUMERIC\saffinity\sshould\snot\ncontain\sTEXT\svalues\sthat\scould\sbe\sconverted\sinto\snumbers.
-D 2022-10-10T23:54:17.674
+C Improved\sthe\sability\sof\sthe\sCLI\sto\shandle\svery\slong\sinput\slines.\nPotentially\sa\sfix\sfor\sthe\sbug\sreported\sby\n[forum:/forumpost/fa4bb2941a|forum\spost\sfa4bb2941a].
+D 2022-10-11T12:02:42.516
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -589,7 +589,7 @@ F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c bb18acf4eded647fef88d4d543c673874dbebff516fbeba90a85e6c13f2a58cd
-F src/shell.c.in e7e7c2c69ae86c5ee9e8ad66227203d46ff6dce8700a1b1dababff01c71d33df
+F src/shell.c.in d89ed19d90870491d113758f302aabda434154da0f0b16c652748e5881d095ef
 F src/sqlite.h.in bcc51bb43c54676dccbad07051c6d463212707f50363d64f1831440749e91ddb
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d
@@ -2002,9 +2002,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 327965bc71023d9380a9d6805062659108dab4bfcd386b7aba813754f270d33a a140173102febe9ef8064ee9b95bee489db54caba149e577d69e4d75161bf390
-R 27cc3a1e54ea78f4322ce43e3f2008e7
-T +closed a140173102febe9ef8064ee9b95bee489db54caba149e577d69e4d75161bf390
+P aa6e9086196248675b9e33dbfaad9ef67097432535896790f80d2470002978b1
+R 00c6f1b8c7c66f6a163223479513c839
 U drh
-Z e702316a9b12d63d22f572b11832de1b
+Z 946bcdd9664c36b8c41d069cd2649097
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 38b9997aab..7311a37457 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-aa6e9086196248675b9e33dbfaad9ef67097432535896790f80d2470002978b1
\ No newline at end of file
+d0e107ee00101f42b4c9bf372625311d04b83c96a4a9caacac866ea03d8e7fa4
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index d6f3a0aeb6..443de0a171 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -672,7 +672,7 @@ static char *local_getline(char *zLine, FILE *in){
   if( stdin_is_interactive && in==stdin ){
     char *zTrans = sqlite3_win32_mbcs_to_utf8_v2(zLine, 0);
     if( zTrans ){
-      int nTrans = strlen30(zTrans)+1;
+      i64 nTrans = strlen(zTrans)+1;
       if( nTrans>nLine ){
         zLine = realloc(zLine, nTrans);
         shell_check_oom(zLine);
@@ -808,9 +808,9 @@ static void freeText(ShellText *p){
 ** quote character for zAppend.
 */
 static void appendText(ShellText *p, const char *zAppend, char quote){
-  int len;
-  int i;
-  int nAppend = strlen30(zAppend);
+  i64 len;
+  i64 i;
+  i64 nAppend = strlen30(zAppend);
 
   len = nAppend+p->n+1;
   if( quote ){
@@ -1676,9 +1676,9 @@ static void output_c_string(FILE *out, const char *z){
 /*
 ** Output the given string as a quoted according to JSON quoting rules.
 */
-static void output_json_string(FILE *out, const char *z, int n){
+static void output_json_string(FILE *out, const char *z, i64 n){
   unsigned int c;
-  if( n<0 ) n = (int)strlen(z);
+  if( n<0 ) n = strlen(z);
   fputc('"', out);
   while( n-- ){
     c = *(z++);
@@ -1981,7 +1981,7 @@ static int wsToEol(const char *z){
 */
 static void eqp_append(ShellState *p, int iEqpId, int p2, const char *zText){
   EQPGraphRow *pNew;
-  int nText = strlen30(zText);
+  i64 nText = strlen(zText);
   if( p->autoEQPtest ){
     utf8_printf(p->out, "%d,%d,%s\n", iEqpId, p2, zText);
   }
@@ -2026,14 +2026,14 @@ static EQPGraphRow *eqp_next_row(ShellState *p, int iEqpId, EQPGraphRow *pOld){
 */
 static void eqp_render_level(ShellState *p, int iEqpId){
   EQPGraphRow *pRow, *pNext;
-  int n = strlen30(p->sGraph.zPrefix);
+  i64 n = strlen(p->sGraph.zPrefix);
   char *z;
   for(pRow = eqp_next_row(p, iEqpId, 0); pRow; pRow = pNext){
     pNext = eqp_next_row(p, iEqpId, pRow);
     z = pRow->zText;
     utf8_printf(p->out, "%s%s%s\n", p->sGraph.zPrefix,
                 pNext ? "|--" : "`--", z);
-    if( n<(int)sizeof(p->sGraph.zPrefix)-7 ){
+    if( n<(i64)sizeof(p->sGraph.zPrefix)-7 ){
       memcpy(&p->sGraph.zPrefix[n], pNext ? "|  " : "   ", 4);
       eqp_render_level(p, pRow->iEqpId);
       p->sGraph.zPrefix[n] = 0;
@@ -4945,28 +4945,28 @@ static void shellEscapeCrnl(
   const char *zText = (const char*)sqlite3_value_text(argv[0]);
   UNUSED_PARAMETER(argc);
   if( zText && zText[0]=='\'' ){
-    int nText = sqlite3_value_bytes(argv[0]);
-    int i;
+    i64 nText = sqlite3_value_bytes(argv[0]);
+    i64 i;
     char zBuf1[20];
     char zBuf2[20];
     const char *zNL = 0;
     const char *zCR = 0;
-    int nCR = 0;
-    int nNL = 0;
+    i64 nCR = 0;
+    i64 nNL = 0;
 
     for(i=0; zText[i]; i++){
       if( zNL==0 && zText[i]=='\n' ){
         zNL = unused_string(zText, "\\n", "\\012", zBuf1);
-        nNL = (int)strlen(zNL);
+        nNL = strlen(zNL);
       }
       if( zCR==0 && zText[i]=='\r' ){
         zCR = unused_string(zText, "\\r", "\\015", zBuf2);
-        nCR = (int)strlen(zCR);
+        nCR = strlen(zCR);
       }
     }
 
     if( zNL || zCR ){
-      int iOut = 0;
+      i64 iOut = 0;
       i64 nMax = (nNL > nCR) ? nNL : nCR;
       i64 nAlloc = nMax * nText + (nMax+64)*2;
       char *zOut = (char*)sqlite3_malloc64(nAlloc);
@@ -5207,8 +5207,8 @@ static char **readline_completion(const char *zText, int iStart, int iEnd){
 ** Linenoise completion callback
 */
 static void linenoise_completion(const char *zLine, linenoiseCompletions *lc){
-  int nLine = strlen30(zLine);
-  int i, iStart;
+  i64 nLine = strlen(zLine);
+  i64 i, iStart;
   sqlite3_stmt *pStmt = 0;
   char *zSql;
   char zBuf[1000];
@@ -5374,7 +5374,7 @@ static int sql_trace_callback(
   ShellState *p = (ShellState*)pArg;
   sqlite3_stmt *pStmt;
   const char *zSql;
-  int nSql;
+  i64 nSql;
   if( p->traceOut==0 ) return 0;
   if( mType==SQLITE_TRACE_CLOSE ){
     utf8_printf(p->traceOut, "-- closing database connection\n");
@@ -5402,17 +5402,18 @@ static int sql_trace_callback(
     }
   }
   if( zSql==0 ) return 0;
-  nSql = strlen30(zSql);
+  nSql = strlen(zSql);
+  if( nSql>1000000000 ) nSql = 1000000000;
   while( nSql>0 && zSql[nSql-1]==';' ){ nSql--; }
   switch( mType ){
     case SQLITE_TRACE_ROW:
     case SQLITE_TRACE_STMT: {
-      utf8_printf(p->traceOut, "%.*s;\n", nSql, zSql);
+      utf8_printf(p->traceOut, "%.*s;\n", (int)nSql, zSql);
       break;
     }
     case SQLITE_TRACE_PROFILE: {
       sqlite3_int64 nNanosec = *(sqlite3_int64*)pX;
-      utf8_printf(p->traceOut, "%.*s; -- %lld ns\n", nSql, zSql, nNanosec);
+      utf8_printf(p->traceOut, "%.*s; -- %lld ns\n", (int)nSql, zSql, nNanosec);
       break;
     }
   }
@@ -11609,7 +11610,7 @@ static char *one_input_line(FILE *in, char *zPrior, int isContinuation){
   const char *zBegin = shellState.wasm.zPos;
   const char *z = zBegin;
   char *zLine = 0;
-  int nZ = 0;
+  i64 nZ = 0;
 
   UNUSED_PARAMETER(in);
   UNUSED_PARAMETER(isContinuation);
@@ -11625,7 +11626,7 @@ static char *one_input_line(FILE *in, char *zPrior, int isContinuation){
   shellState.wasm.zPos = z;
   zLine = realloc(zPrior, nZ+1);
   shell_check_oom(zLine);
-  memcpy(zLine, zBegin, (size_t)nZ);
+  memcpy(zLine, zBegin, nZ);
   zLine[nZ] = 0;
   return zLine;
 }
@@ -11643,12 +11644,12 @@ static char *one_input_line(FILE *in, char *zPrior, int isContinuation){
 static int process_input(ShellState *p){
   char *zLine = 0;          /* A single input line */
   char *zSql = 0;           /* Accumulated SQL text */
-  int nLine;                /* Length of current line */
-  int nSql = 0;             /* Bytes of zSql[] used */
-  int nAlloc = 0;           /* Allocated zSql[] space */
+  i64 nLine;                /* Length of current line */
+  i64 nSql = 0;             /* Bytes of zSql[] used */
+  i64 nAlloc = 0;           /* Allocated zSql[] space */
   int rc;                   /* Error code */
   int errCnt = 0;           /* Number of errors seen */
-  int startline = 0;        /* Line number for start of current input */
+  i64 startline = 0;        /* Line number for start of current input */
   QuickScanState qss = QSS_Start; /* Accumulated line status (so far) */
 
   if( p->inputNesting==MAX_INPUT_NESTING ){
@@ -11698,7 +11699,7 @@ static int process_input(ShellState *p){
       continue;
     }
     /* No single-line dispositions remain; accumulate line(s). */
-    nLine = strlen30(zLine);
+    nLine = strlen(zLine);
     if( nSql+nLine+2>=nAlloc ){
       /* Grow buffer by half-again increments when big. */
       nAlloc = nSql+(nSql>>1)+nLine+100;
@@ -11706,7 +11707,7 @@ static int process_input(ShellState *p){
       shell_check_oom(zSql);
     }
     if( nSql==0 ){
-      int i;
+      i64 i;
       for(i=0; zLine[i] && IsSpace(zLine[i]); i++){}
       assert( nAlloc>0 && zSql!=0 );
       memcpy(zSql, zLine+i, nLine+1-i);
@@ -11806,7 +11807,7 @@ static char *find_home_dir(int clearFlag){
 #endif /* !_WIN32_WCE */
 
   if( home_dir ){
-    int n = strlen30(home_dir) + 1;
+    i64 n = strlen(home_dir) + 1;
     char *z = malloc( n );
     if( z ) memcpy(z, home_dir, n);
     home_dir = z;
@@ -12098,9 +12099,9 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
   argv = argvToFree + argc;
   for(i=0; i<argc; i++){
     char *z = sqlite3_win32_unicode_to_utf8(wargv[i]);
-    int n;
+    i64 n;
     shell_check_oom(z);
-    n = (int)strlen(z);
+    n = strlen(z);
     argv[i] = malloc( n+1 );
     shell_check_oom(argv[i]);
     memcpy(argv[i], z, n+1);

From c2777abc2d0536180f9bf62a1e6f0f2ef82ec336 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Tue, 11 Oct 2022 13:57:55 +0000
Subject: [PATCH 260/428] Enhance the OP_IsType opcode so that it is slightly
 smaller and faster and so that it works correctly with invalid serial-type
 codes 10 and 11.

FossilOrigin-Name: 846f863e0d55eb7e78c8d355bbbcd73e1946d0ba566c2cb31683cde5f4353d1b
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/vdbe.c    | 42 +++++++++++++++++++++++++++++++++---------
 3 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/manifest b/manifest
index c8deb59a44..9710bd798c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\sthe\sability\sof\sthe\sCLI\sto\shandle\svery\slong\sinput\slines.\nPotentially\sa\sfix\sfor\sthe\sbug\sreported\sby\n[forum:/forumpost/fa4bb2941a|forum\spost\sfa4bb2941a].
-D 2022-10-11T12:02:42.516
+C Enhance\sthe\sOP_IsType\sopcode\sso\sthat\sit\sis\sslightly\ssmaller\sand\sfaster\sand\nso\sthat\sit\sworks\scorrectly\swith\sinvalid\sserial-type\scodes\s10\sand\s11.
+D 2022-10-11T13:57:55.911
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -660,7 +660,7 @@ F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 F src/util.c 0be191521ff6d2805995f4910f0b6231b42843678b2efdc1abecaf39929a673f
 F src/vacuum.c bb346170b0b54c6683bba4a5983aea40485597fdf605c87ec8bc2e199fe88cd8
-F src/vdbe.c 387270d575129b0c6ab0d19dad6de5abc1576ce6cc97f30d233ee13775ea4527
+F src/vdbe.c 4e51ba30edcdcec171fdb1db1133147ea1084d8b6842bc601b174e8a0e4b3b7f
 F src/vdbe.h 64619af62603dc3c4f5ff6ff6d2c8f389abd667a29ce6007ed44bd22b3211cd0
 F src/vdbeInt.h 17b7461ffcf9ee760d1341731715a419f6b8c763089a7ece25c2e8098d702b3f
 F src/vdbeapi.c fc3183daf72808b4311b228989120fdbc2dc44972fb0d77d5c453460cc0e5b2c
@@ -2002,8 +2002,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 aa6e9086196248675b9e33dbfaad9ef67097432535896790f80d2470002978b1
-R 00c6f1b8c7c66f6a163223479513c839
+P d0e107ee00101f42b4c9bf372625311d04b83c96a4a9caacac866ea03d8e7fa4
+R 75c541ecdbd1687f41e2a45748e7c504
 U drh
-Z 946bcdd9664c36b8c41d069cd2649097
+Z eaa615432748e218fd8e5d681605336a
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 7311a37457..3ab9362edd 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d0e107ee00101f42b4c9bf372625311d04b83c96a4a9caacac866ea03d8e7fa4
\ No newline at end of file
+846f863e0d55eb7e78c8d355bbbcd73e1946d0ba566c2cb31683cde5f4353d1b
\ No newline at end of file
diff --git a/src/vdbe.c b/src/vdbe.c
index 3cfb828660..b4a96468f1 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -2626,23 +2626,47 @@ case OP_IsType: {        /* jump */
     assert( pOp->p3>=0 );
     if( pOp->p3<pC->nHdrParsed ){
       serialType = pC->aType[pOp->p3];
-      if( serialType==0 ){
-        typeMask = 0x10;   /* SQLITE_NULL */
-      }else if( serialType==7 ){
-        typeMask = 0x02;   /* SQLITE_FLOAT */
-      }else if( serialType<12 ){
-        typeMask = 0x01;   /* SQLITE_INTEGER */
-      }else if( serialType&1 ){
-        typeMask = 0x04;   /* SQLITE_TEXT */
+      if( serialType>=12 ){
+        if( serialType&1 ){
+          typeMask = 0x04;   /* SQLITE_TEXT */
+        }else{
+          typeMask = 0x08;   /* SQLITE_BLOB */
+        }
       }else{
-        typeMask = 0x08;   /* SQLITE_BLOB */
+        static const unsigned char aMask[] = {
+           0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x2,
+           0x01, 0x01, 0x10, 0x10
+        };
+        testcase( serialType==0 );
+        testcase( serialType==1 );
+        testcase( serialType==2 );
+        testcase( serialType==3 );
+        testcase( serialType==4 );
+        testcase( serialType==5 );
+        testcase( serialType==6 );
+        testcase( serialType==7 );
+        testcase( serialType==8 );
+        testcase( serialType==9 );
+        testcase( serialType==10 );
+        testcase( serialType==11 );
+        typeMask = aMask[serialType];
       }
     }else{
       typeMask = 1 << (pOp->p4.i - 1);
+      testcase( typeMask==0x01 );
+      testcase( typeMask==0x02 );
+      testcase( typeMask==0x04 );
+      testcase( typeMask==0x08 );
+      testcase( typeMask==0x10 );
     }
   }else{
     assert( memIsValid(&aMem[pOp->p3]) );
     typeMask = 1 << (sqlite3_value_type((sqlite3_value*)&aMem[pOp->p3])-1);
+    testcase( typeMask==0x01 );
+    testcase( typeMask==0x02 );
+    testcase( typeMask==0x04 );
+    testcase( typeMask==0x08 );
+    testcase( typeMask==0x10 );
   }
   VdbeBranchTaken( (typeMask & pOp->p5)!=0, 2);
   if( typeMask & pOp->p5 ){

From 47996ea7c4973cff51e6510b197781a40ce84978 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Wed, 12 Oct 2022 12:49:29 +0000
Subject: [PATCH 261/428] Add the sqlite3_value_encoding() interface.

FossilOrigin-Name: d6d449978245b4fa66c152132da468eea7977eab4d1fe53bb2fe3ef543d8030f
---
 manifest         | 18 +++++++++---------
 manifest.uuid    |  2 +-
 src/sqlite.h.in  | 11 +++++++++++
 src/sqlite3ext.h |  4 ++++
 src/vdbeapi.c    |  3 +++
 src/vdbemem.c    |  3 +++
 6 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/manifest b/manifest
index 9710bd798c..9cd1d76155 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\sthe\sOP_IsType\sopcode\sso\sthat\sit\sis\sslightly\ssmaller\sand\sfaster\sand\nso\sthat\sit\sworks\scorrectly\swith\sinvalid\sserial-type\scodes\s10\sand\s11.
-D 2022-10-11T13:57:55.911
+C Add\sthe\ssqlite3_value_encoding()\sinterface.
+D 2022-10-12T12:49:29.915
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -590,9 +590,9 @@ F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c bb18acf4eded647fef88d4d543c673874dbebff516fbeba90a85e6c13f2a58cd
 F src/shell.c.in d89ed19d90870491d113758f302aabda434154da0f0b16c652748e5881d095ef
-F src/sqlite.h.in bcc51bb43c54676dccbad07051c6d463212707f50363d64f1831440749e91ddb
+F src/sqlite.h.in d9c8a6243fc0a1c270d69db33758e34b810af3462f9bc5b4af113b347e07c69d
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
-F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d
+F src/sqlite3ext.h 5336beea1868d99d2f62e628dbea55e97267dbff8193291ab175e960c5df9141
 F src/sqliteInt.h 1d27d00dcaafed614d6ed8738d6c41a81acf12fe50fe4c677427b1c56d8a81da
 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
@@ -663,10 +663,10 @@ F src/vacuum.c bb346170b0b54c6683bba4a5983aea40485597fdf605c87ec8bc2e199fe88cd8
 F src/vdbe.c 4e51ba30edcdcec171fdb1db1133147ea1084d8b6842bc601b174e8a0e4b3b7f
 F src/vdbe.h 64619af62603dc3c4f5ff6ff6d2c8f389abd667a29ce6007ed44bd22b3211cd0
 F src/vdbeInt.h 17b7461ffcf9ee760d1341731715a419f6b8c763089a7ece25c2e8098d702b3f
-F src/vdbeapi.c fc3183daf72808b4311b228989120fdbc2dc44972fb0d77d5c453460cc0e5b2c
+F src/vdbeapi.c 1e8713d0b653acb43cd1bdf579c40e005c4844ea90f414f065946a83db3c27fb
 F src/vdbeaux.c c719cebaffa75e166f16a405b3dee96e7150d60fc563ab2dea716b60c6a51312
 F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
-F src/vdbemem.c a9a3556bbdc8f3022f75136054c3ed02cbac15a73ec55cff2ea27bf5bb773dcc
+F src/vdbemem.c 6cfed43758d57b6e3b99d9cdedfeccd86e45a07e427b22d8487cbdbebb6c522a
 F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
 F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
 F src/vdbevtab.c f99b275366c5fc5e2d99f734729880994ab9500bdafde7fae3b02d562b9d323c
@@ -2002,8 +2002,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 d0e107ee00101f42b4c9bf372625311d04b83c96a4a9caacac866ea03d8e7fa4
-R 75c541ecdbd1687f41e2a45748e7c504
+P 846f863e0d55eb7e78c8d355bbbcd73e1946d0ba566c2cb31683cde5f4353d1b
+R eccde4f305d467cae06bf8441137806b
 U drh
-Z eaa615432748e218fd8e5d681605336a
+Z 21275c411a8ede34346bf4a3cb006dad
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 3ab9362edd..b85eb5bcd4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-846f863e0d55eb7e78c8d355bbbcd73e1946d0ba566c2cb31683cde5f4353d1b
\ No newline at end of file
+d6d449978245b4fa66c152132da468eea7977eab4d1fe53bb2fe3ef543d8030f
\ No newline at end of file
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 03a3e5cc01..7a697305e6 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -5521,6 +5521,16 @@ SQLITE_DEPRECATED int sqlite3_memory_alarm(void(*)(void*,sqlite3_int64,int),
 ** then the conversion is performed.  Otherwise no conversion occurs.
 ** The [SQLITE_INTEGER | datatype] after conversion is returned.)^
 **
+** ^(The sqlite3_value_encoding(X) interface returns one of [SQLITE_UTF8],
+** [SQLITE_UTF16BE], or [SQLITE_UTF16LE] according to the current encoding
+** of the value X, assuming that X has type TEXT.)^  If sqlite3_value_type(X)
+** returns something other than SQLITE_TEXT, then the return value from
+** sqlite3_value_encoding(X) is meaningless.  ^Calls to
+** sqlite3_value_text(X), sqlite3_value_text16(X), sqlite3_value_text16be(X),
+** sqlite3_value_text16le(X), sqlite3_value_bytes(X), or
+** sqlite3_value_bytes16(X) might change the encoding of the value X and
+** thus change the return from subsequent calls to sqlite3_value_encoding(X).
+**
 ** ^Within the [xUpdate] method of a [virtual table], the
 ** sqlite3_value_nochange(X) interface returns true if and only if
 ** the column corresponding to X is unchanged by the UPDATE operation
@@ -5585,6 +5595,7 @@ int sqlite3_value_type(sqlite3_value*);
 int sqlite3_value_numeric_type(sqlite3_value*);
 int sqlite3_value_nochange(sqlite3_value*);
 int sqlite3_value_frombind(sqlite3_value*);
+int sqlite3_value_encoding(sqlite3_value*);
 
 /*
 ** CAPI3REF: Finding The Subtype Of SQL Values
diff --git a/src/sqlite3ext.h b/src/sqlite3ext.h
index 2cdd0e429b..964af09c0e 100644
--- a/src/sqlite3ext.h
+++ b/src/sqlite3ext.h
@@ -357,6 +357,8 @@ struct sqlite3_api_routines {
   unsigned char *(*serialize)(sqlite3*,const char *,sqlite3_int64*,
                               unsigned int);
   const char *(*db_name)(sqlite3*,int);
+  /* Version 3.40.0 and later */
+  int (*value_encoding)(sqlite3_value*);
 };
 
 /*
@@ -681,6 +683,8 @@ typedef int (*sqlite3_loadext_entry)(
 #define sqlite3_serialize              sqlite3_api->serialize
 #endif
 #define sqlite3_db_name                sqlite3_api->db_name
+/* Version 3.40.0 and later */
+#define sqlite3_value_encoding         sqlite3_api->value_encoding
 #endif /* !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) */
 
 #if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)
diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index 6c5f7562b3..04295342b9 100644
--- a/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@ -318,6 +318,9 @@ int sqlite3_value_type(sqlite3_value* pVal){
 #endif
   return aType[pVal->flags&MEM_AffMask];
 }
+int sqlite3_value_encoding(sqlite3_value *pVal){
+  return pVal->enc;
+}
 
 /* Return true if a parameter to xUpdate represents an unchanged column */
 int sqlite3_value_nochange(sqlite3_value *pVal){
diff --git a/src/vdbemem.c b/src/vdbemem.c
index 3e9813ebe1..f14599def6 100644
--- a/src/vdbemem.c
+++ b/src/vdbemem.c
@@ -1968,6 +1968,9 @@ int sqlite3ValueBytes(sqlite3_value *pVal, u8 enc){
   if( (p->flags & MEM_Str)!=0 && pVal->enc==enc ){
     return p->n;
   }
+  if( (p->flags & MEM_Str)!=0 && enc!=SQLITE_UTF8 && pVal->enc!=SQLITE_UTF8 ){
+    return p->n;
+  }
   if( (p->flags & MEM_Blob)!=0 ){
     if( p->flags & MEM_Zero ){
       return p->n + p->u.nZero;

From 181f7e869dada22627da5715fd9b7e6609b565ad Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 12 Oct 2022 14:39:15 +0000
Subject: [PATCH 262/428] Correct mismatched H1 tags in test code. Minor CSS
 tweaks.

FossilOrigin-Name: 4d8eb90a370054d4482c20637ab56f5e01f4d10215f2af4e35fb9a1f85ecb700
---
 ext/wasm/common/testing.css   |  1 +
 ext/wasm/demo-123-worker.html |  2 +-
 ext/wasm/demo-123.html        |  2 +-
 manifest                      | 16 ++++++++--------
 manifest.uuid                 |  2 +-
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ext/wasm/common/testing.css b/ext/wasm/common/testing.css
index e112fd0a83..8782e3862d 100644
--- a/ext/wasm/common/testing.css
+++ b/ext/wasm/common/testing.css
@@ -2,6 +2,7 @@ body {
   display: flex;
   flex-direction: column;
   flex-wrap: wrap;
+  white-space: break-spaces;
 }
 textarea {
     font-family: monospace;
diff --git a/ext/wasm/demo-123-worker.html b/ext/wasm/demo-123-worker.html
index 7480037a16..f632e39515 100644
--- a/ext/wasm/demo-123-worker.html
+++ b/ext/wasm/demo-123-worker.html
@@ -17,7 +17,7 @@
     </style>
   </head>
   <body>
-    <h1>1-2-sqlite3 worker demo</h2>
+    <h1>1-2-sqlite3 worker demo</h1>
     <script>(function(){
       const logHtml = function(cssClass,...args){
         const ln = document.createElement('div');
diff --git a/ext/wasm/demo-123.html b/ext/wasm/demo-123.html
index 25fa974910..0771990c70 100644
--- a/ext/wasm/demo-123.html
+++ b/ext/wasm/demo-123.html
@@ -17,7 +17,7 @@
     </style>
   </head>
   <body>
-    <h1>1-2-sqlite3 demo</h2>
+    <h1>1-2-sqlite3 demo</h1>
     <script src="sqlite3.js"></script>
     <script src="demo-123.js"></script>
   </body>
diff --git a/manifest b/manifest
index 941d84fc61..b1db26d204 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\ssome\sextraneous\sdebug\soutput.
-D 2022-10-09T17:08:36.884
+C Correct\smismatched\sH1\stags\sin\stest\scode.\sMinor\sCSS\stweaks.
+D 2022-10-12T14:39:15.726
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -496,10 +496,10 @@ F ext/wasm/batch-runner.html cf1a410c92bad50fcec2ddc71390b4e9df63a6ea1bef12a5163
 F ext/wasm/batch-runner.js 5bae81684728b6be157d1f92b39824153f0fd019345b39f2ab8930f7ee2a57d8
 F ext/wasm/common/SqliteTestUtil.js 647bf014bd30bdd870a7e9001e251d12fc1c9ec9ce176a1004b838a4b33c5c05
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
-F ext/wasm/common/testing.css 3a5143699c2b73a85b962271e1a9b3241b30d90e30d895e4f55665e648572962
+F ext/wasm/common/testing.css bd6b23c4666be765139c1e50569cac301d949d5e251f7ad442376995ec5aa39a
 F ext/wasm/common/whwasmutil.js bc8522a071f4754af7b50f53807b95f691d2f9e44fc3b3e8c65dff6ef2485c0d
-F ext/wasm/demo-123-worker.html e419b66495d209b5211ec64903b4cfb3ca7df20d652b41fcd28bf018a773234f
-F ext/wasm/demo-123.html aa281d33b7eefa755f3122b7b5a18f39a42dc5fb69c8879171bf14b4c37c4ec4
+F ext/wasm/demo-123-worker.html e50b51dc7271b9d3cc830cb7c2fba294d622f56b7acb199f7257d11195a63d49
+F ext/wasm/demo-123.html 7c239c9951d1b113f9f532969ac039294cf1dcfee2b3ae0a2c1ed2b3d59f8dfa
 F ext/wasm/demo-123.js d563cf9d725692ccd940c46df1c026d87863e0544942a2ba2015f17fba3f6f74
 F ext/wasm/demo-kvvfs1.html 7d4f28873de67f51ac18c584b7d920825139866a96049a49c424d6f5a0ea5e7f
 F ext/wasm/demo-kvvfs1.js 105596bd2ccd0b1deb5fde8e99b536e8242d4bb5932fac0c8403ff3a6bc547e8
@@ -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 08b516d6953256cfb8792cfee9e6ed7450fd55d84196b66b77409cfaee3c8729
-R 7e182cfb7c10cb8b3ac675a3158817af
+P 56ff42053f7b73b380c103a84f29e285cfbfb6e18a25b3a50a6d78e32610914e
+R 05647e42780f3b3d4973106aac02535b
 U stephan
-Z 9fd199323718b411b75fc96a664d948d
+Z 9edc725f213a1258fdc6680a6f64d9ac
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 6a5deb99bb..c0bbdb1f5b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-56ff42053f7b73b380c103a84f29e285cfbfb6e18a25b3a50a6d78e32610914e
\ No newline at end of file
+4d8eb90a370054d4482c20637ab56f5e01f4d10215f2af4e35fb9a1f85ecb700
\ No newline at end of file

From b75971e6e96dc35d88f325e7124593cf430970d3 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 12 Oct 2022 15:40:16 +0000
Subject: [PATCH 263/428] Minor doc cleanups and corrections in sqlite3-wasm.c

FossilOrigin-Name: 5144c122a921e4240901cf4eb46347b92213273eec7cf0977952ab2b60722c27
---
 ext/wasm/api/sqlite3-wasm.c | 60 ++++++++++++++++++++-----------------
 manifest                    | 12 ++++----
 manifest.uuid               |  2 +-
 3 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index cfeb99e922..d57dc0562d 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -5,7 +5,7 @@
 ** requires compiling with -std=c99 (or equivalent, or a later C
 ** version) because it makes use of features not available in C89.
 **
-** At it's simplest, to build sqlite3.wasm either place this file
+** At its simplest, to build sqlite3.wasm either place this file
 ** in the same directory as sqlite3.c/h before compilation or use the
 ** -I/path flag to tell the compiler where to find both of those
 ** files, then compile this file. For example:
@@ -111,7 +111,7 @@
 ** this writing we are tied to Emscripten for various reasons
 ** and cannot test the library with other build environments.
 */
-#define WASM_KEEP __attribute__((used,visibility("default")))
+#define SQLITE_WASM_KEEP __attribute__((used,visibility("default")))
 // See also:
 //__attribute__((export_name("theExportedName"), used, visibility("default")))
 
@@ -128,24 +128,24 @@
 ** Another option is to malloc() a chunk of our own and call that our
 ** "stack".
 */
-WASM_KEEP void * sqlite3_wasm_stack_end(void){
+SQLITE_WASM_KEEP void * sqlite3_wasm_stack_end(void){
   extern void __heap_base
     /* see https://stackoverflow.com/questions/10038964 */;
   return &__heap_base;
 }
-WASM_KEEP void * sqlite3_wasm_stack_begin(void){
+SQLITE_WASM_KEEP void * sqlite3_wasm_stack_begin(void){
   extern void __data_end;
   return &__data_end;
 }
 static void * pWasmStackPtr = 0;
-WASM_KEEP void * sqlite3_wasm_stack_ptr(void){
+SQLITE_WASM_KEEP void * sqlite3_wasm_stack_ptr(void){
   if(!pWasmStackPtr) pWasmStackPtr = sqlite3_wasm_stack_end();
   return pWasmStackPtr;
 }
-WASM_KEEP void sqlite3_wasm_stack_restore(void * p){
+SQLITE_WASM_KEEP void sqlite3_wasm_stack_restore(void * p){
   pWasmStackPtr = p;
 }
-WASM_KEEP void * sqlite3_wasm_stack_alloc(int n){
+SQLITE_WASM_KEEP void * sqlite3_wasm_stack_alloc(int n){
   if(n<=0) return 0;
   n = (n + 7) & ~7 /* align to 8-byte boundary */;
   unsigned char * const p = (unsigned char *)sqlite3_wasm_stack_ptr();
@@ -181,14 +181,14 @@ static struct {
 /*
 ** Returns the current pstack position.
 */
-WASM_KEEP void * sqlite3_wasm_pstack_ptr(void){
+SQLITE_WASM_KEEP void * sqlite3_wasm_pstack_ptr(void){
   return PStack.pPos;
 }
 /*
 ** Sets the pstack position poitner to p. Results are undefined if the
 ** given value did not come from sqlite3_wasm_pstack_ptr().
 */
-WASM_KEEP void sqlite3_wasm_pstack_restore(unsigned char * p){
+SQLITE_WASM_KEEP void sqlite3_wasm_pstack_restore(unsigned char * p){
   assert(p>=PStack.pBegin && p<=PStack.pEnd && p>=PStack.pPos);
   assert(0==(p & 0x7));
   if(p>=PStack.pBegin && p<=PStack.pEnd /*&& p>=PStack.pPos*/){
@@ -203,7 +203,7 @@ WASM_KEEP void sqlite3_wasm_pstack_restore(unsigned char * p){
 ** JS code from having to do so, and most uses of the pstack will
 ** call for doing so).
 */
-WASM_KEEP void * sqlite3_wasm_pstack_alloc(int n){
+SQLITE_WASM_KEEP void * sqlite3_wasm_pstack_alloc(int n){
   if( n<=0 ) return 0;
   //if( n & 0x7 ) n += 8 - (n & 0x7) /* align to 8-byte boundary */;
   n = (n + 7) & ~7 /* align to 8-byte boundary */;
@@ -216,7 +216,7 @@ WASM_KEEP void * sqlite3_wasm_pstack_alloc(int n){
 ** Return the number of bytes left which can be
 ** sqlite3_wasm_pstack_alloc()'d.
 */
-WASM_KEEP int sqlite3_wasm_pstack_remaining(void){
+SQLITE_WASM_KEEP int sqlite3_wasm_pstack_remaining(void){
   assert(PStack.pPos >= PStack.pBegin);
   assert(PStack.pPos <= PStack.pEnd);
   return (int)(PStack.pPos - PStack.pBegin);
@@ -227,7 +227,7 @@ WASM_KEEP int sqlite3_wasm_pstack_remaining(void){
 ** any space which is currently allocated. This value is a
 ** compile-time constant.
 */
-WASM_KEEP int sqlite3_wasm_pstack_quota(void){
+SQLITE_WASM_KEEP int sqlite3_wasm_pstack_quota(void){
   return (int)(PStack.pEnd - PStack.pBegin);
 }
 
@@ -245,9 +245,9 @@ WASM_KEEP int sqlite3_wasm_pstack_quota(void){
 **
 ** Returns err_code.
 */
-WASM_KEEP
+SQLITE_WASM_KEEP
 int sqlite3_wasm_db_error(sqlite3*db, int err_code, const char *zMsg){
-  if(0!=zMsg){
+  if( 0!=zMsg ){
     const int nMsg = sqlite3Strlen30(zMsg);
     sqlite3ErrorWithMsg(db, err_code, "%.*s", nMsg, zMsg);
   }else{
@@ -271,7 +271,7 @@ int sqlite3_wasm_db_error(sqlite3*db, int err_code, const char *zMsg){
 ** buffer is not large enough for the generated JSON and needs to be
 ** increased. In debug builds that will trigger an assert().
 */
-WASM_KEEP
+SQLITE_WASM_KEEP
 const char * sqlite3_wasm_enum_json(void){
   static char aBuffer[1024 * 12] = {0} /* where the JSON goes */;
   int n = 0, nChildren = 0, nStruct = 0
@@ -714,12 +714,16 @@ const char * sqlite3_wasm_enum_json(void){
 ** This function is NOT part of the sqlite3 public API. It is strictly
 ** for use by the sqlite project's own JS/WASM bindings.
 **
+** Do not use this function, even for internal use: it was
+** ill-conceived and will be removed once the JS code which still
+** calls it has been weeded out.
+**
 ** This function invokes the xDelete method of the default VFS,
 ** passing on the given filename. If zName is NULL, no default VFS is
 ** found, or it has no xDelete method, SQLITE_MISUSE is returned, else
 ** the result of the xDelete() call is returned.
 */
-WASM_KEEP
+SQLITE_WASM_KEEP
 int sqlite3_wasm_vfs_unlink(const char * zName){
   int rc = SQLITE_MISUSE /* ??? */;
   sqlite3_vfs * const pVfs = sqlite3_vfs_find(0);
@@ -743,7 +747,7 @@ int sqlite3_wasm_vfs_unlink(const char * zName){
 ** Returns 0 on success, an SQLITE_xxx code on error. Returns
 ** SQLITE_MISUSE if pDb is NULL.
 */
-WASM_KEEP
+SQLITE_WASM_KEEP
 int sqlite3_wasm_db_reset(sqlite3*pDb){
   int rc = SQLITE_MISUSE;
   if( pDb ){
@@ -755,7 +759,7 @@ int sqlite3_wasm_db_reset(sqlite3*pDb){
 }
 
 /*
-** Uses the current database's VFS xRead to stream the db file's
+** Uses the given database's VFS xRead to stream the db file's
 ** contents out to the given callback. The callback gets a single
 ** chunk of size n (its 2nd argument) on each call and must return 0
 ** on success, non-0 on error. This function returns 0 on success,
@@ -768,7 +772,7 @@ int sqlite3_wasm_db_reset(sqlite3*pDb){
 ** sqlite3_wasm_db_serialize() is arguably the better way to achieve
 ** this.
 */
-WASM_KEEP
+SQLITE_WASM_KEEP
 int sqlite3_wasm_db_export_chunked( sqlite3* pDb,
                                     int (*xCallback)(unsigned const char *zOut, int n) ){
   sqlite3_int64 nSize = 0;
@@ -815,9 +819,9 @@ int sqlite3_wasm_db_export_chunked( sqlite3* pDb,
 ** If `*pOut` is not NULL, the caller is responsible for passing it to
 ** sqlite3_free() to free it.
 */
-WASM_KEEP
-int sqlite3_wasm_db_serialize( sqlite3* pDb, unsigned char **pOut, sqlite3_int64 * nOut,
-                               unsigned int mFlags ){
+SQLITE_WASM_KEEP
+int sqlite3_wasm_db_serialize( sqlite3* pDb, unsigned char **pOut,
+                               sqlite3_int64 * nOut, unsigned int mFlags ){
   unsigned char * z;
   if( !pDb || !pOut ) return SQLITE_MISUSE;
   if(nOut) *nOut = 0;
@@ -840,7 +844,7 @@ int sqlite3_wasm_db_serialize( sqlite3* pDb, unsigned char **pOut, sqlite3_int64
 ** NUL-terminated pointer to that string. It is up to the caller to
 ** use sqlite3_wasm_pstack_restore() to free the returned pointer.
 */
-WASM_KEEP
+SQLITE_WASM_KEEP
 char * sqlite3_wasm_kvvfsMakeKeyOnPstack(const char *zClass,
                                          const char *zKeyIn){
   assert(sqlite3KvvfsMethods.nKeySize>24);
@@ -859,7 +863,7 @@ char * sqlite3_wasm_kvvfsMakeKeyOnPstack(const char *zClass,
 ** Returns the pointer to the singleton object which holds the kvvfs
 ** I/O methods and associated state.
 */
-WASM_KEEP
+SQLITE_WASM_KEEP
 sqlite3_kvvfs_methods * sqlite3_wasm_kvvfs_methods(void){
   return &sqlite3KvvfsMethods;
 }
@@ -881,14 +885,14 @@ sqlite3_kvvfs_methods * sqlite3_wasm_kvvfs_methods(void){
 ** This function may be passed a "mount point" name, which must have a
 ** leading "/" and is currently restricted to a single path component,
 ** e.g. "/foo" is legal but "/foo/" and "/foo/bar" are not. If it is
-** NULL or empty, it defaults to "/persistent".
+** NULL or empty, it defaults to "/opfs".
 **
 ** Returns 0 on success, SQLITE_NOMEM if instantiation of the backend
 ** object fails, SQLITE_IOERR if mkdir() of the zMountPoint dir in
 ** the virtual FS fails. In builds compiled without SQLITE_WASM_WASMFS
 ** defined, SQLITE_NOTFOUND is returned without side effects.
 */
-WASM_KEEP
+SQLITE_WASM_KEEP
 int sqlite3_wasm_init_wasmfs(const char *zMountPoint){
   static backend_t pOpfs = 0;
   if( !zMountPoint || !*zMountPoint ) zMountPoint = "/opfs";
@@ -914,7 +918,7 @@ int sqlite3_wasm_init_wasmfs(const char *zMountPoint){
   return pOpfs ? 0 : SQLITE_NOMEM;
 }
 #else
-WASM_KEEP
+SQLITE_WASM_KEEP
 int sqlite3_wasm_init_wasmfs(const char *zUnused){
   emscripten_console_warn("WASMFS OPFS is not compiled in.");
   if(zUnused){/*unused*/}
@@ -922,4 +926,4 @@ int sqlite3_wasm_init_wasmfs(const char *zUnused){
 }
 #endif /* __EMSCRIPTEN__ && SQLITE_WASM_WASMFS */
 
-#undef WASM_KEEP
+#undef SQLITE_WASM_KEEP
diff --git a/manifest b/manifest
index b1db26d204..69d43e4bfc 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Correct\smismatched\sH1\stags\sin\stest\scode.\sMinor\sCSS\stweaks.
-D 2022-10-12T14:39:15.726
+C Minor\sdoc\scleanups\sand\scorrections\sin\ssqlite3-wasm.c
+D 2022-10-12T15:40:16.122
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -491,7 +491,7 @@ F ext/wasm/api/sqlite3-api-opfs.js 5a8ab3b76880c8ada8710ca9ba1ca5b160872edfd8bd5
 F ext/wasm/api/sqlite3-api-prologue.js daf288df965cab1e8eabee4451f6ba3beb03d5a579722b0b0f90e5203962f515
 F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c ea456d398bda1c5f4b2c4a54512de7b9ca4513c2b0ab326b99a46fb51cef0b42
+F ext/wasm/api/sqlite3-wasm.c a321f12ceedac8611c1377ccfb5df0c0547bd9395f7fd7613827de365d994948
 F ext/wasm/batch-runner.html cf1a410c92bad50fcec2ddc71390b4e9df63a6ea1bef12a5163a66a0af4d78d9
 F ext/wasm/batch-runner.js 5bae81684728b6be157d1f92b39824153f0fd019345b39f2ab8930f7ee2a57d8
 F ext/wasm/common/SqliteTestUtil.js 647bf014bd30bdd870a7e9001e251d12fc1c9ec9ce176a1004b838a4b33c5c05
@@ -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 56ff42053f7b73b380c103a84f29e285cfbfb6e18a25b3a50a6d78e32610914e
-R 05647e42780f3b3d4973106aac02535b
+P 4d8eb90a370054d4482c20637ab56f5e01f4d10215f2af4e35fb9a1f85ecb700
+R ec480873b71afa3a4f3e56bd5ade8bb5
 U stephan
-Z 9edc725f213a1258fdc6680a6f64d9ac
+Z 751b3d56cb87f4b752682f04e4cf1f99
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index c0bbdb1f5b..4b5abf1097 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4d8eb90a370054d4482c20637ab56f5e01f4d10215f2af4e35fb9a1f85ecb700
\ No newline at end of file
+5144c122a921e4240901cf4eb46347b92213273eec7cf0977952ab2b60722c27
\ No newline at end of file

From 402da26c1624c4ace6c60bd93f9b32d4131a422e Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 12 Oct 2022 15:54:28 +0000
Subject: [PATCH 264/428] Add initial infrastructure for setting up
 function/regression tests for the JS/WASM APIs.

FossilOrigin-Name: 7f5db9829b6e60fadb756fea5442da1f4368c8428bb5cdaf14f97f0c3c8451d9
---
 ext/wasm/tester1-worker.html |  37 +++++++
 ext/wasm/tester1.html        |  21 ++++
 ext/wasm/tester1.js          | 200 +++++++++++++++++++++++++++++++++++
 manifest                     |  13 ++-
 manifest.uuid                |   2 +-
 5 files changed, 267 insertions(+), 6 deletions(-)
 create mode 100644 ext/wasm/tester1-worker.html
 create mode 100644 ext/wasm/tester1.html
 create mode 100644 ext/wasm/tester1.js

diff --git a/ext/wasm/tester1-worker.html b/ext/wasm/tester1-worker.html
new file mode 100644
index 0000000000..32af0f47c9
--- /dev/null
+++ b/ext/wasm/tester1-worker.html
@@ -0,0 +1,37 @@
+<!doctype html>
+<html lang="en-us">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
+    <link rel="stylesheet" href="../common/emscripten.css"/>
+    <link rel="stylesheet" href="../common/testing.css"/>
+    <title>sqlite3 tester #1 (Worker thread)</title>
+    <style>
+      body {
+          font-family: monospace;
+      }
+    </style>
+  </head>
+  <body>
+    <h1>sqlite3 WASM/JS tester #1 (Worker thread)</h1>
+    <script>(function(){
+      const logHtml = function(cssClass,...args){
+        const ln = document.createElement('div');
+        if(cssClass) ln.classList.add(cssClass);
+        ln.append(document.createTextNode(args.join(' ')));
+        document.body.append(ln);
+      };
+      const w = new Worker("tester1.js");
+      w.onmessage = function({data}){
+        switch(data.type){
+            case 'log':
+              logHtml(data.payload.cssClass, ...data.payload.args);
+              break;
+            default:
+              logHtml('error',"Unhandled message:",data.type);
+        };
+      };
+    })();</script>
+  </body>
+</html>
diff --git a/ext/wasm/tester1.html b/ext/wasm/tester1.html
new file mode 100644
index 0000000000..cf4217a78b
--- /dev/null
+++ b/ext/wasm/tester1.html
@@ -0,0 +1,21 @@
+<!doctype html>
+<html lang="en-us">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
+    <link rel="stylesheet" href="../common/emscripten.css"/>
+    <link rel="stylesheet" href="../common/testing.css"/>
+    <title>sqlite3 tester #1 (UI thread)</title>
+    <style>
+      body {
+          font-family: monospace;
+      }
+    </style>
+  </head>
+  <body>
+    <h1>sqlite3 WASM/JS tester #1 (UI thread)</h1>
+    <script src="sqlite3.js"></script>
+    <script src="tester1.js"></script>
+  </body>
+</html>
diff --git a/ext/wasm/tester1.js b/ext/wasm/tester1.js
new file mode 100644
index 0000000000..d4b6cf7d1a
--- /dev/null
+++ b/ext/wasm/tester1.js
@@ -0,0 +1,200 @@
+/*
+  2022-10-12
+
+  The author disclaims copyright to this source code.  In place of a
+  legal notice, here is a blessing:
+
+  *   May you do good and not evil.
+  *   May you find forgiveness for yourself and forgive others.
+  *   May you share freely, never taking more than you give.
+
+  ***********************************************************************
+
+  Main functional and regression tests for the sqlite3 WASM API.
+*/
+'use strict';
+(function(){
+  /**
+     Set up our output channel differently depending
+     on whether we are running in a worker thread or
+     the main (UI) thread.
+  */
+  let logHtml;
+  const isUIThread = ()=>(self.window===self && self.document);
+  const mapToString = (v)=>{
+    switch(typeof v){
+        case 'number': case 'string': case 'boolean':
+        case 'undefined':
+          return ''+v;
+        default: break;
+    }
+    if(null===v) return 'null';
+    return JSON.stringify(v,undefined,2);
+  };
+  const normalizeArgs = (args)=>args.map(mapToString);
+  if( isUIThread() ){
+    console.log("Running UI thread.");
+    logHtml = function(cssClass,...args){
+      const ln = document.createElement('div');
+      if(cssClass) ln.classList.add(cssClass);
+      ln.append(document.createTextNode(normalizeArgs(args).join(' ')));
+      document.body.append(ln);
+    };
+  }else{ /* Worker thread */
+    console.log("Running Worker thread.");
+    logHtml = function(cssClass,...args){
+      postMessage({
+        type:'log',
+        payload:{cssClass, args: normalizeArgs(args)}
+      });
+    };
+  }
+  const log = (...args)=>{
+    //console.log(...args);
+    logHtml('',...args);
+  }
+  const warn = (...args)=>{
+    console.warn(...args);
+    logHtml('warning',...args);
+  }
+  const error = (...args)=>{
+    console.error(...args);
+    logHtml('error',...args);
+  };
+
+  const toss = (...args)=>{
+    error(...args);
+    throw new Error(args.join(' '));
+  };
+
+  /**
+     Helpers for writing sqlite3-specific tests.
+  */
+  const TestUtil = {
+    /** Running total of the number of tests run via
+        this API. */
+    counter: 0,
+    /**
+       If expr is a function, it is called and its result
+       is returned, coerced to a bool, else expr, coerced to
+       a bool, is returned.
+    */
+    toBool: function(expr){
+      return (expr instanceof Function) ? !!expr() : !!expr;
+    },
+    /** abort() if expr is false. If expr is a function, it
+        is called and its result is evaluated.
+    */
+    assert: function f(expr, msg){
+      if(!f._){
+        f._ = ('undefined'===typeof abort
+               ? (msg)=>{throw new Error(msg)}
+               : abort);
+      }
+      ++this.counter;
+      if(!this.toBool(expr)){
+        f._(msg || "Assertion failed.");
+      }
+      return this;
+    },
+    /** Identical to assert() but throws instead of calling
+        abort(). */
+    affirm: function(expr, msg){
+      ++this.counter;
+      if(!this.toBool(expr)) throw new Error(msg || "Affirmation failed.");
+      return this;
+    },
+    /** Calls f() and squelches any exception it throws. If it
+        does not throw, this function throws. */
+    mustThrow: function(f, msg){
+      ++this.counter;
+      let err;
+      try{ f(); } catch(e){err=e;}
+      if(!err) throw new Error(msg || "Expected exception.");
+      return this;
+    },
+    /**
+       Works like mustThrow() but expects filter to be a regex,
+       function, or string to match/filter the resulting exception
+       against. If f() does not throw, this test fails and an Error is
+       thrown. If filter is a regex, the test passes if
+       filter.test(error.message) passes. If it's a function, the test
+       passes if filter(error) returns truthy. If it's a string, the
+       test passes if the filter matches the exception message
+       precisely. In all other cases the test fails, throwing an
+       Error.
+
+       If it throws, msg is used as the error report unless it's falsy,
+       in which case a default is used.
+    */
+    mustThrowMatching: function(f, filter, msg){
+      ++this.counter;
+      let err;
+      try{ f(); } catch(e){err=e;}
+      if(!err) throw new Error(msg || "Expected exception.");
+      let pass = false;
+      if(filter instanceof RegExp) pass = filter.test(err.message);
+      else if(filter instanceof Function) pass = filter(err);
+      else if('string' === typeof filter) pass = (err.message === filter);
+      if(!pass){
+        throw new Error(msg || ("Filter rejected this exception: "+err.message));
+      }
+      return this;
+    },
+    /** Throws if expr is truthy or expr is a function and expr()
+        returns truthy. */
+    throwIf: function(expr, msg){
+      ++this.counter;
+      if(this.toBool(expr)) throw new Error(msg || "throwIf() failed");
+      return this;
+    },
+    /** Throws if expr is falsy or expr is a function and expr()
+        returns falsy. */
+    throwUnless: function(expr, msg){
+      ++this.counter;
+      if(!this.toBool(expr)) throw new Error(msg || "throwUnless() failed");
+      return this;
+    },
+    TestGroup: class {
+      constructor(name){
+        this.name = name;
+        this.tests = [];
+      }
+      push(name,callback){
+      }
+    }/*TestGroup*/,
+    testGroups: [],
+    currentTestGroup: undefined,
+    addGroup: function(name){
+      if(this.testGroups[name]){
+        toss("Test group already exists:",name);
+      }
+      this.testGroups.push( this.currentTestGroup = new this.TestGroup(name) );
+      return this;
+    },
+    addTest: function(name, callback){
+      this.currentTestGroup.push(name, callback);
+    },
+    runTests: function(){
+      toss("TODO: runTests()");
+    }
+  }/*TestUtil*/;
+
+  
+  log("Loading and initializing sqlite3 WASM module...");
+  if(!isUIThread()){
+    importScripts("sqlite3.js");
+  }
+  self.sqlite3InitModule({
+    print: log,
+    printErr: error
+  }).then(function(sqlite3){
+    //console.log('sqlite3 =',sqlite3);
+    log("Done initializing. Running tests...");
+    try {
+      TestUtil.runTests();
+    }catch(e){
+      error("Tests failed:",e.message);
+    }
+  });
+})();
diff --git a/manifest b/manifest
index 69d43e4bfc..a9dd2c89d3 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\sdoc\scleanups\sand\scorrections\sin\ssqlite3-wasm.c
-D 2022-10-12T15:40:16.122
+C Add\sinitial\sinfrastructure\sfor\ssetting\sup\sfunction/regression\stests\sfor\sthe\sJS/WASM\sAPIs.
+D 2022-10-12T15:54:28.657
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -527,6 +527,9 @@ F ext/wasm/sqlite3-worker1-promiser.js 307d7837420ca6a9d3780dfc81194f1c0715637e6
 F ext/wasm/sqlite3-worker1.js 466e9bd39409ab03f3e00999887aaffc11e95b416e2689596e3d7f1516673fdf
 F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
 F ext/wasm/test-opfs-vfs.js 56c3d725044c668fa7910451e96c1195d25ad95825f9ac79f747a7759d1973d0
+F ext/wasm/tester1-worker.html 9d24bfc5aec4d81ce00695dea2dbed262eb486f59e3ce75746de9f5b58b128a0
+F ext/wasm/tester1.html 13ad0dc087bdd8be1e9a4869d591d0c9915e89c8e191bce7803dc23b45cdd912
+F ext/wasm/tester1.js 2f05d90d7c8f519ff6a09bb5a7a1a3ad853aea72c4e51553f2c004446465b179
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
 F ext/wasm/testing-worker1-promiser.js bd788e33c1807e0a6dda9c9a9d784bd3350ca49c9dd8ae2cc8719b506b6e013e
 F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d7669fb17fcae
@@ -2029,8 +2032,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 4d8eb90a370054d4482c20637ab56f5e01f4d10215f2af4e35fb9a1f85ecb700
-R ec480873b71afa3a4f3e56bd5ade8bb5
+P 5144c122a921e4240901cf4eb46347b92213273eec7cf0977952ab2b60722c27
+R a82c7637aadf073be20dddba63284e1f
 U stephan
-Z 751b3d56cb87f4b752682f04e4cf1f99
+Z 2f8d1fea1ed0d036410539dd7b357510
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 4b5abf1097..70d7ca7a23 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5144c122a921e4240901cf4eb46347b92213273eec7cf0977952ab2b60722c27
\ No newline at end of file
+7f5db9829b6e60fadb756fea5442da1f4368c8428bb5cdaf14f97f0c3c8451d9
\ No newline at end of file

From 131aa13a2a5d247e69d7a2fc440ef4192a09f182 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Wed, 12 Oct 2022 18:30:08 +0000
Subject: [PATCH 265/428] Changes to Makefile.msc to fix the build on Windows
 following the previous merge.

FossilOrigin-Name: 368fa6b25bc803ded7c1a0184615980902657879370caec22ceea42496ec0566
---
 Makefile.msc  |  6 +++++-
 manifest      | 21 ++++++++++-----------
 manifest.uuid |  2 +-
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/Makefile.msc b/Makefile.msc
index 9baa4ae937..6c4e99d696 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -1251,7 +1251,7 @@ LIBOBJS0 = vdbe.lo parse.lo alter.lo analyze.lo attach.lo auth.lo \
          main.lo malloc.lo mem0.lo mem1.lo mem2.lo mem3.lo mem5.lo \
          memdb.lo memjournal.lo \
          mutex.lo mutex_noop.lo mutex_unix.lo mutex_w32.lo \
-         notify.lo opcodes.lo os.lo os_unix.lo os_win.lo \
+         notify.lo opcodes.lo os.lo os_kv.lo os_unix.lo os_win.lo \
          pager.lo pcache.lo pcache1.lo pragma.lo prepare.lo printf.lo \
          random.lo resolve.lo rowset.lo rtree.lo \
          sqlite3session.lo select.lo sqlite3rbu.lo status.lo stmt.lo \
@@ -1332,6 +1332,7 @@ SRC00 = \
   $(TOP)\src\mutex_w32.c \
   $(TOP)\src\notify.c \
   $(TOP)\src\os.c \
+  $(TOP)\src\os_kv.c \
   $(TOP)\src\os_unix.c \
   $(TOP)\src\os_win.c
 
@@ -2053,6 +2054,9 @@ pcache1.lo:	$(TOP)\src\pcache1.c $(HDR) $(TOP)\src\pcache.h
 os.lo:	$(TOP)\src\os.c $(HDR)
 	$(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\os.c
 
+os_kv.lo:	$(TOP)\src\os_kv.c $(HDR)
+	$(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\os_kv.c
+
 os_unix.lo:	$(TOP)\src\os_unix.c $(HDR)
 	$(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\os_unix.c
 
diff --git a/manifest b/manifest
index 7ef496aefe..4e2d560dc1 100644
--- a/manifest
+++ b/manifest
@@ -1,11 +1,11 @@
-C Merge\sfiddle-opfs\sbranch\sinto\strunk.
-D 2022-10-12T18:13:52.265
+C Changes\sto\sMakefile.msc\sto\sfix\sthe\sbuild\son\sWindows\sfollowing\sthe\sprevious\nmerge.
+D 2022-10-12T18:30:08.886
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
 F Makefile.in d7c7b4f0751ab67b5f15119bf9d22a153ef5ce47c3db0f1f4f91236a10e0ea66
 F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
-F Makefile.msc d547a2fdba38a1c6cd1954977d0b0cc017f5f8fbfbc65287bf8d335808938016
+F Makefile.msc 905b7205ef708fea740b17f35d8a8ec7a7aa1e034ee53b708b75c094eeab4e21
 F README.md 8b8df9ca852aeac4864eb1e400002633ee6db84065bd01b78c33817f97d31f5e
 F VERSION 8868ddfa6e1eee218286021a94b3e22d13e550c76c72d878857547ca001de24a
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -471,7 +471,7 @@ F ext/session/test_session.c f433f68a8a8c64b0f5bc74dc725078f12483301ad4ae8375205
 F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
-F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c w ext/wasm/EXPORTED_FUNCTIONS.fiddle
+F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle 0e88c8cfc3719e4b7e74980d9da664c709e68acf863e48386cda376edfd3bfb0
 F ext/wasm/GNUmakefile 8ab74ed186a15d956a21b28fa0800b84af2b8a289392ae2dff8126ff033bd3f9
 F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
@@ -488,7 +488,7 @@ F ext/wasm/api/sqlite3-api-glue.js 3b2a43c7b2ceb2b60f5f4a1afefbd93508c2fe0f2e667
 F ext/wasm/api/sqlite3-api-oo1.js ac1e08d36bdfb5aa0a2d75b7d4c892fd51819d34c932370c3282810672bcc086
 F ext/wasm/api/sqlite3-api-opfs.js 5a8ab3b76880c8ada8710ca9ba1ca5b160872edfd8bd5322e4f179a7f41cc616
 F ext/wasm/api/sqlite3-api-prologue.js daf288df965cab1e8eabee4451f6ba3beb03d5a579722b0b0f90e5203962f515
-F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8 w ext/wasm/api/sqlite3-api-worker.js
+F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c a321f12ceedac8611c1377ccfb5df0c0547bd9395f7fd7613827de365d994948
 F ext/wasm/batch-runner.html cf1a410c92bad50fcec2ddc71390b4e9df63a6ea1bef12a5163a66a0af4d78d9
@@ -523,7 +523,7 @@ F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d826
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
 F ext/wasm/sqlite3-opfs-async-proxy.js 40fc1f779e18e08b31404ef832381ffd36b9d11447007aaf96223198324e4467
 F ext/wasm/sqlite3-worker1-promiser.js 307d7837420ca6a9d3780dfc81194f1c0715637e6d9540e935514086b96913d8
-F ext/wasm/sqlite3-worker1.js 466e9bd39409ab03f3e00999887aaffc11e95b416e2689596e3d7f1516673fdf w ext/wasm/api/sqlite3-worker.js
+F ext/wasm/sqlite3-worker1.js 466e9bd39409ab03f3e00999887aaffc11e95b416e2689596e3d7f1516673fdf
 F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
 F ext/wasm/test-opfs-vfs.js 56c3d725044c668fa7910451e96c1195d25ad95825f9ac79f747a7759d1973d0
 F ext/wasm/tester1-worker.html 9d24bfc5aec4d81ce00695dea2dbed262eb486f59e3ce75746de9f5b58b128a0
@@ -2034,9 +2034,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 d6d449978245b4fa66c152132da468eea7977eab4d1fe53bb2fe3ef543d8030f 5e1848ce384a78fe5dfa1b5c1b2acb9c2fac34a8f0ba6c652e0541dcf24e9027
-R adcad742e1699a0071e5b7c35c0ae37c
-T +closed 5e1848ce384a78fe5dfa1b5c1b2acb9c2fac34a8f0ba6c652e0541dcf24e9027 Closed\sby\sintegrate-merge.
-U stephan
-Z 961b9c0cc90eaad2ec9486f80b7d7b18
+P 98f954942a8d4824b5c4bd1d27cfeff7a71a029dc5a54220b76d59e367996581
+R 54aab607449d14558025d70793f3c47c
+U drh
+Z e026cd3c8f91b1cd55f89d31b35f702a
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 979cd0efbb..aec81506ee 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-98f954942a8d4824b5c4bd1d27cfeff7a71a029dc5a54220b76d59e367996581
\ No newline at end of file
+368fa6b25bc803ded7c1a0184615980902657879370caec22ceea42496ec0566
\ No newline at end of file

From 1ffb6be1195c592e6c85d57603984b1f36bfde62 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Wed, 12 Oct 2022 18:40:25 +0000
Subject: [PATCH 266/428] Updates to the fuzzer query invariant checker -
 tracking changes made over in dbsqlfuzz.

FossilOrigin-Name: 4ca16a304ad10fbb48f78b4384b347fe883e1a4f222f113ac981e89845c3e113
---
 manifest              |  12 ++--
 manifest.uuid         |   2 +-
 test/fuzzinvariants.c | 136 +++++++++++++++++++++++++++++++++++-------
 3 files changed, 122 insertions(+), 28 deletions(-)

diff --git a/manifest b/manifest
index 4e2d560dc1..d95623c883 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Changes\sto\sMakefile.msc\sto\sfix\sthe\sbuild\son\sWindows\sfollowing\sthe\sprevious\nmerge.
-D 2022-10-12T18:30:08.886
+C Updates\sto\sthe\sfuzzer\squery\sinvariant\schecker\s-\stracking\schanges\smade\nover\sin\sdbsqlfuzz.
+D 2022-10-12T18:40:25.766
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1149,7 +1149,7 @@ F test/fuzzdata8.db 653423800b7671e67caa740e977d80e1360f0d69e9992851f3ea5c4a69a2
 F test/fuzzer1.test 3d4c4b7e547aba5e5511a2991e3e3d07166cfbb8
 F test/fuzzer2.test a85ef814ce071293bce1ad8dffa217cbbaad4c14
 F test/fuzzerfault.test f64c4aef4c9e9edf1d6dc0d3f1e65dcc81e67c996403c88d14f09b74807a42bc
-F test/fuzzinvariants.c d7bb4a0fcc0ac344bcb72f1b86e4ae0acba5ea26dddde8160ee3db6520f10c64
+F test/fuzzinvariants.c a91f439e512c72045bddaf0f0ee3b876b2fe645e076aefb085658f1337066f7e
 F test/gcfault.test dd28c228a38976d6336a3fc42d7e5f1ad060cb8c
 F test/gencol1.test cc0dbb0ee116e5602e18ea7d47f2a0f76b26e09a823b7c36ef254370c2b0f3c1
 F test/genesis.tcl 1e2e2e8e5cc4058549a154ff1892fe5c9de19f98
@@ -2034,8 +2034,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 98f954942a8d4824b5c4bd1d27cfeff7a71a029dc5a54220b76d59e367996581
-R 54aab607449d14558025d70793f3c47c
+P 368fa6b25bc803ded7c1a0184615980902657879370caec22ceea42496ec0566
+R b6417444abfe9dc882e90feaa0e7d85d
 U drh
-Z e026cd3c8f91b1cd55f89d31b35f702a
+Z 6e9d8b3a258c07649344995d3cb09455
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index aec81506ee..ca633fd6b3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-368fa6b25bc803ded7c1a0184615980902657879370caec22ceea42496ec0566
\ No newline at end of file
+4ca16a304ad10fbb48f78b4384b347fe883e1a4f222f113ac981e89845c3e113
\ No newline at end of file
diff --git a/test/fuzzinvariants.c b/test/fuzzinvariants.c
index 90f1fad492..73fede630e 100644
--- a/test/fuzzinvariants.c
+++ b/test/fuzzinvariants.c
@@ -46,11 +46,14 @@ static void reportInvariantFailed(sqlite3_stmt*,sqlite3_stmt*,int);
 **
 **     SQLITE_OK          This check was successful.
 **
-**     SQLITE_DONE        iCnt is out of range.
+**     SQLITE_DONE        iCnt is out of range.  The caller typically sets
+**                        up a loop on iCnt starting with zero, and increments
+**                        iCnt until this code is returned.
 **
 **     SQLITE_CORRUPT     The invariant failed, but the underlying database
 **                        file is indicating that it is corrupt, which might
-**                        be the cause of the malfunction.
+**                        be the cause of the malfunction.  The *pCorrupt
+**                        value will also be set.
 **
 **     SQLITE_INTERNAL    The invariant failed, and the database file is not
 **                        corrupt.  (This never happens because this function
@@ -142,6 +145,20 @@ int fuzz_invariant(
       */
       goto not_a_fault;
     }
+    if( sqlite3_strlike("%limit%)%order%by%", sqlite3_sql(pTestStmt),0)==0 ){
+      /* crash-89bd6a6f8c6166e9a4c5f47b3e70b225f69b76c6
+      ** Original statement is:
+      **
+      **    SELECT a,b,c* FROM t1 LIMIT 1%5<4
+      **
+      ** When running:
+      **
+      **    SELECT * FROM (...) ORDER BY 1
+      **
+      ** A different subset of the rows come out
+      */
+      goto not_a_fault;
+    }
     rc = sqlite3_prepare_v2(db, 
             "SELECT 1 FROM bytecode(?1) WHERE opcode='VOpen'", -1, &pCk, 0);
     if( rc==SQLITE_OK ){
@@ -166,6 +183,24 @@ not_a_fault:
 ** Generate SQL used to test a statement invariant.
 **
 ** Return 0 if the iCnt is out of range.
+**
+** iCnt meanings:
+**
+**   0     SELECT * FROM (<query>)
+**   1     SELECT DISTINCT * FROM (<query>)
+**   2     SELECT * FROM (<query>) WHERE ORDER BY 1
+**   3     SELECT DISTINCT * FROM (<query>) ORDER BY 1
+**   4     SELECT * FROM (<query>) WHERE <all-columns>=<all-values>
+**   5     SELECT DISTINCT * FROM (<query>) WHERE <all-columns=<all-values
+**   6     SELECT * FROM (<query>) WHERE <all-column>=<all-value> ORDER BY 1
+**   7     SELECT DISTINCT * FROM (<query>) WHERE <all-column>=<all-value>
+**                           ORDER BY 1
+**   N+0   SELECT * FROM (<query>) WHERE <nth-column>=<value>
+**   N+1   SELECT DISTINCT * FROM (<query>) WHERE <Nth-column>=<value>
+**   N+2   SELECT * FROM (<query>) WHERE <Nth-column>=<value> ORDER BY 1
+**   N+3   SELECT DISTINCT * FROM (<query>) WHERE <Nth-column>=<value>
+**                           ORDER BY N
+**
 */
 static char *fuzz_invariant_sql(sqlite3_stmt *pStmt, int iCnt){
   const char *zIn;
@@ -182,7 +217,6 @@ static char *fuzz_invariant_sql(sqlite3_stmt *pStmt, int iCnt){
   int bOrderBy = 0;
   int nParam = sqlite3_bind_parameter_count(pStmt);
 
-  iCnt++;
   switch( iCnt % 4 ){
     case 1:  bDistinct = 1;              break;
     case 2:  bOrderBy = 1;               break;
@@ -197,9 +231,10 @@ static char *fuzz_invariant_sql(sqlite3_stmt *pStmt, int iCnt){
   while( nIn>0 && (isspace(zIn[nIn-1]) || zIn[nIn-1]==';') ) nIn--;
   if( strchr(zIn, '?') ) return 0;
   pTest = sqlite3_str_new(0);
-  sqlite3_str_appendf(pTest, "SELECT %s* FROM (%s",
-                      bDistinct ? "DISTINCT " : "", zIn);
-  sqlite3_str_appendf(pTest, ")");
+  sqlite3_str_appendf(pTest, "SELECT %s* FROM (",  
+                      bDistinct ? "DISTINCT " : "");
+  sqlite3_str_append(pTest, zIn, nIn);
+  sqlite3_str_append(pTest, ")", 1);
   rc = sqlite3_prepare_v2(db, sqlite3_str_value(pTest), -1, &pBase, 0);
   if( rc ){
     sqlite3_finalize(pBase);
@@ -216,7 +251,8 @@ static char *fuzz_invariant_sql(sqlite3_stmt *pStmt, int iCnt){
       ** WHERE clause. */
       continue;
     }
-    if( i+1!=iCnt ) continue;
+    if( iCnt==0 ) continue;
+    if( iCnt>1 && i+2!=iCnt ) continue;
     if( zColName==0 ) continue;
     if( sqlite3_column_type(pStmt, i)==SQLITE_NULL ){
       sqlite3_str_appendf(pTest, " %s \"%w\" ISNULL", zAnd, zColName);
@@ -228,7 +264,7 @@ static char *fuzz_invariant_sql(sqlite3_stmt *pStmt, int iCnt){
   }
   if( pBase!=pStmt ) sqlite3_finalize(pBase);
   if( bOrderBy ){
-    sqlite3_str_appendf(pTest, " ORDER BY 1");
+    sqlite3_str_appendf(pTest, " ORDER BY %d", iCnt>2 ? iCnt-1 : 1);
   }
   return sqlite3_str_finish(pTest);
 }
@@ -259,10 +295,30 @@ static int sameValue(sqlite3_stmt *pS1, int i1, sqlite3_stmt *pS2, int i2){
       break;
     }
     case SQLITE_TEXT: {
-      const char *z1 = (const char*)sqlite3_column_text(pS1,i1);
-      const char *z2 = (const char*)sqlite3_column_text(pS2,i2);
-      x = ((z1==0 && z2==0) || (z1!=0 && z2!=0 && strcmp(z1,z1)==0));
-      break;
+      int e1 = sqlite3_value_encoding(sqlite3_column_value(pS1,i1));
+      int e2 = sqlite3_value_encoding(sqlite3_column_value(pS2,i2));
+      if( e1!=e2 ){
+        const char *z1 = (const char*)sqlite3_column_text(pS1,i1);
+        const char *z2 = (const char*)sqlite3_column_text(pS2,i2);
+        x = ((z1==0 && z2==0) || (z1!=0 && z2!=0 && strcmp(z1,z1)==0));
+        printf("Encodings differ.  %d on left and %d on right\n", e1, e2);
+        break;
+      }
+      if( e1!=SQLITE_UTF8 ){
+        int len1 = sqlite3_column_bytes16(pS1,i1);
+        const unsigned char *b1 = sqlite3_column_blob(pS1,i1);
+        int len2 = sqlite3_column_bytes16(pS2,i2);
+        const unsigned char *b2 = sqlite3_column_blob(pS2,i2);
+        if( len1!=len2 ){
+          x = 0;
+        }else if( len1==0 ){
+          x = 1;
+        }else{
+          x = (b1!=0 && b2!=0 && memcmp(b1,b2,len1)==0);
+        }
+        break;
+      }
+      /* Fall through into the SQLITE_BLOB case */
     }
     case SQLITE_BLOB: {
       int len1 = sqlite3_column_bytes(pS1,i1);
@@ -282,11 +338,23 @@ static int sameValue(sqlite3_stmt *pS1, int i1, sqlite3_stmt *pS2, int i2){
   return x;
 }
 
+/*
+** Print binary data as hex
+*/
+static void printHex(const unsigned char *a, int n, int mx){
+  int j;
+  for(j=0; j<mx && j<n; j++){
+    printf("%02x", a[j]);
+  }
+  if( j<n ) printf("...");
+}
+
 /*
 ** Print a single row from the prepared statement
 */
 static void printRow(sqlite3_stmt *pStmt, int iRow){
-  int i, nCol;
+  int i, n, nCol;
+  unsigned const char *data;
   nCol = sqlite3_column_count(pStmt);
   for(i=0; i<nCol; i++){
     printf("row%d.col%d = ", iRow, i);
@@ -304,18 +372,44 @@ static void printRow(sqlite3_stmt *pStmt, int iRow){
         break;
       }
       case SQLITE_TEXT: {
-        printf("(text) \"%s\"\n", sqlite3_column_text(pStmt, i));
+        switch( sqlite3_value_encoding(sqlite3_column_value(pStmt,i)) ){
+          case SQLITE_UTF8: {
+            printf("(utf8) x'");
+            n = sqlite3_column_bytes(pStmt, i);
+            data = sqlite3_column_blob(pStmt, i);
+            printHex(data, n, 35);
+            printf("'\n");
+            break;
+          }
+          case SQLITE_UTF16BE: {
+            printf("(utf16be) x'");
+            n = sqlite3_column_bytes16(pStmt, i);
+            data = sqlite3_column_blob(pStmt, i);
+            printHex(data, n, 35);
+            printf("'\n");
+            break;
+          }
+          case SQLITE_UTF16LE: {
+            printf("(utf16le) x'");
+            n = sqlite3_column_bytes16(pStmt, i);
+            data = sqlite3_column_blob(pStmt, i);
+            printHex(data, n, 35);
+            printf("'\n");
+            break;
+          }
+          default: {
+            printf("Illegal return from sqlite3_value_encoding(): %d\n",
+                sqlite3_value_encoding(sqlite3_column_value(pStmt,i)));
+            abort();
+          }
+        }
         break;
       }
       case SQLITE_BLOB: {
-        int n = sqlite3_column_bytes(pStmt, i);
-        int j;
-        unsigned const char *data = sqlite3_column_blob(pStmt, i);
+        n = sqlite3_column_bytes(pStmt, i);
+        data = sqlite3_column_blob(pStmt, i);
         printf("(blob %d bytes) x'", n);
-        for(j=0; j<20 && j<n; j++){
-          printf("%02x", data[j]);
-        }
-        if( j<n ) printf("...");
+        printHex(data, n, 35);
         printf("'\n");
         break;
       }

From d85d08398dbd06f6d8e1a96a58e6f538090c0fb9 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Thu, 13 Oct 2022 08:03:31 +0000
Subject: [PATCH 267/428] Port the first 180-odd unit tests from testing1.*
 into the new tester1.*. Fix a stray-keystroke-induced typo which broke
 pstack.allocChunks().

FossilOrigin-Name: ef689e33e464829f5cbe4ca24a53d9dba59abe74d3d80a37a91b93a4eccccf2d
---
 ext/wasm/api/sqlite3-api-prologue.js |   3 +-
 ext/wasm/common/testing.css          |   4 +
 ext/wasm/tester1-worker.html         |   4 +-
 ext/wasm/tester1.html                |   1 +
 ext/wasm/tester1.js                  | 595 +++++++++++++++++++++++++--
 ext/wasm/testing1.js                 |   4 +-
 manifest                             |  24 +-
 manifest.uuid                        |   2 +-
 8 files changed, 591 insertions(+), 46 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 61bbeabb15..10d09d7404 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -941,8 +941,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     */
     allocChunks: (n,sz)=>{
       const mem = wasm.pstack.alloc(n * sz);
-      const r 
-= [];
+      const rc = [];
       let i = 0, offset = 0;
       for(; i < n; offset = (sz * ++i)){
         rc.push(mem + offset);
diff --git a/ext/wasm/common/testing.css b/ext/wasm/common/testing.css
index 8782e3862d..c8629a2c62 100644
--- a/ext/wasm/common/testing.css
+++ b/ext/wasm/common/testing.css
@@ -36,9 +36,13 @@ span.labeled-input {
     background-color: yellow;
 }
 .warning { color: firebrick; }
+.green { color: darkgreen; }
+.group-start { color: blue; }
+.group-end { color: blue; }
 .input-wrapper { white-space: nowrap; }
 #test-output {
   border: 1px inset;
+  border-radius: 0.25em;
   padding: 0.25em;
   /*max-height: 30em;*/
   overflow: auto;
diff --git a/ext/wasm/tester1-worker.html b/ext/wasm/tester1-worker.html
index 32af0f47c9..bb5de0762f 100644
--- a/ext/wasm/tester1-worker.html
+++ b/ext/wasm/tester1-worker.html
@@ -15,12 +15,14 @@
   </head>
   <body>
     <h1>sqlite3 WASM/JS tester #1 (Worker thread)</h1>
+    <div id='test-output'></div>
     <script>(function(){
+      const logTarget = document.querySelector('#test-output');
       const logHtml = function(cssClass,...args){
         const ln = document.createElement('div');
         if(cssClass) ln.classList.add(cssClass);
         ln.append(document.createTextNode(args.join(' ')));
-        document.body.append(ln);
+        logTarget.append(ln);
       };
       const w = new Worker("tester1.js");
       w.onmessage = function({data}){
diff --git a/ext/wasm/tester1.html b/ext/wasm/tester1.html
index cf4217a78b..9cf0bee0a3 100644
--- a/ext/wasm/tester1.html
+++ b/ext/wasm/tester1.html
@@ -15,6 +15,7 @@
   </head>
   <body>
     <h1>sqlite3 WASM/JS tester #1 (UI thread)</h1>
+    <div id='test-output'></div>
     <script src="sqlite3.js"></script>
     <script src="tester1.js"></script>
   </body>
diff --git a/ext/wasm/tester1.js b/ext/wasm/tester1.js
index d4b6cf7d1a..ae4cc0c949 100644
--- a/ext/wasm/tester1.js
+++ b/ext/wasm/tester1.js
@@ -11,6 +11,23 @@
   ***********************************************************************
 
   Main functional and regression tests for the sqlite3 WASM API.
+
+  This mini-framework works like so:
+
+  This script adds a series of test groups, each of which contains an
+  arbitrary number of tests, into a queue. After loading of the
+  sqlite3 WASM/JS module is complete, that queue is processed. If any
+  given test fails, the whole thing fails. This script is built such
+  that it can run from the main UI thread or worker thread. Test
+  groups and individual tests can be assigned a predicate function
+  which determines whether to run them or not, and this is
+  specifically intended to be used to toggle certain tests on or off
+  for the main/worker threads.
+
+  Each test group defines a state object which gets applied as each
+  test function's `this`. Test functions can use that to, e.g., set up
+  a db in an early test and close it in a later test. Each test gets
+  passed the sqlite3 namespace object as its only argument.
 */
 'use strict';
 (function(){
@@ -19,8 +36,16 @@
      on whether we are running in a worker thread or
      the main (UI) thread.
   */
-  let logHtml;
+  let logClass;
+  /* Predicate for tests/groups. */
   const isUIThread = ()=>(self.window===self && self.document);
+  /* Predicate for tests/groups. */
+  const isWorker = ()=>!isUIThread();
+  /* Predicate for tests/groups. */
+  const testIsTodo = ()=>false;
+  const haveJaccwabytTests = function(){
+    return !!wasm.exports.jaccwabyt_test_int64_max;
+  };
   const mapToString = (v)=>{
     switch(typeof v){
         case 'number': case 'string': case 'boolean':
@@ -29,20 +54,28 @@
         default: break;
     }
     if(null===v) return 'null';
+    if(v instanceof Error){
+      v = {
+        message: v.message,
+        stack: v.stack,
+        errorClass: v.name
+      };
+    }
     return JSON.stringify(v,undefined,2);
   };
   const normalizeArgs = (args)=>args.map(mapToString);
   if( isUIThread() ){
-    console.log("Running UI thread.");
-    logHtml = function(cssClass,...args){
+    console.log("Running in UI thread.");
+    const logTarget = document.querySelector('#test-output');
+    logClass = function(cssClass,...args){
       const ln = document.createElement('div');
       if(cssClass) ln.classList.add(cssClass);
       ln.append(document.createTextNode(normalizeArgs(args).join(' ')));
-      document.body.append(ln);
+      logTarget.append(ln);
     };
   }else{ /* Worker thread */
     console.log("Running Worker thread.");
-    logHtml = function(cssClass,...args){
+    logClass = function(cssClass,...args){
       postMessage({
         type:'log',
         payload:{cssClass, args: normalizeArgs(args)}
@@ -51,21 +84,24 @@
   }
   const log = (...args)=>{
     //console.log(...args);
-    logHtml('',...args);
+    logClass('',...args);
   }
   const warn = (...args)=>{
     console.warn(...args);
-    logHtml('warning',...args);
+    logClass('warning',...args);
   }
   const error = (...args)=>{
     console.error(...args);
-    logHtml('error',...args);
+    logClass('error',...args);
   };
 
   const toss = (...args)=>{
     error(...args);
     throw new Error(args.join(' '));
   };
+  const tossQuietly = (...args)=>{
+    throw new Error(args.join(' '));
+  };
 
   /**
      Helpers for writing sqlite3-specific tests.
@@ -74,6 +110,8 @@
     /** Running total of the number of tests run via
         this API. */
     counter: 0,
+    /* Separator line for log messages. */
+    separator: '------------------------------------------------------------',
     /**
        If expr is a function, it is called and its result
        is returned, coerced to a bool, else expr, coerced to
@@ -155,32 +193,531 @@
       if(!this.toBool(expr)) throw new Error(msg || "throwUnless() failed");
       return this;
     },
-    TestGroup: class {
-      constructor(name){
+    eqApprox: (v1,v2,factor=0.05)=>(v1>=(v2-factor) && v1<=(v2+factor)),
+    TestGroup: (function(){
+      let groupCounter = 0;
+      const TestGroup = function(name, predicate){
+        this.number = ++groupCounter;
         this.name = name;
+        this.predicate = predicate;
         this.tests = [];
-      }
-      push(name,callback){
-      }
-    }/*TestGroup*/,
+      };
+      TestGroup.prototype = {
+        addTest: function(testObj){
+          this.tests.push(testObj);
+          return this;
+        },
+        run: async function(sqlite3){
+          if(this.predicate && !this.predicate()){
+            log("SKIPPING test group #"+this.number,this.name);
+            return;
+          }
+          log(TestUtil.separator);
+          logClass('group-start',"Group #"+this.number+':',this.name);
+          const indent = '....';
+          const assertCount = TestUtil.counter;
+          const groupState = Object.create(null);
+          const skipped = [];
+          for(let i in this.tests){
+            const t = this.tests[i];
+            const n = this.number+"."+i;
+            if(t.predicate && !t.predicate()){
+              logClass('warning',indent, n+': SKIPPING',t.name);
+              skipped.push( n+': '+t.name );
+            }else{
+              const tc = TestUtil.counter
+              log(indent, n+":", t.name);
+              await t.test.call(groupState, sqlite3);
+              //log(indent, indent, 'assertion count:',TestUtil.counter - tc);
+            }
+          }
+          logClass('green',
+                   "Group #"+this.number,"assertion count:",(TestUtil.counter - assertCount));
+          if(skipped.length){
+            log("SKIPPED test(s) in group",this.number+":",skipped);
+          }
+        }
+      };
+      return TestGroup;
+    })()/*TestGroup*/,
     testGroups: [],
     currentTestGroup: undefined,
-    addGroup: function(name){
-      if(this.testGroups[name]){
-        toss("Test group already exists:",name);
-      }
+    addGroup: function(name, predicate){
       this.testGroups.push( this.currentTestGroup = new this.TestGroup(name) );
       return this;
     },
     addTest: function(name, callback){
-      this.currentTestGroup.push(name, callback);
+      let predicate;
+      if(1===arguments.length){
+        const opt = arguments[0];
+        predicate = opt.predicate;
+        name = opt.name;
+        callback = opt.test;
+      }
+      this.currentTestGroup.addTest({
+        name, predicate, test: callback
+      });
+      return this;
     },
-    runTests: function(){
-      toss("TODO: runTests()");
+    runTests: async function(sqlite3){
+      return new Promise(async function(pok,pnok){
+        try {
+          for(let g of this.testGroups){
+            await g.run(sqlite3);
+          }
+          log(TestUtil.separator);
+          log("Done running tests. Total assertion count:",TestUtil.counter);
+          pok();
+        }catch(e){
+          error(e);
+          pnok(e);
+        }
+      }.bind(this));
     }
   }/*TestUtil*/;
-
+  const T = TestUtil;
+  T.g = T.addGroup;
+  T.t = T.addTest;
+  let capi, wasm/*assigned after module init*/;
+  ////////////////////////////////////////////////////////////////////////
+  // End of infrastructure setup. Now define the tests...
+  ////////////////////////////////////////////////////////////////////////
   
+  T.g('Basic sanity checks')
+    .t('Namespace object checks', function(sqlite3){
+      const wasmCtypes = wasm.ctype;
+      T.assert(wasmCtypes.structs[0].name==='sqlite3_vfs').
+        assert(wasmCtypes.structs[0].members.szOsFile.sizeof>=4).
+        assert(wasmCtypes.structs[1/*sqlite3_io_methods*/
+                                 ].members.xFileSize.offset>0);
+      [ /* Spot-check a handful of constants to make sure they got installed... */
+        'SQLITE_SCHEMA','SQLITE_NULL','SQLITE_UTF8',
+        'SQLITE_STATIC', 'SQLITE_DIRECTONLY',
+        'SQLITE_OPEN_CREATE', 'SQLITE_OPEN_DELETEONCLOSE'
+      ].forEach((k)=>T.assert('number' === typeof capi[k]));
+      [/* Spot-check a few of the WASM API methods. */
+        'alloc', 'dealloc', 'installFunction'
+      ].forEach((k)=>T.assert(wasm[k] instanceof Function));
+
+      T.assert(capi.sqlite3_errstr(capi.SQLITE_IOERR_ACCESS).indexOf("I/O")>=0).
+        assert(capi.sqlite3_errstr(capi.SQLITE_CORRUPT).indexOf('malformed')>0).
+        assert(capi.sqlite3_errstr(capi.SQLITE_OK) === 'not an error');
+
+      try {
+        throw new sqlite3.WasmAllocError;
+      }catch(e){
+        T.assert(e instanceof Error)
+          .assert(e instanceof sqlite3.WasmAllocError);
+      }
+    })
+    .t('strglob/strlike', function(sqlite3){
+      T.assert(0===capi.sqlite3_strglob("*.txt", "foo.txt")).
+        assert(0!==capi.sqlite3_strglob("*.txt", "foo.xtx")).
+        assert(0===capi.sqlite3_strlike("%.txt", "foo.txt", 0)).
+        assert(0!==capi.sqlite3_strlike("%.txt", "foo.xtx", 0));
+    })
+
+    .t('sqlite3.capi.wasm.pstack', function(sqlite3){
+      const w = sqlite3.capi.wasm, P = w.pstack;
+      const isAllocErr = (e)=>e instanceof sqlite3.WasmAllocError;
+      const stack = P.pointer;
+      T.assert(0===stack % 8 /* must be 8-byte aligned */);
+      try{
+        const remaining = P.remaining;
+        T.assert(P.quota >= 4096)
+          .assert(remaining === P.quota)
+          .mustThrowMatching(()=>P.alloc(0), isAllocErr)
+          .mustThrowMatching(()=>P.alloc(-1), isAllocErr);
+        let p1 = P.alloc(12);
+        T.assert(p1 === stack - 16/*8-byte aligned*/)
+          .assert(P.pointer === p1);
+        let p2 = P.alloc(7);
+        T.assert(p2 === p1-8/*8-byte aligned, stack grows downwards*/)
+          .mustThrowMatching(()=>P.alloc(remaining), isAllocErr)
+          .assert(24 === stack - p2)
+          .assert(P.pointer === p2);
+        let n = remaining - (stack - p2);
+        let p3 = P.alloc(n);
+        T.assert(p3 === stack-remaining)
+          .mustThrowMatching(()=>P.alloc(1), isAllocErr);
+      }finally{
+        P.restore(stack);
+      }
+
+      T.assert(P.pointer === stack);
+      try {
+        const [p1, p2, p3] = P.allocChunks(3,4);
+        T.assert(P.pointer === stack-16/*always rounded to multiple of 8*/)
+          .assert(p2 === p1 + 4)
+          .assert(p3 === p2 + 4);
+        T.mustThrowMatching(()=>P.allocChunks(1024, 1024 * 16),
+                            (e)=>e instanceof sqlite3.WasmAllocError)
+      }finally{
+        P.restore(stack);
+      }
+
+      T.assert(P.pointer === stack);
+      try {
+        let [p1, p2, p3] = P.allocPtr(3,false);
+        let sPos = stack-16/*always rounded to multiple of 8*/;
+        T.assert(P.pointer === sPos)
+          .assert(p2 === p1 + 4)
+          .assert(p3 === p2 + 4);
+        [p1, p2, p3] = P.allocPtr(3);
+        T.assert(P.pointer === sPos-24/*3 x 8 bytes*/)
+          .assert(p2 === p1 + 8)
+          .assert(p3 === p2 + 8);
+        p1 = P.allocPtr();
+        T.assert('number'===typeof p1);
+      }finally{
+        P.restore(stack);
+      }
+    }/*pstack tests*/)
+  ;/*end of basic sanity checks*/
+
+  ////////////////////////////////////////////////////////////////////////
+  T.g('sqlite3.oo1 sanity checks')
+    .t('Create db', function(sqlite3){
+      const db = this.db = new sqlite3.oo1.DB();
+      T.assert(Number.isInteger(db.pointer)).
+        mustThrowMatching(()=>db.pointer=1, /read-only/).
+        assert(0===sqlite3.capi.sqlite3_extended_result_codes(db.pointer,1)).
+        assert('main'===db.dbName(0));
+
+      // Custom db error message handling via sqlite3_prepare_v2/v3()
+      let rc = capi.sqlite3_prepare_v3(db.pointer, {/*invalid*/}, -1, 0, null, null);
+      T.assert(capi.SQLITE_MISUSE === rc)
+        .assert(0 === capi.sqlite3_errmsg(db.pointer).indexOf("Invalid SQL"));
+    })
+    .t('DB.Stmt sanity checks', function(S){
+      let pId;
+      let st = this.db.prepare(
+        new TextEncoder('utf-8').encode("select 3 as a")
+      );
+      //debug("statement =",st);
+      try {
+        T.assert(Number.isInteger(st.pointer))
+          .mustThrowMatching(()=>st.pointer=1, /read-only/)
+          .assert(1===this.db.openStatementCount())
+          .assert(!st._mayGet)
+          .assert('a' === st.getColumnName(0))
+          .assert(1===st.columnCount)
+          .assert(0===st.parameterCount)
+          .mustThrow(()=>st.bind(1,null))
+          .assert(true===st.step())
+          .assert(3 === st.get(0))
+          .mustThrow(()=>st.get(1))
+          .mustThrow(()=>st.get(0,~capi.SQLITE_INTEGER))
+          .assert(3 === st.get(0,capi.SQLITE_INTEGER))
+          .assert(3 === st.getInt(0))
+          .assert('3' === st.get(0,capi.SQLITE_TEXT))
+          .assert('3' === st.getString(0))
+          .assert(3.0 === st.get(0,capi.SQLITE_FLOAT))
+          .assert(3.0 === st.getFloat(0))
+          .assert(3 === st.get({}).a)
+          .assert(3 === st.get([])[0])
+          .assert(3 === st.getJSON(0))
+          .assert(st.get(0,capi.SQLITE_BLOB) instanceof Uint8Array)
+          .assert(1===st.get(0,capi.SQLITE_BLOB).length)
+          .assert(st.getBlob(0) instanceof Uint8Array)
+          .assert('3'.charCodeAt(0) === st.getBlob(0)[0])
+          .assert(st._mayGet)
+          .assert(false===st.step())
+          .assert(!st._mayGet)
+        ;
+        pId = st.pointer;
+        T.assert(0===capi.sqlite3_strglob("*.txt", "foo.txt")).
+          assert(0!==capi.sqlite3_strglob("*.txt", "foo.xtx")).
+          assert(0===capi.sqlite3_strlike("%.txt", "foo.txt", 0)).
+          assert(0!==capi.sqlite3_strlike("%.txt", "foo.xtx", 0));
+      }finally{
+        st.finalize();
+      }
+      T.assert(!st.pointer)
+        .assert(0===this.db.openStatementCount());
+    })
+    .t('Table t', function(sqlite3){
+      const db = this.db;
+      let list = [];
+      db.exec({
+        sql:['CREATE TABLE t(a,b);',
+             "INSERT INTO t(a,b) VALUES(1,2),(3,4),",
+             "(?,?),('blob',X'6869')"/*intentionally missing semicolon to test for
+                                       off-by-one bug in string-to-WASM conversion*/],
+        saveSql: list,
+        bind: [5,6]
+      });
+      //debug("Exec'd SQL:", list);
+      T.assert(2 === list.length)
+        .assert('string'===typeof list[1])
+        .assert(4===db.changes());
+      if(capi.wasm.bigIntEnabled){
+        T.assert(4n===db.changes(false,true));
+      }
+      let blob = db.selectValue("select b from t where a='blob'");
+      T.assert(blob instanceof Uint8Array).
+        assert(0x68===blob[0] && 0x69===blob[1]);
+      blob = null;
+      let counter = 0, colNames = [];
+      list.length = 0;
+      db.exec(new TextEncoder('utf-8').encode("SELECT a a, b b FROM t"),{
+        rowMode: 'object',
+        resultRows: list,
+        columnNames: colNames,
+        callback: function(row,stmt){
+          ++counter;
+          T.assert((row.a%2 && row.a<6) || 'blob'===row.a);
+        }
+      });
+      T.assert(2 === colNames.length)
+        .assert('a' === colNames[0])
+        .assert(4 === counter)
+        .assert(4 === list.length);
+      list.length = 0;
+      db.exec("SELECT a a, b b FROM t",{
+        rowMode: 'array',
+        callback: function(row,stmt){
+          ++counter;
+          T.assert(Array.isArray(row))
+            .assert((0===row[1]%2 && row[1]<7)
+                    || (row[1] instanceof Uint8Array));
+        }
+      });
+      T.assert(8 === counter);
+      T.assert(Number.MIN_SAFE_INTEGER ===
+               db.selectValue("SELECT "+Number.MIN_SAFE_INTEGER)).
+        assert(Number.MAX_SAFE_INTEGER ===
+               db.selectValue("SELECT "+Number.MAX_SAFE_INTEGER));
+      if(capi.wasm.bigIntEnabled && haveJaccwabytTests()){
+        const mI = capi.wasm.xCall('jaccwabyt_test_int64_max');
+        const b = BigInt(Number.MAX_SAFE_INTEGER * 2);
+        T.assert(b === db.selectValue("SELECT "+b)).
+          assert(b === db.selectValue("SELECT ?", b)).
+          assert(mI == db.selectValue("SELECT $x", {$x:mI}));
+      }else{
+        /* Curiously, the JS spec seems to be off by one with the definitions
+           of MIN/MAX_SAFE_INTEGER:
+
+           https://github.com/emscripten-core/emscripten/issues/17391 */
+        T.mustThrow(()=>db.selectValue("SELECT "+(Number.MAX_SAFE_INTEGER+1))).
+          mustThrow(()=>db.selectValue("SELECT "+(Number.MIN_SAFE_INTEGER-1)));
+      }
+
+      let st = db.prepare("update t set b=:b where a='blob'");
+      try {
+        const ndx = st.getParamIndex(':b');
+        T.assert(1===ndx);
+        st.bindAsBlob(ndx, "ima blob").reset(true);
+      } finally {
+        st.finalize();
+      }
+
+      try {
+        db.prepare("/*empty SQL*/");
+        toss("Must not be reached.");
+      }catch(e){
+        T.assert(e instanceof sqlite3.SQLite3Error)
+          .assert(0==e.message.indexOf('Cannot prepare empty'));
+      }
+    })
+
+    .t('Scalar UDFs', function(sqlite3){
+      const db = this.db;
+      db.createFunction("foo",(pCx,a,b)=>a+b);
+      T.assert(7===db.selectValue("select foo(3,4)")).
+        assert(5===db.selectValue("select foo(3,?)",2)).
+        assert(5===db.selectValue("select foo(?,?2)",[1,4])).
+        assert(5===db.selectValue("select foo($a,$b)",{$a:0,$b:5}));
+      db.createFunction("bar", {
+        arity: -1,
+        callback: function(pCx){
+          var rc = 0;
+          for(let i = 1; i < arguments.length; ++i) rc += arguments[i];
+          return rc;
+        }
+      }).createFunction({
+        name: "asis",
+        callback: (pCx,arg)=>arg
+      });
+      T.assert(0===db.selectValue("select bar()")).
+        assert(1===db.selectValue("select bar(1)")).
+        assert(3===db.selectValue("select bar(1,2)")).
+        assert(-1===db.selectValue("select bar(1,2,-4)")).
+        assert('hi' === db.selectValue("select asis('hi')")).
+        assert('hi' === db.selectValue("select ?",'hi')).
+        assert(null === db.selectValue("select null")).
+        assert(null === db.selectValue("select asis(null)")).
+        assert(1 === db.selectValue("select ?",1)).
+        assert(2 === db.selectValue("select ?",[2])).
+        assert(3 === db.selectValue("select $a",{$a:3})).
+        assert(T.eqApprox(3.1,db.selectValue("select 3.0 + 0.1"))).
+        assert(T.eqApprox(1.3,db.selectValue("select asis(1 + 0.3)")));
+
+      let blobArg = new Uint8Array(2);
+      blobArg.set([0x68, 0x69], 0);
+      let blobRc = db.selectValue("select asis(?1)", blobArg);
+      T.assert(blobRc instanceof Uint8Array).
+        assert(2 === blobRc.length).
+        assert(0x68==blobRc[0] && 0x69==blobRc[1]);
+      blobRc = db.selectValue("select asis(X'6869')");
+      T.assert(blobRc instanceof Uint8Array).
+        assert(2 === blobRc.length).
+        assert(0x68==blobRc[0] && 0x69==blobRc[1]);
+
+      blobArg = new Int8Array(2);
+      blobArg.set([0x68, 0x69]);
+      //debug("blobArg=",blobArg);
+      blobRc = db.selectValue("select asis(?1)", blobArg);
+      T.assert(blobRc instanceof Uint8Array).
+        assert(2 === blobRc.length);
+      //debug("blobRc=",blobRc);
+      T.assert(0x68==blobRc[0] && 0x69==blobRc[1]);
+    })
+
+    .t({
+      name: 'Aggregate UDFs (tests are TODO)',
+      predicate: testIsTodo
+    })
+
+    .t({
+      name: 'Window UDFs (tests are TODO)',
+      predicate: testIsTodo
+    })
+
+    .t("ATTACH", function(){
+      const db = this.db;
+      const resultRows = [];
+      db.exec({
+        sql:new TextEncoder('utf-8').encode([
+          // ^^^ testing string-vs-typedarray handling in exec()
+          "attach 'session' as foo;" /* name 'session' is magic for kvvfs! */,
+          "create table foo.bar(a);",
+          "insert into foo.bar(a) values(1),(2),(3);",
+          "select a from foo.bar order by a;"
+        ].join('')),
+        rowMode: 0,
+        resultRows
+      });
+      T.assert(3===resultRows.length)
+        .assert(2===resultRows[1]);
+      T.assert(2===db.selectValue('select a from foo.bar where a>1 order by a'));
+      let colCount = 0, rowCount = 0;
+      const execCallback = function(pVoid, nCols, aVals, aNames){
+        colCount = nCols;
+        ++rowCount;
+        T.assert(2===aVals.length)
+          .assert(2===aNames.length)
+          .assert(+(aVals[1]) === 2 * +(aVals[0]));
+      };
+      let rc = capi.sqlite3_exec(
+        db.pointer, "select a, a*2 from foo.bar", execCallback,
+        0, 0
+      );
+      T.assert(0===rc).assert(3===rowCount).assert(2===colCount);
+      rc = capi.sqlite3_exec(
+        db.pointer, "select a from foo.bar", ()=>{
+          tossQuietly("Testing throwing from exec() callback.");
+        }, 0, 0
+      );
+      T.assert(capi.SQLITE_ABORT === rc);
+      db.exec("detach foo");
+      T.mustThrow(()=>db.exec("select * from foo.bar"));
+    })
+
+    .t({
+      name: 'Jaccwabyt-specific int-pointer tests (if compiled in)',
+      predicate: haveJaccwabytTests,
+      test: function(){
+        const w = wasm, db = this.db;
+        const stack = w.scopedAllocPush();
+        let ptrInt;
+        const origValue = 512;
+        const ptrValType = 'i32';
+        try{
+          ptrInt = w.scopedAlloc(4);
+          w.setMemValue(ptrInt,origValue, ptrValType);
+          const cf = w.xGet('jaccwabyt_test_intptr');
+          const oldPtrInt = ptrInt;
+          //log('ptrInt',ptrInt);
+          //log('getMemValue(ptrInt)',w.getMemValue(ptrInt));
+          T.assert(origValue === w.getMemValue(ptrInt, ptrValType));
+          const rc = cf(ptrInt);
+          //log('cf(ptrInt)',rc);
+          //log('ptrInt',ptrInt);
+          //log('getMemValue(ptrInt)',w.getMemValue(ptrInt,ptrValType));
+          T.assert(2*origValue === rc).
+            assert(rc === w.getMemValue(ptrInt,ptrValType)).
+            assert(oldPtrInt === ptrInt);
+          const pi64 = w.scopedAlloc(8)/*ptr to 64-bit integer*/;
+          const o64 = 0x010203040506/*>32-bit integer*/;
+          const ptrType64 = 'i64';
+          if(w.bigIntEnabled){
+            w.setMemValue(pi64, o64, ptrType64);
+            //log("pi64 =",pi64, "o64 = 0x",o64.toString(16), o64);
+            const v64 = ()=>w.getMemValue(pi64,ptrType64)
+            //log("getMemValue(pi64)",v64());
+            T.assert(v64() == o64);
+            //T.assert(o64 === w.getMemValue(pi64, ptrType64));
+            const cf64w = w.xGet('jaccwabyt_test_int64ptr');
+            cf64w(pi64);
+            //log("getMemValue(pi64)",v64());
+            T.assert(v64() == BigInt(2 * o64));
+            cf64w(pi64);
+            T.assert(v64() == BigInt(4 * o64));
+
+            const biTimes2 = w.xGet('jaccwabyt_test_int64_times2');
+            T.assert(BigInt(2 * o64) ===
+                     biTimes2(BigInt(o64)/*explicit conv. required to avoid TypeError
+                                           in the call :/ */));
+
+            const pMin = w.scopedAlloc(16);
+            const pMax = pMin + 8;
+            const g64 = (p)=>w.getMemValue(p,ptrType64);
+            w.setMemValue(pMin, 0, ptrType64);
+            w.setMemValue(pMax, 0, ptrType64);
+            const minMaxI64 = [
+              w.xCall('jaccwabyt_test_int64_min'),
+              w.xCall('jaccwabyt_test_int64_max')
+            ];
+            T.assert(minMaxI64[0] < BigInt(Number.MIN_SAFE_INTEGER)).
+              assert(minMaxI64[1] > BigInt(Number.MAX_SAFE_INTEGER));
+            //log("int64_min/max() =",minMaxI64, typeof minMaxI64[0]);
+            w.xCall('jaccwabyt_test_int64_minmax', pMin, pMax);
+            T.assert(g64(pMin) === minMaxI64[0], "int64 mismatch").
+              assert(g64(pMax) === minMaxI64[1], "int64 mismatch");
+            //log("pMin",g64(pMin), "pMax",g64(pMax));
+            w.setMemValue(pMin, minMaxI64[0], ptrType64);
+            T.assert(g64(pMin) === minMaxI64[0]).
+              assert(minMaxI64[0] === db.selectValue("select ?",g64(pMin))).
+              assert(minMaxI64[1] === db.selectValue("select ?",g64(pMax)));
+            const rxRange = /too big/;
+            T.mustThrowMatching(()=>{db.prepare("select ?").bind(minMaxI64[0] - BigInt(1))},
+                                rxRange).
+              mustThrowMatching(()=>{db.prepare("select ?").bind(minMaxI64[1] + BigInt(1))},
+                                (e)=>rxRange.test(e.message));
+          }else{
+            log("No BigInt support. Skipping related tests.");
+            log("\"The problem\" here is that we can manipulate, at the byte level,",
+                "heap memory to set 64-bit values, but we can't get those values",
+                "back into JS because of the lack of 64-bit integer support.");
+          }
+        }finally{
+          const x = w.scopedAlloc(1), y = w.scopedAlloc(1), z = w.scopedAlloc(1);
+          //log("x=",x,"y=",y,"z=",z); // just looking at the alignment
+          w.scopedAllocPop(stack);
+        }
+      }
+    }/* jaccwabyt-specific tests */)
+
+    .t('Close db', function(){
+      T.assert(this.db).assert(Number.isInteger(this.db.pointer));
+      wasm.exports.sqlite3_wasm_db_reset(this.db.pointer);
+      this.db.close();
+      T.assert(!this.db.pointer);
+    })
+  ;/* end of oo1 checks */
+
+  ////////////////////////////////////////////////////////////////////////
   log("Loading and initializing sqlite3 WASM module...");
   if(!isUIThread()){
     importScripts("sqlite3.js");
@@ -190,11 +727,15 @@
     printErr: error
   }).then(function(sqlite3){
     //console.log('sqlite3 =',sqlite3);
-    log("Done initializing. Running tests...");
-    try {
-      TestUtil.runTests();
-    }catch(e){
-      error("Tests failed:",e.message);
+    log("Done initializing WASM/JS bits. Running tests...");
+    capi = sqlite3.capi;
+    wasm = capi.wasm;
+    log("sqlite3 version:",capi.sqlite3_libversion(),
+        capi.sqlite3_sourceid());
+    log("BigInt/int64 support is",(wasm.bigIntEnabled ? "enabled" : "disabled"));
+    if(haveJaccwabytTests()){
+      log("Jaccwabyt test C code found. Jaccwabyt-specific low-level tests.");
     }
+    TestUtil.runTests(sqlite3);
   });
 })();
diff --git a/ext/wasm/testing1.js b/ext/wasm/testing1.js
index 5ef6d15b0b..6bda587733 100644
--- a/ext/wasm/testing1.js
+++ b/ext/wasm/testing1.js
@@ -94,7 +94,6 @@
            "INSERT INTO t(a,b) VALUES(1,2),(3,4),",
            "(?,?),('blob',X'6869')"/*intentionally missing semicolon to test for
                                      off-by-one bug in string-to-WASM conversion*/],
-      multi: true,
       saveSql: list,
       bind: [5,6]
     });
@@ -258,7 +257,6 @@
         "insert into foo.bar(a) values(1),(2),(3);",
         "select a from foo.bar order by a;"
       ].join('')),
-      multi: true,
       rowMode: 0,
       resultRows
     });
@@ -1083,7 +1081,7 @@
     }finally{
       P.restore(stack);
     }
-}/*testPstack()*/;
+  }/*testPstack()*/;
 
   const clearKvvfs = function(){
     const sz = sqlite3.capi.sqlite3_web_kvvfs_size();
diff --git a/manifest b/manifest
index d95623c883..2913fa1744 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Updates\sto\sthe\sfuzzer\squery\sinvariant\schecker\s-\stracking\schanges\smade\nover\sin\sdbsqlfuzz.
-D 2022-10-12T18:40:25.766
+C Port\sthe\sfirst\s180-odd\sunit\stests\sfrom\stesting1.*\sinto\sthe\snew\stester1.*.\sFix\sa\sstray-keystroke-induced\stypo\swhich\sbroke\spstack.allocChunks().
+D 2022-10-13T08:03:31.255
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -487,7 +487,7 @@ F ext/wasm/api/sqlite3-api-cleanup.js 5d22d1d3818ecacb23bfa223d5970cd0617d8cdbb4
 F ext/wasm/api/sqlite3-api-glue.js 3b2a43c7b2ceb2b60f5f4a1afefbd93508c2fe0f2e667eea278afe570be4b606
 F ext/wasm/api/sqlite3-api-oo1.js ac1e08d36bdfb5aa0a2d75b7d4c892fd51819d34c932370c3282810672bcc086
 F ext/wasm/api/sqlite3-api-opfs.js 5a8ab3b76880c8ada8710ca9ba1ca5b160872edfd8bd5322e4f179a7f41cc616
-F ext/wasm/api/sqlite3-api-prologue.js daf288df965cab1e8eabee4451f6ba3beb03d5a579722b0b0f90e5203962f515
+F ext/wasm/api/sqlite3-api-prologue.js 5c56056810333974c971f6310c5c9698cf7ca8b06f6d2f1986cec819d0f5bbad
 F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c a321f12ceedac8611c1377ccfb5df0c0547bd9395f7fd7613827de365d994948
@@ -495,7 +495,7 @@ F ext/wasm/batch-runner.html cf1a410c92bad50fcec2ddc71390b4e9df63a6ea1bef12a5163
 F ext/wasm/batch-runner.js 5bae81684728b6be157d1f92b39824153f0fd019345b39f2ab8930f7ee2a57d8
 F ext/wasm/common/SqliteTestUtil.js 647bf014bd30bdd870a7e9001e251d12fc1c9ec9ce176a1004b838a4b33c5c05
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
-F ext/wasm/common/testing.css bd6b23c4666be765139c1e50569cac301d949d5e251f7ad442376995ec5aa39a
+F ext/wasm/common/testing.css 12bd88c69eea1b61649ad9add3ff24f0fbc3b79a7616d74ab3997b7271cd8482
 F ext/wasm/common/whwasmutil.js bc8522a071f4754af7b50f53807b95f691d2f9e44fc3b3e8c65dff6ef2485c0d
 F ext/wasm/demo-123-worker.html e50b51dc7271b9d3cc830cb7c2fba294d622f56b7acb199f7257d11195a63d49
 F ext/wasm/demo-123.html 7c239c9951d1b113f9f532969ac039294cf1dcfee2b3ae0a2c1ed2b3d59f8dfa
@@ -526,13 +526,13 @@ F ext/wasm/sqlite3-worker1-promiser.js 307d7837420ca6a9d3780dfc81194f1c0715637e6
 F ext/wasm/sqlite3-worker1.js 466e9bd39409ab03f3e00999887aaffc11e95b416e2689596e3d7f1516673fdf
 F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
 F ext/wasm/test-opfs-vfs.js 56c3d725044c668fa7910451e96c1195d25ad95825f9ac79f747a7759d1973d0
-F ext/wasm/tester1-worker.html 9d24bfc5aec4d81ce00695dea2dbed262eb486f59e3ce75746de9f5b58b128a0
-F ext/wasm/tester1.html 13ad0dc087bdd8be1e9a4869d591d0c9915e89c8e191bce7803dc23b45cdd912
-F ext/wasm/tester1.js 2f05d90d7c8f519ff6a09bb5a7a1a3ad853aea72c4e51553f2c004446465b179
+F ext/wasm/tester1-worker.html 0af7a22025ff1da72a84765d64f8f221844a57c6e6e314acf3a30f176101fd3f
+F ext/wasm/tester1.html fde0e0bdeaaa2c39877c749dc86a8c1c306f771c3d75b89a6289a5ed11243e9d
+F ext/wasm/tester1.js d25cf7615bd39ab9ab4be2f231fecf1fff1378227e695083dc35adc4fdff668e
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
 F ext/wasm/testing-worker1-promiser.js bd788e33c1807e0a6dda9c9a9d784bd3350ca49c9dd8ae2cc8719b506b6e013e
 F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d7669fb17fcae
-F ext/wasm/testing1.js 15fc3dca6b2fc22c1458cca2cc2c484281dfc91f01c048ad4e38d5d3924ea961
+F ext/wasm/testing1.js 2034cf6972ab1506e75e41e532ca7cd3060e194c37edab3ff65d00d8a8af8ba2
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
 F ext/wasm/testing2.js 88f40ef3cd8201bdadd120a711c36bbf0ce56cc0eab1d5e7debb71fed7822494
 F ext/wasm/wasmfs.make 3cce1820006196de140f90f2da4b4ea657083fb5bfee7d125be43f7a85748c8f
@@ -2034,8 +2034,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 368fa6b25bc803ded7c1a0184615980902657879370caec22ceea42496ec0566
-R b6417444abfe9dc882e90feaa0e7d85d
-U drh
-Z 6e9d8b3a258c07649344995d3cb09455
+P 4ca16a304ad10fbb48f78b4384b347fe883e1a4f222f113ac981e89845c3e113
+R 624f8080126a42bc3dcbc00f2cc651c0
+U stephan
+Z 26dc7314d65c80886c8a3b55a6ce8b4e
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index ca633fd6b3..7a450195f2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4ca16a304ad10fbb48f78b4384b347fe883e1a4f222f113ac981e89845c3e113
\ No newline at end of file
+ef689e33e464829f5cbe4ca24a53d9dba59abe74d3d80a37a91b93a4eccccf2d
\ No newline at end of file

From e995d2c226e2b65c5e40cd238415bdfeb0936e8c Mon Sep 17 00:00:00 2001
From: drh <>
Date: Thu, 13 Oct 2022 12:47:33 +0000
Subject: [PATCH 268/428] Proposed optimization to the IS NULL and NOT NULL
 operators that avoids loading the entire content of larges strings and BLOBs.
  Response to [forum:/info/3c08d4715dc05b00|forum post 3c08d4715dc05b00].

FossilOrigin-Name: 45f171565442f9fd6574fb93ae7abe83c168b20be68af42531bc55571450d3ab
---
 manifest      | 21 ++++++++++++---------
 manifest.uuid |  2 +-
 src/expr.c    |  2 ++
 src/pragma.c  |  4 +---
 src/vdbe.h    |  1 +
 src/vdbeaux.c | 16 ++++++++++++++++
 6 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/manifest b/manifest
index d95623c883..507552e771 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Updates\sto\sthe\sfuzzer\squery\sinvariant\schecker\s-\stracking\schanges\smade\nover\sin\sdbsqlfuzz.
-D 2022-10-12T18:40:25.766
+C Proposed\soptimization\sto\sthe\sIS\sNULL\sand\sNOT\sNULL\soperators\sthat\savoids\nloading\sthe\sentire\scontent\sof\slarges\sstrings\sand\sBLOBs.\s\sResponse\sto\n[forum:/info/3c08d4715dc05b00|forum\spost\s3c08d4715dc05b00].
+D 2022-10-13T12:47:33.470
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -570,7 +570,7 @@ F src/date.c 94ce83b4cd848a387680a5f920c9018c16655db778c4d36525af0a0f34679ac5
 F src/dbpage.c 5808e91bc27fa3981b028000f8fadfdc10ce9e59a34ce7dc4e035a69be3906ec
 F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
 F src/delete.c 86573edae75e3d3e9a8b590d87db8e47222103029df4f3e11fa56044459b514e
-F src/expr.c 1cbdd76eeedb729ea9060df03e3e6b74a302784a13bfa38794a8194f894641ea
+F src/expr.c d199850a925665df7f8ac29fa938909f65a2bd32354aa206aa8c25fc74ff3d3d
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 722f20779f5342a787922deded3628d8c74b5249cab04098cf17ee2f2aaff002
 F src/func.c 8f72e88cccdee22185133c10f96ccd61dc34c5ea4b1fa9a73c237ef59b2e64f1
@@ -613,7 +613,7 @@ F src/parse.y 8e67d820030d2655b9942ffe61c1e7e6b96cea2f2f72183533299393907d0564
 F src/pcache.c f4268f7f73c6a3db12ce22fd25bc68dc42315d19599414ab1207d7cf32f79197
 F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
 F src/pcache1.c dee95e3cd2b61e6512dc814c5ab76d5eb36f0bfc9441dbb4260fccc0d12bbddc
-F src/pragma.c 444f596c9e9123d19451ad762917f0f7545e4acecb10f67e09a19f01289cefce
+F src/pragma.c 41430ca04735cc8e5d003bfd9315eadede3ec326e50805cc81bcf34e46601292
 F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 F src/prepare.c 1b02be0441eda4579471fea097f678effcbb77ef0c39ab3f703c837822bcd674
 F src/printf.c e99ee9741e79ae3873458146f59644276657340385ade4e76a5f5d1c25793764
@@ -693,10 +693,10 @@ F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 F src/util.c 0be191521ff6d2805995f4910f0b6231b42843678b2efdc1abecaf39929a673f
 F src/vacuum.c bb346170b0b54c6683bba4a5983aea40485597fdf605c87ec8bc2e199fe88cd8
 F src/vdbe.c 4e51ba30edcdcec171fdb1db1133147ea1084d8b6842bc601b174e8a0e4b3b7f
-F src/vdbe.h 64619af62603dc3c4f5ff6ff6d2c8f389abd667a29ce6007ed44bd22b3211cd0
+F src/vdbe.h 58675f47dcf3105bab182c3ad3726efd60ffd003e954386904ac9107d0d2b743
 F src/vdbeInt.h 17b7461ffcf9ee760d1341731715a419f6b8c763089a7ece25c2e8098d702b3f
 F src/vdbeapi.c 1e8713d0b653acb43cd1bdf579c40e005c4844ea90f414f065946a83db3c27fb
-F src/vdbeaux.c c719cebaffa75e166f16a405b3dee96e7150d60fc563ab2dea716b60c6a51312
+F src/vdbeaux.c 3468ba4e9910fc6659030ea1a3f523f3bdf16396dab28a836f7f36c27c5aa771
 F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
 F src/vdbemem.c 6cfed43758d57b6e3b99d9cdedfeccd86e45a07e427b22d8487cbdbebb6c522a
 F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
@@ -2034,8 +2034,11 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 368fa6b25bc803ded7c1a0184615980902657879370caec22ceea42496ec0566
-R b6417444abfe9dc882e90feaa0e7d85d
+P 4ca16a304ad10fbb48f78b4384b347fe883e1a4f222f113ac981e89845c3e113
+R f35663338c50b8e03d89b8b5f5341f38
+T *branch * isnull-opt
+T *sym-isnull-opt *
+T -sym-trunk *
 U drh
-Z 6e9d8b3a258c07649344995d3cb09455
+Z 5002c0678afa100b4df523686944d5c0
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index ca633fd6b3..97f10acb71 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4ca16a304ad10fbb48f78b4384b347fe883e1a4f222f113ac981e89845c3e113
\ No newline at end of file
+45f171565442f9fd6574fb93ae7abe83c168b20be68af42531bc55571450d3ab
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index baa0fe6476..bceb5efb08 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -5241,6 +5241,7 @@ void sqlite3ExprIfTrue(Parse *pParse, Expr *pExpr, int dest, int jumpIfNull){
       assert( TK_ISNULL==OP_IsNull );   testcase( op==TK_ISNULL );
       assert( TK_NOTNULL==OP_NotNull ); testcase( op==TK_NOTNULL );
       r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
+      sqlite3VdbeTypeofColumn(v, r1);
       sqlite3VdbeAddOp2(v, op, r1, dest);
       VdbeCoverageIf(v, op==TK_ISNULL);
       VdbeCoverageIf(v, op==TK_NOTNULL);
@@ -5415,6 +5416,7 @@ void sqlite3ExprIfFalse(Parse *pParse, Expr *pExpr, int dest, int jumpIfNull){
     case TK_ISNULL:
     case TK_NOTNULL: {
       r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
+      sqlite3VdbeTypeofColumn(v, r1);
       sqlite3VdbeAddOp2(v, op, r1, dest);
       testcase( op==TK_ISNULL );   VdbeCoverageIf(v, op==TK_ISNULL);
       testcase( op==TK_NOTNULL );  VdbeCoverageIf(v, op==TK_NOTNULL);
diff --git a/src/pragma.c b/src/pragma.c
index 7976f83c6f..7aea3dd2cb 100644
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -1791,9 +1791,7 @@ void sqlite3Pragma(
                 || pTab->iPKey==mxCol) ) mxCol--;
         if( mxCol>=0 ){
           sqlite3ExprCodeGetColumnOfTable(v, pTab, iDataCur, mxCol, 3);
-          if( sqlite3VdbeGetLastOp(v)->opcode==OP_Column ){
-            sqlite3VdbeChangeP5(v, OPFLAG_TYPEOFARG);
-          }
+          sqlite3VdbeTypeofColumn(v, 3);
         }
 
         if( !isQuick ){
diff --git a/src/vdbe.h b/src/vdbe.h
index eb1445f1db..a244468b52 100644
--- a/src/vdbe.h
+++ b/src/vdbe.h
@@ -228,6 +228,7 @@ void sqlite3VdbeChangeP1(Vdbe*, int addr, int P1);
 void sqlite3VdbeChangeP2(Vdbe*, int addr, int P2);
 void sqlite3VdbeChangeP3(Vdbe*, int addr, int P3);
 void sqlite3VdbeChangeP5(Vdbe*, u16 P5);
+void sqlite3VdbeTypeofColumn(Vdbe*, int);
 void sqlite3VdbeJumpHere(Vdbe*, int addr);
 void sqlite3VdbeJumpHereOrPopInst(Vdbe*, int addr);
 int sqlite3VdbeChangeToNoop(Vdbe*, int addr);
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 8785e3b568..275ba6f770 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -1155,6 +1155,22 @@ void sqlite3VdbeChangeP5(Vdbe *p, u16 p5){
   if( p->nOp>0 ) p->aOp[p->nOp-1].p5 = p5;
 }
 
+/*
+** If the previous opcode is an OP_Column that delivers results
+** into register iDest, then add the OPFLAG_TYPEOF flag to that
+** opcode.
+*/
+void sqlite3VdbeTypeofColumn(Vdbe *p, int iDest){
+  if( p->nOp>0 ){
+    VdbeOp *pOp = &p->aOp[p->nOp-1];
+    if( pOp->opcode==OP_Column && pOp->p3==iDest ){
+      pOp->p5 |= OPFLAG_TYPEOFARG;
+    }
+  }else{
+    assert( p->db->mallocFailed );
+  }
+}
+
 /*
 ** Change the P2 operand of instruction addr so that it points to
 ** the address of the next instruction to be coded.

From 7ca4af6a9f9aa882747e8082c413b8b0c479b533 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Thu, 13 Oct 2022 14:01:11 +0000
Subject: [PATCH 269/428] Fix a typo in the documentation of the OP_Column
 opcode. [forum:/forumpost/a2b5bd6d43|Forum post a2b5bd6d43].

FossilOrigin-Name: 043e76e6166da5cf8e213cce46aaccb1f910e1fdbdb5556576eafb81b3bc5faa
---
 manifest      | 14 +++++++-------
 manifest.uuid |  2 +-
 src/vdbe.c    |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index 2913fa1744..7cc3384d5a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Port\sthe\sfirst\s180-odd\sunit\stests\sfrom\stesting1.*\sinto\sthe\snew\stester1.*.\sFix\sa\sstray-keystroke-induced\stypo\swhich\sbroke\spstack.allocChunks().
-D 2022-10-13T08:03:31.255
+C Fix\sa\stypo\sin\sthe\sdocumentation\sof\sthe\sOP_Column\sopcode.\n[forum:/forumpost/a2b5bd6d43|Forum\spost\sa2b5bd6d43].
+D 2022-10-13T14:01:11.049
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -692,7 +692,7 @@ F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 F src/util.c 0be191521ff6d2805995f4910f0b6231b42843678b2efdc1abecaf39929a673f
 F src/vacuum.c bb346170b0b54c6683bba4a5983aea40485597fdf605c87ec8bc2e199fe88cd8
-F src/vdbe.c 4e51ba30edcdcec171fdb1db1133147ea1084d8b6842bc601b174e8a0e4b3b7f
+F src/vdbe.c 76c402850156e69eaf43c32fc8e5ecffa2c4a0cf0c2dc24c23e48a60d1bf388a
 F src/vdbe.h 64619af62603dc3c4f5ff6ff6d2c8f389abd667a29ce6007ed44bd22b3211cd0
 F src/vdbeInt.h 17b7461ffcf9ee760d1341731715a419f6b8c763089a7ece25c2e8098d702b3f
 F src/vdbeapi.c 1e8713d0b653acb43cd1bdf579c40e005c4844ea90f414f065946a83db3c27fb
@@ -2034,8 +2034,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 4ca16a304ad10fbb48f78b4384b347fe883e1a4f222f113ac981e89845c3e113
-R 624f8080126a42bc3dcbc00f2cc651c0
-U stephan
-Z 26dc7314d65c80886c8a3b55a6ce8b4e
+P ef689e33e464829f5cbe4ca24a53d9dba59abe74d3d80a37a91b93a4eccccf2d
+R be99ac3662eff783728d08e4d117e169
+U drh
+Z 157d4043f80d56e9469d6c0aa37164a1
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 7a450195f2..da43638604 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ef689e33e464829f5cbe4ca24a53d9dba59abe74d3d80a37a91b93a4eccccf2d
\ No newline at end of file
+043e76e6166da5cf8e213cce46aaccb1f910e1fdbdb5556576eafb81b3bc5faa
\ No newline at end of file
diff --git a/src/vdbe.c b/src/vdbe.c
index b4a96468f1..79b7400955 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -2772,7 +2772,7 @@ case OP_Offset: {          /* out3 */
 ** Interpret the data that cursor P1 points to as a structure built using
 ** the MakeRecord instruction.  (See the MakeRecord opcode for additional
 ** information about the format of the data.)  Extract the P2-th column
-** from this record.  If there are less that (P2+1) 
+** from this record.  If there are less than (P2+1) 
 ** values in the record, extract a NULL.
 **
 ** The value extracted is stored in register P3.

From bd1c634546dea473ed734a33b77ea1f54a202299 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Thu, 13 Oct 2022 14:35:20 +0000
Subject: [PATCH 270/428] Adjust the implementation of
 sqlite3VdbeTypeofColumn() to make it easier to test (and slightly smaller).

FossilOrigin-Name: 79fdd021df256c6a2b9973fd6bf8e52ffaaf4d369d40489b8395ac97880b1325
---
 manifest      | 15 ++++++---------
 manifest.uuid |  2 +-
 src/vdbeaux.c | 10 +++-------
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/manifest b/manifest
index 507552e771..b6c85bb266 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Proposed\soptimization\sto\sthe\sIS\sNULL\sand\sNOT\sNULL\soperators\sthat\savoids\nloading\sthe\sentire\scontent\sof\slarges\sstrings\sand\sBLOBs.\s\sResponse\sto\n[forum:/info/3c08d4715dc05b00|forum\spost\s3c08d4715dc05b00].
-D 2022-10-13T12:47:33.470
+C Adjust\sthe\simplementation\sof\ssqlite3VdbeTypeofColumn()\sto\smake\sit\seasier\nto\stest\s(and\sslightly\ssmaller).
+D 2022-10-13T14:35:20.191
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -696,7 +696,7 @@ F src/vdbe.c 4e51ba30edcdcec171fdb1db1133147ea1084d8b6842bc601b174e8a0e4b3b7f
 F src/vdbe.h 58675f47dcf3105bab182c3ad3726efd60ffd003e954386904ac9107d0d2b743
 F src/vdbeInt.h 17b7461ffcf9ee760d1341731715a419f6b8c763089a7ece25c2e8098d702b3f
 F src/vdbeapi.c 1e8713d0b653acb43cd1bdf579c40e005c4844ea90f414f065946a83db3c27fb
-F src/vdbeaux.c 3468ba4e9910fc6659030ea1a3f523f3bdf16396dab28a836f7f36c27c5aa771
+F src/vdbeaux.c e22cf8b85b8b0b8dd585e46f13a4db24f42053a549685e79907d7c0812f00fbd
 F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
 F src/vdbemem.c 6cfed43758d57b6e3b99d9cdedfeccd86e45a07e427b22d8487cbdbebb6c522a
 F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
@@ -2034,11 +2034,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 4ca16a304ad10fbb48f78b4384b347fe883e1a4f222f113ac981e89845c3e113
-R f35663338c50b8e03d89b8b5f5341f38
-T *branch * isnull-opt
-T *sym-isnull-opt *
-T -sym-trunk *
+P 45f171565442f9fd6574fb93ae7abe83c168b20be68af42531bc55571450d3ab
+R 0e1d021509719a6dc58294a46bab294e
 U drh
-Z 5002c0678afa100b4df523686944d5c0
+Z b79894d44bbaa33297da5bbb579b93c8
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 97f10acb71..414ca045b4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-45f171565442f9fd6574fb93ae7abe83c168b20be68af42531bc55571450d3ab
\ No newline at end of file
+79fdd021df256c6a2b9973fd6bf8e52ffaaf4d369d40489b8395ac97880b1325
\ No newline at end of file
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 275ba6f770..45e573535e 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -1161,13 +1161,9 @@ void sqlite3VdbeChangeP5(Vdbe *p, u16 p5){
 ** opcode.
 */
 void sqlite3VdbeTypeofColumn(Vdbe *p, int iDest){
-  if( p->nOp>0 ){
-    VdbeOp *pOp = &p->aOp[p->nOp-1];
-    if( pOp->opcode==OP_Column && pOp->p3==iDest ){
-      pOp->p5 |= OPFLAG_TYPEOFARG;
-    }
-  }else{
-    assert( p->db->mallocFailed );
+  VdbeOp *pOp = sqlite3VdbeGetLastOp(p);
+  if( pOp->p3==iDest && pOp->opcode==OP_Column ){
+    pOp->p5 |= OPFLAG_TYPEOFARG;
   }
 }
 

From eddfa9840eac8a15ac02db65b96d3db85f6c8f4a Mon Sep 17 00:00:00 2001
From: drh <>
Date: Thu, 13 Oct 2022 14:54:32 +0000
Subject: [PATCH 271/428] Improvements to the description of the
 OPFLAG_TYPEOFARG option to OP_Column.

FossilOrigin-Name: 5e9c67ba18b701aabbb0546acdfc532c9e8f0d27fb0a2c899415a5c47096c90b
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/vdbe.c    | 10 ++++++----
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/manifest b/manifest
index b6c85bb266..3fd16f1266 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Adjust\sthe\simplementation\sof\ssqlite3VdbeTypeofColumn()\sto\smake\sit\seasier\nto\stest\s(and\sslightly\ssmaller).
-D 2022-10-13T14:35:20.191
+C Improvements\sto\sthe\sdescription\sof\sthe\sOPFLAG_TYPEOFARG\soption\sto\sOP_Column.
+D 2022-10-13T14:54:32.397
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -692,7 +692,7 @@ F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 F src/util.c 0be191521ff6d2805995f4910f0b6231b42843678b2efdc1abecaf39929a673f
 F src/vacuum.c bb346170b0b54c6683bba4a5983aea40485597fdf605c87ec8bc2e199fe88cd8
-F src/vdbe.c 4e51ba30edcdcec171fdb1db1133147ea1084d8b6842bc601b174e8a0e4b3b7f
+F src/vdbe.c 581496d84d7ce5b4f7302f14b3bc5271bbcef5dce28ce97c505297340e0c46e3
 F src/vdbe.h 58675f47dcf3105bab182c3ad3726efd60ffd003e954386904ac9107d0d2b743
 F src/vdbeInt.h 17b7461ffcf9ee760d1341731715a419f6b8c763089a7ece25c2e8098d702b3f
 F src/vdbeapi.c 1e8713d0b653acb43cd1bdf579c40e005c4844ea90f414f065946a83db3c27fb
@@ -2034,8 +2034,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 45f171565442f9fd6574fb93ae7abe83c168b20be68af42531bc55571450d3ab
-R 0e1d021509719a6dc58294a46bab294e
+P 79fdd021df256c6a2b9973fd6bf8e52ffaaf4d369d40489b8395ac97880b1325
+R f513ee84e2c3c752a45dcdac513b8ce6
 U drh
-Z b79894d44bbaa33297da5bbb579b93c8
+Z 5b4f99a755b8cb54cd55294bc14ffa4e
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 414ca045b4..fc10115bbe 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-79fdd021df256c6a2b9973fd6bf8e52ffaaf4d369d40489b8395ac97880b1325
\ No newline at end of file
+5e9c67ba18b701aabbb0546acdfc532c9e8f0d27fb0a2c899415a5c47096c90b
\ No newline at end of file
diff --git a/src/vdbe.c b/src/vdbe.c
index b4a96468f1..f8878db316 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -2781,10 +2781,12 @@ case OP_Offset: {          /* out3 */
 ** if the P4 argument is a P4_MEM use the value of the P4 argument as
 ** the result.
 **
-** If the OPFLAG_LENGTHARG and OPFLAG_TYPEOFARG bits are set on P5 then
-** the result is guaranteed to only be used as the argument of a length()
-** or typeof() function, respectively.  The loading of large blobs can be
-** skipped for length() and all content loading can be skipped for typeof().
+** If the OPFLAG_LENGTHARG bit is set in P5 then the result is guaranteed
+** to only be used by the length() function or the equivalent.  The content
+** of large blobs is not loaded, thus saving CPU cycles.  If the
+** OPFLAG_TYPEOFARG bit is set then the result will only be used by the
+** typeof() function or the IS NULL or IS NOT NULL operators or the
+** equivalent.  In this case, all content loading can be omitted.
 */
 case OP_Column: {
   u32 p2;            /* column number to retrieve */

From d92c652ac1fe570e27acd83e15903fb695386880 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Thu, 13 Oct 2022 16:48:35 +0000
Subject: [PATCH 272/428] Move the rest of testing1.js into tester1.js and
 eliminate the dependency on jaccwabyt_test.c. Extend the list of default
 config-related #defines in sqlite3-wasm.c and reorganize them for
 maintainability.

FossilOrigin-Name: 4e2a8aff2dd4b6e148f45184e2523ebe47815257eca97fa3d32bcbf9625f0def
---
 ext/wasm/GNUmakefile                      |   25 +-
 ext/wasm/api/sqlite3-api-glue.js          |    8 +-
 ext/wasm/api/sqlite3-api-oo1.js           |   22 +-
 ext/wasm/api/sqlite3-api-prologue.js      |    2 +-
 ext/wasm/api/sqlite3-wasm.c               |  223 +++-
 ext/wasm/common/testing.css               |    1 -
 ext/wasm/common/whwasmutil.js             |   51 +-
 ext/wasm/index.html                       |   10 +-
 ext/wasm/jaccwabyt/jaccwabyt_test.c       |  178 ----
 ext/wasm/jaccwabyt/jaccwabyt_test.exports |   10 -
 ext/wasm/tester1.js                       |  687 +++++++++++-
 ext/wasm/testing1.js                      | 1169 ---------------------
 manifest                                  |   34 +-
 manifest.uuid                             |    2 +-
 14 files changed, 938 insertions(+), 1484 deletions(-)
 delete mode 100644 ext/wasm/jaccwabyt/jaccwabyt_test.c
 delete mode 100644 ext/wasm/jaccwabyt/jaccwabyt_test.exports
 delete mode 100644 ext/wasm/testing1.js

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index f6d2a50c93..cf0e8b1081 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -68,14 +68,10 @@ SQLITE_OPT = \
   -DSQLITE_TEMP_STORE=3 \
   -DSQLITE_OS_KV_OPTIONAL=1 \
   '-DSQLITE_DEFAULT_UNIX_VFS="unix-none"' \
-  -DSQLITE_USE_URI=1
-#SQLITE_OPT += -DSQLITE_ENABLE_MEMSYS5
-# ^^^ MEMSYS5 is hypothetically useful for non-Emscripten builds but
-# requires adding more infrastructure and fixing one spot in the
-# sqlite3 internals which calls malloc() early on.
-
-# SQLITE_OMIT_LOAD_EXTENSION: if this is true, sqlite3_vfs::xDlOpen
-# and friends may be NULL.
+  -DSQLITE_USE_URI=1 \
+  -DSQLITE_WASM_ENABLE_C_TESTS
+# ^^^ most flags are set in sqlite3-wasm.c but we need them
+# made explicit here for building speedtest1.c.
 
 ifneq (,$(filter release,$(MAKECMDGOALS)))
 emcc_opt ?= -Oz -flto
@@ -128,8 +124,7 @@ else
   $(info Development build. Use '$(MAKE) release' for a smaller release build.)
 endif
 
-EXPORTED_FUNCTIONS.api.in := $(dir.api)/EXPORTED_FUNCTIONS.sqlite3-api \
-    $(dir.jacc)/jaccwabyt_test.exports
+EXPORTED_FUNCTIONS.api.in := $(dir.api)/EXPORTED_FUNCTIONS.sqlite3-api
 
 EXPORTED_FUNCTIONS.api: $(EXPORTED_FUNCTIONS.api.in) $(MAKEFILE)
 	cat $(EXPORTED_FUNCTIONS.api.in) > $@
@@ -294,12 +289,6 @@ sqlite3-wasm.o := $(dir.api)/sqlite3-wasm.o
 $(sqlite3-wasm.o): emcc.cflags += $(SQLITE_OPT)
 $(sqlite3-wasm.o): $(dir.top)/sqlite3.c
 sqlite3-wasm.c := $(dir.api)/sqlite3-wasm.c
-jaccwabyt_test.c := $(dir.jacc)/jaccwabyt_test.c
-# ^^^ FIXME (how?): jaccwabyt_test.c is only needed for the test apps,
-# so we don't really want to include it in release builds. However, we
-# want to test the release builds with those apps, so we cannot simply
-# elide that file in release builds. That component is critical to the
-# VFS bindings so needs to be tested along with the core APIs.
 ########################################################################
 # call-wasm-c-compile sets up build rules
 # for $1.o. $1 must be the name of a C file (with extension).
@@ -310,7 +299,7 @@ $$($(1).o): $$(MAKEFILE) $(1)
 	$$(emcc.bin) $$(emcc_opt_full) $$(emcc.flags) $$(emcc.cflags) -c $(1) -o $$@
 CLEAN_FILES += $$($(1).o)
 endef
-$(foreach c,$(sqlite3-wasm.c) $(jaccwabyt_test.c),$(eval $(call call-wasm-c-compile,$(c))))
+$(foreach c,$(sqlite3-wasm.c),$(eval $(call call-wasm-c-compile,$(c))))
 $(eval $(call call-make-pre-js,sqlite3))
 $(sqlite3.js): $(MAKEFILE) $(sqlite3.wasm.obj) \
     EXPORTED_FUNCTIONS.api \
@@ -401,7 +390,7 @@ speedtest1.wasm := $(subst .js,.wasm,$(speedtest1.js))
 speedtest1.cflags := \
   -I. -I.. -I$(dir.top) \
   -DSQLITE_SPEEDTEST1_WASM
-speedtest1.cs := $(speedtest1.c) $(sqlite3-wasm.c) $(jaccwabyt_test.c)
+speedtest1.cs := $(speedtest1.c) $(sqlite3-wasm.c)
 $(speedtest1.js): emcc.cflags+=
 # speedtest1 notes re. sqlite3-wasm.o vs sqlite3-wasm.c: building against
 # the latter (predictably) results in a slightly faster binary, but we're
diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index 6f7301ece6..fd1f0c3e02 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -592,8 +592,14 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     */
     capi.sqlite3_web_rc_str = (rc)=>__rcMap[rc];
     /* Bind all registered C-side structs... */
+    const notThese = Object.assign(Object.create(null),{
+      // Structs NOT to register
+      WasmTestStruct: true
+    });
     for(const s of wasm.ctype.structs){
-      capi[s.name] = sqlite3.StructBinder(s);
+      if(!notThese[s.name]){
+        capi[s.name] = sqlite3.StructBinder(s);
+      }
     }
   }/*end C constant imports*/
 
diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index b78c9b68ef..fa6c6d8e5f 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -806,12 +806,16 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        - (optionsObject)
 
        In the final two cases, the function must be defined as the
-       'callback' property of the options object. In the final
+       `callback` property of the options object (optionally called
+       `xFunc` to align with the C API documentation). In the final
        case, the function's name must be the 'name' property.
 
-       This can only be used to create scalar functions, not
-       aggregate or window functions. UDFs cannot be removed from
-       a DB handle after they're added.
+       This can currently only be used to create scalar functions, not
+       aggregate or window functions (requires only a bit of
+       refactoring to support aggregates and window functions).
+
+       UDFs cannot currently be removed from a DB handle after they're
+       added.
 
        On success, returns this object. Throws on error.
 
@@ -848,18 +852,22 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        - .deterministic = SQLITE_DETERMINISTIC
        - .directOnly = SQLITE_DIRECTONLY
        - .innocuous = SQLITE_INNOCUOUS
+
+       TODO: for the (optionsObject) form, accept callbacks for
+       aggregate and window functions.
+
     */
-    createFunction: function f(name, callback,opt){
+    createFunction: function f(name, callback, opt){
       switch(arguments.length){
           case 1: /* (optionsObject) */
             opt = name;
             name = opt.name;
-            callback = opt.callback;
+            callback = opt.xFunc || opt.callback;
             break;
           case 2: /* (name, callback|optionsObject) */
             if(!(callback instanceof Function)){
               opt = callback;
-              callback = opt.callback;
+              callback = opt.xFunc || opt.callback;
             }
             break;
           default: break;
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 10d09d7404..a267e93454 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -949,7 +949,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
       return rc;
     },
     /**
-       A convenience wrapper for allocChunks() which sizes each chunks
+       A convenience wrapper for allocChunks() which sizes each chunk
        as either 8 bytes (safePtrSize is truthy) or wasm.ptrSizeof (if
        safePtrSize is falsy).
 
diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index d57dc0562d..26771d5c9a 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -14,6 +14,16 @@
 */
 
 #define SQLITE_WASM
+#ifdef SQLITE_WASM_ENABLE_C_TESTS
+/*
+** Functions blocked off by SQLITE_WASM_TESTS are intended solely for
+** use in unit/regression testing. They may be safely omitted from
+** client-side builds.
+*/
+#  define SQLITE_WASM_TESTS 1
+#else
+#  define SQLITE_WASM_TESTS 0
+#endif
 
 /*
 ** Threading and file locking: JS is single-threaded. Each Worker
@@ -32,34 +42,20 @@
 ** locking, and any similar future filesystems, threading and file
 ** locking support are unnecessary in the wasm build.
 */
+
+/*
+** Undefine any SQLITE_... config flags which we specifically do not
+** want undefined. Please keep these alphabetized.
+*/
 #undef SQLITE_OMIT_DESERIALIZE
-#ifndef SQLITE_DEFAULT_UNIX_VFS
-# define SQLITE_DEFAULT_UNIX_VFS "unix-none"
-#endif
-#ifndef SQLITE_OMIT_DEPRECATED
-# define SQLITE_OMIT_DEPRECATED
-#endif
-#ifndef SQLITE_OMIT_LOAD_EXTENSION
-# define SQLITE_OMIT_LOAD_EXTENSION
-#endif
-#ifndef SQLITE_OMIT_SHARED_CACHE
-# define SQLITE_OMIT_SHARED_CACHE
-#endif
-#ifndef SQLITE_OMIT_UTF16
-# define SQLITE_OMIT_UTF16
-#endif
-#ifndef SQLITE_OS_KV_OPTIONAL
-# define SQLITE_OS_KV_OPTIONAL 1
-#endif
-#ifndef SQLITE_TEMP_STORE
-# define SQLITE_TEMP_STORE 3
-#endif
-#ifndef SQLITE_THREADSAFE
-# define SQLITE_THREADSAFE 0
-#endif
-#ifndef SQLITE_OMIT_WAL
-# define SQLITE_OMIT_WAL
-#endif
+
+/*
+** Define any SQLITE_... config defaults we want if they aren't
+** overridden by the builder. Please keep these alphabetized.
+*/
+
+/**********************************************************************/
+/* SQLITE_DEFAULT_... */
 #ifndef SQLITE_DEFAULT_CACHE_SIZE
 /*
 ** The OPFS impls benefit tremendously from an increased cache size
@@ -71,14 +67,78 @@
 */
 # define SQLITE_DEFAULT_CACHE_SIZE -16777216
 #endif
-
-#if 0
-/*
-** TODO: experiment with this when back on the opfs-capable machine.
-*/
-#ifndef SQLITE_DEFAULT_PAGE_SIZE
+#if 0 && !defined(SQLITE_DEFAULT_PAGE_SIZE)
+/* TODO: experiment with this. */
 # define SQLITE_DEFAULT_PAGE_SIZE 8192 /*4096*/
 #endif
+#ifndef SQLITE_DEFAULT_UNIX_VFS
+# define SQLITE_DEFAULT_UNIX_VFS "unix-none"
+#endif
+
+/**********************************************************************/
+/* SQLITE_ENABLE_... */
+#ifndef SQLITE_ENABLE_BYTECODE_VTAB
+#  define SQLITE_ENABLE_BYTECODE_VTAB 1
+#endif
+#ifndef SQLITE_ENABLE_DBPAGE_VTAB
+#  define SQLITE_ENABLE_DBPAGE_VTAB 1
+#endif
+#ifndef SQLITE_ENABLE_DBSTAT_VTAB
+#  define SQLITE_ENABLE_DBSTAT_VTAB 1
+#endif
+#ifndef SQLITE_ENABLE_EXPLAIN_COMMENTS
+#  define SQLITE_ENABLE_EXPLAIN_COMMENTS 1
+#endif
+#ifndef SQLITE_ENABLE_FTS4
+#  define SQLITE_ENABLE_FTS4 1
+#endif
+#ifndef SQLITE_ENABLE_OFFSET_SQL_FUNC
+#  define SQLITE_ENABLE_OFFSET_SQL_FUNC 1
+#endif
+#ifndef SQLITE_ENABLE_RTREE
+#  define SQLITE_ENABLE_RTREE 1
+#endif
+#ifndef SQLITE_ENABLE_STMTVTAB
+#  define SQLITE_ENABLE_STMTVTAB 1
+#endif
+#ifndef SQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
+#  define SQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
+#endif
+
+/**********************************************************************/
+/* SQLITE_O... */
+#ifndef SQLITE_OMIT_DEPRECATED
+# define SQLITE_OMIT_DEPRECATED 1
+#endif
+#ifndef SQLITE_OMIT_LOAD_EXTENSION
+# define SQLITE_OMIT_LOAD_EXTENSION 1
+#endif
+#ifndef SQLITE_OMIT_SHARED_CACHE
+# define SQLITE_OMIT_SHARED_CACHE 1
+#endif
+#ifndef SQLITE_OMIT_UTF16
+# define SQLITE_OMIT_UTF16 1
+#endif
+#ifndef SQLITE_OMIT_WAL
+# define SQLITE_OMIT_WAL 1
+#endif
+#ifndef SQLITE_OS_KV_OPTIONAL
+# define SQLITE_OS_KV_OPTIONAL 1
+#endif
+
+/**********************************************************************/
+/* SQLITE_T... */
+#ifndef SQLITE_TEMP_STORE
+# define SQLITE_TEMP_STORE 3
+#endif
+#ifndef SQLITE_THREADSAFE
+# define SQLITE_THREADSAFE 0
+#endif
+
+/**********************************************************************/
+/* SQLITE_USE_... */
+#ifndef SQLITE_USE_URI
+#  define SQLITE_USE_URI 1
 #endif
 
 #include <assert.h>
@@ -89,11 +149,11 @@
 #endif
 
 /*
-** SQLITE_WASM_KEEP is identical to EMSCRIPTEN_KEEPALIVE but is not
-** Emscripten-specific. It explicitly marks functions for export into
-** the target wasm file without requiring explicit listing of those
-** functions in Emscripten's -sEXPORTED_FUNCTIONS=... list (or
-** equivalent in other build platforms). Any function with neither
+** SQLITE_WASM_KEEP is functionally identical to EMSCRIPTEN_KEEPALIVE
+** but is not Emscripten-specific. It explicitly marks functions for
+** export into the target wasm file without requiring explicit listing
+** of those functions in Emscripten's -sEXPORTED_FUNCTIONS=... list
+** (or equivalent in other build platforms). Any function with neither
 ** this attribute nor which is listed as an explicit export will not
 ** be exported from the wasm file (but may still be used internally
 ** within the wasm file).
@@ -256,6 +316,28 @@ int sqlite3_wasm_db_error(sqlite3*db, int err_code, const char *zMsg){
   return err_code;
 }
 
+#if SQLITE_WASM_TESTS
+struct WasmTestStruct {
+  int v4;
+  void * ppV;
+  const char * cstr;
+  int64_t v8;
+  void (*xFunc)(void*);
+};
+typedef struct WasmTestStruct WasmTestStruct;
+SQLITE_WASM_KEEP
+void sqlite3_wasm_test_struct(WasmTestStruct * s){
+  if(s){
+    s->v4 *= 2;
+    s->v8 = s->v4 * 2;
+    s->ppV = s;
+    s->cstr = __FILE__;
+    if(s->xFunc) s->xFunc(s);
+  }
+  return;
+}
+#endif /* SQLITE_WASM_TESTS */
+
 /*
 ** This function is NOT part of the sqlite3 public API. It is strictly
 ** for use by the sqlite project's own JS/WASM bindings. Unlike the
@@ -692,6 +774,19 @@ const char * sqlite3_wasm_enum_json(void){
       M(xDelete,"i(ss)");
       M(nKeySize,"i");
     } _StructBinder;
+#undef CurrentStruct
+
+#if SQLITE_WASM_TESTS
+#define CurrentStruct WasmTestStruct
+    StructBinder {
+      M(v4,"i");
+      M(cstr,"s");
+      M(ppV,"p");
+      M(v8,"j");
+      M(xFunc,"v(p)");
+    } _StructBinder;
+#undef CurrentStruct
+#endif
 
   } out( "]"/*structs*/);
 
@@ -926,4 +1021,56 @@ int sqlite3_wasm_init_wasmfs(const char *zUnused){
 }
 #endif /* __EMSCRIPTEN__ && SQLITE_WASM_WASMFS */
 
+#if SQLITE_WASM_TESTS
+
+SQLITE_WASM_KEEP
+int sqlite3_wasm_test_intptr(int * p){
+  return *p = *p * 2;
+}
+
+SQLITE_WASM_KEEP
+int64_t sqlite3_wasm_test_int64_max(void){
+  return (int64_t)0x7fffffffffffffff;
+}
+
+SQLITE_WASM_KEEP
+int64_t sqlite3_wasm_test_int64_min(void){
+  return ~sqlite3_wasm_test_int64_max();
+}
+
+SQLITE_WASM_KEEP
+int64_t sqlite3_wasm_test_int64_times2(int64_t x){
+  return x * 2;
+}
+
+SQLITE_WASM_KEEP
+void sqlite3_wasm_test_int64_minmax(int64_t * min, int64_t *max){
+  *max = sqlite3_wasm_test_int64_max();
+  *min = sqlite3_wasm_test_int64_min();
+  /*printf("minmax: min=%lld, max=%lld\n", *min, *max);*/
+}
+
+SQLITE_WASM_KEEP
+int64_t sqlite3_wasm_test_int64ptr(int64_t * p){
+  /*printf("sqlite3_wasm_test_int64ptr( @%lld = 0x%llx )\n", (int64_t)p, *p);*/
+  return *p = *p * 2;
+}
+
+SQLITE_WASM_KEEP
+void sqlite3_wasm_test_stack_overflow(int recurse){
+  if(recurse) sqlite3_wasm_test_stack_overflow(recurse);
+}
+
+/* For testing the 'string-free' whwasmutil.xWrap() conversion. */
+SQLITE_WASM_KEEP
+char * sqlite3_wasm_test_str_hello(int fail){
+  char * s = fail ? 0 : (char *)malloc(6);
+  if(s){
+    memcpy(s, "hello", 5);
+    s[5] = 0;
+  }
+  return s;
+}
+#endif /* SQLITE_WASM_TESTS */
+
 #undef SQLITE_WASM_KEEP
diff --git a/ext/wasm/common/testing.css b/ext/wasm/common/testing.css
index c8629a2c62..27f77e45c7 100644
--- a/ext/wasm/common/testing.css
+++ b/ext/wasm/common/testing.css
@@ -2,7 +2,6 @@ body {
   display: flex;
   flex-direction: column;
   flex-wrap: wrap;
-  white-space: break-spaces;
 }
 textarea {
     font-family: monospace;
diff --git a/ext/wasm/common/whwasmutil.js b/ext/wasm/common/whwasmutil.js
index c98b7cea4d..e04886de8a 100644
--- a/ext/wasm/common/whwasmutil.js
+++ b/ext/wasm/common/whwasmutil.js
@@ -1255,12 +1255,13 @@ self.WhWasmUtilInstaller = function(target){
      Would that be too much magic concentrated in one place, ready to
      backfire?
   */
-  xcv.arg.string = xcv.arg['pointer'] = xcv.arg['*'] = function(v){
-    if('string'===typeof v) return target.scopedAllocCString(v);
-    return v ? xcv.arg[ptrIR](v) : null;
-  };
-  xcv.result.string = (i)=>target.cstringToJs(i);
-  xcv.result['string:free'] = (i)=>{
+  xcv.arg.string = xcv.arg.utf8 = xcv.arg['pointer'] = xcv.arg['*']
+    = function(v){
+      if('string'===typeof v) return target.scopedAllocCString(v);
+      return v ? xcv.arg[ptrIR](v) : null;
+    };
+  xcv.result.string = xcv.result.utf8 = (i)=>target.cstringToJs(i);
+  xcv.result['string:free'] = xcv.result['utf8:free'] = (i)=>{
     try { return i ? target.cstringToJs(i) : null }
     finally{ target.dealloc(i) }
   };
@@ -1374,31 +1375,33 @@ self.WhWasmUtilInstaller = function(target){
 
      Non-numeric conversions include:
 
-     - `string` (args): has two different semantics in order to
-       accommodate various uses of certain C APIs (e.g. output-style
-       strings)...
+     - `string` or `utf8` (args): has two different semantics in order
+       to accommodate various uses of certain C APIs
+       (e.g. output-style strings)...
 
-       - If the arg is a string, it creates a _temporary_ C-string to
-         pass to the exported function, cleaning it up before the
-         wrapper returns. If a long-lived C-string pointer is
-         required, that requires client-side code to create the
-         string, then pass its pointer to the function.
+       - If the arg is a string, it creates a _temporary_
+         UTF-8-encoded C-string to pass to the exported function,
+         cleaning it up before the wrapper returns. If a long-lived
+         C-string pointer is required, that requires client-side code
+         to create the string, then pass its pointer to the function.
 
        - Else the arg is assumed to be a pointer to a string the
          client has already allocated and it's passed on as
          a WASM pointer.
 
-     - `string` (results): treats the result value as a const C-string,
-       copies it to a JS string, and returns that JS string.
+       - `string` or `utf8` (results): treats the result value as a
+         const C-string, encoded as UTF-8, copies it to a JS string,
+         and returns that JS string.
 
-     - `string:free` (results): treats the result value as a non-const
-       C-string, ownership of which has just been transfered to the
-       caller. It copies the C-string to a JS string, frees the
-       C-string, and returns the JS string. If such a result value is
-       NULL, the JS result is `null`. Achtung: when using an API which
-       returns results from a specific allocator, e.g. `my_malloc()`,
-       this conversion _is not legal_. Instead, an equivalent conversion
-       which uses the appropriate deallocator is required. For example:  
+     - `string:free` or `utf8:free) (results): treats the result value
+       as a non-const UTF-8 C-string, ownership of which has just been
+       transfered to the caller. It copies the C-string to a JS
+       string, frees the C-string, and returns the JS string. If such
+       a result value is NULL, the JS result is `null`. Achtung: when
+       using an API which returns results from a specific allocator,
+       e.g. `my_malloc()`, this conversion _is not legal_. Instead, an
+       equivalent conversion which uses the appropriate deallocator is
+       required. For example:
 
 ```js
    target.xWrap.resultAdaptor('string:my_free',(i)=>{
diff --git a/ext/wasm/index.html b/ext/wasm/index.html
index 20668db20e..01d178bb7a 100644
--- a/ext/wasm/index.html
+++ b/ext/wasm/index.html
@@ -41,6 +41,15 @@
     </div>
     <div>The tests and demos...
       <ul id='test-list'>
+        <li>Core-most tests
+          <ul>
+            <li><a href='tester1.html'>tester1</a>: Core unit and
+              regression tests for the various APIs and surrounding
+              utility code.</li>
+            <li><a href='tester1.html'>tester1-worker</a>: same thing
+            but running in a Worker.</li>
+          </ul>
+        </li>
         <li>High-level apps and demos...
           <ul>
             <li><a href='fiddle/fiddle.html'>fiddle</a> is an HTML front-end
@@ -68,7 +77,6 @@
         </li>
         <li>The obligatory "misc." category...
           <ul>
-            <li><a href='testing1.html'>testing1</a>: sanity tests of the core APIs and surrounding utility code.</li>
             <li><a href='testing2.html'>testing2</a>: Worker-based test of OO API #1.</li>
             <li><a href='testing-worker1-promiser.html'>testing-worker1-promiser</a>:
               tests for the Promise-based wrapper of the Worker-based API.</li>
diff --git a/ext/wasm/jaccwabyt/jaccwabyt_test.c b/ext/wasm/jaccwabyt/jaccwabyt_test.c
deleted file mode 100644
index 7e2db394c6..0000000000
--- a/ext/wasm/jaccwabyt/jaccwabyt_test.c
+++ /dev/null
@@ -1,178 +0,0 @@
-#include <assert.h>
-#include <string.h> /* memset() */
-#include <stddef.h> /* offsetof() */
-#include <stdio.h>  /* snprintf() */
-#include <stdint.h> /* int64_t */
-/*#include <stdlib.h>*/ /* malloc/free(), needed for emscripten exports. */
-extern void * malloc(size_t);
-extern void free(void *);
-
-/*
-**  2022-06-25
-**
-**  The author disclaims copyright to this source code.  In place of a
-**  legal notice, here is a blessing:
-**
-**  *   May you do good and not evil.
-**  *   May you find forgiveness for yourself and forgive others.
-**  *   May you share freely, never taking more than you give.
-**
-***********************************************************************
-**
-** Utility functions for use with the emscripten/WASM bits. These
-** functions ARE NOT part of the sqlite3 public API. They are strictly
-** for internal use by the JS/WASM bindings.
-**
-** This file is intended to be WASM-compiled together with sqlite3.c,
-** e.g.:
-**
-**  emcc ... sqlite3.c wasm_util.c
-*/
-
-/*
-** Experimenting with output parameters.
-*/
-int jaccwabyt_test_intptr(int * p){
-  if(1==((int)p)%3){
-    /* kludge to get emscripten to export malloc() and free() */;
-    free(malloc(0));
-  }
-  return *p = *p * 2;
-}
-int64_t jaccwabyt_test_int64_max(void){
-  return (int64_t)0x7fffffffffffffff;
-}
-int64_t jaccwabyt_test_int64_min(void){
-  return ~jaccwabyt_test_int64_max();
-}
-int64_t jaccwabyt_test_int64_times2(int64_t x){
-  return x * 2;
-}
-
-void jaccwabyt_test_int64_minmax(int64_t * min, int64_t *max){
-  *max = jaccwabyt_test_int64_max();
-  *min = jaccwabyt_test_int64_min();
-  /*printf("minmax: min=%lld, max=%lld\n", *min, *max);*/
-}
-int64_t jaccwabyt_test_int64ptr(int64_t * p){
-  /*printf("jaccwabyt_test_int64ptr( @%lld = 0x%llx )\n", (int64_t)p, *p);*/
-  return *p = *p * 2;
-}
-
-void jaccwabyt_test_stack_overflow(int recurse){
-  if(recurse) jaccwabyt_test_stack_overflow(recurse);
-}
-
-struct WasmTestStruct {
-  int v4;
-  void * ppV;
-  const char * cstr;
-  int64_t v8;
-  void (*xFunc)(void*);
-};
-typedef struct WasmTestStruct WasmTestStruct;
-void jaccwabyt_test_struct(WasmTestStruct * s){
-  if(s){
-    s->v4 *= 2;
-    s->v8 = s->v4 * 2;
-    s->ppV = s;
-    s->cstr = __FILE__;
-    if(s->xFunc) s->xFunc(s);
-  }
-  return;
-}
-
-/** For testing the 'string-free' whwasmutil.xWrap() conversion. */
-char * jaccwabyt_test_str_hello(int fail){
-  char * s = fail ? 0 : (char *)malloc(6);
-  if(s){
-    memcpy(s, "hello", 5);
-    s[5] = 0;
-  }
-  return s;
-}
-
-/*
-** Returns a NUL-terminated string containing a JSON-format metadata
-** regarding C structs, for use with the StructBinder API. The
-** returned memory is static and is only written to the first time
-** this is called.
-*/
-const char * jaccwabyt_test_ctype_json(void){
-  static char strBuf[1024 * 8] = {0};
-  int n = 0, structCount = 0, groupCount = 0;
-  char * pos = &strBuf[1] /* skip first byte for now to help protect
-                             against a small race condition */;
-  char const * const zEnd = pos + sizeof(strBuf);
-  if(strBuf[0]) return strBuf;
-  /* Leave first strBuf[0] at 0 until the end to help guard against a
-     tiny race condition. If this is called twice concurrently, they
-     might end up both writing to strBuf, but they'll both write the
-     same thing, so that's okay. If we set byte 0 up front then the
-     2nd instance might return a partially-populated string. */
-
-  ////////////////////////////////////////////////////////////////////
-  // First we need to build up our macro framework...
-  ////////////////////////////////////////////////////////////////////
-  // Core output macros...
-#define lenCheck assert(pos < zEnd - 100)
-#define outf(format,...) \
-  pos += snprintf(pos, ((size_t)(zEnd - pos)), format, __VA_ARGS__); \
-  lenCheck
-#define out(TXT) outf("%s",TXT)
-#define CloseBrace(LEVEL) \
-  assert(LEVEL<5); memset(pos, '}', LEVEL); pos+=LEVEL; lenCheck
-
-  ////////////////////////////////////////////////////////////////////
-  // Macros for emitting StructBinder descriptions...
-#define StructBinder__(TYPE)                 \
-  n = 0;                                     \
-  outf("%s{", (structCount++ ? ", " : ""));  \
-  out("\"name\": \"" # TYPE "\",");         \
-  outf("\"sizeof\": %d", (int)sizeof(TYPE)); \
-  out(",\"members\": {");
-#define StructBinder_(T) StructBinder__(T)
-// ^^^ indirection needed to expand CurrentStruct
-#define StructBinder StructBinder_(CurrentStruct)
-#define _StructBinder CloseBrace(2)
-#define M(MEMBER,SIG)                                         \
-  outf("%s\"%s\": "                                           \
-       "{\"offset\":%d,\"sizeof\": %d,\"signature\":\"%s\"}", \
-       (n++ ? ", " : ""), #MEMBER,                            \
-       (int)offsetof(CurrentStruct,MEMBER),                   \
-       (int)sizeof(((CurrentStruct*)0)->MEMBER),              \
-       SIG)
-  // End of macros
-  ////////////////////////////////////////////////////////////////////
-  
-  out("\"structs\": ["); {
-
-#define CurrentStruct WasmTestStruct
-    StructBinder {
-      M(v4,"i");
-      M(cstr,"s");
-      M(ppV,"p");
-      M(v8,"j");
-      M(xFunc,"v(p)");
-    } _StructBinder;
-#undef CurrentStruct
-
-  } out( "]"/*structs*/);
-  out("}"/*top-level object*/);
-  *pos = 0;
-  strBuf[0] = '{'/*end of the race-condition workaround*/;
-  return strBuf;
-#undef DefGroup
-#undef Def
-#undef _DefGroup
-#undef StructBinder
-#undef StructBinder_
-#undef StructBinder__
-#undef M
-#undef _StructBinder
-#undef CurrentStruct
-#undef CloseBrace
-#undef out
-#undef outf
-#undef lenCheck
-}
diff --git a/ext/wasm/jaccwabyt/jaccwabyt_test.exports b/ext/wasm/jaccwabyt/jaccwabyt_test.exports
deleted file mode 100644
index b6182207b5..0000000000
--- a/ext/wasm/jaccwabyt/jaccwabyt_test.exports
+++ /dev/null
@@ -1,10 +0,0 @@
-_jaccwabyt_test_intptr
-_jaccwabyt_test_int64ptr
-_jaccwabyt_test_int64_max
-_jaccwabyt_test_int64_min
-_jaccwabyt_test_int64_minmax
-_jaccwabyt_test_int64_times2
-_jaccwabyt_test_struct
-_jaccwabyt_test_ctype_json
-_jaccwabyt_test_stack_overflow
-_jaccwabyt_test_str_hello
diff --git a/ext/wasm/tester1.js b/ext/wasm/tester1.js
index ae4cc0c949..37a992d619 100644
--- a/ext/wasm/tester1.js
+++ b/ext/wasm/tester1.js
@@ -43,8 +43,8 @@
   const isWorker = ()=>!isUIThread();
   /* Predicate for tests/groups. */
   const testIsTodo = ()=>false;
-  const haveJaccwabytTests = function(){
-    return !!wasm.exports.jaccwabyt_test_int64_max;
+  const haveWasmCTests = function(){
+    return !!wasm.exports.sqlite3_wasm_test_int64_max;
   };
   const mapToString = (v)=>{
     switch(typeof v){
@@ -282,7 +282,8 @@
   ////////////////////////////////////////////////////////////////////////
   // End of infrastructure setup. Now define the tests...
   ////////////////////////////////////////////////////////////////////////
-  
+
+  ////////////////////////////////////////////////////////////////////
   T.g('Basic sanity checks')
     .t('Namespace object checks', function(sqlite3){
       const wasmCtypes = wasm.ctype;
@@ -310,13 +311,656 @@
           .assert(e instanceof sqlite3.WasmAllocError);
       }
     })
+  ////////////////////////////////////////////////////////////////////
     .t('strglob/strlike', function(sqlite3){
       T.assert(0===capi.sqlite3_strglob("*.txt", "foo.txt")).
         assert(0!==capi.sqlite3_strglob("*.txt", "foo.xtx")).
         assert(0===capi.sqlite3_strlike("%.txt", "foo.txt", 0)).
         assert(0!==capi.sqlite3_strlike("%.txt", "foo.xtx", 0));
     })
+  ////////////////////////////////////////////////////////////////////
+  ;/*end of basic sanity checks*/
 
+  ////////////////////////////////////////////////////////////////////
+  T.g('C/WASM Utilities')
+    .t('sqlite3.capi.wasm', function(sqlite3){
+      const w = wasm;
+      const chr = (x)=>x.charCodeAt(0);
+      //log("heap getters...");
+      {
+        const li = [8, 16, 32];
+        if(w.bigIntEnabled) li.push(64);
+        for(const n of li){
+          const bpe = n/8;
+          const s = w.heapForSize(n,false);
+          T.assert(bpe===s.BYTES_PER_ELEMENT).
+            assert(w.heapForSize(s.constructor) === s);
+          const u = w.heapForSize(n,true);
+          T.assert(bpe===u.BYTES_PER_ELEMENT).
+            assert(s!==u).
+            assert(w.heapForSize(u.constructor) === u);
+        }
+      }
+
+      //log("jstrlen()...");
+      {
+        T.assert(3 === w.jstrlen("abc")).assert(4 === w.jstrlen("äbc"));
+      }
+
+      //log("jstrcpy()...");
+      {
+        const fillChar = 10;
+        let ua = new Uint8Array(8), rc,
+            refill = ()=>ua.fill(fillChar);
+        refill();
+        rc = w.jstrcpy("hello", ua);
+        T.assert(6===rc).assert(0===ua[5]).assert(chr('o')===ua[4]);
+        refill();
+        ua[5] = chr('!');
+        rc = w.jstrcpy("HELLO", ua, 0, -1, false);
+        T.assert(5===rc).assert(chr('!')===ua[5]).assert(chr('O')===ua[4]);
+        refill();
+        rc = w.jstrcpy("the end", ua, 4);
+        //log("rc,ua",rc,ua);
+        T.assert(4===rc).assert(0===ua[7]).
+          assert(chr('e')===ua[6]).assert(chr('t')===ua[4]);
+        refill();
+        rc = w.jstrcpy("the end", ua, 4, -1, false);
+        T.assert(4===rc).assert(chr(' ')===ua[7]).
+          assert(chr('e')===ua[6]).assert(chr('t')===ua[4]);
+        refill();
+        rc = w.jstrcpy("", ua, 0, 1, true);
+        //log("rc,ua",rc,ua);
+        T.assert(1===rc).assert(0===ua[0]);
+        refill();
+        rc = w.jstrcpy("x", ua, 0, 1, true);
+        //log("rc,ua",rc,ua);
+        T.assert(1===rc).assert(0===ua[0]);
+        refill();
+        rc = w.jstrcpy('äbä', ua, 0, 1, true);
+        T.assert(1===rc, 'Must not write partial multi-byte char.')
+          .assert(0===ua[0]);
+        refill();
+        rc = w.jstrcpy('äbä', ua, 0, 2, true);
+        T.assert(1===rc, 'Must not write partial multi-byte char.')
+          .assert(0===ua[0]);
+        refill();
+        rc = w.jstrcpy('äbä', ua, 0, 2, false);
+        T.assert(2===rc).assert(fillChar!==ua[1]).assert(fillChar===ua[2]);
+      }/*jstrcpy()*/
+
+      //log("cstrncpy()...");
+      {
+        const scope = w.scopedAllocPush();
+        try {
+          let cStr = w.scopedAllocCString("hello");
+          const n = w.cstrlen(cStr);
+          let cpy = w.scopedAlloc(n+10);
+          let rc = w.cstrncpy(cpy, cStr, n+10);
+          T.assert(n+1 === rc).
+            assert("hello" === w.cstringToJs(cpy)).
+            assert(chr('o') === w.getMemValue(cpy+n-1)).
+            assert(0 === w.getMemValue(cpy+n));
+          let cStr2 = w.scopedAllocCString("HI!!!");
+          rc = w.cstrncpy(cpy, cStr2, 3);
+          T.assert(3===rc).
+            assert("HI!lo" === w.cstringToJs(cpy)).
+            assert(chr('!') === w.getMemValue(cpy+2)).
+            assert(chr('l') === w.getMemValue(cpy+3));
+        }finally{
+          w.scopedAllocPop(scope);
+        }
+      }
+
+      //log("jstrToUintArray()...");
+      {
+        let a = w.jstrToUintArray("hello", false);
+        T.assert(5===a.byteLength).assert(chr('o')===a[4]);
+        a = w.jstrToUintArray("hello", true);
+        T.assert(6===a.byteLength).assert(chr('o')===a[4]).assert(0===a[5]);
+        a = w.jstrToUintArray("äbä", false);
+        T.assert(5===a.byteLength).assert(chr('b')===a[2]);
+        a = w.jstrToUintArray("äbä", true);
+        T.assert(6===a.byteLength).assert(chr('b')===a[2]).assert(0===a[5]);
+      }
+
+      //log("allocCString()...");
+      {
+        const cstr = w.allocCString("hällo, world");
+        const n = w.cstrlen(cstr);
+        T.assert(13 === n)
+          .assert(0===w.getMemValue(cstr+n))
+          .assert(chr('d')===w.getMemValue(cstr+n-1));
+      }
+
+      //log("scopedAlloc() and friends...");
+      {
+        const alloc = w.alloc, dealloc = w.dealloc;
+        w.alloc = w.dealloc = null;
+        T.assert(!w.scopedAlloc.level)
+          .mustThrowMatching(()=>w.scopedAlloc(1), /^No scopedAllocPush/)
+          .mustThrowMatching(()=>w.scopedAllocPush(), /missing alloc/);
+        w.alloc = alloc;
+        T.mustThrowMatching(()=>w.scopedAllocPush(), /missing alloc/);
+        w.dealloc = dealloc;
+        T.mustThrowMatching(()=>w.scopedAllocPop(), /^Invalid state/)
+          .mustThrowMatching(()=>w.scopedAlloc(1), /^No scopedAllocPush/)
+          .mustThrowMatching(()=>w.scopedAlloc.level=0, /read-only/);
+        const asc = w.scopedAllocPush();
+        let asc2;
+        try {
+          const p1 = w.scopedAlloc(16),
+                p2 = w.scopedAlloc(16);
+          T.assert(1===w.scopedAlloc.level)
+            .assert(Number.isFinite(p1))
+            .assert(Number.isFinite(p2))
+            .assert(asc[0] === p1)
+            .assert(asc[1]===p2);
+          asc2 = w.scopedAllocPush();
+          const p3 = w.scopedAlloc(16);
+          T.assert(2===w.scopedAlloc.level)
+            .assert(Number.isFinite(p3))
+            .assert(2===asc.length)
+            .assert(p3===asc2[0]);
+
+          const [z1, z2, z3] = w.scopedAllocPtr(3);
+          T.assert('number'===typeof z1).assert(z2>z1).assert(z3>z2)
+            .assert(0===w.getMemValue(z1,'i32'), 'allocPtr() must zero the targets')
+            .assert(0===w.getMemValue(z3,'i32'));
+        }finally{
+          // Pop them in "incorrect" order to make sure they behave:
+          w.scopedAllocPop(asc);
+          T.assert(0===asc.length);
+          T.mustThrowMatching(()=>w.scopedAllocPop(asc),
+                              /^Invalid state object/);
+          if(asc2){
+            T.assert(2===asc2.length,'Should be p3 and z1');
+            w.scopedAllocPop(asc2);
+            T.assert(0===asc2.length);
+            T.mustThrowMatching(()=>w.scopedAllocPop(asc2),
+                                /^Invalid state object/);
+          }
+        }
+        T.assert(0===w.scopedAlloc.level);
+        w.scopedAllocCall(function(){
+          T.assert(1===w.scopedAlloc.level);
+          const [cstr, n] = w.scopedAllocCString("hello, world", true);
+          T.assert(12 === n)
+            .assert(0===w.getMemValue(cstr+n))
+            .assert(chr('d')===w.getMemValue(cstr+n-1));
+        });
+      }/*scopedAlloc()*/
+
+      //log("xCall()...");
+      {
+        const pJson = w.xCall('sqlite3_wasm_enum_json');
+        T.assert(Number.isFinite(pJson)).assert(w.cstrlen(pJson)>300);
+      }
+
+      //log("xWrap()...");
+      {
+        T.mustThrowMatching(()=>w.xWrap('sqlite3_libversion',null,'i32'),
+                            /requires 0 arg/).
+          assert(w.xWrap.resultAdapter('i32') instanceof Function).
+          assert(w.xWrap.argAdapter('i32') instanceof Function);
+        let fw = w.xWrap('sqlite3_libversion','utf8');
+        T.mustThrowMatching(()=>fw(1), /requires 0 arg/);
+        let rc = fw();
+        T.assert('string'===typeof rc).assert(rc.length>5);
+        rc = w.xCallWrapped('sqlite3_wasm_enum_json','*');
+        T.assert(rc>0 && Number.isFinite(rc));
+        rc = w.xCallWrapped('sqlite3_wasm_enum_json','utf8');
+        T.assert('string'===typeof rc).assert(rc.length>300);
+        if(haveWasmCTests()){
+          fw = w.xWrap('sqlite3_wasm_test_str_hello', 'utf8:free',['i32']);
+          rc = fw(0);
+          T.assert('hello'===rc);
+          rc = fw(1);
+          T.assert(null===rc);
+
+          if(w.bigIntEnabled){
+            w.xWrap.resultAdapter('thrice', (v)=>3n*BigInt(v));
+            w.xWrap.argAdapter('twice', (v)=>2n*BigInt(v));
+            fw = w.xWrap('sqlite3_wasm_test_int64_times2','thrice','twice');
+            rc = fw(1);
+            T.assert(12n===rc);
+
+            w.scopedAllocCall(function(){
+              let pI1 = w.scopedAlloc(8), pI2 = pI1+4;
+              w.setMemValue(pI1, 0,'*')(pI2, 0, '*');
+              let f = w.xWrap('sqlite3_wasm_test_int64_minmax',undefined,['i64*','i64*']);
+              let r1 = w.getMemValue(pI1, 'i64'), r2 = w.getMemValue(pI2, 'i64');
+              T.assert(!Number.isSafeInteger(r1)).assert(!Number.isSafeInteger(r2));
+            });
+          }
+        }
+      }
+    }/*WhWasmUtil*/)
+
+  ////////////////////////////////////////////////////////////////////
+    .t('sqlite3.StructBinder (jaccwabyt)', function(sqlite3){
+      const S = sqlite3, W = S.capi.wasm;
+      const MyStructDef = {
+        sizeof: 16,
+        members: {
+          p4: {offset: 0, sizeof: 4, signature: "i"},
+          pP: {offset: 4, sizeof: 4, signature: "P"},
+          ro: {offset: 8, sizeof: 4, signature: "i", readOnly: true},
+          cstr: {offset: 12, sizeof: 4, signature: "s"}
+        }
+      };
+      if(W.bigIntEnabled){
+        const m = MyStructDef;
+        m.members.p8 = {offset: m.sizeof, sizeof: 8, signature: "j"};
+        m.sizeof += m.members.p8.sizeof;
+      }
+      const StructType = S.StructBinder.StructType;
+      const K = S.StructBinder('my_struct',MyStructDef);
+      T.mustThrowMatching(()=>K(), /via 'new'/).
+        mustThrowMatching(()=>new K('hi'), /^Invalid pointer/);
+      const k1 = new K(), k2 = new K();
+      try {
+        T.assert(k1.constructor === K).
+          assert(K.isA(k1)).
+          assert(k1 instanceof K).
+          assert(K.prototype.lookupMember('p4').key === '$p4').
+          assert(K.prototype.lookupMember('$p4').name === 'p4').
+          mustThrowMatching(()=>K.prototype.lookupMember('nope'), /not a mapped/).
+          assert(undefined === K.prototype.lookupMember('nope',false)).
+          assert(k1 instanceof StructType).
+          assert(StructType.isA(k1)).
+          assert(K.resolveToInstance(k1.pointer)===k1).
+          mustThrowMatching(()=>K.resolveToInstance(null,true), /is-not-a my_struct/).
+          assert(k1 === StructType.instanceForPointer(k1.pointer)).
+          mustThrowMatching(()=>k1.$ro = 1, /read-only/);
+        Object.keys(MyStructDef.members).forEach(function(key){
+          key = K.memberKey(key);
+          T.assert(0 == k1[key],
+                   "Expecting allocation to zero the memory "+
+                   "for "+key+" but got: "+k1[key]+
+                   " from "+k1.memoryDump());
+        });
+        T.assert('number' === typeof k1.pointer).
+          mustThrowMatching(()=>k1.pointer = 1, /pointer/).
+          assert(K.instanceForPointer(k1.pointer) === k1);
+        k1.$p4 = 1; k1.$pP = 2;
+        T.assert(1 === k1.$p4).assert(2 === k1.$pP);
+        if(MyStructDef.members.$p8){
+          k1.$p8 = 1/*must not throw despite not being a BigInt*/;
+          k1.$p8 = BigInt(Number.MAX_SAFE_INTEGER * 2);
+          T.assert(BigInt(2 * Number.MAX_SAFE_INTEGER) === k1.$p8);
+        }
+        T.assert(!k1.ondispose);
+        k1.setMemberCString('cstr', "A C-string.");
+        T.assert(Array.isArray(k1.ondispose)).
+          assert(k1.ondispose[0] === k1.$cstr).
+          assert('number' === typeof k1.$cstr).
+          assert('A C-string.' === k1.memberToJsString('cstr'));
+        k1.$pP = k2;
+        T.assert(k1.$pP === k2);
+        k1.$pP = null/*null is special-cased to 0.*/;
+        T.assert(0===k1.$pP);
+        let ptr = k1.pointer;
+        k1.dispose();
+        T.assert(undefined === k1.pointer).
+          assert(undefined === K.instanceForPointer(ptr)).
+          mustThrowMatching(()=>{k1.$pP=1}, /disposed instance/);
+        const k3 = new K();
+        ptr = k3.pointer;
+        T.assert(k3 === K.instanceForPointer(ptr));
+        K.disposeAll();
+        T.assert(ptr).
+          assert(undefined === k2.pointer).
+          assert(undefined === k3.pointer).
+          assert(undefined === K.instanceForPointer(ptr));
+      }finally{
+        k1.dispose();
+        k2.dispose();
+      }
+
+      if(!W.bigIntEnabled){
+        log("Skipping WasmTestStruct tests: BigInt not enabled.");
+        return;
+      }
+
+      const WTStructDesc =
+            W.ctype.structs.filter((e)=>'WasmTestStruct'===e.name)[0];
+      const autoResolvePtr = true /* EXPERIMENTAL */;
+      if(autoResolvePtr){
+        WTStructDesc.members.ppV.signature = 'P';
+      }
+      const WTStruct = S.StructBinder(WTStructDesc);
+      //log(WTStruct.structName, WTStruct.structInfo);
+      const wts = new WTStruct();
+      //log("WTStruct.prototype keys:",Object.keys(WTStruct.prototype));
+      try{
+        T.assert(wts.constructor === WTStruct).
+          assert(WTStruct.memberKeys().indexOf('$ppV')>=0).
+          assert(wts.memberKeys().indexOf('$v8')>=0).
+          assert(!K.isA(wts)).
+          assert(WTStruct.isA(wts)).
+          assert(wts instanceof WTStruct).
+          assert(wts instanceof StructType).
+          assert(StructType.isA(wts)).
+          assert(wts === StructType.instanceForPointer(wts.pointer));
+        T.assert(wts.pointer>0).assert(0===wts.$v4).assert(0n===wts.$v8).
+          assert(0===wts.$ppV).assert(0===wts.$xFunc).
+          assert(WTStruct.instanceForPointer(wts.pointer) === wts);
+        const testFunc =
+              W.xGet('sqlite3_wasm_test_struct'/*name gets mangled in -O3 builds!*/);
+        let counter = 0;
+        //log("wts.pointer =",wts.pointer);
+        const wtsFunc = function(arg){
+          /*log("This from a JS function called from C, "+
+              "which itself was called from JS. arg =",arg);*/
+          ++counter;
+          T.assert(WTStruct.instanceForPointer(arg) === wts);
+          if(3===counter){
+            tossQuietly("Testing exception propagation.");
+          }
+        }
+        wts.$v4 = 10; wts.$v8 = 20;
+        wts.$xFunc = W.installFunction(wtsFunc, wts.memberSignature('xFunc'))
+        T.assert(0===counter).assert(10 === wts.$v4).assert(20n === wts.$v8)
+          .assert(0 === wts.$ppV).assert('number' === typeof wts.$xFunc)
+          .assert(0 === wts.$cstr)
+          .assert(wts.memberIsString('$cstr'))
+          .assert(!wts.memberIsString('$v4'))
+          .assert(null === wts.memberToJsString('$cstr'))
+          .assert(W.functionEntry(wts.$xFunc) instanceof Function);
+        /* It might seem silly to assert that the values match
+           what we just set, but recall that all of those property
+           reads and writes are, via property interceptors,
+           actually marshaling their data to/from a raw memory
+           buffer, so merely reading them back is actually part of
+           testing the struct-wrapping API. */
+
+        testFunc(wts.pointer);
+        //log("wts.pointer, wts.$ppV",wts.pointer, wts.$ppV);
+        T.assert(1===counter).assert(20 === wts.$v4).assert(40n === wts.$v8)
+          .assert(autoResolvePtr ? (wts.$ppV === wts) : (wts.$ppV === wts.pointer))
+          .assert('string' === typeof wts.memberToJsString('cstr'))
+          .assert(wts.memberToJsString('cstr') === wts.memberToJsString('$cstr'))
+          .mustThrowMatching(()=>wts.memberToJsString('xFunc'),
+                             /Invalid member type signature for C-string/)
+        ;
+        testFunc(wts.pointer);
+        T.assert(2===counter).assert(40 === wts.$v4).assert(80n === wts.$v8)
+          .assert(autoResolvePtr ? (wts.$ppV === wts) : (wts.$ppV === wts.pointer));
+        /** The 3rd call to wtsFunc throw from JS, which is called
+            from C, which is called from JS. Let's ensure that
+            that exception propagates back here... */
+        T.mustThrowMatching(()=>testFunc(wts.pointer),/^Testing/);
+        W.uninstallFunction(wts.$xFunc);
+        wts.$xFunc = 0;
+        if(autoResolvePtr){
+          wts.$ppV = 0;
+          T.assert(!wts.$ppV);
+          WTStruct.debugFlags(0x03);
+          wts.$ppV = wts;
+          T.assert(wts === wts.$ppV)
+          WTStruct.debugFlags(0);
+        }
+        wts.setMemberCString('cstr', "A C-string.");
+        T.assert(Array.isArray(wts.ondispose)).
+          assert(wts.ondispose[0] === wts.$cstr).
+          assert('A C-string.' === wts.memberToJsString('cstr'));
+        const ptr = wts.pointer;
+        wts.dispose();
+        T.assert(ptr).assert(undefined === wts.pointer).
+          assert(undefined === WTStruct.instanceForPointer(ptr))
+      }finally{
+        wts.dispose();
+      }
+    }/*StructBinder*/)
+
+  ////////////////////////////////////////////////////////////////////
+    .t('sqlite3.StructBinder part 2', function(sqlite3){
+      // https://www.sqlite.org/c3ref/vfs.html
+      // https://www.sqlite.org/c3ref/io_methods.html
+      const W = wasm;
+      const sqlite3_io_methods = capi.sqlite3_io_methods,
+            sqlite3_vfs = capi.sqlite3_vfs,
+            sqlite3_file = capi.sqlite3_file;
+      //log("struct sqlite3_file", sqlite3_file.memberKeys());
+      //log("struct sqlite3_vfs", sqlite3_vfs.memberKeys());
+      //log("struct sqlite3_io_methods", sqlite3_io_methods.memberKeys());
+      const installMethod = function callee(tgt, name, func){
+        if(1===arguments.length){
+          return (n,f)=>callee(tgt,n,f);
+        }
+        if(!callee.argcProxy){
+          callee.argcProxy = function(func,sig){
+            return function(...args){
+              if(func.length!==arguments.length){
+                toss("Argument mismatch. Native signature is:",sig);
+              }
+              return func.apply(this, args);
+            }
+          };
+          callee.ondisposeRemoveFunc = function(){
+            if(this.__ondispose){
+              const who = this;
+              this.__ondispose.forEach(
+                (v)=>{
+                  if('number'===typeof v){
+                    try{capi.wasm.uninstallFunction(v)}
+                    catch(e){/*ignore*/}
+                  }else{/*wasm function wrapper property*/
+                    delete who[v];
+                  }
+                }
+              );
+              delete this.__ondispose;
+            }
+          };
+        }/*static init*/
+        const sigN = tgt.memberSignature(name),
+              memKey = tgt.memberKey(name);
+        //log("installMethod",tgt, name, sigN);
+        if(!tgt.__ondispose){
+          T.assert(undefined === tgt.ondispose);
+          tgt.ondispose = [callee.ondisposeRemoveFunc];
+          tgt.__ondispose = [];
+        }
+        const fProxy = callee.argcProxy(func, sigN);
+        const pFunc = capi.wasm.installFunction(fProxy, tgt.memberSignature(name, true));
+        tgt[memKey] = pFunc;
+        /**
+           ACHTUNG: function pointer IDs are from a different pool than
+           allocation IDs, starting at 1 and incrementing in steps of 1,
+           so if we set tgt[memKey] to those values, we'd very likely
+           later misinterpret them as plain old pointer addresses unless
+           unless we use some silly heuristic like "all values <5k are
+           presumably function pointers," or actually perform a function
+           lookup on every pointer to first see if it's a function. That
+           would likely work just fine, but would be kludgy.
+
+           It turns out that "all values less than X are functions" is
+           essentially how it works in wasm: a function pointer is
+           reported to the client as its index into the
+           __indirect_function_table.
+
+           So... once jaccwabyt can be told how to access the
+           function table, it could consider all pointer values less
+           than that table's size to be functions.  As "real" pointer
+           values start much, much higher than the function table size,
+           that would likely work reasonably well. e.g. the object
+           pointer address for sqlite3's default VFS is (in this local
+           setup) 65104, whereas the function table has fewer than 600
+           entries.
+        */
+        const wrapperKey = '$'+memKey;
+        tgt[wrapperKey] = fProxy;
+        tgt.__ondispose.push(pFunc, wrapperKey);
+        //log("tgt.__ondispose =",tgt.__ondispose);
+        return (n,f)=>callee(tgt, n, f);
+      }/*installMethod*/;
+
+      const installIOMethods = function instm(iom){
+        (iom instanceof capi.sqlite3_io_methods) || toss("Invalid argument type.");
+        if(!instm._requireFileArg){
+          instm._requireFileArg = function(arg,methodName){
+            arg = capi.sqlite3_file.resolveToInstance(arg);
+            if(!arg){
+              err("sqlite3_io_methods::xClose() was passed a non-sqlite3_file.");
+            }
+            return arg;
+          };
+          instm._methods = {
+            // https://sqlite.org/c3ref/io_methods.html
+            xClose: /*i(P)*/function(f){
+              /* int (*xClose)(sqlite3_file*) */
+              log("xClose(",f,")");
+              if(!(f = instm._requireFileArg(f,'xClose'))) return capi.SQLITE_MISUSE;
+              f.dispose(/*noting that f has externally-owned memory*/);
+              return 0;
+            },
+            xRead: /*i(Ppij)*/function(f,dest,n,offset){
+              /* int (*xRead)(sqlite3_file*, void*, int iAmt, sqlite3_int64 iOfst) */
+              log("xRead(",arguments,")");
+              if(!(f = instm._requireFileArg(f))) return capi.SQLITE_MISUSE;
+              capi.wasm.heap8().fill(0, dest + offset, n);
+              return 0;
+            },
+            xWrite: /*i(Ppij)*/function(f,dest,n,offset){
+              /* int (*xWrite)(sqlite3_file*, const void*, int iAmt, sqlite3_int64 iOfst) */
+              log("xWrite(",arguments,")");
+              if(!(f=instm._requireFileArg(f,'xWrite'))) return capi.SQLITE_MISUSE;
+              return 0;
+            },
+            xTruncate: /*i(Pj)*/function(f){
+              /* int (*xTruncate)(sqlite3_file*, sqlite3_int64 size) */
+              log("xTruncate(",arguments,")");
+              if(!(f=instm._requireFileArg(f,'xTruncate'))) return capi.SQLITE_MISUSE;
+              return 0;
+            },
+            xSync: /*i(Pi)*/function(f){
+              /* int (*xSync)(sqlite3_file*, int flags) */
+              log("xSync(",arguments,")");
+              if(!(f=instm._requireFileArg(f,'xSync'))) return capi.SQLITE_MISUSE;
+              return 0;
+            },
+            xFileSize: /*i(Pp)*/function(f,pSz){
+              /* int (*xFileSize)(sqlite3_file*, sqlite3_int64 *pSize) */
+              log("xFileSize(",arguments,")");
+              if(!(f=instm._requireFileArg(f,'xFileSize'))) return capi.SQLITE_MISUSE;
+              capi.wasm.setMemValue(pSz, 0/*file size*/);
+              return 0;
+            },
+            xLock: /*i(Pi)*/function(f){
+              /* int (*xLock)(sqlite3_file*, int) */
+              log("xLock(",arguments,")");
+              if(!(f=instm._requireFileArg(f,'xLock'))) return capi.SQLITE_MISUSE;
+              return 0;
+            },
+            xUnlock: /*i(Pi)*/function(f){
+              /* int (*xUnlock)(sqlite3_file*, int) */
+              log("xUnlock(",arguments,")");
+              if(!(f=instm._requireFileArg(f,'xUnlock'))) return capi.SQLITE_MISUSE;
+              return 0;
+            },
+            xCheckReservedLock: /*i(Pp)*/function(){
+              /* int (*xCheckReservedLock)(sqlite3_file*, int *pResOut) */
+              log("xCheckReservedLock(",arguments,")");
+              return 0;
+            },
+            xFileControl: /*i(Pip)*/function(){
+              /* int (*xFileControl)(sqlite3_file*, int op, void *pArg) */
+              log("xFileControl(",arguments,")");
+              return capi.SQLITE_NOTFOUND;
+            },
+            xSectorSize: /*i(P)*/function(){
+              /* int (*xSectorSize)(sqlite3_file*) */
+              log("xSectorSize(",arguments,")");
+              return 0/*???*/;
+            },
+            xDeviceCharacteristics:/*i(P)*/function(){
+              /* int (*xDeviceCharacteristics)(sqlite3_file*) */
+              log("xDeviceCharacteristics(",arguments,")");
+              return 0;
+            }
+          };
+        }/*static init*/
+        iom.$iVersion = 1;
+        Object.keys(instm._methods).forEach(
+          (k)=>installMethod(iom, k, instm._methods[k])
+        );
+      }/*installIOMethods()*/;
+
+      const iom = new sqlite3_io_methods, sfile = new sqlite3_file;
+      const err = console.error.bind(console);
+      try {
+        const IOM = sqlite3_io_methods, S3F = sqlite3_file;
+        //log("iom proto",iom,iom.constructor.prototype);
+        //log("sfile",sfile,sfile.constructor.prototype);
+        T.assert(0===sfile.$pMethods).assert(iom.pointer > 0);
+        //log("iom",iom);
+        sfile.$pMethods = iom.pointer;
+        T.assert(iom.pointer === sfile.$pMethods)
+          .assert(IOM.resolveToInstance(iom))
+          .assert(undefined ===IOM.resolveToInstance(sfile))
+          .mustThrow(()=>IOM.resolveToInstance(0,true))
+          .assert(S3F.resolveToInstance(sfile.pointer))
+          .assert(undefined===S3F.resolveToInstance(iom))
+          .assert(iom===IOM.resolveToInstance(sfile.$pMethods));
+        T.assert(0===iom.$iVersion);
+        installIOMethods(iom);
+        T.assert(1===iom.$iVersion);
+        //log("iom.__ondispose",iom.__ondispose);
+        T.assert(Array.isArray(iom.__ondispose)).assert(iom.__ondispose.length>10);
+      }finally{
+        iom.dispose();
+        T.assert(undefined === iom.__ondispose);
+      }
+
+      const dVfs = new sqlite3_vfs(capi.sqlite3_vfs_find(null));
+      try {
+        const SB = sqlite3.StructBinder;
+        T.assert(dVfs instanceof SB.StructType)
+          .assert(dVfs.pointer)
+          .assert('sqlite3_vfs' === dVfs.structName)
+          .assert(!!dVfs.structInfo)
+          .assert(SB.StructType.hasExternalPointer(dVfs))
+          .assert(dVfs.$iVersion>0)
+          .assert('number'===typeof dVfs.$zName)
+          .assert('number'===typeof dVfs.$xSleep)
+          .assert(capi.wasm.functionEntry(dVfs.$xOpen))
+          .assert(dVfs.memberIsString('zName'))
+          .assert(dVfs.memberIsString('$zName'))
+          .assert(!dVfs.memberIsString('pAppData'))
+          .mustThrowMatching(()=>dVfs.memberToJsString('xSleep'),
+                             /Invalid member type signature for C-string/)
+          .mustThrowMatching(()=>dVfs.memberSignature('nope'), /nope is not a mapped/)
+          .assert('string' === typeof dVfs.memberToJsString('zName'))
+          .assert(dVfs.memberToJsString('zName')===dVfs.memberToJsString('$zName'))
+        ;
+        //log("Default VFS: @",dVfs.pointer);
+        Object.keys(sqlite3_vfs.structInfo.members).forEach(function(mname){
+          const mk = sqlite3_vfs.memberKey(mname), mbr = sqlite3_vfs.structInfo.members[mname],
+                addr = dVfs[mk], prefix = 'defaultVfs.'+mname;
+          if(1===mbr.signature.length){
+            let sep = '?', val = undefined;
+            switch(mbr.signature[0]){
+                  // TODO: move this into an accessor, e.g. getPreferredValue(member)
+                case 'i': case 'j': case 'f': case 'd': sep = '='; val = dVfs[mk]; break
+                case 'p': case 'P': sep = '@'; val = dVfs[mk]; break;
+                case 's': sep = '=';
+                  val = dVfs.memberToJsString(mname);
+                  break;
+            }
+            //log(prefix, sep, val);
+          }else{
+            //log(prefix," = funcptr @",addr, capi.wasm.functionEntry(addr));
+          }
+        });
+      }finally{
+        dVfs.dispose();
+        T.assert(undefined===dVfs.pointer);
+      }
+    }/*StructBinder part 2*/)
+  
+  ////////////////////////////////////////////////////////////////////
     .t('sqlite3.capi.wasm.pstack', function(sqlite3){
       const w = sqlite3.capi.wasm, P = w.pstack;
       const isAllocErr = (e)=>e instanceof sqlite3.WasmAllocError;
@@ -373,7 +1017,9 @@
         P.restore(stack);
       }
     }/*pstack tests*/)
-  ;/*end of basic sanity checks*/
+
+  ////////////////////////////////////////////////////////////////////
+  ;/*end of C/WASM utils checks*/
 
   ////////////////////////////////////////////////////////////////////////
   T.g('sqlite3.oo1 sanity checks')
@@ -389,6 +1035,8 @@
       T.assert(capi.SQLITE_MISUSE === rc)
         .assert(0 === capi.sqlite3_errmsg(db.pointer).indexOf("Invalid SQL"));
     })
+
+  ////////////////////////////////////////////////////////////////////
     .t('DB.Stmt sanity checks', function(S){
       let pId;
       let st = this.db.prepare(
@@ -436,6 +1084,8 @@
       T.assert(!st.pointer)
         .assert(0===this.db.openStatementCount());
     })
+
+  ////////////////////////////////////////////////////////////////////
     .t('Table t', function(sqlite3){
       const db = this.db;
       let list = [];
@@ -488,8 +1138,8 @@
                db.selectValue("SELECT "+Number.MIN_SAFE_INTEGER)).
         assert(Number.MAX_SAFE_INTEGER ===
                db.selectValue("SELECT "+Number.MAX_SAFE_INTEGER));
-      if(capi.wasm.bigIntEnabled && haveJaccwabytTests()){
-        const mI = capi.wasm.xCall('jaccwabyt_test_int64_max');
+      if(capi.wasm.bigIntEnabled && haveWasmCTests()){
+        const mI = capi.wasm.xCall('sqlite3_wasm_test_int64_max');
         const b = BigInt(Number.MAX_SAFE_INTEGER * 2);
         T.assert(b === db.selectValue("SELECT "+b)).
           assert(b === db.selectValue("SELECT ?", b)).
@@ -521,6 +1171,7 @@
       }
     })
 
+  ////////////////////////////////////////////////////////////////////
     .t('Scalar UDFs', function(sqlite3){
       const db = this.db;
       db.createFunction("foo",(pCx,a,b)=>a+b);
@@ -574,16 +1225,19 @@
       T.assert(0x68==blobRc[0] && 0x69==blobRc[1]);
     })
 
+  ////////////////////////////////////////////////////////////////////
     .t({
       name: 'Aggregate UDFs (tests are TODO)',
       predicate: testIsTodo
     })
 
+  ////////////////////////////////////////////////////////////////////
     .t({
       name: 'Window UDFs (tests are TODO)',
       predicate: testIsTodo
     })
 
+  ////////////////////////////////////////////////////////////////////
     .t("ATTACH", function(){
       const db = this.db;
       const resultRows = [];
@@ -624,9 +1278,10 @@
       T.mustThrow(()=>db.exec("select * from foo.bar"));
     })
 
+  ////////////////////////////////////////////////////////////////////
     .t({
-      name: 'Jaccwabyt-specific int-pointer tests (if compiled in)',
-      predicate: haveJaccwabytTests,
+      name: 'C-side WASM tests (if compiled in)',
+      predicate: haveWasmCTests,
       test: function(){
         const w = wasm, db = this.db;
         const stack = w.scopedAllocPush();
@@ -636,7 +1291,7 @@
         try{
           ptrInt = w.scopedAlloc(4);
           w.setMemValue(ptrInt,origValue, ptrValType);
-          const cf = w.xGet('jaccwabyt_test_intptr');
+          const cf = w.xGet('sqlite3_wasm_test_intptr');
           const oldPtrInt = ptrInt;
           //log('ptrInt',ptrInt);
           //log('getMemValue(ptrInt)',w.getMemValue(ptrInt));
@@ -658,14 +1313,14 @@
             //log("getMemValue(pi64)",v64());
             T.assert(v64() == o64);
             //T.assert(o64 === w.getMemValue(pi64, ptrType64));
-            const cf64w = w.xGet('jaccwabyt_test_int64ptr');
+            const cf64w = w.xGet('sqlite3_wasm_test_int64ptr');
             cf64w(pi64);
             //log("getMemValue(pi64)",v64());
             T.assert(v64() == BigInt(2 * o64));
             cf64w(pi64);
             T.assert(v64() == BigInt(4 * o64));
 
-            const biTimes2 = w.xGet('jaccwabyt_test_int64_times2');
+            const biTimes2 = w.xGet('sqlite3_wasm_test_int64_times2');
             T.assert(BigInt(2 * o64) ===
                      biTimes2(BigInt(o64)/*explicit conv. required to avoid TypeError
                                            in the call :/ */));
@@ -676,13 +1331,13 @@
             w.setMemValue(pMin, 0, ptrType64);
             w.setMemValue(pMax, 0, ptrType64);
             const minMaxI64 = [
-              w.xCall('jaccwabyt_test_int64_min'),
-              w.xCall('jaccwabyt_test_int64_max')
+              w.xCall('sqlite3_wasm_test_int64_min'),
+              w.xCall('sqlite3_wasm_test_int64_max')
             ];
             T.assert(minMaxI64[0] < BigInt(Number.MIN_SAFE_INTEGER)).
               assert(minMaxI64[1] > BigInt(Number.MAX_SAFE_INTEGER));
             //log("int64_min/max() =",minMaxI64, typeof minMaxI64[0]);
-            w.xCall('jaccwabyt_test_int64_minmax', pMin, pMax);
+            w.xCall('sqlite3_wasm_test_int64_minmax', pMin, pMax);
             T.assert(g64(pMin) === minMaxI64[0], "int64 mismatch").
               assert(g64(pMax) === minMaxI64[1], "int64 mismatch");
             //log("pMin",g64(pMin), "pMax",g64(pMax));
@@ -733,8 +1388,8 @@
     log("sqlite3 version:",capi.sqlite3_libversion(),
         capi.sqlite3_sourceid());
     log("BigInt/int64 support is",(wasm.bigIntEnabled ? "enabled" : "disabled"));
-    if(haveJaccwabytTests()){
-      log("Jaccwabyt test C code found. Jaccwabyt-specific low-level tests.");
+    if(haveWasmCTests()){
+      log("sqlite3_wasm_test_...() APIs are available.");
     }
     TestUtil.runTests(sqlite3);
   });
diff --git a/ext/wasm/testing1.js b/ext/wasm/testing1.js
deleted file mode 100644
index 6bda587733..0000000000
--- a/ext/wasm/testing1.js
+++ /dev/null
@@ -1,1169 +0,0 @@
-/*
-  2022-05-22
-
-  The author disclaims copyright to this source code.  In place of a
-  legal notice, here is a blessing:
-
-  *   May you do good and not evil.
-  *   May you find forgiveness for yourself and forgive others.
-  *   May you share freely, never taking more than you give.
-
-  ***********************************************************************
-
-  A basic test script for sqlite3-api.js. This file must be run in
-  main JS thread and sqlite3.js must have been loaded before it.
-*/
-'use strict';
-(function(){
-  const T = self.SqliteTestUtil;
-  const toss = function(...args){throw new Error(args.join(' '))};
-  const debug = console.debug.bind(console);
-  const eOutput = document.querySelector('#test-output');
-  const log = console.log.bind(console),
-        warn = console.warn.bind(console);
-  const logHtml = function(...args){
-    log.apply(this, args);
-    const ln = document.createElement('div');
-    ln.append(document.createTextNode(args.join(' ')));
-    eOutput.append(ln);
-  };
-
-  const eqApprox = function(v1,v2,factor=0.05){
-    //debug('eqApprox',v1, v2);
-    return v1>=(v2-factor) && v1<=(v2+factor);
-  };
-
-  let sqlite3 /* loaded later */;
-  
-  const testBasicSanity = function(db,sqlite3){
-    const capi = sqlite3.capi;
-    log("Basic sanity tests...");
-    T.assert(Number.isInteger(db.pointer)).
-      mustThrowMatching(()=>db.pointer=1, /read-only/).
-      assert(0===capi.sqlite3_extended_result_codes(db.pointer,1)).
-      assert('main'===db.dbName(0));
-    let pId;
-    let st = db.prepare(
-      new TextEncoder('utf-8').encode("select 3 as a")
-      /* Testing handling of Uint8Array input */
-    );
-    //debug("statement =",st);
-    try {
-      T.assert(Number.isInteger(st.pointer))
-        .mustThrowMatching(()=>st.pointer=1, /read-only/)
-        .assert(1===db.openStatementCount())
-        .assert(!st._mayGet)
-        .assert('a' === st.getColumnName(0))
-        .assert(1===st.columnCount)
-        .assert(0===st.parameterCount)
-        .mustThrow(()=>st.bind(1,null))
-        .assert(true===st.step())
-        .assert(3 === st.get(0))
-        .mustThrow(()=>st.get(1))
-        .mustThrow(()=>st.get(0,~capi.SQLITE_INTEGER))
-        .assert(3 === st.get(0,capi.SQLITE_INTEGER))
-        .assert(3 === st.getInt(0))
-        .assert('3' === st.get(0,capi.SQLITE_TEXT))
-        .assert('3' === st.getString(0))
-        .assert(3.0 === st.get(0,capi.SQLITE_FLOAT))
-        .assert(3.0 === st.getFloat(0))
-        .assert(3 === st.get({}).a)
-        .assert(3 === st.get([])[0])
-        .assert(3 === st.getJSON(0))
-        .assert(st.get(0,capi.SQLITE_BLOB) instanceof Uint8Array)
-        .assert(1===st.get(0,capi.SQLITE_BLOB).length)
-        .assert(st.getBlob(0) instanceof Uint8Array)
-        .assert('3'.charCodeAt(0) === st.getBlob(0)[0])
-        .assert(st._mayGet)
-        .assert(false===st.step())
-        .assert(!st._mayGet)
-      ;
-      pId = st.pointer;
-      T.assert(0===capi.sqlite3_strglob("*.txt", "foo.txt")).
-        assert(0!==capi.sqlite3_strglob("*.txt", "foo.xtx")).
-        assert(0===capi.sqlite3_strlike("%.txt", "foo.txt", 0)).
-        assert(0!==capi.sqlite3_strlike("%.txt", "foo.xtx", 0));
-    }finally{
-      st.finalize();
-    }
-    T.assert(!st.pointer)
-      .assert(0===db.openStatementCount());
-    let list = [];
-    db.exec({
-      sql:['CREATE TABLE t(a,b);',
-           "INSERT INTO t(a,b) VALUES(1,2),(3,4),",
-           "(?,?),('blob',X'6869')"/*intentionally missing semicolon to test for
-                                     off-by-one bug in string-to-WASM conversion*/],
-      saveSql: list,
-      bind: [5,6]
-    });
-    //debug("Exec'd SQL:", list);
-    T.assert(2 === list.length)
-      .assert('string'===typeof list[1])
-      .assert(4===db.changes());
-    if(capi.wasm.bigIntEnabled){
-      T.assert(4n===db.changes(false,true));
-    }
-    let blob = db.selectValue("select b from t where a='blob'");
-    T.assert(blob instanceof Uint8Array).
-      assert(0x68===blob[0] && 0x69===blob[1]);
-    blob = null;
-
-    let counter = 0, colNames = [];
-    list.length = 0;
-    db.exec(new TextEncoder('utf-8').encode("SELECT a a, b b FROM t"),{
-      rowMode: 'object',
-      resultRows: list,
-      columnNames: colNames,
-      callback: function(row,stmt){
-        ++counter;
-        T.assert((row.a%2 && row.a<6) || 'blob'===row.a);
-      }
-    });
-    T.assert(2 === colNames.length)
-      .assert('a' === colNames[0])
-      .assert(4 === counter)
-      .assert(4 === list.length);
-    list.length = 0;
-    db.exec("SELECT a a, b b FROM t",{
-      rowMode: 'array',
-      callback: function(row,stmt){
-        ++counter;
-        T.assert(Array.isArray(row))
-          .assert((0===row[1]%2 && row[1]<7)
-                  || (row[1] instanceof Uint8Array));
-      }
-    });
-    T.assert(8 === counter);
-    T.assert(Number.MIN_SAFE_INTEGER ===
-             db.selectValue("SELECT "+Number.MIN_SAFE_INTEGER)).
-      assert(Number.MAX_SAFE_INTEGER ===
-             db.selectValue("SELECT "+Number.MAX_SAFE_INTEGER));
-    if(capi.wasm.bigIntEnabled){
-      const mI = capi.wasm.xCall('jaccwabyt_test_int64_max');
-      const b = BigInt(Number.MAX_SAFE_INTEGER * 2);
-      T.assert(b === db.selectValue("SELECT "+b)).
-        assert(b === db.selectValue("SELECT ?", b)).
-        assert(mI == db.selectValue("SELECT $x", {$x:mI}));
-    }else{
-      /* Curiously, the JS spec seems to be off by one with the definitions
-         of MIN/MAX_SAFE_INTEGER:
-
-         https://github.com/emscripten-core/emscripten/issues/17391 */
-      T.mustThrow(()=>db.selectValue("SELECT "+(Number.MAX_SAFE_INTEGER+1))).
-        mustThrow(()=>db.selectValue("SELECT "+(Number.MIN_SAFE_INTEGER-1)));
-    }
-
-    st = db.prepare("update t set b=:b where a='blob'");
-    try {
-      const ndx = st.getParamIndex(':b');
-      T.assert(1===ndx);
-      st.bindAsBlob(ndx, "ima blob").reset(true);
-    } finally {
-      st.finalize();
-    }
-
-    try {
-      throw new sqlite3.WasmAllocError;
-    }catch(e){
-      T.assert(e instanceof Error)
-        .assert(e instanceof sqlite3.WasmAllocError);
-    }
-
-    try {
-      db.prepare("/*empty SQL*/");
-      toss("Must not be reached.");
-    }catch(e){
-      T.assert(e instanceof sqlite3.SQLite3Error)
-        .assert(0==e.message.indexOf('Cannot prepare empty'));
-    }
-
-    T.assert(capi.sqlite3_errstr(capi.SQLITE_IOERR_ACCESS).indexOf("I/O")>=0).
-      assert(capi.sqlite3_errstr(capi.SQLITE_CORRUPT).indexOf('malformed')>0).
-      assert(capi.sqlite3_errstr(capi.SQLITE_OK) === 'not an error');
-    
-    // Custom db error message handling via sqlite3_prepare_v2/v3()
-    if(capi.wasm.exports.sqlite3_wasm_db_error){
-      log("Testing custom error message via prepare_v3()...");
-      let rc = capi.sqlite3_prepare_v3(db.pointer, {/*invalid*/}, -1, 0, null, null);
-      T.assert(capi.SQLITE_MISUSE === rc)
-        .assert(0 === capi.sqlite3_errmsg(db.pointer).indexOf("Invalid SQL"));
-      log("errmsg =",capi.sqlite3_errmsg(db.pointer));
-    }
-  }/*testBasicSanity()*/;
-
-  const testUDF = function(db){
-    db.createFunction("foo",(pCx,a,b)=>a+b);
-    T.assert(7===db.selectValue("select foo(3,4)")).
-      assert(5===db.selectValue("select foo(3,?)",2)).
-      assert(5===db.selectValue("select foo(?,?2)",[1,4])).
-      assert(5===db.selectValue("select foo($a,$b)",{$a:0,$b:5}));
-    db.createFunction("bar", {
-      arity: -1,
-      callback: function(pCx){
-        var rc = 0;
-        for(let i = 1; i < arguments.length; ++i) rc += arguments[i];
-        return rc;
-      }
-    }).createFunction({
-      name: "asis",
-      callback: (pCx,arg)=>arg
-    });
-
-    //log("Testing DB::selectValue() w/ UDF...");
-    T.assert(0===db.selectValue("select bar()")).
-      assert(1===db.selectValue("select bar(1)")).
-      assert(3===db.selectValue("select bar(1,2)")).
-      assert(-1===db.selectValue("select bar(1,2,-4)")).
-      assert('hi' === db.selectValue("select asis('hi')")).
-      assert('hi' === db.selectValue("select ?",'hi')).
-      assert(null === db.selectValue("select null")).
-      assert(null === db.selectValue("select asis(null)")).
-      assert(1 === db.selectValue("select ?",1)).
-      assert(2 === db.selectValue("select ?",[2])).
-      assert(3 === db.selectValue("select $a",{$a:3})).
-      assert(eqApprox(3.1,db.selectValue("select 3.0 + 0.1"))).
-      assert(eqApprox(1.3,db.selectValue("select asis(1 + 0.3)")));
-
-    //log("Testing binding and UDF propagation of blobs...");
-    let blobArg = new Uint8Array(2);
-    blobArg.set([0x68, 0x69], 0);
-    let blobRc = db.selectValue("select asis(?1)", blobArg);
-    T.assert(blobRc instanceof Uint8Array).
-      assert(2 === blobRc.length).
-      assert(0x68==blobRc[0] && 0x69==blobRc[1]);
-    blobRc = db.selectValue("select asis(X'6869')");
-    T.assert(blobRc instanceof Uint8Array).
-      assert(2 === blobRc.length).
-      assert(0x68==blobRc[0] && 0x69==blobRc[1]);
-
-    blobArg = new Int8Array(2);
-    blobArg.set([0x68, 0x69]);
-    //debug("blobArg=",blobArg);
-    blobRc = db.selectValue("select asis(?1)", blobArg);
-    T.assert(blobRc instanceof Uint8Array).
-      assert(2 === blobRc.length);
-    //debug("blobRc=",blobRc);
-    T.assert(0x68==blobRc[0] && 0x69==blobRc[1]);
-  };
-
-  const testAttach = function(db){
-    const resultRows = [];
-    db.exec({
-      sql:new TextEncoder('utf-8').encode([
-        // ^^^ testing string-vs-typedarray handling in exec()
-        "attach 'session' as foo;" /* name 'session' is magic for kvvfs! */,
-        "create table foo.bar(a);",
-        "insert into foo.bar(a) values(1),(2),(3);",
-        "select a from foo.bar order by a;"
-      ].join('')),
-      rowMode: 0,
-      resultRows
-    });
-    T.assert(3===resultRows.length)
-      .assert(2===resultRows[1]);
-    T.assert(2===db.selectValue('select a from foo.bar where a>1 order by a'));
-    let colCount = 0, rowCount = 0;
-    const execCallback = function(pVoid, nCols, aVals, aNames){
-      colCount = nCols;
-      ++rowCount;
-      T.assert(2===aVals.length)
-        .assert(2===aNames.length)
-        .assert(+(aVals[1]) === 2 * +(aVals[0]));
-    };
-    const capi = sqlite3.capi;
-    let rc = capi.sqlite3_exec(
-      db.pointer, "select a, a*2 from foo.bar", execCallback,
-      0, 0
-    );
-    T.assert(0===rc).assert(3===rowCount).assert(2===colCount);
-    rc = capi.sqlite3_exec(
-      db.pointer, "select a from foo.bar", ()=>{
-        toss("Testing throwing from exec() callback.");
-      }, 0, 0
-    );
-    T.assert(capi.SQLITE_ABORT === rc);
-    db.exec("detach foo");
-    T.mustThrow(()=>db.exec("select * from foo.bar"));
-  };
-
-  const testIntPtr = function(db,S){
-    const w = S.capi.wasm;
-    const stack = w.scopedAllocPush();
-    let ptrInt;
-    const origValue = 512;
-    const ptrValType = 'i32';
-    try{
-      ptrInt = w.scopedAlloc(4);
-      w.setMemValue(ptrInt,origValue, ptrValType);
-      const cf = w.xGet('jaccwabyt_test_intptr');
-      const oldPtrInt = ptrInt;
-      //log('ptrInt',ptrInt);
-      //log('getMemValue(ptrInt)',w.getMemValue(ptrInt));
-      T.assert(origValue === w.getMemValue(ptrInt, ptrValType));
-      const rc = cf(ptrInt);
-      //log('cf(ptrInt)',rc);
-      //log('ptrInt',ptrInt);
-      //log('getMemValue(ptrInt)',w.getMemValue(ptrInt,ptrValType));
-      T.assert(2*origValue === rc).
-        assert(rc === w.getMemValue(ptrInt,ptrValType)).
-        assert(oldPtrInt === ptrInt);
-      const pi64 = w.scopedAlloc(8)/*ptr to 64-bit integer*/;
-      const o64 = 0x010203040506/*>32-bit integer*/;
-      const ptrType64 = 'i64';
-      if(w.bigIntEnabled){
-        log("BigInt support is enabled...");
-        w.setMemValue(pi64, o64, ptrType64);
-        //log("pi64 =",pi64, "o64 = 0x",o64.toString(16), o64);
-        const v64 = ()=>w.getMemValue(pi64,ptrType64)
-        //log("getMemValue(pi64)",v64());
-        T.assert(v64() == o64);
-        //T.assert(o64 === w.getMemValue(pi64, ptrType64));
-        const cf64w = w.xGet('jaccwabyt_test_int64ptr');
-        cf64w(pi64);
-        //log("getMemValue(pi64)",v64());
-        T.assert(v64() == BigInt(2 * o64));
-        cf64w(pi64);
-        T.assert(v64() == BigInt(4 * o64));
-
-        const biTimes2 = w.xGet('jaccwabyt_test_int64_times2');
-        T.assert(BigInt(2 * o64) ===
-                 biTimes2(BigInt(o64)/*explicit conv. required to avoid TypeError
-                                       in the call :/ */));
-
-        const pMin = w.scopedAlloc(16);
-        const pMax = pMin + 8;
-        const g64 = (p)=>w.getMemValue(p,ptrType64);
-        w.setMemValue(pMin, 0, ptrType64);
-        w.setMemValue(pMax, 0, ptrType64);
-        const minMaxI64 = [
-          w.xCall('jaccwabyt_test_int64_min'),
-          w.xCall('jaccwabyt_test_int64_max')
-        ];
-        T.assert(minMaxI64[0] < BigInt(Number.MIN_SAFE_INTEGER)).
-          assert(minMaxI64[1] > BigInt(Number.MAX_SAFE_INTEGER));
-        //log("int64_min/max() =",minMaxI64, typeof minMaxI64[0]);
-        w.xCall('jaccwabyt_test_int64_minmax', pMin, pMax);
-        T.assert(g64(pMin) === minMaxI64[0], "int64 mismatch").
-          assert(g64(pMax) === minMaxI64[1], "int64 mismatch");
-        //log("pMin",g64(pMin), "pMax",g64(pMax));
-        w.setMemValue(pMin, minMaxI64[0], ptrType64);
-        T.assert(g64(pMin) === minMaxI64[0]).
-          assert(minMaxI64[0] === db.selectValue("select ?",g64(pMin))).
-          assert(minMaxI64[1] === db.selectValue("select ?",g64(pMax)));
-        const rxRange = /too big/;
-        T.mustThrowMatching(()=>{db.prepare("select ?").bind(minMaxI64[0] - BigInt(1))},
-                          rxRange).
-          mustThrowMatching(()=>{db.prepare("select ?").bind(minMaxI64[1] + BigInt(1))},
-                          (e)=>rxRange.test(e.message));
-      }else{
-        log("No BigInt support. Skipping related tests.");
-        log("\"The problem\" here is that we can manipulate, at the byte level,",
-            "heap memory to set 64-bit values, but we can't get those values",
-            "back into JS because of the lack of 64-bit integer support.");
-      }
-    }finally{
-      const x = w.scopedAlloc(1), y = w.scopedAlloc(1), z = w.scopedAlloc(1);
-      //log("x=",x,"y=",y,"z=",z); // just looking at the alignment
-      w.scopedAllocPop(stack);
-    }
-  }/*testIntPtr()*/;
-  
-  const testStructStuff = function(db,S,M){
-    const W = S.capi.wasm, C = S;
-    /** Maintenance reminder: the rest of this function is copy/pasted
-        from the upstream jaccwabyt tests. */
-    log("Jaccwabyt tests...");
-    const MyStructDef = {
-      sizeof: 16,
-      members: {
-        p4: {offset: 0, sizeof: 4, signature: "i"},
-        pP: {offset: 4, sizeof: 4, signature: "P"},
-        ro: {offset: 8, sizeof: 4, signature: "i", readOnly: true},
-        cstr: {offset: 12, sizeof: 4, signature: "s"}
-      }
-    };
-    if(W.bigIntEnabled){
-      const m = MyStructDef;
-      m.members.p8 = {offset: m.sizeof, sizeof: 8, signature: "j"};
-      m.sizeof += m.members.p8.sizeof;
-    }
-    const StructType = C.StructBinder.StructType;
-    const K = C.StructBinder('my_struct',MyStructDef);
-    T.mustThrowMatching(()=>K(), /via 'new'/).
-      mustThrowMatching(()=>new K('hi'), /^Invalid pointer/);
-    const k1 = new K(), k2 = new K();
-    try {
-      T.assert(k1.constructor === K).
-        assert(K.isA(k1)).
-        assert(k1 instanceof K).
-        assert(K.prototype.lookupMember('p4').key === '$p4').
-        assert(K.prototype.lookupMember('$p4').name === 'p4').
-        mustThrowMatching(()=>K.prototype.lookupMember('nope'), /not a mapped/).
-        assert(undefined === K.prototype.lookupMember('nope',false)).
-        assert(k1 instanceof StructType).
-        assert(StructType.isA(k1)).
-        assert(K.resolveToInstance(k1.pointer)===k1).
-        mustThrowMatching(()=>K.resolveToInstance(null,true), /is-not-a my_struct/).
-        assert(k1 === StructType.instanceForPointer(k1.pointer)).
-        mustThrowMatching(()=>k1.$ro = 1, /read-only/);
-      Object.keys(MyStructDef.members).forEach(function(key){
-        key = K.memberKey(key);
-        T.assert(0 == k1[key],
-                 "Expecting allocation to zero the memory "+
-                 "for "+key+" but got: "+k1[key]+
-                 " from "+k1.memoryDump());
-      });
-      T.assert('number' === typeof k1.pointer).
-        mustThrowMatching(()=>k1.pointer = 1, /pointer/).
-      assert(K.instanceForPointer(k1.pointer) === k1);
-      k1.$p4 = 1; k1.$pP = 2;
-      T.assert(1 === k1.$p4).assert(2 === k1.$pP);
-      if(MyStructDef.members.$p8){
-        k1.$p8 = 1/*must not throw despite not being a BigInt*/;
-        k1.$p8 = BigInt(Number.MAX_SAFE_INTEGER * 2);
-        T.assert(BigInt(2 * Number.MAX_SAFE_INTEGER) === k1.$p8);
-      }
-      T.assert(!k1.ondispose);
-      k1.setMemberCString('cstr', "A C-string.");
-      T.assert(Array.isArray(k1.ondispose)).
-        assert(k1.ondispose[0] === k1.$cstr).
-        assert('number' === typeof k1.$cstr).
-        assert('A C-string.' === k1.memberToJsString('cstr'));
-      k1.$pP = k2;
-      T.assert(k1.$pP === k2);
-      k1.$pP = null/*null is special-cased to 0.*/;
-      T.assert(0===k1.$pP);
-      let ptr = k1.pointer;
-      k1.dispose();
-      T.assert(undefined === k1.pointer).
-        assert(undefined === K.instanceForPointer(ptr)).
-        mustThrowMatching(()=>{k1.$pP=1}, /disposed instance/);
-      const k3 = new K();
-      ptr = k3.pointer;
-      T.assert(k3 === K.instanceForPointer(ptr));
-      K.disposeAll();
-      T.assert(ptr).
-        assert(undefined === k2.pointer).
-        assert(undefined === k3.pointer).
-        assert(undefined === K.instanceForPointer(ptr));
-    }finally{
-      k1.dispose();
-      k2.dispose();
-    }
-
-    if(!W.bigIntEnabled){
-      log("Skipping WasmTestStruct tests: BigInt not enabled.");
-      return;
-    }
-
-    const ctype = W.xCallWrapped('jaccwabyt_test_ctype_json', 'json');
-    log("Struct descriptions:",ctype.structs);
-    const WTStructDesc =
-          ctype.structs.filter((e)=>'WasmTestStruct'===e.name)[0];
-    const autoResolvePtr = true /* EXPERIMENTAL */;
-    if(autoResolvePtr){
-      WTStructDesc.members.ppV.signature = 'P';
-    }
-    const WTStruct = C.StructBinder(WTStructDesc);
-    log(WTStruct.structName, WTStruct.structInfo);
-    const wts = new WTStruct();
-    log("WTStruct.prototype keys:",Object.keys(WTStruct.prototype));
-    try{
-      T.assert(wts.constructor === WTStruct).
-        assert(WTStruct.memberKeys().indexOf('$ppV')>=0).
-        assert(wts.memberKeys().indexOf('$v8')>=0).
-        assert(!K.isA(wts)).
-        assert(WTStruct.isA(wts)).
-        assert(wts instanceof WTStruct).
-        assert(wts instanceof StructType).
-        assert(StructType.isA(wts)).
-        assert(wts === StructType.instanceForPointer(wts.pointer));
-      T.assert(wts.pointer>0).assert(0===wts.$v4).assert(0n===wts.$v8).
-        assert(0===wts.$ppV).assert(0===wts.$xFunc).
-        assert(WTStruct.instanceForPointer(wts.pointer) === wts);
-      const testFunc =
-            W.xGet('jaccwabyt_test_struct'/*name gets mangled in -O3 builds!*/);
-      let counter = 0;
-      log("wts.pointer =",wts.pointer);
-      const wtsFunc = function(arg){
-        log("This from a JS function called from C, "+
-            "which itself was called from JS. arg =",arg);
-        ++counter;
-        T.assert(WTStruct.instanceForPointer(arg) === wts);
-        if(3===counter){
-          toss("Testing exception propagation.");
-        }
-      }
-      wts.$v4 = 10; wts.$v8 = 20;
-      wts.$xFunc = W.installFunction(wtsFunc, wts.memberSignature('xFunc'))
-      /* ^^^ compiles wtsFunc to WASM and returns its new function pointer */;
-      T.assert(0===counter).assert(10 === wts.$v4).assert(20n === wts.$v8)
-        .assert(0 === wts.$ppV).assert('number' === typeof wts.$xFunc)
-        .assert(0 === wts.$cstr)
-        .assert(wts.memberIsString('$cstr'))
-        .assert(!wts.memberIsString('$v4'))
-        .assert(null === wts.memberToJsString('$cstr'))
-        .assert(W.functionEntry(wts.$xFunc) instanceof Function);
-      /* It might seem silly to assert that the values match
-         what we just set, but recall that all of those property
-         reads and writes are, via property interceptors,
-         actually marshaling their data to/from a raw memory
-         buffer, so merely reading them back is actually part of
-         testing the struct-wrapping API. */
-
-      testFunc(wts.pointer);
-      log("wts.pointer, wts.$ppV",wts.pointer, wts.$ppV);
-      T.assert(1===counter).assert(20 === wts.$v4).assert(40n === wts.$v8)
-        .assert(autoResolvePtr ? (wts.$ppV === wts) : (wts.$ppV === wts.pointer))
-        .assert('string' === typeof wts.memberToJsString('cstr'))
-        .assert(wts.memberToJsString('cstr') === wts.memberToJsString('$cstr'))
-        .mustThrowMatching(()=>wts.memberToJsString('xFunc'),
-                           /Invalid member type signature for C-string/)
-      ;
-      testFunc(wts.pointer);
-      T.assert(2===counter).assert(40 === wts.$v4).assert(80n === wts.$v8)
-        .assert(autoResolvePtr ? (wts.$ppV === wts) : (wts.$ppV === wts.pointer));
-      /** The 3rd call to wtsFunc throw from JS, which is called
-          from C, which is called from JS. Let's ensure that
-          that exception propagates back here... */
-      T.mustThrowMatching(()=>testFunc(wts.pointer),/^Testing/);
-      W.uninstallFunction(wts.$xFunc);
-      wts.$xFunc = 0;
-      if(autoResolvePtr){
-        wts.$ppV = 0;
-        T.assert(!wts.$ppV);
-        WTStruct.debugFlags(0x03);
-        wts.$ppV = wts;
-        T.assert(wts === wts.$ppV)
-        WTStruct.debugFlags(0);
-      }
-      wts.setMemberCString('cstr', "A C-string.");
-      T.assert(Array.isArray(wts.ondispose)).
-        assert(wts.ondispose[0] === wts.$cstr).
-        assert('A C-string.' === wts.memberToJsString('cstr'));
-      const ptr = wts.pointer;
-      wts.dispose();
-      T.assert(ptr).assert(undefined === wts.pointer).
-        assert(undefined === WTStruct.instanceForPointer(ptr))
-    }finally{
-      wts.dispose();
-    }
-  }/*testStructStuff()*/;
-
-  const testSqliteStructs = function(db,sqlite3,M){
-    log("Tinkering with sqlite3_io_methods...");
-    // https://www.sqlite.org/c3ref/vfs.html
-    // https://www.sqlite.org/c3ref/io_methods.html
-    const capi = sqlite3.capi, W = capi.wasm;
-    const sqlite3_io_methods = capi.sqlite3_io_methods,
-          sqlite3_vfs = capi.sqlite3_vfs,
-          sqlite3_file = capi.sqlite3_file;
-    log("struct sqlite3_file", sqlite3_file.memberKeys());
-    log("struct sqlite3_vfs", sqlite3_vfs.memberKeys());
-    log("struct sqlite3_io_methods", sqlite3_io_methods.memberKeys());
-
-    const installMethod = function callee(tgt, name, func){
-      if(1===arguments.length){
-        return (n,f)=>callee(tgt,n,f);
-      }
-      if(!callee.argcProxy){
-        callee.argcProxy = function(func,sig){
-          return function(...args){
-            if(func.length!==arguments.length){
-              toss("Argument mismatch. Native signature is:",sig);
-            }
-            return func.apply(this, args);
-          }
-        };
-        callee.ondisposeRemoveFunc = function(){
-          if(this.__ondispose){
-            const who = this;
-            this.__ondispose.forEach(
-              (v)=>{
-                if('number'===typeof v){
-                  try{capi.wasm.uninstallFunction(v)}
-                  catch(e){/*ignore*/}
-                }else{/*wasm function wrapper property*/
-                  delete who[v];
-                }
-              }
-            );
-            delete this.__ondispose;
-          }
-        };
-      }/*static init*/
-      const sigN = tgt.memberSignature(name),
-            memKey = tgt.memberKey(name);
-      //log("installMethod",tgt, name, sigN);
-      if(!tgt.__ondispose){
-        T.assert(undefined === tgt.ondispose);
-        tgt.ondispose = [callee.ondisposeRemoveFunc];
-        tgt.__ondispose = [];
-      }
-      const fProxy = callee.argcProxy(func, sigN);
-      const pFunc = capi.wasm.installFunction(fProxy, tgt.memberSignature(name, true));
-      tgt[memKey] = pFunc;
-      /**
-         ACHTUNG: function pointer IDs are from a different pool than
-         allocation IDs, starting at 1 and incrementing in steps of 1,
-         so if we set tgt[memKey] to those values, we'd very likely
-         later misinterpret them as plain old pointer addresses unless
-         unless we use some silly heuristic like "all values <5k are
-         presumably function pointers," or actually perform a function
-         lookup on every pointer to first see if it's a function. That
-         would likely work just fine, but would be kludgy.
-
-         It turns out that "all values less than X are functions" is
-         essentially how it works in wasm: a function pointer is
-         reported to the client as its index into the
-         __indirect_function_table.
-
-         So... once jaccwabyt can be told how to access the
-         function table, it could consider all pointer values less
-         than that table's size to be functions.  As "real" pointer
-         values start much, much higher than the function table size,
-         that would likely work reasonably well. e.g. the object
-         pointer address for sqlite3's default VFS is (in this local
-         setup) 65104, whereas the function table has fewer than 600
-         entries.
-      */
-      const wrapperKey = '$'+memKey;
-      tgt[wrapperKey] = fProxy;
-      tgt.__ondispose.push(pFunc, wrapperKey);
-      //log("tgt.__ondispose =",tgt.__ondispose);
-      return (n,f)=>callee(tgt, n, f);
-    }/*installMethod*/;
-
-    const installIOMethods = function instm(iom){
-      (iom instanceof capi.sqlite3_io_methods) || toss("Invalid argument type.");
-      if(!instm._requireFileArg){
-        instm._requireFileArg = function(arg,methodName){
-          arg = capi.sqlite3_file.resolveToInstance(arg);
-          if(!arg){
-            err("sqlite3_io_methods::xClose() was passed a non-sqlite3_file.");
-          }
-          return arg;
-        };
-        instm._methods = {
-          // https://sqlite.org/c3ref/io_methods.html
-          xClose: /*i(P)*/function(f){
-            /* int (*xClose)(sqlite3_file*) */
-            log("xClose(",f,")");
-            if(!(f = instm._requireFileArg(f,'xClose'))) return capi.SQLITE_MISUSE;
-            f.dispose(/*noting that f has externally-owned memory*/);
-            return 0;
-          },
-          xRead: /*i(Ppij)*/function(f,dest,n,offset){
-            /* int (*xRead)(sqlite3_file*, void*, int iAmt, sqlite3_int64 iOfst) */
-            log("xRead(",arguments,")");
-            if(!(f = instm._requireFileArg(f))) return capi.SQLITE_MISUSE;
-            capi.wasm.heap8().fill(0, dest + offset, n);
-            return 0;
-          },
-          xWrite: /*i(Ppij)*/function(f,dest,n,offset){
-            /* int (*xWrite)(sqlite3_file*, const void*, int iAmt, sqlite3_int64 iOfst) */
-            log("xWrite(",arguments,")");
-            if(!(f=instm._requireFileArg(f,'xWrite'))) return capi.SQLITE_MISUSE;
-            return 0;
-          },
-          xTruncate: /*i(Pj)*/function(f){
-            /* int (*xTruncate)(sqlite3_file*, sqlite3_int64 size) */
-            log("xTruncate(",arguments,")");
-            if(!(f=instm._requireFileArg(f,'xTruncate'))) return capi.SQLITE_MISUSE;
-            return 0;
-          },
-          xSync: /*i(Pi)*/function(f){
-            /* int (*xSync)(sqlite3_file*, int flags) */
-            log("xSync(",arguments,")");
-            if(!(f=instm._requireFileArg(f,'xSync'))) return capi.SQLITE_MISUSE;
-            return 0;
-          },
-          xFileSize: /*i(Pp)*/function(f,pSz){
-            /* int (*xFileSize)(sqlite3_file*, sqlite3_int64 *pSize) */
-            log("xFileSize(",arguments,")");
-            if(!(f=instm._requireFileArg(f,'xFileSize'))) return capi.SQLITE_MISUSE;
-            capi.wasm.setMemValue(pSz, 0/*file size*/);
-            return 0;
-          },
-          xLock: /*i(Pi)*/function(f){
-            /* int (*xLock)(sqlite3_file*, int) */
-            log("xLock(",arguments,")");
-            if(!(f=instm._requireFileArg(f,'xLock'))) return capi.SQLITE_MISUSE;
-            return 0;
-          },
-          xUnlock: /*i(Pi)*/function(f){
-            /* int (*xUnlock)(sqlite3_file*, int) */
-            log("xUnlock(",arguments,")");
-            if(!(f=instm._requireFileArg(f,'xUnlock'))) return capi.SQLITE_MISUSE;
-            return 0;
-          },
-          xCheckReservedLock: /*i(Pp)*/function(){
-            /* int (*xCheckReservedLock)(sqlite3_file*, int *pResOut) */
-            log("xCheckReservedLock(",arguments,")");
-            return 0;
-          },
-          xFileControl: /*i(Pip)*/function(){
-            /* int (*xFileControl)(sqlite3_file*, int op, void *pArg) */
-            log("xFileControl(",arguments,")");
-            return capi.SQLITE_NOTFOUND;
-          },
-          xSectorSize: /*i(P)*/function(){
-            /* int (*xSectorSize)(sqlite3_file*) */
-            log("xSectorSize(",arguments,")");
-            return 0/*???*/;
-          },
-          xDeviceCharacteristics:/*i(P)*/function(){
-            /* int (*xDeviceCharacteristics)(sqlite3_file*) */
-            log("xDeviceCharacteristics(",arguments,")");
-            return 0;
-          }
-        };
-      }/*static init*/
-      iom.$iVersion = 1;
-      Object.keys(instm._methods).forEach(
-        (k)=>installMethod(iom, k, instm._methods[k])
-      );
-    }/*installIOMethods()*/;
-
-    const iom = new sqlite3_io_methods, sfile = new sqlite3_file;
-    const err = console.error.bind(console);
-    try {
-      const IOM = sqlite3_io_methods, S3F = sqlite3_file;
-      //log("iom proto",iom,iom.constructor.prototype);
-      //log("sfile",sfile,sfile.constructor.prototype);
-      T.assert(0===sfile.$pMethods).assert(iom.pointer > 0);
-      //log("iom",iom);
-      sfile.$pMethods = iom.pointer;
-      T.assert(iom.pointer === sfile.$pMethods)
-        .assert(IOM.resolveToInstance(iom))
-        .assert(undefined ===IOM.resolveToInstance(sfile))
-        .mustThrow(()=>IOM.resolveToInstance(0,true))
-        .assert(S3F.resolveToInstance(sfile.pointer))
-        .assert(undefined===S3F.resolveToInstance(iom))
-        .assert(iom===IOM.resolveToInstance(sfile.$pMethods));
-      T.assert(0===iom.$iVersion);
-      installIOMethods(iom);
-      T.assert(1===iom.$iVersion);
-      //log("iom.__ondispose",iom.__ondispose);
-      T.assert(Array.isArray(iom.__ondispose)).assert(iom.__ondispose.length>10);
-    }finally{
-      iom.dispose();
-      T.assert(undefined === iom.__ondispose);
-    }
-
-    const dVfs = new sqlite3_vfs(capi.sqlite3_vfs_find(null));
-    try {
-      const SB = sqlite3.StructBinder;
-      T.assert(dVfs instanceof SB.StructType)
-        .assert(dVfs.pointer)
-        .assert('sqlite3_vfs' === dVfs.structName)
-        .assert(!!dVfs.structInfo)
-        .assert(SB.StructType.hasExternalPointer(dVfs))
-        .assert(dVfs.$iVersion>0)
-        .assert('number'===typeof dVfs.$zName)
-        .assert('number'===typeof dVfs.$xSleep)
-        .assert(capi.wasm.functionEntry(dVfs.$xOpen))
-        .assert(dVfs.memberIsString('zName'))
-        .assert(dVfs.memberIsString('$zName'))
-        .assert(!dVfs.memberIsString('pAppData'))
-        .mustThrowMatching(()=>dVfs.memberToJsString('xSleep'),
-                           /Invalid member type signature for C-string/)
-        .mustThrowMatching(()=>dVfs.memberSignature('nope'), /nope is not a mapped/)
-        .assert('string' === typeof dVfs.memberToJsString('zName'))
-        .assert(dVfs.memberToJsString('zName')===dVfs.memberToJsString('$zName'))
-      ;
-      log("Default VFS: @",dVfs.pointer);
-      Object.keys(sqlite3_vfs.structInfo.members).forEach(function(mname){
-        const mk = sqlite3_vfs.memberKey(mname), mbr = sqlite3_vfs.structInfo.members[mname],
-              addr = dVfs[mk], prefix = 'defaultVfs.'+mname;
-        if(1===mbr.signature.length){
-          let sep = '?', val = undefined;
-          switch(mbr.signature[0]){
-              // TODO: move this into an accessor, e.g. getPreferredValue(member)
-              case 'i': case 'j': case 'f': case 'd': sep = '='; val = dVfs[mk]; break
-              case 'p': case 'P': sep = '@'; val = dVfs[mk]; break;
-              case 's': sep = '=';
-                //val = capi.wasm.UTF8ToString(addr);
-                val = dVfs.memberToJsString(mname);
-                break;
-          }
-          log(prefix, sep, val);
-        }
-        else{
-          log(prefix," = funcptr @",addr, capi.wasm.functionEntry(addr));
-        }
-      });
-    }finally{
-      dVfs.dispose();
-      T.assert(undefined===dVfs.pointer);
-    }
-  }/*testSqliteStructs()*/;
-
-  const testWasmUtil = function(DB,S){
-    const w = S.capi.wasm;
-    /**
-       Maintenance reminder: the rest of this function is part of the
-       upstream Jaccwabyt tree.
-    */
-    const chr = (x)=>x.charCodeAt(0);
-    log("heap getters...");
-    {
-      const li = [8, 16, 32];
-      if(w.bigIntEnabled) li.push(64);
-      for(const n of li){
-        const bpe = n/8;
-        const s = w.heapForSize(n,false);
-        T.assert(bpe===s.BYTES_PER_ELEMENT).
-          assert(w.heapForSize(s.constructor) === s);
-        const u = w.heapForSize(n,true);
-        T.assert(bpe===u.BYTES_PER_ELEMENT).
-          assert(s!==u).
-          assert(w.heapForSize(u.constructor) === u);
-      }
-    }
-
-    log("jstrlen()...");
-    {
-      T.assert(3 === w.jstrlen("abc")).assert(4 === w.jstrlen("äbc"));
-    }
-
-    log("jstrcpy()...");
-    {
-      const fillChar = 10;
-      let ua = new Uint8Array(8), rc,
-          refill = ()=>ua.fill(fillChar);
-      refill();
-      rc = w.jstrcpy("hello", ua);
-      T.assert(6===rc).assert(0===ua[5]).assert(chr('o')===ua[4]);
-      refill();
-      ua[5] = chr('!');
-      rc = w.jstrcpy("HELLO", ua, 0, -1, false);
-      T.assert(5===rc).assert(chr('!')===ua[5]).assert(chr('O')===ua[4]);
-      refill();
-      rc = w.jstrcpy("the end", ua, 4);
-      //log("rc,ua",rc,ua);
-      T.assert(4===rc).assert(0===ua[7]).
-        assert(chr('e')===ua[6]).assert(chr('t')===ua[4]);
-      refill();
-      rc = w.jstrcpy("the end", ua, 4, -1, false);
-      T.assert(4===rc).assert(chr(' ')===ua[7]).
-        assert(chr('e')===ua[6]).assert(chr('t')===ua[4]);
-      refill();
-      rc = w.jstrcpy("", ua, 0, 1, true);
-      //log("rc,ua",rc,ua);
-      T.assert(1===rc).assert(0===ua[0]);
-      refill();
-      rc = w.jstrcpy("x", ua, 0, 1, true);
-      //log("rc,ua",rc,ua);
-      T.assert(1===rc).assert(0===ua[0]);
-      refill();
-      rc = w.jstrcpy('äbä', ua, 0, 1, true);
-      T.assert(1===rc, 'Must not write partial multi-byte char.')
-        .assert(0===ua[0]);
-      refill();
-      rc = w.jstrcpy('äbä', ua, 0, 2, true);
-      T.assert(1===rc, 'Must not write partial multi-byte char.')
-        .assert(0===ua[0]);
-      refill();
-      rc = w.jstrcpy('äbä', ua, 0, 2, false);
-      T.assert(2===rc).assert(fillChar!==ua[1]).assert(fillChar===ua[2]);
-    }/*jstrcpy()*/
-
-    log("cstrncpy()...");
-    {
-      const scope = w.scopedAllocPush();
-      try {
-        let cStr = w.scopedAllocCString("hello");
-        const n = w.cstrlen(cStr);
-        let cpy = w.scopedAlloc(n+10);
-        let rc = w.cstrncpy(cpy, cStr, n+10);
-        T.assert(n+1 === rc).
-          assert("hello" === w.cstringToJs(cpy)).
-          assert(chr('o') === w.getMemValue(cpy+n-1)).
-          assert(0 === w.getMemValue(cpy+n));
-        let cStr2 = w.scopedAllocCString("HI!!!");
-        rc = w.cstrncpy(cpy, cStr2, 3);
-        T.assert(3===rc).
-          assert("HI!lo" === w.cstringToJs(cpy)).
-          assert(chr('!') === w.getMemValue(cpy+2)).
-          assert(chr('l') === w.getMemValue(cpy+3));
-      }finally{
-        w.scopedAllocPop(scope);
-      }
-    }
-
-    log("jstrToUintArray()...");
-    {
-      let a = w.jstrToUintArray("hello", false);
-      T.assert(5===a.byteLength).assert(chr('o')===a[4]);
-      a = w.jstrToUintArray("hello", true);
-      T.assert(6===a.byteLength).assert(chr('o')===a[4]).assert(0===a[5]);
-      a = w.jstrToUintArray("äbä", false);
-      T.assert(5===a.byteLength).assert(chr('b')===a[2]);
-      a = w.jstrToUintArray("äbä", true);
-      T.assert(6===a.byteLength).assert(chr('b')===a[2]).assert(0===a[5]);
-    }
-
-    log("allocCString()...");
-    {
-      const cstr = w.allocCString("hällo, world");
-      const n = w.cstrlen(cstr);
-      T.assert(13 === n)
-        .assert(0===w.getMemValue(cstr+n))
-        .assert(chr('d')===w.getMemValue(cstr+n-1));
-    }
-
-    log("scopedAlloc() and friends...");
-    {
-      const alloc = w.alloc, dealloc = w.dealloc;
-      w.alloc = w.dealloc = null;
-      T.assert(!w.scopedAlloc.level)
-        .mustThrowMatching(()=>w.scopedAlloc(1), /^No scopedAllocPush/)
-        .mustThrowMatching(()=>w.scopedAllocPush(), /missing alloc/);
-      w.alloc = alloc;
-      T.mustThrowMatching(()=>w.scopedAllocPush(), /missing alloc/);
-      w.dealloc = dealloc;
-      T.mustThrowMatching(()=>w.scopedAllocPop(), /^Invalid state/)
-        .mustThrowMatching(()=>w.scopedAlloc(1), /^No scopedAllocPush/)
-        .mustThrowMatching(()=>w.scopedAlloc.level=0, /read-only/);
-      const asc = w.scopedAllocPush();
-      let asc2;
-      try {
-        const p1 = w.scopedAlloc(16),
-              p2 = w.scopedAlloc(16);
-        T.assert(1===w.scopedAlloc.level)
-          .assert(Number.isFinite(p1))
-          .assert(Number.isFinite(p2))
-          .assert(asc[0] === p1)
-          .assert(asc[1]===p2);
-        asc2 = w.scopedAllocPush();
-        const p3 = w.scopedAlloc(16);
-        T.assert(2===w.scopedAlloc.level)
-          .assert(Number.isFinite(p3))
-          .assert(2===asc.length)
-          .assert(p3===asc2[0]);
-
-        const [z1, z2, z3] = w.scopedAllocPtr(3);
-        T.assert('number'===typeof z1).assert(z2>z1).assert(z3>z2)
-          .assert(0===w.getMemValue(z1,'i32'), 'allocPtr() must zero the targets')
-          .assert(0===w.getMemValue(z3,'i32'));
-      }finally{
-        // Pop them in "incorrect" order to make sure they behave:
-        w.scopedAllocPop(asc);
-        T.assert(0===asc.length);
-        T.mustThrowMatching(()=>w.scopedAllocPop(asc),
-                            /^Invalid state object/);
-        if(asc2){
-          T.assert(2===asc2.length,'Should be p3 and z1');
-          w.scopedAllocPop(asc2);
-          T.assert(0===asc2.length);
-          T.mustThrowMatching(()=>w.scopedAllocPop(asc2),
-                              /^Invalid state object/);
-        }
-      }
-      T.assert(0===w.scopedAlloc.level);
-      w.scopedAllocCall(function(){
-        T.assert(1===w.scopedAlloc.level);
-        const [cstr, n] = w.scopedAllocCString("hello, world", true);
-        T.assert(12 === n)
-          .assert(0===w.getMemValue(cstr+n))
-          .assert(chr('d')===w.getMemValue(cstr+n-1));
-      });
-    }/*scopedAlloc()*/
-
-    log("xCall()...");
-    {
-      const pJson = w.xCall('jaccwabyt_test_ctype_json');
-      T.assert(Number.isFinite(pJson)).assert(w.cstrlen(pJson)>300);
-    }
-
-    log("xWrap()...");
-    {
-      //int jaccwabyt_test_intptr(int * p);
-      //int64_t jaccwabyt_test_int64_max(void)
-      //int64_t jaccwabyt_test_int64_min(void)
-      //int64_t jaccwabyt_test_int64_times2(int64_t x)
-      //void jaccwabyt_test_int64_minmax(int64_t * min, int64_t *max)
-      //int64_t jaccwabyt_test_int64ptr(int64_t * p)
-      //const char * jaccwabyt_test_ctype_json(void)
-      T.mustThrowMatching(()=>w.xWrap('jaccwabyt_test_ctype_json',null,'i32'),
-                          /requires 0 arg/).
-        assert(w.xWrap.resultAdapter('i32') instanceof Function).
-        assert(w.xWrap.argAdapter('i32') instanceof Function);
-      let fw = w.xWrap('jaccwabyt_test_ctype_json','string');
-      T.mustThrowMatching(()=>fw(1), /requires 0 arg/);
-      let rc = fw();
-      T.assert('string'===typeof rc).assert(rc.length>300);
-      rc = w.xCallWrapped('jaccwabyt_test_ctype_json','*');
-      T.assert(rc>0 && Number.isFinite(rc));
-      rc = w.xCallWrapped('jaccwabyt_test_ctype_json','string');
-      T.assert('string'===typeof rc).assert(rc.length>300);
-      fw = w.xWrap('jaccwabyt_test_str_hello', 'string:free',['i32']);
-      rc = fw(0);
-      T.assert('hello'===rc);
-      rc = fw(1);
-      T.assert(null===rc);
-
-      w.xWrap.resultAdapter('thrice', (v)=>3n*BigInt(v));
-      w.xWrap.argAdapter('twice', (v)=>2n*BigInt(v));
-      fw = w.xWrap('jaccwabyt_test_int64_times2','thrice','twice');
-      rc = fw(1);
-      T.assert(12n===rc);
-
-      w.scopedAllocCall(function(){
-        let pI1 = w.scopedAlloc(8), pI2 = pI1+4;
-        w.setMemValue(pI1, 0,'*')(pI2, 0, '*');
-        let f = w.xWrap('jaccwabyt_test_int64_minmax',undefined,['i64*','i64*']);
-        let r1 = w.getMemValue(pI1, 'i64'), r2 = w.getMemValue(pI2, 'i64');
-        T.assert(!Number.isSafeInteger(r1)).assert(!Number.isSafeInteger(r2));
-      });
-    }
-  }/*testWasmUtil()*/;
-
-
-  /**
-     Tests for sqlite3.capi.wasm.pstack().
-   */
-  const testPstack = function(db,sqlite3){
-    const w = sqlite3.capi.wasm, P = w.pstack;
-    const isAllocErr = (e)=>e instanceof sqlite3.WasmAllocError;
-    const stack = P.pointer;
-    T.assert(0===stack % 8 /* must be 8-byte aligned */);
-    try{
-      const remaining = P.remaining;
-      log("pstack quota, remaining",P.quota,remaining);
-      T.assert(P.quota >= 4096)
-        .assert(remaining === P.quota)
-        .mustThrowMatching(()=>P.alloc(0), isAllocErr)
-        .mustThrowMatching(()=>P.alloc(-1), isAllocErr);
-      let p1 = P.alloc(12);
-      T.assert(p1 === stack - 16/*8-byte aligned*/)
-        .assert(P.pointer === p1);
-      let p2 = P.alloc(7);
-      T.assert(p2 === p1-8/*8-byte aligned, stack grows downwards*/)
-        .mustThrowMatching(()=>P.alloc(remaining), isAllocErr)
-        .assert(24 === stack - p2)
-        .assert(P.pointer === p2);
-      let n = remaining - (stack - p2);
-      let p3 = P.alloc(n);
-      T.assert(p3 === stack-remaining)
-        .mustThrowMatching(()=>P.alloc(1), isAllocErr);
-    }finally{
-      P.restore(stack);
-    }
-
-    T.assert(P.pointer === stack);
-    try {
-      const [p1, p2, p3] = P.allocChunks(3,4);
-      T.assert(P.pointer === stack-16/*always rounded to multiple of 8*/)
-        .assert(p2 === p1 + 4)
-        .assert(p3 === p2 + 4);
-      T.mustThrowMatching(()=>P.allocChunks(1024, 1024 * 16),
-                          (e)=>e instanceof sqlite3.WasmAllocError)
-    }finally{
-      P.restore(stack);
-    }
-
-    T.assert(P.pointer === stack);
-    try {
-      let [p1, p2, p3] = P.allocPtr(3,false);
-      let sPos = stack-16/*always rounded to multiple of 8*/;
-      T.assert(P.pointer === sPos)
-        .assert(p2 === p1 + 4)
-        .assert(p3 === p2 + 4);
-      [p1, p2, p3] = P.allocPtr(3);
-      T.assert(P.pointer === sPos-24/*3 x 8 bytes*/)
-        .assert(p2 === p1 + 8)
-        .assert(p3 === p2 + 8);
-      p1 = P.allocPtr();
-      T.assert('number'===typeof p1);
-    }finally{
-      P.restore(stack);
-    }
-  }/*testPstack()*/;
-
-  const clearKvvfs = function(){
-    const sz = sqlite3.capi.sqlite3_web_kvvfs_size();
-    const n = sqlite3.capi.sqlite3_web_kvvfs_clear('');
-    log("Cleared kvvfs local/sessionStorage:",
-        n,"entries totaling approximately",sz,"bytes.");
-  };
-
-  const runTests = function(_sqlite3){
-    sqlite3 = _sqlite3;
-    const capi = sqlite3.capi,
-          oo = sqlite3.oo1,
-          wasm = capi.wasm;
-    log("Loaded module:",capi.sqlite3_libversion(), capi.sqlite3_sourceid());
-    log("Build options:",wasm.compileOptionUsed());
-    capi.sqlite3_wasmfs_opfs_dir()/*will install OPFS if available, plus a and non-locking VFS*/;
-    if(1){
-      /* Let's grab those last few lines of test coverage for
-         sqlite3-api.js... */
-      const rc = wasm.compileOptionUsed(['COMPILER']);
-      T.assert(1 === rc.COMPILER);
-      const obj = {COMPILER:undefined};
-      wasm.compileOptionUsed(obj);
-      T.assert(1 === obj.COMPILER);
-    }
-    log("WASM heap size =",wasm.heap8().length);
-    //log("capi.wasm.exports.__indirect_function_table",capi.wasm.exports.__indirect_function_table);
-
-    const wasmCtypes = wasm.ctype;
-    //log("wasmCtypes",wasmCtypes);
-    T.assert(wasmCtypes.structs[0].name==='sqlite3_vfs').
-      assert(wasmCtypes.structs[0].members.szOsFile.sizeof>=4).
-      assert(wasmCtypes.structs[1/*sqlite3_io_methods*/
-                             ].members.xFileSize.offset>0);
-    //log(wasmCtypes.structs[0].name,"members",wasmCtypes.structs[0].members);
-    [ /* Spot-check a handful of constants to make sure they got installed... */
-      'SQLITE_SCHEMA','SQLITE_NULL','SQLITE_UTF8',
-      'SQLITE_STATIC', 'SQLITE_DIRECTONLY',
-      'SQLITE_OPEN_CREATE', 'SQLITE_OPEN_DELETEONCLOSE'
-    ].forEach(function(k){
-      T.assert('number' === typeof capi[k]);
-    });
-    [/* Spot-check a few of the WASM API methods. */
-      'alloc', 'dealloc', 'installFunction'
-    ].forEach(function(k){
-      T.assert(capi.wasm[k] instanceof Function);
-    });
-
-    let dbName = "/testing1.sqlite3";
-    let vfsName = undefined;
-    if(capi.sqlite3_web_db_uses_vfs(0,"kvvfs")){
-      dbName = "local";
-      vfsName = 'kvvfs';
-      logHtml("Found kvvfs. Clearing db(s) from sessionStorage and localStorage",
-              "and selecting kvvfs-friendly db name:",dbName);
-      clearKvvfs();
-    }
-    const db = new oo.DB(dbName,'c',vfsName), startTime = performance.now();
-    log("db is kvvfs?",capi.sqlite3_web_db_uses_vfs(db.pointer,"kvvfs"));
-    try {
-      log("db.filename =",db.filename,"db.fileName() =",db.getFilename());
-      const banner1 = '>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>',
-            banner2 = '<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<';
-      [
-        testWasmUtil, testBasicSanity, testUDF,
-        testAttach, testIntPtr, testStructStuff,
-        testSqliteStructs, testPstack
-      ].forEach((f)=>{
-        const t = T.counter, n = performance.now();
-        logHtml(banner1,"Running",f.name+"()...");
-        f(db, sqlite3);
-        logHtml(banner2,f.name+"():",T.counter - t,'tests in',(performance.now() - n),"ms");
-      });
-    }finally{
-      db.close();
-      if('kvvfs'===vfsName) clearKvvfs();
-    }
-    logHtml("Total Test count:",T.counter,"in",(performance.now() - startTime),"ms");
-    log('capi.wasm.exports',capi.wasm.exports);
-  };
-
-  self.sqlite3TestModule.initSqlite3().then((S)=>{
-    runTests(S);
-  });
-})();
diff --git a/manifest b/manifest
index 98f55bf418..13be78b776 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Optimize\sthe\sIS\sNULL\sand\sIS\sNOT\sNULL\soperators\sso\sthat\sthey\savoid\sloading\nlarge\sstrings\sor\sblobs\soff\sof\sdisk\sif\sall\sit\sneeds\sto\sknow\sis\swhether\sor\nnot\sthe\sstring\sor\sblob\sis\sNULL.
-D 2022-10-13T15:09:44.252
+C Move\sthe\srest\sof\stesting1.js\sinto\stester1.js\sand\seliminate\sthe\sdependency\son\sjaccwabyt_test.c.\sExtend\sthe\slist\sof\sdefault\sconfig-related\s#defines\sin\ssqlite3-wasm.c\sand\sreorganize\sthem\sfor\smaintainability.
+D 2022-10-13T16:48:35.302
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -473,7 +473,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle 0e88c8cfc3719e4b7e74980d9da664c709e68acf863e48386cda376edfd3bfb0
-F ext/wasm/GNUmakefile 8ab74ed186a15d956a21b28fa0800b84af2b8a289392ae2dff8126ff033bd3f9
+F ext/wasm/GNUmakefile 4ec270532b921c7c4b437fbdb06f6a0ce41f3bd874395ce70dbc933c8553efa9
 F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 89983a8d122c35a90c65ec667844b95a78bcd04f3198a99c1e0c8368c1a0b03a
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -484,19 +484,19 @@ F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba814
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
 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 3b2a43c7b2ceb2b60f5f4a1afefbd93508c2fe0f2e667eea278afe570be4b606
-F ext/wasm/api/sqlite3-api-oo1.js ac1e08d36bdfb5aa0a2d75b7d4c892fd51819d34c932370c3282810672bcc086
+F ext/wasm/api/sqlite3-api-glue.js 842dc03783aecc951a543a209523343a6fda9af258fb0bee08e8cc2dc3c4d8ae
+F ext/wasm/api/sqlite3-api-oo1.js 00f5cfce0989d2e08d7b21765d703c69234245d03a0cce8fcb32ccfcd53ffdbb
 F ext/wasm/api/sqlite3-api-opfs.js 5a8ab3b76880c8ada8710ca9ba1ca5b160872edfd8bd5322e4f179a7f41cc616
-F ext/wasm/api/sqlite3-api-prologue.js 5c56056810333974c971f6310c5c9698cf7ca8b06f6d2f1986cec819d0f5bbad
+F ext/wasm/api/sqlite3-api-prologue.js b7c82a22d50658a48463fa646a23135273bc2cfa843aedda32627ff281c12e4d
 F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c a321f12ceedac8611c1377ccfb5df0c0547bd9395f7fd7613827de365d994948
+F ext/wasm/api/sqlite3-wasm.c 4c131945ced4b08a694d287abcdb066b896d961ef79ee5241805ecc37e83d63a
 F ext/wasm/batch-runner.html cf1a410c92bad50fcec2ddc71390b4e9df63a6ea1bef12a5163a66a0af4d78d9
 F ext/wasm/batch-runner.js 5bae81684728b6be157d1f92b39824153f0fd019345b39f2ab8930f7ee2a57d8
 F ext/wasm/common/SqliteTestUtil.js 647bf014bd30bdd870a7e9001e251d12fc1c9ec9ce176a1004b838a4b33c5c05
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
-F ext/wasm/common/testing.css 12bd88c69eea1b61649ad9add3ff24f0fbc3b79a7616d74ab3997b7271cd8482
-F ext/wasm/common/whwasmutil.js bc8522a071f4754af7b50f53807b95f691d2f9e44fc3b3e8c65dff6ef2485c0d
+F ext/wasm/common/testing.css 53394885077edd3db22d2a0896192334dfc06fb3d1da0b646eb12a332d22f18e
+F ext/wasm/common/whwasmutil.js 50d2ede0b0fa01c1d467e1801fab79f5e46bb02bcbd2b0232e4fdc6090a47818
 F ext/wasm/demo-123-worker.html e50b51dc7271b9d3cc830cb7c2fba294d622f56b7acb199f7257d11195a63d49
 F ext/wasm/demo-123.html 7c239c9951d1b113f9f532969ac039294cf1dcfee2b3ae0a2c1ed2b3d59f8dfa
 F ext/wasm/demo-123.js d563cf9d725692ccd940c46df1c026d87863e0544942a2ba2015f17fba3f6f74
@@ -507,11 +507,9 @@ F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d695
 F ext/wasm/fiddle/fiddle-worker.js 531859a471924a0ea48afa218e6877f0c164ca324d51e15843ed6ecc1c65c7ee
 F ext/wasm/fiddle/fiddle.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
 F ext/wasm/fiddle/fiddle.js 974b995119ac443685d7d94d3b3c58c6a36540e9eb3fed7069d5653284071715
-F ext/wasm/index.html 63b370619e4f849ac76f1baed435c05edc29dbb6795bc7c1c935561ff667dd27
+F ext/wasm/index.html 9ae9f9629310ed3ee88901aa14e20195815583806af245da08c2ecb43ced2243
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 9aa6951b529a8b29f578ec8f0355713c39584c92cf1708f63ba0cf917cb5b68e
-F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
-F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e568d2c2307c416902059339c06f19
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
 F ext/wasm/scratchpad-wasmfs-main.js 1aa32c1035cf1440a226a28fefcbb5762fbbcb020ccbe5895f8736d701695c63
 F ext/wasm/speedtest1-wasmfs.html bc28eb29b69a73864b8d7aae428448f8b7e1de81d8bfb9bba99541322054dbd0
@@ -528,11 +526,10 @@ F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33
 F ext/wasm/test-opfs-vfs.js 56c3d725044c668fa7910451e96c1195d25ad95825f9ac79f747a7759d1973d0
 F ext/wasm/tester1-worker.html 0af7a22025ff1da72a84765d64f8f221844a57c6e6e314acf3a30f176101fd3f
 F ext/wasm/tester1.html fde0e0bdeaaa2c39877c749dc86a8c1c306f771c3d75b89a6289a5ed11243e9d
-F ext/wasm/tester1.js d25cf7615bd39ab9ab4be2f231fecf1fff1378227e695083dc35adc4fdff668e
+F ext/wasm/tester1.js d6a66fc36c7571b8050314b6d0e93e69cd6def88df14fb3ef2403e7aa244ec36
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
 F ext/wasm/testing-worker1-promiser.js bd788e33c1807e0a6dda9c9a9d784bd3350ca49c9dd8ae2cc8719b506b6e013e
 F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d7669fb17fcae
-F ext/wasm/testing1.js 2034cf6972ab1506e75e41e532ca7cd3060e194c37edab3ff65d00d8a8af8ba2
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
 F ext/wasm/testing2.js 88f40ef3cd8201bdadd120a711c36bbf0ce56cc0eab1d5e7debb71fed7822494
 F ext/wasm/wasmfs.make 3cce1820006196de140f90f2da4b4ea657083fb5bfee7d125be43f7a85748c8f
@@ -2034,9 +2031,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 043e76e6166da5cf8e213cce46aaccb1f910e1fdbdb5556576eafb81b3bc5faa 5e9c67ba18b701aabbb0546acdfc532c9e8f0d27fb0a2c899415a5c47096c90b
-R c0d9c663bdd4b8318254b199c65d7e13
-T +closed 5e9c67ba18b701aabbb0546acdfc532c9e8f0d27fb0a2c899415a5c47096c90b
-U drh
-Z 57cc74128fdf4ddaf1ca461d6df422e4
+P cb94350185f555c333b628ee846c47bcc9df5f76bb82de569b8322f30dbbe1bc
+R 32dab828066657d904ede486bb592456
+U stephan
+Z 3fd1b23c49b42c2df54d60ffd9b89d7f
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 82a3113355..7e72bfdd21 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cb94350185f555c333b628ee846c47bcc9df5f76bb82de569b8322f30dbbe1bc
\ No newline at end of file
+4e2a8aff2dd4b6e148f45184e2523ebe47815257eca97fa3d32bcbf9625f0def
\ No newline at end of file

From 249efd04d783cdc2b5417d8d1f26ce61d0307b77 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Thu, 13 Oct 2022 20:06:17 +0000
Subject: [PATCH 273/428] Add tests for detecting page size of databases.

FossilOrigin-Name: 31f9e2369fcf59032b7c4c9f5bfc85e7ef7c174003b0b9e2757dad5a4c79b370
---
 ext/recover/recoverpgsz.test | 103 +++++++++++++++++++++++++++++++++++
 ext/recover/sqlite3recover.c |  21 ++++---
 manifest                     |  13 +++--
 manifest.uuid                |   2 +-
 4 files changed, 124 insertions(+), 15 deletions(-)
 create mode 100644 ext/recover/recoverpgsz.test

diff --git a/ext/recover/recoverpgsz.test b/ext/recover/recoverpgsz.test
new file mode 100644
index 0000000000..71413b0ead
--- /dev/null
+++ b/ext/recover/recoverpgsz.test
@@ -0,0 +1,103 @@
+# 2022 October 14
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+#
+
+if {![info exists testdir]} {
+  set testdir [file join [file dirname [info script]] .. .. test]
+} 
+source [file join [file dirname [info script]] recover_common.tcl]
+source $testdir/tester.tcl
+
+db close
+sqlite3_test_control_pending_byte 0x1000000
+
+set testprefix recoverpgsz
+
+foreach {pgsz bOverflow} {
+  512 0 1024 0 2048 0 4096 0 8192 0 16384 0 32768 0 65536 0
+  512 1 1024 1 2048 1 4096 1 8192 1 16384 1 32768 1 65536 1
+} {
+  reset_db
+  execsql "PRAGMA page_size = $pgsz"
+  do_execsql_test 1.$pgsz.$bOverflow.1 {
+    CREATE TABLE t1(a, b, c);
+    CREATE INDEX i1 ON t1(b, a, c);
+    INSERT INTO t1(a, b) VALUES(1, 2), (3, 4), (5, 6);
+    DELETE FROM t1 WHERE a=3;
+  }
+  if {$bOverflow} {
+    do_execsql_test 1.$pgsz.$bOverflow.1a {
+      UPDATE t1 SET c = randomblob(100000);
+    }
+  }
+  db close
+
+
+  set fd [open test.db]
+  fconfigure $fd -encoding binary -translation binary
+  seek $fd $pgsz
+  set pg1 [read $fd $pgsz]
+  set pg2 [read $fd $pgsz]
+  close $fd
+
+  set fd2 [open test.db2 w]
+  fconfigure $fd2 -encoding binary -translation binary
+  seek $fd2 $pgsz
+  puts -nonewline $fd2 $pg1
+  close $fd2
+
+  sqlite3 db2 test.db2
+  do_test 1.$pgsz.$bOverflow.2 {
+    set R [sqlite3_recover_init db2 main test.db3]
+    $R run
+    $R finish
+  } {}
+
+  sqlite3 db3 test.db3
+  do_test 1.$pgsz.$bOverflow.3 {
+    db3 eval { SELECT * FROM sqlite_schema }
+    db3 eval { PRAGMA page_size } 
+  } $pgsz
+
+  db2 close
+  db3 close
+
+  forcedelete test.db3
+  forcedelete test.db2
+
+  set fd2 [open test.db2 w]
+  fconfigure $fd2 -encoding binary -translation binary
+  seek $fd2 $pgsz
+  puts -nonewline $fd2 $pg2
+  close $fd2
+
+  sqlite3 db2 test.db2
+  do_test 1.$pgsz.$bOverflow.4 {
+    set R [sqlite3_recover_init db2 main test.db3]
+    $R run
+    $R finish
+  } {}
+
+  sqlite3 db3 test.db3
+  do_test 1.$pgsz.$bOverflow.5 {
+    db3 eval { SELECT * FROM sqlite_schema }
+    db3 eval { PRAGMA page_size } 
+  } $pgsz
+
+  db2 close
+  db3 close
+}
+
+
+finish_test
+
+
+
diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index 4b61d6b3ec..6e5db516c9 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -193,6 +193,7 @@ struct sqlite3_recover {
   int bSlowIndexes;               /* SQLITE_RECOVER_SLOWINDEXES setting */
 
   int pgsz;
+  int detected_pgsz;
   u8 *pPage1Disk;
   u8 *pPage1Cache;
 
@@ -1980,7 +1981,7 @@ static int recoverIsValidPage(u8 *aTmp, const u8 *a, int n){
     iNext = recoverGetU16(&a[iFree]);
     nByte = recoverGetU16(&a[iFree+2]);
     if( iFree+nByte>n ) return 0;
-    if( iNext<iFree+nByte ) return 0;
+    if( iNext && iNext<iFree+nByte ) return 0;
     memset(&aUsed[iFree], 0xFF, nByte);
     iFree = iNext;
   }
@@ -2093,7 +2094,11 @@ static void recoverPutU32(u8 *a, u32 v){
   a[3] = (v>>0) & 0x00FF;
 }
 
-static int recoverVfsDetectPagesize(sqlite3_file *pFd, i64 nSz, u32 *pPgsz){
+static int recoverVfsDetectPagesize(
+  sqlite3_recover *p,
+  sqlite3_file *pFd, 
+  i64 nSz
+){
   int rc = SQLITE_OK;
   const int nMin = 512;
   const int nMax = 65536;
@@ -2129,7 +2134,7 @@ static int recoverVfsDetectPagesize(sqlite3_file *pFd, i64 nSz, u32 *pPgsz){
     }
   }
 
-  *pPgsz = pgsz;
+  p->detected_pgsz = pgsz;
   sqlite3_free(aPg);
   return rc;
 }
@@ -2192,12 +2197,12 @@ static int recoverVfsRead(sqlite3_file *pFd, void *aBuf, int nByte, i64 iOff){
       if( pgsz==0x01 ) pgsz = 65536;
       rc = pFd->pMethods->xFileSize(pFd, &dbFileSize);
 
-      if( rc==SQLITE_OK ){
+      if( rc==SQLITE_OK && p->detected_pgsz==0 ){
         u32 pgsz2 = 0;
-        rc = recoverVfsDetectPagesize(pFd, dbFileSize, &pgsz2);
-        if( pgsz2!=0 ){
-          pgsz = pgsz2;
-        }
+        rc = recoverVfsDetectPagesize(p, pFd, dbFileSize);
+      }
+      if( p->detected_pgsz ){
+        pgsz = p->detected_pgsz;
       }
 
       if( pgsz ){
diff --git a/manifest b/manifest
index bb0cc53623..9f328fce8c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthe\spage-size,\sauto-vacuum\sand\sother\ssettings\sare\scopied\sinto\sthe\srecovered\sdatabase.
-D 2022-10-06T21:00:23.727
+C Add\stests\sfor\sdetecting\spage\ssize\sof\sdatabases.
+D 2022-10-13T20:06:17.168
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -394,10 +394,11 @@ F ext/recover/recovercorrupt2.test a131d8005337c092e2dfa3b84909ed67ae82d22399a8c
 F ext/recover/recoverfault.test 3a0a32b9fc216592b97775d69220695b0926980c0f7424b7a59144e47d7cb568
 F ext/recover/recoverfault2.test 321036336af23e778a87f148c4cc4407f88fbdab1fd72ddb661669be9020d36b
 F ext/recover/recoverold.test 46e9d99b595fac583d4c67f74d7d89c20a435c752ef6eeb3e918b599940c88e0
+F ext/recover/recoverpgsz.test 93e970eab05e4e89f8fd6b1bd23f9ec137ea09857e66ba0d4d27a83cd1ba4a89
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
 F ext/recover/recoverslowidx.test f356bb9fba7ffd6fc50e045e419464f0129ac6e24decf6e919584f79c3493727
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
-F ext/recover/sqlite3recover.c dcd00bbb95150b3d2a1ae75abd194fa863e4ed86971a3589da226c716fb5a6c0
+F ext/recover/sqlite3recover.c 2e9244bcc552f84bb60ea67060b793af2eb050bcbb9c8caed13510308e2039fb
 F ext/recover/sqlite3recover.h f698ccc94bd4da38761035415ad08c4549a408491ff9fd5f52d34d2214f64e36
 F ext/recover/test_recover.c 61ec931e47abca6b2210f46239cafd9f3060741605e3d3c45a7c7a53f63dd957
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -2014,8 +2015,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 0dbd0ccef532e076fa82c9fad4dc9fe632c0ef43e3483cc288cbb7eca336a9b9
-R c47f69833d79cdde413f6662a615cd06
+P 078520f2825bcb82d01b30209409e9bf8b6c99084c192345df41c9f531d08f51
+R c9070f986a9313d4a9d177b6562a0478
 U dan
-Z b397112aade8ffe2182cfeaa2f331f80
+Z 7bf274fb579b6c3146f808450c95f374
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 5806dd4688..6462e520e8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-078520f2825bcb82d01b30209409e9bf8b6c99084c192345df41c9f531d08f51
\ No newline at end of file
+31f9e2369fcf59032b7c4c9f5bfc85e7ef7c174003b0b9e2757dad5a4c79b370
\ No newline at end of file

From 4bc1cc18476aaa674f8a24f859e1ed754c365505 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Thu, 13 Oct 2022 21:08:34 +0000
Subject: [PATCH 274/428] This experimental branch attempts to use columns for
 an index-on-expression in place of the expression that is being indexed. 
 This particular check-in mostly works, but there are still issues.

FossilOrigin-Name: 2e8d4fd4cfd9e82f33c707ba246fe2bb3ca01762cf5ac5905058fbc7adf0abe7
---
 manifest        | 31 ++++++++++++++++-------------
 manifest.uuid   |  2 +-
 src/analyze.c   |  1 +
 src/build.c     |  1 +
 src/expr.c      | 28 ++++++++++++++++++++++++++
 src/insert.c    |  1 +
 src/sqliteInt.h | 20 +++++++++++++++++++
 src/upsert.c    |  1 +
 src/where.c     | 52 +++++++++++++++++++++++++++++++++++++++++++++++++
 src/whereexpr.c |  1 +
 10 files changed, 123 insertions(+), 15 deletions(-)

diff --git a/manifest b/manifest
index 13be78b776..f752561d83 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Move\sthe\srest\sof\stesting1.js\sinto\stester1.js\sand\seliminate\sthe\sdependency\son\sjaccwabyt_test.c.\sExtend\sthe\slist\sof\sdefault\sconfig-related\s#defines\sin\ssqlite3-wasm.c\sand\sreorganize\sthem\sfor\smaintainability.
-D 2022-10-13T16:48:35.302
+C This\sexperimental\sbranch\sattempts\sto\suse\scolumns\sfor\san\sindex-on-expression\nin\splace\sof\sthe\sexpression\sthat\sis\sbeing\sindexed.\s\sThis\sparticular\scheck-in\nmostly\sworks,\sbut\sthere\sare\sstill\sissues.
+D 2022-10-13T21:08:34.457
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -550,7 +550,7 @@ F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
 F sqlite_cfg.h.in baf2e409c63d4e7a765e17769b6ff17c5a82bbd9cbf1e284fd2e4cefaff3fcf2
 F src/alter.c 0390ca1d69ec3626cfa9f153114b7ab233e6b2bada6a9eb91361ed385fe90deb
-F src/analyze.c aabdf3769c7fd9954a8ec508eb7041ae174b66f88d12c47199fabbea9a646467
+F src/analyze.c d2fce73f6a024897593012c6ca25368629fa4aeb49960d88a52fac664582e483
 F src/attach.c 4431f82f0247bf3aaf91589acafdff77d1882235c95407b36da1585c765fbbc8
 F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
 F src/backup.c a2891172438e385fdbe97c11c9745676bec54f518d4447090af97189fd8e52d7
@@ -559,7 +559,7 @@ F src/btmutex.c 6ffb0a22c19e2f9110be0964d0731d2ef1c67b5f7fabfbaeb7b9dabc4b7740ca
 F src/btree.c 74fc5f6a0577df703d6f98d0c51ee0d8d91d22dbc0ba86e42e056517e2b45576
 F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
 F src/btreeInt.h 8ce1332edd89dfd2461d561ac10a0ab5601c8e06200cb5230596c3caaf54482e
-F src/build.c 6e3ee380a4f0ff95de4b53bf510f66600cff08e4e04b92e95fae789072563f8f
+F src/build.c e9b3adf21cdae3c9ca9450ee8463f2094f133c23734b81fd371f23b3d5d345ca
 F src/callback.c 4cd7225b26a97f7de5fee5ae10464bed5a78f2adefe19534cc2095b3a8ca484a
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c 428b47a2548c7c2c2f885189b42fdcc178fb03c276a2d58b3008b10da29373d5
@@ -567,7 +567,7 @@ F src/date.c 94ce83b4cd848a387680a5f920c9018c16655db778c4d36525af0a0f34679ac5
 F src/dbpage.c 5808e91bc27fa3981b028000f8fadfdc10ce9e59a34ce7dc4e035a69be3906ec
 F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
 F src/delete.c 86573edae75e3d3e9a8b590d87db8e47222103029df4f3e11fa56044459b514e
-F src/expr.c d199850a925665df7f8ac29fa938909f65a2bd32354aa206aa8c25fc74ff3d3d
+F src/expr.c b60036e4bb9080c741a970df3b3cfffc6292aadec3670b7b04bfae6f662ff245
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 722f20779f5342a787922deded3628d8c74b5249cab04098cf17ee2f2aaff002
 F src/func.c 8f72e88cccdee22185133c10f96ccd61dc34c5ea4b1fa9a73c237ef59b2e64f1
@@ -576,7 +576,7 @@ F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
 F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
 F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
-F src/insert.c aea5361767817f917b0f0f647a1f0b1621bd858938ae6ae545c3b6b9814b798f
+F src/insert.c b972b1642cd0f7d5ae4964d713b65158a7bfa6a6e8786a9e8e57bd9c0b4a896d
 F src/json.c 7749b98c62f691697c7ee536b570c744c0583cab4a89200fdd0fc2aa8cc8cbd6
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 853385cc7a604157e137585097949252d5d0c731768e16b044608e5c95c3614b
@@ -622,7 +622,7 @@ F src/shell.c.in 2915eaf22bda89ad6533851a051de4773c249185360fe1fc7b4477b8f9063b2
 F src/sqlite.h.in d9c8a6243fc0a1c270d69db33758e34b810af3462f9bc5b4af113b347e07c69d
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 5336beea1868d99d2f62e628dbea55e97267dbff8193291ab175e960c5df9141
-F src/sqliteInt.h d15694b228fe5082587e13ac14f3e449621a5fe6d5933f5dee6e3c9491260da3
+F src/sqliteInt.h a856afa8ff20886d1b0c668b9e3c62daf7875989a1db79e60f121778d48015e1
 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -685,7 +685,7 @@ F src/tokenize.c 1305797eab3542a0896b552c6e7669c972c1468e11e92b370533c1f37a37082
 F src/treeview.c 07787f67cd297a6d09d04b8d70c06769c60c9c1d9080378f93929c16f8fd3298
 F src/trigger.c 4163ada044af89d51caba1cb713a73165347b2ec05fe84a283737c134d61fcd5
 F src/update.c 5b0302c47cf31b533d5dff04c497ca1d8b9d89c39727e633fbe7b882fd5ac5aa
-F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
+F src/upsert.c 5303dc6c518fa7d4b280ec65170f465c7a70b7ac2b22491598f6d0b4875b3145
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 F src/util.c 0be191521ff6d2805995f4910f0b6231b42843678b2efdc1abecaf39929a673f
 F src/vacuum.c bb346170b0b54c6683bba4a5983aea40485597fdf605c87ec8bc2e199fe88cd8
@@ -704,10 +704,10 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d
 F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
-F src/where.c 63e712bcad47f70e94c2150976cd7da5040933699e3938d4189d064acbe40891
+F src/where.c 5cd2a96f99841e0ba3e5564d53b5ad397d3e8a42ce6e4694cd332da4e2c527f1
 F src/whereInt.h 70cd30de9ed784aa33fa6bd1245f060617de7a00d992469b6d8e419eed915743
 F src/wherecode.c bb88be457df3a6a01c844074ab79a9ba74279e73185f1362383aa697e3cae5dc
-F src/whereexpr.c 55a39f42aaf982574fbf52906371a84cceed98a994422198dfd03db4fce4cc46
+F src/whereexpr.c bf8c155212c886621d71c951053660de6fcc4ee907b17aa02da0a96a39aa9405
 F src/window.c 928e215840e2f2d9a2746e018c9643ef42c66c4ab6630ef0df7fa388fa145e86
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
@@ -2031,8 +2031,11 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P cb94350185f555c333b628ee846c47bcc9df5f76bb82de569b8322f30dbbe1bc
-R 32dab828066657d904ede486bb592456
-U stephan
-Z 3fd1b23c49b42c2df54d60ffd9b89d7f
+P 4e2a8aff2dd4b6e148f45184e2523ebe47815257eca97fa3d32bcbf9625f0def
+R 6b28e91c7f03fb2da80daeebeb46b73a
+T *branch * index-expr-opt
+T *sym-index-expr-opt *
+T -sym-trunk *
+U drh
+Z 4c1c25db22a8599a4330b36a4516d3d7
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 7e72bfdd21..c689c214d4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4e2a8aff2dd4b6e148f45184e2523ebe47815257eca97fa3d32bcbf9625f0def
\ No newline at end of file
+2e8d4fd4cfd9e82f33c707ba246fe2bb3ca01762cf5ac5905058fbc7adf0abe7
\ No newline at end of file
diff --git a/src/analyze.c b/src/analyze.c
index 39009899ab..8562b9d7f1 100644
--- a/src/analyze.c
+++ b/src/analyze.c
@@ -953,6 +953,7 @@ static void analyzeVdbeCommentIndexWithColumnName(
   if( NEVER(i==XN_ROWID) ){
     VdbeComment((v,"%s.rowid",pIdx->zName));
   }else if( i==XN_EXPR ){
+    assert( pIdx->bHasExpr );
     VdbeComment((v,"%s.expr(%d)",pIdx->zName, k));
   }else{
     VdbeComment((v,"%s.%s", pIdx->zName, pIdx->pTable->aCol[i].zCnName));
diff --git a/src/build.c b/src/build.c
index be6b01eb08..502826bfc8 100644
--- a/src/build.c
+++ b/src/build.c
@@ -4192,6 +4192,7 @@ void sqlite3CreateIndex(
       j = XN_EXPR;
       pIndex->aiColumn[i] = XN_EXPR;
       pIndex->uniqNotNull = 0;
+      pIndex->bHasExpr = 1;
     }else{
       j = pCExpr->iColumn;
       assert( j<=0x7fff );
diff --git a/src/expr.c b/src/expr.c
index bceb5efb08..3630b47aa8 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -4043,6 +4043,26 @@ static int exprCodeInlineFunction(
   return target;
 }
 
+/*
+** Check to see if pExpr is one of the indexed expression on pParse->pIdxExpr.
+** If it is, then resolve the expression by reading from the index and
+** return the register into which the value has been read.  If there is
+** no match, return negative.
+*/
+static SQLITE_NOINLINE int sqlite3ExprIndexLookup(
+  Parse *pParse,   /* The parsing context */
+  Expr *pExpr,     /* The expression to potentially bypass */
+  int target       /* Where to store the result of the expression */
+){
+  IndexExpr *p;
+  for(p=pParse->pIdxExpr; p; p=p->pIENext){
+    if( sqlite3ExprCompare(0, pExpr, p->pExpr, p->iDataCur)!=0 ) continue;
+    sqlite3VdbeAddOp3(pParse->pVdbe, OP_Column, p->iIdxCur, p->iIdxCol, target);
+    return target;
+  }
+  return -1;  /* Not found */
+}
+
 
 /*
 ** Generate code into the current Vdbe to evaluate the given
@@ -4068,6 +4088,14 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){
   assert( target>0 && target<=pParse->nMem );
   assert( v!=0 );
 
+  if( pParse->pIdxExpr!=0 
+   && pExpr!=0
+   && !ExprHasProperty(pExpr, EP_Leaf)
+   && (r1 = sqlite3ExprIndexLookup(pParse, pExpr, target))>=0
+  ){
+    return r1;
+  }
+
 expr_code_doover:
   if( pExpr==0 ){
     op = TK_NULL;
diff --git a/src/insert.c b/src/insert.c
index 6c71391a1b..3e0d696d74 100644
--- a/src/insert.c
+++ b/src/insert.c
@@ -96,6 +96,7 @@ const char *sqlite3IndexAffinityStr(sqlite3 *db, Index *pIdx){
         aff = SQLITE_AFF_INTEGER;
       }else{
         assert( x==XN_EXPR );
+        assert( pIdx->bHasExpr );
         assert( pIdx->aColExpr!=0 );
         aff = sqlite3ExprAffinity(pIdx->aColExpr->a[n].pExpr);
       }
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 6f1109f2f6..caf7610adb 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -1189,6 +1189,7 @@ typedef struct FuncDef FuncDef;
 typedef struct FuncDefHash FuncDefHash;
 typedef struct IdList IdList;
 typedef struct Index Index;
+typedef struct IndexExpr IndexExpr;
 typedef struct IndexSample IndexSample;
 typedef struct KeyClass KeyClass;
 typedef struct KeyInfo KeyInfo;
@@ -2616,6 +2617,7 @@ struct Index {
   unsigned bNoQuery:1;     /* Do not use this index to optimize queries */
   unsigned bAscKeyBug:1;   /* True if the bba7b69f9849b5bf bug applies */
   unsigned bHasVCol:1;     /* Index references one or more VIRTUAL columns */
+  unsigned bHasExpr:1;     /* This is an index on an expression */
 #ifdef SQLITE_ENABLE_STAT4
   int nSample;             /* Number of elements in aSample[] */
   int nSampleCol;          /* Size of IndexSample.anEq[] and so on */
@@ -3563,6 +3565,23 @@ struct TriggerPrg {
 # define DbMaskNonZero(M)   (M)!=0
 #endif
 
+/*
+** If there is an index on an expression in scope such that the value
+** of the expression pExpr can be read out of the index with cursor iCur
+** at column iCol, then an instance of this object records that fact.
+**
+** A linked list of these objects is attached to Parse and records all
+** expressions that can be short-circuited by extracting a valid from
+** an index.
+*/
+struct IndexExpr {
+  Expr *pExpr;            /* The expression contained in the index */
+  int iDataCur;           /* The data cursor associated with the index */
+  int iIdxCur;            /* The index cursor */
+  int iIdxCol;            /* The column of the index that contains pExpr */
+  IndexExpr *pIENext;     /* Next in a list of all indexed expressions */
+};
+
 /*
 ** An instance of the ParseCleanup object specifies an operation that
 ** should be performed after parsing to deallocation resources obtained
@@ -3621,6 +3640,7 @@ struct Parse {
   int nLabelAlloc;     /* Number of slots in aLabel */
   int *aLabel;         /* Space to hold the labels */
   ExprList *pConstExpr;/* Constant expressions */
+  IndexExpr *pIdxExpr; /* List of all expression in active indexes */
   Token constraintName;/* Name of the constraint currently being parsed */
   yDbMask writeMask;   /* Start a write transaction on these databases */
   yDbMask cookieMask;  /* Bitmask of schema verified databases */
diff --git a/src/upsert.c b/src/upsert.c
index fb6c7c0c07..85994020cf 100644
--- a/src/upsert.c
+++ b/src/upsert.c
@@ -166,6 +166,7 @@ int sqlite3UpsertAnalyzeTarget(
         if( pIdx->aiColumn[ii]==XN_EXPR ){
           assert( pIdx->aColExpr!=0 );
           assert( pIdx->aColExpr->nExpr>ii );
+          assert( pIdx->bHasExpr );
           pExpr = pIdx->aColExpr->a[ii].pExpr;
           if( pExpr->op!=TK_COLLATE ){
             sCol[0].pLeft = pExpr;
diff --git a/src/where.c b/src/where.c
index b0c0ea7d4e..220ea5139d 100644
--- a/src/where.c
+++ b/src/where.c
@@ -5383,6 +5383,55 @@ static SQLITE_NOINLINE void whereCheckIfBloomFilterIsUseful(
   }
 }
 
+/*
+** This is an sqlite3ParserAddCleanup() callback that is invoked to
+** free the Parse->pIdxExpr list when the Parse object is destroyed.
+*/
+static void whereIndexExprCleanup(sqlite3 *db, void *pObject){
+  Parse *pParse = (Parse*)pObject;
+  while( pParse->pIdxExpr!=0 ){
+    IndexExpr *p = pParse->pIdxExpr;
+    pParse->pIdxExpr = p->pIENext;
+    sqlite3ExprDelete(db, p->pExpr);
+    sqlite3DbFreeNN(db, p);
+  }
+}
+
+/*
+** The index pIdx is used by a query and contains one or more expressions.
+** In other words pIdx is an index on an expression.  iIdxCur is the cursor
+** number for the index and iDataCur is the cursor number for the corresponding
+** table.
+**
+** This routine adds IndexExpr entries to the Parse->pIdxExpr field for
+** each of the expressions in the index so that the expression code generator
+** will know to replace occurrences of the indexed expression with
+** references to the corresponding column of the index.
+*/
+static SQLITE_NOINLINE void whereAddIndexExpr(
+  Parse *pParse,    /* Add IndexExpr entries to pParse->pIdxExpr */
+  Index *pIdx,      /* The index-on-expression that contains the expressions */
+  int iIdxCur,      /* Cursor number for pIdx */
+  int iDataCur      /* Cursor for the corresponding table */
+){
+  int i;
+  IndexExpr *p;
+  for(i=0; i<pIdx->nColumn; i++){
+    if( pIdx->aiColumn[i]!=XN_EXPR ) continue;
+    p = sqlite3DbMallocRaw(pParse->db, sizeof(IndexExpr));
+    if( p==0 ) break;
+    p->pIENext = pParse->pIdxExpr;
+    p->pExpr = sqlite3ExprDup(pParse->db, pIdx->aColExpr->a[i].pExpr, 0);
+    p->iDataCur = iDataCur;
+    p->iIdxCur = iIdxCur;
+    p->iIdxCol = i;
+    pParse->pIdxExpr = p;
+    if( p->pIENext==0 ){
+      sqlite3ParserAddCleanup(pParse, whereIndexExprCleanup, pParse);
+    }
+  }
+}
+
 /*
 ** Generate the beginning of the loop used for WHERE clause processing.
 ** The return value is a pointer to an opaque structure that contains
@@ -5928,6 +5977,9 @@ WhereInfo *sqlite3WhereBegin(
         op = OP_ReopenIdx;
       }else{
         iIndexCur = pParse->nTab++;
+        if( pIx->bHasExpr ){
+          whereAddIndexExpr(pParse, pIx, iIndexCur, pTabItem->iCursor);
+        }
       }
       pLevel->iIdxCur = iIndexCur;
       assert( pIx!=0 );
diff --git a/src/whereexpr.c b/src/whereexpr.c
index 8c9233ebd3..20e569642a 100644
--- a/src/whereexpr.c
+++ b/src/whereexpr.c
@@ -989,6 +989,7 @@ static SQLITE_NOINLINE int exprMightBeIndexed2(
     if( pIdx->aColExpr==0 ) continue;
     for(i=0; i<pIdx->nKeyCol; i++){
       if( pIdx->aiColumn[i]!=XN_EXPR ) continue;
+      assert( pIdx->bHasExpr );
       if( sqlite3ExprCompareSkip(pExpr, pIdx->aColExpr->a[i].pExpr, iCur)==0 ){
         aiCurCol[0] = iCur;
         aiCurCol[1] = XN_EXPR;

From 859434d049a41edd3eb961b85b1b930cebac6540 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Fri, 14 Oct 2022 02:00:54 +0000
Subject: [PATCH 275/428] Cancel IndexExpr objects when they go out of scope.

FossilOrigin-Name: 0963519371bb7ac02adb323430855760fb9b82a23745e47c504aaf393d22ac34
---
 manifest      | 15 ++++++---------
 manifest.uuid |  2 +-
 src/where.c   | 11 +++++++++++
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/manifest b/manifest
index f752561d83..573214d62d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C This\sexperimental\sbranch\sattempts\sto\suse\scolumns\sfor\san\sindex-on-expression\nin\splace\sof\sthe\sexpression\sthat\sis\sbeing\sindexed.\s\sThis\sparticular\scheck-in\nmostly\sworks,\sbut\sthere\sare\sstill\sissues.
-D 2022-10-13T21:08:34.457
+C Cancel\sIndexExpr\sobjects\swhen\sthey\sgo\sout\sof\sscope.
+D 2022-10-14T02:00:54.507
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -704,7 +704,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d
 F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
-F src/where.c 5cd2a96f99841e0ba3e5564d53b5ad397d3e8a42ce6e4694cd332da4e2c527f1
+F src/where.c 39889861616d7751efacb9e5aa84ec5635dbf12a137725f57aa25fc6b622e15c
 F src/whereInt.h 70cd30de9ed784aa33fa6bd1245f060617de7a00d992469b6d8e419eed915743
 F src/wherecode.c bb88be457df3a6a01c844074ab79a9ba74279e73185f1362383aa697e3cae5dc
 F src/whereexpr.c bf8c155212c886621d71c951053660de6fcc4ee907b17aa02da0a96a39aa9405
@@ -2031,11 +2031,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 4e2a8aff2dd4b6e148f45184e2523ebe47815257eca97fa3d32bcbf9625f0def
-R 6b28e91c7f03fb2da80daeebeb46b73a
-T *branch * index-expr-opt
-T *sym-index-expr-opt *
-T -sym-trunk *
+P 2e8d4fd4cfd9e82f33c707ba246fe2bb3ca01762cf5ac5905058fbc7adf0abe7
+R 6e639b412a6a288ed64157bd3e723cf0
 U drh
-Z 4c1c25db22a8599a4330b36a4516d3d7
+Z c5e6e161a1559a577698a45d0fdb903e
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index c689c214d4..78c84b6668 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2e8d4fd4cfd9e82f33c707ba246fe2bb3ca01762cf5ac5905058fbc7adf0abe7
\ No newline at end of file
+0963519371bb7ac02adb323430855760fb9b82a23745e47c504aaf393d22ac34
\ No newline at end of file
diff --git a/src/where.c b/src/where.c
index 220ea5139d..0bba48883e 100644
--- a/src/where.c
+++ b/src/where.c
@@ -6376,6 +6376,17 @@ void sqlite3WhereEnd(WhereInfo *pWInfo){
       }else{
         last = pWInfo->iEndWhere;
       }
+      if( pIdx->bHasExpr ){
+        IndexExpr *p = pParse->pIdxExpr;
+        while( p ){
+          if( p->iIdxCur==pLevel->iIdxCur ){
+            p->iDataCur = -1;
+            p->iIdxCur = -1;
+            p->pExpr->op = TK_ILLEGAL;
+          }
+          p = p->pIENext;
+        }
+      }
       k = pLevel->addrBody + 1;
 #ifdef SQLITE_DEBUG
       if( db->flags & SQLITE_VdbeAddopTrace ){

From 3e771c0f077a6a9fad6e560559edb3f501c3892e Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Fri, 14 Oct 2022 13:26:18 +0000
Subject: [PATCH 276/428] Remove a resolved TODO comment.

FossilOrigin-Name: 32fd4ac382f774189ac34f6fff80e55e6e56dd2aa67b0db88d5a88324f17f6ff
---
 ext/wasm/sqlite3-opfs-async-proxy.js | 13 ++-----------
 manifest                             | 12 ++++++------
 manifest.uuid                        |  2 +-
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/ext/wasm/sqlite3-opfs-async-proxy.js b/ext/wasm/sqlite3-opfs-async-proxy.js
index fd4c7f2b80..d261dd354c 100644
--- a/ext/wasm/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/sqlite3-opfs-async-proxy.js
@@ -25,13 +25,6 @@
   access to the sqlite3 JS/WASM bits, so any bits which it needs (most
   notably SQLITE_xxx integer codes) have to be imported into it via an
   initialization process.
-
-  Potential TODOs:
-
-  - When idle for "a long time", close the sync access handle in order
-  to release the lock, then re-open it on demand. Similarly, delay
-  fetching of the sync access handle until we need it. The intent
-  would be to help multi-tab access to a db avoid locking issues.
 */
 'use strict';
 const toss = function(...args){throw new Error(args.join(' '))};
@@ -42,8 +35,6 @@ if(self.window === self){
   toss("This API requires navigator.storage.getDirectory.");
 }
 
-//warn("This file is very much experimental and under construction.",self.location.pathname);
-
 /**
    Will hold state copied to this object from the syncronous side of
    this API.
@@ -161,7 +152,7 @@ const getSyncHandle = async (fh)=>{
       try {
         //if(1===i) toss("Just testing.");
         //TODO? A config option which tells it to throw here
-        //randomly every now and then.
+        //randomly every now and then, for testing purposes.
         fh.syncHandle = await fh.fileHandle.createSyncAccessHandle();
         break;
       }catch(e){
@@ -170,7 +161,7 @@ const getSyncHandle = async (fh)=>{
                "attempts failed. ",fh.filenameAbs, ":", e.message);
           throw e;
         }
-        error("Error getting sync handle. Waiting",ms,
+        warn("Error getting sync handle. Waiting",ms,
               "ms and trying again.",fh.filenameAbs,e);
         Atomics.wait(state.sabOPView, state.opIds.xSleep, 0, ms);
       }
diff --git a/manifest b/manifest
index 13be78b776..2d787a777f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Move\sthe\srest\sof\stesting1.js\sinto\stester1.js\sand\seliminate\sthe\sdependency\son\sjaccwabyt_test.c.\sExtend\sthe\slist\sof\sdefault\sconfig-related\s#defines\sin\ssqlite3-wasm.c\sand\sreorganize\sthem\sfor\smaintainability.
-D 2022-10-13T16:48:35.302
+C Remove\sa\sresolved\sTODO\scomment.
+D 2022-10-14T13:26:18.756
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -519,7 +519,7 @@ F ext/wasm/speedtest1.html e4cb5d722b494104fc1249e7c008ca018f820a784833c51004c95
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
-F ext/wasm/sqlite3-opfs-async-proxy.js 40fc1f779e18e08b31404ef832381ffd36b9d11447007aaf96223198324e4467
+F ext/wasm/sqlite3-opfs-async-proxy.js e552d9290509644929cd7bfde3381a0eac85d17b4d82dbb11e86fae5336215b6
 F ext/wasm/sqlite3-worker1-promiser.js 307d7837420ca6a9d3780dfc81194f1c0715637e6d9540e935514086b96913d8
 F ext/wasm/sqlite3-worker1.js 466e9bd39409ab03f3e00999887aaffc11e95b416e2689596e3d7f1516673fdf
 F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
@@ -2031,8 +2031,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 cb94350185f555c333b628ee846c47bcc9df5f76bb82de569b8322f30dbbe1bc
-R 32dab828066657d904ede486bb592456
+P 4e2a8aff2dd4b6e148f45184e2523ebe47815257eca97fa3d32bcbf9625f0def
+R 9e71573268d8509a62b15b73d008f5e9
 U stephan
-Z 3fd1b23c49b42c2df54d60ffd9b89d7f
+Z fced5d49252f4340d2afc14fae1e4aa8
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 7e72bfdd21..6ab0e1f14e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4e2a8aff2dd4b6e148f45184e2523ebe47815257eca97fa3d32bcbf9625f0def
\ No newline at end of file
+32fd4ac382f774189ac34f6fff80e55e6e56dd2aa67b0db88d5a88324f17f6ff
\ No newline at end of file

From 2bc4a6cad0457fc07138f8c27d0190f3acb33f72 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Fri, 14 Oct 2022 15:10:36 +0000
Subject: [PATCH 277/428] Fix a problem in the LIKE and GLOB operators that may
 occur when the character immediately following a "%" or "*" wildcard is U+80.
 Reported by [forum:61bf7ccbdf].

FossilOrigin-Name: 2da677c45b643482eec39e4db7079c772760bc966dc71bf6c01658cc468f5823
---
 manifest        | 16 ++++++++--------
 manifest.uuid   |  2 +-
 src/func.c      |  2 +-
 test/like2.test |  8 ++++++++
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/manifest b/manifest
index 2d787a777f..5e6a5ac9b8 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sa\sresolved\sTODO\scomment.
-D 2022-10-14T13:26:18.756
+C Fix\sa\sproblem\sin\sthe\sLIKE\sand\sGLOB\soperators\sthat\smay\soccur\swhen\sthe\scharacter\simmediately\sfollowing\sa\s"%"\sor\s"*"\swildcard\sis\sU+80.\sReported\sby\s[forum:61bf7ccbdf].
+D 2022-10-14T15:10:36.387
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -570,7 +570,7 @@ F src/delete.c 86573edae75e3d3e9a8b590d87db8e47222103029df4f3e11fa56044459b514e
 F src/expr.c d199850a925665df7f8ac29fa938909f65a2bd32354aa206aa8c25fc74ff3d3d
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 722f20779f5342a787922deded3628d8c74b5249cab04098cf17ee2f2aaff002
-F src/func.c 8f72e88cccdee22185133c10f96ccd61dc34c5ea4b1fa9a73c237ef59b2e64f1
+F src/func.c fe2a795ad647ce42054873ac91c43beb7b5d204892903a67f6e7e314379b9d4a
 F src/global.c e83ee571b79ee3adc32e380cf554cf1254bc43763d23786c71721fbcdfbbb965
 F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
 F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
@@ -1243,7 +1243,7 @@ F test/lastinsert.test 42e948fd6442f07d60acbd15d33fb86473e0ef63
 F test/laststmtchanges.test ae613f53819206b3222771828d024154d51db200
 F test/lemon-test01.y 58b764610fd934e189ffbb0bbfa33d171b9cb06019b55bdc04d090d6767e11d7
 F test/like.test 5fe0bc37f307aef0a453ce2de4632bdfc0759448f0421c39f6d53caefe905fac
-F test/like2.test 3b2ee13149ba4a8a60b59756f4e5d345573852da
+F test/like2.test d3be15fefee3e02fc88942a9b98f26c5339bbdef7783c90023c092c4955fe3d3
 F test/like3.test a76e5938fadbe6d32807284c796bafd869974a961057bc5fc5a28e06de98745c
 F test/limit.test 350f5d03c29e7dff9a2cde016f84f8d368d40bcd02fa2b2a52fa10c4bf3cbfaf
 F test/limit2.test 9409b033284642a859fafc95f29a5a6a557bd57c1f0d7c3f554bd64ed69df77e
@@ -2031,8 +2031,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 4e2a8aff2dd4b6e148f45184e2523ebe47815257eca97fa3d32bcbf9625f0def
-R 9e71573268d8509a62b15b73d008f5e9
-U stephan
-Z fced5d49252f4340d2afc14fae1e4aa8
+P 32fd4ac382f774189ac34f6fff80e55e6e56dd2aa67b0db88d5a88324f17f6ff
+R ad7e356fc9072ccedd7e8855b564b667
+U dan
+Z 16dbeccb3b1fdf0272ff90de38793516
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 6ab0e1f14e..8828e08bae 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-32fd4ac382f774189ac34f6fff80e55e6e56dd2aa67b0db88d5a88324f17f6ff
\ No newline at end of file
+2da677c45b643482eec39e4db7079c772760bc966dc71bf6c01658cc468f5823
\ No newline at end of file
diff --git a/src/func.c b/src/func.c
index ec50a17a37..06581cbe32 100644
--- a/src/func.c
+++ b/src/func.c
@@ -740,7 +740,7 @@ static int patternCompare(
       ** c but in the other case and search the input string for either
       ** c or cx.
       */
-      if( c<=0x80 ){
+      if( c<0x80 ){
         char zStop[3];
         int bMatch;
         if( noCase ){
diff --git a/test/like2.test b/test/like2.test
index 4fd16420ad..2a4474edce 100644
--- a/test/like2.test
+++ b/test/like2.test
@@ -1006,4 +1006,12 @@ do_test like-2.126.3 {
 } {126}
 
 
+do_test like-3.1 {
+  db eval "SELECT '\u01C0' LIKE '%\x80'"
+} {0}
+do_test like-3.2 {
+  db eval "SELECT '\u0080' LIKE '%\x80'"
+} {1}
+
+
 finish_test

From 3fa10f82f4c14a30574d64556e2a80e68be6735d Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Fri, 14 Oct 2022 15:46:19 +0000
Subject: [PATCH 278/428] Handle recovering databases with reserved bytes at
 the end of each page.

FossilOrigin-Name: 52d0235ef3f21683daadf2343514f7b95a67c3589266f75c1e00e04f11dc6214
---
 ext/misc/cksumvfs.c          |  2 +-
 ext/recover/recover1.test    | 24 +++++++++++++++
 ext/recover/sqlite3recover.c | 60 ++++++++++++++++++++----------------
 manifest                     | 16 +++++-----
 manifest.uuid                |  2 +-
 5 files changed, 67 insertions(+), 37 deletions(-)

diff --git a/ext/misc/cksumvfs.c b/ext/misc/cksumvfs.c
index 8c340889fe..e7c2c9d5c0 100644
--- a/ext/misc/cksumvfs.c
+++ b/ext/misc/cksumvfs.c
@@ -47,7 +47,7 @@
 **
 **     sqlite3 *db;
 **     sqlite3_open(":memory:", &db);
-**     sqlite3_load_extention(db, "./cksumvfs");
+**     sqlite3_load_extension(db, "./cksumvfs");
 **     sqlite3_close(db);
 **
 ** If this extension is compiled with -DSQLITE_CKSUMVFS_STATIC and
diff --git a/ext/recover/recover1.test b/ext/recover/recover1.test
index 99ddc1f4b3..ed921b7e91 100644
--- a/ext/recover/recover1.test
+++ b/ext/recover/recover1.test
@@ -222,5 +222,29 @@ do_test 12.3 {
   $R finish
 } {}
 
+
+
+#-------------------------------------------------------------------------
+reset_db
+file_control_reservebytes db 16
+do_execsql_test 12.1 {
+  PRAGMA auto_vacuum = 2;
+  PRAGMA user_version = 45;
+  PRAGMA application_id = 22;
+
+  CREATE TABLE u1(u, v);
+  CREATE UNIQUE INDEX i1 ON u1(u, v);
+  INSERT INTO u1 VALUES(1, 2), (3, 4);
+
+  CREATE TABLE u2(u, v);
+  CREATE UNIQUE INDEX i2 ON u1(u, v);
+  INSERT INTO u2 VALUES(hex(randomblob(500)), hex(randomblob(1000)));
+  INSERT INTO u2 VALUES(hex(randomblob(500)), hex(randomblob(1000)));
+  INSERT INTO u2 VALUES(hex(randomblob(500)), hex(randomblob(1000)));
+  INSERT INTO u2 VALUES(hex(randomblob(50000)), hex(randomblob(20000)));
+}
+
+do_recover_test 12 
+
 finish_test
 
diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index 6e5db516c9..70f3386924 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -194,6 +194,7 @@ struct sqlite3_recover {
 
   int pgsz;
   int detected_pgsz;
+  int nReserve;
   u8 *pPage1Disk;
   u8 *pPage1Cache;
 
@@ -667,20 +668,13 @@ static void recoverGetPage(
     if( pStmt ){
       sqlite3_bind_int64(pStmt, 1, pgno);
       if( SQLITE_ROW==sqlite3_step(pStmt) ){
-        int bDone = 0;
         assert( p->errCode==SQLITE_OK );
-        if( pgno==1 ){
-          const u8 *aPg = sqlite3_column_blob(pStmt, 0);
-          int nPg = sqlite3_column_bytes(pStmt, 0);
-          if( nPg==p->pgsz && 0==memcmp(p->pPage1Cache, aPg, nPg) ){
-            sqlite3_result_blob(pCtx, p->pPage1Disk, nPg, SQLITE_STATIC);
-            bDone = 1;
-          }
-        }
-        
-        if( !bDone ){
-          sqlite3_result_value(pCtx, sqlite3_column_value(pStmt, 0));
+        const u8 *aPg = sqlite3_column_blob(pStmt, 0);
+        int nPg = sqlite3_column_bytes(pStmt, 0);
+        if( pgno==1 && nPg==p->pgsz && 0==memcmp(p->pPage1Cache, aPg, nPg) ){
+          aPg = p->pPage1Disk;
         }
+        sqlite3_result_blob(pCtx, aPg, nPg-p->nReserve, SQLITE_TRANSIENT);
       }
       recoverReset(p, pStmt);
     }
@@ -2097,6 +2091,7 @@ static void recoverPutU32(u8 *a, u32 v){
 static int recoverVfsDetectPagesize(
   sqlite3_recover *p,
   sqlite3_file *pFd, 
+  u32 nReserve,                   /* Possible nReserve value */
   i64 nSz
 ){
   int rc = SQLITE_OK;
@@ -2116,23 +2111,31 @@ static int recoverVfsDetectPagesize(
   nBlk = (nSz+nMax-1)/nMax;
   if( nBlk>nMaxBlk ) nBlk = nMaxBlk;
 
-  for(iBlk=0; rc==SQLITE_OK && iBlk<nBlk; iBlk++){
-    int nByte = (nSz>=((iBlk+1)*nMax)) ? nMax : (nSz % nMax);
-    memset(aPg, 0, nMax);
-    rc = pFd->pMethods->xRead(pFd, aPg, nByte, iBlk*nMax);
-    if( rc==SQLITE_OK ){
-      int pgsz2;
-      for(pgsz2=(pgsz ? pgsz*2 : nMin); pgsz2<=nMax; pgsz2=pgsz2*2){
-        int iOff;
-        for(iOff=0; iOff<nMax; iOff+=pgsz2){
-          if( recoverIsValidPage(aTmp, &aPg[iOff], pgsz2) ){
-            pgsz = pgsz2;
-            break;
+  do {
+    for(iBlk=0; rc==SQLITE_OK && iBlk<nBlk; iBlk++){
+      int nByte = (nSz>=((iBlk+1)*nMax)) ? nMax : (nSz % nMax);
+      memset(aPg, 0, nMax);
+      rc = pFd->pMethods->xRead(pFd, aPg, nByte, iBlk*nMax);
+      if( rc==SQLITE_OK ){
+        int pgsz2;
+        for(pgsz2=(pgsz ? pgsz*2 : nMin); pgsz2<=nMax; pgsz2=pgsz2*2){
+          int iOff;
+          for(iOff=0; iOff<nMax; iOff+=pgsz2){
+            if( recoverIsValidPage(aTmp, &aPg[iOff], pgsz2-nReserve) ){
+              pgsz = pgsz2;
+              break;
+            }
           }
         }
       }
     }
-  }
+    if( pgsz>p->detected_pgsz ){
+      p->detected_pgsz = pgsz;
+      p->nReserve = nReserve;
+    }
+    if( nReserve==0 ) break;
+    nReserve = 0;
+  }while( 1 );
 
   p->detected_pgsz = pgsz;
   sqlite3_free(aPg);
@@ -2188,6 +2191,7 @@ static int recoverVfsRead(sqlite3_file *pFd, void *aBuf, int nByte, i64 iOff){
       u8 *a = (u8*)aBuf;
 
       u32 pgsz = recoverGetU16(&a[16]);
+      u32 nReserve = a[20];
       u32 enc = recoverGetU32(&a[56]);
       u32 dbsz = 0;
       i64 dbFileSize = 0;
@@ -2199,10 +2203,11 @@ static int recoverVfsRead(sqlite3_file *pFd, void *aBuf, int nByte, i64 iOff){
 
       if( rc==SQLITE_OK && p->detected_pgsz==0 ){
         u32 pgsz2 = 0;
-        rc = recoverVfsDetectPagesize(p, pFd, dbFileSize);
+        rc = recoverVfsDetectPagesize(p, pFd, nReserve, dbFileSize);
       }
       if( p->detected_pgsz ){
         pgsz = p->detected_pgsz;
+        nReserve = p->nReserve;
       }
 
       if( pgsz ){
@@ -2224,9 +2229,10 @@ static int recoverVfsRead(sqlite3_file *pFd, void *aBuf, int nByte, i64 iOff){
 
         recoverPutU32(&aHdr[28], dbsz);
         recoverPutU32(&aHdr[56], enc);
-        recoverPutU16(&aHdr[105], pgsz);
+        recoverPutU16(&aHdr[105], pgsz-nReserve);
         if( pgsz==65536 ) pgsz = 1;
         recoverPutU16(&aHdr[16], pgsz);
+        aHdr[20] = nReserve;
         for(ii=0; ii<sizeof(aPreserve)/sizeof(aPreserve[0]); ii++){
           memcpy(&aHdr[aPreserve[ii]], &a[aPreserve[ii]], 4);
         }
diff --git a/manifest b/manifest
index 9f328fce8c..9b344b5af1 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stests\sfor\sdetecting\spage\ssize\sof\sdatabases.
-D 2022-10-13T20:06:17.168
+C Handle\srecovering\sdatabases\swith\sreserved\sbytes\sat\sthe\send\sof\seach\spage.
+D 2022-10-14T15:46:19.783
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -293,7 +293,7 @@ F ext/misc/blobio.c a867c4c4617f6ec223a307ebfe0eabb45e0992f74dd47722b96f3e631c0e
 F ext/misc/btreeinfo.c d28ce349b40054eaa9473e835837bad7a71deec33ba13e39f963d50933bfa0f9
 F ext/misc/carray.c b752f46411e4e47e34dce6f0c88bc8e51bb821ba9e49bfcd882506451c928f69
 F ext/misc/carray.h d2b1b12486d531367c37832d3d0dad34eea4bdd83ed839d445521ef01f0bc4e3
-F ext/misc/cksumvfs.c b42ef52eaaa510d54ec320c87bea149e934a3b06cd232be2093562bf669bd572
+F ext/misc/cksumvfs.c 9224e33cc0cb6aa61ff1d7d7b8fd6fe56beca9f9c47954fa4ae0a69bef608f69
 F ext/misc/closure.c dbfd8543b2a017ae6b1a5843986b22ddf99ff126ec9634a2f4047cd14c85c243
 F ext/misc/completion.c 6dafd7f4348eecc7be9e920d4b419d1fb2af75d938cd9c59a20cfe8beb2f22b9
 F ext/misc/compress.c 3354c77a7c8e86e07d849916000cdac451ed96500bfb5bd83b20eb61eee012c9
@@ -386,7 +386,7 @@ F ext/rbu/rbuvacuum4.test a78898e438a44803eb2bc897ba3323373c9f277418e2d6d76e90f2
 F ext/rbu/sqlite3rbu.c 8737cabdfbee84bb25a7851ecef8b1312be332761238da9be6ddb10c62ad4291
 F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9cd389812
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
-F ext/recover/recover1.test 6b59ef31e3c0beef8b66e112d50af160e6f7ad8df95bee10192a9e44169d03ec
+F ext/recover/recover1.test 93acc42f95259f8b34050ad75873685a305da76d6cb1727d003f45157a4a6402
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
 F ext/recover/recoverclobber.test 294dcc894124ab4ca3a7b35766630742a3d25810fceac22220beb64f70a33a60
 F ext/recover/recovercorrupt.test 69af3d68aedc2cf1c3c41dbd6afb45b3cebadb57796d513550b5fd1e2a8b3fba
@@ -398,7 +398,7 @@ F ext/recover/recoverpgsz.test 93e970eab05e4e89f8fd6b1bd23f9ec137ea09857e66ba0d4
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
 F ext/recover/recoverslowidx.test f356bb9fba7ffd6fc50e045e419464f0129ac6e24decf6e919584f79c3493727
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
-F ext/recover/sqlite3recover.c 2e9244bcc552f84bb60ea67060b793af2eb050bcbb9c8caed13510308e2039fb
+F ext/recover/sqlite3recover.c 3ab2017a947fa8c9286aa6257d0b19443ec04e557af9d989227b89f36ff50dd6
 F ext/recover/sqlite3recover.h f698ccc94bd4da38761035415ad08c4549a408491ff9fd5f52d34d2214f64e36
 F ext/recover/test_recover.c 61ec931e47abca6b2210f46239cafd9f3060741605e3d3c45a7c7a53f63dd957
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -2015,8 +2015,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 078520f2825bcb82d01b30209409e9bf8b6c99084c192345df41c9f531d08f51
-R c9070f986a9313d4a9d177b6562a0478
+P 31f9e2369fcf59032b7c4c9f5bfc85e7ef7c174003b0b9e2757dad5a4c79b370
+R 5cdbc6428c0fa2e93f2a85abaf27f095
 U dan
-Z 7bf274fb579b6c3146f808450c95f374
+Z b6e8d5631de2a7b5df9849ef8598b9a3
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 6462e520e8..402dc22cc5 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-31f9e2369fcf59032b7c4c9f5bfc85e7ef7c174003b0b9e2757dad5a4c79b370
\ No newline at end of file
+52d0235ef3f21683daadf2343514f7b95a67c3589266f75c1e00e04f11dc6214
\ No newline at end of file

From e72ddfd89b05c7ed60b82ac019480d1f3a5c7a21 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Fri, 14 Oct 2022 15:52:29 +0000
Subject: [PATCH 279/428] Generic minor cleanups and docs in the OPFS async
 proxy.

FossilOrigin-Name: a4423ca234453c14eb40db7fe5943f63b30fd9dc2207388e8a2966733a004e9d
---
 ext/wasm/sqlite3-opfs-async-proxy.js | 97 ++++++++++++++++------------
 manifest                             | 14 ++--
 manifest.uuid                        |  2 +-
 3 files changed, 64 insertions(+), 49 deletions(-)

diff --git a/ext/wasm/sqlite3-opfs-async-proxy.js b/ext/wasm/sqlite3-opfs-async-proxy.js
index d261dd354c..5b29aa3ea5 100644
--- a/ext/wasm/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/sqlite3-opfs-async-proxy.js
@@ -10,10 +10,10 @@
 
   ***********************************************************************
 
-  An INCOMPLETE and UNDER CONSTRUCTION experiment for OPFS: a Worker
-  which manages asynchronous OPFS handles on behalf of a synchronous
-  API which controls it via a combination of Worker messages,
-  SharedArrayBuffer, and Atomics.
+  An Worker which manages asynchronous OPFS handles on behalf of a
+  synchronous API which controls it via a combination of Worker
+  messages, SharedArrayBuffer, and Atomics. It is the asynchronous
+  counterpart of the API defined in sqlite3-api-opfs.js.
 
   Highly indebted to:
 
@@ -102,9 +102,9 @@ const __openFiles = Object.create(null);
 
 /**
    Expects an OPFS file path. It gets resolved, such that ".."
-   components are properly expanded, and returned. If the 2nd
-   are is true, it's returned as an array of path elements,
-   else it's returned as an absolute path string.
+   components are properly expanded, and returned. If the 2nd arg is
+   true, the result is returned as an array of path elements, else an
+   absolute path string is returned.
 */
 const getResolvedPath = function(filename,splitIt){
   const p = new URL(
@@ -115,9 +115,9 @@ const getResolvedPath = function(filename,splitIt){
 
 /**
    Takes the absolute path to a filesystem element. Returns an array
-   of [handleOfContainingDir, filename]. If the 2nd argument is
-   truthy then each directory element leading to the file is created
-   along the way. Throws if any creation or resolution fails.
+   of [handleOfContainingDir, filename]. If the 2nd argument is truthy
+   then each directory element leading to the file is created along
+   the way. Throws if any creation or resolution fails.
 */
 const getDirForFilename = async function f(absFilename, createDirs = false){
   const path = getResolvedPath(absFilename, true);
@@ -171,6 +171,16 @@ const getSyncHandle = async (fh)=>{
   return fh.syncHandle;
 };
 
+/**
+   If the given file-holding object has a sync handle attached to it,
+   that handle is remove and asynchronously closed. Though it may
+   sound sensible to continue work as soon as the close() returns
+   (noting that it's asynchronous), doing so can cause operations
+   performed soon afterwards, e.g. a call to getSyncHandle() to fail
+   because they may happen out of order from the close(). OPFS does
+   not guaranty that the actual order of operations is retained in
+   such cases. i.e.  always "await" on the result of this function.
+*/
 const closeSyncHandle = async (fh)=>{
   if(fh.syncHandle){
     log("Closing sync handle for",fh.filenameAbs);
@@ -197,43 +207,50 @@ const affirmNotRO = function(opName,fh){
   if(fh.readOnly) toss(opName+"(): File is read-only: "+fh.filenameAbs);
 };
 
-
-const opTimer = Object.create(null);
-opTimer.op = undefined;
-opTimer.start = undefined;
+/**
+   We track 2 different timers: the "metrics" timer records how much
+   time we spend performing work. The "wait" timer records how much
+   time we spend waiting on the underlying OPFS timer. See the calls
+   to mTimeStart(), mTimeEnd(), wTimeStart(), and wTimeEnd()
+   throughout this file to see how they're used.
+*/
+const __mTimer = Object.create(null);
+__mTimer.op = undefined;
+__mTimer.start = undefined;
 const mTimeStart = (op)=>{
-  opTimer.start = performance.now();
-  opTimer.op = op;
+  __mTimer.start = performance.now();
+  __mTimer.op = op;
   //metrics[op] || toss("Maintenance required: missing metrics for",op);
   ++metrics[op].count;
 };
 const mTimeEnd = ()=>(
-  metrics[opTimer.op].time += performance.now() - opTimer.start
+  metrics[__mTimer.op].time += performance.now() - __mTimer.start
 );
-const waitTimer = Object.create(null);
-waitTimer.op = undefined;
-waitTimer.start = undefined;
+const __wTimer = Object.create(null);
+__wTimer.op = undefined;
+__wTimer.start = undefined;
 const wTimeStart = (op)=>{
-  waitTimer.start = performance.now();
-  waitTimer.op = op;
+  __wTimer.start = performance.now();
+  __wTimer.op = op;
   //metrics[op] || toss("Maintenance required: missing metrics for",op);
 };
 const wTimeEnd = ()=>(
-  metrics[waitTimer.op].wait += performance.now() - waitTimer.start
+  metrics[__wTimer.op].wait += performance.now() - __wTimer.start
 );
 
 /**
-   Set to true by the 'opfs-async-shutdown' command to quite the wait loop.
-   This is only intended for debugging purposes: we cannot inspect this
-   file's state while the tight waitLoop() is running.
+   Gets set to true by the 'opfs-async-shutdown' command to quit the
+   wait loop. This is only intended for debugging purposes: we cannot
+   inspect this file's state while the tight waitLoop() is running and
+   need a way to stop that loop for introspection purposes.
 */
 let flagAsyncShutdown = false;
 
 
 /**
    Asynchronous wrappers for sqlite3_vfs and sqlite3_io_methods
-   methods. Maintenance reminder: members are in alphabetical order
-   to simplify finding them.
+   methods, as well as helpers like mkdir(). Maintenance reminder:
+   members are in alphabetical order to simplify finding them.
 */
 const vfsAsyncImpls = {
   'opfs-async-metrics': async ()=>{
@@ -369,11 +386,13 @@ const vfsAsyncImpls = {
     const fh = __openFiles[fid];
     let rc = 0;
     if( !fh.syncHandle ){
+      wTimeStart('xLock');
       try { await getSyncHandle(fh) }
       catch(e){
         state.s11n.storeException(1,e);
         rc = state.sq3Codes.SQLITE_IOERR;
       }
+      wTimeEnd();
     }
     storeAndNotify('xLock',rc);
     mTimeEnd();
@@ -423,11 +442,11 @@ const vfsAsyncImpls = {
   },
   xRead: async function(fid,n,offset){
     mTimeStart('xRead');
-    let rc = 0;
+    let rc = 0, nRead;
     const fh = __openFiles[fid];
     try{
       wTimeStart('xRead');
-      const nRead = (await getSyncHandle(fh)).read(
+      nRead = (await getSyncHandle(fh)).read(
         fh.sabView.subarray(0, n),
         {at: Number(offset)}
       );
@@ -437,6 +456,7 @@ const vfsAsyncImpls = {
         rc = state.sq3Codes.SQLITE_IOERR_SHORT_READ;
       }
     }catch(e){
+      if(undefined===nRead) wTimeEnd();
       error("xRead() failed",e,fh);
       state.s11n.storeException(1,e);
       rc = state.sq3Codes.SQLITE_IOERR_READ;
@@ -454,9 +474,8 @@ const vfsAsyncImpls = {
         await fh.syncHandle.flush();
       }catch(e){
         state.s11n.storeException(2,e);
-      }finally{
-        wTimeEnd();
       }
+      wTimeEnd();
     }
     storeAndNotify('xSync',rc);
     mTimeEnd();
@@ -484,13 +503,13 @@ const vfsAsyncImpls = {
     const fh = __openFiles[fid];
     if( state.sq3Codes.SQLITE_LOCK_NONE===lockType
         && fh.syncHandle ){
+      wTimeStart('xUnlock');
       try { await closeSyncHandle(fh) }
       catch(e){
         state.s11n.storeException(1,e);
         rc = state.sq3Codes.SQLITE_IOERR;
-        /* Maybe we want to not report this? "Destructors do not
-           throw." */
       }
+      wTimeEnd();
     }
     storeAndNotify('xUnlock',rc);
     mTimeEnd();
@@ -511,9 +530,8 @@ const vfsAsyncImpls = {
       error("xWrite():",e,fh);
       state.s11n.storeException(1,e);
       rc = state.sq3Codes.SQLITE_IOERR_WRITE;
-    }finally{
-      wTimeEnd();
     }
+    wTimeEnd();
     storeAndNotify('xWrite',rc);
     mTimeEnd();
   }
@@ -632,7 +650,7 @@ const waitLoop = async function f(){
     const o = Object.create(null);
     opHandlers[state.opIds[k]] = o;
     o.key = k;
-    o.f = vi || toss("No vfsAsyncImpls[",k,"]");
+    o.f = vi;
   }
   /**
      waitTime is how long (ms) to wait for each Atomics.wait().
@@ -640,8 +658,6 @@ const waitLoop = async function f(){
      to do other things.
   */
   const waitTime = 1000;
-  let lastOpTime = performance.now();
-  let now;
   while(!flagAsyncShutdown){
     try {
       if('timed-out'===Atomics.wait(
@@ -649,7 +665,6 @@ const waitLoop = async function f(){
       )){
         continue;
       }
-      lastOpTime = performance.now();
       const opId = Atomics.load(state.sabOPView, state.opIds.whichOp);
       Atomics.store(state.sabOPView, state.opIds.whichOp, 0);
       const hnd = opHandlers[opId] ?? toss("No waitLoop handler for whichOp #",opId);
@@ -663,7 +678,7 @@ const waitLoop = async function f(){
     }catch(e){
       error('in waitLoop():',e);
     }
-  };
+  }
 };
 
 navigator.storage.getDirectory().then(function(d){
diff --git a/manifest b/manifest
index 5e6a5ac9b8..259868c45d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\sin\sthe\sLIKE\sand\sGLOB\soperators\sthat\smay\soccur\swhen\sthe\scharacter\simmediately\sfollowing\sa\s"%"\sor\s"*"\swildcard\sis\sU+80.\sReported\sby\s[forum:61bf7ccbdf].
-D 2022-10-14T15:10:36.387
+C Generic\sminor\scleanups\sand\sdocs\sin\sthe\sOPFS\sasync\sproxy.
+D 2022-10-14T15:52:29.231
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -519,7 +519,7 @@ F ext/wasm/speedtest1.html e4cb5d722b494104fc1249e7c008ca018f820a784833c51004c95
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
-F ext/wasm/sqlite3-opfs-async-proxy.js e552d9290509644929cd7bfde3381a0eac85d17b4d82dbb11e86fae5336215b6
+F ext/wasm/sqlite3-opfs-async-proxy.js 206ce6bbc3c30ad51a37d9c25e3a2712e70b586e0f9a2cf8cb0b9619017c2671
 F ext/wasm/sqlite3-worker1-promiser.js 307d7837420ca6a9d3780dfc81194f1c0715637e6d9540e935514086b96913d8
 F ext/wasm/sqlite3-worker1.js 466e9bd39409ab03f3e00999887aaffc11e95b416e2689596e3d7f1516673fdf
 F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
@@ -2031,8 +2031,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 32fd4ac382f774189ac34f6fff80e55e6e56dd2aa67b0db88d5a88324f17f6ff
-R ad7e356fc9072ccedd7e8855b564b667
-U dan
-Z 16dbeccb3b1fdf0272ff90de38793516
+P 2da677c45b643482eec39e4db7079c772760bc966dc71bf6c01658cc468f5823
+R bd5efaaf882b3ae0c03e0e5a6693b37e
+U stephan
+Z c8a3d40e488aded9faa8a7e4d2f0c359
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 8828e08bae..de485659dc 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2da677c45b643482eec39e4db7079c772760bc966dc71bf6c01658cc468f5823
\ No newline at end of file
+a4423ca234453c14eb40db7fe5943f63b30fd9dc2207388e8a2966733a004e9d
\ No newline at end of file

From 0388f17988d3b5f0281f92123d9c78732c13c1f2 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Fri, 14 Oct 2022 19:21:12 +0000
Subject: [PATCH 280/428] Add missing initializer from the extension loader. 
 Fix for check-in [d6d449978245b4fa].

FossilOrigin-Name: 565d74c36f2dd4612860c7ee561682c50db28cfa5384346528292019dbfdf86c
---
 manifest      | 14 +++++++-------
 manifest.uuid |  2 +-
 src/loadext.c |  4 +++-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index 259868c45d..7c2b8ac79b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Generic\sminor\scleanups\sand\sdocs\sin\sthe\sOPFS\sasync\sproxy.
-D 2022-10-14T15:52:29.231
+C Add\smissing\sinitializer\sfrom\sthe\sextension\sloader.\s\sFix\sfor\s\ncheck-in\s[d6d449978245b4fa].
+D 2022-10-14T19:21:12.300
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -579,7 +579,7 @@ F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 F src/insert.c aea5361767817f917b0f0f647a1f0b1621bd858938ae6ae545c3b6b9814b798f
 F src/json.c 7749b98c62f691697c7ee536b570c744c0583cab4a89200fdd0fc2aa8cc8cbd6
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
-F src/loadext.c 853385cc7a604157e137585097949252d5d0c731768e16b044608e5c95c3614b
+F src/loadext.c 8086232d10e51e183a7f64199815bad1c579896354db69435347665f62f481e9
 F src/main.c b434b8e4aca38419962de3d1c55fb9279807ba6a8802998a427b1635dc8250f6
 F src/malloc.c dfddca1e163496c0a10250cedeafaf56dff47673e0f15888fb0925340a8e3f90
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
@@ -2031,8 +2031,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 2da677c45b643482eec39e4db7079c772760bc966dc71bf6c01658cc468f5823
-R bd5efaaf882b3ae0c03e0e5a6693b37e
-U stephan
-Z c8a3d40e488aded9faa8a7e4d2f0c359
+P a4423ca234453c14eb40db7fe5943f63b30fd9dc2207388e8a2966733a004e9d
+R 657c639cfdb29ba1717741ed5fd9ad00
+U drh
+Z ac4a2afa493b2e100552976a88fb6b99
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index de485659dc..0fb2923565 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a4423ca234453c14eb40db7fe5943f63b30fd9dc2207388e8a2966733a004e9d
\ No newline at end of file
+565d74c36f2dd4612860c7ee561682c50db28cfa5384346528292019dbfdf86c
\ No newline at end of file
diff --git a/src/loadext.c b/src/loadext.c
index dd15d9a4da..421ccca804 100644
--- a/src/loadext.c
+++ b/src/loadext.c
@@ -508,7 +508,9 @@ static const sqlite3_api_routines sqlite3Apis = {
   0,
   0,
 #endif
-  sqlite3_db_name
+  sqlite3_db_name,
+  /* Version 3.40.0 and later */
+  sqlite3_value_type
 };
 
 /* True if x is the directory separator character

From 879164ed74846a4bdfcd513c200c70debf0b9409 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Fri, 14 Oct 2022 19:30:34 +0000
Subject: [PATCH 281/428] Fix a problem with using the push-down optimization
 on compound SELECTs where component SELECTs use different collation
 sequences. dbsqlfuzz 11516f050100243e5a845f5a2b48a90ed2efaf2e.

FossilOrigin-Name: ed14863dd72e35fa3a23320c3d5a8166515faea39a555c28a27b2d35e701eac4
---
 manifest           | 16 ++++++++--------
 manifest.uuid      |  2 +-
 src/select.c       | 33 +++++++++++++++++++++++++++------
 test/collate5.test | 36 ++++++++++++++++++++++++++++++++++++
 4 files changed, 72 insertions(+), 15 deletions(-)

diff --git a/manifest b/manifest
index 7c2b8ac79b..df43c1449f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\smissing\sinitializer\sfrom\sthe\sextension\sloader.\s\sFix\sfor\s\ncheck-in\s[d6d449978245b4fa].
-D 2022-10-14T19:21:12.300
+C Fix\sa\sproblem\swith\susing\sthe\spush-down\soptimization\son\scompound\sSELECTs\swhere\scomponent\sSELECTs\suse\sdifferent\scollation\ssequences.\sdbsqlfuzz\s11516f050100243e5a845f5a2b48a90ed2efaf2e.
+D 2022-10-14T19:30:34.777
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -617,7 +617,7 @@ F src/printf.c e99ee9741e79ae3873458146f59644276657340385ade4e76a5f5d1c25793764
 F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c bb18acf4eded647fef88d4d543c673874dbebff516fbeba90a85e6c13f2a58cd
+F src/select.c b795f31a326564ffc448bb26f863c64f0796b2a5e0585a3358aff7877b72ed82
 F src/shell.c.in 2915eaf22bda89ad6533851a051de4773c249185360fe1fc7b4477b8f9063b2c
 F src/sqlite.h.in d9c8a6243fc0a1c270d69db33758e34b810af3462f9bc5b4af113b347e07c69d
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -848,7 +848,7 @@ F test/collate1.test 71a6f27fdc93a92f14d8ab80c05e1937656a5a03197e1a10157314554d6
 F test/collate2.test 471c6f74573382b89b0f8b88a05256faa52f7964f9e4799e76708a3b1ece6ba4
 F test/collate3.test 89defc49983ddfbf0a0555aca8c0521a676f56a5
 F test/collate4.test c953715fb498b87163e3e73dd94356bff1f317bd
-F test/collate5.test 65d928034d30d2d263a80f6359f7549ee1598ec6
+F test/collate5.test b1dfeff239ea69ee9225832553f423d37a6184eb730cee06f6846ab4e3c6dbef
 F test/collate6.test 8be65a182abaac8011a622131486dafb8076e907
 F test/collate7.test 8ec29d98f3ee4ccebce6e16ce3863fb6b8c7b868
 F test/collate8.test cd9b3d3f999b8520ffaa7cc1647061fc5bab1334
@@ -2031,8 +2031,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 a4423ca234453c14eb40db7fe5943f63b30fd9dc2207388e8a2966733a004e9d
-R 657c639cfdb29ba1717741ed5fd9ad00
-U drh
-Z ac4a2afa493b2e100552976a88fb6b99
+P 565d74c36f2dd4612860c7ee561682c50db28cfa5384346528292019dbfdf86c
+R 75e7f9b91b017a681d1ae11ac5186379
+U dan
+Z 42c84fae9e00b1c8a3d198c324edcd95
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 0fb2923565..65ef760f0e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-565d74c36f2dd4612860c7ee561682c50db28cfa5384346528292019dbfdf86c
\ No newline at end of file
+ed14863dd72e35fa3a23320c3d5a8166515faea39a555c28a27b2d35e701eac4
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index 2876f48ab8..e4424024c8 100644
--- a/src/select.c
+++ b/src/select.c
@@ -3750,6 +3750,7 @@ typedef struct SubstContext {
   int iNewTable;            /* New table number */
   int isOuterJoin;          /* Add TK_IF_NULL_ROW opcodes on each replacement */
   ExprList *pEList;         /* Replacement expressions */
+  ExprList *pCList;         /* Collation sequences for replacement expr */
 } SubstContext;
 
 /* Forward Declarations */
@@ -3791,9 +3792,10 @@ static Expr *substExpr(
 #endif
     {
       Expr *pNew;
-      Expr *pCopy = pSubst->pEList->a[pExpr->iColumn].pExpr;
+      int iColumn = pExpr->iColumn;
+      Expr *pCopy = pSubst->pEList->a[iColumn].pExpr;
       Expr ifNullRow;
-      assert( pSubst->pEList!=0 && pExpr->iColumn<pSubst->pEList->nExpr );
+      assert( pSubst->pEList!=0 && iColumn<pSubst->pEList->nExpr );
       assert( pExpr->pRight==0 );
       if( sqlite3ExprIsVector(pCopy) ){
         sqlite3VectorErrorMsg(pSubst->pParse, pCopy);
@@ -3831,11 +3833,16 @@ static Expr *substExpr(
 
         /* Ensure that the expression now has an implicit collation sequence,
         ** just as it did when it was a column of a view or sub-query. */
-        if( pExpr->op!=TK_COLUMN && pExpr->op!=TK_COLLATE ){
-          CollSeq *pColl = sqlite3ExprCollSeq(pSubst->pParse, pExpr);
-          pExpr = sqlite3ExprAddCollateString(pSubst->pParse, pExpr, 
-              (pColl ? pColl->zName : "BINARY")
+        {
+          CollSeq *pNat = sqlite3ExprCollSeq(pSubst->pParse, pExpr);
+          CollSeq *pColl = sqlite3ExprCollSeq(pSubst->pParse,
+                pSubst->pCList->a[iColumn].pExpr
           );
+          if( pNat!=pColl || (pExpr->op!=TK_COLUMN && pExpr->op!=TK_COLLATE) ){
+            pExpr = sqlite3ExprAddCollateString(pSubst->pParse, pExpr,
+                (pColl ? pColl->zName : "BINARY")
+            );
+          }
         }
         ExprClearProperty(pExpr, EP_Collate);
       }
@@ -4028,6 +4035,18 @@ static void renumberCursors(
 }
 #endif /* !defined(SQLITE_OMIT_SUBQUERY) || !defined(SQLITE_OMIT_VIEW) */
 
+/*
+** If pSel is not part of a compound SELECT, return a pointer to its
+** expression list. Otherwise, return a pointer to the expression list
+** of the leftmost SELECT in the compound.
+*/
+static ExprList *findLeftmostExprlist(Select *pSel){
+  while( pSel->pPrior ){
+    pSel = pSel->pPrior;
+  }
+  return pSel->pEList;
+}
+
 #if !defined(SQLITE_OMIT_SUBQUERY) || !defined(SQLITE_OMIT_VIEW)
 /*
 ** This routine attempts to flatten subqueries as a performance optimization.
@@ -4580,6 +4599,7 @@ static int flattenSubquery(
       x.iNewTable = iNewParent;
       x.isOuterJoin = isOuterJoin;
       x.pEList = pSub->pEList;
+      x.pCList = findLeftmostExprlist(pSub);
       substSelect(&x, pParent, 0);
     }
   
@@ -5062,6 +5082,7 @@ static int pushDownWhereTerms(
       x.iNewTable = pSrc->iCursor;
       x.isOuterJoin = 0;
       x.pEList = pSubq->pEList;
+      x.pCList = findLeftmostExprlist(pSubq);
       pNew = substExpr(&x, pNew);
 #ifndef SQLITE_OMIT_WINDOWFUNC
       if( pSubq->pWin && 0==pushDownWindowCheck(pParse, pSubq, pNew) ){
diff --git a/test/collate5.test b/test/collate5.test
index 5f8697ea51..71d4efe255 100644
--- a/test/collate5.test
+++ b/test/collate5.test
@@ -19,6 +19,8 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+set testprefix collate5
+
 
 #
 # Tests are organised as follows:
@@ -26,6 +28,7 @@ source $testdir/tester.tcl
 # collate5-2.* - Compound SELECT
 # collate5-3.* - ORDER BY on compound SELECT
 # collate5-4.* - GROUP BY
+# collate5-5.* - Collation sequence cases
 
 # Create the collation sequence 'TEXT', purely for asthetic reasons. The
 # test cases in this script could just as easily use BINARY.
@@ -289,4 +292,37 @@ do_test collate5-4.3 {
   }
 } {}
 
+#-------------------------------------------------------------------------
+reset_db
+
+do_execsql_test 5.0 {
+  CREATE TABLE t1(a, b COLLATE nocase);
+  CREATE TABLE t2(c, d);
+  INSERT INTO t2 VALUES(1, 'bbb');
+}
+do_execsql_test 5.1 {
+  SELECT * FROM (
+      SELECT a, b FROM t1 UNION ALL SELECT c, d FROM t2
+  ) WHERE b='BbB';
+} {1 bbb}
+
+reset_db
+do_execsql_test 5.2 {
+  CREATE TABLE t1(a,b,c COLLATE NOCASE);
+  INSERT INTO t1 VALUES(NULL,'C','c');
+  CREATE VIEW v2 AS
+    SELECT a,b,c FROM t1 INTERSECT SELECT a,b,b FROM t1
+    WHERE 'eT"3qRkL+oJMJjQ9z0'>=b
+    ORDER BY a,b,c;
+}
+
+do_execsql_test 5.3 {
+  SELECT * FROM v2;
+} { {} C c }
+
+do_execsql_test 5.4 {
+  SELECT * FROM v2 WHERE c='c';
+} { {} C c }
+
+
 finish_test

From 7a98937db2414e60a75991e637c0da6b87dd6336 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sat, 15 Oct 2022 11:27:01 +0000
Subject: [PATCH 282/428] Only extract an expression from an index when the
 index is not a null row in an outer join.

FossilOrigin-Name: 08b033c737d1a84859291f50e2985c9dad8d660a50185d55d3171165a8e08d4c
---
 manifest        | 16 ++++++++--------
 manifest.uuid   |  2 +-
 src/expr.c      | 22 +++++++++++++++++++++-
 src/sqliteInt.h |  1 +
 src/where.c     | 16 ++++++++--------
 5 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/manifest b/manifest
index e6e98f6967..697406e18c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sfixes\sfrom\strunk.
-D 2022-10-14T19:56:58.085
+C Only\sextract\san\sexpression\sfrom\san\sindex\swhen\sthe\sindex\sis\snot\sa\snull\srow\nin\san\souter\sjoin.
+D 2022-10-15T11:27:01.598
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -567,7 +567,7 @@ F src/date.c 94ce83b4cd848a387680a5f920c9018c16655db778c4d36525af0a0f34679ac5
 F src/dbpage.c 5808e91bc27fa3981b028000f8fadfdc10ce9e59a34ce7dc4e035a69be3906ec
 F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
 F src/delete.c 86573edae75e3d3e9a8b590d87db8e47222103029df4f3e11fa56044459b514e
-F src/expr.c b60036e4bb9080c741a970df3b3cfffc6292aadec3670b7b04bfae6f662ff245
+F src/expr.c 8e260b0082700cb009238eb41cb28a8fce0290356b9fd25a72017c7fb48cb463
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 722f20779f5342a787922deded3628d8c74b5249cab04098cf17ee2f2aaff002
 F src/func.c fe2a795ad647ce42054873ac91c43beb7b5d204892903a67f6e7e314379b9d4a
@@ -622,7 +622,7 @@ F src/shell.c.in 2915eaf22bda89ad6533851a051de4773c249185360fe1fc7b4477b8f9063b2
 F src/sqlite.h.in d9c8a6243fc0a1c270d69db33758e34b810af3462f9bc5b4af113b347e07c69d
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 5336beea1868d99d2f62e628dbea55e97267dbff8193291ab175e960c5df9141
-F src/sqliteInt.h a856afa8ff20886d1b0c668b9e3c62daf7875989a1db79e60f121778d48015e1
+F src/sqliteInt.h 30e6fdc957f09dbdbe1bcf73874263427bbd9a321cd2a583de74bdb030c9fa78
 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -704,7 +704,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d
 F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
-F src/where.c 39889861616d7751efacb9e5aa84ec5635dbf12a137725f57aa25fc6b622e15c
+F src/where.c 8517a0ee4a3169368176fda649e2693ee013d7bdca72d485050e91cd640735f7
 F src/whereInt.h 70cd30de9ed784aa33fa6bd1245f060617de7a00d992469b6d8e419eed915743
 F src/wherecode.c bb88be457df3a6a01c844074ab79a9ba74279e73185f1362383aa697e3cae5dc
 F src/whereexpr.c bf8c155212c886621d71c951053660de6fcc4ee907b17aa02da0a96a39aa9405
@@ -2031,8 +2031,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 0963519371bb7ac02adb323430855760fb9b82a23745e47c504aaf393d22ac34 ed14863dd72e35fa3a23320c3d5a8166515faea39a555c28a27b2d35e701eac4
-R a9b714ce8ec9ca5df691ed405bb47472
+P 1cb65f36c3539302767f551ed53082f054666a7cb2696cef0990ab6747edbc52
+R b4967a409c773c44f7c239bcdd51f4f2
 U drh
-Z 5b8c2826f1d75c8b25b3831a35d10fbe
+Z 10f741f9b8a389bcee87379894e97dc0
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 2169956f70..8ced3b3665 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1cb65f36c3539302767f551ed53082f054666a7cb2696cef0990ab6747edbc52
\ No newline at end of file
+08b033c737d1a84859291f50e2985c9dad8d660a50185d55d3171165a8e08d4c
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index 3630b47aa8..0ff364ddca 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -4055,9 +4055,29 @@ static SQLITE_NOINLINE int sqlite3ExprIndexLookup(
   int target       /* Where to store the result of the expression */
 ){
   IndexExpr *p;
+  Vdbe *v;
   for(p=pParse->pIdxExpr; p; p=p->pIENext){
+    if( p->iDataCur<0 ) continue;
     if( sqlite3ExprCompare(0, pExpr, p->pExpr, p->iDataCur)!=0 ) continue;
-    sqlite3VdbeAddOp3(pParse->pVdbe, OP_Column, p->iIdxCur, p->iIdxCol, target);
+    v = pParse->pVdbe;
+    assert( v!=0 );
+    if( p->bMaybeNullRow ){
+      /* If the index is on a NULL row due to an outer join, then we
+      ** cannot extract the value from the index.  The value must be
+      ** computed using the original expression. */
+      int addr = sqlite3VdbeCurrentAddr(v);
+      sqlite3VdbeAddOp3(v, OP_IfNullRow, p->iIdxCur, addr+3, target);
+      VdbeCoverage(v);
+      sqlite3VdbeAddOp3(v, OP_Column, p->iIdxCur, p->iIdxCol, target);
+      sqlite3VdbeGoto(v, 0);
+      p = pParse->pIdxExpr;
+      pParse->pIdxExpr = 0;
+      sqlite3ExprCode(pParse, pExpr, target);
+      pParse->pIdxExpr = p;
+      sqlite3VdbeJumpHere(v, addr+2);
+    }else{
+      sqlite3VdbeAddOp3(v, OP_Column, p->iIdxCur, p->iIdxCol, target);
+    }
     return target;
   }
   return -1;  /* Not found */
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index caf7610adb..fffe981488 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -3579,6 +3579,7 @@ struct IndexExpr {
   int iDataCur;           /* The data cursor associated with the index */
   int iIdxCur;            /* The index cursor */
   int iIdxCol;            /* The column of the index that contains pExpr */
+  u8 bMaybeNullRow;       /* True if we need an OP_IfNullRow check */
   IndexExpr *pIENext;     /* Next in a list of all indexed expressions */
 };
 
diff --git a/src/where.c b/src/where.c
index 0bba48883e..d43c2b2050 100644
--- a/src/where.c
+++ b/src/where.c
@@ -5409,22 +5409,23 @@ static void whereIndexExprCleanup(sqlite3 *db, void *pObject){
 ** references to the corresponding column of the index.
 */
 static SQLITE_NOINLINE void whereAddIndexExpr(
-  Parse *pParse,    /* Add IndexExpr entries to pParse->pIdxExpr */
-  Index *pIdx,      /* The index-on-expression that contains the expressions */
-  int iIdxCur,      /* Cursor number for pIdx */
-  int iDataCur      /* Cursor for the corresponding table */
+  Parse *pParse,     /* Add IndexExpr entries to pParse->pIdxExpr */
+  Index *pIdx,       /* The index-on-expression that contains the expressions */
+  int iIdxCur,       /* Cursor number for pIdx */
+  SrcItem *pTabItem  /* The FROM clause entry for the table */
 ){
   int i;
   IndexExpr *p;
   for(i=0; i<pIdx->nColumn; i++){
     if( pIdx->aiColumn[i]!=XN_EXPR ) continue;
-    p = sqlite3DbMallocRaw(pParse->db, sizeof(IndexExpr));
+    p = sqlite3DbMallocRaw(pParse->db,  sizeof(IndexExpr));
     if( p==0 ) break;
     p->pIENext = pParse->pIdxExpr;
     p->pExpr = sqlite3ExprDup(pParse->db, pIdx->aColExpr->a[i].pExpr, 0);
-    p->iDataCur = iDataCur;
+    p->iDataCur = pTabItem->iCursor;
     p->iIdxCur = iIdxCur;
     p->iIdxCol = i;
+    p->bMaybeNullRow = (pTabItem->fg.jointype & (JT_LEFT|JT_LTORJ))!=0;
     pParse->pIdxExpr = p;
     if( p->pIENext==0 ){
       sqlite3ParserAddCleanup(pParse, whereIndexExprCleanup, pParse);
@@ -5978,7 +5979,7 @@ WhereInfo *sqlite3WhereBegin(
       }else{
         iIndexCur = pParse->nTab++;
         if( pIx->bHasExpr ){
-          whereAddIndexExpr(pParse, pIx, iIndexCur, pTabItem->iCursor);
+          whereAddIndexExpr(pParse, pIx, iIndexCur, pTabItem);
         }
       }
       pLevel->iIdxCur = iIndexCur;
@@ -6382,7 +6383,6 @@ void sqlite3WhereEnd(WhereInfo *pWInfo){
           if( p->iIdxCur==pLevel->iIdxCur ){
             p->iDataCur = -1;
             p->iIdxCur = -1;
-            p->pExpr->op = TK_ILLEGAL;
           }
           p = p->pIENext;
         }

From f3adb7c43092d6af97a71e32e3cb4f714afe63ea Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sat, 15 Oct 2022 12:01:40 +0000
Subject: [PATCH 283/428] Enable the index-on-expression optimization even when
 the expression is used as an argument to an aggregate function.

FossilOrigin-Name: 462b3c7f39724dc814f55e7a225e7d0c48f81c524cdda797a66e9e198c35ce58
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/expr.c    |  8 +++++++-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/manifest b/manifest
index 697406e18c..af4a5b033e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Only\sextract\san\sexpression\sfrom\san\sindex\swhen\sthe\sindex\sis\snot\sa\snull\srow\nin\san\souter\sjoin.
-D 2022-10-15T11:27:01.598
+C Enable\sthe\sindex-on-expression\soptimization\seven\swhen\sthe\sexpression\sis\nused\sas\san\sargument\sto\san\saggregate\sfunction.
+D 2022-10-15T12:01:40.334
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -567,7 +567,7 @@ F src/date.c 94ce83b4cd848a387680a5f920c9018c16655db778c4d36525af0a0f34679ac5
 F src/dbpage.c 5808e91bc27fa3981b028000f8fadfdc10ce9e59a34ce7dc4e035a69be3906ec
 F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
 F src/delete.c 86573edae75e3d3e9a8b590d87db8e47222103029df4f3e11fa56044459b514e
-F src/expr.c 8e260b0082700cb009238eb41cb28a8fce0290356b9fd25a72017c7fb48cb463
+F src/expr.c 4a13a0e5c30be801b0adc295ef74e0f1aa8c041aefdcb5d0d424337ecefa2806
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 722f20779f5342a787922deded3628d8c74b5249cab04098cf17ee2f2aaff002
 F src/func.c fe2a795ad647ce42054873ac91c43beb7b5d204892903a67f6e7e314379b9d4a
@@ -2031,8 +2031,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 1cb65f36c3539302767f551ed53082f054666a7cb2696cef0990ab6747edbc52
-R b4967a409c773c44f7c239bcdd51f4f2
+P 08b033c737d1a84859291f50e2985c9dad8d660a50185d55d3171165a8e08d4c
+R a01b27e71bf0d1c060a37cd77d73f0f5
 U drh
-Z 10f741f9b8a389bcee87379894e97dc0
+Z 807c2ee5a3bf759378437d2cb1bbfe03
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 8ced3b3665..ce95dd861c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-08b033c737d1a84859291f50e2985c9dad8d660a50185d55d3171165a8e08d4c
\ No newline at end of file
+462b3c7f39724dc814f55e7a225e7d0c48f81c524cdda797a66e9e198c35ce58
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index 0ff364ddca..4bff004119 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -5618,7 +5618,13 @@ int sqlite3ExprCompare(
     if( pB->op==TK_COLLATE && sqlite3ExprCompare(pParse, pA,pB->pLeft,iTab)<2 ){
       return 1;
     }
-    return 2;
+    if( pA->op==TK_AGG_COLUMN && pB->op==TK_COLUMN 
+     && pB->iTable<0 && pA->iTable==iTab
+    ){
+      /* fall through */
+    }else{
+      return 2;
+    }
   }
   assert( !ExprHasProperty(pA, EP_IntValue) );
   assert( !ExprHasProperty(pB, EP_IntValue) );

From f0799fdf6d5516c69753260a3ba3a662266b5c67 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Sat, 15 Oct 2022 18:26:30 +0000
Subject: [PATCH 284/428] Add missing comments and fix other code issues.

FossilOrigin-Name: 8ed4e4a80d8104d20b211a0b3e299abdb955cabdd36979bf6aae54266dc9778d
---
 ext/recover/sqlite3recover.c | 162 +++++++++++++++++++++++++++++++++--
 manifest                     |  18 ++--
 manifest.uuid                |   2 +-
 3 files changed, 164 insertions(+), 18 deletions(-)

diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index 70f3386924..74b7f8a369 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -141,6 +141,11 @@ struct RecoverBitmap {
   u32 aElem[1];                   /* Array of 32-bit bitmasks */
 };
 
+/*
+** State variables (part of the sqlite3_recover structure) used while
+** recovering data for tables identified in the recovered schema (state
+** RECOVER_STATE_WRITING).
+*/
 typedef struct RecoverStateW1 RecoverStateW1;
 struct RecoverStateW1 {
   sqlite3_stmt *pTbls;
@@ -158,6 +163,11 @@ struct RecoverStateW1 {
   int iPrevCell;
 };
 
+/*
+** State variables (part of the sqlite3_recover structure) used while
+** recovering data destined for the lost and found table (states
+** RECOVER_STATE_LOSTANDFOUND[123]).
+*/
 typedef struct RecoverStateLAF RecoverStateLAF;
 struct RecoverStateLAF {
   RecoverBitmap *pUsed;
@@ -208,7 +218,7 @@ struct sqlite3_recover {
   /* Variables used with eState==RECOVER_STATE_WRITING */
   RecoverStateW1 w1;
 
-  /* Variables used with states RECOVER_STATE_LOSTANDFOUND* */
+  /* Variables used with states RECOVER_STATE_LOSTANDFOUND[123] */
   RecoverStateLAF laf;
 
   /* Fields used within sqlite3_recover_run() */
@@ -265,7 +275,6 @@ static RecoverGlobal recover_g;
 #define RECOVER_MUTEX_ID SQLITE_MUTEX_STATIC_APP2
 
 
-
 /* 
 ** Default value for SQLITE_RECOVER_ROWIDS (sqlite3_recover.bRecoverRowid).
 */
@@ -965,6 +974,11 @@ static int recoverOpenOutput(sqlite3_recover *p){
   return p->errCode;
 }
 
+/*
+** Attach the auxiliary database 'recovery' to the output database handle.
+** This temporary database is used during the recovery process and then 
+** discarded.
+*/
 static void recoverOpenRecovery(sqlite3_recover *p){
   char *zSql = recoverMPrintf(p, "ATTACH %Q AS recovery;", p->zStateDb);
   recoverExec(p, p->dbOut, zSql);
@@ -1424,6 +1438,15 @@ static sqlite3_stmt *recoverLostAndFoundInsert(
   return pRet;
 }
 
+/*
+** Input database page iPg contains data that will be written to the
+** lost-and-found table of the output database. This function attempts
+** to identify the root page of the tree that page iPg belonged to.
+** If successful, it sets output variable (*piRoot) to the page number
+** of the root page and returns SQLITE_OK. Otherwise, if an error occurs,
+** an SQLite error code is returned and the final value of *piRoot 
+** undefined.
+*/
 static int recoverLostAndFoundFindRoot(
   sqlite3_recover *p, 
   i64 iPg,
@@ -1454,6 +1477,10 @@ static int recoverLostAndFoundFindRoot(
   return p->errCode;
 }
 
+/*
+** Recover data from page iPage of the input database and write it to
+** the lost-and-found table in the output database.
+*/
 static void recoverLostAndFoundOnePage(sqlite3_recover *p, i64 iPage){
   RecoverStateLAF *pLaf = &p->laf;
   sqlite3_value **apVal = pLaf->apVal;
@@ -1526,6 +1553,13 @@ static void recoverLostAndFoundOnePage(sqlite3_recover *p, i64 iPage){
   }
 }
 
+/*
+** Perform one step (sqlite3_recover_step()) of work for the connection 
+** passed as the only argument, which is guaranteed to be in
+** RECOVER_STATE_LOSTANDFOUND3 state - during which the lost-and-found 
+** table of the output database is populated with recovered data that can 
+** not be assigned to any recovered schema object.
+*/ 
 static int recoverLostAndFound3Step(sqlite3_recover *p){
   RecoverStateLAF *pLaf = &p->laf;
   if( p->errCode==SQLITE_OK ){
@@ -1549,6 +1583,12 @@ static int recoverLostAndFound3Step(sqlite3_recover *p){
   return SQLITE_OK;
 }
 
+/*
+** Initialize resources required in RECOVER_STATE_LOSTANDFOUND3 
+** state - during which the lost-and-found table of the output database 
+** is populated with recovered data that can not be assigned to any 
+** recovered schema object.
+*/ 
 static void recoverLostAndFound3Init(sqlite3_recover *p){
   RecoverStateLAF *pLaf = &p->laf;
 
@@ -1578,6 +1618,11 @@ static void recoverLostAndFound3Init(sqlite3_recover *p){
   }
 }
 
+/*
+** Initialize resources required in RECOVER_STATE_WRITING state - during which
+** tables recovered from the schema of the input database are populated with
+** recovered data.
+*/ 
 static int recoverWriteDataInit(sqlite3_recover *p){
   RecoverStateW1 *p1 = &p->w1;
   RecoverTable *pTbl = 0;
@@ -1635,6 +1680,12 @@ static void recoverWriteDataCleanup(sqlite3_recover *p){
   memset(p1, 0, sizeof(*p1));
 }
 
+/*
+** Perform one step (sqlite3_recover_step()) of work for the connection 
+** passed as the only argument, which is guaranteed to be in
+** RECOVER_STATE_WRITING state - during which tables recovered from the
+** schema of the input database are populated with recovered data.
+*/ 
 static int recoverWriteDataStep(sqlite3_recover *p){
   RecoverStateW1 *p1 = &p->w1;
   sqlite3_stmt *pSel = p1->pSel;
@@ -1756,6 +1807,11 @@ static int recoverWriteDataStep(sqlite3_recover *p){
   return p->errCode;
 }
 
+/*
+** Initialize resources required by sqlite3_recover_step() in
+** RECOVER_STATE_LOSTANDFOUND1 state - during which the set of pages not
+** already allocated to a recovered schema element is determined.
+*/ 
 static void recoverLostAndFound1Init(sqlite3_recover *p){
   RecoverStateLAF *pLaf = &p->laf;
   sqlite3_stmt *pStmt = 0;
@@ -1802,6 +1858,12 @@ static void recoverLostAndFound1Init(sqlite3_recover *p){
   pLaf->pUsedPages = pStmt;
 }
 
+/*
+** Perform one step (sqlite3_recover_step()) of work for the connection 
+** passed as the only argument, which is guaranteed to be in
+** RECOVER_STATE_LOSTANDFOUND1 state - during which the set of pages not
+** already allocated to a recovered schema element is determined.
+*/ 
 static int recoverLostAndFound1Step(sqlite3_recover *p){
   RecoverStateLAF *pLaf = &p->laf;
   int rc = p->errCode;
@@ -1819,6 +1881,11 @@ static int recoverLostAndFound1Step(sqlite3_recover *p){
   return rc;
 }
 
+/*
+** Initialize resources required by RECOVER_STATE_LOSTANDFOUND2 
+** state - during which the pages identified in RECOVER_STATE_LOSTANDFOUND1
+** are sorted into sets that likely belonged to the same database tree.
+*/ 
 static void recoverLostAndFound2Init(sqlite3_recover *p){
   RecoverStateLAF *pLaf = &p->laf;
 
@@ -1843,6 +1910,13 @@ static void recoverLostAndFound2Init(sqlite3_recover *p){
   );
 }
 
+/*
+** Perform one step (sqlite3_recover_step()) of work for the connection 
+** passed as the only argument, which is guaranteed to be in
+** RECOVER_STATE_LOSTANDFOUND2 state - during which the pages identified 
+** in RECOVER_STATE_LOSTANDFOUND1 are sorted into sets that likely belonged 
+** to the same database tree.
+*/ 
 static int recoverLostAndFound2Step(sqlite3_recover *p){
   RecoverStateLAF *pLaf = &p->laf;
   if( p->errCode==SQLITE_OK ){
@@ -1872,6 +1946,10 @@ static int recoverLostAndFound2Step(sqlite3_recover *p){
   return p->errCode;
 }
 
+/*
+** Free all resources allocated as part of sqlite3_recover_step() calls
+** in one of the RECOVER_STATE_LOSTANDFOUND[123] states.
+*/
 static void recoverLostAndFoundCleanup(sqlite3_recover *p){
   recoverBitmapFree(p->laf.pUsed);
   p->laf.pUsed = 0;
@@ -1895,6 +1973,9 @@ static void recoverLostAndFoundCleanup(sqlite3_recover *p){
   p->laf.apVal = 0;
 }
 
+/*
+** Free all resources allocated as part of sqlite3_recover_step() calls.
+*/
 static void recoverFinalCleanup(sqlite3_recover *p){
   RecoverTable *pTab = 0;
   RecoverTable *pNext = 0;
@@ -1917,12 +1998,26 @@ static void recoverFinalCleanup(sqlite3_recover *p){
   p->dbOut = 0;
 }
 
+/*
+** Decode and return an unsigned 16-bit big-endian integer value from 
+** buffer a[].
+*/
 static u32 recoverGetU16(const u8 *a){
   return (((u32)a[0])<<8) + ((u32)a[1]);
 }
+
+/*
+** Decode and return an unsigned 32-bit big-endian integer value from 
+** buffer a[].
+*/
 static u32 recoverGetU32(const u8 *a){
   return (((u32)a[0])<<24) + (((u32)a[1])<<16) + (((u32)a[2])<<8) + ((u32)a[3]);
 }
+
+/*
+** Decode an SQLite varint from buffer a[]. Write the decoded value to (*pVal)
+** and return the number of bytes consumed.
+*/
 static int recoverGetVarint(const u8 *a, i64 *pVal){
   sqlite3_int64 v = 0;
   int i;
@@ -2077,10 +2172,17 @@ static int recoverVfsClose(sqlite3_file *pFd){
   return pFd->pMethods->xClose(pFd);
 }
 
+/*
+** Write value v to buffer a[] as a 16-bit big-endian unsigned integer.
+*/
 static void recoverPutU16(u8 *a, u32 v){
   a[0] = (v>>8) & 0x00FF;
   a[1] = (v>>0) & 0x00FF;
 }
+
+/*
+** Write value v to buffer a[] as a 32-bit big-endian unsigned integer.
+*/
 static void recoverPutU32(u8 *a, u32 v){
   a[0] = (v>>24) & 0x00FF;
   a[1] = (v>>16) & 0x00FF;
@@ -2088,11 +2190,25 @@ static void recoverPutU32(u8 *a, u32 v){
   a[3] = (v>>0) & 0x00FF;
 }
 
+/*
+** Detect the page-size of the database opened by file-handle pFd by 
+** searching the first part of the file for a well-formed SQLite b-tree 
+** page. If parameter nReserve is non-zero, then as well as searching for
+** a b-tree page with zero reserved bytes, this function searches for one
+** with nReserve reserved bytes at the end of it.
+**
+** If successful, set variable p->detected_pgsz to the detected page-size
+** in bytes and return SQLITE_OK. Or, if no error occurs but no valid page
+** can be found, return SQLITE_OK but leave p->detected_pgsz set to 0. Or,
+** if an error occurs (e.g. an IO or OOM error), then an SQLite error code
+** is returned. The final value of p->detected_pgsz is undefined in this
+** case.
+*/
 static int recoverVfsDetectPagesize(
-  sqlite3_recover *p,
-  sqlite3_file *pFd, 
+  sqlite3_recover *p,             /* Recover handle */
+  sqlite3_file *pFd,              /* File-handle open on input database */
   u32 nReserve,                   /* Possible nReserve value */
-  i64 nSz
+  i64 nSz                         /* Size of database file in bytes */
 ){
   int rc = SQLITE_OK;
   const int nMin = 512;
@@ -2142,6 +2258,10 @@ static int recoverVfsDetectPagesize(
   return rc;
 }
 
+/*
+** The xRead() method of the wrapper VFS. This is used to intercept calls
+** to read page 1 of the input database.
+*/
 static int recoverVfsRead(sqlite3_file *pFd, void *aBuf, int nByte, i64 iOff){
   int rc = SQLITE_OK;
   if( pFd->pMethods==&recover_methods ){
@@ -2252,6 +2372,9 @@ static int recoverVfsRead(sqlite3_file *pFd, void *aBuf, int nByte, i64 iOff){
   return rc;
 }
 
+/*
+** Used to make sqlite3_io_methods wrapper methods less verbose.
+*/
 #define RECOVER_VFS_WRAPPER(code)                         \
   int rc = SQLITE_OK;                                     \
   if( pFd->pMethods==&recover_methods ){                  \
@@ -2263,6 +2386,12 @@ static int recoverVfsRead(sqlite3_file *pFd, void *aBuf, int nByte, i64 iOff){
   }                                                       \
   return rc;                                              
 
+/*
+** Methods of the wrapper VFS. All methods except for xRead() and xClose()
+** simply uninstall the sqlite3_io_methods wrapper, invoke the equivalent
+** method on the lower level VFS, then reinstall the wrapper before returning.
+** Those that return an integer value use the RECOVER_VFS_WRAPPER macro.
+*/
 static int recoverVfsWrite(
   sqlite3_file *pFd, const void *aBuf, int nByte, i64 iOff
 ){
@@ -2275,7 +2404,6 @@ static int recoverVfsTruncate(sqlite3_file *pFd, sqlite3_int64 size){
       pFd->pMethods->xTruncate(pFd, size)
   );
 }
-
 static int recoverVfsSync(sqlite3_file *pFd, int flags){
   RECOVER_VFS_WRAPPER (
       pFd->pMethods->xSync(pFd, flags)
@@ -2343,9 +2471,15 @@ static int recoverVfsShmUnmap(sqlite3_file *pFd, int deleteFlag){
   );
 }
 
+/*
+** Install the VFS wrapper around the file-descriptor open on the input
+** database for recover handle p. Mutex RECOVER_MUTEX_ID must be held
+** when this function is called.
+*/
 static void recoverInstallWrapper(sqlite3_recover *p){
   sqlite3_file *pFd = 0;
   assert( recover_g.pMethods==0 );
+  assert( sqlite3_mutex_held( sqlite3_mutex_alloc(RECOVER_MUTEX_ID) ) );
   sqlite3_file_control(p->dbIn, p->zDb, SQLITE_FCNTL_FILE_POINTER, (void*)&pFd);
   if( pFd ){
     recover_g.pMethods = pFd->pMethods;
@@ -2353,7 +2487,14 @@ static void recoverInstallWrapper(sqlite3_recover *p){
     pFd->pMethods = &recover_methods;
   }
 }
+
+/*
+** Uninstall the VFS wrapper that was installed around the file-descriptor open
+** on the input database for recover handle p. Mutex RECOVER_MUTEX_ID must be
+** held when this function is called.
+*/
 static void recoverUninstallWrapper(sqlite3_recover *p){
+  assert( sqlite3_mutex_held( sqlite3_mutex_alloc(RECOVER_MUTEX_ID) ) );
   if( recover_g.pMethods ){
     sqlite3_file *pFd = 0;
     sqlite3_file_control(p->dbIn, p->zDb,SQLITE_FCNTL_FILE_POINTER,(void*)&pFd);
@@ -2364,6 +2505,11 @@ static void recoverUninstallWrapper(sqlite3_recover *p){
   }
 }
 
+/*
+** This function does the work of a single sqlite3_recover_step() call. It
+** is guaranteed that the handle is not in an error state when this
+** function is called.
+*/
 static void recoverStep(sqlite3_recover *p){
   assert( p && p->errCode==SQLITE_OK );
   switch( p->eState ){
@@ -2373,7 +2519,7 @@ static void recoverStep(sqlite3_recover *p){
       recoverSqlCallback(p, "BEGIN");
       recoverSqlCallback(p, "PRAGMA writable_schema = on");
 
-      sqlite3_mutex_enter( sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_APP2) );
+      sqlite3_mutex_enter( sqlite3_mutex_alloc(RECOVER_MUTEX_ID) );
       recoverInstallWrapper(p);
 
       /* Open the output database. And register required virtual tables and 
@@ -2390,7 +2536,7 @@ static void recoverStep(sqlite3_recover *p){
       recoverCacheSchema(p);
 
       recoverUninstallWrapper(p);
-      sqlite3_mutex_leave( sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_APP2) );
+      sqlite3_mutex_leave( sqlite3_mutex_alloc(RECOVER_MUTEX_ID) );
 
       recoverExec(p, p->dbOut, "BEGIN");
 
diff --git a/manifest b/manifest
index 6ea8d64d5c..a8752032f6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\slatest\strunk\schanges.
-D 2022-10-15T15:39:46.578
+C Add\smissing\scomments\sand\sfix\sother\scode\sissues.
+D 2022-10-15T18:26:30.696
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -398,7 +398,7 @@ F ext/recover/recoverpgsz.test 93e970eab05e4e89f8fd6b1bd23f9ec137ea09857e66ba0d4
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
 F ext/recover/recoverslowidx.test f356bb9fba7ffd6fc50e045e419464f0129ac6e24decf6e919584f79c3493727
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
-F ext/recover/sqlite3recover.c 3ab2017a947fa8c9286aa6257d0b19443ec04e557af9d989227b89f36ff50dd6
+F ext/recover/sqlite3recover.c db8f2166dbbdfc09a58a85f51f8e848858858ca8b4915a2f9c8cd5fd5ca536a8
 F ext/recover/sqlite3recover.h f698ccc94bd4da38761035415ad08c4549a408491ff9fd5f52d34d2214f64e36
 F ext/recover/test_recover.c 61ec931e47abca6b2210f46239cafd9f3060741605e3d3c45a7c7a53f63dd957
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -486,7 +486,7 @@ F ext/session/test_session.c f433f68a8a8c64b0f5bc74dc725078f12483301ad4ae8375205
 F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
-F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c w ext/wasm/EXPORTED_FUNCTIONS.fiddle
+F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle 0e88c8cfc3719e4b7e74980d9da664c709e68acf863e48386cda376edfd3bfb0
 F ext/wasm/GNUmakefile 4ec270532b921c7c4b437fbdb06f6a0ce41f3bd874395ce70dbc933c8553efa9
 F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
@@ -503,7 +503,7 @@ F ext/wasm/api/sqlite3-api-glue.js 842dc03783aecc951a543a209523343a6fda9af258fb0
 F ext/wasm/api/sqlite3-api-oo1.js 00f5cfce0989d2e08d7b21765d703c69234245d03a0cce8fcb32ccfcd53ffdbb
 F ext/wasm/api/sqlite3-api-opfs.js 5a8ab3b76880c8ada8710ca9ba1ca5b160872edfd8bd5322e4f179a7f41cc616
 F ext/wasm/api/sqlite3-api-prologue.js b7c82a22d50658a48463fa646a23135273bc2cfa843aedda32627ff281c12e4d
-F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8 w ext/wasm/api/sqlite3-api-worker.js
+F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 4c131945ced4b08a694d287abcdb066b896d961ef79ee5241805ecc37e83d63a
 F ext/wasm/batch-runner.html cf1a410c92bad50fcec2ddc71390b4e9df63a6ea1bef12a5163a66a0af4d78d9
@@ -536,7 +536,7 @@ F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d826
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
 F ext/wasm/sqlite3-opfs-async-proxy.js 206ce6bbc3c30ad51a37d9c25e3a2712e70b586e0f9a2cf8cb0b9619017c2671
 F ext/wasm/sqlite3-worker1-promiser.js 307d7837420ca6a9d3780dfc81194f1c0715637e6d9540e935514086b96913d8
-F ext/wasm/sqlite3-worker1.js 466e9bd39409ab03f3e00999887aaffc11e95b416e2689596e3d7f1516673fdf w ext/wasm/api/sqlite3-worker.js
+F ext/wasm/sqlite3-worker1.js 466e9bd39409ab03f3e00999887aaffc11e95b416e2689596e3d7f1516673fdf
 F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
 F ext/wasm/test-opfs-vfs.js 56c3d725044c668fa7910451e96c1195d25ad95825f9ac79f747a7759d1973d0
 F ext/wasm/tester1-worker.html 0af7a22025ff1da72a84765d64f8f221844a57c6e6e314acf3a30f176101fd3f
@@ -2046,8 +2046,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 52d0235ef3f21683daadf2343514f7b95a67c3589266f75c1e00e04f11dc6214 ed14863dd72e35fa3a23320c3d5a8166515faea39a555c28a27b2d35e701eac4
-R 67f4b2d0a660b4df4f4f8911e9f69960
+P 42255ead8e44b24a8abc04aca49f170c55f3b52f42366a0d8ef248ee65fcc7ce
+R ba398a54428773327d217095fdca83a1
 U dan
-Z 2f155b3b54b3254ee16d85f44719ac5e
+Z 9c11c46950d6b0a76e0307ada9a3c264
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index c99ce61654..49018171fa 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-42255ead8e44b24a8abc04aca49f170c55f3b52f42366a0d8ef248ee65fcc7ce
\ No newline at end of file
+8ed4e4a80d8104d20b211a0b3e299abdb955cabdd36979bf6aae54266dc9778d
\ No newline at end of file

From 8e62d370cf57ce7b74d0a1999ae5ca1c6bf936ff Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Sat, 15 Oct 2022 19:18:10 +0000
Subject: [PATCH 285/428] Exclude slow test recovercorrupt.test from
 veryquick.test.

FossilOrigin-Name: ff9a733532fe11bb253246b45a94681a174c976aafee5c780af571893e8ce694
---
 manifest               | 12 ++++++------
 manifest.uuid          |  2 +-
 test/permutations.test |  1 +
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/manifest b/manifest
index a8752032f6..48bd10c08c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\smissing\scomments\sand\sfix\sother\scode\sissues.
-D 2022-10-15T18:26:30.696
+C Exclude\sslow\stest\srecovercorrupt.test\sfrom\sveryquick.test.
+D 2022-10-15T19:18:10.184
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1381,7 +1381,7 @@ F test/parser1.test 6ccdf5e459a5dc4673d3273dc311a7e9742ca952dd0551a6a6320d27035c
 F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
 F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
 F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
-F test/permutations.test 847df2d81f0172ab7032e55145f0f3da460dd65759ac2b02864e385add1947d5
+F test/permutations.test 650d89ab5aad0c9fab9325b11deca8662cb5e72f43e005073d35f12ad00eaca2
 F test/pg_common.tcl 3b27542224db1e713ae387459b5d117c836a5f6e328846922993b6d2b7640d9f
 F test/pragma.test cae534c12a033a5c319ccc94f50b32811acdef9f67bf19a82ff42697caccd69f
 F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
@@ -2046,8 +2046,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 42255ead8e44b24a8abc04aca49f170c55f3b52f42366a0d8ef248ee65fcc7ce
-R ba398a54428773327d217095fdca83a1
+P 8ed4e4a80d8104d20b211a0b3e299abdb955cabdd36979bf6aae54266dc9778d
+R 845d52da8da6984141e3c82e5a9ffafe
 U dan
-Z 9c11c46950d6b0a76e0307ada9a3c264
+Z c4bdc57e0746f05859841f5f12f56c5e
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 49018171fa..531c1cb665 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8ed4e4a80d8104d20b211a0b3e299abdb955cabdd36979bf6aae54266dc9778d
\ No newline at end of file
+ff9a733532fe11bb253246b45a94681a174c976aafee5c780af571893e8ce694
\ No newline at end of file
diff --git a/test/permutations.test b/test/permutations.test
index 8ab9dc8755..8a5484944a 100644
--- a/test/permutations.test
+++ b/test/permutations.test
@@ -130,6 +130,7 @@ set allquicktests [test_set $alltests -exclude {
   fts4merge5.test
   fts3cov.test fts3snippet.test fts3corrupt2.test fts3an.test
   fts3defer.test fts4langid.test fts3sort.test fts5unicode.test
+  recovercorrupt.test
 
   rtree4.test
   sessionbig.test

From 956392694abaaa832ec3186f7b6af5043f71e623 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sun, 16 Oct 2022 15:38:03 +0000
Subject: [PATCH 286/428] Add a top-level license and build-time version info
 header to generated sqlite3*.js. Correct a broken link in
 ext/wasm/index.html.

FossilOrigin-Name: 0f1a06e8e39a1fbc74f1aff9cc59787282dfbf847d6c5c7edb3f7d410db0e4b7
---
 ext/wasm/GNUmakefile                          | 24 ++++++++++++++---
 ext/wasm/api/extern-post-js.js                |  3 ++-
 ext/wasm/api/extern-pre-js.js                 |  3 +++
 ext/wasm/api/post-js-footer.js                |  3 ++-
 ext/wasm/api/pre-js.js                        |  7 +++++
 ext/wasm/api/sqlite3-api-cleanup.js           | 27 +++++++++----------
 .../api/sqlite3-license-version-header.js     | 25 +++++++++++++++++
 ext/wasm/index.html                           |  2 +-
 manifest                                      | 27 ++++++++++---------
 manifest.uuid                                 |  2 +-
 10 files changed, 88 insertions(+), 35 deletions(-)
 create mode 100644 ext/wasm/api/sqlite3-license-version-header.js

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index cf0e8b1081..c4c2886da3 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -49,6 +49,7 @@ dir.fiddle := fiddle
 CLEAN_FILES := *~ $(dir.jacc)/*~ $(dir.api)/*~ $(dir.common)/*~
 emcc_enable_bigint ?= 1
 sqlite3.c := $(dir.top)/sqlite3.c
+sqlite3.h := $(dir.top)/sqlite3.h
 SQLITE_OPT = \
   -DSQLITE_ENABLE_FTS4 \
   -DSQLITE_ENABLE_RTREE \
@@ -109,7 +110,7 @@ emcc_opt_full := $(emcc_opt) -g3
 ########################################################################
 
 
-$(sqlite3.c):
+$(sqlite3.c) $(sqlite3.h):
 	$(MAKE) -C $(dir.top) sqlite3.c
 
 clean:
@@ -130,7 +131,10 @@ EXPORTED_FUNCTIONS.api: $(EXPORTED_FUNCTIONS.api.in) $(MAKEFILE)
 	cat $(EXPORTED_FUNCTIONS.api.in) > $@
 CLEAN_FILES += EXPORTED_FUNCTIONS.api
 
-sqlite3-api.jses := $(dir.api)/sqlite3-api-prologue.js
+sqlite3-license-version.js := sqlite3-license-version.js
+sqlite3-license-version-header.js := $(dir.api)/sqlite3-license-version-header.js
+sqlite3-api.jses := $(sqlite3-license-version.js)
+sqlite3-api.jses += $(dir.api)/sqlite3-api-prologue.js
 sqlite3-api.jses += $(dir.common)/whwasmutil.js
 sqlite3-api.jses += $(dir.jacc)/jaccwabyt.js
 sqlite3-api.jses += $(dir.api)/sqlite3-api-glue.js
@@ -141,6 +145,7 @@ sqlite3-api.jses += $(dir.api)/sqlite3-api-cleanup.js
 
 sqlite3-api.js := sqlite3-api.js
 CLEAN_FILES += $(sqlite3-api.js)
+CLEAN_FILES += $(sqlite3-license-version.js)
 $(sqlite3-api.js): $(sqlite3-api.jses) $(MAKEFILE)
 	@echo "Making $@..."
 	@for i in $(sqlite3-api.jses); do \
@@ -171,9 +176,20 @@ extern-pre-js.js := $(dir.api)/extern-pre-js.js
 pre-post-common.flags := \
   --post-js=$(post-js.js) \
   --extern-post-js=$(extern-post-js.js) \
-  --extern-pre-js=$(extern-pre-js.js)
+  --extern-pre-js=$(dir.wasm)/$(sqlite3-license-version.js)
 pre-post-jses.deps := $(post-js.js) \
-  $(extern-post-js.js) $(extern-pre-js.js)
+  $(extern-post-js.js) $(extern-pre-js.js) $(sqlite3-license-version.js)
+$(sqlite3-license-version.js): $(sqlite3.h) $(sqlite3-license-version-header.js) $(MAKEFILE)
+	@echo "Making $@..."; { \
+    cat $(sqlite3-license-version-header.js); \
+    echo '/*'; \
+    echo '** This code was built from sqlite3 version...'; \
+    echo "** "; \
+    awk -e '/define SQLITE_VERSION/{$$1=""; print "**" $$0}' \
+        -e '/define SQLITE_SOURCE_ID/{$$1=""; print "**" $$0}' $(sqlite3.h); \
+    echo '*/'; \
+   } > $@
+
 ########################################################################
 # call-make-pre-js creates rules for pre-js-$(1).js. $1 = the base
 # name of the JS file on whose behalf this pre-js is for.
diff --git a/ext/wasm/api/extern-post-js.js b/ext/wasm/api/extern-post-js.js
index 5ebb5a31e7..51e8d12b2b 100644
--- a/ext/wasm/api/extern-post-js.js
+++ b/ext/wasm/api/extern-post-js.js
@@ -1,5 +1,6 @@
 /* extern-post-js.js must be appended to the resulting sqlite3.js
-   file. */
+   file. It gets its name from being used as the value for
+   the --extern-post-js=... Emscripten flag. */
 (function(){
   /**
      In order to hide the sqlite3InitModule()'s resulting Emscripten
diff --git a/ext/wasm/api/extern-pre-js.js b/ext/wasm/api/extern-pre-js.js
index 26d066d2ee..7d47d33e33 100644
--- a/ext/wasm/api/extern-pre-js.js
+++ b/ext/wasm/api/extern-pre-js.js
@@ -1,4 +1,7 @@
 /* extern-pre-js.js must be prepended to the resulting sqlite3.js
    file. This file is currently only used for holding snippets during
    test and development.
+
+   It gets its name from being used as the value for the
+   --extern-pre-js=... Emscripten flag.
 */
diff --git a/ext/wasm/api/post-js-footer.js b/ext/wasm/api/post-js-footer.js
index ee470928ba..58882cbd9c 100644
--- a/ext/wasm/api/post-js-footer.js
+++ b/ext/wasm/api/post-js-footer.js
@@ -1,3 +1,4 @@
 /* The current function scope was opened via post-js-header.js, which
-   gets prepended to this at build-time. */
+   gets prepended to this at build-time. This file closes that
+   scope. */
 })/*postRun.push(...)*/;
diff --git a/ext/wasm/api/pre-js.js b/ext/wasm/api/pre-js.js
index 502ecf348f..b6630416dd 100644
--- a/ext/wasm/api/pre-js.js
+++ b/ext/wasm/api/pre-js.js
@@ -1,3 +1,9 @@
+/**
+   BEGIN FILE: api/pre-js.js
+
+   This file is intended to be prepended to the sqlite3.js build using
+   Emscripten's --pre-js=THIS_FILE flag (or equivalent).
+*/
 Module['locateFile'] = function(path, prefix) {
   return prefix + path;
 };
@@ -39,3 +45,4 @@ Module[xInstantiateWasm] = function callee(imports,onSuccess){
   scripts.
 */
 Module[xInstantiateWasm].uri = 'sqlite3.wasm';
+/* END FILE: api/pre-js.js */
diff --git a/ext/wasm/api/sqlite3-api-cleanup.js b/ext/wasm/api/sqlite3-api-cleanup.js
index c2a3425891..555e5d31c5 100644
--- a/ext/wasm/api/sqlite3-api-cleanup.js
+++ b/ext/wasm/api/sqlite3-api-cleanup.js
@@ -20,17 +20,15 @@ if('undefined' !== typeof Module){ // presumably an Emscripten build
   /**
      Install a suitable default configuration for sqlite3ApiBootstrap().
   */
-  const SABC = self.sqlite3ApiConfig || Object.create(null);
-  if(undefined===SABC.Module){
-    SABC.Module = Module /* ==> Currently needs to be exposed here for
-                            test code. NOT part of the public API. */;
-  }
-  if(undefined===SABC.exports){
-    SABC.exports = Module['asm'];
-  }
-  if(undefined===SABC.memory){
-    SABC.memory = Module.wasmMemory /* gets set if built with -sIMPORT_MEMORY */;
-  }
+  const SABC = Object.assign(
+    Object.create(null), {
+      Module: Module /* ==> Currently needs to be exposed here for
+                        test code. NOT part of the public API. */,
+      exports: Module['asm'],
+      memory: Module.wasmMemory /* gets set if built with -sIMPORT_MEMORY */
+    },
+    self.sqlite3ApiConfig || Object.create(null)
+  );
 
   /**
      For current (2022-08-22) purposes, automatically call
@@ -38,10 +36,11 @@ if('undefined' !== typeof Module){ // presumably an Emscripten build
      point, as we really want client code to be able to call this to
      configure certain parts. Clients may modify
      self.sqlite3ApiBootstrap.defaultConfig to tweak the default
-     configuration used by a no-args call to sqlite3ApiBootstrap().
+     configuration used by a no-args call to sqlite3ApiBootstrap(),
+     but must have first loaded their WASM module in order to be
+     able to provide the necessary configuration state.
   */
   //console.warn("self.sqlite3ApiConfig = ",self.sqlite3ApiConfig);
-  const rmApiConfig = (SABC !== self.sqlite3ApiConfig);
   self.sqlite3ApiConfig = SABC;
   let sqlite3;
   try{
@@ -51,7 +50,7 @@ if('undefined' !== typeof Module){ // presumably an Emscripten build
     throw e;
   }finally{
     delete self.sqlite3ApiBootstrap;
-    if(rmApiConfig) delete self.sqlite3ApiConfig;
+    delete self.sqlite3ApiConfig;
   }
 
   if(self.location && +self.location.port > 1024){
diff --git a/ext/wasm/api/sqlite3-license-version-header.js b/ext/wasm/api/sqlite3-license-version-header.js
new file mode 100644
index 0000000000..f8b3eddc5f
--- /dev/null
+++ b/ext/wasm/api/sqlite3-license-version-header.js
@@ -0,0 +1,25 @@
+/*
+** LICENSE for the sqlite3 WebAssembly/JavaScript APIs.
+**
+** This bundle (typically released as sqlite3.js or sqlite3-wasmfs.js)
+** is an amalgamation of JavaScript source code from two projects:
+**
+** 1) https://emscripten.org: the Emscripten "glue code" is covered by
+**    the terms of the MIT license and University of Illinois/NCSA
+**    Open Source License, as described at:
+**
+**    https://emscripten.org/docs/introducing_emscripten/emscripten_license.html
+**
+** 2) https://sqlite.org: all code and documentation labeled as being
+**    from this source are released under the same terms as the sqlite3
+**    C library:
+**
+** 2022-10-16
+**
+** The author disclaims copyright to this source code.  In place of a
+** legal notice, here is a blessing:
+**
+** *   May you do good and not evil.
+** *   May you find forgiveness for yourself and forgive others.
+** *   May you share freely, never taking more than you give.
+*/
diff --git a/ext/wasm/index.html b/ext/wasm/index.html
index 01d178bb7a..a7f0974fbe 100644
--- a/ext/wasm/index.html
+++ b/ext/wasm/index.html
@@ -46,7 +46,7 @@
             <li><a href='tester1.html'>tester1</a>: Core unit and
               regression tests for the various APIs and surrounding
               utility code.</li>
-            <li><a href='tester1.html'>tester1-worker</a>: same thing
+            <li><a href='tester1-worker.html'>tester1-worker</a>: same thing
             but running in a Worker.</li>
           </ul>
         </li>
diff --git a/manifest b/manifest
index df43c1449f..2f0d88b24d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\swith\susing\sthe\spush-down\soptimization\son\scompound\sSELECTs\swhere\scomponent\sSELECTs\suse\sdifferent\scollation\ssequences.\sdbsqlfuzz\s11516f050100243e5a845f5a2b48a90ed2efaf2e.
-D 2022-10-14T19:30:34.777
+C Add\sa\stop-level\slicense\sand\sbuild-time\sversion\sinfo\sheader\sto\sgenerated\ssqlite3*.js.\sCorrect\sa\sbroken\slink\sin\sext/wasm/index.html.
+D 2022-10-16T15:38:03.833
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -473,22 +473,23 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle 0e88c8cfc3719e4b7e74980d9da664c709e68acf863e48386cda376edfd3bfb0
-F ext/wasm/GNUmakefile 4ec270532b921c7c4b437fbdb06f6a0ce41f3bd874395ce70dbc933c8553efa9
+F ext/wasm/GNUmakefile e298b8a91fab19b758fc9e843601d50129afec1e5a6fcf4328affe3f34f40b3e
 F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 89983a8d122c35a90c65ec667844b95a78bcd04f3198a99c1e0c8368c1a0b03a
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
 F ext/wasm/api/README.md 62758e8dd98741d41505f69130cc767013d2e871ebb9e4313d8f8b97d95071d8
-F ext/wasm/api/extern-post-js.js dc68cbf552d8ea085181400a6963907c32e0b088b03ffd8969b1869fea246629
-F ext/wasm/api/extern-pre-js.js 20143b16b672d0a576fbf768a786d12ee1f84e222126477072389b992542a5b2
-F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba81456260a713ed04900c
+F ext/wasm/api/extern-post-js.js dfae3a5f621ae94f1fae671f8013ed6464355f11e2adda38ed8b10bf1929f337
+F ext/wasm/api/extern-pre-js.js cc61c09c7a24a07dbecb4c352453c3985170cec12b4e7e7e7a4d11d43c5c8f41
+F ext/wasm/api/post-js-footer.js cd0a8ec768501d9bd45d325ab0442037fb0e33d1f3b4f08902f15c34720ee4a1
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
-F ext/wasm/api/pre-js.js 2db711eb637991b383fc6b5c0f3df65ec48a7201e5730e304beba8de2d3f9b0b
-F ext/wasm/api/sqlite3-api-cleanup.js 5d22d1d3818ecacb23bfa223d5970cd0617d8cdbb48c8bc4bbd463f05b021a99
+F ext/wasm/api/pre-js.js 5b550904322d73127badd4347ca967ea525b901573559736f92d326ad9b7bb76
+F ext/wasm/api/sqlite3-api-cleanup.js 4d07a7524dc9b7b050acfde57163e839243ad2383bd7ee0de0178b1b3e988588
 F ext/wasm/api/sqlite3-api-glue.js 842dc03783aecc951a543a209523343a6fda9af258fb0bee08e8cc2dc3c4d8ae
 F ext/wasm/api/sqlite3-api-oo1.js 00f5cfce0989d2e08d7b21765d703c69234245d03a0cce8fcb32ccfcd53ffdbb
 F ext/wasm/api/sqlite3-api-opfs.js 5a8ab3b76880c8ada8710ca9ba1ca5b160872edfd8bd5322e4f179a7f41cc616
 F ext/wasm/api/sqlite3-api-prologue.js b7c82a22d50658a48463fa646a23135273bc2cfa843aedda32627ff281c12e4d
 F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
+F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 4c131945ced4b08a694d287abcdb066b896d961ef79ee5241805ecc37e83d63a
 F ext/wasm/batch-runner.html cf1a410c92bad50fcec2ddc71390b4e9df63a6ea1bef12a5163a66a0af4d78d9
@@ -507,7 +508,7 @@ F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d695
 F ext/wasm/fiddle/fiddle-worker.js 531859a471924a0ea48afa218e6877f0c164ca324d51e15843ed6ecc1c65c7ee
 F ext/wasm/fiddle/fiddle.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
 F ext/wasm/fiddle/fiddle.js 974b995119ac443685d7d94d3b3c58c6a36540e9eb3fed7069d5653284071715
-F ext/wasm/index.html 9ae9f9629310ed3ee88901aa14e20195815583806af245da08c2ecb43ced2243
+F ext/wasm/index.html f41ff0b3cef07196b18f3f917c46560a0d5289064d344b438b254c41ed0f2c76
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 9aa6951b529a8b29f578ec8f0355713c39584c92cf1708f63ba0cf917cb5b68e
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
@@ -2031,8 +2032,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 565d74c36f2dd4612860c7ee561682c50db28cfa5384346528292019dbfdf86c
-R 75e7f9b91b017a681d1ae11ac5186379
-U dan
-Z 42c84fae9e00b1c8a3d198c324edcd95
+P ed14863dd72e35fa3a23320c3d5a8166515faea39a555c28a27b2d35e701eac4
+R 664fdd2b5e755302311ec6a1ceb0cf59
+U stephan
+Z 70648a34d9cd28a66a6a4694b2eeaced
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 65ef760f0e..0ece5330b0 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ed14863dd72e35fa3a23320c3d5a8166515faea39a555c28a27b2d35e701eac4
\ No newline at end of file
+0f1a06e8e39a1fbc74f1aff9cc59787282dfbf847d6c5c7edb3f7d410db0e4b7
\ No newline at end of file

From 8ffc98999d4fae6598aff02cabf63ba4c3829c95 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sun, 16 Oct 2022 16:38:15 +0000
Subject: [PATCH 287/428] JS: add build-time-generated version info to the
 sqlite3.version object. Remove some stray debug output from tester1.js.

FossilOrigin-Name: b5f462c2d85d503f6492ec20580d57cb4c926712f6306a6be764bd09d1f5e8b8
---
 ext/wasm/GNUmakefile                 | 17 +++++++++++++++++
 ext/wasm/api/README.md               |  4 ++++
 ext/wasm/api/sqlite3-api-glue.js     |  5 -----
 ext/wasm/api/sqlite3-api-prologue.js | 11 +++++++++++
 ext/wasm/tester1.js                  | 10 ++++------
 ext/wasm/version-json.c              | 26 ++++++++++++++++++++++++++
 manifest                             | 21 +++++++++++----------
 manifest.uuid                        |  2 +-
 8 files changed, 74 insertions(+), 22 deletions(-)
 create mode 100644 ext/wasm/version-json.c

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index c4c2886da3..45ab3b8386 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -125,6 +125,10 @@ else
   $(info Development build. Use '$(MAKE) release' for a smaller release build.)
 endif
 
+version-json: version-json.c $(sqlite3.c) $(MAKEFILE)
+	$(CC) -O0 -I$(dir.top) -o $@ $(SQLITE_OPT) -DHAVE_MREMAP=0 $< $(sqlite3.c)
+CLEAN_FILES := version-json
+
 EXPORTED_FUNCTIONS.api.in := $(dir.api)/EXPORTED_FUNCTIONS.sqlite3-api
 
 EXPORTED_FUNCTIONS.api: $(EXPORTED_FUNCTIONS.api.in) $(MAKEFILE)
@@ -133,11 +137,13 @@ CLEAN_FILES += EXPORTED_FUNCTIONS.api
 
 sqlite3-license-version.js := sqlite3-license-version.js
 sqlite3-license-version-header.js := $(dir.api)/sqlite3-license-version-header.js
+sqlite3-api-build-version.js := $(dir.api)/sqlite3-api-build-version.js
 sqlite3-api.jses := $(sqlite3-license-version.js)
 sqlite3-api.jses += $(dir.api)/sqlite3-api-prologue.js
 sqlite3-api.jses += $(dir.common)/whwasmutil.js
 sqlite3-api.jses += $(dir.jacc)/jaccwabyt.js
 sqlite3-api.jses += $(dir.api)/sqlite3-api-glue.js
+sqlite3-api.jses += $(sqlite3-api-build-version.js)
 sqlite3-api.jses += $(dir.api)/sqlite3-api-oo1.js
 sqlite3-api.jses += $(dir.api)/sqlite3-api-worker1.js
 sqlite3-api.jses += $(dir.api)/sqlite3-api-opfs.js
@@ -146,6 +152,7 @@ sqlite3-api.jses += $(dir.api)/sqlite3-api-cleanup.js
 sqlite3-api.js := sqlite3-api.js
 CLEAN_FILES += $(sqlite3-api.js)
 CLEAN_FILES += $(sqlite3-license-version.js)
+CLEAN_FILES += $(sqlite3-api-build-version.js)
 $(sqlite3-api.js): $(sqlite3-api.jses) $(MAKEFILE)
 	@echo "Making $@..."
 	@for i in $(sqlite3-api.jses); do \
@@ -154,6 +161,16 @@ $(sqlite3-api.js): $(sqlite3-api.jses) $(MAKEFILE)
 		echo "/* END FILE: $$i */"; \
 	done > $@
 
+$(sqlite3-api-build-version.js): version-json
+	@echo "Making $@..."
+	@{ \
+  echo 'self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){'; \
+	echo -n '  sqlite3.version = '; \
+  ./version-json; \
+  echo ';'; \
+	echo '});'; \
+  } > $@
+
 ########################################################################
 # --post-js and --pre-js are emcc flags we use to append/prepend JS to
 # the generated emscripten module file.
diff --git a/ext/wasm/api/README.md b/ext/wasm/api/README.md
index edac17fa1e..dfb13c569f 100644
--- a/ext/wasm/api/README.md
+++ b/ext/wasm/api/README.md
@@ -48,6 +48,10 @@ browser client:
   Invokes functionality exposed by the previous two files to
   flesh out low-level parts of `sqlite3-api-prologue.js`. Most of
   these pieces related to the `sqlite3.capi.wasm` object.
+- `sqlite3-api-build-version.js`\  
+  Gets created by the build process and populates the
+  `sqlite3.version` object. This part is not critical, but records the
+  version of the library against which this module was built.
 - `sqlite3-api-oo1.js`\  
   Provides a high-level object-oriented wrapper to the lower-level C
   API, colloquially known as OO API #1. Its API is similar to other
diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index fd1f0c3e02..bfacef3b3c 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -688,9 +688,4 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     }
   }/*kvvfs*/
 
-  sqlite3.version = Object.assign(Object.create(null),{
-    library: sqlite3.capi.sqlite3_libversion(),
-    sourceId: sqlite3.capi.sqlite3_sourceid()
-  });
 });
-
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index a267e93454..7d9ae96914 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -1281,6 +1281,17 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     SQLite3Error: SQLite3Error,
     capi,
     config,
+    /**
+       Holds the version info of the sqlite3 source tree from which
+       the generated sqlite3-api.js gets built. Note that its version
+       may well differ from that reported by sqlite3_libversion(), but
+       that should be considered a source file mismatch, as the JS and
+       WASM files are intended to be built and distributed together.
+
+       This object is initially a placeholder which gets replaced by a
+       build-generated object.
+    */
+    version: Object.create(null),
     /**
        Performs any optional asynchronous library-level initialization
        which might be required. This function returns a Promise which
diff --git a/ext/wasm/tester1.js b/ext/wasm/tester1.js
index 37a992d619..72991c451c 100644
--- a/ext/wasm/tester1.js
+++ b/ext/wasm/tester1.js
@@ -696,10 +696,10 @@
         if(autoResolvePtr){
           wts.$ppV = 0;
           T.assert(!wts.$ppV);
-          WTStruct.debugFlags(0x03);
+          //WTStruct.debugFlags(0x03);
           wts.$ppV = wts;
           T.assert(wts === wts.$ppV)
-          WTStruct.debugFlags(0);
+          //WTStruct.debugFlags(0);
         }
         wts.setMemberCString('cstr', "A C-string.");
         T.assert(Array.isArray(wts.ondispose)).
@@ -1022,7 +1022,7 @@
   ;/*end of C/WASM utils checks*/
 
   ////////////////////////////////////////////////////////////////////////
-  T.g('sqlite3.oo1 sanity checks')
+  T.g('sqlite3.oo1')
     .t('Create db', function(sqlite3){
       const db = this.db = new sqlite3.oo1.DB();
       T.assert(Number.isInteger(db.pointer)).
@@ -1037,8 +1037,7 @@
     })
 
   ////////////////////////////////////////////////////////////////////
-    .t('DB.Stmt sanity checks', function(S){
-      let pId;
+    .t('DB.Stmt', function(S){
       let st = this.db.prepare(
         new TextEncoder('utf-8').encode("select 3 as a")
       );
@@ -1073,7 +1072,6 @@
           .assert(false===st.step())
           .assert(!st._mayGet)
         ;
-        pId = st.pointer;
         T.assert(0===capi.sqlite3_strglob("*.txt", "foo.txt")).
           assert(0!==capi.sqlite3_strglob("*.txt", "foo.xtx")).
           assert(0===capi.sqlite3_strlike("%.txt", "foo.txt", 0)).
diff --git a/ext/wasm/version-json.c b/ext/wasm/version-json.c
new file mode 100644
index 0000000000..cb5083a40a
--- /dev/null
+++ b/ext/wasm/version-json.c
@@ -0,0 +1,26 @@
+/*
+** 2022-10-16
+**
+** The author disclaims copyright to this source code.  In place of a
+** legal notice, here is a blessing:
+**
+** *   May you do good and not evil.
+** *   May you find forgiveness for yourself and forgive others.
+** *   May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file simply outputs sqlite3 version information in JSON form,
+** intended for embedding in the sqlite3 JS API build.
+*/
+#include <stdio.h>
+#include "sqlite3.h"
+int main(int argc, char const * const * argv){
+  if(argc || argv){/*unused*/}
+  printf("{\"libVersion\": \"%s\", "
+         "\"libVersionNumber\": %d, "
+         "\"sourceId\": \"%s\"}"/*missing newline is intentional*/,
+         SQLITE_VERSION,
+         SQLITE_VERSION_NUMBER,
+         SQLITE_SOURCE_ID);
+  return 0;
+}
diff --git a/manifest b/manifest
index 2f0d88b24d..6e78bd13e1 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\stop-level\slicense\sand\sbuild-time\sversion\sinfo\sheader\sto\sgenerated\ssqlite3*.js.\sCorrect\sa\sbroken\slink\sin\sext/wasm/index.html.
-D 2022-10-16T15:38:03.833
+C JS:\sadd\sbuild-time-generated\sversion\sinfo\sto\sthe\ssqlite3.version\sobject.\sRemove\ssome\sstray\sdebug\soutput\sfrom\stester1.js.
+D 2022-10-16T16:38:15.159
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -473,21 +473,21 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle 0e88c8cfc3719e4b7e74980d9da664c709e68acf863e48386cda376edfd3bfb0
-F ext/wasm/GNUmakefile e298b8a91fab19b758fc9e843601d50129afec1e5a6fcf4328affe3f34f40b3e
+F ext/wasm/GNUmakefile ce1eb95ca32b23ce3400b26e99c23f6b2737a5356cb4eff2b8b364d7630a8cc9
 F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 89983a8d122c35a90c65ec667844b95a78bcd04f3198a99c1e0c8368c1a0b03a
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
-F ext/wasm/api/README.md 62758e8dd98741d41505f69130cc767013d2e871ebb9e4313d8f8b97d95071d8
+F ext/wasm/api/README.md 946398dd80bfd673f098b9d6ca3564e1fc77b03e660274d132f267c407b8703c
 F ext/wasm/api/extern-post-js.js dfae3a5f621ae94f1fae671f8013ed6464355f11e2adda38ed8b10bf1929f337
 F ext/wasm/api/extern-pre-js.js cc61c09c7a24a07dbecb4c352453c3985170cec12b4e7e7e7a4d11d43c5c8f41
 F ext/wasm/api/post-js-footer.js cd0a8ec768501d9bd45d325ab0442037fb0e33d1f3b4f08902f15c34720ee4a1
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
 F ext/wasm/api/pre-js.js 5b550904322d73127badd4347ca967ea525b901573559736f92d326ad9b7bb76
 F ext/wasm/api/sqlite3-api-cleanup.js 4d07a7524dc9b7b050acfde57163e839243ad2383bd7ee0de0178b1b3e988588
-F ext/wasm/api/sqlite3-api-glue.js 842dc03783aecc951a543a209523343a6fda9af258fb0bee08e8cc2dc3c4d8ae
+F ext/wasm/api/sqlite3-api-glue.js 05eb701460bb72edbe3bf923bd51262551614612c37802fc597eabb4c6b83232
 F ext/wasm/api/sqlite3-api-oo1.js 00f5cfce0989d2e08d7b21765d703c69234245d03a0cce8fcb32ccfcd53ffdbb
 F ext/wasm/api/sqlite3-api-opfs.js 5a8ab3b76880c8ada8710ca9ba1ca5b160872edfd8bd5322e4f179a7f41cc616
-F ext/wasm/api/sqlite3-api-prologue.js b7c82a22d50658a48463fa646a23135273bc2cfa843aedda32627ff281c12e4d
+F ext/wasm/api/sqlite3-api-prologue.js a17b35814c6399a2e69c7836e5fd2eaa71f755ee51f96cb69d68cbf99985d45b
 F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
 F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
@@ -527,12 +527,13 @@ F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33
 F ext/wasm/test-opfs-vfs.js 56c3d725044c668fa7910451e96c1195d25ad95825f9ac79f747a7759d1973d0
 F ext/wasm/tester1-worker.html 0af7a22025ff1da72a84765d64f8f221844a57c6e6e314acf3a30f176101fd3f
 F ext/wasm/tester1.html fde0e0bdeaaa2c39877c749dc86a8c1c306f771c3d75b89a6289a5ed11243e9d
-F ext/wasm/tester1.js d6a66fc36c7571b8050314b6d0e93e69cd6def88df14fb3ef2403e7aa244ec36
+F ext/wasm/tester1.js fd333bc7608a91c86ae6147aa489840c06f4131119cc26d66976874a50da7cab
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
 F ext/wasm/testing-worker1-promiser.js bd788e33c1807e0a6dda9c9a9d784bd3350ca49c9dd8ae2cc8719b506b6e013e
 F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d7669fb17fcae
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
 F ext/wasm/testing2.js 88f40ef3cd8201bdadd120a711c36bbf0ce56cc0eab1d5e7debb71fed7822494
+F ext/wasm/version-json.c 03c6fb4efefd7c5b14f618b36648e71da741e39059ea5059c39495fdceaed144
 F ext/wasm/wasmfs.make 3cce1820006196de140f90f2da4b4ea657083fb5bfee7d125be43f7a85748c8f
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
@@ -2032,8 +2033,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 ed14863dd72e35fa3a23320c3d5a8166515faea39a555c28a27b2d35e701eac4
-R 664fdd2b5e755302311ec6a1ceb0cf59
+P 0f1a06e8e39a1fbc74f1aff9cc59787282dfbf847d6c5c7edb3f7d410db0e4b7
+R 33971fddc9aa38f4e82f55e933f782a8
 U stephan
-Z 70648a34d9cd28a66a6a4694b2eeaced
+Z 0dd1ff3eef43ed68b7aa15bcdfe291e6
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 0ece5330b0..5d2cd089f9 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0f1a06e8e39a1fbc74f1aff9cc59787282dfbf847d6c5c7edb3f7d410db0e4b7
\ No newline at end of file
+b5f462c2d85d503f6492ec20580d57cb4c926712f6306a6be764bd09d1f5e8b8
\ No newline at end of file

From 824bb5b8db88d064640a8e9d72b2204b916433e0 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sun, 16 Oct 2022 18:50:55 +0000
Subject: [PATCH 288/428] Add aggregate function support to
 sqlite3.oo1.DB.createFunction(). Change signature of the options object used
 by that function so that the callback property names match those of the
 corresponding C APIs.

FossilOrigin-Name: a7db6e4b50beebfb1c97e0c4de49538d8199c166b18a0b1b175736c593128a00
---
 ext/wasm/api/sqlite3-api-oo1.js | 111 +++++++++++++++++++++++---------
 ext/wasm/demo-123.js            |   2 +-
 ext/wasm/tester1.js             |  69 ++++++++++++++++++--
 manifest                        |  16 ++---
 manifest.uuid                   |   2 +-
 5 files changed, 151 insertions(+), 49 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index fa6c6d8e5f..f775406756 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -45,8 +45,10 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
 
   /** If object opts has _its own_ property named p then that
       property's value is returned, else dflt is returned. */
-  const getOwnOption = (opts, p, dflt)=>
-        opts.hasOwnProperty(p) ? opts[p] : dflt;
+  const getOwnOption = (opts, p, dflt)=>{
+    const d = Object.getOwnPropertyDescriptor(opts,p);
+    return d ? d.value : dflt;
+  };
 
   // Documented in DB.checkRc()
   const checkSqlite3Rc = function(dbPtr, sqliteResultCode){
@@ -810,12 +812,14 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        `xFunc` to align with the C API documentation). In the final
        case, the function's name must be the 'name' property.
 
-       This can currently only be used to create scalar functions, not
-       aggregate or window functions (requires only a bit of
-       refactoring to support aggregates and window functions).
+       The first two call forms can only be used for creating scalar
+       functions. Creating an aggregate function requires the
+       options-object form (see below for details).
 
        UDFs cannot currently be removed from a DB handle after they're
-       added.
+       added. More correctly, they can be removed as documented for
+       sqlite3_create_function_v2(), but doing so will "leak" the
+       JS-created WASM binding of those functions.
 
        On success, returns this object. Throws on error.
 
@@ -825,18 +829,35 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        cannot be determined. The docs for sqlite3_create_function_v2()
        describe the conversions in more detail.
 
+       The values set in the options object differ for scalar and
+       aggregate functions:
+
+       - Scalar: set the `xFunc` function-type property to the UDF
+         function.
+
+       - Aggregate: set the `xStep` and `xFinal` function-type
+         properties to the "step" and "final" callbacks for the
+         aggregate. Do not set the `xFunc` property.
+
+       The options object may optionally have an `xDestroy`
+       function-type property, as per
+       sqlite3_create_function_v2(). Its argument will be the
+       WASM-pointer-type value of the `pApp` property, and this
+       function will throw if `pApp` is defined but is not null,
+       undefined, or a numeric (WASM pointer) value.
+
        The optional options object may contain flags to modify how
        the function is defined:
 
-       - .arity: the number of arguments which SQL calls to this
-       function expect or require. The default value is
-       `callback.length` (i.e. the number of declared parameters it
-       has) **MINUS 1** (see below for why). As a special case, if
-       callback.length is 0, its arity is also 0 instead of -1. A
-       negative arity value means that the function is variadic and
-       may accept any number of arguments, up to sqlite3's
-       compile-time limits. sqlite3 will enforce the argument count if
-       is zero or greater.
+       - `arity`: the number of arguments which SQL calls to this
+       function expect or require. The default value is `xFunc.length`
+       or `xStep.length` (i.e. the number of declared parameters it
+       has) **MINUS 1** (see below for why). As a special case, if the
+       `length` is 0, its arity is also 0 instead of -1. A negative
+       arity value means that the function is variadic and may accept
+       any number of arguments, up to sqlite3's compile-time
+       limits. sqlite3 will enforce the argument count if is zero or
+       greater.
 
        The callback always receives a pointer to an `sqlite3_context`
        object as its first argument. Any arguments after that are from
@@ -852,44 +873,70 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        - .deterministic = SQLITE_DETERMINISTIC
        - .directOnly = SQLITE_DIRECTONLY
        - .innocuous = SQLITE_INNOCUOUS
-
-       TODO: for the (optionsObject) form, accept callbacks for
-       aggregate and window functions.
-
     */
-    createFunction: function f(name, callback, opt){
+    createFunction: function f(name, xFunc, opt){
+      let xStep, xFinal;
+      const isFunc = (f)=>(f instanceof Function);
       switch(arguments.length){
           case 1: /* (optionsObject) */
             opt = name;
             name = opt.name;
-            callback = opt.xFunc || opt.callback;
+            xFunc = opt.xFunc;
             break;
           case 2: /* (name, callback|optionsObject) */
-            if(!(callback instanceof Function)){
-              opt = callback;
-              callback = opt.xFunc || opt.callback;
+            if(!isFunc(xFunc)){
+              opt = xFunc;
+              xFunc = opt.xFunc;
             }
             break;
+          case 3: /* name, xFunc, opt */
+            break;
           default: break;
       }
       if(!opt) opt = {};
-      if(!(callback instanceof Function)){
-        toss3("Invalid arguments: expecting a callback function.");
-      }else if('string' !== typeof name){
+      if('string' !== typeof name){
         toss3("Invalid arguments: missing function name.");
       }
+      xStep = opt.xStep;
+      xFinal = opt.xFinal;
+      if(isFunc(xFunc)){
+        if(isFunc(xStep) || isFunc(xFinal)){
+          toss3("Ambiguous arguments: scalar or aggregate?");
+        }
+        xStep = xFinal = null;
+      }else if(isFunc(xStep)){
+        if(!isFunc(xFinal)){
+          toss3("Missing xFinal() callback for aggregate UDF.");
+        }
+        xFunc = null;
+      }else if(isFunc(xFinal)){
+        toss3("Missing xStep() callback for aggregate UDF.");
+      }else{
+        toss3("Missing function-type properties.");
+      }
+      const pApp = opt.pApp;
+      if(undefined!==pApp && (('number'!==typeof pApp)
+                              || !capi.util.isInt32(pApp))){
+        toss3("Invalid value for pApp property. Must be a legal WASM pointer value.");
+      }
+      const xDestroy = opt.xDestroy;
+      if(xDestroy && !isFunc(xDestroy)){
+        toss3("xDestroy property must be a function.");
+      }
       let fFlags = 0 /*flags for sqlite3_create_function_v2()*/;
       if(getOwnOption(opt, 'deterministic')) fFlags |= capi.SQLITE_DETERMINISTIC;
       if(getOwnOption(opt, 'directOnly')) fFlags |= capi.SQLITE_DIRECTONLY;
       if(getOwnOption(opt, 'innocuous')) fFlags |= capi.SQLITE_INNOCUOUS;
       name = name.toLowerCase();
+      const xArity = xFunc || xStep;
+      const arity = getOwnOption(opt, 'arity');
       DB.checkRc(this, capi.sqlite3_create_function_v2(
         this.pointer, name,
-        (opt.hasOwnProperty('arity')
-         ? +opt.arity
-         : (callback.length ? callback.length-1/*for pCtx arg*/ : 0)),
-        capi.SQLITE_UTF8 | fFlags, null/*pApp*/, callback,
-        null/*xStep*/, null/*xFinal*/, null/*xDestroy*/));
+        ('number'===typeof arity
+         ? arity
+         : (xArity.length ? xArity.length-1/*for pCtx arg*/ : 0)),
+        capi.SQLITE_UTF8 | fFlags, pApp,
+        xFunc, xStep, xFinal, xDestroy));
       return this;
     }/*createFunction()*/,
     /**
diff --git a/ext/wasm/demo-123.js b/ext/wasm/demo-123.js
index ff36aaf4e2..04a999488a 100644
--- a/ext/wasm/demo-123.js
+++ b/ext/wasm/demo-123.js
@@ -160,7 +160,7 @@
       log("Create a scalar UDF...");
       db.createFunction({
         name: 'twice',
-        callback: function(pCx, arg){ // note the call arg count
+        xFunc: function(pCx, arg){ // note the call arg count
           return arg + arg;
         }
       });
diff --git a/ext/wasm/tester1.js b/ext/wasm/tester1.js
index 72991c451c..aef9d2301b 100644
--- a/ext/wasm/tester1.js
+++ b/ext/wasm/tester1.js
@@ -1179,14 +1179,14 @@
         assert(5===db.selectValue("select foo($a,$b)",{$a:0,$b:5}));
       db.createFunction("bar", {
         arity: -1,
-        callback: function(pCx){
-          var rc = 0;
-          for(let i = 1; i < arguments.length; ++i) rc += arguments[i];
+        xFunc: (pCx,...args)=>{
+          let rc = 0;
+          for(const v of args) rc += v;
           return rc;
         }
       }).createFunction({
         name: "asis",
-        callback: (pCx,arg)=>arg
+        xFunc: (pCx,arg)=>arg
       });
       T.assert(0===db.selectValue("select bar()")).
         assert(1===db.selectValue("select bar(1)")).
@@ -1225,9 +1225,64 @@
 
   ////////////////////////////////////////////////////////////////////
     .t({
-      name: 'Aggregate UDFs (tests are TODO)',
-      predicate: testIsTodo
-    })
+      name: 'Aggregate UDFs',
+      test: function(sqlite3){
+        const db = this.db;
+        const aggState = {summer: 0, summerN: 0};
+        db.createFunction({
+          name: 'summer',
+          xStep: function(pCtx, n){
+            aggState.summer += n;
+          },
+          xFinal: function(pCtx){
+            const rc = aggState.summer;
+            aggState.summer = 0;
+            return rc;
+          }
+        });
+        let v = db.selectValue([
+          "with cte(v) as (",
+          "select 3 union all select 5 union all select 7",
+          ") select summer(v) from cte"
+        ]);
+        T.assert(15===v);
+        T.mustThrowMatching(()=>db.selectValue("select summer(1,2)"),
+                            /wrong number of arguments/);
+        db.createFunction({
+          name: 'summerN',
+          arity: -1,
+          xStep: function(pCtx, ...args){
+            for(const v of args) aggState.summerN += v;
+          },
+          xFinal: function(pCtx){
+            const rc = aggState.summerN;
+            aggState.summerN = 0;
+            return rc;
+          }
+        }); 
+        T.assert(18===db.selectValue('select summerN(1,8,9)'));
+        T.mustThrowMatching(()=>{
+          db.createFunction('nope',{
+            xFunc: ()=>{}, xStep: ()=>{}
+          });
+        }, /scalar or aggregate\?/);
+        T.mustThrowMatching(()=>{
+          db.createFunction('nope',{xStep: ()=>{}});
+        }, /Missing xFinal/);
+        T.mustThrowMatching(()=>{
+          db.createFunction('nope',{xFinal: ()=>{}});
+        }, /Missing xStep/);
+        T.mustThrowMatching(()=>{
+          db.createFunction('nope',{});
+        }, /Missing function-type properties/);
+        T.mustThrowMatching(()=>{
+          db.createFunction('nope',{xFunc:()=>{}, xDestroy:'nope'});
+        }, /xDestroy property must be a function/);
+        T.mustThrowMatching(()=>{
+          db.createFunction('nope',{xFunc:()=>{}, pApp:'nope'});
+        }, /Invalid value for pApp/);
+     }
+    }/*aggregate UDFs*/)
 
   ////////////////////////////////////////////////////////////////////
     .t({
diff --git a/manifest b/manifest
index 6e78bd13e1..00b073fd77 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C JS:\sadd\sbuild-time-generated\sversion\sinfo\sto\sthe\ssqlite3.version\sobject.\sRemove\ssome\sstray\sdebug\soutput\sfrom\stester1.js.
-D 2022-10-16T16:38:15.159
+C Add\saggregate\sfunction\ssupport\sto\ssqlite3.oo1.DB.createFunction().\sChange\ssignature\sof\sthe\soptions\sobject\sused\sby\sthat\sfunction\sso\sthat\sthe\scallback\sproperty\snames\smatch\sthose\sof\sthe\scorresponding\sC\sAPIs.
+D 2022-10-16T18:50:55.647
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -485,7 +485,7 @@ F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1
 F ext/wasm/api/pre-js.js 5b550904322d73127badd4347ca967ea525b901573559736f92d326ad9b7bb76
 F ext/wasm/api/sqlite3-api-cleanup.js 4d07a7524dc9b7b050acfde57163e839243ad2383bd7ee0de0178b1b3e988588
 F ext/wasm/api/sqlite3-api-glue.js 05eb701460bb72edbe3bf923bd51262551614612c37802fc597eabb4c6b83232
-F ext/wasm/api/sqlite3-api-oo1.js 00f5cfce0989d2e08d7b21765d703c69234245d03a0cce8fcb32ccfcd53ffdbb
+F ext/wasm/api/sqlite3-api-oo1.js f7f1fa6e6364347e99d0619ac1d3766dabab1e114cdf343259f38372576b6650
 F ext/wasm/api/sqlite3-api-opfs.js 5a8ab3b76880c8ada8710ca9ba1ca5b160872edfd8bd5322e4f179a7f41cc616
 F ext/wasm/api/sqlite3-api-prologue.js a17b35814c6399a2e69c7836e5fd2eaa71f755ee51f96cb69d68cbf99985d45b
 F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
@@ -500,7 +500,7 @@ F ext/wasm/common/testing.css 53394885077edd3db22d2a0896192334dfc06fb3d1da0b646e
 F ext/wasm/common/whwasmutil.js 50d2ede0b0fa01c1d467e1801fab79f5e46bb02bcbd2b0232e4fdc6090a47818
 F ext/wasm/demo-123-worker.html e50b51dc7271b9d3cc830cb7c2fba294d622f56b7acb199f7257d11195a63d49
 F ext/wasm/demo-123.html 7c239c9951d1b113f9f532969ac039294cf1dcfee2b3ae0a2c1ed2b3d59f8dfa
-F ext/wasm/demo-123.js d563cf9d725692ccd940c46df1c026d87863e0544942a2ba2015f17fba3f6f74
+F ext/wasm/demo-123.js e0cbeb3495e14103763d5c49794a24d67cf3d78e0ed5b82843be70c0c2ee4b3b
 F ext/wasm/demo-kvvfs1.html 7d4f28873de67f51ac18c584b7d920825139866a96049a49c424d6f5a0ea5e7f
 F ext/wasm/demo-kvvfs1.js 105596bd2ccd0b1deb5fde8e99b536e8242d4bb5932fac0c8403ff3a6bc547e8
 F ext/wasm/fiddle.make 3f4efd62bc2a9c883bfcea52ae2755114a62d444d6d042df287f4aef301d6c6c
@@ -527,7 +527,7 @@ F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33
 F ext/wasm/test-opfs-vfs.js 56c3d725044c668fa7910451e96c1195d25ad95825f9ac79f747a7759d1973d0
 F ext/wasm/tester1-worker.html 0af7a22025ff1da72a84765d64f8f221844a57c6e6e314acf3a30f176101fd3f
 F ext/wasm/tester1.html fde0e0bdeaaa2c39877c749dc86a8c1c306f771c3d75b89a6289a5ed11243e9d
-F ext/wasm/tester1.js fd333bc7608a91c86ae6147aa489840c06f4131119cc26d66976874a50da7cab
+F ext/wasm/tester1.js 8161dcc4b21902dadec2d3a5dc5700cab9c1641db0603e2ea56ea2a8de6cbab3
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
 F ext/wasm/testing-worker1-promiser.js bd788e33c1807e0a6dda9c9a9d784bd3350ca49c9dd8ae2cc8719b506b6e013e
 F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d7669fb17fcae
@@ -2033,8 +2033,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 0f1a06e8e39a1fbc74f1aff9cc59787282dfbf847d6c5c7edb3f7d410db0e4b7
-R 33971fddc9aa38f4e82f55e933f782a8
+P b5f462c2d85d503f6492ec20580d57cb4c926712f6306a6be764bd09d1f5e8b8
+R dc71c7ee6cfc588ad89cef2f6b6a3e75
 U stephan
-Z 0dd1ff3eef43ed68b7aa15bcdfe291e6
+Z 295c02a265fc3379708e7d138c173321
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 5d2cd089f9..f04ed5fbac 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b5f462c2d85d503f6492ec20580d57cb4c926712f6306a6be764bd09d1f5e8b8
\ No newline at end of file
+a7db6e4b50beebfb1c97e0c4de49538d8199c166b18a0b1b175736c593128a00
\ No newline at end of file

From 2676fc58c86a497f8f2510dfe48e843d7371d88b Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sun, 16 Oct 2022 18:57:15 +0000
Subject: [PATCH 289/428] Minor tweak to get bring an edge case of
 oo1.DB.createFunction() into aggreement with its docs.

FossilOrigin-Name: 8d59ccd9f357fbed0b0790508ca9027194fc4b0131029f9f460c7b4bde806a5f
---
 ext/wasm/api/sqlite3-api-oo1.js |  5 +++--
 manifest                        | 12 ++++++------
 manifest.uuid                   |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index f775406756..f1014fcc00 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -915,8 +915,9 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
         toss3("Missing function-type properties.");
       }
       const pApp = opt.pApp;
-      if(undefined!==pApp && (('number'!==typeof pApp)
-                              || !capi.util.isInt32(pApp))){
+      if(undefined!==pApp &&
+         null!==pApp &&
+         (('number'!==typeof pApp) || !capi.util.isInt32(pApp))){
         toss3("Invalid value for pApp property. Must be a legal WASM pointer value.");
       }
       const xDestroy = opt.xDestroy;
diff --git a/manifest b/manifest
index 00b073fd77..d7401cafab 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\saggregate\sfunction\ssupport\sto\ssqlite3.oo1.DB.createFunction().\sChange\ssignature\sof\sthe\soptions\sobject\sused\sby\sthat\sfunction\sso\sthat\sthe\scallback\sproperty\snames\smatch\sthose\sof\sthe\scorresponding\sC\sAPIs.
-D 2022-10-16T18:50:55.647
+C Minor\stweak\sto\sget\sbring\san\sedge\scase\sof\soo1.DB.createFunction()\sinto\saggreement\swith\sits\sdocs.
+D 2022-10-16T18:57:15.939
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -485,7 +485,7 @@ F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1
 F ext/wasm/api/pre-js.js 5b550904322d73127badd4347ca967ea525b901573559736f92d326ad9b7bb76
 F ext/wasm/api/sqlite3-api-cleanup.js 4d07a7524dc9b7b050acfde57163e839243ad2383bd7ee0de0178b1b3e988588
 F ext/wasm/api/sqlite3-api-glue.js 05eb701460bb72edbe3bf923bd51262551614612c37802fc597eabb4c6b83232
-F ext/wasm/api/sqlite3-api-oo1.js f7f1fa6e6364347e99d0619ac1d3766dabab1e114cdf343259f38372576b6650
+F ext/wasm/api/sqlite3-api-oo1.js 9a5f0c00d476c504f16dcd456e1743dbc2826ca3d10645dfa62663a39e3ed0d8
 F ext/wasm/api/sqlite3-api-opfs.js 5a8ab3b76880c8ada8710ca9ba1ca5b160872edfd8bd5322e4f179a7f41cc616
 F ext/wasm/api/sqlite3-api-prologue.js a17b35814c6399a2e69c7836e5fd2eaa71f755ee51f96cb69d68cbf99985d45b
 F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
@@ -2033,8 +2033,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 b5f462c2d85d503f6492ec20580d57cb4c926712f6306a6be764bd09d1f5e8b8
-R dc71c7ee6cfc588ad89cef2f6b6a3e75
+P a7db6e4b50beebfb1c97e0c4de49538d8199c166b18a0b1b175736c593128a00
+R 3422110515a596def98dff69dd1bdfc7
 U stephan
-Z 295c02a265fc3379708e7d138c173321
+Z eb1680ea30bd7067803bb7e8ee35441a
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f04ed5fbac..946bd8b7e8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a7db6e4b50beebfb1c97e0c4de49538d8199c166b18a0b1b175736c593128a00
\ No newline at end of file
+8d59ccd9f357fbed0b0790508ca9027194fc4b0131029f9f460c7b4bde806a5f
\ No newline at end of file

From e493f8f0cd2f04a7ef84c06dfef0040db3f6cf64 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sun, 16 Oct 2022 23:33:24 +0000
Subject: [PATCH 290/428] Typo fix.

FossilOrigin-Name: 650126c92aa191d6361a32ec90ca7def60a2df22ba6bec1d2354692fe3504423
---
 ext/wasm/index.html | 11 +++++------
 manifest            | 12 ++++++------
 manifest.uuid       |  2 +-
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/ext/wasm/index.html b/ext/wasm/index.html
index a7f0974fbe..663d4c9240 100644
--- a/ext/wasm/index.html
+++ b/ext/wasm/index.html
@@ -87,12 +87,11 @@
               worker due to an Emscripten limitation.</li>
             <li><a href='test-opfs-vfs.html'>test-opfs-vfs</a>
               (<a href='test-opfs-vfs.html?opfs-sanity-check&opfs-verbose'>same
-                with verbose output and sanity-checking tests</a>) is an
-              experiment in implementing a syncronous sqlite3 VFS proxy
-              for a fully asynchronous backend interface (namely OPFS),
-              using SharedArrayBuffer and the Atomics APIs to regulate
-              communication between the synchronous interface and the
-              async impl.
+              with verbose output and sanity-checking tests</a>) is an
+              sqlite3_vfs OPFS proxy using SharedArrayBuffer and the
+              Atomics APIs to regulate communication between the
+              synchronous sqlite3_vfs interface and the async OPFS
+              impl.
             </li>
           </ul>
         </li>
diff --git a/manifest b/manifest
index d7401cafab..a206aae7bb 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\stweak\sto\sget\sbring\san\sedge\scase\sof\soo1.DB.createFunction()\sinto\saggreement\swith\sits\sdocs.
-D 2022-10-16T18:57:15.939
+C Typo\sfix.
+D 2022-10-16T23:33:24.941
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -508,7 +508,7 @@ F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d695
 F ext/wasm/fiddle/fiddle-worker.js 531859a471924a0ea48afa218e6877f0c164ca324d51e15843ed6ecc1c65c7ee
 F ext/wasm/fiddle/fiddle.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
 F ext/wasm/fiddle/fiddle.js 974b995119ac443685d7d94d3b3c58c6a36540e9eb3fed7069d5653284071715
-F ext/wasm/index.html f41ff0b3cef07196b18f3f917c46560a0d5289064d344b438b254c41ed0f2c76
+F ext/wasm/index.html d75b516236c6869568ff691b9b7ff61307d6436e059b5657dadc473b6f41e581
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 9aa6951b529a8b29f578ec8f0355713c39584c92cf1708f63ba0cf917cb5b68e
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
@@ -2033,8 +2033,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 a7db6e4b50beebfb1c97e0c4de49538d8199c166b18a0b1b175736c593128a00
-R 3422110515a596def98dff69dd1bdfc7
+P 8d59ccd9f357fbed0b0790508ca9027194fc4b0131029f9f460c7b4bde806a5f
+R 7eb92d13aa47fc635e45e77480d0d518
 U stephan
-Z eb1680ea30bd7067803bb7e8ee35441a
+Z e9d4f2e253f6a0945cb00e8689db7471
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 946bd8b7e8..e7aecb1f4e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8d59ccd9f357fbed0b0790508ca9027194fc4b0131029f9f460c7b4bde806a5f
\ No newline at end of file
+650126c92aa191d6361a32ec90ca7def60a2df22ba6bec1d2354692fe3504423
\ No newline at end of file

From 135c9ff6f7077435614e5226dbb5361e33bd1cac Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 17 Oct 2022 09:56:51 +0000
Subject: [PATCH 291/428] Remove a use of alloca() that does more harm than
 good.

FossilOrigin-Name: 2ab3cf4d71b23a4c0b69f977828d82df7bbc080c29ae189e0d78d38efee50c96
---
 manifest        | 14 +++++++-------
 manifest.uuid   |  2 +-
 src/wherecode.c |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/manifest b/manifest
index a206aae7bb..93a3db2696 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Typo\sfix.
-D 2022-10-16T23:33:24.941
+C Remove\sa\suse\sof\salloca()\sthat\sdoes\smore\sharm\sthan\sgood.
+D 2022-10-17T09:56:51.582
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -708,7 +708,7 @@ F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
 F src/where.c 63e712bcad47f70e94c2150976cd7da5040933699e3938d4189d064acbe40891
 F src/whereInt.h 70cd30de9ed784aa33fa6bd1245f060617de7a00d992469b6d8e419eed915743
-F src/wherecode.c bb88be457df3a6a01c844074ab79a9ba74279e73185f1362383aa697e3cae5dc
+F src/wherecode.c 8ec5a413f12af06638dcca36d0954be2151eea6f293d3c67397cef6a90d6adf1
 F src/whereexpr.c 55a39f42aaf982574fbf52906371a84cceed98a994422198dfd03db4fce4cc46
 F src/window.c 928e215840e2f2d9a2746e018c9643ef42c66c4ab6630ef0df7fa388fa145e86
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
@@ -2033,8 +2033,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 8d59ccd9f357fbed0b0790508ca9027194fc4b0131029f9f460c7b4bde806a5f
-R 7eb92d13aa47fc635e45e77480d0d518
-U stephan
-Z e9d4f2e253f6a0945cb00e8689db7471
+P 650126c92aa191d6361a32ec90ca7def60a2df22ba6bec1d2354692fe3504423
+R 0976ce63c2884a014f8f48854ee7e700
+U drh
+Z eaf9cf4bd31fd72933cff88a3ffeecd2
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index e7aecb1f4e..ee9a25c253 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-650126c92aa191d6361a32ec90ca7def60a2df22ba6bec1d2354692fe3504423
\ No newline at end of file
+2ab3cf4d71b23a4c0b69f977828d82df7bbc080c29ae189e0d78d38efee50c96
\ No newline at end of file
diff --git a/src/wherecode.c b/src/wherecode.c
index 85d9be5011..c2e7278d1a 100644
--- a/src/wherecode.c
+++ b/src/wherecode.c
@@ -2314,7 +2314,7 @@ Bitmask sqlite3WhereCodeOneLoopStart(
       int nNotReady;                 /* The number of notReady tables */
       SrcItem *origSrc;              /* Original list of tables */
       nNotReady = pWInfo->nLevel - iLevel - 1;
-      pOrTab = sqlite3StackAllocRaw(db,
+      pOrTab = sqlite3DbMallocRawNN(db,
                             sizeof(*pOrTab)+ nNotReady*sizeof(pOrTab->a[0]));
       if( pOrTab==0 ) return notReady;
       pOrTab->nAlloc = (u8)(nNotReady + 1);
@@ -2567,7 +2567,7 @@ Bitmask sqlite3WhereCodeOneLoopStart(
     assert( pLevel->op==OP_Return );
     pLevel->p2 = sqlite3VdbeCurrentAddr(v);
 
-    if( pWInfo->nLevel>1 ){ sqlite3StackFree(db, pOrTab); }
+    if( pWInfo->nLevel>1 ){ sqlite3DbFreeNN(db, pOrTab); }
     if( !untestedTerms ) disableTerm(pLevel, pTerm);
   }else
 #endif /* SQLITE_OMIT_OR_OPTIMIZATION */

From ce4b0fdf8a04b2ccaf2a587d0f8d9f3382355d51 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 17 Oct 2022 10:15:41 +0000
Subject: [PATCH 292/428] Make use of alloca() in wherePathSolver() when
 SQLITE_USE_ALLOCA is defined.

FossilOrigin-Name: 45752471521f8d4a6cad4bce40f907018acd403ffd3b8170020c34e4e0b6b91b
---
 manifest        | 14 +++++++-------
 manifest.uuid   |  2 +-
 src/sqliteInt.h |  4 ++++
 src/where.c     |  9 +++------
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/manifest b/manifest
index 93a3db2696..f650226ca1 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sa\suse\sof\salloca()\sthat\sdoes\smore\sharm\sthan\sgood.
-D 2022-10-17T09:56:51.582
+C Make\suse\sof\salloca()\sin\swherePathSolver()\swhen\sSQLITE_USE_ALLOCA\sis\sdefined.
+D 2022-10-17T10:15:41.927
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -624,7 +624,7 @@ F src/shell.c.in 2915eaf22bda89ad6533851a051de4773c249185360fe1fc7b4477b8f9063b2
 F src/sqlite.h.in d9c8a6243fc0a1c270d69db33758e34b810af3462f9bc5b4af113b347e07c69d
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 5336beea1868d99d2f62e628dbea55e97267dbff8193291ab175e960c5df9141
-F src/sqliteInt.h d15694b228fe5082587e13ac14f3e449621a5fe6d5933f5dee6e3c9491260da3
+F src/sqliteInt.h 27916b91f3aafd09d1b50f62948e0d506a58933f4cf5f5c136233658fbd39e60
 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -706,7 +706,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d
 F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
-F src/where.c 63e712bcad47f70e94c2150976cd7da5040933699e3938d4189d064acbe40891
+F src/where.c ab74681d07e310fb81c01c2bb1068378764cfff9e431e2b01aacc7a3678a018d
 F src/whereInt.h 70cd30de9ed784aa33fa6bd1245f060617de7a00d992469b6d8e419eed915743
 F src/wherecode.c 8ec5a413f12af06638dcca36d0954be2151eea6f293d3c67397cef6a90d6adf1
 F src/whereexpr.c 55a39f42aaf982574fbf52906371a84cceed98a994422198dfd03db4fce4cc46
@@ -2033,8 +2033,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 650126c92aa191d6361a32ec90ca7def60a2df22ba6bec1d2354692fe3504423
-R 0976ce63c2884a014f8f48854ee7e700
+P 2ab3cf4d71b23a4c0b69f977828d82df7bbc080c29ae189e0d78d38efee50c96
+R fd1636fa451b5b8e84570a9195b2236a
 U drh
-Z eaf9cf4bd31fd72933cff88a3ffeecd2
+Z 2743069ef130a7abdc131b5ac7f77275
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index ee9a25c253..d362e0dc32 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2ab3cf4d71b23a4c0b69f977828d82df7bbc080c29ae189e0d78d38efee50c96
\ No newline at end of file
+45752471521f8d4a6cad4bce40f907018acd403ffd3b8170020c34e4e0b6b91b
\ No newline at end of file
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 6f1109f2f6..05bc6dd4c5 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -4391,12 +4391,16 @@ int sqlite3HeapNearlyFull(void);
 */
 #ifdef SQLITE_USE_ALLOCA
 # define sqlite3StackAllocRaw(D,N)   alloca(N)
+# define sqlite3StackAllocRawNN(D,N) alloca(N)
 # define sqlite3StackAllocZero(D,N)  memset(alloca(N), 0, N)
 # define sqlite3StackFree(D,P)
+# define sqlite3StackFreeNN(D,P)
 #else
 # define sqlite3StackAllocRaw(D,N)   sqlite3DbMallocRaw(D,N)
+# define sqlite3StackAllocRawNN(D,N) sqlite3DbMallocRawNN(D,N)
 # define sqlite3StackAllocZero(D,N)  sqlite3DbMallocZero(D,N)
 # define sqlite3StackFree(D,P)       sqlite3DbFree(D,P)
+# define sqlite3StackFreeNN(D,P)     sqlite3DbFreeNN(D,P)
 #endif
 
 /* Do not allow both MEMSYS5 and MEMSYS3 to be defined together.  If they
diff --git a/src/where.c b/src/where.c
index b0c0ea7d4e..2bd3e055db 100644
--- a/src/where.c
+++ b/src/where.c
@@ -4701,7 +4701,6 @@ static int wherePathSolver(WhereInfo *pWInfo, LogEst nRowEst){
   int mxChoice;             /* Maximum number of simultaneous paths tracked */
   int nLoop;                /* Number of terms in the join */
   Parse *pParse;            /* Parsing context */
-  sqlite3 *db;              /* The database connection */
   int iLoop;                /* Loop counter over the terms of the join */
   int ii, jj;               /* Loop counters */
   int mxI = 0;              /* Index of next entry to replace */
@@ -4720,7 +4719,6 @@ static int wherePathSolver(WhereInfo *pWInfo, LogEst nRowEst){
   int nSpace;               /* Bytes of space allocated at pSpace */
 
   pParse = pWInfo->pParse;
-  db = pParse->db;
   nLoop = pWInfo->nLevel;
   /* TUNING: For simple queries, only the best path is tracked.
   ** For 2-way joins, the 5 best paths are followed.
@@ -4743,7 +4741,7 @@ static int wherePathSolver(WhereInfo *pWInfo, LogEst nRowEst){
   /* Allocate and initialize space for aTo, aFrom and aSortCost[] */
   nSpace = (sizeof(WherePath)+sizeof(WhereLoop*)*nLoop)*mxChoice*2;
   nSpace += sizeof(LogEst) * nOrderBy;
-  pSpace = sqlite3DbMallocRawNN(db, nSpace);
+  pSpace = sqlite3StackAllocRawNN(pParse->db, nSpace);
   if( pSpace==0 ) return SQLITE_NOMEM_BKPT;
   aTo = (WherePath*)pSpace;
   aFrom = aTo+mxChoice;
@@ -5001,7 +4999,7 @@ static int wherePathSolver(WhereInfo *pWInfo, LogEst nRowEst){
 
   if( nFrom==0 ){
     sqlite3ErrorMsg(pParse, "no query solution");
-    sqlite3DbFreeNN(db, pSpace);
+    sqlite3StackFreeNN(pParse->db, pSpace);
     return SQLITE_ERROR;
   }
   
@@ -5083,8 +5081,7 @@ static int wherePathSolver(WhereInfo *pWInfo, LogEst nRowEst){
   pWInfo->nRowOut = pFrom->nRow;
 
   /* Free temporary memory and return success */
-  assert( db!=0 );
-  sqlite3DbNNFreeNN(db, pSpace);
+  sqlite3StackFreeNN(pParse->db, pSpace);
   return SQLITE_OK;
 }
 

From 08535840c6a279a69a421a3be3b23fac355d80ac Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 17 Oct 2022 14:30:01 +0000
Subject: [PATCH 293/428] Get the indexed expression optimization working for
 virtual generated columns.

FossilOrigin-Name: 8a510cb0880349370ad19b0852f270ca072bff7871f0dc272964af31c32a7c37
---
 manifest      | 14 +++++++-------
 manifest.uuid |  2 +-
 src/build.c   |  1 +
 src/where.c   | 15 +++++++++++++--
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/manifest b/manifest
index e2d3074db5..cf96d243eb 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\strunk\senhancements\sinto\sindex-expr-opt\sbranch.
-D 2022-10-17T14:29:04.031
+C Get\sthe\sindexed\sexpression\soptimization\sworking\sfor\svirtual\sgenerated\scolumns.
+D 2022-10-17T14:30:01.606
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -561,7 +561,7 @@ F src/btmutex.c 6ffb0a22c19e2f9110be0964d0731d2ef1c67b5f7fabfbaeb7b9dabc4b7740ca
 F src/btree.c 74fc5f6a0577df703d6f98d0c51ee0d8d91d22dbc0ba86e42e056517e2b45576
 F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
 F src/btreeInt.h 8ce1332edd89dfd2461d561ac10a0ab5601c8e06200cb5230596c3caaf54482e
-F src/build.c e9b3adf21cdae3c9ca9450ee8463f2094f133c23734b81fd371f23b3d5d345ca
+F src/build.c 13bcc04821ad260ef00d87e0704424e0ae4e6cd66c7e384b4cedb379a6cb738b
 F src/callback.c 4cd7225b26a97f7de5fee5ae10464bed5a78f2adefe19534cc2095b3a8ca484a
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c 428b47a2548c7c2c2f885189b42fdcc178fb03c276a2d58b3008b10da29373d5
@@ -706,7 +706,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d
 F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
-F src/where.c a1c42bab8e840fa2cc90f6caf0f7133c35972e2f93b5899a90036d85e665c107
+F src/where.c 5d687c1f910b9b52284e0f7881a4d9b0ea9e9902b222dcc38e07a02ebeea3550
 F src/whereInt.h 70cd30de9ed784aa33fa6bd1245f060617de7a00d992469b6d8e419eed915743
 F src/wherecode.c 8ec5a413f12af06638dcca36d0954be2151eea6f293d3c67397cef6a90d6adf1
 F src/whereexpr.c bf8c155212c886621d71c951053660de6fcc4ee907b17aa02da0a96a39aa9405
@@ -2033,8 +2033,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 462b3c7f39724dc814f55e7a225e7d0c48f81c524cdda797a66e9e198c35ce58 45752471521f8d4a6cad4bce40f907018acd403ffd3b8170020c34e4e0b6b91b
-R 6f3970b0a66900429c4532002ac9cf64
+P 56ef97e64efb84176df570819474901d492209ff80ce4355ff896dea9d2b8a51
+R de79047dd54e7d5b7736aaaf7de5ad42
 U drh
-Z f2ec0a1b95a0b19c496d987488a36bd5
+Z 08d869d5cc79e1976c4600c81c421785
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index ff66fa27b1..8e5d83ed47 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-56ef97e64efb84176df570819474901d492209ff80ce4355ff896dea9d2b8a51
\ No newline at end of file
+8a510cb0880349370ad19b0852f270ca072bff7871f0dc272964af31c32a7c37
\ No newline at end of file
diff --git a/src/build.c b/src/build.c
index 502826bfc8..8578a71275 100644
--- a/src/build.c
+++ b/src/build.c
@@ -4204,6 +4204,7 @@ void sqlite3CreateIndex(
         }
         if( pTab->aCol[j].colFlags & COLFLAG_VIRTUAL ){
           pIndex->bHasVCol = 1;
+          pIndex->bHasExpr = 1;
         }
       }
       pIndex->aiColumn[i] = (i16)j;
diff --git a/src/where.c b/src/where.c
index c5a6438791..32daa6e80e 100644
--- a/src/where.c
+++ b/src/where.c
@@ -5413,12 +5413,23 @@ static SQLITE_NOINLINE void whereAddIndexExpr(
 ){
   int i;
   IndexExpr *p;
+  Table *pTab;
+  assert( pIdx->bHasExpr );
+  pTab = pIdx->pTable;
   for(i=0; i<pIdx->nColumn; i++){
-    if( pIdx->aiColumn[i]!=XN_EXPR ) continue;
+    Expr *pExpr;
+    int j = pIdx->aiColumn[i];
+    if( j==XN_EXPR ){
+      pExpr = pIdx->aColExpr->a[i].pExpr;
+    }else if( j>=0 && (pTab->aCol[j].colFlags & COLFLAG_VIRTUAL)!=0 ){
+      pExpr = sqlite3ColumnExpr(pTab, &pTab->aCol[j]);
+    }else{
+      continue;
+    }
     p = sqlite3DbMallocRaw(pParse->db,  sizeof(IndexExpr));
     if( p==0 ) break;
     p->pIENext = pParse->pIdxExpr;
-    p->pExpr = sqlite3ExprDup(pParse->db, pIdx->aColExpr->a[i].pExpr, 0);
+    p->pExpr = sqlite3ExprDup(pParse->db, pExpr, 0);
     p->iDataCur = pTabItem->iCursor;
     p->iIdxCur = iIdxCur;
     p->iIdxCol = i;

From e70d458340146bf20cc48224b8ddd9a18120d3c0 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 17 Oct 2022 14:46:39 +0000
Subject: [PATCH 294/428] Improved comments and function names.  No logic
 changes.

FossilOrigin-Name: 8f460b3b15bf4b88a224907d2f83e4ed6bf84d6b3f480008a1b187ea49c6ce1d
---
 manifest        | 16 ++++++++--------
 manifest.uuid   |  2 +-
 src/expr.c      | 12 ++++++------
 src/sqliteInt.h | 26 ++++++++++++++------------
 src/where.c     | 20 ++++++++++----------
 5 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/manifest b/manifest
index cf96d243eb..99d55d9f43 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Get\sthe\sindexed\sexpression\soptimization\sworking\sfor\svirtual\sgenerated\scolumns.
-D 2022-10-17T14:30:01.606
+C Improved\scomments\sand\sfunction\snames.\s\sNo\slogic\schanges.
+D 2022-10-17T14:46:39.146
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -569,7 +569,7 @@ F src/date.c 94ce83b4cd848a387680a5f920c9018c16655db778c4d36525af0a0f34679ac5
 F src/dbpage.c 5808e91bc27fa3981b028000f8fadfdc10ce9e59a34ce7dc4e035a69be3906ec
 F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
 F src/delete.c 86573edae75e3d3e9a8b590d87db8e47222103029df4f3e11fa56044459b514e
-F src/expr.c 4a13a0e5c30be801b0adc295ef74e0f1aa8c041aefdcb5d0d424337ecefa2806
+F src/expr.c ba67701bd7621ebba9c472fcc2dbd4f6444260530e694fa9d87281f9aedec93c
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 722f20779f5342a787922deded3628d8c74b5249cab04098cf17ee2f2aaff002
 F src/func.c fe2a795ad647ce42054873ac91c43beb7b5d204892903a67f6e7e314379b9d4a
@@ -624,7 +624,7 @@ F src/shell.c.in 2915eaf22bda89ad6533851a051de4773c249185360fe1fc7b4477b8f9063b2
 F src/sqlite.h.in d9c8a6243fc0a1c270d69db33758e34b810af3462f9bc5b4af113b347e07c69d
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 5336beea1868d99d2f62e628dbea55e97267dbff8193291ab175e960c5df9141
-F src/sqliteInt.h 2a182a906ac614eb240a68abba8eaf4b018693fd2410ddaa133c08de00507e0a
+F src/sqliteInt.h ed402c12a8b0920ae28cf79631d31490376ca3eed76b386b646712a1dda9e945
 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -706,7 +706,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d
 F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
-F src/where.c 5d687c1f910b9b52284e0f7881a4d9b0ea9e9902b222dcc38e07a02ebeea3550
+F src/where.c 3ab52180ad3a4eea7a2061bd804850f443298adbdc9264642d0a28affe26fb4c
 F src/whereInt.h 70cd30de9ed784aa33fa6bd1245f060617de7a00d992469b6d8e419eed915743
 F src/wherecode.c 8ec5a413f12af06638dcca36d0954be2151eea6f293d3c67397cef6a90d6adf1
 F src/whereexpr.c bf8c155212c886621d71c951053660de6fcc4ee907b17aa02da0a96a39aa9405
@@ -2033,8 +2033,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 56ef97e64efb84176df570819474901d492209ff80ce4355ff896dea9d2b8a51
-R de79047dd54e7d5b7736aaaf7de5ad42
+P 8a510cb0880349370ad19b0852f270ca072bff7871f0dc272964af31c32a7c37
+R 2b7b8043aec8092eea598ea28e3a1178
 U drh
-Z 08d869d5cc79e1976c4600c81c421785
+Z e241a4932bd8de7b16432b2f0cb5fca6
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 8e5d83ed47..6dd4259d17 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8a510cb0880349370ad19b0852f270ca072bff7871f0dc272964af31c32a7c37
\ No newline at end of file
+8f460b3b15bf4b88a224907d2f83e4ed6bf84d6b3f480008a1b187ea49c6ce1d
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index 4bff004119..30f9031e21 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -4044,17 +4044,17 @@ static int exprCodeInlineFunction(
 }
 
 /*
-** Check to see if pExpr is one of the indexed expression on pParse->pIdxExpr.
+** Check to see if pExpr is one of the indexed expressions on pParse->pIdxExpr.
 ** If it is, then resolve the expression by reading from the index and
-** return the register into which the value has been read.  If there is
-** no match, return negative.
+** return the register into which the value has been read.  If pExpr is
+** not an indexed expression, then return negative.
 */
-static SQLITE_NOINLINE int sqlite3ExprIndexLookup(
+static SQLITE_NOINLINE int sqlite3IndexedExprLookup(
   Parse *pParse,   /* The parsing context */
   Expr *pExpr,     /* The expression to potentially bypass */
   int target       /* Where to store the result of the expression */
 ){
-  IndexExpr *p;
+  IndexedExpr *p;
   Vdbe *v;
   for(p=pParse->pIdxExpr; p; p=p->pIENext){
     if( p->iDataCur<0 ) continue;
@@ -4111,7 +4111,7 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){
   if( pParse->pIdxExpr!=0 
    && pExpr!=0
    && !ExprHasProperty(pExpr, EP_Leaf)
-   && (r1 = sqlite3ExprIndexLookup(pParse, pExpr, target))>=0
+   && (r1 = sqlite3IndexedExprLookup(pParse, pExpr, target))>=0
   ){
     return r1;
   }
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 8b9bdf474a..0e02db8cc8 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -1189,7 +1189,7 @@ typedef struct FuncDef FuncDef;
 typedef struct FuncDefHash FuncDefHash;
 typedef struct IdList IdList;
 typedef struct Index Index;
-typedef struct IndexExpr IndexExpr;
+typedef struct IndexedExpr IndexedExpr;
 typedef struct IndexSample IndexSample;
 typedef struct KeyClass KeyClass;
 typedef struct KeyInfo KeyInfo;
@@ -2617,7 +2617,8 @@ struct Index {
   unsigned bNoQuery:1;     /* Do not use this index to optimize queries */
   unsigned bAscKeyBug:1;   /* True if the bba7b69f9849b5bf bug applies */
   unsigned bHasVCol:1;     /* Index references one or more VIRTUAL columns */
-  unsigned bHasExpr:1;     /* This is an index on an expression */
+  unsigned bHasExpr:1;     /* Index contains an expression, either a literal
+                           ** expression, or a reference to a VIRTUAL column */
 #ifdef SQLITE_ENABLE_STAT4
   int nSample;             /* Number of elements in aSample[] */
   int nSampleCol;          /* Size of IndexSample.anEq[] and so on */
@@ -3566,21 +3567,22 @@ struct TriggerPrg {
 #endif
 
 /*
-** If there is an index on an expression in scope such that the value
-** of the expression pExpr can be read out of the index with cursor iCur
-** at column iCol, then an instance of this object records that fact.
+** For each index X that has as one of its arguments either an expression
+** or the name of a virtual generated column, and if X is in scope such that
+** the value of the expression can simply be read from the index, then
+** there is an instance of this object on the Parse.pIdxExpr list.
 **
-** A linked list of these objects is attached to Parse and records all
-** expressions that can be short-circuited by extracting a valid from
-** an index.
+** During code generation, while generating code to evaluate expressions,
+** this list is consulted and if a matching expression is found, the value
+** is read from the index rather than being recomputed.
 */
-struct IndexExpr {
+struct IndexedExpr {
   Expr *pExpr;            /* The expression contained in the index */
   int iDataCur;           /* The data cursor associated with the index */
   int iIdxCur;            /* The index cursor */
-  int iIdxCol;            /* The column of the index that contains pExpr */
+  int iIdxCol;            /* The index column that contains value of pExpr */
   u8 bMaybeNullRow;       /* True if we need an OP_IfNullRow check */
-  IndexExpr *pIENext;     /* Next in a list of all indexed expressions */
+  IndexedExpr *pIENext;   /* Next in a list of all indexed expressions */
 };
 
 /*
@@ -3641,7 +3643,7 @@ struct Parse {
   int nLabelAlloc;     /* Number of slots in aLabel */
   int *aLabel;         /* Space to hold the labels */
   ExprList *pConstExpr;/* Constant expressions */
-  IndexExpr *pIdxExpr; /* List of all expression in active indexes */
+  IndexedExpr *pIdxExpr;/* List of expressions used by active indexes */
   Token constraintName;/* Name of the constraint currently being parsed */
   yDbMask writeMask;   /* Start a write transaction on these databases */
   yDbMask cookieMask;  /* Bitmask of schema verified databases */
diff --git a/src/where.c b/src/where.c
index 32daa6e80e..39bbf7d64c 100644
--- a/src/where.c
+++ b/src/where.c
@@ -5384,10 +5384,10 @@ static SQLITE_NOINLINE void whereCheckIfBloomFilterIsUseful(
 ** This is an sqlite3ParserAddCleanup() callback that is invoked to
 ** free the Parse->pIdxExpr list when the Parse object is destroyed.
 */
-static void whereIndexExprCleanup(sqlite3 *db, void *pObject){
+static void whereIndexedExprCleanup(sqlite3 *db, void *pObject){
   Parse *pParse = (Parse*)pObject;
   while( pParse->pIdxExpr!=0 ){
-    IndexExpr *p = pParse->pIdxExpr;
+    IndexedExpr *p = pParse->pIdxExpr;
     pParse->pIdxExpr = p->pIENext;
     sqlite3ExprDelete(db, p->pExpr);
     sqlite3DbFreeNN(db, p);
@@ -5400,19 +5400,19 @@ static void whereIndexExprCleanup(sqlite3 *db, void *pObject){
 ** number for the index and iDataCur is the cursor number for the corresponding
 ** table.
 **
-** This routine adds IndexExpr entries to the Parse->pIdxExpr field for
+** This routine adds IndexedExpr entries to the Parse->pIdxExpr field for
 ** each of the expressions in the index so that the expression code generator
 ** will know to replace occurrences of the indexed expression with
 ** references to the corresponding column of the index.
 */
-static SQLITE_NOINLINE void whereAddIndexExpr(
-  Parse *pParse,     /* Add IndexExpr entries to pParse->pIdxExpr */
+static SQLITE_NOINLINE void whereAddIndexedExpr(
+  Parse *pParse,     /* Add IndexedExpr entries to pParse->pIdxExpr */
   Index *pIdx,       /* The index-on-expression that contains the expressions */
   int iIdxCur,       /* Cursor number for pIdx */
   SrcItem *pTabItem  /* The FROM clause entry for the table */
 ){
   int i;
-  IndexExpr *p;
+  IndexedExpr *p;
   Table *pTab;
   assert( pIdx->bHasExpr );
   pTab = pIdx->pTable;
@@ -5426,7 +5426,7 @@ static SQLITE_NOINLINE void whereAddIndexExpr(
     }else{
       continue;
     }
-    p = sqlite3DbMallocRaw(pParse->db,  sizeof(IndexExpr));
+    p = sqlite3DbMallocRaw(pParse->db,  sizeof(IndexedExpr));
     if( p==0 ) break;
     p->pIENext = pParse->pIdxExpr;
     p->pExpr = sqlite3ExprDup(pParse->db, pExpr, 0);
@@ -5436,7 +5436,7 @@ static SQLITE_NOINLINE void whereAddIndexExpr(
     p->bMaybeNullRow = (pTabItem->fg.jointype & (JT_LEFT|JT_LTORJ))!=0;
     pParse->pIdxExpr = p;
     if( p->pIENext==0 ){
-      sqlite3ParserAddCleanup(pParse, whereIndexExprCleanup, pParse);
+      sqlite3ParserAddCleanup(pParse, whereIndexedExprCleanup, pParse);
     }
   }
 }
@@ -5987,7 +5987,7 @@ WhereInfo *sqlite3WhereBegin(
       }else{
         iIndexCur = pParse->nTab++;
         if( pIx->bHasExpr ){
-          whereAddIndexExpr(pParse, pIx, iIndexCur, pTabItem);
+          whereAddIndexedExpr(pParse, pIx, iIndexCur, pTabItem);
         }
       }
       pLevel->iIdxCur = iIndexCur;
@@ -6386,7 +6386,7 @@ void sqlite3WhereEnd(WhereInfo *pWInfo){
         last = pWInfo->iEndWhere;
       }
       if( pIdx->bHasExpr ){
-        IndexExpr *p = pParse->pIdxExpr;
+        IndexedExpr *p = pParse->pIdxExpr;
         while( p ){
           if( p->iIdxCur==pLevel->iIdxCur ){
             p->iDataCur = -1;

From 0467b01a1fb2de4f5a909d3a05681fa5fa1aafb3 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 17 Oct 2022 15:52:12 +0000
Subject: [PATCH 295/428] Rework ext/wasm/version-info.c to make it more useful
 for the upcoming dist build rules.

FossilOrigin-Name: 36e197cb3d0cbb76e4c1381d77f7d8856e7391f2ef6671c13b9b6b0133315814
---
 ext/wasm/GNUmakefile | 16 +++++++++++-----
 manifest             | 14 +++++++-------
 manifest.uuid        |  2 +-
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 45ab3b8386..7d910ebdaa 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -125,9 +125,9 @@ else
   $(info Development build. Use '$(MAKE) release' for a smaller release build.)
 endif
 
-version-json: version-json.c $(sqlite3.c) $(MAKEFILE)
-	$(CC) -O0 -I$(dir.top) -o $@ $(SQLITE_OPT) -DHAVE_MREMAP=0 $< $(sqlite3.c)
-CLEAN_FILES := version-json
+version-info: version-info.c $(sqlite3.c) $(MAKEFILE)
+	$(CC) -O0 -I$(dir.top) -o $@ $(SQLITE_OPT) $< $(sqlite3.c)
+CLEAN_FILES := version-info
 
 EXPORTED_FUNCTIONS.api.in := $(dir.api)/EXPORTED_FUNCTIONS.sqlite3-api
 
@@ -161,12 +161,12 @@ $(sqlite3-api.js): $(sqlite3-api.jses) $(MAKEFILE)
 		echo "/* END FILE: $$i */"; \
 	done > $@
 
-$(sqlite3-api-build-version.js): version-json
+$(sqlite3-api-build-version.js): version-info
 	@echo "Making $@..."
 	@{ \
   echo 'self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){'; \
 	echo -n '  sqlite3.version = '; \
-  ./version-json; \
+  ./version-info --json; \
   echo ';'; \
 	echo '});'; \
   } > $@
@@ -518,6 +518,12 @@ else
 include wasmfs.make
 endif
 
+########################################################################
+# Create deliverables: TODO
+#ifneq (,$(filter dist,$(MAKECMDGOALS)))
+#include dist.make
+#endif
+
 ########################################################################
 # Push files to public wasm-testing.sqlite.org server
 wasm-testing.include = *.wasm *.js *.html \
diff --git a/manifest b/manifest
index f650226ca1..a4e6f65c4e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\suse\sof\salloca()\sin\swherePathSolver()\swhen\sSQLITE_USE_ALLOCA\sis\sdefined.
-D 2022-10-17T10:15:41.927
+C Rework\sext/wasm/version-info.c\sto\smake\sit\smore\suseful\sfor\sthe\supcoming\sdist\sbuild\srules.
+D 2022-10-17T15:52:12.372
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -473,7 +473,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle 0e88c8cfc3719e4b7e74980d9da664c709e68acf863e48386cda376edfd3bfb0
-F ext/wasm/GNUmakefile ce1eb95ca32b23ce3400b26e99c23f6b2737a5356cb4eff2b8b364d7630a8cc9
+F ext/wasm/GNUmakefile 0fd09868726368d849c2cf03e6ac9884a07d236855c7802a89f0f8a16c034d10
 F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 89983a8d122c35a90c65ec667844b95a78bcd04f3198a99c1e0c8368c1a0b03a
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -2033,8 +2033,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 2ab3cf4d71b23a4c0b69f977828d82df7bbc080c29ae189e0d78d38efee50c96
-R fd1636fa451b5b8e84570a9195b2236a
-U drh
-Z 2743069ef130a7abdc131b5ac7f77275
+P 45752471521f8d4a6cad4bce40f907018acd403ffd3b8170020c34e4e0b6b91b
+R d0d2c913cf0284c12f6d5ab66c60618d
+U stephan
+Z 389e498f7feafb90497b4f68916517e0
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index d362e0dc32..4db4924c5f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-45752471521f8d4a6cad4bce40f907018acd403ffd3b8170020c34e4e0b6b91b
\ No newline at end of file
+36e197cb3d0cbb76e4c1381d77f7d8856e7391f2ef6671c13b9b6b0133315814
\ No newline at end of file

From cdc9ddc6ec28a475e20a86022de8f7d7d5331379 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 17 Oct 2022 15:53:16 +0000
Subject: [PATCH 296/428] Missing file-rename for the previous checkin.

FossilOrigin-Name: e9b407a4d0a0fcd9f26d457beede19d41141327befe84be621681952be5d1e69
---
 ext/wasm/{version-json.c => version-info.c} |  0
 manifest                                    | 12 ++++++------
 manifest.uuid                               |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename ext/wasm/{version-json.c => version-info.c} (100%)

diff --git a/ext/wasm/version-json.c b/ext/wasm/version-info.c
similarity index 100%
rename from ext/wasm/version-json.c
rename to ext/wasm/version-info.c
diff --git a/manifest b/manifest
index a4e6f65c4e..1ca9745db6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Rework\sext/wasm/version-info.c\sto\smake\sit\smore\suseful\sfor\sthe\supcoming\sdist\sbuild\srules.
-D 2022-10-17T15:52:12.372
+C Missing\sfile-rename\sfor\sthe\sprevious\scheckin.
+D 2022-10-17T15:53:16.486
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -533,7 +533,7 @@ F ext/wasm/testing-worker1-promiser.js bd788e33c1807e0a6dda9c9a9d784bd3350ca49c9
 F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d7669fb17fcae
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
 F ext/wasm/testing2.js 88f40ef3cd8201bdadd120a711c36bbf0ce56cc0eab1d5e7debb71fed7822494
-F ext/wasm/version-json.c 03c6fb4efefd7c5b14f618b36648e71da741e39059ea5059c39495fdceaed144
+F ext/wasm/version-info.c 03c6fb4efefd7c5b14f618b36648e71da741e39059ea5059c39495fdceaed144 w ext/wasm/version-json.c
 F ext/wasm/wasmfs.make 3cce1820006196de140f90f2da4b4ea657083fb5bfee7d125be43f7a85748c8f
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
@@ -2033,8 +2033,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 45752471521f8d4a6cad4bce40f907018acd403ffd3b8170020c34e4e0b6b91b
-R d0d2c913cf0284c12f6d5ab66c60618d
+P 36e197cb3d0cbb76e4c1381d77f7d8856e7391f2ef6671c13b9b6b0133315814
+R 913b0f5c6deb44215505d33b5b2a96aa
 U stephan
-Z 389e498f7feafb90497b4f68916517e0
+Z 279fbd3aa8e8b6ab1074595f5c42e719
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 4db4924c5f..34165934d5 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-36e197cb3d0cbb76e4c1381d77f7d8856e7391f2ef6671c13b9b6b0133315814
\ No newline at end of file
+e9b407a4d0a0fcd9f26d457beede19d41141327befe84be621681952be5d1e69
\ No newline at end of file

From 8be89249012a556580737d9e7a6b1938bab9e02c Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 17 Oct 2022 16:09:33 +0000
Subject: [PATCH 297/428] Fix a potential call to strlen() with a null argument
 in the command-line shell following an OOM error.
 [forum:/forumpost/9c4f2ebe22|forum post 9c4f2ebe22].

FossilOrigin-Name: b6413a6dff8ac9b7088b1381afbbbf799e376455d11786530cc5fc825747ab53
---
 manifest       | 16 ++++++++--------
 manifest.uuid  |  2 +-
 src/shell.c.in |  4 +++-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/manifest b/manifest
index 1ca9745db6..215cd1c292 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Missing\sfile-rename\sfor\sthe\sprevious\scheckin.
-D 2022-10-17T15:53:16.486
+C Fix\sa\spotential\scall\sto\sstrlen()\swith\sa\snull\sargument\sin\sthe\scommand-line\sshell\nfollowing\san\sOOM\serror.\s[forum:/forumpost/9c4f2ebe22|forum\spost\s9c4f2ebe22].
+D 2022-10-17T16:09:33.721
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -533,7 +533,7 @@ F ext/wasm/testing-worker1-promiser.js bd788e33c1807e0a6dda9c9a9d784bd3350ca49c9
 F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d7669fb17fcae
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
 F ext/wasm/testing2.js 88f40ef3cd8201bdadd120a711c36bbf0ce56cc0eab1d5e7debb71fed7822494
-F ext/wasm/version-info.c 03c6fb4efefd7c5b14f618b36648e71da741e39059ea5059c39495fdceaed144 w ext/wasm/version-json.c
+F ext/wasm/version-info.c 03c6fb4efefd7c5b14f618b36648e71da741e39059ea5059c39495fdceaed144
 F ext/wasm/wasmfs.make 3cce1820006196de140f90f2da4b4ea657083fb5bfee7d125be43f7a85748c8f
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
@@ -620,7 +620,7 @@ F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c b795f31a326564ffc448bb26f863c64f0796b2a5e0585a3358aff7877b72ed82
-F src/shell.c.in 2915eaf22bda89ad6533851a051de4773c249185360fe1fc7b4477b8f9063b2c
+F src/shell.c.in a4c0754470d4fcc2c3da2f0cda0363cecf4a84273d3cc3865325c2df06d5e56b
 F src/sqlite.h.in d9c8a6243fc0a1c270d69db33758e34b810af3462f9bc5b4af113b347e07c69d
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 5336beea1868d99d2f62e628dbea55e97267dbff8193291ab175e960c5df9141
@@ -2033,8 +2033,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 36e197cb3d0cbb76e4c1381d77f7d8856e7391f2ef6671c13b9b6b0133315814
-R 913b0f5c6deb44215505d33b5b2a96aa
-U stephan
-Z 279fbd3aa8e8b6ab1074595f5c42e719
+P e9b407a4d0a0fcd9f26d457beede19d41141327befe84be621681952be5d1e69
+R fd5bd78c383b3a5ac313c836d503f5ef
+U drh
+Z 6ca21d53ba6df71519b0f06bf84205e6
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 34165934d5..0b5ebb0171 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e9b407a4d0a0fcd9f26d457beede19d41141327befe84be621681952be5d1e69
\ No newline at end of file
+b6413a6dff8ac9b7088b1381afbbbf799e376455d11786530cc5fc825747ab53
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index a83aab58a1..1dbe349efa 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -1990,7 +1990,9 @@ static int wsToEol(const char *z){
 */
 static void eqp_append(ShellState *p, int iEqpId, int p2, const char *zText){
   EQPGraphRow *pNew;
-  i64 nText = strlen(zText);
+  i64 nText;
+  if( zText==0 ) return;
+  nText = strlen(zText);
   if( p->autoEQPtest ){
     utf8_printf(p->out, "%d,%d,%s\n", iEqpId, p2, zText);
   }

From 1b8c2467991886b970ab18011404ed12673b1df8 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 17 Oct 2022 16:47:59 +0000
Subject: [PATCH 298/428] Repair version-info.c after a local mishap caused all
 of the intended edits from [36e197cb3d0c]/[e9b407a4d0a0] to get deleted
 before checkin. Simplify version-info build (only requires sqlite3.h, not the
 library).

FossilOrigin-Name: 6e511df500c63e27f932be9d601b641144562614dead99371477eca4594fb3fd
---
 ext/wasm/GNUmakefile    | 13 ++++----
 ext/wasm/version-info.c | 72 ++++++++++++++++++++++++++++++++++++-----
 manifest                | 16 ++++-----
 manifest.uuid           |  2 +-
 4 files changed, 80 insertions(+), 23 deletions(-)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 7d910ebdaa..78f49bb8b0 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -125,9 +125,10 @@ else
   $(info Development build. Use '$(MAKE) release' for a smaller release build.)
 endif
 
-version-info: version-info.c $(sqlite3.c) $(MAKEFILE)
-	$(CC) -O0 -I$(dir.top) -o $@ $(SQLITE_OPT) $< $(sqlite3.c)
-CLEAN_FILES := version-info
+version-info := $(dir.wasm)/version-info
+$(version-info): $(dir.wasm)/version-info.c $(sqlite3.h) $(MAKEFILE)
+	$(CC) -O0 -I$(dir.top) -o $@ $<
+CLEAN_FILES := $(version-info)
 
 EXPORTED_FUNCTIONS.api.in := $(dir.api)/EXPORTED_FUNCTIONS.sqlite3-api
 
@@ -161,12 +162,12 @@ $(sqlite3-api.js): $(sqlite3-api.jses) $(MAKEFILE)
 		echo "/* END FILE: $$i */"; \
 	done > $@
 
-$(sqlite3-api-build-version.js): version-info
+$(sqlite3-api-build-version.js): $(version-info)
 	@echo "Making $@..."
 	@{ \
   echo 'self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){'; \
 	echo -n '  sqlite3.version = '; \
-  ./version-info --json; \
+  $(version-info) --json; \
   echo ';'; \
 	echo '});'; \
   } > $@
@@ -344,7 +345,7 @@ $(sqlite3.js): $(MAKEFILE) $(sqlite3.wasm.obj) \
 	chmod -x $(sqlite3.wasm)
 	$(maybe-wasm-strip) $(sqlite3.wasm)
 	@ls -la $@ $(sqlite3.wasm)
-
+$(sqlite3.wasm): $(sqlite3.js)
 CLEAN_FILES += $(sqlite3.js) $(sqlite3.wasm)
 all: $(sqlite3.js)
 wasm: $(sqlite3.js)
diff --git a/ext/wasm/version-info.c b/ext/wasm/version-info.c
index cb5083a40a..96c8e2dbee 100644
--- a/ext/wasm/version-info.c
+++ b/ext/wasm/version-info.c
@@ -12,15 +12,71 @@
 ** This file simply outputs sqlite3 version information in JSON form,
 ** intended for embedding in the sqlite3 JS API build.
 */
-#include <stdio.h>
 #include "sqlite3.h"
+#include <stdio.h>
+#include <string.h>
+
+static void usage(const char *zAppName){
+  puts("Emits version info about the sqlite3 it is built against.");
+  printf("Usage: %s [--quote] --INFO-FLAG:\n\n", zAppName);
+  puts("  --version          Emit SQLITE_VERSION (3.X.Y)");
+  puts("  --version-number   Emit SQLITE_VERSION_NUMBER (30XXYYZZ)");
+  puts("  --source-id        Emit SQLITE_SOURCE_ID");
+  puts("  --json             Emit all info in JSON form");
+  puts("\nThe non-JSON formats may be modified by:\n");
+  puts("  --quote            Add double quotes around output.");
+}
+
 int main(int argc, char const * const * argv){
-  if(argc || argv){/*unused*/}
-  printf("{\"libVersion\": \"%s\", "
-         "\"libVersionNumber\": %d, "
-         "\"sourceId\": \"%s\"}"/*missing newline is intentional*/,
-         SQLITE_VERSION,
-         SQLITE_VERSION_NUMBER,
-         SQLITE_SOURCE_ID);
+  int fJson = 0;
+  int fVersion = 0;
+  int fVersionNumber = 0;
+  int fSourceInfo = 0;
+  int fQuote = 0;
+  int nFlags = 0;
+  int i;
+
+  for( i = 1; i < argc; ++i ){
+    const char * zArg = argv[i];
+    while('-'==*zArg) ++zArg;
+    if( 0==strcmp("version", zArg) ){
+      fVersion = 1;
+    }else if( 0==strcmp("version-number", zArg) ){
+      fVersionNumber = 1;
+    }else if( 0==strcmp("source-id", zArg) ){
+      fSourceInfo = 1;
+    }else if( 0==strcmp("json", zArg) ){
+      fJson = 1;
+    }else if( 0==strcmp("quote", zArg) ){
+      fQuote = 1;
+      --nFlags;
+    }else{
+      printf("Unhandled flag: %s\n", argv[i]);
+      usage(argv[0]);
+      return 1;
+    }
+    ++nFlags;
+  }
+
+  if( 0==nFlags ) fJson = 1;
+  if( fJson ){
+    printf("{\"libVersion\": \"%s\", "
+           "\"libVersionNumber\": %d, "
+           "\"sourceId\": \"%s\"}"/*missing newline is intentional*/,
+           SQLITE_VERSION,
+           SQLITE_VERSION_NUMBER,
+           SQLITE_SOURCE_ID);
+  }else{
+    if(fQuote) printf("%c", '"');
+    if( fVersion ){
+      printf("%s", SQLITE_VERSION);
+    }else if( fVersionNumber ){
+      printf("%d", SQLITE_VERSION_NUMBER);
+    }else if( fSourceInfo ){
+      printf("%s", SQLITE_SOURCE_ID);
+    }
+    if(fQuote) printf("%c", '"');
+    puts("");
+  }
   return 0;
 }
diff --git a/manifest b/manifest
index 215cd1c292..b69cf38c6d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\spotential\scall\sto\sstrlen()\swith\sa\snull\sargument\sin\sthe\scommand-line\sshell\nfollowing\san\sOOM\serror.\s[forum:/forumpost/9c4f2ebe22|forum\spost\s9c4f2ebe22].
-D 2022-10-17T16:09:33.721
+C Repair\sversion-info.c\safter\sa\slocal\smishap\scaused\sall\sof\sthe\sintended\sedits\sfrom\s[36e197cb3d0c]/[e9b407a4d0a0]\sto\sget\sdeleted\sbefore\scheckin.\sSimplify\sversion-info\sbuild\s(only\srequires\ssqlite3.h,\snot\sthe\slibrary).
+D 2022-10-17T16:47:59.012
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -473,7 +473,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle 0e88c8cfc3719e4b7e74980d9da664c709e68acf863e48386cda376edfd3bfb0
-F ext/wasm/GNUmakefile 0fd09868726368d849c2cf03e6ac9884a07d236855c7802a89f0f8a16c034d10
+F ext/wasm/GNUmakefile a483eb1baec9bf997261908ed56f34a1dfc44eb2353e438ec9b1d2a7045c1d50
 F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 89983a8d122c35a90c65ec667844b95a78bcd04f3198a99c1e0c8368c1a0b03a
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -533,7 +533,7 @@ F ext/wasm/testing-worker1-promiser.js bd788e33c1807e0a6dda9c9a9d784bd3350ca49c9
 F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d7669fb17fcae
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
 F ext/wasm/testing2.js 88f40ef3cd8201bdadd120a711c36bbf0ce56cc0eab1d5e7debb71fed7822494
-F ext/wasm/version-info.c 03c6fb4efefd7c5b14f618b36648e71da741e39059ea5059c39495fdceaed144
+F ext/wasm/version-info.c 5fa356d38859d71a0369b5c37e1935def7413fcc8a4e349a39d9052c1d0479f4
 F ext/wasm/wasmfs.make 3cce1820006196de140f90f2da4b4ea657083fb5bfee7d125be43f7a85748c8f
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
@@ -2033,8 +2033,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 e9b407a4d0a0fcd9f26d457beede19d41141327befe84be621681952be5d1e69
-R fd5bd78c383b3a5ac313c836d503f5ef
-U drh
-Z 6ca21d53ba6df71519b0f06bf84205e6
+P b6413a6dff8ac9b7088b1381afbbbf799e376455d11786530cc5fc825747ab53
+R 178294a2ffbab5bdb66a3de75a26d638
+U stephan
+Z 39b6a8dbd3ac1d229c47b7711c3bc156
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 0b5ebb0171..ccf652c86f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b6413a6dff8ac9b7088b1381afbbbf799e376455d11786530cc5fc825747ab53
\ No newline at end of file
+6e511df500c63e27f932be9d601b641144562614dead99371477eca4594fb3fd
\ No newline at end of file

From e79a0943ed7d52b101d73c3dc1a769e0668dcecf Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 17 Oct 2022 17:34:41 +0000
Subject: [PATCH 299/428] Initial draft of archive generation for the wasm/js
 deliverables.

FossilOrigin-Name: f6cee114c71e11ca1f508c8f60be5753871cbd4fd6c45ce397824bddbf00ffd9
---
 ext/wasm/GNUmakefile |  7 +++--
 ext/wasm/dist.make   | 62 ++++++++++++++++++++++++++++++++++++++++++++
 ext/wasm/fiddle.make |  8 +++---
 ext/wasm/wasmfs.make | 20 +++-----------
 manifest             | 17 ++++++------
 manifest.uuid        |  2 +-
 6 files changed, 83 insertions(+), 33 deletions(-)
 create mode 100644 ext/wasm/dist.make

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 78f49bb8b0..a683a91416 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -521,9 +521,9 @@ endif
 
 ########################################################################
 # Create deliverables: TODO
-#ifneq (,$(filter dist,$(MAKECMDGOALS)))
-#include dist.make
-#endif
+ifneq (,$(filter dist,$(MAKECMDGOALS)))
+include dist.make
+endif
 
 ########################################################################
 # Push files to public wasm-testing.sqlite.org server
@@ -539,4 +539,3 @@ push:
     $(wasm-testing.include) $(wasm-testing.dest)
 	ssh wasm-testing 'cd $(wasm-testing.dir) && bash .gzip' || \
     echo "SSH failed: it's likely that stale content will be served via old gzip files." 
-
diff --git a/ext/wasm/dist.make b/ext/wasm/dist.make
new file mode 100644
index 0000000000..84abe393a2
--- /dev/null
+++ b/ext/wasm/dist.make
@@ -0,0 +1,62 @@
+#!/do/not/make
+#^^^ help emacs select edit mode
+#
+# Intended to include'd by ./GNUmakefile.
+#
+# 'make dist' rules for creating a distribution archive of the WASM/JS
+# pieces, noting that we only build a dist of the built files, not the
+# numerous pieces required to build them.
+#######################################################################
+MAKEFILE.dist := $(lastword $(MAKEFILE_LIST))
+
+
+########################################################################
+# Chicken/egg situation: we need $(version-info) to get the version
+# info for the archive name, but that binary may not yet be built, so
+# we have to use a temporary name for the archive.
+dist-name = sqlite-wasm-TEMP
+dist-archive = $(dist-name).zip
+
+#ifeq (0,1)
+#  $(info WARNING  *******************************************************************)
+#  $(info ** Be sure to create the desired build configuration before creating the)
+#  $(info ** distribution archive. Use one of the following targets to do so:)
+#  $(info **   o2: builds with -O2, resulting in the fastest builds)
+#  $(info **   oz: builds with -Oz, resulting in the smallest builds)
+#  $(info /WARNING *******************************************************************)
+#endif
+
+demo-123.html := $(dir.wasm)/demo-123.html
+demo-123-worker.html := $(dir.wasm)/demo-123-worker.html
+demo-123.js := $(dir.wasm)/demo-123.js
+demo-files := $(demo-123.js) $(demo-123.html) $(demo-123-worker.html)
+README-dist := $(dir.wasm)/README-dist.txt
+$(dist-archive): $(sqlite3.wasm) $(sqlite3.js) $(sqlite3-wasmfs.wasm) $(sqlite3-wasmfs.js)
+#$(dist-archive): $(sqlite3.h) $(sqlite3.c) $(sqlite3-wasm.c)
+$(dist-archive): $(MAKEFILE.dist) $(version-info) $(demo-files) $(README-dist)
+$(dist-archive): oz
+	rm -fr $(dist-name)
+	mkdir -p $(dist-name)/main $(dist-name)/wasmfs
+	cp -p $(README-dist) $(dist-name)/README.txt
+	cp -p $(sqlite3.wasm) $(sqlite3.js) $(dist-name)/main
+	cp -p $(demo-files) $(dist-name)/main
+	cp -p $(sqlite3-wasmfs.wasm) $(sqlite3-wasmfs.js) $(dist-name)/wasmfs
+	for i in $(demo-123.js) $(demo-123.html); do \
+    sed -e 's/\bsqlite3\.js\b/sqlite3-wasmfs.js/' $$i \
+      > $(dist-name)/wasmfs/$${i##*/} || exit; \
+  done
+	vnum=$$($(version-info) --version-number); \
+	vdir=sqlite-wasm-$$vnum; \
+	arc=$$vdir.zip; \
+	rm -f $$arc; \
+	mv $(dist-name) $$vdir; \
+	zip -qr $$arc $$vdir; \
+	rm -fr $$vdir; \
+	ls -la $$arc; \
+	unzip -l $$arc
+
+#$(shell $(version-info) --version-number)
+dist: $(dist-archive)
+clean-dist:
+	rm -f $(dist-archive)
+clean: clean-dist
diff --git a/ext/wasm/fiddle.make b/ext/wasm/fiddle.make
index 585add4270..6f90024811 100644
--- a/ext/wasm/fiddle.make
+++ b/ext/wasm/fiddle.make
@@ -46,11 +46,11 @@ fiddle.EXPORTED_FUNCTIONS.in := \
     EXPORTED_FUNCTIONS.api
 
 EXPORTED_FUNCTIONS.fiddle: $(fiddle.EXPORTED_FUNCTIONS.in) $(MAKEFILE.fiddle)
-	grep -h -v jaccwabyt $(fiddle.EXPORTED_FUNCTIONS.in) | sort -u > $@
+	sort -u $(fiddle.EXPORTED_FUNCTIONS.in) > $@
 
 fiddle-module.js := $(dir.fiddle)/fiddle-module.js
 fiddle-module.wasm := $(subst .js,.wasm,$(fiddle-module.js))
-fiddle.cs := $(dir.top)/shell.c $(sqlite3-wasm.c)
+fiddle.cses := $(dir.top)/shell.c $(sqlite3-wasm.c)
 
 SOAP.js := sqlite3-opfs-async-proxy.js
 $(dir.fiddle)/$(SOAP.js): $(SOAP.js)
@@ -59,10 +59,10 @@ $(dir.fiddle)/$(SOAP.js): $(SOAP.js)
 $(eval $(call call-make-pre-js,fiddle-module))
 $(fiddle-module.js): $(MAKEFILE) $(MAKEFILE.fiddle) \
     EXPORTED_FUNCTIONS.fiddle EXPORTED_RUNTIME_METHODS.fiddle \
-    $(fiddle.cs) $(pre-post-fiddle-module.deps) $(dir.fiddle)/$(SOAP.js)
+    $(fiddle.cses) $(pre-post-fiddle-module.deps) $(dir.fiddle)/$(SOAP.js)
 	$(emcc.bin) -o $@ $(fiddle.emcc-flags) \
     $(pre-post-common.flags) $(pre-post-fiddle-module.flags) \
-    $(fiddle.cs)
+    $(fiddle.cses)
 	$(maybe-wasm-strip) $(fiddle-module.wasm)
 	gzip < $@ > $@.gz
 	gzip < $(fiddle-module.wasm) > $(fiddle-module.wasm).gz
diff --git a/ext/wasm/wasmfs.make b/ext/wasm/wasmfs.make
index fa8320e585..ee7b9f12bc 100644
--- a/ext/wasm/wasmfs.make
+++ b/ext/wasm/wasmfs.make
@@ -9,7 +9,6 @@ MAKEFILE.wasmfs := $(lastword $(MAKEFILE_LIST))
 
 sqlite3-wasmfs.js     := sqlite3-wasmfs.js
 sqlite3-wasmfs.wasm   := sqlite3-wasmfs.wasm
-sqlite3-wasmfs.wasm.c := $(dir.api)/sqlite3-wasm.c
 
 CLEAN_FILES += $(sqlite3-wasmfs.js) $(sqlite3-wasmfs.wasm) \
     $(subst .js,.worker.js,$(sqlite3-wasmfs.js))
@@ -27,12 +26,6 @@ sqlite3-wasmfs.cflags += -pthread
 sqlite3-wasmfs.cflags += -I. -I.. -I$(dir.top)
 sqlite3-wasmfs.cflags += $(SQLITE_OPT) -DSQLITE_WASM_WASMFS
 
-sqlite3-wasmfs.extra.c :=
-ifeq (1,1)
-  # To get testing1.js to run with $(sqlite3-wasmfs.js) we need...
-  sqlite3-wasmfs.extra.c += $(jaccwabyt_test.c)
-endif
-
 ########################################################################
 # emcc flags specific to building the final .js/.wasm file...
 sqlite3-wasmfs.jsflags := -fPIC
@@ -42,12 +35,7 @@ sqlite3-wasmfs.jsflags += -sMODULARIZE
 sqlite3-wasmfs.jsflags += -sSTRICT_JS
 sqlite3-wasmfs.jsflags += -sDYNAMIC_EXECUTION=0
 sqlite3-wasmfs.jsflags += -sNO_POLYFILL
-ifeq (,$(sqlite3-wasmfs.extra.c))
-  sqlite3-wasmfs.jsflags += -sEXPORTED_FUNCTIONS=@$(dir.api)/EXPORTED_FUNCTIONS.sqlite3-api
-else
-  # need more exports for jaccwabyt test code...
-  sqlite3-wasmfs.jsflags += -sEXPORTED_FUNCTIONS=@$(dir.wasm)/EXPORTED_FUNCTIONS.api
-endif
+sqlite3-wasmfs.jsflags += -sEXPORTED_FUNCTIONS=@$(dir.api)/EXPORTED_FUNCTIONS.sqlite3-api
 sqlite3-wasmfs.jsflags += -sEXPORTED_RUNTIME_METHODS=FS,wasmMemory,allocateUTF8OnStack
                                             # wasmMemory ==> for -sIMPORTED_MEMORY
                                             # allocateUTF8OnStack ==> wasmfs internals
@@ -78,17 +66,17 @@ sqlite3-wasmfs.jsflags += $(sqlite3-wasmfs.fsflags)
 sqlite3-wasmfs.jsflags += -sWASM_BIGINT=$(emcc_enable_bigint)
 $(eval $(call call-make-pre-js,sqlite3-wasmfs))
 sqlite3-wasmfs.jsflags += $(pre-post-common.flags) $(pre-post-sqlite3-wasmfs.flags)
-$(sqlite3-wasmfs.js): $(sqlite3-wasmfs.wasm.c) $(sqlite3-wasm.c) $(sqlite3-wasmfs.extra.c) \
+$(sqlite3-wasmfs.js): $(sqlite3-wasm.c) \
     EXPORTED_FUNCTIONS.api $(MAKEFILE) $(MAKEFILE.wasmfs) \
     $(pre-post-sqlite3-wasmfs.deps)
 	@echo "Building $@ ..."
 	$(emcc.bin) -o $@ $(emcc_opt_full) $(emcc.flags) \
       $(sqlite3-wasmfs.cflags) $(sqlite3-wasmfs.jsflags) \
-     $(sqlite3-wasmfs.wasm.c) $(sqlite3-wasmfs.extra.c)
+     $(sqlite3-wasm.c)
 	chmod -x $(sqlite3-wasmfs.wasm)
 	$(maybe-wasm-strip) $(sqlite3-wasmfs.wasm)
 	@ls -la $@ $(sqlite3-wasmfs.wasm)
-
+$(sqlite3-wasmfs.wasm): $(sqlite3-wasmfs.js)
 wasmfs: $(sqlite3-wasmfs.js)
 all: wasmfs
 
diff --git a/manifest b/manifest
index b69cf38c6d..c6570296a3 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Repair\sversion-info.c\safter\sa\slocal\smishap\scaused\sall\sof\sthe\sintended\sedits\sfrom\s[36e197cb3d0c]/[e9b407a4d0a0]\sto\sget\sdeleted\sbefore\scheckin.\sSimplify\sversion-info\sbuild\s(only\srequires\ssqlite3.h,\snot\sthe\slibrary).
-D 2022-10-17T16:47:59.012
+C Initial\sdraft\sof\sarchive\sgeneration\sfor\sthe\swasm/js\sdeliverables.
+D 2022-10-17T17:34:41.824
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -473,7 +473,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle 0e88c8cfc3719e4b7e74980d9da664c709e68acf863e48386cda376edfd3bfb0
-F ext/wasm/GNUmakefile a483eb1baec9bf997261908ed56f34a1dfc44eb2353e438ec9b1d2a7045c1d50
+F ext/wasm/GNUmakefile 2fd83d7183bce3f9236fdd2dbe20a4ea37b1d7b26e1a422054ec63008319f065
 F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 89983a8d122c35a90c65ec667844b95a78bcd04f3198a99c1e0c8368c1a0b03a
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -503,7 +503,8 @@ F ext/wasm/demo-123.html 7c239c9951d1b113f9f532969ac039294cf1dcfee2b3ae0a2c1ed2b
 F ext/wasm/demo-123.js e0cbeb3495e14103763d5c49794a24d67cf3d78e0ed5b82843be70c0c2ee4b3b
 F ext/wasm/demo-kvvfs1.html 7d4f28873de67f51ac18c584b7d920825139866a96049a49c424d6f5a0ea5e7f
 F ext/wasm/demo-kvvfs1.js 105596bd2ccd0b1deb5fde8e99b536e8242d4bb5932fac0c8403ff3a6bc547e8
-F ext/wasm/fiddle.make 3f4efd62bc2a9c883bfcea52ae2755114a62d444d6d042df287f4aef301d6c6c
+F ext/wasm/dist.make d7076e90f04396f1cc54cb41ee106451496179c10d54bbdebb65ae7b1ae12211
+F ext/wasm/fiddle.make b609dfde299b4523d7123b7e0cecaa1a0aff0dd984e62cea653aae91f5063c90
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js 531859a471924a0ea48afa218e6877f0c164ca324d51e15843ed6ecc1c65c7ee
 F ext/wasm/fiddle/fiddle.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
@@ -534,7 +535,7 @@ F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d766
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
 F ext/wasm/testing2.js 88f40ef3cd8201bdadd120a711c36bbf0ce56cc0eab1d5e7debb71fed7822494
 F ext/wasm/version-info.c 5fa356d38859d71a0369b5c37e1935def7413fcc8a4e349a39d9052c1d0479f4
-F ext/wasm/wasmfs.make 3cce1820006196de140f90f2da4b4ea657083fb5bfee7d125be43f7a85748c8f
+F ext/wasm/wasmfs.make 9a51480d0a5ef33dd1c06c305379775302b735cb27737c2490ea449575ca5e25
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
@@ -2033,8 +2034,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 b6413a6dff8ac9b7088b1381afbbbf799e376455d11786530cc5fc825747ab53
-R 178294a2ffbab5bdb66a3de75a26d638
+P 6e511df500c63e27f932be9d601b641144562614dead99371477eca4594fb3fd
+R ac89799bd8dcc9e62a5727e545f26c38
 U stephan
-Z 39b6a8dbd3ac1d229c47b7711c3bc156
+Z 4dda775375ae46314750ace83110f63b
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index ccf652c86f..03196c2b8b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6e511df500c63e27f932be9d601b641144562614dead99371477eca4594fb3fd
\ No newline at end of file
+f6cee114c71e11ca1f508c8f60be5753871cbd4fd6c45ce397824bddbf00ffd9
\ No newline at end of file

From ce152a436923a4208f56205140abc6e10edb549c Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 17 Oct 2022 17:36:11 +0000
Subject: [PATCH 300/428] Add ext/wasm/README-dist.txt, intended to have been
 in the previous checkin.

FossilOrigin-Name: c9080b6505b839cc0bb5bd25ce7df0daa91a0a303d037ffe6e77888c8584b932
---
 ext/wasm/README-dist.txt | 26 ++++++++++++++++++++++++++
 manifest                 | 11 ++++++-----
 manifest.uuid            |  2 +-
 3 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 ext/wasm/README-dist.txt

diff --git a/ext/wasm/README-dist.txt b/ext/wasm/README-dist.txt
new file mode 100644
index 0000000000..ecb906acdc
--- /dev/null
+++ b/ext/wasm/README-dist.txt
@@ -0,0 +1,26 @@
+This is the README for the sqlite3 WASM/JS distribution.
+
+Main project page: https://sqlite.org
+
+TODO: link to main WASM/JS docs, once they are online
+
+This archive contains two related deliverables:
+
+- ./main contains the sqlite3.js and sqlite3.wasm file which make up
+  the standard sqlite3 WASM/JS build.
+
+- ./wasmfs contains a build of those files which includes the
+  Emscripten WASMFS[^1]. It offers an alternative approach
+  to accessing the browser-side Origin-Private FileSystem
+  but is less portable than the main build, so is provided
+  as a separate binary.
+
+Both directories contain small demonstration apps. Browsers will not
+server WASM files from file:// URLs, so the demonstrations require a
+web server and that server must include the following headers in its
+response when serving the files:
+
+    Cross-Origin-Opener-Policy: same-origin
+    Cross-Origin-Embedder-Policy: require-corp
+
+[^1]: https://emscripten.org
diff --git a/manifest b/manifest
index c6570296a3..412021640a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Initial\sdraft\sof\sarchive\sgeneration\sfor\sthe\swasm/js\sdeliverables.
-D 2022-10-17T17:34:41.824
+C Add\sext/wasm/README-dist.txt,\sintended\sto\shave\sbeen\sin\sthe\sprevious\scheckin.
+D 2022-10-17T17:36:11.919
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,6 +474,7 @@ F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle 0e88c8cfc3719e4b7e74980d9da664c709e68acf863e48386cda376edfd3bfb0
 F ext/wasm/GNUmakefile 2fd83d7183bce3f9236fdd2dbe20a4ea37b1d7b26e1a422054ec63008319f065
+F ext/wasm/README-dist.txt bc1fb4f90a28ad2ed0e555a637f393b9249d8d928ac509dad6293b7cae628ea4
 F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 89983a8d122c35a90c65ec667844b95a78bcd04f3198a99c1e0c8368c1a0b03a
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -2034,8 +2035,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 6e511df500c63e27f932be9d601b641144562614dead99371477eca4594fb3fd
-R ac89799bd8dcc9e62a5727e545f26c38
+P f6cee114c71e11ca1f508c8f60be5753871cbd4fd6c45ce397824bddbf00ffd9
+R 94e4f6969f6fba48019898e2b4d88284
 U stephan
-Z 4dda775375ae46314750ace83110f63b
+Z 0dd260cfe444ff6950e06a618165a6ba
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 03196c2b8b..f47af71200 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f6cee114c71e11ca1f508c8f60be5753871cbd4fd6c45ce397824bddbf00ffd9
\ No newline at end of file
+c9080b6505b839cc0bb5bd25ce7df0daa91a0a303d037ffe6e77888c8584b932
\ No newline at end of file

From 43fce6bb0d85d596615f9f71b040dfa5ef395d65 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Tue, 18 Oct 2022 10:27:06 +0000
Subject: [PATCH 301/428] Fix sqlite3VdbeRecordCompareWithSkip() so that it
 sorts the internal-use serial-type of 10 together with NULLs. dbsqlfuzz
 5ff35e9d49a5fcca5051e23960ff2f483a538bab

FossilOrigin-Name: 4fb77e96fa89a23a9365320c4190834edd6c09cfaf1ca30b34ce19b747ebbec0
---
 manifest      | 14 +++++++-------
 manifest.uuid |  2 +-
 src/vdbeaux.c |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index 412021640a..afb62b8e86 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sext/wasm/README-dist.txt,\sintended\sto\shave\sbeen\sin\sthe\sprevious\scheckin.
-D 2022-10-17T17:36:11.919
+C Fix\ssqlite3VdbeRecordCompareWithSkip()\sso\sthat\sit\ssorts\sthe\sinternal-use\nserial-type\sof\s10\stogether\swith\sNULLs.\ndbsqlfuzz\s5ff35e9d49a5fcca5051e23960ff2f483a538bab
+D 2022-10-18T10:27:06.495
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -697,7 +697,7 @@ F src/vdbe.c 0c7cb1b934ad8611e14e7efaf2c3a95df7dd3f7964d63ea07fef42a23df86131
 F src/vdbe.h 58675f47dcf3105bab182c3ad3726efd60ffd003e954386904ac9107d0d2b743
 F src/vdbeInt.h 17b7461ffcf9ee760d1341731715a419f6b8c763089a7ece25c2e8098d702b3f
 F src/vdbeapi.c 1e8713d0b653acb43cd1bdf579c40e005c4844ea90f414f065946a83db3c27fb
-F src/vdbeaux.c 6946c7082a0d61566794bd35253f0ccd013a9dba3f33488a23fd5360a5744e5b
+F src/vdbeaux.c fe4e8d270582d5eb7c4d44222b74584d8e47c5e6ba90849416115ce5eb47d5a4
 F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
 F src/vdbemem.c 6cfed43758d57b6e3b99d9cdedfeccd86e45a07e427b22d8487cbdbebb6c522a
 F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
@@ -2035,8 +2035,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 f6cee114c71e11ca1f508c8f60be5753871cbd4fd6c45ce397824bddbf00ffd9
-R 94e4f6969f6fba48019898e2b4d88284
-U stephan
-Z 0dd260cfe444ff6950e06a618165a6ba
+P c9080b6505b839cc0bb5bd25ce7df0daa91a0a303d037ffe6e77888c8584b932
+R c6933aa36b3965399e80dc36fb15b922
+U drh
+Z f66ba4d30fb256e3ce3a8281933b3c32
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f47af71200..82a1ebdb17 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c9080b6505b839cc0bb5bd25ce7df0daa91a0a303d037ffe6e77888c8584b932
\ No newline at end of file
+4fb77e96fa89a23a9365320c4190834edd6c09cfaf1ca30b34ce19b747ebbec0
\ No newline at end of file
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 18bbcd2f97..67de532d80 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -4691,7 +4691,7 @@ int sqlite3VdbeRecordCompareWithSkip(
     /* RHS is null */
     else{
       serial_type = aKey1[idx1];
-      rc = (serial_type!=0);
+      rc = (serial_type!=0 && serial_type!=10);
     }
 
     if( rc!=0 ){

From 0e522c068a8ff85aaadc4e61ab57a4090908a2da Mon Sep 17 00:00:00 2001
From: drh <>
Date: Tue, 18 Oct 2022 13:27:31 +0000
Subject: [PATCH 302/428] Correct sort order for serial-type 10 entries in the
 database file.  This is a continuation of [4fb77e96fa89a23a].

FossilOrigin-Name: 904b54625d985e742888e06ba792cab316b9ec9d6669d9cf509bac48030373ca
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/vdbeaux.c |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index afb62b8e86..c13ee1adf0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\ssqlite3VdbeRecordCompareWithSkip()\sso\sthat\sit\ssorts\sthe\sinternal-use\nserial-type\sof\s10\stogether\swith\sNULLs.\ndbsqlfuzz\s5ff35e9d49a5fcca5051e23960ff2f483a538bab
-D 2022-10-18T10:27:06.495
+C Correct\ssort\sorder\sfor\sserial-type\s10\sentries\sin\sthe\sdatabase\sfile.\s\sThis\nis\sa\scontinuation\sof\s[4fb77e96fa89a23a].
+D 2022-10-18T13:27:31.501
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -697,7 +697,7 @@ F src/vdbe.c 0c7cb1b934ad8611e14e7efaf2c3a95df7dd3f7964d63ea07fef42a23df86131
 F src/vdbe.h 58675f47dcf3105bab182c3ad3726efd60ffd003e954386904ac9107d0d2b743
 F src/vdbeInt.h 17b7461ffcf9ee760d1341731715a419f6b8c763089a7ece25c2e8098d702b3f
 F src/vdbeapi.c 1e8713d0b653acb43cd1bdf579c40e005c4844ea90f414f065946a83db3c27fb
-F src/vdbeaux.c fe4e8d270582d5eb7c4d44222b74584d8e47c5e6ba90849416115ce5eb47d5a4
+F src/vdbeaux.c 6d0a75c1fbc7efea6924f6895ebceca664001464bc7ac56949d3c60aa5e498a0
 F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
 F src/vdbemem.c 6cfed43758d57b6e3b99d9cdedfeccd86e45a07e427b22d8487cbdbebb6c522a
 F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
@@ -2035,8 +2035,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 c9080b6505b839cc0bb5bd25ce7df0daa91a0a303d037ffe6e77888c8584b932
-R c6933aa36b3965399e80dc36fb15b922
+P 4fb77e96fa89a23a9365320c4190834edd6c09cfaf1ca30b34ce19b747ebbec0
+R 5c6e987358d9e0bba6df4dc33586711a
 U drh
-Z f66ba4d30fb256e3ce3a8281933b3c32
+Z 8c0c9fb2c03809d55de676732eaf3a4b
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 82a1ebdb17..250cad019b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4fb77e96fa89a23a9365320c4190834edd6c09cfaf1ca30b34ce19b747ebbec0
\ No newline at end of file
+904b54625d985e742888e06ba792cab316b9ec9d6669d9cf509bac48030373ca
\ No newline at end of file
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 67de532d80..131740ac6c 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -4585,7 +4585,7 @@ int sqlite3VdbeRecordCompareWithSkip(
       serial_type = aKey1[idx1];
       testcase( serial_type==12 );
       if( serial_type>=10 ){
-        rc = +1;
+        rc = serial_type==10 ? -1 : +1;
       }else if( serial_type==0 ){
         rc = -1;
       }else if( serial_type==7 ){
@@ -4610,7 +4610,7 @@ int sqlite3VdbeRecordCompareWithSkip(
         ** numbers). Types 10 and 11 are currently "reserved for future 
         ** use", so it doesn't really matter what the results of comparing
         ** them to numberic values are.  */
-        rc = +1;
+        rc = serial_type==10 ? -1 : +1;
       }else if( serial_type==0 ){
         rc = -1;
       }else{

From ac79fa1c785b4660761a0a98ec7f86d7568fd5ec Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Tue, 18 Oct 2022 15:02:08 +0000
Subject: [PATCH 303/428] Add new test file windowE.test, to test the window
 functions modules response to an inconsistent collation sequence.

FossilOrigin-Name: 740a2eb0928d54fdf735a8e573c6a61a34dbd295b46e5b6ef39e957fd2623293
---
 manifest          | 13 ++++++-----
 manifest.uuid     |  2 +-
 test/windowE.test | 58 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+), 7 deletions(-)
 create mode 100644 test/windowE.test

diff --git a/manifest b/manifest
index c13ee1adf0..cb6da43b72 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Correct\ssort\sorder\sfor\sserial-type\s10\sentries\sin\sthe\sdatabase\sfile.\s\sThis\nis\sa\scontinuation\sof\s[4fb77e96fa89a23a].
-D 2022-10-18T13:27:31.501
+C Add\snew\stest\sfile\swindowE.test,\sto\stest\sthe\swindow\sfunctions\smodules\sresponse\sto\san\sinconsistent\scollation\ssequence.
+D 2022-10-18T15:02:08.725
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1905,6 +1905,7 @@ F test/windowA.test 6d63dc1260daa17141a55007600581778523a8b420629f1282d2acfc36af
 F test/windowB.test f2fb42b864b0cf431c956407583e9478a74c3642bdf8737fdcb6ff4a40298b07
 F test/windowC.test 6fd75f5bb2f1343d34e470e36e68f0ff638d8a42f6aa7d99471261b31a0d42f2
 F test/windowD.test 65cf5a765fb8072450e8a0de2979ce7f09a38d87724fe1280c6444073e3da49b
+F test/windowE.test 6ba0c8048e4cc02b942e56640f8fcd50fd7ca72c876656c40f6baf42e316684c
 F test/windowerr.tcl f5acd6fbc210d7b5546c0e879d157888455cd4a17a1d3f28f07c1c8a387019e0
 F test/windowerr.test a8b752402109c15aa1c5efe1b93ccb0ce1ef84fa964ae1cd6684dd0b3cc1819b
 F test/windowfault.test 15094c1529424e62f798bc679e3fe9dfab6e8ba2f7dfe8c923b6248c31660a7c
@@ -2035,8 +2036,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 4fb77e96fa89a23a9365320c4190834edd6c09cfaf1ca30b34ce19b747ebbec0
-R 5c6e987358d9e0bba6df4dc33586711a
-U drh
-Z 8c0c9fb2c03809d55de676732eaf3a4b
+P 904b54625d985e742888e06ba792cab316b9ec9d6669d9cf509bac48030373ca
+R 609c010622cb8a1edf242ffa07ea33a0
+U dan
+Z 47ec91d5045ad14459bc2cd80292963b
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 250cad019b..d617a968ca 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-904b54625d985e742888e06ba792cab316b9ec9d6669d9cf509bac48030373ca
\ No newline at end of file
+740a2eb0928d54fdf735a8e573c6a61a34dbd295b46e5b6ef39e957fd2623293
\ No newline at end of file
diff --git a/test/windowE.test b/test/windowE.test
new file mode 100644
index 0000000000..f20bcdaaa8
--- /dev/null
+++ b/test/windowE.test
@@ -0,0 +1,58 @@
+# 2022 October 18
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+#
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+set testprefix windowE
+
+proc custom {a b} { return [string compare $a $b] }
+db collate custom custom
+
+do_execsql_test 1.0 {
+  CREATE TABLE t1(a INTEGER PRIMARY KEY, b TEXT COLLATE custom);
+  INSERT INTO t1 VALUES(1, 'one');
+  INSERT INTO t1 VALUES(2, 'two');
+  INSERT INTO t1 VALUES(3, 'three');
+  INSERT INTO t1 VALUES(4, 'four');
+  INSERT INTO t1 VALUES(5, 'five');
+  INSERT INTO t1 VALUES(6, 'six');
+  CREATE INDEX t1b ON t1(b);
+}
+
+do_execsql_test 1.1 {
+  SELECT * FROM t1
+} {
+  1 one 2 two 3 three 4 four 5 five 6 six
+}
+
+do_execsql_test 1.2 {
+  SELECT group_concat(a,',') OVER win FROM t1 
+  WINDOW win AS (
+    ORDER BY b RANGE BETWEEN 1 PRECEDING AND 2 PRECEDING
+  )
+} {
+  5 4 1 6 3 2
+}
+
+proc custom {a b} { return [string compare $b $a] }
+
+do_execsql_test 1.3 {
+  SELECT group_concat(a,',') OVER win FROM t1 
+  WINDOW win AS (
+    ORDER BY b RANGE BETWEEN 1 PRECEDING AND 2 PRECEDING
+  )
+} {
+  5 5,4 5,4,1 5,4,1,6 5,4,1,6,3 5,4,1,6,3,2
+}
+
+finish_test
+

From a331cf7e5792949ada1371bf61fdbf3b26e9d8d5 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Tue, 18 Oct 2022 16:47:41 +0000
Subject: [PATCH 304/428] Fix the indexed expression resolver for generated
 columns so that it picks the correct table in a self-join.

FossilOrigin-Name: 54c3eb085aca92da2b819f3532ee4750b377265f7e1e914600ea3c3d535efe51
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/expr.c    | 20 +++++++++++---------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/manifest b/manifest
index 7dd1de75d8..8307bc415b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\srecent\strunk\sfixes\sinto\sthe\sindex-expr-opt\sbranch.
-D 2022-10-18T16:32:22.335
+C Fix\sthe\sindexed\sexpression\sresolver\sfor\sgenerated\scolumns\sso\sthat\sit\spicks\nthe\scorrect\stable\sin\sa\sself-join.
+D 2022-10-18T16:47:41.814
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -571,7 +571,7 @@ F src/date.c 94ce83b4cd848a387680a5f920c9018c16655db778c4d36525af0a0f34679ac5
 F src/dbpage.c 5808e91bc27fa3981b028000f8fadfdc10ce9e59a34ce7dc4e035a69be3906ec
 F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
 F src/delete.c 86573edae75e3d3e9a8b590d87db8e47222103029df4f3e11fa56044459b514e
-F src/expr.c ba67701bd7621ebba9c472fcc2dbd4f6444260530e694fa9d87281f9aedec93c
+F src/expr.c 74a947891247873696385bf910e60c60e50283bbc0e8ef90b571ac60bc4b6279
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 722f20779f5342a787922deded3628d8c74b5249cab04098cf17ee2f2aaff002
 F src/func.c fe2a795ad647ce42054873ac91c43beb7b5d204892903a67f6e7e314379b9d4a
@@ -2036,8 +2036,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 c7b9cc645b394a1b638a9a13ca83d321215aaa78d69ca70c6baa0ee692ed21bf 740a2eb0928d54fdf735a8e573c6a61a34dbd295b46e5b6ef39e957fd2623293
-R f7f5f954c4cc82eef2f394d97ecd28bc
+P 6198ab4b871c464448ae303072bde0a810cac566a516cc29b1bf806fbd0a6c7b
+R 51dcaf4cc6cc82ca16d600c0c30b38d8
 U drh
-Z 298a7ba276579f138f35bb1c8d732eed
+Z c6035e9224ad1746d908acc7b5320c40
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 52c2ac163e..9e3658c558 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6198ab4b871c464448ae303072bde0a810cac566a516cc29b1bf806fbd0a6c7b
\ No newline at end of file
+54c3eb085aca92da2b819f3532ee4750b377265f7e1e914600ea3c3d535efe51
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index 30f9031e21..c2e399f119 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -4057,8 +4057,13 @@ static SQLITE_NOINLINE int sqlite3IndexedExprLookup(
   IndexedExpr *p;
   Vdbe *v;
   for(p=pParse->pIdxExpr; p; p=p->pIENext){
-    if( p->iDataCur<0 ) continue;
-    if( sqlite3ExprCompare(0, pExpr, p->pExpr, p->iDataCur)!=0 ) continue;
+    int iDataCur = p->iDataCur;
+    if( iDataCur<0 ) continue;
+    if( pParse->iSelfTab ){
+      if( p->iDataCur!=pParse->iSelfTab-1 ) continue;
+      iDataCur = -1;
+    }
+    if( sqlite3ExprCompare(0, pExpr, p->pExpr, iDataCur)!=0 ) continue;
     v = pParse->pVdbe;
     assert( v!=0 );
     if( p->bMaybeNullRow ){
@@ -4108,17 +4113,14 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){
   assert( target>0 && target<=pParse->nMem );
   assert( v!=0 );
 
-  if( pParse->pIdxExpr!=0 
-   && pExpr!=0
+expr_code_doover:
+  if( pExpr==0 ){
+    op = TK_NULL;
+  }else if( pParse->pIdxExpr!=0 
    && !ExprHasProperty(pExpr, EP_Leaf)
    && (r1 = sqlite3IndexedExprLookup(pParse, pExpr, target))>=0
   ){
     return r1;
-  }
-
-expr_code_doover:
-  if( pExpr==0 ){
-    op = TK_NULL;
   }else{
     assert( !ExprHasVVAProperty(pExpr,EP_Immutable) );
     op = pExpr->op;

From 7a2a8cee5a8f8117a0960be062c3107900d335b2 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Tue, 18 Oct 2022 20:27:02 +0000
Subject: [PATCH 305/428] Improved byte-code comments for the OP_Column opcodes
 used by the indexed expression optimization.

FossilOrigin-Name: bf6d837fddbf74d5b3f40ad01ea4564edfac00b651d6f3f0e996cc5dc18bb06c
---
 manifest        | 16 ++++++++--------
 manifest.uuid   |  2 +-
 src/expr.c      |  2 ++
 src/sqliteInt.h |  3 +++
 src/where.c     |  3 +++
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index 8307bc415b..dbc666f750 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sindexed\sexpression\sresolver\sfor\sgenerated\scolumns\sso\sthat\sit\spicks\nthe\scorrect\stable\sin\sa\sself-join.
-D 2022-10-18T16:47:41.814
+C Improved\sbyte-code\scomments\sfor\sthe\sOP_Column\sopcodes\sused\sby\sthe\nindexed\sexpression\soptimization.
+D 2022-10-18T20:27:02.327
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -571,7 +571,7 @@ F src/date.c 94ce83b4cd848a387680a5f920c9018c16655db778c4d36525af0a0f34679ac5
 F src/dbpage.c 5808e91bc27fa3981b028000f8fadfdc10ce9e59a34ce7dc4e035a69be3906ec
 F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
 F src/delete.c 86573edae75e3d3e9a8b590d87db8e47222103029df4f3e11fa56044459b514e
-F src/expr.c 74a947891247873696385bf910e60c60e50283bbc0e8ef90b571ac60bc4b6279
+F src/expr.c 3ac1d9e87c018f804d10ab9ffa8bf55efef79c376e7ca90d21ac4ef67bfa8f25
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 722f20779f5342a787922deded3628d8c74b5249cab04098cf17ee2f2aaff002
 F src/func.c fe2a795ad647ce42054873ac91c43beb7b5d204892903a67f6e7e314379b9d4a
@@ -626,7 +626,7 @@ F src/shell.c.in a4c0754470d4fcc2c3da2f0cda0363cecf4a84273d3cc3865325c2df06d5e56
 F src/sqlite.h.in d9c8a6243fc0a1c270d69db33758e34b810af3462f9bc5b4af113b347e07c69d
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 5336beea1868d99d2f62e628dbea55e97267dbff8193291ab175e960c5df9141
-F src/sqliteInt.h ed402c12a8b0920ae28cf79631d31490376ca3eed76b386b646712a1dda9e945
+F src/sqliteInt.h 872ab50cc285de11f7fdc0ce1f0481018f14905e4e0b75da43d8cba5a03b8d8d
 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -708,7 +708,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d
 F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
-F src/where.c 3ab52180ad3a4eea7a2061bd804850f443298adbdc9264642d0a28affe26fb4c
+F src/where.c cd5b21856c18ccf739f8b2eb29a2eb97ee69cf6381b10b783a6a2a9f57b99125
 F src/whereInt.h 70cd30de9ed784aa33fa6bd1245f060617de7a00d992469b6d8e419eed915743
 F src/wherecode.c 8ec5a413f12af06638dcca36d0954be2151eea6f293d3c67397cef6a90d6adf1
 F src/whereexpr.c bf8c155212c886621d71c951053660de6fcc4ee907b17aa02da0a96a39aa9405
@@ -2036,8 +2036,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 6198ab4b871c464448ae303072bde0a810cac566a516cc29b1bf806fbd0a6c7b
-R 51dcaf4cc6cc82ca16d600c0c30b38d8
+P 54c3eb085aca92da2b819f3532ee4750b377265f7e1e914600ea3c3d535efe51
+R ae1b5d3a3c2ab2b867842bafa6837a36
 U drh
-Z c6035e9224ad1746d908acc7b5320c40
+Z cb3bd1c1a3ec2d75a54535d3d8da6ebd
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 9e3658c558..54e63697ea 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-54c3eb085aca92da2b819f3532ee4750b377265f7e1e914600ea3c3d535efe51
\ No newline at end of file
+bf6d837fddbf74d5b3f40ad01ea4564edfac00b651d6f3f0e996cc5dc18bb06c
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index c2e399f119..1a743ee5ce 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -4074,6 +4074,7 @@ static SQLITE_NOINLINE int sqlite3IndexedExprLookup(
       sqlite3VdbeAddOp3(v, OP_IfNullRow, p->iIdxCur, addr+3, target);
       VdbeCoverage(v);
       sqlite3VdbeAddOp3(v, OP_Column, p->iIdxCur, p->iIdxCol, target);
+      VdbeComment((v, "%s expr-column %d", p->zIdxName, p->iIdxCol));
       sqlite3VdbeGoto(v, 0);
       p = pParse->pIdxExpr;
       pParse->pIdxExpr = 0;
@@ -4082,6 +4083,7 @@ static SQLITE_NOINLINE int sqlite3IndexedExprLookup(
       sqlite3VdbeJumpHere(v, addr+2);
     }else{
       sqlite3VdbeAddOp3(v, OP_Column, p->iIdxCur, p->iIdxCol, target);
+      VdbeComment((v, "%s expr-column %d", p->zIdxName, p->iIdxCol));
     }
     return target;
   }
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 0e02db8cc8..a437cc0d25 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -3583,6 +3583,9 @@ struct IndexedExpr {
   int iIdxCol;            /* The index column that contains value of pExpr */
   u8 bMaybeNullRow;       /* True if we need an OP_IfNullRow check */
   IndexedExpr *pIENext;   /* Next in a list of all indexed expressions */
+#ifdef SQLITE_ENABLE_EXPLAIN_COMMENTS
+  const char *zIdxName;   /* Name of index, used only for bytecode comments */
+#endif
 };
 
 /*
diff --git a/src/where.c b/src/where.c
index 39bbf7d64c..dccf493873 100644
--- a/src/where.c
+++ b/src/where.c
@@ -5434,6 +5434,9 @@ static SQLITE_NOINLINE void whereAddIndexedExpr(
     p->iIdxCur = iIdxCur;
     p->iIdxCol = i;
     p->bMaybeNullRow = (pTabItem->fg.jointype & (JT_LEFT|JT_LTORJ))!=0;
+#ifdef SQLITE_ENABLE_EXPLAIN_COMMENTS
+    p->zIdxName = pIdx->zName;
+#endif
     pParse->pIdxExpr = p;
     if( p->pIENext==0 ){
       sqlite3ParserAddCleanup(pParse, whereIndexedExprCleanup, pParse);

From b5e2e6fcd39901f3280a4bbbfec7f41d4bcc48f8 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 18 Oct 2022 20:36:50 +0000
Subject: [PATCH 306/428] More work on the JS end-user deliverables. Add
 tool/stripccomments.c to support that.

FossilOrigin-Name: 2156f0744acfe425457430a0f6a7e02de907de85edba81a6d4eef40293e561c8
---
 ext/wasm/GNUmakefile     |  42 ++++++--
 ext/wasm/README-dist.txt |   8 +-
 ext/wasm/dist.make       |  72 +++++++++----
 manifest                 |  19 ++--
 manifest.uuid            |   2 +-
 tool/stripccomments.c    | 228 +++++++++++++++++++++++++++++++++++++++
 6 files changed, 331 insertions(+), 40 deletions(-)
 create mode 100644 tool/stripccomments.c

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index a683a91416..881eabfac9 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -1,11 +1,29 @@
 ########################################################################
 # This GNU makefile drives the build of the sqlite3 WASM
 # components. It is not part of the canonical build process.
+#
+# This build assumes a Linux platform and is not intended for
+# client-level use. It is for the sqlite project's own development of
+# the JS/WASM components.
+#
+# Primary targets:
+#
+#  default, all = build in dev mode
+#
+#  o0, o1, o2, o3, os, oz = full clean/rebuild with the -Ox level indicated
+#      by the target name. Rebuild is necessary for all components to get
+#      the desired optimization level.
+#
+#  dist = create end user deliverables. Add dist-opt=oX to build with a
+#      specific optimization level, where oX is one of the above-listed
+#      o? target names.
+#
+#  clean = clean up
 ########################################################################
 SHELL := $(shell which bash 2>/dev/null)
 MAKEFILE := $(lastword $(MAKEFILE_LIST))
-all:
-release: all
+default: all
+release: default
 
 # Emscripten SDK home dir and related binaries...
 EMSDK_HOME ?= $(word 1,$(wildcard $(HOME)/src/emsdk $(HOME)/emsdk))
@@ -46,7 +64,9 @@ dir.api := api
 dir.jacc := jaccwabyt
 dir.common := common
 dir.fiddle := fiddle
+dir.tool := $(dir.top)/tool
 CLEAN_FILES := *~ $(dir.jacc)/*~ $(dir.api)/*~ $(dir.common)/*~
+DISTCLEAN_FILES := ./-dummy
 emcc_enable_bigint ?= 1
 sqlite3.c := $(dir.top)/sqlite3.c
 sqlite3.h := $(dir.top)/sqlite3.h
@@ -113,8 +133,11 @@ emcc_opt_full := $(emcc_opt) -g3
 $(sqlite3.c) $(sqlite3.h):
 	$(MAKE) -C $(dir.top) sqlite3.c
 
+.PHONY: clean distclean
 clean:
 	-rm -f $(CLEAN_FILES)
+distclean: clean
+	-rm -f $(DISTCLEAN_FILES)
 
 ifeq (release,$(filter release,$(MAKECMDGOALS)))
   ifeq (,$(wasm-strip))
@@ -128,7 +151,12 @@ endif
 version-info := $(dir.wasm)/version-info
 $(version-info): $(dir.wasm)/version-info.c $(sqlite3.h) $(MAKEFILE)
 	$(CC) -O0 -I$(dir.top) -o $@ $<
-CLEAN_FILES := $(version-info)
+DISTCLEAN_FILES += $(version-info)
+
+stripccomments := $(dir.tool)/stripccomments
+$(stripccomments): $(stripccomments).c $(MAKEFILE)
+	$(CC) -o $@ $<
+DISTCLEAN_FILES += $(stripccomments)
 
 EXPORTED_FUNCTIONS.api.in := $(dir.api)/EXPORTED_FUNCTIONS.sqlite3-api
 
@@ -480,11 +508,7 @@ push-fiddle: $(fiddle_files)
 # painful.
 
 .PHONY: o0 o1 o2 o3 os oz
-o-xtra := -g3
-# ^^^ -g3 is important to keep higher -O levels from mangling (via
-# minification), or outright removing, otherwise working code.
-
-o-xtra += -flto
+o-xtra := -flto
 # ^^^^ -flto can have a considerably performance boost at -O0 but
 # doubles the build time and seems to have negligible effect on
 # higher optimization levels.
@@ -515,7 +539,9 @@ PLATFORMS_WITH_NO_WASMFS := aarch64 # add any others here
 THIS_ARCH := $(shell /usr/bin/uname -m)
 ifneq (,$(filter $(THIS_ARCH),$(PLATFORMS_WITH_NO_WASMFS)))
 $(info This platform does not support the WASMFS build.)
+HAVE_WASMFS := 0
 else
+HAVE_WASMFS := 1
 include wasmfs.make
 endif
 
diff --git a/ext/wasm/README-dist.txt b/ext/wasm/README-dist.txt
index ecb906acdc..bbc82a1df8 100644
--- a/ext/wasm/README-dist.txt
+++ b/ext/wasm/README-dist.txt
@@ -15,10 +15,10 @@ This archive contains two related deliverables:
   but is less portable than the main build, so is provided
   as a separate binary.
 
-Both directories contain small demonstration apps. Browsers will not
-server WASM files from file:// URLs, so the demonstrations require a
-web server and that server must include the following headers in its
-response when serving the files:
+Both directories contain small demonstration and test apps. Browsers
+will not serve WASM files from file:// URLs, so the demo/test apps
+require a web server and that server must include the following
+headers in its response when serving the files:
 
     Cross-Origin-Opener-Policy: same-origin
     Cross-Origin-Embedder-Policy: require-corp
diff --git a/ext/wasm/dist.make b/ext/wasm/dist.make
index 84abe393a2..cb13b0bd92 100644
--- a/ext/wasm/dist.make
+++ b/ext/wasm/dist.make
@@ -9,51 +9,87 @@
 #######################################################################
 MAKEFILE.dist := $(lastword $(MAKEFILE_LIST))
 
+ifeq (0,$(HAVE_WASMFS))
+$(error The 'dist' target needs to be run on a WASMFS-capable platform.)
+endif
 
 ########################################################################
 # Chicken/egg situation: we need $(version-info) to get the version
-# info for the archive name, but that binary may not yet be built, so
-# we have to use a temporary name for the archive.
+# info for the archive name, but that binary may not yet be built, and
+# won't be built until we expand the dependencies. We have to use a
+# temporary name for the archive.
 dist-name = sqlite-wasm-TEMP
 dist-archive = $(dist-name).zip
-
+.PHONY: $(dist-archive)
+CLEAN_FILES += $(wildcard sqlite-wasm-*.zip)
 #ifeq (0,1)
 #  $(info WARNING  *******************************************************************)
 #  $(info ** Be sure to create the desired build configuration before creating the)
 #  $(info ** distribution archive. Use one of the following targets to do so:)
+#  $(info **)
 #  $(info **   o2: builds with -O2, resulting in the fastest builds)
 #  $(info **   oz: builds with -Oz, resulting in the smallest builds)
 #  $(info /WARNING *******************************************************************)
 #endif
 
+########################################################################
+# dist-opt must be the name of a target which triggers the
+# build of the files to be packed into the dist archive.  The
+# intention is that it be one of (o0, o1, o2, o3, os, oz), each of
+# which uses like-named -Ox optimization level flags. The o2 target
+# provides the best overall runtime speeds. The oz target provides
+# slightly slower speeds (roughly 10%) with significantly smaller WASM
+# file sizes. Note that -O2 (the o2 target) results in faster binaries
+# than both -O3 and -Os (the o3 and os targets) in all tests run to
+# date.
+dist-opt ?= oz
+
 demo-123.html := $(dir.wasm)/demo-123.html
 demo-123-worker.html := $(dir.wasm)/demo-123-worker.html
 demo-123.js := $(dir.wasm)/demo-123.js
-demo-files := $(demo-123.js) $(demo-123.html) $(demo-123-worker.html)
+demo-files := $(demo-123.js) $(demo-123.html) $(demo-123-worker.html) \
+              tester1.html tester1.js tester1-worker.html
 README-dist := $(dir.wasm)/README-dist.txt
-$(dist-archive): $(sqlite3.wasm) $(sqlite3.js) $(sqlite3-wasmfs.wasm) $(sqlite3-wasmfs.js)
-#$(dist-archive): $(sqlite3.h) $(sqlite3.c) $(sqlite3-wasm.c)
-$(dist-archive): $(MAKEFILE.dist) $(version-info) $(demo-files) $(README-dist)
-$(dist-archive): oz
-	rm -fr $(dist-name)
-	mkdir -p $(dist-name)/main $(dist-name)/wasmfs
-	cp -p $(README-dist) $(dist-name)/README.txt
-	cp -p $(sqlite3.wasm) $(sqlite3.js) $(dist-name)/main
-	cp -p $(demo-files) $(dist-name)/main
-	cp -p $(sqlite3-wasmfs.wasm) $(sqlite3-wasmfs.js) $(dist-name)/wasmfs
-	for i in $(demo-123.js) $(demo-123.html); do \
+dist-dir-main := $(dist-name)/main
+dist-dir-wasmfs := $(dist-name)/wasmfs
+########################################################################
+# $(dist-archive): create the end-user deliverable archive.
+#
+# Maintenance reminder: because $(dist-archive) depends on
+# $(dist-opt), and $(dist-opt) will depend on clean, having any deps
+# on $(dist-archive) which themselves may be cleaned up by the clean
+# target will lead to grief in parallel builds (-j #). Thus
+# $(dist-target)'s deps must be trimmed to non-generated files or
+# files which are _not_ cleaned up by the clean target.
+$(dist-archive): \
+    $(stripccomments) $(version-info) \
+    $(dist-opt) \
+    $(MAKEFILE) $(MAKEFILE.dist)
+	@echo "Making end-user deliverables..."
+	@rm -fr $(dist-name)
+	@mkdir -p $(dist-dir-main) $(dist-dir-wasmfs)
+	@cp -p $(README-dist) $(dist-name)/README.txt
+	@cp -p $(sqlite3.wasm) $(dist-dir-main)
+	@$(stripccomments) -k -k < $(sqlite3.js) \
+		> $(dist-dir-main)/$(notdir $(sqlite3.js))
+	@cp -p $(demo-files) $(dist-dir-main)
+	@cp -p $(sqlite3-wasmfs.wasm) sqlite3-wasmfs.worker.js $(dist-dir-wasmfs)
+	@$(stripccomments) -k -k < $(sqlite3-wasmfs.js) \
+		> $(dist-dir-wasmfs)/$(notdir $(sqlite3-wasmfs.js))
+	@for i in $(demo-123.js) $(demo-123.html); do \
     sed -e 's/\bsqlite3\.js\b/sqlite3-wasmfs.js/' $$i \
-      > $(dist-name)/wasmfs/$${i##*/} || exit; \
+      > $(dist-dir-wasmfs)/$${i##*/} || exit; \
   done
-	vnum=$$($(version-info) --version-number); \
+	@vnum=$$($(version-info) --version-number); \
 	vdir=sqlite-wasm-$$vnum; \
 	arc=$$vdir.zip; \
+	echo "Making $$arc ..."; \
 	rm -f $$arc; \
 	mv $(dist-name) $$vdir; \
 	zip -qr $$arc $$vdir; \
 	rm -fr $$vdir; \
 	ls -la $$arc; \
-	unzip -l $$arc
+	unzip -lv $$arc || echo "Missing unzip app? Not fatal."
 
 #$(shell $(version-info) --version-number)
 dist: $(dist-archive)
diff --git a/manifest b/manifest
index cb6da43b72..40f33190d9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\snew\stest\sfile\swindowE.test,\sto\stest\sthe\swindow\sfunctions\smodules\sresponse\sto\san\sinconsistent\scollation\ssequence.
-D 2022-10-18T15:02:08.725
+C More\swork\son\sthe\sJS\send-user\sdeliverables.\sAdd\stool/stripccomments.c\sto\ssupport\sthat.
+D 2022-10-18T20:36:50.562
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -473,8 +473,8 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle 0e88c8cfc3719e4b7e74980d9da664c709e68acf863e48386cda376edfd3bfb0
-F ext/wasm/GNUmakefile 2fd83d7183bce3f9236fdd2dbe20a4ea37b1d7b26e1a422054ec63008319f065
-F ext/wasm/README-dist.txt bc1fb4f90a28ad2ed0e555a637f393b9249d8d928ac509dad6293b7cae628ea4
+F ext/wasm/GNUmakefile 279fd4589ba602e24d8e66ca795ec5a2275a0e329405e4e984e8ea0579339bae
+F ext/wasm/README-dist.txt 170be2d47b4b52504ef09088ca2f143aab657de0f9ac04d3a68e366f40929c3d
 F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 89983a8d122c35a90c65ec667844b95a78bcd04f3198a99c1e0c8368c1a0b03a
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -504,7 +504,7 @@ F ext/wasm/demo-123.html 7c239c9951d1b113f9f532969ac039294cf1dcfee2b3ae0a2c1ed2b
 F ext/wasm/demo-123.js e0cbeb3495e14103763d5c49794a24d67cf3d78e0ed5b82843be70c0c2ee4b3b
 F ext/wasm/demo-kvvfs1.html 7d4f28873de67f51ac18c584b7d920825139866a96049a49c424d6f5a0ea5e7f
 F ext/wasm/demo-kvvfs1.js 105596bd2ccd0b1deb5fde8e99b536e8242d4bb5932fac0c8403ff3a6bc547e8
-F ext/wasm/dist.make d7076e90f04396f1cc54cb41ee106451496179c10d54bbdebb65ae7b1ae12211
+F ext/wasm/dist.make 1d59fafdfcf6fc5ee0f3351b21199585dba21afcf0518241789fd5d37a1c011d
 F ext/wasm/fiddle.make b609dfde299b4523d7123b7e0cecaa1a0aff0dd984e62cea653aae91f5063c90
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js 531859a471924a0ea48afa218e6877f0c164ca324d51e15843ed6ecc1c65c7ee
@@ -2007,6 +2007,7 @@ F tool/sqltclsh.c.in 1bcc2e9da58fadf17b0bf6a50e68c1159e602ce057210b655d50bad5aaa
 F tool/sqltclsh.tcl 862f4cf1418df5e1315b5db3b5ebe88969e2a784525af5fbf9596592f14ed848
 F tool/srcck1.c 371de5363b70154012955544f86fdee8f6e5326f
 F tool/stack_usage.tcl f8e71b92cdb099a147dad572375595eae55eca43
+F tool/stripccomments.c 20b8aabc4694d0d4af5566e42da1f1a03aff057689370326e9269a9ddcffdc37
 F tool/symbols-mingw.sh 4dbcea7e74768305384c9fd2ed2b41bbf9f0414d
 F tool/symbols.sh 1612bd947750e21e7b47befad5f6b3825b06cce0705441f903bf35ced65ae9b9
 F tool/varint.c 5d94cb5003db9dbbcbcc5df08d66f16071aee003
@@ -2036,8 +2037,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 904b54625d985e742888e06ba792cab316b9ec9d6669d9cf509bac48030373ca
-R 609c010622cb8a1edf242ffa07ea33a0
-U dan
-Z 47ec91d5045ad14459bc2cd80292963b
+P 740a2eb0928d54fdf735a8e573c6a61a34dbd295b46e5b6ef39e957fd2623293
+R f3423b9e5fdd1b3c8749326c161b8bbf
+U stephan
+Z 8ed4b03e8c6243f1d25f4dc2d31715c7
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index d617a968ca..965ccd2dac 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-740a2eb0928d54fdf735a8e573c6a61a34dbd295b46e5b6ef39e957fd2623293
\ No newline at end of file
+2156f0744acfe425457430a0f6a7e02de907de85edba81a6d4eef40293e561c8
\ No newline at end of file
diff --git a/tool/stripccomments.c b/tool/stripccomments.c
new file mode 100644
index 0000000000..53933c0138
--- /dev/null
+++ b/tool/stripccomments.c
@@ -0,0 +1,228 @@
+/**
+   Strips C- and C++-style comments from stdin, sending the results to
+   stdout. It assumes that its input is legal C-like code, and does
+   only little error handling.
+
+   It treats string literals as anything starting and ending with
+   matching double OR single quotes OR backticks (for use with
+   scripting languages which use those). It assumes that a quote
+   character within a string which uses the same quote type is escaped
+   by a backslash. It should not be used on any code which might
+   contain C/C++ comments inside heredocs, and similar constructs, as
+   it will strip those out.
+
+   Usage: $0 [--keep-first|-k] < input > output
+
+   The --keep-first (-k) flag tells it to retain the first comment in the
+   input stream (which is often a license or attribution block). It
+   may be given repeatedly, each one incrementing the number of
+   retained comments by one.
+
+   License: Public Domain
+   Author: Stephan Beal (stephan@wanderinghorse.net)
+*/
+#include <stdio.h>
+#include <assert.h>
+#include <string.h>
+
+#if 1
+#define MARKER(pfexp)                                                \
+  do{ printf("MARKER: %s:%d:\t",__FILE__,__LINE__);                  \
+    printf pfexp;                                                    \
+  } while(0)
+#else
+#define MARKER(exp) if(0) printf
+#endif
+
+struct {
+  FILE * input;
+  FILE * output;
+  int rc;
+  int keepFirst;
+} App = {
+  0/*input*/,
+  0/*output*/,
+  0/*rc*/,
+  0/*keepFirst*/
+};
+
+void do_it_all(void){
+  enum states {
+    S_NONE = 0 /* not in comment */,
+    S_SLASH1 = 1 /* slash - possibly comment prefix */,
+    S_CPP = 2 /* in C++ comment */,
+    S_C = 3 /* in C comment */
+  };
+  int ch, prev = EOF;
+  FILE * out = App.output;
+  int const slash = '/';
+  int const star = '*';
+  int line = 1;
+  int col = 0;
+  enum states state = S_NONE /* current state */;
+  int elide = 0 /* true if currently eliding output */;
+  int state3Col = -99
+    /* huge kludge for odd corner case: */
+    /*/ <--- here. state3Col marks the source column in which a C-style
+      comment starts, so that it can tell if star-slash inside a
+      C-style comment is the end of the comment or is the weird corner
+      case marked at the start of _this_ comment block. */;
+  for( ; EOF != (ch = fgetc(App.input)); prev = ch,
+         ++col){
+    switch(state){
+      case S_NONE:
+        if('\''==ch || '"'==ch || '`'==ch){
+          /* Read string literal...
+             needed to properly catch comments in strings. */
+          int const quote = ch,
+            startLine = line, startCol = col;
+          int ch2, escaped = 0, endOfString = 0;
+          fputc(ch, out);
+          for( ++col; !endOfString && EOF != (ch2 = fgetc(App.input));
+               ++col ){
+            switch(ch2){
+              case '\\': escaped = !escaped;
+                break;
+              case '`':
+              case '\'':
+              case '"':
+                if(!escaped && quote == ch2) endOfString = 1;
+                escaped = 0;
+                break;
+              default:
+                escaped = 0;
+                break;
+            }
+            if('\n'==ch2){
+              ++line;
+              col = 0;
+            }
+            fputc(ch2, out);
+          }
+          if(EOF == ch2){
+            fprintf(stderr, "Unexpected EOF while reading %s literal "
+                    "on line %d column %d.\n",
+                    ('\''==ch) ? "char" : "string",
+                    startLine, startCol);
+            App.rc = 1;
+            return;
+          }
+          break;
+        }
+        else if(slash == ch){
+          /* MARKER(("state 0 ==> 1 @ %d:%d\n", line, col)); */
+          state = S_SLASH1;
+          break;
+        }
+        fputc(ch, out);
+        break;
+      case S_SLASH1: /* 1 slash */
+        /* MARKER(("SLASH1 @ %d:%d App.keepFirst=%d\n",
+           line, col, App.keepFirst)); */
+        switch(ch){
+          case '*':
+            /* Enter C comment */
+            if(App.keepFirst>0){
+              elide = 0;
+              --App.keepFirst;
+            }else{
+              elide = 1;
+            }
+            /*MARKER(("state 1 ==> 3 @ %d:%d\n", line, col));*/
+            state = S_C;
+            state3Col = col-1;
+            if(!elide){
+              fputc(prev, out);
+              fputc(ch, out);
+            }
+            break;
+          case '/':
+            /* Enter C++ comment */
+            if(App.keepFirst>0){
+              elide = 0;
+              --App.keepFirst;
+            }else{
+              elide = 1;
+            }
+            /*MARKER(("state 1 ==> 2 @ %d:%d\n", line, col));*/
+            state = S_CPP;
+            if(!elide){
+              fputc(prev, out);
+              fputc(ch, out);
+            }
+            break;
+          default:
+            /* It wasn't a comment after all. */
+            state = S_NONE;
+            if(!elide){
+              fputc(prev, out);
+              fputc(ch, out);
+            }
+        }
+        break;
+      case S_CPP: /* C++ comment */
+        if('\n' == ch){
+          /* MARKER(("state 2 ==> 0 @ %d:%d\n", line, col)); */
+          state = S_NONE;
+          elide = 0;
+        }
+        if(!elide){
+          fputc(ch, out);
+        }
+        break;
+      case S_C: /* C comment */
+        if(!elide){
+          fputc(ch, out);
+        }
+        if(slash == ch){
+          if(star == prev){
+            /* MARKER(("state 3 ==> 0 @ %d:%d\n", line, col)); */
+            /* Corner case which breaks this: */
+            /*/ <-- slash there */
+            /* That shows up twice in a piece of 3rd-party
+               code i use. */
+            /* And thus state3Col was introduced :/ */
+            if(col!=state3Col+2){
+              state = S_NONE;
+              elide = 0;
+              state3Col = -99;
+            }
+          }
+        }
+        break;
+      default:
+        assert(!"impossible!");
+        break;
+    }
+    if('\n' == ch){
+      ++line;
+      col = 0;
+      state3Col = -99;
+    }
+  }
+}
+
+static void usage(char const *zAppName){
+  fprintf(stderr, "Strips C- and C++-style comments from stdin and sends "
+          "the results to stdout.\n");
+  fprintf(stderr, "Usage: %s [--keep-first|-k] < input > output\n", zAppName);
+}
+
+int main( int argc, char const * const * argv ){
+  int i;
+  for(i = 1; i < argc; ++i){
+    char const * zArg = argv[i];
+    while( '-'==*zArg ) ++zArg;
+    if( 0==strcmp(zArg,"k")
+        || 0==strcmp(zArg,"keep-first") ){
+      ++App.keepFirst;
+    }else{
+      usage(argv[0]);
+      return 1;
+    }
+  }
+  App.input = stdin;
+  App.output = stdout;
+  do_it_all();
+  return App.rc ? 1 : 0;
+}

From 72ab36619233cdf216716f5f17541dfc78d60abd Mon Sep 17 00:00:00 2001
From: drh <>
Date: Tue, 18 Oct 2022 22:37:07 +0000
Subject: [PATCH 307/428] If a virtual column whose value is constant gets
 indexed, do not include that column in the IndexedExpr list. dbsqlfuzz
 59ac17a99b9a5c4930ee71cc153c9428a0c0e794

FossilOrigin-Name: c21eb903f06a16d4fafa5f895be08414fa58e6a91c148030aec8676b40c2d66d
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/where.c   |  1 +
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/manifest b/manifest
index dbc666f750..d02cffb63f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\sbyte-code\scomments\sfor\sthe\sOP_Column\sopcodes\sused\sby\sthe\nindexed\sexpression\soptimization.
-D 2022-10-18T20:27:02.327
+C If\sa\svirtual\scolumn\swhose\svalue\sis\sconstant\sgets\sindexed,\sdo\snot\sinclude\nthat\scolumn\sin\sthe\sIndexedExpr\slist.\ndbsqlfuzz\s59ac17a99b9a5c4930ee71cc153c9428a0c0e794
+D 2022-10-18T22:37:07.303
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -708,7 +708,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d
 F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
-F src/where.c cd5b21856c18ccf739f8b2eb29a2eb97ee69cf6381b10b783a6a2a9f57b99125
+F src/where.c 5dcd88d080ad302da4278f55acce12fd1c1f91eff2bcbfa2c0806d33fa230a5f
 F src/whereInt.h 70cd30de9ed784aa33fa6bd1245f060617de7a00d992469b6d8e419eed915743
 F src/wherecode.c 8ec5a413f12af06638dcca36d0954be2151eea6f293d3c67397cef6a90d6adf1
 F src/whereexpr.c bf8c155212c886621d71c951053660de6fcc4ee907b17aa02da0a96a39aa9405
@@ -2036,8 +2036,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 54c3eb085aca92da2b819f3532ee4750b377265f7e1e914600ea3c3d535efe51
-R ae1b5d3a3c2ab2b867842bafa6837a36
+P bf6d837fddbf74d5b3f40ad01ea4564edfac00b651d6f3f0e996cc5dc18bb06c
+R 4b10826dbdabc43e45460aaf0b235a26
 U drh
-Z cb3bd1c1a3ec2d75a54535d3d8da6ebd
+Z be3c5dec512d6ceddfe2e2950bc8e7bf
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 54e63697ea..5b7598c5ff 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bf6d837fddbf74d5b3f40ad01ea4564edfac00b651d6f3f0e996cc5dc18bb06c
\ No newline at end of file
+c21eb903f06a16d4fafa5f895be08414fa58e6a91c148030aec8676b40c2d66d
\ No newline at end of file
diff --git a/src/where.c b/src/where.c
index dccf493873..8c65dc7b02 100644
--- a/src/where.c
+++ b/src/where.c
@@ -5426,6 +5426,7 @@ static SQLITE_NOINLINE void whereAddIndexedExpr(
     }else{
       continue;
     }
+    if( sqlite3ExprIsConstant(pExpr) ) continue;
     p = sqlite3DbMallocRaw(pParse->db,  sizeof(IndexedExpr));
     if( p==0 ) break;
     p->pIENext = pParse->pIdxExpr;

From 71de8e02416aa9a4ad90ac6958ff3fa025a33d2d Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 19 Oct 2022 01:07:30 +0000
Subject: [PATCH 308/428] Considerable wasm/js build cleanups and reworking.
 Remove wasmfs builds from the end-user deliverables and disable the wasmfs
 build by default, per /chat discussion, as it doubles our deliverable count
 for only marginal gain. Attempt to move the sqlite3.js/wasm files into
 subdirectories but rediscovered that that breaks loading in Worker mode
 because URI resolution of the wasm files differs depending on whether the
 main script is loaded from a script tag or a Worker.

FossilOrigin-Name: 5b23e0675efdd2f1ea7b4f5836a579e8d6aa8a25b3f1a6a950520ad845ff01bb
---
 ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle |  15 ---
 ext/wasm/GNUmakefile                     | 155 +++++++++++++----------
 ext/wasm/README-dist.txt                 |  28 ++--
 ext/wasm/api/extern-post-js.js           |   8 ++
 ext/wasm/api/sqlite3-api-prologue.js     |   1 -
 ext/wasm/api/sqlite3-wasm.c              |   2 +-
 ext/wasm/dist.make                       |  31 ++---
 ext/wasm/fiddle.make                     |  11 +-
 ext/wasm/index.html                      |  10 +-
 ext/wasm/sqlite3-worker1.js              |  22 +++-
 ext/wasm/testing1.html                   |  36 ------
 ext/wasm/wasmfs.make                     |  29 +++--
 manifest                                 |  32 +++--
 manifest.uuid                            |   2 +-
 14 files changed, 185 insertions(+), 197 deletions(-)
 delete mode 100644 ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle
 delete mode 100644 ext/wasm/testing1.html

diff --git a/ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle b/ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle
deleted file mode 100644
index 5e80f703ae..0000000000
--- a/ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle
+++ /dev/null
@@ -1,15 +0,0 @@
-FS
-addFunction
-allocateUTF8OnStack
-ccall
-cwrap
-getValue
-intArrayFromString
-lengthBytesUTF8
-removeFunction
-setValue
-stackAlloc
-stackRestore
-stackSave
-stringToUTF8Array
-wasmMemory
diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 881eabfac9..f461f8b46a 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -1,4 +1,4 @@
-########################################################################
+#######################################################################
 # This GNU makefile drives the build of the sqlite3 WASM
 # components. It is not part of the canonical build process.
 #
@@ -22,8 +22,10 @@
 ########################################################################
 SHELL := $(shell which bash 2>/dev/null)
 MAKEFILE := $(lastword $(MAKEFILE_LIST))
+CLEAN_FILES :=
+DISTCLEAN_FILES := ./--dummy--
 default: all
-release: default
+release: oz
 
 # Emscripten SDK home dir and related binaries...
 EMSDK_HOME ?= $(word 1,$(wildcard $(HOME)/src/emsdk $(HOME)/emsdk))
@@ -58,15 +60,50 @@ else
 endif
 
 dir.top := ../..
-# Reminder: some Emscripten flags require absolute paths
-dir.wasm := $(patsubst %/,%,$(dir $(abspath $(MAKEFILE))))
+# Reminder: some Emscripten flags require absolute paths but we want
+# relative paths for most stuff simply to reduce noise. The
+# $(abspath...) GNU make function can transform relative paths to
+# absolute.
+dir.wasm := $(patsubst %/,%,$(dir $(MAKEFILE)))
 dir.api := api
 dir.jacc := jaccwabyt
 dir.common := common
 dir.fiddle := fiddle
 dir.tool := $(dir.top)/tool
-CLEAN_FILES := *~ $(dir.jacc)/*~ $(dir.api)/*~ $(dir.common)/*~
-DISTCLEAN_FILES := ./-dummy
+########################################################################
+# MAINTENANCE REMINDER: the output .js and .wasm files of emcc must be
+# in _this_ dir, rather than a subdir, or else parts of the generated
+# code get confused and cannot load property. Specifically, when X.js
+# loads X.wasm, whether or not X.js uses the correct path for X.wasm
+# depends on how it's loaded: an HTML script tag will resolve it
+# intuitively, whereas a Worker's call to importScripts() will not.
+# That's a fundamental incompatibility with how URL resolution in
+# JS happens between those two contexts. See:
+#
+# https://zzz.buzz/2017/03/14/relative-uris-in-web-development/
+#
+# We unfortunately have no way, from Worker-initiated code, to
+# automatically resolve the path from X.js to X.wasm.
+#
+# In case we ever find a solution to that which does not require
+# duplicating the X.js files only to swap out the path to X.wasm for
+# the loading-from-worker case...
+#
+# dir.dout = output dir for deliverables.
+dir.dout := $(dir.wasm)
+# dir.tmp = output dir for intermediary build files, as opposed to
+# end-user deliverables.
+dir.tmp := $(dir.wasm)/bld
+#CLEAN_FILES += $(wildcard $(dir.dout)/*) $(wildcard $(dir.tmp)/*)
+ifeq (,$(wildcard $(dir.dout)))
+  dir._tmp := $(shell mkdir -p $(dir.dout))
+endif
+ifeq (,$(wildcard $(dir.tmp)))
+  dir._tmp := $(shell mkdir -p $(dir.tmp))
+endif
+
+cflags.common :=  -I. -I.. -I$(dir.top)
+CLEAN_FILES += *~ $(dir.jacc)/*~ $(dir.api)/*~ $(dir.common)/*~
 emcc_enable_bigint ?= 1
 sqlite3.c := $(dir.top)/sqlite3.c
 sqlite3.h := $(dir.top)/sqlite3.h
@@ -149,6 +186,8 @@ else
 endif
 
 version-info := $(dir.wasm)/version-info
+# ^^^^ NOT in $(dir.tmp) because we need it to survive the cleanup
+# process for the dist build to work properly.
 $(version-info): $(dir.wasm)/version-info.c $(sqlite3.h) $(MAKEFILE)
 	$(CC) -O0 -I$(dir.top) -o $@ $<
 DISTCLEAN_FILES += $(version-info)
@@ -158,15 +197,16 @@ $(stripccomments): $(stripccomments).c $(MAKEFILE)
 	$(CC) -o $@ $<
 DISTCLEAN_FILES += $(stripccomments)
 
-EXPORTED_FUNCTIONS.api.in := $(dir.api)/EXPORTED_FUNCTIONS.sqlite3-api
-
-EXPORTED_FUNCTIONS.api: $(EXPORTED_FUNCTIONS.api.in) $(MAKEFILE)
+EXPORTED_FUNCTIONS.api.in := $(abspath $(dir.api)/EXPORTED_FUNCTIONS.sqlite3-api)
+EXPORTED_FUNCTIONS.api := $(dir.tmp)/EXPORTED_FUNCTIONS.api
+$(EXPORTED_FUNCTIONS.api): $(EXPORTED_FUNCTIONS.api.in) $(MAKEFILE)
 	cat $(EXPORTED_FUNCTIONS.api.in) > $@
-CLEAN_FILES += EXPORTED_FUNCTIONS.api
 
-sqlite3-license-version.js := sqlite3-license-version.js
+sqlite3-license-version.js := $(dir.tmp)/sqlite3-license-version.js
 sqlite3-license-version-header.js := $(dir.api)/sqlite3-license-version-header.js
-sqlite3-api-build-version.js := $(dir.api)/sqlite3-api-build-version.js
+sqlite3-api-build-version.js := $(dir.tmp)/sqlite3-api-build-version.js
+# sqlite3-api.jses = the list of JS files which make up $(sqlite3-api.js), in
+# the order they need to be assembled.
 sqlite3-api.jses := $(sqlite3-license-version.js)
 sqlite3-api.jses += $(dir.api)/sqlite3-api-prologue.js
 sqlite3-api.jses += $(dir.common)/whwasmutil.js
@@ -178,10 +218,7 @@ sqlite3-api.jses += $(dir.api)/sqlite3-api-worker1.js
 sqlite3-api.jses += $(dir.api)/sqlite3-api-opfs.js
 sqlite3-api.jses += $(dir.api)/sqlite3-api-cleanup.js
 
-sqlite3-api.js := sqlite3-api.js
-CLEAN_FILES += $(sqlite3-api.js)
-CLEAN_FILES += $(sqlite3-license-version.js)
-CLEAN_FILES += $(sqlite3-api-build-version.js)
+sqlite3-api.js := $(dir.tmp)/sqlite3-api.js
 $(sqlite3-api.js): $(sqlite3-api.jses) $(MAKEFILE)
 	@echo "Making $@..."
 	@for i in $(sqlite3-api.jses); do \
@@ -190,7 +227,7 @@ $(sqlite3-api.js): $(sqlite3-api.jses) $(MAKEFILE)
 		echo "/* END FILE: $$i */"; \
 	done > $@
 
-$(sqlite3-api-build-version.js): $(version-info)
+$(sqlite3-api-build-version.js): $(version-info) $(MAKEFILE)
 	@echo "Making $@..."
 	@{ \
   echo 'self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){'; \
@@ -204,8 +241,7 @@ $(sqlite3-api-build-version.js): $(version-info)
 # --post-js and --pre-js are emcc flags we use to append/prepend JS to
 # the generated emscripten module file.
 pre-js.js := $(dir.api)/pre-js.js
-post-js.js := post-js.js
-CLEAN_FILES += $(post-js.js)
+post-js.js := $(dir.tmp)/post-js.js
 post-jses := \
   $(dir.api)/post-js-header.js \
   $(sqlite3-api.js) \
@@ -222,7 +258,7 @@ extern-pre-js.js := $(dir.api)/extern-pre-js.js
 pre-post-common.flags := \
   --post-js=$(post-js.js) \
   --extern-post-js=$(extern-post-js.js) \
-  --extern-pre-js=$(dir.wasm)/$(sqlite3-license-version.js)
+  --extern-pre-js=$(sqlite3-license-version.js)
 pre-post-jses.deps := $(post-js.js) \
   $(extern-post-js.js) $(extern-pre-js.js) $(sqlite3-license-version.js)
 $(sqlite3-license-version.js): $(sqlite3.h) $(sqlite3-license-version-header.js) $(MAKEFILE)
@@ -275,12 +311,11 @@ emcc.jsflags += -sMODULARIZE
 emcc.jsflags += -sSTRICT_JS
 emcc.jsflags += -sDYNAMIC_EXECUTION=0
 emcc.jsflags += -sNO_POLYFILL
-emcc.jsflags += -sEXPORTED_FUNCTIONS=@$(dir.wasm)/EXPORTED_FUNCTIONS.api
+emcc.jsflags += -sEXPORTED_FUNCTIONS=@$(EXPORTED_FUNCTIONS.api)
 emcc.exportedRuntimeMethods := \
-    -sEXPORTED_RUNTIME_METHODS=FS,wasmMemory,allocateUTF8OnStack
+    -sEXPORTED_RUNTIME_METHODS=FS,wasmMemory
     # FS ==> stdio/POSIX I/O proxies
     # wasmMemory ==> required by our code for use with -sIMPORTED_MEMORY
-    # allocateUTF8OnStack => for kvvfs internals
 emcc.jsflags += $(emcc.exportedRuntimeMethods)
 emcc.jsflags += -sUSE_CLOSURE_COMPILER=0
 emcc.jsflags += -sIMPORTED_MEMORY
@@ -312,7 +347,7 @@ emcc.jsflags += -Wno-limited-postlink-optimizations
 emcc.jsflags += -sERROR_ON_UNDEFINED_SYMBOLS=0
 emcc.jsflags += -sLLD_REPORT_UNDEFINED
 #emcc.jsflags += --allow-undefined
-emcc.jsflags += --import-undefined
+#emcc.jsflags += --import-undefined
 #emcc.jsflags += --unresolved-symbols=import-dynamic --experimental-pic
 #emcc.jsflags += --experimental-pic --unresolved-symbols=ingore-all --import-undefined
 #emcc.jsflags += --unresolved-symbols=ignore-all
@@ -340,36 +375,22 @@ emcc.jsflags += -sWASM_BIGINT=$(emcc_enable_bigint)
 # debugging info, _huge_.
 ########################################################################
 
-########################################################################
-# Maintenance reminder: the output .js and .wasm files of emcc must be
-# in _this_ dir, rather than a subdir, or else parts of the generated
-# code get confused and cannot load property (namely, the
-# sqlite3.worker.js generated in conjunction with -sWASMFS).
-sqlite3.js := sqlite3.js
-sqlite3.wasm := sqlite3.wasm
-sqlite3-wasm.o := $(dir.api)/sqlite3-wasm.o
-$(sqlite3-wasm.o): emcc.cflags += $(SQLITE_OPT)
-$(sqlite3-wasm.o): $(dir.top)/sqlite3.c
+sqlite3.js := $(dir.dout)/sqlite3.js
+sqlite3.wasm := $(dir.dout)/sqlite3.wasm
 sqlite3-wasm.c := $(dir.api)/sqlite3-wasm.c
-########################################################################
-# call-wasm-c-compile sets up build rules
-# for $1.o. $1 must be the name of a C file (with extension).
-define call-wasm-c-compile
-$(1).o := $$(subst .c,.o,$(1))
-sqlite3.wasm.obj += $$($(1).o)
-$$($(1).o): $$(MAKEFILE) $(1)
-	$$(emcc.bin) $$(emcc_opt_full) $$(emcc.flags) $$(emcc.cflags) -c $(1) -o $$@
-CLEAN_FILES += $$($(1).o)
-endef
-$(foreach c,$(sqlite3-wasm.c),$(eval $(call call-wasm-c-compile,$(c))))
+# sqlite3-wasm.o vs sqlite3-wasm.c: building against the latter
+# (predictably) results in a slightly faster binary, but we're close
+# enough to the target speed requirements that the 500ms makes a
+# difference. Thus we build all binaries against sqlite3-wasm.c
+# instead of building a shared copy of sqlite3-wasm.o.
 $(eval $(call call-make-pre-js,sqlite3))
 $(sqlite3.js): $(MAKEFILE) $(sqlite3.wasm.obj) \
-    EXPORTED_FUNCTIONS.api \
+    $(EXPORTED_FUNCTIONS.api) \
     $(pre-post-sqlite3.deps)
 	@echo "Building $@ ..."
 	$(emcc.bin) -o $@ $(emcc_opt_full) $(emcc.flags) \
     $(emcc.jsflags) $(pre-post-common.flags) $(pre-post-sqlite3.flags) \
-    $(sqlite3.wasm.obj)
+    $(cflags.common) $(SQLITE_OPT) $(sqlite3-wasm.c)
 	chmod -x $(sqlite3.wasm)
 	$(maybe-wasm-strip) $(sqlite3.wasm)
 	@ls -la $@ $(sqlite3.wasm)
@@ -417,7 +438,8 @@ speedtest1-common.eflags += -sINITIAL_MEMORY=128450560
 speedtest1-common.eflags += -sSTRICT_JS
 speedtest1-common.eflags += -sMODULARIZE
 speedtest1-common.eflags += -Wno-limited-postlink-optimizations
-speedtest1-common.eflags += -sEXPORTED_FUNCTIONS=@$(dir.wasm)/EXPORTED_FUNCTIONS.speedtest1
+EXPORTED_FUNCTIONS.speedtest1 := $(abspath $(dir.tmp)/EXPORTED_FUNCTIONS.speedtest1)
+speedtest1-common.eflags += -sEXPORTED_FUNCTIONS=@$(EXPORTED_FUNCTIONS.speedtest1)
 speedtest1-common.eflags += $(emcc.exportedRuntimeMethods)
 speedtest1-common.eflags += -sALLOW_TABLE_GROWTH
 speedtest1-common.eflags += -sDYNAMIC_EXECUTION=0
@@ -444,31 +466,24 @@ speedtest1.exit-runtime1 := -sEXIT_RUNTIME=1
 # -sEXIT_RUNTIME=1 but we need EXIT_RUNTIME=0 for the worker-based app
 # which runs speedtest1 multiple times.
 
-EXPORTED_FUNCTIONS.speedtest1: EXPORTED_FUNCTIONS.api
-	{ echo _wasm_main; cat EXPORTED_FUNCTIONS.api; } > $@
-CLEAN_FILES += EXPORTED_FUNCTIONS.speedtest1
-speedtest1.js := speedtest1.js
+$(EXPORTED_FUNCTIONS.speedtest1): $(EXPORTED_FUNCTIONS.api)
+	@echo "Making $@ ..."
+	@{ echo _wasm_main; cat $(EXPORTED_FUNCTIONS.api); } > $@
+speedtest1.js := $(dir.dout)/speedtest1.js
 speedtest1.wasm := $(subst .js,.wasm,$(speedtest1.js))
-speedtest1.cflags := \
-  -I. -I.. -I$(dir.top) \
-  -DSQLITE_SPEEDTEST1_WASM
-speedtest1.cs := $(speedtest1.c) $(sqlite3-wasm.c)
-$(speedtest1.js): emcc.cflags+=
-# speedtest1 notes re. sqlite3-wasm.o vs sqlite3-wasm.c: building against
-# the latter (predictably) results in a slightly faster binary, but we're
-# close enough to the target speed requirements that the 500ms makes a
-# difference.
+speedtest1.cflags := $(cflags.common) -DSQLITE_SPEEDTEST1_WASM
+speedtest1.cses := $(speedtest1.c) $(sqlite3-wasm.c)
 $(eval $(call call-make-pre-js,speedtest1))
-$(speedtest1.js): $(MAKEFILE) $(speedtest1.cs) \
+$(speedtest1.js): $(MAKEFILE) $(speedtest1.cses) \
     $(pre-post-speedtest1.deps) \
-    EXPORTED_FUNCTIONS.speedtest1
+    $(EXPORTED_FUNCTIONS.speedtest1)
 	@echo "Building $@ ..."
 	$(emcc.bin) \
         $(speedtest1.eflags) $(speedtest1-common.eflags) $(speedtest1.cflags) \
         $(pre-post-speedtest1.flags) \
         $(SQLITE_OPT) \
         $(speedtest1.exit-runtime0) \
-        -o $@ $(speedtest1.cs) -lm
+        -o $@ $(speedtest1.cses) -lm
 	$(maybe-wasm-strip) $(speedtest1.wasm)
 	ls -la $@ $(speedtest1.wasm)
 
@@ -531,6 +546,13 @@ oz: clean
 
 include fiddle.make
 
+ifneq (,$(filter wasmfs,$(MAKECMDGOALS)))
+# wasmfs build disabled 2022-10-19 per /chat
+# discussion. OPFS-over-wasmfs was initially a stopgap measure and a
+# convenient point of comparison for the OPFS sqlite3_vfs's
+# performance, but it currently doubles our deliverables for very
+# little, if any, benefit.
+#
 ########################################################################
 # Some platforms do not support the WASMFS build. Raspberry Pi OS is one
 # of them. As such platforms are discovered, add their (uname -m) name
@@ -544,9 +566,12 @@ else
 HAVE_WASMFS := 1
 include wasmfs.make
 endif
+endif
+# /wasmfs
+########################################################################
 
 ########################################################################
-# Create deliverables: TODO
+# Create deliverables:
 ifneq (,$(filter dist,$(MAKECMDGOALS)))
 include dist.make
 endif
diff --git a/ext/wasm/README-dist.txt b/ext/wasm/README-dist.txt
index bbc82a1df8..422f3f1e0c 100644
--- a/ext/wasm/README-dist.txt
+++ b/ext/wasm/README-dist.txt
@@ -4,23 +4,21 @@ Main project page: https://sqlite.org
 
 TODO: link to main WASM/JS docs, once they are online
 
-This archive contains two related deliverables:
+This archive contains the sqlite3.js and sqlite3.wasm file which make
+up the sqlite3 WASM/JS build.
 
-- ./main contains the sqlite3.js and sqlite3.wasm file which make up
-  the standard sqlite3 WASM/JS build.
-
-- ./wasmfs contains a build of those files which includes the
-  Emscripten WASMFS[^1]. It offers an alternative approach
-  to accessing the browser-side Origin-Private FileSystem
-  but is less portable than the main build, so is provided
-  as a separate binary.
-
-Both directories contain small demonstration and test apps. Browsers
-will not serve WASM files from file:// URLs, so the demo/test apps
-require a web server and that server must include the following
-headers in its response when serving the files:
+The jswasm directory contains both the main deliverables and small
+demonstration and test apps. Browsers will not serve WASM files from
+file:// URLs, so the demo/test apps require a web server and that
+server must include the following headers in its response when serving
+the files:
 
     Cross-Origin-Opener-Policy: same-origin
     Cross-Origin-Embedder-Policy: require-corp
 
-[^1]: https://emscripten.org
+The files named sqlite3*.js and sqlite3.wasm belong to the core
+sqlite3 deliverables and the others are soley for demonstration and
+may be discarded. They are not in separate directories from the main
+deliverables because a quirk of URI resolution in JS code would then
+require that sqlite3.js be duplicated and edited for Worker-loaded
+operation.
diff --git a/ext/wasm/api/extern-post-js.js b/ext/wasm/api/extern-post-js.js
index 51e8d12b2b..7dba03b3a7 100644
--- a/ext/wasm/api/extern-post-js.js
+++ b/ext/wasm/api/extern-post-js.js
@@ -43,3 +43,11 @@
   self.sqlite3InitModule.ready = originalInit.ready;
   //console.warn("Replaced sqlite3InitModule()");
 })();
+
+if(0){
+  console.warn("self.location.href =",self.location.href);
+  if('undefined' !== typeof document){
+    console.warn("document.currentScript.src =",
+                 document?.currentScript?.src);
+  }
+}
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 7d9ae96914..f8c0f024e6 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -1158,7 +1158,6 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
   */
   capi.sqlite3_web_db_export = function(pDb){
     if(!pDb) toss('Invalid sqlite3* argument.');
-    const wasm = wasm;
     if(!wasm.bigIntEnabled) toss('BigInt64 support is not enabled.');
     const stack = wasm.pstack.pointer;
     let pOut;
diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index 26771d5c9a..cda4e7ae2f 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -1007,7 +1007,7 @@ int sqlite3_wasm_init_wasmfs(const char *zMountPoint){
        hypothetically suffice for the transient wasm-based virtual
        filesystem we're currently running in. */
     const int rc = wasmfs_create_directory(zMountPoint, 0777, pOpfs);
-    emscripten_console_logf("OPFS mkdir(%s) rc=%d", zMountPoint, rc);
+    /*emscripten_console_logf("OPFS mkdir(%s) rc=%d", zMountPoint, rc);*/
     if(rc) return SQLITE_IOERR;
   }
   return pOpfs ? 0 : SQLITE_NOMEM;
diff --git a/ext/wasm/dist.make b/ext/wasm/dist.make
index cb13b0bd92..e19b361b19 100644
--- a/ext/wasm/dist.make
+++ b/ext/wasm/dist.make
@@ -9,10 +9,6 @@
 #######################################################################
 MAKEFILE.dist := $(lastword $(MAKEFILE_LIST))
 
-ifeq (0,$(HAVE_WASMFS))
-$(error The 'dist' target needs to be run on a WASMFS-capable platform.)
-endif
-
 ########################################################################
 # Chicken/egg situation: we need $(version-info) to get the version
 # info for the archive name, but that binary may not yet be built, and
@@ -33,7 +29,7 @@ CLEAN_FILES += $(wildcard sqlite-wasm-*.zip)
 #endif
 
 ########################################################################
-# dist-opt must be the name of a target which triggers the
+# dist-build must be the name of a target which triggers the
 # build of the files to be packed into the dist archive.  The
 # intention is that it be one of (o0, o1, o2, o3, os, oz), each of
 # which uses like-named -Ox optimization level flags. The o2 target
@@ -42,7 +38,7 @@ CLEAN_FILES += $(wildcard sqlite-wasm-*.zip)
 # file sizes. Note that -O2 (the o2 target) results in faster binaries
 # than both -O3 and -Os (the o3 and os targets) in all tests run to
 # date.
-dist-opt ?= oz
+dist-build ?= oz
 
 demo-123.html := $(dir.wasm)/demo-123.html
 demo-123-worker.html := $(dir.wasm)/demo-123-worker.html
@@ -50,36 +46,33 @@ demo-123.js := $(dir.wasm)/demo-123.js
 demo-files := $(demo-123.js) $(demo-123.html) $(demo-123-worker.html) \
               tester1.html tester1.js tester1-worker.html
 README-dist := $(dir.wasm)/README-dist.txt
-dist-dir-main := $(dist-name)/main
-dist-dir-wasmfs := $(dist-name)/wasmfs
+dist-dir-main := $(dist-name)/jswasm
+dist.main.extras := \
+    sqlite3-opfs-async-proxy.js \
+    sqlite3-worker1.js \
+    sqlite3-worker1-promiser.js
+
 ########################################################################
 # $(dist-archive): create the end-user deliverable archive.
 #
 # Maintenance reminder: because $(dist-archive) depends on
-# $(dist-opt), and $(dist-opt) will depend on clean, having any deps
+# $(dist-build), and $(dist-build) will depend on clean, having any deps
 # on $(dist-archive) which themselves may be cleaned up by the clean
 # target will lead to grief in parallel builds (-j #). Thus
 # $(dist-target)'s deps must be trimmed to non-generated files or
 # files which are _not_ cleaned up by the clean target.
 $(dist-archive): \
     $(stripccomments) $(version-info) \
-    $(dist-opt) \
+    $(dist-build) \
     $(MAKEFILE) $(MAKEFILE.dist)
 	@echo "Making end-user deliverables..."
 	@rm -fr $(dist-name)
-	@mkdir -p $(dist-dir-main) $(dist-dir-wasmfs)
+	@mkdir -p $(dist-dir-main)
 	@cp -p $(README-dist) $(dist-name)/README.txt
-	@cp -p $(sqlite3.wasm) $(dist-dir-main)
+	@cp -p $(sqlite3.wasm) $(dist.main.extras) $(dist-dir-main)
 	@$(stripccomments) -k -k < $(sqlite3.js) \
 		> $(dist-dir-main)/$(notdir $(sqlite3.js))
 	@cp -p $(demo-files) $(dist-dir-main)
-	@cp -p $(sqlite3-wasmfs.wasm) sqlite3-wasmfs.worker.js $(dist-dir-wasmfs)
-	@$(stripccomments) -k -k < $(sqlite3-wasmfs.js) \
-		> $(dist-dir-wasmfs)/$(notdir $(sqlite3-wasmfs.js))
-	@for i in $(demo-123.js) $(demo-123.html); do \
-    sed -e 's/\bsqlite3\.js\b/sqlite3-wasmfs.js/' $$i \
-      > $(dist-dir-wasmfs)/$${i##*/} || exit; \
-  done
 	@vnum=$$($(version-info) --version-number); \
 	vdir=sqlite-wasm-$$vnum; \
 	arc=$$vdir.zip; \
diff --git a/ext/wasm/fiddle.make b/ext/wasm/fiddle.make
index 6f90024811..84cc6b298a 100644
--- a/ext/wasm/fiddle.make
+++ b/ext/wasm/fiddle.make
@@ -23,6 +23,7 @@ $(dir.top)/shell.c: $(SHELL_SRC) $(dir.top)/tool/mkshellc.tcl
 # /shell.c
 ########################################################################
 
+EXPORTED_FUNCTIONS.fiddle := $(dir.tmp)/EXPORTED_FUNCTIONS.fiddle
 fiddle.emcc-flags = \
   $(emcc.cflags) $(emcc_opt_full) \
   --minify 0 \
@@ -35,17 +36,17 @@ fiddle.emcc-flags = \
   -sWASM_BIGINT=$(emcc_enable_bigint) \
   -sEXPORT_NAME=$(sqlite3.js.init-func) \
   $(sqlite3.js.flags.--post-js) \
-  -sEXPORTED_RUNTIME_METHODS=@$(dir.wasm)/EXPORTED_RUNTIME_METHODS.fiddle \
-  -sEXPORTED_FUNCTIONS=@$(dir.wasm)/EXPORTED_FUNCTIONS.fiddle \
+  $(emcc.exportedRuntimeMethods) \
+  -sEXPORTED_FUNCTIONS=@$(abspath $(EXPORTED_FUNCTIONS.fiddle)) \
   $(SQLITE_OPT) $(SHELL_OPT) \
   -DSQLITE_SHELL_FIDDLE
 # -D_POSIX_C_SOURCE is needed for strdup() with emcc
 
 fiddle.EXPORTED_FUNCTIONS.in := \
     EXPORTED_FUNCTIONS.fiddle.in \
-    EXPORTED_FUNCTIONS.api
+    $(EXPORTED_FUNCTIONS.api)
 
-EXPORTED_FUNCTIONS.fiddle: $(fiddle.EXPORTED_FUNCTIONS.in) $(MAKEFILE.fiddle)
+$(EXPORTED_FUNCTIONS.fiddle): $(fiddle.EXPORTED_FUNCTIONS.in) $(MAKEFILE.fiddle)
 	sort -u $(fiddle.EXPORTED_FUNCTIONS.in) > $@
 
 fiddle-module.js := $(dir.fiddle)/fiddle-module.js
@@ -58,7 +59,7 @@ $(dir.fiddle)/$(SOAP.js): $(SOAP.js)
 
 $(eval $(call call-make-pre-js,fiddle-module))
 $(fiddle-module.js): $(MAKEFILE) $(MAKEFILE.fiddle) \
-    EXPORTED_FUNCTIONS.fiddle EXPORTED_RUNTIME_METHODS.fiddle \
+    $(EXPORTED_FUNCTIONS.fiddle) \
     $(fiddle.cses) $(pre-post-fiddle-module.deps) $(dir.fiddle)/$(SOAP.js)
 	$(emcc.bin) -o $@ $(fiddle.emcc-flags) \
     $(pre-post-common.flags) $(pre-post-fiddle-module.flags) \
diff --git a/ext/wasm/index.html b/ext/wasm/index.html
index 663d4c9240..9fc475f1ed 100644
--- a/ext/wasm/index.html
+++ b/ext/wasm/index.html
@@ -34,8 +34,7 @@
         </li>
         <li>Whether or not WASMFS/OPFS support is enabled on any given
           page may depend on build-time options which are <em>off by
-          default</em> because they currently (as of 2022-09-08) break
-          with Worker-based pages.
+          default</em>.
         </li>
       </ul>
     </div>
@@ -68,7 +67,8 @@
         <li>speedtest1 ports (sqlite3's primary benchmarking tool)...
           <ul>
             <li><a href='speedtest1.html'>speedtest1</a>: a main-thread WASM build of speedtest1.</li>
-            <li><a href='speedtest1-wasmfs.html?flags=--size,25'>speedtest1-wasmfs</a>: a variant of speedtest1 built solely for the wasmfs/opfs feature.</li>
+            <!--li><a href='speedtest1-wasmfs.html?flags=--size,25'>speedtest1-wasmfs</a>: a variant of speedtest1 built solely for the wasmfs/opfs feature.
+                </li-->
             <li><a href='speedtest1.html?vfs=kvvfs'>speedtest1-kvvfs</a>: speedtest1 with the kvvfs.</li>
             <li><a href='speedtest1-worker.html?size=25'>speedtest1-worker</a>: an interactive Worker-thread variant of speedtest1.</li>
             <li><a href='speedtest1-worker.html?vfs=opfs&size=25'>speedtest1-worker-opfs</a>: speedtest1-worker with the
@@ -81,10 +81,10 @@
             <li><a href='testing-worker1-promiser.html'>testing-worker1-promiser</a>:
               tests for the Promise-based wrapper of the Worker-based API.</li>
             <li><a href='batch-runner.html'>batch-runner</a>: runs batches of SQL exported from speedtest1.</li>
-            <li><a href='scratchpad-wasmfs-main.html'>scratchpad-wasmfs-main</a>:
+            <!--li><a href='scratchpad-wasmfs-main.html'>scratchpad-wasmfs-main</a>:
               experimenting with WASMFS/OPFS-based persistence. Maintenance
               reminder: we cannot currently (2022-09-15) load WASMFS in a
-              worker due to an Emscripten limitation.</li>
+              worker due to an Emscripten limitation.</li-->
             <li><a href='test-opfs-vfs.html'>test-opfs-vfs</a>
               (<a href='test-opfs-vfs.html?opfs-sanity-check&opfs-verbose'>same
               with verbose output and sanity-checking tests</a>) is an
diff --git a/ext/wasm/sqlite3-worker1.js b/ext/wasm/sqlite3-worker1.js
index 167c6a5c79..fef155e1f8 100644
--- a/ext/wasm/sqlite3-worker1.js
+++ b/ext/wasm/sqlite3-worker1.js
@@ -25,13 +25,29 @@
   Worker-specific API needs to pass _this_ file (or equivalent) to the
   Worker constructor and then listen for an event in the form shown
   above in order to know when the module has completed initialization.
+
+  This file accepts a couple of URL arguments to adjust how it loads
+  sqlite3.js:
+
+  - `sqlite3.dir`, if set, treats the given directory name as the
+    directory from which `sqlite3.js` will be loaded.
+  - `sqlite3.js`, if set, is used as the URI to `sqlite3.js` and it
+    may contain path elements, e.g. `sqlite3.js=foo/bar/my-sqlite3.js`.
+
+  By default is loads 'sqlite3.js'.
 */
 "use strict";
 (()=>{
   const urlParams = new URL(self.location.href).searchParams;
-  importScripts(urlParams.has('wasmfs')
-                ? 'sqlite3-wasmfs.js'
-                : 'sqlite3.js');
+  let theJs;
+  if(urlParams.has('sqlite3.js')){
+    theJs = urlParams.get('sqlite3.js');
+  }else if(urlParams.has('sqlite3.dir')){
+    theJs = urlParams.get('sqlite3.dir')+'/sqlite3.js';
+  }else{
+    theJs = 'sqlite3.js';
+  }
+  importScripts(theJs);
   sqlite3InitModule().then((sqlite3)=>{
     sqlite3.capi.sqlite3_wasmfs_opfs_dir();
     sqlite3.initWorker1API();
diff --git a/ext/wasm/testing1.html b/ext/wasm/testing1.html
deleted file mode 100644
index bf73974ee7..0000000000
--- a/ext/wasm/testing1.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!doctype html>
-<html lang="en-us">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
-    <link rel="stylesheet" href="common/emscripten.css"/>
-    <link rel="stylesheet" href="common/testing.css"/>
-    <title>sqlite3-api.js tests</title>
-  </head>
-  <body>
-    <header id='titlebar'><span>sqlite3-api.js tests</span></header>
-    <!-- emscripten bits -->
-    <figure id="module-spinner">
-      <div class="spinner"></div>
-      <div class='center'><strong>Initializing app...</strong></div>
-      <div class='center'>
-        On a slow internet connection this may take a moment.  If this
-        message displays for "a long time", intialization may have
-        failed and the JavaScript console may contain clues as to why.
-      </div>
-    </figure>
-    <div class="emscripten" id="module-status">Downloading...</div>
-    <div class="emscripten">
-      <progress value="0" max="100" id="module-progress" hidden='1'></progress>  
-    </div><!-- /emscripten bits -->
-    <div>Most stuff on this page happens in the dev console.</div>
-    <hr>
-    <div id='test-output'></div>
-    <!-- testing1.js "should" work with both sqlite3.js and sqlite3-kvvfs.js -->
-    <!--script src="sqlite3-kvvfs.js"></script-->
-    <script src="sqlite3.js"></script>
-    <script src="common/SqliteTestUtil.js"></script>
-    <script src="testing1.js"></script>
-  </body>
-</html>
diff --git a/ext/wasm/wasmfs.make b/ext/wasm/wasmfs.make
index ee7b9f12bc..f27c9d631d 100644
--- a/ext/wasm/wasmfs.make
+++ b/ext/wasm/wasmfs.make
@@ -7,23 +7,24 @@
 ########################################################################
 MAKEFILE.wasmfs := $(lastword $(MAKEFILE_LIST))
 
-sqlite3-wasmfs.js     := sqlite3-wasmfs.js
-sqlite3-wasmfs.wasm   := sqlite3-wasmfs.wasm
+# Maintenance reminder: these particular files cannot be built into a
+# subdirectory because loading of the auxiliary
+# sqlite3-wasmfs.worker.js file it creates fails if sqlite3-wasmfs.js
+# is loaded from any directory other than the one in which the
+# containing HTML lives.
+dir.wasmfs := $(dir.wasm)
+sqlite3-wasmfs.js     := $(dir.wasmfs)/sqlite3-wasmfs.js
+sqlite3-wasmfs.wasm   := $(dir.wasmfs)/sqlite3-wasmfs.wasm
 
 CLEAN_FILES += $(sqlite3-wasmfs.js) $(sqlite3-wasmfs.wasm) \
     $(subst .js,.worker.js,$(sqlite3-wasmfs.js))
 
-########################################################################
-# emcc flags for .c/.o/.wasm.
-sqlite3-wasmfs.flags =
-#sqlite3-wasmfs.flags += -v # _very_ loud but also informative about what it's doing
-
 ########################################################################
 # emcc flags for .c/.o.
 sqlite3-wasmfs.cflags :=
 sqlite3-wasmfs.cflags += -std=c99 -fPIC
 sqlite3-wasmfs.cflags += -pthread
-sqlite3-wasmfs.cflags += -I. -I.. -I$(dir.top)
+sqlite3-wasmfs.cflags += $(cflags.common)
 sqlite3-wasmfs.cflags += $(SQLITE_OPT) -DSQLITE_WASM_WASMFS
 
 ########################################################################
@@ -35,7 +36,7 @@ sqlite3-wasmfs.jsflags += -sMODULARIZE
 sqlite3-wasmfs.jsflags += -sSTRICT_JS
 sqlite3-wasmfs.jsflags += -sDYNAMIC_EXECUTION=0
 sqlite3-wasmfs.jsflags += -sNO_POLYFILL
-sqlite3-wasmfs.jsflags += -sEXPORTED_FUNCTIONS=@$(dir.api)/EXPORTED_FUNCTIONS.sqlite3-api
+sqlite3-wasmfs.jsflags += -sEXPORTED_FUNCTIONS=@$(abspath $(dir.api)/EXPORTED_FUNCTIONS.sqlite3-api)
 sqlite3-wasmfs.jsflags += -sEXPORTED_RUNTIME_METHODS=FS,wasmMemory,allocateUTF8OnStack
                                             # wasmMemory ==> for -sIMPORTED_MEMORY
                                             # allocateUTF8OnStack ==> wasmfs internals
@@ -67,7 +68,7 @@ sqlite3-wasmfs.jsflags += -sWASM_BIGINT=$(emcc_enable_bigint)
 $(eval $(call call-make-pre-js,sqlite3-wasmfs))
 sqlite3-wasmfs.jsflags += $(pre-post-common.flags) $(pre-post-sqlite3-wasmfs.flags)
 $(sqlite3-wasmfs.js): $(sqlite3-wasm.c) \
-    EXPORTED_FUNCTIONS.api $(MAKEFILE) $(MAKEFILE.wasmfs) \
+    $(EXPORTED_FUNCTIONS.api) $(MAKEFILE) $(MAKEFILE.wasmfs) \
     $(pre-post-sqlite3-wasmfs.deps)
 	@echo "Building $@ ..."
 	$(emcc.bin) -o $@ $(emcc_opt_full) $(emcc.flags) \
@@ -84,22 +85,22 @@ all: wasmfs
 # speedtest1 for wasmfs. Re. sqlite3-wasm.o vs sqlite3-wasm.c:
 # building against the latter (predictably) results in a slightly
 # faster binary.
-speedtest1-wasmfs.js := speedtest1-wasmfs.js
+speedtest1-wasmfs.js := $(dir.wasmfs)/speedtest1-wasmfs.js
 speedtest1-wasmfs.wasm := $(subst .js,.wasm,$(speedtest1-wasmfs.js))
 speedtest1-wasmfs.eflags := $(sqlite3-wasmfs.fsflags)
 speedtest1-wasmfs.eflags += $(SQLITE_OPT) -DSQLITE_WASM_WASMFS
 $(eval $(call call-make-pre-js,speedtest1-wasmfs))
-$(speedtest1-wasmfs.js): $(speedtest1.cs) $(sqlite3-wasmfs.js) \
+$(speedtest1-wasmfs.js): $(speedtest1.cses) $(sqlite3-wasmfs.js) \
   $(MAKEFILE) $(MAKEFILE.wasmfs) \
   $(pre-post-speedtest1-wasmfs.deps) \
-  EXPORTED_FUNCTIONS.speedtest1
+  $(EXPORTED_FUNCTIONS.speedtest1)
 	@echo "Building $@ ..."
 	$(emcc.bin) \
         $(speedtest1-wasmfs.eflags) $(speedtest1-common.eflags) \
         $(pre-post-speedtest1-wasmfs.flags) \
         $(speedtest1.cflags) \
         $(sqlite3-wasmfs.cflags) \
-        -o $@ $(speedtest1.cs) -lm
+        -o $@ $(speedtest1.cses) -lm
 	$(maybe-wasm-strip) $(speedtest1-wasmfs.wasm)
 	ls -la $@ $(speedtest1-wasmfs.wasm)
 
diff --git a/manifest b/manifest
index 40f33190d9..f50dd6aef7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C More\swork\son\sthe\sJS\send-user\sdeliverables.\sAdd\stool/stripccomments.c\sto\ssupport\sthat.
-D 2022-10-18T20:36:50.562
+C Considerable\swasm/js\sbuild\scleanups\sand\sreworking.\sRemove\swasmfs\sbuilds\sfrom\sthe\send-user\sdeliverables\sand\sdisable\sthe\swasmfs\sbuild\sby\sdefault,\sper\s/chat\sdiscussion,\sas\sit\sdoubles\sour\sdeliverable\scount\sfor\sonly\smarginal\sgain.\sAttempt\sto\smove\sthe\ssqlite3.js/wasm\sfiles\sinto\ssubdirectories\sbut\srediscovered\sthat\sthat\sbreaks\sloading\sin\sWorker\smode\sbecause\sURI\sresolution\sof\sthe\swasm\sfiles\sdiffers\sdepending\son\swhether\sthe\smain\sscript\sis\sloaded\sfrom\sa\sscript\stag\sor\sa\sWorker.
+D 2022-10-19T01:07:30.150
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -472,14 +472,13 @@ F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
-F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle 0e88c8cfc3719e4b7e74980d9da664c709e68acf863e48386cda376edfd3bfb0
-F ext/wasm/GNUmakefile 279fd4589ba602e24d8e66ca795ec5a2275a0e329405e4e984e8ea0579339bae
-F ext/wasm/README-dist.txt 170be2d47b4b52504ef09088ca2f143aab657de0f9ac04d3a68e366f40929c3d
+F ext/wasm/GNUmakefile d5a39121aeb316562895889c6b27f9ec11e9cae2f844b23d5c7d04479a3bec2a
+F ext/wasm/README-dist.txt 13438bafe5fab1eca223be91459e757e6e67248fc959b9ae0ffb5808fd0a1610
 F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 89983a8d122c35a90c65ec667844b95a78bcd04f3198a99c1e0c8368c1a0b03a
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
 F ext/wasm/api/README.md 946398dd80bfd673f098b9d6ca3564e1fc77b03e660274d132f267c407b8703c
-F ext/wasm/api/extern-post-js.js dfae3a5f621ae94f1fae671f8013ed6464355f11e2adda38ed8b10bf1929f337
+F ext/wasm/api/extern-post-js.js b3d14b7d5880e70caec2feae2ab2f31ccb3af67d200e4a9fd58dcc0c4b401bf1
 F ext/wasm/api/extern-pre-js.js cc61c09c7a24a07dbecb4c352453c3985170cec12b4e7e7e7a4d11d43c5c8f41
 F ext/wasm/api/post-js-footer.js cd0a8ec768501d9bd45d325ab0442037fb0e33d1f3b4f08902f15c34720ee4a1
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
@@ -488,11 +487,11 @@ F ext/wasm/api/sqlite3-api-cleanup.js 4d07a7524dc9b7b050acfde57163e839243ad2383b
 F ext/wasm/api/sqlite3-api-glue.js 05eb701460bb72edbe3bf923bd51262551614612c37802fc597eabb4c6b83232
 F ext/wasm/api/sqlite3-api-oo1.js 9a5f0c00d476c504f16dcd456e1743dbc2826ca3d10645dfa62663a39e3ed0d8
 F ext/wasm/api/sqlite3-api-opfs.js 5a8ab3b76880c8ada8710ca9ba1ca5b160872edfd8bd5322e4f179a7f41cc616
-F ext/wasm/api/sqlite3-api-prologue.js a17b35814c6399a2e69c7836e5fd2eaa71f755ee51f96cb69d68cbf99985d45b
+F ext/wasm/api/sqlite3-api-prologue.js f6ae0da8de61f8d550b0bb8e486e5edd38129005c2bb2a448f6bf30dbf8b723b
 F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
 F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c 4c131945ced4b08a694d287abcdb066b896d961ef79ee5241805ecc37e83d63a
+F ext/wasm/api/sqlite3-wasm.c 84d410a2b9defdac85e6a421736307ff3a3eed3c1b0ae3b7b140edbc6ad81a8f
 F ext/wasm/batch-runner.html cf1a410c92bad50fcec2ddc71390b4e9df63a6ea1bef12a5163a66a0af4d78d9
 F ext/wasm/batch-runner.js 5bae81684728b6be157d1f92b39824153f0fd019345b39f2ab8930f7ee2a57d8
 F ext/wasm/common/SqliteTestUtil.js 647bf014bd30bdd870a7e9001e251d12fc1c9ec9ce176a1004b838a4b33c5c05
@@ -504,13 +503,13 @@ F ext/wasm/demo-123.html 7c239c9951d1b113f9f532969ac039294cf1dcfee2b3ae0a2c1ed2b
 F ext/wasm/demo-123.js e0cbeb3495e14103763d5c49794a24d67cf3d78e0ed5b82843be70c0c2ee4b3b
 F ext/wasm/demo-kvvfs1.html 7d4f28873de67f51ac18c584b7d920825139866a96049a49c424d6f5a0ea5e7f
 F ext/wasm/demo-kvvfs1.js 105596bd2ccd0b1deb5fde8e99b536e8242d4bb5932fac0c8403ff3a6bc547e8
-F ext/wasm/dist.make 1d59fafdfcf6fc5ee0f3351b21199585dba21afcf0518241789fd5d37a1c011d
-F ext/wasm/fiddle.make b609dfde299b4523d7123b7e0cecaa1a0aff0dd984e62cea653aae91f5063c90
+F ext/wasm/dist.make 2015746f6cd37ed17fadb14dba45d41ac6db727917d04f9b9aa431a816c5e54d
+F ext/wasm/fiddle.make a87250f6f973d9632818b9d2396c59e6542da180f8f10b164665a6fc04d239bc
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js 531859a471924a0ea48afa218e6877f0c164ca324d51e15843ed6ecc1c65c7ee
 F ext/wasm/fiddle/fiddle.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
 F ext/wasm/fiddle/fiddle.js 974b995119ac443685d7d94d3b3c58c6a36540e9eb3fed7069d5653284071715
-F ext/wasm/index.html d75b516236c6869568ff691b9b7ff61307d6436e059b5657dadc473b6f41e581
+F ext/wasm/index.html 47fd8be5f76b7e1123edb301b604bc751ba387498a597d8dc48bce24d1007c57
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 9aa6951b529a8b29f578ec8f0355713c39584c92cf1708f63ba0cf917cb5b68e
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
@@ -524,7 +523,7 @@ F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d826
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
 F ext/wasm/sqlite3-opfs-async-proxy.js 206ce6bbc3c30ad51a37d9c25e3a2712e70b586e0f9a2cf8cb0b9619017c2671
 F ext/wasm/sqlite3-worker1-promiser.js 307d7837420ca6a9d3780dfc81194f1c0715637e6d9540e935514086b96913d8
-F ext/wasm/sqlite3-worker1.js 466e9bd39409ab03f3e00999887aaffc11e95b416e2689596e3d7f1516673fdf
+F ext/wasm/sqlite3-worker1.js 25b29ff23958883e0a772bc835f4f4eb7e1714d7310385ed27106525930c2530
 F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
 F ext/wasm/test-opfs-vfs.js 56c3d725044c668fa7910451e96c1195d25ad95825f9ac79f747a7759d1973d0
 F ext/wasm/tester1-worker.html 0af7a22025ff1da72a84765d64f8f221844a57c6e6e314acf3a30f176101fd3f
@@ -532,11 +531,10 @@ F ext/wasm/tester1.html fde0e0bdeaaa2c39877c749dc86a8c1c306f771c3d75b89a6289a5ed
 F ext/wasm/tester1.js 8161dcc4b21902dadec2d3a5dc5700cab9c1641db0603e2ea56ea2a8de6cbab3
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
 F ext/wasm/testing-worker1-promiser.js bd788e33c1807e0a6dda9c9a9d784bd3350ca49c9dd8ae2cc8719b506b6e013e
-F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d7669fb17fcae
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
 F ext/wasm/testing2.js 88f40ef3cd8201bdadd120a711c36bbf0ce56cc0eab1d5e7debb71fed7822494
 F ext/wasm/version-info.c 5fa356d38859d71a0369b5c37e1935def7413fcc8a4e349a39d9052c1d0479f4
-F ext/wasm/wasmfs.make 9a51480d0a5ef33dd1c06c305379775302b735cb27737c2490ea449575ca5e25
+F ext/wasm/wasmfs.make ee0004813e16c283ff633e08b482008d56adf9b7d42f6c5612f7ab002b924f69
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
@@ -2037,8 +2035,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 740a2eb0928d54fdf735a8e573c6a61a34dbd295b46e5b6ef39e957fd2623293
-R f3423b9e5fdd1b3c8749326c161b8bbf
+P 2156f0744acfe425457430a0f6a7e02de907de85edba81a6d4eef40293e561c8
+R ee0ece99cec342c109cdb62c53280a5b
 U stephan
-Z 8ed4b03e8c6243f1d25f4dc2d31715c7
+Z 86621ae22c81858679965e272da6ace1
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 965ccd2dac..38a86ebeb0 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2156f0744acfe425457430a0f6a7e02de907de85edba81a6d4eef40293e561c8
\ No newline at end of file
+5b23e0675efdd2f1ea7b4f5836a579e8d6aa8a25b3f1a6a950520ad845ff01bb
\ No newline at end of file

From cd0df83c156d12c89bcbe41420af51d83444855d Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 19 Oct 2022 04:44:58 +0000
Subject: [PATCH 309/428] Apply considerable acrobatics to get the JS/WASM
 deliverables building to and loadable from a directory other than the one
 which contains the app-level code. Requires an only-slightly-leaky
 abstraction of passing a URL argument when loading sqlite3.js but provides
 much greater flexibility in where the JS/WASM files are located.

FossilOrigin-Name: 6d468dab9eb84d4548f68014959f02fe4f66455472ff24fe729382bb2972e3d1
---
 ext/wasm/GNUmakefile                          | 17 +++++-
 ext/wasm/api/extern-post-js.js                | 45 +++++++++++---
 ext/wasm/api/pre-js.js                        | 44 +++++++++++++-
 ext/wasm/api/sqlite3-api-opfs.js              | 14 ++++-
 ext/wasm/api/sqlite3-api-prologue.js          | 16 ++++-
 .../{ => api}/sqlite3-opfs-async-proxy.js     |  0
 .../{ => api}/sqlite3-worker1-promiser.js     | 19 +++++-
 ext/wasm/{ => api}/sqlite3-worker1.js         | 10 ++--
 ext/wasm/batch-runner.html                    |  2 +-
 ext/wasm/demo-123-worker.html                 |  6 +-
 ext/wasm/demo-123.html                        |  2 +-
 ext/wasm/demo-123.js                          | 21 ++++++-
 ext/wasm/demo-kvvfs1.html                     |  2 +-
 ext/wasm/fiddle.make                          |  6 +-
 ext/wasm/speedtest1-worker.html               |  2 +-
 ext/wasm/speedtest1-worker.js                 |  7 ++-
 ext/wasm/speedtest1.html                      |  2 +-
 ext/wasm/test-opfs-vfs.html                   | 12 ++--
 ext/wasm/test-opfs-vfs.js                     |  2 +-
 ext/wasm/tester1-worker.html                  |  2 +-
 ext/wasm/tester1.html                         |  2 +-
 ext/wasm/tester1.js                           | 25 +++++++-
 ext/wasm/testing-worker1-promiser.html        |  2 +-
 ext/wasm/testing-worker1-promiser.js          |  2 +-
 ext/wasm/testing2.js                          |  2 +-
 manifest                                      | 60 +++++++++----------
 manifest.uuid                                 |  2 +-
 27 files changed, 250 insertions(+), 76 deletions(-)
 rename ext/wasm/{ => api}/sqlite3-opfs-async-proxy.js (100%)
 rename ext/wasm/{ => api}/sqlite3-worker1-promiser.js (93%)
 rename ext/wasm/{ => api}/sqlite3-worker1.js (94%)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index f461f8b46a..f364e446bc 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -90,7 +90,7 @@ dir.tool := $(dir.top)/tool
 # the loading-from-worker case...
 #
 # dir.dout = output dir for deliverables.
-dir.dout := $(dir.wasm)
+dir.dout := $(dir.wasm)/jswasm
 # dir.tmp = output dir for intermediary build files, as opposed to
 # end-user deliverables.
 dir.tmp := $(dir.wasm)/bld
@@ -218,6 +218,20 @@ sqlite3-api.jses += $(dir.api)/sqlite3-api-worker1.js
 sqlite3-api.jses += $(dir.api)/sqlite3-api-opfs.js
 sqlite3-api.jses += $(dir.api)/sqlite3-api-cleanup.js
 
+# "External" API files which are part of our distribution
+# but not part of the sqlite3-api.js amalgamation.
+SOAP.js := $(dir.api)/sqlite3-opfs-async-proxy.js
+sqlite3-worker1.js := $(dir.api)/sqlite3-worker1.js
+sqlite3-worker1-promiser.js := $(dir.api)/sqlite3-worker1-promiser.js
+define CP_XAPI
+sqlite3-api.ext.jses += $$(dir.dout)/$$(notdir $(1))
+$$(dir.dout)/$$(notdir $(1)): $(1) $$(MAKEFILE)
+	cp $$< $$@
+endef
+$(foreach X,$(SOAP.js) $(sqlite3-worker1.js) $(sqlite3-worker1-promiser.js),\
+  $(eval $(call CP_XAPI,$(X))))
+all: $(sqlite3-api.ext.jses)
+
 sqlite3-api.js := $(dir.tmp)/sqlite3-api.js
 $(sqlite3-api.js): $(sqlite3-api.jses) $(MAKEFILE)
 	@echo "Making $@..."
@@ -384,6 +398,7 @@ sqlite3-wasm.c := $(dir.api)/sqlite3-wasm.c
 # difference. Thus we build all binaries against sqlite3-wasm.c
 # instead of building a shared copy of sqlite3-wasm.o.
 $(eval $(call call-make-pre-js,sqlite3))
+$(sqlite3.js):
 $(sqlite3.js): $(MAKEFILE) $(sqlite3.wasm.obj) \
     $(EXPORTED_FUNCTIONS.api) \
     $(pre-post-sqlite3.deps)
diff --git a/ext/wasm/api/extern-post-js.js b/ext/wasm/api/extern-post-js.js
index 7dba03b3a7..5f5f72d4b3 100644
--- a/ext/wasm/api/extern-post-js.js
+++ b/ext/wasm/api/extern-post-js.js
@@ -16,6 +16,27 @@
   if(!originalInit){
     throw new Error("Expecting self.sqlite3InitModule to be defined by the Emscripten build.");
   }
+  /**
+     We need to add some state which our custom Module.locateFile()
+     can see, but an Emscripten limitation currently prevents us from
+     attaching it to the sqlite3InitModule function object:
+
+     https://github.com/emscripten-core/emscripten/issues/18071
+
+     The only current workaround is to temporarily stash this state
+     into the global scope and delete it when sqlite3InitModule()
+     is called.
+  */
+  const initModuleState = self.sqlite3InitModuleState = Object.assign(Object.create(null),{
+    moduleScript: self?.document?.currentScript,
+    isWorker: (!self.document && self.window !== self),
+    location: self.location,
+    urlParams: new URL(self.location.href).searchParams
+  });
+  if(initModuleState.urlParams.has('sqlite3.dir')){
+    initModuleState.sqlite3Dir = initModuleState.urlParams.get('sqlite3.dir') +'/';
+  };
+
   self.sqlite3InitModule = (...args)=>{
     //console.warn("Using replaced sqlite3InitModule()",self.location);
     return originalInit(...args).then((EmscriptenModule)=>{
@@ -32,6 +53,8 @@
             Emscripten details. */
         return EmscriptenModule;
       }
+      EmscriptenModule.sqlite3.scriptInfo = initModuleState;
+      //console.warn("sqlite3.scriptInfo =",EmscriptenModule.sqlite3.scriptInfo);
       const f = EmscriptenModule.sqlite3.asyncPostInit;
       delete EmscriptenModule.sqlite3.asyncPostInit;
       return f();
@@ -41,13 +64,19 @@
     });
   };
   self.sqlite3InitModule.ready = originalInit.ready;
-  //console.warn("Replaced sqlite3InitModule()");
-})();
 
-if(0){
-  console.warn("self.location.href =",self.location.href);
-  if('undefined' !== typeof document){
-    console.warn("document.currentScript.src =",
-                 document?.currentScript?.src);
+  if(self.sqlite3InitModuleState.moduleScript){
+    const sim = self.sqlite3InitModuleState;
+    let src = sim.moduleScript.src.split('/');
+    src.pop();
+    sim.scriptDir = src.join('/') + '/';
   }
-}
+  if(0){
+    console.warn("Replaced sqlite3InitModule()");
+    console.warn("self.location.href =",self.location.href);
+    if('undefined' !== typeof document){
+      console.warn("document.currentScript.src =",
+                   document?.currentScript?.src);
+    }
+  }
+})();
diff --git a/ext/wasm/api/pre-js.js b/ext/wasm/api/pre-js.js
index b6630416dd..c07d0373cd 100644
--- a/ext/wasm/api/pre-js.js
+++ b/ext/wasm/api/pre-js.js
@@ -4,9 +4,49 @@
    This file is intended to be prepended to the sqlite3.js build using
    Emscripten's --pre-js=THIS_FILE flag (or equivalent).
 */
+
+// See notes in extern-post-js.js
+const sqlite3InitModuleState = self.sqlite3InitModuleState || Object.create(null);
+delete self.sqlite3InitModuleState;
+
+/**
+   This custom locateFile() tries to figure out where to load `path`
+   from. The intent is to provide a way for foo/bar/X.js loaded from a
+   Worker constructor or importScripts() to be able to resolve
+   foo/bar/X.wasm (in the latter case, with some help):
+
+   1) If URL param named the same as `path` is set, it is returned.
+
+   2) If sqlite3InitModuleState.sqlite3Dir is set, then (thatName + path)
+      is returned (note that it's assumed to end with '/').
+
+   3) If this code is running in the main UI thread AND it was loaded
+      from a SCRIPT tag, the directory part of that URL is used
+      as the prefix. (This form of resolution unfortunately does not
+      function for scripts loaded via importScripts().)
+
+   4) If none of the above apply, (prefix+path) is returned.
+*/
 Module['locateFile'] = function(path, prefix) {
-  return prefix + path;
-};
+  let theFile;
+  const up = this.urlParams;
+  if(0){
+    console.warn("locateFile(",arguments[0], ',', arguments[1],")",
+                 'self.location =',self.location,
+                 'sqlite3InitModuleState.scriptDir =',this.scriptDir,
+                 'up.entries() =',Array.from(up.entries()));
+  }
+  if(up.has(path)){
+    theFile = up.get(path);
+  }else if(this.sqlite3Dir){
+    theFile = this.sqlite3Dir + path;
+  }else if(this.scriptDir){
+    theFile = this.scriptDir + path;
+  }else{
+    theFile = prefix + path;
+  }
+  return theFile;
+}.bind(sqlite3InitModuleState);
 
 /**
    Bug warning: this xInstantiateWasm bit must remain disabled
diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index 98defe4fbc..9f53024548 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -98,6 +98,9 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
     options.proxyUri = callee.defaultProxyUri;
   }
 
+  if('function' === typeof options.proxyUri){
+    options.proxyUri = options.proxyUri();
+  }
   const thePromise = new Promise(function(promiseResolve, promiseReject_){
     const loggers = {
       0:console.error.bind(console),
@@ -1092,9 +1095,18 @@ installOpfsVfs.defaultProxyUri =
   "sqlite3-opfs-async-proxy.js";
 //console.warn("sqlite3.installOpfsVfs.defaultProxyUri =",sqlite3.installOpfsVfs.defaultProxyUri);
 self.sqlite3ApiBootstrap.initializersAsync.push(async (sqlite3)=>{
+  if(sqlite3.scriptInfo && !sqlite3.scriptInfo.isWorker){
+    return;
+  }
   try{
+    let proxyJs = installOpfsVfs.defaultProxyUri;
+    if(sqlite3.scriptInfo.sqlite3Dir){
+      installOpfsVfs.defaultProxyUri =
+        sqlite3.scriptInfo.sqlite3Dir + proxyJs;
+      //console.warn("installOpfsVfs.defaultProxyUri =",installOpfsVfs.defaultProxyUri);
+    }
     return installOpfsVfs().catch((e)=>{
-      console.warn("Ignoring inability to install OPFS sqlite3_vfs:",e);
+      console.warn("Ignoring inability to install OPFS sqlite3_vfs:",e.message);
     });
   }catch(e){
     console.error("installOpfsVfs() exception:",e);
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index f8c0f024e6..3980e0ad42 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -1334,7 +1334,20 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
       //while(lip.length) p = p.then(lip.shift());
       //return p.then(()=>sqlite3);
       return Promise.all(lip).then(()=>sqlite3);
-    }
+    },
+    /**
+       scriptInfo ideally gets injected into this object by the
+       infrastructure which assembles the JS/WASM module. It contains
+       state which must be collected before sqlite3ApiBootstrap() can
+       be declared. It is not necessarily available to any
+       sqlite3ApiBootstrap.initializers but "should" be in place (if
+       it's added at all) by the time that
+       sqlite3ApiBootstrap.initializersAsync is processed.
+
+       This state is not part of the public API, only intended for use
+       with the sqlite3 API bootstrapping and wasm-loading process.
+    */
+    scriptInfo: undefined
   };
   try{
     sqlite3ApiBootstrap.initializers.forEach((f)=>{
@@ -1410,3 +1423,4 @@ self.sqlite3ApiBootstrap.defaultConfig = Object.create(null);
    value which will be stored here.
 */
 self.sqlite3ApiBootstrap.sqlite3 = undefined;
+
diff --git a/ext/wasm/sqlite3-opfs-async-proxy.js b/ext/wasm/api/sqlite3-opfs-async-proxy.js
similarity index 100%
rename from ext/wasm/sqlite3-opfs-async-proxy.js
rename to ext/wasm/api/sqlite3-opfs-async-proxy.js
diff --git a/ext/wasm/sqlite3-worker1-promiser.js b/ext/wasm/api/sqlite3-worker1-promiser.js
similarity index 93%
rename from ext/wasm/sqlite3-worker1-promiser.js
rename to ext/wasm/api/sqlite3-worker1-promiser.js
index 71e2e33135..a77b0126df 100644
--- a/ext/wasm/sqlite3-worker1-promiser.js
+++ b/ext/wasm/api/sqlite3-worker1-promiser.js
@@ -237,6 +237,23 @@ self.sqlite3Worker1Promiser = function callee(config = callee.defaultConfig){
   };
 }/*sqlite3Worker1Promiser()*/;
 self.sqlite3Worker1Promiser.defaultConfig = {
-  worker: ()=>new Worker("sqlite3-worker1.js"+self.location.search),
+  worker: function(){
+    let theJs = "sqlite3-worker1.js";
+    if(this.currentScript){
+      const src = this.currentScript.src.split('/');
+      src.pop();
+      theJs = src.join('/')+'/' + theJs;
+      //console.warn("promiser currentScript, theJs =",this.currentScript,theJs);
+    }else{
+      //console.warn("promiser self.location =",self.location);
+      const urlParams = new URL(self.location.href).searchParams;
+      if(urlParams.has('sqlite3.dir')){
+        theJs = urlParams.get('sqlite3.dir') + '/' + theJs;
+      }
+    }
+    return new Worker(theJs + self.location.search);
+  }.bind({
+    currentScript: self?.document?.currentScript
+  }),
   onerror: (...args)=>console.error('worker1 promiser error',...args)
 };
diff --git a/ext/wasm/sqlite3-worker1.js b/ext/wasm/api/sqlite3-worker1.js
similarity index 94%
rename from ext/wasm/sqlite3-worker1.js
rename to ext/wasm/api/sqlite3-worker1.js
index fef155e1f8..bc860300bb 100644
--- a/ext/wasm/sqlite3-worker1.js
+++ b/ext/wasm/api/sqlite3-worker1.js
@@ -29,23 +29,21 @@
   This file accepts a couple of URL arguments to adjust how it loads
   sqlite3.js:
 
-  - `sqlite3.dir`, if set, treats the given directory name as the
-    directory from which `sqlite3.js` will be loaded.
   - `sqlite3.js`, if set, is used as the URI to `sqlite3.js` and it
     may contain path elements, e.g. `sqlite3.js=foo/bar/my-sqlite3.js`.
+  - `sqlite3.dir`, if set, treats the given directory name as the
+    directory from which `sqlite3.js` will be loaded.
 
   By default is loads 'sqlite3.js'.
 */
 "use strict";
 (()=>{
   const urlParams = new URL(self.location.href).searchParams;
-  let theJs;
+  let theJs = 'sqlite3.js';
   if(urlParams.has('sqlite3.js')){
     theJs = urlParams.get('sqlite3.js');
   }else if(urlParams.has('sqlite3.dir')){
-    theJs = urlParams.get('sqlite3.dir')+'/sqlite3.js';
-  }else{
-    theJs = 'sqlite3.js';
+    theJs = urlParams.get('sqlite3.dir') + '/' + theJs;
   }
   importScripts(theJs);
   sqlite3InitModule().then((sqlite3)=>{
diff --git a/ext/wasm/batch-runner.html b/ext/wasm/batch-runner.html
index e7a2b1e082..5258f9597e 100644
--- a/ext/wasm/batch-runner.html
+++ b/ext/wasm/batch-runner.html
@@ -69,7 +69,7 @@
         <label for='cb-reverse-log-order'>Reverse log order (newest first)</label>
       </span>
     <div id='test-output'></div>
-    <script src="sqlite3-wasmfs.js"></script>
+    <script src="jswasm/sqlite3.js"></script>
     <script src="common/SqliteTestUtil.js"></script>
     <script src="batch-runner.js"></script>
     <style>
diff --git a/ext/wasm/demo-123-worker.html b/ext/wasm/demo-123-worker.html
index f632e39515..692203d71e 100644
--- a/ext/wasm/demo-123-worker.html
+++ b/ext/wasm/demo-123-worker.html
@@ -25,7 +25,11 @@
         ln.append(document.createTextNode(args.join(' ')));
         document.body.append(ln);
       };
-      const w = new Worker("demo-123.js");
+      const w = new Worker("demo-123.js?sqlite3.dir=jswasm"
+                           /* Note the URL argument on that name. See
+                              the notes in demo-123.js (search for
+                              "importScripts") for why we need
+                              that. */);
       w.onmessage = function({data}){
         switch(data.type){
             case 'log':
diff --git a/ext/wasm/demo-123.html b/ext/wasm/demo-123.html
index 0771990c70..2046b076d4 100644
--- a/ext/wasm/demo-123.html
+++ b/ext/wasm/demo-123.html
@@ -18,7 +18,7 @@
   </head>
   <body>
     <h1>1-2-sqlite3 demo</h1>
-    <script src="sqlite3.js"></script>
+    <script src="jswasm/sqlite3.js"></script>
     <script src="demo-123.js"></script>
   </body>
 </html>
diff --git a/ext/wasm/demo-123.js b/ext/wasm/demo-123.js
index 04a999488a..311afcc827 100644
--- a/ext/wasm/demo-123.js
+++ b/ext/wasm/demo-123.js
@@ -251,7 +251,26 @@
 
   log("Loading and initializing sqlite3 module...");
   if(self.window!==self) /*worker thread*/{
-    importScripts("sqlite3.js");
+    /*
+      If sqlite3.js is in a directory other than this script, in order
+      to get sqlite3.js to resolve sqlite3.wasm properly, we have to
+      explicitly tell it where sqlite3.js is being loaded from. We do
+      that by passing the `sqlite3.dir=theDirName` URL argument to
+      _this_ script. That URL argument will be seen by the JS/WASM
+      loader and it will adjust the sqlite3.wasm path accordingly. If
+      sqlite3.js/.wasm are in the same directory as this script then
+      that's not needed.
+
+      URL arguments passed as part of the filename via importScripts()
+      are simply lost, and such scripts see the self.location of
+      _this_ script.
+    */
+    let sqlite3Js = 'sqlite3.js';
+    const urlParams = new URL(self.location.href).searchParams;
+    if(urlParams.has('sqlite3.dir')){
+      sqlite3Js = urlParams.get('sqlite3.dir') + '/' + sqlite3Js;
+    }
+    importScripts(sqlite3Js);
   }
   self.sqlite3InitModule({
     // We can redirect any stdout/stderr from the module
diff --git a/ext/wasm/demo-kvvfs1.html b/ext/wasm/demo-kvvfs1.html
index caa3cdec85..b79ef1157b 100644
--- a/ext/wasm/demo-kvvfs1.html
+++ b/ext/wasm/demo-kvvfs1.html
@@ -42,7 +42,7 @@
       .toolbar > * { margin: 0.25em; }
       fieldset { border-radius: 0.5em; }
     </style>
-    <script src="sqlite3.js"></script>
+    <script src="jswasm/sqlite3.js"></script>
     <script src="common/SqliteTestUtil.js"></script>
     <script src="demo-kvvfs1.js"></script>
   </body>
diff --git a/ext/wasm/fiddle.make b/ext/wasm/fiddle.make
index 84cc6b298a..f669efd92c 100644
--- a/ext/wasm/fiddle.make
+++ b/ext/wasm/fiddle.make
@@ -53,14 +53,14 @@ fiddle-module.js := $(dir.fiddle)/fiddle-module.js
 fiddle-module.wasm := $(subst .js,.wasm,$(fiddle-module.js))
 fiddle.cses := $(dir.top)/shell.c $(sqlite3-wasm.c)
 
-SOAP.js := sqlite3-opfs-async-proxy.js
-$(dir.fiddle)/$(SOAP.js): $(SOAP.js)
+fiddle.SOAP.js := $(dir.fiddle)/$(notdir $(SOAP.js))
+$(fiddle.SOAP.js): $(SOAP.js)
 	cp $< $@
 
 $(eval $(call call-make-pre-js,fiddle-module))
 $(fiddle-module.js): $(MAKEFILE) $(MAKEFILE.fiddle) \
     $(EXPORTED_FUNCTIONS.fiddle) \
-    $(fiddle.cses) $(pre-post-fiddle-module.deps) $(dir.fiddle)/$(SOAP.js)
+    $(fiddle.cses) $(pre-post-fiddle-module.deps) $(fiddle.SOAP.js)
 	$(emcc.bin) -o $@ $(fiddle.emcc-flags) \
     $(pre-post-common.flags) $(pre-post-fiddle-module.flags) \
     $(fiddle.cses)
diff --git a/ext/wasm/speedtest1-worker.html b/ext/wasm/speedtest1-worker.html
index 2e9ea2c343..56b6913352 100644
--- a/ext/wasm/speedtest1-worker.html
+++ b/ext/wasm/speedtest1-worker.html
@@ -169,7 +169,7 @@
         return str+a.join('&nbsp;');
     };
 
-    const W = new Worker("speedtest1-worker.js"+self.location.search);
+    const W = new Worker("speedtest1-worker.js?sqlite3.dir=jswasm");
     const mPost = function(msgType,payload){
         W.postMessage({type: msgType, data: payload});
     };
diff --git a/ext/wasm/speedtest1-worker.js b/ext/wasm/speedtest1-worker.js
index 1f421b0b86..81a40e2b78 100644
--- a/ext/wasm/speedtest1-worker.js
+++ b/ext/wasm/speedtest1-worker.js
@@ -1,6 +1,11 @@
 'use strict';
 (function(){
-  importScripts('common/whwasmutil.js','speedtest1.js');
+  let speedtestJs = 'speedtest1.js';
+  const urlParams = new URL(self.location.href).searchParams;
+  if(urlParams.has('sqlite3.dir')){
+    speedtestJs = urlParams.get('sqlite3.dir') + '/' + speedtestJs;
+  }
+  importScripts('common/whwasmutil.js', speedtestJs);
   /**
      If this environment contains OPFS, this function initializes it and
      returns the name of the dir on which OPFS is mounted, else it returns
diff --git a/ext/wasm/speedtest1.html b/ext/wasm/speedtest1.html
index 358d8ba79e..a53b24c6df 100644
--- a/ext/wasm/speedtest1.html
+++ b/ext/wasm/speedtest1.html
@@ -37,7 +37,7 @@
       speedtest is running. Output will appear below when ready...
     <div id='test-output'></div>
     <script src="common/SqliteTestUtil.js"></script>
-    <script src="speedtest1.js"></script>
+    <script src="jswasm/speedtest1.js"></script>
     <script>(function(){
     /**
        If this environment contains OPFS, this function initializes it and
diff --git a/ext/wasm/test-opfs-vfs.html b/ext/wasm/test-opfs-vfs.html
index 41b278c289..235ef51e9f 100644
--- a/ext/wasm/test-opfs-vfs.html
+++ b/ext/wasm/test-opfs-vfs.html
@@ -9,16 +9,18 @@
     <title>Async-behind-Sync experiment</title>
   </head>
   <body>
-    <header id='titlebar'><span>Async-behind-Sync Experiment</span></header>
-    <div>This is an experiment in wrapping the
-      asynchronous OPFS APIs behind a fully synchronous proxy. It is
-      very much incomplete, under construction, and experimental.
+    <header id='titlebar'><span>Async-behind-Sync sqlite3_vfs</span></header>
+    <div>This performs a sanity test of the "opfs" sqlite3_vfs.
       <strong>See the dev console for all output.</strong>
     </div>
     <div>
       <a href='?delete'>Use this link</a> to delete the persistent OPFS-side db (if any).
     </div>
     <div id='test-output'></div>
-    <script>new Worker("test-opfs-vfs.js"+self.location.search);</script>
+    <script>
+      new Worker(
+          "test-opfs-vfs.js?sqlite3.dir=jswasm&"+self.location.search.substr(1)
+      );
+    </script>
   </body>
 </html>
diff --git a/ext/wasm/test-opfs-vfs.js b/ext/wasm/test-opfs-vfs.js
index 583871b7d1..e22acc0e3d 100644
--- a/ext/wasm/test-opfs-vfs.js
+++ b/ext/wasm/test-opfs-vfs.js
@@ -76,7 +76,7 @@ const tryOpfsVfs = async function(sqlite3){
   log("Done!");
 }/*tryOpfsVfs()*/;
 
-importScripts('sqlite3.js');
+importScripts('jswasm/sqlite3.js');
 self.sqlite3InitModule()
   .then((sqlite3)=>tryOpfsVfs(sqlite3))
   .catch((e)=>{
diff --git a/ext/wasm/tester1-worker.html b/ext/wasm/tester1-worker.html
index bb5de0762f..e127cffdca 100644
--- a/ext/wasm/tester1-worker.html
+++ b/ext/wasm/tester1-worker.html
@@ -24,7 +24,7 @@
         ln.append(document.createTextNode(args.join(' ')));
         logTarget.append(ln);
       };
-      const w = new Worker("tester1.js");
+      const w = new Worker("tester1.js?sqlite3.dir=jswasm");
       w.onmessage = function({data}){
         switch(data.type){
             case 'log':
diff --git a/ext/wasm/tester1.html b/ext/wasm/tester1.html
index 9cf0bee0a3..c163151278 100644
--- a/ext/wasm/tester1.html
+++ b/ext/wasm/tester1.html
@@ -16,7 +16,7 @@
   <body>
     <h1>sqlite3 WASM/JS tester #1 (UI thread)</h1>
     <div id='test-output'></div>
-    <script src="sqlite3.js"></script>
+    <script src="jswasm/sqlite3.js"></script>
     <script src="tester1.js"></script>
   </body>
 </html>
diff --git a/ext/wasm/tester1.js b/ext/wasm/tester1.js
index aef9d2301b..c8808c9137 100644
--- a/ext/wasm/tester1.js
+++ b/ext/wasm/tester1.js
@@ -65,7 +65,7 @@
   };
   const normalizeArgs = (args)=>args.map(mapToString);
   if( isUIThread() ){
-    console.log("Running in UI thread.");
+    console.log("Running in the UI thread.");
     const logTarget = document.querySelector('#test-output');
     logClass = function(cssClass,...args){
       const ln = document.createElement('div');
@@ -74,7 +74,7 @@
       logTarget.append(ln);
     };
   }else{ /* Worker thread */
-    console.log("Running Worker thread.");
+    console.log("Running in a Worker thread.");
     logClass = function(cssClass,...args){
       postMessage({
         type:'log',
@@ -1428,7 +1428,26 @@
   ////////////////////////////////////////////////////////////////////////
   log("Loading and initializing sqlite3 WASM module...");
   if(!isUIThread()){
-    importScripts("sqlite3.js");
+    /*
+      If sqlite3.js is in a directory other than this script, in order
+      to get sqlite3.js to resolve sqlite3.wasm properly, we have to
+      explicitly tell it where sqlite3.js is being loaded from. We do
+      that by passing the `sqlite3.dir=theDirName` URL argument to
+      _this_ script. That URL argument will be seen by the JS/WASM
+      loader and it will adjust the sqlite3.wasm path accordingly. If
+      sqlite3.js/.wasm are in the same directory as this script then
+      that's not needed.
+
+      URL arguments passed as part of the filename via importScripts()
+      are simply lost, and such scripts see the self.location of
+      _this_ script.
+    */
+    let sqlite3Js = 'sqlite3.js';
+    const urlParams = new URL(self.location.href).searchParams;
+    if(urlParams.has('sqlite3.dir')){
+      sqlite3Js = urlParams.get('sqlite3.dir') + '/' + sqlite3Js;
+    }
+    importScripts(sqlite3Js);
   }
   self.sqlite3InitModule({
     print: log,
diff --git a/ext/wasm/testing-worker1-promiser.html b/ext/wasm/testing-worker1-promiser.html
index 9af809d9ed..4b35ca82c0 100644
--- a/ext/wasm/testing-worker1-promiser.html
+++ b/ext/wasm/testing-worker1-promiser.html
@@ -28,7 +28,7 @@
     <hr>
     <div id='test-output'></div>
     <script src="common/SqliteTestUtil.js"></script>
-    <script src="sqlite3-worker1-promiser.js"></script>
+    <script src="jswasm/sqlite3-worker1-promiser.js"></script>
     <script src="testing-worker1-promiser.js"></script>
   </body>
 </html>
diff --git a/ext/wasm/testing-worker1-promiser.js b/ext/wasm/testing-worker1-promiser.js
index 259d20fddc..855643b2d2 100644
--- a/ext/wasm/testing-worker1-promiser.js
+++ b/ext/wasm/testing-worker1-promiser.js
@@ -40,7 +40,7 @@
 
   const promiserConfig = {
     worker: ()=>{
-      const w = new Worker("sqlite3-worker1.js");
+      const w = new Worker("jswasm/sqlite3-worker1.js");
       w.onerror = (event)=>error("worker.onerror",event);
       return w;
     },
diff --git a/ext/wasm/testing2.js b/ext/wasm/testing2.js
index 7163fe1204..5ea48db6b6 100644
--- a/ext/wasm/testing2.js
+++ b/ext/wasm/testing2.js
@@ -19,7 +19,7 @@
 'use strict';
 (function(){
   const T = self.SqliteTestUtil;
-  const SW = new Worker("sqlite3-worker1.js");
+  const SW = new Worker("jswasm/sqlite3-worker1.js");
   const DbState = {
     id: undefined
   };
diff --git a/manifest b/manifest
index f50dd6aef7..f141d54ba2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Considerable\swasm/js\sbuild\scleanups\sand\sreworking.\sRemove\swasmfs\sbuilds\sfrom\sthe\send-user\sdeliverables\sand\sdisable\sthe\swasmfs\sbuild\sby\sdefault,\sper\s/chat\sdiscussion,\sas\sit\sdoubles\sour\sdeliverable\scount\sfor\sonly\smarginal\sgain.\sAttempt\sto\smove\sthe\ssqlite3.js/wasm\sfiles\sinto\ssubdirectories\sbut\srediscovered\sthat\sthat\sbreaks\sloading\sin\sWorker\smode\sbecause\sURI\sresolution\sof\sthe\swasm\sfiles\sdiffers\sdepending\son\swhether\sthe\smain\sscript\sis\sloaded\sfrom\sa\sscript\stag\sor\sa\sWorker.
-D 2022-10-19T01:07:30.150
+C Apply\sconsiderable\sacrobatics\sto\sget\sthe\sJS/WASM\sdeliverables\sbuilding\sto\sand\sloadable\sfrom\sa\sdirectory\sother\sthan\sthe\sone\swhich\scontains\sthe\sapp-level\scode.\sRequires\san\sonly-slightly-leaky\sabstraction\sof\spassing\sa\sURL\sargument\swhen\sloading\ssqlite3.js\sbut\sprovides\smuch\sgreater\sflexibility\sin\swhere\sthe\sJS/WASM\sfiles\sare\slocated.
+D 2022-10-19T04:44:58.210
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -472,39 +472,42 @@ F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
-F ext/wasm/GNUmakefile d5a39121aeb316562895889c6b27f9ec11e9cae2f844b23d5c7d04479a3bec2a
+F ext/wasm/GNUmakefile e9686a03f201a16786783964d0f2fcf4d9af8a9aee6e3ce5b6c3ee5d7750842f
 F ext/wasm/README-dist.txt 13438bafe5fab1eca223be91459e757e6e67248fc959b9ae0ffb5808fd0a1610
 F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 89983a8d122c35a90c65ec667844b95a78bcd04f3198a99c1e0c8368c1a0b03a
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
 F ext/wasm/api/README.md 946398dd80bfd673f098b9d6ca3564e1fc77b03e660274d132f267c407b8703c
-F ext/wasm/api/extern-post-js.js b3d14b7d5880e70caec2feae2ab2f31ccb3af67d200e4a9fd58dcc0c4b401bf1
+F ext/wasm/api/extern-post-js.js 4bba34d8301f6058abd8ee24d2778b7360c5c3679217b38f5670e97a5ba7a3ec
 F ext/wasm/api/extern-pre-js.js cc61c09c7a24a07dbecb4c352453c3985170cec12b4e7e7e7a4d11d43c5c8f41
 F ext/wasm/api/post-js-footer.js cd0a8ec768501d9bd45d325ab0442037fb0e33d1f3b4f08902f15c34720ee4a1
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
-F ext/wasm/api/pre-js.js 5b550904322d73127badd4347ca967ea525b901573559736f92d326ad9b7bb76
+F ext/wasm/api/pre-js.js 151e0616614a49f3db19ed544fa13b38c87c108959fbcd4029ea8399a562d94f
 F ext/wasm/api/sqlite3-api-cleanup.js 4d07a7524dc9b7b050acfde57163e839243ad2383bd7ee0de0178b1b3e988588
 F ext/wasm/api/sqlite3-api-glue.js 05eb701460bb72edbe3bf923bd51262551614612c37802fc597eabb4c6b83232
 F ext/wasm/api/sqlite3-api-oo1.js 9a5f0c00d476c504f16dcd456e1743dbc2826ca3d10645dfa62663a39e3ed0d8
-F ext/wasm/api/sqlite3-api-opfs.js 5a8ab3b76880c8ada8710ca9ba1ca5b160872edfd8bd5322e4f179a7f41cc616
-F ext/wasm/api/sqlite3-api-prologue.js f6ae0da8de61f8d550b0bb8e486e5edd38129005c2bb2a448f6bf30dbf8b723b
+F ext/wasm/api/sqlite3-api-opfs.js 22d60ba956e873b65e2e0591e239178082bd53a6d563c3c58db7dc03e562e8f7
+F ext/wasm/api/sqlite3-api-prologue.js bdcd1f636e5ef0622f99b753aff0d26cc250bcd3a17923771e335ec73059b073
 F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
 F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
+F ext/wasm/api/sqlite3-opfs-async-proxy.js 206ce6bbc3c30ad51a37d9c25e3a2712e70b586e0f9a2cf8cb0b9619017c2671 w ext/wasm/sqlite3-opfs-async-proxy.js
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 84d410a2b9defdac85e6a421736307ff3a3eed3c1b0ae3b7b140edbc6ad81a8f
-F ext/wasm/batch-runner.html cf1a410c92bad50fcec2ddc71390b4e9df63a6ea1bef12a5163a66a0af4d78d9
+F ext/wasm/api/sqlite3-worker1-promiser.js f0aa93db62903f4006428cbcd2209a765655ec69a0e57247baba0fc94d745987 w ext/wasm/sqlite3-worker1-promiser.js
+F ext/wasm/api/sqlite3-worker1.js 59fd89ee42bc380a053a848d35806177c27eb82684ef152a34c65c7ce1b5d233 w ext/wasm/sqlite3-worker1.js
+F ext/wasm/batch-runner.html 4deeed44fe41496dc6898d9fb17938ea3291f40f4bfb977e29d0cef96fbbe4c8
 F ext/wasm/batch-runner.js 5bae81684728b6be157d1f92b39824153f0fd019345b39f2ab8930f7ee2a57d8
 F ext/wasm/common/SqliteTestUtil.js 647bf014bd30bdd870a7e9001e251d12fc1c9ec9ce176a1004b838a4b33c5c05
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 53394885077edd3db22d2a0896192334dfc06fb3d1da0b646eb12a332d22f18e
 F ext/wasm/common/whwasmutil.js 50d2ede0b0fa01c1d467e1801fab79f5e46bb02bcbd2b0232e4fdc6090a47818
-F ext/wasm/demo-123-worker.html e50b51dc7271b9d3cc830cb7c2fba294d622f56b7acb199f7257d11195a63d49
-F ext/wasm/demo-123.html 7c239c9951d1b113f9f532969ac039294cf1dcfee2b3ae0a2c1ed2b3d59f8dfa
-F ext/wasm/demo-123.js e0cbeb3495e14103763d5c49794a24d67cf3d78e0ed5b82843be70c0c2ee4b3b
-F ext/wasm/demo-kvvfs1.html 7d4f28873de67f51ac18c584b7d920825139866a96049a49c424d6f5a0ea5e7f
+F ext/wasm/demo-123-worker.html a0b58d9caef098a626a1a1db567076fca4245e8d60ba94557ede8684350a81ed
+F ext/wasm/demo-123.html 8c70a412ce386bd3796534257935eb1e3ea5c581e5d5aea0490b8232e570a508
+F ext/wasm/demo-123.js ebae30756585bca655b4ab2553ec9236a87c23ad24fc8652115dcedb06d28df6
+F ext/wasm/demo-kvvfs1.html c4a69d2ded9cabad3e2eea75cd2936d9a13002ab4f10b9f1bac6130a0dee84dd
 F ext/wasm/demo-kvvfs1.js 105596bd2ccd0b1deb5fde8e99b536e8242d4bb5932fac0c8403ff3a6bc547e8
 F ext/wasm/dist.make 2015746f6cd37ed17fadb14dba45d41ac6db727917d04f9b9aa431a816c5e54d
-F ext/wasm/fiddle.make a87250f6f973d9632818b9d2396c59e6542da180f8f10b164665a6fc04d239bc
+F ext/wasm/fiddle.make e5a8966be370bf8592cdffb2520ad8c3bf6a64d08ea91c8ed17dc88624967697
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js 531859a471924a0ea48afa218e6877f0c164ca324d51e15843ed6ecc1c65c7ee
 F ext/wasm/fiddle/fiddle.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
@@ -515,24 +518,21 @@ F ext/wasm/jaccwabyt/jaccwabyt.md 9aa6951b529a8b29f578ec8f0355713c39584c92cf1708
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
 F ext/wasm/scratchpad-wasmfs-main.js 1aa32c1035cf1440a226a28fefcbb5762fbbcb020ccbe5895f8736d701695c63
 F ext/wasm/speedtest1-wasmfs.html bc28eb29b69a73864b8d7aae428448f8b7e1de81d8bfb9bba99541322054dbd0
-F ext/wasm/speedtest1-worker.html 17f5b3f0ddb361ea0fdfd58703e42d65b1564c297930ec5fff2cd267e6e252d9
-F ext/wasm/speedtest1-worker.js a9e3d052dd1d8016d6e9a641e596e6d99aec04ef8995d7ee9a85a9964eed771a
-F ext/wasm/speedtest1.html e4cb5d722b494104fc1249e7c008ca018f820a784833c51004c958c71038c80f
+F ext/wasm/speedtest1-worker.html 7b0cceab6a68b2883738e19f61d21620fe1244ba36c1b2e38d0efde57ecce86d
+F ext/wasm/speedtest1-worker.js 3fce67c7d00c9fc42591835a2014520997630e51189f98ca47f706b55cdce8bc
+F ext/wasm/speedtest1.html 00102689678b3c09ae6f5e4b3782e95f448e943a3491246e7be9ee349049bcaf
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
-F ext/wasm/sqlite3-opfs-async-proxy.js 206ce6bbc3c30ad51a37d9c25e3a2712e70b586e0f9a2cf8cb0b9619017c2671
-F ext/wasm/sqlite3-worker1-promiser.js 307d7837420ca6a9d3780dfc81194f1c0715637e6d9540e935514086b96913d8
-F ext/wasm/sqlite3-worker1.js 25b29ff23958883e0a772bc835f4f4eb7e1714d7310385ed27106525930c2530
-F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5
-F ext/wasm/test-opfs-vfs.js 56c3d725044c668fa7910451e96c1195d25ad95825f9ac79f747a7759d1973d0
-F ext/wasm/tester1-worker.html 0af7a22025ff1da72a84765d64f8f221844a57c6e6e314acf3a30f176101fd3f
-F ext/wasm/tester1.html fde0e0bdeaaa2c39877c749dc86a8c1c306f771c3d75b89a6289a5ed11243e9d
-F ext/wasm/tester1.js 8161dcc4b21902dadec2d3a5dc5700cab9c1641db0603e2ea56ea2a8de6cbab3
-F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
-F ext/wasm/testing-worker1-promiser.js bd788e33c1807e0a6dda9c9a9d784bd3350ca49c9dd8ae2cc8719b506b6e013e
+F ext/wasm/test-opfs-vfs.html 1f2d672f3f3fce810dfd48a8d56914aba22e45c6834e262555e685bce3da8c3f
+F ext/wasm/test-opfs-vfs.js 48fc59110e8775bb43c9be25b6d634fc07ebadab7da8fbd44889e8129c6e2548
+F ext/wasm/tester1-worker.html 048c341f124fdb61ca14dfd1bd1f78742490f208aa3bb1e84399f83f1e7e6a74
+F ext/wasm/tester1.html 66b71e2accdcbedae2593c72d2a69f906757707394dc014c2253102f0838cf57
+F ext/wasm/tester1.js 44d71175e2941bf1d7c27afa0c395fe81c83cbd74cd10e34e0688dd833042f1e
+F ext/wasm/testing-worker1-promiser.html 88c6ff8a7be351abef219639cd684c5c3e0c649c1dc07b10a5bd59939e7bb4b5
+F ext/wasm/testing-worker1-promiser.js f68ffbbe1c6086e18ce7961b8fc2b40dd88db174f59052e228c06b07484945ca
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
-F ext/wasm/testing2.js 88f40ef3cd8201bdadd120a711c36bbf0ce56cc0eab1d5e7debb71fed7822494
+F ext/wasm/testing2.js 90dc901a54ecc319d09356de2f8c21f53e7f61f2914445e6b176e1bcad12ba8b
 F ext/wasm/version-info.c 5fa356d38859d71a0369b5c37e1935def7413fcc8a4e349a39d9052c1d0479f4
 F ext/wasm/wasmfs.make ee0004813e16c283ff633e08b482008d56adf9b7d42f6c5612f7ab002b924f69
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
@@ -2035,8 +2035,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 2156f0744acfe425457430a0f6a7e02de907de85edba81a6d4eef40293e561c8
-R ee0ece99cec342c109cdb62c53280a5b
+P 5b23e0675efdd2f1ea7b4f5836a579e8d6aa8a25b3f1a6a950520ad845ff01bb
+R 120493b0bac13d94c837a00d100ef2e2
 U stephan
-Z 86621ae22c81858679965e272da6ace1
+Z 1f6ca89c3f0ab931ccb09f09451983aa
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 38a86ebeb0..cb6b4b3768 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5b23e0675efdd2f1ea7b4f5836a579e8d6aa8a25b3f1a6a950520ad845ff01bb
\ No newline at end of file
+6d468dab9eb84d4548f68014959f02fe4f66455472ff24fe729382bb2972e3d1
\ No newline at end of file

From 3117dc60e30dc65455f23c0e7e4230dc6c635ae1 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 19 Oct 2022 06:06:42 +0000
Subject: [PATCH 310/428] Update the dist rules for this evening's js/wasm
 build changes and include an index.html specifically for the subset of apps
 included in the dist archive.

FossilOrigin-Name: a0ef0f32e96638b502b3951e524d590bdfb09dd39be453686b075102da67b7db
---
 ext/wasm/GNUmakefile     | 18 ++++----
 ext/wasm/README-dist.txt | 21 +++++-----
 ext/wasm/api/README.md   |  6 +--
 ext/wasm/dist.make       | 89 +++++++++++++++++++++-------------------
 ext/wasm/index-dist.html | 82 ++++++++++++++++++++++++++++++++++++
 ext/wasm/tester1.html    |  4 +-
 manifest                 | 27 ++++++------
 manifest.uuid            |  2 +-
 8 files changed, 167 insertions(+), 82 deletions(-)
 create mode 100644 ext/wasm/index-dist.html

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index f364e446bc..fdf1332e5c 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -185,17 +185,17 @@ else
   $(info Development build. Use '$(MAKE) release' for a smaller release build.)
 endif
 
-version-info := $(dir.wasm)/version-info
+bin.version-info := $(dir.wasm)/bin.version-info
 # ^^^^ NOT in $(dir.tmp) because we need it to survive the cleanup
 # process for the dist build to work properly.
-$(version-info): $(dir.wasm)/version-info.c $(sqlite3.h) $(MAKEFILE)
+$(bin.version-info): $(dir.wasm)/version-info.c $(sqlite3.h) $(MAKEFILE)
 	$(CC) -O0 -I$(dir.top) -o $@ $<
-DISTCLEAN_FILES += $(version-info)
+DISTCLEAN_FILES += $(bin.version-info)
 
-stripccomments := $(dir.tool)/stripccomments
-$(stripccomments): $(stripccomments).c $(MAKEFILE)
+bin.stripccomments := $(dir.tool)/stripccomments
+$(bin.stripccomments): $(bin.stripccomments).c $(MAKEFILE)
 	$(CC) -o $@ $<
-DISTCLEAN_FILES += $(stripccomments)
+DISTCLEAN_FILES += $(bin.stripccomments)
 
 EXPORTED_FUNCTIONS.api.in := $(abspath $(dir.api)/EXPORTED_FUNCTIONS.sqlite3-api)
 EXPORTED_FUNCTIONS.api := $(dir.tmp)/EXPORTED_FUNCTIONS.api
@@ -241,12 +241,12 @@ $(sqlite3-api.js): $(sqlite3-api.jses) $(MAKEFILE)
 		echo "/* END FILE: $$i */"; \
 	done > $@
 
-$(sqlite3-api-build-version.js): $(version-info) $(MAKEFILE)
+$(sqlite3-api-build-version.js): $(bin.version-info) $(MAKEFILE)
 	@echo "Making $@..."
 	@{ \
   echo 'self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){'; \
 	echo -n '  sqlite3.version = '; \
-  $(version-info) --json; \
+  $(bin.version-info) --json; \
   echo ';'; \
 	echo '});'; \
   } > $@
@@ -543,7 +543,7 @@ o-xtra := -flto
 # doubles the build time and seems to have negligible effect on
 # higher optimization levels.
 o0: clean
-	$(MAKE) -e "emcc_opt=-O0 $(o-xtra)"
+	$(MAKE) -e "emcc_opt=-O0"
 o1: clean
 	$(MAKE) -e "emcc_opt=-O1 $(o-xtra)"
 o2: clean
diff --git a/ext/wasm/README-dist.txt b/ext/wasm/README-dist.txt
index 422f3f1e0c..c6fb2c5d1a 100644
--- a/ext/wasm/README-dist.txt
+++ b/ext/wasm/README-dist.txt
@@ -7,18 +7,17 @@ TODO: link to main WASM/JS docs, once they are online
 This archive contains the sqlite3.js and sqlite3.wasm file which make
 up the sqlite3 WASM/JS build.
 
-The jswasm directory contains both the main deliverables and small
-demonstration and test apps. Browsers will not serve WASM files from
-file:// URLs, so the demo/test apps require a web server and that
-server must include the following headers in its response when serving
-the files:
+The jswasm directory contains the core sqlite3 deliverables and the
+top-level directory contains demonstration and test apps. Browsers
+will not serve WASM files from file:// URLs, so the demo/test apps
+require a web server and that server must include the following
+headers in its response when serving the files:
 
     Cross-Origin-Opener-Policy: same-origin
     Cross-Origin-Embedder-Policy: require-corp
 
-The files named sqlite3*.js and sqlite3.wasm belong to the core
-sqlite3 deliverables and the others are soley for demonstration and
-may be discarded. They are not in separate directories from the main
-deliverables because a quirk of URI resolution in JS code would then
-require that sqlite3.js be duplicated and edited for Worker-loaded
-operation.
+One simple way to get the demo apps up and running on Unix-style
+systems is to install althttpd (https://sqlite.org/althttpd) and run:
+
+    althttpd --enable-sab --page index.html
+ 
diff --git a/ext/wasm/api/README.md b/ext/wasm/api/README.md
index dfb13c569f..6440eba996 100644
--- a/ext/wasm/api/README.md
+++ b/ext/wasm/api/README.md
@@ -64,12 +64,12 @@ browser client:
   thread via the Worker message-passing interface. Like OO API #1,
   this is an optional component, offering one of any number of
   potential implementations for such an API.
-    - `../sqlite3-worker1.js`\  
+    - `sqlite3-worker1.js`\  
       Is not part of the amalgamated sources and is intended to be
       loaded by a client Worker thread. It loads the sqlite3 module
       and runs the Worker #1 API which is implemented in
       `sqlite3-api-worker1.js`.
-    - `../sqlite3-worker1-promiser.js`\  
+    - `sqlite3-worker1-promiser.js`\  
       Is likewise not part of the amalgamated sources and provides
       a Promise-based interface into the Worker #1 API. This is
       a far user-friendlier way to interface with databases running
@@ -78,7 +78,7 @@ browser client:
   is an sqlite3 VFS implementation which supports Google Chrome's
   Origin-Private FileSystem (OPFS) as a storage layer to provide
   persistent storage for database files in a browser. It requires...
-    - `../sqlite3-opfs-async-proxy.js`\  
+    - `sqlite3-opfs-async-proxy.js`\  
       is the asynchronous backend part of the OPFS proxy. It speaks
       directly to the (async) OPFS API and channels those results back
       to its synchronous counterpart. This file, because it must be
diff --git a/ext/wasm/dist.make b/ext/wasm/dist.make
index e19b361b19..13cab87669 100644
--- a/ext/wasm/dist.make
+++ b/ext/wasm/dist.make
@@ -10,14 +10,11 @@
 MAKEFILE.dist := $(lastword $(MAKEFILE_LIST))
 
 ########################################################################
-# Chicken/egg situation: we need $(version-info) to get the version
+# Chicken/egg situation: we need $(bin.version-info) to get the version
 # info for the archive name, but that binary may not yet be built, and
 # won't be built until we expand the dependencies. We have to use a
 # temporary name for the archive.
 dist-name = sqlite-wasm-TEMP
-dist-archive = $(dist-name).zip
-.PHONY: $(dist-archive)
-CLEAN_FILES += $(wildcard sqlite-wasm-*.zip)
 #ifeq (0,1)
 #  $(info WARNING  *******************************************************************)
 #  $(info ** Be sure to create the desired build configuration before creating the)
@@ -40,52 +37,58 @@ CLEAN_FILES += $(wildcard sqlite-wasm-*.zip)
 # date.
 dist-build ?= oz
 
-demo-123.html := $(dir.wasm)/demo-123.html
-demo-123-worker.html := $(dir.wasm)/demo-123-worker.html
-demo-123.js := $(dir.wasm)/demo-123.js
-demo-files := $(demo-123.js) $(demo-123.html) $(demo-123-worker.html) \
-              tester1.html tester1.js tester1-worker.html
-README-dist := $(dir.wasm)/README-dist.txt
-dist-dir-main := $(dist-name)/jswasm
-dist.main.extras := \
-    sqlite3-opfs-async-proxy.js \
-    sqlite3-worker1.js \
-    sqlite3-worker1-promiser.js
+dist-dir.top := $(dist-name)
+dist-dir.jswasm := $(dist-dir.top)/$(notdir $(dir.dout))
+dist-dir.common := $(dist-dir.top)/common
+dist.top.extras := \
+    demo-123.html demo-123-worker.html demo-123.js \
+    tester1.html tester1-worker.html tester1.js
+dist.jswasm.extras := $(sqlite3-api.ext.jses) $(sqlite3.wasm)
+dist.common.extras := $(wildcard $(dir.common)/*.css)
 
+.PHONY: dist
 ########################################################################
-# $(dist-archive): create the end-user deliverable archive.
+# dist: create the end-user deliverable archive.
 #
-# Maintenance reminder: because $(dist-archive) depends on
-# $(dist-build), and $(dist-build) will depend on clean, having any deps
-# on $(dist-archive) which themselves may be cleaned up by the clean
+# Maintenance reminder: because dist depends on $(dist-build), and
+# $(dist-build) will depend on clean, having any deps on
+# $(dist-archive) which themselves may be cleaned up by the clean
 # target will lead to grief in parallel builds (-j #). Thus
 # $(dist-target)'s deps must be trimmed to non-generated files or
 # files which are _not_ cleaned up by the clean target.
-$(dist-archive): \
-    $(stripccomments) $(version-info) \
+#
+# Note that we require $(bin.version-info) in order to figure out the
+# dist file's name, so cannot (without a recursive make) have the
+# target name equal to the archive name.
+dist: \
+    $(bin.stripccomments) $(bin.version-info) \
     $(dist-build) \
     $(MAKEFILE) $(MAKEFILE.dist)
 	@echo "Making end-user deliverables..."
-	@rm -fr $(dist-name)
-	@mkdir -p $(dist-dir-main)
-	@cp -p $(README-dist) $(dist-name)/README.txt
-	@cp -p $(sqlite3.wasm) $(dist.main.extras) $(dist-dir-main)
-	@$(stripccomments) -k -k < $(sqlite3.js) \
-		> $(dist-dir-main)/$(notdir $(sqlite3.js))
-	@cp -p $(demo-files) $(dist-dir-main)
-	@vnum=$$($(version-info) --version-number); \
-	vdir=sqlite-wasm-$$vnum; \
-	arc=$$vdir.zip; \
-	echo "Making $$arc ..."; \
-	rm -f $$arc; \
-	mv $(dist-name) $$vdir; \
-	zip -qr $$arc $$vdir; \
-	rm -fr $$vdir; \
-	ls -la $$arc; \
-	unzip -lv $$arc || echo "Missing unzip app? Not fatal."
+	@rm -fr $(dist-dir.top)
+	@mkdir -p $(dist-dir.jswasm) $(dist-dir.common)
+	@cp -p $(dist.top.extras) $(dist-dir.top)
+	@cp -p README-dist.txt $(dist-dir.top)/README.txt
+	@cp -p index-dist.html $(dist-dir.top)/index.html
+	@cp -p $(dist.jswasm.extras) $(dist-dir.jswasm)
+	@$(bin.stripccomments) -k -k < $(sqlite3.js) \
+		> $(dist-dir.jswasm)/$(notdir $(sqlite3.js))
+	@cp -p $(dist.common.extras) $(dist-dir.common)
+	@vnum=$$($(bin.version-info) --version-number); \
+		vdir=sqlite-wasm-$$vnum; \
+		arczip=$$vdir.zip; \
+		echo "Making $$arczip ..."; \
+		rm -f $$arczip; \
+		mv $(dist-dir.top) $$vdir; \
+		zip -qr $$arczip $$vdir; \
+		rm -fr $$vdir; \
+		ls -la $$arczip; \
+		unzip -lv $$arczip || echo "Missing unzip app? Not fatal."
 
-#$(shell $(version-info) --version-number)
-dist: $(dist-archive)
-clean-dist:
-	rm -f $(dist-archive)
-clean: clean-dist
+# We need a separate `clean` rule to account for weirdness in
+# a sub-make, where we get a copy of the $(dist-name) dir
+# copied into the new $(dist-name) dir.
+.PHONY: dist-clean
+clean: dist-clean
+dist-clean:
+	rm -fr $(dist-name) $(wildcard sqlite-wasm-*.zip)
diff --git a/ext/wasm/index-dist.html b/ext/wasm/index-dist.html
new file mode 100644
index 0000000000..ffb3127761
--- /dev/null
+++ b/ext/wasm/index-dist.html
@@ -0,0 +1,82 @@
+<!doctype html>
+<html lang="en-us">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
+    <title>sqlite3 WASM Demo Page Index</title>
+  </head>
+  <body>
+    <style>
+      body {
+          display: flex;
+          flex-direction: column;
+          flex-wrap: wrap;
+      }
+      textarea {
+          font-family: monospace;
+      }
+      header {
+          font-size: 130%;
+          font-weight: bold;
+      }
+      .hidden, .initially-hidden {
+          position: absolute !important;
+          opacity: 0 !important;
+          pointer-events: none !important;
+          display: none !important;
+      }
+      .warning { color: firebrick; }
+    </style>
+    <header id='titlebar'><span>sqlite3 WASM demo pages</span></header>
+    <hr>
+    <div>Below is the list of demo pages for the sqlite3 WASM
+      builds. The intent is that <em>this</em> page be run
+      using the functional equivalent of:</div>
+    <blockquote><pre><a href='https://sqlite.org/althttpd'>althttpd</a> -enable-sab -page index.html</pre></blockquote>
+    <div>and the individual pages be started in their own tab.
+      Warnings and Caveats:
+      <ul class='warning'>
+        <li>Some of these pages require that the web server emit the
+          so-called
+          <a href='https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cross-Origin-Opener-Policy'>COOP</a>
+          and
+          <a href='https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cross-Origin-Embedder-Policy'>COEP</a>
+          headers. <a href='https://sqlite.org/althttpd'>althttpd</a> requires the
+          <code>-enable-sab</code> flag for that.
+        </li>
+      </ul>
+    </div>
+    <div>The tests and demos...
+      <ul id='test-list'>
+        <li>Core-most tests
+          <ul>
+            <li><a href='tester1.html'>tester1</a>: Core unit and
+              regression tests for the various APIs and surrounding
+              utility code.</li>
+            <li><a href='tester1-worker.html'>tester1-worker</a>: same thing
+            but running in a Worker.</li>
+          </ul>
+        </li>
+        <li>High-level apps and demos...
+          <ul>
+            <li><a href='demo-123.html'>demo-123</a> provides a
+              no-nonsense example of adding sqlite3 support to a web
+              page in the UI thread.</li>
+            <li><a href='demo-123-worker.html'>demo-123-worker</a> is
+              the same as <code>demo-123</code> but loads and runs
+              sqlite3 from a Worker thread.</li>
+          </ul>
+        </li>
+      </ul>
+    </div>
+    <style>
+      #test-list { font-size: 120%; }
+    </style>
+    <script>//Assign a distinct target tab name for each test page...
+      document.querySelectorAll('a').forEach(function(e){
+          e.target = e.href;
+      });
+    </script>
+  </body>
+</html>
diff --git a/ext/wasm/tester1.html b/ext/wasm/tester1.html
index c163151278..0de679f34f 100644
--- a/ext/wasm/tester1.html
+++ b/ext/wasm/tester1.html
@@ -4,8 +4,8 @@
     <meta charset="utf-8">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
-    <link rel="stylesheet" href="../common/emscripten.css"/>
-    <link rel="stylesheet" href="../common/testing.css"/>
+    <link rel="stylesheet" href="common/emscripten.css"/>
+    <link rel="stylesheet" href="common/testing.css"/>
     <title>sqlite3 tester #1 (UI thread)</title>
     <style>
       body {
diff --git a/manifest b/manifest
index f141d54ba2..0194c6f719 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Apply\sconsiderable\sacrobatics\sto\sget\sthe\sJS/WASM\sdeliverables\sbuilding\sto\sand\sloadable\sfrom\sa\sdirectory\sother\sthan\sthe\sone\swhich\scontains\sthe\sapp-level\scode.\sRequires\san\sonly-slightly-leaky\sabstraction\sof\spassing\sa\sURL\sargument\swhen\sloading\ssqlite3.js\sbut\sprovides\smuch\sgreater\sflexibility\sin\swhere\sthe\sJS/WASM\sfiles\sare\slocated.
-D 2022-10-19T04:44:58.210
+C Update\sthe\sdist\srules\sfor\sthis\sevening's\sjs/wasm\sbuild\schanges\sand\sinclude\san\sindex.html\sspecifically\sfor\sthe\ssubset\sof\sapps\sincluded\sin\sthe\sdist\sarchive.
+D 2022-10-19T06:06:42.551
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -472,12 +472,12 @@ F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
-F ext/wasm/GNUmakefile e9686a03f201a16786783964d0f2fcf4d9af8a9aee6e3ce5b6c3ee5d7750842f
-F ext/wasm/README-dist.txt 13438bafe5fab1eca223be91459e757e6e67248fc959b9ae0ffb5808fd0a1610
+F ext/wasm/GNUmakefile 1c60c998df5c33f49d1490a5746425e2d477389f4c9337613c507ff5a5a60c70
+F ext/wasm/README-dist.txt e78e44a58772d5b5d7a5a179b5bf639cd67b62249aac66138e2c319bd02dd243
 F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 89983a8d122c35a90c65ec667844b95a78bcd04f3198a99c1e0c8368c1a0b03a
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
-F ext/wasm/api/README.md 946398dd80bfd673f098b9d6ca3564e1fc77b03e660274d132f267c407b8703c
+F ext/wasm/api/README.md 1350088aee90e959ad9a94fab1bb6bcb5e99d4d27f976db389050f54f2640c78
 F ext/wasm/api/extern-post-js.js 4bba34d8301f6058abd8ee24d2778b7360c5c3679217b38f5670e97a5ba7a3ec
 F ext/wasm/api/extern-pre-js.js cc61c09c7a24a07dbecb4c352453c3985170cec12b4e7e7e7a4d11d43c5c8f41
 F ext/wasm/api/post-js-footer.js cd0a8ec768501d9bd45d325ab0442037fb0e33d1f3b4f08902f15c34720ee4a1
@@ -490,11 +490,11 @@ F ext/wasm/api/sqlite3-api-opfs.js 22d60ba956e873b65e2e0591e239178082bd53a6d563c
 F ext/wasm/api/sqlite3-api-prologue.js bdcd1f636e5ef0622f99b753aff0d26cc250bcd3a17923771e335ec73059b073
 F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
 F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
-F ext/wasm/api/sqlite3-opfs-async-proxy.js 206ce6bbc3c30ad51a37d9c25e3a2712e70b586e0f9a2cf8cb0b9619017c2671 w ext/wasm/sqlite3-opfs-async-proxy.js
+F ext/wasm/api/sqlite3-opfs-async-proxy.js 206ce6bbc3c30ad51a37d9c25e3a2712e70b586e0f9a2cf8cb0b9619017c2671
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 84d410a2b9defdac85e6a421736307ff3a3eed3c1b0ae3b7b140edbc6ad81a8f
-F ext/wasm/api/sqlite3-worker1-promiser.js f0aa93db62903f4006428cbcd2209a765655ec69a0e57247baba0fc94d745987 w ext/wasm/sqlite3-worker1-promiser.js
-F ext/wasm/api/sqlite3-worker1.js 59fd89ee42bc380a053a848d35806177c27eb82684ef152a34c65c7ce1b5d233 w ext/wasm/sqlite3-worker1.js
+F ext/wasm/api/sqlite3-worker1-promiser.js f0aa93db62903f4006428cbcd2209a765655ec69a0e57247baba0fc94d745987
+F ext/wasm/api/sqlite3-worker1.js 59fd89ee42bc380a053a848d35806177c27eb82684ef152a34c65c7ce1b5d233
 F ext/wasm/batch-runner.html 4deeed44fe41496dc6898d9fb17938ea3291f40f4bfb977e29d0cef96fbbe4c8
 F ext/wasm/batch-runner.js 5bae81684728b6be157d1f92b39824153f0fd019345b39f2ab8930f7ee2a57d8
 F ext/wasm/common/SqliteTestUtil.js 647bf014bd30bdd870a7e9001e251d12fc1c9ec9ce176a1004b838a4b33c5c05
@@ -506,12 +506,13 @@ F ext/wasm/demo-123.html 8c70a412ce386bd3796534257935eb1e3ea5c581e5d5aea0490b823
 F ext/wasm/demo-123.js ebae30756585bca655b4ab2553ec9236a87c23ad24fc8652115dcedb06d28df6
 F ext/wasm/demo-kvvfs1.html c4a69d2ded9cabad3e2eea75cd2936d9a13002ab4f10b9f1bac6130a0dee84dd
 F ext/wasm/demo-kvvfs1.js 105596bd2ccd0b1deb5fde8e99b536e8242d4bb5932fac0c8403ff3a6bc547e8
-F ext/wasm/dist.make 2015746f6cd37ed17fadb14dba45d41ac6db727917d04f9b9aa431a816c5e54d
+F ext/wasm/dist.make 0db045760d5740f7bb688bac68332af3c974d331f4bdd4cec623f37687b92d6b
 F ext/wasm/fiddle.make e5a8966be370bf8592cdffb2520ad8c3bf6a64d08ea91c8ed17dc88624967697
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js 531859a471924a0ea48afa218e6877f0c164ca324d51e15843ed6ecc1c65c7ee
 F ext/wasm/fiddle/fiddle.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
 F ext/wasm/fiddle/fiddle.js 974b995119ac443685d7d94d3b3c58c6a36540e9eb3fed7069d5653284071715
+F ext/wasm/index-dist.html 5e579a9d4101c5bb15c6d97475b15c7a6195b4e3b4b42bc9f31deac475736e6a
 F ext/wasm/index.html 47fd8be5f76b7e1123edb301b604bc751ba387498a597d8dc48bce24d1007c57
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 9aa6951b529a8b29f578ec8f0355713c39584c92cf1708f63ba0cf917cb5b68e
@@ -527,7 +528,7 @@ F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f
 F ext/wasm/test-opfs-vfs.html 1f2d672f3f3fce810dfd48a8d56914aba22e45c6834e262555e685bce3da8c3f
 F ext/wasm/test-opfs-vfs.js 48fc59110e8775bb43c9be25b6d634fc07ebadab7da8fbd44889e8129c6e2548
 F ext/wasm/tester1-worker.html 048c341f124fdb61ca14dfd1bd1f78742490f208aa3bb1e84399f83f1e7e6a74
-F ext/wasm/tester1.html 66b71e2accdcbedae2593c72d2a69f906757707394dc014c2253102f0838cf57
+F ext/wasm/tester1.html 37ccc958fa0d95074af2d72b7241c8e2d982bbec6dda4dc790241af3d933c3b6
 F ext/wasm/tester1.js 44d71175e2941bf1d7c27afa0c395fe81c83cbd74cd10e34e0688dd833042f1e
 F ext/wasm/testing-worker1-promiser.html 88c6ff8a7be351abef219639cd684c5c3e0c649c1dc07b10a5bd59939e7bb4b5
 F ext/wasm/testing-worker1-promiser.js f68ffbbe1c6086e18ce7961b8fc2b40dd88db174f59052e228c06b07484945ca
@@ -2035,8 +2036,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 5b23e0675efdd2f1ea7b4f5836a579e8d6aa8a25b3f1a6a950520ad845ff01bb
-R 120493b0bac13d94c837a00d100ef2e2
+P 6d468dab9eb84d4548f68014959f02fe4f66455472ff24fe729382bb2972e3d1
+R c3bcb52d1a251087b76c2618ae8668d8
 U stephan
-Z 1f6ca89c3f0ab931ccb09f09451983aa
+Z f3f479298121a0f7f76d8d380e2cd8a4
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index cb6b4b3768..1eab435905 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6d468dab9eb84d4548f68014959f02fe4f66455472ff24fe729382bb2972e3d1
\ No newline at end of file
+a0ef0f32e96638b502b3951e524d590bdfb09dd39be453686b075102da67b7db
\ No newline at end of file

From 9dc4d5e6b44c2491b291a9b1b7d6d6be78f33364 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 19 Oct 2022 06:14:24 +0000
Subject: [PATCH 311/428] Minor wasm/js build tweaks.

FossilOrigin-Name: bcbee1ec010ae74f0749aa7fda008698198a8cd52a7aa12d6458d43d3e739eb0
---
 ext/wasm/dist.make   | 12 ++++++------
 ext/wasm/fiddle.make |  1 +
 manifest             | 14 +++++++-------
 manifest.uuid        |  2 +-
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/ext/wasm/dist.make b/ext/wasm/dist.make
index 13cab87669..bb553d1bd2 100644
--- a/ext/wasm/dist.make
+++ b/ext/wasm/dist.make
@@ -26,7 +26,7 @@ dist-name = sqlite-wasm-TEMP
 #endif
 
 ########################################################################
-# dist-build must be the name of a target which triggers the
+# dist.build must be the name of a target which triggers the
 # build of the files to be packed into the dist archive.  The
 # intention is that it be one of (o0, o1, o2, o3, os, oz), each of
 # which uses like-named -Ox optimization level flags. The o2 target
@@ -35,7 +35,7 @@ dist-name = sqlite-wasm-TEMP
 # file sizes. Note that -O2 (the o2 target) results in faster binaries
 # than both -O3 and -Os (the o3 and os targets) in all tests run to
 # date.
-dist-build ?= oz
+dist.build ?= oz
 
 dist-dir.top := $(dist-name)
 dist-dir.jswasm := $(dist-dir.top)/$(notdir $(dir.dout))
@@ -50,8 +50,8 @@ dist.common.extras := $(wildcard $(dir.common)/*.css)
 ########################################################################
 # dist: create the end-user deliverable archive.
 #
-# Maintenance reminder: because dist depends on $(dist-build), and
-# $(dist-build) will depend on clean, having any deps on
+# Maintenance reminder: because dist depends on $(dist.build), and
+# $(dist.build) will depend on clean, having any deps on
 # $(dist-archive) which themselves may be cleaned up by the clean
 # target will lead to grief in parallel builds (-j #). Thus
 # $(dist-target)'s deps must be trimmed to non-generated files or
@@ -62,7 +62,7 @@ dist.common.extras := $(wildcard $(dir.common)/*.css)
 # target name equal to the archive name.
 dist: \
     $(bin.stripccomments) $(bin.version-info) \
-    $(dist-build) \
+    $(dist.build) \
     $(MAKEFILE) $(MAKEFILE.dist)
 	@echo "Making end-user deliverables..."
 	@rm -fr $(dist-dir.top)
@@ -78,7 +78,7 @@ dist: \
 		vdir=sqlite-wasm-$$vnum; \
 		arczip=$$vdir.zip; \
 		echo "Making $$arczip ..."; \
-		rm -f $$arczip; \
+		rm -fr $$arczip $$vdir; \
 		mv $(dist-dir.top) $$vdir; \
 		zip -qr $$arczip $$vdir; \
 		rm -fr $$vdir; \
diff --git a/ext/wasm/fiddle.make b/ext/wasm/fiddle.make
index f669efd92c..3de2414636 100644
--- a/ext/wasm/fiddle.make
+++ b/ext/wasm/fiddle.make
@@ -35,6 +35,7 @@ fiddle.emcc-flags = \
   -sDYNAMIC_EXECUTION=0 \
   -sWASM_BIGINT=$(emcc_enable_bigint) \
   -sEXPORT_NAME=$(sqlite3.js.init-func) \
+  -Wno-limited-postlink-optimizations \
   $(sqlite3.js.flags.--post-js) \
   $(emcc.exportedRuntimeMethods) \
   -sEXPORTED_FUNCTIONS=@$(abspath $(EXPORTED_FUNCTIONS.fiddle)) \
diff --git a/manifest b/manifest
index 0194c6f719..df0c255d8a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\sdist\srules\sfor\sthis\sevening's\sjs/wasm\sbuild\schanges\sand\sinclude\san\sindex.html\sspecifically\sfor\sthe\ssubset\sof\sapps\sincluded\sin\sthe\sdist\sarchive.
-D 2022-10-19T06:06:42.551
+C Minor\swasm/js\sbuild\stweaks.
+D 2022-10-19T06:14:24.574
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -506,8 +506,8 @@ F ext/wasm/demo-123.html 8c70a412ce386bd3796534257935eb1e3ea5c581e5d5aea0490b823
 F ext/wasm/demo-123.js ebae30756585bca655b4ab2553ec9236a87c23ad24fc8652115dcedb06d28df6
 F ext/wasm/demo-kvvfs1.html c4a69d2ded9cabad3e2eea75cd2936d9a13002ab4f10b9f1bac6130a0dee84dd
 F ext/wasm/demo-kvvfs1.js 105596bd2ccd0b1deb5fde8e99b536e8242d4bb5932fac0c8403ff3a6bc547e8
-F ext/wasm/dist.make 0db045760d5740f7bb688bac68332af3c974d331f4bdd4cec623f37687b92d6b
-F ext/wasm/fiddle.make e5a8966be370bf8592cdffb2520ad8c3bf6a64d08ea91c8ed17dc88624967697
+F ext/wasm/dist.make a4054056e6757bbc1ba7693c883c334b448c7b474f3ec0102eebdaaca080fb52
+F ext/wasm/fiddle.make acdb1a402864f9b05a4c89805c5e91d88f5080652d8861f0865655b172243847
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js 531859a471924a0ea48afa218e6877f0c164ca324d51e15843ed6ecc1c65c7ee
 F ext/wasm/fiddle/fiddle.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
@@ -2036,8 +2036,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 6d468dab9eb84d4548f68014959f02fe4f66455472ff24fe729382bb2972e3d1
-R c3bcb52d1a251087b76c2618ae8668d8
+P a0ef0f32e96638b502b3951e524d590bdfb09dd39be453686b075102da67b7db
+R dd2c6bc27c1ee39a3214f089113c267d
 U stephan
-Z f3f479298121a0f7f76d8d380e2cd8a4
+Z 0031e9fd6a3aaf1c9c22f1905a3b97fd
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 1eab435905..285cfb9c2c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a0ef0f32e96638b502b3951e524d590bdfb09dd39be453686b075102da67b7db
\ No newline at end of file
+bcbee1ec010ae74f0749aa7fda008698198a8cd52a7aa12d6458d43d3e739eb0
\ No newline at end of file

From fd31ae3bf9a2093ae5f29a1d70226bd46baceb1a Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 19 Oct 2022 07:34:36 +0000
Subject: [PATCH 312/428] Rename several demo/test files and include more of
 them in the end-user dist archive.

FossilOrigin-Name: 9c85835f6f50eb3b1a2b89c817816335743f04440c48bfa05aa89ec519cc0d51
---
 ext/wasm/api/sqlite3-api-worker1.js           | 19 +++++------
 ext/wasm/api/sqlite3-worker1-promiser.js      |  4 +--
 ext/wasm/api/sqlite3-worker1.js               |  9 ++---
 .../{demo-kvvfs1.html => demo-jsstorage.html} |  2 +-
 .../{demo-kvvfs1.js => demo-jsstorage.js}     |  0
 ...omiser.html => demo-worker1-promiser.html} |  2 +-
 ...1-promiser.js => demo-worker1-promiser.js} |  0
 ext/wasm/{testing2.html => demo-worker1.html} |  3 +-
 ext/wasm/{testing2.js => demo-worker1.js}     |  2 +-
 ext/wasm/dist.make                            |  9 +++--
 ext/wasm/index-dist.html                      | 12 +++++--
 ext/wasm/index.html                           | 10 +++---
 manifest                                      | 34 +++++++++----------
 manifest.uuid                                 |  2 +-
 14 files changed, 59 insertions(+), 49 deletions(-)
 rename ext/wasm/{demo-kvvfs1.html => demo-jsstorage.html} (97%)
 rename ext/wasm/{demo-kvvfs1.js => demo-jsstorage.js} (100%)
 rename ext/wasm/{testing-worker1-promiser.html => demo-worker1-promiser.html} (96%)
 rename ext/wasm/{testing-worker1-promiser.js => demo-worker1-promiser.js} (100%)
 rename ext/wasm/{testing2.html => demo-worker1.html} (96%)
 rename ext/wasm/{testing2.js => demo-worker1.js} (99%)

diff --git a/ext/wasm/api/sqlite3-api-worker1.js b/ext/wasm/api/sqlite3-api-worker1.js
index 69bb8ced61..55faab2829 100644
--- a/ext/wasm/api/sqlite3-api-worker1.js
+++ b/ext/wasm/api/sqlite3-api-worker1.js
@@ -106,7 +106,7 @@
 
   ```
   {
-    type: 'error',
+    type: "error",
 
     messageId: ...as above...,
 
@@ -150,7 +150,7 @@
 
   ```
   {
-    type: 'config',
+    type: "config-get",
     messageId: ...as above...,
     result: {
 
@@ -167,7 +167,7 @@
       the non-WASMFS OPFS VFS to open a database via a URI-style
       db filename.
 
-      vfses: result of sqlite3.capi.sqlite3_web_vfs_list()
+      vfsList: result of sqlite3.capi.sqlite3_web_vfs_list()
    }
   }
   ```
@@ -196,7 +196,7 @@
 
   ```
   {
-    type: 'open',
+    type: "open",
     messageId: ...as above...,
     result: {
       filename: db filename, possibly differing from the input.
@@ -205,7 +205,7 @@
       envelope to other calls in this API to tell them which db to
       use. If it is not provided to future calls, they will default to
       operating on the first-opened db. This property is, for API
-      consistency's sake, also part of the contaning message envelope.
+      consistency's sake, also part of the containing message envelope.
       Only the `open` operation includes it in the `result` property.
 
       persistent: true if the given filename resides in the
@@ -237,7 +237,7 @@
 
   ```
   {
-    type: 'close',
+    type: "close",
     messageId: ...as above...,
     result: {
 
@@ -269,7 +269,7 @@
 
   ```
   {
-    type: 'exec',
+    type: "exec",
     messageId: ...as above...,
     dbId: ...as above...
     result: {
@@ -370,8 +370,7 @@ sqlite3.initWorker1API = function(){
         if(alsoUnlink && filename){
           /* This isn't necessarily correct: the db might be using a
              VFS other than the default. How do we best resolve this
-             without having to special-case the kvvfs and opfs
-             VFSes? */
+             without having to special-case the opfs VFSes? */
           sqlite3.capi.wasm.sqlite3_wasm_vfs_unlink(filename);
         }
       }
@@ -524,7 +523,7 @@ sqlite3.initWorker1API = function(){
       });
       rc.wasmfsOpfsEnabled = !!sqlite3.capi.sqlite3_wasmfs_opfs_dir();
       rc.version = sqlite3.version;
-      rc.vfses = sqlite3.capi.sqlite3_web_vfs_list();
+      rc.vfsList = sqlite3.capi.sqlite3_web_vfs_list();
       return rc;
     },
 
diff --git a/ext/wasm/api/sqlite3-worker1-promiser.js b/ext/wasm/api/sqlite3-worker1-promiser.js
index a77b0126df..7360512d49 100644
--- a/ext/wasm/api/sqlite3-worker1-promiser.js
+++ b/ext/wasm/api/sqlite3-worker1-promiser.js
@@ -70,8 +70,8 @@
    message. The second expects an object in the form {type:...,
    args:...}  plus any other properties the client cares to set. This
    function will always set the `messageId` property on the object,
-   even if it's already set, and will set the `dbId` property to
-   `config.dbId` if it is _not_ set in the message object.
+   even if it's already set, and will set the `dbId` property to the
+   current database ID if it is _not_ set in the message object.
 
    The function throws on error.
 
diff --git a/ext/wasm/api/sqlite3-worker1.js b/ext/wasm/api/sqlite3-worker1.js
index bc860300bb..26c88402c1 100644
--- a/ext/wasm/api/sqlite3-worker1.js
+++ b/ext/wasm/api/sqlite3-worker1.js
@@ -26,11 +26,8 @@
   Worker constructor and then listen for an event in the form shown
   above in order to know when the module has completed initialization.
 
-  This file accepts a couple of URL arguments to adjust how it loads
-  sqlite3.js:
+  This file accepts a URL arguments to adjust how it loads sqlite3.js:
 
-  - `sqlite3.js`, if set, is used as the URI to `sqlite3.js` and it
-    may contain path elements, e.g. `sqlite3.js=foo/bar/my-sqlite3.js`.
   - `sqlite3.dir`, if set, treats the given directory name as the
     directory from which `sqlite3.js` will be loaded.
 
@@ -40,9 +37,7 @@
 (()=>{
   const urlParams = new URL(self.location.href).searchParams;
   let theJs = 'sqlite3.js';
-  if(urlParams.has('sqlite3.js')){
-    theJs = urlParams.get('sqlite3.js');
-  }else if(urlParams.has('sqlite3.dir')){
+  if(urlParams.has('sqlite3.dir')){
     theJs = urlParams.get('sqlite3.dir') + '/' + theJs;
   }
   importScripts(theJs);
diff --git a/ext/wasm/demo-kvvfs1.html b/ext/wasm/demo-jsstorage.html
similarity index 97%
rename from ext/wasm/demo-kvvfs1.html
rename to ext/wasm/demo-jsstorage.html
index b79ef1157b..79f4a3b4be 100644
--- a/ext/wasm/demo-kvvfs1.html
+++ b/ext/wasm/demo-jsstorage.html
@@ -44,6 +44,6 @@
     </style>
     <script src="jswasm/sqlite3.js"></script>
     <script src="common/SqliteTestUtil.js"></script>
-    <script src="demo-kvvfs1.js"></script>
+    <script src="demo-jsstorage.js"></script>
   </body>
 </html>
diff --git a/ext/wasm/demo-kvvfs1.js b/ext/wasm/demo-jsstorage.js
similarity index 100%
rename from ext/wasm/demo-kvvfs1.js
rename to ext/wasm/demo-jsstorage.js
diff --git a/ext/wasm/testing-worker1-promiser.html b/ext/wasm/demo-worker1-promiser.html
similarity index 96%
rename from ext/wasm/testing-worker1-promiser.html
rename to ext/wasm/demo-worker1-promiser.html
index 4b35ca82c0..e99131e6c9 100644
--- a/ext/wasm/testing-worker1-promiser.html
+++ b/ext/wasm/demo-worker1-promiser.html
@@ -29,6 +29,6 @@
     <div id='test-output'></div>
     <script src="common/SqliteTestUtil.js"></script>
     <script src="jswasm/sqlite3-worker1-promiser.js"></script>
-    <script src="testing-worker1-promiser.js"></script>
+    <script src="demo-worker1-promiser.js"></script>
   </body>
 </html>
diff --git a/ext/wasm/testing-worker1-promiser.js b/ext/wasm/demo-worker1-promiser.js
similarity index 100%
rename from ext/wasm/testing-worker1-promiser.js
rename to ext/wasm/demo-worker1-promiser.js
diff --git a/ext/wasm/testing2.html b/ext/wasm/demo-worker1.html
similarity index 96%
rename from ext/wasm/testing2.html
rename to ext/wasm/demo-worker1.html
index 25d5a9f5d8..c766ffd445 100644
--- a/ext/wasm/testing2.html
+++ b/ext/wasm/demo-worker1.html
@@ -1,3 +1,4 @@
+
 <!doctype html>
 <html lang="en-us">
   <head>
@@ -28,6 +29,6 @@
     <hr>
     <div id='test-output'></div>
     <script src="common/SqliteTestUtil.js"></script>
-    <script src="testing2.js"></script>
+    <script src="demo-worker1.js"></script>
   </body>
 </html>
diff --git a/ext/wasm/testing2.js b/ext/wasm/demo-worker1.js
similarity index 99%
rename from ext/wasm/testing2.js
rename to ext/wasm/demo-worker1.js
index 5ea48db6b6..2da80bc239 100644
--- a/ext/wasm/testing2.js
+++ b/ext/wasm/demo-worker1.js
@@ -13,7 +13,7 @@
   A basic test script for sqlite3-worker1.js.
 
   Note that the wrapper interface demonstrated in
-  testing-worker1-promiser.js is much easier to use from client code, as it
+  demo-worker1-promiser.js is much easier to use from client code, as it
   lacks the message-passing acrobatics demonstrated in this file.
 */
 'use strict';
diff --git a/ext/wasm/dist.make b/ext/wasm/dist.make
index bb553d1bd2..df3e236d7b 100644
--- a/ext/wasm/dist.make
+++ b/ext/wasm/dist.make
@@ -42,9 +42,14 @@ dist-dir.jswasm := $(dist-dir.top)/$(notdir $(dir.dout))
 dist-dir.common := $(dist-dir.top)/common
 dist.top.extras := \
     demo-123.html demo-123-worker.html demo-123.js \
-    tester1.html tester1-worker.html tester1.js
+    tester1.html tester1-worker.html tester1.js \
+    demo-jsstorage.html demo-jsstorage.js \
+    demo-worker1.html demo-worker1.js \
+    demo-worker1-promiser.html demo-worker1-promiser.js
 dist.jswasm.extras := $(sqlite3-api.ext.jses) $(sqlite3.wasm)
-dist.common.extras := $(wildcard $(dir.common)/*.css)
+dist.common.extras := \
+    $(wildcard $(dir.common)/*.css) \
+    $(dir.common)/SqliteTestUtil.js
 
 .PHONY: dist
 ########################################################################
diff --git a/ext/wasm/index-dist.html b/ext/wasm/index-dist.html
index ffb3127761..6b038c82a9 100644
--- a/ext/wasm/index-dist.html
+++ b/ext/wasm/index-dist.html
@@ -55,10 +55,10 @@
               regression tests for the various APIs and surrounding
               utility code.</li>
             <li><a href='tester1-worker.html'>tester1-worker</a>: same thing
-            but running in a Worker.</li>
+              but running in a Worker.</li>
           </ul>
         </li>
-        <li>High-level apps and demos...
+        <li>Higher-level apps and demos...
           <ul>
             <li><a href='demo-123.html'>demo-123</a> provides a
               no-nonsense example of adding sqlite3 support to a web
@@ -66,6 +66,14 @@
             <li><a href='demo-123-worker.html'>demo-123-worker</a> is
               the same as <code>demo-123</code> but loads and runs
               sqlite3 from a Worker thread.</li>
+            <li><a href='demo-jsstorage.html'>demo-jsstorage</a>: very basic
+              demo of using the key-value VFS for storing a persistent db
+              in JS <code>localStorage</code> or <code>sessionStorage</code>.</li>
+            <li><a href='demo-worker1.html'>demo-worker1</a>:
+              Worker-based wrapper of the OO API #1. Its Promise-based
+              wrapper is significantly easier to use, however.</li>
+            <li><a href='demo-worker1-promiser.html'>demo-worker1-promiser</a>:
+              a demo of the Promise-based wrapper of the Worker1 API.</li>
           </ul>
         </li>
       </ul>
diff --git a/ext/wasm/index.html b/ext/wasm/index.html
index 9fc475f1ed..222105599c 100644
--- a/ext/wasm/index.html
+++ b/ext/wasm/index.html
@@ -59,9 +59,14 @@
             <li><a href='demo-123-worker.html'>demo-123-worker</a> is
               the same as <code>demo-123</code> but loads and runs
               sqlite3 from a Worker thread.</li>
-            <li><a href='demo-kvvfs1.html'>demo-kvvfs1</a>: very basic
+            <li><a href='demo-jsstorage.html'>demo-jsstorage</a>: very basic
               demo of using the key-value VFS for storing a persistent db
               in JS <code>localStorage</code> or <code>sessionStorage</code>.</li>
+            <li><a href='demo-worker1.html'>demo-worker1</a>:
+              Worker-based wrapper of the OO API #1. Its Promise-based
+              wrapper is significantly easier to use, however.</li>
+            <li><a href='demo-worker1-promiser.html'>demo-worker1-promiser</a>:
+              a demo of the Promise-based wrapper of the Worker1 API.</li>
           </ul>
         </li>
         <li>speedtest1 ports (sqlite3's primary benchmarking tool)...
@@ -77,9 +82,6 @@
         </li>
         <li>The obligatory "misc." category...
           <ul>
-            <li><a href='testing2.html'>testing2</a>: Worker-based test of OO API #1.</li>
-            <li><a href='testing-worker1-promiser.html'>testing-worker1-promiser</a>:
-              tests for the Promise-based wrapper of the Worker-based API.</li>
             <li><a href='batch-runner.html'>batch-runner</a>: runs batches of SQL exported from speedtest1.</li>
             <!--li><a href='scratchpad-wasmfs-main.html'>scratchpad-wasmfs-main</a>:
               experimenting with WASMFS/OPFS-based persistence. Maintenance
diff --git a/manifest b/manifest
index df0c255d8a..544355b1a7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\swasm/js\sbuild\stweaks.
-D 2022-10-19T06:14:24.574
+C Rename\sseveral\sdemo/test\sfiles\sand\sinclude\smore\sof\sthem\sin\sthe\send-user\sdist\sarchive.
+D 2022-10-19T07:34:36.266
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -488,13 +488,13 @@ F ext/wasm/api/sqlite3-api-glue.js 05eb701460bb72edbe3bf923bd51262551614612c3780
 F ext/wasm/api/sqlite3-api-oo1.js 9a5f0c00d476c504f16dcd456e1743dbc2826ca3d10645dfa62663a39e3ed0d8
 F ext/wasm/api/sqlite3-api-opfs.js 22d60ba956e873b65e2e0591e239178082bd53a6d563c3c58db7dc03e562e8f7
 F ext/wasm/api/sqlite3-api-prologue.js bdcd1f636e5ef0622f99b753aff0d26cc250bcd3a17923771e335ec73059b073
-F ext/wasm/api/sqlite3-api-worker1.js 7f4f46cb6b512a48572d7567233896e6a9c46570c44bdc3d13419730c7c221c8
+F ext/wasm/api/sqlite3-api-worker1.js df948de3968abd2361e1ff7a4410a5c5313275e9738a07e6686e8803a4c6070b
 F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
 F ext/wasm/api/sqlite3-opfs-async-proxy.js 206ce6bbc3c30ad51a37d9c25e3a2712e70b586e0f9a2cf8cb0b9619017c2671
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 84d410a2b9defdac85e6a421736307ff3a3eed3c1b0ae3b7b140edbc6ad81a8f
-F ext/wasm/api/sqlite3-worker1-promiser.js f0aa93db62903f4006428cbcd2209a765655ec69a0e57247baba0fc94d745987
-F ext/wasm/api/sqlite3-worker1.js 59fd89ee42bc380a053a848d35806177c27eb82684ef152a34c65c7ce1b5d233
+F ext/wasm/api/sqlite3-worker1-promiser.js 0c7a9826dbf82a5ed4e4f7bf7816e825a52aff253afbf3350431f5773faf0e4b
+F ext/wasm/api/sqlite3-worker1.js ed87487c0813241909dc57813368a02a5ade37bc95e858c8ca256dedda030651
 F ext/wasm/batch-runner.html 4deeed44fe41496dc6898d9fb17938ea3291f40f4bfb977e29d0cef96fbbe4c8
 F ext/wasm/batch-runner.js 5bae81684728b6be157d1f92b39824153f0fd019345b39f2ab8930f7ee2a57d8
 F ext/wasm/common/SqliteTestUtil.js 647bf014bd30bdd870a7e9001e251d12fc1c9ec9ce176a1004b838a4b33c5c05
@@ -504,16 +504,20 @@ F ext/wasm/common/whwasmutil.js 50d2ede0b0fa01c1d467e1801fab79f5e46bb02bcbd2b023
 F ext/wasm/demo-123-worker.html a0b58d9caef098a626a1a1db567076fca4245e8d60ba94557ede8684350a81ed
 F ext/wasm/demo-123.html 8c70a412ce386bd3796534257935eb1e3ea5c581e5d5aea0490b8232e570a508
 F ext/wasm/demo-123.js ebae30756585bca655b4ab2553ec9236a87c23ad24fc8652115dcedb06d28df6
-F ext/wasm/demo-kvvfs1.html c4a69d2ded9cabad3e2eea75cd2936d9a13002ab4f10b9f1bac6130a0dee84dd
-F ext/wasm/demo-kvvfs1.js 105596bd2ccd0b1deb5fde8e99b536e8242d4bb5932fac0c8403ff3a6bc547e8
-F ext/wasm/dist.make a4054056e6757bbc1ba7693c883c334b448c7b474f3ec0102eebdaaca080fb52
+F ext/wasm/demo-jsstorage.html 409c4be4af5f207fb2877160724b91b33ea36a3cd8c204e8da1acb828ffe588e w ext/wasm/demo-kvvfs1.html
+F ext/wasm/demo-jsstorage.js 105596bd2ccd0b1deb5fde8e99b536e8242d4bb5932fac0c8403ff3a6bc547e8 w ext/wasm/demo-kvvfs1.js
+F ext/wasm/demo-worker1-promiser.html 1de7c248c7c2cfd4a5783d2aa154bce62d74c6de98ab22f5786620b3354ed15f w ext/wasm/testing-worker1-promiser.html
+F ext/wasm/demo-worker1-promiser.js f68ffbbe1c6086e18ce7961b8fc2b40dd88db174f59052e228c06b07484945ca w ext/wasm/testing-worker1-promiser.js
+F ext/wasm/demo-worker1.html 2c178c1890a2beb5a5fecb1453e796d067a4b8d3d2a04d65ca2eb1ab2c68ef5d w ext/wasm/testing2.html
+F ext/wasm/demo-worker1.js 8ba51d94c4601fa5c313d9e59b63b238f5305b5d5739ad21f4782a0161e6682e w ext/wasm/testing2.js
+F ext/wasm/dist.make b3b156061ff6a35ce59715632c9446cb58e0fc497021a93c778fed051a04fde1
 F ext/wasm/fiddle.make acdb1a402864f9b05a4c89805c5e91d88f5080652d8861f0865655b172243847
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js 531859a471924a0ea48afa218e6877f0c164ca324d51e15843ed6ecc1c65c7ee
 F ext/wasm/fiddle/fiddle.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
 F ext/wasm/fiddle/fiddle.js 974b995119ac443685d7d94d3b3c58c6a36540e9eb3fed7069d5653284071715
-F ext/wasm/index-dist.html 5e579a9d4101c5bb15c6d97475b15c7a6195b4e3b4b42bc9f31deac475736e6a
-F ext/wasm/index.html 47fd8be5f76b7e1123edb301b604bc751ba387498a597d8dc48bce24d1007c57
+F ext/wasm/index-dist.html cb0da16cba0f21cda2c25724c5869102d48eb0af04446acd3cd0ca031f80ed19
+F ext/wasm/index.html 751bbf248ee3106cec92cc4e6e3f703cd5c94deff3c6b7a596154fb04ab3efac
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 9aa6951b529a8b29f578ec8f0355713c39584c92cf1708f63ba0cf917cb5b68e
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
@@ -530,10 +534,6 @@ F ext/wasm/test-opfs-vfs.js 48fc59110e8775bb43c9be25b6d634fc07ebadab7da8fbd44889
 F ext/wasm/tester1-worker.html 048c341f124fdb61ca14dfd1bd1f78742490f208aa3bb1e84399f83f1e7e6a74
 F ext/wasm/tester1.html 37ccc958fa0d95074af2d72b7241c8e2d982bbec6dda4dc790241af3d933c3b6
 F ext/wasm/tester1.js 44d71175e2941bf1d7c27afa0c395fe81c83cbd74cd10e34e0688dd833042f1e
-F ext/wasm/testing-worker1-promiser.html 88c6ff8a7be351abef219639cd684c5c3e0c649c1dc07b10a5bd59939e7bb4b5
-F ext/wasm/testing-worker1-promiser.js f68ffbbe1c6086e18ce7961b8fc2b40dd88db174f59052e228c06b07484945ca
-F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
-F ext/wasm/testing2.js 90dc901a54ecc319d09356de2f8c21f53e7f61f2914445e6b176e1bcad12ba8b
 F ext/wasm/version-info.c 5fa356d38859d71a0369b5c37e1935def7413fcc8a4e349a39d9052c1d0479f4
 F ext/wasm/wasmfs.make ee0004813e16c283ff633e08b482008d56adf9b7d42f6c5612f7ab002b924f69
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
@@ -2036,8 +2036,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 a0ef0f32e96638b502b3951e524d590bdfb09dd39be453686b075102da67b7db
-R dd2c6bc27c1ee39a3214f089113c267d
+P bcbee1ec010ae74f0749aa7fda008698198a8cd52a7aa12d6458d43d3e739eb0
+R 86acac49fd52bddbad82feb56257fc0d
 U stephan
-Z 0031e9fd6a3aaf1c9c22f1905a3b97fd
+Z 7a4c1fad2692e602692868ef64880c6e
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 285cfb9c2c..6c61ad2ef2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bcbee1ec010ae74f0749aa7fda008698198a8cd52a7aa12d6458d43d3e739eb0
\ No newline at end of file
+9c85835f6f50eb3b1a2b89c817816335743f04440c48bfa05aa89ec519cc0d51
\ No newline at end of file

From a817b30f0b93b3dc6ffaa5ab863ef866942de8ad Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 19 Oct 2022 07:51:12 +0000
Subject: [PATCH 313/428] Update the wasm/js 'push' rule to account for this
 morning's changes.

FossilOrigin-Name: c4a0f745fbaf6f950810f92765cbe66dde66e226b78ec5dd9017473bf4c9c268
---
 ext/wasm/GNUmakefile |  4 ++--
 manifest             | 24 ++++++++++++------------
 manifest.uuid        |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index fdf1332e5c..1bb14a65df 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -593,8 +593,8 @@ endif
 
 ########################################################################
 # Push files to public wasm-testing.sqlite.org server
-wasm-testing.include = *.wasm *.js *.html \
-    batch-runner.list sql common fiddle jaccwabyt
+wasm-testing.include = $(dir.dout) *.js *.html \
+    batch-runner.list $(dir.sql) $(dir.common) $(dir.fiddle) $(dir.jacc)
 wasm-testing.exclude = sql/speedtest1.sql
 wasm-testing.dir     = /jail/sites/wasm-testing
 wasm-testing.dest   ?= wasm-testing:$(wasm-testing.dir)
diff --git a/manifest b/manifest
index 544355b1a7..6e9ac6d0cc 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Rename\sseveral\sdemo/test\sfiles\sand\sinclude\smore\sof\sthem\sin\sthe\send-user\sdist\sarchive.
-D 2022-10-19T07:34:36.266
+C Update\sthe\swasm/js\s'push'\srule\sto\saccount\sfor\sthis\smorning's\schanges.
+D 2022-10-19T07:51:12.703
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -472,7 +472,7 @@ F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
-F ext/wasm/GNUmakefile 1c60c998df5c33f49d1490a5746425e2d477389f4c9337613c507ff5a5a60c70
+F ext/wasm/GNUmakefile 6cd57a8ce51424220917c6ff766e8a7b7998cbdc6a1e364c4366992a77f11de4
 F ext/wasm/README-dist.txt e78e44a58772d5b5d7a5a179b5bf639cd67b62249aac66138e2c319bd02dd243
 F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 89983a8d122c35a90c65ec667844b95a78bcd04f3198a99c1e0c8368c1a0b03a
@@ -504,12 +504,12 @@ F ext/wasm/common/whwasmutil.js 50d2ede0b0fa01c1d467e1801fab79f5e46bb02bcbd2b023
 F ext/wasm/demo-123-worker.html a0b58d9caef098a626a1a1db567076fca4245e8d60ba94557ede8684350a81ed
 F ext/wasm/demo-123.html 8c70a412ce386bd3796534257935eb1e3ea5c581e5d5aea0490b8232e570a508
 F ext/wasm/demo-123.js ebae30756585bca655b4ab2553ec9236a87c23ad24fc8652115dcedb06d28df6
-F ext/wasm/demo-jsstorage.html 409c4be4af5f207fb2877160724b91b33ea36a3cd8c204e8da1acb828ffe588e w ext/wasm/demo-kvvfs1.html
-F ext/wasm/demo-jsstorage.js 105596bd2ccd0b1deb5fde8e99b536e8242d4bb5932fac0c8403ff3a6bc547e8 w ext/wasm/demo-kvvfs1.js
-F ext/wasm/demo-worker1-promiser.html 1de7c248c7c2cfd4a5783d2aa154bce62d74c6de98ab22f5786620b3354ed15f w ext/wasm/testing-worker1-promiser.html
-F ext/wasm/demo-worker1-promiser.js f68ffbbe1c6086e18ce7961b8fc2b40dd88db174f59052e228c06b07484945ca w ext/wasm/testing-worker1-promiser.js
-F ext/wasm/demo-worker1.html 2c178c1890a2beb5a5fecb1453e796d067a4b8d3d2a04d65ca2eb1ab2c68ef5d w ext/wasm/testing2.html
-F ext/wasm/demo-worker1.js 8ba51d94c4601fa5c313d9e59b63b238f5305b5d5739ad21f4782a0161e6682e w ext/wasm/testing2.js
+F ext/wasm/demo-jsstorage.html 409c4be4af5f207fb2877160724b91b33ea36a3cd8c204e8da1acb828ffe588e
+F ext/wasm/demo-jsstorage.js 105596bd2ccd0b1deb5fde8e99b536e8242d4bb5932fac0c8403ff3a6bc547e8
+F ext/wasm/demo-worker1-promiser.html 1de7c248c7c2cfd4a5783d2aa154bce62d74c6de98ab22f5786620b3354ed15f
+F ext/wasm/demo-worker1-promiser.js f68ffbbe1c6086e18ce7961b8fc2b40dd88db174f59052e228c06b07484945ca
+F ext/wasm/demo-worker1.html 2c178c1890a2beb5a5fecb1453e796d067a4b8d3d2a04d65ca2eb1ab2c68ef5d
+F ext/wasm/demo-worker1.js 8ba51d94c4601fa5c313d9e59b63b238f5305b5d5739ad21f4782a0161e6682e
 F ext/wasm/dist.make b3b156061ff6a35ce59715632c9446cb58e0fc497021a93c778fed051a04fde1
 F ext/wasm/fiddle.make acdb1a402864f9b05a4c89805c5e91d88f5080652d8861f0865655b172243847
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
@@ -2036,8 +2036,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 bcbee1ec010ae74f0749aa7fda008698198a8cd52a7aa12d6458d43d3e739eb0
-R 86acac49fd52bddbad82feb56257fc0d
+P 9c85835f6f50eb3b1a2b89c817816335743f04440c48bfa05aa89ec519cc0d51
+R a9a6139814485c7e9bf06cc091e7f39f
 U stephan
-Z 7a4c1fad2692e602692868ef64880c6e
+Z dc0807c91bdea09652a27e395e493617
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 6c61ad2ef2..a16b04e95f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9c85835f6f50eb3b1a2b89c817816335743f04440c48bfa05aa89ec519cc0d51
\ No newline at end of file
+c4a0f745fbaf6f950810f92765cbe66dde66e226b78ec5dd9017473bf4c9c268
\ No newline at end of file

From 3b88065d35eabf1a707ec3dc54d41c29cffeaa0c Mon Sep 17 00:00:00 2001
From: drh <>
Date: Wed, 19 Oct 2022 11:58:24 +0000
Subject: [PATCH 314/428] Fix references to "SrcList_item" in comments as that
 object has since [bfd5bf2c73110fcb] (2021-02-21) been called "SrcItem". 
 Comment changes only.  No changes to code.

FossilOrigin-Name: e3648a07f5607dbd4d6ad5b6e5a62a4a1d0b173d3f22aa36c74b768281fc86d8
---
 manifest       | 15 +++++++--------
 manifest.uuid  |  2 +-
 src/select.c   |  8 ++++----
 src/whereInt.h |  2 +-
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/manifest b/manifest
index 6cc52db63f..c215932fc2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C If\sa\squery\suses\san\sindex\swhere\sone\sor\smore\sof\sthe\scolumns\sof\sthe\sindex\sis\nan\sexpression\sor\sa\svirtual\scolumn,\sand\sif\sthe\scorresponding\sexpression\sis\nused\selsewhere\sin\sthe\squery,\sthen\sstrive\sto\sread\sthe\svalue\sof\sthe\sexpression\nout\sof\sthe\sindex,\srather\sthan\srecomputing\sit.\s\sThis\sis\sthe\n"Indexed\sExpression\sOptimizations".
-D 2022-10-19T10:56:05.300
+C Fix\sreferences\sto\s"SrcList_item"\sin\scomments\sas\sthat\sobject\shas\ssince\n[bfd5bf2c73110fcb]\s(2021-02-21)\sbeen\scalled\s"SrcItem".\s\sComment\schanges\nonly.\s\sNo\schanges\sto\scode.
+D 2022-10-19T11:58:24.911
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -620,7 +620,7 @@ F src/printf.c e99ee9741e79ae3873458146f59644276657340385ade4e76a5f5d1c25793764
 F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c b795f31a326564ffc448bb26f863c64f0796b2a5e0585a3358aff7877b72ed82
+F src/select.c 3f7238ebb3252f4768a8fb46ad95b62700d27baddcab8a21548129f4f9305d52
 F src/shell.c.in a4c0754470d4fcc2c3da2f0cda0363cecf4a84273d3cc3865325c2df06d5e56b
 F src/sqlite.h.in d9c8a6243fc0a1c270d69db33758e34b810af3462f9bc5b4af113b347e07c69d
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -708,7 +708,7 @@ F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d
 F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
 F src/where.c 5dcd88d080ad302da4278f55acce12fd1c1f91eff2bcbfa2c0806d33fa230a5f
-F src/whereInt.h 70cd30de9ed784aa33fa6bd1245f060617de7a00d992469b6d8e419eed915743
+F src/whereInt.h 89a0ae1af68264c925f9729c247ae01457b3d2400b8f0626345e2a15bb30d7b8
 F src/wherecode.c 8ec5a413f12af06638dcca36d0954be2151eea6f293d3c67397cef6a90d6adf1
 F src/whereexpr.c bf8c155212c886621d71c951053660de6fcc4ee907b17aa02da0a96a39aa9405
 F src/window.c 928e215840e2f2d9a2746e018c9643ef42c66c4ab6630ef0df7fa388fa145e86
@@ -2036,9 +2036,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 c4a0f745fbaf6f950810f92765cbe66dde66e226b78ec5dd9017473bf4c9c268 c21eb903f06a16d4fafa5f895be08414fa58e6a91c148030aec8676b40c2d66d
-R 099250bc6a2990d79990297a12d3039b
-T +closed c21eb903f06a16d4fafa5f895be08414fa58e6a91c148030aec8676b40c2d66d
+P 2435112867fbd7b6ebb7f2c2b9da57cdf1e23fab6c2869870b66133a9f9faedc
+R 766b448614fab16fb83d46c28ed5755d
 U drh
-Z 09e5a4ee4f8f7eb5b6479975bdf31b92
+Z 302f41db1560793249aef3cf7bc0796f
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index a7c20b191b..d58d651707 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2435112867fbd7b6ebb7f2c2b9da57cdf1e23fab6c2869870b66133a9f9faedc
\ No newline at end of file
+e3648a07f5607dbd4d6ad5b6e5a62a4a1d0b173d3f22aa36c74b768281fc86d8
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index e4424024c8..03d9c42cfa 100644
--- a/src/select.c
+++ b/src/select.c
@@ -4619,7 +4619,7 @@ static int flattenSubquery(
       pSub->pLimit = 0;
     }
 
-    /* Recompute the SrcList_item.colUsed masks for the flattened
+    /* Recompute the SrcItem.colUsed masks for the flattened
     ** tables. */
     for(i=0; i<nSubSrc; i++){
       recomputeColumnsUsed(pParent, &pSrc->a[i+iFrom]);
@@ -5607,9 +5607,9 @@ void sqlite3SelectPopWith(Walker *pWalker, Select *p){
 #endif
 
 /*
-** The SrcList_item structure passed as the second argument represents a
+** The SrcItem structure passed as the second argument represents a
 ** sub-query in the FROM clause of a SELECT statement. This function
-** allocates and populates the SrcList_item.pTab object. If successful,
+** allocates and populates the SrcItem.pTab object. If successful,
 ** SQLITE_OK is returned. Otherwise, if an OOM error is encountered,
 ** SQLITE_NOMEM.
 */
@@ -6442,7 +6442,7 @@ static void havingToWhere(Parse *pParse, Select *p){
 
 /*
 ** Check to see if the pThis entry of pTabList is a self-join of a prior view.
-** If it is, then return the SrcList_item for the prior view.  If it is not,
+** If it is, then return the SrcItem for the prior view.  If it is not,
 ** then return 0.
 */
 static SrcItem *isSelfJoinView(
diff --git a/src/whereInt.h b/src/whereInt.h
index fda207890c..43da5c2089 100644
--- a/src/whereInt.h
+++ b/src/whereInt.h
@@ -378,7 +378,7 @@ struct WhereAndInfo {
 ** between VDBE cursor numbers and bits of the bitmasks in WhereTerm.
 **
 ** The VDBE cursor numbers are small integers contained in 
-** SrcList_item.iCursor and Expr.iTable fields.  For any given WHERE 
+** SrcItem.iCursor and Expr.iTable fields.  For any given WHERE 
 ** clause, the cursor numbers might not begin with 0 and they might
 ** contain gaps in the numbering sequence.  But we want to make maximum
 ** use of the bits in our bitmasks.  This structure provides a mapping

From 361fb98b5d1ad2d9787e2b42cc849ec594a0fd51 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Wed, 19 Oct 2022 18:03:39 +0000
Subject: [PATCH 315/428] Move file /ext/misc/dbdata.c to the /ext/recover/
 directory.

FossilOrigin-Name: f6d5ac807efcf6140016a8b8f0c74566c0bfc98ad92bd8fca03c5cc80ebf3dec
---
 Makefile.in                     |  4 ++--
 Makefile.msc                    |  4 ++--
 ext/{misc => recover}/dbdata.c  |  0
 ext/recover/recovercorrupt.test |  4 ++--
 main.mk                         |  4 ++--
 manifest                        | 22 +++++++++++-----------
 manifest.uuid                   |  2 +-
 src/shell.c.in                  |  2 +-
 8 files changed, 21 insertions(+), 21 deletions(-)
 rename ext/{misc => recover}/dbdata.c (100%)

diff --git a/Makefile.in b/Makefile.in
index d5000549f4..e0eef2b09e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -435,7 +435,7 @@ TESTSRC = \
   $(TOP)/ext/fts3/fts3_test.c  \
   $(TOP)/ext/session/test_session.c \
   $(TOP)/ext/recover/sqlite3recover.c \
-  $(TOP)/ext/misc/dbdata.c \
+  $(TOP)/ext/recover/dbdata.c \
   $(TOP)/ext/recover/test_recover.c \
   $(TOP)/ext/rbu/test_rbu.c 
 
@@ -1111,7 +1111,7 @@ SHELL_SRC = \
 	$(TOP)/ext/expert/sqlite3expert.h \
 	$(TOP)/ext/misc/zipfile.c \
 	$(TOP)/ext/misc/memtrace.c \
-	$(TOP)/ext/misc/dbdata.c \
+	$(TOP)/ext/recover/dbdata.c \
 	$(TOP)/ext/recover/sqlite3recover.c \
 	$(TOP)/ext/recover/sqlite3recover.h \
         $(TOP)/src/test_windirent.c
diff --git a/Makefile.msc b/Makefile.msc
index 9265cd641e..eff104eb56 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -1590,7 +1590,7 @@ TESTEXT = \
   $(TOP)\ext\rtree\test_rtreedoc.c \
   $(TOP)\ext\recover\sqlite3recover.c \
   $(TOP)\ext\recover\test_recover.c \
-  $(TOP)\ext\misc\dbdata.c \
+  $(TOP)\ext\recover\dbdata.c \
   fts5.c
 
 # If use of zlib is enabled, add the "zipfile.c" source file.
@@ -2231,7 +2231,7 @@ SHELL_SRC = \
 	$(TOP)\ext\expert\sqlite3expert.c \
 	$(TOP)\ext\expert\sqlite3expert.h \
 	$(TOP)\ext\misc\memtrace.c \
-	$(TOP)/ext/misc/dbdata.c \
+	$(TOP)/ext/recover/dbdata.c \
 	$(TOP)/ext/recover/sqlite3recover.c \
 	$(TOP)/ext/recover/sqlite3recover.h \
 	$(TOP)\src\test_windirent.c
diff --git a/ext/misc/dbdata.c b/ext/recover/dbdata.c
similarity index 100%
rename from ext/misc/dbdata.c
rename to ext/recover/dbdata.c
diff --git a/ext/recover/recovercorrupt.test b/ext/recover/recovercorrupt.test
index 290ba63b0c..40859f3d1c 100644
--- a/ext/recover/recovercorrupt.test
+++ b/ext/recover/recovercorrupt.test
@@ -35,8 +35,8 @@ do_execsql_test 1.0 {
 }
 
 do_test 1.1 {
-  file size test.db
-} {5120}
+  expr [file size test.db]>3072
+} {1}
 
 proc toggle_bit {blob bit} {
   set byte [expr {$bit / 8}]
diff --git a/main.mk b/main.mk
index 087f7f1b36..14ce23b01d 100644
--- a/main.mk
+++ b/main.mk
@@ -447,7 +447,7 @@ TESTSRC2 = \
   $(TOP)/ext/session/sqlite3session.c \
   $(TOP)/ext/session/test_session.c \
   $(TOP)/ext/recover/sqlite3recover.c \
-  $(TOP)/ext/misc/dbdata.c \
+  $(TOP)/ext/recover/dbdata.c \
   $(TOP)/ext/recover/test_recover.c \
   fts5.c
 
@@ -764,7 +764,7 @@ SHELL_SRC = \
 	$(TOP)/ext/expert/sqlite3expert.h \
 	$(TOP)/ext/misc/zipfile.c \
 	$(TOP)/ext/misc/memtrace.c \
-	$(TOP)/ext/misc/dbdata.c \
+	$(TOP)/ext/recover/dbdata.c \
 	$(TOP)/ext/recover/sqlite3recover.c \
 	$(TOP)/ext/recover/sqlite3recover.h \
         $(TOP)/src/test_windirent.c
diff --git a/manifest b/manifest
index 48bd10c08c..38b47d48a8 100644
--- a/manifest
+++ b/manifest
@@ -1,11 +1,11 @@
-C Exclude\sslow\stest\srecovercorrupt.test\sfrom\sveryquick.test.
-D 2022-10-15T19:18:10.184
+C Move\sfile\s/ext/misc/dbdata.c\sto\sthe\s/ext/recover/\sdirectory.
+D 2022-10-19T18:03:39.271
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in 64ccee54a3027ae4b2333dd28c680be45eda1002360273c03a6447b9da2bb113
+F Makefile.in b3d8ebf01cb78204988ee21e6b0d2d28c87f7d1f2b47ac23ed7a89802e68cb40
 F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
-F Makefile.msc 4986d28d183af7b0660e82aae250385cfd3c3d006de7ed6ff553bb6cf6367757
+F Makefile.msc ea790f1db3c02b62cb13416a680fa909b54bc1e0533cca222db0dae3f7af3db9
 F README.md 8b8df9ca852aeac4864eb1e400002633ee6db84065bd01b78c33817f97d31f5e
 F VERSION 8868ddfa6e1eee218286021a94b3e22d13e550c76c72d878857547ca001de24a
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -298,7 +298,6 @@ F ext/misc/closure.c dbfd8543b2a017ae6b1a5843986b22ddf99ff126ec9634a2f4047cd14c8
 F ext/misc/completion.c 6dafd7f4348eecc7be9e920d4b419d1fb2af75d938cd9c59a20cfe8beb2f22b9
 F ext/misc/compress.c 3354c77a7c8e86e07d849916000cdac451ed96500bfb5bd83b20eb61eee012c9
 F ext/misc/csv.c ca8d6dafc5469639de81937cb66ae2e6b358542aba94c4f791910d355a8e7f73
-F ext/misc/dbdata.c ca7b235fa2396e8fc2e950826872f820f31268ac2cb51368b0d655bb71568f07
 F ext/misc/dbdump.c b8592f6f2da292c62991a13864a60d6c573c47a9cc58362131b9e6a64f823e01
 F ext/misc/decimal.c 09f967dcf4a1ee35a76309829308ec278d3648168733f4a1147820e11ebefd12
 F ext/misc/eval.c 04bc9aada78c888394204b4ed996ab834b99726fb59603b0ee3ed6e049755dc1
@@ -386,10 +385,11 @@ F ext/rbu/rbuvacuum4.test a78898e438a44803eb2bc897ba3323373c9f277418e2d6d76e90f2
 F ext/rbu/sqlite3rbu.c 8737cabdfbee84bb25a7851ecef8b1312be332761238da9be6ddb10c62ad4291
 F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9cd389812
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
+F ext/recover/dbdata.c ca7b235fa2396e8fc2e950826872f820f31268ac2cb51368b0d655bb71568f07 w ext/misc/dbdata.c
 F ext/recover/recover1.test 93acc42f95259f8b34050ad75873685a305da76d6cb1727d003f45157a4a6402
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
 F ext/recover/recoverclobber.test 294dcc894124ab4ca3a7b35766630742a3d25810fceac22220beb64f70a33a60
-F ext/recover/recovercorrupt.test 69af3d68aedc2cf1c3c41dbd6afb45b3cebadb57796d513550b5fd1e2a8b3fba
+F ext/recover/recovercorrupt.test 6540aae95e17398dd70b44518367fd56588c44962cb276d2623a0fedba9efe9e
 F ext/recover/recovercorrupt2.test a131d8005337c092e2dfa3b84909ed67ae82d22399a8cfb8c984b2939969ca42
 F ext/recover/recoverfault.test 3a0a32b9fc216592b97775d69220695b0926980c0f7424b7a59144e47d7cb568
 F ext/recover/recoverfault2.test 321036336af23e778a87f148c4cc4407f88fbdab1fd72ddb661669be9020d36b
@@ -551,7 +551,7 @@ F ext/wasm/wasmfs.make 3cce1820006196de140f90f2da4b4ea657083fb5bfee7d125be43f7a8
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
-F main.mk 845d815ae761459c346ffd8a1ffc243195701b800955f94db257b8ce71a4ab38
+F main.mk d5fdf519235d657a3b87d70324f8ee1f057207626e5ab4daf23a0199d20a25ad
 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@ -633,7 +633,7 @@ F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c b795f31a326564ffc448bb26f863c64f0796b2a5e0585a3358aff7877b72ed82
-F src/shell.c.in 831dbd94e910215fffd67c0cfdbf2d38f3906e60eaf3c9647d69af0bfe12abd6
+F src/shell.c.in d24655392a5be8143b8d29226856ba6528339355702b52e5a4c165e16c01ec8f
 F src/sqlite.h.in d9c8a6243fc0a1c270d69db33758e34b810af3462f9bc5b4af113b347e07c69d
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 5336beea1868d99d2f62e628dbea55e97267dbff8193291ab175e960c5df9141
@@ -2046,8 +2046,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 8ed4e4a80d8104d20b211a0b3e299abdb955cabdd36979bf6aae54266dc9778d
-R 845d52da8da6984141e3c82e5a9ffafe
+P ff9a733532fe11bb253246b45a94681a174c976aafee5c780af571893e8ce694
+R 0b6e256547f11180eef1e8e83664e1a7
 U dan
-Z c4bdc57e0746f05859841f5f12f56c5e
+Z 01393ff26cde3c9365efd46ef5c6323b
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 531c1cb665..609d1f6daf 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ff9a733532fe11bb253246b45a94681a174c976aafee5c780af571893e8ce694
\ No newline at end of file
+f6d5ac807efcf6140016a8b8f0c74566c0bfc98ad92bd8fca03c5cc80ebf3dec
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index e9b028b349..cd0abfbe71 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -1046,7 +1046,7 @@ INCLUDE ../ext/expert/sqlite3expert.h
 INCLUDE ../ext/expert/sqlite3expert.c
 
 #if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
-INCLUDE ../ext/misc/dbdata.c
+INCLUDE ../ext/recover/dbdata.c
 INCLUDE ../ext/recover/sqlite3recover.h
 INCLUDE ../ext/recover/sqlite3recover.c
 #endif

From bf70f1bd1a24093e8a03549090af7d87ef4e9c8e Mon Sep 17 00:00:00 2001
From: drh <>
Date: Wed, 19 Oct 2022 18:04:42 +0000
Subject: [PATCH 316/428] In the CLI, never use strcmp() or strncmp() directly.
  Instead use wrapper functions cli_strcmp() and cli_strncmp() that work
 correctly even if the input is a NULL pointer.
 [forum:/forumpost/142b868da7560d0b|Forum post 142b868da7560d0b].

FossilOrigin-Name: 7450a561f8577c3ee41f84074c6ef39e29e56876cab4fd763e6489c66f603223
---
 manifest       |  12 +-
 manifest.uuid  |   2 +-
 src/shell.c.in | 550 +++++++++++++++++++++++++------------------------
 3 files changed, 291 insertions(+), 273 deletions(-)

diff --git a/manifest b/manifest
index c215932fc2..a40ab24a57 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sreferences\sto\s"SrcList_item"\sin\scomments\sas\sthat\sobject\shas\ssince\n[bfd5bf2c73110fcb]\s(2021-02-21)\sbeen\scalled\s"SrcItem".\s\sComment\schanges\nonly.\s\sNo\schanges\sto\scode.
-D 2022-10-19T11:58:24.911
+C In\sthe\sCLI,\snever\suse\sstrcmp()\sor\sstrncmp()\sdirectly.\s\sInstead\suse\nwrapper\sfunctions\scli_strcmp()\sand\scli_strncmp()\sthat\swork\scorrectly\seven\nif\sthe\sinput\sis\sa\sNULL\spointer.\n[forum:/forumpost/142b868da7560d0b|Forum\spost\s142b868da7560d0b].
+D 2022-10-19T18:04:42.228
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -621,7 +621,7 @@ F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 3f7238ebb3252f4768a8fb46ad95b62700d27baddcab8a21548129f4f9305d52
-F src/shell.c.in a4c0754470d4fcc2c3da2f0cda0363cecf4a84273d3cc3865325c2df06d5e56b
+F src/shell.c.in 520c8d289f149f3fcadf4d7263874a422c646496199a40d8901ad698d98dfb18
 F src/sqlite.h.in d9c8a6243fc0a1c270d69db33758e34b810af3462f9bc5b4af113b347e07c69d
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 5336beea1868d99d2f62e628dbea55e97267dbff8193291ab175e960c5df9141
@@ -2036,8 +2036,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 2435112867fbd7b6ebb7f2c2b9da57cdf1e23fab6c2869870b66133a9f9faedc
-R 766b448614fab16fb83d46c28ed5755d
+P e3648a07f5607dbd4d6ad5b6e5a62a4a1d0b173d3f22aa36c74b768281fc86d8
+R dc5d57d2ab062846ea9bb105dfaf948e
 U drh
-Z 302f41db1560793249aef3cf7bc0796f
+Z 77fd38c4ef78083cfcf69fef5a64b6ae
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index d58d651707..2d0cb0c719 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e3648a07f5607dbd4d6ad5b6e5a62a4a1d0b173d3f22aa36c74b768281fc86d8
\ No newline at end of file
+7450a561f8577c3ee41f84074c6ef39e29e56876cab4fd763e6489c66f603223
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index 1dbe349efa..a50c2ab62a 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -249,6 +249,18 @@ static void setTextMode(FILE *file, int isOutput){
 /* True if the timer is enabled */
 static int enableTimer = 0;
 
+/* A version of strcmp() that works with NULL values */
+static int cli_strcmp(const char *a, const char *b){
+  if( a==0 ) a = "";
+  if( b==0 ) b = "";
+  return strcmp(a,b);
+}
+static int cli_strncmp(const char *a, const char *b, size_t n){
+  if( a==0 ) a = "";
+  if( b==0 ) b = "";
+  return strncmp(a,b,n);
+}
+
 /* Return the current wall-clock time */
 static sqlite3_int64 timeOfDay(void){
   static sqlite3_vfs *clockVfs = 0;
@@ -977,10 +989,10 @@ static void shellAddSchemaName(
   const char *zName = (const char*)sqlite3_value_text(apVal[2]);
   sqlite3 *db = sqlite3_context_db_handle(pCtx);
   UNUSED_PARAMETER(nVal);
-  if( zIn!=0 && strncmp(zIn, "CREATE ", 7)==0 ){
+  if( zIn!=0 && cli_strncmp(zIn, "CREATE ", 7)==0 ){
     for(i=0; i<ArraySize(aPrefix); i++){
       int n = strlen30(aPrefix[i]);
-      if( strncmp(zIn+7, aPrefix[i], n)==0 && zIn[n+7]==' ' ){
+      if( cli_strncmp(zIn+7, aPrefix[i], n)==0 && zIn[n+7]==' ' ){
         char *z = 0;
         char *zFake = 0;
         if( zSchema ){
@@ -2760,7 +2772,7 @@ static void displayLinuxIoStats(FILE *out){
     int i;
     for(i=0; i<ArraySize(aTrans); i++){
       int n = strlen30(aTrans[i].zPattern);
-      if( strncmp(aTrans[i].zPattern, z, n)==0 ){
+      if( cli_strncmp(aTrans[i].zPattern, z, n)==0 ){
         utf8_printf(out, "%-36s %s", aTrans[i].zDesc, &z[n]);
         break;
       }
@@ -2999,7 +3011,7 @@ static void display_scanstats(
 static int str_in_array(const char *zStr, const char **azArray){
   int i;
   for(i=0; azArray[i]; i++){
-    if( 0==strcmp(zStr, azArray[i]) ) return 1;
+    if( 0==cli_strcmp(zStr, azArray[i]) ) return 1;
   }
   return 0;
 }
@@ -3074,7 +3086,7 @@ static void explain_data_prepare(ShellState *p, sqlite3_stmt *pSql){
            "addr", "opcode", "p1", "p2", "p3", "p4", "p5", "comment" };
         int jj;
         for(jj=0; jj<ArraySize(explainCols); jj++){
-          if( strcmp(sqlite3_column_name(pSql,jj),explainCols[jj])!=0 ){
+          if( cli_strcmp(sqlite3_column_name(pSql,jj),explainCols[jj])!=0 ){
             p->cMode = p->mode;
             sqlite3_reset(pSql);
             return;
@@ -3798,10 +3810,10 @@ static int expertDotCommand(
     int n;
     if( z[0]=='-' && z[1]=='-' ) z++;
     n = strlen30(z);
-    if( n>=2 && 0==strncmp(z, "-verbose", n) ){
+    if( n>=2 && 0==cli_strncmp(z, "-verbose", n) ){
       pState->expert.bVerbose = 1;
     }
-    else if( n>=2 && 0==strncmp(z, "-sample", n) ){
+    else if( n>=2 && 0==cli_strncmp(z, "-sample", n) ){
       if( i==(nArg-1) ){
         raw_printf(stderr, "option requires an argument: %s\n", z);
         rc = SQLITE_ERROR;
@@ -4152,15 +4164,15 @@ static int dump_callback(void *pArg, int nArg, char **azArg, char **azNotUsed){
   dataOnly = (p->shellFlgs & SHFLG_DumpDataOnly)!=0;
   noSys    = (p->shellFlgs & SHFLG_DumpNoSys)!=0;
 
-  if( strcmp(zTable, "sqlite_sequence")==0 && !noSys ){
+  if( cli_strcmp(zTable, "sqlite_sequence")==0 && !noSys ){
     if( !dataOnly ) raw_printf(p->out, "DELETE FROM sqlite_sequence;\n");
   }else if( sqlite3_strglob("sqlite_stat?", zTable)==0 && !noSys ){
     if( !dataOnly ) raw_printf(p->out, "ANALYZE sqlite_schema;\n");
-  }else if( strncmp(zTable, "sqlite_", 7)==0 ){
+  }else if( cli_strncmp(zTable, "sqlite_", 7)==0 ){
     return 0;
   }else if( dataOnly ){
     /* no-op */
-  }else if( strncmp(zSql, "CREATE VIRTUAL TABLE", 20)==0 ){
+  }else if( cli_strncmp(zSql, "CREATE VIRTUAL TABLE", 20)==0 ){
     char *zIns;
     if( !p->writableSchema ){
       raw_printf(p->out, "PRAGMA writable_schema=ON;\n");
@@ -4178,7 +4190,7 @@ static int dump_callback(void *pArg, int nArg, char **azArg, char **azNotUsed){
     printSchemaLine(p->out, zSql, ";\n");
   }
 
-  if( strcmp(zType, "table")==0 ){
+  if( cli_strcmp(zType, "table")==0 ){
     ShellText sSelect;
     ShellText sTable;
     char **azCol;
@@ -4597,9 +4609,9 @@ static int showHelp(FILE *out, const char *zPattern){
   char *zPat;
   if( zPattern==0
    || zPattern[0]=='0'
-   || strcmp(zPattern,"-a")==0
-   || strcmp(zPattern,"-all")==0
-   || strcmp(zPattern,"--all")==0
+   || cli_strcmp(zPattern,"-a")==0
+   || cli_strcmp(zPattern,"-all")==0
+   || cli_strcmp(zPattern,"--all")==0
   ){
     /* Show all commands, but only one line per command */
     if( zPattern==0 ) zPattern = "";
@@ -4836,7 +4848,7 @@ static unsigned char *readHexDb(ShellState *p, int *pnData){
       iOffset = k;
       continue;
     }
-    if( strncmp(zLine, "| end ", 6)==0 ){
+    if( cli_strncmp(zLine, "| end ", 6)==0 ){
       break;
     }
     rc = sscanf(zLine,"| %d: %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x",
@@ -4864,7 +4876,7 @@ readHexDb_error:
   }else{
     while( fgets(zLine, sizeof(zLine), p->in)!=0 ){
       nLine++;
-      if(strncmp(zLine, "| end ", 6)==0 ) break;
+      if(cli_strncmp(zLine, "| end ", 6)==0 ) break;
     }
     p->lineno = nLine;
   }
@@ -5357,11 +5369,11 @@ static void output_file_close(FILE *f){
 */
 static FILE *output_file_open(const char *zFile, int bTextMode){
   FILE *f;
-  if( strcmp(zFile,"stdout")==0 ){
+  if( cli_strcmp(zFile,"stdout")==0 ){
     f = stdout;
-  }else if( strcmp(zFile, "stderr")==0 ){
+  }else if( cli_strcmp(zFile, "stderr")==0 ){
     f = stderr;
-  }else if( strcmp(zFile, "off")==0 ){
+  }else if( cli_strcmp(zFile, "off")==0 ){
     f = 0;
   }else{
     f = fopen(zFile, bTextMode ? "w" : "wb");
@@ -5973,7 +5985,7 @@ static int shell_dbinfo_command(ShellState *p, int nArg, char **azArg){
   }
   if( zDb==0 ){
     zSchemaTab = sqlite3_mprintf("main.sqlite_schema");
-  }else if( strcmp(zDb,"temp")==0 ){
+  }else if( cli_strcmp(zDb,"temp")==0 ){
     zSchemaTab = sqlite3_mprintf("%s", "sqlite_temp_schema");
   }else{
     zSchemaTab = sqlite3_mprintf("\"%w\".sqlite_schema", zDb);
@@ -6107,7 +6119,7 @@ static int optionMatch(const char *zStr, const char *zOpt){
   if( zStr[0]!='-' ) return 0;
   zStr++;
   if( zStr[0]=='-' ) zStr++;
-  return strcmp(zStr, zOpt)==0;
+  return cli_strcmp(zStr, zOpt)==0;
 }
 
 /*
@@ -8213,7 +8225,7 @@ static int do_meta_command(char *zLine, ShellState *p){
   clearTempFile(p);
 
 #ifndef SQLITE_OMIT_AUTHORIZATION
-  if( c=='a' && strncmp(azArg[0], "auth", n)==0 ){
+  if( c=='a' && cli_strncmp(azArg[0], "auth", n)==0 ){
     if( nArg!=2 ){
       raw_printf(stderr, "Usage: .auth ON|OFF\n");
       rc = 1;
@@ -8232,7 +8244,7 @@ static int do_meta_command(char *zLine, ShellState *p){
 
 #if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_HAVE_ZLIB) \
   && !defined(SQLITE_SHELL_FIDDLE)
-  if( c=='a' && strncmp(azArg[0], "archive", n)==0 ){
+  if( c=='a' && cli_strncmp(azArg[0], "archive", n)==0 ){
     open_db(p, 0);
     failIfSafeMode(p, "cannot run .archive in safe mode");
     rc = arDotCommand(p, 0, azArg, nArg);
@@ -8240,8 +8252,8 @@ static int do_meta_command(char *zLine, ShellState *p){
 #endif
 
 #ifndef SQLITE_SHELL_FIDDLE
-  if( (c=='b' && n>=3 && strncmp(azArg[0], "backup", n)==0)
-   || (c=='s' && n>=3 && strncmp(azArg[0], "save", n)==0)
+  if( (c=='b' && n>=3 && cli_strncmp(azArg[0], "backup", n)==0)
+   || (c=='s' && n>=3 && cli_strncmp(azArg[0], "save", n)==0)
   ){
     const char *zDestFile = 0;
     const char *zDb = 0;
@@ -8255,10 +8267,10 @@ static int do_meta_command(char *zLine, ShellState *p){
       const char *z = azArg[j];
       if( z[0]=='-' ){
         if( z[1]=='-' ) z++;
-        if( strcmp(z, "-append")==0 ){
+        if( cli_strcmp(z, "-append")==0 ){
           zVfs = "apndvfs";
         }else
-        if( strcmp(z, "-async")==0 ){
+        if( cli_strcmp(z, "-async")==0 ){
           bAsync = 1;
         }else
         {
@@ -8310,7 +8322,7 @@ static int do_meta_command(char *zLine, ShellState *p){
   }else
 #endif /* !defined(SQLITE_SHELL_FIDDLE) */
 
-  if( c=='b' && n>=3 && strncmp(azArg[0], "bail", n)==0 ){
+  if( c=='b' && n>=3 && cli_strncmp(azArg[0], "bail", n)==0 ){
     if( nArg==2 ){
       bail_on_error = booleanValue(azArg[1]);
     }else{
@@ -8319,7 +8331,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     }
   }else
 
-  if( c=='b' && n>=3 && strncmp(azArg[0], "binary", n)==0 ){
+  if( c=='b' && n>=3 && cli_strncmp(azArg[0], "binary", n)==0 ){
     if( nArg==2 ){
       if( booleanValue(azArg[1]) ){
         setBinaryMode(p->out, 1);
@@ -8335,12 +8347,12 @@ static int do_meta_command(char *zLine, ShellState *p){
   /* The undocumented ".breakpoint" command causes a call to the no-op
   ** routine named test_breakpoint().
   */
-  if( c=='b' && n>=3 && strncmp(azArg[0], "breakpoint", n)==0 ){
+  if( c=='b' && n>=3 && cli_strncmp(azArg[0], "breakpoint", n)==0 ){
     test_breakpoint();
   }else
 
 #ifndef SQLITE_SHELL_FIDDLE
-  if( c=='c' && strcmp(azArg[0],"cd")==0 ){
+  if( c=='c' && cli_strcmp(azArg[0],"cd")==0 ){
     failIfSafeMode(p, "cannot run .cd in safe mode");
     if( nArg==2 ){
 #if defined(_WIN32) || defined(WIN32)
@@ -8361,7 +8373,7 @@ static int do_meta_command(char *zLine, ShellState *p){
   }else
 #endif /* !defined(SQLITE_SHELL_FIDDLE) */
 
-  if( c=='c' && n>=3 && strncmp(azArg[0], "changes", n)==0 ){
+  if( c=='c' && n>=3 && cli_strncmp(azArg[0], "changes", n)==0 ){
     if( nArg==2 ){
       setOrClearFlag(p, SHFLG_CountChanges, azArg[1]);
     }else{
@@ -8375,7 +8387,7 @@ static int do_meta_command(char *zLine, ShellState *p){
   ** Then read the content of the testcase-out.txt file and compare against
   ** azArg[1].  If there are differences, report an error and exit.
   */
-  if( c=='c' && n>=3 && strncmp(azArg[0], "check", n)==0 ){
+  if( c=='c' && n>=3 && cli_strncmp(azArg[0], "check", n)==0 ){
     char *zRes = 0;
     output_reset(p);
     if( nArg!=2 ){
@@ -8398,7 +8410,7 @@ static int do_meta_command(char *zLine, ShellState *p){
 #endif /* !defined(SQLITE_SHELL_FIDDLE) */
 
 #ifndef SQLITE_SHELL_FIDDLE
-  if( c=='c' && strncmp(azArg[0], "clone", n)==0 ){
+  if( c=='c' && cli_strncmp(azArg[0], "clone", n)==0 ){
     failIfSafeMode(p, "cannot run .clone in safe mode");
     if( nArg==2 ){
       tryToClone(p, azArg[1]);
@@ -8409,7 +8421,7 @@ static int do_meta_command(char *zLine, ShellState *p){
   }else
 #endif /* !defined(SQLITE_SHELL_FIDDLE) */
 
-  if( c=='c' && strncmp(azArg[0], "connection", n)==0 ){
+  if( c=='c' && cli_strncmp(azArg[0], "connection", n)==0 ){
     if( nArg==1 ){
       /* List available connections */
       int i;
@@ -8436,7 +8448,7 @@ static int do_meta_command(char *zLine, ShellState *p){
         globalDb = p->db = p->pAuxDb->db;
         p->pAuxDb->db = 0;
       }
-    }else if( nArg==3 && strcmp(azArg[1], "close")==0
+    }else if( nArg==3 && cli_strcmp(azArg[1], "close")==0
            && IsDigit(azArg[2][0]) && azArg[2][1]==0 ){
       int i = azArg[2][0] - '0';
       if( i<0 || i>=ArraySize(p->aAuxDb) ){
@@ -8455,7 +8467,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     }
   }else
 
-  if( c=='d' && n>1 && strncmp(azArg[0], "databases", n)==0 ){
+  if( c=='d' && n>1 && cli_strncmp(azArg[0], "databases", n)==0 ){
     char **azName = 0;
     int nName = 0;
     sqlite3_stmt *pStmt;
@@ -8494,7 +8506,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     sqlite3_free(azName);
   }else
 
-  if( c=='d' && n>=3 && strncmp(azArg[0], "dbconfig", n)==0 ){
+  if( c=='d' && n>=3 && cli_strncmp(azArg[0], "dbconfig", n)==0 ){
     static const struct DbConfigChoices {
       const char *zName;
       int op;
@@ -8519,7 +8531,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     int ii, v;
     open_db(p, 0);
     for(ii=0; ii<ArraySize(aDbConfig); ii++){
-      if( nArg>1 && strcmp(azArg[1], aDbConfig[ii].zName)!=0 ) continue;
+      if( nArg>1 && cli_strcmp(azArg[1], aDbConfig[ii].zName)!=0 ) continue;
       if( nArg>=3 ){
         sqlite3_db_config(p->db, aDbConfig[ii].op, booleanValue(azArg[2]), 0);
       }
@@ -8534,17 +8546,17 @@ static int do_meta_command(char *zLine, ShellState *p){
   }else
 
 #if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
-  if( c=='d' && n>=3 && strncmp(azArg[0], "dbinfo", n)==0 ){
+  if( c=='d' && n>=3 && cli_strncmp(azArg[0], "dbinfo", n)==0 ){
     rc = shell_dbinfo_command(p, nArg, azArg);
   }else
 
-  if( c=='r' && strncmp(azArg[0], "recover", n)==0 ){
+  if( c=='r' && cli_strncmp(azArg[0], "recover", n)==0 ){
     open_db(p, 0);
     rc = recoverDatabaseCmd(p, nArg, azArg);
   }else
 #endif /* !(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB) */
 
-  if( c=='d' && strncmp(azArg[0], "dump", n)==0 ){
+  if( c=='d' && cli_strncmp(azArg[0], "dump", n)==0 ){
     char *zLike = 0;
     char *zSql;
     int i;
@@ -8557,7 +8569,7 @@ static int do_meta_command(char *zLine, ShellState *p){
       if( azArg[i][0]=='-' ){
         const char *z = azArg[i]+1;
         if( z[0]=='-' ) z++;
-        if( strcmp(z,"preserve-rowids")==0 ){
+        if( cli_strcmp(z,"preserve-rowids")==0 ){
 #ifdef SQLITE_OMIT_VIRTUALTABLE
           raw_printf(stderr, "The --preserve-rowids option is not compatible"
                              " with SQLITE_OMIT_VIRTUALTABLE\n");
@@ -8568,13 +8580,13 @@ static int do_meta_command(char *zLine, ShellState *p){
           ShellSetFlag(p, SHFLG_PreserveRowid);
 #endif
         }else
-        if( strcmp(z,"newlines")==0 ){
+        if( cli_strcmp(z,"newlines")==0 ){
           ShellSetFlag(p, SHFLG_Newlines);
         }else
-        if( strcmp(z,"data-only")==0 ){
+        if( cli_strcmp(z,"data-only")==0 ){
           ShellSetFlag(p, SHFLG_DumpDataOnly);
         }else
-        if( strcmp(z,"nosys")==0 ){
+        if( cli_strcmp(z,"nosys")==0 ){
           ShellSetFlag(p, SHFLG_DumpNoSys);
         }else
         {
@@ -8656,7 +8668,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     p->shellFlgs = savedShellFlags;
   }else
 
-  if( c=='e' && strncmp(azArg[0], "echo", n)==0 ){
+  if( c=='e' && cli_strncmp(azArg[0], "echo", n)==0 ){
     if( nArg==2 ){
       setOrClearFlag(p, SHFLG_Echo, azArg[1]);
     }else{
@@ -8665,22 +8677,22 @@ static int do_meta_command(char *zLine, ShellState *p){
     }
   }else
 
-  if( c=='e' && strncmp(azArg[0], "eqp", n)==0 ){
+  if( c=='e' && cli_strncmp(azArg[0], "eqp", n)==0 ){
     if( nArg==2 ){
       p->autoEQPtest = 0;
       if( p->autoEQPtrace ){
         if( p->db ) sqlite3_exec(p->db, "PRAGMA vdbe_trace=OFF;", 0, 0, 0);
         p->autoEQPtrace = 0;
       }
-      if( strcmp(azArg[1],"full")==0 ){
+      if( cli_strcmp(azArg[1],"full")==0 ){
         p->autoEQP = AUTOEQP_full;
-      }else if( strcmp(azArg[1],"trigger")==0 ){
+      }else if( cli_strcmp(azArg[1],"trigger")==0 ){
         p->autoEQP = AUTOEQP_trigger;
 #ifdef SQLITE_DEBUG
-      }else if( strcmp(azArg[1],"test")==0 ){
+      }else if( cli_strcmp(azArg[1],"test")==0 ){
         p->autoEQP = AUTOEQP_on;
         p->autoEQPtest = 1;
-      }else if( strcmp(azArg[1],"trace")==0 ){
+      }else if( cli_strcmp(azArg[1],"trace")==0 ){
         p->autoEQP = AUTOEQP_full;
         p->autoEQPtrace = 1;
         open_db(p, 0);
@@ -8697,7 +8709,7 @@ static int do_meta_command(char *zLine, ShellState *p){
   }else
 
 #ifndef SQLITE_SHELL_FIDDLE
-  if( c=='e' && strncmp(azArg[0], "exit", n)==0 ){
+  if( c=='e' && cli_strncmp(azArg[0], "exit", n)==0 ){
     if( nArg>1 && (rc = (int)integerValue(azArg[1]))!=0 ) exit(rc);
     rc = 2;
   }else
@@ -8705,10 +8717,10 @@ static int do_meta_command(char *zLine, ShellState *p){
 
   /* The ".explain" command is automatic now.  It is largely pointless.  It
   ** retained purely for backwards compatibility */
-  if( c=='e' && strncmp(azArg[0], "explain", n)==0 ){
+  if( c=='e' && cli_strncmp(azArg[0], "explain", n)==0 ){
     int val = 1;
     if( nArg>=2 ){
-      if( strcmp(azArg[1],"auto")==0 ){
+      if( cli_strcmp(azArg[1],"auto")==0 ){
         val = 99;
       }else{
         val =  booleanValue(azArg[1]);
@@ -8728,7 +8740,7 @@ static int do_meta_command(char *zLine, ShellState *p){
   }else
 
 #ifndef SQLITE_OMIT_VIRTUALTABLE
-  if( c=='e' && strncmp(azArg[0], "expert", n)==0 ){
+  if( c=='e' && cli_strncmp(azArg[0], "expert", n)==0 ){
     if( p->bSafeMode ){
       raw_printf(stderr, 
         "Cannot run experimental commands such as \"%s\" in safe mode\n",
@@ -8741,7 +8753,7 @@ static int do_meta_command(char *zLine, ShellState *p){
   }else
 #endif
 
-  if( c=='f' && strncmp(azArg[0], "filectrl", n)==0 ){
+  if( c=='f' && cli_strncmp(azArg[0], "filectrl", n)==0 ){
     static const struct {
        const char *zCtrlName;   /* Name of a test-control option */
        int ctrlCode;            /* Integer code for that option */
@@ -8771,7 +8783,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     zCmd = nArg>=2 ? azArg[1] : "help";
 
     if( zCmd[0]=='-' 
-     && (strcmp(zCmd,"--schema")==0 || strcmp(zCmd,"-schema")==0)
+     && (cli_strcmp(zCmd,"--schema")==0 || cli_strcmp(zCmd,"-schema")==0)
      && nArg>=4
     ){
       zSchema = azArg[2];
@@ -8787,7 +8799,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     }
 
     /* --help lists all file-controls */
-    if( strcmp(zCmd,"help")==0 ){
+    if( cli_strcmp(zCmd,"help")==0 ){
       utf8_printf(p->out, "Available file-controls:\n");
       for(i=0; i<ArraySize(aCtrl); i++){
         utf8_printf(p->out, "  .filectrl %s %s\n",
@@ -8801,7 +8813,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     ** of the option name, or a numerical value. */
     n2 = strlen30(zCmd);
     for(i=0; i<ArraySize(aCtrl); i++){
-      if( strncmp(zCmd, aCtrl[i].zCtrlName, n2)==0 ){
+      if( cli_strncmp(zCmd, aCtrl[i].zCtrlName, n2)==0 ){
         if( filectrl<0 ){
           filectrl = aCtrl[i].ctrlCode;
           iCtrl = i;
@@ -8888,7 +8900,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     }
   }else
 
-  if( c=='f' && strncmp(azArg[0], "fullschema", n)==0 ){
+  if( c=='f' && cli_strncmp(azArg[0], "fullschema", n)==0 ){
     ShellState data;
     int doStats = 0;
     memcpy(&data, p, sizeof(data));
@@ -8935,7 +8947,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     }
   }else
 
-  if( c=='h' && strncmp(azArg[0], "headers", n)==0 ){
+  if( c=='h' && cli_strncmp(azArg[0], "headers", n)==0 ){
     if( nArg==2 ){
       p->showHeader = booleanValue(azArg[1]);
       p->shellFlgs |= SHFLG_HeaderSet;
@@ -8945,7 +8957,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     }
   }else
 
-  if( c=='h' && strncmp(azArg[0], "help", n)==0 ){
+  if( c=='h' && cli_strncmp(azArg[0], "help", n)==0 ){
     if( nArg>=2 ){
       n = showHelp(p->out, azArg[1]);
       if( n==0 ){
@@ -8957,7 +8969,7 @@ static int do_meta_command(char *zLine, ShellState *p){
   }else
 
 #ifndef SQLITE_SHELL_FIDDLE
-  if( c=='i' && strncmp(azArg[0], "import", n)==0 ){
+  if( c=='i' && cli_strncmp(azArg[0], "import", n)==0 ){
     char *zTable = 0;           /* Insert data into this table */
     char *zSchema = 0;          /* within this schema (may default to "main") */
     char *zFile = 0;            /* Name of file to extra content from */
@@ -8997,18 +9009,18 @@ static int do_meta_command(char *zLine, ShellState *p){
           showHelp(p->out, "import");
           goto meta_command_exit;
         }
-      }else if( strcmp(z,"-v")==0 ){
+      }else if( cli_strcmp(z,"-v")==0 ){
         eVerbose++;
-      }else if( strcmp(z,"-schema")==0 && i<nArg-1 ){
+      }else if( cli_strcmp(z,"-schema")==0 && i<nArg-1 ){
         zSchema = azArg[++i];
-      }else if( strcmp(z,"-skip")==0 && i<nArg-1 ){
+      }else if( cli_strcmp(z,"-skip")==0 && i<nArg-1 ){
         nSkip = integerValue(azArg[++i]);
-      }else if( strcmp(z,"-ascii")==0 ){
+      }else if( cli_strcmp(z,"-ascii")==0 ){
         sCtx.cColSep = SEP_Unit[0];
         sCtx.cRowSep = SEP_Record[0];
         xRead = ascii_read_one_field;
         useOutputMode = 0;
-      }else if( strcmp(z,"-csv")==0 ){
+      }else if( cli_strcmp(z,"-csv")==0 ){
         sCtx.cColSep = ',';
         sCtx.cRowSep = '\n';
         xRead = csv_read_one_field;
@@ -9048,7 +9060,9 @@ static int do_meta_command(char *zLine, ShellState *p){
             "Error: non-null row separator required for import\n");
         goto meta_command_exit;
       }
-      if( nSep==2 && p->mode==MODE_Csv && strcmp(p->rowSeparator,SEP_CrLf)==0 ){
+      if( nSep==2 && p->mode==MODE_Csv
+       && cli_strcmp(p->rowSeparator,SEP_CrLf)==0
+      ){
         /* When importing CSV (only), if the row separator is set to the
         ** default output row separator, change it to the default input
         ** row separator.  This avoids having to maintain different input
@@ -9250,7 +9264,7 @@ static int do_meta_command(char *zLine, ShellState *p){
 #endif /* !defined(SQLITE_SHELL_FIDDLE) */
 
 #ifndef SQLITE_UNTESTABLE
-  if( c=='i' && strncmp(azArg[0], "imposter", n)==0 ){
+  if( c=='i' && cli_strncmp(azArg[0], "imposter", n)==0 ){
     char *zSql;
     char *zCollist = 0;
     sqlite3_stmt *pStmt;
@@ -9351,13 +9365,13 @@ static int do_meta_command(char *zLine, ShellState *p){
 #endif /* !defined(SQLITE_OMIT_TEST_CONTROL) */
 
 #ifdef SQLITE_ENABLE_IOTRACE
-  if( c=='i' && strncmp(azArg[0], "iotrace", n)==0 ){
+  if( c=='i' && cli_strncmp(azArg[0], "iotrace", n)==0 ){
     SQLITE_API extern void (SQLITE_CDECL *sqlite3IoTrace)(const char*, ...);
     if( iotrace && iotrace!=stdout ) fclose(iotrace);
     iotrace = 0;
     if( nArg<2 ){
       sqlite3IoTrace = 0;
-    }else if( strcmp(azArg[1], "-")==0 ){
+    }else if( cli_strcmp(azArg[1], "-")==0 ){
       sqlite3IoTrace = iotracePrintf;
       iotrace = stdout;
     }else{
@@ -9373,7 +9387,7 @@ static int do_meta_command(char *zLine, ShellState *p){
   }else
 #endif
 
-  if( c=='l' && n>=5 && strncmp(azArg[0], "limits", n)==0 ){
+  if( c=='l' && n>=5 && cli_strncmp(azArg[0], "limits", n)==0 ){
     static const struct {
        const char *zLimitName;   /* Name of a limit */
        int limitCode;            /* Integer code for that limit */
@@ -9432,13 +9446,13 @@ static int do_meta_command(char *zLine, ShellState *p){
     }
   }else
 
-  if( c=='l' && n>2 && strncmp(azArg[0], "lint", n)==0 ){
+  if( c=='l' && n>2 && cli_strncmp(azArg[0], "lint", n)==0 ){
     open_db(p, 0);
     lintDotCommand(p, azArg, nArg);
   }else
 
 #if !defined(SQLITE_OMIT_LOAD_EXTENSION) && !defined(SQLITE_SHELL_FIDDLE)
-  if( c=='l' && strncmp(azArg[0], "load", n)==0 ){
+  if( c=='l' && cli_strncmp(azArg[0], "load", n)==0 ){
     const char *zFile, *zProc;
     char *zErrMsg = 0;
     failIfSafeMode(p, "cannot run .load in safe mode");
@@ -9460,7 +9474,7 @@ static int do_meta_command(char *zLine, ShellState *p){
 #endif
 
 #ifndef SQLITE_SHELL_FIDDLE
-  if( c=='l' && strncmp(azArg[0], "log", n)==0 ){
+  if( c=='l' && cli_strncmp(azArg[0], "log", n)==0 ){
     failIfSafeMode(p, "cannot run .log in safe mode");
     if( nArg!=2 ){
       raw_printf(stderr, "Usage: .log FILENAME\n");
@@ -9473,7 +9487,7 @@ static int do_meta_command(char *zLine, ShellState *p){
   }else
 #endif
 
-  if( c=='m' && strncmp(azArg[0], "mode", n)==0 ){
+  if( c=='m' && cli_strncmp(azArg[0], "mode", n)==0 ){
     const char *zMode = 0;
     const char *zTabname = 0;
     int i, n2;
@@ -9495,7 +9509,7 @@ static int do_meta_command(char *zLine, ShellState *p){
         /* Apply defaults for qbox pseudo-mods. If that
          * overwrites already-set values, user was informed of this.
          */
-        if( strcmp(z, "qbox")==0 ){
+        if( cli_strcmp(z, "qbox")==0 ){
           ColModeOpts cmo = ColModeOpts_default_qbox;
           zMode = "box";
           cmOpts = cmo;
@@ -9534,58 +9548,58 @@ static int do_meta_command(char *zLine, ShellState *p){
       zMode = modeDescr[p->mode];
     }
     n2 = strlen30(zMode);
-    if( strncmp(zMode,"lines",n2)==0 ){
+    if( cli_strncmp(zMode,"lines",n2)==0 ){
       p->mode = MODE_Line;
       sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Row);
-    }else if( strncmp(zMode,"columns",n2)==0 ){
+    }else if( cli_strncmp(zMode,"columns",n2)==0 ){
       p->mode = MODE_Column;
       if( (p->shellFlgs & SHFLG_HeaderSet)==0 ){
         p->showHeader = 1;
       }
       sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Row);
       p->cmOpts = cmOpts;
-    }else if( strncmp(zMode,"list",n2)==0 ){
+    }else if( cli_strncmp(zMode,"list",n2)==0 ){
       p->mode = MODE_List;
       sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator, SEP_Column);
       sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Row);
-    }else if( strncmp(zMode,"html",n2)==0 ){
+    }else if( cli_strncmp(zMode,"html",n2)==0 ){
       p->mode = MODE_Html;
-    }else if( strncmp(zMode,"tcl",n2)==0 ){
+    }else if( cli_strncmp(zMode,"tcl",n2)==0 ){
       p->mode = MODE_Tcl;
       sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator, SEP_Space);
       sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Row);
-    }else if( strncmp(zMode,"csv",n2)==0 ){
+    }else if( cli_strncmp(zMode,"csv",n2)==0 ){
       p->mode = MODE_Csv;
       sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator, SEP_Comma);
       sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_CrLf);
-    }else if( strncmp(zMode,"tabs",n2)==0 ){
+    }else if( cli_strncmp(zMode,"tabs",n2)==0 ){
       p->mode = MODE_List;
       sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator, SEP_Tab);
-    }else if( strncmp(zMode,"insert",n2)==0 ){
+    }else if( cli_strncmp(zMode,"insert",n2)==0 ){
       p->mode = MODE_Insert;
       set_table_name(p, zTabname ? zTabname : "table");
-    }else if( strncmp(zMode,"quote",n2)==0 ){
+    }else if( cli_strncmp(zMode,"quote",n2)==0 ){
       p->mode = MODE_Quote;
       sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator, SEP_Comma);
       sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Row);
-    }else if( strncmp(zMode,"ascii",n2)==0 ){
+    }else if( cli_strncmp(zMode,"ascii",n2)==0 ){
       p->mode = MODE_Ascii;
       sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator, SEP_Unit);
       sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Record);
-    }else if( strncmp(zMode,"markdown",n2)==0 ){
+    }else if( cli_strncmp(zMode,"markdown",n2)==0 ){
       p->mode = MODE_Markdown;
       p->cmOpts = cmOpts;
-    }else if( strncmp(zMode,"table",n2)==0 ){
+    }else if( cli_strncmp(zMode,"table",n2)==0 ){
       p->mode = MODE_Table;
       p->cmOpts = cmOpts;
-    }else if( strncmp(zMode,"box",n2)==0 ){
+    }else if( cli_strncmp(zMode,"box",n2)==0 ){
       p->mode = MODE_Box;
       p->cmOpts = cmOpts;
-    }else if( strncmp(zMode,"count",n2)==0 ){
+    }else if( cli_strncmp(zMode,"count",n2)==0 ){
       p->mode = MODE_Count;
-    }else if( strncmp(zMode,"off",n2)==0 ){
+    }else if( cli_strncmp(zMode,"off",n2)==0 ){
       p->mode = MODE_Off;
-    }else if( strncmp(zMode,"json",n2)==0 ){
+    }else if( cli_strncmp(zMode,"json",n2)==0 ){
       p->mode = MODE_Json;
     }else{
       raw_printf(stderr, "Error: mode should be one of: "
@@ -9597,11 +9611,11 @@ static int do_meta_command(char *zLine, ShellState *p){
   }else
 
 #ifndef SQLITE_SHELL_FIDDLE
-  if( c=='n' && strcmp(azArg[0], "nonce")==0 ){
+  if( c=='n' && cli_strcmp(azArg[0], "nonce")==0 ){
     if( nArg!=2 ){
       raw_printf(stderr, "Usage: .nonce NONCE\n");
       rc = 1;
-    }else if( p->zNonce==0 || strcmp(azArg[1],p->zNonce)!=0 ){
+    }else if( p->zNonce==0 || cli_strcmp(azArg[1],p->zNonce)!=0 ){
       raw_printf(stderr, "line %d: incorrect nonce: \"%s\"\n",
                  p->lineno, azArg[1]);
       exit(1);
@@ -9613,7 +9627,7 @@ static int do_meta_command(char *zLine, ShellState *p){
   }else
 #endif /* !defined(SQLITE_SHELL_FIDDLE) */
 
-  if( c=='n' && strncmp(azArg[0], "nullvalue", n)==0 ){
+  if( c=='n' && cli_strncmp(azArg[0], "nullvalue", n)==0 ){
     if( nArg==2 ){
       sqlite3_snprintf(sizeof(p->nullValue), p->nullValue,
                        "%.*s", (int)ArraySize(p->nullValue)-1, azArg[1]);
@@ -9623,7 +9637,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     }
   }else
 
-  if( c=='o' && strncmp(azArg[0], "open", n)==0 && n>=2 ){
+  if( c=='o' && cli_strncmp(azArg[0], "open", n)==0 && n>=2 ){
     const char *zFN = 0;     /* Pointer to constant filename */
     char *zNewFilename = 0;  /* Name of the database file to open */
     int iName = 1;           /* Index in azArg[] of the filename */
@@ -9687,7 +9701,7 @@ static int do_meta_command(char *zLine, ShellState *p){
       if( p->bSafeMode
        && p->openMode!=SHELL_OPEN_HEXDB
        && zFN
-       && strcmp(zFN,":memory:")!=0
+       && cli_strcmp(zFN,":memory:")!=0
       ){
         failIfSafeMode(p, "cannot open disk-based database files in safe mode");
       }
@@ -9718,8 +9732,9 @@ static int do_meta_command(char *zLine, ShellState *p){
 
 #ifndef SQLITE_SHELL_FIDDLE
   if( (c=='o'
-        && (strncmp(azArg[0], "output", n)==0||strncmp(azArg[0], "once", n)==0))
-   || (c=='e' && n==5 && strcmp(azArg[0],"excel")==0)
+        && (cli_strncmp(azArg[0], "output", n)==0
+            || cli_strncmp(azArg[0], "once", n)==0))
+   || (c=='e' && n==5 && cli_strcmp(azArg[0],"excel")==0)
   ){
     char *zFile = 0;
     int bTxtMode = 0;
@@ -9733,21 +9748,21 @@ static int do_meta_command(char *zLine, ShellState *p){
     if( c=='e' ){
       eMode = 'x';
       bOnce = 2;
-    }else if( strncmp(azArg[0],"once",n)==0 ){
+    }else if( cli_strncmp(azArg[0],"once",n)==0 ){
       bOnce = 1;
     }
     for(i=1; i<nArg; i++){
       char *z = azArg[i];
       if( z[0]=='-' ){
         if( z[1]=='-' ) z++;
-        if( strcmp(z,"-bom")==0 ){
+        if( cli_strcmp(z,"-bom")==0 ){
           zBOM[0] = 0xef;
           zBOM[1] = 0xbb;
           zBOM[2] = 0xbf;
           zBOM[3] = 0;
-        }else if( c!='e' && strcmp(z,"-x")==0 ){
+        }else if( c!='e' && cli_strcmp(z,"-x")==0 ){
           eMode = 'x';  /* spreadsheet */
-        }else if( c!='e' && strcmp(z,"-e")==0 ){
+        }else if( c!='e' && cli_strcmp(z,"-e")==0 ){
           eMode = 'e';  /* text editor */
         }else{
           utf8_printf(p->out, "ERROR: unknown option: \"%s\".  Usage:\n",
@@ -9820,7 +9835,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     }else{
       p->out = output_file_open(zFile, bTxtMode);
       if( p->out==0 ){
-        if( strcmp(zFile,"off")!=0 ){
+        if( cli_strcmp(zFile,"off")!=0 ){
           utf8_printf(stderr,"Error: cannot write to \"%s\"\n", zFile);
         }
         p->out = stdout;
@@ -9834,14 +9849,14 @@ static int do_meta_command(char *zLine, ShellState *p){
   }else
 #endif /* !defined(SQLITE_SHELL_FIDDLE) */
 
-  if( c=='p' && n>=3 && strncmp(azArg[0], "parameter", n)==0 ){
+  if( c=='p' && n>=3 && cli_strncmp(azArg[0], "parameter", n)==0 ){
     open_db(p,0);
     if( nArg<=1 ) goto parameter_syntax_error;
 
     /* .parameter clear
     ** Clear all bind parameters by dropping the TEMP table that holds them.
     */
-    if( nArg==2 && strcmp(azArg[1],"clear")==0 ){
+    if( nArg==2 && cli_strcmp(azArg[1],"clear")==0 ){
       sqlite3_exec(p->db, "DROP TABLE IF EXISTS temp.sqlite_parameters;",
                    0, 0, 0);
     }else
@@ -9849,7 +9864,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     /* .parameter list
     ** List all bind parameters.
     */
-    if( nArg==2 && strcmp(azArg[1],"list")==0 ){
+    if( nArg==2 && cli_strcmp(azArg[1],"list")==0 ){
       sqlite3_stmt *pStmt = 0;
       int rx;
       int len = 0;
@@ -9878,7 +9893,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     ** Make sure the TEMP table used to hold bind parameters exists.
     ** Create it if necessary.
     */
-    if( nArg==2 && strcmp(azArg[1],"init")==0 ){
+    if( nArg==2 && cli_strcmp(azArg[1],"init")==0 ){
       bind_table_init(p);
     }else
 
@@ -9888,7 +9903,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     ** VALUE can be in either SQL literal notation, or if not it will be
     ** understood to be a text string.
     */
-    if( nArg==4 && strcmp(azArg[1],"set")==0 ){
+    if( nArg==4 && cli_strcmp(azArg[1],"set")==0 ){
       int rx;
       char *zSql;
       sqlite3_stmt *pStmt;
@@ -9926,7 +9941,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     ** Remove the NAME binding from the parameter binding table, if it
     ** exists.
     */
-    if( nArg==3 && strcmp(azArg[1],"unset")==0 ){
+    if( nArg==3 && cli_strcmp(azArg[1],"unset")==0 ){
       char *zSql = sqlite3_mprintf(
           "DELETE FROM temp.sqlite_parameters WHERE key=%Q", azArg[2]);
       shell_check_oom(zSql);
@@ -9938,7 +9953,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     showHelp(p->out, "parameter");
   }else
 
-  if( c=='p' && n>=3 && strncmp(azArg[0], "print", n)==0 ){
+  if( c=='p' && n>=3 && cli_strncmp(azArg[0], "print", n)==0 ){
     int i;
     for(i=1; i<nArg; i++){
       if( i>1 ) raw_printf(p->out, " ");
@@ -9948,7 +9963,7 @@ static int do_meta_command(char *zLine, ShellState *p){
   }else
 
 #ifndef SQLITE_OMIT_PROGRESS_CALLBACK
-  if( c=='p' && n>=3 && strncmp(azArg[0], "progress", n)==0 ){
+  if( c=='p' && n>=3 && cli_strncmp(azArg[0], "progress", n)==0 ){
     int i;
     int nn = 0;
     p->flgProgress = 0;
@@ -9959,19 +9974,19 @@ static int do_meta_command(char *zLine, ShellState *p){
       if( z[0]=='-' ){
         z++;
         if( z[0]=='-' ) z++;
-        if( strcmp(z,"quiet")==0 || strcmp(z,"q")==0 ){
+        if( cli_strcmp(z,"quiet")==0 || cli_strcmp(z,"q")==0 ){
           p->flgProgress |= SHELL_PROGRESS_QUIET;
           continue;
         }
-        if( strcmp(z,"reset")==0 ){
+        if( cli_strcmp(z,"reset")==0 ){
           p->flgProgress |= SHELL_PROGRESS_RESET;
           continue;
         }
-        if( strcmp(z,"once")==0 ){
+        if( cli_strcmp(z,"once")==0 ){
           p->flgProgress |= SHELL_PROGRESS_ONCE;
           continue;
         }
-        if( strcmp(z,"limit")==0 ){
+        if( cli_strcmp(z,"limit")==0 ){
           if( i+1>=nArg ){
             utf8_printf(stderr, "Error: missing argument on --limit\n");
             rc = 1;
@@ -9993,7 +10008,7 @@ static int do_meta_command(char *zLine, ShellState *p){
   }else
 #endif /* SQLITE_OMIT_PROGRESS_CALLBACK */
 
-  if( c=='p' && strncmp(azArg[0], "prompt", n)==0 ){
+  if( c=='p' && cli_strncmp(azArg[0], "prompt", n)==0 ){
     if( nArg >= 2) {
       strncpy(mainPrompt,azArg[1],(int)ArraySize(mainPrompt)-1);
     }
@@ -10003,13 +10018,13 @@ static int do_meta_command(char *zLine, ShellState *p){
   }else
 
 #ifndef SQLITE_SHELL_FIDDLE
-  if( c=='q' && strncmp(azArg[0], "quit", n)==0 ){
+  if( c=='q' && cli_strncmp(azArg[0], "quit", n)==0 ){
     rc = 2;
   }else
 #endif
 
 #ifndef SQLITE_SHELL_FIDDLE
-  if( c=='r' && n>=3 && strncmp(azArg[0], "read", n)==0 ){
+  if( c=='r' && n>=3 && cli_strncmp(azArg[0], "read", n)==0 ){
     FILE *inSaved = p->in;
     int savedLineno = p->lineno;
     failIfSafeMode(p, "cannot run .read in safe mode");
@@ -10046,7 +10061,7 @@ static int do_meta_command(char *zLine, ShellState *p){
 #endif /* !defined(SQLITE_SHELL_FIDDLE) */
 
 #ifndef SQLITE_SHELL_FIDDLE
-  if( c=='r' && n>=3 && strncmp(azArg[0], "restore", n)==0 ){
+  if( c=='r' && n>=3 && cli_strncmp(azArg[0], "restore", n)==0 ){
     const char *zSrcFile;
     const char *zDb;
     sqlite3 *pSrc;
@@ -10099,7 +10114,7 @@ static int do_meta_command(char *zLine, ShellState *p){
   }else
 #endif /* !defined(SQLITE_SHELL_FIDDLE) */
 
-  if( c=='s' && strncmp(azArg[0], "scanstats", n)==0 ){
+  if( c=='s' && cli_strncmp(azArg[0], "scanstats", n)==0 ){
     if( nArg==2 ){
       p->scanstatsOn = (u8)booleanValue(azArg[1]);
 #ifndef SQLITE_ENABLE_STMT_SCANSTATUS
@@ -10111,7 +10126,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     }
   }else
 
-  if( c=='s' && strncmp(azArg[0], "schema", n)==0 ){
+  if( c=='s' && cli_strncmp(azArg[0], "schema", n)==0 ){
     ShellText sSelect;
     ShellState data;
     char *zErrMsg = 0;
@@ -10254,15 +10269,15 @@ static int do_meta_command(char *zLine, ShellState *p){
     }
   }else
 
-  if( (c=='s' && n==11 && strncmp(azArg[0], "selecttrace", n)==0)
-   || (c=='t' && n==9  && strncmp(azArg[0], "treetrace", n)==0)
+  if( (c=='s' && n==11 && cli_strncmp(azArg[0], "selecttrace", n)==0)
+   || (c=='t' && n==9  && cli_strncmp(azArg[0], "treetrace", n)==0)
   ){
     unsigned int x = nArg>=2 ? (unsigned int)integerValue(azArg[1]) : 0xffffffff;
     sqlite3_test_control(SQLITE_TESTCTRL_TRACEFLAGS, 1, &x);
   }else
 
 #if defined(SQLITE_ENABLE_SESSION)
-  if( c=='s' && strncmp(azArg[0],"session",n)==0 && n>=3 ){
+  if( c=='s' && cli_strncmp(azArg[0],"session",n)==0 && n>=3 ){
     struct AuxDb *pAuxDb = p->pAuxDb;
     OpenSession *pSession = &pAuxDb->aSession[0];
     char **azCmd = &azArg[1];
@@ -10273,7 +10288,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     open_db(p, 0);
     if( nArg>=3 ){
       for(iSes=0; iSes<pAuxDb->nSession; iSes++){
-        if( strcmp(pAuxDb->aSession[iSes].zName, azArg[1])==0 ) break;
+        if( cli_strcmp(pAuxDb->aSession[iSes].zName, azArg[1])==0 ) break;
       }
       if( iSes<pAuxDb->nSession ){
         pSession = &pAuxDb->aSession[iSes];
@@ -10289,7 +10304,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     ** Invoke the sqlite3session_attach() interface to attach a particular
     ** table so that it is never filtered.
     */
-    if( strcmp(azCmd[0],"attach")==0 ){
+    if( cli_strcmp(azCmd[0],"attach")==0 ){
       if( nCmd!=2 ) goto session_syntax_error;
       if( pSession->p==0 ){
         session_not_open:
@@ -10307,7 +10322,9 @@ static int do_meta_command(char *zLine, ShellState *p){
     ** .session patchset FILE
     ** Write a changeset or patchset into a file.  The file is overwritten.
     */
-    if( strcmp(azCmd[0],"changeset")==0 || strcmp(azCmd[0],"patchset")==0 ){
+    if( cli_strcmp(azCmd[0],"changeset")==0
+     || cli_strcmp(azCmd[0],"patchset")==0
+    ){
       FILE *out = 0;
       failIfSafeMode(p, "cannot run \".session %s\" in safe mode", azCmd[0]);
       if( nCmd!=2 ) goto session_syntax_error;
@@ -10341,7 +10358,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     /* .session close
     ** Close the identified session
     */
-    if( strcmp(azCmd[0], "close")==0 ){
+    if( cli_strcmp(azCmd[0], "close")==0 ){
       if( nCmd!=1 ) goto session_syntax_error;
       if( pAuxDb->nSession ){
         session_close(pSession);
@@ -10352,7 +10369,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     /* .session enable ?BOOLEAN?
     ** Query or set the enable flag
     */
-    if( strcmp(azCmd[0], "enable")==0 ){
+    if( cli_strcmp(azCmd[0], "enable")==0 ){
       int ii;
       if( nCmd>2 ) goto session_syntax_error;
       ii = nCmd==1 ? -1 : booleanValue(azCmd[1]);
@@ -10366,7 +10383,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     /* .session filter GLOB ....
     ** Set a list of GLOB patterns of table names to be excluded.
     */
-    if( strcmp(azCmd[0], "filter")==0 ){
+    if( cli_strcmp(azCmd[0], "filter")==0 ){
       int ii, nByte;
       if( nCmd<2 ) goto session_syntax_error;
       if( pAuxDb->nSession ){
@@ -10391,7 +10408,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     /* .session indirect ?BOOLEAN?
     ** Query or set the indirect flag
     */
-    if( strcmp(azCmd[0], "indirect")==0 ){
+    if( cli_strcmp(azCmd[0], "indirect")==0 ){
       int ii;
       if( nCmd>2 ) goto session_syntax_error;
       ii = nCmd==1 ? -1 : booleanValue(azCmd[1]);
@@ -10405,7 +10422,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     /* .session isempty
     ** Determine if the session is empty
     */
-    if( strcmp(azCmd[0], "isempty")==0 ){
+    if( cli_strcmp(azCmd[0], "isempty")==0 ){
       int ii;
       if( nCmd!=1 ) goto session_syntax_error;
       if( pAuxDb->nSession ){
@@ -10418,7 +10435,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     /* .session list
     ** List all currently open sessions
     */
-    if( strcmp(azCmd[0],"list")==0 ){
+    if( cli_strcmp(azCmd[0],"list")==0 ){
       for(i=0; i<pAuxDb->nSession; i++){
         utf8_printf(p->out, "%d %s\n", i, pAuxDb->aSession[i].zName);
       }
@@ -10428,13 +10445,13 @@ static int do_meta_command(char *zLine, ShellState *p){
     ** Open a new session called NAME on the attached database DB.
     ** DB is normally "main".
     */
-    if( strcmp(azCmd[0],"open")==0 ){
+    if( cli_strcmp(azCmd[0],"open")==0 ){
       char *zName;
       if( nCmd!=3 ) goto session_syntax_error;
       zName = azCmd[2];
       if( zName[0]==0 ) goto session_syntax_error;
       for(i=0; i<pAuxDb->nSession; i++){
-        if( strcmp(pAuxDb->aSession[i].zName,zName)==0 ){
+        if( cli_strcmp(pAuxDb->aSession[i].zName,zName)==0 ){
           utf8_printf(stderr, "Session \"%s\" already exists\n", zName);
           goto meta_command_exit;
         }
@@ -10465,15 +10482,15 @@ static int do_meta_command(char *zLine, ShellState *p){
 #ifdef SQLITE_DEBUG
   /* Undocumented commands for internal testing.  Subject to change
   ** without notice. */
-  if( c=='s' && n>=10 && strncmp(azArg[0], "selftest-", 9)==0 ){
-    if( strncmp(azArg[0]+9, "boolean", n-9)==0 ){
+  if( c=='s' && n>=10 && cli_strncmp(azArg[0], "selftest-", 9)==0 ){
+    if( cli_strncmp(azArg[0]+9, "boolean", n-9)==0 ){
       int i, v;
       for(i=1; i<nArg; i++){
         v = booleanValue(azArg[i]);
         utf8_printf(p->out, "%s: %d 0x%x\n", azArg[i], v, v);
       }
     }
-    if( strncmp(azArg[0]+9, "integer", n-9)==0 ){
+    if( cli_strncmp(azArg[0]+9, "integer", n-9)==0 ){
       int i; sqlite3_int64 v;
       for(i=1; i<nArg; i++){
         char zBuf[200];
@@ -10485,7 +10502,7 @@ static int do_meta_command(char *zLine, ShellState *p){
   }else
 #endif
 
-  if( c=='s' && n>=4 && strncmp(azArg[0],"selftest",n)==0 ){
+  if( c=='s' && n>=4 && cli_strncmp(azArg[0],"selftest",n)==0 ){
     int bIsInit = 0;         /* True to initialize the SELFTEST table */
     int bVerbose = 0;        /* Verbose output */
     int bSelftestExists;     /* True if SELFTEST already exists */
@@ -10499,10 +10516,10 @@ static int do_meta_command(char *zLine, ShellState *p){
     for(i=1; i<nArg; i++){
       const char *z = azArg[i];
       if( z[0]=='-' && z[1]=='-' ) z++;
-      if( strcmp(z,"-init")==0 ){
+      if( cli_strcmp(z,"-init")==0 ){
         bIsInit = 1;
       }else
-      if( strcmp(z,"-v")==0 ){
+      if( cli_strcmp(z,"-v")==0 ){
         bVerbose++;
       }else
       {
@@ -10555,10 +10572,10 @@ static int do_meta_command(char *zLine, ShellState *p){
         if( bVerbose>0 ){
           printf("%d: %s %s\n", tno, zOp, zSql);
         }
-        if( strcmp(zOp,"memo")==0 ){
+        if( cli_strcmp(zOp,"memo")==0 ){
           utf8_printf(p->out, "%s\n", zSql);
         }else
-        if( strcmp(zOp,"run")==0 ){
+        if( cli_strcmp(zOp,"run")==0 ){
           char *zErrMsg = 0;
           str.n = 0;
           str.z[0] = 0;
@@ -10572,7 +10589,7 @@ static int do_meta_command(char *zLine, ShellState *p){
             rc = 1;
             utf8_printf(p->out, "%d: error-code-%d: %s\n", tno, rc, zErrMsg);
             sqlite3_free(zErrMsg);
-          }else if( strcmp(zAns,str.z)!=0 ){
+          }else if( cli_strcmp(zAns,str.z)!=0 ){
             nErr++;
             rc = 1;
             utf8_printf(p->out, "%d: Expected: [%s]\n", tno, zAns);
@@ -10592,7 +10609,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     utf8_printf(p->out, "%d errors out of %d tests\n", nErr, nTest);
   }else
 
-  if( c=='s' && strncmp(azArg[0], "separator", n)==0 ){
+  if( c=='s' && cli_strncmp(azArg[0], "separator", n)==0 ){
     if( nArg<2 || nArg>3 ){
       raw_printf(stderr, "Usage: .separator COL ?ROW?\n");
       rc = 1;
@@ -10607,7 +10624,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     }
   }else
 
-  if( c=='s' && n>=4 && strncmp(azArg[0],"sha3sum",n)==0 ){
+  if( c=='s' && n>=4 && cli_strncmp(azArg[0],"sha3sum",n)==0 ){
     const char *zLike = 0;   /* Which table to checksum. 0 means everything */
     int i;                   /* Loop counter */
     int bSchema = 0;         /* Also hash the schema */
@@ -10625,15 +10642,15 @@ static int do_meta_command(char *zLine, ShellState *p){
       if( z[0]=='-' ){
         z++;
         if( z[0]=='-' ) z++;
-        if( strcmp(z,"schema")==0 ){
+        if( cli_strcmp(z,"schema")==0 ){
           bSchema = 1;
         }else
-        if( strcmp(z,"sha3-224")==0 || strcmp(z,"sha3-256")==0
-         || strcmp(z,"sha3-384")==0 || strcmp(z,"sha3-512")==0
+        if( cli_strcmp(z,"sha3-224")==0 || cli_strcmp(z,"sha3-256")==0
+         || cli_strcmp(z,"sha3-384")==0 || cli_strcmp(z,"sha3-512")==0
         ){
           iSize = atoi(&z[5]);
         }else
-        if( strcmp(z,"debug")==0 ){
+        if( cli_strcmp(z,"debug")==0 ){
           bDebug = 1;
         }else
         {
@@ -10673,20 +10690,20 @@ static int do_meta_command(char *zLine, ShellState *p){
       const char *zTab = (const char*)sqlite3_column_text(pStmt,0);
       if( zTab==0 ) continue;
       if( zLike && sqlite3_strlike(zLike, zTab, 0)!=0 ) continue;
-      if( strncmp(zTab, "sqlite_",7)!=0 ){
+      if( cli_strncmp(zTab, "sqlite_",7)!=0 ){
         appendText(&sQuery,"SELECT * FROM ", 0);
         appendText(&sQuery,zTab,'"');
         appendText(&sQuery," NOT INDEXED;", 0);
-      }else if( strcmp(zTab, "sqlite_schema")==0 ){
+      }else if( cli_strcmp(zTab, "sqlite_schema")==0 ){
         appendText(&sQuery,"SELECT type,name,tbl_name,sql FROM sqlite_schema"
                            " ORDER BY name;", 0);
-      }else if( strcmp(zTab, "sqlite_sequence")==0 ){
+      }else if( cli_strcmp(zTab, "sqlite_sequence")==0 ){
         appendText(&sQuery,"SELECT name,seq FROM sqlite_sequence"
                            " ORDER BY name;", 0);
-      }else if( strcmp(zTab, "sqlite_stat1")==0 ){
+      }else if( cli_strcmp(zTab, "sqlite_stat1")==0 ){
         appendText(&sQuery,"SELECT tbl,idx,stat FROM sqlite_stat1"
                            " ORDER BY tbl,idx;", 0);
-      }else if( strcmp(zTab, "sqlite_stat4")==0 ){
+      }else if( cli_strcmp(zTab, "sqlite_stat4")==0 ){
         appendText(&sQuery, "SELECT * FROM ", 0);
         appendText(&sQuery, zTab, 0);
         appendText(&sQuery, " ORDER BY tbl, idx, rowid;\n", 0);
@@ -10725,7 +10742,8 @@ static int do_meta_command(char *zLine, ShellState *p){
 
 #if !defined(SQLITE_NOHAVE_SYSTEM) && !defined(SQLITE_SHELL_FIDDLE)
   if( c=='s'
-   && (strncmp(azArg[0], "shell", n)==0 || strncmp(azArg[0],"system",n)==0)
+   && (cli_strncmp(azArg[0], "shell", n)==0
+       || cli_strncmp(azArg[0],"system",n)==0)
   ){
     char *zCmd;
     int i, x;
@@ -10746,7 +10764,7 @@ static int do_meta_command(char *zLine, ShellState *p){
   }else
 #endif /* !defined(SQLITE_NOHAVE_SYSTEM) && !defined(SQLITE_SHELL_FIDDLE) */
 
-  if( c=='s' && strncmp(azArg[0], "show", n)==0 ){
+  if( c=='s' && cli_strncmp(azArg[0], "show", n)==0 ){
     static const char *azBool[] = { "off", "on", "trigger", "full"};
     const char *zOut;
     int i;
@@ -10799,11 +10817,11 @@ static int do_meta_command(char *zLine, ShellState *p){
                 p->pAuxDb->zDbFilename ? p->pAuxDb->zDbFilename : "");
   }else
 
-  if( c=='s' && strncmp(azArg[0], "stats", n)==0 ){
+  if( c=='s' && cli_strncmp(azArg[0], "stats", n)==0 ){
     if( nArg==2 ){
-      if( strcmp(azArg[1],"stmt")==0 ){
+      if( cli_strcmp(azArg[1],"stmt")==0 ){
         p->statsOn = 2;
-      }else if( strcmp(azArg[1],"vmstep")==0 ){
+      }else if( cli_strcmp(azArg[1],"vmstep")==0 ){
         p->statsOn = 3;
       }else{
         p->statsOn = (u8)booleanValue(azArg[1]);
@@ -10816,9 +10834,9 @@ static int do_meta_command(char *zLine, ShellState *p){
     }
   }else
 
-  if( (c=='t' && n>1 && strncmp(azArg[0], "tables", n)==0)
-   || (c=='i' && (strncmp(azArg[0], "indices", n)==0
-                 || strncmp(azArg[0], "indexes", n)==0) )
+  if( (c=='t' && n>1 && cli_strncmp(azArg[0], "tables", n)==0)
+   || (c=='i' && (cli_strncmp(azArg[0], "indices", n)==0
+                 || cli_strncmp(azArg[0], "indexes", n)==0) )
   ){
     sqlite3_stmt *pStmt;
     char **azResult;
@@ -10926,7 +10944,7 @@ static int do_meta_command(char *zLine, ShellState *p){
 
 #ifndef SQLITE_SHELL_FIDDLE
   /* Begin redirecting output to the file "testcase-out.txt" */
-  if( c=='t' && strcmp(azArg[0],"testcase")==0 ){
+  if( c=='t' && cli_strcmp(azArg[0],"testcase")==0 ){
     output_reset(p);
     p->out = output_file_open("testcase-out.txt", 0);
     if( p->out==0 ){
@@ -10941,7 +10959,7 @@ static int do_meta_command(char *zLine, ShellState *p){
 #endif /* !defined(SQLITE_SHELL_FIDDLE) */
 
 #ifndef SQLITE_UNTESTABLE
-  if( c=='t' && n>=8 && strncmp(azArg[0], "testctrl", n)==0 ){
+  if( c=='t' && n>=8 && cli_strncmp(azArg[0], "testctrl", n)==0 ){
     static const struct {
        const char *zCtrlName;   /* Name of a test-control option */
        int ctrlCode;            /* Integer code for that option */
@@ -10988,7 +11006,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     }
 
     /* --help lists all test-controls */
-    if( strcmp(zCmd,"help")==0 ){
+    if( cli_strcmp(zCmd,"help")==0 ){
       utf8_printf(p->out, "Available test-controls:\n");
       for(i=0; i<ArraySize(aCtrl); i++){
         utf8_printf(p->out, "  .testctrl %s %s\n",
@@ -11002,7 +11020,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     ** of the option name, or a numerical value. */
     n2 = strlen30(zCmd);
     for(i=0; i<ArraySize(aCtrl); i++){
-      if( strncmp(zCmd, aCtrl[i].zCtrlName, n2)==0 ){
+      if( cli_strncmp(zCmd, aCtrl[i].zCtrlName, n2)==0 ){
         if( testctrl<0 ){
           testctrl = aCtrl[i].ctrlCode;
           iCtrl = i;
@@ -11058,7 +11076,7 @@ static int do_meta_command(char *zLine, ShellState *p){
           if( nArg==3 || nArg==4 ){
             int ii = (int)integerValue(azArg[2]);
             sqlite3 *db;
-            if( ii==0 && strcmp(azArg[2],"random")==0 ){
+            if( ii==0 && cli_strcmp(azArg[2],"random")==0 ){
               sqlite3_randomness(sizeof(ii),&ii);
               printf("-- random seed: %d\n", ii);
             }
@@ -11174,12 +11192,12 @@ static int do_meta_command(char *zLine, ShellState *p){
   }else
 #endif /* !defined(SQLITE_UNTESTABLE) */
 
-  if( c=='t' && n>4 && strncmp(azArg[0], "timeout", n)==0 ){
+  if( c=='t' && n>4 && cli_strncmp(azArg[0], "timeout", n)==0 ){
     open_db(p, 0);
     sqlite3_busy_timeout(p->db, nArg>=2 ? (int)integerValue(azArg[1]) : 0);
   }else
 
-  if( c=='t' && n>=5 && strncmp(azArg[0], "timer", n)==0 ){
+  if( c=='t' && n>=5 && cli_strncmp(azArg[0], "timer", n)==0 ){
     if( nArg==2 ){
       enableTimer = booleanValue(azArg[1]);
       if( enableTimer && !HAS_TIMER ){
@@ -11193,7 +11211,7 @@ static int do_meta_command(char *zLine, ShellState *p){
   }else
 
 #ifndef SQLITE_OMIT_TRACE
-  if( c=='t' && strncmp(azArg[0], "trace", n)==0 ){
+  if( c=='t' && cli_strncmp(azArg[0], "trace", n)==0 ){
     int mType = 0;
     int jj;
     open_db(p, 0);
@@ -11243,7 +11261,7 @@ static int do_meta_command(char *zLine, ShellState *p){
 #endif /* !defined(SQLITE_OMIT_TRACE) */
 
 #if defined(SQLITE_DEBUG) && !defined(SQLITE_OMIT_VIRTUALTABLE)
-  if( c=='u' && strncmp(azArg[0], "unmodule", n)==0 ){
+  if( c=='u' && cli_strncmp(azArg[0], "unmodule", n)==0 ){
     int ii;
     int lenOpt;
     char *zOpt;
@@ -11256,7 +11274,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     zOpt = azArg[1];
     if( zOpt[0]=='-' && zOpt[1]=='-' && zOpt[2]!=0 ) zOpt++;
     lenOpt = (int)strlen(zOpt);
-    if( lenOpt>=3 && strncmp(zOpt, "-allexcept",lenOpt)==0 ){
+    if( lenOpt>=3 && cli_strncmp(zOpt, "-allexcept",lenOpt)==0 ){
       assert( azArg[nArg]==0 );
       sqlite3_drop_modules(p->db, nArg>2 ? (const char**)(azArg+2) : 0);
     }else{
@@ -11268,14 +11286,14 @@ static int do_meta_command(char *zLine, ShellState *p){
 #endif
 
 #if SQLITE_USER_AUTHENTICATION
-  if( c=='u' && strncmp(azArg[0], "user", n)==0 ){
+  if( c=='u' && cli_strncmp(azArg[0], "user", n)==0 ){
     if( nArg<2 ){
       raw_printf(stderr, "Usage: .user SUBCOMMAND ...\n");
       rc = 1;
       goto meta_command_exit;
     }
     open_db(p, 0);
-    if( strcmp(azArg[1],"login")==0 ){
+    if( cli_strcmp(azArg[1],"login")==0 ){
       if( nArg!=4 ){
         raw_printf(stderr, "Usage: .user login USER PASSWORD\n");
         rc = 1;
@@ -11287,7 +11305,7 @@ static int do_meta_command(char *zLine, ShellState *p){
         utf8_printf(stderr, "Authentication failed for user %s\n", azArg[2]);
         rc = 1;
       }
-    }else if( strcmp(azArg[1],"add")==0 ){
+    }else if( cli_strcmp(azArg[1],"add")==0 ){
       if( nArg!=5 ){
         raw_printf(stderr, "Usage: .user add USER PASSWORD ISADMIN\n");
         rc = 1;
@@ -11299,7 +11317,7 @@ static int do_meta_command(char *zLine, ShellState *p){
         raw_printf(stderr, "User-Add failed: %d\n", rc);
         rc = 1;
       }
-    }else if( strcmp(azArg[1],"edit")==0 ){
+    }else if( cli_strcmp(azArg[1],"edit")==0 ){
       if( nArg!=5 ){
         raw_printf(stderr, "Usage: .user edit USER PASSWORD ISADMIN\n");
         rc = 1;
@@ -11311,7 +11329,7 @@ static int do_meta_command(char *zLine, ShellState *p){
         raw_printf(stderr, "User-Edit failed: %d\n", rc);
         rc = 1;
       }
-    }else if( strcmp(azArg[1],"delete")==0 ){
+    }else if( cli_strcmp(azArg[1],"delete")==0 ){
       if( nArg!=3 ){
         raw_printf(stderr, "Usage: .user delete USER\n");
         rc = 1;
@@ -11330,7 +11348,7 @@ static int do_meta_command(char *zLine, ShellState *p){
   }else
 #endif /* SQLITE_USER_AUTHENTICATION */
 
-  if( c=='v' && strncmp(azArg[0], "version", n)==0 ){
+  if( c=='v' && cli_strncmp(azArg[0], "version", n)==0 ){
     utf8_printf(p->out, "SQLite %s %s\n" /*extra-version-info*/,
         sqlite3_libversion(), sqlite3_sourceid());
 #if SQLITE_HAVE_ZLIB
@@ -11349,7 +11367,7 @@ static int do_meta_command(char *zLine, ShellState *p){
 #endif
   }else
 
-  if( c=='v' && strncmp(azArg[0], "vfsinfo", n)==0 ){
+  if( c=='v' && cli_strncmp(azArg[0], "vfsinfo", n)==0 ){
     const char *zDbName = nArg==2 ? azArg[1] : "main";
     sqlite3_vfs *pVfs = 0;
     if( p->db ){
@@ -11363,7 +11381,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     }
   }else
 
-  if( c=='v' && strncmp(azArg[0], "vfslist", n)==0 ){
+  if( c=='v' && cli_strncmp(azArg[0], "vfslist", n)==0 ){
     sqlite3_vfs *pVfs;
     sqlite3_vfs *pCurrent = 0;
     if( p->db ){
@@ -11381,7 +11399,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     }
   }else
 
-  if( c=='v' && strncmp(azArg[0], "vfsname", n)==0 ){
+  if( c=='v' && cli_strncmp(azArg[0], "vfsname", n)==0 ){
     const char *zDbName = nArg==2 ? azArg[1] : "main";
     char *zVfsName = 0;
     if( p->db ){
@@ -11393,12 +11411,12 @@ static int do_meta_command(char *zLine, ShellState *p){
     }
   }else
 
-  if( c=='w' && strncmp(azArg[0], "wheretrace", n)==0 ){
+  if( c=='w' && cli_strncmp(azArg[0], "wheretrace", n)==0 ){
     unsigned int x = nArg>=2 ? (unsigned int)integerValue(azArg[1]) : 0xffffffff;
     sqlite3_test_control(SQLITE_TESTCTRL_TRACEFLAGS, 3, &x);
   }else
 
-  if( c=='w' && strncmp(azArg[0], "width", n)==0 ){
+  if( c=='w' && cli_strncmp(azArg[0], "width", n)==0 ){
     int j;
     assert( nArg<=ArraySize(azArg) );
     p->nWidth = nArg-1;
@@ -11576,10 +11594,10 @@ static int runOneSqlLine(ShellState *p, char *zSql, FILE *in, int startline){
     if( zErrMsg==0 ){
       zErrorType = "Error";
       zErrorTail = sqlite3_errmsg(p->db);
-    }else if( strncmp(zErrMsg, "in prepare, ",12)==0 ){
+    }else if( cli_strncmp(zErrMsg, "in prepare, ",12)==0 ){
       zErrorType = "Parse error";
       zErrorTail = &zErrMsg[12];
-    }else if( strncmp(zErrMsg, "stepping, ", 10)==0 ){
+    }else if( cli_strncmp(zErrMsg, "stepping, ", 10)==0 ){
       zErrorType = "Runtime error";
       zErrorTail = &zErrMsg[10];
     }else{
@@ -12089,7 +12107,7 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
 #endif
 
 #if USE_SYSTEM_SQLITE+0!=1
-  if( strncmp(sqlite3_sourceid(),SQLITE_SOURCE_ID,60)!=0 ){
+  if( cli_strncmp(sqlite3_sourceid(),SQLITE_SOURCE_ID,60)!=0 ){
     utf8_printf(stderr, "SQLite header and source version mismatch\n%s\n%s\n",
             sqlite3_sourceid(), SQLITE_SOURCE_ID);
     exit(1);
@@ -12170,21 +12188,21 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
       }
     }
     if( z[1]=='-' ) z++;
-    if( strcmp(z,"-separator")==0
-     || strcmp(z,"-nullvalue")==0
-     || strcmp(z,"-newline")==0
-     || strcmp(z,"-cmd")==0
+    if( cli_strcmp(z,"-separator")==0
+     || cli_strcmp(z,"-nullvalue")==0
+     || cli_strcmp(z,"-newline")==0
+     || cli_strcmp(z,"-cmd")==0
     ){
       (void)cmdline_option_value(argc, argv, ++i);
-    }else if( strcmp(z,"-init")==0 ){
+    }else if( cli_strcmp(z,"-init")==0 ){
       zInitFile = cmdline_option_value(argc, argv, ++i);
-    }else if( strcmp(z,"-batch")==0 ){
+    }else if( cli_strcmp(z,"-batch")==0 ){
       /* Need to check for batch mode here to so we can avoid printing
       ** informational messages (like from process_sqliterc) before
       ** we do the actual processing of arguments later in a second pass.
       */
       stdin_is_interactive = 0;
-    }else if( strcmp(z,"-heap")==0 ){
+    }else if( cli_strcmp(z,"-heap")==0 ){
 #if defined(SQLITE_ENABLE_MEMSYS3) || defined(SQLITE_ENABLE_MEMSYS5)
       const char *zSize;
       sqlite3_int64 szHeap;
@@ -12196,7 +12214,7 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
 #else
       (void)cmdline_option_value(argc, argv, ++i);
 #endif
-    }else if( strcmp(z,"-pagecache")==0 ){
+    }else if( cli_strcmp(z,"-pagecache")==0 ){
       sqlite3_int64 n, sz;
       sz = integerValue(cmdline_option_value(argc,argv,++i));
       if( sz>70000 ) sz = 70000;
@@ -12208,7 +12226,7 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
       sqlite3_config(SQLITE_CONFIG_PAGECACHE,
                     (n>0 && sz>0) ? malloc(n*sz) : 0, sz, n);
       data.shellFlgs |= SHFLG_Pagecache;
-    }else if( strcmp(z,"-lookaside")==0 ){
+    }else if( cli_strcmp(z,"-lookaside")==0 ){
       int n, sz;
       sz = (int)integerValue(cmdline_option_value(argc,argv,++i));
       if( sz<0 ) sz = 0;
@@ -12216,7 +12234,7 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
       if( n<0 ) n = 0;
       sqlite3_config(SQLITE_CONFIG_LOOKASIDE, sz, n);
       if( sz*n==0 ) data.shellFlgs &= ~SHFLG_Lookaside;
-    }else if( strcmp(z,"-threadsafe")==0 ){
+    }else if( cli_strcmp(z,"-threadsafe")==0 ){
       int n;
       n = (int)integerValue(cmdline_option_value(argc,argv,++i));
       switch( n ){
@@ -12225,7 +12243,7 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
          default: sqlite3_config(SQLITE_CONFIG_SERIALIZED);    break;
       }
 #ifdef SQLITE_ENABLE_VFSTRACE
-    }else if( strcmp(z,"-vfstrace")==0 ){
+    }else if( cli_strcmp(z,"-vfstrace")==0 ){
       extern int vfstrace_register(
          const char *zTraceName,
          const char *zOldVfsName,
@@ -12236,50 +12254,50 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
       vfstrace_register("trace",0,(int(*)(const char*,void*))fputs,stderr,1);
 #endif
 #ifdef SQLITE_ENABLE_MULTIPLEX
-    }else if( strcmp(z,"-multiplex")==0 ){
+    }else if( cli_strcmp(z,"-multiplex")==0 ){
       extern int sqlite3_multiple_initialize(const char*,int);
       sqlite3_multiplex_initialize(0, 1);
 #endif
-    }else if( strcmp(z,"-mmap")==0 ){
+    }else if( cli_strcmp(z,"-mmap")==0 ){
       sqlite3_int64 sz = integerValue(cmdline_option_value(argc,argv,++i));
       sqlite3_config(SQLITE_CONFIG_MMAP_SIZE, sz, sz);
 #ifdef SQLITE_ENABLE_SORTER_REFERENCES
-    }else if( strcmp(z,"-sorterref")==0 ){
+    }else if( cli_strcmp(z,"-sorterref")==0 ){
       sqlite3_int64 sz = integerValue(cmdline_option_value(argc,argv,++i));
       sqlite3_config(SQLITE_CONFIG_SORTERREF_SIZE, (int)sz);
 #endif
-    }else if( strcmp(z,"-vfs")==0 ){
+    }else if( cli_strcmp(z,"-vfs")==0 ){
       zVfs = cmdline_option_value(argc, argv, ++i);
 #ifdef SQLITE_HAVE_ZLIB
-    }else if( strcmp(z,"-zip")==0 ){
+    }else if( cli_strcmp(z,"-zip")==0 ){
       data.openMode = SHELL_OPEN_ZIPFILE;
 #endif
-    }else if( strcmp(z,"-append")==0 ){
+    }else if( cli_strcmp(z,"-append")==0 ){
       data.openMode = SHELL_OPEN_APPENDVFS;
 #ifndef SQLITE_OMIT_DESERIALIZE
-    }else if( strcmp(z,"-deserialize")==0 ){
+    }else if( cli_strcmp(z,"-deserialize")==0 ){
       data.openMode = SHELL_OPEN_DESERIALIZE;
-    }else if( strcmp(z,"-maxsize")==0 && i+1<argc ){
+    }else if( cli_strcmp(z,"-maxsize")==0 && i+1<argc ){
       data.szMax = integerValue(argv[++i]);
 #endif
-    }else if( strcmp(z,"-readonly")==0 ){
+    }else if( cli_strcmp(z,"-readonly")==0 ){
       data.openMode = SHELL_OPEN_READONLY;
-    }else if( strcmp(z,"-nofollow")==0 ){
+    }else if( cli_strcmp(z,"-nofollow")==0 ){
       data.openFlags = SQLITE_OPEN_NOFOLLOW;
 #if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_HAVE_ZLIB)
-    }else if( strncmp(z, "-A",2)==0 ){
+    }else if( cli_strncmp(z, "-A",2)==0 ){
       /* All remaining command-line arguments are passed to the ".archive"
       ** command, so ignore them */
       break;
 #endif
-    }else if( strcmp(z, "-memtrace")==0 ){
+    }else if( cli_strcmp(z, "-memtrace")==0 ){
       sqlite3MemTraceActivate(stderr);
-    }else if( strcmp(z,"-bail")==0 ){
+    }else if( cli_strcmp(z,"-bail")==0 ){
       bail_on_error = 1;
-    }else if( strcmp(z,"-nonce")==0 ){
+    }else if( cli_strcmp(z,"-nonce")==0 ){
       free(data.zNonce);
       data.zNonce = strdup(argv[++i]);
-    }else if( strcmp(z,"-safe")==0 ){
+    }else if( cli_strcmp(z,"-safe")==0 ){
       /* no-op - catch this on the second pass */
     }
   }
@@ -12349,127 +12367,127 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
     char *z = argv[i];
     if( z[0]!='-' ) continue;
     if( z[1]=='-' ){ z++; }
-    if( strcmp(z,"-init")==0 ){
+    if( cli_strcmp(z,"-init")==0 ){
       i++;
-    }else if( strcmp(z,"-html")==0 ){
+    }else if( cli_strcmp(z,"-html")==0 ){
       data.mode = MODE_Html;
-    }else if( strcmp(z,"-list")==0 ){
+    }else if( cli_strcmp(z,"-list")==0 ){
       data.mode = MODE_List;
-    }else if( strcmp(z,"-quote")==0 ){
+    }else if( cli_strcmp(z,"-quote")==0 ){
       data.mode = MODE_Quote;
       sqlite3_snprintf(sizeof(data.colSeparator), data.colSeparator, SEP_Comma);
       sqlite3_snprintf(sizeof(data.rowSeparator), data.rowSeparator, SEP_Row);
-    }else if( strcmp(z,"-line")==0 ){
+    }else if( cli_strcmp(z,"-line")==0 ){
       data.mode = MODE_Line;
-    }else if( strcmp(z,"-column")==0 ){
+    }else if( cli_strcmp(z,"-column")==0 ){
       data.mode = MODE_Column;
-    }else if( strcmp(z,"-json")==0 ){
+    }else if( cli_strcmp(z,"-json")==0 ){
       data.mode = MODE_Json;
-    }else if( strcmp(z,"-markdown")==0 ){
+    }else if( cli_strcmp(z,"-markdown")==0 ){
       data.mode = MODE_Markdown;
-    }else if( strcmp(z,"-table")==0 ){
+    }else if( cli_strcmp(z,"-table")==0 ){
       data.mode = MODE_Table;
-    }else if( strcmp(z,"-box")==0 ){
+    }else if( cli_strcmp(z,"-box")==0 ){
       data.mode = MODE_Box;
-    }else if( strcmp(z,"-csv")==0 ){
+    }else if( cli_strcmp(z,"-csv")==0 ){
       data.mode = MODE_Csv;
       memcpy(data.colSeparator,",",2);
 #ifdef SQLITE_HAVE_ZLIB
-    }else if( strcmp(z,"-zip")==0 ){
+    }else if( cli_strcmp(z,"-zip")==0 ){
       data.openMode = SHELL_OPEN_ZIPFILE;
 #endif
-    }else if( strcmp(z,"-append")==0 ){
+    }else if( cli_strcmp(z,"-append")==0 ){
       data.openMode = SHELL_OPEN_APPENDVFS;
 #ifndef SQLITE_OMIT_DESERIALIZE
-    }else if( strcmp(z,"-deserialize")==0 ){
+    }else if( cli_strcmp(z,"-deserialize")==0 ){
       data.openMode = SHELL_OPEN_DESERIALIZE;
-    }else if( strcmp(z,"-maxsize")==0 && i+1<argc ){
+    }else if( cli_strcmp(z,"-maxsize")==0 && i+1<argc ){
       data.szMax = integerValue(argv[++i]);
 #endif
-    }else if( strcmp(z,"-readonly")==0 ){
+    }else if( cli_strcmp(z,"-readonly")==0 ){
       data.openMode = SHELL_OPEN_READONLY;
-    }else if( strcmp(z,"-nofollow")==0 ){
+    }else if( cli_strcmp(z,"-nofollow")==0 ){
       data.openFlags |= SQLITE_OPEN_NOFOLLOW;
-    }else if( strcmp(z,"-ascii")==0 ){
+    }else if( cli_strcmp(z,"-ascii")==0 ){
       data.mode = MODE_Ascii;
       sqlite3_snprintf(sizeof(data.colSeparator), data.colSeparator, SEP_Unit);
       sqlite3_snprintf(sizeof(data.rowSeparator), data.rowSeparator, SEP_Record);
-    }else if( strcmp(z,"-tabs")==0 ){
+    }else if( cli_strcmp(z,"-tabs")==0 ){
       data.mode = MODE_List;
       sqlite3_snprintf(sizeof(data.colSeparator), data.colSeparator, SEP_Tab);
       sqlite3_snprintf(sizeof(data.rowSeparator), data.rowSeparator, SEP_Row);
-    }else if( strcmp(z,"-separator")==0 ){
+    }else if( cli_strcmp(z,"-separator")==0 ){
       sqlite3_snprintf(sizeof(data.colSeparator), data.colSeparator,
                        "%s",cmdline_option_value(argc,argv,++i));
-    }else if( strcmp(z,"-newline")==0 ){
+    }else if( cli_strcmp(z,"-newline")==0 ){
       sqlite3_snprintf(sizeof(data.rowSeparator), data.rowSeparator,
                        "%s",cmdline_option_value(argc,argv,++i));
-    }else if( strcmp(z,"-nullvalue")==0 ){
+    }else if( cli_strcmp(z,"-nullvalue")==0 ){
       sqlite3_snprintf(sizeof(data.nullValue), data.nullValue,
                        "%s",cmdline_option_value(argc,argv,++i));
-    }else if( strcmp(z,"-header")==0 ){
+    }else if( cli_strcmp(z,"-header")==0 ){
       data.showHeader = 1;
       ShellSetFlag(&data, SHFLG_HeaderSet);
-     }else if( strcmp(z,"-noheader")==0 ){
+     }else if( cli_strcmp(z,"-noheader")==0 ){
       data.showHeader = 0;
       ShellSetFlag(&data, SHFLG_HeaderSet);
-    }else if( strcmp(z,"-echo")==0 ){
+    }else if( cli_strcmp(z,"-echo")==0 ){
       ShellSetFlag(&data, SHFLG_Echo);
-    }else if( strcmp(z,"-eqp")==0 ){
+    }else if( cli_strcmp(z,"-eqp")==0 ){
       data.autoEQP = AUTOEQP_on;
-    }else if( strcmp(z,"-eqpfull")==0 ){
+    }else if( cli_strcmp(z,"-eqpfull")==0 ){
       data.autoEQP = AUTOEQP_full;
-    }else if( strcmp(z,"-stats")==0 ){
+    }else if( cli_strcmp(z,"-stats")==0 ){
       data.statsOn = 1;
-    }else if( strcmp(z,"-scanstats")==0 ){
+    }else if( cli_strcmp(z,"-scanstats")==0 ){
       data.scanstatsOn = 1;
-    }else if( strcmp(z,"-backslash")==0 ){
+    }else if( cli_strcmp(z,"-backslash")==0 ){
       /* Undocumented command-line option: -backslash
       ** Causes C-style backslash escapes to be evaluated in SQL statements
       ** prior to sending the SQL into SQLite.  Useful for injecting
       ** crazy bytes in the middle of SQL statements for testing and debugging.
       */
       ShellSetFlag(&data, SHFLG_Backslash);
-    }else if( strcmp(z,"-bail")==0 ){
+    }else if( cli_strcmp(z,"-bail")==0 ){
       /* No-op.  The bail_on_error flag should already be set. */
-    }else if( strcmp(z,"-version")==0 ){
+    }else if( cli_strcmp(z,"-version")==0 ){
       printf("%s %s\n", sqlite3_libversion(), sqlite3_sourceid());
       return 0;
-    }else if( strcmp(z,"-interactive")==0 ){
+    }else if( cli_strcmp(z,"-interactive")==0 ){
       stdin_is_interactive = 1;
-    }else if( strcmp(z,"-batch")==0 ){
+    }else if( cli_strcmp(z,"-batch")==0 ){
       stdin_is_interactive = 0;
-    }else if( strcmp(z,"-heap")==0 ){
+    }else if( cli_strcmp(z,"-heap")==0 ){
       i++;
-    }else if( strcmp(z,"-pagecache")==0 ){
+    }else if( cli_strcmp(z,"-pagecache")==0 ){
       i+=2;
-    }else if( strcmp(z,"-lookaside")==0 ){
+    }else if( cli_strcmp(z,"-lookaside")==0 ){
       i+=2;
-    }else if( strcmp(z,"-threadsafe")==0 ){
+    }else if( cli_strcmp(z,"-threadsafe")==0 ){
       i+=2;
-    }else if( strcmp(z,"-nonce")==0 ){
+    }else if( cli_strcmp(z,"-nonce")==0 ){
       i += 2;
-    }else if( strcmp(z,"-mmap")==0 ){
+    }else if( cli_strcmp(z,"-mmap")==0 ){
       i++;
-    }else if( strcmp(z,"-memtrace")==0 ){
+    }else if( cli_strcmp(z,"-memtrace")==0 ){
       i++;
 #ifdef SQLITE_ENABLE_SORTER_REFERENCES
-    }else if( strcmp(z,"-sorterref")==0 ){
+    }else if( cli_strcmp(z,"-sorterref")==0 ){
       i++;
 #endif
-    }else if( strcmp(z,"-vfs")==0 ){
+    }else if( cli_strcmp(z,"-vfs")==0 ){
       i++;
 #ifdef SQLITE_ENABLE_VFSTRACE
-    }else if( strcmp(z,"-vfstrace")==0 ){
+    }else if( cli_strcmp(z,"-vfstrace")==0 ){
       i++;
 #endif
 #ifdef SQLITE_ENABLE_MULTIPLEX
-    }else if( strcmp(z,"-multiplex")==0 ){
+    }else if( cli_strcmp(z,"-multiplex")==0 ){
       i++;
 #endif
-    }else if( strcmp(z,"-help")==0 ){
+    }else if( cli_strcmp(z,"-help")==0 ){
       usage(1);
-    }else if( strcmp(z,"-cmd")==0 ){
+    }else if( cli_strcmp(z,"-cmd")==0 ){
       /* Run commands that follow -cmd first and separately from commands
       ** that simply appear on the command-line.  This seems goofy.  It would
       ** be better if all commands ran in the order that they appear.  But
@@ -12491,7 +12509,7 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
         }
       }
 #if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_HAVE_ZLIB)
-    }else if( strncmp(z, "-A", 2)==0 ){
+    }else if( cli_strncmp(z, "-A", 2)==0 ){
       if( nCmd>0 ){
         utf8_printf(stderr, "Error: cannot mix regular SQL or dot-commands"
                             " with \"%s\"\n", z);
@@ -12507,7 +12525,7 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
       readStdin = 0;
       break;
 #endif
-    }else if( strcmp(z,"-safe")==0 ){
+    }else if( cli_strcmp(z,"-safe")==0 ){
       data.bSafeMode = data.bSafeModePersist = 1;
     }else{
       utf8_printf(stderr,"%s: Error: unknown option: %s\n", Argv0, z);

From d89a66ec36491c1d98a1bbeb04dac4e74d66f754 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Thu, 20 Oct 2022 04:00:05 +0000
Subject: [PATCH 317/428] Minor internal JS cleanups.

FossilOrigin-Name: 818ef0b5c909e733b643455278f7cc45533178f1cc6617058c00ed64fa44896a
---
 ext/wasm/api/extern-post-js.js       | 19 ++++++++++++++++---
 ext/wasm/api/sqlite3-api-prologue.js | 10 +++++-----
 ext/wasm/api/sqlite3-worker1.js      |  1 +
 manifest                             | 18 +++++++++---------
 manifest.uuid                        |  2 +-
 5 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/ext/wasm/api/extern-post-js.js b/ext/wasm/api/extern-post-js.js
index 5f5f72d4b3..768696508e 100644
--- a/ext/wasm/api/extern-post-js.js
+++ b/ext/wasm/api/extern-post-js.js
@@ -23,19 +23,24 @@
 
      https://github.com/emscripten-core/emscripten/issues/18071
 
-     The only current workaround is to temporarily stash this state
+     The only(?) current workaround is to temporarily stash this state
      into the global scope and delete it when sqlite3InitModule()
      is called.
   */
   const initModuleState = self.sqlite3InitModuleState = Object.assign(Object.create(null),{
     moduleScript: self?.document?.currentScript,
-    isWorker: (!self.document && self.window !== self),
+    isWorker: ('undefined' !== typeof WorkerGlobalScope),
     location: self.location,
     urlParams: new URL(self.location.href).searchParams
   });
   if(initModuleState.urlParams.has('sqlite3.dir')){
     initModuleState.sqlite3Dir = initModuleState.urlParams.get('sqlite3.dir') +'/';
-  };
+  }else if(initModuleState.moduleScript){
+    const li = initModuleState.moduleScript.src.split('/');
+    li.pop();
+    initModuleState.sqlite3Dir = li.join('/') + '/';
+  }
+  //console.warn("initModuleState =",initModuleState);
 
   self.sqlite3InitModule = (...args)=>{
     //console.warn("Using replaced sqlite3InitModule()",self.location);
@@ -79,4 +84,12 @@
                    document?.currentScript?.src);
     }
   }
+  /* Replace the various module exports performed by the Emscripten
+     glue... */
+  if (typeof exports === 'object' && typeof module === 'object')
+    module.exports = sqlite3InitModule;
+  else if (typeof exports === 'object')
+    exports["sqlite3InitModule"] = sqlite3InitModule;
+  /* AMD modules get injected in a way we cannot override,
+     so we can't handle those here. */
 })();
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 3980e0ad42..f59d86506b 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -522,7 +522,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
       isInt32, isSQLableTypedArray, isTypedArray, 
       typedArrayToString,
       isMainWindow: ()=>{
-        return self.window===self && self.document;
+        return 'undefined' === typeof WorkerGlobalScope
       }
     },
     
@@ -904,8 +904,8 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
   */
   wasm.pstack = Object.assign(Object.create(null),{
     /**
-       Sets the current ppstack position to the given pointer.
-       Results are undefined if the passed-in value did not come from
+       Sets the current pstack position to the given pointer. Results
+       are undefined if the passed-in value did not come from
        this.pointer.
     */
     restore: wasm.exports.sqlite3_wasm_pstack_restore,
@@ -927,7 +927,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
                                "bytes from the pstack.");
     },
     /**
-       Allocates n chunks, each sz bytes, as a single memory block and
+       alloc()'s n chunks, each sz bytes, as a single memory block and
        returns the addresses as an array of n element, each holding
        the address of one chunk.
 
@@ -965,7 +965,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
        will corrupt or read neighboring memory.
 
        However, when all pointers involved point to "small" data, it
-       is safe to pass a falsy value to save to memory.
+       is safe to pass a falsy value to save a tiny bit of memory.
     */
     allocPtr: (n=1,safePtrSize=true)=>{
       return 1===n
diff --git a/ext/wasm/api/sqlite3-worker1.js b/ext/wasm/api/sqlite3-worker1.js
index 26c88402c1..4cff68b08b 100644
--- a/ext/wasm/api/sqlite3-worker1.js
+++ b/ext/wasm/api/sqlite3-worker1.js
@@ -40,6 +40,7 @@
   if(urlParams.has('sqlite3.dir')){
     theJs = urlParams.get('sqlite3.dir') + '/' + theJs;
   }
+  //console.warn("worker1 theJs =",theJs);
   importScripts(theJs);
   sqlite3InitModule().then((sqlite3)=>{
     sqlite3.capi.sqlite3_wasmfs_opfs_dir();
diff --git a/manifest b/manifest
index a40ab24a57..72f30663c2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sthe\sCLI,\snever\suse\sstrcmp()\sor\sstrncmp()\sdirectly.\s\sInstead\suse\nwrapper\sfunctions\scli_strcmp()\sand\scli_strncmp()\sthat\swork\scorrectly\seven\nif\sthe\sinput\sis\sa\sNULL\spointer.\n[forum:/forumpost/142b868da7560d0b|Forum\spost\s142b868da7560d0b].
-D 2022-10-19T18:04:42.228
+C Minor\sinternal\sJS\scleanups.
+D 2022-10-20T04:00:05.192
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -478,7 +478,7 @@ F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 89983a8d122c35a90c65ec667844b95a78bcd04f3198a99c1e0c8368c1a0b03a
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
 F ext/wasm/api/README.md 1350088aee90e959ad9a94fab1bb6bcb5e99d4d27f976db389050f54f2640c78
-F ext/wasm/api/extern-post-js.js 4bba34d8301f6058abd8ee24d2778b7360c5c3679217b38f5670e97a5ba7a3ec
+F ext/wasm/api/extern-post-js.js efbed835f290b3741259acc5faf68714a60d38e6834e6cfe172d5354c87566d2
 F ext/wasm/api/extern-pre-js.js cc61c09c7a24a07dbecb4c352453c3985170cec12b4e7e7e7a4d11d43c5c8f41
 F ext/wasm/api/post-js-footer.js cd0a8ec768501d9bd45d325ab0442037fb0e33d1f3b4f08902f15c34720ee4a1
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
@@ -487,14 +487,14 @@ F ext/wasm/api/sqlite3-api-cleanup.js 4d07a7524dc9b7b050acfde57163e839243ad2383b
 F ext/wasm/api/sqlite3-api-glue.js 05eb701460bb72edbe3bf923bd51262551614612c37802fc597eabb4c6b83232
 F ext/wasm/api/sqlite3-api-oo1.js 9a5f0c00d476c504f16dcd456e1743dbc2826ca3d10645dfa62663a39e3ed0d8
 F ext/wasm/api/sqlite3-api-opfs.js 22d60ba956e873b65e2e0591e239178082bd53a6d563c3c58db7dc03e562e8f7
-F ext/wasm/api/sqlite3-api-prologue.js bdcd1f636e5ef0622f99b753aff0d26cc250bcd3a17923771e335ec73059b073
+F ext/wasm/api/sqlite3-api-prologue.js 73fcbeb788653e305eaae9dbef07825a2f6360812872c0c82185bf5d7447d375
 F ext/wasm/api/sqlite3-api-worker1.js df948de3968abd2361e1ff7a4410a5c5313275e9738a07e6686e8803a4c6070b
 F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
 F ext/wasm/api/sqlite3-opfs-async-proxy.js 206ce6bbc3c30ad51a37d9c25e3a2712e70b586e0f9a2cf8cb0b9619017c2671
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 84d410a2b9defdac85e6a421736307ff3a3eed3c1b0ae3b7b140edbc6ad81a8f
 F ext/wasm/api/sqlite3-worker1-promiser.js 0c7a9826dbf82a5ed4e4f7bf7816e825a52aff253afbf3350431f5773faf0e4b
-F ext/wasm/api/sqlite3-worker1.js ed87487c0813241909dc57813368a02a5ade37bc95e858c8ca256dedda030651
+F ext/wasm/api/sqlite3-worker1.js dbe54b69c1520a2d25eae148cd2750ded2dd7f219ea4ee46f83e0a851dca5974
 F ext/wasm/batch-runner.html 4deeed44fe41496dc6898d9fb17938ea3291f40f4bfb977e29d0cef96fbbe4c8
 F ext/wasm/batch-runner.js 5bae81684728b6be157d1f92b39824153f0fd019345b39f2ab8930f7ee2a57d8
 F ext/wasm/common/SqliteTestUtil.js 647bf014bd30bdd870a7e9001e251d12fc1c9ec9ce176a1004b838a4b33c5c05
@@ -2036,8 +2036,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 e3648a07f5607dbd4d6ad5b6e5a62a4a1d0b173d3f22aa36c74b768281fc86d8
-R dc5d57d2ab062846ea9bb105dfaf948e
-U drh
-Z 77fd38c4ef78083cfcf69fef5a64b6ae
+P 7450a561f8577c3ee41f84074c6ef39e29e56876cab4fd763e6489c66f603223
+R c184bc0a2cb850b281d68afdc582ec08
+U stephan
+Z 1e0d42d411be9deb413df9188b4a61c9
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 2d0cb0c719..6daf2a2f4c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7450a561f8577c3ee41f84074c6ef39e29e56876cab4fd763e6489c66f603223
\ No newline at end of file
+818ef0b5c909e733b643455278f7cc45533178f1cc6617058c00ed64fa44896a
\ No newline at end of file

From 842c5ee84951da8524221e0546d41e4f3a1a18f0 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Thu, 20 Oct 2022 05:14:37 +0000
Subject: [PATCH 318/428] Rework sqlite3_wasm_vfs_unlink(), add
 sqlite3_wasm_db_vfs(), update some docs.

FossilOrigin-Name: cdd46858f0e63bc7bfce8e339b3db9efdec43b6443ee76563a847f53d0176831
---
 ext/wasm/api/sqlite3-api-glue.js     |  4 +++-
 ext/wasm/api/sqlite3-api-prologue.js | 17 +++++--------
 ext/wasm/api/sqlite3-api-worker1.js  |  8 +++----
 ext/wasm/api/sqlite3-wasm.c          | 36 ++++++++++++++++++----------
 ext/wasm/fiddle/fiddle-worker.js     |  6 ++---
 ext/wasm/speedtest1-worker.js        | 11 ++++-----
 manifest                             | 24 +++++++++----------
 manifest.uuid                        |  2 +-
 src/shell.c.in                       |  5 ++--
 9 files changed, 58 insertions(+), 55 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index bfacef3b3c..5768e44cb2 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -72,10 +72,12 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     ('sqlite3_stmt*', aPtr)
     ('sqlite3_context*', aPtr)
     ('sqlite3_value*', aPtr)
+    ('sqlite3_vfs*', aPtr)
     ('void*', aPtr);
     wasm.xWrap.resultAdapter('sqlite3*', aPtr)
-    ('sqlite3_stmt*', aPtr)
     ('sqlite3_context*', aPtr)
+    ('sqlite3_stmt*', aPtr)
+    ('sqlite3_vfs*', aPtr)
     ('void*', aPtr);
 
     /**
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index f59d86506b..d02d6b0540 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -861,13 +861,12 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
   /**
      Functions which are intended solely for API-internal use by the
      WASM components, not client code. These get installed into
-     wasm.
-
-     TODO: get rid of sqlite3_wasm_vfs_unlink(). It is ill-conceived
-     and only rarely actually useful.
+     capi.wasm.
   */
   wasm.bindingSignatures.wasm = [
-    ["sqlite3_wasm_vfs_unlink", "int", "string"]
+    ["sqlite3_wasm_db_reset", "int", "sqlite3*"],
+    ["sqlite3_wasm_db_vfs", "sqlite3_vfs*", "sqlite3*","string"],
+    ["sqlite3_wasm_vfs_unlink", "int", "sqlite3_vfs*","string"]
   ];
 
 
@@ -919,7 +918,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
        This method always adjusts the given value to be a multiple
        of 8 bytes because failing to do so can lead to incorrect
        results when reading and writing 64-bit values from/to the WASM
-       heap.
+       heap. Similarly, the returned address is always 8-byte aligned.
     */
     alloc: (n)=>{
       return wasm.exports.sqlite3_wasm_pstack_alloc(n)
@@ -1074,12 +1073,8 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
      Returns true if sqlite3.capi.sqlite3_wasmfs_opfs_dir() is a
      non-empty string and the given name starts with (that string +
      '/'), else returns false.
-
-     Potential (but arguable) TODO: return true if the name is one of
-     (":localStorage:", "local", ":sessionStorage:", "session") and
-     kvvfs is available.
   */
-  capi.sqlite3_web_filename_is_persistent = function(name){
+  capi.sqlite3_wasmfs_filename_is_persistent = function(name){
     const p = capi.sqlite3_wasmfs_opfs_dir();
     return (p && name) ? name.startsWith(p+'/') : false;
   };
diff --git a/ext/wasm/api/sqlite3-api-worker1.js b/ext/wasm/api/sqlite3-api-worker1.js
index 55faab2829..6c0900a506 100644
--- a/ext/wasm/api/sqlite3-api-worker1.js
+++ b/ext/wasm/api/sqlite3-api-worker1.js
@@ -365,13 +365,11 @@ sqlite3.initWorker1API = function(){
       if(db){
         delete this.dbs[getDbId(db)];
         const filename = db.getFilename();
+        const pVfs = sqlite3.capi.wasm.sqlite3_wasm_db_vfs(db.pointer, 0);
         db.close();
         if(db===this.defaultDb) this.defaultDb = undefined;
-        if(alsoUnlink && filename){
-          /* This isn't necessarily correct: the db might be using a
-             VFS other than the default. How do we best resolve this
-             without having to special-case the opfs VFSes? */
-          sqlite3.capi.wasm.sqlite3_wasm_vfs_unlink(filename);
+        if(alsoUnlink && filename && pVfs){
+          sqlite3.capi.wasm.sqlite3_wasm_vfs_unlink(pVfs, filename);
         }
       }
     },
diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index cda4e7ae2f..1decf0593f 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -809,28 +809,38 @@ const char * sqlite3_wasm_enum_json(void){
 ** This function is NOT part of the sqlite3 public API. It is strictly
 ** for use by the sqlite project's own JS/WASM bindings.
 **
-** Do not use this function, even for internal use: it was
-** ill-conceived and will be removed once the JS code which still
-** calls it has been weeded out.
-**
-** This function invokes the xDelete method of the default VFS,
-** passing on the given filename. If zName is NULL, no default VFS is
-** found, or it has no xDelete method, SQLITE_MISUSE is returned, else
-** the result of the xDelete() call is returned.
+** This function invokes the xDelete method of the given VFS (or the
+** default VFS if pVfs is NULL), passing on the given filename. If
+** zName is NULL, no default VFS is found, or it has no xDelete
+** method, SQLITE_MISUSE is returned, else the result of the xDelete()
+** call is returned.
 */
 SQLITE_WASM_KEEP
-int sqlite3_wasm_vfs_unlink(const char * zName){
+int sqlite3_wasm_vfs_unlink(sqlite3_vfs *pVfs, const char * zName){
   int rc = SQLITE_MISUSE /* ??? */;
-  sqlite3_vfs * const pVfs = sqlite3_vfs_find(0);
-#if defined(__EMSCRIPTEN__)
-  emscripten_console_warn("sqlite3_wasm_vfs_unlink() will be removed.");
-#endif
+  if( 0==pVfs && 0!=zName ) pVfs = sqlite3_vfs_find(0);
   if( zName && pVfs && pVfs->xDelete ){
     rc = pVfs->xDelete(pVfs, zName, 1);
   }
   return rc;
 }
 
+/*
+** This function is NOT part of the sqlite3 public API. It is strictly
+** for use by the sqlite project's own JS/WASM bindings.
+**
+** Returns a pointer to the given DB's VFS for the given DB name,
+** defaulting to "main" if zDbName is 0. Returns 0 if no db with the
+** given name is open.
+*/
+SQLITE_WASM_KEEP
+sqlite3_vfs * sqlite3_wasm_db_vfs(sqlite3 *pDb, const char *zDbName){
+  sqlite3_vfs * pVfs = 0;
+  sqlite3_file_control(pDb, zDbName ? zDbName : "main",
+                       SQLITE_FCNTL_VFS_POINTER, &pVfs);
+  return pVfs;
+}
+
 /*
 ** This function is NOT part of the sqlite3 public API. It is strictly
 ** for use by the sqlite project's own JS/WASM bindings.
diff --git a/ext/wasm/fiddle/fiddle-worker.js b/ext/wasm/fiddle/fiddle-worker.js
index f78a4d3be1..581121826d 100644
--- a/ext/wasm/fiddle/fiddle-worker.js
+++ b/ext/wasm/fiddle/fiddle-worker.js
@@ -102,7 +102,7 @@
   const toss = (...args)=>{
     throw new Error(args.join(' '));
   };
-  const fixmeOPFS = "(FIXME: won't work with vanilla OPFS.)";
+  const fixmeOPFS = "(FIXME: won't work with OPFS-over-sqlite3_vfs.)";
   let sqlite3 /* gets assigned when the wasm module is loaded */;
 
   self.onerror = function(/*message, source, lineno, colno, error*/) {
@@ -370,9 +370,9 @@
   */
   sqlite3InitModule(fiddleModule).then((_sqlite3)=>{
     sqlite3 = _sqlite3;
+    const dbVfs = sqlite3.capi.wasm.xWrap('fiddle_db_vfs', "*", ['string']);
     fiddleModule.fsUnlink = (fn)=>{
-      stderr("unlink:",fixmeOPFS);
-      return sqlite3.capi.wasm.sqlite3_wasm_vfs_unlink(fn);
+      return sqlite3.capi.wasm.sqlite3_wasm_vfs_unlink(dbVfs(0), fn);
     };
     wMsg('fiddle-ready');
   })/*then()*/;
diff --git a/ext/wasm/speedtest1-worker.js b/ext/wasm/speedtest1-worker.js
index 81a40e2b78..e3e4ef7f34 100644
--- a/ext/wasm/speedtest1-worker.js
+++ b/ext/wasm/speedtest1-worker.js
@@ -51,7 +51,7 @@
   const runSpeedtest = function(cliFlagsArray){
     const scope = App.wasm.scopedAllocPush();
     const dbFile = App.pDir+"/speedtest1.sqlite3";
-    App.unlink(dbFile);
+    App.vfsUnlink(0, dbFile);
     try{
       const argv = [
         "speedtest1.wasm", ...cliFlagsArray, dbFile
@@ -64,7 +64,7 @@
       mPost('error',e.message);
     }finally{
       App.wasm.scopedAllocPop(scope);
-      App.unlink(dbFile);
+      App.vfsUnlink(0, dbFile);
       mPost('run-end', App.logBuffer.join('\n'));
       App.logBuffer.length = 0;
     }
@@ -87,10 +87,9 @@
   };
   self.sqlite3InitModule(EmscriptenModule).then((sqlite3)=>{
     const S = sqlite3;
-    const vfsUnlink = S.capi.wasm.xWrap("sqlite3_wasm_vfs_unlink", "int", ["string"]);
-    App.unlink = function(fname){
-      vfsUnlink(fname);
-      if(S.opfs) S.opfs.deleteEntry(fname);
+    App.vfsUnlink = function(pDb, fname){
+      const pVfs = S.capi.wasm.sqlite3_wasm_db_vfs(pDb, fname||0);
+      if(pVfs) S.capi.wasm.sqlite3_wasm_vfs_unlink(pVfs, fname||0);
     };
     App.pDir = wasmfsDir(S.wasm);
     App.wasm = S.capi.wasm;
diff --git a/manifest b/manifest
index 72f30663c2..59505b1c9d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\sinternal\sJS\scleanups.
-D 2022-10-20T04:00:05.192
+C Rework\ssqlite3_wasm_vfs_unlink(),\sadd\ssqlite3_wasm_db_vfs(),\supdate\ssome\sdocs.
+D 2022-10-20T05:14:37.931
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -484,15 +484,15 @@ F ext/wasm/api/post-js-footer.js cd0a8ec768501d9bd45d325ab0442037fb0e33d1f3b4f08
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
 F ext/wasm/api/pre-js.js 151e0616614a49f3db19ed544fa13b38c87c108959fbcd4029ea8399a562d94f
 F ext/wasm/api/sqlite3-api-cleanup.js 4d07a7524dc9b7b050acfde57163e839243ad2383bd7ee0de0178b1b3e988588
-F ext/wasm/api/sqlite3-api-glue.js 05eb701460bb72edbe3bf923bd51262551614612c37802fc597eabb4c6b83232
+F ext/wasm/api/sqlite3-api-glue.js 2f5a337181e541cf3d74ceafb600ebb730a1241a5572710a21133b6dd5b2b2e2
 F ext/wasm/api/sqlite3-api-oo1.js 9a5f0c00d476c504f16dcd456e1743dbc2826ca3d10645dfa62663a39e3ed0d8
 F ext/wasm/api/sqlite3-api-opfs.js 22d60ba956e873b65e2e0591e239178082bd53a6d563c3c58db7dc03e562e8f7
-F ext/wasm/api/sqlite3-api-prologue.js 73fcbeb788653e305eaae9dbef07825a2f6360812872c0c82185bf5d7447d375
-F ext/wasm/api/sqlite3-api-worker1.js df948de3968abd2361e1ff7a4410a5c5313275e9738a07e6686e8803a4c6070b
+F ext/wasm/api/sqlite3-api-prologue.js 7eef0383646c851e3f6a78e21b51e9c078c82829c9d3d2ded9aa0215d71de36c
+F ext/wasm/api/sqlite3-api-worker1.js c8133bb5848c082c6f0eb69722086dd876c389a3bc77cd404f23791a5c2a3300
 F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
 F ext/wasm/api/sqlite3-opfs-async-proxy.js 206ce6bbc3c30ad51a37d9c25e3a2712e70b586e0f9a2cf8cb0b9619017c2671
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c 84d410a2b9defdac85e6a421736307ff3a3eed3c1b0ae3b7b140edbc6ad81a8f
+F ext/wasm/api/sqlite3-wasm.c e1fcda97775dd149b4a2e0a4f16a22cede96daa5a91795ba214bdb3c2e680f4a
 F ext/wasm/api/sqlite3-worker1-promiser.js 0c7a9826dbf82a5ed4e4f7bf7816e825a52aff253afbf3350431f5773faf0e4b
 F ext/wasm/api/sqlite3-worker1.js dbe54b69c1520a2d25eae148cd2750ded2dd7f219ea4ee46f83e0a851dca5974
 F ext/wasm/batch-runner.html 4deeed44fe41496dc6898d9fb17938ea3291f40f4bfb977e29d0cef96fbbe4c8
@@ -513,7 +513,7 @@ F ext/wasm/demo-worker1.js 8ba51d94c4601fa5c313d9e59b63b238f5305b5d5739ad21f4782
 F ext/wasm/dist.make b3b156061ff6a35ce59715632c9446cb58e0fc497021a93c778fed051a04fde1
 F ext/wasm/fiddle.make acdb1a402864f9b05a4c89805c5e91d88f5080652d8861f0865655b172243847
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
-F ext/wasm/fiddle/fiddle-worker.js 531859a471924a0ea48afa218e6877f0c164ca324d51e15843ed6ecc1c65c7ee
+F ext/wasm/fiddle/fiddle-worker.js def4762721ff36e2fd1b5cb35725fc9f56933eb4fbf3dcdaab6eee164baa442e
 F ext/wasm/fiddle/fiddle.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
 F ext/wasm/fiddle/fiddle.js 974b995119ac443685d7d94d3b3c58c6a36540e9eb3fed7069d5653284071715
 F ext/wasm/index-dist.html cb0da16cba0f21cda2c25724c5869102d48eb0af04446acd3cd0ca031f80ed19
@@ -524,7 +524,7 @@ F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e10
 F ext/wasm/scratchpad-wasmfs-main.js 1aa32c1035cf1440a226a28fefcbb5762fbbcb020ccbe5895f8736d701695c63
 F ext/wasm/speedtest1-wasmfs.html bc28eb29b69a73864b8d7aae428448f8b7e1de81d8bfb9bba99541322054dbd0
 F ext/wasm/speedtest1-worker.html 7b0cceab6a68b2883738e19f61d21620fe1244ba36c1b2e38d0efde57ecce86d
-F ext/wasm/speedtest1-worker.js 3fce67c7d00c9fc42591835a2014520997630e51189f98ca47f706b55cdce8bc
+F ext/wasm/speedtest1-worker.js b49358781aca651319eca3720857f19d0eae0868834992f8f6d666c1e976dff8
 F ext/wasm/speedtest1.html 00102689678b3c09ae6f5e4b3782e95f448e943a3491246e7be9ee349049bcaf
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
@@ -621,7 +621,7 @@ F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 3f7238ebb3252f4768a8fb46ad95b62700d27baddcab8a21548129f4f9305d52
-F src/shell.c.in 520c8d289f149f3fcadf4d7263874a422c646496199a40d8901ad698d98dfb18
+F src/shell.c.in 6a9e15cb9fc3cd13d3647d4d9714c0d4d4a65e7f49228c2aafca910ed08d5774
 F src/sqlite.h.in d9c8a6243fc0a1c270d69db33758e34b810af3462f9bc5b4af113b347e07c69d
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 5336beea1868d99d2f62e628dbea55e97267dbff8193291ab175e960c5df9141
@@ -2036,8 +2036,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 7450a561f8577c3ee41f84074c6ef39e29e56876cab4fd763e6489c66f603223
-R c184bc0a2cb850b281d68afdc582ec08
+P 818ef0b5c909e733b643455278f7cc45533178f1cc6617058c00ed64fa44896a
+R 22a24d1afe390b6788cce5394d5651d5
 U stephan
-Z 1e0d42d411be9deb413df9188b4a61c9
+Z 9c3f3340fe7a38ca23b0d884852c3c53
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 6daf2a2f4c..51e0e2bb94 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-818ef0b5c909e733b643455278f7cc45533178f1cc6617058c00ed64fa44896a
\ No newline at end of file
+cdd46858f0e63bc7bfce8e339b3db9efdec43b6443ee76563a847f53d0176831
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index a50c2ab62a..c70bcccd0a 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -12757,9 +12757,8 @@ int fiddle_export_db( int (*xCallback)(unsigned const char *zOut, int n) ){
 /*
 ** Trivial exportable function for emscripten. It processes zSql as if
 ** it were input to the sqlite3 shell and redirects all output to the
-** wasm binding. If fiddle_main() has not been called by the time this
-** is called, this function calls it with a conservative set of
-** flags.
+** wasm binding. fiddle_main() must have been called before this
+** is called, or results are undefined.
 */
 void fiddle_exec(const char * zSql){
   if(zSql && *zSql){

From 9b6a28330b74642e532a814c1aabdcecd4ac026e Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Thu, 20 Oct 2022 10:46:17 +0000
Subject: [PATCH 319/428] Fix minor problems in test1.c test code.

FossilOrigin-Name: 6e545e2b846795fc67f8a90c04de284861a8a429ac686a7476b41c8ed7aabf75
---
 manifest      | 14 +++++++-------
 manifest.uuid |  2 +-
 src/test1.c   |  6 +++++-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index 59505b1c9d..5f8b957193 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Rework\ssqlite3_wasm_vfs_unlink(),\sadd\ssqlite3_wasm_db_vfs(),\supdate\ssome\sdocs.
-D 2022-10-20T05:14:37.931
+C Fix\sminor\sproblems\sin\stest1.c\stest\scode.
+D 2022-10-20T10:46:17.479
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -630,7 +630,7 @@ F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a3
 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
 F src/tclsqlite.c 4e64ba300a5a26e0f1170e09032429faeb65e45e8f3d1a7833e8edb69fc2979e
-F src/test1.c 1356984e97bff07e4a8cc3863e892f05b3348678a74783bb6f350b76316736f1
+F src/test1.c 790c8cd24d1ac39b8cf4e2f618ce16ecc028accfcde60660f7bd983e0f4c7d28
 F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
 F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
 F src/test4.c 4533b76419e7feb41b40582554663ed3cd77aaa54e135cf76b3205098cd6e664
@@ -2036,8 +2036,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 818ef0b5c909e733b643455278f7cc45533178f1cc6617058c00ed64fa44896a
-R 22a24d1afe390b6788cce5394d5651d5
-U stephan
-Z 9c3f3340fe7a38ca23b0d884852c3c53
+P cdd46858f0e63bc7bfce8e339b3db9efdec43b6443ee76563a847f53d0176831
+R ce083a526f8539552e7d3cfc7a645ff7
+U dan
+Z 0e03056726a19a84c80763f2bed74dfa
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 51e0e2bb94..43f2e70804 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cdd46858f0e63bc7bfce8e339b3db9efdec43b6443ee76563a847f53d0176831
\ No newline at end of file
+6e545e2b846795fc67f8a90c04de284861a8a429ac686a7476b41c8ed7aabf75
\ No newline at end of file
diff --git a/src/test1.c b/src/test1.c
index 6ccd4512f5..994e5d262a 100644
--- a/src/test1.c
+++ b/src/test1.c
@@ -1852,7 +1852,8 @@ static int SQLITE_TCLAPI test_create_function_v2(
     {"utf16le", SQLITE_UTF16LE },
     {"utf16be", SQLITE_UTF16BE },
     {"any",     SQLITE_ANY },
-    {"0", 0 }
+    {"0", 0 },
+    {0, 0 }
   };
 
   if( objc<5 || (objc%2)==0 ){
@@ -7273,6 +7274,7 @@ static int SQLITE_TCLAPI test_test_control(
     { "SQLITE_TESTCTRL_SORTER_MMAP",        SQLITE_TESTCTRL_SORTER_MMAP     }, 
     { "SQLITE_TESTCTRL_IMPOSTER",           SQLITE_TESTCTRL_IMPOSTER        },
     { "SQLITE_TESTCTRL_INTERNAL_FUNCTIONS", SQLITE_TESTCTRL_INTERNAL_FUNCTIONS},
+    { 0, 0 }
   };
   int iVerb;
   int iFlag;
@@ -7658,6 +7660,8 @@ static int SQLITE_TCLAPI optimization_control(
     { "skip-scan",           SQLITE_SkipScan       },
     { "push-down",           SQLITE_PushDown       },
     { "balanced-merge",      SQLITE_BalancedMerge  },
+    { "propagate-const",     SQLITE_PropagateConst },
+    { 0, 0 }
   };
 
   if( objc!=4 ){

From 63b3a64ca6d813baec8ab64c23123eb854460c1c Mon Sep 17 00:00:00 2001
From: drh <>
Date: Thu, 20 Oct 2022 13:36:32 +0000
Subject: [PATCH 320/428] The generalized indexed expression optimization of
 [2435112867fbd7b6] makes the prior [a47efb7c8520a011] enhancement from 2017
 obsolete.  This check-in removes the older optimization.

FossilOrigin-Name: 56442c9bdd7844454c79acf83323380ea3509cb2e0b9a3d538a6b51726ae6d07
---
 manifest        |  26 ++++----
 manifest.uuid   |   2 +-
 src/expr.c      |  40 +++++-------
 src/sqliteInt.h |   2 +-
 src/vtab.c      |   2 +-
 src/where.c     |  17 +-----
 src/whereInt.h  |  17 +-----
 src/wherecode.c | 158 ------------------------------------------------
 src/whereexpr.c |  14 ++---
 9 files changed, 40 insertions(+), 238 deletions(-)

diff --git a/manifest b/manifest
index 5f8b957193..bb5360312f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sminor\sproblems\sin\stest1.c\stest\scode.
-D 2022-10-20T10:46:17.479
+C The\sgeneralized\sindexed\sexpression\soptimization\sof\s[2435112867fbd7b6]\smakes\nthe\sprior\s[a47efb7c8520a011]\senhancement\sfrom\s2017\sobsolete.\s\sThis\scheck-in\nremoves\sthe\solder\soptimization.
+D 2022-10-20T13:36:32.870
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -570,7 +570,7 @@ F src/date.c 94ce83b4cd848a387680a5f920c9018c16655db778c4d36525af0a0f34679ac5
 F src/dbpage.c 5808e91bc27fa3981b028000f8fadfdc10ce9e59a34ce7dc4e035a69be3906ec
 F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
 F src/delete.c 86573edae75e3d3e9a8b590d87db8e47222103029df4f3e11fa56044459b514e
-F src/expr.c 3ac1d9e87c018f804d10ab9ffa8bf55efef79c376e7ca90d21ac4ef67bfa8f25
+F src/expr.c 847f87d9df3ede2b2b0a8db088af0b9c1923b21009f8ea1b9b7b28cb0a383170
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 722f20779f5342a787922deded3628d8c74b5249cab04098cf17ee2f2aaff002
 F src/func.c fe2a795ad647ce42054873ac91c43beb7b5d204892903a67f6e7e314379b9d4a
@@ -625,7 +625,7 @@ F src/shell.c.in 6a9e15cb9fc3cd13d3647d4d9714c0d4d4a65e7f49228c2aafca910ed08d577
 F src/sqlite.h.in d9c8a6243fc0a1c270d69db33758e34b810af3462f9bc5b4af113b347e07c69d
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 5336beea1868d99d2f62e628dbea55e97267dbff8193291ab175e960c5df9141
-F src/sqliteInt.h 872ab50cc285de11f7fdc0ce1f0481018f14905e4e0b75da43d8cba5a03b8d8d
+F src/sqliteInt.h f4f3ae8be17f3ef272d2e4a439df504706944b8fbd32b6fe76eefd1240d15a3a
 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -702,15 +702,15 @@ F src/vdbemem.c 6cfed43758d57b6e3b99d9cdedfeccd86e45a07e427b22d8487cbdbebb6c522a
 F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
 F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
 F src/vdbevtab.c f99b275366c5fc5e2d99f734729880994ab9500bdafde7fae3b02d562b9d323c
-F src/vtab.c bb53f9e2eaeecca07158643dd3d5039cf13b525fe2d267e113b39a36f374556c
+F src/vtab.c b2f993aa954078985bc40317bb2140fe0880a08a7440f3a428b60fce74636808
 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d
 F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
-F src/where.c 5dcd88d080ad302da4278f55acce12fd1c1f91eff2bcbfa2c0806d33fa230a5f
-F src/whereInt.h 89a0ae1af68264c925f9729c247ae01457b3d2400b8f0626345e2a15bb30d7b8
-F src/wherecode.c 8ec5a413f12af06638dcca36d0954be2151eea6f293d3c67397cef6a90d6adf1
-F src/whereexpr.c bf8c155212c886621d71c951053660de6fcc4ee907b17aa02da0a96a39aa9405
+F src/where.c 4c5f6a6f3c7a2fe110380b52edd27628074ae0b66c7f62e2fba47897098828aa
+F src/whereInt.h e5f5cf1bc32b7d01a6337027478ef6ed90c8c403de4b977198345c8238f0e1b0
+F src/wherecode.c 13b6373af69d484d9b05b9a732d393ce3b7b320cc93275c6528127678650f8cb
+F src/whereexpr.c a1bd9d8faddc946d19ae8b6b3468874794bf54acd13fe46e1680fb428e8d3ea7
 F src/window.c 928e215840e2f2d9a2746e018c9643ef42c66c4ab6630ef0df7fa388fa145e86
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
@@ -2036,8 +2036,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 cdd46858f0e63bc7bfce8e339b3db9efdec43b6443ee76563a847f53d0176831
-R ce083a526f8539552e7d3cfc7a645ff7
-U dan
-Z 0e03056726a19a84c80763f2bed74dfa
+P 6e545e2b846795fc67f8a90c04de284861a8a429ac686a7476b41c8ed7aabf75
+R 228ae945140472bb5e1b236e96f4ecd2
+U drh
+Z dcc82e93e2bb9bb5c1a3735a5f91159f
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 43f2e70804..7650f52c30 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6e545e2b846795fc67f8a90c04de284861a8a429ac686a7476b41c8ed7aabf75
\ No newline at end of file
+56442c9bdd7844454c79acf83323380ea3509cb2e0b9a3d538a6b51726ae6d07
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index 1a743ee5ce..7a4e59f28d 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -55,9 +55,8 @@ char sqlite3ExprAffinity(const Expr *pExpr){
   if( op==TK_REGISTER ) op = pExpr->op2;
   if( op==TK_COLUMN || op==TK_AGG_COLUMN ){
     assert( ExprUseYTab(pExpr) );
-    if( pExpr->y.pTab ){
-      return sqlite3TableColumnAffinity(pExpr->y.pTab, pExpr->iColumn);
-    }
+    assert( pExpr->y.pTab!=0 );
+    return sqlite3TableColumnAffinity(pExpr->y.pTab, pExpr->iColumn);
   }
   if( op==TK_SELECT ){
     assert( ExprUseXSelect(pExpr) );
@@ -175,17 +174,14 @@ CollSeq *sqlite3ExprCollSeq(Parse *pParse, const Expr *pExpr){
     int op = p->op;
     if( op==TK_REGISTER ) op = p->op2;
     if( op==TK_AGG_COLUMN || op==TK_COLUMN || op==TK_TRIGGER ){
+      int j;
       assert( ExprUseYTab(p) );
-      if( p->y.pTab!=0 ){
-        /* op==TK_REGISTER && p->y.pTab!=0 happens when pExpr was originally
-        ** a TK_COLUMN but was previously evaluated and cached in a register */
-        int j = p->iColumn;
-        if( j>=0 ){
-          const char *zColl = sqlite3ColumnColl(&p->y.pTab->aCol[j]);
-          pColl = sqlite3FindCollSeq(db, ENC(db), zColl, 0);
-        }
-        break;
+      assert( p->y.pTab!=0 );
+      if( (j = p->iColumn)>=0 ){
+        const char *zColl = sqlite3ColumnColl(&p->y.pTab->aCol[j]);
+        pColl = sqlite3FindCollSeq(db, ENC(db), zColl, 0);
       }
+      break;
     }
     if( op==TK_CAST || op==TK_UPLUS ){
       p = p->pLeft;
@@ -3790,10 +3786,7 @@ void sqlite3ExprCodeGetColumnOfTable(
 ){
   Column *pCol;
   assert( v!=0 );
-  if( pTab==0 ){
-    sqlite3VdbeAddOp3(v, OP_Column, iTabCur, iCol, regOut);
-    return;
-  }
+  assert( pTab!=0 );
   if( iCol<0 || iCol==pTab->iPKey ){
     sqlite3VdbeAddOp2(v, OP_Rowid, iTabCur, regOut);
     VdbeComment((v, "%s.rowid", pTab->zName));
@@ -4168,11 +4161,8 @@ expr_code_doover:
         int aff;
         iReg = sqlite3ExprCodeTarget(pParse, pExpr->pLeft,target);
         assert( ExprUseYTab(pExpr) );
-        if( pExpr->y.pTab ){
-          aff = sqlite3TableColumnAffinity(pExpr->y.pTab, pExpr->iColumn);
-        }else{
-          aff = pExpr->affExpr;
-        }
+        assert( pExpr->y.pTab!=0 );
+        aff = sqlite3TableColumnAffinity(pExpr->y.pTab, pExpr->iColumn);
         if( aff>SQLITE_AFF_BLOB ){
           static const char zAff[] = "B\000C\000D\000E";
           assert( SQLITE_AFF_BLOB=='A' );
@@ -4234,12 +4224,10 @@ expr_code_doover:
         }
       }
       assert( ExprUseYTab(pExpr) );
+      assert( pExpr->y.pTab!=0 );
       iReg = sqlite3ExprCodeGetColumn(pParse, pExpr->y.pTab,
                                pExpr->iColumn, iTab, target,
                                pExpr->op2);
-      if( pExpr->y.pTab==0 && pExpr->affExpr==SQLITE_AFF_REAL ){
-        sqlite3VdbeAddOp1(v, OP_RealAffinity, iReg);
-      }
       return iReg;
     }
     case TK_INTEGER: {
@@ -5930,10 +5918,10 @@ static int impliesNotNullRow(Walker *pWalker, Expr *pExpr){
       assert( pLeft->op!=TK_COLUMN || ExprUseYTab(pLeft) );
       assert( pRight->op!=TK_COLUMN || ExprUseYTab(pRight) );
       if( (pLeft->op==TK_COLUMN
-           && pLeft->y.pTab!=0
+           && ALWAYS(pLeft->y.pTab!=0)
            && IsVirtual(pLeft->y.pTab))
        || (pRight->op==TK_COLUMN
-           && pRight->y.pTab!=0
+           && ALWAYS(pRight->y.pTab!=0)
            && IsVirtual(pRight->y.pTab))
       ){
         return WRC_Prune;
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index a437cc0d25..2159ec848d 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -2361,7 +2361,7 @@ struct Table {
 #ifndef SQLITE_OMIT_VIRTUALTABLE
 #  define IsVirtual(X)      ((X)->eTabType==TABTYP_VTAB)
 #  define ExprIsVtab(X)  \
-    ((X)->op==TK_COLUMN && (X)->y.pTab!=0 && (X)->y.pTab->eTabType==TABTYP_VTAB)
+   ((X)->op==TK_COLUMN && (X)->y.pTab->eTabType==TABTYP_VTAB)
 #else
 #  define IsVirtual(X)      0
 #  define ExprIsVtab(X)     0
diff --git a/src/vtab.c b/src/vtab.c
index 9bf031faf0..3814b0355e 100644
--- a/src/vtab.c
+++ b/src/vtab.c
@@ -1141,7 +1141,7 @@ FuncDef *sqlite3VtabOverloadFunction(
   if( pExpr->op!=TK_COLUMN ) return pDef;
   assert( ExprUseYTab(pExpr) );
   pTab = pExpr->y.pTab;
-  if( pTab==0 ) return pDef;
+  if( NEVER(pTab==0) ) return pDef;
   if( !IsVirtual(pTab) ) return pDef;
   pVtab = sqlite3GetVTable(db, pTab)->pVtab;
   assert( pVtab!=0 );
diff --git a/src/where.c b/src/where.c
index 8c65dc7b02..905c3391e2 100644
--- a/src/where.c
+++ b/src/where.c
@@ -2287,7 +2287,6 @@ static void whereInfoFree(sqlite3 *db, WhereInfo *pWInfo){
     pWInfo->pLoops = p->pNextLoop;
     whereLoopDelete(db, p);
   }
-  assert( pWInfo->pExprMods==0 );
   while( pWInfo->pMemToFree ){
     WhereMemBlock *pNext = pWInfo->pMemToFree->pNext;
     sqlite3DbNNFreeNN(db, pWInfo->pMemToFree);
@@ -2296,17 +2295,6 @@ static void whereInfoFree(sqlite3 *db, WhereInfo *pWInfo){
   sqlite3DbNNFreeNN(db, pWInfo);
 }
 
-/* Undo all Expr node modifications
-*/
-static void whereUndoExprMods(WhereInfo *pWInfo){
-  while( pWInfo->pExprMods ){
-    WhereExprMod *p = pWInfo->pExprMods;
-    pWInfo->pExprMods = p->pNext;
-    memcpy(p->pExpr, &p->orig, sizeof(p->orig));
-    sqlite3DbFree(pWInfo->pParse->db, p);
-  }
-}
-
 /*
 ** Return TRUE if all of the following are true:
 **
@@ -5608,7 +5596,9 @@ WhereInfo *sqlite3WhereBegin(
   pWInfo->pParse = pParse;
   pWInfo->pTabList = pTabList;
   pWInfo->pOrderBy = pOrderBy;
+#if WHERETRACE_ENABLED
   pWInfo->pWhere = pWhere;
+#endif
   pWInfo->pResultSet = pResultSet;
   pWInfo->aiCurOnePass[0] = pWInfo->aiCurOnePass[1] = -1;
   pWInfo->nLevel = nTabList;
@@ -6115,8 +6105,6 @@ WhereInfo *sqlite3WhereBegin(
   /* Jump here if malloc fails */
 whereBeginError:
   if( pWInfo ){
-    testcase( pWInfo->pExprMods!=0 );
-    whereUndoExprMods(pWInfo);
     pParse->nQueryLoop = pWInfo->savedNQueryLoop;
     whereInfoFree(db, pWInfo);
   }
@@ -6335,7 +6323,6 @@ void sqlite3WhereEnd(WhereInfo *pWInfo){
   }
 
   assert( pWInfo->nLevel<=pTabList->nSrc );
-  if( pWInfo->pExprMods ) whereUndoExprMods(pWInfo);
   for(i=0, pLevel=pWInfo->a; i<pWInfo->nLevel; i++, pLevel++){
     int k, last;
     VdbeOp *pOp, *pLastOp;
diff --git a/src/whereInt.h b/src/whereInt.h
index 43da5c2089..ae436e045c 100644
--- a/src/whereInt.h
+++ b/src/whereInt.h
@@ -449,20 +449,6 @@ struct WhereLoopBuilder {
 # define SQLITE_QUERY_PLANNER_LIMIT_INCR 1000
 #endif
 
-/*
-** Each instance of this object records a change to a single node
-** in an expression tree to cause that node to point to a column
-** of an index rather than an expression or a virtual column.  All
-** such transformations need to be undone at the end of WHERE clause
-** processing.
-*/
-typedef struct WhereExprMod WhereExprMod;
-struct WhereExprMod {
-  WhereExprMod *pNext;  /* Next translation on a list of them all */
-  Expr *pExpr;          /* The Expr node that was transformed */
-  Expr orig;            /* Original value of the Expr node */
-};
-
 /*
 ** The WHERE clause processing routine has two halves.  The
 ** first part does the start of the WHERE loop and the second
@@ -478,7 +464,9 @@ struct WhereInfo {
   SrcList *pTabList;        /* List of tables in the join */
   ExprList *pOrderBy;       /* The ORDER BY clause or NULL */
   ExprList *pResultSet;     /* Result set of the query */
+#if WHERETRACE_ENABLED
   Expr *pWhere;             /* The complete WHERE clause */
+#endif
 #ifndef SQLITE_OMIT_VIRTUALTABLE
   Select *pLimit;           /* Used to access LIMIT expr/registers for vtabs */
 #endif
@@ -500,7 +488,6 @@ struct WhereInfo {
   int iTop;                 /* The very beginning of the WHERE loop */
   int iEndWhere;            /* End of the WHERE clause itself */
   WhereLoop *pLoops;        /* List of all WhereLoop objects */
-  WhereExprMod *pExprMods;  /* Expression modifications */
   WhereMemBlock *pMemToFree;/* Memory to free when this object destroyed */
   Bitmask revMask;          /* Mask of ORDER BY terms that need reversing */
   WhereClause sWC;          /* Decomposition of the WHERE clause */
diff --git a/src/wherecode.c b/src/wherecode.c
index c2e7278d1a..a1ecf93b86 100644
--- a/src/wherecode.c
+++ b/src/wherecode.c
@@ -1217,143 +1217,6 @@ static void codeExprOrVector(Parse *pParse, Expr *p, int iReg, int nReg){
   }
 }
 
-/* An instance of the IdxExprTrans object carries information about a
-** mapping from an expression on table columns into a column in an index
-** down through the Walker.
-*/
-typedef struct IdxExprTrans {
-  Expr *pIdxExpr;    /* The index expression */
-  int iTabCur;       /* The cursor of the corresponding table */
-  int iIdxCur;       /* The cursor for the index */
-  int iIdxCol;       /* The column for the index */
-  int iTabCol;       /* The column for the table */
-  WhereInfo *pWInfo; /* Complete WHERE clause information */
-  sqlite3 *db;       /* Database connection (for malloc()) */
-} IdxExprTrans;
-
-/*
-** Preserve pExpr on the WhereETrans list of the WhereInfo.
-*/
-static void preserveExpr(IdxExprTrans *pTrans, Expr *pExpr){
-  WhereExprMod *pNew;
-  pNew = sqlite3DbMallocRaw(pTrans->db, sizeof(*pNew));
-  if( pNew==0 ) return;
-  pNew->pNext = pTrans->pWInfo->pExprMods;
-  pTrans->pWInfo->pExprMods = pNew;
-  pNew->pExpr = pExpr;
-  memcpy(&pNew->orig, pExpr, sizeof(*pExpr));
-}
-
-/* The walker node callback used to transform matching expressions into
-** a reference to an index column for an index on an expression.
-**
-** If pExpr matches, then transform it into a reference to the index column
-** that contains the value of pExpr.
-*/
-static int whereIndexExprTransNode(Walker *p, Expr *pExpr){
-  IdxExprTrans *pX = p->u.pIdxTrans;
-  if( sqlite3ExprCompare(0, pExpr, pX->pIdxExpr, pX->iTabCur)==0 ){
-    pExpr = sqlite3ExprSkipCollate(pExpr);
-    preserveExpr(pX, pExpr);
-    pExpr->affExpr = sqlite3ExprAffinity(pExpr);
-    pExpr->op = TK_COLUMN;
-    pExpr->iTable = pX->iIdxCur;
-    pExpr->iColumn = pX->iIdxCol;
-    testcase( ExprHasProperty(pExpr, EP_Unlikely) );
-    ExprClearProperty(pExpr, EP_Skip|EP_Unlikely|EP_WinFunc|EP_Subrtn);
-    pExpr->y.pTab = 0;
-    return WRC_Prune;
-  }else{
-    return WRC_Continue;
-  }
-}
-
-#ifndef SQLITE_OMIT_GENERATED_COLUMNS
-/* A walker node callback that translates a column reference to a table
-** into a corresponding column reference of an index.
-*/
-static int whereIndexExprTransColumn(Walker *p, Expr *pExpr){
-  if( pExpr->op==TK_COLUMN ){
-    IdxExprTrans *pX = p->u.pIdxTrans;
-    if( pExpr->iTable==pX->iTabCur && pExpr->iColumn==pX->iTabCol ){
-      assert( ExprUseYTab(pExpr) && pExpr->y.pTab!=0 );
-      preserveExpr(pX, pExpr);
-      pExpr->affExpr = sqlite3TableColumnAffinity(pExpr->y.pTab,pExpr->iColumn);
-      pExpr->iTable = pX->iIdxCur;
-      pExpr->iColumn = pX->iIdxCol;
-      pExpr->y.pTab = 0;
-    }
-  }
-  return WRC_Continue;
-}
-#endif /* SQLITE_OMIT_GENERATED_COLUMNS */
-
-/*
-** For an indexes on expression X, locate every instance of expression X
-** in pExpr and change that subexpression into a reference to the appropriate
-** column of the index.
-**
-** 2019-10-24: Updated to also translate references to a VIRTUAL column in
-** the table into references to the corresponding (stored) column of the
-** index.
-*/
-static void whereIndexExprTrans(
-  Index *pIdx,      /* The Index */
-  int iTabCur,      /* Cursor of the table that is being indexed */
-  int iIdxCur,      /* Cursor of the index itself */
-  WhereInfo *pWInfo /* Transform expressions in this WHERE clause */
-){
-  int iIdxCol;               /* Column number of the index */
-  ExprList *aColExpr;        /* Expressions that are indexed */
-  Table *pTab;
-  Walker w;
-  IdxExprTrans x;
-  aColExpr = pIdx->aColExpr;
-  if( aColExpr==0 && !pIdx->bHasVCol ){
-    /* The index does not reference any expressions or virtual columns
-    ** so no translations are needed. */
-    return;
-  }
-  pTab = pIdx->pTable;
-  memset(&w, 0, sizeof(w));
-  w.u.pIdxTrans = &x;
-  x.iTabCur = iTabCur;
-  x.iIdxCur = iIdxCur;
-  x.pWInfo = pWInfo;
-  x.db = pWInfo->pParse->db;
-  for(iIdxCol=0; iIdxCol<pIdx->nColumn; iIdxCol++){
-    i16 iRef = pIdx->aiColumn[iIdxCol];
-    if( iRef==XN_EXPR ){
-      assert( aColExpr!=0 && aColExpr->a[iIdxCol].pExpr!=0 );
-      x.pIdxExpr = aColExpr->a[iIdxCol].pExpr;
-      if( sqlite3ExprIsConstant(x.pIdxExpr) ) continue;
-      w.xExprCallback = whereIndexExprTransNode;
-#ifndef SQLITE_OMIT_GENERATED_COLUMNS
-    }else if( iRef>=0
-       && (pTab->aCol[iRef].colFlags & COLFLAG_VIRTUAL)!=0
-       && ((pTab->aCol[iRef].colFlags & COLFLAG_HASCOLL)==0
-           || sqlite3StrICmp(sqlite3ColumnColl(&pTab->aCol[iRef]),
-                                               sqlite3StrBINARY)==0)
-    ){
-      /* Check to see if there are direct references to generated columns
-      ** that are contained in the index.  Pulling the generated column
-      ** out of the index is an optimization only - the main table is always
-      ** available if the index cannot be used.  To avoid unnecessary
-      ** complication, omit this optimization if the collating sequence for
-      ** the column is non-standard */
-      x.iTabCol = iRef;
-      w.xExprCallback = whereIndexExprTransColumn;
-#endif /* SQLITE_OMIT_GENERATED_COLUMNS */
-    }else{
-      continue;
-    }
-    x.iIdxCol = iIdxCol;
-    sqlite3WalkExpr(&w, pWInfo->pWhere);
-    sqlite3WalkExprList(&w, pWInfo->pOrderBy);
-    sqlite3WalkExprList(&w, pWInfo->pResultSet);
-  }
-}
-
 /*
 ** The pTruth expression is always true because it is the WHERE clause
 ** a partial index that is driving a query loop.  Look through all of the
@@ -2181,27 +2044,6 @@ Bitmask sqlite3WhereCodeOneLoopStart(
     }
 
     if( pLevel->iLeftJoin==0 ){
-      /* If pIdx is an index on one or more expressions, then look through
-      ** all the expressions in pWInfo and try to transform matching expressions
-      ** into reference to index columns.  Also attempt to translate references
-      ** to virtual columns in the table into references to (stored) columns
-      ** of the index.
-      **
-      ** Do not do this for the RHS of a LEFT JOIN. This is because the 
-      ** expression may be evaluated after OP_NullRow has been executed on
-      ** the cursor. In this case it is important to do the full evaluation,
-      ** as the result of the expression may not be NULL, even if all table
-      ** column values are.  https://www.sqlite.org/src/info/7fa8049685b50b5a
-      **
-      ** Also, do not do this when processing one index an a multi-index
-      ** OR clause, since the transformation will become invalid once we
-      ** move forward to the next index.
-      ** https://sqlite.org/src/info/4e8e4857d32d401f
-      */
-      if( (pWInfo->wctrlFlags & (WHERE_OR_SUBCLAUSE|WHERE_RIGHT_JOIN))==0 ){
-        whereIndexExprTrans(pIdx, iCur, iIdxCur, pWInfo);
-      }
-  
       /* If a partial index is driving the loop, try to eliminate WHERE clause
       ** terms from the query that must be true due to the WHERE clause of
       ** the partial index.
diff --git a/src/whereexpr.c b/src/whereexpr.c
index 20e569642a..9fe7791203 100644
--- a/src/whereexpr.c
+++ b/src/whereexpr.c
@@ -266,7 +266,7 @@ static int isLikeOrGlob(
         if( pLeft->op!=TK_COLUMN 
          || sqlite3ExprAffinity(pLeft)!=SQLITE_AFF_TEXT 
          || (ALWAYS( ExprUseYTab(pLeft) )
-             && pLeft->y.pTab
+             && ALWAYS(pLeft->y.pTab)
              && IsVirtual(pLeft->y.pTab))  /* Might be numeric */
         ){
           int isNum;
@@ -383,8 +383,7 @@ static int isAuxiliaryVtabOperator(
     **       MATCH(expression,vtab_column)
     */
     pCol = pList->a[1].pExpr;
-    assert( pCol->op!=TK_COLUMN || ExprUseYTab(pCol) );
-    testcase( pCol->op==TK_COLUMN && pCol->y.pTab==0 );
+    assert( pCol->op!=TK_COLUMN || (ExprUseYTab(pCol) && pCol->y.pTab!=0) );
     if( ExprIsVtab(pCol) ){
       for(i=0; i<ArraySize(aOp); i++){
         assert( !ExprHasProperty(pExpr, EP_IntValue) );
@@ -409,7 +408,7 @@ static int isAuxiliaryVtabOperator(
     */
     pCol = pList->a[0].pExpr;
     assert( pCol->op!=TK_COLUMN || ExprUseYTab(pCol) );
-    testcase( pCol->op==TK_COLUMN && pCol->y.pTab==0 );
+    assert( pCol->op!=TK_COLUMN || (ExprUseYTab(pCol) && pCol->y.pTab!=0) );
     if( ExprIsVtab(pCol) ){
       sqlite3_vtab *pVtab;
       sqlite3_module *pMod;
@@ -434,13 +433,12 @@ static int isAuxiliaryVtabOperator(
     int res = 0;
     Expr *pLeft = pExpr->pLeft;
     Expr *pRight = pExpr->pRight;
-    assert( pLeft->op!=TK_COLUMN || ExprUseYTab(pLeft) );
-    testcase( pLeft->op==TK_COLUMN && pLeft->y.pTab==0 );
+    assert( pLeft->op!=TK_COLUMN || (ExprUseYTab(pLeft) && pLeft->y.pTab!=0) );
     if( ExprIsVtab(pLeft) ){
       res++;
     }
-    assert( pRight==0 || pRight->op!=TK_COLUMN || ExprUseYTab(pRight) );
-    testcase( pRight && pRight->op==TK_COLUMN && pRight->y.pTab==0 );
+    assert( pRight==0 || pRight->op!=TK_COLUMN
+            || (ExprUseYTab(pRight) && pRight->y.pTab!=0) );
     if( pRight && ExprIsVtab(pRight) ){
       res++;
       SWAP(Expr*, pLeft, pRight);

From e180564028b4cdc1125d1973ea3e33c5e5034442 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Thu, 20 Oct 2022 16:12:02 +0000
Subject: [PATCH 321/428] Only enable the bMaybeNullRow flag on IndexedExpr for
 an index on an expression, not on a virtual column.  But do enable it for the
 right operand of a right join.

FossilOrigin-Name: a9657c87c53c19228a42559c82c54b504a5ad729e407e9e2c7dabcc0c949b261
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/where.c   |  8 +++++++-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/manifest b/manifest
index bb5360312f..7dc18c8ad5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\sgeneralized\sindexed\sexpression\soptimization\sof\s[2435112867fbd7b6]\smakes\nthe\sprior\s[a47efb7c8520a011]\senhancement\sfrom\s2017\sobsolete.\s\sThis\scheck-in\nremoves\sthe\solder\soptimization.
-D 2022-10-20T13:36:32.870
+C Only\senable\sthe\sbMaybeNullRow\sflag\son\sIndexedExpr\sfor\san\sindex\son\san\nexpression,\snot\son\sa\svirtual\scolumn.\s\sBut\sdo\senable\sit\sfor\sthe\sright\soperand\nof\sa\sright\sjoin.
+D 2022-10-20T16:12:02.250
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -707,7 +707,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d
 F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
-F src/where.c 4c5f6a6f3c7a2fe110380b52edd27628074ae0b66c7f62e2fba47897098828aa
+F src/where.c 082f38a719c3e01cddce45619caabe28634224a3712043739ac4bff0d2d56502
 F src/whereInt.h e5f5cf1bc32b7d01a6337027478ef6ed90c8c403de4b977198345c8238f0e1b0
 F src/wherecode.c 13b6373af69d484d9b05b9a732d393ce3b7b320cc93275c6528127678650f8cb
 F src/whereexpr.c a1bd9d8faddc946d19ae8b6b3468874794bf54acd13fe46e1680fb428e8d3ea7
@@ -2036,8 +2036,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 6e545e2b846795fc67f8a90c04de284861a8a429ac686a7476b41c8ed7aabf75
-R 228ae945140472bb5e1b236e96f4ecd2
+P 56442c9bdd7844454c79acf83323380ea3509cb2e0b9a3d538a6b51726ae6d07
+R e70ce67783291a6229c63e36a2977c0f
 U drh
-Z dcc82e93e2bb9bb5c1a3735a5f91159f
+Z e1dee37038322a647b6bc84c263beb82
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 7650f52c30..3376e12f2c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-56442c9bdd7844454c79acf83323380ea3509cb2e0b9a3d538a6b51726ae6d07
\ No newline at end of file
+a9657c87c53c19228a42559c82c54b504a5ad729e407e9e2c7dabcc0c949b261
\ No newline at end of file
diff --git a/src/where.c b/src/where.c
index 905c3391e2..a9285c8314 100644
--- a/src/where.c
+++ b/src/where.c
@@ -5407,10 +5407,16 @@ static SQLITE_NOINLINE void whereAddIndexedExpr(
   for(i=0; i<pIdx->nColumn; i++){
     Expr *pExpr;
     int j = pIdx->aiColumn[i];
+    int bMaybeNullRow;
     if( j==XN_EXPR ){
       pExpr = pIdx->aColExpr->a[i].pExpr;
+      testcase( pTabItem->fg.jointype & JT_LEFT );
+      testcase( pTabItem->fg.jointype & JT_RIGHT );
+      testcase( pTabItem->fg.jointype & JT_LTORJ );
+      bMaybeNullRow = (pTabItem->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))!=0;
     }else if( j>=0 && (pTab->aCol[j].colFlags & COLFLAG_VIRTUAL)!=0 ){
       pExpr = sqlite3ColumnExpr(pTab, &pTab->aCol[j]);
+      bMaybeNullRow = 0;
     }else{
       continue;
     }
@@ -5422,7 +5428,7 @@ static SQLITE_NOINLINE void whereAddIndexedExpr(
     p->iDataCur = pTabItem->iCursor;
     p->iIdxCur = iIdxCur;
     p->iIdxCol = i;
-    p->bMaybeNullRow = (pTabItem->fg.jointype & (JT_LEFT|JT_LTORJ))!=0;
+    p->bMaybeNullRow = bMaybeNullRow;
 #ifdef SQLITE_ENABLE_EXPLAIN_COMMENTS
     p->zIdxName = pIdx->zName;
 #endif

From 7e089d0c409faae47b1497ace4657986a28d7c00 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Thu, 20 Oct 2022 16:22:39 +0000
Subject: [PATCH 322/428] Add test case for previous commit.

FossilOrigin-Name: 535867a9c8719358380f89fd80473c484def9bb72744dd2fd28ada65999ee901
---
 manifest        | 14 +++++++-------
 manifest.uuid   |  2 +-
 test/joinH.test | 21 +++++++++++++++++++++
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/manifest b/manifest
index 7dc18c8ad5..42c29bfe85 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Only\senable\sthe\sbMaybeNullRow\sflag\son\sIndexedExpr\sfor\san\sindex\son\san\nexpression,\snot\son\sa\svirtual\scolumn.\s\sBut\sdo\senable\sit\sfor\sthe\sright\soperand\nof\sa\sright\sjoin.
-D 2022-10-20T16:12:02.250
+C Add\stest\scase\sfor\sprevious\scommit.
+D 2022-10-20T16:22:39.053
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1228,7 +1228,7 @@ F test/joinC.test 1f1a602c2127f55f136e2cbd3bf2d26546614bf8cffe5902ec1ac9c07f87f2
 F test/joinD.test 2ce62e7353a0702ca5e70008faf319c1d4686aa19fba34275c6d1da0e960be28
 F test/joinE.test d5d182f3812771e2c0d97c9dcf5dbe4c41c8e21c82560e59358731c4a3981d6b
 F test/joinF.test 53dd66158806823ea680dd7543b5406af151b5aafa5cd06a7f3231cd94938127
-F test/joinH.test e67d1d6a8c7141caf981a07386caa7fda0362baa09e03669f9a4fbee812806d0
+F test/joinH.test 15f501b33d848521964afde9865a92aeca79c8c41fa84dc4dc3f865c9ed8c868
 F test/journal1.test c7b768041b7f494471531e17abc2f4f5ebf9e5096984f43ed17c4eb80ba34497
 F test/journal2.test 9dac6b4ba0ca79c3b21446bbae993a462c2397c4
 F test/journal3.test 7c3cf23ffc77db06601c1fcfc9743de8441cb77db9d1aa931863d94f5ffa140e
@@ -2036,8 +2036,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 56442c9bdd7844454c79acf83323380ea3509cb2e0b9a3d538a6b51726ae6d07
-R e70ce67783291a6229c63e36a2977c0f
-U drh
-Z e1dee37038322a647b6bc84c263beb82
+P a9657c87c53c19228a42559c82c54b504a5ad729e407e9e2c7dabcc0c949b261
+R a04920b2ec7699abc02d2feb1be4368c
+U dan
+Z eaf5c421745263e3ad4c933ff5bd21f5
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 3376e12f2c..06042db01b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a9657c87c53c19228a42559c82c54b504a5ad729e407e9e2c7dabcc0c949b261
\ No newline at end of file
+535867a9c8719358380f89fd80473c484def9bb72744dd2fd28ada65999ee901
\ No newline at end of file
diff --git a/test/joinH.test b/test/joinH.test
index 9832861208..1d5f66afa2 100644
--- a/test/joinH.test
+++ b/test/joinH.test
@@ -68,5 +68,26 @@ do_catchsql_test 3.2 {
   SELECT * FROM t0 LEFT OUTER JOIN t1 ON v0.c0 INNER JOIN v0 INNER JOIN t2 ON (t2.c2 NOT NULL); 
 } {1 {ON clause references tables to its right}}
 
+#-------------------------------------------------------------
+
+reset_db
+do_execsql_test 4.1 {
+  CREATE TABLE t1(a,b,c,d,e,f,g,h,PRIMARY KEY(a,b,c)) WITHOUT ROWID;
+  CREATE TABLE t2(i, j);
+  INSERT INTO t2 VALUES(10, 20);
+}
+
+do_execsql_test 4.2 {
+  SELECT (d IS NULL) FROM t1 RIGHT JOIN t2 ON (j=33);
+} {1}
+
+do_execsql_test 4.3 {
+  CREATE INDEX i1 ON t1( (d IS NULL), d );
+}
+
+do_execsql_test 4.4 {
+  SELECT (d IS NULL) FROM t1 RIGHT JOIN t2 ON (j=33);
+} {1}
+
 
 finish_test

From c046f6d4d92ed22d1454f3c64da8ecc4e49f9552 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Thu, 20 Oct 2022 16:30:05 +0000
Subject: [PATCH 323/428] Add a bit to the optimization disabling mask for the
 indexed expression optimization.

FossilOrigin-Name: 56df1482ab45d4d41f937b27c5a877b52fa082bfc6809ea682b62b47a51333de
---
 manifest        | 16 ++++++++--------
 manifest.uuid   |  2 +-
 src/sqliteInt.h |  1 +
 src/where.c     |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/manifest b/manifest
index 42c29bfe85..15b79eaab1 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stest\scase\sfor\sprevious\scommit.
-D 2022-10-20T16:22:39.053
+C Add\sa\sbit\sto\sthe\soptimization\sdisabling\smask\sfor\sthe\sindexed\sexpression\noptimization.
+D 2022-10-20T16:30:05.203
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -625,7 +625,7 @@ F src/shell.c.in 6a9e15cb9fc3cd13d3647d4d9714c0d4d4a65e7f49228c2aafca910ed08d577
 F src/sqlite.h.in d9c8a6243fc0a1c270d69db33758e34b810af3462f9bc5b4af113b347e07c69d
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 5336beea1868d99d2f62e628dbea55e97267dbff8193291ab175e960c5df9141
-F src/sqliteInt.h f4f3ae8be17f3ef272d2e4a439df504706944b8fbd32b6fe76eefd1240d15a3a
+F src/sqliteInt.h ce8bf543210ab4a8a797e6abaf45e15f4cff24570b1043560aa747b3dc1a7935
 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -707,7 +707,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d
 F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
-F src/where.c 082f38a719c3e01cddce45619caabe28634224a3712043739ac4bff0d2d56502
+F src/where.c bccea9a1066c9843ad7bf05f9054b390fe9b5d0fb721ff8af2d11fb93779836a
 F src/whereInt.h e5f5cf1bc32b7d01a6337027478ef6ed90c8c403de4b977198345c8238f0e1b0
 F src/wherecode.c 13b6373af69d484d9b05b9a732d393ce3b7b320cc93275c6528127678650f8cb
 F src/whereexpr.c a1bd9d8faddc946d19ae8b6b3468874794bf54acd13fe46e1680fb428e8d3ea7
@@ -2036,8 +2036,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 a9657c87c53c19228a42559c82c54b504a5ad729e407e9e2c7dabcc0c949b261
-R a04920b2ec7699abc02d2feb1be4368c
-U dan
-Z eaf5c421745263e3ad4c933ff5bd21f5
+P 535867a9c8719358380f89fd80473c484def9bb72744dd2fd28ada65999ee901
+R 85216d994cb9632dd89733d6a41cd6c8
+U drh
+Z 8b2ac4d684320c840aa3e0f63be89cad
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 06042db01b..8bf6cfe9ae 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-535867a9c8719358380f89fd80473c484def9bb72744dd2fd28ada65999ee901
\ No newline at end of file
+56df1482ab45d4d41f937b27c5a877b52fa082bfc6809ea682b62b47a51333de
\ No newline at end of file
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 2159ec848d..5e4afb1aeb 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -1789,6 +1789,7 @@ struct sqlite3 {
 #define SQLITE_ReleaseReg     0x00400000 /* Use OP_ReleaseReg for testing */
 #define SQLITE_FlttnUnionAll  0x00800000 /* Disable the UNION ALL flattener */
    /* TH3 expects this value  ^^^^^^^^^^ See flatten04.test */
+#define SQLITE_IndexedExpr    0x01000000 /* Pull exprs from index when able */
 #define SQLITE_AllOpts        0xffffffff /* All optimizations */
 
 /*
diff --git a/src/where.c b/src/where.c
index a9285c8314..8e9290c34c 100644
--- a/src/where.c
+++ b/src/where.c
@@ -5986,7 +5986,7 @@ WhereInfo *sqlite3WhereBegin(
         op = OP_ReopenIdx;
       }else{
         iIndexCur = pParse->nTab++;
-        if( pIx->bHasExpr ){
+        if( pIx->bHasExpr && OptimizationEnabled(db, SQLITE_IndexedExpr) ){
           whereAddIndexedExpr(pParse, pIx, iIndexCur, pTabItem);
         }
       }

From 8a8244b5c104022b5d6b4072630f012e6daf174e Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Thu, 20 Oct 2022 18:31:32 +0000
Subject: [PATCH 324/428] Rename sqlite3_web_... to sqlite3_js_... Document the
 worker1.close.unlink option. Fix unlink usage in speedtest1.html. Minor JS
 build cleanups.

FossilOrigin-Name: ac9af71b72a749b0a040273a88480d56f49570b569389a4ea20cc055f494d8ff
---
 ext/wasm/GNUmakefile                 | 11 +++++------
 ext/wasm/api/sqlite3-api-glue.js     |  2 +-
 ext/wasm/api/sqlite3-api-oo1.js      | 10 +++++-----
 ext/wasm/api/sqlite3-api-prologue.js | 14 +++++++-------
 ext/wasm/api/sqlite3-api-worker1.js  | 20 ++++++++++----------
 ext/wasm/fiddle/fiddle-worker.js     |  4 ++--
 ext/wasm/speedtest1-worker.js        |  2 +-
 ext/wasm/speedtest1.html             | 13 +++++++------
 manifest                             | 28 ++++++++++++++--------------
 manifest.uuid                        |  2 +-
 10 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 1bb14a65df..174e44ddf5 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -291,12 +291,11 @@ $(sqlite3-license-version.js): $(sqlite3.h) $(sqlite3-license-version-header.js)
 # name of the JS file on whose behalf this pre-js is for.
 define call-make-pre-js
 pre-post-$(1).flags ?=
-pre-js-$(1).js: $$(pre-js.js) $$(MAKEFILE)
+$$(dir.tmp)/pre-js-$(1).js: $$(pre-js.js) $$(MAKEFILE)
 	cp $$(pre-js.js) $$@
 	echo "Module[xInstantiateWasm].uri = '$(1).wasm';" >> $$@
-CLEAN_FILES += pre-js-$(1).js
-pre-post-$(1).deps := $$(pre-post-jses.deps) pre-js-$(1).js
-pre-post-$(1).flags += --pre-js=pre-js-$(1).js
+pre-post-$(1).deps := $$(pre-post-jses.deps) $$(dir.tmp)/pre-js-$(1).js
+pre-post-$(1).flags += --pre-js=$$(dir.tmp)/pre-js-$(1).js
 endef
 #$(error $(call call-make-pre-js,sqlite3-wasmfs))
 # /post-js and pre-js
@@ -304,9 +303,9 @@ endef
 
 ########################################################################
 # emcc flags for .c/.o/.wasm/.js.
-emcc.flags =
+emcc.flags :=
 #emcc.flags += -v # _very_ loud but also informative about what it's doing
-# -g is needed to keep -O2 and higher from creating broken JS via
+# -g3 is needed to keep -O2 and higher from creating broken JS via
 # minification.
 
 ########################################################################
diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index 5768e44cb2..7e467868ee 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -592,7 +592,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        For the given integer, returns the SQLITE_xxx result code as a
        string, or undefined if no such mapping is found.
     */
-    capi.sqlite3_web_rc_str = (rc)=>__rcMap[rc];
+    capi.sqlite3_js_rc_str = (rc)=>__rcMap[rc];
     /* Bind all registered C-side structs... */
     const notThese = Object.assign(Object.create(null),{
       // Structs NOT to register
diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index f1014fcc00..c2e7eb14f1 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -1406,7 +1406,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
           default:
             this._mayGet = false;
             console.warn("sqlite3_step() rc=",rc,
-                         capi.sqlite3_web_rc_str(rc),
+                         capi.sqlite3_js_rc_str(rc),
                          "SQL =", capi.sqlite3_sql(this.pointer));
             DB.checkRc(this.db.pointer, rc);
       }
@@ -1662,8 +1662,8 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     };
     const jdb = sqlite3.oo1.JsStorageDb;
     jdb.prototype = Object.create(DB.prototype);
-    /** Equivalent to sqlite3_web_kvvfs_clear(). */
-    jdb.clearStorage = capi.sqlite3_web_kvvfs_clear;
+    /** Equivalent to sqlite3_js_kvvfs_clear(). */
+    jdb.clearStorage = capi.sqlite3_js_kvvfs_clear;
     /**
        Clears this database instance's storage or throws if this
        instance has been closed. Returns the number of
@@ -1672,8 +1672,8 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     jdb.prototype.clearStorage = function(){
       return jdb.clearStorage(affirmDbOpen(this).filename);
     };
-    /** Equivalent to sqlite3_web_kvvfs_size(). */
-    jdb.storageSize = capi.sqlite3_web_kvvfs_size;
+    /** Equivalent to sqlite3_js_kvvfs_size(). */
+    jdb.storageSize = capi.sqlite3_js_kvvfs_size;
     /**
        Returns the _approximate_ number of bytes this database takes
        up in its storage or throws if this instance has been closed.
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index d02d6b0540..ca1542e2b2 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -1107,7 +1107,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
      bad arguments cause a conversion error when passing into
      wasm-space, false is returned.
   */
-  capi.sqlite3_web_db_uses_vfs = function(pDb,vfsName,dbName="main"){
+  capi.sqlite3_js_db_uses_vfs = function(pDb,vfsName,dbName="main"){
     try{
       const pK = capi.sqlite3_vfs_find(vfsName);
       if(!pK) return false;
@@ -1134,7 +1134,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
      Returns an array of the names of all currently-registered sqlite3
      VFSes.
   */
-  capi.sqlite3_web_vfs_list = function(){
+  capi.sqlite3_js_vfs_list = function(){
     const rc = [];
     let pVfs = capi.sqlite3_vfs_find(0);
     while(pVfs){
@@ -1151,7 +1151,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
      sqlite3_serialize(). On success it returns a Uint8Array. On
      error it throws with a description of the problem.
   */
-  capi.sqlite3_web_db_export = function(pDb){
+  capi.sqlite3_js_db_export = function(pDb){
     if(!pDb) toss('Invalid sqlite3* argument.');
     if(!wasm.bigIntEnabled) toss('BigInt64 support is not enabled.');
     const stack = wasm.pstack.pointer;
@@ -1171,7 +1171,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
       );
       if(rc){
         toss("Database serialization failed with code",
-             sqlite3.capi.sqlite3_web_rc_str(rc));
+             sqlite3.capi.sqlite3_js_rc_str(rc));
       }
       pOut = wasm.getPtrValue(ppOut);
       const nOut = wasm.getMemValue(pSize, 'i64');
@@ -1192,7 +1192,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     /* Features specific to the main window thread... */
 
     /**
-       Internal helper for sqlite3_web_kvvfs_clear() and friends.
+       Internal helper for sqlite3_js_kvvfs_clear() and friends.
        Its argument should be one of ('local','session','').
     */
     const __kvvfsInfo = function(which){
@@ -1217,7 +1217,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
 
        Returns the number of entries cleared.
     */
-    capi.sqlite3_web_kvvfs_clear = function(which=''){
+    capi.sqlite3_js_kvvfs_clear = function(which=''){
       let rc = 0;
       const kvinfo = __kvvfsInfo(which);
       kvinfo.stores.forEach((s)=>{
@@ -1250,7 +1250,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
        those limits are unspecified and may include per-entry
        overhead invisible to clients.
     */
-    capi.sqlite3_web_kvvfs_size = function(which=''){
+    capi.sqlite3_js_kvvfs_size = function(which=''){
       let sz = 0;
       const kvinfo = __kvvfsInfo(which);
       kvinfo.stores.forEach((s)=>{
diff --git a/ext/wasm/api/sqlite3-api-worker1.js b/ext/wasm/api/sqlite3-api-worker1.js
index 6c0900a506..fa6a438462 100644
--- a/ext/wasm/api/sqlite3-api-worker1.js
+++ b/ext/wasm/api/sqlite3-api-worker1.js
@@ -167,7 +167,7 @@
       the non-WASMFS OPFS VFS to open a database via a URI-style
       db filename.
 
-      vfsList: result of sqlite3.capi.sqlite3_web_vfs_list()
+      vfsList: result of sqlite3.capi.sqlite3_js_vfs_list()
    }
   }
   ```
@@ -225,13 +225,15 @@
     type: "close",
     messageId: ...as above...
     dbId: ...as above...
-    args: none
+    args: OPTIONAL {unlink: boolean}
   }
   ```
 
-  If the dbId does not refer to an opened ID, this is a no-op. The
-  inability to close a db (because it's not opened) or delete its
-  file does not trigger an error.
+  If the `dbId` does not refer to an opened ID, this is a no-op. If
+  the `args` object contains a truthy `unlink` value then the database
+  will unlinked (deleted) after closing it. The inability to close a
+  db (because it's not opened) or delete its file does not trigger an
+  error.
 
   Response:
 
@@ -432,15 +434,13 @@ sqlite3.initWorker1API = function(){
       const pDir = sqlite3.capi.sqlite3_wasmfs_opfs_dir();
       if(!args.filename || ':memory:'===args.filename){
         oargs.filename = args.filename || '';
-      }else if(pDir){
-        oargs.filename = pDir + ('/'===args.filename[0] ? args.filename : ('/'+args.filename));
       }else{
         oargs.filename = args.filename;
       }
       const db = wState.open(oargs);
       rc.filename = db.filename;
-      rc.persistent = (!!pDir && db.filename.startsWith(pDir))
-        || sqlite3.capi.sqlite3_web_db_uses_vfs(db.pointer, "opfs");
+      rc.persistent = (!!pDir && db.filename.startsWith(pDir+'/'))
+        || sqlite3.capi.sqlite3_js_db_uses_vfs(db.pointer, "opfs");
       rc.dbId = getDbId(db);
       return rc;
     },
@@ -521,7 +521,7 @@ sqlite3.initWorker1API = function(){
       });
       rc.wasmfsOpfsEnabled = !!sqlite3.capi.sqlite3_wasmfs_opfs_dir();
       rc.version = sqlite3.version;
-      rc.vfsList = sqlite3.capi.sqlite3_web_vfs_list();
+      rc.vfsList = sqlite3.capi.sqlite3_js_vfs_list();
       return rc;
     },
 
diff --git a/ext/wasm/fiddle/fiddle-worker.js b/ext/wasm/fiddle/fiddle-worker.js
index 581121826d..e3a2cbbe81 100644
--- a/ext/wasm/fiddle/fiddle-worker.js
+++ b/ext/wasm/fiddle/fiddle-worker.js
@@ -130,7 +130,7 @@
       return f._();
     },
     dbIsOpfs: function f(){
-      return sqlite3.opfs && sqlite3.capi.sqlite3_web_db_uses_vfs(
+      return sqlite3.opfs && sqlite3.capi.sqlite3_js_db_uses_vfs(
         this.dbHandle(), "opfs"
       );
     },
@@ -251,7 +251,7 @@
           const fn2 = fn ? fn.split(/[/\\]/).pop() : null;
           try{
             if(!fn2) toss("DB appears to be closed.");
-            const buffer = sqlite3.capi.sqlite3_web_db_export(
+            const buffer = sqlite3.capi.sqlite3_js_db_export(
               Sqlite3Shell.dbHandle()
             );
             wMsg('db-export',{filename: fn2, buffer: buffer.buffer}, [buffer.buffer]);
diff --git a/ext/wasm/speedtest1-worker.js b/ext/wasm/speedtest1-worker.js
index e3e4ef7f34..a4d6aedc58 100644
--- a/ext/wasm/speedtest1-worker.js
+++ b/ext/wasm/speedtest1-worker.js
@@ -96,6 +96,6 @@
     //if(App.pDir) log("Persistent storage:",pDir);
     //else log("Using transient storage.");
     mPost('ready',true);
-    log("Registered VFSes:", ...S.capi.sqlite3_web_vfs_list());
+    log("Registered VFSes:", ...S.capi.sqlite3_js_vfs_list());
   });
 })();
diff --git a/ext/wasm/speedtest1.html b/ext/wasm/speedtest1.html
index a53b24c6df..b2b0b8e861 100644
--- a/ext/wasm/speedtest1.html
+++ b/ext/wasm/speedtest1.html
@@ -94,7 +94,6 @@
     const runTests = function(sqlite3){
         const capi = sqlite3.capi, wasm = capi.wasm;
         //console.debug('sqlite3 =',sqlite3);
-        const unlink = wasm.xWrap("sqlite3_wasm_vfs_unlink", "int", ["string"]);
         const pDir = wasmfsDir(wasm);
         if(pDir){
             console.warn("Persistent storage:",pDir);
@@ -108,9 +107,11 @@
         }
 
         let forceSize = 0;
+        let vfs, pVfs = 0;
         if(urlParams.has('vfs')){
-            const vfs = urlParams.get('vfs');
-            if(!capi.sqlite3_vfs_find(vfs)){
+            vfs = urlParams.get('vfs');
+            pVfs = capi.sqlite3_vfs_find(vfs);
+            if(!pVfs){
                 log2('error',"Unknown VFS:",vfs);
                 return;
             }
@@ -121,7 +122,7 @@
                 dbFile = 'session';
                 log2('warning',"kvvfs VFS: forcing --size",forceSize,
                      "and filename '"+dbFile+"'.");
-                capi.sqlite3_web_kvvfs_clear(dbFile);
+                capi.sqlite3_js_kvvfs_clear(dbFile);
             }
         }
         if(forceSize){
@@ -146,7 +147,7 @@
         console.log("argv =",argv);
         // These log messages are not emitted to the UI until after main() returns. Fixing that
         // requires moving the main() call and related cleanup into a timeout handler.
-        if(pDir) unlink(dbFile);
+        if(pDir) wasm.sqlite3_wasm_vfs_unlink(pVfs,dbFile);
         log2('',"Starting native app:\n ",argv.join(' '));
         log2('',"This will take a while and the browser might warn about the runaway JS.",
              "Give it time...");
@@ -155,7 +156,7 @@
             wasm.xCall('wasm_main', argv.length,
                        wasm.scopedAllocMainArgv(argv));
             wasm.scopedAllocPop(scope);
-            if(pDir) unlink(dbFile);
+            if(pDir) wasm.sqlite3_wasm_vfs_unlink(pVfs,dbFile);
             logList.unshift("Done running native main(). Output:");
             dumpLogList();
         }, 50);
diff --git a/manifest b/manifest
index 15b79eaab1..7dc2026e7d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\sbit\sto\sthe\soptimization\sdisabling\smask\sfor\sthe\sindexed\sexpression\noptimization.
-D 2022-10-20T16:30:05.203
+C Rename\ssqlite3_web_...\sto\ssqlite3_js_...\sDocument\sthe\sworker1.close.unlink\soption.\sFix\sunlink\susage\sin\sspeedtest1.html.\sMinor\sJS\sbuild\scleanups.
+D 2022-10-20T18:31:32.249
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -472,7 +472,7 @@ F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
-F ext/wasm/GNUmakefile 6cd57a8ce51424220917c6ff766e8a7b7998cbdc6a1e364c4366992a77f11de4
+F ext/wasm/GNUmakefile 645bd5670a56acf2c8f1e969c427555e3e8e74dfd6eac8c948858f530617c7d5
 F ext/wasm/README-dist.txt e78e44a58772d5b5d7a5a179b5bf639cd67b62249aac66138e2c319bd02dd243
 F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 89983a8d122c35a90c65ec667844b95a78bcd04f3198a99c1e0c8368c1a0b03a
@@ -484,11 +484,11 @@ F ext/wasm/api/post-js-footer.js cd0a8ec768501d9bd45d325ab0442037fb0e33d1f3b4f08
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
 F ext/wasm/api/pre-js.js 151e0616614a49f3db19ed544fa13b38c87c108959fbcd4029ea8399a562d94f
 F ext/wasm/api/sqlite3-api-cleanup.js 4d07a7524dc9b7b050acfde57163e839243ad2383bd7ee0de0178b1b3e988588
-F ext/wasm/api/sqlite3-api-glue.js 2f5a337181e541cf3d74ceafb600ebb730a1241a5572710a21133b6dd5b2b2e2
-F ext/wasm/api/sqlite3-api-oo1.js 9a5f0c00d476c504f16dcd456e1743dbc2826ca3d10645dfa62663a39e3ed0d8
+F ext/wasm/api/sqlite3-api-glue.js 0b5240bd325d2561f269cd0d82bf686336526e5e276251c2241adfbda802abf8
+F ext/wasm/api/sqlite3-api-oo1.js dc9b6a61649ad32836044de388c5248790239d62ced4e1116023135fcb0fc68b
 F ext/wasm/api/sqlite3-api-opfs.js 22d60ba956e873b65e2e0591e239178082bd53a6d563c3c58db7dc03e562e8f7
-F ext/wasm/api/sqlite3-api-prologue.js 7eef0383646c851e3f6a78e21b51e9c078c82829c9d3d2ded9aa0215d71de36c
-F ext/wasm/api/sqlite3-api-worker1.js c8133bb5848c082c6f0eb69722086dd876c389a3bc77cd404f23791a5c2a3300
+F ext/wasm/api/sqlite3-api-prologue.js 1366d538a7b388c299a389f441a79cf0b18af50208343545bd318936b6232acd
+F ext/wasm/api/sqlite3-api-worker1.js cb07b321164483524a27cf2207d4358b905703c410fcd8256e0acca5ab2fffb2
 F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
 F ext/wasm/api/sqlite3-opfs-async-proxy.js 206ce6bbc3c30ad51a37d9c25e3a2712e70b586e0f9a2cf8cb0b9619017c2671
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
@@ -513,7 +513,7 @@ F ext/wasm/demo-worker1.js 8ba51d94c4601fa5c313d9e59b63b238f5305b5d5739ad21f4782
 F ext/wasm/dist.make b3b156061ff6a35ce59715632c9446cb58e0fc497021a93c778fed051a04fde1
 F ext/wasm/fiddle.make acdb1a402864f9b05a4c89805c5e91d88f5080652d8861f0865655b172243847
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
-F ext/wasm/fiddle/fiddle-worker.js def4762721ff36e2fd1b5cb35725fc9f56933eb4fbf3dcdaab6eee164baa442e
+F ext/wasm/fiddle/fiddle-worker.js 7ee53ca846071de5d46bb11a2a269a7990ef9cfd8abfae2a25cc948499783d78
 F ext/wasm/fiddle/fiddle.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
 F ext/wasm/fiddle/fiddle.js 974b995119ac443685d7d94d3b3c58c6a36540e9eb3fed7069d5653284071715
 F ext/wasm/index-dist.html cb0da16cba0f21cda2c25724c5869102d48eb0af04446acd3cd0ca031f80ed19
@@ -524,8 +524,8 @@ F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e10
 F ext/wasm/scratchpad-wasmfs-main.js 1aa32c1035cf1440a226a28fefcbb5762fbbcb020ccbe5895f8736d701695c63
 F ext/wasm/speedtest1-wasmfs.html bc28eb29b69a73864b8d7aae428448f8b7e1de81d8bfb9bba99541322054dbd0
 F ext/wasm/speedtest1-worker.html 7b0cceab6a68b2883738e19f61d21620fe1244ba36c1b2e38d0efde57ecce86d
-F ext/wasm/speedtest1-worker.js b49358781aca651319eca3720857f19d0eae0868834992f8f6d666c1e976dff8
-F ext/wasm/speedtest1.html 00102689678b3c09ae6f5e4b3782e95f448e943a3491246e7be9ee349049bcaf
+F ext/wasm/speedtest1-worker.js 490844a70af72d7bb16cc766d66621c1ca587d8a3f7e6b804c69327fa34881f7
+F ext/wasm/speedtest1.html 6303e620162b2058d5e212f966a7caed4a31a516b6140fbc64185cb296218e4f
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
@@ -2036,8 +2036,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 535867a9c8719358380f89fd80473c484def9bb72744dd2fd28ada65999ee901
-R 85216d994cb9632dd89733d6a41cd6c8
-U drh
-Z 8b2ac4d684320c840aa3e0f63be89cad
+P 56df1482ab45d4d41f937b27c5a877b52fa082bfc6809ea682b62b47a51333de
+R afcc999df723d6bf12746efb0e783132
+U stephan
+Z 97b1f226f03f5d4357dc526c8056da42
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 8bf6cfe9ae..2f33d38322 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-56df1482ab45d4d41f937b27c5a877b52fa082bfc6809ea682b62b47a51333de
\ No newline at end of file
+ac9af71b72a749b0a040273a88480d56f49570b569389a4ea20cc055f494d8ff
\ No newline at end of file

From 875b95d4f5759c78f69e70496f84fb797702304d Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Thu, 20 Oct 2022 18:58:14 +0000
Subject: [PATCH 325/428] Apply magic.txt correction and addition reported in
 [forum post 2d2366a04a0385|forum:2d2366a04a0385].

FossilOrigin-Name: 9bf26e2aa3579f354ed2d314e1bf3e3ef117cbd71500ef5f76caa1de5cce1edc
---
 magic.txt     |  9 +++++----
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/magic.txt b/magic.txt
index 65622687cc..f52a7a90ed 100644
--- a/magic.txt
+++ b/magic.txt
@@ -9,18 +9,18 @@
 #     PRAGMA application_id = INTEGER;
 #
 # INTEGER can be any signed 32-bit integer.  That integer is written as
-# a 4-byte big-endian integer into offset 68 of the database header. 
+# a 4-byte big-endian integer into offset 68 of the database header.
 #
 # The Monotone application used "PRAGMA user_version=1598903374;" to set
 # its identifier long before "PRAGMA application_id" became available.
 # The user_version is very similar to application_id except that it is
-# stored at offset 68 instead of offset 60.  The application_id pragma
+# stored at offset 60 instead of offset 68.  The application_id pragma
 # is preferred.  The rule using offset 60 for Monotone is for historical
 # compatibility only.
 #
 0    string  =SQLite\ format\ 3
->68  belong  =0x0f055112  Fossil checkout - 
->68  belong  =0x0f055113  Fossil global configuration - 
+>68  belong  =0x0f055112  Fossil checkout -
+>68  belong  =0x0f055113  Fossil global configuration -
 >68  belong  =0x0f055111  Fossil repository -
 >68  belong  =0x42654462  Bentley Systems BeSQLite Database -
 >68  belong  =0x42654c6e  Bentley Systems Localization File -
@@ -29,4 +29,5 @@
 >68  belong  =0x47503130  OGC GeoPackage version 1.0 file -
 >68  belong  =0x45737269  Esri Spatially-Enabled Database -
 >68  belong  =0x4d504258  MBTiles tileset -
+>68  belong  =0x6a035744  TeXnicard card database
 >0   string  =SQLite      SQLite3 database
diff --git a/manifest b/manifest
index 7dc2026e7d..1e1b0ee252 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Rename\ssqlite3_web_...\sto\ssqlite3_js_...\sDocument\sthe\sworker1.close.unlink\soption.\sFix\sunlink\susage\sin\sspeedtest1.html.\sMinor\sJS\sbuild\scleanups.
-D 2022-10-20T18:31:32.249
+C Apply\smagic.txt\scorrection\sand\saddition\sreported\sin\s[forum\spost\s2d2366a04a0385|forum:2d2366a04a0385].
+D 2022-10-20T18:58:14.289
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -538,7 +538,7 @@ F ext/wasm/version-info.c 5fa356d38859d71a0369b5c37e1935def7413fcc8a4e349a39d905
 F ext/wasm/wasmfs.make ee0004813e16c283ff633e08b482008d56adf9b7d42f6c5612f7ab002b924f69
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
-F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
+F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
 F main.mk b1b02927b2e0b73d025f93e388f2f7fba07614e972453983bddc65cd2bf33bb1
 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
@@ -2036,8 +2036,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 56df1482ab45d4d41f937b27c5a877b52fa082bfc6809ea682b62b47a51333de
-R afcc999df723d6bf12746efb0e783132
+P ac9af71b72a749b0a040273a88480d56f49570b569389a4ea20cc055f494d8ff
+R b44d84c26c2f9b06f7e9b798ca72a049
 U stephan
-Z 97b1f226f03f5d4357dc526c8056da42
+Z e01cdee717736d0716b4f5500835f6af
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 2f33d38322..0796abfc38 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ac9af71b72a749b0a040273a88480d56f49570b569389a4ea20cc055f494d8ff
\ No newline at end of file
+9bf26e2aa3579f354ed2d314e1bf3e3ef117cbd71500ef5f76caa1de5cce1edc
\ No newline at end of file

From 96b6371d709a91015204b14e4b83e61a209bbde2 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Thu, 20 Oct 2022 21:28:31 +0000
Subject: [PATCH 326/428] Add more JS tests. Flesh out the aggregate UDF tests
 to use sqlite3_aggregate_context() so that they can each be used multiple
 times in the same statement. Add sqlite3_js_aggregate_context() convenience
 helper.

FossilOrigin-Name: 9d034ef5e1bab7c9651c2450dc85765fa6365d3f1414c711550de858ff8b3ece
---
 ext/wasm/api/sqlite3-api-oo1.js      |  22 +++---
 ext/wasm/api/sqlite3-api-prologue.js |  61 +++++++++++-----
 ext/wasm/api/sqlite3-api-worker1.js  |   2 +-
 ext/wasm/api/sqlite3-wasm.c          |   1 +
 ext/wasm/tester1.js                  | 100 +++++++++++++++++++++++----
 manifest                             |  20 +++---
 manifest.uuid                        |   2 +-
 7 files changed, 155 insertions(+), 53 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index c2e7eb14f1..d101bc17f3 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -149,9 +149,9 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     if( flagsStr.indexOf('w')>=0 ) oflags |= capi.SQLITE_OPEN_READWRITE;
     if( 0===oflags ) oflags |= capi.SQLITE_OPEN_READONLY;
     oflags |= capi.SQLITE_OPEN_EXRESCODE;
-    const scope = wasm.scopedAllocPush();
+    const stack = wasm.pstack.pointer;
     try {
-      const pPtr = wasm.allocPtr() /* output (sqlite3**) arg */;
+      const pPtr = wasm.pstack.allocPtr() /* output (sqlite3**) arg */;
       const pVfsName = vfsName ? (
         ('number'===typeof vfsName ? vfsName : wasm.scopedAllocCString(vfsName))
       ): 0;
@@ -163,21 +163,19 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
                               __dbTraceToConsole, 0);
       }
       // Check for per-VFS post-open SQL...
-      wasm.setPtrValue(pPtr, 0);
-      if(0===capi.sqlite3_file_control(
-        pDb, "main", capi.SQLITE_FCNTL_VFS_POINTER, pPtr
-      )){
-        const postInitSql = __vfsPostOpenSql[wasm.getPtrValue(pPtr)];
-        if(postInitSql){
-          rc = capi.sqlite3_exec(pDb, postInitSql, 0, 0, 0);
-          checkSqlite3Rc(pDb, rc);
-        }
+      const pVfs = capi.sqlite3_js_db_vfs(pDb);
+      //console.warn("Opened db",fn,"with vfs",vfsName,pVfs);
+      if(!pVfs) toss3("Internal error: cannot get VFS for new db handle.");
+      const postInitSql = __vfsPostOpenSql[pVfs];
+      if(postInitSql){
+        rc = capi.sqlite3_exec(pDb, postInitSql, 0, 0, 0);
+        checkSqlite3Rc(pDb, rc);
       }      
     }catch( e ){
       if( pDb ) capi.sqlite3_close_v2(pDb);
       throw e;
     }finally{
-      wasm.scopedAllocPop(scope);
+      wasm.pstack.restore(stack);
     }
     this.filename = fnJs;
     __ptrMap.set(this, pDb);
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index ca1542e2b2..da7d0740fa 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -280,6 +280,14 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
       this.name = 'WasmAllocError';
     }
   };
+  /**
+     Functionally equivalent to the WasmAllocError constructor but may
+     be used as part of an expression, e.g.:
+
+     ```
+     return someAllocatingFunction(x) || WasmAllocError.toss(...);
+     ```
+  */
   WasmAllocError.toss = (...args)=>{
     throw new WasmAllocError(args.join(' '));
   };
@@ -508,6 +516,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
        "flexible-string" argument converter.
     */
     sqlite3_exec: (pDb, sql, callback, pVoid, pErrMsg)=>{}/*installed later*/,
+
     /**
        Various internal-use utilities are added here as needed. They
        are bound to an object only so that we have access to them in
@@ -1024,6 +1033,14 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
       this.name = 'SQLite3Error';
     }
   };
+  /**
+     Functionally equivalent to the SQLite3Error constructor but may
+     be used as part of an expression, e.g.:
+
+     ```
+     return someFunction(x) || SQLite3Error.toss(...);
+     ```
+  */
   SQLite3Error.toss = (...args)=>{
     throw new SQLite3Error(args.join(' '));
   };
@@ -1096,8 +1113,10 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
      pointer. The 3rd argument specifies the database name of the
      given database connection to check, defaulting to the main db.
 
-     The 2nd and 3rd arguments may either be a JS string or a C-string
-     allocated from the wasm environment.
+     The 2nd and 3rd arguments may either be a JS string or a WASM
+     C-string. If the 2nd argument is a NULL WASM pointer, the default
+     VFS is assumed. If the 3rd is a NULL WASM pointer, "main" is
+     assumed.
 
      The truthy value it returns is a pointer to the `sqlite3_vfs`
      object.
@@ -1112,17 +1131,9 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
       const pK = capi.sqlite3_vfs_find(vfsName);
       if(!pK) return false;
       else if(!pDb){
-        return capi.sqlite3_vfs_find(0)===pK ? pK : false;
-      }
-      const ppVfs = wasm.allocPtr();
-      try{
-        return (
-          (0===capi.sqlite3_file_control(
-            pDb, dbName, capi.SQLITE_FCNTL_VFS_POINTER, ppVfs
-          )) && (wasm.getPtrValue(ppVfs) === pK)
-        ) ? pK : false;
-      }finally{
-        wasm.dealloc(ppVfs);
+        return pK===capi.sqlite3_vfs_find(0) ? pK : false;
+      }else{
+        return pK===capi.sqlite3_js_db_vfs(pDb) ? pK : false;
       }
     }catch(e){
       /* Ignore - probably bad args to a wasm-bound function. */
@@ -1179,14 +1190,32 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
         ? wasm.heap8u().slice(pOut, pOut + Number(nOut))
         : new Uint8Array();
       return rc;
-    }catch(e){
-      console.error('internal error?',e);
-      throw w;
     }finally{
       if(pOut) wasm.exports.sqlite3_free(pOut);
       wasm.pstack.restore(stack);
     }
   };
+
+  /**
+     Given a `sqlite3*` and a database name (JS string or WASM
+     C-string pointer, which may be 0), returns a pointer to the
+     sqlite3_vfs responsible for it. If the given db name is null/0,
+     or not provided, then "main" is assumed.
+  */
+  capi.sqlite3_js_db_vfs =
+    (dbPointer, dbName=0)=>wasm.sqlite3_wasm_db_vfs(dbPointer, dbName);
+
+  /**
+     A thin wrapper around capi.sqlite3_aggregate_context() which
+     behaves the same except that it throws a WasmAllocError if that
+     function returns 0.
+  */
+  capi.sqlite3_js_aggregate_context = (pCtx, n)=>{
+    return capi.sqlite3_aggregate_context(pCtx, n)
+      || WasmAllocError.toss(
+        "Cannot allocate",n,"bytes for sqlite3_aggregate_context()"
+      );
+  };
   
   if( capi.util.isMainWindow() ){
     /* Features specific to the main window thread... */
diff --git a/ext/wasm/api/sqlite3-api-worker1.js b/ext/wasm/api/sqlite3-api-worker1.js
index fa6a438462..dea06341a0 100644
--- a/ext/wasm/api/sqlite3-api-worker1.js
+++ b/ext/wasm/api/sqlite3-api-worker1.js
@@ -231,7 +231,7 @@
 
   If the `dbId` does not refer to an opened ID, this is a no-op. If
   the `args` object contains a truthy `unlink` value then the database
-  will unlinked (deleted) after closing it. The inability to close a
+  will be unlinked (deleted) after closing it. The inability to close a
   db (because it's not opened) or delete its file does not trigger an
   error.
 
diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index 1decf0593f..8b767948e4 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -48,6 +48,7 @@
 ** want undefined. Please keep these alphabetized.
 */
 #undef SQLITE_OMIT_DESERIALIZE
+#undef SQLITE_OMIT_MEMORYDB
 
 /*
 ** Define any SQLITE_... config defaults we want if they aren't
diff --git a/ext/wasm/tester1.js b/ext/wasm/tester1.js
index c8808c9137..0d4dd3bcfc 100644
--- a/ext/wasm/tester1.js
+++ b/ext/wasm/tester1.js
@@ -1083,6 +1083,47 @@
         .assert(0===this.db.openStatementCount());
     })
 
+  ////////////////////////////////////////////////////////////////////////
+    .t('sqlite3_js_...()', function(){
+      const db = this.db;
+      if(1){
+        const vfsList = capi.sqlite3_js_vfs_list();
+        T.assert(vfsList.length>1);
+        T.assert('string'===typeof vfsList[0]);
+
+        for(const v of vfsList){
+          T.assert('string' === typeof v)
+            .assert(capi.sqlite3_vfs_find(v) > 0);
+        }
+      }
+      /**
+         Trivia: the magic db name ":memory:" does not actually use the
+         "memdb" VFS unless "memdb" is _explicitly_ provided as the VFS
+         name. Instead, it uses the default VFS with an in-memory btree.
+         Thus this.db's VFS may not be memdb even though it's an in-memory
+         db.
+      */
+      const pVfsMem = capi.sqlite3_vfs_find('memdb'),
+            pVfsDflt = capi.sqlite3_vfs_find(0),
+            pVfsDb = capi.sqlite3_js_db_vfs(db.pointer);
+      T.assert(pVfsMem > 0)
+        .assert(pVfsDflt > 0)
+        .assert(pVfsDb > 0)
+        .assert(pVfsMem !== pVfsDflt
+                /* memdb lives on top of the default vfs */)
+        .assert(':memory:' === db.filename)
+        .assert(pVfsDb === pVfsDflt || pVfsdb === pVfsMem)
+      ;
+      /*const vMem = new capi.sqlite3_vfs(pVfsMem),
+        vDflt = new capi.sqlite3_vfs(pVfsDflt),
+        vDb = new capi.sqlite3_vfs(pVfsDb);*/
+      const duv = capi.sqlite3_js_db_uses_vfs;
+      T.assert(pVfsDflt === duv(db.pointer, 0)
+               || pVfsMem === duv(db.pointer,0))
+        .assert(!duv(db.pointer, "foo"))
+      ;
+    }/*sqlite3_js_...()*/)
+
   ////////////////////////////////////////////////////////////////////
     .t('Table t', function(sqlite3){
       const db = this.db;
@@ -1168,6 +1209,14 @@
           .assert(0==e.message.indexOf('Cannot prepare empty'));
       }
     })
+  ////////////////////////////////////////////////////////////////////////
+    .t('sqlite3_js_db_export()', function(){
+      const db = this.db;
+      const xp = capi.sqlite3_js_db_export(db.pointer);
+      T.assert(xp instanceof Uint8Array)
+        .assert(xp.byteLength>0)
+        .assert(0 === xp.byteLength % 512);
+    }/*sqlite3_js_db_export()*/)
 
   ////////////////////////////////////////////////////////////////////
     .t('Scalar UDFs', function(sqlite3){
@@ -1228,39 +1277,40 @@
       name: 'Aggregate UDFs',
       test: function(sqlite3){
         const db = this.db;
-        const aggState = {summer: 0, summerN: 0};
+        const sjac = capi.sqlite3_js_aggregate_context;
         db.createFunction({
           name: 'summer',
           xStep: function(pCtx, n){
-            aggState.summer += n;
+            const pAgg = sjac(pCtx, 4);
+            wasm.setMemValue(pAgg, wasm.getMemValue(pAgg,'i32') + Number(n), 'i32');
           },
-          xFinal: function(pCtx){
-            const rc = aggState.summer;
-            aggState.summer = 0;
-            return rc;
-          }
+          xFinal: (pCtx)=>wasm.getMemValue(sjac(pCtx, 4),'i32')
         });
         let v = db.selectValue([
           "with cte(v) as (",
           "select 3 union all select 5 union all select 7",
-          ") select summer(v) from cte"
+          ") select summer(v), summer(v+1) from cte"
+          /* ------------------^^^^^^^^^^^ ensures that we're handling
+              sqlite3_aggregate_context() properly. */
         ]);
         T.assert(15===v);
         T.mustThrowMatching(()=>db.selectValue("select summer(1,2)"),
                             /wrong number of arguments/);
+
         db.createFunction({
           name: 'summerN',
           arity: -1,
           xStep: function(pCtx, ...args){
-            for(const v of args) aggState.summerN += v;
+            const pAgg = sjac(pCtx, 4);
+            let sum = wasm.getMemValue(pAgg, 'i32');
+            for(const v of args) sum += Number(v);
+            wasm.setMemValue(pAgg, sum, 'i32');
           },
           xFinal: function(pCtx){
-            const rc = aggState.summerN;
-            aggState.summerN = 0;
-            return rc;
+            return wasm.getMemValue(sjac(pCtx, 4),'i32')
           }
         }); 
-        T.assert(18===db.selectValue('select summerN(1,8,9)'));
+        T.assert(18===db.selectValue('select summerN(1,8,9), summerN(2,3,4)'));
         T.mustThrowMatching(()=>{
           db.createFunction('nope',{
             xFunc: ()=>{}, xStep: ()=>{}
@@ -1284,6 +1334,30 @@
      }
     }/*aggregate UDFs*/)
 
+  ////////////////////////////////////////////////////////////////////////
+    .t({
+      name: 'Aggregate UDFs (64-bit)',
+      predicate: ()=>wasm.bigIntEnabled,
+      test: function(sqlite3){
+        const db = this.db;
+        const sjac = capi.sqlite3_js_aggregate_context;
+        db.createFunction({
+          name: 'summer64',
+          xStep: function(pCtx, n){
+            const pAgg = sjac(pCtx, 8);
+            wasm.setMemValue(pAgg, wasm.getMemValue(pAgg,'i64') + BigInt(n), 'i64');
+          },
+          xFinal: (pCtx)=>wasm.getMemValue(sjac(pCtx, 8),'i64')
+        });
+        let v = db.selectValue([
+            "with cte(v) as (",
+          "select 3 union all select 5 union all select 7",
+          ") select summer64(v*10), summer64(v+1) from cte"
+        ]);
+        T.assert(150n===BigInt(v));
+     }
+    }/*aggregate UDFs*/)
+
   ////////////////////////////////////////////////////////////////////
     .t({
       name: 'Window UDFs (tests are TODO)',
diff --git a/manifest b/manifest
index 1e1b0ee252..40a970ee62 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Apply\smagic.txt\scorrection\sand\saddition\sreported\sin\s[forum\spost\s2d2366a04a0385|forum:2d2366a04a0385].
-D 2022-10-20T18:58:14.289
+C Add\smore\sJS\stests.\sFlesh\sout\sthe\saggregate\sUDF\stests\sto\suse\ssqlite3_aggregate_context()\sso\sthat\sthey\scan\seach\sbe\sused\smultiple\stimes\sin\sthe\ssame\sstatement.\sAdd\ssqlite3_js_aggregate_context()\sconvenience\shelper.
+D 2022-10-20T21:28:31.440
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -485,14 +485,14 @@ F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1
 F ext/wasm/api/pre-js.js 151e0616614a49f3db19ed544fa13b38c87c108959fbcd4029ea8399a562d94f
 F ext/wasm/api/sqlite3-api-cleanup.js 4d07a7524dc9b7b050acfde57163e839243ad2383bd7ee0de0178b1b3e988588
 F ext/wasm/api/sqlite3-api-glue.js 0b5240bd325d2561f269cd0d82bf686336526e5e276251c2241adfbda802abf8
-F ext/wasm/api/sqlite3-api-oo1.js dc9b6a61649ad32836044de388c5248790239d62ced4e1116023135fcb0fc68b
+F ext/wasm/api/sqlite3-api-oo1.js 0e278d131dad72e9eb348a3dda6a4ff734a9e08925b4ed7e6e5a688d2edaf525
 F ext/wasm/api/sqlite3-api-opfs.js 22d60ba956e873b65e2e0591e239178082bd53a6d563c3c58db7dc03e562e8f7
-F ext/wasm/api/sqlite3-api-prologue.js 1366d538a7b388c299a389f441a79cf0b18af50208343545bd318936b6232acd
-F ext/wasm/api/sqlite3-api-worker1.js cb07b321164483524a27cf2207d4358b905703c410fcd8256e0acca5ab2fffb2
+F ext/wasm/api/sqlite3-api-prologue.js bb7a98a8c62545bf07b5fdee831c0d40c86f98c0094b00d8497a9de8976a0544
+F ext/wasm/api/sqlite3-api-worker1.js a7f38f03275d6c27ab2aef3e83215d3c97ce09c43e6904df47c3764d9d4572b4
 F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
 F ext/wasm/api/sqlite3-opfs-async-proxy.js 206ce6bbc3c30ad51a37d9c25e3a2712e70b586e0f9a2cf8cb0b9619017c2671
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c e1fcda97775dd149b4a2e0a4f16a22cede96daa5a91795ba214bdb3c2e680f4a
+F ext/wasm/api/sqlite3-wasm.c dde771a10e6a8d01ae516d32abc4cdd2d542cb3339e35c5b4be8ebbc1dc1ccc1
 F ext/wasm/api/sqlite3-worker1-promiser.js 0c7a9826dbf82a5ed4e4f7bf7816e825a52aff253afbf3350431f5773faf0e4b
 F ext/wasm/api/sqlite3-worker1.js dbe54b69c1520a2d25eae148cd2750ded2dd7f219ea4ee46f83e0a851dca5974
 F ext/wasm/batch-runner.html 4deeed44fe41496dc6898d9fb17938ea3291f40f4bfb977e29d0cef96fbbe4c8
@@ -533,7 +533,7 @@ F ext/wasm/test-opfs-vfs.html 1f2d672f3f3fce810dfd48a8d56914aba22e45c6834e262555
 F ext/wasm/test-opfs-vfs.js 48fc59110e8775bb43c9be25b6d634fc07ebadab7da8fbd44889e8129c6e2548
 F ext/wasm/tester1-worker.html 048c341f124fdb61ca14dfd1bd1f78742490f208aa3bb1e84399f83f1e7e6a74
 F ext/wasm/tester1.html 37ccc958fa0d95074af2d72b7241c8e2d982bbec6dda4dc790241af3d933c3b6
-F ext/wasm/tester1.js 44d71175e2941bf1d7c27afa0c395fe81c83cbd74cd10e34e0688dd833042f1e
+F ext/wasm/tester1.js 6e1c8e4d48add1d49fb7901dfee04fdf6cdd5bc39adcbf15c097f61b581a893c
 F ext/wasm/version-info.c 5fa356d38859d71a0369b5c37e1935def7413fcc8a4e349a39d9052c1d0479f4
 F ext/wasm/wasmfs.make ee0004813e16c283ff633e08b482008d56adf9b7d42f6c5612f7ab002b924f69
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
@@ -2036,8 +2036,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 ac9af71b72a749b0a040273a88480d56f49570b569389a4ea20cc055f494d8ff
-R b44d84c26c2f9b06f7e9b798ca72a049
+P 9bf26e2aa3579f354ed2d314e1bf3e3ef117cbd71500ef5f76caa1de5cce1edc
+R dbe97bbb80fe6071199461fb846ef1aa
 U stephan
-Z e01cdee717736d0716b4f5500835f6af
+Z 83bd13decfea9b8d2129079a8ff06725
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 0796abfc38..a3b802fb1b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9bf26e2aa3579f354ed2d314e1bf3e3ef117cbd71500ef5f76caa1de5cce1edc
\ No newline at end of file
+9d034ef5e1bab7c9651c2450dc85765fa6365d3f1414c711550de858ff8b3ece
\ No newline at end of file

From 6f3286cafd92fbf2d29db10983f67703c94d3ef8 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Thu, 20 Oct 2022 23:48:38 +0000
Subject: [PATCH 327/428] Make semantics for UDF xFinal() result handling and
 error reporting handling more flexible.

FossilOrigin-Name: 89f3e1982ec32c010af67d15ef780847df20de568669e5c9d02f3cf084f51330
---
 ext/wasm/api/sqlite3-api-glue.js     | 19 ++++--
 ext/wasm/api/sqlite3-api-prologue.js | 10 +--
 ext/wasm/tester1.js                  | 92 ++++++++++++++++------------
 manifest                             | 16 ++---
 manifest.uuid                        |  2 +-
 5 files changed, 81 insertions(+), 58 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index 7e467868ee..c9a3db15d9 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -226,6 +226,9 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     const __udfSetResult = function(pCtx, val){
       //console.warn("udfSetResult",typeof val, val);
       switch(typeof val) {
+          case 'undefined':
+            /* Assume that the client already called sqlite3_result_xxx(). */
+            break;
           case 'boolean':
             capi.sqlite3_result_int(pCtx, val ? 1 : 0);
             break;
@@ -320,7 +323,8 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
       if(e instanceof sqlite3.WasmAllocError){
         capi.sqlite3_result_error_nomem(pCtx);
       }else{
-        capi.sqlite3_result_error(pCtx, e.message, -1);
+        const msg = ('string'===typeof e) ? e : e.message;
+        capi.sqlite3_result_error(pCtx, msg, -1);
       }
     };
 
@@ -462,6 +466,11 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        - `number`: sqlite3_result_int() or sqlite3_result_double()
        - `string`: sqlite3_result_text()
        - Uint8Array or Int8Array: sqlite3_result_blob()
+       - `undefined`: indicates that the UDF called one of the
+         `sqlite3_result_xyz()` routines on its own, making this
+         function a no-op. Results are _undefined_ if this function is
+         passed the `undefined` value but did _not_ call one of the
+         `sqlite3_result_xyz()` routines.
 
        Anything else triggers sqlite3_result_error().
     */
@@ -494,10 +503,10 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     /**
        A helper for UDFs implemented in JS and bound to WASM by the
        client. It expects to be a passed `(sqlite3_context*, Error)`
-       (i.e. an exception object). And it sets the current UDF's
-       result to sqlite3_result_error_nomem() or sqlite3_result_error(),
-       depending on whether the 2nd argument is a
-       sqlite3.WasmAllocError object or not.
+       (an exception object or message string). And it sets the
+       current UDF's result to sqlite3_result_error_nomem() or
+       sqlite3_result_error(), depending on whether the 2nd argument
+       is a sqlite3.WasmAllocError object or not.
     */
     capi.sqlite3_create_function_v2.udfSetError =
       capi.sqlite3_create_function.udfSetError =
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index da7d0740fa..73d189c4f7 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -1208,13 +1208,15 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
   /**
      A thin wrapper around capi.sqlite3_aggregate_context() which
      behaves the same except that it throws a WasmAllocError if that
-     function returns 0.
+     function returns 0. As a special case, if n is falsy it does
+     _not_ throw if that function returns 0. That special case is
+     intended for use with xFinal() implementations.
   */
   capi.sqlite3_js_aggregate_context = (pCtx, n)=>{
     return capi.sqlite3_aggregate_context(pCtx, n)
-      || WasmAllocError.toss(
-        "Cannot allocate",n,"bytes for sqlite3_aggregate_context()"
-      );
+      || (n ? WasmAllocError.toss("Cannot allocate",n,
+                                  "bytes for sqlite3_aggregate_context()")
+          : 0);
   };
   
   if( capi.util.isMainWindow() ){
diff --git a/ext/wasm/tester1.js b/ext/wasm/tester1.js
index 0d4dd3bcfc..e51d0aeb23 100644
--- a/ext/wasm/tester1.js
+++ b/ext/wasm/tester1.js
@@ -43,44 +43,46 @@
   const isWorker = ()=>!isUIThread();
   /* Predicate for tests/groups. */
   const testIsTodo = ()=>false;
-  const haveWasmCTests = function(){
+  const haveWasmCTests = ()=>{
     return !!wasm.exports.sqlite3_wasm_test_int64_max;
   };
-  const mapToString = (v)=>{
-    switch(typeof v){
-        case 'number': case 'string': case 'boolean':
-        case 'undefined':
-          return ''+v;
-        default: break;
-    }
-    if(null===v) return 'null';
-    if(v instanceof Error){
-      v = {
-        message: v.message,
-        stack: v.stack,
-        errorClass: v.name
+  {
+    const mapToString = (v)=>{
+      switch(typeof v){
+          case 'number': case 'string': case 'boolean':
+          case 'undefined':
+            return ''+v;
+          default: break;
+      }
+      if(null===v) return 'null';
+      if(v instanceof Error){
+        v = {
+          message: v.message,
+          stack: v.stack,
+          errorClass: v.name
+        };
+      }
+      return JSON.stringify(v,undefined,2);
+    };
+    const normalizeArgs = (args)=>args.map(mapToString);
+    if( isUIThread() ){
+      console.log("Running in the UI thread.");
+      const logTarget = document.querySelector('#test-output');
+      logClass = function(cssClass,...args){
+        const ln = document.createElement('div');
+        if(cssClass) ln.classList.add(cssClass);
+        ln.append(document.createTextNode(normalizeArgs(args).join(' ')));
+        logTarget.append(ln);
+      };
+    }else{ /* Worker thread */
+      console.log("Running in a Worker thread.");
+      logClass = function(cssClass,...args){
+        postMessage({
+          type:'log',
+          payload:{cssClass, args: normalizeArgs(args)}
+        });
       };
     }
-    return JSON.stringify(v,undefined,2);
-  };
-  const normalizeArgs = (args)=>args.map(mapToString);
-  if( isUIThread() ){
-    console.log("Running in the UI thread.");
-    const logTarget = document.querySelector('#test-output');
-    logClass = function(cssClass,...args){
-      const ln = document.createElement('div');
-      if(cssClass) ln.classList.add(cssClass);
-      ln.append(document.createTextNode(normalizeArgs(args).join(' ')));
-      logTarget.append(ln);
-    };
-  }else{ /* Worker thread */
-    console.log("Running in a Worker thread.");
-    logClass = function(cssClass,...args){
-      postMessage({
-        type:'log',
-        payload:{cssClass, args: normalizeArgs(args)}
-      });
-    };
   }
   const log = (...args)=>{
     //console.log(...args);
@@ -1281,10 +1283,13 @@
         db.createFunction({
           name: 'summer',
           xStep: function(pCtx, n){
-            const pAgg = sjac(pCtx, 4);
-            wasm.setMemValue(pAgg, wasm.getMemValue(pAgg,'i32') + Number(n), 'i32');
+            const ac = sjac(pCtx, 4);
+            wasm.setMemValue(ac, wasm.getMemValue(ac,'i32') + Number(n), 'i32');
           },
-          xFinal: (pCtx)=>wasm.getMemValue(sjac(pCtx, 4),'i32')
+          xFinal: (pCtx)=>{
+            const ac = sjac(pCtx, 0);
+            return ac ? wasm.getMemValue(ac,'i32') : 0;
+          }
         });
         let v = db.selectValue([
           "with cte(v) as (",
@@ -1306,8 +1311,12 @@
             for(const v of args) sum += Number(v);
             wasm.setMemValue(pAgg, sum, 'i32');
           },
-          xFinal: function(pCtx){
-            return wasm.getMemValue(sjac(pCtx, 4),'i32')
+          xFinal: (pCtx)=>{
+            const ac = sjac(pCtx, 0);
+            capi.sqlite3_result_int( pCtx, ac ? wasm.getMemValue(ac,'i32') : 0 );
+            // xFinal() may either return its value directly or call
+            // sqlite3_result_xyz() and return undefined. Both are
+            // functionally equivalent.
           }
         }); 
         T.assert(18===db.selectValue('select summerN(1,8,9), summerN(2,3,4)'));
@@ -1347,7 +1356,10 @@
             const pAgg = sjac(pCtx, 8);
             wasm.setMemValue(pAgg, wasm.getMemValue(pAgg,'i64') + BigInt(n), 'i64');
           },
-          xFinal: (pCtx)=>wasm.getMemValue(sjac(pCtx, 8),'i64')
+          xFinal: (pCtx)=>{
+            const ac = sjac(pCtx, 0);
+            return ac ? wasm.getMemValue(ac,'i64') : 0n;
+          }
         });
         let v = db.selectValue([
             "with cte(v) as (",
diff --git a/manifest b/manifest
index 40a970ee62..730ee02808 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\smore\sJS\stests.\sFlesh\sout\sthe\saggregate\sUDF\stests\sto\suse\ssqlite3_aggregate_context()\sso\sthat\sthey\scan\seach\sbe\sused\smultiple\stimes\sin\sthe\ssame\sstatement.\sAdd\ssqlite3_js_aggregate_context()\sconvenience\shelper.
-D 2022-10-20T21:28:31.440
+C Make\ssemantics\sfor\sUDF\sxFinal()\sresult\shandling\sand\serror\sreporting\shandling\smore\sflexible.
+D 2022-10-20T23:48:38.866
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -484,10 +484,10 @@ F ext/wasm/api/post-js-footer.js cd0a8ec768501d9bd45d325ab0442037fb0e33d1f3b4f08
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
 F ext/wasm/api/pre-js.js 151e0616614a49f3db19ed544fa13b38c87c108959fbcd4029ea8399a562d94f
 F ext/wasm/api/sqlite3-api-cleanup.js 4d07a7524dc9b7b050acfde57163e839243ad2383bd7ee0de0178b1b3e988588
-F ext/wasm/api/sqlite3-api-glue.js 0b5240bd325d2561f269cd0d82bf686336526e5e276251c2241adfbda802abf8
+F ext/wasm/api/sqlite3-api-glue.js ea760df5991cee48e29aa6ced503027760462d5696d50521f7273a91e0e1430c
 F ext/wasm/api/sqlite3-api-oo1.js 0e278d131dad72e9eb348a3dda6a4ff734a9e08925b4ed7e6e5a688d2edaf525
 F ext/wasm/api/sqlite3-api-opfs.js 22d60ba956e873b65e2e0591e239178082bd53a6d563c3c58db7dc03e562e8f7
-F ext/wasm/api/sqlite3-api-prologue.js bb7a98a8c62545bf07b5fdee831c0d40c86f98c0094b00d8497a9de8976a0544
+F ext/wasm/api/sqlite3-api-prologue.js e4fbfa66eb6c5c544c52dea6cb48051eddcdc21c276c39a80801f5e76e6c5b56
 F ext/wasm/api/sqlite3-api-worker1.js a7f38f03275d6c27ab2aef3e83215d3c97ce09c43e6904df47c3764d9d4572b4
 F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
 F ext/wasm/api/sqlite3-opfs-async-proxy.js 206ce6bbc3c30ad51a37d9c25e3a2712e70b586e0f9a2cf8cb0b9619017c2671
@@ -533,7 +533,7 @@ F ext/wasm/test-opfs-vfs.html 1f2d672f3f3fce810dfd48a8d56914aba22e45c6834e262555
 F ext/wasm/test-opfs-vfs.js 48fc59110e8775bb43c9be25b6d634fc07ebadab7da8fbd44889e8129c6e2548
 F ext/wasm/tester1-worker.html 048c341f124fdb61ca14dfd1bd1f78742490f208aa3bb1e84399f83f1e7e6a74
 F ext/wasm/tester1.html 37ccc958fa0d95074af2d72b7241c8e2d982bbec6dda4dc790241af3d933c3b6
-F ext/wasm/tester1.js 6e1c8e4d48add1d49fb7901dfee04fdf6cdd5bc39adcbf15c097f61b581a893c
+F ext/wasm/tester1.js 5533cd100dc663dbe548fb04aefc490aa4b3d2e0ec2212f79881bb4893266e39
 F ext/wasm/version-info.c 5fa356d38859d71a0369b5c37e1935def7413fcc8a4e349a39d9052c1d0479f4
 F ext/wasm/wasmfs.make ee0004813e16c283ff633e08b482008d56adf9b7d42f6c5612f7ab002b924f69
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
@@ -2036,8 +2036,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 9bf26e2aa3579f354ed2d314e1bf3e3ef117cbd71500ef5f76caa1de5cce1edc
-R dbe97bbb80fe6071199461fb846ef1aa
+P 9d034ef5e1bab7c9651c2450dc85765fa6365d3f1414c711550de858ff8b3ece
+R dfb3978c0632c8b69ab9fb0976c9a2ee
 U stephan
-Z 83bd13decfea9b8d2129079a8ff06725
+Z c86f3e45c75ca0a38f433f4183ca8f53
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index a3b802fb1b..61a8d1fbb7 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9d034ef5e1bab7c9651c2450dc85765fa6365d3f1414c711550de858ff8b3ece
\ No newline at end of file
+89f3e1982ec32c010af67d15ef780847df20de568669e5c9d02f3cf084f51330
\ No newline at end of file

From a6ca996e4ae07a970a781f75529a20d955cfa138 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Fri, 21 Oct 2022 05:27:40 +0000
Subject: [PATCH 328/428] Expose sqlite3_vfs_unregister() to WASM and
 unregister kvvfs in Worker threads to avoid its unintended use there (in
 contexts other than local/sessionStorage). Correct registration of window
 functions, extend oo1.DB.createFunction() to support window functions, and
 add window function tests to tester1.js. Correct an incorrect 1-arg handling
 case for DB.exec(). Add per-test assertion counts to tester1.js.

FossilOrigin-Name: f07ce15479b7224b0d1ba9f147a433136e70c1461aa667d2737d4a918f778f55
---
 ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api |   1 +
 ext/wasm/api/sqlite3-api-glue.js            | 173 +++++++++++---------
 ext/wasm/api/sqlite3-api-oo1.js             | 109 +++++++-----
 ext/wasm/api/sqlite3-api-prologue.js        |  25 ++-
 ext/wasm/tester1.js                         |  85 +++++++---
 manifest                                    |  20 +--
 manifest.uuid                               |   2 +-
 7 files changed, 257 insertions(+), 158 deletions(-)

diff --git a/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api b/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
index 506775d2fe..b31f613576 100644
--- a/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
+++ b/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
@@ -89,5 +89,6 @@ _sqlite3_value_text
 _sqlite3_value_type
 _sqlite3_vfs_find
 _sqlite3_vfs_register
+_sqlite3_vfs_unregister
 _malloc
 _free
diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index c9a3db15d9..639e670792 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -443,10 +443,10 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
       try{
         const funcArgs = __xWrapFuncs({xStep, xFinal, xValue, xInverse, xDestroy},
                                       uninstall);
-        rc = sqlite3CreateFunction(pDb, funcName, nArg, eTextRep,
-                                   pApp, ...funcArgs);
+        rc = sqlite3CreateWindowFunction(pDb, funcName, nArg, eTextRep,
+                                         pApp, ...funcArgs);
       }catch(e){
-        console.error("sqlite3_create_function_v2() setup threw:",e);
+        console.error("sqlite3_create_window_function() setup threw:",e);
         for(let v of uninstall){
           wasm.uninstallFunction(v);
         }
@@ -607,6 +607,10 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
       // Structs NOT to register
       WasmTestStruct: true
     });
+    if(!util.isUIThread()){
+      /* We remove the kvvfs VFS from Worker threads below. */
+      notThese.sqlite3_kvvfs_methods = true;
+    }
     for(const s of wasm.ctype.structs){
       if(!notThese[s.name]){
         capi[s.name] = sqlite3.StructBinder(s);
@@ -614,89 +618,96 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     }
   }/*end C constant imports*/
 
-  if( util.isMainWindow()
-      && 0!==capi.sqlite3_vfs_find("kvvfs") ){/* kvvfs-specific glue */
-    const kvvfsMethods = new capi.sqlite3_kvvfs_methods(
-      wasm.exports.sqlite3_wasm_kvvfs_methods()
-    );
-    delete capi.sqlite3_kvvfs_methods;
+  const pKvvfs = capi.sqlite3_vfs_find("kvvfs");
+  if( pKvvfs ){/* kvvfs-specific glue */
+    if(util.isUIThread()){
+      const kvvfsMethods = new capi.sqlite3_kvvfs_methods(
+        wasm.exports.sqlite3_wasm_kvvfs_methods()
+      );
+      delete capi.sqlite3_kvvfs_methods;
 
-    const kvvfsMakeKey = wasm.exports.sqlite3_wasm_kvvfsMakeKeyOnPstack,
-          pstack = wasm.pstack,
-          pAllocRaw = wasm.exports.sqlite3_wasm_pstack_alloc;
+      const kvvfsMakeKey = wasm.exports.sqlite3_wasm_kvvfsMakeKeyOnPstack,
+            pstack = wasm.pstack,
+            pAllocRaw = wasm.exports.sqlite3_wasm_pstack_alloc;
 
-    const kvvfsStorage = (zClass)=>
-          ((115/*=='s'*/===wasm.getMemValue(zClass))
-           ? sessionStorage : localStorage);
-    
-    const kvvfsImpls = {
-      xRead: (zClass, zKey, zBuf, nBuf)=>{
-        const stack = pstack.pointer,
-              astack = wasm.scopedAllocPush();
-        try {
-          const zXKey = kvvfsMakeKey(zClass,zKey);
-          if(!zXKey) return -3/*OOM*/;
-          const jKey = wasm.cstringToJs(zXKey);
-          const jV = kvvfsStorage(zClass).getItem(jKey);
-          if(!jV) return -1;
-          const nV = jV.length /* Note that we are relying 100% on v being
-                                  ASCII so that jV.length is equal to the
-                                  C-string's byte length. */;
-          if(nBuf<=0) return nV;
-          else if(1===nBuf){
-            wasm.setMemValue(zBuf, 0);
-            return nV;
+      const kvvfsStorage = (zClass)=>
+            ((115/*=='s'*/===wasm.getMemValue(zClass))
+             ? sessionStorage : localStorage);
+      
+      const kvvfsImpls = {
+        xRead: (zClass, zKey, zBuf, nBuf)=>{
+          const stack = pstack.pointer,
+                astack = wasm.scopedAllocPush();
+          try {
+            const zXKey = kvvfsMakeKey(zClass,zKey);
+            if(!zXKey) return -3/*OOM*/;
+            const jKey = wasm.cstringToJs(zXKey);
+            const jV = kvvfsStorage(zClass).getItem(jKey);
+            if(!jV) return -1;
+            const nV = jV.length /* Note that we are relying 100% on v being
+                                    ASCII so that jV.length is equal to the
+                                    C-string's byte length. */;
+            if(nBuf<=0) return nV;
+            else if(1===nBuf){
+              wasm.setMemValue(zBuf, 0);
+              return nV;
+            }
+            const zV = wasm.scopedAllocCString(jV);
+            if(nBuf > nV + 1) nBuf = nV + 1;
+            wasm.heap8u().copyWithin(zBuf, zV, zV + nBuf - 1);
+            wasm.setMemValue(zBuf + nBuf - 1, 0);
+            return nBuf - 1;
+          }catch(e){
+            console.error("kvstorageRead()",e);
+            return -2;
+          }finally{
+            pstack.restore(stack);
+            wasm.scopedAllocPop(astack);
+          }
+        },
+        xWrite: (zClass, zKey, zData)=>{
+          const stack = pstack.pointer;
+          try {
+            const zXKey = kvvfsMakeKey(zClass,zKey);
+            if(!zXKey) return 1/*OOM*/;
+            const jKey = wasm.cstringToJs(zXKey);
+            kvvfsStorage(zClass).setItem(jKey, wasm.cstringToJs(zData));
+            return 0;
+          }catch(e){
+            console.error("kvstorageWrite()",e);
+            return capi.SQLITE_IOERR;
+          }finally{
+            pstack.restore(stack);
+          }
+        },
+        xDelete: (zClass, zKey)=>{
+          const stack = pstack.pointer;
+          try {
+            const zXKey = kvvfsMakeKey(zClass,zKey);
+            if(!zXKey) return 1/*OOM*/;
+            kvvfsStorage(zClass).removeItem(wasm.cstringToJs(zXKey));
+            return 0;
+          }catch(e){
+            console.error("kvstorageDelete()",e);
+            return capi.SQLITE_IOERR;
+          }finally{
+            pstack.restore(stack);
           }
-          const zV = wasm.scopedAllocCString(jV);
-          if(nBuf > nV + 1) nBuf = nV + 1;
-          wasm.heap8u().copyWithin(zBuf, zV, zV + nBuf - 1);
-          wasm.setMemValue(zBuf + nBuf - 1, 0);
-          return nBuf - 1;
-        }catch(e){
-          console.error("kvstorageRead()",e);
-          return -2;
-        }finally{
-          pstack.restore(stack);
-          wasm.scopedAllocPop(astack);
-        }
-      },
-      xWrite: (zClass, zKey, zData)=>{
-        const stack = pstack.pointer;
-        try {
-          const zXKey = kvvfsMakeKey(zClass,zKey);
-          if(!zXKey) return 1/*OOM*/;
-          const jKey = wasm.cstringToJs(zXKey);
-          kvvfsStorage(zClass).setItem(jKey, wasm.cstringToJs(zData));
-          return 0;
-        }catch(e){
-          console.error("kvstorageWrite()",e);
-          return capi.SQLITE_IOERR;
-        }finally{
-          pstack.restore(stack);
-        }
-      },
-      xDelete: (zClass, zKey)=>{
-        const stack = pstack.pointer;
-        try {
-          const zXKey = kvvfsMakeKey(zClass,zKey);
-          if(!zXKey) return 1/*OOM*/;
-          kvvfsStorage(zClass).removeItem(wasm.cstringToJs(zXKey));
-          return 0;
-        }catch(e){
-          console.error("kvstorageDelete()",e);
-          return capi.SQLITE_IOERR;
-        }finally{
-          pstack.restore(stack);
         }
+      }/*kvvfsImpls*/;
+      for(let k of Object.keys(kvvfsImpls)){
+        kvvfsMethods[kvvfsMethods.memberKey(k)] =
+          wasm.installFunction(
+            kvvfsMethods.memberSignature(k),
+            kvvfsImpls[k]
+          );
       }
-    }/*kvvfsImpls*/;
-    for(let k of Object.keys(kvvfsImpls)){
-      kvvfsMethods[kvvfsMethods.memberKey(k)] =
-        wasm.installFunction(
-          kvvfsMethods.memberSignature(k),
-          kvvfsImpls[k]
-        );
+    }else{
+      /* Worker thread: unregister kvvfs to avoid it being used
+         for anything other than local/sessionStorage. It "can"
+         be used that way but it's not really intended to be. */
+      capi.sqlite3_vfs_unregister(pKvvfs);
     }
-  }/*kvvfs*/
+  }/*pKvvfs*/
 
 });
diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index d101bc17f3..5b934818fd 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -374,11 +374,11 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
         case 1:
           if('string'===typeof args[0] || util.isSQLableTypedArray(args[0])){
             out.sql = args[0];
+          }else if(Array.isArray(args[0])){
+            out.sql = args[0];
           }else if(args[0] && 'object'===typeof args[0]){
             out.opt = args[0];
             out.sql = out.opt.sql;
-          }else if(Array.isArray(args[0])){
-            out.sql = args[0];
           }
           break;
         case 2:
@@ -392,7 +392,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     }else if(Array.isArray(out.sql)){
       out.sql = out.sql.join('');
     }else if('string'!==typeof out.sql){
-      toss3("Missing SQL argument.");
+      toss3("Missing SQL argument or unsupported SQL value type.");
     }
     if(out.opt.callback || out.opt.resultRows){
       switch((undefined===out.opt.rowMode)
@@ -811,8 +811,8 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        case, the function's name must be the 'name' property.
 
        The first two call forms can only be used for creating scalar
-       functions. Creating an aggregate function requires the
-       options-object form (see below for details).
+       functions. Creating an aggregate or window function requires
+       the options-object form (see below for details).
 
        UDFs cannot currently be removed from a DB handle after they're
        added. More correctly, they can be removed as documented for
@@ -837,14 +837,19 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
          properties to the "step" and "final" callbacks for the
          aggregate. Do not set the `xFunc` property.
 
-       The options object may optionally have an `xDestroy`
-       function-type property, as per
-       sqlite3_create_function_v2(). Its argument will be the
-       WASM-pointer-type value of the `pApp` property, and this
-       function will throw if `pApp` is defined but is not null,
-       undefined, or a numeric (WASM pointer) value.
+       - Window: set the `xStep`, `xFinal`, `xValue`, and `xInverse`
+         function-type properties. Do not set the `xFunc` property.
 
-       The optional options object may contain flags to modify how
+       The options object may optionally have an `xDestroy`
+       function-type property, as per sqlite3_create_function_v2().
+       Its argument will be the WASM-pointer-type value of the `pApp`
+       property, and this function will throw if `pApp` is defined but
+       is not null, undefined, or a numeric (WASM pointer)
+       value. i.e. `pApp`, if set, must be value suitable for use as a
+       WASM pointer argument, noting that `null` or `undefined` will
+       translate to 0 for that purpose.
+
+       The options object may contain flags to modify how
        the function is defined:
 
        - `arity`: the number of arguments which SQL calls to this
@@ -855,36 +860,39 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        arity value means that the function is variadic and may accept
        any number of arguments, up to sqlite3's compile-time
        limits. sqlite3 will enforce the argument count if is zero or
-       greater.
-
-       The callback always receives a pointer to an `sqlite3_context`
-       object as its first argument. Any arguments after that are from
-       SQL code. The leading context argument does _not_ count towards
-       the function's arity. See the docs for
+       greater. The callback always receives a pointer to an
+       `sqlite3_context` object as its first argument. Any arguments
+       after that are from SQL code. The leading context argument does
+       _not_ count towards the function's arity. See the docs for
        sqlite3.capi.sqlite3_create_function_v2() for why that argument
        is needed in the interface.
 
-       The following properties correspond to flags documented at:
+       The following options-object properties correspond to flags
+       documented at:
 
        https://sqlite.org/c3ref/create_function.html
 
-       - .deterministic = SQLITE_DETERMINISTIC
-       - .directOnly = SQLITE_DIRECTONLY
-       - .innocuous = SQLITE_INNOCUOUS
+       - `deterministic` = sqlite3.capi.SQLITE_DETERMINISTIC
+       - `directOnly` = sqlite3.capi.SQLITE_DIRECTONLY
+       - `innocuous` = sqlite3.capi.SQLITE_INNOCUOUS
+
+       Sidebar: the ability to add new WASM-accessible functions to
+       the runtime requires that the WASM build is compiled with the
+       equivalent functionality as that provided by Emscripten's
+       `-sALLOW_TABLE_GROWTH` flag.
     */
     createFunction: function f(name, xFunc, opt){
-      let xStep, xFinal;
       const isFunc = (f)=>(f instanceof Function);
       switch(arguments.length){
           case 1: /* (optionsObject) */
             opt = name;
             name = opt.name;
-            xFunc = opt.xFunc;
+            xFunc = opt.xFunc || 0;
             break;
           case 2: /* (name, callback|optionsObject) */
             if(!isFunc(xFunc)){
               opt = xFunc;
-              xFunc = opt.xFunc;
+              xFunc = opt.xFunc || 0;
             }
             break;
           case 3: /* name, xFunc, opt */
@@ -895,30 +903,46 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
       if('string' !== typeof name){
         toss3("Invalid arguments: missing function name.");
       }
-      xStep = opt.xStep;
-      xFinal = opt.xFinal;
+      let xStep = opt.xStep || 0;
+      let xFinal = opt.xFinal || 0;
+      const xValue = opt.xValue || 0;
+      const xInverse = opt.xInverse || 0;
+      let isWindow = undefined;
       if(isFunc(xFunc)){
+        isWindow = false;
         if(isFunc(xStep) || isFunc(xFinal)){
           toss3("Ambiguous arguments: scalar or aggregate?");
         }
         xStep = xFinal = null;
       }else if(isFunc(xStep)){
         if(!isFunc(xFinal)){
-          toss3("Missing xFinal() callback for aggregate UDF.");
+          toss3("Missing xFinal() callback for aggregate or window UDF.");
         }
         xFunc = null;
       }else if(isFunc(xFinal)){
-        toss3("Missing xStep() callback for aggregate UDF.");
+        toss3("Missing xStep() callback for aggregate or window UDF.");
       }else{
         toss3("Missing function-type properties.");
       }
+      if(false === isWindow){
+        if(isFunc(xValue) || isFunc(xInverse)){
+          toss3("xValue and xInverse are not permitted for non-window UDFs.");
+        }
+      }else if(isFunc(xValue)){
+        if(!isFunc(xInverse)){
+          toss3("xInverse must be provided if xValue is.");
+        }
+        isWindow = true;
+      }else if(isFunc(xInverse)){
+        toss3("xValue must be provided if xInverse is.");
+      }
       const pApp = opt.pApp;
       if(undefined!==pApp &&
          null!==pApp &&
          (('number'!==typeof pApp) || !capi.util.isInt32(pApp))){
         toss3("Invalid value for pApp property. Must be a legal WASM pointer value.");
       }
-      const xDestroy = opt.xDestroy;
+      const xDestroy = opt.xDestroy || 0;
       if(xDestroy && !isFunc(xDestroy)){
         toss3("xDestroy property must be a function.");
       }
@@ -929,13 +953,22 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
       name = name.toLowerCase();
       const xArity = xFunc || xStep;
       const arity = getOwnOption(opt, 'arity');
-      DB.checkRc(this, capi.sqlite3_create_function_v2(
-        this.pointer, name,
-        ('number'===typeof arity
-         ? arity
-         : (xArity.length ? xArity.length-1/*for pCtx arg*/ : 0)),
-        capi.SQLITE_UTF8 | fFlags, pApp,
-        xFunc, xStep, xFinal, xDestroy));
+      const arityArg = ('number'===typeof arity
+                        ? arity
+                        : (xArity.length ? xArity.length-1/*for pCtx arg*/ : 0));
+      let rc;
+      if( isWindow ){
+        rc = capi.sqlite3_create_window_function(
+          this.pointer, name, arityArg,
+          capi.SQLITE_UTF8 | fFlags, pApp || 0,
+          xStep, xFinal, xValue, xInverse, xDestroy);
+      }else{
+        rc = capi.sqlite3_create_function_v2(
+          this.pointer, name, arityArg,
+          capi.SQLITE_UTF8 | fFlags, pApp || 0,
+          xFunc, xStep, xFinal, xDestroy);
+      }
+      DB.checkRc(this, rc);
       return this;
     }/*createFunction()*/,
     /**
@@ -1642,7 +1675,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     dbCtorHelper
   }/*oo1 object*/;
 
-  if(util.isMainWindow()){
+  if(util.isUIThread()){
     /**
        Functionally equivalent to DB(storageName,'c','kvvfs') except
        that it throws if the given storage name is not one of 'local'
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 73d189c4f7..1fcc9a64ab 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -289,7 +289,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
      ```
   */
   WasmAllocError.toss = (...args)=>{
-    throw new WasmAllocError(args.join(' '));
+    throw new WasmAllocError(...args);
   };
 
   /** 
@@ -530,9 +530,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
       isBindableTypedArray,
       isInt32, isSQLableTypedArray, isTypedArray, 
       typedArrayToString,
-      isMainWindow: ()=>{
-        return 'undefined' === typeof WorkerGlobalScope
-      }
+      isUIThread: ()=>'undefined'===typeof WorkerGlobalScope
     },
     
     /**
@@ -839,7 +837,8 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     ["sqlite3_value_text", "string", "sqlite3_value*"],
     ["sqlite3_value_type", "int", "sqlite3_value*"],
     ["sqlite3_vfs_find", "*", "string"],
-    ["sqlite3_vfs_register", "int", "*", "int"]
+    ["sqlite3_vfs_register", "int", "sqlite3_vfs*", "int"],
+    ["sqlite3_vfs_unregister", "int", "sqlite3_vfs*"]
   ]/*wasm.bindingSignatures*/;
 
   if(false && wasm.compileOptionUsed('SQLITE_ENABLE_NORMALIZE')){
@@ -1026,10 +1025,18 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
   class SQLite3Error extends Error {
     /**
        Constructs this object with a message equal to all arguments
-       concatenated with a space between each one.
+       concatenated with a space between each one. As a special case,
+       if it's passed only a single integer argument, the string form
+       of that argument is the result of
+       sqlite3.capi.sqlite3_js_rc_str() or (if that returns falsy), a
+       synthesized string which contains that integer.
     */
     constructor(...args){
-      super(args.join(' '));
+      if(1===args.length && 'number'===typeof args[0] && args[0]===(args[0] | 0)){
+        super(capi.sqlite3_js_rc_str(args[0]) || ("Unknown result code #"+args[0]));
+      }else{
+        super(args.join(' '));
+      }
       this.name = 'SQLite3Error';
     }
   };
@@ -1042,7 +1049,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
      ```
   */
   SQLite3Error.toss = (...args)=>{
-    throw new SQLite3Error(args.join(' '));
+    throw new SQLite3Error(...args);
   };
 
   /** State for sqlite3_wasmfs_opfs_dir(). */
@@ -1219,7 +1226,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
           : 0);
   };
   
-  if( capi.util.isMainWindow() ){
+  if( capi.util.isUIThread() ){
     /* Features specific to the main window thread... */
 
     /**
diff --git a/ext/wasm/tester1.js b/ext/wasm/tester1.js
index e51d0aeb23..642ca1024e 100644
--- a/ext/wasm/tester1.js
+++ b/ext/wasm/tester1.js
@@ -50,7 +50,7 @@
     const mapToString = (v)=>{
       switch(typeof v){
           case 'number': case 'string': case 'boolean':
-          case 'undefined':
+          case 'undefined': case 'bigint':
             return ''+v;
           default: break;
       }
@@ -216,7 +216,7 @@
           }
           log(TestUtil.separator);
           logClass('group-start',"Group #"+this.number+':',this.name);
-          const indent = '....';
+          const indent = '    ';
           const assertCount = TestUtil.counter;
           const groupState = Object.create(null);
           const skipped = [];
@@ -230,7 +230,7 @@
               const tc = TestUtil.counter
               log(indent, n+":", t.name);
               await t.test.call(groupState, sqlite3);
-              //log(indent, indent, 'assertion count:',TestUtil.counter - tc);
+              log(indent, indent, TestUtil.counter - tc, 'assertion(s)');
             }
           }
           logClass('green',
@@ -312,6 +312,8 @@
         T.assert(e instanceof Error)
           .assert(e instanceof sqlite3.WasmAllocError);
       }
+      try{ throw new sqlite3.SQLite3Error(capi.SQLITE_SCHEMA) }
+      catch(e){ T.assert('SQLITE_SCHEMA' === e.message) }
     })
   ////////////////////////////////////////////////////////////////////
     .t('strglob/strlike', function(sqlite3){
@@ -1092,7 +1094,7 @@
         const vfsList = capi.sqlite3_js_vfs_list();
         T.assert(vfsList.length>1);
         T.assert('string'===typeof vfsList[0]);
-
+        //log("vfsList =",vfsList);
         for(const v of vfsList){
           T.assert('string' === typeof v)
             .assert(capi.sqlite3_vfs_find(v) > 0);
@@ -1282,7 +1284,7 @@
         const sjac = capi.sqlite3_js_aggregate_context;
         db.createFunction({
           name: 'summer',
-          xStep: function(pCtx, n){
+          xStep: (pCtx, n)=>{
             const ac = sjac(pCtx, 4);
             wasm.setMemValue(ac, wasm.getMemValue(ac,'i32') + Number(n), 'i32');
           },
@@ -1305,11 +1307,11 @@
         db.createFunction({
           name: 'summerN',
           arity: -1,
-          xStep: function(pCtx, ...args){
-            const pAgg = sjac(pCtx, 4);
-            let sum = wasm.getMemValue(pAgg, 'i32');
+          xStep: (pCtx, ...args)=>{
+            const ac = sjac(pCtx, 4);
+            let sum = wasm.getMemValue(ac, 'i32');
             for(const v of args) sum += Number(v);
-            wasm.setMemValue(pAgg, sum, 'i32');
+            wasm.setMemValue(ac, sum, 'i32');
           },
           xFinal: (pCtx)=>{
             const ac = sjac(pCtx, 0);
@@ -1352,9 +1354,9 @@
         const sjac = capi.sqlite3_js_aggregate_context;
         db.createFunction({
           name: 'summer64',
-          xStep: function(pCtx, n){
-            const pAgg = sjac(pCtx, 8);
-            wasm.setMemValue(pAgg, wasm.getMemValue(pAgg,'i64') + BigInt(n), 'i64');
+          xStep: (pCtx, n)=>{
+            const ac = sjac(pCtx, 8);
+            wasm.setMemValue(ac, wasm.getMemValue(ac,'i64') + BigInt(n), 'i64');
           },
           xFinal: (pCtx)=>{
             const ac = sjac(pCtx, 0);
@@ -1362,19 +1364,64 @@
           }
         });
         let v = db.selectValue([
-            "with cte(v) as (",
-          "select 3 union all select 5 union all select 7",
-          ") select summer64(v*10), summer64(v+1) from cte"
+          "with cte(v) as (",
+          "select 9007199254740991 union all select 1 union all select 2",
+          ") select summer64(v), summer64(v+1) from cte"
         ]);
-        T.assert(150n===BigInt(v));
+        T.assert(9007199254740994n===v);
      }
     }/*aggregate UDFs*/)
 
   ////////////////////////////////////////////////////////////////////
     .t({
-      name: 'Window UDFs (tests are TODO)',
-      predicate: testIsTodo
-    })
+      name: 'Window UDFs',
+      test: function(){
+        /* Example window function, table, and results taken from:
+           https://sqlite.org/windowfunctions.html#udfwinfunc */
+        const db = this.db;
+        const sjac = (cx,n=4)=>capi.sqlite3_js_aggregate_context(cx,n);
+        const xValueFinal = (pCtx)=>{
+          const ac = sjac(pCtx, 0);
+          return ac ? wasm.getMemValue(ac,'i32') : 0;
+        };
+        const xStepInverse = (pCtx, n)=>{
+          const ac = sjac(pCtx);
+          wasm.setMemValue(ac, wasm.getMemValue(ac,'i32') + Number(n), 'i32');
+        };
+        db.createFunction({
+          name: 'winsumint',
+          xStep: (pCtx, n)=>xStepInverse(pCtx, n),
+          xInverse: (pCtx, n)=>xStepInverse(pCtx, -n),
+          xFinal: xValueFinal,
+          xValue: xValueFinal
+        });
+        db.exec([
+          "CREATE TABLE twin(x, y); INSERT INTO twin VALUES",
+          "('a', 4),('b', 5),('c', 3),('d', 8),('e', 1)"
+        ]);
+        let count = 0;
+        db.exec({
+          sql:[
+            "SELECT x, winsumint(y) OVER (",
+            "ORDER BY x ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING",
+            ") AS sum_y ",
+            "FROM twin ORDER BY x;",
+            "DROP TABLE twin;"
+          ],
+          callback: function(row){
+            switch(++count){
+                case 1: T.assert('a'===row[0] && 9===row[1]); break;
+                case 2: T.assert('b'===row[0] && 12===row[1]); break;
+                case 3: T.assert('c'===row[0] && 16===row[1]); break;
+                case 4: T.assert('d'===row[0] && 12===row[1]); break;
+                case 5: T.assert('e'===row[0] && 9===row[1]); break;
+                default: toss("Too many rows to window function.");
+            }
+          }
+        });
+        T.assert(5 === count);
+      }
+    }/*window UDFs*/)
 
   ////////////////////////////////////////////////////////////////////
     .t("ATTACH", function(){
diff --git a/manifest b/manifest
index 730ee02808..e45eccf68a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\ssemantics\sfor\sUDF\sxFinal()\sresult\shandling\sand\serror\sreporting\shandling\smore\sflexible.
-D 2022-10-20T23:48:38.866
+C Expose\ssqlite3_vfs_unregister()\sto\sWASM\sand\sunregister\skvvfs\sin\sWorker\sthreads\sto\savoid\sits\sunintended\suse\sthere\s(in\scontexts\sother\sthan\slocal/sessionStorage).\sCorrect\sregistration\sof\swindow\sfunctions,\sextend\soo1.DB.createFunction()\sto\ssupport\swindow\sfunctions,\sand\sadd\swindow\sfunction\stests\sto\stester1.js.\sCorrect\san\sincorrect\s1-arg\shandling\scase\sfor\sDB.exec().\sAdd\sper-test\sassertion\scounts\sto\stester1.js.
+D 2022-10-21T05:27:40.995
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -475,7 +475,7 @@ F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34ce
 F ext/wasm/GNUmakefile 645bd5670a56acf2c8f1e969c427555e3e8e74dfd6eac8c948858f530617c7d5
 F ext/wasm/README-dist.txt e78e44a58772d5b5d7a5a179b5bf639cd67b62249aac66138e2c319bd02dd243
 F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
-F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 89983a8d122c35a90c65ec667844b95a78bcd04f3198a99c1e0c8368c1a0b03a
+F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 36f413ab4dbb057d2dec938fb366ac0a4c5e85ba14660a8d672f0277602c0fc5
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
 F ext/wasm/api/README.md 1350088aee90e959ad9a94fab1bb6bcb5e99d4d27f976db389050f54f2640c78
 F ext/wasm/api/extern-post-js.js efbed835f290b3741259acc5faf68714a60d38e6834e6cfe172d5354c87566d2
@@ -484,10 +484,10 @@ F ext/wasm/api/post-js-footer.js cd0a8ec768501d9bd45d325ab0442037fb0e33d1f3b4f08
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
 F ext/wasm/api/pre-js.js 151e0616614a49f3db19ed544fa13b38c87c108959fbcd4029ea8399a562d94f
 F ext/wasm/api/sqlite3-api-cleanup.js 4d07a7524dc9b7b050acfde57163e839243ad2383bd7ee0de0178b1b3e988588
-F ext/wasm/api/sqlite3-api-glue.js ea760df5991cee48e29aa6ced503027760462d5696d50521f7273a91e0e1430c
-F ext/wasm/api/sqlite3-api-oo1.js 0e278d131dad72e9eb348a3dda6a4ff734a9e08925b4ed7e6e5a688d2edaf525
+F ext/wasm/api/sqlite3-api-glue.js 6e4e472eb5afc732a695cd7c5ded6dee6ef8b480e61aa0d648a3fc9033c84745
+F ext/wasm/api/sqlite3-api-oo1.js 5016f6dd4b6b461bb6047fe6a2d3d7cbe85aa6b110c263ebf0347672a0cd897e
 F ext/wasm/api/sqlite3-api-opfs.js 22d60ba956e873b65e2e0591e239178082bd53a6d563c3c58db7dc03e562e8f7
-F ext/wasm/api/sqlite3-api-prologue.js e4fbfa66eb6c5c544c52dea6cb48051eddcdc21c276c39a80801f5e76e6c5b56
+F ext/wasm/api/sqlite3-api-prologue.js fa00d55f927e5a4ec51cf2c80f6f0eaed2f4f5774341ecf3d63a0ea4c738f8f5
 F ext/wasm/api/sqlite3-api-worker1.js a7f38f03275d6c27ab2aef3e83215d3c97ce09c43e6904df47c3764d9d4572b4
 F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
 F ext/wasm/api/sqlite3-opfs-async-proxy.js 206ce6bbc3c30ad51a37d9c25e3a2712e70b586e0f9a2cf8cb0b9619017c2671
@@ -533,7 +533,7 @@ F ext/wasm/test-opfs-vfs.html 1f2d672f3f3fce810dfd48a8d56914aba22e45c6834e262555
 F ext/wasm/test-opfs-vfs.js 48fc59110e8775bb43c9be25b6d634fc07ebadab7da8fbd44889e8129c6e2548
 F ext/wasm/tester1-worker.html 048c341f124fdb61ca14dfd1bd1f78742490f208aa3bb1e84399f83f1e7e6a74
 F ext/wasm/tester1.html 37ccc958fa0d95074af2d72b7241c8e2d982bbec6dda4dc790241af3d933c3b6
-F ext/wasm/tester1.js 5533cd100dc663dbe548fb04aefc490aa4b3d2e0ec2212f79881bb4893266e39
+F ext/wasm/tester1.js 3fc539001b861d6360ea8c4825351157251204781b7a45389527574ad338c7e1
 F ext/wasm/version-info.c 5fa356d38859d71a0369b5c37e1935def7413fcc8a4e349a39d9052c1d0479f4
 F ext/wasm/wasmfs.make ee0004813e16c283ff633e08b482008d56adf9b7d42f6c5612f7ab002b924f69
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
@@ -2036,8 +2036,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 9d034ef5e1bab7c9651c2450dc85765fa6365d3f1414c711550de858ff8b3ece
-R dfb3978c0632c8b69ab9fb0976c9a2ee
+P 89f3e1982ec32c010af67d15ef780847df20de568669e5c9d02f3cf084f51330
+R 8a68d8975e926edd4ad048c9589fdc73
 U stephan
-Z c86f3e45c75ca0a38f433f4183ca8f53
+Z 78e197950cf91aa30272843b46106df8
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 61a8d1fbb7..9dfbdf93ac 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-89f3e1982ec32c010af67d15ef780847df20de568669e5c9d02f3cf084f51330
\ No newline at end of file
+f07ce15479b7224b0d1ba9f147a433136e70c1461aa667d2737d4a918f778f55
\ No newline at end of file

From 848d27ada1d856cf8cfb677ba5cb8148d6516dc0 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Fri, 21 Oct 2022 06:26:17 +0000
Subject: [PATCH 329/428] Add timing info and OPFS sanity tests to tester1.js

FossilOrigin-Name: 99915b0076422487cdd181a54e55694404fba13e4a540329b5ede9e2c9e12532
---
 ext/wasm/api/sqlite3-api-oo1.js |  2 +-
 ext/wasm/common/testing.css     |  2 +
 ext/wasm/tester1-worker.html    |  6 ++-
 ext/wasm/tester1.js             | 83 +++++++++++++++++++++++++++------
 manifest                        | 18 +++----
 manifest.uuid                   |  2 +-
 6 files changed, 86 insertions(+), 27 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index 5b934818fd..b1b79c643e 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -87,7 +87,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
      being-construct DB object as its "this". See the DB constructor
      for the argument docs. This is split into a separate function
      in order to enable simple creation of special-case DB constructors,
-     e.g. JsStorageDB and OpfsDB.
+     e.g. JsStorageDB and OpfsDb.
 
      Expects to be passed a configuration object with the following
      properties:
diff --git a/ext/wasm/common/testing.css b/ext/wasm/common/testing.css
index 27f77e45c7..47517d9672 100644
--- a/ext/wasm/common/testing.css
+++ b/ext/wasm/common/testing.css
@@ -34,8 +34,10 @@ span.labeled-input {
     color: red;
     background-color: yellow;
 }
+.strong { font-weight: 700 }
 .warning { color: firebrick; }
 .green { color: darkgreen; }
+.faded { opacity: 0.5; }
 .group-start { color: blue; }
 .group-end { color: blue; }
 .input-wrapper { white-space: nowrap; }
diff --git a/ext/wasm/tester1-worker.html b/ext/wasm/tester1-worker.html
index e127cffdca..4baf084e73 100644
--- a/ext/wasm/tester1-worker.html
+++ b/ext/wasm/tester1-worker.html
@@ -20,7 +20,11 @@
       const logTarget = document.querySelector('#test-output');
       const logHtml = function(cssClass,...args){
         const ln = document.createElement('div');
-        if(cssClass) ln.classList.add(cssClass);
+        if(cssClass){
+          for(const c of (Array.isArray(cssClass) ? cssClass : [cssClass])){
+            ln.classList.add(c);
+          }
+        }
         ln.append(document.createTextNode(args.join(' ')));
         logTarget.append(ln);
       };
diff --git a/ext/wasm/tester1.js b/ext/wasm/tester1.js
index 642ca1024e..bc93c9c37c 100644
--- a/ext/wasm/tester1.js
+++ b/ext/wasm/tester1.js
@@ -70,7 +70,11 @@
       const logTarget = document.querySelector('#test-output');
       logClass = function(cssClass,...args){
         const ln = document.createElement('div');
-        if(cssClass) ln.classList.add(cssClass);
+        if(cssClass){
+          for(const c of (Array.isArray(cssClass) ? cssClass : [cssClass])){
+            ln.classList.add(c);
+          }
+        }
         ln.append(document.createTextNode(normalizeArgs(args).join(' ')));
         logTarget.append(ln);
       };
@@ -105,6 +109,8 @@
     throw new Error(args.join(' '));
   };
 
+  const roundMs = (ms)=>Math.round(ms*100)/100;
+
   /**
      Helpers for writing sqlite3-specific tests.
   */
@@ -210,33 +216,41 @@
           return this;
         },
         run: async function(sqlite3){
-          if(this.predicate && !this.predicate()){
-            log("SKIPPING test group #"+this.number,this.name);
-            return;
-          }
           log(TestUtil.separator);
           logClass('group-start',"Group #"+this.number+':',this.name);
           const indent = '    ';
+          if(this.predicate && !this.predicate(sqlite3)){
+            logClass('warning',indent,
+                     "SKIPPING group because predicate says to.");
+            return;
+          }
           const assertCount = TestUtil.counter;
           const groupState = Object.create(null);
           const skipped = [];
+          let runtime = 0;
           for(let i in this.tests){
             const t = this.tests[i];
             const n = this.number+"."+i;
-            if(t.predicate && !t.predicate()){
-              logClass('warning',indent, n+': SKIPPING',t.name);
+              log(indent, n+":", t.name);
+            if(t.predicate && !t.predicate(sqlite3)){
+              logClass('warning', indent, indent,
+                       'SKIPPING because predicate says to');
               skipped.push( n+': '+t.name );
             }else{
-              const tc = TestUtil.counter
-              log(indent, n+":", t.name);
+              const tc = TestUtil.counter, now = performance.now();
               await t.test.call(groupState, sqlite3);
-              log(indent, indent, TestUtil.counter - tc, 'assertion(s)');
+              const then = performance.now();
+              runtime += then - now;
+              logClass('faded',indent, indent,
+                       TestUtil.counter - tc, 'assertion(s) in',
+                       roundMs(then-now),'ms');
             }
           }
           logClass('green',
-                   "Group #"+this.number,"assertion count:",(TestUtil.counter - assertCount));
+                   "Group #"+this.number+":",(TestUtil.counter - assertCount),
+                   "assertion(s) in",roundMs(runtime),"ms");
           if(skipped.length){
-            log("SKIPPED test(s) in group",this.number+":",skipped);
+            logClass('warning',"SKIPPED test(s) in group",this.number+":",skipped);
           }
         }
       };
@@ -245,7 +259,8 @@
     testGroups: [],
     currentTestGroup: undefined,
     addGroup: function(name, predicate){
-      this.testGroups.push( this.currentTestGroup = new this.TestGroup(name) );
+      this.testGroups.push( this.currentTestGroup =
+                            new this.TestGroup(name, predicate) );
       return this;
     },
     addTest: function(name, callback){
@@ -264,11 +279,16 @@
     runTests: async function(sqlite3){
       return new Promise(async function(pok,pnok){
         try {
+          let runtime = 0;
           for(let g of this.testGroups){
+            const now = performance.now();
             await g.run(sqlite3);
+            runtime += performance.now() - now;
           }
           log(TestUtil.separator);
-          log("Done running tests. Total assertion count:",TestUtil.counter);
+          logClass(['strong','green'],
+                   "Done running tests.",TestUtil.counter,"assertions in",
+                   roundMs(runtime),'ms');
           pok();
         }catch(e){
           error(e);
@@ -1558,6 +1578,33 @@
     })
   ;/* end of oo1 checks */
 
+  ////////////////////////////////////////////////////////////////////////
+  T.g('OPFS (Worker thread only and only in supported browsers)',
+      (sqlite3)=>{return !!sqlite3.opfs})
+    .t({
+      name: 'OPFS sanity checks',
+      test: function(sqlite3){
+        const filename = 'tester1.js';
+        const pVfs = capi.sqlite3_vfs_find('opfs');
+        T.assert(pVfs);
+        const unlink = (fn=filename)=>wasm.sqlite3_wasm_vfs_unlink(pVfs,fn);
+        unlink();
+        let db = new sqlite3.opfs.OpfsDb(filename);
+        db.exec([
+          'create table p(a);',
+          'insert into p(a) values(1),(2),(3)'
+        ]);
+        T.assert(3 === db.selectValue('select count(*) from p'));
+        db.close();
+        db = new sqlite3.opfs.OpfsDb(filename);
+        db.exec('insert into p(a) values(4),(5),(6)');
+        T.assert(6 === db.selectValue('select count(*) from p'));
+        db.close();
+        unlink();
+      }
+    }/*OPFS sanity checks*/)
+  ;/* end OPFS tests */
+
   ////////////////////////////////////////////////////////////////////////
   log("Loading and initializing sqlite3 WASM module...");
   if(!isUIThread()){
@@ -1592,9 +1639,15 @@
     wasm = capi.wasm;
     log("sqlite3 version:",capi.sqlite3_libversion(),
         capi.sqlite3_sourceid());
-    log("BigInt/int64 support is",(wasm.bigIntEnabled ? "enabled" : "disabled"));
+    if(wasm.bigIntEnabled){
+      log("BigInt/int64 support is enabled.");
+    }else{
+      logClass('warning',"BigInt/int64 support is disabled.");
+    }
     if(haveWasmCTests()){
       log("sqlite3_wasm_test_...() APIs are available.");
+    }else{
+      logClass('warning',"sqlite3_wasm_test_...() APIs unavailable.");
     }
     TestUtil.runTests(sqlite3);
   });
diff --git a/manifest b/manifest
index e45eccf68a..95d27b17b9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Expose\ssqlite3_vfs_unregister()\sto\sWASM\sand\sunregister\skvvfs\sin\sWorker\sthreads\sto\savoid\sits\sunintended\suse\sthere\s(in\scontexts\sother\sthan\slocal/sessionStorage).\sCorrect\sregistration\sof\swindow\sfunctions,\sextend\soo1.DB.createFunction()\sto\ssupport\swindow\sfunctions,\sand\sadd\swindow\sfunction\stests\sto\stester1.js.\sCorrect\san\sincorrect\s1-arg\shandling\scase\sfor\sDB.exec().\sAdd\sper-test\sassertion\scounts\sto\stester1.js.
-D 2022-10-21T05:27:40.995
+C Add\stiming\sinfo\sand\sOPFS\ssanity\stests\sto\stester1.js
+D 2022-10-21T06:26:17.258
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -485,7 +485,7 @@ F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1
 F ext/wasm/api/pre-js.js 151e0616614a49f3db19ed544fa13b38c87c108959fbcd4029ea8399a562d94f
 F ext/wasm/api/sqlite3-api-cleanup.js 4d07a7524dc9b7b050acfde57163e839243ad2383bd7ee0de0178b1b3e988588
 F ext/wasm/api/sqlite3-api-glue.js 6e4e472eb5afc732a695cd7c5ded6dee6ef8b480e61aa0d648a3fc9033c84745
-F ext/wasm/api/sqlite3-api-oo1.js 5016f6dd4b6b461bb6047fe6a2d3d7cbe85aa6b110c263ebf0347672a0cd897e
+F ext/wasm/api/sqlite3-api-oo1.js a8f48c76b127c6e20af8937e519e059626e8b859d17036266ae1b1b18c96a31f
 F ext/wasm/api/sqlite3-api-opfs.js 22d60ba956e873b65e2e0591e239178082bd53a6d563c3c58db7dc03e562e8f7
 F ext/wasm/api/sqlite3-api-prologue.js fa00d55f927e5a4ec51cf2c80f6f0eaed2f4f5774341ecf3d63a0ea4c738f8f5
 F ext/wasm/api/sqlite3-api-worker1.js a7f38f03275d6c27ab2aef3e83215d3c97ce09c43e6904df47c3764d9d4572b4
@@ -499,7 +499,7 @@ F ext/wasm/batch-runner.html 4deeed44fe41496dc6898d9fb17938ea3291f40f4bfb977e29d
 F ext/wasm/batch-runner.js 5bae81684728b6be157d1f92b39824153f0fd019345b39f2ab8930f7ee2a57d8
 F ext/wasm/common/SqliteTestUtil.js 647bf014bd30bdd870a7e9001e251d12fc1c9ec9ce176a1004b838a4b33c5c05
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
-F ext/wasm/common/testing.css 53394885077edd3db22d2a0896192334dfc06fb3d1da0b646eb12a332d22f18e
+F ext/wasm/common/testing.css c5f37db26f0c86c06503fdbe813f4786c454de2b4ec1e4437ace49256417f54d
 F ext/wasm/common/whwasmutil.js 50d2ede0b0fa01c1d467e1801fab79f5e46bb02bcbd2b0232e4fdc6090a47818
 F ext/wasm/demo-123-worker.html a0b58d9caef098a626a1a1db567076fca4245e8d60ba94557ede8684350a81ed
 F ext/wasm/demo-123.html 8c70a412ce386bd3796534257935eb1e3ea5c581e5d5aea0490b8232e570a508
@@ -531,9 +531,9 @@ F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d826
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
 F ext/wasm/test-opfs-vfs.html 1f2d672f3f3fce810dfd48a8d56914aba22e45c6834e262555e685bce3da8c3f
 F ext/wasm/test-opfs-vfs.js 48fc59110e8775bb43c9be25b6d634fc07ebadab7da8fbd44889e8129c6e2548
-F ext/wasm/tester1-worker.html 048c341f124fdb61ca14dfd1bd1f78742490f208aa3bb1e84399f83f1e7e6a74
+F ext/wasm/tester1-worker.html dae897329d095a56ec48881878f3b17c2833ebc850aef0b7ddc06ce075917267
 F ext/wasm/tester1.html 37ccc958fa0d95074af2d72b7241c8e2d982bbec6dda4dc790241af3d933c3b6
-F ext/wasm/tester1.js 3fc539001b861d6360ea8c4825351157251204781b7a45389527574ad338c7e1
+F ext/wasm/tester1.js bbdf1ff6446f767871c0a88bb9c05dba14139ee9e04c236bea48da014090f825
 F ext/wasm/version-info.c 5fa356d38859d71a0369b5c37e1935def7413fcc8a4e349a39d9052c1d0479f4
 F ext/wasm/wasmfs.make ee0004813e16c283ff633e08b482008d56adf9b7d42f6c5612f7ab002b924f69
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
@@ -2036,8 +2036,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 89f3e1982ec32c010af67d15ef780847df20de568669e5c9d02f3cf084f51330
-R 8a68d8975e926edd4ad048c9589fdc73
+P f07ce15479b7224b0d1ba9f147a433136e70c1461aa667d2737d4a918f778f55
+R 9850bd6041ab5774a27f08fd128a0d0d
 U stephan
-Z 78e197950cf91aa30272843b46106df8
+Z 22f5514a98dfdd6ddf86c9b4efb8fd0e
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 9dfbdf93ac..879c083aaf 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f07ce15479b7224b0d1ba9f147a433136e70c1461aa667d2737d4a918f778f55
\ No newline at end of file
+99915b0076422487cdd181a54e55694404fba13e4a540329b5ede9e2c9e12532
\ No newline at end of file

From 98147dd5264fa362f458b2a154b6ee25f0c47963 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Fri, 21 Oct 2022 06:58:27 +0000
Subject: [PATCH 330/428] Add kvvfs tests to tester1.js. Fix a scopedAlloc()
 misuse in oo1.DB ctor caused by refactoring earlier this morning (and caught
 by these new tests).

FossilOrigin-Name: 8e0f001ab76de6dbc17295b9085f7f61ce274c43f8c432ea4d2ec3153d248ff3
---
 ext/wasm/api/sqlite3-api-oo1.js |  7 ++---
 ext/wasm/common/testing.css     |  7 ++++-
 ext/wasm/tester1-worker.html    | 12 +++++++
 ext/wasm/tester1.html           |  6 ++++
 ext/wasm/tester1.js             | 56 ++++++++++++++++++++++++++++++---
 manifest                        | 20 ++++++------
 manifest.uuid                   |  2 +-
 7 files changed, 89 insertions(+), 21 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index b1b79c643e..20210a03fb 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -87,7 +87,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
      being-construct DB object as its "this". See the DB constructor
      for the argument docs. This is split into a separate function
      in order to enable simple creation of special-case DB constructors,
-     e.g. JsStorageDB and OpfsDb.
+     e.g. JsStorageDb and OpfsDb.
 
      Expects to be passed a configuration object with the following
      properties:
@@ -152,10 +152,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     const stack = wasm.pstack.pointer;
     try {
       const pPtr = wasm.pstack.allocPtr() /* output (sqlite3**) arg */;
-      const pVfsName = vfsName ? (
-        ('number'===typeof vfsName ? vfsName : wasm.scopedAllocCString(vfsName))
-      ): 0;
-      let rc = capi.sqlite3_open_v2(fn, pPtr, oflags, pVfsName);
+      let rc = capi.sqlite3_open_v2(fn, pPtr, oflags, vfsName || 0);
       pDb = wasm.getPtrValue(pPtr);
       checkSqlite3Rc(pDb, rc);
       if(flagsStr.indexOf('t')>=0){
diff --git a/ext/wasm/common/testing.css b/ext/wasm/common/testing.css
index 47517d9672..a4433af8c6 100644
--- a/ext/wasm/common/testing.css
+++ b/ext/wasm/common/testing.css
@@ -40,7 +40,11 @@ span.labeled-input {
 .faded { opacity: 0.5; }
 .group-start { color: blue; }
 .group-end { color: blue; }
-.input-wrapper { white-space: nowrap; }
+.input-wrapper {
+  white-space: nowrap;
+  display: flex;
+  align-items: center;
+}
 #test-output {
   border: 1px inset;
   border-radius: 0.25em;
@@ -54,3 +58,4 @@ span.labeled-input {
 #test-output.reverse {
   flex-direction: column-reverse;
 }
+label[for] { cursor: pointer }
diff --git a/ext/wasm/tester1-worker.html b/ext/wasm/tester1-worker.html
index 4baf084e73..c7ca8e5b54 100644
--- a/ext/wasm/tester1-worker.html
+++ b/ext/wasm/tester1-worker.html
@@ -15,6 +15,12 @@
   </head>
   <body>
     <h1>sqlite3 WASM/JS tester #1 (Worker thread)</h1>
+    <div>See <a href='tester1.html' target='tester1.html'>tester1.html</a>
+      for the UI-thread variant.</div>
+    <div class='input-wrapper'>
+      <input type='checkbox' id='cb-log-reverse' checked>
+      <label for='cb-log-reverse'>Reverse log order?</label>
+    </div>
     <div id='test-output'></div>
     <script>(function(){
       const logTarget = document.querySelector('#test-output');
@@ -28,6 +34,12 @@
         ln.append(document.createTextNode(args.join(' ')));
         logTarget.append(ln);
       };
+      const cbReverse = document.querySelector('#cb-log-reverse');
+      const cbReverseIt = ()=>{
+        logTarget.classList[cbReverse.checked ? 'add' : 'remove']('reverse');
+      };
+      cbReverse.addEventListener('change',cbReverseIt,true);
+      cbReverseIt();
       const w = new Worker("tester1.js?sqlite3.dir=jswasm");
       w.onmessage = function({data}){
         switch(data.type){
diff --git a/ext/wasm/tester1.html b/ext/wasm/tester1.html
index 0de679f34f..380ef4dc43 100644
--- a/ext/wasm/tester1.html
+++ b/ext/wasm/tester1.html
@@ -15,6 +15,12 @@
   </head>
   <body>
     <h1>sqlite3 WASM/JS tester #1 (UI thread)</h1>
+    <div>See <a href='tester1-worker.html' target='tester1-worker.html'>tester1-worker.html</a>
+      for the Worker-thread variant.</div>
+    <div class='input-wrapper'>
+      <input type='checkbox' id='cb-log-reverse' checked>
+      <label for='cb-log-reverse'>Reverse log order?</label>
+    </div>
     <div id='test-output'></div>
     <script src="jswasm/sqlite3.js"></script>
     <script src="tester1.js"></script>
diff --git a/ext/wasm/tester1.js b/ext/wasm/tester1.js
index bc93c9c37c..15f750400f 100644
--- a/ext/wasm/tester1.js
+++ b/ext/wasm/tester1.js
@@ -78,6 +78,17 @@
         ln.append(document.createTextNode(normalizeArgs(args).join(' ')));
         logTarget.append(ln);
       };
+      const cbReverse = document.querySelector('#cb-log-reverse');
+      const cbReverseKey = 'tester1:cb-log-reverse';
+      const cbReverseIt = ()=>{
+        logTarget.classList[cbReverse.checked ? 'add' : 'remove']('reverse');
+        localStorage.setItem(cbReverseKey, cbReverse.checked ? 1 : 0);
+      };
+      cbReverse.addEventListener('change',cbReverseIt,true);
+      if(localStorage.getItem(cbReverseKey)){
+        cbReverse.checked = !!(+localStorage.getItem(cbReverseKey));
+      }
+      cbReverseIt();
     }else{ /* Worker thread */
       console.log("Running in a Worker thread.");
       logClass = function(cssClass,...args){
@@ -227,9 +238,9 @@
           const assertCount = TestUtil.counter;
           const groupState = Object.create(null);
           const skipped = [];
-          let runtime = 0;
-          for(let i in this.tests){
-            const t = this.tests[i];
+          let runtime = 0, i = 0;
+          for(const t of this.tests){
+            ++i;
             const n = this.number+"."+i;
               log(indent, n+":", t.name);
             if(t.predicate && !t.predicate(sqlite3)){
@@ -1578,13 +1589,50 @@
     })
   ;/* end of oo1 checks */
 
+  ////////////////////////////////////////////////////////////////////////
+  T.g('kvvfs (Worker thread only)', isWorker)
+    .t({
+      name: 'kvvfs is disabled',
+      test: ()=>{
+        T.assert(
+          !capi.sqlite3_vfs_find('kvvfs'),
+          "Expecting kvvfs to be unregistered."
+        );
+      }
+    });
+  T.g('kvvfs (UI thread only)', isUIThread)
+    .t({
+      name: 'kvvfs sanity checks',
+      test: function(sqlite3){
+        const filename = 'session';
+        const pVfs = capi.sqlite3_vfs_find('kvvfs');
+        T.assert(pVfs);
+        const JDb = sqlite3.oo1.JsStorageDb;
+        const unlink = ()=>JDb.clearStorage(filename);
+        unlink();
+        let db = new JDb(filename);
+        db.exec([
+          'create table kvvfs(a);',
+          'insert into kvvfs(a) values(1),(2),(3)'
+        ]);
+        T.assert(3 === db.selectValue('select count(*) from kvvfs'));
+        db.close();
+        db = new JDb(filename);
+        db.exec('insert into kvvfs(a) values(4),(5),(6)');
+        T.assert(6 === db.selectValue('select count(*) from kvvfs'));
+        db.close();
+        unlink();
+      }
+    }/*kvvfs sanity checks*/)
+  ;/* end kvvfs tests */
+
   ////////////////////////////////////////////////////////////////////////
   T.g('OPFS (Worker thread only and only in supported browsers)',
       (sqlite3)=>{return !!sqlite3.opfs})
     .t({
       name: 'OPFS sanity checks',
       test: function(sqlite3){
-        const filename = 'tester1.js';
+        const filename = 'sqlite3-tester1.db';
         const pVfs = capi.sqlite3_vfs_find('opfs');
         T.assert(pVfs);
         const unlink = (fn=filename)=>wasm.sqlite3_wasm_vfs_unlink(pVfs,fn);
diff --git a/manifest b/manifest
index 95d27b17b9..010e243492 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stiming\sinfo\sand\sOPFS\ssanity\stests\sto\stester1.js
-D 2022-10-21T06:26:17.258
+C Add\skvvfs\stests\sto\stester1.js.\sFix\sa\sscopedAlloc()\smisuse\sin\soo1.DB\sctor\scaused\sby\srefactoring\searlier\sthis\smorning\s(and\scaught\sby\sthese\snew\stests).
+D 2022-10-21T06:58:27.888
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -485,7 +485,7 @@ F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1
 F ext/wasm/api/pre-js.js 151e0616614a49f3db19ed544fa13b38c87c108959fbcd4029ea8399a562d94f
 F ext/wasm/api/sqlite3-api-cleanup.js 4d07a7524dc9b7b050acfde57163e839243ad2383bd7ee0de0178b1b3e988588
 F ext/wasm/api/sqlite3-api-glue.js 6e4e472eb5afc732a695cd7c5ded6dee6ef8b480e61aa0d648a3fc9033c84745
-F ext/wasm/api/sqlite3-api-oo1.js a8f48c76b127c6e20af8937e519e059626e8b859d17036266ae1b1b18c96a31f
+F ext/wasm/api/sqlite3-api-oo1.js ca41ffe58bfbbefc98181081fba0b7af58afcc2770e963558f4f6a408c583fc0
 F ext/wasm/api/sqlite3-api-opfs.js 22d60ba956e873b65e2e0591e239178082bd53a6d563c3c58db7dc03e562e8f7
 F ext/wasm/api/sqlite3-api-prologue.js fa00d55f927e5a4ec51cf2c80f6f0eaed2f4f5774341ecf3d63a0ea4c738f8f5
 F ext/wasm/api/sqlite3-api-worker1.js a7f38f03275d6c27ab2aef3e83215d3c97ce09c43e6904df47c3764d9d4572b4
@@ -499,7 +499,7 @@ F ext/wasm/batch-runner.html 4deeed44fe41496dc6898d9fb17938ea3291f40f4bfb977e29d
 F ext/wasm/batch-runner.js 5bae81684728b6be157d1f92b39824153f0fd019345b39f2ab8930f7ee2a57d8
 F ext/wasm/common/SqliteTestUtil.js 647bf014bd30bdd870a7e9001e251d12fc1c9ec9ce176a1004b838a4b33c5c05
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
-F ext/wasm/common/testing.css c5f37db26f0c86c06503fdbe813f4786c454de2b4ec1e4437ace49256417f54d
+F ext/wasm/common/testing.css 739b58c44511f642f16f57b701c84dc9ee412d8bc47b3d8a99d947babfa69d9d
 F ext/wasm/common/whwasmutil.js 50d2ede0b0fa01c1d467e1801fab79f5e46bb02bcbd2b0232e4fdc6090a47818
 F ext/wasm/demo-123-worker.html a0b58d9caef098a626a1a1db567076fca4245e8d60ba94557ede8684350a81ed
 F ext/wasm/demo-123.html 8c70a412ce386bd3796534257935eb1e3ea5c581e5d5aea0490b8232e570a508
@@ -531,9 +531,9 @@ F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d826
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
 F ext/wasm/test-opfs-vfs.html 1f2d672f3f3fce810dfd48a8d56914aba22e45c6834e262555e685bce3da8c3f
 F ext/wasm/test-opfs-vfs.js 48fc59110e8775bb43c9be25b6d634fc07ebadab7da8fbd44889e8129c6e2548
-F ext/wasm/tester1-worker.html dae897329d095a56ec48881878f3b17c2833ebc850aef0b7ddc06ce075917267
-F ext/wasm/tester1.html 37ccc958fa0d95074af2d72b7241c8e2d982bbec6dda4dc790241af3d933c3b6
-F ext/wasm/tester1.js bbdf1ff6446f767871c0a88bb9c05dba14139ee9e04c236bea48da014090f825
+F ext/wasm/tester1-worker.html 906feeb0528fed0fbdc2833eeb8397a4637af9b0cf36831b20dae5b425b4d877
+F ext/wasm/tester1.html 6dc6594f0182ae84f70b58cf4102f2bb8994bbef588cedc45ea38d396937d5f4
+F ext/wasm/tester1.js 031fae6b912d8a3df462febde99b6fed2f43bd13d20832d6fd99e01d427f9f3b
 F ext/wasm/version-info.c 5fa356d38859d71a0369b5c37e1935def7413fcc8a4e349a39d9052c1d0479f4
 F ext/wasm/wasmfs.make ee0004813e16c283ff633e08b482008d56adf9b7d42f6c5612f7ab002b924f69
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
@@ -2036,8 +2036,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 f07ce15479b7224b0d1ba9f147a433136e70c1461aa667d2737d4a918f778f55
-R 9850bd6041ab5774a27f08fd128a0d0d
+P 99915b0076422487cdd181a54e55694404fba13e4a540329b5ede9e2c9e12532
+R a5a8d00ecb4b4c8e0659b56352a632c1
 U stephan
-Z 22f5514a98dfdd6ddf86c9b4efb8fd0e
+Z 0c3f60384d64eebf1bbc2e3f1ead88de
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 879c083aaf..f720b168f3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-99915b0076422487cdd181a54e55694404fba13e4a540329b5ede9e2c9e12532
\ No newline at end of file
+8e0f001ab76de6dbc17295b9085f7f61ce274c43f8c432ea4d2ec3153d248ff3
\ No newline at end of file

From de033d078bcc465de086cd543283c49a7b32f654 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Fri, 21 Oct 2022 17:18:58 +0000
Subject: [PATCH 331/428] Ensure that the RtreeCell object in rtreeUpdate has
 all bytes initialized.

FossilOrigin-Name: 1e38742bde09cd879eb370bcf8604ed7ed00759209bcb4ed0374350e4b9e842d
---
 ext/rtree/rtree.c |  2 +-
 manifest          | 14 +++++++-------
 manifest.uuid     |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c
index 49053a2bcc..7daae9b1cb 100644
--- a/ext/rtree/rtree.c
+++ b/ext/rtree/rtree.c
@@ -3235,7 +3235,7 @@ static int rtreeUpdate(
   rtreeReference(pRtree);
   assert(nData>=1);
 
-  cell.iRowid = 0;  /* Used only to suppress a compiler warning */
+  memset(&cell, 0, sizeof(cell));
 
   /* Constraint handling. A write operation on an r-tree table may return
   ** SQLITE_CONSTRAINT for two reasons:
diff --git a/manifest b/manifest
index 010e243492..9dc874ef0b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\skvvfs\stests\sto\stester1.js.\sFix\sa\sscopedAlloc()\smisuse\sin\soo1.DB\sctor\scaused\sby\srefactoring\searlier\sthis\smorning\s(and\scaught\sby\sthese\snew\stests).
-D 2022-10-21T06:58:27.888
+C Ensure\sthat\sthe\sRtreeCell\sobject\sin\srtreeUpdate\shas\sall\sbytes\sinitialized.
+D 2022-10-21T17:18:58.719
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -397,7 +397,7 @@ F ext/repair/test/checkindex01.test b530f141413b587c9eb78ff734de6bb79bc3515c3350
 F ext/repair/test/test.tcl 686d76d888dffd021f64260abf29a55c57b2cedfa7fc69150b42b1d6119aac3c
 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
 F ext/rtree/geopoly.c bb0dcd013dbb3fe0335b6bbae0d9c29fcfffda93d5ef6c31daa47e802132e435
-F ext/rtree/rtree.c d7b4b8b81d8d54376a7f81de5be85ec58b37c11604bcf42984a8418b34158d93
+F ext/rtree/rtree.c b963ebced19f249d8523396a779351481d13a67c36c3c1f034b982886cd39a42
 F ext/rtree/rtree.h 4a690463901cb5e6127cf05eb8e642f127012fd5003830dbc974eca5802d9412
 F ext/rtree/rtree1.test d47f58832145fcfed9067bc457ca8664962196c4566c17a1ebd679367db55d11
 F ext/rtree/rtree2.test 9d9deddbb16fd0c30c36e6b4fdc3ee3132d765567f0f9432ee71e1303d32603d
@@ -2036,8 +2036,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 99915b0076422487cdd181a54e55694404fba13e4a540329b5ede9e2c9e12532
-R a5a8d00ecb4b4c8e0659b56352a632c1
-U stephan
-Z 0c3f60384d64eebf1bbc2e3f1ead88de
+P 8e0f001ab76de6dbc17295b9085f7f61ce274c43f8c432ea4d2ec3153d248ff3
+R 4f4c998337e054efe35725546fb44ec3
+U drh
+Z 21fea6537087590fcabd164447032406
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f720b168f3..f467e3eafe 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8e0f001ab76de6dbc17295b9085f7f61ce274c43f8c432ea4d2ec3153d248ff3
\ No newline at end of file
+1e38742bde09cd879eb370bcf8604ed7ed00759209bcb4ed0374350e4b9e842d
\ No newline at end of file

From 89ccfac0ac6cc445c29b6c6dddfa05a72d844f87 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Fri, 21 Oct 2022 17:37:05 +0000
Subject: [PATCH 332/428] Macro name typo fix in OS_KV builds.

FossilOrigin-Name: 9cf1142b0cdb13347e3f551c862cb4714cadfe5ad637f049cf0a4b8bb6125b32
---
 manifest       | 14 +++++++-------
 manifest.uuid  |  2 +-
 src/os_setup.h |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index 9dc874ef0b..cdafba0bf1 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthat\sthe\sRtreeCell\sobject\sin\srtreeUpdate\shas\sall\sbytes\sinitialized.
-D 2022-10-21T17:18:58.719
+C Macro\sname\stypo\sfix\sin\sOS_KV\sbuilds.
+D 2022-10-21T17:37:05.838
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -603,7 +603,7 @@ F src/os.c 81c9c1c52eab711e27e33fd51fe5788488d3a02bc1a71439857abbee5d0d2c97
 F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
 F src/os_kv.c c3d991bfb6207560d3416bbf241cade7113e4ce852781c53b7e40a3d6ac25fcb
-F src/os_setup.h 0711dbc4678f3ac52d7fe736951b6384a0615387c4ba5135a4764e4e31f4b6a6
+F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107
 F src/os_unix.c 287aa5f5691a2b356780c63e83abaa33549add84227b8313395f04088486d79c
 F src/os_win.c 8d129ae3e59e0fa900e20d0ad789e96f2e08177f0b00b53cdda65c40331e0902
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
@@ -2036,8 +2036,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 8e0f001ab76de6dbc17295b9085f7f61ce274c43f8c432ea4d2ec3153d248ff3
-R 4f4c998337e054efe35725546fb44ec3
-U drh
-Z 21fea6537087590fcabd164447032406
+P 1e38742bde09cd879eb370bcf8604ed7ed00759209bcb4ed0374350e4b9e842d
+R e4775449fc75a6bac21b2c19d9b6c731
+U stephan
+Z 53be779b3f3013af77542d00aec95a88
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f467e3eafe..0bce33e5b3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1e38742bde09cd879eb370bcf8604ed7ed00759209bcb4ed0374350e4b9e842d
\ No newline at end of file
+9cf1142b0cdb13347e3f551c862cb4714cadfe5ad637f049cf0a4b8bb6125b32
\ No newline at end of file
diff --git a/src/os_setup.h b/src/os_setup.h
index df2f52a7ee..a82f86fd9f 100644
--- a/src/os_setup.h
+++ b/src/os_setup.h
@@ -63,7 +63,7 @@
 #  define SQLITE_OS_WIN 0
 #  define SQLITE_OMIT_LOAD_EXTENSION 1
 #  define SQLITE_OMIT_WAL 1
-#  define SQLITE_OMIT DEPRECATED 1
+#  define SQLITE_OMIT_DEPRECATED 1
 #  undef SQLITE_TEMP_STORE
 #  define SQLITE_TEMP_STORE 3  /* Always use memory for temporary storage */
 #  define SQLITE_DQS 0

From 3725af73b9f9bf3b1c6d47d1232ce85347afb853 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Fri, 21 Oct 2022 17:48:49 +0000
Subject: [PATCH 333/428] Add SQLITE_DQS to the compileoptions_used list, per
 request in [forum post 8b1060122b|forum:8b1060122b]. Force DQS=0 in
 sqlite3-wasm.c.

FossilOrigin-Name: fcd9e0dbe3226f3f7ccc15b11fc3aa3b8058571bef274c25a33e9753e22f7551
---
 ext/wasm/api/sqlite3-wasm.c |  4 +++-
 manifest                    | 16 ++++++++--------
 manifest.uuid               |  2 +-
 src/ctime.c                 |  3 +++
 tool/mkctimec.tcl           |  1 +
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index 8b767948e4..754f9cf0d4 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -56,7 +56,7 @@
 */
 
 /**********************************************************************/
-/* SQLITE_DEFAULT_... */
+/* SQLITE_D... */
 #ifndef SQLITE_DEFAULT_CACHE_SIZE
 /*
 ** The OPFS impls benefit tremendously from an increased cache size
@@ -75,6 +75,8 @@
 #ifndef SQLITE_DEFAULT_UNIX_VFS
 # define SQLITE_DEFAULT_UNIX_VFS "unix-none"
 #endif
+#undef SQLITE_DQS
+#define SQLITE_DQS 0
 
 /**********************************************************************/
 /* SQLITE_ENABLE_... */
diff --git a/manifest b/manifest
index cdafba0bf1..0c94ebc3b2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Macro\sname\stypo\sfix\sin\sOS_KV\sbuilds.
-D 2022-10-21T17:37:05.838
+C Add\sSQLITE_DQS\sto\sthe\scompileoptions_used\slist,\sper\srequest\sin\s[forum\spost\s8b1060122b|forum:8b1060122b].\sForce\sDQS=0\sin\ssqlite3-wasm.c.
+D 2022-10-21T17:48:49.786
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -492,7 +492,7 @@ F ext/wasm/api/sqlite3-api-worker1.js a7f38f03275d6c27ab2aef3e83215d3c97ce09c43e
 F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
 F ext/wasm/api/sqlite3-opfs-async-proxy.js 206ce6bbc3c30ad51a37d9c25e3a2712e70b586e0f9a2cf8cb0b9619017c2671
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c dde771a10e6a8d01ae516d32abc4cdd2d542cb3339e35c5b4be8ebbc1dc1ccc1
+F ext/wasm/api/sqlite3-wasm.c 940d576bda7068ba60492e206d06a3567b8a89a3770700aa88690a6e246a0c78
 F ext/wasm/api/sqlite3-worker1-promiser.js 0c7a9826dbf82a5ed4e4f7bf7816e825a52aff253afbf3350431f5773faf0e4b
 F ext/wasm/api/sqlite3-worker1.js dbe54b69c1520a2d25eae148cd2750ded2dd7f219ea4ee46f83e0a851dca5974
 F ext/wasm/batch-runner.html 4deeed44fe41496dc6898d9fb17938ea3291f40f4bfb977e29d0cef96fbbe4c8
@@ -565,7 +565,7 @@ F src/btreeInt.h 8ce1332edd89dfd2461d561ac10a0ab5601c8e06200cb5230596c3caaf54482
 F src/build.c 13bcc04821ad260ef00d87e0704424e0ae4e6cd66c7e384b4cedb379a6cb738b
 F src/callback.c 4cd7225b26a97f7de5fee5ae10464bed5a78f2adefe19534cc2095b3a8ca484a
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
-F src/ctime.c 428b47a2548c7c2c2f885189b42fdcc178fb03c276a2d58b3008b10da29373d5
+F src/ctime.c 20507cc0b0a6c19cd882fcd0eaeda32ae6a4229fb4b024cfdf3183043d9b703d
 F src/date.c 94ce83b4cd848a387680a5f920c9018c16655db778c4d36525af0a0f34679ac5
 F src/dbpage.c 5808e91bc27fa3981b028000f8fadfdc10ce9e59a34ce7dc4e035a69be3906ec
 F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
@@ -1961,7 +1961,7 @@ F tool/max-limits.c cbb635fbb37ae4d05f240bfb5b5270bb63c54439
 F tool/merge-test.tcl de76b62f2de2a92d4c1ca4f976bce0aea6899e0229e250479b229b2a1914b176
 F tool/mkautoconfamal.sh f62353eb6c06ab264da027fd4507d09914433dbdcab9cb011cdc18016f1ab3b8
 F tool/mkccode.tcl 86463e68ce9c15d3041610fedd285ce32a5cf7a58fc88b3202b8b76837650dbe x
-F tool/mkctimec.tcl 0e309dfc8bb01cd385deeb010df4ca76dee3ab4e8ec0588233b3f152679122e8 x
+F tool/mkctimec.tcl c185cf1bdcd3d9bd3c06f77a2fd2df8a4a0d07266f992ecda75286965ba3574c x
 F tool/mkkeywordhash.c 35bfc41adacc4aa6ef6fca7fd0c63e0ec0534b78daf4d0cfdebe398216bbffc3
 F tool/mkmsvcmin.tcl 6ecab9fe22c2c8de4d82d4c46797bda3d2deac8e763885f5a38d0c44a895ab33
 F tool/mkopcodec.tcl 33d20791e191df43209b77d37f0ff0904620b28465cca6990cf8d60da61a07ef
@@ -2036,8 +2036,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 1e38742bde09cd879eb370bcf8604ed7ed00759209bcb4ed0374350e4b9e842d
-R e4775449fc75a6bac21b2c19d9b6c731
+P 9cf1142b0cdb13347e3f551c862cb4714cadfe5ad637f049cf0a4b8bb6125b32
+R f0d8c3eadf9b3a16756631ad00044092
 U stephan
-Z 53be779b3f3013af77542d00aec95a88
+Z 4b9ac72991a7e1ed1b8b1873a504bb5c
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 0bce33e5b3..16c3bc411d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9cf1142b0cdb13347e3f551c862cb4714cadfe5ad637f049cf0a4b8bb6125b32
\ No newline at end of file
+fcd9e0dbe3226f3f7ccc15b11fc3aa3b8058571bef274c25a33e9753e22f7551
\ No newline at end of file
diff --git a/src/ctime.c b/src/ctime.c
index eb425e5887..c853e5ba46 100644
--- a/src/ctime.c
+++ b/src/ctime.c
@@ -193,6 +193,9 @@ static const char * const sqlite3azCompileOpt[] = {
 #ifdef SQLITE_DISABLE_SKIPAHEAD_DISTINCT
   "DISABLE_SKIPAHEAD_DISTINCT",
 #endif
+#ifdef SQLITE_DQS
+  "DQS=" CTIMEOPT_VAL(SQLITE_DQS),
+#endif
 #ifdef SQLITE_ENABLE_8_3_NAMES
   "ENABLE_8_3_NAMES=" CTIMEOPT_VAL(SQLITE_ENABLE_8_3_NAMES),
 #endif
diff --git a/tool/mkctimec.tcl b/tool/mkctimec.tcl
index 73c28d36bc..0438b11b35 100755
--- a/tool/mkctimec.tcl
+++ b/tool/mkctimec.tcl
@@ -304,6 +304,7 @@ set value_options {
   SQLITE_DEFAULT_WAL_AUTOCHECKPOINT
   SQLITE_DEFAULT_WAL_SYNCHRONOUS
   SQLITE_DEFAULT_WORKER_THREADS
+  SQLITE_DQS
   SQLITE_ENABLE_8_3_NAMES
   SQLITE_ENABLE_CEROD
   SQLITE_ENABLE_LOCKING_STYLE

From 5723c659fd8cfda89399e9c144604a1f3a9be6ba Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sat, 22 Oct 2022 13:49:35 +0000
Subject: [PATCH 334/428] Clarification on the meaning of SrcList and SrcItem
 and especially the SrcItem.colUsed and Index.colNotIdxed fields.  Comment
 changes only - no changes to code.

FossilOrigin-Name: d96f6cc8475ae5509b8bff2db75e3c6f69a214d58d8979fbc0162ae488a040dc
---
 manifest        | 16 ++++++++--------
 manifest.uuid   |  2 +-
 src/build.c     |  5 +++--
 src/sqliteInt.h | 48 ++++++++++++++++++++++++++++--------------------
 4 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/manifest b/manifest
index 0c94ebc3b2..2ddcf13fa0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sSQLITE_DQS\sto\sthe\scompileoptions_used\slist,\sper\srequest\sin\s[forum\spost\s8b1060122b|forum:8b1060122b].\sForce\sDQS=0\sin\ssqlite3-wasm.c.
-D 2022-10-21T17:48:49.786
+C Clarification\son\sthe\smeaning\sof\sSrcList\sand\sSrcItem\sand\sespecially\sthe\nSrcItem.colUsed\sand\sIndex.colNotIdxed\sfields.\s\sComment\schanges\sonly\s-\sno\nchanges\sto\scode.
+D 2022-10-22T13:49:35.916
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -562,7 +562,7 @@ F src/btmutex.c 6ffb0a22c19e2f9110be0964d0731d2ef1c67b5f7fabfbaeb7b9dabc4b7740ca
 F src/btree.c 74fc5f6a0577df703d6f98d0c51ee0d8d91d22dbc0ba86e42e056517e2b45576
 F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
 F src/btreeInt.h 8ce1332edd89dfd2461d561ac10a0ab5601c8e06200cb5230596c3caaf54482e
-F src/build.c 13bcc04821ad260ef00d87e0704424e0ae4e6cd66c7e384b4cedb379a6cb738b
+F src/build.c d3e43e950e4e377c1d451a4862556792acdef1faba14a03f899d30d09731c48b
 F src/callback.c 4cd7225b26a97f7de5fee5ae10464bed5a78f2adefe19534cc2095b3a8ca484a
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c 20507cc0b0a6c19cd882fcd0eaeda32ae6a4229fb4b024cfdf3183043d9b703d
@@ -625,7 +625,7 @@ F src/shell.c.in 6a9e15cb9fc3cd13d3647d4d9714c0d4d4a65e7f49228c2aafca910ed08d577
 F src/sqlite.h.in d9c8a6243fc0a1c270d69db33758e34b810af3462f9bc5b4af113b347e07c69d
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 5336beea1868d99d2f62e628dbea55e97267dbff8193291ab175e960c5df9141
-F src/sqliteInt.h ce8bf543210ab4a8a797e6abaf45e15f4cff24570b1043560aa747b3dc1a7935
+F src/sqliteInt.h 36f456f599a1bda4287ece61f3a9305b0b8d90ff49017a47a981cda5721a7ce0
 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -2036,8 +2036,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 9cf1142b0cdb13347e3f551c862cb4714cadfe5ad637f049cf0a4b8bb6125b32
-R f0d8c3eadf9b3a16756631ad00044092
-U stephan
-Z 4b9ac72991a7e1ed1b8b1873a504bb5c
+P fcd9e0dbe3226f3f7ccc15b11fc3aa3b8058571bef274c25a33e9753e22f7551
+R 3bee91f5b3c5cc3b42735acd38a39745
+U drh
+Z 7715147e0f497c16dde985e20f495b12
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 16c3bc411d..402d6976f0 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fcd9e0dbe3226f3f7ccc15b11fc3aa3b8058571bef274c25a33e9753e22f7551
\ No newline at end of file
+d96f6cc8475ae5509b8bff2db75e3c6f69a214d58d8979fbc0162ae488a040dc
\ No newline at end of file
diff --git a/src/build.c b/src/build.c
index 8578a71275..effaeb7332 100644
--- a/src/build.c
+++ b/src/build.c
@@ -2276,7 +2276,8 @@ static int isDupColumn(Index *pIdx, int nKey, Index *pPk, int iCol){
 /* Recompute the colNotIdxed field of the Index.
 **
 ** colNotIdxed is a bitmask that has a 0 bit representing each indexed
-** columns that are within the first 63 columns of the table.  The
+** columns that are within the first 63 columns of the table and a 1 for
+** all other bits (all columns that are not in the index).  The
 ** high-order bit of colNotIdxed is always 1.  All unindexed columns
 ** of the table have a 1.
 **
@@ -2304,7 +2305,7 @@ static void recomputeColumnsNotIndexed(Index *pIdx){
     }
   }
   pIdx->colNotIdxed = ~m;
-  assert( (pIdx->colNotIdxed>>63)==1 );
+  assert( (pIdx->colNotIdxed>>63)==1 );  /* See note-20221022-a */
 }
 
 /*
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 5e4afb1aeb..ea75eb2769 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -2579,10 +2579,22 @@ struct UnpackedRecord {
 ** The Index.onError field determines whether or not the indexed columns
 ** must be unique and what to do if they are not.  When Index.onError=OE_None,
 ** it means this is not a unique index.  Otherwise it is a unique index
-** and the value of Index.onError indicate the which conflict resolution
-** algorithm to employ whenever an attempt is made to insert a non-unique
+** and the value of Index.onError indicates which conflict resolution
+** algorithm to employ when an attempt is made to insert a non-unique
 ** element.
 **
+** The colNotIdxed bitmask is used in combination with SrcItem.colUsed
+** for a fast test to see if an index can serve as a covering index.
+** colNotIdxed has a 1 bit for every column of the original table that
+** is *not* available in the index.  Thus the expression
+** "colUsed & colNotIdxed" will be non-zero if the index is not a
+** covering index.  The most significant bit of of colNotIdxed will always
+** be true (note-20221022-a).  If a column beyond the 63rd column of the
+** table is used, the "colUsed & colNotIdxed" test will always be non-zero
+** and we have to assume either that the index is not covering, or use
+** an alternative (slower) algorithm to determine whether or not
+** the index is covering.
+**
 ** While parsing a CREATE TABLE or CREATE INDEX statement in order to
 ** generate VDBE code (as opposed to parsing one read from an sqlite_schema
 ** table as part of parsing an existing database schema), transient instances
@@ -2628,7 +2640,7 @@ struct Index {
   tRowcnt *aiRowEst;       /* Non-logarithmic stat1 data for this index */
   tRowcnt nRowEst0;        /* Non-logarithmic number of rows in the index */
 #endif
-  Bitmask colNotIdxed;     /* 0 for unindexed columns in pTab */
+  Bitmask colNotIdxed;     /* Unindexed columns in pTab */
 };
 
 /*
@@ -3081,6 +3093,14 @@ struct IdList {
 ** The SrcItem object represents a single term in the FROM clause of a query.
 ** The SrcList object is mostly an array of SrcItems.
 **
+** The jointype starts out showing the join type between the current table
+** and the next table on the list.  The parser builds the list this way.
+** But sqlite3SrcListShiftJoinType() later shifts the jointypes so that each
+** jointype expresses the join between the table and the previous table.
+**
+** In the colUsed field, the high-order bit (bit 63) is set if the table
+** contains more than 63 columns and the 64-th or later column is used.
+**
 ** Union member validity:
 **
 **    u1.zIndexedBy          fg.isIndexedBy && !fg.isTabFunc
@@ -3120,7 +3140,7 @@ struct SrcItem {
     Expr *pOn;        /* fg.isUsing==0 =>  The ON clause of a join */
     IdList *pUsing;   /* fg.isUsing==1 =>  The USING clause of a join */
   } u3;
-  Bitmask colUsed;  /* Bit N (1<<N) set if column N of pTab is used */
+  Bitmask colUsed;  /* Bit N set if column N used. Details above for N>62 */
   union {
     char *zIndexedBy;    /* Identifier from "INDEXED BY <zIndex>" clause */
     ExprList *pFuncArg;  /* Arguments to table-valued-function */
@@ -3141,23 +3161,11 @@ struct OnOrUsing {
 };
 
 /*
-** The following structure describes the FROM clause of a SELECT statement.
-** Each table or subquery in the FROM clause is a separate element of
-** the SrcList.a[] array.
+** This object represents one or more tables that are the source of
+** content for an SQL statement.  For example, a single SrcList object
+** is used to hold the FROM clause of a SELECT statement.  SrcList also
+** represents the target tables for DELETE, INSERT, and UPDATE statements.
 **
-** With the addition of multiple database support, the following structure
-** can also be used to describe a particular table such as the table that
-** is modified by an INSERT, DELETE, or UPDATE statement.  In standard SQL,
-** such a table must be a simple name: ID.  But in SQLite, the table can
-** now be identified by a database name, a dot, then the table name: ID.ID.
-**
-** The jointype starts out showing the join type between the current table
-** and the next table on the list.  The parser builds the list this way.
-** But sqlite3SrcListShiftJoinType() later shifts the jointypes so that each
-** jointype expresses the join between the table and the previous table.
-**
-** In the colUsed field, the high-order bit (bit 63) is set if the table
-** contains more than 63 columns and the 64-th or later column is used.
 */
 struct SrcList {
   int nSrc;        /* Number of tables or subqueries in the FROM clause */

From f55a7dad195994f2bb24db7df0a0515502386fe2 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sat, 22 Oct 2022 14:16:02 +0000
Subject: [PATCH 335/428] This branch attempts to improve the detection of
 covering indexes.  This first check-in merely improves a parameter name to
 sqlite3WhereBegin() to be more descriptive of what it contains, and ensures
 that a subroutine is not inlines so that sqlite3WhereBegin() runs slightly
 faster.

FossilOrigin-Name: cadf5f6bb1ce0492ef858ada476288e8057afd3609caa18b09c818d3845d7244
---
 manifest        | 21 ++++++++++++---------
 manifest.uuid   |  2 +-
 src/where.c     | 10 +++++-----
 src/whereInt.h  |  4 +---
 src/wherecode.c |  6 +++---
 src/whereexpr.c |  8 ++++----
 6 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/manifest b/manifest
index 2ddcf13fa0..409ea22b91 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Clarification\son\sthe\smeaning\sof\sSrcList\sand\sSrcItem\sand\sespecially\sthe\nSrcItem.colUsed\sand\sIndex.colNotIdxed\sfields.\s\sComment\schanges\sonly\s-\sno\nchanges\sto\scode.
-D 2022-10-22T13:49:35.916
+C This\sbranch\sattempts\sto\simprove\sthe\sdetection\sof\scovering\sindexes.\s\sThis\nfirst\scheck-in\smerely\simproves\sa\sparameter\sname\sto\ssqlite3WhereBegin()\sto\nbe\smore\sdescriptive\sof\swhat\sit\scontains,\sand\sensures\sthat\sa\ssubroutine\sis\nnot\sinlines\sso\sthat\ssqlite3WhereBegin()\sruns\sslightly\sfaster.
+D 2022-10-22T14:16:02.784
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -707,10 +707,10 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d
 F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
-F src/where.c bccea9a1066c9843ad7bf05f9054b390fe9b5d0fb721ff8af2d11fb93779836a
-F src/whereInt.h e5f5cf1bc32b7d01a6337027478ef6ed90c8c403de4b977198345c8238f0e1b0
-F src/wherecode.c 13b6373af69d484d9b05b9a732d393ce3b7b320cc93275c6528127678650f8cb
-F src/whereexpr.c a1bd9d8faddc946d19ae8b6b3468874794bf54acd13fe46e1680fb428e8d3ea7
+F src/where.c 0e2d1630a0894b61e2dc6a20a83eaffa5b05e2680fba03902abf332d9573b522
+F src/whereInt.h df0c79388c0b71b4a91f480d02791679fe0345d40410435c541c8893e95a4d3f
+F src/wherecode.c 133a94f82858787217d073143617df19e4a6a7d0b771a1519f957608109ad5a5
+F src/whereexpr.c a98e498cb7b6d033bf2ee7c04876ccf7b0b4d46e7f6510d6b458a411a4b27fa5
 F src/window.c 928e215840e2f2d9a2746e018c9643ef42c66c4ab6630ef0df7fa388fa145e86
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
@@ -2036,8 +2036,11 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P fcd9e0dbe3226f3f7ccc15b11fc3aa3b8058571bef274c25a33e9753e22f7551
-R 3bee91f5b3c5cc3b42735acd38a39745
+P d96f6cc8475ae5509b8bff2db75e3c6f69a214d58d8979fbc0162ae488a040dc
+R d1d7bec4f98c1ae80c81ea353f1cf097
+T *branch * covering-index-enh
+T *sym-covering-index-enh *
+T -sym-trunk *
 U drh
-Z 7715147e0f497c16dde985e20f495b12
+Z 4413d5327beb9bbaff2921e04536c2c1
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 402d6976f0..0ce3e4314f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d96f6cc8475ae5509b8bff2db75e3c6f69a214d58d8979fbc0162ae488a040dc
\ No newline at end of file
+cadf5f6bb1ce0492ef858ada476288e8057afd3609caa18b09c818d3845d7244
\ No newline at end of file
diff --git a/src/where.c b/src/where.c
index 8e9290c34c..88aefd86ed 100644
--- a/src/where.c
+++ b/src/where.c
@@ -5533,7 +5533,7 @@ WhereInfo *sqlite3WhereBegin(
   Expr *pWhere,           /* The WHERE clause */
   ExprList *pOrderBy,     /* An ORDER BY (or GROUP BY) clause, or NULL */
   ExprList *pResultSet,   /* Query result set.  Req'd for DISTINCT */
-  Select *pLimit,         /* Use this LIMIT/OFFSET clause, if any */
+  Select *pSelect,        /* The entire SELECT statement */
   u16 wctrlFlags,         /* The WHERE_* flags defined in sqliteInt.h */
   int iAuxArg             /* If WHERE_OR_SUBCLAUSE is set, index cursor number
                           ** If WHERE_USE_LIMIT, then the limit amount */
@@ -5612,9 +5612,7 @@ WhereInfo *sqlite3WhereBegin(
   pWInfo->wctrlFlags = wctrlFlags;
   pWInfo->iLimit = iAuxArg;
   pWInfo->savedNQueryLoop = pParse->nQueryLoop;
-#ifndef SQLITE_OMIT_VIRTUALTABLE
-  pWInfo->pLimit = pLimit;
-#endif
+  pWInfo->pSelect = pSelect;
   memset(&pWInfo->nOBSat, 0, 
          offsetof(WhereInfo,sWC) - offsetof(WhereInfo,nOBSat));
   memset(&pWInfo->a[0], 0, sizeof(WhereLoop)+nTabList*sizeof(WhereLevel));
@@ -5683,7 +5681,9 @@ WhereInfo *sqlite3WhereBegin(
   
   /* Analyze all of the subexpressions. */
   sqlite3WhereExprAnalyze(pTabList, &pWInfo->sWC);
-  sqlite3WhereAddLimit(&pWInfo->sWC, pLimit);
+  if( pSelect && pSelect->pLimit ){
+    sqlite3WhereAddLimit(&pWInfo->sWC, pSelect);
+  }
   if( pParse->nErr ) goto whereBeginError;
 
   /* Special case: WHERE terms that do not refer to any tables in the join
diff --git a/src/whereInt.h b/src/whereInt.h
index ae436e045c..28ede5be66 100644
--- a/src/whereInt.h
+++ b/src/whereInt.h
@@ -467,9 +467,7 @@ struct WhereInfo {
 #if WHERETRACE_ENABLED
   Expr *pWhere;             /* The complete WHERE clause */
 #endif
-#ifndef SQLITE_OMIT_VIRTUALTABLE
-  Select *pLimit;           /* Used to access LIMIT expr/registers for vtabs */
-#endif
+  Select *pSelect;          /* The entire SELECT statement containing WHERE */
   int aiCurOnePass[2];      /* OP_OpenWrite cursors for the ONEPASS opt */
   int iContinue;            /* Jump here to continue with next record */
   int iBreak;               /* Jump here to break out of the loop */
diff --git a/src/wherecode.c b/src/wherecode.c
index a1ecf93b86..e36d1c9964 100644
--- a/src/wherecode.c
+++ b/src/wherecode.c
@@ -1438,9 +1438,9 @@ Bitmask sqlite3WhereCodeOneLoopStart(
          && pLoop->u.vtab.bOmitOffset
         ){
           assert( pTerm->eOperator==WO_AUX );
-          assert( pWInfo->pLimit!=0 );
-          assert( pWInfo->pLimit->iOffset>0 );
-          sqlite3VdbeAddOp2(v, OP_Integer, 0, pWInfo->pLimit->iOffset);
+          assert( pWInfo->pSelect!=0 );
+          assert( pWInfo->pSelect->iOffset>0 );
+          sqlite3VdbeAddOp2(v, OP_Integer, 0, pWInfo->pSelect->iOffset);
           VdbeComment((v,"Zero OFFSET counter"));
         }
       }
diff --git a/src/whereexpr.c b/src/whereexpr.c
index 9fe7791203..1816a01f4b 100644
--- a/src/whereexpr.c
+++ b/src/whereexpr.c
@@ -1601,10 +1601,10 @@ static void whereAddLimitExpr(
 ** exist only so that they may be passed to the xBestIndex method of the
 ** single virtual table in the FROM clause of the SELECT.
 */
-void sqlite3WhereAddLimit(WhereClause *pWC, Select *p){
-  assert( p==0 || (p->pGroupBy==0 && (p->selFlags & SF_Aggregate)==0) );
-  if( (p && p->pLimit)                                          /* 1 */
-   && (p->selFlags & (SF_Distinct|SF_Aggregate))==0             /* 2 */
+void SQLITE_NOINLINE sqlite3WhereAddLimit(WhereClause *pWC, Select *p){
+  assert( p!=0 && p->pLimit!=0 );                 /* 1 -- checked by caller */
+  assert( p->pGroupBy==0 && (p->selFlags & SF_Aggregate)==0 );
+  if( (p->selFlags & (SF_Distinct|SF_Aggregate))==0             /* 2 */
    && (p->pSrc->nSrc==1 && IsVirtual(p->pSrc->a[0].pTab))       /* 3 */
   ){
     ExprList *pOrderBy = p->pOrderBy;

From 54cc766b418a0cab68cf21cbbf37872d55a654c6 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sat, 22 Oct 2022 20:13:46 +0000
Subject: [PATCH 336/428] Enhance the query planner with the ability to discern
 when an index is covering even when it indexes columns well beyond the 63rd
 column.

FossilOrigin-Name: 1390417be45dd84e9118f6e761f23b8ff7476d26411e165bbaab678881e4eadd
---
 manifest        | 17 ++++-----
 manifest.uuid   |  2 +-
 src/sqliteInt.h |  3 +-
 src/where.c     | 91 +++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 101 insertions(+), 12 deletions(-)

diff --git a/manifest b/manifest
index 409ea22b91..9528ef1337 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C This\sbranch\sattempts\sto\simprove\sthe\sdetection\sof\scovering\sindexes.\s\sThis\nfirst\scheck-in\smerely\simproves\sa\sparameter\sname\sto\ssqlite3WhereBegin()\sto\nbe\smore\sdescriptive\sof\swhat\sit\scontains,\sand\sensures\sthat\sa\ssubroutine\sis\nnot\sinlines\sso\sthat\ssqlite3WhereBegin()\sruns\sslightly\sfaster.
-D 2022-10-22T14:16:02.784
+C Enhance\sthe\squery\splanner\swith\sthe\sability\sto\sdiscern\swhen\san\sindex\sis\ncovering\seven\swhen\sit\sindexes\scolumns\swell\sbeyond\sthe\s63rd\scolumn.
+D 2022-10-22T20:13:46.151
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -625,7 +625,7 @@ F src/shell.c.in 6a9e15cb9fc3cd13d3647d4d9714c0d4d4a65e7f49228c2aafca910ed08d577
 F src/sqlite.h.in d9c8a6243fc0a1c270d69db33758e34b810af3462f9bc5b4af113b347e07c69d
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 5336beea1868d99d2f62e628dbea55e97267dbff8193291ab175e960c5df9141
-F src/sqliteInt.h 36f456f599a1bda4287ece61f3a9305b0b8d90ff49017a47a981cda5721a7ce0
+F src/sqliteInt.h 18590a040a47718b82cfdfd7a22ba03bfc6f278be4771a160039538279f3c17a
 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -707,7 +707,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d
 F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
-F src/where.c 0e2d1630a0894b61e2dc6a20a83eaffa5b05e2680fba03902abf332d9573b522
+F src/where.c 658d7890809d20cd879621608cb8a6da19d7b4e00bbdbc175952c16ddaef4178
 F src/whereInt.h df0c79388c0b71b4a91f480d02791679fe0345d40410435c541c8893e95a4d3f
 F src/wherecode.c 133a94f82858787217d073143617df19e4a6a7d0b771a1519f957608109ad5a5
 F src/whereexpr.c a98e498cb7b6d033bf2ee7c04876ccf7b0b4d46e7f6510d6b458a411a4b27fa5
@@ -2036,11 +2036,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 d96f6cc8475ae5509b8bff2db75e3c6f69a214d58d8979fbc0162ae488a040dc
-R d1d7bec4f98c1ae80c81ea353f1cf097
-T *branch * covering-index-enh
-T *sym-covering-index-enh *
-T -sym-trunk *
+P cadf5f6bb1ce0492ef858ada476288e8057afd3609caa18b09c818d3845d7244
+R 505ea793a261a3784aaa7cb5127ecad5
 U drh
-Z 4413d5327beb9bbaff2921e04536c2c1
+Z 202e57f8058bf0a039d2caefddb8daa7
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 0ce3e4314f..d6cafbbfe6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cadf5f6bb1ce0492ef858ada476288e8057afd3609caa18b09c818d3845d7244
\ No newline at end of file
+1390417be45dd84e9118f6e761f23b8ff7476d26411e165bbaab678881e4eadd
\ No newline at end of file
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index ea75eb2769..04f8204d2a 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -1255,6 +1255,7 @@ typedef struct With With;
 #define MASKBIT32(n)  (((unsigned int)1)<<(n))
 #define SMASKBIT32(n) ((n)<=31?((unsigned int)1)<<(n):0)
 #define ALLBITS       ((Bitmask)-1)
+#define TOPBIT        (((Bitmask)1)<<(BMS-1))
 
 /* A VList object records a mapping between parameters/variables/wildcards
 ** in the SQL statement (such as $abc, @pqr, or :xyz) and the integer
@@ -4091,13 +4092,13 @@ struct Walker {
     struct RefSrcList *pRefSrcList;           /* sqlite3ReferencesSrcList() */
     int *aiCol;                               /* array of column indexes */
     struct IdxCover *pIdxCover;               /* Check for index coverage */
-    struct IdxExprTrans *pIdxTrans;           /* Convert idxed expr to column */
     ExprList *pGroupBy;                       /* GROUP BY clause */
     Select *pSelect;                          /* HAVING to WHERE clause ctx */
     struct WindowRewrite *pRewrite;           /* Window rewrite context */
     struct WhereConst *pConst;                /* WHERE clause constants */
     struct RenameCtx *pRename;                /* RENAME COLUMN context */
     struct Table *pTab;                       /* Table of generated column */
+    struct CoveringIndexCheck *pCovIdxCk;     /* Check for covering index */
     SrcItem *pSrcItem;                        /* A single FROM clause item */
     DbFixer *pFix;
   } u;
diff --git a/src/where.c b/src/where.c
index 88aefd86ed..ff63098159 100644
--- a/src/where.c
+++ b/src/where.c
@@ -3247,6 +3247,94 @@ static int whereUsablePartialIndex(
   return 0;
 }
 
+/*
+** Structure passed to the whereIsCoveringIndex Walker callback.
+*/
+struct CoveringIndexCheck {
+  Index *pIdx;       /* The index */
+  int iTabCur;       /* Cursor number for the corresponding table */
+};
+
+/*
+** Information passed in is pWalk->u.pCovIdxCk.  Call is pCk.
+**
+** If the Expr node references the table with cursor pCk->iTabCur, then
+** make sure that column is covered by the index pCk->pIdx.  We know that
+** all columns less than 63 (really BMS-1) are covered, so we don't need
+** to check them.  But we do need to check any column at 63 or greater.
+**
+** If the index does not cover the column, then set pWalk->eCode to 
+** non-zero and return WRC_Abort to stop the search.
+**
+** If this node does not disprove that the index can be a covering index,
+** then just return WRC_Continue, to continue the search.
+*/
+static int whereIsCoveringIndexWalkCallback(Walker *pWalk, Expr *pExpr){
+  int i;                  /* Loop counter */
+  const Index *pIdx;      /* The index of interest */
+  const i16 *aiColumn;    /* Columns contained in the index */
+  u16 nColumn;            /* Number of columns in the index */
+  if( pExpr->op!=TK_COLUMN ) return WRC_Continue;
+  if( pExpr->iColumn<(BMS-1) ) return WRC_Continue;
+  if( pExpr->iTable!=pWalk->u.pCovIdxCk->iTabCur ) return WRC_Continue;
+  pIdx = pWalk->u.pCovIdxCk->pIdx;
+  aiColumn = pIdx->aiColumn;
+  nColumn = pIdx->nColumn;
+  for(i=0; i<nColumn; i++){
+    if( aiColumn[i]==pExpr->iColumn ) return WRC_Continue;
+  }
+  pWalk->eCode = 1;
+  return WRC_Abort;
+}
+
+
+/*
+** pIdx is an index that covers all of the low-number columns used by
+** pWInfo->pSelect (columns from 0 through 62).  But there are columns
+** in pWInfo->pSelect beyond 62.  This routine tries to answer the question
+** of whether pIdx covers *all* columns in the query.
+**
+** Return 0 if pIdx is a covering index.   Return non-zero if pIdx is
+** not a covering index or if we are unable to determine if pIdx is a
+** covering index.
+**
+** This routine is an optimization.  It is always safe to return non-zero.
+** But returning zero when non-zero should have been returned can lead to
+** incorrect bytecode and assertion faults.
+*/
+static SQLITE_NOINLINE u32 whereIsCoveringIndex(
+  WhereInfo *pWInfo,     /* The WHERE clause context */
+  Index *pIdx,           /* Index that is being tested */
+  int iTabCur            /* Cursor for the table being indexed */
+){
+  int i;
+  struct CoveringIndexCheck ck;
+  Walker w;
+  if( pWInfo->pSelect==0 ){
+    /* We don't have access to the full query, so we cannot check to see
+    ** if pIdx is covering.  Assume it is not. */
+    return 1;
+  }
+  for(i=0; i<pIdx->nColumn; i++){
+    if( pIdx->aiColumn[i]>=BMS-1 ) break;
+  }
+  if( i>=pIdx->nColumn ){
+    /* pIdx does not index any columns greater than 62, but we know from
+    ** colMask that columns greater than 62 are used, so this is not a
+    ** covering index */
+    return 1;
+  }
+  ck.pIdx = pIdx;
+  ck.iTabCur = iTabCur;
+  memset(&w, 0, sizeof(w));
+  w.xExprCallback = whereIsCoveringIndexWalkCallback;
+  w.xSelectCallback = sqlite3SelectWalkNoop;
+  w.u.pCovIdxCk = &ck;
+  w.eCode = 0;
+  sqlite3WalkSelect(&w, pWInfo->pSelect);
+  return w.eCode;
+}
+
 /*
 ** Add all WhereLoop objects for a single table of the join where the table
 ** is identified by pBuilder->pNew->iTab.  That table is guaranteed to be
@@ -3464,6 +3552,9 @@ static int whereLoopAddBtree(
         m = 0;
       }else{
         m = pSrc->colUsed & pProbe->colNotIdxed;
+        if( m==TOPBIT ){
+          m = whereIsCoveringIndex(pWInfo, pProbe, pSrc->iCursor);
+        }
         pNew->wsFlags = (m==0) ? (WHERE_IDX_ONLY|WHERE_INDEXED) : WHERE_INDEXED;
       }
 

From fb643592fed37076f42bc5466ee18e8106b92d5b Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sat, 22 Oct 2022 23:09:29 +0000
Subject: [PATCH 337/428] More frequently send the complete SELECT statement
 into sqlite3WhereBegin() so that it can more accurately determine index
 coverage.

FossilOrigin-Name: f6d09c5a0df940dbaa716df70df28218985b83540b34c468989729a3421ef38c
---
 manifest        | 14 +++++++-------
 manifest.uuid   |  2 +-
 src/select.c    |  4 ++--
 src/whereexpr.c |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/manifest b/manifest
index 9528ef1337..60313f770e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\sthe\squery\splanner\swith\sthe\sability\sto\sdiscern\swhen\san\sindex\sis\ncovering\seven\swhen\sit\sindexes\scolumns\swell\sbeyond\sthe\s63rd\scolumn.
-D 2022-10-22T20:13:46.151
+C More\sfrequently\ssend\sthe\scomplete\sSELECT\sstatement\sinto\ssqlite3WhereBegin()\nso\sthat\sit\scan\smore\saccurately\sdetermine\sindex\scoverage.
+D 2022-10-22T23:09:29.065
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -620,7 +620,7 @@ F src/printf.c e99ee9741e79ae3873458146f59644276657340385ade4e76a5f5d1c25793764
 F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c 3f7238ebb3252f4768a8fb46ad95b62700d27baddcab8a21548129f4f9305d52
+F src/select.c e5b6f930f068c9c5362fc76c704ae5cb5ef1e3f18759c2126f23b0cf04c0e263
 F src/shell.c.in 6a9e15cb9fc3cd13d3647d4d9714c0d4d4a65e7f49228c2aafca910ed08d5774
 F src/sqlite.h.in d9c8a6243fc0a1c270d69db33758e34b810af3462f9bc5b4af113b347e07c69d
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -710,7 +710,7 @@ F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
 F src/where.c 658d7890809d20cd879621608cb8a6da19d7b4e00bbdbc175952c16ddaef4178
 F src/whereInt.h df0c79388c0b71b4a91f480d02791679fe0345d40410435c541c8893e95a4d3f
 F src/wherecode.c 133a94f82858787217d073143617df19e4a6a7d0b771a1519f957608109ad5a5
-F src/whereexpr.c a98e498cb7b6d033bf2ee7c04876ccf7b0b4d46e7f6510d6b458a411a4b27fa5
+F src/whereexpr.c 05295b44b54eea76d1ba766f0908928d0e20e990c249344c9521454d3d09c7ae
 F src/window.c 928e215840e2f2d9a2746e018c9643ef42c66c4ab6630ef0df7fa388fa145e86
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
@@ -2036,8 +2036,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 cadf5f6bb1ce0492ef858ada476288e8057afd3609caa18b09c818d3845d7244
-R 505ea793a261a3784aaa7cb5127ecad5
+P 1390417be45dd84e9118f6e761f23b8ff7476d26411e165bbaab678881e4eadd
+R fe4090e455979b12a8be7e7dd6cc1e7b
 U drh
-Z 202e57f8058bf0a039d2caefddb8daa7
+Z d37a1eec89dc77f7cc3b46b2df76b240
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index d6cafbbfe6..28a30292e9 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1390417be45dd84e9118f6e761f23b8ff7476d26411e165bbaab678881e4eadd
\ No newline at end of file
+f6d09c5a0df940dbaa716df70df28218985b83540b34c468989729a3421ef38c
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index 03d9c42cfa..42a476c00f 100644
--- a/src/select.c
+++ b/src/select.c
@@ -7486,7 +7486,7 @@ int sqlite3Select(
       sqlite3VdbeAddOp2(v, OP_Gosub, regReset, addrReset);
       SELECTTRACE(1,pParse,p,("WhereBegin\n"));
       pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere, pGroupBy, pDistinct,
-          0, (sDistinct.isTnct==2 ? WHERE_DISTINCTBY : WHERE_GROUPBY) 
+          p, (sDistinct.isTnct==2 ? WHERE_DISTINCTBY : WHERE_GROUPBY) 
           |  (orderByGrp ? WHERE_SORTBYGROUP : 0) | distFlag, 0
       );
       if( pWInfo==0 ){
@@ -7785,7 +7785,7 @@ int sqlite3Select(
 
         SELECTTRACE(1,pParse,p,("WhereBegin\n"));
         pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere, pMinMaxOrderBy,
-                                   pDistinct, 0, minMaxFlag|distFlag, 0);
+                                   pDistinct, p, minMaxFlag|distFlag, 0);
         if( pWInfo==0 ){
           goto select_end;
         }
diff --git a/src/whereexpr.c b/src/whereexpr.c
index 1816a01f4b..24246c1aaf 100644
--- a/src/whereexpr.c
+++ b/src/whereexpr.c
@@ -1603,8 +1603,8 @@ static void whereAddLimitExpr(
 */
 void SQLITE_NOINLINE sqlite3WhereAddLimit(WhereClause *pWC, Select *p){
   assert( p!=0 && p->pLimit!=0 );                 /* 1 -- checked by caller */
-  assert( p->pGroupBy==0 && (p->selFlags & SF_Aggregate)==0 );
-  if( (p->selFlags & (SF_Distinct|SF_Aggregate))==0             /* 2 */
+  if( p->pGroupBy==0
+   && (p->selFlags & (SF_Distinct|SF_Aggregate))==0             /* 2 */
    && (p->pSrc->nSrc==1 && IsVirtual(p->pSrc->a[0].pTab))       /* 3 */
   ){
     ExprList *pOrderBy = p->pOrderBy;

From 7d913e9aae6e2490d56a6faf60a063be98207b37 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sun, 23 Oct 2022 20:09:13 +0000
Subject: [PATCH 338/428] The wide-table covering index detection must take
 into account aggregate queries.

FossilOrigin-Name: 9ac73f83c53b9fba10bb1b8bbfd1a8dc8a2dc4a655e811d5b96335dbf2b6fdac
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/where.c   |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/manifest b/manifest
index 60313f770e..466a8bbb6a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C More\sfrequently\ssend\sthe\scomplete\sSELECT\sstatement\sinto\ssqlite3WhereBegin()\nso\sthat\sit\scan\smore\saccurately\sdetermine\sindex\scoverage.
-D 2022-10-22T23:09:29.065
+C The\swide-table\scovering\sindex\sdetection\smust\stake\sinto\saccount\saggregate\nqueries.
+D 2022-10-23T20:09:13.523
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -707,7 +707,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d
 F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
-F src/where.c 658d7890809d20cd879621608cb8a6da19d7b4e00bbdbc175952c16ddaef4178
+F src/where.c 1ef5aae7fac877057b9f360f06b26d4275888460d8fb6e92bbb9e70e07afe946
 F src/whereInt.h df0c79388c0b71b4a91f480d02791679fe0345d40410435c541c8893e95a4d3f
 F src/wherecode.c 133a94f82858787217d073143617df19e4a6a7d0b771a1519f957608109ad5a5
 F src/whereexpr.c 05295b44b54eea76d1ba766f0908928d0e20e990c249344c9521454d3d09c7ae
@@ -2036,8 +2036,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 1390417be45dd84e9118f6e761f23b8ff7476d26411e165bbaab678881e4eadd
-R fe4090e455979b12a8be7e7dd6cc1e7b
+P f6d09c5a0df940dbaa716df70df28218985b83540b34c468989729a3421ef38c
+R fd3c0067754c62608d43d72ec9e99f57
 U drh
-Z d37a1eec89dc77f7cc3b46b2df76b240
+Z 5bfa2fd79b68e79172127d7fb9b603ce
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 28a30292e9..439d00ad72 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f6d09c5a0df940dbaa716df70df28218985b83540b34c468989729a3421ef38c
\ No newline at end of file
+9ac73f83c53b9fba10bb1b8bbfd1a8dc8a2dc4a655e811d5b96335dbf2b6fdac
\ No newline at end of file
diff --git a/src/where.c b/src/where.c
index ff63098159..7ba72d2766 100644
--- a/src/where.c
+++ b/src/where.c
@@ -3274,7 +3274,7 @@ static int whereIsCoveringIndexWalkCallback(Walker *pWalk, Expr *pExpr){
   const Index *pIdx;      /* The index of interest */
   const i16 *aiColumn;    /* Columns contained in the index */
   u16 nColumn;            /* Number of columns in the index */
-  if( pExpr->op!=TK_COLUMN ) return WRC_Continue;
+  if( pExpr->op!=TK_COLUMN && pExpr->op!=TK_AGG_COLUMN ) return WRC_Continue;
   if( pExpr->iColumn<(BMS-1) ) return WRC_Continue;
   if( pExpr->iTable!=pWalk->u.pCovIdxCk->iTabCur ) return WRC_Continue;
   pIdx = pWalk->u.pCovIdxCk->pIdx;

From 89b373ab282268f9c74d3b3f2ab13a45344b47b8 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 24 Oct 2022 11:02:02 +0000
Subject: [PATCH 339/428] Test cases for covering indexes on wide tables.

FossilOrigin-Name: 64c3777eb356b15094a9e9fcc135499ba22f4d847fb117afa6ccf19986e33585
---
 manifest           |  11 ++--
 manifest.uuid      |   2 +-
 test/widetab1.test | 156 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 163 insertions(+), 6 deletions(-)
 create mode 100644 test/widetab1.test

diff --git a/manifest b/manifest
index 466a8bbb6a..dfeec2e4db 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\swide-table\scovering\sindex\sdetection\smust\stake\sinto\saccount\saggregate\nqueries.
-D 2022-10-23T20:09:13.523
+C Test\scases\sfor\scovering\sindexes\son\swide\stables.
+D 2022-10-24T11:02:02.863
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1882,6 +1882,7 @@ F test/wherefault.test 6cf2a9c5712952d463d3f45ebee7f6caf400984df51a195d884cfb7eb
 F test/wherelfault.test 9012e4ef5259058b771606616bd007af5d154e64cc25fa9fd4170f6411db44e3
 F test/wherelimit.test afb46397c6d7e964e6e294ba3569864a0c570fe3807afc634236c2b752372f31
 F test/wherelimit2.test 657a3f24aadee62d058c5091ea682dc4af4b95ffe32f137155be49799a58e721
+F test/widetab1.test c296a98e123762de79917350e45fa33fdf88577a2571eb3a64c8bf7e44ef74d1
 F test/win32heap.test 10fd891266bd00af68671e702317726375e5407561d859be1aa04696f2aeee74
 F test/win32lock.test e0924eb8daac02bf80e9da88930747bd44dd9b230b7759fed927b1655b467c9c
 F test/win32longpath.test 4baffc3acb2e5188a5e3a895b2b543ed09e62f7c72d713c1feebf76222fe9976
@@ -2036,8 +2037,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 f6d09c5a0df940dbaa716df70df28218985b83540b34c468989729a3421ef38c
-R fd3c0067754c62608d43d72ec9e99f57
+P 9ac73f83c53b9fba10bb1b8bbfd1a8dc8a2dc4a655e811d5b96335dbf2b6fdac
+R ff35d1f3645fbbb934cd300395b24fe9
 U drh
-Z 5bfa2fd79b68e79172127d7fb9b603ce
+Z 474244313dc1a74df1056f4f86b5a3b2
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 439d00ad72..790aa82555 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9ac73f83c53b9fba10bb1b8bbfd1a8dc8a2dc4a655e811d5b96335dbf2b6fdac
\ No newline at end of file
+64c3777eb356b15094a9e9fcc135499ba22f4d847fb117afa6ccf19986e33585
\ No newline at end of file
diff --git a/test/widetab1.test b/test/widetab1.test
new file mode 100644
index 0000000000..39523ce882
--- /dev/null
+++ b/test/widetab1.test
@@ -0,0 +1,156 @@
+# 2022-10-24
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+# This file implements test cases for wide table (tables with more than
+# 64 columns) and indexes that reference columns beyond the 63rd or 64th
+# column.
+#
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+set testprefix widetab1
+
+
+# In order to pick the better index in the following query, SQLite needs to
+# be able to detect when an index that references later columns in a wide
+# table is a covering index.
+#
+do_execsql_test 100 {
+  CREATE TABLE a(
+   a00, a01, a02, a03, a04, a05, a06, a07, a08, a09,
+   a10, a11, a12, a13, a14, a15, a16, a17, a18, a19,
+   a20, a21, a22, a23, a24, a25, a26, a27, a28, a29,
+   a30, a31, a32, a33, a34, a35, a36, a37, a38, a39,
+   a40, a41, a42, a43, a44, a45, a46, a47, a48, a49,
+   a50, a51, a52, a53, a54, a55, a56, a57, a58, a59,
+   pd, bn, vb, bc, cn, ie, qm);
+  CREATE INDEX a1 on a(pd, bn, vb, bc, cn); -- preferred index
+  CREATE INDEX a2 on a(pd, bc, ie, qm);     -- suboptimal index
+  CREATE TABLE b(bg, bc, bn, iv, ln, mg);
+  CREATE INDEX b1 on b(bn, iv, bg);
+}
+do_eqp_test 110 {
+  SELECT dc, count(cn)
+    FROM (SELECT coalesce(b.bg, a.bc) as dc, cn
+            FROM a LEFT JOIN b
+                  ON a.bn = b.bn
+                 AND CASE WHEN a.vb IS NOT NULL THEN 1 ELSE 0 END = b.iv
+           WHERE pd BETWEEN 0 AND 10)
+   GROUP BY dc;
+} {
+  QUERY PLAN
+  |--SEARCH a USING COVERING INDEX a1 (pd>? AND pd<?)
+  |--SEARCH b USING COVERING INDEX b1 (bn=? AND iv=?) LEFT-JOIN
+  `--USE TEMP B-TREE FOR GROUP BY
+}
+
+reset_db
+do_execsql_test 200 {
+  CREATE TABLE t1(
+    c00,c01,c02,c03,c04,c05,c06,c07,c08,c09,
+    c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,
+    c20,c21,c22,c23,c24,c25,c26,c27,c28,c29,
+    c30,c31,c32,c33,c34,c35,c36,c37,c38,c39,
+    c40,c41,c42,c43,c44,c45,c46,c47,c48,c49,
+    c50,c51,c52,c53,c54,c55,c56,c57,c58,c59,
+    c60,c61,c62,c63,c64,c65,c66,c67,c68,c69,
+    c70,c71,c72,c73,c74,c75,c76,c77,c78,c79,
+    c80,c81,c82,c83,c84,c85,c86,c87,c88,c89,
+    c90,c91,c92,c93,c94,c95,c96,c97,c98,c99,
+    a,b,c,d,e
+  );
+  CREATE INDEX t1x1 on t1(c00,a,b,
+        c01,c02,c03,c04,c05,c06,c07,c08,c09,
+    c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,
+    c20,c21,c22,c23,c24,c25,c26,c27,c28,c29,
+    c30,c31,c32,c33,c34,c35,c36,c37,c38,c39,
+    c40,c41,c42,c43,c44,c45,c46,c47,c48,c49,
+    c50,c51,c52,c53,c54,c55,c56,c57,c58,c59,
+    c60,c61,c62,c63,c64,c65,c66,c67,c68,c69,
+    c70,c71,c72,c73,c74,c75,c76,c77,c78,c79,
+    c80,c81,c82,c83,c84,c85,c86,c87,c88,c89,
+    c90,c91,c92,c93,c94,c00,c96,c97,c98,c99
+  );
+  CREATE INDEX t1cd ON t1(c,d);
+  CREATE INDEX t1x2 ON t1(c01,c02,c03,a,b);
+  WITH RECURSIVE c(x) AS (VALUES(0) UNION ALL SELECT x+1000 FROM c WHERE x<9000)
+  INSERT INTO t1 SELECT
+    x+00, x+01, x+02, x+03, x+04, x+05, x+06, x+07, x+08, x+09,
+    x+10, x+11, x+12, x+13, x+14, x+15, x+16, x+17, x+18, x+19,
+    x+20, x+21, x+22, x+23, x+24, x+25, x+26, x+27, x+28, x+29,
+    x+30, x+31, x+32, x+33, x+34, x+35, x+36, x+37, x+38, x+39,
+    x+40, x+41, x+42, x+43, x+44, x+45, x+46, x+47, x+48, x+49,
+    x+50, x+51, x+52, x+53, x+54, x+55, x+56, x+57, x+58, x+59,
+    x+60, x+61, x+62, x+63, x+64, x+65, x+66, x+67, x+68, x+69,
+    x+70, x+71, x+72, x+73, x+74, x+75, x+76, x+77, x+78, x+79,
+    x+80, x+81, x+82, x+83, x+84, x+85, x+86, x+87, x+88, x+89,
+    x+90, x+91, x+92, x+93, x+94, x+95, x+96, x+97, x+98, x+99,
+    x+100, x+101, x+102, x+103, x+104 FROM c;
+}
+
+do_execsql_test 210 {SELECT sum(c62) FROM t1;} 45620
+do_execsql_test 220 {SELECT sum(c63) FROM t1;} 45630
+do_execsql_test 230 {SELECT sum(c64) FROM t1;} 45640
+do_execsql_test 240 {SELECT sum(c65) FROM t1;} 45650
+
+do_execsql_test 300 {
+  BEGIN;
+  SELECT sum(c62) FROM t1;
+  UPDATE t1 SET c62=c62+1 WHERE c00=1000;
+  SELECT sum(c62) FROM t1;
+} {45620 45621}
+do_execsql_test 310 {
+  SELECT sum(c65) FROM t1;
+  UPDATE t1 SET c65=c65+1 WHERE c00=1000;
+  SELECT sum(c65) FROM t1;
+  ROLLBACK;
+} {45650 45651}
+
+do_execsql_test 320 {
+  BEGIN;
+  SELECT count(*) FROM t1;
+  DELETE FROM t1 WHERE c=3102;
+  SELECT COUNT(*) FROM t1;
+  ROLLBACK;
+} {10 9}
+do_execsql_test 330 {
+  BEGIN;
+  SELECT count(*) FROM t1;
+  DELETE FROM t1 WHERE c=3102 AND d=3103;
+  SELECT COUNT(*) FROM t1;
+  ROLLBACK;
+} {10 9}
+do_execsql_test 340 {
+  BEGIN;
+  DELETE FROM t1 WHERE (c,d) IN (VALUES(3102,3103),(4102,4103),(5102,5103),(1,2));
+  SELECT count(*) FROM t1;
+  ROLLBACK;
+} {7}
+
+do_execsql_test 400 {
+  DROP INDEX t1cd;
+  DROP INDEX t1x1;
+  DROP INDEX t1x2;
+  CREATE INDEX t1x3 ON t1(c00,c05,c08);
+}
+do_execsql_test 410 {SELECT sum(c08) FROM t1 WHERE c00 IN (1000,5000);} 6016
+do_execsql_test 420 {SELECT sum(c63) FROM t1 WHERE c00 IN (1000,5000);} 6126
+do_execsql_test 430 {SELECT sum(c64) FROM t1 WHERE c00 IN (1000,5000);} 6128
+
+do_execsql_test 500 {
+  DROP INDEX t1x3;
+  CREATE TABLE t2 AS SELECT * FROM t1;
+  CREATE INDEX t1x4 ON t1(c00, c62, a, b);
+  CREATE INDEX t2x4 ON t2(c01, c62, c63, b, c);
+  SELECT t1.b, t2.b FROM t1 JOIN t2 ON t2.c01=t1.c00+1 WHERE +t1.b<7000
+   ORDER BY +t1.b;
+} {101 101 1101 1101 2101 2101 3101 3101 4101 4101 5101 5101 6101 6101}
+
+finish_test

From 1f41a8c8a71ccc5af5f74c354b7d8a482fcccb9a Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 24 Oct 2022 11:10:40 +0000
Subject: [PATCH 340/428] Fix built-in documentation for the ".mode qbox"
 command in the CLI.

FossilOrigin-Name: 3d7ea33be1076fd21681bdcff0c489646c017594b42b4a21a74e9e2d3947890b
---
 manifest       | 12 ++++++------
 manifest.uuid  |  2 +-
 src/shell.c.in |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index 2ddcf13fa0..9ad431517e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Clarification\son\sthe\smeaning\sof\sSrcList\sand\sSrcItem\sand\sespecially\sthe\nSrcItem.colUsed\sand\sIndex.colNotIdxed\sfields.\s\sComment\schanges\sonly\s-\sno\nchanges\sto\scode.
-D 2022-10-22T13:49:35.916
+C Fix\sbuilt-in\sdocumentation\sfor\sthe\s".mode\sqbox"\scommand\sin\sthe\sCLI.
+D 2022-10-24T11:10:40.311
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -621,7 +621,7 @@ F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 3f7238ebb3252f4768a8fb46ad95b62700d27baddcab8a21548129f4f9305d52
-F src/shell.c.in 6a9e15cb9fc3cd13d3647d4d9714c0d4d4a65e7f49228c2aafca910ed08d5774
+F src/shell.c.in 97f4ee3966d7d8ffcd976658ea3b92bc9a670eb988d2e8aeb2243789631689a6
 F src/sqlite.h.in d9c8a6243fc0a1c270d69db33758e34b810af3462f9bc5b4af113b347e07c69d
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 5336beea1868d99d2f62e628dbea55e97267dbff8193291ab175e960c5df9141
@@ -2036,8 +2036,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 fcd9e0dbe3226f3f7ccc15b11fc3aa3b8058571bef274c25a33e9753e22f7551
-R 3bee91f5b3c5cc3b42735acd38a39745
+P d96f6cc8475ae5509b8bff2db75e3c6f69a214d58d8979fbc0162ae488a040dc
+R d80b6eff956f308472eb5e33e1c2da52
 U drh
-Z 7715147e0f497c16dde985e20f495b12
+Z f106cab0f2ec627c6908493949c58d50
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 402d6976f0..6e79bf96d8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d96f6cc8475ae5509b8bff2db75e3c6f69a214d58d8979fbc0162ae488a040dc
\ No newline at end of file
+3d7ea33be1076fd21681bdcff0c489646c017594b42b4a21a74e9e2d3947890b
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index c70bcccd0a..21f610240f 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -4434,7 +4434,7 @@ static const char *(azHelp[]) = {
   "     line        One value per line",
   "     list        Values delimited by \"|\"",
   "     markdown    Markdown table format",
-  "     qbox        Shorthand for \"box --width 60 --quote\"",
+  "     qbox        Shorthand for \"box --wrap 60 --quote\"",
   "     quote       Escape answers as for SQL",
   "     table       ASCII-art table",
   "     tabs        Tab-separated values",
@@ -9506,7 +9506,7 @@ static int do_meta_command(char *zLine, ShellState *p){
         cmOpts.bQuote = 0;
       }else if( zMode==0 ){
         zMode = z;
-        /* Apply defaults for qbox pseudo-mods. If that
+        /* Apply defaults for qbox pseudo-mode.  If that
          * overwrites already-set values, user was informed of this.
          */
         if( cli_strcmp(z, "qbox")==0 ){

From 2d75c1aa3d18e889cd1752bab3aed3abc1633236 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 24 Oct 2022 12:38:32 +0000
Subject: [PATCH 341/428] Update the fuzzinvariant logic in fuzzcheck to the
 latest code from dbsqlfuzz.

FossilOrigin-Name: 739ad584765f1fc0eb196db870785da1726805cc2d9dd0a831a37a9e55a4afe9
---
 manifest              | 12 +++++------
 manifest.uuid         |  2 +-
 test/fuzzinvariants.c | 48 ++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/manifest b/manifest
index 9ad431517e..e4d289ddcf 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sbuilt-in\sdocumentation\sfor\sthe\s".mode\sqbox"\scommand\sin\sthe\sCLI.
-D 2022-10-24T11:10:40.311
+C Update\sthe\sfuzzinvariant\slogic\sin\sfuzzcheck\sto\sthe\slatest\scode\sfrom\ndbsqlfuzz.
+D 2022-10-24T12:38:32.096
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1149,7 +1149,7 @@ F test/fuzzdata8.db 653423800b7671e67caa740e977d80e1360f0d69e9992851f3ea5c4a69a2
 F test/fuzzer1.test 3d4c4b7e547aba5e5511a2991e3e3d07166cfbb8
 F test/fuzzer2.test a85ef814ce071293bce1ad8dffa217cbbaad4c14
 F test/fuzzerfault.test f64c4aef4c9e9edf1d6dc0d3f1e65dcc81e67c996403c88d14f09b74807a42bc
-F test/fuzzinvariants.c a91f439e512c72045bddaf0f0ee3b876b2fe645e076aefb085658f1337066f7e
+F test/fuzzinvariants.c 760a1004ae4c4cef398310631ea6d441c5e8297af0f688a2dc7a467afd22df33
 F test/gcfault.test dd28c228a38976d6336a3fc42d7e5f1ad060cb8c
 F test/gencol1.test cc0dbb0ee116e5602e18ea7d47f2a0f76b26e09a823b7c36ef254370c2b0f3c1
 F test/genesis.tcl 1e2e2e8e5cc4058549a154ff1892fe5c9de19f98
@@ -2036,8 +2036,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 d96f6cc8475ae5509b8bff2db75e3c6f69a214d58d8979fbc0162ae488a040dc
-R d80b6eff956f308472eb5e33e1c2da52
+P 3d7ea33be1076fd21681bdcff0c489646c017594b42b4a21a74e9e2d3947890b
+R 8f78a5fa1e8c20b5a3592cf3de894b6c
 U drh
-Z f106cab0f2ec627c6908493949c58d50
+Z c3f47754444910e4af4759510c20d50b
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 6e79bf96d8..9d60eb4976 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3d7ea33be1076fd21681bdcff0c489646c017594b42b4a21a74e9e2d3947890b
\ No newline at end of file
+739ad584765f1fc0eb196db870785da1726805cc2d9dd0a831a37a9e55a4afe9
\ No newline at end of file
diff --git a/test/fuzzinvariants.c b/test/fuzzinvariants.c
index 73fede630e..c2df82b4aa 100644
--- a/test/fuzzinvariants.c
+++ b/test/fuzzinvariants.c
@@ -29,7 +29,7 @@
 
 /* Forward references */
 static char *fuzz_invariant_sql(sqlite3_stmt*, int);
-static int sameValue(sqlite3_stmt*,int,sqlite3_stmt*,int);
+static int sameValue(sqlite3_stmt*,int,sqlite3_stmt*,int,sqlite3_stmt*);
 static void reportInvariantFailed(sqlite3_stmt*,sqlite3_stmt*,int);
 
 /*
@@ -108,13 +108,16 @@ int fuzz_invariant(
   }
   while( (rc = sqlite3_step(pTestStmt))==SQLITE_ROW ){
     for(i=0; i<nCol; i++){
-      if( !sameValue(pStmt, i, pTestStmt, i) ) break;
+      if( !sameValue(pStmt, i, pTestStmt, i, 0) ) break;
     }
     if( i>=nCol ) break;
   }
   if( rc==SQLITE_DONE ){
     /* No matching output row found */
     sqlite3_stmt *pCk = 0;
+
+    /* This is not a fault if the database file is corrupt, because anything
+    ** can happen with a corrupt database file */
     rc = sqlite3_prepare_v2(db, "PRAGMA integrity_check", -1, &pCk, 0);
     if( rc ){
       sqlite3_finalize(pCk);
@@ -132,6 +135,7 @@ int fuzz_invariant(
       return SQLITE_CORRUPT;
     }
     sqlite3_finalize(pCk);
+
     if( sqlite3_strlike("%group%by%order%by%desc%",sqlite3_sql(pStmt),0)==0 ){
       /* dbsqlfuzz crash-647c162051c9b23ce091b7bbbe5125ce5f00e922
       ** Original statement is:
@@ -145,6 +149,7 @@ int fuzz_invariant(
       */
       goto not_a_fault;
     }
+
     if( sqlite3_strlike("%limit%)%order%by%", sqlite3_sql(pTestStmt),0)==0 ){
       /* crash-89bd6a6f8c6166e9a4c5f47b3e70b225f69b76c6
       ** Original statement is:
@@ -159,6 +164,31 @@ int fuzz_invariant(
       */
       goto not_a_fault;
     }
+
+    /* The original sameValue() comparison assumed a collating sequence
+    ** of "binary".  It can sometimes get an incorrect result for different
+    ** collating sequences.  So rerun the test with no assumptions about
+    ** collations.
+    */
+    rc = sqlite3_prepare_v2(db,
+       "SELECT ?1=?2 OR ?1=?2 COLLATE nocase OR ?1=?2 COLLATE rtrim",
+       -1, &pCk, 0);
+    if( rc==SQLITE_OK ){
+      sqlite3_reset(pTestStmt);
+      while( (rc = sqlite3_step(pTestStmt))==SQLITE_ROW ){
+        for(i=0; i<nCol; i++){
+          if( !sameValue(pStmt, i, pTestStmt, i, pCk) ) break;
+        }
+        if( i>=nCol ){
+          sqlite3_finalize(pCk);
+          goto not_a_fault;
+        }
+      }
+    }
+    sqlite3_finalize(pCk);
+
+    /* Invariants do not necessarily work if there are virtual tables
+    ** involved in the query */
     rc = sqlite3_prepare_v2(db, 
             "SELECT 1 FROM bytecode(?1) WHERE opcode='VOpen'", -1, &pCk, 0);
     if( rc==SQLITE_OK ){
@@ -272,7 +302,11 @@ static char *fuzz_invariant_sql(sqlite3_stmt *pStmt, int iCnt){
 /*
 ** Return true if and only if v1 and is the same as v2.
 */
-static int sameValue(sqlite3_stmt *pS1, int i1, sqlite3_stmt *pS2, int i2){
+static int sameValue(
+  sqlite3_stmt *pS1, int i1,       /* Value to text on the left */
+  sqlite3_stmt *pS2, int i2,       /* Value to test on the right */
+  sqlite3_stmt *pTestCompare       /* COLLATE comparison statement or NULL */
+){
   int x = 1;
   int t1 = sqlite3_column_type(pS1,i1);
   int t2 = sqlite3_column_type(pS2,i2);
@@ -302,6 +336,14 @@ static int sameValue(sqlite3_stmt *pS1, int i1, sqlite3_stmt *pS2, int i2){
         const char *z2 = (const char*)sqlite3_column_text(pS2,i2);
         x = ((z1==0 && z2==0) || (z1!=0 && z2!=0 && strcmp(z1,z1)==0));
         printf("Encodings differ.  %d on left and %d on right\n", e1, e2);
+        abort();
+      }
+      if( pTestCompare ){
+        sqlite3_bind_value(pTestCompare, 1, sqlite3_column_value(pS1,i1));
+        sqlite3_bind_value(pTestCompare, 2, sqlite3_column_value(pS2,i2));
+        x = sqlite3_step(pTestCompare)==SQLITE_ROW
+                      && sqlite3_column_int(pTestCompare,0)!=0;
+        sqlite3_reset(pTestCompare);
         break;
       }
       if( e1!=SQLITE_UTF8 ){

From 80b30f995eacfafaba95f76d25b5ae2c37f478e9 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Mon, 24 Oct 2022 15:51:24 +0000
Subject: [PATCH 342/428] Use the same "PRAGMA synchronous" setting for the
 output of a "VACUUM INTO" as are configured for the database being vacuumed.

FossilOrigin-Name: 86cb21ca12581cae9a29f42ba707bd9d789e667e5ddc0f64b24940d5d5c9a118
---
 manifest              | 17 +++++++-------
 manifest.uuid         |  2 +-
 src/vacuum.c          |  8 ++++++-
 test/vacuum-into.test | 54 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 70 insertions(+), 11 deletions(-)

diff --git a/manifest b/manifest
index f93e531e07..a834a0d53e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improve\sthe\sability\sof\sthe\squery\splanner\sto\srecognize\scovering\sindexes\seven\non\stables\swith\smore\sthan\s63\scolumns\sand\swhere\sthe\sindex\sis\sover\scolumns\nbeyond\sthe\s63rd\scolumn.
-D 2022-10-24T13:20:48.155
+C Use\sthe\ssame\s"PRAGMA\ssynchronous"\ssetting\sfor\sthe\soutput\sof\sa\s"VACUUM\sINTO"\sas\sare\sconfigured\sfor\sthe\sdatabase\sbeing\svacuumed.
+D 2022-10-24T15:51:24.342
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -691,7 +691,7 @@ F src/update.c 5b0302c47cf31b533d5dff04c497ca1d8b9d89c39727e633fbe7b882fd5ac5aa
 F src/upsert.c 5303dc6c518fa7d4b280ec65170f465c7a70b7ac2b22491598f6d0b4875b3145
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 F src/util.c 0be191521ff6d2805995f4910f0b6231b42843678b2efdc1abecaf39929a673f
-F src/vacuum.c bb346170b0b54c6683bba4a5983aea40485597fdf605c87ec8bc2e199fe88cd8
+F src/vacuum.c 84ce7f01f8a7a08748e107a441db83bcec13970190ddcb0c9ff522adbc1c23fd
 F src/vdbe.c 0c7cb1b934ad8611e14e7efaf2c3a95df7dd3f7964d63ea07fef42a23df86131
 F src/vdbe.h 58675f47dcf3105bab182c3ad3726efd60ffd003e954386904ac9107d0d2b743
 F src/vdbeInt.h 17b7461ffcf9ee760d1341731715a419f6b8c763089a7ece25c2e8098d702b3f
@@ -1780,7 +1780,7 @@ F test/uri.test c1abaaaa28e9422d61e5f3f9cbc8ef993ec49fe802f581520731708561d49384
 F test/uri2.test 9d3ba7a53ee167572d53a298ee4a5d38ec4a8fb7
 F test/userauth01.test e740a2697a7b40d7c5003a7d7edaee16acd349a9
 F test/utf16align.test 9fde0bb5d3a821594aa68c6829ab9c5453a084384137ebb9f6153e2d678039da
-F test/vacuum-into.test f0b8c091df5305728b6973e9cce4166c861955b650dd3c599cb045d7160d3971
+F test/vacuum-into.test e0e3406845be4cf1b44db354179e5d9437e38bc267e4ac8e8dc617f9c3c903ab
 F test/vacuum.test ce91c39f7f91a4273bf620efad21086b5aa6ef1d
 F test/vacuum2.test 9fd45ce6ce29f5614c249e03938d3567c06a9e772d4f155949f8eafe2d8af520
 F test/vacuum3.test d9d9a04ee58c485b94694fd4f68cffaba49c32234fdefe1ac1a622c5e17d4ce3
@@ -2037,9 +2037,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 739ad584765f1fc0eb196db870785da1726805cc2d9dd0a831a37a9e55a4afe9 64c3777eb356b15094a9e9fcc135499ba22f4d847fb117afa6ccf19986e33585
-R b5f98598ecfac110db3df7f3097043ba
-T +closed 64c3777eb356b15094a9e9fcc135499ba22f4d847fb117afa6ccf19986e33585
-U drh
-Z 9b3937f6428c706b296ca84f8cdbf61c
+P f058773e41495ddbae698f9e9a4f62b7003112ea8614dfad69471340058735e4
+R aad070fc822a6fea7b7048f7529b6e92
+U dan
+Z 5db98dc51925ab218523ddcf42e091d9
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 6a52eb6e4d..9e6b2e317b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f058773e41495ddbae698f9e9a4f62b7003112ea8614dfad69471340058735e4
\ No newline at end of file
+86cb21ca12581cae9a29f42ba707bd9d789e667e5ddc0f64b24940d5d5c9a118
\ No newline at end of file
diff --git a/src/vacuum.c b/src/vacuum.c
index 9899b63cf1..9908cf1429 100644
--- a/src/vacuum.c
+++ b/src/vacuum.c
@@ -161,6 +161,7 @@ SQLITE_NOINLINE int sqlite3RunVacuum(
   int nDb;                /* Number of attached databases */
   const char *zDbMain;    /* Schema name of database to vacuum */
   const char *zOut;       /* Name of output file */
+  u32 pgflags = PAGER_SYNCHRONOUS_OFF; /* sync flags for output db */
 
   if( !db->autoCommit ){
     sqlite3SetString(pzErrMsg, db, "cannot VACUUM from within a transaction");
@@ -232,12 +233,17 @@ SQLITE_NOINLINE int sqlite3RunVacuum(
       goto end_of_vacuum;
     }
     db->mDbFlags |= DBFLAG_VacuumInto;
+
+    /* For a VACUUM INTO, the pager-flags are set to the same values as
+    ** they are for the database being vacuumed, except that PAGER_CACHESPILL
+    ** is always set. */
+    pgflags = db->aDb[iDb].safety_level | (db->flags & PAGER_FLAGS_MASK);
   }
   nRes = sqlite3BtreeGetRequestedReserve(pMain);
 
   sqlite3BtreeSetCacheSize(pTemp, db->aDb[iDb].pSchema->cache_size);
   sqlite3BtreeSetSpillSize(pTemp, sqlite3BtreeSetSpillSize(pMain,0));
-  sqlite3BtreeSetPagerFlags(pTemp, PAGER_SYNCHRONOUS_OFF|PAGER_CACHESPILL);
+  sqlite3BtreeSetPagerFlags(pTemp, pgflags|PAGER_CACHESPILL);
 
   /* Begin a transaction and take an exclusive lock on the main database
   ** file. This is done before the sqlite3BtreeGetPageSize(pMain) call below,
diff --git a/test/vacuum-into.test b/test/vacuum-into.test
index a46d95cf17..98692a108a 100644
--- a/test/vacuum-into.test
+++ b/test/vacuum-into.test
@@ -133,4 +133,58 @@ if {[wal_is_capable]} {
   } {1024 ok}
 }
 
+#-------------------------------------------------------------------------
+
+testvfs tvfs -default 1
+tvfs filter xSync
+tvfs script xSyncCb
+proc xSyncCb {method file fileid flags} {
+  incr ::sync($flags)
+}
+
+reset_db
+
+do_execsql_test vacuum-into-700 {
+  CREATE TABLE t1(a, b);
+  INSERT INTO t1 VALUES(1, 2);
+}
+
+foreach {tn pragma res} {
+  710 {
+    PRAGMA synchronous = normal
+  } {normal 2}
+  720 {
+    PRAGMA synchronous = full
+  } {normal 3}
+  730 {
+    PRAGMA synchronous = off
+  } {}
+  740 {
+    PRAGMA synchronous = extra;
+  } {normal 3}
+  750 {
+    PRAGMA fullfsync = 1;
+    PRAGMA synchronous = full;
+  } {full|dataonly 1 full 2}
+} {
+
+  forcedelete test.db2
+  array unset ::sync
+  do_execsql_test vacuum-into-$tn.1 "
+    $pragma ;
+    VACUUM INTO 'test.db2'
+  "
+
+  do_test vacuum-into-$tn.2 {
+    array get ::sync
+  } $res
+}
+
+db close
+tvfs delete
+
+
 finish_test
+
+
+

From 99a37ca7792b817581ba8f0bc9a8a0072b3df099 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 24 Oct 2022 18:33:50 +0000
Subject: [PATCH 343/428] Add a comment to a previously undescribed member of
 the Walker union.

FossilOrigin-Name: 69d704224e9ed022fcec591beff2ffcc4daf3e7fc586debfdcf00b25c1fddd87
---
 manifest        | 14 +++++++-------
 manifest.uuid   |  2 +-
 src/sqliteInt.h |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index a834a0d53e..5ee83cf4e7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Use\sthe\ssame\s"PRAGMA\ssynchronous"\ssetting\sfor\sthe\soutput\sof\sa\s"VACUUM\sINTO"\sas\sare\sconfigured\sfor\sthe\sdatabase\sbeing\svacuumed.
-D 2022-10-24T15:51:24.342
+C Add\sa\scomment\sto\sa\spreviously\sundescribed\smember\sof\sthe\sWalker\sunion.
+D 2022-10-24T18:33:50.858
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -625,7 +625,7 @@ F src/shell.c.in 97f4ee3966d7d8ffcd976658ea3b92bc9a670eb988d2e8aeb2243789631689a
 F src/sqlite.h.in d9c8a6243fc0a1c270d69db33758e34b810af3462f9bc5b4af113b347e07c69d
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 5336beea1868d99d2f62e628dbea55e97267dbff8193291ab175e960c5df9141
-F src/sqliteInt.h 18590a040a47718b82cfdfd7a22ba03bfc6f278be4771a160039538279f3c17a
+F src/sqliteInt.h 666631a1b7e6dde044626c90a4aa85fbc2c3bc5115c5bef58fb979254d0b34d4
 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -2037,8 +2037,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 f058773e41495ddbae698f9e9a4f62b7003112ea8614dfad69471340058735e4
-R aad070fc822a6fea7b7048f7529b6e92
-U dan
-Z 5db98dc51925ab218523ddcf42e091d9
+P 86cb21ca12581cae9a29f42ba707bd9d789e667e5ddc0f64b24940d5d5c9a118
+R 21f17ac8e71c90776b8e00d4be179330
+U drh
+Z 94b439c11f7f291f078b33955954c7a9
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 9e6b2e317b..990b0c8a6f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-86cb21ca12581cae9a29f42ba707bd9d789e667e5ddc0f64b24940d5d5c9a118
\ No newline at end of file
+69d704224e9ed022fcec591beff2ffcc4daf3e7fc586debfdcf00b25c1fddd87
\ No newline at end of file
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 04f8204d2a..0df62c7da3 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -4100,7 +4100,7 @@ struct Walker {
     struct Table *pTab;                       /* Table of generated column */
     struct CoveringIndexCheck *pCovIdxCk;     /* Check for covering index */
     SrcItem *pSrcItem;                        /* A single FROM clause item */
-    DbFixer *pFix;
+    DbFixer *pFix;                            /* See sqlite3FixSelect() */
   } u;
 };
 

From 7704a535d094d7520ab4893bdf83e5bd9e67e892 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 24 Oct 2022 18:42:45 +0000
Subject: [PATCH 344/428] Fix typo in comment.

FossilOrigin-Name: f65c95658fe4d30817da8de7eb88e823ea1cd8be40e347d626870bad3cc13359
---
 manifest        | 12 ++++++------
 manifest.uuid   |  2 +-
 src/sqliteInt.h |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/manifest b/manifest
index 5ee83cf4e7..bf748e6b59 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\scomment\sto\sa\spreviously\sundescribed\smember\sof\sthe\sWalker\sunion.
-D 2022-10-24T18:33:50.858
+C Fix\stypo\sin\scomment.
+D 2022-10-24T18:42:45.118
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -625,7 +625,7 @@ F src/shell.c.in 97f4ee3966d7d8ffcd976658ea3b92bc9a670eb988d2e8aeb2243789631689a
 F src/sqlite.h.in d9c8a6243fc0a1c270d69db33758e34b810af3462f9bc5b4af113b347e07c69d
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 5336beea1868d99d2f62e628dbea55e97267dbff8193291ab175e960c5df9141
-F src/sqliteInt.h 666631a1b7e6dde044626c90a4aa85fbc2c3bc5115c5bef58fb979254d0b34d4
+F src/sqliteInt.h 9a40d5b075cd2e78bac6f9ae724e3fa4281373cb728f961272cb182f6ba94ce6
 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -2037,8 +2037,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 86cb21ca12581cae9a29f42ba707bd9d789e667e5ddc0f64b24940d5d5c9a118
-R 21f17ac8e71c90776b8e00d4be179330
+P 69d704224e9ed022fcec591beff2ffcc4daf3e7fc586debfdcf00b25c1fddd87
+R e2a88fcf6a9d4446fa629ea861bc8ca4
 U drh
-Z 94b439c11f7f291f078b33955954c7a9
+Z ea85a8ca90f8837e6e02f1969966b7f9
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 990b0c8a6f..c85389d8a2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-69d704224e9ed022fcec591beff2ffcc4daf3e7fc586debfdcf00b25c1fddd87
\ No newline at end of file
+f65c95658fe4d30817da8de7eb88e823ea1cd8be40e347d626870bad3cc13359
\ No newline at end of file
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 0df62c7da3..3dde0f6f9c 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -3148,7 +3148,7 @@ struct SrcItem {
   } u1;
   union {
     Index *pIBIndex;  /* Index structure corresponding to u1.zIndexedBy */
-    CteUse *pCteUse;  /* CTE Usage info info fg.isCte is true */
+    CteUse *pCteUse;  /* CTE Usage info when fg.isCte is true */
   } u2;
 };
 

From f861b36bf47b3c2586643905a9248b91b8402416 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 25 Oct 2022 08:06:17 +0000
Subject: [PATCH 345/428] Minor cleanups and doc improvements in the OPFS
 sqlite3_vfs proxy.

FossilOrigin-Name: 48645f7bcacf81c4149f26d20ee1752fbe93a02f96b85bd7e28bfa49322137e5
---
 ext/wasm/api/extern-post-js.js           |   7 +-
 ext/wasm/api/sqlite3-api-opfs.js         | 182 ++++++++++++-----------
 ext/wasm/api/sqlite3-opfs-async-proxy.js |  41 ++---
 manifest                                 |  18 +--
 manifest.uuid                            |   2 +-
 5 files changed, 132 insertions(+), 118 deletions(-)

diff --git a/ext/wasm/api/extern-post-js.js b/ext/wasm/api/extern-post-js.js
index 768696508e..67b32e8912 100644
--- a/ext/wasm/api/extern-post-js.js
+++ b/ext/wasm/api/extern-post-js.js
@@ -1,6 +1,9 @@
 /* extern-post-js.js must be appended to the resulting sqlite3.js
-   file. It gets its name from being used as the value for
-   the --extern-post-js=... Emscripten flag. */
+   file. It gets its name from being used as the value for the
+   --extern-post-js=... Emscripten flag. Note that this code, unlike
+   most of the associated JS code, runs outside of the
+   Emscripten-generated module init scope, in the current
+   global scope. */
 (function(){
   /**
      In order to hide the sqlite3InitModule()'s resulting Emscripten
diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index 9f53024548..3f27941e8b 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -15,14 +15,17 @@
   asynchronous Origin-Private FileSystem (OPFS) APIs using a second
   Worker, implemented in sqlite3-opfs-async-proxy.js.  This file is
   intended to be appended to the main sqlite3 JS deliverable somewhere
-  after sqlite3-api-glue.js and before sqlite3-api-cleanup.js.
+  after sqlite3-api-oo1.js and before sqlite3-api-cleanup.js.
 */
 'use strict';
 self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
 /**
-   installOpfsVfs() returns a Promise which, on success, installs
-   an sqlite3_vfs named "opfs", suitable for use with all sqlite3 APIs
-   which accept a VFS. It uses the Origin-Private FileSystem API for
+   installOpfsVfs() returns a Promise which, on success, installs an
+   sqlite3_vfs named "opfs", suitable for use with all sqlite3 APIs
+   which accept a VFS. It is intended to be called via
+   sqlite3ApiBootstrap.initializersAsync or an equivalent mechanism.
+
+   The installed VFS uses the Origin-Private FileSystem API for
    all file storage. On error it is rejected with an exception
    explaining the problem. Reasons for rejection include, but are
    not limited to:
@@ -48,31 +51,31 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     proxying OPFS's synchronous API via the synchronous interface
     required by the sqlite3_vfs API.
 
-  - This function may only be called a single time and it must be
-    called from the client, as opposed to the library initialization,
-    in case the client requires a custom path for this API's
-    "counterpart": this function's argument is the relative URI to
-    this module's "asynchronous half". When called, this function removes
-    itself from the sqlite3 object.
+  - This function may only be called a single time. When called, this
+    function removes itself from the sqlite3 object.
 
-   The argument may optionally be a plain object with the following
-   configuration options:
+  All arguments to this function are for internal/development purposes
+  only. They do not constitute a public API and may change at any
+  time.
 
-   - proxyUri: as described above
+  The argument may optionally be a plain object with the following
+  configuration options:
 
-   - verbose (=2): an integer 0-3. 0 disables all logging, 1 enables
-     logging of errors. 2 enables logging of warnings and errors. 3
-     additionally enables debugging info.
+  - proxyUri: as described above
 
-   - sanityChecks (=false): if true, some basic sanity tests are
-     run on the OPFS VFS API after it's initialized, before the
-     returned Promise resolves.
+  - verbose (=2): an integer 0-3. 0 disables all logging, 1 enables
+    logging of errors. 2 enables logging of warnings and errors. 3
+    additionally enables debugging info.
 
-   On success, the Promise resolves to the top-most sqlite3 namespace
-   object and that object gets a new object installed in its
-   `opfs` property, containing several OPFS-specific utilities.
+  - sanityChecks (=false): if true, some basic sanity tests are
+    run on the OPFS VFS API after it's initialized, before the
+    returned Promise resolves.
+
+  On success, the Promise resolves to the top-most sqlite3 namespace
+  object and that object gets a new object installed in its
+  `opfs` property, containing several OPFS-specific utilities.
 */
-const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
+const installOpfsVfs = function callee(options){
   if(!self.SharedArrayBuffer ||
      !self.Atomics ||
      !self.FileSystemHandle ||
@@ -84,9 +87,9 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
       new Error("This environment does not have OPFS support.")
     );
   }
-  const options = (asyncProxyUri && 'object'===asyncProxyUri) ? asyncProxyUri : {
-    proxyUri: asyncProxyUri
-  };
+  if(!options || 'object'!==typeof options){
+    options = Object.create(null);
+  }
   const urlParams = new URL(self.location.href).searchParams;
   if(undefined===options.verbose){
     options.verbose = urlParams.has('opfs-verbose') ? 3 : 2;
@@ -113,7 +116,6 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
     const log =    (...args)=>logImpl(2, ...args);
     const warn =   (...args)=>logImpl(1, ...args);
     const error =  (...args)=>logImpl(0, ...args);
-    //warn("The OPFS VFS feature is very much experimental and under construction.");
     const toss = function(...args){throw new Error(args.join(' '))};
     const capi = sqlite3.capi;
     const wasm = capi.wasm;
@@ -158,9 +160,6 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
         s.count = s.time = 0;
         s = metrics.s11n.deserialize = Object.create(null);
         s.count = s.time = 0;
-        //[ // timed routines which are not in state.opIds
-        //  'xFileControl'
-        //].forEach((k)=>r(metrics[k] = Object.create(null)));
       }
     }/*metrics*/;      
     const promiseReject = function(err){
@@ -223,32 +222,36 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
        cases. We should probably have one SAB here with a single slot
        for locking a per-file initialization step and then allocate a
        separate SAB like the above one for each file. That will
-       require a bit of acrobatics but should be feasible.
+       require a bit of acrobatics but should be feasible. The most
+       problematic part is that xOpen() would have to use
+       postMessage() to communicate its SharedArrayBuffer, and mixing
+       that approach with Atomics.wait/notify() gets a bit messy.
     */
     const state = Object.create(null);
     state.verbose = options.verbose;
     state.littleEndian = (()=>{
       const buffer = new ArrayBuffer(2);
-      new DataView(buffer).setInt16(0, 256, true /* littleEndian */);
+      new DataView(buffer).setInt16(0, 256, true /* ==>littleEndian */);
       // Int16Array uses the platform's endianness.
       return new Int16Array(buffer)[0] === 256;
     })();
-    /** Whether the async counterpart should log exceptions to
-        the serialization channel. That produces a great deal of
-        noise for seemingly innocuous things like xAccess() checks
-        for missing files, so this option may have one of 3 values:
+    /**
+       Whether the async counterpart should log exceptions to
+       the serialization channel. That produces a great deal of
+       noise for seemingly innocuous things like xAccess() checks
+       for missing files, so this option may have one of 3 values:
 
-        0 = no exception logging
+       0 = no exception logging
 
-        1 = only log exceptions for "significant" ops like xOpen(),
-        xRead(), and xWrite().
+       1 = only log exceptions for "significant" ops like xOpen(),
+       xRead(), and xWrite().
 
-        2 = log all exceptions.
+       2 = log all exceptions.
     */
     state.asyncS11nExceptions = 1;
-    /* Size of file I/O buffer block. 64k = max sqlite3 page size. */
-    state.fileBufferSize =
-      1024 * 64;
+    /* Size of file I/O buffer block. 64k = max sqlite3 page size, and
+       xRead/xWrite() will never deal in blocks larger than that. */
+    state.fileBufferSize = 1024 * 64;
     state.sabS11nOffset = state.fileBufferSize;
     /**
        The size of the block in our SAB for serializing arguments and
@@ -258,7 +261,8 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
     */
     state.sabS11nSize = opfsVfs.$mxPathname * 2;
     /**
-       The SAB used for all data I/O (files and arg/result s11n).
+       The SAB used for all data I/O between the synchronous and
+       async halves (file i/o and arg/result s11n).
     */
     state.sabIO = new SharedArrayBuffer(
       state.fileBufferSize/* file i/o block */
@@ -297,7 +301,13 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
       state.opIds.mkdir = i++;
       state.opIds['opfs-async-metrics'] = i++;
       state.opIds['opfs-async-shutdown'] = i++;
-      state.sabOP = new SharedArrayBuffer(i * 4/*sizeof int32*/);
+      /* The retry slot is used by the async part for wait-and-retry
+         semantics. Though we could hypothetically use the xSleep slot
+         for that, doing so might lead to undesired side effects. */
+      state.opIds.retry = i++;
+      state.sabOP = new SharedArrayBuffer(
+        i * 4/* ==sizeof int32, noting that Atomics.wait() and friends
+                can only function on Int32Array views of an SAB. */);
       opfsUtil.metrics.reset();
     }
     /**
@@ -338,9 +348,12 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
       state.s11n.serialize(...args);
       Atomics.store(state.sabOPView, state.opIds.rc, -1);
       Atomics.store(state.sabOPView, state.opIds.whichOp, opNdx);
-      Atomics.notify(state.sabOPView, state.opIds.whichOp) /* async thread will take over here */;
+      Atomics.notify(state.sabOPView, state.opIds.whichOp)
+      /* async thread will take over here */;
       const t = performance.now();
-      Atomics.wait(state.sabOPView, state.opIds.rc, -1);
+      Atomics.wait(state.sabOPView, state.opIds.rc, -1)
+      /* When this wait() call returns, the async half will have
+         completed the operation and reported its results. */;
       const rc = Atomics.load(state.sabOPView, state.opIds.rc);
       metrics[op].wait += performance.now() - t;
       if(rc && state.asyncS11nExceptions){
@@ -352,17 +365,22 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
 
     const initS11n = ()=>{
       /**
-         ACHTUNG: this code is 100% duplicated in the other half of this
-         proxy! The documentation is maintained in the "synchronous half".
+         !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+         ACHTUNG: this code is 100% duplicated in the other half of
+         this proxy! The documentation is maintained in the
+         "synchronous half".
+         !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
          This proxy de/serializes cross-thread function arguments and
          output-pointer values via the state.sabIO SharedArrayBuffer,
          using the region defined by (state.sabS11nOffset,
          state.sabS11nOffset]. Only one dataset is recorded at a time.
 
-         This is not a general-purpose format. It only supports the range
-         of operations, and data sizes, needed by the sqlite3_vfs and
-         sqlite3_io_methods operations.
+         This is not a general-purpose format. It only supports the
+         range of operations, and data sizes, needed by the
+         sqlite3_vfs and sqlite3_io_methods operations. Serialized
+         data are transient and this serialization algorithm may
+         change at any time.
 
          The data format can be succinctly summarized as:
 
@@ -386,7 +404,8 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
          using their TextEncoder/TextDecoder representations. It would
          arguably make more sense to store them as Int16Arrays of
          their JS character values, but how best/fastest to get that
-         in and out of string form us an open point.
+         in and out of string form is an open point. Initial
+         experimentation with that approach did not gain us any speed.
 
          Historical note: this impl was initially about 1% this size by
          using using JSON.stringify/parse(), but using fit-to-purpose
@@ -583,9 +602,11 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
         toss("Member",name," is not a function pointer. Signature =",sigN);
       }
       const memKey = tgt.memberKey(name);
-      //log("installMethod",tgt, name, sigN);
       const fProxy = 0
-      // We can remove this proxy middle-man once the VFS is working
+      /** This middle-man proxy is only for use during development, to
+          confirm that we always pass the proper number of
+          arguments. We know that the C-level code will always use the
+          correct argument count. */
             ? callee.argcProxy(func, sigN)
             : func;
       const pFunc = wasm.installFunction(fProxy, tgt.memberSignature(name, true));
@@ -606,7 +627,6 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
     const mTimeStart = (op)=>{
       opTimer.start = performance.now();
       opTimer.op = op;
-      //metrics[op] || toss("Maintenance required: missing metrics for",op);
       ++metrics[op].count;
     };
     const mTimeEnd = ()=>(
@@ -619,8 +639,15 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
     */
     const ioSyncWrappers = {
       xCheckReservedLock: function(pFile,pOut){
-        // Exclusive lock is automatically acquired when opened
-        //warn("xCheckReservedLock(",arguments,") is a no-op");
+        /**
+           As of late 2022, only a single lock can be held on an OPFS
+           file. We have no way of checking whether any _other_ db
+           connection has a lock except by trying to obtain and (on
+           success) release a sync-handle for it, but doing so would
+           involve an inherent race condition. For the time being,
+           pending a better solution, we simply report whether the
+           given pFile instance has a lock.
+        */
         const f = __openFiles[pFile];
         wasm.setMemValue(pOut, f.lockMode ? 1 : 0, 'i32');
         return 0;
@@ -673,14 +700,17 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
         return rc;
       },
       xRead: function(pFile,pDest,n,offset64){
-        /* int (*xRead)(sqlite3_file*, void*, int iAmt, sqlite3_int64 iOfst) */
         mTimeStart('xRead');
         const f = __openFiles[pFile];
         let rc;
         try {
           rc = opRun('xRead',pFile, n, Number(offset64));
-          if(0===rc || capi.SQLITE_IOERR_SHORT_READ===rc){
-            // set() seems to be the fastest way to copy this...
+          if(0===rc || capi.SQLITE_IOERR_SHORT_READ===rc){ 
+            /**
+               Results get written to the SharedArrayBuffer f.sabView.
+               Because the heap is _not_ a SharedArrayBuffer, we have
+               to copy the results. TypedArray.set() seems to be the
+               fastest way to copy this. */
             wasm.heap8u().set(f.sabView.subarray(0, n), pDest);
           }
         }catch(e){
@@ -713,7 +743,6 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
         return rc;
       },
       xWrite: function(pFile,pSrc,n,offset64){
-        /* int (*xWrite)(sqlite3_file*, const void*, int iAmt, sqlite3_int64 iOfst) */
         mTimeStart('xWrite');
         const f = __openFiles[pFile];
         let rc;
@@ -779,28 +808,6 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
       //xSleep is optionally defined below
       xOpen: function f(pVfs, zName, pFile, flags, pOutFlags){
         mTimeStart('xOpen');
-        if(!f._){
-          f._ = {
-            fileTypes: {
-              SQLITE_OPEN_MAIN_DB: 'mainDb',
-              SQLITE_OPEN_MAIN_JOURNAL: 'mainJournal',
-              SQLITE_OPEN_TEMP_DB: 'tempDb',
-              SQLITE_OPEN_TEMP_JOURNAL: 'tempJournal',
-              SQLITE_OPEN_TRANSIENT_DB: 'transientDb',
-              SQLITE_OPEN_SUBJOURNAL: 'subjournal',
-              SQLITE_OPEN_SUPER_JOURNAL: 'superJournal',
-              SQLITE_OPEN_WAL: 'wal'
-            },
-            getFileType: function(filename,oflags){
-              const ft = f._.fileTypes;
-              for(let k of Object.keys(ft)){
-                if(oflags & capi[k]) return ft[k];
-              }
-              warn("Cannot determine fileType based on xOpen() flags for file",filename);
-              return '???';
-            }
-          };
-        }
         if(0===zName){
           zName = randomFilename();
         }else if('number'===typeof zName){
@@ -1084,16 +1091,13 @@ const installOpfsVfs = function callee(asyncProxyUri = callee.defaultProxyUri){
             promiseReject(e);
             error("Unexpected message from the async worker:",data);
             break;
-      }
-    };
-
+      }/*switch(data.type)*/
+    }/*W.onmessage()*/;
   })/*thePromise*/;
   return thePromise;
 }/*installOpfsVfs()*/;
 installOpfsVfs.defaultProxyUri =
-    //self.location.pathname.replace(/[^/]*$/, "sqlite3-opfs-async-proxy.js");
   "sqlite3-opfs-async-proxy.js";
-//console.warn("sqlite3.installOpfsVfs.defaultProxyUri =",sqlite3.installOpfsVfs.defaultProxyUri);
 self.sqlite3ApiBootstrap.initializersAsync.push(async (sqlite3)=>{
   if(sqlite3.scriptInfo && !sqlite3.scriptInfo.isWorker){
     return;
diff --git a/ext/wasm/api/sqlite3-opfs-async-proxy.js b/ext/wasm/api/sqlite3-opfs-async-proxy.js
index 5b29aa3ea5..254da7ee5d 100644
--- a/ext/wasm/api/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/api/sqlite3-opfs-async-proxy.js
@@ -10,7 +10,7 @@
 
   ***********************************************************************
 
-  An Worker which manages asynchronous OPFS handles on behalf of a
+  A Worker which manages asynchronous OPFS handles on behalf of a
   synchronous API which controls it via a combination of Worker
   messages, SharedArrayBuffer, and Atomics. It is the asynchronous
   counterpart of the API defined in sqlite3-api-opfs.js.
@@ -25,8 +25,12 @@
   access to the sqlite3 JS/WASM bits, so any bits which it needs (most
   notably SQLITE_xxx integer codes) have to be imported into it via an
   initialization process.
+
+  This file represents an implementation detail of a larger piece of
+  code, and not a public interface. Its details may change at any time
+  and are not intended to be used by any client-level code.
 */
-'use strict';
+"use strict";
 const toss = function(...args){throw new Error(args.join(' '))};
 if(self.window === self){
   toss("This code cannot run from the main thread.",
@@ -133,8 +137,8 @@ const getDirForFilename = async function f(absFilename, createDirs = false){
 
 /**
    Returns the sync access handle associated with the given file
-   handle object (which must be a valid handle object), lazily opening
-   it if needed.
+   handle object (which must be a valid handle object, as created by
+   xOpen()), lazily opening it if needed.
 
    In order to help alleviate cross-tab contention for a dabase,
    if an exception is thrown while acquiring the handle, this routine
@@ -150,7 +154,7 @@ const getSyncHandle = async (fh)=>{
     let i = 1, ms = 300;
     for(; true; ms *= ++i){
       try {
-        //if(1===i) toss("Just testing.");
+        //if(i<3) toss("Just testing.");
         //TODO? A config option which tells it to throw here
         //randomly every now and then, for testing purposes.
         fh.syncHandle = await fh.fileHandle.createSyncAccessHandle();
@@ -163,7 +167,7 @@ const getSyncHandle = async (fh)=>{
         }
         warn("Error getting sync handle. Waiting",ms,
               "ms and trying again.",fh.filenameAbs,e);
-        Atomics.wait(state.sabOPView, state.opIds.xSleep, 0, ms);
+        Atomics.wait(state.sabOPView, state.opIds.retry, 0, ms);
       }
     }
     log("Got sync handle for",fh.filenameAbs,'in',performance.now() - t,'ms');
@@ -305,7 +309,7 @@ const vfsAsyncImpls = {
     storeAndNotify('xAccess', rc);
     mTimeEnd();
   },
-  xClose: async function(fid){
+  xClose: async function(fid/*sqlite3_file pointer*/){
     const opName = 'xClose';
     mTimeStart(opName);
     const fh = __openFiles[fid];
@@ -364,7 +368,7 @@ const vfsAsyncImpls = {
     wTimeEnd();
     return rc;
   },
-  xFileSize: async function(fid){
+  xFileSize: async function(fid/*sqlite3_file pointer*/){
     mTimeStart('xFileSize');
     const fh = __openFiles[fid];
     let sz;
@@ -381,7 +385,8 @@ const vfsAsyncImpls = {
     storeAndNotify('xFileSize', sz);
     mTimeEnd();
   },
-  xLock: async function(fid,lockType){
+  xLock: async function(fid/*sqlite3_file pointer*/,
+                        lockType/*SQLITE_LOCK_...*/){
     mTimeStart('xLock');
     const fh = __openFiles[fid];
     let rc = 0;
@@ -397,7 +402,8 @@ const vfsAsyncImpls = {
     storeAndNotify('xLock',rc);
     mTimeEnd();
   },
-  xOpen: async function(fid/*sqlite3_file pointer*/, filename, flags){
+  xOpen: async function(fid/*sqlite3_file pointer*/, filename,
+                        flags/*SQLITE_OPEN_...*/){
     const opName = 'xOpen';
     mTimeStart(opName);
     const deleteOnClose = (state.sq3Codes.SQLITE_OPEN_DELETEONCLOSE & flags);
@@ -440,7 +446,7 @@ const vfsAsyncImpls = {
     }
     mTimeEnd();
   },
-  xRead: async function(fid,n,offset){
+  xRead: async function(fid/*sqlite3_file pointer*/,n,offset64){
     mTimeStart('xRead');
     let rc = 0, nRead;
     const fh = __openFiles[fid];
@@ -448,7 +454,7 @@ const vfsAsyncImpls = {
       wTimeStart('xRead');
       nRead = (await getSyncHandle(fh)).read(
         fh.sabView.subarray(0, n),
-        {at: Number(offset)}
+        {at: Number(offset64)}
       );
       wTimeEnd();
       if(nRead < n){/* Zero-fill remaining bytes */
@@ -464,7 +470,7 @@ const vfsAsyncImpls = {
     storeAndNotify('xRead',rc);
     mTimeEnd();
   },
-  xSync: async function(fid,flags/*ignored*/){
+  xSync: async function(fid/*sqlite3_file pointer*/,flags/*ignored*/){
     mTimeStart('xSync');
     const fh = __openFiles[fid];
     let rc = 0;
@@ -480,7 +486,7 @@ const vfsAsyncImpls = {
     storeAndNotify('xSync',rc);
     mTimeEnd();
   },
-  xTruncate: async function(fid,size){
+  xTruncate: async function(fid/*sqlite3_file pointer*/,size){
     mTimeStart('xTruncate');
     let rc = 0;
     const fh = __openFiles[fid];
@@ -497,7 +503,8 @@ const vfsAsyncImpls = {
     storeAndNotify('xTruncate',rc);
     mTimeEnd();
   },
-  xUnlock: async function(fid,lockType){
+  xUnlock: async function(fid/*sqlite3_file pointer*/,
+                          lockType/*SQLITE_LOCK_...*/){
     mTimeStart('xUnlock');
     let rc = 0;
     const fh = __openFiles[fid];
@@ -514,7 +521,7 @@ const vfsAsyncImpls = {
     storeAndNotify('xUnlock',rc);
     mTimeEnd();
   },
-  xWrite: async function(fid,n,offset){
+  xWrite: async function(fid/*sqlite3_file pointer*/,n,offset64){
     mTimeStart('xWrite');
     let rc;
     wTimeStart('xWrite');
@@ -524,7 +531,7 @@ const vfsAsyncImpls = {
       rc = (
         n === (await getSyncHandle(fh))
           .write(fh.sabView.subarray(0, n),
-                 {at: Number(offset)})
+                 {at: Number(offset64)})
       ) ? 0 : state.sq3Codes.SQLITE_IOERR_WRITE;
     }catch(e){
       error("xWrite():",e,fh);
diff --git a/manifest b/manifest
index bf748e6b59..a762413d2d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\stypo\sin\scomment.
-D 2022-10-24T18:42:45.118
+C Minor\scleanups\sand\sdoc\simprovements\sin\sthe\sOPFS\ssqlite3_vfs\sproxy.
+D 2022-10-25T08:06:17.330
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -478,7 +478,7 @@ F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 36f413ab4dbb057d2dec938fb366ac0a4c5e85ba14660a8d672f0277602c0fc5
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
 F ext/wasm/api/README.md 1350088aee90e959ad9a94fab1bb6bcb5e99d4d27f976db389050f54f2640c78
-F ext/wasm/api/extern-post-js.js efbed835f290b3741259acc5faf68714a60d38e6834e6cfe172d5354c87566d2
+F ext/wasm/api/extern-post-js.js 926d192b72fa808378e5e7843721dc7ba3908c163a0260e06d8aa501c12f5469
 F ext/wasm/api/extern-pre-js.js cc61c09c7a24a07dbecb4c352453c3985170cec12b4e7e7e7a4d11d43c5c8f41
 F ext/wasm/api/post-js-footer.js cd0a8ec768501d9bd45d325ab0442037fb0e33d1f3b4f08902f15c34720ee4a1
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
@@ -486,11 +486,11 @@ F ext/wasm/api/pre-js.js 151e0616614a49f3db19ed544fa13b38c87c108959fbcd4029ea839
 F ext/wasm/api/sqlite3-api-cleanup.js 4d07a7524dc9b7b050acfde57163e839243ad2383bd7ee0de0178b1b3e988588
 F ext/wasm/api/sqlite3-api-glue.js 6e4e472eb5afc732a695cd7c5ded6dee6ef8b480e61aa0d648a3fc9033c84745
 F ext/wasm/api/sqlite3-api-oo1.js ca41ffe58bfbbefc98181081fba0b7af58afcc2770e963558f4f6a408c583fc0
-F ext/wasm/api/sqlite3-api-opfs.js 22d60ba956e873b65e2e0591e239178082bd53a6d563c3c58db7dc03e562e8f7
+F ext/wasm/api/sqlite3-api-opfs.js 62da8b7cac30d4e7bb940762d2ac948b0aeb89704a5a290b74eb268ecbd1a64e
 F ext/wasm/api/sqlite3-api-prologue.js fa00d55f927e5a4ec51cf2c80f6f0eaed2f4f5774341ecf3d63a0ea4c738f8f5
 F ext/wasm/api/sqlite3-api-worker1.js a7f38f03275d6c27ab2aef3e83215d3c97ce09c43e6904df47c3764d9d4572b4
 F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
-F ext/wasm/api/sqlite3-opfs-async-proxy.js 206ce6bbc3c30ad51a37d9c25e3a2712e70b586e0f9a2cf8cb0b9619017c2671
+F ext/wasm/api/sqlite3-opfs-async-proxy.js f04cb1eb483c92bc61fe02749f7afcf17ec803968171aedd7d96faf428c26bcb
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 940d576bda7068ba60492e206d06a3567b8a89a3770700aa88690a6e246a0c78
 F ext/wasm/api/sqlite3-worker1-promiser.js 0c7a9826dbf82a5ed4e4f7bf7816e825a52aff253afbf3350431f5773faf0e4b
@@ -2037,8 +2037,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 69d704224e9ed022fcec591beff2ffcc4daf3e7fc586debfdcf00b25c1fddd87
-R e2a88fcf6a9d4446fa629ea861bc8ca4
-U drh
-Z ea85a8ca90f8837e6e02f1969966b7f9
+P f65c95658fe4d30817da8de7eb88e823ea1cd8be40e347d626870bad3cc13359
+R 18bf727aa37df31466f2ea66a532842e
+U stephan
+Z 9cf62ee935cac4cb5c613433da7a1983
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index c85389d8a2..125f873da6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f65c95658fe4d30817da8de7eb88e823ea1cd8be40e347d626870bad3cc13359
\ No newline at end of file
+48645f7bcacf81c4149f26d20ee1752fbe93a02f96b85bd7e28bfa49322137e5
\ No newline at end of file

From d3c8f2ac33d4eb3822f5cfdd2bc3b9392cdf91b0 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 25 Oct 2022 08:15:57 +0000
Subject: [PATCH 346/428] Remove persistence from the 'reverse log order?'
 checkbox in tester1.js to eliminate an inconsistency between the main-thread
 and worker-thread modes (the latter having no option for persistence of that
 setting).

FossilOrigin-Name: ecf906b07f50b4fcc551d20326a1bb1189bd6c2274627fd293f9460658ebea07
---
 ext/wasm/tester1-worker.html |  2 +-
 ext/wasm/tester1.html        |  2 +-
 ext/wasm/tester1.js          |  8 ++++----
 manifest                     | 16 ++++++++--------
 manifest.uuid                |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ext/wasm/tester1-worker.html b/ext/wasm/tester1-worker.html
index c7ca8e5b54..e1a7247e3e 100644
--- a/ext/wasm/tester1-worker.html
+++ b/ext/wasm/tester1-worker.html
@@ -18,7 +18,7 @@
     <div>See <a href='tester1.html' target='tester1.html'>tester1.html</a>
       for the UI-thread variant.</div>
     <div class='input-wrapper'>
-      <input type='checkbox' id='cb-log-reverse' checked>
+      <input type='checkbox' id='cb-log-reverse'>
       <label for='cb-log-reverse'>Reverse log order?</label>
     </div>
     <div id='test-output'></div>
diff --git a/ext/wasm/tester1.html b/ext/wasm/tester1.html
index 380ef4dc43..0ceacc5c36 100644
--- a/ext/wasm/tester1.html
+++ b/ext/wasm/tester1.html
@@ -18,7 +18,7 @@
     <div>See <a href='tester1-worker.html' target='tester1-worker.html'>tester1-worker.html</a>
       for the Worker-thread variant.</div>
     <div class='input-wrapper'>
-      <input type='checkbox' id='cb-log-reverse' checked>
+      <input type='checkbox' id='cb-log-reverse'>
       <label for='cb-log-reverse'>Reverse log order?</label>
     </div>
     <div id='test-output'></div>
diff --git a/ext/wasm/tester1.js b/ext/wasm/tester1.js
index 15f750400f..064909f870 100644
--- a/ext/wasm/tester1.js
+++ b/ext/wasm/tester1.js
@@ -82,12 +82,12 @@
       const cbReverseKey = 'tester1:cb-log-reverse';
       const cbReverseIt = ()=>{
         logTarget.classList[cbReverse.checked ? 'add' : 'remove']('reverse');
-        localStorage.setItem(cbReverseKey, cbReverse.checked ? 1 : 0);
+        //localStorage.setItem(cbReverseKey, cbReverse.checked ? 1 : 0);
       };
-      cbReverse.addEventListener('change',cbReverseIt,true);
-      if(localStorage.getItem(cbReverseKey)){
+      cbReverse.addEventListener('change', cbReverseIt, true);
+      /*if(localStorage.getItem(cbReverseKey)){
         cbReverse.checked = !!(+localStorage.getItem(cbReverseKey));
-      }
+      }*/
       cbReverseIt();
     }else{ /* Worker thread */
       console.log("Running in a Worker thread.");
diff --git a/manifest b/manifest
index a762413d2d..5df510bbdf 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\scleanups\sand\sdoc\simprovements\sin\sthe\sOPFS\ssqlite3_vfs\sproxy.
-D 2022-10-25T08:06:17.330
+C Remove\spersistence\sfrom\sthe\s'reverse\slog\sorder?'\scheckbox\sin\stester1.js\sto\seliminate\san\sinconsistency\sbetween\sthe\smain-thread\sand\sworker-thread\smodes\s(the\slatter\shaving\sno\soption\sfor\spersistence\sof\sthat\ssetting).
+D 2022-10-25T08:15:57.627
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -531,9 +531,9 @@ F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d826
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
 F ext/wasm/test-opfs-vfs.html 1f2d672f3f3fce810dfd48a8d56914aba22e45c6834e262555e685bce3da8c3f
 F ext/wasm/test-opfs-vfs.js 48fc59110e8775bb43c9be25b6d634fc07ebadab7da8fbd44889e8129c6e2548
-F ext/wasm/tester1-worker.html 906feeb0528fed0fbdc2833eeb8397a4637af9b0cf36831b20dae5b425b4d877
-F ext/wasm/tester1.html 6dc6594f0182ae84f70b58cf4102f2bb8994bbef588cedc45ea38d396937d5f4
-F ext/wasm/tester1.js 031fae6b912d8a3df462febde99b6fed2f43bd13d20832d6fd99e01d427f9f3b
+F ext/wasm/tester1-worker.html d02b9d38876b023854cf8955e77a40912f7e516956b4dbe1ec7f215faac273ee
+F ext/wasm/tester1.html c6c47e5a8071eb09cb1301104435c8e44fbb5719c92411f5b2384a461f9793c5
+F ext/wasm/tester1.js 12741d4ff6015fc14fa9a397e6f9130bbda699067bbceca23d5a228138271735
 F ext/wasm/version-info.c 5fa356d38859d71a0369b5c37e1935def7413fcc8a4e349a39d9052c1d0479f4
 F ext/wasm/wasmfs.make ee0004813e16c283ff633e08b482008d56adf9b7d42f6c5612f7ab002b924f69
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
@@ -2037,8 +2037,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 f65c95658fe4d30817da8de7eb88e823ea1cd8be40e347d626870bad3cc13359
-R 18bf727aa37df31466f2ea66a532842e
+P 48645f7bcacf81c4149f26d20ee1752fbe93a02f96b85bd7e28bfa49322137e5
+R 342f38b916b08b1d39097f16997abe99
 U stephan
-Z 9cf62ee935cac4cb5c613433da7a1983
+Z 9505dfbffcf369c44f4fc0daae947b24
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 125f873da6..ccbd7fb87d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-48645f7bcacf81c4149f26d20ee1752fbe93a02f96b85bd7e28bfa49322137e5
\ No newline at end of file
+ecf906b07f50b4fcc551d20326a1bb1189bd6c2274627fd293f9460658ebea07
\ No newline at end of file

From 89954fe7ce03f4337ce8935a4b44edabd91278d0 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 25 Oct 2022 08:41:00 +0000
Subject: [PATCH 347/428] Minor doc tweaks in the JS GNUmakefile.

FossilOrigin-Name: 9c8df130b8137cb4705f805907d1ff754d7f4b07bf181e1d05f1798b7aa5f4f6
---
 ext/wasm/GNUmakefile | 16 ++++++++++------
 manifest             | 12 ++++++------
 manifest.uuid        |  2 +-
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 174e44ddf5..815c84c873 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -3,8 +3,9 @@
 # components. It is not part of the canonical build process.
 #
 # This build assumes a Linux platform and is not intended for
-# client-level use. It is for the sqlite project's own development of
-# the JS/WASM components.
+# general-purpose client-level use, except for creating builds with
+# custom configurations. It is primarily intended for the sqlite
+# project's own development of the JS/WASM components.
 #
 # Primary targets:
 #
@@ -14,9 +15,9 @@
 #      by the target name. Rebuild is necessary for all components to get
 #      the desired optimization level.
 #
-#  dist = create end user deliverables. Add dist-opt=oX to build with a
-#      specific optimization level, where oX is one of the above-listed
-#      o? target names.
+#  dist = create end user deliverables. Add dist.build=oX to build
+#      with a specific optimization level, where oX is one of the
+#      above-listed o? target names.
 #
 #  clean = clean up
 ########################################################################
@@ -344,7 +345,9 @@ emcc.jsflags += $(emcc.environment)
 #emcc.jsflags += -sTOTAL_STACK=4194304
 
 sqlite3.js.init-func := sqlite3InitModule
-# ^^^^ $(sqlite3.js.init-func) symbol name is hard-coded in $(extern-post-js.js)
+# ^^^^ $(sqlite3.js.init-func) symbol name is hard-coded in
+# $(extern-post-js.js) as well as in numerous docs. If changed, it
+# needs to be globally modified in *.js and all related documentation.
 
 emcc.jsflags += -sEXPORT_NAME=$(sqlite3.js.init-func)
 emcc.jsflags += -sGLOBAL_BASE=4096 # HYPOTHETICALLY keep func table indexes from overlapping w/ heap addr.
@@ -353,6 +356,7 @@ emcc.jsflags += -sGLOBAL_BASE=4096 # HYPOTHETICALLY keep func table indexes from
 #emcc.jsflags += -sFILESYSTEM=0 # only for experimentation. sqlite3 needs the FS API
 #emcc.jsflags += -sABORTING_MALLOC
 emcc.jsflags += -sALLOW_TABLE_GROWTH
+# -sALLOW_TABLE_GROWTH is required for installing new SQL UDFs
 emcc.jsflags += -Wno-limited-postlink-optimizations
 # ^^^^^ it likes to warn when we have "limited optimizations" via the -g3 flag.
 #emcc.jsflags += -sSTANDALONE_WASM # causes OOM errors, not sure why
diff --git a/manifest b/manifest
index 5df510bbdf..f3670167e4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\spersistence\sfrom\sthe\s'reverse\slog\sorder?'\scheckbox\sin\stester1.js\sto\seliminate\san\sinconsistency\sbetween\sthe\smain-thread\sand\sworker-thread\smodes\s(the\slatter\shaving\sno\soption\sfor\spersistence\sof\sthat\ssetting).
-D 2022-10-25T08:15:57.627
+C Minor\sdoc\stweaks\sin\sthe\sJS\sGNUmakefile.
+D 2022-10-25T08:41:00.214
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -472,7 +472,7 @@ F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
-F ext/wasm/GNUmakefile 645bd5670a56acf2c8f1e969c427555e3e8e74dfd6eac8c948858f530617c7d5
+F ext/wasm/GNUmakefile 72f8ca582578295315f9f198f308b927e64e8657e2b14f738123745043db7c7c
 F ext/wasm/README-dist.txt e78e44a58772d5b5d7a5a179b5bf639cd67b62249aac66138e2c319bd02dd243
 F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 36f413ab4dbb057d2dec938fb366ac0a4c5e85ba14660a8d672f0277602c0fc5
@@ -2037,8 +2037,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 48645f7bcacf81c4149f26d20ee1752fbe93a02f96b85bd7e28bfa49322137e5
-R 342f38b916b08b1d39097f16997abe99
+P ecf906b07f50b4fcc551d20326a1bb1189bd6c2274627fd293f9460658ebea07
+R 262377d6cc8a0c78206bc5c74f7073d2
 U stephan
-Z 9505dfbffcf369c44f4fc0daae947b24
+Z a0e24ff084335de60676ee440f409f2e
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index ccbd7fb87d..d4cde65f90 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ecf906b07f50b4fcc551d20326a1bb1189bd6c2274627fd293f9460658ebea07
\ No newline at end of file
+9c8df130b8137cb4705f805907d1ff754d7f4b07bf181e1d05f1798b7aa5f4f6
\ No newline at end of file

From d5ca2c4b3d2550c7e0b6689a6d5ebe9b4b279d06 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Tue, 25 Oct 2022 13:42:10 +0000
Subject: [PATCH 348/428] Make the ".dump" command of the CLI more robust
 against malformed databases. See [forum:/forumpost/730b554179|forum post
 730b554179].

FossilOrigin-Name: 0573edfb9e0b1fd51e8da20592c71b02040968c33fdec41c31a6b1b7d3e83262
---
 manifest       | 14 +++++++-------
 manifest.uuid  |  2 +-
 src/shell.c.in |  2 ++
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/manifest b/manifest
index f3670167e4..022b4ce4d0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\sdoc\stweaks\sin\sthe\sJS\sGNUmakefile.
-D 2022-10-25T08:41:00.214
+C Make\sthe\s".dump"\scommand\sof\sthe\sCLI\smore\srobust\sagainst\smalformed\sdatabases.\nSee\s[forum:/forumpost/730b554179|forum\spost\s730b554179].
+D 2022-10-25T13:42:10.151
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -621,7 +621,7 @@ F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c e5b6f930f068c9c5362fc76c704ae5cb5ef1e3f18759c2126f23b0cf04c0e263
-F src/shell.c.in 97f4ee3966d7d8ffcd976658ea3b92bc9a670eb988d2e8aeb2243789631689a6
+F src/shell.c.in 35873039518a51ce5c5a944183a82f615942ffc3923f41b8afe7d6289a28fdb6
 F src/sqlite.h.in d9c8a6243fc0a1c270d69db33758e34b810af3462f9bc5b4af113b347e07c69d
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 5336beea1868d99d2f62e628dbea55e97267dbff8193291ab175e960c5df9141
@@ -2037,8 +2037,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 ecf906b07f50b4fcc551d20326a1bb1189bd6c2274627fd293f9460658ebea07
-R 262377d6cc8a0c78206bc5c74f7073d2
-U stephan
-Z a0e24ff084335de60676ee440f409f2e
+P 9c8df130b8137cb4705f805907d1ff754d7f4b07bf181e1d05f1798b7aa5f4f6
+R 23401c751a5369145738c4b7f745d240
+U drh
+Z 40633614ee3a7dbce2fa03715269ae26
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index d4cde65f90..af1961e770 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9c8df130b8137cb4705f805907d1ff754d7f4b07bf181e1d05f1798b7aa5f4f6
\ No newline at end of file
+0573edfb9e0b1fd51e8da20592c71b02040968c33fdec41c31a6b1b7d3e83262
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index 21f610240f..681f4847c5 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -4161,6 +4161,8 @@ static int dump_callback(void *pArg, int nArg, char **azArg, char **azNotUsed){
   zTable = azArg[0];
   zType = azArg[1];
   zSql = azArg[2];
+  if( zTable==0 ) return 0;
+  if( zType==0 ) return 0;
   dataOnly = (p->shellFlgs & SHFLG_DumpDataOnly)!=0;
   noSys    = (p->shellFlgs & SHFLG_DumpNoSys)!=0;
 

From 42dddb97de346675b78779f896fbb3ee7a5cb05b Mon Sep 17 00:00:00 2001
From: drh <>
Date: Tue, 25 Oct 2022 13:44:18 +0000
Subject: [PATCH 349/428] Enhance the sqlite3_strglob() and sqlite3_strlike()
 interfaces so that they will do sensible things with NULL string pointers. 
 This is an extra layer of defense against bugs such as reported by
 [forum:/forumpost/730b554179|forum post 730b554179].

FossilOrigin-Name: 8ba9c884bded52e3e044ff39c826c04838e7c31f05d802f4a14d9ce5a01ab721
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/func.c    | 16 ++++++++++++++--
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index 022b4ce4d0..347218bd3a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\sthe\s".dump"\scommand\sof\sthe\sCLI\smore\srobust\sagainst\smalformed\sdatabases.\nSee\s[forum:/forumpost/730b554179|forum\spost\s730b554179].
-D 2022-10-25T13:42:10.151
+C Enhance\sthe\ssqlite3_strglob()\sand\ssqlite3_strlike()\sinterfaces\sso\sthat\sthey\nwill\sdo\ssensible\sthings\swith\sNULL\sstring\spointers.\s\sThis\sis\san\sextra\slayer\nof\sdefense\sagainst\sbugs\ssuch\sas\sreported\sby\n[forum:/forumpost/730b554179|forum\spost\s730b554179].
+D 2022-10-25T13:44:18.953
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -573,7 +573,7 @@ F src/delete.c 86573edae75e3d3e9a8b590d87db8e47222103029df4f3e11fa56044459b514e
 F src/expr.c 847f87d9df3ede2b2b0a8db088af0b9c1923b21009f8ea1b9b7b28cb0a383170
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 722f20779f5342a787922deded3628d8c74b5249cab04098cf17ee2f2aaff002
-F src/func.c fe2a795ad647ce42054873ac91c43beb7b5d204892903a67f6e7e314379b9d4a
+F src/func.c d25f3c667d59dbac195e65f3539fdbbd8a36c142ce7bcdb45d1baf07446ad13a
 F src/global.c e83ee571b79ee3adc32e380cf554cf1254bc43763d23786c71721fbcdfbbb965
 F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
 F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
@@ -2037,8 +2037,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 9c8df130b8137cb4705f805907d1ff754d7f4b07bf181e1d05f1798b7aa5f4f6
-R 23401c751a5369145738c4b7f745d240
+P 0573edfb9e0b1fd51e8da20592c71b02040968c33fdec41c31a6b1b7d3e83262
+R b962dfb311d9f3ef292f680567ba007c
 U drh
-Z 40633614ee3a7dbce2fa03715269ae26
+Z d1fa08bbcbba3825117385d2044b1b0a
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index af1961e770..3abac015f4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0573edfb9e0b1fd51e8da20592c71b02040968c33fdec41c31a6b1b7d3e83262
\ No newline at end of file
+8ba9c884bded52e3e044ff39c826c04838e7c31f05d802f4a14d9ce5a01ab721
\ No newline at end of file
diff --git a/src/func.c b/src/func.c
index 06581cbe32..b42b2588af 100644
--- a/src/func.c
+++ b/src/func.c
@@ -823,7 +823,13 @@ static int patternCompare(
 ** non-zero if there is no match.
 */
 int sqlite3_strglob(const char *zGlobPattern, const char *zString){
-  return patternCompare((u8*)zGlobPattern, (u8*)zString, &globInfo, '[');
+  if( zString==0 ){
+    return zGlobPattern!=0;
+  }else if( zGlobPattern==0 ){
+    return 1;
+  }else {
+    return patternCompare((u8*)zGlobPattern, (u8*)zString, &globInfo, '[');
+  }
 }
 
 /*
@@ -831,7 +837,13 @@ int sqlite3_strglob(const char *zGlobPattern, const char *zString){
 ** a miss - like strcmp().
 */
 int sqlite3_strlike(const char *zPattern, const char *zStr, unsigned int esc){
-  return patternCompare((u8*)zPattern, (u8*)zStr, &likeInfoNorm, esc);
+  if( zStr==0 ){
+    return zPattern!=0;
+  }else if( zPattern==0 ){
+    return 1;
+  }else{
+    return patternCompare((u8*)zPattern, (u8*)zStr, &likeInfoNorm, esc);
+  }
 }
 
 /*

From 16603ecfcb35e4207900a7e7165e5e6a583f4ea1 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 25 Oct 2022 15:38:38 +0000
Subject: [PATCH 350/428] speedtest1: use the current (or default) vfs->xDelete
 method to unlink the db. This is specifically necessary when running the opfs
 vfs in a wasm build of speedtest1. This worked without this fix until
 recently because the affected test code was performing similar acrobatics in
 its stead.

FossilOrigin-Name: d3c830bd37a402161b486d3631feceae5d00f89c2522aed65fcd2e666bd64238
---
 ext/wasm/speedtest1-worker.js |  4 +---
 manifest                      | 16 ++++++++--------
 manifest.uuid                 |  2 +-
 test/speedtest1.c             | 15 ++++++++++++++-
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/ext/wasm/speedtest1-worker.js b/ext/wasm/speedtest1-worker.js
index a4d6aedc58..b5683bc1db 100644
--- a/ext/wasm/speedtest1-worker.js
+++ b/ext/wasm/speedtest1-worker.js
@@ -51,7 +51,6 @@
   const runSpeedtest = function(cliFlagsArray){
     const scope = App.wasm.scopedAllocPush();
     const dbFile = App.pDir+"/speedtest1.sqlite3";
-    App.vfsUnlink(0, dbFile);
     try{
       const argv = [
         "speedtest1.wasm", ...cliFlagsArray, dbFile
@@ -64,7 +63,6 @@
       mPost('error',e.message);
     }finally{
       App.wasm.scopedAllocPop(scope);
-      App.vfsUnlink(0, dbFile);
       mPost('run-end', App.logBuffer.join('\n'));
       App.logBuffer.length = 0;
     }
@@ -88,7 +86,7 @@
   self.sqlite3InitModule(EmscriptenModule).then((sqlite3)=>{
     const S = sqlite3;
     App.vfsUnlink = function(pDb, fname){
-      const pVfs = S.capi.wasm.sqlite3_wasm_db_vfs(pDb, fname||0);
+      const pVfs = S.capi.wasm.sqlite3_wasm_db_vfs(pDb, 0);
       if(pVfs) S.capi.wasm.sqlite3_wasm_vfs_unlink(pVfs, fname||0);
     };
     App.pDir = wasmfsDir(S.wasm);
diff --git a/manifest b/manifest
index 347218bd3a..f948ac6038 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\sthe\ssqlite3_strglob()\sand\ssqlite3_strlike()\sinterfaces\sso\sthat\sthey\nwill\sdo\ssensible\sthings\swith\sNULL\sstring\spointers.\s\sThis\sis\san\sextra\slayer\nof\sdefense\sagainst\sbugs\ssuch\sas\sreported\sby\n[forum:/forumpost/730b554179|forum\spost\s730b554179].
-D 2022-10-25T13:44:18.953
+C speedtest1:\suse\sthe\scurrent\s(or\sdefault)\svfs->xDelete\smethod\sto\sunlink\sthe\sdb.\sThis\sis\sspecifically\snecessary\swhen\srunning\sthe\sopfs\svfs\sin\sa\swasm\sbuild\sof\sspeedtest1.\sThis\sworked\swithout\sthis\sfix\suntil\srecently\sbecause\sthe\saffected\stest\scode\swas\sperforming\ssimilar\sacrobatics\sin\sits\sstead.
+D 2022-10-25T15:38:38.924
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -524,7 +524,7 @@ F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e10
 F ext/wasm/scratchpad-wasmfs-main.js 1aa32c1035cf1440a226a28fefcbb5762fbbcb020ccbe5895f8736d701695c63
 F ext/wasm/speedtest1-wasmfs.html bc28eb29b69a73864b8d7aae428448f8b7e1de81d8bfb9bba99541322054dbd0
 F ext/wasm/speedtest1-worker.html 7b0cceab6a68b2883738e19f61d21620fe1244ba36c1b2e38d0efde57ecce86d
-F ext/wasm/speedtest1-worker.js 490844a70af72d7bb16cc766d66621c1ca587d8a3f7e6b804c69327fa34881f7
+F ext/wasm/speedtest1-worker.js 942af0909dee6e6a43af85d3e4a5e6aa74956290ca4b78fd4e753be13673ccd6
 F ext/wasm/speedtest1.html 6303e620162b2058d5e212f966a7caed4a31a516b6140fbc64185cb296218e4f
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
@@ -1514,7 +1514,7 @@ F test/speed3.test 694affeb9100526007436334cf7d08f3d74b85ef
 F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
 F test/speed4p.test 377a0c48e5a92e0b11c1c5ebb1bc9d83a7312c922bc0cb05970ef5d6a96d1f0c
-F test/speedtest1.c 8677e29942ed0b8b5212e46c05e3debfe48bcaaebde4aa8ddc797cd73b8937d2
+F test/speedtest1.c 645dbf022337116fcef60ac2579e8d25c94e4475109e2c6f48005f302efe7b09
 F test/spellfix.test 951a6405d49d1a23d6b78027d3877b4a33eeb8221dcab5704b499755bb4f552e
 F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3
 F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33
@@ -2037,8 +2037,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 0573edfb9e0b1fd51e8da20592c71b02040968c33fdec41c31a6b1b7d3e83262
-R b962dfb311d9f3ef292f680567ba007c
-U drh
-Z d1fa08bbcbba3825117385d2044b1b0a
+P 8ba9c884bded52e3e044ff39c826c04838e7c31f05d802f4a14d9ce5a01ab721
+R a12e657bf006b1f4149c559a9983c3ea
+U stephan
+Z 350b5441f32a515aa32cf4712729b820
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 3abac015f4..308ba01fb6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8ba9c884bded52e3e044ff39c826c04838e7c31f05d802f4a14d9ce5a01ab721
\ No newline at end of file
+d3c830bd37a402161b486d3631feceae5d00f89c2522aed65fcd2e666bd64238
\ No newline at end of file
diff --git a/test/speedtest1.c b/test/speedtest1.c
index 27eb5dfd06..12c8d69b5b 100644
--- a/test/speedtest1.c
+++ b/test/speedtest1.c
@@ -2423,7 +2423,6 @@ int main(int argc, char **argv){
     }
   }
 #undef ARGC_VALUE_CHECK
-  if( zDbName!=0 ) unlink(zDbName);
 #if SQLITE_VERSION_NUMBER>=3006001
   if( nHeap>0 ){
     pHeap = malloc( nHeap );
@@ -2446,6 +2445,20 @@ int main(int argc, char **argv){
 #endif
   sqlite3_initialize();
 
+  if( zDbName!=0 ){
+    sqlite3_vfs *pVfs = sqlite3_vfs_find(zVfs);
+    /* For some VFSes, e.g. opfs, unlink() is not sufficient. Use the
+    ** selected (or default) VFS's xDelete method to delete the
+    ** database. This is specifically important for the "opfs" VFS
+    ** when running from a WASM build of speedtest1, so that the db
+    ** can be cleaned up properly. For historical compatibility, we'll
+    ** also simply unlink(). */
+    if( pVfs!=0 ){
+      pVfs->xDelete(pVfs, zDbName, 1);
+    }
+    unlink(zDbName);
+  }
+
   /* Open the database and the input file */
   if( sqlite3_open_v2(memDb ? ":memory:" : zDbName, &g.db,
                       openFlags, zVfs) ){

From ce2d4ae6a64a78a25fd100fddceb5461229351dc Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 25 Oct 2022 15:59:27 +0000
Subject: [PATCH 351/428] Rename fiddle.html to index.html and move fiddle
 push-to-server rules from GNUmakefile into fiddle.make.

FossilOrigin-Name: 3d7b4f36b7dd01058d57fc8ef7689d9bbf1a219166796ed427180cd59d2c189d
---
 ext/wasm/GNUmakefile                        | 44 ++++++---------------
 ext/wasm/fiddle.make                        | 23 +++++++++++
 ext/wasm/fiddle/{fiddle.html => index.html} |  0
 manifest                                    | 16 ++++----
 manifest.uuid                               |  2 +-
 5 files changed, 43 insertions(+), 42 deletions(-)
 rename ext/wasm/fiddle/{fiddle.html => index.html} (100%)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 815c84c873..cd8822084c 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -29,8 +29,8 @@ default: all
 release: oz
 
 # Emscripten SDK home dir and related binaries...
-EMSDK_HOME ?= $(word 1,$(wildcard $(HOME)/src/emsdk $(HOME)/emsdk))
-emcc.bin ?= $(word 1,$(wildcard $(shell which emcc) $(EMSDK_HOME)/upstream/emscripten/emcc))
+EMSDK_HOME ?= $(word 1,$(wildcard $(HOME)/emsdk $(HOME)/src/emsdk))
+emcc.bin ?= $(word 1,$(wildcard $(EMSDK_HOME)/upstream/emscripten/emcc) $(shell which emcc))
 ifeq (,$(emcc.bin))
   $(error Cannot find emcc.)
 endif
@@ -45,7 +45,7 @@ ifeq (,$(wasm-strip))
   $(info WARNING: info after compilation, using wasm-strip, to shrink the wasm file.)
   $(info WARNING: wasm-strip was not found in the PATH so we cannot strip those.)
   $(info WARNING: If this build uses any optimization level higher than -O1 then)
-  $(info WARNING: the ***resulting WASM binary WILL NOT BE USABLE***.)
+  $(info WARNING: the ***resulting JS code WILL NOT BE USABLE***.)
   $(info WARNING: wasm-strip is part of the wabt package:)
   $(info WARNING:    https://github.com/WebAssembly/wabt)
   $(info WARNING: on Ubuntu-like systems it can be installed with:)
@@ -72,6 +72,8 @@ dir.common := common
 dir.fiddle := fiddle
 dir.tool := $(dir.top)/tool
 ########################################################################
+# dir.dout = output dir for deliverables.
+#
 # MAINTENANCE REMINDER: the output .js and .wasm files of emcc must be
 # in _this_ dir, rather than a subdir, or else parts of the generated
 # code get confused and cannot load property. Specifically, when X.js
@@ -86,11 +88,10 @@ dir.tool := $(dir.top)/tool
 # We unfortunately have no way, from Worker-initiated code, to
 # automatically resolve the path from X.js to X.wasm.
 #
-# In case we ever find a solution to that which does not require
-# duplicating the X.js files only to swap out the path to X.wasm for
-# the loading-from-worker case...
-#
-# dir.dout = output dir for deliverables.
+# We have an "only slightly unsightly" solution for our main builds
+# but it does not work for the WASMFS builds, so those builds have to
+# be built to _this_ directory and can only run when the client app is
+# loaded from the same directory.
 dir.dout := $(dir.wasm)/jswasm
 # dir.tmp = output dir for intermediary build files, as opposed to
 # end-user deliverables.
@@ -511,29 +512,6 @@ CLEAN_FILES += $(speedtest1.js) $(speedtest1.wasm)
 # end speedtest1.js
 ########################################################################
 
-########################################################################
-# fiddle_remote is the remote destination for the fiddle app. It
-# must be a [user@]HOST:/path for rsync.
-# Note that the target "should probably" contain a symlink of
-# index.html -> fiddle.html.
-fiddle_remote ?=
-ifeq (,$(fiddle_remote))
-ifneq (,$(wildcard /home/stephan))
-  fiddle_remote = wh:www/wh/sqlite3/.
-else ifneq (,$(wildcard /home/drh))
-  #fiddle_remote = if appropriate, add that user@host:/path here
-endif
-endif
-$(fiddle_files): default
-push-fiddle: $(fiddle_files)
-	@if [ x = "x$(fiddle_remote)" ]; then \
-		echo "fiddle_remote must be a [user@]HOST:/path for rsync"; \
-		exit 1; \
-	fi
-	rsync -va fiddle/ $(fiddle_remote)
-# end fiddle remote push
-########################################################################
-
 ########################################################################
 # Convenience rules to rebuild with various -Ox levels. Much
 # experimentation shows -O2 to be the clear winner in terms of speed.
@@ -568,8 +546,8 @@ ifneq (,$(filter wasmfs,$(MAKECMDGOALS)))
 # wasmfs build disabled 2022-10-19 per /chat
 # discussion. OPFS-over-wasmfs was initially a stopgap measure and a
 # convenient point of comparison for the OPFS sqlite3_vfs's
-# performance, but it currently doubles our deliverables for very
-# little, if any, benefit.
+# performance, but it currently doubles our deliverables and build
+# maintenance burden for very little, if any, benefit.
 #
 ########################################################################
 # Some platforms do not support the WASMFS build. Raspberry Pi OS is one
diff --git a/ext/wasm/fiddle.make b/ext/wasm/fiddle.make
index 3de2414636..bed7bf367e 100644
--- a/ext/wasm/fiddle.make
+++ b/ext/wasm/fiddle.make
@@ -83,6 +83,29 @@ clean-fiddle:
 fiddle: $(fiddle-module.js) $(dir.fiddle)/fiddle.js.gz
 all: fiddle
 
+########################################################################
+# fiddle_remote is the remote destination for the fiddle app. It
+# must be a [user@]HOST:/path for rsync.
+# Note that the target "should probably" contain a symlink of
+# index.html -> fiddle.html.
+fiddle_remote ?=
+ifeq (,$(fiddle_remote))
+ifneq (,$(wildcard /home/stephan))
+  fiddle_remote = wh:www/wh/sqlite3/.
+else ifneq (,$(wildcard /home/drh))
+  #fiddle_remote = if appropriate, add that user@host:/path here
+endif
+endif
+push-fiddle: fiddle
+	@if [ x = "x$(fiddle_remote)" ]; then \
+		echo "fiddle_remote must be a [user@]HOST:/path for rsync"; \
+		exit 1; \
+	fi
+	rsync -va fiddle/ $(fiddle_remote)
+# end fiddle remote push
+########################################################################
+
+
 ########################################################################
 # Explanation of the emcc build flags follows. Full docs for these can
 # be found at:
diff --git a/ext/wasm/fiddle/fiddle.html b/ext/wasm/fiddle/index.html
similarity index 100%
rename from ext/wasm/fiddle/fiddle.html
rename to ext/wasm/fiddle/index.html
diff --git a/manifest b/manifest
index f948ac6038..be45572c99 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C speedtest1:\suse\sthe\scurrent\s(or\sdefault)\svfs->xDelete\smethod\sto\sunlink\sthe\sdb.\sThis\sis\sspecifically\snecessary\swhen\srunning\sthe\sopfs\svfs\sin\sa\swasm\sbuild\sof\sspeedtest1.\sThis\sworked\swithout\sthis\sfix\suntil\srecently\sbecause\sthe\saffected\stest\scode\swas\sperforming\ssimilar\sacrobatics\sin\sits\sstead.
-D 2022-10-25T15:38:38.924
+C Rename\sfiddle.html\sto\sindex.html\sand\smove\sfiddle\spush-to-server\srules\sfrom\sGNUmakefile\sinto\sfiddle.make.
+D 2022-10-25T15:59:27.394
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -472,7 +472,7 @@ F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
-F ext/wasm/GNUmakefile 72f8ca582578295315f9f198f308b927e64e8657e2b14f738123745043db7c7c
+F ext/wasm/GNUmakefile ef0b2ab599c5e2fd89fe7620920319de73df36f1c8fe2ef4e745fa0e30ecc608
 F ext/wasm/README-dist.txt e78e44a58772d5b5d7a5a179b5bf639cd67b62249aac66138e2c319bd02dd243
 F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 36f413ab4dbb057d2dec938fb366ac0a4c5e85ba14660a8d672f0277602c0fc5
@@ -511,11 +511,11 @@ F ext/wasm/demo-worker1-promiser.js f68ffbbe1c6086e18ce7961b8fc2b40dd88db174f590
 F ext/wasm/demo-worker1.html 2c178c1890a2beb5a5fecb1453e796d067a4b8d3d2a04d65ca2eb1ab2c68ef5d
 F ext/wasm/demo-worker1.js 8ba51d94c4601fa5c313d9e59b63b238f5305b5d5739ad21f4782a0161e6682e
 F ext/wasm/dist.make b3b156061ff6a35ce59715632c9446cb58e0fc497021a93c778fed051a04fde1
-F ext/wasm/fiddle.make acdb1a402864f9b05a4c89805c5e91d88f5080652d8861f0865655b172243847
+F ext/wasm/fiddle.make 68abe5dcfdd6fdf8dc1b715b94b96fae771b5b28bc1843997b9b1ec79407f2c9
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js 7ee53ca846071de5d46bb11a2a269a7990ef9cfd8abfae2a25cc948499783d78
-F ext/wasm/fiddle/fiddle.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
 F ext/wasm/fiddle/fiddle.js 974b995119ac443685d7d94d3b3c58c6a36540e9eb3fed7069d5653284071715
+F ext/wasm/fiddle/index.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2 w ext/wasm/fiddle/fiddle.html
 F ext/wasm/index-dist.html cb0da16cba0f21cda2c25724c5869102d48eb0af04446acd3cd0ca031f80ed19
 F ext/wasm/index.html 751bbf248ee3106cec92cc4e6e3f703cd5c94deff3c6b7a596154fb04ab3efac
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
@@ -2037,8 +2037,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 8ba9c884bded52e3e044ff39c826c04838e7c31f05d802f4a14d9ce5a01ab721
-R a12e657bf006b1f4149c559a9983c3ea
+P d3c830bd37a402161b486d3631feceae5d00f89c2522aed65fcd2e666bd64238
+R cdf159df9e6c825fac67e2645c1ad476
 U stephan
-Z 350b5441f32a515aa32cf4712729b820
+Z 282ed5b5b57abda7a343c9407b34123d
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 308ba01fb6..b6ae2b9af6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d3c830bd37a402161b486d3631feceae5d00f89c2522aed65fcd2e666bd64238
\ No newline at end of file
+3d7b4f36b7dd01058d57fc8ef7689d9bbf1a219166796ed427180cd59d2c189d
\ No newline at end of file

From 4831f4e0f1b0d3d4523a810c863377576aae9b39 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 25 Oct 2022 16:04:44 +0000
Subject: [PATCH 352/428] Correct -O level for fiddle build when built from the
 top-most directory (-Os instead of -O0).

FossilOrigin-Name: ff4fc29c38b78dfd471e25942304cba352469d6018f1c09158172795dbdd438c
---
 Makefile.in   |  2 +-
 manifest      | 14 +++++++-------
 manifest.uuid |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 4356a16e85..502c7ade84 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1532,4 +1532,4 @@ sqlite3.dll: $(REAL_LIBOBJ) sqlite3.def
 # Fiddle app
 #
 fiddle: sqlite3.c shell.c
-	make -C ext/wasm fiddle
+	make -C ext/wasm fiddle emcc_opt=-Os
diff --git a/manifest b/manifest
index be45572c99..e619d4a261 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Rename\sfiddle.html\sto\sindex.html\sand\smove\sfiddle\spush-to-server\srules\sfrom\sGNUmakefile\sinto\sfiddle.make.
-D 2022-10-25T15:59:27.394
+C Correct\s-O\slevel\sfor\sfiddle\sbuild\swhen\sbuilt\sfrom\sthe\stop-most\sdirectory\s(-Os\sinstead\sof\s-O0).
+D 2022-10-25T16:04:44.107
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in d7c7b4f0751ab67b5f15119bf9d22a153ef5ce47c3db0f1f4f91236a10e0ea66
+F Makefile.in f1d0ee0aad6cc81de195ab1da015eb7f4d16c76697266ab2a84706f868b0c736
 F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
 F Makefile.msc 905b7205ef708fea740b17f35d8a8ec7a7aa1e034ee53b708b75c094eeab4e21
 F README.md 8b8df9ca852aeac4864eb1e400002633ee6db84065bd01b78c33817f97d31f5e
@@ -515,7 +515,7 @@ F ext/wasm/fiddle.make 68abe5dcfdd6fdf8dc1b715b94b96fae771b5b28bc1843997b9b1ec79
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js 7ee53ca846071de5d46bb11a2a269a7990ef9cfd8abfae2a25cc948499783d78
 F ext/wasm/fiddle/fiddle.js 974b995119ac443685d7d94d3b3c58c6a36540e9eb3fed7069d5653284071715
-F ext/wasm/fiddle/index.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2 w ext/wasm/fiddle/fiddle.html
+F ext/wasm/fiddle/index.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
 F ext/wasm/index-dist.html cb0da16cba0f21cda2c25724c5869102d48eb0af04446acd3cd0ca031f80ed19
 F ext/wasm/index.html 751bbf248ee3106cec92cc4e6e3f703cd5c94deff3c6b7a596154fb04ab3efac
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
@@ -2037,8 +2037,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 d3c830bd37a402161b486d3631feceae5d00f89c2522aed65fcd2e666bd64238
-R cdf159df9e6c825fac67e2645c1ad476
+P 3d7b4f36b7dd01058d57fc8ef7689d9bbf1a219166796ed427180cd59d2c189d
+R 955321b7bb1e655f8b109cf12d102f3d
 U stephan
-Z 282ed5b5b57abda7a343c9407b34123d
+Z ebab1879829c4b6ca37dba849b7e13b9
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index b6ae2b9af6..30ac81c8aa 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3d7b4f36b7dd01058d57fc8ef7689d9bbf1a219166796ed427180cd59d2c189d
\ No newline at end of file
+ff4fc29c38b78dfd471e25942304cba352469d6018f1c09158172795dbdd438c
\ No newline at end of file

From e896ba94e3c7458dffa0c0fc84d779766b213365 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 25 Oct 2022 16:57:42 +0000
Subject: [PATCH 353/428] Add doc page link to the wasm dist README.txt.

FossilOrigin-Name: c2380668d9a2ad04f6f27ef052190bda17cdb112895e93b94ae1da70db6983c8
---
 ext/wasm/README-dist.txt |  4 ++--
 manifest                 | 12 ++++++------
 manifest.uuid            |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ext/wasm/README-dist.txt b/ext/wasm/README-dist.txt
index c6fb2c5d1a..ca6bef93e8 100644
--- a/ext/wasm/README-dist.txt
+++ b/ext/wasm/README-dist.txt
@@ -2,7 +2,7 @@ This is the README for the sqlite3 WASM/JS distribution.
 
 Main project page: https://sqlite.org
 
-TODO: link to main WASM/JS docs, once they are online
+Documentation: https://sqlite.org/wasm
 
 This archive contains the sqlite3.js and sqlite3.wasm file which make
 up the sqlite3 WASM/JS build.
@@ -20,4 +20,4 @@ One simple way to get the demo apps up and running on Unix-style
 systems is to install althttpd (https://sqlite.org/althttpd) and run:
 
     althttpd --enable-sab --page index.html
- 
+
diff --git a/manifest b/manifest
index e619d4a261..e252060abc 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Correct\s-O\slevel\sfor\sfiddle\sbuild\swhen\sbuilt\sfrom\sthe\stop-most\sdirectory\s(-Os\sinstead\sof\s-O0).
-D 2022-10-25T16:04:44.107
+C Add\sdoc\spage\slink\sto\sthe\swasm\sdist\sREADME.txt.
+D 2022-10-25T16:57:42.914
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -473,7 +473,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
 F ext/wasm/GNUmakefile ef0b2ab599c5e2fd89fe7620920319de73df36f1c8fe2ef4e745fa0e30ecc608
-F ext/wasm/README-dist.txt e78e44a58772d5b5d7a5a179b5bf639cd67b62249aac66138e2c319bd02dd243
+F ext/wasm/README-dist.txt 2d670b426fc7c613b90a7d2f2b05b433088fe65181abead970980f0a4a75ea20
 F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 36f413ab4dbb057d2dec938fb366ac0a4c5e85ba14660a8d672f0277602c0fc5
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -2037,8 +2037,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 3d7b4f36b7dd01058d57fc8ef7689d9bbf1a219166796ed427180cd59d2c189d
-R 955321b7bb1e655f8b109cf12d102f3d
+P ff4fc29c38b78dfd471e25942304cba352469d6018f1c09158172795dbdd438c
+R f599aafebad5f34bada7ffb876eb7b23
 U stephan
-Z ebab1879829c4b6ca37dba849b7e13b9
+Z 2dc58cd7e46ee3c816a1b578eeb79113
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 30ac81c8aa..6f66dd4033 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ff4fc29c38b78dfd471e25942304cba352469d6018f1c09158172795dbdd438c
\ No newline at end of file
+c2380668d9a2ad04f6f27ef052190bda17cdb112895e93b94ae1da70db6983c8
\ No newline at end of file

From 419e0d3e097824653f1d578fbb2889c810ce98a2 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 26 Oct 2022 06:05:44 +0000
Subject: [PATCH 354/428] Add --download-version flag to
 ext/wasm/version-info.c and correct dist target's output version format to
 match.

FossilOrigin-Name: 6f2a40d06dd9a56491d27928ed3785e08308c7dcea2b3f768097fc98ba91a910
---
 ext/wasm/GNUmakefile    |  2 +-
 ext/wasm/dist.make      |  2 +-
 ext/wasm/version-info.c | 30 +++++++++++++++++++++++++++---
 manifest                | 16 ++++++++--------
 manifest.uuid           |  2 +-
 5 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index cd8822084c..a191668d5b 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -187,7 +187,7 @@ else
   $(info Development build. Use '$(MAKE) release' for a smaller release build.)
 endif
 
-bin.version-info := $(dir.wasm)/bin.version-info
+bin.version-info := $(dir.wasm)/version-info
 # ^^^^ NOT in $(dir.tmp) because we need it to survive the cleanup
 # process for the dist build to work properly.
 $(bin.version-info): $(dir.wasm)/version-info.c $(sqlite3.h) $(MAKEFILE)
diff --git a/ext/wasm/dist.make b/ext/wasm/dist.make
index df3e236d7b..13e750dbc5 100644
--- a/ext/wasm/dist.make
+++ b/ext/wasm/dist.make
@@ -79,7 +79,7 @@ dist: \
 	@$(bin.stripccomments) -k -k < $(sqlite3.js) \
 		> $(dist-dir.jswasm)/$(notdir $(sqlite3.js))
 	@cp -p $(dist.common.extras) $(dist-dir.common)
-	@vnum=$$($(bin.version-info) --version-number); \
+	@vnum=$$($(bin.version-info) --download-version); \
 		vdir=sqlite-wasm-$$vnum; \
 		arczip=$$vdir.zip; \
 		echo "Making $$arczip ..."; \
diff --git a/ext/wasm/version-info.c b/ext/wasm/version-info.c
index 96c8e2dbee..62fcd633c8 100644
--- a/ext/wasm/version-info.c
+++ b/ext/wasm/version-info.c
@@ -12,15 +12,22 @@
 ** This file simply outputs sqlite3 version information in JSON form,
 ** intended for embedding in the sqlite3 JS API build.
 */
+#ifdef TEST_VERSION
+/*3029003 3039012*/
+#define SQLITE_VERSION "X.Y.Z"
+#define SQLITE_VERSION_NUMBER TEST_VERSION
+#define SQLITE_SOURCE_ID "dummy"
+#else
 #include "sqlite3.h"
+#endif
 #include <stdio.h>
 #include <string.h>
-
 static void usage(const char *zAppName){
   puts("Emits version info about the sqlite3 it is built against.");
   printf("Usage: %s [--quote] --INFO-FLAG:\n\n", zAppName);
   puts("  --version          Emit SQLITE_VERSION (3.X.Y)");
   puts("  --version-number   Emit SQLITE_VERSION_NUMBER (30XXYYZZ)");
+  puts("  --download-version Emit /download.html version number (3XXYYZZ)");
   puts("  --source-id        Emit SQLITE_SOURCE_ID");
   puts("  --json             Emit all info in JSON form");
   puts("\nThe non-JSON formats may be modified by:\n");
@@ -31,6 +38,8 @@ int main(int argc, char const * const * argv){
   int fJson = 0;
   int fVersion = 0;
   int fVersionNumber = 0;
+  int fDlVersion = 0;
+  int dlVersion = 0;
   int fSourceInfo = 0;
   int fQuote = 0;
   int nFlags = 0;
@@ -43,6 +52,8 @@ int main(int argc, char const * const * argv){
       fVersion = 1;
     }else if( 0==strcmp("version-number", zArg) ){
       fVersionNumber = 1;
+    }else if( 0==strcmp("download-version", zArg) ){
+      fDlVersion = 1;
     }else if( 0==strcmp("source-id", zArg) ){
       fSourceInfo = 1;
     }else if( 0==strcmp("json", zArg) ){
@@ -59,13 +70,24 @@ int main(int argc, char const * const * argv){
   }
 
   if( 0==nFlags ) fJson = 1;
+
+  {
+    const int v = SQLITE_VERSION_NUMBER;
+    int ver[4] = {0,0,0,0};
+    ver[0] = (v / 1000000) * 1000000;
+    ver[1] = v % 1000000 / 100 * 1000;
+    ver[2] = v % 100 * 100;
+    dlVersion = ver[0] + ver[1] + ver[2] + ver[3];
+  }
   if( fJson ){
     printf("{\"libVersion\": \"%s\", "
            "\"libVersionNumber\": %d, "
-           "\"sourceId\": \"%s\"}"/*missing newline is intentional*/,
+           "\"sourceId\": \"%s\","
+           "\"downloadVersion\": %d}"/*missing newline is intentional*/,
            SQLITE_VERSION,
            SQLITE_VERSION_NUMBER,
-           SQLITE_SOURCE_ID);
+           SQLITE_SOURCE_ID,
+           dlVersion);
   }else{
     if(fQuote) printf("%c", '"');
     if( fVersion ){
@@ -74,6 +96,8 @@ int main(int argc, char const * const * argv){
       printf("%d", SQLITE_VERSION_NUMBER);
     }else if( fSourceInfo ){
       printf("%s", SQLITE_SOURCE_ID);
+    }else if( fDlVersion ){
+      printf("%d", dlVersion);
     }
     if(fQuote) printf("%c", '"');
     puts("");
diff --git a/manifest b/manifest
index e252060abc..b3f53c41a6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sdoc\spage\slink\sto\sthe\swasm\sdist\sREADME.txt.
-D 2022-10-25T16:57:42.914
+C Add\s--download-version\sflag\sto\sext/wasm/version-info.c\sand\scorrect\sdist\starget's\soutput\sversion\sformat\sto\smatch.
+D 2022-10-26T06:05:44.732
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -472,7 +472,7 @@ F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
-F ext/wasm/GNUmakefile ef0b2ab599c5e2fd89fe7620920319de73df36f1c8fe2ef4e745fa0e30ecc608
+F ext/wasm/GNUmakefile 7a8c06f9bdbb791f8ef084ecd47e099da81e5797b9b1d60e33ac9a07eedd5dbd
 F ext/wasm/README-dist.txt 2d670b426fc7c613b90a7d2f2b05b433088fe65181abead970980f0a4a75ea20
 F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 36f413ab4dbb057d2dec938fb366ac0a4c5e85ba14660a8d672f0277602c0fc5
@@ -510,7 +510,7 @@ F ext/wasm/demo-worker1-promiser.html 1de7c248c7c2cfd4a5783d2aa154bce62d74c6de98
 F ext/wasm/demo-worker1-promiser.js f68ffbbe1c6086e18ce7961b8fc2b40dd88db174f59052e228c06b07484945ca
 F ext/wasm/demo-worker1.html 2c178c1890a2beb5a5fecb1453e796d067a4b8d3d2a04d65ca2eb1ab2c68ef5d
 F ext/wasm/demo-worker1.js 8ba51d94c4601fa5c313d9e59b63b238f5305b5d5739ad21f4782a0161e6682e
-F ext/wasm/dist.make b3b156061ff6a35ce59715632c9446cb58e0fc497021a93c778fed051a04fde1
+F ext/wasm/dist.make b687dc07db2dc9669369f126ac42c4ff6539dce2531063a0e75405c74a3cee1d
 F ext/wasm/fiddle.make 68abe5dcfdd6fdf8dc1b715b94b96fae771b5b28bc1843997b9b1ec79407f2c9
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js 7ee53ca846071de5d46bb11a2a269a7990ef9cfd8abfae2a25cc948499783d78
@@ -534,7 +534,7 @@ F ext/wasm/test-opfs-vfs.js 48fc59110e8775bb43c9be25b6d634fc07ebadab7da8fbd44889
 F ext/wasm/tester1-worker.html d02b9d38876b023854cf8955e77a40912f7e516956b4dbe1ec7f215faac273ee
 F ext/wasm/tester1.html c6c47e5a8071eb09cb1301104435c8e44fbb5719c92411f5b2384a461f9793c5
 F ext/wasm/tester1.js 12741d4ff6015fc14fa9a397e6f9130bbda699067bbceca23d5a228138271735
-F ext/wasm/version-info.c 5fa356d38859d71a0369b5c37e1935def7413fcc8a4e349a39d9052c1d0479f4
+F ext/wasm/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd72273503ae7d5
 F ext/wasm/wasmfs.make ee0004813e16c283ff633e08b482008d56adf9b7d42f6c5612f7ab002b924f69
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
@@ -2037,8 +2037,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 ff4fc29c38b78dfd471e25942304cba352469d6018f1c09158172795dbdd438c
-R f599aafebad5f34bada7ffb876eb7b23
+P c2380668d9a2ad04f6f27ef052190bda17cdb112895e93b94ae1da70db6983c8
+R b38f83a008231bedbea9fc9c1ad80f86
 U stephan
-Z 2dc58cd7e46ee3c816a1b578eeb79113
+Z 6ac73cda6074f1cdcaf9b0a6a58d82e1
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 6f66dd4033..dbfc8f0b1f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c2380668d9a2ad04f6f27ef052190bda17cdb112895e93b94ae1da70db6983c8
\ No newline at end of file
+6f2a40d06dd9a56491d27928ed3785e08308c7dcea2b3f768097fc98ba91a910
\ No newline at end of file

From 705d7be62dad956dac8c21856f5e93ee9156eb82 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Wed, 26 Oct 2022 11:11:31 +0000
Subject: [PATCH 355/428] Remove the sqlite3StdTypeMap global constant that was
 made obsolete by [aa6e908619624867].

FossilOrigin-Name: 3dfdfb3f12edb3f4267942598efd05d573e13b7c5d6cdbc3404373f41b8993dd
---
 manifest        | 16 ++++++++--------
 manifest.uuid   |  2 +-
 src/global.c    | 12 ------------
 src/sqliteInt.h |  1 -
 4 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/manifest b/manifest
index b3f53c41a6..4296da4172 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\s--download-version\sflag\sto\sext/wasm/version-info.c\sand\scorrect\sdist\starget's\soutput\sversion\sformat\sto\smatch.
-D 2022-10-26T06:05:44.732
+C Remove\sthe\ssqlite3StdTypeMap\sglobal\sconstant\sthat\swas\smade\nobsolete\sby\s[aa6e908619624867].
+D 2022-10-26T11:11:31.010
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -574,7 +574,7 @@ F src/expr.c 847f87d9df3ede2b2b0a8db088af0b9c1923b21009f8ea1b9b7b28cb0a383170
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 722f20779f5342a787922deded3628d8c74b5249cab04098cf17ee2f2aaff002
 F src/func.c d25f3c667d59dbac195e65f3539fdbbd8a36c142ce7bcdb45d1baf07446ad13a
-F src/global.c e83ee571b79ee3adc32e380cf554cf1254bc43763d23786c71721fbcdfbbb965
+F src/global.c e06ff8e0acd85aec13563c9ecb44fbbf38232ccf73594998fd880b92d619594b
 F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
 F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
 F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
@@ -625,7 +625,7 @@ F src/shell.c.in 35873039518a51ce5c5a944183a82f615942ffc3923f41b8afe7d6289a28fdb
 F src/sqlite.h.in d9c8a6243fc0a1c270d69db33758e34b810af3462f9bc5b4af113b347e07c69d
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 5336beea1868d99d2f62e628dbea55e97267dbff8193291ab175e960c5df9141
-F src/sqliteInt.h 9a40d5b075cd2e78bac6f9ae724e3fa4281373cb728f961272cb182f6ba94ce6
+F src/sqliteInt.h 2449c9ea2936e077dfba0f116178d8be2b908cf1ed8fa8eaabe73540a4df4331
 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -2037,8 +2037,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 c2380668d9a2ad04f6f27ef052190bda17cdb112895e93b94ae1da70db6983c8
-R b38f83a008231bedbea9fc9c1ad80f86
-U stephan
-Z 6ac73cda6074f1cdcaf9b0a6a58d82e1
+P 6f2a40d06dd9a56491d27928ed3785e08308c7dcea2b3f768097fc98ba91a910
+R 939184dfcbf30234af97eb9fa7179799
+U drh
+Z 7fbab0d9ec3f74d2ff4dedacc970788e
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index dbfc8f0b1f..d206de713c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6f2a40d06dd9a56491d27928ed3785e08308c7dcea2b3f768097fc98ba91a910
\ No newline at end of file
+3dfdfb3f12edb3f4267942598efd05d573e13b7c5d6cdbc3404373f41b8993dd
\ No newline at end of file
diff --git a/src/global.c b/src/global.c
index 9e3c07a515..799b1e47c4 100644
--- a/src/global.c
+++ b/src/global.c
@@ -375,10 +375,6 @@ const char sqlite3StrBINARY[] = "BINARY";
 **
 **    sqlite3StdTypeAffinity[]    The affinity associated with each entry
 **                                in sqlite3StdType[].
-**
-**    sqlite3StdTypeMap[]         The type value (as returned from
-**                                sqlite3_column_type() or sqlite3_value_type())
-**                                for each entry in sqlite3StdType[].
 */
 const unsigned char sqlite3StdTypeLen[] = { 3, 4, 3, 7, 4, 4 };
 const char sqlite3StdTypeAffinity[] = {
@@ -389,14 +385,6 @@ const char sqlite3StdTypeAffinity[] = {
   SQLITE_AFF_REAL,
   SQLITE_AFF_TEXT
 };
-const char sqlite3StdTypeMap[] = {
-  0,
-  SQLITE_BLOB,
-  SQLITE_INTEGER,
-  SQLITE_INTEGER,
-  SQLITE_FLOAT,
-  SQLITE_TEXT
-};
 const char *sqlite3StdType[] = {
   "ANY",
   "BLOB",
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 3dde0f6f9c..f272f1a4f6 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -5052,7 +5052,6 @@ extern const unsigned char sqlite3OpcodeProperty[];
 extern const char sqlite3StrBINARY[];
 extern const unsigned char sqlite3StdTypeLen[];
 extern const char sqlite3StdTypeAffinity[];
-extern const char sqlite3StdTypeMap[];
 extern const char *sqlite3StdType[];
 extern const unsigned char sqlite3UpperToLower[];
 extern const unsigned char *sqlite3aLTb;

From 14ae1a533160e0510f33e408b4f17c66f71e2bd7 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 26 Oct 2022 11:12:14 +0000
Subject: [PATCH 356/428] Remove oo1.DB.hasFilename() and getFilename(), as
 they are unnecessary.

FossilOrigin-Name: 75c546b982024bf2b527c85271111d54158cb010867f6e29fc89e86cc8457cc5
---
 ext/wasm/api/sqlite3-api-oo1.js     | 21 ---------------------
 ext/wasm/api/sqlite3-api-worker1.js |  2 +-
 ext/wasm/scratchpad-wasmfs-main.js  |  2 +-
 manifest                            | 18 +++++++++---------
 manifest.uuid                       |  2 +-
 5 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index 20210a03fb..05fc403710 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -514,27 +514,6 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
           : capi.sqlite3_changes(p);
       }
     },
-    /**
-       Similar to the this.filename property but will return a falsy
-       value for special names like ":memory:". Throws if the DB has
-       been closed. If passed an argument it then it will return the
-       filename of the ATTACHEd db with that name, else it assumes a
-       name of `main`. The argument may be either a JS string or
-       a pointer to a WASM-allocated C-string.
-    */
-    getFilename: function(dbName='main'){
-      return capi.sqlite3_db_filename(affirmDbOpen(this).pointer, dbName);
-    },
-    /**
-       Returns true if this db instance has a name which resolves to a
-       file. If the name is "" or starts with ":", it resolves to false.
-       Note that it is not aware of the peculiarities of URI-style
-       names and a URI-style name for a ":memory:" db will fool it.
-       Returns false if this db is closed.
-    */
-    hasFilename: function(){
-      return this.filename && ':'!==this.filename[0];
-    },
     /**
        Returns the name of the given 0-based db number, as documented
        for sqlite3_db_name().
diff --git a/ext/wasm/api/sqlite3-api-worker1.js b/ext/wasm/api/sqlite3-api-worker1.js
index dea06341a0..748ce4c6f5 100644
--- a/ext/wasm/api/sqlite3-api-worker1.js
+++ b/ext/wasm/api/sqlite3-api-worker1.js
@@ -366,7 +366,7 @@ sqlite3.initWorker1API = function(){
     close: function(db,alsoUnlink){
       if(db){
         delete this.dbs[getDbId(db)];
-        const filename = db.getFilename();
+        const filename = db.filename;
         const pVfs = sqlite3.capi.wasm.sqlite3_wasm_db_vfs(db.pointer, 0);
         db.close();
         if(db===this.defaultDb) this.defaultDb = undefined;
diff --git a/ext/wasm/scratchpad-wasmfs-main.js b/ext/wasm/scratchpad-wasmfs-main.js
index e76011274b..d0f5fdeb54 100644
--- a/ext/wasm/scratchpad-wasmfs-main.js
+++ b/ext/wasm/scratchpad-wasmfs-main.js
@@ -49,7 +49,7 @@
     let db;
     try {
       db = new oo.DB(persistentDir+'/foo.db');
-      stdout("DB filename:",db.filename,db.getFilename());
+      stdout("DB filename:",db.filename);
       const banner1 = '>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>',
             banner2 = '<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<';
       [
diff --git a/manifest b/manifest
index 4296da4172..6385e1e028 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sthe\ssqlite3StdTypeMap\sglobal\sconstant\sthat\swas\smade\nobsolete\sby\s[aa6e908619624867].
-D 2022-10-26T11:11:31.010
+C Remove\soo1.DB.hasFilename()\sand\sgetFilename(),\sas\sthey\sare\sunnecessary.
+D 2022-10-26T11:12:14.318
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -485,10 +485,10 @@ F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1
 F ext/wasm/api/pre-js.js 151e0616614a49f3db19ed544fa13b38c87c108959fbcd4029ea8399a562d94f
 F ext/wasm/api/sqlite3-api-cleanup.js 4d07a7524dc9b7b050acfde57163e839243ad2383bd7ee0de0178b1b3e988588
 F ext/wasm/api/sqlite3-api-glue.js 6e4e472eb5afc732a695cd7c5ded6dee6ef8b480e61aa0d648a3fc9033c84745
-F ext/wasm/api/sqlite3-api-oo1.js ca41ffe58bfbbefc98181081fba0b7af58afcc2770e963558f4f6a408c583fc0
+F ext/wasm/api/sqlite3-api-oo1.js 06e168af4c03b7c41f3a384e99714e8180b2feda475b71bc1682756ed1fb7424
 F ext/wasm/api/sqlite3-api-opfs.js 62da8b7cac30d4e7bb940762d2ac948b0aeb89704a5a290b74eb268ecbd1a64e
 F ext/wasm/api/sqlite3-api-prologue.js fa00d55f927e5a4ec51cf2c80f6f0eaed2f4f5774341ecf3d63a0ea4c738f8f5
-F ext/wasm/api/sqlite3-api-worker1.js a7f38f03275d6c27ab2aef3e83215d3c97ce09c43e6904df47c3764d9d4572b4
+F ext/wasm/api/sqlite3-api-worker1.js b2d650514ccc75f80dff666fd3ee68dc8fb4137bcd01caac2c62ff93a7ebf638
 F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
 F ext/wasm/api/sqlite3-opfs-async-proxy.js f04cb1eb483c92bc61fe02749f7afcf17ec803968171aedd7d96faf428c26bcb
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
@@ -521,7 +521,7 @@ F ext/wasm/index.html 751bbf248ee3106cec92cc4e6e3f703cd5c94deff3c6b7a596154fb04a
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 9aa6951b529a8b29f578ec8f0355713c39584c92cf1708f63ba0cf917cb5b68e
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
-F ext/wasm/scratchpad-wasmfs-main.js 1aa32c1035cf1440a226a28fefcbb5762fbbcb020ccbe5895f8736d701695c63
+F ext/wasm/scratchpad-wasmfs-main.js 1841c124a58e3f9e7ee580a0868d6e1834c5a01dbb47c8fdd565eda5db362437
 F ext/wasm/speedtest1-wasmfs.html bc28eb29b69a73864b8d7aae428448f8b7e1de81d8bfb9bba99541322054dbd0
 F ext/wasm/speedtest1-worker.html 7b0cceab6a68b2883738e19f61d21620fe1244ba36c1b2e38d0efde57ecce86d
 F ext/wasm/speedtest1-worker.js 942af0909dee6e6a43af85d3e4a5e6aa74956290ca4b78fd4e753be13673ccd6
@@ -2037,8 +2037,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 6f2a40d06dd9a56491d27928ed3785e08308c7dcea2b3f768097fc98ba91a910
-R 939184dfcbf30234af97eb9fa7179799
-U drh
-Z 7fbab0d9ec3f74d2ff4dedacc970788e
+P 3dfdfb3f12edb3f4267942598efd05d573e13b7c5d6cdbc3404373f41b8993dd
+R df51a6d29b4944ae600f13957da052ce
+U stephan
+Z 781ef648a1949ab8c3f9ac5d81d120d1
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index d206de713c..3be00156ea 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3dfdfb3f12edb3f4267942598efd05d573e13b7c5d6cdbc3404373f41b8993dd
\ No newline at end of file
+75c546b982024bf2b527c85271111d54158cb010867f6e29fc89e86cc8457cc5
\ No newline at end of file

From 34b92b19f3443c60669cd8a4d3239c9b9f84d3f0 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 26 Oct 2022 11:27:33 +0000
Subject: [PATCH 357/428] Replace the newly-removed oo1.DB.getFilename() with
 DB.dbFilename() with the hope that the distinction from the
 dbInstance.filename property is clearer.

FossilOrigin-Name: 0b80543d75504c733b73b32f73b96074a4b0cebad64e47032926a3fefee41726
---
 ext/wasm/api/sqlite3-api-oo1.js |  9 +++++++++
 ext/wasm/tester1.js             | 10 ++++++----
 manifest                        | 14 +++++++-------
 manifest.uuid                   |  2 +-
 4 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index 05fc403710..0a6b48b6e7 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -514,6 +514,15 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
           : capi.sqlite3_changes(p);
       }
     },
+    /**
+       Similar to the this.filename but returns the
+       sqlite3_db_filename() value for the given database name,
+       defaulting to "main".  The argument may be either a JS string
+       or a pointer to a WASM-allocated C-string.
+    */
+    dbFilename: function(dbName='main'){
+      return capi.sqlite3_db_filename(affirmDbOpen(this).pointer, dbName);
+    },
     /**
        Returns the name of the given 0-based db number, as documented
        for sqlite3_db_name().
diff --git a/ext/wasm/tester1.js b/ext/wasm/tester1.js
index 064909f870..4a6074d91b 100644
--- a/ext/wasm/tester1.js
+++ b/ext/wasm/tester1.js
@@ -1059,16 +1059,19 @@
   ////////////////////////////////////////////////////////////////////////
   T.g('sqlite3.oo1')
     .t('Create db', function(sqlite3){
-      const db = this.db = new sqlite3.oo1.DB();
+      const dbFile = '/tester1.db';
+      sqlite3.capi.wasm.sqlite3_wasm_vfs_unlink(0, dbFile);
+      const db = this.db = new sqlite3.oo1.DB(dbFile);
       T.assert(Number.isInteger(db.pointer)).
         mustThrowMatching(()=>db.pointer=1, /read-only/).
         assert(0===sqlite3.capi.sqlite3_extended_result_codes(db.pointer,1)).
         assert('main'===db.dbName(0));
-
       // Custom db error message handling via sqlite3_prepare_v2/v3()
       let rc = capi.sqlite3_prepare_v3(db.pointer, {/*invalid*/}, -1, 0, null, null);
       T.assert(capi.SQLITE_MISUSE === rc)
-        .assert(0 === capi.sqlite3_errmsg(db.pointer).indexOf("Invalid SQL"));
+        .assert(0 === capi.sqlite3_errmsg(db.pointer).indexOf("Invalid SQL"))
+        .assert(dbFile === db.dbFilename())
+        .assert(!db.dbFilename('nope'));
     })
 
   ////////////////////////////////////////////////////////////////////
@@ -1146,7 +1149,6 @@
         .assert(pVfsDb > 0)
         .assert(pVfsMem !== pVfsDflt
                 /* memdb lives on top of the default vfs */)
-        .assert(':memory:' === db.filename)
         .assert(pVfsDb === pVfsDflt || pVfsdb === pVfsMem)
       ;
       /*const vMem = new capi.sqlite3_vfs(pVfsMem),
diff --git a/manifest b/manifest
index 6385e1e028..b4ef9da2db 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\soo1.DB.hasFilename()\sand\sgetFilename(),\sas\sthey\sare\sunnecessary.
-D 2022-10-26T11:12:14.318
+C Replace\sthe\snewly-removed\soo1.DB.getFilename()\swith\sDB.dbFilename()\swith\sthe\shope\sthat\sthe\sdistinction\sfrom\sthe\sdbInstance.filename\sproperty\sis\sclearer.
+D 2022-10-26T11:27:33.666
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -485,7 +485,7 @@ F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1
 F ext/wasm/api/pre-js.js 151e0616614a49f3db19ed544fa13b38c87c108959fbcd4029ea8399a562d94f
 F ext/wasm/api/sqlite3-api-cleanup.js 4d07a7524dc9b7b050acfde57163e839243ad2383bd7ee0de0178b1b3e988588
 F ext/wasm/api/sqlite3-api-glue.js 6e4e472eb5afc732a695cd7c5ded6dee6ef8b480e61aa0d648a3fc9033c84745
-F ext/wasm/api/sqlite3-api-oo1.js 06e168af4c03b7c41f3a384e99714e8180b2feda475b71bc1682756ed1fb7424
+F ext/wasm/api/sqlite3-api-oo1.js 38004e18001396c078124769e14737a0ff703f98317279734020121af72efdd5
 F ext/wasm/api/sqlite3-api-opfs.js 62da8b7cac30d4e7bb940762d2ac948b0aeb89704a5a290b74eb268ecbd1a64e
 F ext/wasm/api/sqlite3-api-prologue.js fa00d55f927e5a4ec51cf2c80f6f0eaed2f4f5774341ecf3d63a0ea4c738f8f5
 F ext/wasm/api/sqlite3-api-worker1.js b2d650514ccc75f80dff666fd3ee68dc8fb4137bcd01caac2c62ff93a7ebf638
@@ -533,7 +533,7 @@ F ext/wasm/test-opfs-vfs.html 1f2d672f3f3fce810dfd48a8d56914aba22e45c6834e262555
 F ext/wasm/test-opfs-vfs.js 48fc59110e8775bb43c9be25b6d634fc07ebadab7da8fbd44889e8129c6e2548
 F ext/wasm/tester1-worker.html d02b9d38876b023854cf8955e77a40912f7e516956b4dbe1ec7f215faac273ee
 F ext/wasm/tester1.html c6c47e5a8071eb09cb1301104435c8e44fbb5719c92411f5b2384a461f9793c5
-F ext/wasm/tester1.js 12741d4ff6015fc14fa9a397e6f9130bbda699067bbceca23d5a228138271735
+F ext/wasm/tester1.js 21dad63165954a8a28dfa8eeab68a4881eb1d9b5c6bc9f2c83aa3ceea8c41fee
 F ext/wasm/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd72273503ae7d5
 F ext/wasm/wasmfs.make ee0004813e16c283ff633e08b482008d56adf9b7d42f6c5612f7ab002b924f69
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
@@ -2037,8 +2037,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 3dfdfb3f12edb3f4267942598efd05d573e13b7c5d6cdbc3404373f41b8993dd
-R df51a6d29b4944ae600f13957da052ce
+P 75c546b982024bf2b527c85271111d54158cb010867f6e29fc89e86cc8457cc5
+R be623a8f6f7c8b5e05b25a56c6af0f35
 U stephan
-Z 781ef648a1949ab8c3f9ac5d81d120d1
+Z 1a485f2ae92bc65c3a772e74dd0aa397
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 3be00156ea..7b3b3f9bca 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-75c546b982024bf2b527c85271111d54158cb010867f6e29fc89e86cc8457cc5
\ No newline at end of file
+0b80543d75504c733b73b32f73b96074a4b0cebad64e47032926a3fefee41726
\ No newline at end of file

From 7731dfca49dac5512c74dba0675cd47ea83f1389 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 26 Oct 2022 15:34:51 +0000
Subject: [PATCH 358/428] Corrected link to fiddle in ext/wasm/index.html
 (broken by [3d7b4f36b7dd]).

FossilOrigin-Name: 6efa0bae1678bf719a0693feeceb4c1e252fc86502bee9ee2a6d8af9a91d9b20
---
 ext/wasm/index.html |  2 +-
 manifest            | 12 ++++++------
 manifest.uuid       |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ext/wasm/index.html b/ext/wasm/index.html
index 222105599c..7df2c601f5 100644
--- a/ext/wasm/index.html
+++ b/ext/wasm/index.html
@@ -51,7 +51,7 @@
         </li>
         <li>High-level apps and demos...
           <ul>
-            <li><a href='fiddle/fiddle.html'>fiddle</a> is an HTML front-end
+            <li><a href='fiddle/index.html'>fiddle</a> is an HTML front-end
               to a wasm build of the sqlite3 shell.</li>
             <li><a href='demo-123.html'>demo-123</a> provides a
               no-nonsense example of adding sqlite3 support to a web
diff --git a/manifest b/manifest
index b4ef9da2db..0828defefa 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Replace\sthe\snewly-removed\soo1.DB.getFilename()\swith\sDB.dbFilename()\swith\sthe\shope\sthat\sthe\sdistinction\sfrom\sthe\sdbInstance.filename\sproperty\sis\sclearer.
-D 2022-10-26T11:27:33.666
+C Corrected\slink\sto\sfiddle\sin\sext/wasm/index.html\s(broken\sby\s[3d7b4f36b7dd]).
+D 2022-10-26T15:34:51.810
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -517,7 +517,7 @@ F ext/wasm/fiddle/fiddle-worker.js 7ee53ca846071de5d46bb11a2a269a7990ef9cfd8abfa
 F ext/wasm/fiddle/fiddle.js 974b995119ac443685d7d94d3b3c58c6a36540e9eb3fed7069d5653284071715
 F ext/wasm/fiddle/index.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
 F ext/wasm/index-dist.html cb0da16cba0f21cda2c25724c5869102d48eb0af04446acd3cd0ca031f80ed19
-F ext/wasm/index.html 751bbf248ee3106cec92cc4e6e3f703cd5c94deff3c6b7a596154fb04ab3efac
+F ext/wasm/index.html 6ac073d45d7602e1d8a5b493ce4204dc4a6c5594fdeeb12dec38c4e36ce473ad
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 9aa6951b529a8b29f578ec8f0355713c39584c92cf1708f63ba0cf917cb5b68e
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
@@ -2037,8 +2037,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 75c546b982024bf2b527c85271111d54158cb010867f6e29fc89e86cc8457cc5
-R be623a8f6f7c8b5e05b25a56c6af0f35
+P 0b80543d75504c733b73b32f73b96074a4b0cebad64e47032926a3fefee41726
+R 2a1356c9a64536bf417fe49604c5ed2c
 U stephan
-Z 1a485f2ae92bc65c3a772e74dd0aa397
+Z c560d1f193bb5507ca9ff271fe297692
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 7b3b3f9bca..9646e0f467 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0b80543d75504c733b73b32f73b96074a4b0cebad64e47032926a3fefee41726
\ No newline at end of file
+6efa0bae1678bf719a0693feeceb4c1e252fc86502bee9ee2a6d8af9a91d9b20
\ No newline at end of file

From 8c3e234ad56b15fc8fbc523d3b6cc1b292bfdf84 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 26 Oct 2022 15:40:17 +0000
Subject: [PATCH 359/428] Correct misuse of localhost-mode-only symbol S in
 fiddle-worker.js, which should fix the outage reported in
 [forum:67d985ac0bbe407f|forum post 67d985ac0bbe407f].

FossilOrigin-Name: 3b5aa50c223ac35c7d73e4629420a01408cd74d19ae5b887f91b7a657d91e026
---
 ext/wasm/fiddle/fiddle-worker.js |  4 ++--
 manifest                         | 12 ++++++------
 manifest.uuid                    |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ext/wasm/fiddle/fiddle-worker.js b/ext/wasm/fiddle/fiddle-worker.js
index e3a2cbbe81..935878c81a 100644
--- a/ext/wasm/fiddle/fiddle-worker.js
+++ b/ext/wasm/fiddle/fiddle-worker.js
@@ -166,11 +166,11 @@
       stdout("SQLite version", capi.sqlite3_libversion(),
              capi.sqlite3_sourceid().substr(0,19));
       stdout('Welcome to the "fiddle" shell.');
-      if(S.opfs){
+      if(sqlite3.opfs){
         stdout("\nOPFS is available. To open a persistent db, use:\n\n",
                "  .open file:name?vfs=opfs\n\nbut note that some",
                "features (e.g. upload) do not yet work with OPFS.");
-        S.opfs.registerVfs();
+        sqlite3.opfs.registerVfs();
       }
       stdout('\nEnter ".help" for usage hints.');
       this.exec([ // initialization commands...
diff --git a/manifest b/manifest
index 0828defefa..711609b288 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Corrected\slink\sto\sfiddle\sin\sext/wasm/index.html\s(broken\sby\s[3d7b4f36b7dd]).
-D 2022-10-26T15:34:51.810
+C Correct\smisuse\sof\slocalhost-mode-only\ssymbol\sS\sin\sfiddle-worker.js,\swhich\sshould\sfix\sthe\soutage\sreported\sin\s[forum:67d985ac0bbe407f|forum\spost\s67d985ac0bbe407f].
+D 2022-10-26T15:40:17.652
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -513,7 +513,7 @@ F ext/wasm/demo-worker1.js 8ba51d94c4601fa5c313d9e59b63b238f5305b5d5739ad21f4782
 F ext/wasm/dist.make b687dc07db2dc9669369f126ac42c4ff6539dce2531063a0e75405c74a3cee1d
 F ext/wasm/fiddle.make 68abe5dcfdd6fdf8dc1b715b94b96fae771b5b28bc1843997b9b1ec79407f2c9
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
-F ext/wasm/fiddle/fiddle-worker.js 7ee53ca846071de5d46bb11a2a269a7990ef9cfd8abfae2a25cc948499783d78
+F ext/wasm/fiddle/fiddle-worker.js 41b9796d689fabbef1ad9447496d14645eeb4101b534e54951fa5259c877c341
 F ext/wasm/fiddle/fiddle.js 974b995119ac443685d7d94d3b3c58c6a36540e9eb3fed7069d5653284071715
 F ext/wasm/fiddle/index.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
 F ext/wasm/index-dist.html cb0da16cba0f21cda2c25724c5869102d48eb0af04446acd3cd0ca031f80ed19
@@ -2037,8 +2037,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 0b80543d75504c733b73b32f73b96074a4b0cebad64e47032926a3fefee41726
-R 2a1356c9a64536bf417fe49604c5ed2c
+P 6efa0bae1678bf719a0693feeceb4c1e252fc86502bee9ee2a6d8af9a91d9b20
+R 42b8c73d0292f252fc1b26ba498e8eed
 U stephan
-Z c560d1f193bb5507ca9ff271fe297692
+Z 171dbba4f5a911c6906efc53820d42f2
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 9646e0f467..c4408a562d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6efa0bae1678bf719a0693feeceb4c1e252fc86502bee9ee2a6d8af9a91d9b20
\ No newline at end of file
+3b5aa50c223ac35c7d73e4629420a01408cd74d19ae5b887f91b7a657d91e026
\ No newline at end of file

From 8364ce2aa295bb50333b1361058d2c6c1bf381bd Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Wed, 26 Oct 2022 18:04:34 +0000
Subject: [PATCH 360/428] Make the shell .recover command and the dbdata.c
 module more robust in the face of corrupted databases.

FossilOrigin-Name: 4eef562a00ae988f2426c9af51f4165c0e4cbccd601061664a0c54c19b9cc70f
---
 ext/misc/dbdata.c | 31 ++++++++++++++++++++++---------
 manifest          | 14 +++++++-------
 manifest.uuid     |  2 +-
 3 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/ext/misc/dbdata.c b/ext/misc/dbdata.c
index 7405e7c890..32d529bb41 100644
--- a/ext/misc/dbdata.c
+++ b/ext/misc/dbdata.c
@@ -358,17 +358,30 @@ static int dbdataLoadPage(
 ** Read a varint.  Put the value in *pVal and return the number of bytes.
 */
 static int dbdataGetVarint(const u8 *z, sqlite3_int64 *pVal){
-  sqlite3_int64 v = 0;
+  sqlite3_uint64 u = 0;
   int i;
   for(i=0; i<8; i++){
-    v = (v<<7) + (z[i]&0x7f);
-    if( (z[i]&0x80)==0 ){ *pVal = v; return i+1; }
+    u = (u<<7) + (z[i]&0x7f);
+    if( (z[i]&0x80)==0 ){ *pVal = (sqlite3_int64)u; return i+1; }
   }
-  v = (v<<8) + (z[i]&0xff);
-  *pVal = v;
+  u = (u<<8) + (z[i]&0xff);
+  *pVal = (sqlite3_int64)u;
   return 9;
 }
 
+/*
+** Like dbdataGetVarint(), but set the output to 0 if it is less than 0
+** or greater than 0xFFFFFFFF. This can be used for all varints in an
+** SQLite database except for key values in intkey tables.
+*/
+static int dbdataGetVarintU32(const u8 *z, sqlite3_int64 *pVal){
+  sqlite3_int64 val;
+  int nRet = dbdataGetVarint(z, &val);
+  if( val<0 || val>0xFFFFFFFF ) val = 0;
+  *pVal = val;
+  return nRet;
+}
+
 /*
 ** Return the number of bytes of space used by an SQLite value of type
 ** eType.
@@ -540,7 +553,7 @@ static int dbdataNext(sqlite3_vtab_cursor *pCursor){
           if( bNextPage || iOff>pCsr->nPage ){
             bNextPage = 1;
           }else{
-            iOff += dbdataGetVarint(&pCsr->aPage[iOff], &nPayload);
+            iOff += dbdataGetVarintU32(&pCsr->aPage[iOff], &nPayload);
           }
     
           /* If this is a leaf intkey cell, load the rowid */
@@ -607,7 +620,7 @@ static int dbdataNext(sqlite3_vtab_cursor *pCursor){
               }
             }
     
-            iHdr = dbdataGetVarint(pCsr->pRec, &nHdr);
+            iHdr = dbdataGetVarintU32(pCsr->pRec, &nHdr);
             pCsr->nHdr = nHdr;
             pCsr->pHdrPtr = &pCsr->pRec[iHdr];
             pCsr->pPtr = &pCsr->pRec[pCsr->nHdr];
@@ -621,7 +634,7 @@ static int dbdataNext(sqlite3_vtab_cursor *pCursor){
           if( pCsr->pHdrPtr>&pCsr->pRec[pCsr->nRec] ){
             bNextPage = 1;
           }else{
-            pCsr->pHdrPtr += dbdataGetVarint(pCsr->pHdrPtr, &iType);
+            pCsr->pHdrPtr += dbdataGetVarintU32(pCsr->pHdrPtr, &iType);
             pCsr->pPtr += dbdataValueBytes(iType);
           }
         }
@@ -778,7 +791,7 @@ static int dbdataColumn(
           sqlite3_result_int64(ctx, pCsr->iIntkey);
         }else{
           sqlite3_int64 iType;
-          dbdataGetVarint(pCsr->pHdrPtr, &iType);
+          dbdataGetVarintU32(pCsr->pHdrPtr, &iType);
           dbdataValue(
               ctx, iType, pCsr->pPtr, &pCsr->pRec[pCsr->nRec] - pCsr->pPtr
           );
diff --git a/manifest b/manifest
index 711609b288..7edad4429d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Correct\smisuse\sof\slocalhost-mode-only\ssymbol\sS\sin\sfiddle-worker.js,\swhich\sshould\sfix\sthe\soutage\sreported\sin\s[forum:67d985ac0bbe407f|forum\spost\s67d985ac0bbe407f].
-D 2022-10-26T15:40:17.652
+C Make\sthe\sshell\s.recover\scommand\sand\sthe\sdbdata.c\smodule\smore\srobust\sin\sthe\sface\sof\scorrupted\sdatabases.
+D 2022-10-26T18:04:34.995
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -298,7 +298,7 @@ F ext/misc/closure.c dbfd8543b2a017ae6b1a5843986b22ddf99ff126ec9634a2f4047cd14c8
 F ext/misc/completion.c 6dafd7f4348eecc7be9e920d4b419d1fb2af75d938cd9c59a20cfe8beb2f22b9
 F ext/misc/compress.c 3354c77a7c8e86e07d849916000cdac451ed96500bfb5bd83b20eb61eee012c9
 F ext/misc/csv.c ca8d6dafc5469639de81937cb66ae2e6b358542aba94c4f791910d355a8e7f73
-F ext/misc/dbdata.c e316fba936571584e55abd5b974a32a191727a6b746053a0c9d439bd2cf93940
+F ext/misc/dbdata.c 8caece471d25790456bff52043592369f367cd8f41bcb55a2f6540a2c062c57a
 F ext/misc/dbdump.c b8592f6f2da292c62991a13864a60d6c573c47a9cc58362131b9e6a64f823e01
 F ext/misc/decimal.c 09f967dcf4a1ee35a76309829308ec278d3648168733f4a1147820e11ebefd12
 F ext/misc/eval.c 04bc9aada78c888394204b4ed996ab834b99726fb59603b0ee3ed6e049755dc1
@@ -2037,8 +2037,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 6efa0bae1678bf719a0693feeceb4c1e252fc86502bee9ee2a6d8af9a91d9b20
-R 42b8c73d0292f252fc1b26ba498e8eed
-U stephan
-Z 171dbba4f5a911c6906efc53820d42f2
+P 3b5aa50c223ac35c7d73e4629420a01408cd74d19ae5b887f91b7a657d91e026
+R 35ce71983125759a6aec05074aeb42bb
+U dan
+Z abadf61b49ea483e6a667d1435917fe4
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index c4408a562d..a88c2839d9 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3b5aa50c223ac35c7d73e4629420a01408cd74d19ae5b887f91b7a657d91e026
\ No newline at end of file
+4eef562a00ae988f2426c9af51f4165c0e4cbccd601061664a0c54c19b9cc70f
\ No newline at end of file

From 50632afa6e10df30ecd22b7bfcc582c73ea142ab Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Wed, 26 Oct 2022 18:29:19 +0000
Subject: [PATCH 361/428] Remove an undefined left-shift operation from the
 recover extension.

FossilOrigin-Name: a67082357a2cc348faf8236aafa7f39eb5cb673b1d114a594c6d5bb257f85b73
---
 ext/recover/sqlite3recover.c | 10 +++++-----
 manifest                     | 14 +++++++-------
 manifest.uuid                |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index 74b7f8a369..5e51bce9d4 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -2019,14 +2019,14 @@ static u32 recoverGetU32(const u8 *a){
 ** and return the number of bytes consumed.
 */
 static int recoverGetVarint(const u8 *a, i64 *pVal){
-  sqlite3_int64 v = 0;
+  sqlite3_uint64 u = 0;
   int i;
   for(i=0; i<8; i++){
-    v = (v<<7) + (a[i]&0x7f);
-    if( (a[i]&0x80)==0 ){ *pVal = v; return i+1; }
+    u = (u<<7) + (a[i]&0x7f);
+    if( (a[i]&0x80)==0 ){ *pVal = (sqlite3_int64)u; return i+1; }
   }
-  v = (v<<8) + (a[i]&0xff);
-  *pVal = v;
+  u = (u<<8) + (a[i]&0xff);
+  *pVal = (sqlite3_int64)u;
   return 9;
 }
 
diff --git a/manifest b/manifest
index e9680fd7ee..848d7b0c4e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sfurther\schanges\sfrom\strunk,\sincluding\sfix\sto\sdbdata.c.
-D 2022-10-26T18:22:22.756
+C Remove\san\sundefined\sleft-shift\soperation\sfrom\sthe\srecover\sextension.
+D 2022-10-26T18:29:19.827
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -398,7 +398,7 @@ F ext/recover/recoverpgsz.test 93e970eab05e4e89f8fd6b1bd23f9ec137ea09857e66ba0d4
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
 F ext/recover/recoverslowidx.test f356bb9fba7ffd6fc50e045e419464f0129ac6e24decf6e919584f79c3493727
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
-F ext/recover/sqlite3recover.c db8f2166dbbdfc09a58a85f51f8e848858858ca8b4915a2f9c8cd5fd5ca536a8
+F ext/recover/sqlite3recover.c 537bfad4bf9f14fd43d138b988365bb38548fabec3252d3bff719524d907a1da
 F ext/recover/sqlite3recover.h f698ccc94bd4da38761035415ad08c4549a408491ff9fd5f52d34d2214f64e36
 F ext/recover/test_recover.c 61ec931e47abca6b2210f46239cafd9f3060741605e3d3c45a7c7a53f63dd957
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -530,7 +530,7 @@ F ext/wasm/fiddle.make 68abe5dcfdd6fdf8dc1b715b94b96fae771b5b28bc1843997b9b1ec79
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js 41b9796d689fabbef1ad9447496d14645eeb4101b534e54951fa5259c877c341
 F ext/wasm/fiddle/fiddle.js 974b995119ac443685d7d94d3b3c58c6a36540e9eb3fed7069d5653284071715
-F ext/wasm/fiddle/index.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2 w ext/wasm/fiddle/fiddle.html
+F ext/wasm/fiddle/index.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
 F ext/wasm/index-dist.html cb0da16cba0f21cda2c25724c5869102d48eb0af04446acd3cd0ca031f80ed19
 F ext/wasm/index.html 6ac073d45d7602e1d8a5b493ce4204dc4a6c5594fdeeb12dec38c4e36ce473ad
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
@@ -2052,8 +2052,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 757e3f585959f4f113fee48fe3d504f037604c53a95c8d47ce5c2bccfb2af8ff 4eef562a00ae988f2426c9af51f4165c0e4cbccd601061664a0c54c19b9cc70f
-R fd8351a8bbdf0dfc78a1c53b0189bb2d
+P bcf6b48d52c1ce656899f50bd508c0920cae8cf2ef3c0758a7633981f0f0f484
+R 1abad855e0472232f0e7862b9a7dd438
 U dan
-Z 99bd3f3c58c53208f300189c934ad348
+Z 4fb1e189272de9078a5ba7b4ef187b9a
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 2bca4f1203..af7804ec05 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bcf6b48d52c1ce656899f50bd508c0920cae8cf2ef3c0758a7633981f0f0f484
\ No newline at end of file
+a67082357a2cc348faf8236aafa7f39eb5cb673b1d114a594c6d5bb257f85b73
\ No newline at end of file

From 07dd4810105350e92ccc8b513b3b64cc7ae819f8 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Wed, 26 Oct 2022 20:12:46 +0000
Subject: [PATCH 362/428] Remove an unused variable from the recovery
 extension.

FossilOrigin-Name: a029dddff4f4ed7275538610cbd9cea658b905b72924860ec9cda9e76dabcfac
---
 ext/recover/sqlite3recover.c |  2 --
 manifest                     | 16 ++++++++--------
 manifest.uuid                |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index 5e51bce9d4..7b2259a3ac 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -2322,7 +2322,6 @@ static int recoverVfsRead(sqlite3_file *pFd, void *aBuf, int nByte, i64 iOff){
       rc = pFd->pMethods->xFileSize(pFd, &dbFileSize);
 
       if( rc==SQLITE_OK && p->detected_pgsz==0 ){
-        u32 pgsz2 = 0;
         rc = recoverVfsDetectPagesize(p, pFd, nReserve, dbFileSize);
       }
       if( p->detected_pgsz ){
@@ -2801,4 +2800,3 @@ int sqlite3_recover_finish(sqlite3_recover *p){
   }
   return rc;
 }
-
diff --git a/manifest b/manifest
index d3883a235a..f0b20fc495 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\s"recover"\sextension\sin\sext/recover/,\sfor\ssalvaging\sdata\sfrom\scorrupt\sdatabases.
-D 2022-10-26T18:41:12.936
+C Remove\san\sunused\svariable\sfrom\sthe\srecovery\sextension.
+D 2022-10-26T20:12:46.218
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -385,7 +385,7 @@ F ext/rbu/rbuvacuum4.test a78898e438a44803eb2bc897ba3323373c9f277418e2d6d76e90f2
 F ext/rbu/sqlite3rbu.c 8737cabdfbee84bb25a7851ecef8b1312be332761238da9be6ddb10c62ad4291
 F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9cd389812
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
-F ext/recover/dbdata.c a7b2fc6750139a7bb3455d784063d43f98c28f226b7f84d88270f1c083dc6b72 w ext/misc/dbdata.c
+F ext/recover/dbdata.c a7b2fc6750139a7bb3455d784063d43f98c28f226b7f84d88270f1c083dc6b72
 F ext/recover/recover1.test 93acc42f95259f8b34050ad75873685a305da76d6cb1727d003f45157a4a6402
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
 F ext/recover/recoverclobber.test 294dcc894124ab4ca3a7b35766630742a3d25810fceac22220beb64f70a33a60
@@ -398,7 +398,7 @@ F ext/recover/recoverpgsz.test 93e970eab05e4e89f8fd6b1bd23f9ec137ea09857e66ba0d4
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
 F ext/recover/recoverslowidx.test f356bb9fba7ffd6fc50e045e419464f0129ac6e24decf6e919584f79c3493727
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
-F ext/recover/sqlite3recover.c 537bfad4bf9f14fd43d138b988365bb38548fabec3252d3bff719524d907a1da
+F ext/recover/sqlite3recover.c c91dd44f970b9e3cc37aec11e1b8eaedc93175e3021cda0db10fc3c751919e8a
 F ext/recover/sqlite3recover.h f698ccc94bd4da38761035415ad08c4549a408491ff9fd5f52d34d2214f64e36
 F ext/recover/test_recover.c 61ec931e47abca6b2210f46239cafd9f3060741605e3d3c45a7c7a53f63dd957
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -2052,8 +2052,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 4eef562a00ae988f2426c9af51f4165c0e4cbccd601061664a0c54c19b9cc70f a67082357a2cc348faf8236aafa7f39eb5cb673b1d114a594c6d5bb257f85b73
-R 1abad855e0472232f0e7862b9a7dd438
-U dan
-Z 07060bbf38e0bec12a8e0d42fa98e255
+P a820792548da596ed0f8ab3fd1c04ec16647abbe51a2a5aac9e17c4f58be6d97
+R fafb14c921e326db97f2283b26832d15
+U drh
+Z 210311a48b0a6d9b875d5af811e3653c
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 795f295fb7..996982e632 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a820792548da596ed0f8ab3fd1c04ec16647abbe51a2a5aac9e17c4f58be6d97
\ No newline at end of file
+a029dddff4f4ed7275538610cbd9cea658b905b72924860ec9cda9e76dabcfac
\ No newline at end of file

From 195687f1bfaf15460da345d0b5faae31a0c1eff3 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Wed, 26 Oct 2022 21:14:21 +0000
Subject: [PATCH 363/428] Disable the push-down optimization for sub-queries
 that are INTERSECT, UNION or EXCEPT compounds. dbsqlfuzz
 a34f455c91ad75a0cf8cd9476841903f42930a7a.

FossilOrigin-Name: 346a3b12b861ce7ba369e98cd336f79a1d4f7a7bb9acd7a4f63f37b391755bf5
---
 manifest          | 16 ++++++++--------
 manifest.uuid     |  2 +-
 src/select.c      | 11 +++++++++++
 test/selectA.test | 24 ++++++++++++++++++++++++
 4 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index f0b20fc495..1ba4ebfcf9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\san\sunused\svariable\sfrom\sthe\srecovery\sextension.
-D 2022-10-26T20:12:46.218
+C Disable\sthe\spush-down\soptimization\sfor\ssub-queries\sthat\sare\sINTERSECT,\sUNION\sor\sEXCEPT\scompounds.\sdbsqlfuzz\sa34f455c91ad75a0cf8cd9476841903f42930a7a.
+D 2022-10-26T21:14:21.853
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -635,7 +635,7 @@ F src/printf.c e99ee9741e79ae3873458146f59644276657340385ade4e76a5f5d1c25793764
 F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c e5b6f930f068c9c5362fc76c704ae5cb5ef1e3f18759c2126f23b0cf04c0e263
+F src/select.c 8a709a8e19b32d2c411eaae1a10e2ee214cf740288859a9f9a362fcb2f50eaf1
 F src/shell.c.in c4497295b826971f35a7ec77c5fb33aea192c935d670a690cec71379b007eca4
 F src/sqlite.h.in d9c8a6243fc0a1c270d69db33758e34b810af3462f9bc5b4af113b347e07c69d
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1465,7 +1465,7 @@ F test/select6.test 9b2fb4ffedf52e1b5703cfcae1212e7a4a063f014c0458d78d29aca3db76
 F test/select7.test f659f231489349e8c5734e610803d7654207318f
 F test/select8.test 8c8f5ae43894c891efc5755ed905467d1d67ad5d
 F test/select9.test f7586b207ce2304ab80dc93d3146469a28fd4403621dd3a82d06644563d3c812
-F test/selectA.test 985df11dfc58dedd6f8124dea32754566346b93e294f26291b5c96d10c8cc889
+F test/selectA.test 6aef8b2136a4ac7a3e2e4161d2b8ca7bc6ebe2779de084f9bb66ca9e2323a937
 F test/selectB.test 954e4e49cf1f896d61794e440669e03a27ceea25
 F test/selectC.test fec14c9015ed4ec941508bbc144f30b42e40ac34a4bb33001450369865dd0b75
 F test/selectD.test 6d1909b49970bf92f45ce657505befcef5fc7cbc13544e18103a316d32189bfb
@@ -2052,8 +2052,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 a820792548da596ed0f8ab3fd1c04ec16647abbe51a2a5aac9e17c4f58be6d97
-R fafb14c921e326db97f2283b26832d15
-U drh
-Z 210311a48b0a6d9b875d5af811e3653c
+P a029dddff4f4ed7275538610cbd9cea658b905b72924860ec9cda9e76dabcfac
+R b53abb7e437a17a51c11b8e565290cc0
+U dan
+Z f234279171f2df9582a4a9e673101d04
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 996982e632..3ad43b42ae 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a029dddff4f4ed7275538610cbd9cea658b905b72924860ec9cda9e76dabcfac
\ No newline at end of file
+346a3b12b861ce7ba369e98cd336f79a1d4f7a7bb9acd7a4f63f37b391755bf5
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index 42a476c00f..0925f102eb 100644
--- a/src/select.c
+++ b/src/select.c
@@ -5009,6 +5009,13 @@ static int pushDownWindowCheck(Parse *pParse, Select *pSubq, Expr *pExpr){
 **       be materialized.  (This restriction is implemented in the calling
 **       routine.)
 **
+**   (8) The subquery may not be a compound that uses UNION, INTERSECT,
+**       or EXCEPT.  (We could, perhaps, relax this restriction to allow
+**       this case if none of the comparisons operators between left and
+**       right arms of the compound use a collation other than BINARY.
+**       But it is a lot of work to check that case for an obscure and
+**       minor optimization, so we omit it for now.)
+**
 ** Return 0 if no changes are made and non-zero if one or more WHERE clause
 ** terms are duplicated into the subquery.
 */
@@ -5028,6 +5035,10 @@ static int pushDownWhereTerms(
   if( pSubq->pPrior ){
     Select *pSel;
     for(pSel=pSubq; pSel; pSel=pSel->pPrior){
+      u8 op = pSel->op;
+      assert( op==TK_ALL || op==TK_SELECT 
+           || op==TK_UNION || op==TK_INTERSECT || op==TK_EXCEPT );
+      if( op!=TK_ALL && op!=TK_SELECT ) return 0;  /* restriction (8) */
       if( pSel->pWin ) return 0;    /* restriction (6b) */
     }
   }else{
diff --git a/test/selectA.test b/test/selectA.test
index ce7f8eba9c..7d72bb3fa5 100644
--- a/test/selectA.test
+++ b/test/selectA.test
@@ -1483,4 +1483,28 @@ do_execsql_test 8.1 {
       AND (0 OR (SELECT 'xyz' INTERSECT SELECT a ORDER BY 1))
 } {}
 
+#-------------------------------------------------------------------------
+# dbsqlfuzz a34f455c91ad75a0cf8cd9476841903f42930a7a
+#
+reset_db
+do_execsql_test 9.0 {
+  CREATE TABLE t1(a COLLATE nocase);
+  CREATE TABLE t2(b COLLATE nocase);
+
+  INSERT INTO t1 VALUES('ABC');
+  INSERT INTO t2 VALUES('abc');
+}
+
+do_execsql_test 9.1 {
+  SELECT a FROM t1 INTERSECT SELECT b FROM t2;
+} {ABC}
+
+do_execsql_test 9.2 {
+  SELECT * FROM (
+      SELECT a FROM t1 INTERSECT SELECT b FROM t2
+  ) WHERE a||'' = 'ABC';
+} {ABC}
+
+
+
 finish_test

From de868175c3e82fb0b9c71d4b810bdb61c6f63231 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Thu, 27 Oct 2022 03:03:16 +0000
Subject: [PATCH 364/428] Expose sqlite3_randomness() to WASM and add a custom
 binding for it which can populate a JS byte array. Add WhWasmUtil.isPtr().

FossilOrigin-Name: 333e67076b4bc967bb543ef8e265c63f6e3498c38ac121a7d1eff4a1d7a71c63
---
 ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api |   1 +
 ext/wasm/api/sqlite3-api-glue.js            |   2 +-
 ext/wasm/api/sqlite3-api-prologue.js        | 143 +++++++++++++++-----
 ext/wasm/common/whwasmutil.js               |  20 ++-
 ext/wasm/tester1.js                         |  56 ++++++++
 manifest                                    |  22 +--
 manifest.uuid                               |   2 +-
 7 files changed, 200 insertions(+), 46 deletions(-)

diff --git a/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api b/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
index b31f613576..416b08d23f 100644
--- a/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
+++ b/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
@@ -52,6 +52,7 @@ _sqlite3_open
 _sqlite3_open_v2
 _sqlite3_prepare_v2
 _sqlite3_prepare_v3
+_sqlite3_randomness
 _sqlite3_realloc
 _sqlite3_realloc64
 _sqlite3_reset
diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index 639e670792..d096af1c89 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -45,7 +45,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
       if(v && v.constructor && v instanceof StructBinder.StructType){
         v = v.pointer;
       }
-      return (v === (v | 0) /* v is a 32-bit integer */)
+      return wasm.isPtr(v)
         ? argPointer(v)
         : toss("Invalid (object) type for StructType-type argument.");
     });
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 1fcc9a64ab..71058d174e 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -215,6 +215,32 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     return (v && v.constructor && isInt32(v.constructor.BYTES_PER_ELEMENT)) ? v : false;
   };
 
+
+  /** Internal helper to use in operations which need to distinguish
+      between TypedArrays which are backed by a SharedArrayBuffer
+      from those which are not. */
+  const __SAB = ('undefined'===typeof SharedArrayBuffer)
+        ? function(){} : SharedArrayBuffer;
+  /** Returns true if the given TypedArray object is backed by a
+      SharedArrayBuffer, else false. */
+  const isSharedTypedArray = (aTypedArray)=>(aTypedArray.buffer instanceof __SAB);
+
+  /**
+     Returns either aTypedArray.slice(begin,end) (if
+     aTypedArray.buffer is a SharedArrayBuffer) or
+     aTypedArray.subarray(begin,end) (if it's not).
+
+     This distinction is important for APIs which don't like to
+     work on SABs, e.g. TextDecoder, and possibly for our
+     own APIs which work on memory ranges which "might" be
+     modified by other threads while it's working.
+   */
+  const typedArrayPart = (aTypedArray, begin, end)=>{
+    return isSharedTypedArray(aTypedArray)
+      ? aTypedArray.slice(begin, end)
+      : aTypedArray.subarray(begin, end);
+  };
+
   /**
      Returns true if v appears to be one of our bind()-able
      TypedArray types: Uint8Array or Int8Array. Support for
@@ -246,16 +272,16 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
 
   const utf8Decoder = new TextDecoder('utf-8');
 
-  /** Internal helper to use in operations which need to distinguish
-      between SharedArrayBuffer heap memory and non-shared heap. */
-  const __SAB = ('undefined'===typeof SharedArrayBuffer)
-        ? function(){} : SharedArrayBuffer;
-  const typedArrayToString = function(arrayBuffer, begin, end){
-    return utf8Decoder.decode(
-      (arrayBuffer.buffer instanceof __SAB)
-        ? arrayBuffer.slice(begin, end)
-        : arrayBuffer.subarray(begin, end)
-    );
+  /**
+     Uses TextDecoder to decode the given half-open range of the
+     given TypedArray to a string. This differs from a simple
+     call to TextDecoder in that it accounts for whether the
+     first argument is based by a SharedArrayBuffer or not,
+     and can work more efficiently if it's not (TextDecoder
+     refuses to act upon an SAB).
+  */
+  const typedArrayToString = function(typedArray, begin, end){
+    return utf8Decoder.decode(typedArrayPart(typedArray, begin,end));
   };
 
   /**
@@ -502,11 +528,11 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
 
        If the callback is a function, then for the duration of the
        sqlite3_exec() call, it installs a WASM-bound function which
-       acts as a proxy for the given callback. That proxy will
-       also perform a conversion of the callback's arguments from
+       acts as a proxy for the given callback. That proxy will also
+       perform a conversion of the callback's arguments from
        `(char**)` to JS arrays of strings. However, for API
-       consistency's sake it will still honor the C-level
-       callback parameter order and will call it like:
+       consistency's sake it will still honor the C-level callback
+       parameter order and will call it like:
 
        `callback(pVoid, colCount, listOfValues, listOfColNames)`
 
@@ -517,12 +543,27 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     */
     sqlite3_exec: (pDb, sql, callback, pVoid, pErrMsg)=>{}/*installed later*/,
 
+    /**
+       If passed a single argument which appears to be a byte-oriented
+       TypedArray (Int8Array or Uint8Array), this function treats that
+       TypedArray as an output target, fetches `theArray.byteLength`
+       bytes of randomness, and populates the whole array with it. As
+       a special case, if the array's length is 0, this function
+       behaves as if it were passed (0,0). When called this way, it
+       returns its argument, else it returns the `undefined` value.
+
+       If called with any other arguments, they are passed on as-is
+       to the C API. Results are undefined if passed any incompatible
+       values.
+     */
+    sqlite3_randomness: (n, outPtr)=>{/*installed later*/},
+
     /**
        Various internal-use utilities are added here as needed. They
        are bound to an object only so that we have access to them in
        the differently-scoped steps of the API bootstrapping
        process. At the end of the API setup process, this object gets
-       removed.
+       removed. These are NOT part of the public API.
     */
     util:{
       affirmBindableTypedArray, flexibleString,
@@ -530,7 +571,9 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
       isBindableTypedArray,
       isInt32, isSQLableTypedArray, isTypedArray, 
       typedArrayToString,
-      isUIThread: ()=>'undefined'===typeof WorkerGlobalScope
+      isUIThread: ()=>'undefined'===typeof WorkerGlobalScope,
+      isSharedTypedArray,
+      typedArrayPart
     },
     
     /**
@@ -617,7 +660,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     }/*wasm*/
   }/*capi*/;
 
-  const wasm = capi.wasm;
+  const wasm = capi.wasm, util = capi.util;
 
   /**
      wasm.alloc()'s srcTypedArray.byteLength bytes,
@@ -743,8 +786,8 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     // Please keep these sorted by function name!
     ["sqlite3_aggregate_context","void*", "sqlite3_context*", "int"],
     ["sqlite3_bind_blob","int", "sqlite3_stmt*", "int", "*", "int", "*"
-     /* We should arguably write a custom wrapper which knows how
-        to handle Blob, TypedArrays, and JS strings. */
+     /* TODO: we should arguably write a custom wrapper which knows
+        how to handle Blob, TypedArrays, and JS strings. */
     ],
     ["sqlite3_bind_double","int", "sqlite3_stmt*", "int", "f64"],
     ["sqlite3_bind_int","int", "sqlite3_stmt*", "int", "int"],
@@ -752,10 +795,10 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     ["sqlite3_bind_parameter_count", "int", "sqlite3_stmt*"],
     ["sqlite3_bind_parameter_index","int", "sqlite3_stmt*", "string"],
     ["sqlite3_bind_text","int", "sqlite3_stmt*", "int", "string", "int", "int"
-     /* We should arguably create a hand-written binding
-        which does more flexible text conversion, along the lines of
-        sqlite3_prepare_v3(). The slightly problematic part is the
-        final argument (text destructor). */
+     /* We should arguably create a hand-written binding of
+        bind_text() which does more flexible text conversion, along
+        the lines of sqlite3_prepare_v3(). The slightly problematic
+        part is the final argument (text destructor). */
     ],
     ["sqlite3_close_v2", "int", "sqlite3*"],
     ["sqlite3_changes", "int", "sqlite3*"],
@@ -770,15 +813,16 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     ["sqlite3_column_type","int", "sqlite3_stmt*", "int"],
     ["sqlite3_compileoption_get", "string", "int"],
     ["sqlite3_compileoption_used", "int", "string"],
-    /* sqlite3_create_function_v2() is handled separate to simplify conversion
-       of its callback argument */
+    /* sqlite3_create_function(), sqlite3_create_function_v2(), and
+       sqlite3_create_window_function() use hand-written bindings to
+       simplify handling of their function-type arguments. */
     ["sqlite3_data_count", "int", "sqlite3_stmt*"],
     ["sqlite3_db_filename", "string", "sqlite3*", "string"],
     ["sqlite3_db_handle", "sqlite3*", "sqlite3_stmt*"],
     ["sqlite3_db_name", "string", "sqlite3*", "int"],
     ["sqlite3_deserialize", "int", "sqlite3*", "string", "*", "i64", "i64", "int"]
     /* Careful! Short version: de/serialize() are problematic because they
-       might use a different allocator that the user for managing the
+       might use a different allocator than the user for managing the
        deserialized block. de/serialize() are ONLY safe to use with
        sqlite3_malloc(), sqlite3_free(), and its 64-bit variants. */,
     ["sqlite3_errmsg", "string", "sqlite3*"],
@@ -806,6 +850,8 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     /* sqlite3_prepare_v2() and sqlite3_prepare_v3() are handled
        separately due to us requiring two different sets of semantics
        for those, depending on how their SQL argument is provided. */
+    /* sqlite3_randomness() uses a hand-written wrapper to extend
+       the range of supported argument types. */
     ["sqlite3_realloc", "*","*","int"],
     ["sqlite3_reset", "int", "sqlite3_stmt*"],
     ["sqlite3_result_blob",undefined, "*", "*", "int", "*"],
@@ -1052,8 +1098,41 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     throw new SQLite3Error(...args);
   };
 
+  capi.sqlite3_randomness = (...args)=>{
+    if(1===args.length && util.isTypedArray(args[0])
+      && 1===args[0].BYTES_PER_ELEMENT){
+      const ta = args[0];
+      if(0===ta.byteLength){
+        wasm.exports.sqlite3_randomness(0,0);
+        return ta;
+      }
+      const stack = wasm.pstack.pointer;
+      try {
+        let n = ta.byteLength, offset = 0;
+        const r = wasm.exports.sqlite3_randomness;
+        const heap = wasm.heap8u();
+        const nAlloc = n < 512 ? n : 512;
+        const ptr = wasm.pstack.alloc(nAlloc);
+        do{
+          const j = (n>nAlloc ? nAlloc : n);
+          r(j, ptr);
+          ta.set(typedArrayPart(heap, ptr, ptr+j), offset);
+          n -= j;
+          offset += j;
+        } while(n > 0);
+      }catch(e){
+        console.error("Highly unexpected (and ignored!) "+
+                      "exception in sqlite3_randomness():",e);
+      }finally{
+        wasm.pstack.restore(stack);
+      }
+      return ta;
+    }
+    capi.wasm.exports.sqlite3_randomness(...args);
+  };
+
   /** State for sqlite3_wasmfs_opfs_dir(). */
-  let __persistentDir = undefined;
+  let __wasmfsOpfsDir = undefined;
   /**
      If the wasm environment has a WASMFS/OPFS-backed persistent
      storage directory, its path is returned by this function. If it
@@ -1068,26 +1147,26 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
      Emscripten-managed virtual filesystem.
   */
   capi.sqlite3_wasmfs_opfs_dir = function(){
-    if(undefined !== __persistentDir) return __persistentDir;
+    if(undefined !== __wasmfsOpfsDir) return __wasmfsOpfsDir;
     // If we have no OPFS, there is no persistent dir
     const pdir = config.wasmfsOpfsDir;
     if(!pdir
        || !self.FileSystemHandle
        || !self.FileSystemDirectoryHandle
        || !self.FileSystemFileHandle){
-      return __persistentDir = "";
+      return __wasmfsOpfsDir = "";
     }
     try{
       if(pdir && 0===wasm.xCallWrapped(
         'sqlite3_wasm_init_wasmfs', 'i32', ['string'], pdir
       )){
-        return __persistentDir = pdir;
+        return __wasmfsOpfsDir = pdir;
       }else{
-        return __persistentDir = "";
+        return __wasmfsOpfsDir = "";
       }
     }catch(e){
       // sqlite3_wasm_init_wasmfs() is not available
-      return __persistentDir = "";
+      return __wasmfsOpfsDir = "";
     }
   };
 
diff --git a/ext/wasm/common/whwasmutil.js b/ext/wasm/common/whwasmutil.js
index e04886de8a..24c67ef78f 100644
--- a/ext/wasm/common/whwasmutil.js
+++ b/ext/wasm/common/whwasmutil.js
@@ -704,6 +704,23 @@ self.WhWasmUtilInstaller = function(target){
       pointer-to-pointer values. */
   target.setPtrValue = (ptr, value)=>target.setMemValue(ptr, value, ptrIR);
 
+  /**
+     Returns true if the given value appears to be legal for use as
+     a WASM pointer value. Its _range_ of values is not (cannot be)
+     validated except to ensure that it is a 32-bit integer with a
+     value of 0 or greater. Likewise, it cannot verify whether the
+     value actually refers to allocated memory in the WASM heap.
+  */
+  target.isPtr32 = (ptr)=>('number'===typeof ptr && (ptr===(ptr|0)) && ptr>=0);
+
+  /**
+     isPtr() is an alias for isPtr32(). If/when 64-bit WASM pointer
+     support becomes widespread, it will become an alias for either
+     isPtr32() or the as-yet-hypothetical isPtr64(), depending on a
+     configuration option.
+  */
+  target.isPtr = target.isPtr32;
+
   /**
      Expects ptr to be a pointer into the WASM heap memory which
      refers to a NUL-terminated C-style string encoded as UTF-8.
@@ -1229,7 +1246,8 @@ self.WhWasmUtilInstaller = function(target){
   xcv.result['*'] = xcv.result['pointer'] = xcv.arg['**'] = xcv.arg[ptrIR];
   xcv.result['number'] = (v)=>Number(v);
 
-  {
+  { /* Copy certain xcv.arg[...] handlers to xcv.result[...] and
+       add pointer-style variants of them. */
     const copyToResult = ['i8', 'i16', 'i32', 'int',
                           'f32', 'float', 'f64', 'double'];
     if(target.bigIntEnabled) copyToResult.push('i64');
diff --git a/ext/wasm/tester1.js b/ext/wasm/tester1.js
index 4a6074d91b..d3f1c44fc5 100644
--- a/ext/wasm/tester1.js
+++ b/ext/wasm/tester1.js
@@ -377,6 +377,19 @@
         }
       }
 
+      // isPtr32()
+      {
+        const ip = w.isPtr32;
+        T.assert(ip(0))
+          .assert(!ip(-1))
+          .assert(!ip(1.1))
+          .assert(!ip(0xffffffff))
+          .assert(ip(0x7fffffff))
+          .assert(!ip())
+          .assert(!ip(null)/*might change: under consideration*/)
+        ;
+      }
+
       //log("jstrlen()...");
       {
         T.assert(3 === w.jstrlen("abc")).assert(4 === w.jstrlen("äbc"));
@@ -1056,6 +1069,49 @@
   ////////////////////////////////////////////////////////////////////
   ;/*end of C/WASM utils checks*/
 
+  T.g('sqlite3_randomness()')
+    .t('To memory buffer', function(sqlite3){
+      const stack = wasm.pstack.pointer;
+      try{
+        const n = 520;
+        const p = wasm.pstack.alloc(n);
+        T.assert(0===wasm.getMemValue(p))
+          .assert(0===wasm.getMemValue(p+n-1));
+        T.assert(undefined === capi.sqlite3_randomness(n - 10, p));
+        let j, check = 0;
+        const heap = wasm.heap8u();
+        for(j = 0; j < 10 && 0===check; ++j){
+          check += heap[p + j];
+        }
+        T.assert(check > 0);
+        check = 0;
+        // Ensure that the trailing bytes were not modified...
+        for(j = n - 10; j < n && 0===check; ++j){
+          check += heap[p + j];
+        }
+        T.assert(0===check);
+      }finally{
+        wasm.pstack.restore(stack);
+      }
+    })
+    .t('To byte array', function(sqlite3){
+      const ta = new Uint8Array(117);
+      let i, n = 0;
+      for(i=0; i<ta.byteLength && 0===n; ++i){
+        n += ta[i];
+      }
+      T.assert(0===n)
+        .assert(ta === capi.sqlite3_randomness(ta));
+      for(i=ta.byteLength-10; i<ta.byteLength && 0===n; ++i){
+        n += ta[i];
+      }
+      T.assert(n>0);
+      const t0 = new Uint8Array(0);
+      T.assert(t0 === capi.sqlite3_randomness(t0),
+               "0-length array is a special case");
+    })
+  ;;/*end sqlite3_randomness() checks*/
+
   ////////////////////////////////////////////////////////////////////////
   T.g('sqlite3.oo1')
     .t('Create db', function(sqlite3){
diff --git a/manifest b/manifest
index 1ba4ebfcf9..4c7e6bd142 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Disable\sthe\spush-down\soptimization\sfor\ssub-queries\sthat\sare\sINTERSECT,\sUNION\sor\sEXCEPT\scompounds.\sdbsqlfuzz\sa34f455c91ad75a0cf8cd9476841903f42930a7a.
-D 2022-10-26T21:14:21.853
+C Expose\ssqlite3_randomness()\sto\sWASM\sand\sadd\sa\scustom\sbinding\sfor\sit\swhich\scan\spopulate\sa\sJS\sbyte\sarray.\sAdd\sWhWasmUtil.isPtr().
+D 2022-10-27T03:03:16.460
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -490,7 +490,7 @@ F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34ce
 F ext/wasm/GNUmakefile 7a8c06f9bdbb791f8ef084ecd47e099da81e5797b9b1d60e33ac9a07eedd5dbd
 F ext/wasm/README-dist.txt 2d670b426fc7c613b90a7d2f2b05b433088fe65181abead970980f0a4a75ea20
 F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
-F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 36f413ab4dbb057d2dec938fb366ac0a4c5e85ba14660a8d672f0277602c0fc5
+F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api cfbe8efcb9d1444139d6c381eb54dfdd5e62cf1ddfe10ed8a38617149a664b9b
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
 F ext/wasm/api/README.md 1350088aee90e959ad9a94fab1bb6bcb5e99d4d27f976db389050f54f2640c78
 F ext/wasm/api/extern-post-js.js 926d192b72fa808378e5e7843721dc7ba3908c163a0260e06d8aa501c12f5469
@@ -499,10 +499,10 @@ F ext/wasm/api/post-js-footer.js cd0a8ec768501d9bd45d325ab0442037fb0e33d1f3b4f08
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
 F ext/wasm/api/pre-js.js 151e0616614a49f3db19ed544fa13b38c87c108959fbcd4029ea8399a562d94f
 F ext/wasm/api/sqlite3-api-cleanup.js 4d07a7524dc9b7b050acfde57163e839243ad2383bd7ee0de0178b1b3e988588
-F ext/wasm/api/sqlite3-api-glue.js 6e4e472eb5afc732a695cd7c5ded6dee6ef8b480e61aa0d648a3fc9033c84745
+F ext/wasm/api/sqlite3-api-glue.js f024dc2f41418ad203edf1228d7cf7934249c11ffcbb65d21f9bb69333d63d55
 F ext/wasm/api/sqlite3-api-oo1.js 38004e18001396c078124769e14737a0ff703f98317279734020121af72efdd5
 F ext/wasm/api/sqlite3-api-opfs.js 62da8b7cac30d4e7bb940762d2ac948b0aeb89704a5a290b74eb268ecbd1a64e
-F ext/wasm/api/sqlite3-api-prologue.js fa00d55f927e5a4ec51cf2c80f6f0eaed2f4f5774341ecf3d63a0ea4c738f8f5
+F ext/wasm/api/sqlite3-api-prologue.js 4706ca7fa125426019b8dd01f9e6a774021a2781874df8b9f435c69544383e79
 F ext/wasm/api/sqlite3-api-worker1.js b2d650514ccc75f80dff666fd3ee68dc8fb4137bcd01caac2c62ff93a7ebf638
 F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
 F ext/wasm/api/sqlite3-opfs-async-proxy.js f04cb1eb483c92bc61fe02749f7afcf17ec803968171aedd7d96faf428c26bcb
@@ -515,7 +515,7 @@ F ext/wasm/batch-runner.js 5bae81684728b6be157d1f92b39824153f0fd019345b39f2ab893
 F ext/wasm/common/SqliteTestUtil.js 647bf014bd30bdd870a7e9001e251d12fc1c9ec9ce176a1004b838a4b33c5c05
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 739b58c44511f642f16f57b701c84dc9ee412d8bc47b3d8a99d947babfa69d9d
-F ext/wasm/common/whwasmutil.js 50d2ede0b0fa01c1d467e1801fab79f5e46bb02bcbd2b0232e4fdc6090a47818
+F ext/wasm/common/whwasmutil.js 77930367c2a65cf6fd6f99ad3644ede33e4d20466f5e506eb87b8d101a0a7655
 F ext/wasm/demo-123-worker.html a0b58d9caef098a626a1a1db567076fca4245e8d60ba94557ede8684350a81ed
 F ext/wasm/demo-123.html 8c70a412ce386bd3796534257935eb1e3ea5c581e5d5aea0490b8232e570a508
 F ext/wasm/demo-123.js ebae30756585bca655b4ab2553ec9236a87c23ad24fc8652115dcedb06d28df6
@@ -548,7 +548,7 @@ F ext/wasm/test-opfs-vfs.html 1f2d672f3f3fce810dfd48a8d56914aba22e45c6834e262555
 F ext/wasm/test-opfs-vfs.js 48fc59110e8775bb43c9be25b6d634fc07ebadab7da8fbd44889e8129c6e2548
 F ext/wasm/tester1-worker.html d02b9d38876b023854cf8955e77a40912f7e516956b4dbe1ec7f215faac273ee
 F ext/wasm/tester1.html c6c47e5a8071eb09cb1301104435c8e44fbb5719c92411f5b2384a461f9793c5
-F ext/wasm/tester1.js 21dad63165954a8a28dfa8eeab68a4881eb1d9b5c6bc9f2c83aa3ceea8c41fee
+F ext/wasm/tester1.js 39dd4277944f79f475d78850ebbf48b0fe61b2caf4df2b5c5db6219f509d5c96
 F ext/wasm/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd72273503ae7d5
 F ext/wasm/wasmfs.make ee0004813e16c283ff633e08b482008d56adf9b7d42f6c5612f7ab002b924f69
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
@@ -2052,8 +2052,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 a029dddff4f4ed7275538610cbd9cea658b905b72924860ec9cda9e76dabcfac
-R b53abb7e437a17a51c11b8e565290cc0
-U dan
-Z f234279171f2df9582a4a9e673101d04
+P 346a3b12b861ce7ba369e98cd336f79a1d4f7a7bb9acd7a4f63f37b391755bf5
+R 5867ff413088cae7742d2b15dc451b3e
+U stephan
+Z c456212142f768a2abd7eb0069fb1a57
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 3ad43b42ae..db063108c1 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-346a3b12b861ce7ba369e98cd336f79a1d4f7a7bb9acd7a4f63f37b391755bf5
\ No newline at end of file
+333e67076b4bc967bb543ef8e265c63f6e3498c38ac121a7d1eff4a1d7a71c63
\ No newline at end of file

From 3d420836fd4254f88cf69e51412fe69d0dd80441 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Thu, 27 Oct 2022 03:56:01 +0000
Subject: [PATCH 365/428] Restructure and simplify the feature-detection
 #defines of the recovery support in shell.c.in and disable it when building
 fiddle because it uses features we elide from the wasm build (e.g. utf16),
 leading to link errors.

FossilOrigin-Name: ddd10c05c5d16d7205c347c5c1e73a75faecb2b7ec88a4a15875856765e1b143
---
 manifest       | 12 ++++++------
 manifest.uuid  |  2 +-
 src/shell.c.in | 29 +++++++++++++++++++----------
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/manifest b/manifest
index 4c7e6bd142..0a173ec63a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Expose\ssqlite3_randomness()\sto\sWASM\sand\sadd\sa\scustom\sbinding\sfor\sit\swhich\scan\spopulate\sa\sJS\sbyte\sarray.\sAdd\sWhWasmUtil.isPtr().
-D 2022-10-27T03:03:16.460
+C Restructure\sand\ssimplify\sthe\sfeature-detection\s#defines\sof\sthe\srecovery\ssupport\sin\sshell.c.in\sand\sdisable\sit\swhen\sbuilding\sfiddle\sbecause\sit\suses\sfeatures\swe\selide\sfrom\sthe\swasm\sbuild\s(e.g.\sutf16),\sleading\sto\slink\serrors.
+D 2022-10-27T03:56:01.987
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -636,7 +636,7 @@ F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 8a709a8e19b32d2c411eaae1a10e2ee214cf740288859a9f9a362fcb2f50eaf1
-F src/shell.c.in c4497295b826971f35a7ec77c5fb33aea192c935d670a690cec71379b007eca4
+F src/shell.c.in cd16f24f755460f1168672dee4eff3d3cbf08057ef3f6fbe15b965fbd689d2f2
 F src/sqlite.h.in d9c8a6243fc0a1c270d69db33758e34b810af3462f9bc5b4af113b347e07c69d
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 5336beea1868d99d2f62e628dbea55e97267dbff8193291ab175e960c5df9141
@@ -2052,8 +2052,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 346a3b12b861ce7ba369e98cd336f79a1d4f7a7bb9acd7a4f63f37b391755bf5
-R 5867ff413088cae7742d2b15dc451b3e
+P 333e67076b4bc967bb543ef8e265c63f6e3498c38ac121a7d1eff4a1d7a71c63
+R c4eec01d7f5a0771483022a51027cd3b
 U stephan
-Z c456212142f768a2abd7eb0069fb1a57
+Z f124a6c3a0b7b44b68f7fc7038529120
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index db063108c1..655fa8cbc1 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-333e67076b4bc967bb543ef8e265c63f6e3498c38ac121a7d1eff4a1d7a71c63
\ No newline at end of file
+ddd10c05c5d16d7205c347c5c1e73a75faecb2b7ec88a4a15875856765e1b143
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index 23fac6c0e8..a400b3ec8a 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -1057,7 +1057,17 @@ INCLUDE ../ext/misc/sqlar.c
 INCLUDE ../ext/expert/sqlite3expert.h
 INCLUDE ../ext/expert/sqlite3expert.c
 
-#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
+#if !defined(SQLITE_OMIT_VIRTUALTABLE)  \
+  && defined(SQLITE_ENABLE_DBPAGE_VTAB) \
+  && !defined(SQLITE_SHELL_FIDDLE)
+/* Including the recovery API causes the fiddle build to fail because
+** recovery-related code invokes mutex- and UTF16-related APIs which
+** we specifically disable in the wasm builds. */
+#define SQLITE_SHELL_HAVE_RECOVER 1
+#else
+#define SQLITE_SHELL_HAVE_RECOVER 0
+#endif
+#if SQLITE_SHELL_HAVE_RECOVER
 INCLUDE ../ext/recover/dbdata.c
 INCLUDE ../ext/recover/sqlite3recover.h
 INCLUDE ../ext/recover/sqlite3recover.c
@@ -4357,7 +4367,7 @@ static const char *(azHelp[]) = {
   ".connection [close] [#]  Open or close an auxiliary database connection",
   ".databases               List names and files of attached databases",
   ".dbconfig ?op? ?val?     List or change sqlite3_db_config() options",
-#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
+#if SQLITE_SHELL_HAVE_RECOVER
   ".dbinfo ?DB?             Show status information about the database",
 #endif
   ".dump ?OBJECTS?          Render database content as SQL",
@@ -4505,7 +4515,7 @@ static const char *(azHelp[]) = {
   ".read FILE               Read input from FILE or command output",
   "    If FILE begins with \"|\", it is a command that generates the input.",
 #endif
-#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
+#if SQLITE_SHELL_HAVE_RECOVER
   ".recover                 Recover as much data as possible from corrupt db.",
   "   --freelist-corrupt       Assume the freelist is corrupt",
   "   --recovery-db NAME       Store recovery metadata in database file NAME",
@@ -5120,7 +5130,7 @@ static void open_db(ShellState *p, int openFlags){
     sqlite3_fileio_init(p->db, 0, 0);
     sqlite3_completion_init(p->db, 0, 0);
 #endif
-#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
+#if SQLITE_SHELL_HAVE_RECOVER
     sqlite3_dbdata_init(p->db, 0, 0);
 #endif
 #ifdef SQLITE_HAVE_ZLIB
@@ -6005,8 +6015,7 @@ static int shell_dbinfo_command(ShellState *p, int nArg, char **azArg){
   utf8_printf(p->out, "%-20s %u\n", "data version", iDataVersion);
   return 0;
 }
-#endif /* !defined(SQLITE_OMIT_VIRTUALTABLE)
-          && defined(SQLITE_ENABLE_DBPAGE_VTAB) */
+#endif /* SQLITE_SHELL_HAVE_RECOVER */
 
 /*
 ** Print the current sqlite3_errmsg() value to stderr and return 1.
@@ -7279,7 +7288,7 @@ end_ar_command:
 *******************************************************************************/
 #endif /* !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_HAVE_ZLIB) */
 
-#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
+#if SQLITE_SHELL_HAVE_RECOVER
 
 /*
 ** This function is used as a callback by the recover extension. Simply
@@ -7349,7 +7358,7 @@ static int recoverDatabaseCmd(ShellState *pState, int nArg, char **azArg){
   rc = sqlite3_recover_finish(p);
   return rc;
 }
-#endif /* !(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB) */
+#endif /* SQLITE_SHELL_HAVE_RECOVER */
 
 
 /*
@@ -7941,7 +7950,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     }   
   }else
 
-#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
+#if SQLITE_SHELL_HAVE_RECOVER
   if( c=='d' && n>=3 && cli_strncmp(azArg[0], "dbinfo", n)==0 ){
     rc = shell_dbinfo_command(p, nArg, azArg);
   }else
@@ -7950,7 +7959,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     open_db(p, 0);
     rc = recoverDatabaseCmd(p, nArg, azArg);
   }else
-#endif /* !(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB) */
+#endif /* SQLITE_SHELL_HAVE_RECOVER */
 
   if( c=='d' && cli_strncmp(azArg[0], "dump", n)==0 ){
     char *zLike = 0;

From 4f975c33798bb2eff7ebe8b1ec8a68e6644b58cf Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Thu, 27 Oct 2022 03:57:48 +0000
Subject: [PATCH 366/428] Minor doc typo fixes.

FossilOrigin-Name: ed8d3f25a4d6ac04d9f7918c791d8d2c6f23ce846278ca63f8fbadb7ea27369f
---
 ext/wasm/api/sqlite3-api-prologue.js |  6 +++---
 ext/wasm/tester1.js                  |  2 +-
 manifest                             | 14 +++++++-------
 manifest.uuid                        |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 71058d174e..96b2fa019d 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -233,8 +233,8 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
      This distinction is important for APIs which don't like to
      work on SABs, e.g. TextDecoder, and possibly for our
      own APIs which work on memory ranges which "might" be
-     modified by other threads while it's working.
-   */
+     modified by other threads while they're working.
+  */
   const typedArrayPart = (aTypedArray, begin, end)=>{
     return isSharedTypedArray(aTypedArray)
       ? aTypedArray.slice(begin, end)
@@ -276,7 +276,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
      Uses TextDecoder to decode the given half-open range of the
      given TypedArray to a string. This differs from a simple
      call to TextDecoder in that it accounts for whether the
-     first argument is based by a SharedArrayBuffer or not,
+     first argument is backed by a SharedArrayBuffer or not,
      and can work more efficiently if it's not (TextDecoder
      refuses to act upon an SAB).
   */
diff --git a/ext/wasm/tester1.js b/ext/wasm/tester1.js
index d3f1c44fc5..c7729a6635 100644
--- a/ext/wasm/tester1.js
+++ b/ext/wasm/tester1.js
@@ -1110,7 +1110,7 @@
       T.assert(t0 === capi.sqlite3_randomness(t0),
                "0-length array is a special case");
     })
-  ;;/*end sqlite3_randomness() checks*/
+  ;/*end sqlite3_randomness() checks*/
 
   ////////////////////////////////////////////////////////////////////////
   T.g('sqlite3.oo1')
diff --git a/manifest b/manifest
index 0a173ec63a..2b952a900b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Restructure\sand\ssimplify\sthe\sfeature-detection\s#defines\sof\sthe\srecovery\ssupport\sin\sshell.c.in\sand\sdisable\sit\swhen\sbuilding\sfiddle\sbecause\sit\suses\sfeatures\swe\selide\sfrom\sthe\swasm\sbuild\s(e.g.\sutf16),\sleading\sto\slink\serrors.
-D 2022-10-27T03:56:01.987
+C Minor\sdoc\stypo\sfixes.
+D 2022-10-27T03:57:48.950
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -502,7 +502,7 @@ F ext/wasm/api/sqlite3-api-cleanup.js 4d07a7524dc9b7b050acfde57163e839243ad2383b
 F ext/wasm/api/sqlite3-api-glue.js f024dc2f41418ad203edf1228d7cf7934249c11ffcbb65d21f9bb69333d63d55
 F ext/wasm/api/sqlite3-api-oo1.js 38004e18001396c078124769e14737a0ff703f98317279734020121af72efdd5
 F ext/wasm/api/sqlite3-api-opfs.js 62da8b7cac30d4e7bb940762d2ac948b0aeb89704a5a290b74eb268ecbd1a64e
-F ext/wasm/api/sqlite3-api-prologue.js 4706ca7fa125426019b8dd01f9e6a774021a2781874df8b9f435c69544383e79
+F ext/wasm/api/sqlite3-api-prologue.js 7f7c2f516d3ed39b3761ad8a6de86dc703b6c2678de6d078defcdc52df48cc27
 F ext/wasm/api/sqlite3-api-worker1.js b2d650514ccc75f80dff666fd3ee68dc8fb4137bcd01caac2c62ff93a7ebf638
 F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
 F ext/wasm/api/sqlite3-opfs-async-proxy.js f04cb1eb483c92bc61fe02749f7afcf17ec803968171aedd7d96faf428c26bcb
@@ -548,7 +548,7 @@ F ext/wasm/test-opfs-vfs.html 1f2d672f3f3fce810dfd48a8d56914aba22e45c6834e262555
 F ext/wasm/test-opfs-vfs.js 48fc59110e8775bb43c9be25b6d634fc07ebadab7da8fbd44889e8129c6e2548
 F ext/wasm/tester1-worker.html d02b9d38876b023854cf8955e77a40912f7e516956b4dbe1ec7f215faac273ee
 F ext/wasm/tester1.html c6c47e5a8071eb09cb1301104435c8e44fbb5719c92411f5b2384a461f9793c5
-F ext/wasm/tester1.js 39dd4277944f79f475d78850ebbf48b0fe61b2caf4df2b5c5db6219f509d5c96
+F ext/wasm/tester1.js 2b971e6dd291513685f38552340adc1d2e09f7b0a5bccf21c81f8037d6242bf3
 F ext/wasm/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd72273503ae7d5
 F ext/wasm/wasmfs.make ee0004813e16c283ff633e08b482008d56adf9b7d42f6c5612f7ab002b924f69
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
@@ -2052,8 +2052,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 333e67076b4bc967bb543ef8e265c63f6e3498c38ac121a7d1eff4a1d7a71c63
-R c4eec01d7f5a0771483022a51027cd3b
+P ddd10c05c5d16d7205c347c5c1e73a75faecb2b7ec88a4a15875856765e1b143
+R 3db55ae605739ec81d57bf9021be2dd5
 U stephan
-Z f124a6c3a0b7b44b68f7fc7038529120
+Z 9cefeec4e7d702ffe1c98da983ab0ab0
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 655fa8cbc1..1474c49658 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ddd10c05c5d16d7205c347c5c1e73a75faecb2b7ec88a4a15875856765e1b143
\ No newline at end of file
+ed8d3f25a4d6ac04d9f7918c791d8d2c6f23ce846278ca63f8fbadb7ea27369f
\ No newline at end of file

From 21fd7ce098ddea35a7e5916f2e259cfe47f90655 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Thu, 27 Oct 2022 10:51:49 +0000
Subject: [PATCH 367/428] Do not use sqlite3_mutex_xxx() functions in
 sqlite3recover.c when built with SQLITE_THREADSAFE=0.

FossilOrigin-Name: cd0aa27d1732abc61c8a8440118ff629f7dca185d2f515ce1f6090c49d8dc890
---
 ext/recover/sqlite3recover.c | 24 ++++++++++++++++++++----
 manifest                     | 14 +++++++-------
 manifest.uuid                |  2 +-
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index 7b2259a3ac..30d02f9ca2 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -280,6 +280,22 @@ static RecoverGlobal recover_g;
 */
 #define RECOVER_ROWID_DEFAULT 1
 
+#if defined(SQLITE_THREADSAFE) && SQLITE_THREADSAFE==0
+# define recoverEnterMutex()
+# define recoverLeaveMutex()
+# define recoverAssertMutexHeld()
+#else
+static void recoverEnterMutex(void){
+  sqlite3_mutex_enter(sqlite3_mutex_alloc(RECOVER_MUTEX_ID));
+}
+static void recoverLeaveMutex(void){
+  sqlite3_mutex_leave(sqlite3_mutex_alloc(RECOVER_MUTEX_ID));
+}
+static void recoverAssertMutexHeld(void){
+  assert( sqlite3_mutex_held(sqlite3_mutex_alloc(RECOVER_MUTEX_ID)) );
+}
+#endif
+
 
 /*
 ** Like strlen(). But handles NULL pointer arguments.
@@ -2478,7 +2494,7 @@ static int recoverVfsShmUnmap(sqlite3_file *pFd, int deleteFlag){
 static void recoverInstallWrapper(sqlite3_recover *p){
   sqlite3_file *pFd = 0;
   assert( recover_g.pMethods==0 );
-  assert( sqlite3_mutex_held( sqlite3_mutex_alloc(RECOVER_MUTEX_ID) ) );
+  recoverAssertMutexHeld();
   sqlite3_file_control(p->dbIn, p->zDb, SQLITE_FCNTL_FILE_POINTER, (void*)&pFd);
   if( pFd ){
     recover_g.pMethods = pFd->pMethods;
@@ -2493,7 +2509,7 @@ static void recoverInstallWrapper(sqlite3_recover *p){
 ** held when this function is called.
 */
 static void recoverUninstallWrapper(sqlite3_recover *p){
-  assert( sqlite3_mutex_held( sqlite3_mutex_alloc(RECOVER_MUTEX_ID) ) );
+  recoverAssertMutexHeld();
   if( recover_g.pMethods ){
     sqlite3_file *pFd = 0;
     sqlite3_file_control(p->dbIn, p->zDb,SQLITE_FCNTL_FILE_POINTER,(void*)&pFd);
@@ -2518,7 +2534,7 @@ static void recoverStep(sqlite3_recover *p){
       recoverSqlCallback(p, "BEGIN");
       recoverSqlCallback(p, "PRAGMA writable_schema = on");
 
-      sqlite3_mutex_enter( sqlite3_mutex_alloc(RECOVER_MUTEX_ID) );
+      recoverEnterMutex();
       recoverInstallWrapper(p);
 
       /* Open the output database. And register required virtual tables and 
@@ -2535,7 +2551,7 @@ static void recoverStep(sqlite3_recover *p){
       recoverCacheSchema(p);
 
       recoverUninstallWrapper(p);
-      sqlite3_mutex_leave( sqlite3_mutex_alloc(RECOVER_MUTEX_ID) );
+      recoverLeaveMutex();
 
       recoverExec(p, p->dbOut, "BEGIN");
 
diff --git a/manifest b/manifest
index 2b952a900b..97724ee2e7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\sdoc\stypo\sfixes.
-D 2022-10-27T03:57:48.950
+C Do\snot\suse\ssqlite3_mutex_xxx()\sfunctions\sin\ssqlite3recover.c\swhen\sbuilt\swith\sSQLITE_THREADSAFE=0.
+D 2022-10-27T10:51:49.063
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -398,7 +398,7 @@ F ext/recover/recoverpgsz.test 93e970eab05e4e89f8fd6b1bd23f9ec137ea09857e66ba0d4
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
 F ext/recover/recoverslowidx.test f356bb9fba7ffd6fc50e045e419464f0129ac6e24decf6e919584f79c3493727
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
-F ext/recover/sqlite3recover.c c91dd44f970b9e3cc37aec11e1b8eaedc93175e3021cda0db10fc3c751919e8a
+F ext/recover/sqlite3recover.c 8847c27ce4ad80b327fe8266dd79087839d8ba5aeb10a03c68b199b57da00019
 F ext/recover/sqlite3recover.h f698ccc94bd4da38761035415ad08c4549a408491ff9fd5f52d34d2214f64e36
 F ext/recover/test_recover.c 61ec931e47abca6b2210f46239cafd9f3060741605e3d3c45a7c7a53f63dd957
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -2052,8 +2052,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 ddd10c05c5d16d7205c347c5c1e73a75faecb2b7ec88a4a15875856765e1b143
-R 3db55ae605739ec81d57bf9021be2dd5
-U stephan
-Z 9cefeec4e7d702ffe1c98da983ab0ab0
+P ed8d3f25a4d6ac04d9f7918c791d8d2c6f23ce846278ca63f8fbadb7ea27369f
+R 31b949bd8120302ed6e08d715da99043
+U dan
+Z 1e435f3e6e7a6ad7e9a041f4354e77c4
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 1474c49658..12a1eaf2ee 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ed8d3f25a4d6ac04d9f7918c791d8d2c6f23ce846278ca63f8fbadb7ea27369f
\ No newline at end of file
+cd0aa27d1732abc61c8a8440118ff629f7dca185d2f515ce1f6090c49d8dc890
\ No newline at end of file

From 48a4a4b73d7fdfe2c509fb618b8e8ae374511099 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Thu, 27 Oct 2022 11:12:54 +0000
Subject: [PATCH 368/428] Fix a problem with running ".recover" on an in-memory
 database.

FossilOrigin-Name: 87b4cca2b84845cee603d40fbf16c9635d6dc2d19d2f37ae86abfeff716c9a85
---
 ext/recover/recover1.test    | 23 +++++++++++++++++++++++
 ext/recover/sqlite3recover.c | 10 +++++-----
 manifest                     | 14 +++++++-------
 manifest.uuid                |  2 +-
 4 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/ext/recover/recover1.test b/ext/recover/recover1.test
index ed921b7e91..7c3b0a0eef 100644
--- a/ext/recover/recover1.test
+++ b/ext/recover/recover1.test
@@ -246,5 +246,28 @@ do_execsql_test 12.1 {
 
 do_recover_test 12 
 
+#-------------------------------------------------------------------------
+reset_db
+sqlite3 db "" 
+do_recover_test 13
+
+do_execsql_test 14.1 {
+  PRAGMA auto_vacuum = 2;
+  PRAGMA user_version = 45;
+  PRAGMA application_id = 22;
+
+  CREATE TABLE u1(u, v);
+  CREATE UNIQUE INDEX i1 ON u1(u, v);
+  INSERT INTO u1 VALUES(1, 2), (3, 4);
+
+  CREATE TABLE u2(u, v);
+  CREATE UNIQUE INDEX i2 ON u1(u, v);
+  INSERT INTO u2 VALUES(hex(randomblob(500)), hex(randomblob(1000)));
+  INSERT INTO u2 VALUES(hex(randomblob(500)), hex(randomblob(1000)));
+  INSERT INTO u2 VALUES(hex(randomblob(500)), hex(randomblob(1000)));
+  INSERT INTO u2 VALUES(hex(randomblob(50000)), hex(randomblob(20000)));
+}
+do_recover_test 14 
+
 finish_test
 
diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index 30d02f9ca2..db1a9fd487 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -2446,7 +2446,7 @@ static int recoverVfsCheckReservedLock(sqlite3_file *pFd, int *pResOut){
 }
 static int recoverVfsFileControl(sqlite3_file *pFd, int op, void *pArg){
   RECOVER_VFS_WRAPPER (
-      pFd->pMethods->xFileControl(pFd, op, pArg)
+    (pFd->pMethods ?  pFd->pMethods->xFileControl(pFd, op, pArg) : SQLITE_NOTFOUND)
   );
 }
 static int recoverVfsSectorSize(sqlite3_file *pFd){
@@ -2496,6 +2496,7 @@ static void recoverInstallWrapper(sqlite3_recover *p){
   assert( recover_g.pMethods==0 );
   recoverAssertMutexHeld();
   sqlite3_file_control(p->dbIn, p->zDb, SQLITE_FCNTL_FILE_POINTER, (void*)&pFd);
+  assert( pFd==0 || pFd->pMethods!=&recover_methods );
   if( pFd ){
     recover_g.pMethods = pFd->pMethods;
     recover_g.p = p;
@@ -2510,10 +2511,9 @@ static void recoverInstallWrapper(sqlite3_recover *p){
 */
 static void recoverUninstallWrapper(sqlite3_recover *p){
   recoverAssertMutexHeld();
-  if( recover_g.pMethods ){
-    sqlite3_file *pFd = 0;
-    sqlite3_file_control(p->dbIn, p->zDb,SQLITE_FCNTL_FILE_POINTER,(void*)&pFd);
-    assert( pFd );
+  sqlite3_file *pFd = 0;
+  sqlite3_file_control(p->dbIn, p->zDb,SQLITE_FCNTL_FILE_POINTER,(void*)&pFd);
+  if( pFd ){
     pFd->pMethods = recover_g.pMethods;
     recover_g.pMethods = 0;
     recover_g.p = 0;
diff --git a/manifest b/manifest
index 97724ee2e7..a8a40591c9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\suse\ssqlite3_mutex_xxx()\sfunctions\sin\ssqlite3recover.c\swhen\sbuilt\swith\sSQLITE_THREADSAFE=0.
-D 2022-10-27T10:51:49.063
+C Fix\sa\sproblem\swith\srunning\s".recover"\son\san\sin-memory\sdatabase.
+D 2022-10-27T11:12:54.318
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -386,7 +386,7 @@ F ext/rbu/sqlite3rbu.c 8737cabdfbee84bb25a7851ecef8b1312be332761238da9be6ddb10c6
 F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9cd389812
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
 F ext/recover/dbdata.c a7b2fc6750139a7bb3455d784063d43f98c28f226b7f84d88270f1c083dc6b72
-F ext/recover/recover1.test 93acc42f95259f8b34050ad75873685a305da76d6cb1727d003f45157a4a6402
+F ext/recover/recover1.test e08dc7a0513eab9de33e7b8e2260b9538bedb57c9bd6fbb278f328d29a102827
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
 F ext/recover/recoverclobber.test 294dcc894124ab4ca3a7b35766630742a3d25810fceac22220beb64f70a33a60
 F ext/recover/recovercorrupt.test 6540aae95e17398dd70b44518367fd56588c44962cb276d2623a0fedba9efe9e
@@ -398,7 +398,7 @@ F ext/recover/recoverpgsz.test 93e970eab05e4e89f8fd6b1bd23f9ec137ea09857e66ba0d4
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
 F ext/recover/recoverslowidx.test f356bb9fba7ffd6fc50e045e419464f0129ac6e24decf6e919584f79c3493727
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
-F ext/recover/sqlite3recover.c 8847c27ce4ad80b327fe8266dd79087839d8ba5aeb10a03c68b199b57da00019
+F ext/recover/sqlite3recover.c 157f5c9dc198feb1f78f4c902e6073430bd48f747953e2330a58493f4fa5bfcf
 F ext/recover/sqlite3recover.h f698ccc94bd4da38761035415ad08c4549a408491ff9fd5f52d34d2214f64e36
 F ext/recover/test_recover.c 61ec931e47abca6b2210f46239cafd9f3060741605e3d3c45a7c7a53f63dd957
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -2052,8 +2052,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 ed8d3f25a4d6ac04d9f7918c791d8d2c6f23ce846278ca63f8fbadb7ea27369f
-R 31b949bd8120302ed6e08d715da99043
+P cd0aa27d1732abc61c8a8440118ff629f7dca185d2f515ce1f6090c49d8dc890
+R 0b3eaef812138ac59816127d76cc1fa8
 U dan
-Z 1e435f3e6e7a6ad7e9a041f4354e77c4
+Z 1810ee577f2015d8abedf9ca1b5465fa
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 12a1eaf2ee..dc80392c1a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cd0aa27d1732abc61c8a8440118ff629f7dca185d2f515ce1f6090c49d8dc890
\ No newline at end of file
+87b4cca2b84845cee603d40fbf16c9635d6dc2d19d2f37ae86abfeff716c9a85
\ No newline at end of file

From 340b1d1a710ca5d8a503b0524c88abcf73083afe Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Thu, 27 Oct 2022 11:25:08 +0000
Subject: [PATCH 369/428] Do not use sqlite3_result_text16() in the recover
 extension if SQLITE_OMIT_UTF16 is defined.

FossilOrigin-Name: 3d20d77a3511bb223474da8491e1da8aec098c41c1b81ab78ff80fbd37d5b568
---
 ext/recover/dbdata.c |  2 ++
 manifest             | 12 ++++++------
 manifest.uuid        |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ext/recover/dbdata.c b/ext/recover/dbdata.c
index 2c297e086c..c92db0c66c 100644
--- a/ext/recover/dbdata.c
+++ b/ext/recover/dbdata.c
@@ -466,12 +466,14 @@ static void dbdataValue(
         int n = ((eType-12) / 2);
         if( eType % 2 ){
           switch( enc ){
+#ifndef SQLITE_OMIT_UTF16
             case SQLITE_UTF16BE:
               sqlite3_result_text16be(pCtx, (void*)pData, n, SQLITE_TRANSIENT);
               break;
             case SQLITE_UTF16LE:
               sqlite3_result_text16le(pCtx, (void*)pData, n, SQLITE_TRANSIENT);
               break;
+#endif
             default:
               sqlite3_result_text(pCtx, (char*)pData, n, SQLITE_TRANSIENT);
               break;
diff --git a/manifest b/manifest
index a8a40591c9..9e692e12ba 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\swith\srunning\s".recover"\son\san\sin-memory\sdatabase.
-D 2022-10-27T11:12:54.318
+C Do\snot\suse\ssqlite3_result_text16()\sin\sthe\srecover\sextension\sif\sSQLITE_OMIT_UTF16\sis\sdefined.
+D 2022-10-27T11:25:08.538
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -385,7 +385,7 @@ F ext/rbu/rbuvacuum4.test a78898e438a44803eb2bc897ba3323373c9f277418e2d6d76e90f2
 F ext/rbu/sqlite3rbu.c 8737cabdfbee84bb25a7851ecef8b1312be332761238da9be6ddb10c62ad4291
 F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9cd389812
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
-F ext/recover/dbdata.c a7b2fc6750139a7bb3455d784063d43f98c28f226b7f84d88270f1c083dc6b72
+F ext/recover/dbdata.c e2cb4c88ba97a1617d78fe2d8adfde7b3e5ad8bca902b691938e5cc0bae92e2d
 F ext/recover/recover1.test e08dc7a0513eab9de33e7b8e2260b9538bedb57c9bd6fbb278f328d29a102827
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
 F ext/recover/recoverclobber.test 294dcc894124ab4ca3a7b35766630742a3d25810fceac22220beb64f70a33a60
@@ -2052,8 +2052,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 cd0aa27d1732abc61c8a8440118ff629f7dca185d2f515ce1f6090c49d8dc890
-R 0b3eaef812138ac59816127d76cc1fa8
+P 87b4cca2b84845cee603d40fbf16c9635d6dc2d19d2f37ae86abfeff716c9a85
+R 1191358d3125d3ef7c1b475e54a08f91
 U dan
-Z 1810ee577f2015d8abedf9ca1b5465fa
+Z 95755cf8ea251206d6850b6a2278f09f
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index dc80392c1a..4f6d94ef1f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-87b4cca2b84845cee603d40fbf16c9635d6dc2d19d2f37ae86abfeff716c9a85
\ No newline at end of file
+3d20d77a3511bb223474da8491e1da8aec098c41c1b81ab78ff80fbd37d5b568
\ No newline at end of file

From bb5136e5cbd949b0efde2b75b07ebef992a24e43 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Thu, 27 Oct 2022 11:32:20 +0000
Subject: [PATCH 370/428] Re-enable the .recovery and .dbinfo commands in
 shell.c.in in the fiddle build, as those were fixed by [3d20d77a3511] and
 [cd0aa27d1732].

FossilOrigin-Name: ba3a7a4a9997f62b78467d78d95fa5b58a03ecb2e2ccb68f4d316fc08fd02f86
---
 manifest       | 14 +++++++-------
 manifest.uuid  |  2 +-
 src/shell.c.in |  7 +------
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/manifest b/manifest
index 9e692e12ba..f66cb5b964 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\suse\ssqlite3_result_text16()\sin\sthe\srecover\sextension\sif\sSQLITE_OMIT_UTF16\sis\sdefined.
-D 2022-10-27T11:25:08.538
+C Re-enable\sthe\s.recovery\sand\s.dbinfo\scommands\sin\sshell.c.in\sin\sthe\sfiddle\sbuild,\sas\sthose\swere\sfixed\sby\s[3d20d77a3511]\sand\s[cd0aa27d1732].
+D 2022-10-27T11:32:20.864
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -636,7 +636,7 @@ F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 8a709a8e19b32d2c411eaae1a10e2ee214cf740288859a9f9a362fcb2f50eaf1
-F src/shell.c.in cd16f24f755460f1168672dee4eff3d3cbf08057ef3f6fbe15b965fbd689d2f2
+F src/shell.c.in 02634e7996d087f24cb585aaec6296989e7addf306b6befc27a9a4d391262ea7
 F src/sqlite.h.in d9c8a6243fc0a1c270d69db33758e34b810af3462f9bc5b4af113b347e07c69d
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 5336beea1868d99d2f62e628dbea55e97267dbff8193291ab175e960c5df9141
@@ -2052,8 +2052,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 87b4cca2b84845cee603d40fbf16c9635d6dc2d19d2f37ae86abfeff716c9a85
-R 1191358d3125d3ef7c1b475e54a08f91
-U dan
-Z 95755cf8ea251206d6850b6a2278f09f
+P 3d20d77a3511bb223474da8491e1da8aec098c41c1b81ab78ff80fbd37d5b568
+R 8b1c4b146eae8a02f0a8547671d20281
+U stephan
+Z 6ccb2d2f25ac48d59b613698e33377db
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 4f6d94ef1f..dc8aca86bb 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3d20d77a3511bb223474da8491e1da8aec098c41c1b81ab78ff80fbd37d5b568
\ No newline at end of file
+ba3a7a4a9997f62b78467d78d95fa5b58a03ecb2e2ccb68f4d316fc08fd02f86
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index a400b3ec8a..6c4c3e5f72 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -1057,12 +1057,7 @@ INCLUDE ../ext/misc/sqlar.c
 INCLUDE ../ext/expert/sqlite3expert.h
 INCLUDE ../ext/expert/sqlite3expert.c
 
-#if !defined(SQLITE_OMIT_VIRTUALTABLE)  \
-  && defined(SQLITE_ENABLE_DBPAGE_VTAB) \
-  && !defined(SQLITE_SHELL_FIDDLE)
-/* Including the recovery API causes the fiddle build to fail because
-** recovery-related code invokes mutex- and UTF16-related APIs which
-** we specifically disable in the wasm builds. */
+#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
 #define SQLITE_SHELL_HAVE_RECOVER 1
 #else
 #define SQLITE_SHELL_HAVE_RECOVER 0

From f7b58da8316c85567ba84a84f72e4e7c6c16f542 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Thu, 27 Oct 2022 12:46:17 +0000
Subject: [PATCH 371/428] The kvvfs VFS should remember the page size when
 writing to the database.

FossilOrigin-Name: fc5503c8acb085042e877c9de43256a4fee27f63ab35e2ddad18e40734ed00d4
---
 manifest      | 14 +++++++-------
 manifest.uuid |  2 +-
 src/os_kv.c   |  2 ++
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/manifest b/manifest
index f66cb5b964..93ccd49b54 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Re-enable\sthe\s.recovery\sand\s.dbinfo\scommands\sin\sshell.c.in\sin\sthe\sfiddle\sbuild,\sas\sthose\swere\sfixed\sby\s[3d20d77a3511]\sand\s[cd0aa27d1732].
-D 2022-10-27T11:32:20.864
+C The\skvvfs\sVFS\sshould\sremember\sthe\spage\ssize\swhen\swriting\sto\sthe\sdatabase.
+D 2022-10-27T12:46:17.474
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -617,7 +617,7 @@ F src/notify.c 89a97dc854c3aa62ad5f384ef50c5a4a11d70fcc69f86de3e991573421130ed6
 F src/os.c 81c9c1c52eab711e27e33fd51fe5788488d3a02bc1a71439857abbee5d0d2c97
 F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
-F src/os_kv.c c3d991bfb6207560d3416bbf241cade7113e4ce852781c53b7e40a3d6ac25fcb
+F src/os_kv.c f7cf0e1778a6827df864bb3e49bffbc5a2ef71557d65464df033e2ec6d115d6b
 F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107
 F src/os_unix.c 287aa5f5691a2b356780c63e83abaa33549add84227b8313395f04088486d79c
 F src/os_win.c 8d129ae3e59e0fa900e20d0ad789e96f2e08177f0b00b53cdda65c40331e0902
@@ -2052,8 +2052,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 3d20d77a3511bb223474da8491e1da8aec098c41c1b81ab78ff80fbd37d5b568
-R 8b1c4b146eae8a02f0a8547671d20281
-U stephan
-Z 6ccb2d2f25ac48d59b613698e33377db
+P ba3a7a4a9997f62b78467d78d95fa5b58a03ecb2e2ccb68f4d316fc08fd02f86
+R b33b563552a619b10e13303be4b4d6d1
+U drh
+Z 69a517744f2cbe033f11e6c64dfd41a8
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index dc8aca86bb..bf44b9ac3f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ba3a7a4a9997f62b78467d78d95fa5b58a03ecb2e2ccb68f4d316fc08fd02f86
\ No newline at end of file
+fc5503c8acb085042e877c9de43256a4fee27f63ab35e2ddad18e40734ed00d4
\ No newline at end of file
diff --git a/src/os_kv.c b/src/os_kv.c
index ecccacf61e..7bb73ce4fe 100644
--- a/src/os_kv.c
+++ b/src/os_kv.c
@@ -629,6 +629,8 @@ static int kvvfsWriteDb(
   SQLITE_KV_LOG(("xWrite('%s-db',%d,%lld)\n", pFile->zClass, iAmt, iOfst));
   assert( iAmt>=512 && iAmt<=65536 );
   assert( (iAmt & (iAmt-1))==0 );
+  assert( pFile->szPage<0 || pFile->szPage==iAmt );
+  pFile->szPage = iAmt;
   pgno = 1 + iOfst/iAmt;
   sqlite3_snprintf(sizeof(zKey), zKey, "%u", pgno);
   kvvfsEncode(zBuf, iAmt, aData);

From 9c17ee4f934517e51d116e0ae4c0ed31efd25bc8 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Thu, 27 Oct 2022 14:00:21 +0000
Subject: [PATCH 372/428] Do not accept a NULL pointer for the filename in
 KVVFS.

FossilOrigin-Name: fdecbd3b5bcdeb358015f461ac6c863f12ab180ab4624ed50734e41e557d8186
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/os_kv.c   |  1 +
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/manifest b/manifest
index 93ccd49b54..a40fd6acf7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\skvvfs\sVFS\sshould\sremember\sthe\spage\ssize\swhen\swriting\sto\sthe\sdatabase.
-D 2022-10-27T12:46:17.474
+C Do\snot\saccept\sa\sNULL\spointer\sfor\sthe\sfilename\sin\sKVVFS.
+D 2022-10-27T14:00:21.740
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -617,7 +617,7 @@ F src/notify.c 89a97dc854c3aa62ad5f384ef50c5a4a11d70fcc69f86de3e991573421130ed6
 F src/os.c 81c9c1c52eab711e27e33fd51fe5788488d3a02bc1a71439857abbee5d0d2c97
 F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
-F src/os_kv.c f7cf0e1778a6827df864bb3e49bffbc5a2ef71557d65464df033e2ec6d115d6b
+F src/os_kv.c 0e59600d25b72034c7666b8b7dcc527f039b5d9c16f24a7eca4c08c66f63c364
 F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107
 F src/os_unix.c 287aa5f5691a2b356780c63e83abaa33549add84227b8313395f04088486d79c
 F src/os_win.c 8d129ae3e59e0fa900e20d0ad789e96f2e08177f0b00b53cdda65c40331e0902
@@ -2052,8 +2052,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 ba3a7a4a9997f62b78467d78d95fa5b58a03ecb2e2ccb68f4d316fc08fd02f86
-R b33b563552a619b10e13303be4b4d6d1
+P fc5503c8acb085042e877c9de43256a4fee27f63ab35e2ddad18e40734ed00d4
+R 6cb19b2a6a261de50cb8a948672510cf
 U drh
-Z 69a517744f2cbe033f11e6c64dfd41a8
+Z 79b8e8e87ee4d06cb8ce6f55cae0e30f
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index bf44b9ac3f..0445a8d662 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fc5503c8acb085042e877c9de43256a4fee27f63ab35e2ddad18e40734ed00d4
\ No newline at end of file
+fdecbd3b5bcdeb358015f461ac6c863f12ab180ab4624ed50734e41e557d8186
\ No newline at end of file
diff --git a/src/os_kv.c b/src/os_kv.c
index 7bb73ce4fe..322588be9a 100644
--- a/src/os_kv.c
+++ b/src/os_kv.c
@@ -813,6 +813,7 @@ static int kvvfsOpen(
   int *pOutFlags
 ){
   KVVfsFile *pFile = (KVVfsFile*)pProtoFile;
+  if( zName==0 ) zName = "";
   SQLITE_KV_LOG(("xOpen(\"%s\")\n", zName));
   if( strcmp(zName, "local")==0
    || strcmp(zName, "session")==0

From fd6080637c02986f45dd510aff68a96104339b53 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Thu, 27 Oct 2022 14:28:15 +0000
Subject: [PATCH 373/428] Automatically set temp_store=MEMORY if the VFS is
 kvvfs.

FossilOrigin-Name: a4d40f6346e7eb2a5239684dba86f297358122768a4d4bf6786b6028f4300e04
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/main.c    |  6 ++++++
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/manifest b/manifest
index a40fd6acf7..04ff339ed7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\saccept\sa\sNULL\spointer\sfor\sthe\sfilename\sin\sKVVFS.
-D 2022-10-27T14:00:21.740
+C Automatically\sset\stemp_store=MEMORY\sif\sthe\sVFS\sis\skvvfs.
+D 2022-10-27T14:28:15.302
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -598,7 +598,7 @@ F src/insert.c b972b1642cd0f7d5ae4964d713b65158a7bfa6a6e8786a9e8e57bd9c0b4a896d
 F src/json.c 7749b98c62f691697c7ee536b570c744c0583cab4a89200fdd0fc2aa8cc8cbd6
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 8086232d10e51e183a7f64199815bad1c579896354db69435347665f62f481e9
-F src/main.c b434b8e4aca38419962de3d1c55fb9279807ba6a8802998a427b1635dc8250f6
+F src/main.c 5bf12aca926324eb804de3f38e5231ccd68e238f640c45dadd9756c96a2817af
 F src/malloc.c dfddca1e163496c0a10250cedeafaf56dff47673e0f15888fb0925340a8e3f90
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@ -2052,8 +2052,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 fc5503c8acb085042e877c9de43256a4fee27f63ab35e2ddad18e40734ed00d4
-R 6cb19b2a6a261de50cb8a948672510cf
+P fdecbd3b5bcdeb358015f461ac6c863f12ab180ab4624ed50734e41e557d8186
+R dfc4ed13a64515196293181db6b5de60
 U drh
-Z 79b8e8e87ee4d06cb8ce6f55cae0e30f
+Z 98eb6601307a798f1c90903f8afb0012
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 0445a8d662..f771feb37a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fdecbd3b5bcdeb358015f461ac6c863f12ab180ab4624ed50734e41e557d8186
\ No newline at end of file
+a4d40f6346e7eb2a5239684dba86f297358122768a4d4bf6786b6028f4300e04
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index e73fe351ca..646683558d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -3395,6 +3395,12 @@ static int openDatabase(
     sqlite3_free(zErrMsg);
     goto opendb_out;
   }
+  assert( db->pVfs!=0 );
+#if defined(SQLITE_OS_KV) || defined(SQLITE_OS_KV_OPTIONAL)
+  if( sqlite3_stricmp(db->pVfs->zName, "kvvfs")==0 ){
+    db->temp_store = 2;
+  }
+#endif
 
   /* Open the backend database driver */
   rc = sqlite3BtreeOpen(db->pVfs, zOpen, db, &db->aDb[0].pBt, 0,

From 674b312ed711615ef000c8076f4851b76d15a2db Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Thu, 27 Oct 2022 14:41:38 +0000
Subject: [PATCH 374/428] speedtest1.html: when vfs==kvvfs, increase --size
 from 2 to 4, as enabled by [a4d40f6346e7]. --size 5 is 4.96mb out of
 (supposedly) 5mb, which works but is a bit too close to the edge.

FossilOrigin-Name: a608d584a8a68ebaf8566cffc9c33f59309b710e7b29229a15bef529702f35d5
---
 ext/wasm/speedtest1.html |  6 +++++-
 manifest                 | 14 +++++++-------
 manifest.uuid            |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/ext/wasm/speedtest1.html b/ext/wasm/speedtest1.html
index b2b0b8e861..ef74380373 100644
--- a/ext/wasm/speedtest1.html
+++ b/ext/wasm/speedtest1.html
@@ -118,7 +118,7 @@
             argv.push("--vfs", vfs);
             log2('',"Using VFS:",vfs);
             if('kvvfs' === vfs){
-                forceSize = 2;
+                forceSize = 4 /* 5 uses approx. 4.96mb */;
                 dbFile = 'session';
                 log2('warning',"kvvfs VFS: forcing --size",forceSize,
                      "and filename '"+dbFile+"'.");
@@ -156,6 +156,10 @@
             wasm.xCall('wasm_main', argv.length,
                        wasm.scopedAllocMainArgv(argv));
             wasm.scopedAllocPop(scope);
+            if('kvvfs'===vfs){
+                logList.unshift("KVVFS "+dbFile+" size = "+
+                                capi.sqlite3_js_kvvfs_size(dbFile));
+            }
             if(pDir) wasm.sqlite3_wasm_vfs_unlink(pVfs,dbFile);
             logList.unshift("Done running native main(). Output:");
             dumpLogList();
diff --git a/manifest b/manifest
index 04ff339ed7..cf243b4c10 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Automatically\sset\stemp_store=MEMORY\sif\sthe\sVFS\sis\skvvfs.
-D 2022-10-27T14:28:15.302
+C speedtest1.html:\swhen\svfs==kvvfs,\sincrease\s--size\sfrom\s2\sto\s4,\sas\senabled\sby\s[a4d40f6346e7].\s--size\s5\sis\s4.96mb\sout\sof\s(supposedly)\s5mb,\swhich\sworks\sbut\sis\sa\sbit\stoo\sclose\sto\sthe\sedge.
+D 2022-10-27T14:41:38.247
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -540,7 +540,7 @@ F ext/wasm/scratchpad-wasmfs-main.js 1841c124a58e3f9e7ee580a0868d6e1834c5a01dbb4
 F ext/wasm/speedtest1-wasmfs.html bc28eb29b69a73864b8d7aae428448f8b7e1de81d8bfb9bba99541322054dbd0
 F ext/wasm/speedtest1-worker.html 7b0cceab6a68b2883738e19f61d21620fe1244ba36c1b2e38d0efde57ecce86d
 F ext/wasm/speedtest1-worker.js 942af0909dee6e6a43af85d3e4a5e6aa74956290ca4b78fd4e753be13673ccd6
-F ext/wasm/speedtest1.html 6303e620162b2058d5e212f966a7caed4a31a516b6140fbc64185cb296218e4f
+F ext/wasm/speedtest1.html 3b3321eee32b6becf0b2134fd8f17db5802b400b8233c3537527d3c46e4e17b9
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
@@ -2052,8 +2052,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 fdecbd3b5bcdeb358015f461ac6c863f12ab180ab4624ed50734e41e557d8186
-R dfc4ed13a64515196293181db6b5de60
-U drh
-Z 98eb6601307a798f1c90903f8afb0012
+P a4d40f6346e7eb2a5239684dba86f297358122768a4d4bf6786b6028f4300e04
+R 99c4e795333d2dc1049d59bf743d209d
+U stephan
+Z 2931f3e9dccb9e9bedf9ff1781ba6005
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f771feb37a..1c98cca254 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a4d40f6346e7eb2a5239684dba86f297358122768a4d4bf6786b6028f4300e04
\ No newline at end of file
+a608d584a8a68ebaf8566cffc9c33f59309b710e7b29229a15bef529702f35d5
\ No newline at end of file

From f7fea5b4b8097b3a564cd9c5938e98d4619df713 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Thu, 27 Oct 2022 18:19:45 +0000
Subject: [PATCH 375/428] Change the name of the ".recover" command option
 "--freelist-corrupt" to "--ignore-freelist".

FossilOrigin-Name: afce8443ace57c3c99c6810be98f05ed716ae504b68098726c869843c643bbf0
---
 manifest          | 16 ++++++++--------
 manifest.uuid     |  2 +-
 src/shell.c.in    |  6 +++---
 test/recover.test | 47 +++++++++++++++++++++++++++++++++++++++++++++--
 4 files changed, 57 insertions(+), 14 deletions(-)

diff --git a/manifest b/manifest
index cf243b4c10..36ea326c15 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C speedtest1.html:\swhen\svfs==kvvfs,\sincrease\s--size\sfrom\s2\sto\s4,\sas\senabled\sby\s[a4d40f6346e7].\s--size\s5\sis\s4.96mb\sout\sof\s(supposedly)\s5mb,\swhich\sworks\sbut\sis\sa\sbit\stoo\sclose\sto\sthe\sedge.
-D 2022-10-27T14:41:38.247
+C Change\sthe\sname\sof\sthe\s".recover"\scommand\soption\s"--freelist-corrupt"\sto\s"--ignore-freelist".
+D 2022-10-27T18:19:45.230
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -636,7 +636,7 @@ F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 8a709a8e19b32d2c411eaae1a10e2ee214cf740288859a9f9a362fcb2f50eaf1
-F src/shell.c.in 02634e7996d087f24cb585aaec6296989e7addf306b6befc27a9a4d391262ea7
+F src/shell.c.in af6bf3efa19b22c72058427e3d7f7814b72929aee1bd58fd39b992c0f8383b60
 F src/sqlite.h.in d9c8a6243fc0a1c270d69db33758e34b810af3462f9bc5b4af113b347e07c69d
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 5336beea1868d99d2f62e628dbea55e97267dbff8193291ab175e960c5df9141
@@ -1408,7 +1408,7 @@ F test/randexpr1.tcl 40dec52119ed3a2b8b2a773bce24b63a3a746459
 F test/randexpr1.test eda062a97e60f9c38ae8d806b03b0ddf23d796df
 F test/rbu.test 168573d353cd0fd10196b87b0caa322c144ef736
 F test/rdonly.test 64e2696c322e3538df0b1ed624e21f9a23ed9ff8
-F test/recover.test ccb8c2623902a92ebb76770edd075cb4f75a4760bb7afde38026572c6e79070d
+F test/recover.test cd81539661b9a6263d68f7bfd1440f4ac0aeb68f0fa0370db32a9e706da89de7
 F test/regexp1.test 83c631617357150f8054ca1d1fed40a552b0d0f8eb7a7f090c3be02cee9f9913
 F test/regexp2.test 55ed41da802b0e284ac7e2fe944be3948f93ff25abbca0361a609acfed1368b5
 F test/reindex.test cd9d6021729910ece82267b4f5e1b5ac2911a7566c43b43c176a6a4732e2118d
@@ -2052,8 +2052,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 a4d40f6346e7eb2a5239684dba86f297358122768a4d4bf6786b6028f4300e04
-R 99c4e795333d2dc1049d59bf743d209d
-U stephan
-Z 2931f3e9dccb9e9bedf9ff1781ba6005
+P a608d584a8a68ebaf8566cffc9c33f59309b710e7b29229a15bef529702f35d5
+R acdd9868710d658cbd45f34ba638ca6b
+U dan
+Z 87ba6aaecfad0a3a8476812a05f3df34
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 1c98cca254..f33ea7e2d6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a608d584a8a68ebaf8566cffc9c33f59309b710e7b29229a15bef529702f35d5
\ No newline at end of file
+afce8443ace57c3c99c6810be98f05ed716ae504b68098726c869843c643bbf0
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index 6c4c3e5f72..b1cfe9d5b2 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -4512,7 +4512,7 @@ static const char *(azHelp[]) = {
 #endif
 #if SQLITE_SHELL_HAVE_RECOVER
   ".recover                 Recover as much data as possible from corrupt db.",
-  "   --freelist-corrupt       Assume the freelist is corrupt",
+  "   --ignore-freelist        Ignore pages that appear to be on db freelist",
   "   --recovery-db NAME       Store recovery metadata in database file NAME",
   "   --lost-and-found TABLE   Alternative name for the lost-and-found table",
   "   --no-rowids              Do not attempt to recover rowid values",
@@ -7304,7 +7304,7 @@ static int recoverDatabaseCmd(ShellState *pState, int nArg, char **azArg){
   int rc = SQLITE_OK;
   const char *zRecoveryDb = "";   /* Name of "recovery" database */
   const char *zLAF = "lost_and_found";
-  int bFreelist = 1;              /* 0 if --freelist-corrupt is specified */
+  int bFreelist = 1;              /* 0 if --ignore-freelist is specified */
   int bRowids = 1;                /* 0 if --no-rowids */
   sqlite3_recover *p = 0;
   int i = 0;
@@ -7314,7 +7314,7 @@ static int recoverDatabaseCmd(ShellState *pState, int nArg, char **azArg){
     int n;
     if( z[0]=='-' && z[1]=='-' ) z++;
     n = strlen30(z);
-    if( n<=17 && memcmp("-freelist-corrupt", z, n)==0 ){
+    if( n<=17 && memcmp("-ignore-freelist", z, n)==0 ){
       bFreelist = 0;
     }else
     if( n<=12 && memcmp("-recovery-db", z, n)==0 && i<(nArg-1) ){
diff --git a/test/recover.test b/test/recover.test
index 469c43b115..b60892459f 100644
--- a/test/recover.test
+++ b/test/recover.test
@@ -39,8 +39,9 @@ proc compare_dbs {db1 db2} {
   }
 }
 
-proc do_recover_test {tn {tsql {}} {res {}}} {
-  set fd [open "|$::CLI test.db .recover"]
+proc recover_with_opts {opts} {
+  set cmd ".recover $opts"
+  set fd [open [list |$::CLI test.db $cmd]]
   fconfigure $fd -encoding binary
   fconfigure $fd -translation binary
   set sql [read $fd]
@@ -49,6 +50,13 @@ proc do_recover_test {tn {tsql {}} {res {}}} {
   forcedelete test.db2
   sqlite3 db2 test.db2
   execsql $sql db2
+  db2 close
+}
+
+proc do_recover_test {tn {tsql {}} {res {}}} {
+  recover_with_opts ""
+
+  sqlite3 db2 test.db2
   if {$tsql==""} {
     uplevel [list do_test $tn [list compare_dbs db db2] {}]
   } else {
@@ -131,4 +139,39 @@ do_recover_test 2.4.1 {
 reset_db
 do_recover_test 3.0
 
+#-------------------------------------------------------------------------
+reset_db 
+do_execsql_test 4.0 {
+  CREATE TABLE t1(a, b, c);
+  CREATE TABLE t2(d, e, f);
+  CREATE TABLE t3(g, h, i);
+
+  INSERT INTO t2 VALUES(1, 2, 3);
+  INSERT INTO t2 VALUES('a', 'b', 'c');
+
+  INSERT INTO t3 VALUES('one', 'two', 'three');
+  DROP TABLE t1;
+  DROP TABLE t2;
+}
+
+recover_with_opts ""
+sqlite3 db2 test.db2
+do_execsql_test -db db2 4.1.1 {
+  SELECT name FROM sqlite_schema
+} {t3 lost_and_found}
+do_execsql_test -db db2 4.1.2 {
+  SELECT id, c0, c1, c2 FROM lost_and_found
+} {1 1 2 3    2 a b c}
+db2 close
+
+recover_with_opts -ignore-freelist
+sqlite3 db2 test.db2
+do_execsql_test -db db2 4.2.1 {
+  SELECT name FROM sqlite_schema
+} {t3}
+do_execsql_test -db db2 4.2.2 {
+  SELECT * FROM t3
+} {one two three}
+db2 close
+
 finish_test

From 4853aa18f0a01decd150a95c7dd911d87ea1fb90 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Thu, 27 Oct 2022 18:20:08 +0000
Subject: [PATCH 376/428] In the CLI, ensure that input to utf8_width_print is
 not NULL, or if it is, change it to an empty string.  For for the problem
 reported by [forum:/forumpost/2961cf13eec61876|forum post 2961cf13eec61876].

FossilOrigin-Name: 9ecc9d25ea62a7777bbf621989a5c577b612784121a20465cda4d4023fa9634d
---
 manifest       | 14 +++++++-------
 manifest.uuid  |  2 +-
 src/shell.c.in |  1 +
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/manifest b/manifest
index 36ea326c15..005502f33c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sthe\sname\sof\sthe\s".recover"\scommand\soption\s"--freelist-corrupt"\sto\s"--ignore-freelist".
-D 2022-10-27T18:19:45.230
+C In\sthe\sCLI,\sensure\sthat\sinput\sto\sutf8_width_print\sis\snot\sNULL,\sor\sif\sit\sis,\nchange\sit\sto\san\sempty\sstring.\s\sFor\sfor\sthe\sproblem\sreported\sby\n[forum:/forumpost/2961cf13eec61876|forum\spost\s2961cf13eec61876].
+D 2022-10-27T18:20:08.411
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -636,7 +636,7 @@ F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 8a709a8e19b32d2c411eaae1a10e2ee214cf740288859a9f9a362fcb2f50eaf1
-F src/shell.c.in af6bf3efa19b22c72058427e3d7f7814b72929aee1bd58fd39b992c0f8383b60
+F src/shell.c.in 70e7c85074806cdb35c019a5cb5b16f989edb98d1b0e8ca441c2693cbb2e3dca
 F src/sqlite.h.in d9c8a6243fc0a1c270d69db33758e34b810af3462f9bc5b4af113b347e07c69d
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 5336beea1868d99d2f62e628dbea55e97267dbff8193291ab175e960c5df9141
@@ -2052,8 +2052,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 a608d584a8a68ebaf8566cffc9c33f59309b710e7b29229a15bef529702f35d5
-R acdd9868710d658cbd45f34ba638ca6b
-U dan
-Z 87ba6aaecfad0a3a8476812a05f3df34
+P afce8443ace57c3c99c6810be98f05ed716ae504b68098726c869843c643bbf0
+R e55959c410fb52f7ad34ecde96c130d2
+U drh
+Z 207dea69502bccb805e97d5ac064979f
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f33ea7e2d6..72e567ed62 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-afce8443ace57c3c99c6810be98f05ed716ae504b68098726c869843c643bbf0
\ No newline at end of file
+9ecc9d25ea62a7777bbf621989a5c577b612784121a20465cda4d4023fa9634d
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index b1cfe9d5b2..cbac2a7302 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -549,6 +549,7 @@ static void utf8_width_print(FILE *pOut, int w, const char *zUtf){
   int i;
   int n;
   int aw = w<0 ? -w : w;
+  if( zUtf==0 ) zUtf = "";
   for(i=n=0; zUtf[i]; i++){
     if( (zUtf[i]&0xc0)!=0x80 ){
       n++;

From 895f12dfe77f7b7a1f1cb17f517853573276d7bb Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Thu, 27 Oct 2022 18:35:09 +0000
Subject: [PATCH 377/428] Fix an assert() failure in the recover extension
 triggered by a zero value as the first page-number in an overflow page chain.

FossilOrigin-Name: 44c0874c33e76ce708022e5c38c74f75565a8cea9f4c5b067cc0a54079aeee20
---
 ext/recover/dbdata.c             | 34 ++++++++++++++--------------
 ext/recover/recovercorrupt2.test | 38 ++++++++++++++++++++++++++++++++
 manifest                         | 16 +++++++-------
 manifest.uuid                    |  2 +-
 4 files changed, 65 insertions(+), 25 deletions(-)

diff --git a/ext/recover/dbdata.c b/ext/recover/dbdata.c
index c92db0c66c..8b14890461 100644
--- a/ext/recover/dbdata.c
+++ b/ext/recover/dbdata.c
@@ -333,25 +333,27 @@ static int dbdataLoadPage(
 
   *ppPage = 0;
   *pnPage = 0;
-  sqlite3_bind_int64(pStmt, 2, pgno);
-  if( SQLITE_ROW==sqlite3_step(pStmt) ){
-    int nCopy = sqlite3_column_bytes(pStmt, 0);
-    if( nCopy>0 ){
-      u8 *pPage;
-      pPage = (u8*)sqlite3_malloc64(nCopy + DBDATA_PADDING_BYTES);
-      if( pPage==0 ){
-        rc = SQLITE_NOMEM;
-      }else{
-        const u8 *pCopy = sqlite3_column_blob(pStmt, 0);
-        memcpy(pPage, pCopy, nCopy);
-        memset(&pPage[nCopy], 0, DBDATA_PADDING_BYTES);
+  if( pgno>0 ){
+    sqlite3_bind_int64(pStmt, 2, pgno);
+    if( SQLITE_ROW==sqlite3_step(pStmt) ){
+      int nCopy = sqlite3_column_bytes(pStmt, 0);
+      if( nCopy>0 ){
+        u8 *pPage;
+        pPage = (u8*)sqlite3_malloc64(nCopy + DBDATA_PADDING_BYTES);
+        if( pPage==0 ){
+          rc = SQLITE_NOMEM;
+        }else{
+          const u8 *pCopy = sqlite3_column_blob(pStmt, 0);
+          memcpy(pPage, pCopy, nCopy);
+          memset(&pPage[nCopy], 0, DBDATA_PADDING_BYTES);
+        }
+        *ppPage = pPage;
+        *pnPage = nCopy;
       }
-      *ppPage = pPage;
-      *pnPage = nCopy;
     }
+    rc2 = sqlite3_reset(pStmt);
+    if( rc==SQLITE_OK ) rc = rc2;
   }
-  rc2 = sqlite3_reset(pStmt);
-  if( rc==SQLITE_OK ) rc = rc2;
 
   return rc;
 }
diff --git a/ext/recover/recovercorrupt2.test b/ext/recover/recovercorrupt2.test
index 6b8fbeeeec..1846eb64d0 100644
--- a/ext/recover/recovercorrupt2.test
+++ b/ext/recover/recovercorrupt2.test
@@ -112,6 +112,44 @@ do_execsql_test -db db2 2.3 {
 } {}
 db2 close
 
+#-------------------------------------------------------------------------
+#
+reset_db
+do_test 3.0 {
+  sqlite3 db {}
+  db deserialize [decode_hexdb {
+  .open --hexdb
+  | size 4096 pagesize 1024 filename corrupt032.txt.db
+  | page 1 offset 0
+  |      0: 53 51 4c 69 74 65 20 66 6f 72 6d 61 74 20 33 00   SQLite format 3.
+  |     16: 04 00 01 01 08 40 20 20 00 00 00 02 00 00 00 03   .....@  ........
+  |     32: 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00 04   ................
+  |     48: 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00   ................
+  |     80: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 02   ................
+  |     96: 00 2e 24 80 0d 00 00 00 01 03 d4 00 03 d4 00 00   ..$.............
+  |    976: 00 00 00 00 22 01 06 17 11 11 01 31 74 61 62 6c   ...........1tabl
+  |    992: 65 74 31 74 31 02 43 52 45 41 54 45 20 54 41 42   et1t1.CREATE TAB
+  |   1008: 4c 45 20 74 31 28 78 29 00 00 00 00 00 00 00 00   LE t1(x)........
+  | page 2 offset 1024
+  |      0: 0d 00 00 00 01 02 06 00 02 06 00 00 00 00 00 00   ................
+  |    512: 00 00 00 00 00 00 8b 60 01 03 97 46 00 00 00 00   .......`...F....
+  |   1008: 00 00 00 00 00 00 00 03 00 00 00 00 00 00 00 00   ................
+  | end corrupt032.txt.db
+}]} {}
+
+do_test 3.1 {
+  set R [sqlite3_recover_init db main test.db2]
+  $R run
+  $R finish
+} {}
+
+sqlite3 db2 test.db2
+do_execsql_test -db db2 3.2 {
+} {
+}
+do_execsql_test -db db2 3.3 {
+} {}
+db2 close
 
 finish_test
 
diff --git a/manifest b/manifest
index 005502f33c..4ee7151f88 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sthe\sCLI,\sensure\sthat\sinput\sto\sutf8_width_print\sis\snot\sNULL,\sor\sif\sit\sis,\nchange\sit\sto\san\sempty\sstring.\s\sFor\sfor\sthe\sproblem\sreported\sby\n[forum:/forumpost/2961cf13eec61876|forum\spost\s2961cf13eec61876].
-D 2022-10-27T18:20:08.411
+C Fix\san\sassert()\sfailure\sin\sthe\srecover\sextension\striggered\sby\sa\szero\svalue\sas\sthe\sfirst\spage-number\sin\san\soverflow\spage\schain.
+D 2022-10-27T18:35:09.479
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -385,12 +385,12 @@ F ext/rbu/rbuvacuum4.test a78898e438a44803eb2bc897ba3323373c9f277418e2d6d76e90f2
 F ext/rbu/sqlite3rbu.c 8737cabdfbee84bb25a7851ecef8b1312be332761238da9be6ddb10c62ad4291
 F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9cd389812
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
-F ext/recover/dbdata.c e2cb4c88ba97a1617d78fe2d8adfde7b3e5ad8bca902b691938e5cc0bae92e2d
+F ext/recover/dbdata.c a7b75b53054d131355cb62fd00643fdafc561dfd1e9e9dd0710778e690579853
 F ext/recover/recover1.test e08dc7a0513eab9de33e7b8e2260b9538bedb57c9bd6fbb278f328d29a102827
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
 F ext/recover/recoverclobber.test 294dcc894124ab4ca3a7b35766630742a3d25810fceac22220beb64f70a33a60
 F ext/recover/recovercorrupt.test 6540aae95e17398dd70b44518367fd56588c44962cb276d2623a0fedba9efe9e
-F ext/recover/recovercorrupt2.test dff0c9f52888ae5956b1892ce502db42e6f51a666230369251bbbca923be541f
+F ext/recover/recovercorrupt2.test aae5329bd5e773895ad426a72100b290c06cc855704c7c7561369ea03742b5f0
 F ext/recover/recoverfault.test 3a0a32b9fc216592b97775d69220695b0926980c0f7424b7a59144e47d7cb568
 F ext/recover/recoverfault2.test 321036336af23e778a87f148c4cc4407f88fbdab1fd72ddb661669be9020d36b
 F ext/recover/recoverold.test 46e9d99b595fac583d4c67f74d7d89c20a435c752ef6eeb3e918b599940c88e0
@@ -2052,8 +2052,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 afce8443ace57c3c99c6810be98f05ed716ae504b68098726c869843c643bbf0
-R e55959c410fb52f7ad34ecde96c130d2
-U drh
-Z 207dea69502bccb805e97d5ac064979f
+P 9ecc9d25ea62a7777bbf621989a5c577b612784121a20465cda4d4023fa9634d
+R 3096a83bfa4b844f97735d498da01d52
+U dan
+Z ed22d20a006d2a515bbb5bbd662f21b3
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 72e567ed62..09daa9a138 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9ecc9d25ea62a7777bbf621989a5c577b612784121a20465cda4d4023fa9634d
\ No newline at end of file
+44c0874c33e76ce708022e5c38c74f75565a8cea9f4c5b067cc0a54079aeee20
\ No newline at end of file

From ac16a4716bfb77b4c29d4422fcf6a0c9f0973589 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Thu, 27 Oct 2022 19:02:51 +0000
Subject: [PATCH 378/428] Ensure that the VFS wrapper in the recover extension
 does not attempt to invoke undefined methods on the underlying VFS.

FossilOrigin-Name: 347c575108bc8112613a02afda1247bdbed24c15def7eb412d0b27aba047715b
---
 ext/recover/recovercorrupt2.test | 28 +++++++++++++++++++++-------
 ext/recover/sqlite3recover.c     |  2 ++
 manifest                         | 14 +++++++-------
 manifest.uuid                    |  2 +-
 4 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/ext/recover/recovercorrupt2.test b/ext/recover/recovercorrupt2.test
index 1846eb64d0..ef4bf5216a 100644
--- a/ext/recover/recovercorrupt2.test
+++ b/ext/recover/recovercorrupt2.test
@@ -143,13 +143,27 @@ do_test 3.1 {
   $R finish
 } {}
 
-sqlite3 db2 test.db2
-do_execsql_test -db db2 3.2 {
-} {
-}
-do_execsql_test -db db2 3.3 {
-} {}
-db2 close
+#-------------------------------------------------------------------------
+#
+reset_db
+do_test 4.0 {
+  sqlite3 db {}
+  db deserialize [decode_hexdb {
+  .open --hexdb
+  | size 4096 pagesize 4096 filename crash-00f2d3627f1b43.db
+  | page 1 offset 0
+  |      0: 53 51 4c 69 74 65 20 66 6f 72 6d 61 74 20 33 00   SQLite format 3.
+  |     16: 00 01 01 02 00 40 20 20 01 00 ff 00 42 01 10 01   .....@  ....B...
+  |     32: ef 00 00 87 00 ff ff ff f0 01 01 10 ff ff 00 00   ................
+  | end crash-00f2d3627f1b43.db
+  .recover
+}]} {}
+
+do_test 4.1 {
+  set R [sqlite3_recover_init db main test.db2]
+  catch { $R run }
+  list [catch { $R finish } msg] $msg
+} {1 {unable to open database file}}
 
 finish_test
 
diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index db1a9fd487..41aad84245 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -2498,8 +2498,10 @@ static void recoverInstallWrapper(sqlite3_recover *p){
   sqlite3_file_control(p->dbIn, p->zDb, SQLITE_FCNTL_FILE_POINTER, (void*)&pFd);
   assert( pFd==0 || pFd->pMethods!=&recover_methods );
   if( pFd ){
+    int iVersion = 1 + (pFd->pMethods->iVersion>1 && pFd->pMethods->xShmMap!=0);
     recover_g.pMethods = pFd->pMethods;
     recover_g.p = p;
+    recover_methods.iVersion = iVersion;
     pFd->pMethods = &recover_methods;
   }
 }
diff --git a/manifest b/manifest
index 4ee7151f88..4540f2893c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sassert()\sfailure\sin\sthe\srecover\sextension\striggered\sby\sa\szero\svalue\sas\sthe\sfirst\spage-number\sin\san\soverflow\spage\schain.
-D 2022-10-27T18:35:09.479
+C Ensure\sthat\sthe\sVFS\swrapper\sin\sthe\srecover\sextension\sdoes\snot\sattempt\sto\sinvoke\sundefined\smethods\son\sthe\sunderlying\sVFS.
+D 2022-10-27T19:02:51.201
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -390,7 +390,7 @@ F ext/recover/recover1.test e08dc7a0513eab9de33e7b8e2260b9538bedb57c9bd6fbb278f3
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
 F ext/recover/recoverclobber.test 294dcc894124ab4ca3a7b35766630742a3d25810fceac22220beb64f70a33a60
 F ext/recover/recovercorrupt.test 6540aae95e17398dd70b44518367fd56588c44962cb276d2623a0fedba9efe9e
-F ext/recover/recovercorrupt2.test aae5329bd5e773895ad426a72100b290c06cc855704c7c7561369ea03742b5f0
+F ext/recover/recovercorrupt2.test c1a703d1612ff7ad8c9c2b86036c195f06ffa5663aedd7f6314074cdb5a56b1f
 F ext/recover/recoverfault.test 3a0a32b9fc216592b97775d69220695b0926980c0f7424b7a59144e47d7cb568
 F ext/recover/recoverfault2.test 321036336af23e778a87f148c4cc4407f88fbdab1fd72ddb661669be9020d36b
 F ext/recover/recoverold.test 46e9d99b595fac583d4c67f74d7d89c20a435c752ef6eeb3e918b599940c88e0
@@ -398,7 +398,7 @@ F ext/recover/recoverpgsz.test 93e970eab05e4e89f8fd6b1bd23f9ec137ea09857e66ba0d4
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
 F ext/recover/recoverslowidx.test f356bb9fba7ffd6fc50e045e419464f0129ac6e24decf6e919584f79c3493727
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
-F ext/recover/sqlite3recover.c 157f5c9dc198feb1f78f4c902e6073430bd48f747953e2330a58493f4fa5bfcf
+F ext/recover/sqlite3recover.c 5f7ace27d8e69d350a20171f13ebe964f090906ff0a74eb0fb4582c391c44dc5
 F ext/recover/sqlite3recover.h f698ccc94bd4da38761035415ad08c4549a408491ff9fd5f52d34d2214f64e36
 F ext/recover/test_recover.c 61ec931e47abca6b2210f46239cafd9f3060741605e3d3c45a7c7a53f63dd957
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -2052,8 +2052,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 9ecc9d25ea62a7777bbf621989a5c577b612784121a20465cda4d4023fa9634d
-R 3096a83bfa4b844f97735d498da01d52
+P 44c0874c33e76ce708022e5c38c74f75565a8cea9f4c5b067cc0a54079aeee20
+R 2a9f1c8744e1f06e55a5b9eca0aedd6c
 U dan
-Z ed22d20a006d2a515bbb5bbd662f21b3
+Z 2859b7a2df62a00c975fd7e3b56edbdb
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 09daa9a138..10ccc61b4a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-44c0874c33e76ce708022e5c38c74f75565a8cea9f4c5b067cc0a54079aeee20
\ No newline at end of file
+347c575108bc8112613a02afda1247bdbed24c15def7eb412d0b27aba047715b
\ No newline at end of file

From 10f5525410201e06a262c93433cf629f30ea1e8a Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Thu, 27 Oct 2022 19:06:42 +0000
Subject: [PATCH 379/428] Fix another problem to do with recovering from
 in-memory databases.

FossilOrigin-Name: 5a7bfd4a217cd80882a1827674b479cdc547419a785e06e0ee82cb8cfca42701
---
 ext/recover/sqlite3recover.c |  4 ++--
 manifest                     | 12 ++++++------
 manifest.uuid                |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index 41aad84245..7e284931a3 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -2497,7 +2497,7 @@ static void recoverInstallWrapper(sqlite3_recover *p){
   recoverAssertMutexHeld();
   sqlite3_file_control(p->dbIn, p->zDb, SQLITE_FCNTL_FILE_POINTER, (void*)&pFd);
   assert( pFd==0 || pFd->pMethods!=&recover_methods );
-  if( pFd ){
+  if( pFd && pFd->pMethods ){
     int iVersion = 1 + (pFd->pMethods->iVersion>1 && pFd->pMethods->xShmMap!=0);
     recover_g.pMethods = pFd->pMethods;
     recover_g.p = p;
@@ -2515,7 +2515,7 @@ static void recoverUninstallWrapper(sqlite3_recover *p){
   recoverAssertMutexHeld();
   sqlite3_file *pFd = 0;
   sqlite3_file_control(p->dbIn, p->zDb,SQLITE_FCNTL_FILE_POINTER,(void*)&pFd);
-  if( pFd ){
+  if( pFd && pFd->pMethods ){
     pFd->pMethods = recover_g.pMethods;
     recover_g.pMethods = 0;
     recover_g.p = 0;
diff --git a/manifest b/manifest
index 4540f2893c..7d4485263d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthat\sthe\sVFS\swrapper\sin\sthe\srecover\sextension\sdoes\snot\sattempt\sto\sinvoke\sundefined\smethods\son\sthe\sunderlying\sVFS.
-D 2022-10-27T19:02:51.201
+C Fix\sanother\sproblem\sto\sdo\swith\srecovering\sfrom\sin-memory\sdatabases.
+D 2022-10-27T19:06:42.311
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -398,7 +398,7 @@ F ext/recover/recoverpgsz.test 93e970eab05e4e89f8fd6b1bd23f9ec137ea09857e66ba0d4
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
 F ext/recover/recoverslowidx.test f356bb9fba7ffd6fc50e045e419464f0129ac6e24decf6e919584f79c3493727
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
-F ext/recover/sqlite3recover.c 5f7ace27d8e69d350a20171f13ebe964f090906ff0a74eb0fb4582c391c44dc5
+F ext/recover/sqlite3recover.c b8f4b3a58bc81f2d31ca4645a7dddfc4dedd9a06e66471f827932cc63edc2bc0
 F ext/recover/sqlite3recover.h f698ccc94bd4da38761035415ad08c4549a408491ff9fd5f52d34d2214f64e36
 F ext/recover/test_recover.c 61ec931e47abca6b2210f46239cafd9f3060741605e3d3c45a7c7a53f63dd957
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -2052,8 +2052,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 44c0874c33e76ce708022e5c38c74f75565a8cea9f4c5b067cc0a54079aeee20
-R 2a9f1c8744e1f06e55a5b9eca0aedd6c
+P 347c575108bc8112613a02afda1247bdbed24c15def7eb412d0b27aba047715b
+R 8cb4c38216254872472236af72461bb8
 U dan
-Z 2859b7a2df62a00c975fd7e3b56edbdb
+Z 43cd6d4bbed8e35cf002f980c0324c18
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 10ccc61b4a..f0b1156329 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-347c575108bc8112613a02afda1247bdbed24c15def7eb412d0b27aba047715b
\ No newline at end of file
+5a7bfd4a217cd80882a1827674b479cdc547419a785e06e0ee82cb8cfca42701
\ No newline at end of file

From 676d1cda921f37561022813f09065ef140839e09 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Thu, 27 Oct 2022 20:27:45 +0000
Subject: [PATCH 380/428] Fix another crash in the recover extension triggered
 by a corrupt database.

FossilOrigin-Name: d125377378916fb3147612a536fde15ee955176eea9ea6eaa4a2ee5f1e8e1cbe
---
 ext/recover/dbdata.c             |   5 +-
 ext/recover/recovercorrupt2.test | 127 ++++++++++++++++++++++++++++++-
 ext/recover/sqlite3recover.c     |   2 +-
 manifest                         |  16 ++--
 manifest.uuid                    |   2 +-
 5 files changed, 139 insertions(+), 13 deletions(-)

diff --git a/ext/recover/dbdata.c b/ext/recover/dbdata.c
index 8b14890461..51fc2c037b 100644
--- a/ext/recover/dbdata.c
+++ b/ext/recover/dbdata.c
@@ -103,8 +103,8 @@ struct DbdataCursor {
 
   /* Only for the sqlite_dbdata table */
   u8 *pRec;                       /* Buffer containing current record */
-  int nRec;                       /* Size of pRec[] in bytes */
-  int nHdr;                       /* Size of header in bytes */
+  sqlite3_int64 nRec;             /* Size of pRec[] in bytes */
+  sqlite3_int64 nHdr;             /* Size of header in bytes */
   int iField;                     /* Current field number */
   u8 *pHdrPtr;
   u8 *pPtr;
@@ -639,6 +639,7 @@ static int dbdataNext(sqlite3_vtab_cursor *pCursor){
             }
     
             iHdr = dbdataGetVarintU32(pCsr->pRec, &nHdr);
+            if( nHdr>nPayload ) nHdr = 0;
             pCsr->nHdr = nHdr;
             pCsr->pHdrPtr = &pCsr->pRec[iHdr];
             pCsr->pPtr = &pCsr->pRec[pCsr->nHdr];
diff --git a/ext/recover/recovercorrupt2.test b/ext/recover/recovercorrupt2.test
index ef4bf5216a..20d4c39bcd 100644
--- a/ext/recover/recovercorrupt2.test
+++ b/ext/recover/recovercorrupt2.test
@@ -156,7 +156,6 @@ do_test 4.0 {
   |     16: 00 01 01 02 00 40 20 20 01 00 ff 00 42 01 10 01   .....@  ....B...
   |     32: ef 00 00 87 00 ff ff ff f0 01 01 10 ff ff 00 00   ................
   | end crash-00f2d3627f1b43.db
-  .recover
 }]} {}
 
 do_test 4.1 {
@@ -165,5 +164,131 @@ do_test 4.1 {
   list [catch { $R finish } msg] $msg
 } {1 {unable to open database file}}
 
+#-------------------------------------------------------------------------
+#
+reset_db
+do_test 5.0 {
+  sqlite3 db {}
+  db deserialize [decode_hexdb {
+.open --hexdb
+| size 16384 pagesize 4096 filename crash-7b75760a4c5f15.db
+| page 1 offset 0
+|      0: 53 51 4c 69 74 65 20 66 6f 72 6d 61 74 20 33 00   SQLite format 3.
+|     16: 10 00 01 01 00 40 20 20 00 00 00 00 00 00 00 04   .....@  ........
+|     32: 00 00 00 00 00 00 00 00 00 00 00 03 00 00 00 00   ................
+|     96: 00 00 00 00 0d 00 00 00 03 0f 4e 00 0f bc 0f 90   ..........N.....
+|    112: 0f 4e 00 00 00 00 00 00 00 00 00 00 00 00 00 00   .N..............
+|   3904: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 40 03   ..............@.
+|   3920: 06 17 11 11 01 6d 74 61 62 6c 65 74 32 74 32 04   .....mtablet2t2.
+|   3936: 43 52 45 41 54 45 20 54 41 42 4c 45 20 74 32 28   CREATE TABLE t2(
+|   3952: 78 2c 79 2c 7a 20 50 52 49 4d 41 52 59 20 4b 45   x,y,z PRIMARY KE
+|   3968: 59 29 20 57 49 54 48 4f 55 54 20 52 4f 57 49 44   Y) WITHOUT ROWID
+|   3984: 2a 02 06 17 13 11 01 3f 69 6e 64 65 78 74 31 61   *......?indext1a
+|   4000: 74 31 03 43 52 45 41 54 45 20 49 4e 44 45 58 20   t1.CREATE INDEX 
+|   4016: 74 31 61 20 4f 4e 20 74 31 28 61 29 42 01 06 17   t1a ON t1(a)B...
+|   4032: 11 11 01 71 74 61 62 6c 65 74 31 74 31 02 43 52   ...qtablet1t1.CR
+|   4048: 45 41 54 45 20 54 41 42 4c 45 20 74 31 28 61 20   EATE TABLE t1(a 
+|   4064: 49 4e 54 2c 62 20 54 45 58 54 2c 63 20 42 4c 4f   INT,b TEXT,c BLO
+|   4080: 42 2c 64 20 52 45 41 4c 29 20 53 54 52 49 43 54   B,d REAL) STRICT
+| page 2 offset 4096
+|      0: 0d 00 00 00 14 0c ae 00 0f df 0f bd 0f 9a 0f 76   ...............v
+|     16: 0f 51 0f 2b 0f 04 0e dc 0e b3 0e 89 0e 5e 0e 32   .Q.+.........^.2
+|     32: 0e 05 0d 1a 0d a8 0d 78 0d 47 0d 15 0c e2 00 00   .......x.G......
+|   3232: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 32 14   ..............2.
+|   3248: 05 06 3f 34 07 15 f4 c9 23 af e2 b3 b6 61 62 63   ..?4....#....abc
+|   3264: 30 32 30 78 79 7a 01 00 00 00 00 00 00 00 00 00   020xyz..........
+|   3280: 00 00 00 00 00 00 00 00 00 00 c3 b0 96 7e fb 4e   .............~.N
+|   3296: c5 4c 31 13 05 06 1f 32 07 dd f2 2a a5 7e b2 4d   .L1....2...*.~.M
+|   3312: 82 61 62 63 30 31 39 78 79 7a 01 00 00 00 00 00   .abc019xyz......
+|   3328: 00 00 00 00 00 00 00 00 00 00 00 00 00 c3 a3 d6   ................
+|   3344: e9 f1 c2 fd f3 30 12 05 06 1f 30 07 8f 8f f5 c4   .....0....0.....
+|   3360: 35 b6 7f 8d 61 62 63 30 31 38 00 00 00 00 00 00   5...abc018......
+|   3376: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 43   ...............C
+|   3392: b2 13 1f 9d 56 8a 47 21 b1 05 06 1f 2e 07 7f 46   ....V.G!.......F
+|   3408: 91 03 3f 97 fb f7 61 62 63 30 00 00 00 00 00 00   ..?...abc0......
+|   3440: c3 bb d8 96 86 c2 e8 2b 2e 10 05 06 1f 2c 07 6d   .......+.....,.m
+|   3456: 85 7b ce d0 32 d2 54 61 62 63 30 00 00 00 00 00   ....2.Tabc0.....
+|   3488: 43 a1 eb 44 14 dc 03 7b 2d 0f 05 06 1f 2a 07 d9   C..D....-....*..
+|   3504: ab ec bf 34 51 70 f3 61 62 63 30 31 35 78 79 7a   ...4Qp.abc015xyz
+|   3520: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 c3   ................
+|   3536: b6 3d f4 46 b1 6a af 2c 0e 05 06 1f 28 07 36 75   .=.F.j.,....(.6u
+|   3552: e9 a2 bd 05 04 ea 61 62 63 30 31 34 78 79 7a 00   ......abc014xyz.
+|   3568: 00 00 00 00 00 00 00 00 00 00 00 00 00 c3 ab 23   ...............#
+|   3584: a7 6a 34 ca f8 2b 0d 05 06 1f 26 07 48 45 ab e0   .j4..+....&.HE..
+|   3600: 8c 7c ff 0c 61 62 63 30 31 33 78 79 7a 00 00 00   .|..abc013xyz...
+|   3616: 00 00 00 00 0d d0 00 00 00 00 43 b8 d3 93 f4 92   ..........C.....
+|   3632: 5b 7a 2a 0c 05 06 1f 24 07 be 6d 1e db 61 5d 80   [z*....$..m..a].
+|   3648: 9f 61 62 63 30 31 32 78 79 7a 00 00 00 00 00 00   .abc012xyz......
+|   3664: 00 00 00 00 00 00 43 b5 a1 a4 af 7b c6 60 29 0b   ......C......`).
+|   3680: 05 06 1f 22 07 6e a2 a3 64 68 d4 a6 bd 61 62 63   .....n..dh...abc
+|   3696: 30 31 31 78 79 7a 00 00 00 00 00 00 00 00 00 00   011xyz..........
+|   3712: 00 c3 c4 1e ff 0f fc e6 ff 28 0a 05 06 1f 20 07   .........(.... .
+|   3728: 50 f9 4a bb a5 7a 1e ca 61 62 63 30 31 30 78 79   P.J..z..abc010xy
+|   3744: 7a 00 00 00 00 00 00 00 00 00 00 c3 a7 90 ed d9   z...............
+|   3760: 5c 2c d5 27 09 05 06 1f 1e 07 90 8e 1d d9 1c 3a   .,.'...........:
+|   3776: e8 c1 61 62 63 30 30 39 78 79 7a 00 00 00 00 00   ..abc009xyz.....
+|   3792: 00 00 00 00 43 a7 97 87 cf b0 ff 79 26 08 05 06   ....C......y&...
+|   3808: 1f 1c 07 86 65 f6 7c 50 7a 2c 76 61 62 63 30 30   ....e.|Pz,vabc00
+|   3824: 38 78 79 7a 00 00 00 00 00 00 00 00 c3 b0 e3 4c   8xyz...........L
+|   3840: 4f d3 41 b5 25 07 05 06 1f 1a 07 8b 20 e5 68 11   O.A.%....... .h.
+|   3856: 13 55 87 61 62 63 30 30 37 78 79 7a 00 00 00 00   .U.abc007xyz....
+|   3872: 00 00 00 c3 b6 a3 74 f1 9c 33 f8 24 06 05 06 1f   ......t..3.$....
+|   3888: 18 07 97 3c bc 34 49 94 54 ab 61 62 63 30 30 36   ...<.4I.T.abc006
+|   3904: 78 79 7a 00 00 00 00 00 00 c3 88 00 c2 ca 4c 4d   xyz...........LM
+|   3920: d3 23 05 05 06 1f 16 07 59 37 11 10 e9 e5 3d d5   .#......Y7....=.
+|   3936: 61 62 63 30 30 35 78 79 7a 00 00 00 00 00 c3 c0   abc005xyz.......
+|   3952: 15 12 67 ed 4b 79 22 04 05 06 1f 14 07 93 39 01   ..g.Ky........9.
+|   3968: 7f b8 c7 99 58 61 62 63 30 30 34 78 79 7a 00 00   ....Xabc004xyz..
+|   3984: 09 c0 43 bf e0 e7 6d 70 fd 61 21 03 05 06 1f 12   ..C...mp.a!.....
+|   4000: 07 b6 df 8d 8b 27 08 22 5a 61 62 63 30 30 33 78   .....'..Zabc003x
+|   4016: 79 7a 00 00 00 c3 c7 ea 0f dc dd 32 22 20 02 05   yz.........2. ..
+|   4032: 06 1f 10 07 2f a6 da 71 df 66 b3 b5 61 62 63 30   ..../..q.f..abc0
+|   4048: 30 32 78 79 7a 00 00 c3 ce d9 8d e9 ec 20 45 1f   02xyz........ E.
+|   4064: 01 05 06 1f 0e 07 5a 47 53 20 3b 48 8f c0 61 62   ......ZGS ;H..ab
+|   4080: 63 30 30 31 78 79 7a 00 c3 c9 e6 81 f8 d9 24 04   c001xyz.......$.
+| page 3 offset 8192
+|      0: 0a 00 00 00 14 0e fd 00 0f f3 0f e6 0f d9 0f cc   ................
+|     16: 0f bf 0f b2 0f a5 0f 98 0f 8b 0f 7e 0f 71 0f 64   ...........~.q.d
+|     32: 0f 57 0f 4a 0f 3d 0f 30 0f 24 00 00 00 00 00 00   .W.J.=.0.$......
+|   3824: 00 00 00 00 00 00 00 00 00 00 00 00 00 0c 03 06   ................
+|   3840: 01 7f 46 91 03 3f 97 fb f7 11 0c 03 06 01 6e a2   ..F..?........n.
+|   3856: a3 64 68 d4 a6 bd 0b 0c 03 06 01 6d 85 7b ce d0   .dh........m....
+|   3872: 32 d2 54 10 0b 03 06 09 5a 47 53 20 3b 48 8f c0   2.T.....ZGS ;H..
+|   3888: 0c 03 06 01 59 37 11 10 e9 e5 3d d5 05 0c 03 06   ....Y7....=.....
+|   3904: 01 50 f9 4a bb a5 7a 1e ca 0a 0c 03 06 01 48 45   .P.J..z.......HE
+|   3920: ab e0 8c 7c ff 0c 0d 0c 03 06 01 36 75 e9 a2 bd   ...|.......6u...
+|   3936: 05 04 ea 0e 0c 03 06 01 2f a6 da 71 df 66 b3 b5   ......../..q.f..
+|   3952: 02 0c 03 06 01 15 f4 c9 23 af e2 b3 b6 14 0c 03   ........#.......
+|   3968: 06 01 dd f2 2a a5 7e b2 4d 82 13 0c 03 06 01 d9   ....*.~.M.......
+|   3984: ab ec bf 34 51 70 f3 0f 0c 03 06 01 be 6d 1e db   ...4Qp.......m..
+|   4000: 61 5d 80 9f 0c 0c 03 06 01 b6 df 8d 8b 27 08 22   a]...........'..
+|   4016: 5a 03 0c 03 06 01 97 3c bc 34 49 94 54 ab 06 0c   Z......<.4I.T...
+|   4032: 03 06 01 93 39 01 7f b8 c7 99 58 04 0c 03 06 01   ....9.....X.....
+|   4048: 90 8e 1d d9 1c 3a e8 c1 09 0c 03 06 01 8f 8f f5   .....:..........
+|   4064: c4 35 b6 7f 8d 12 0c 03 06 01 8b 20 e5 68 11 13   .5......... .h..
+|   4080: 55 87 07 0c 03 06 01 86 65 f6 7c 50 7a 2b 06 08   U.......e.|Pz+..
+| page 4 offset 12288
+|      0: 0a 00 00 00 14 0f 62 00 0f 7a 0f a1 0f c9 0f d9   ......b..z......
+|     16: 0f 81 0f d1 0f f1 0f f9 0f e1 0f 89 0e 6a 0f c1   .............j..
+|     32: 0f 91 0f 99 0f b9 0f 72 0f 62 0f e9 0f b1 0f a9   .......r.b......
+|   3936: 00 00 07 04 01 01 01 11 0e 9e 07 04 01 01 01 0b   ................
+|   3952: 31 16 07 04 01 01 01 10 37 36 06 04 09 01 01 ab   1.......76......
+|   3968: 58 07 04 01 01 01 05 1c 28 07 04 01 01 01 0a 10   X.......(.......
+|   3984: cf 07 04 01 01 01 0d b2 e3 07 04 01 01 01 0e d3   ................
+|   4000: f2 07 04 01 01 01 02 41 ad 07 04 01 01 01 14 3e   .......A.......>
+|   4016: 22 07 04 01 01 01 13 27 45 07 04 01 01 01 0f ad   .......'E.......
+|   4032: dd 07 04 01 01 01 0c 2e a1 07 04 01 01 01 03 df   ................
+|   4048: e1 07 04 01 01 01 06 59 a7 07 04 01 01 01 04 27   .......Y.......'
+|   4064: bd 07 04 01 01 01 09 d0 e0 07 04 01 01 01 12 39   ...............9
+|   4080: 4f 07 04 01 01 01 07 c4 11 06 04 00 00 00 00 00   O...............
+| end crash-7b75760a4c5f15.db
+}]} {}
+
+do_test 5.1 {
+  set R [sqlite3_recover_init db main test.db2]
+  catch { $R run }
+  list [catch { $R finish } msg] $msg
+} {0 {}}
+
 finish_test
 
diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index 7e284931a3..d3783b3200 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -490,7 +490,7 @@ static sqlite3_stmt *recoverPreparePrintf(
 */
 static sqlite3_stmt *recoverReset(sqlite3_recover *p, sqlite3_stmt *pStmt){
   int rc = sqlite3_reset(pStmt);
-  if( rc!=SQLITE_OK && p->errCode==SQLITE_OK ){
+  if( rc!=SQLITE_OK && rc!=SQLITE_CONSTRAINT && p->errCode==SQLITE_OK ){
     recoverDbError(p, sqlite3_db_handle(pStmt));
   }
   return pStmt;
diff --git a/manifest b/manifest
index 7d4485263d..290eac5424 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sanother\sproblem\sto\sdo\swith\srecovering\sfrom\sin-memory\sdatabases.
-D 2022-10-27T19:06:42.311
+C Fix\sanother\scrash\sin\sthe\srecover\sextension\striggered\sby\sa\scorrupt\sdatabase.
+D 2022-10-27T20:27:45.594
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -385,12 +385,12 @@ F ext/rbu/rbuvacuum4.test a78898e438a44803eb2bc897ba3323373c9f277418e2d6d76e90f2
 F ext/rbu/sqlite3rbu.c 8737cabdfbee84bb25a7851ecef8b1312be332761238da9be6ddb10c62ad4291
 F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9cd389812
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
-F ext/recover/dbdata.c a7b75b53054d131355cb62fd00643fdafc561dfd1e9e9dd0710778e690579853
+F ext/recover/dbdata.c 4c36b75735ebb554bd44b91c8788c45131c6ae1c5e6153eaaf0a189a07eb2448
 F ext/recover/recover1.test e08dc7a0513eab9de33e7b8e2260b9538bedb57c9bd6fbb278f328d29a102827
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
 F ext/recover/recoverclobber.test 294dcc894124ab4ca3a7b35766630742a3d25810fceac22220beb64f70a33a60
 F ext/recover/recovercorrupt.test 6540aae95e17398dd70b44518367fd56588c44962cb276d2623a0fedba9efe9e
-F ext/recover/recovercorrupt2.test c1a703d1612ff7ad8c9c2b86036c195f06ffa5663aedd7f6314074cdb5a56b1f
+F ext/recover/recovercorrupt2.test a7e0735cefb79de7959ebd1ee6d963f9505305fe7983ac58394eb5f5aa9236c7
 F ext/recover/recoverfault.test 3a0a32b9fc216592b97775d69220695b0926980c0f7424b7a59144e47d7cb568
 F ext/recover/recoverfault2.test 321036336af23e778a87f148c4cc4407f88fbdab1fd72ddb661669be9020d36b
 F ext/recover/recoverold.test 46e9d99b595fac583d4c67f74d7d89c20a435c752ef6eeb3e918b599940c88e0
@@ -398,7 +398,7 @@ F ext/recover/recoverpgsz.test 93e970eab05e4e89f8fd6b1bd23f9ec137ea09857e66ba0d4
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
 F ext/recover/recoverslowidx.test f356bb9fba7ffd6fc50e045e419464f0129ac6e24decf6e919584f79c3493727
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
-F ext/recover/sqlite3recover.c b8f4b3a58bc81f2d31ca4645a7dddfc4dedd9a06e66471f827932cc63edc2bc0
+F ext/recover/sqlite3recover.c 69656992f1dd3b0645c30e465372bb73c6f64f9620845622424fec8f84a8b42b
 F ext/recover/sqlite3recover.h f698ccc94bd4da38761035415ad08c4549a408491ff9fd5f52d34d2214f64e36
 F ext/recover/test_recover.c 61ec931e47abca6b2210f46239cafd9f3060741605e3d3c45a7c7a53f63dd957
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -2052,8 +2052,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 347c575108bc8112613a02afda1247bdbed24c15def7eb412d0b27aba047715b
-R 8cb4c38216254872472236af72461bb8
+P 5a7bfd4a217cd80882a1827674b479cdc547419a785e06e0ee82cb8cfca42701
+R 4890ae4a27813f81579cbe6a09f4e6de
 U dan
-Z 43cd6d4bbed8e35cf002f980c0324c18
+Z 5b83e6d937b65a5473d327a12ed454d5
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f0b1156329..0e7b854a8e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5a7bfd4a217cd80882a1827674b479cdc547419a785e06e0ee82cb8cfca42701
\ No newline at end of file
+d125377378916fb3147612a536fde15ee955176eea9ea6eaa4a2ee5f1e8e1cbe
\ No newline at end of file

From c97bb14fab566f6fa8d967c8fd1e90f3702d5b73 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Thu, 27 Oct 2022 23:17:49 +0000
Subject: [PATCH 381/428] Fix a minor problem with sqlite_dbdata.

FossilOrigin-Name: 58c2e49279c8f77f006b0c2ce351776bc711633f9c1a39c7a37969838d49ec0b
---
 ext/recover/dbdata.c |  1 +
 manifest             | 14 +++++++-------
 manifest.uuid        |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ext/recover/dbdata.c b/ext/recover/dbdata.c
index 51fc2c037b..2ad7e639ce 100644
--- a/ext/recover/dbdata.c
+++ b/ext/recover/dbdata.c
@@ -770,6 +770,7 @@ static int dbdataFilter(
   assert( pCsr->iPgno==1 );
   if( idxNum & 0x01 ){
     zSchema = (const char*)sqlite3_value_text(argv[0]);
+    if( zSchema==0 ) zSchema = "";
   }
   if( idxNum & 0x02 ){
     pCsr->iPgno = sqlite3_value_int(argv[(idxNum & 0x01)]);
diff --git a/manifest b/manifest
index 290eac5424..b8b8f6549f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sanother\scrash\sin\sthe\srecover\sextension\striggered\sby\sa\scorrupt\sdatabase.
-D 2022-10-27T20:27:45.594
+C Fix\sa\sminor\sproblem\swith\ssqlite_dbdata.
+D 2022-10-27T23:17:49.777
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -385,7 +385,7 @@ F ext/rbu/rbuvacuum4.test a78898e438a44803eb2bc897ba3323373c9f277418e2d6d76e90f2
 F ext/rbu/sqlite3rbu.c 8737cabdfbee84bb25a7851ecef8b1312be332761238da9be6ddb10c62ad4291
 F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9cd389812
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
-F ext/recover/dbdata.c 4c36b75735ebb554bd44b91c8788c45131c6ae1c5e6153eaaf0a189a07eb2448
+F ext/recover/dbdata.c 76b4040547dc5f448f5d4599ccde8ab4311e0ab9df002adc410fef3f13fd822e
 F ext/recover/recover1.test e08dc7a0513eab9de33e7b8e2260b9538bedb57c9bd6fbb278f328d29a102827
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
 F ext/recover/recoverclobber.test 294dcc894124ab4ca3a7b35766630742a3d25810fceac22220beb64f70a33a60
@@ -2052,8 +2052,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 5a7bfd4a217cd80882a1827674b479cdc547419a785e06e0ee82cb8cfca42701
-R 4890ae4a27813f81579cbe6a09f4e6de
-U dan
-Z 5b83e6d937b65a5473d327a12ed454d5
+P d125377378916fb3147612a536fde15ee955176eea9ea6eaa4a2ee5f1e8e1cbe
+R d5cee1d1ee9e2bbc207468a746867276
+U drh
+Z b1ba27eaf6110056c2f716aa2713d00f
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 0e7b854a8e..cb240dd529 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d125377378916fb3147612a536fde15ee955176eea9ea6eaa4a2ee5f1e8e1cbe
\ No newline at end of file
+58c2e49279c8f77f006b0c2ce351776bc711633f9c1a39c7a37969838d49ec0b
\ No newline at end of file

From e681b651eb5cc1da2724ce73b84792b10039152b Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Fri, 28 Oct 2022 10:36:18 +0000
Subject: [PATCH 382/428] Minor sqlite3.oo1 API reorg prompted by documenting.

FossilOrigin-Name: 55237924ca363c5a3e0f8c82620eb6626a98311615866197375a86876b9da3a1
---
 ext/wasm/api/sqlite3-api-oo1.js  |  4 ++--
 ext/wasm/api/sqlite3-api-opfs.js |  6 +++---
 manifest                         | 16 ++++++++--------
 manifest.uuid                    |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index 0a6b48b6e7..bab5a64ef2 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -281,6 +281,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
   const DB = function(...args){
     dbCtorHelper.apply(this, args);
   };
+  DB.dbCtorHelper = dbCtorHelper;
 
   /**
      Internal-use enum for mapping JS types to DB-bindable types.
@@ -1656,8 +1657,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
       ooApi: "0.1"
     },
     DB,
-    Stmt,
-    dbCtorHelper
+    Stmt
   }/*oo1 object*/;
 
   if(util.isUIThread()){
diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index 3f27941e8b..41efe0ab6d 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -948,12 +948,12 @@ const installOpfsVfs = function callee(options){
 
     if(sqlite3.oo1){
       opfsUtil.OpfsDb = function(...args){
-        const opt = sqlite3.oo1.dbCtorHelper.normalizeArgs(...args);
+        const opt = sqlite3.oo1.DB.dbCtorHelper.normalizeArgs(...args);
         opt.vfs = opfsVfs.$zName;
-        sqlite3.oo1.dbCtorHelper.call(this, opt);
+        sqlite3.oo1.DB.dbCtorHelper.call(this, opt);
       };
       opfsUtil.OpfsDb.prototype = Object.create(sqlite3.oo1.DB.prototype);
-      sqlite3.oo1.dbCtorHelper.setVfsPostOpenSql(
+      sqlite3.oo1.DB.dbCtorHelper.setVfsPostOpenSql(
         opfsVfs.pointer,
         [
           /* Truncate journal mode is faster than delete or wal for
diff --git a/manifest b/manifest
index b8b8f6549f..91bcc1f863 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sminor\sproblem\swith\ssqlite_dbdata.
-D 2022-10-27T23:17:49.777
+C Minor\ssqlite3.oo1\sAPI\sreorg\sprompted\sby\sdocumenting.
+D 2022-10-28T10:36:18.816
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -500,8 +500,8 @@ F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1
 F ext/wasm/api/pre-js.js 151e0616614a49f3db19ed544fa13b38c87c108959fbcd4029ea8399a562d94f
 F ext/wasm/api/sqlite3-api-cleanup.js 4d07a7524dc9b7b050acfde57163e839243ad2383bd7ee0de0178b1b3e988588
 F ext/wasm/api/sqlite3-api-glue.js f024dc2f41418ad203edf1228d7cf7934249c11ffcbb65d21f9bb69333d63d55
-F ext/wasm/api/sqlite3-api-oo1.js 38004e18001396c078124769e14737a0ff703f98317279734020121af72efdd5
-F ext/wasm/api/sqlite3-api-opfs.js 62da8b7cac30d4e7bb940762d2ac948b0aeb89704a5a290b74eb268ecbd1a64e
+F ext/wasm/api/sqlite3-api-oo1.js 9ae79193d05712f9883a3e1a1a54f0620354aeb85fef5850fad5e4a9437a5b4d
+F ext/wasm/api/sqlite3-api-opfs.js a4316c04b2eb6ae69fc9a8b33f1d0ff22a0398665d98e6504ee13221cbf5cc5b
 F ext/wasm/api/sqlite3-api-prologue.js 7f7c2f516d3ed39b3761ad8a6de86dc703b6c2678de6d078defcdc52df48cc27
 F ext/wasm/api/sqlite3-api-worker1.js b2d650514ccc75f80dff666fd3ee68dc8fb4137bcd01caac2c62ff93a7ebf638
 F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
@@ -2052,8 +2052,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 d125377378916fb3147612a536fde15ee955176eea9ea6eaa4a2ee5f1e8e1cbe
-R d5cee1d1ee9e2bbc207468a746867276
-U drh
-Z b1ba27eaf6110056c2f716aa2713d00f
+P 58c2e49279c8f77f006b0c2ce351776bc711633f9c1a39c7a37969838d49ec0b
+R dab7258db99e87600cc7587ad7416655
+U stephan
+Z 4f2c2ebef52736f5acf8b48e5d4ac065
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index cb240dd529..3eabfb83ca 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-58c2e49279c8f77f006b0c2ce351776bc711633f9c1a39c7a37969838d49ec0b
\ No newline at end of file
+55237924ca363c5a3e0f8c82620eb6626a98311615866197375a86876b9da3a1
\ No newline at end of file

From f03ddcca3282b7d8fd2cd6e2f8caa142e5cc5be8 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Fri, 28 Oct 2022 11:40:46 +0000
Subject: [PATCH 383/428] Add ext/wasm/module-symbols.html. Adjacent minor JS
 touchups.

FossilOrigin-Name: 24f12e681e06e3b71a6ac9c82255fe0270953a74c711405841f7e385eeafe874
---
 ext/wasm/api/sqlite3-api-glue.js     |  28 +--
 ext/wasm/api/sqlite3-api-prologue.js |  25 ++-
 ext/wasm/common/SqliteTestUtil.js    |   8 +-
 ext/wasm/index.html                  |   3 +
 ext/wasm/module-symbols.html         | 307 +++++++++++++++++++++++++++
 manifest                             |  19 +-
 manifest.uuid                        |   2 +-
 7 files changed, 351 insertions(+), 41 deletions(-)
 create mode 100644 ext/wasm/module-symbols.html

diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index d096af1c89..16840e79f3 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -104,6 +104,10 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
         : fI64Disabled(e[0]);
     }
 
+    /* There's no(?) need to expose bindingSignatures to clients,
+       implicitly making it part of the public interface. */
+    delete wasm.bindingSignatures;
+
     if(wasm.exports.sqlite3_wasm_db_error){
       util.sqlite3_wasm_db_error = capi.wasm.xWrap(
         'sqlite3_wasm_db_error', 'int', 'sqlite3*', 'int', 'string'
@@ -115,20 +119,20 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
       };
     }
 
-    /**
-       When registering a VFS and its related components it may be
-       necessary to ensure that JS keeps a reference to them to keep
-       them from getting garbage collected. Simply pass each such value
-       to this function and a reference will be held to it for the life
-       of the app.
-    */
-    capi.sqlite3_vfs_register.addReference = function f(...args){
-      if(!f._) f._ = [];
-      f._.push(...args);
-    };
-
   }/*xWrap() bindings*/;
 
+  /**
+     When registering a VFS and its related components it may be
+     necessary to ensure that JS keeps a reference to them to keep
+     them from getting garbage collected. Simply pass each such value
+     to this function and a reference will be held to it for the life
+     of the app.
+  */
+  capi.sqlite3_vfs_register.addReference = function f(...args){
+    if(!f._) f._ = [];
+    f._.push(...args);
+  };
+
   /**
      Internal helper to assist in validating call argument counts in
      the hand-written sqlite3_xyz() wrappers. We do this only for
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 96b2fa019d..05305db22a 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -1042,25 +1042,24 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
       //set: wasm.exports.sqlite3_wasm_pstack_restore
     },
     /**
-      Resolves to the total number of bytes available in the pstack,
-      including any space which is currently allocated. This value is
-      a compile-time constant.
+       sqlite3.wasm.pstack.quota to the total number of bytes
+       available in the pstack, including any space which is currently
+       allocated. This value is a compile-time constant.
     */
     quota: {
       configurable: false, iterable: true, writeable: false,
       get: wasm.exports.sqlite3_wasm_pstack_quota
-    }    
+    },
+    /**
+       sqlite3.wasm.pstack.remaining resolves to the amount of space
+       remaining in the pstack.
+    */
+    remaining: {
+      configurable: false, iterable: true, writeable: false,
+      get: wasm.exports.sqlite3_wasm_pstack_remaining
+    }
   })/*wasm.pstack properties*/;
 
-  /**
-     sqlite3.wasm.pstack.remaining resolves to the amount of
-     space remaining in the pstack.
-  */
-  Object.defineProperty(wasm.pstack, 'remaining', {
-    configurable: false, iterable: true, writeable: false,
-    get: wasm.exports.sqlite3_wasm_pstack_remaining
-  });
-
   /**
      An Error subclass specifically for reporting DB-level errors and
      enabling clients to unambiguously identify such exceptions.
diff --git a/ext/wasm/common/SqliteTestUtil.js b/ext/wasm/common/SqliteTestUtil.js
index 08688fd487..5ed423785b 100644
--- a/ext/wasm/common/SqliteTestUtil.js
+++ b/ext/wasm/common/SqliteTestUtil.js
@@ -172,13 +172,9 @@
     ],
     //onRuntimeInitialized: function(){},
     /* Proxy for C-side stdout output. */
-    print: function(){
-      console.log.apply(console, Array.prototype.slice.call(arguments));
-    },
+    print: (...args)=>{console.log(...args)},
     /* Proxy for C-side stderr output. */
-    printErr: function(){
-      console.error.apply(console, Array.prototype.slice.call(arguments));
-    },
+    printErr: (...args)=>{console.error(...args)},
     /**
        Called by the Emscripten module init bits to report loading
        progress. It gets passed an empty argument when loading is done
diff --git a/ext/wasm/index.html b/ext/wasm/index.html
index 7df2c601f5..044cd1360d 100644
--- a/ext/wasm/index.html
+++ b/ext/wasm/index.html
@@ -82,6 +82,9 @@
         </li>
         <li>The obligatory "misc." category...
           <ul>
+            <li><a href='module-symbols.html'>module-symbols</a> gives
+              a high-level overview of the symbols exposed by the JS
+              module.</li>
             <li><a href='batch-runner.html'>batch-runner</a>: runs batches of SQL exported from speedtest1.</li>
             <!--li><a href='scratchpad-wasmfs-main.html'>scratchpad-wasmfs-main</a>:
               experimenting with WASMFS/OPFS-based persistence. Maintenance
diff --git a/ext/wasm/module-symbols.html b/ext/wasm/module-symbols.html
new file mode 100644
index 0000000000..e77866a5e7
--- /dev/null
+++ b/ext/wasm/module-symbols.html
@@ -0,0 +1,307 @@
+<!doctype html>
+<html lang="en-us">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
+    <script src="jswasm/sqlite3.js"></script>
+    <title>sqlite3 Module Symbols</title>
+  </head>
+  <body>
+<div class="fossil-doc" data-title="sqlite3 Module Symbols">
+  <style>
+    .pseudolist {
+        column-count: auto;
+        column-width: 20rem;
+        column-gap: 1.5em;
+        width: 95%;
+        margin: auto;
+    }
+    .pseudolist > span {
+        font-family: monospace;
+        margin: 0.25em 0;
+        display: block;
+    }
+    .pseudolist.wrap-anywhere {
+        overflow-wrap: anywhere;
+    }
+    .warning { color: firebrick }
+    .error { color: firebrick; background-color: yellow}
+    .hidden, .initially-hidden {
+        position: absolute !important;
+        opacity: 0 !important;
+        pointer-events: none !important;
+        display: none !important;
+    }
+    h1::before, h2::before, h3::before, h4::before {
+        /* Remove automatic numbering */
+        content: "" !important;
+        background-color: transparent !important;
+        margin: 0 !important;
+        border: 0 !important;
+        padding: 0 !important;
+    }
+    .func-wasm {
+        
+    }
+    .func-wasm::after {
+        content: "*";
+        color: blue;
+    }
+  </style>
+  <p id='module-load-status'><strong>Loading WASM module...</strong>
+    If this takes "a long time" it may have failed and the browser's
+    dev console may contain hints as to why.
+  </p>
+
+  <p>
+    This page lists the SQLite3 APIs exported
+    by <code>sqlite3.wasm</code> and exposed to clients
+    by <code>sqlite3.js</code>. These lists are generated dynamically
+    by loading the JS/WASM module and introspecting it, with the following
+    caveats:
+  </p>
+
+  <ul>
+    <li>Some APIs are explicitly filtered out of these lists because
+      they are strictly for internal use within the JS/WASM APIs and
+      its own test code.
+    </li>
+    <li>This page runs in the main UI thread so cannot see features
+      which are only available in a Worker thread. If this page were
+      to function via a Worker, it would not be able to see
+      functionality only available in the main thread. Starting a
+      Worker here to fetch those symbols requires loading a second
+      copy of the sqlite3 WASM module and JS code.
+    </li>
+  </ul>
+
+  <div class='initially-hidden'>
+
+    <p>This page exposes a global symbol named <code>sqlite3</code>
+      which can be inspected using the browser's dev tools.
+    </p>
+
+    <p>Jump to...</p>
+    <ul>
+      <li><a href='#sqlite3-namespace'><code>sqlite3</code> namespace</a></li>
+      <li><a href='#sqlite3-version'><code>sqlite3.version</code></a></li>
+      <li><a href='#sqlite3-functions'><code>sqlite3_...()</code> functions</a></li>
+      <li><a href='#sqlite3-constants'><code>SQLITE_...</code> functions</a></li>
+      <li><a href='#sqlite3.oo1'><code>sqlite3.oo1</code></a>
+        <!--ul>
+          <li><a href='#sqlite3.oo1.DB'><code>sqlite3.oo1.DB</code></a></li>
+          <li><a href='#sqlite3.oo1.Stmt'><code>sqlite3.oo1.Stmt</code></a></li>
+        </ul-->
+      </li>
+      <li><a href='#sqlite3.capi.wasm'><code>sqlite3.capi.wasm</code></a></li>
+      <li><a href='#sqlite3.capi.wasm.pstack'><code>sqlite3.capi.wasm.pstack</code></a></li>
+      <li><a href='#compile-options'>Compilation options used in this module build.</a></li>
+    </ul>
+
+    <a id="sqlite3-namespace"></a>
+    <h1><code>sqlite3</code> Namespace</h1>
+    <p>
+      The <code>sqlite3</code> namespace object exposes the following...
+    </p>
+    <div id='list-namespace' class='pseudolist'></div>
+
+    <a id="sqlite3-version"></a>
+    <h1><code>sqlite3.version</code></h1>
+    <p>
+      The <code>sqlite3.version</code> object exposes the following...
+    </p>
+    <div id='list-version' class='pseudolist wrap-anywhere'></div>
+    
+    <a id="sqlite3-functions"></a>
+    <h1><code>sqlite3_...()</code> Function List</h1>
+    
+    <p>The <code>sqlite3.capi</code> object exposes the following
+      <a href='https://sqlite.org/c3ref/funclist.html'><code>sqlite3_...()</code>
+        functions</a>...
+    </p>
+    <div id='list-functions' class='pseudolist'></div>
+    <p>
+      <code class='func-wasm'></code> = function is specific to the JS/WASM
+      bindings, not part of the C API.
+    </p>
+
+    <a id="sqlite3-constants"></a>
+    <h1><code>SQLITE_...</code> Constants</h1>
+
+    <p>The <code>sqlite3.capi</code> object exposes the following
+      <a href='https://sqlite.org/c3ref/constlist.html'><code>SQLITE_...</code>
+        constants</a>...
+    </p>
+    <div id='list-constants' class='pseudolist'></div>
+
+    <a id="sqlite3.oo1"></a>
+    <h1><code>sqlite3.oo1</code></h1>
+    <p>
+      The <code>sqlite3.oo1</code> object exposes the following...
+    </p>
+    <div id='list-oo1' class='pseudolist'></div>
+
+    <a id="sqlite3.capi.wasm"></a>
+    <h1><code>sqlite3.capi.wasm</code></h1>
+    <p>
+      The <code>sqlite3.capi.wasm</code> object exposes the
+      following...
+    </p>
+    <div id='list-wasm' class='pseudolist'></div>
+
+    <a id="sqlite3.capi.wasm.pstack"></a>
+    <h1><code>sqlite3.capi.wasm.pstack</code></h1>
+    <p>
+      The <code>sqlite3.capi.wasm.pstack</code> object exposes the
+      following...
+    </p>
+    <div id='list-wasm-pstack' class='pseudolist'></div>
+
+    <a id="compile-options"></a>
+    <h1>Compilation Options</h1>
+    <p>
+      Compilation options used in this build of <code>sqlite3.wasm</code>...
+    </p>
+    <div id='list-compile-options' class='pseudolist'></div>
+
+  </div><!-- .initially-hidden -->
+  <script>(async function(){
+    const eNew = (tag,parent)=>{
+        const e = document.createElement(tag);
+        if(parent) parent.appendChild(e);
+        return e;
+    };
+    const eLi = (label,parent)=>{
+        const e = eNew('span',parent);
+        e.innerText = label;
+        return e;
+    };
+    const E = (sel)=>document.querySelector(sel);
+    const EAll = (sel)=>document.querySelectorAll(sel);
+    const eFuncs = E('#list-functions'),
+          eConst = E('#list-constants');
+    const renderConst = function(name){
+        eLi(name, eConst);
+    };
+    const renderFunc = function(name){
+        let lbl = name+'()';
+        const e = eLi(lbl, eFuncs);;
+        if(name.startsWith('sqlite3_js')
+           || name.startsWith('sqlite3_wasm')){
+            e.classList.add('func-wasm');
+        }
+    };
+    const renderGeneric = function(name,value,eParent){
+        let lbl;
+        if(value instanceof Function) lbl = name+'()';
+        else{
+            switch(typeof value){
+                case 'number': case 'boolean': case 'string':
+                    lbl = name+' = '+JSON.stringify(value);
+                    break;
+                default:
+                    lbl = name + ' ['+(typeof value)+']';
+            }
+        }
+        const e = eLi(lbl, eParent);
+        if(name.startsWith('sqlite3_wasm')){
+            e.classList.add('func-wasm');
+        }
+    };
+    const renderIt = async function(sqlite3){
+        self.sqlite3 = sqlite3;
+        console.warn("sqlite3 installed as global symbol self.sqlite3.");
+        const capi = sqlite3.capi;
+        const cmpIcase = (a,b)=>a.toLowerCase().localeCompare(b.toLowerCase());
+        const renderX = function(tgtElem, container, keys){
+            for(const k of keys.sort(cmpIcase)){
+                renderGeneric(k, container[k], tgtElem);
+            }
+        };
+        
+        const excludeNamespace = ['scriptInfo','StructBinder'];
+        renderX(
+            E('#list-namespace'), sqlite3,
+            Object.keys(sqlite3)
+                .filter((v)=>excludeNamespace.indexOf(v)<0)
+        );
+        renderX(
+            E('#list-version'), sqlite3.version,
+            Object.keys(sqlite3.version)
+        );
+
+        /* sqlite3_...() and SQLITE_... */
+        const lists = {c: [], f: []};
+        for(const [k,v] of Object.entries(capi)){
+            if(k.startsWith('SQLITE_')) lists.c.push(k);
+            else if(k.startsWith('sqlite3_')) lists.f.push(k);
+        }
+        const excludeCapi = [
+            'sqlite3_wasmfs_filename_is_persistent',
+            'sqlite3_wasmfs_opfs_dir'
+        ];
+        lists.c.sort().forEach(renderConst);
+        lists.f
+            .filter((v)=>excludeCapi.indexOf(v)<0)
+            .sort()
+            .forEach(renderFunc);
+        lists.c = lists.f = null;
+
+        renderX(E('#list-oo1'), sqlite3.oo1,
+                Object.keys(sqlite3.oo1) );
+
+        const excludeWasm = ['ctype'];
+        renderX(E('#list-wasm'),
+                capi.wasm,
+                Object.keys(capi.wasm)
+                .filter((v)=>{
+                    return !v.startsWith('sqlite3_wasm_')
+                        && excludeWasm.indexOf(v)<0;
+                }));
+        const psKeys = Object.keys(capi.wasm.pstack);
+        psKeys.push('pointer','quota','remaining');
+        renderX(E('#list-wasm-pstack'), capi.wasm.pstack, psKeys);
+
+        const cou = capi.wasm.compileOptionUsed();
+        renderX(E('#list-compile-options'), cou, Object.keys(cou));
+    };
+
+    /**
+       This is a module object for use with the emscripten-installed
+       sqlite3InitModule() factory function.
+    */
+    const myModule = {
+        print: (...args)=>{console.log(...args)},
+        printErr: (...args)=>{console.error(...args)},
+        /**
+           Called by the Emscripten module init bits to report loading
+           progress. It gets passed an empty argument when loading is done
+           (after onRuntimeInitialized() and any this.postRun callbacks
+           have been run).
+        */
+        setStatus: function f(text){
+            if(!f.last){
+                f.last = { text: '', step: 0 };
+                f.ui = {
+                    status: E('#module-load-status')
+                };
+            }
+            if(text === f.last.text) return;
+            f.last.text = text;
+            ++f.last.step;
+            if(text) {
+                f.ui.status.classList.remove('hidden');
+                f.ui.status.innerText = text;
+            }else{
+                f.ui.status.classList.add('hidden');
+                EAll('.initially-hidden').forEach((e)=>{
+                    e.classList.remove('initially-hidden');
+                });
+            }
+        }
+    }/*myModule*/;
+    self.sqlite3InitModule(myModule).then(renderIt);
+})();</script>
+</div><!-- .fossil-doc -->
+</body></html>
diff --git a/manifest b/manifest
index 91bcc1f863..d8b26a700f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\ssqlite3.oo1\sAPI\sreorg\sprompted\sby\sdocumenting.
-D 2022-10-28T10:36:18.816
+C Add\sext/wasm/module-symbols.html.\sAdjacent\sminor\sJS\stouchups.
+D 2022-10-28T11:40:46.460
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -499,10 +499,10 @@ F ext/wasm/api/post-js-footer.js cd0a8ec768501d9bd45d325ab0442037fb0e33d1f3b4f08
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
 F ext/wasm/api/pre-js.js 151e0616614a49f3db19ed544fa13b38c87c108959fbcd4029ea8399a562d94f
 F ext/wasm/api/sqlite3-api-cleanup.js 4d07a7524dc9b7b050acfde57163e839243ad2383bd7ee0de0178b1b3e988588
-F ext/wasm/api/sqlite3-api-glue.js f024dc2f41418ad203edf1228d7cf7934249c11ffcbb65d21f9bb69333d63d55
+F ext/wasm/api/sqlite3-api-glue.js c47e86a1b91917cf37de8386e4a94669612565df7f35a5ad7e04028330e5db54
 F ext/wasm/api/sqlite3-api-oo1.js 9ae79193d05712f9883a3e1a1a54f0620354aeb85fef5850fad5e4a9437a5b4d
 F ext/wasm/api/sqlite3-api-opfs.js a4316c04b2eb6ae69fc9a8b33f1d0ff22a0398665d98e6504ee13221cbf5cc5b
-F ext/wasm/api/sqlite3-api-prologue.js 7f7c2f516d3ed39b3761ad8a6de86dc703b6c2678de6d078defcdc52df48cc27
+F ext/wasm/api/sqlite3-api-prologue.js 968c7204ff7357b4565e166c7f39600132b08e4050094fa4d8c014a12a5bdd3e
 F ext/wasm/api/sqlite3-api-worker1.js b2d650514ccc75f80dff666fd3ee68dc8fb4137bcd01caac2c62ff93a7ebf638
 F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
 F ext/wasm/api/sqlite3-opfs-async-proxy.js f04cb1eb483c92bc61fe02749f7afcf17ec803968171aedd7d96faf428c26bcb
@@ -512,7 +512,7 @@ F ext/wasm/api/sqlite3-worker1-promiser.js 0c7a9826dbf82a5ed4e4f7bf7816e825a52af
 F ext/wasm/api/sqlite3-worker1.js dbe54b69c1520a2d25eae148cd2750ded2dd7f219ea4ee46f83e0a851dca5974
 F ext/wasm/batch-runner.html 4deeed44fe41496dc6898d9fb17938ea3291f40f4bfb977e29d0cef96fbbe4c8
 F ext/wasm/batch-runner.js 5bae81684728b6be157d1f92b39824153f0fd019345b39f2ab8930f7ee2a57d8
-F ext/wasm/common/SqliteTestUtil.js 647bf014bd30bdd870a7e9001e251d12fc1c9ec9ce176a1004b838a4b33c5c05
+F ext/wasm/common/SqliteTestUtil.js d8bf97ecb0705a2299765c8fc9e11b1a5ac7f10988bbf375a6558b7ca287067b
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 739b58c44511f642f16f57b701c84dc9ee412d8bc47b3d8a99d947babfa69d9d
 F ext/wasm/common/whwasmutil.js 77930367c2a65cf6fd6f99ad3644ede33e4d20466f5e506eb87b8d101a0a7655
@@ -532,9 +532,10 @@ F ext/wasm/fiddle/fiddle-worker.js 41b9796d689fabbef1ad9447496d14645eeb4101b534e
 F ext/wasm/fiddle/fiddle.js 974b995119ac443685d7d94d3b3c58c6a36540e9eb3fed7069d5653284071715
 F ext/wasm/fiddle/index.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
 F ext/wasm/index-dist.html cb0da16cba0f21cda2c25724c5869102d48eb0af04446acd3cd0ca031f80ed19
-F ext/wasm/index.html 6ac073d45d7602e1d8a5b493ce4204dc4a6c5594fdeeb12dec38c4e36ce473ad
+F ext/wasm/index.html ce6a68a75532b47e3c0adb83381a06d15de8c0ac0331fb7bf31d33f8e7c77dc4
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 9aa6951b529a8b29f578ec8f0355713c39584c92cf1708f63ba0cf917cb5b68e
+F ext/wasm/module-symbols.html e521cf07f8d136748e60d91e49b7b956e8bd56c58fc52acbe5ad58eaeaacf719
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
 F ext/wasm/scratchpad-wasmfs-main.js 1841c124a58e3f9e7ee580a0868d6e1834c5a01dbb47c8fdd565eda5db362437
 F ext/wasm/speedtest1-wasmfs.html bc28eb29b69a73864b8d7aae428448f8b7e1de81d8bfb9bba99541322054dbd0
@@ -2052,8 +2053,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 58c2e49279c8f77f006b0c2ce351776bc711633f9c1a39c7a37969838d49ec0b
-R dab7258db99e87600cc7587ad7416655
+P 55237924ca363c5a3e0f8c82620eb6626a98311615866197375a86876b9da3a1
+R d51316afe79c3d740526e1647073065f
 U stephan
-Z 4f2c2ebef52736f5acf8b48e5d4ac065
+Z 0ba750ccdbd0f150e9be1a1ecd5962f2
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 3eabfb83ca..c490bd1e4c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-55237924ca363c5a3e0f8c82620eb6626a98311615866197375a86876b9da3a1
\ No newline at end of file
+24f12e681e06e3b71a6ac9c82255fe0270953a74c711405841f7e385eeafe874
\ No newline at end of file

From ffbc653d85e248e5c24a3bb8467ea223a2711a5c Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Fri, 28 Oct 2022 14:33:50 +0000
Subject: [PATCH 384/428] Remove sqlite3_interrupt() from the WASM build, as it
 is essentially impossible to employ in JS's threading model.

FossilOrigin-Name: e85387590061edbb6cdc04de792ab86f43afaa5c8d1b0792206cb5b481c7d76a
---
 ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api |  1 -
 ext/wasm/api/sqlite3-api-prologue.js        |  6 +++---
 manifest                                    | 14 +++++++-------
 manifest.uuid                               |  2 +-
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api b/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
index 416b08d23f..b903bedee6 100644
--- a/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
+++ b/ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api
@@ -42,7 +42,6 @@ _sqlite3_file_control
 _sqlite3_finalize
 _sqlite3_free
 _sqlite3_initialize
-_sqlite3_interrupt
 _sqlite3_libversion
 _sqlite3_libversion_number
 _sqlite3_malloc
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 05305db22a..b841a0491d 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -838,10 +838,10 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     ["sqlite3_finalize", "int", "sqlite3_stmt*"],
     ["sqlite3_free", undefined,"*"],
     ["sqlite3_initialize", undefined],
-    ["sqlite3_interrupt", undefined, "sqlite3*"
-     /* ^^^ we cannot actually currently support this because JS is
+    /*["sqlite3_interrupt", undefined, "sqlite3*"
+       ^^^ we cannot actually currently support this because JS is
         single-threaded and we don't have a portable way to access a DB
-        from 2 SharedWorkers concurrently. */],
+        from 2 SharedWorkers concurrently. ],*/
     ["sqlite3_libversion", "string"],
     ["sqlite3_libversion_number", "int"],
     ["sqlite3_malloc", "*","int"],
diff --git a/manifest b/manifest
index d8b26a700f..61bdcf19fe 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sext/wasm/module-symbols.html.\sAdjacent\sminor\sJS\stouchups.
-D 2022-10-28T11:40:46.460
+C Remove\ssqlite3_interrupt()\sfrom\sthe\sWASM\sbuild,\sas\sit\sis\sessentially\simpossible\sto\semploy\sin\sJS's\sthreading\smodel.
+D 2022-10-28T14:33:50.731
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -490,7 +490,7 @@ F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34ce
 F ext/wasm/GNUmakefile 7a8c06f9bdbb791f8ef084ecd47e099da81e5797b9b1d60e33ac9a07eedd5dbd
 F ext/wasm/README-dist.txt 2d670b426fc7c613b90a7d2f2b05b433088fe65181abead970980f0a4a75ea20
 F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
-F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api cfbe8efcb9d1444139d6c381eb54dfdd5e62cf1ddfe10ed8a38617149a664b9b
+F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 9120c2f8f51fa85f46dcf4dcb6b12f4a807d428f6089b99cdb08d8ddfcfd88b2
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
 F ext/wasm/api/README.md 1350088aee90e959ad9a94fab1bb6bcb5e99d4d27f976db389050f54f2640c78
 F ext/wasm/api/extern-post-js.js 926d192b72fa808378e5e7843721dc7ba3908c163a0260e06d8aa501c12f5469
@@ -502,7 +502,7 @@ F ext/wasm/api/sqlite3-api-cleanup.js 4d07a7524dc9b7b050acfde57163e839243ad2383b
 F ext/wasm/api/sqlite3-api-glue.js c47e86a1b91917cf37de8386e4a94669612565df7f35a5ad7e04028330e5db54
 F ext/wasm/api/sqlite3-api-oo1.js 9ae79193d05712f9883a3e1a1a54f0620354aeb85fef5850fad5e4a9437a5b4d
 F ext/wasm/api/sqlite3-api-opfs.js a4316c04b2eb6ae69fc9a8b33f1d0ff22a0398665d98e6504ee13221cbf5cc5b
-F ext/wasm/api/sqlite3-api-prologue.js 968c7204ff7357b4565e166c7f39600132b08e4050094fa4d8c014a12a5bdd3e
+F ext/wasm/api/sqlite3-api-prologue.js 9ca7f1636cc401354e12c13b1f537a1ad9e024c6c0fddfa216f4aabf00bf206b
 F ext/wasm/api/sqlite3-api-worker1.js b2d650514ccc75f80dff666fd3ee68dc8fb4137bcd01caac2c62ff93a7ebf638
 F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
 F ext/wasm/api/sqlite3-opfs-async-proxy.js f04cb1eb483c92bc61fe02749f7afcf17ec803968171aedd7d96faf428c26bcb
@@ -2053,8 +2053,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 55237924ca363c5a3e0f8c82620eb6626a98311615866197375a86876b9da3a1
-R d51316afe79c3d740526e1647073065f
+P 24f12e681e06e3b71a6ac9c82255fe0270953a74c711405841f7e385eeafe874
+R 71ac4be467afcb9551a419bbdef91c5e
 U stephan
-Z 0ba750ccdbd0f150e9be1a1ecd5962f2
+Z 6815d8fe49b90127f256439e44a2ed16
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index c490bd1e4c..f8eb050b17 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-24f12e681e06e3b71a6ac9c82255fe0270953a74c711405841f7e385eeafe874
\ No newline at end of file
+e85387590061edbb6cdc04de792ab86f43afaa5c8d1b0792206cb5b481c7d76a
\ No newline at end of file

From 71b65e88e889d428981c2e0fa933a9de98332caa Mon Sep 17 00:00:00 2001
From: drh <>
Date: Fri, 28 Oct 2022 18:35:06 +0000
Subject: [PATCH 385/428] Add sqlite3recover() support to fuzzcheck.

FossilOrigin-Name: e65c5bdc5bd6e1989c3de59798ff0a761125fc490fdec8c7671ca70ed688c4f8
---
 Makefile.in      |   14 +-
 Makefile.msc     |   14 +-
 main.mk          |    9 +-
 manifest         |   21 +-
 manifest.uuid    |    2 +-
 test/fuzzcheck.c |   77 +++-
 test/vt02.c      | 1020 ++++++++++++++++++++++++++++++++++++++++++++++
 7 files changed, 1131 insertions(+), 26 deletions(-)
 create mode 100644 test/vt02.c

diff --git a/Makefile.in b/Makefile.in
index c7014a5bda..09e75bb882 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -626,7 +626,10 @@ SHELL_OPT += -DSQLITE_ENABLE_DBSTAT_VTAB
 SHELL_OPT += -DSQLITE_ENABLE_BYTECODE_VTAB
 SHELL_OPT += -DSQLITE_ENABLE_OFFSET_SQL_FUNC
 FUZZERSHELL_OPT = 
-FUZZCHECK_OPT = -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_OSS_FUZZ
+FUZZCHECK_OPT += -I$(TOP)/test
+FUZZCHECK_OPT += -I$(TOP)/ext/recover
+FUZZCHECK_OPT += -DSQLITE_OMIT_LOAD_EXTENSION
+FUZZCHECK_OPT += -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_OSS_FUZZ
 FUZZCHECK_OPT += -DSQLITE_MAX_MEMORY=50000000
 FUZZCHECK_OPT += -DSQLITE_PRINTF_PRECISION_LIMIT=1000
 FUZZCHECK_OPT += -DSQLITE_ENABLE_FTS4
@@ -636,7 +639,12 @@ FUZZCHECK_OPT += -DSQLITE_ENABLE_RTREE
 FUZZCHECK_OPT += -DSQLITE_ENABLE_GEOPOLY
 FUZZCHECK_OPT += -DSQLITE_ENABLE_DBSTAT_VTAB
 FUZZCHECK_OPT += -DSQLITE_ENABLE_BYTECODE_VTAB
-FUZZCHECK_SRC = $(TOP)/test/fuzzcheck.c $(TOP)/test/ossfuzz.c $(TOP)/test/fuzzinvariants.c
+FUZZCHECK_SRC += $(TOP)/test/fuzzcheck.c
+FUZZCHECK_SRC += $(TOP)/test/ossfuzz.c
+FUZZCHECK_SRC += $(TOP)/test/fuzzinvariants.c
+FUZZCHECK_SRC += $(TOP)/ext/recover/dbdata.c
+FUZZCHECK_SRC += $(TOP)/ext/recover/sqlite3recover.c
+FUZZCHECK_SRC += $(TOP)/test/vt02.c
 DBFUZZ_OPT =
 ST_OPT = -DSQLITE_OS_KV_OPTIONAL
 
@@ -687,7 +695,7 @@ fuzzershell$(TEXE):	$(TOP)/tool/fuzzershell.c sqlite3.c sqlite3.h
 	$(LTLINK) -o $@ $(FUZZERSHELL_OPT) \
 	  $(TOP)/tool/fuzzershell.c sqlite3.c $(TLIBS)
 
-fuzzcheck$(TEXE):	$(FUZZCHECK_SRC) sqlite3.c sqlite3.h
+fuzzcheck$(TEXE):	$(FUZZCHECK_SRC) sqlite3.c sqlite3.h $(FUZZCHECK_DEP)
 	$(LTLINK) -o $@ $(FUZZCHECK_OPT) $(FUZZCHECK_SRC) sqlite3.c $(TLIBS)
 
 ossshell$(TEXE):	$(TOP)/test/ossfuzz.c $(TOP)/test/ossshell.c sqlite3.c sqlite3.h
diff --git a/Makefile.msc b/Makefile.msc
index eff104eb56..191701cdba 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -1701,15 +1701,25 @@ SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_OFFSET_SQL_FUNC=1
 #
 MPTESTER_COMPILE_OPTS = -DSQLITE_ENABLE_FTS5
 FUZZERSHELL_COMPILE_OPTS =
-FUZZCHECK_OPTS = -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_OSS_FUZZ -DSQLITE_MAX_MEMORY=50000000 -DSQLITE_PRINTF_PRECISION_LIMIT=1000
+FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -I$(TOP)\test -I$(TOP)\ext\recover
+FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_MEMSYS5
+FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_OSS_FUZZ
+FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_MAX_MEMORY=50000000
+FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_PRINTF_PRECISION_LIMIT=1000
+FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_OMIT_LOAD_EXTENSION
 FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_FTS4
 FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_FTS5
 FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_RTREE
 FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_GEOPOLY
 FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_DBSTAT_VTAB
 FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_BYTECODE_VTAB
+FUZZCHECK_SRC = $(FUZZCHECK_SRC) $(TOP)\test\fuzzcheck.c
+FUZZCHECK_SRC = $(FUZZCHECK_SRC) $(TOP)\test\ossfuzz.c
+FUZZCHECK_SRC = $(FUZZCHECK_SRC) $(TOP)\test\fuzzinvariants.c
+FUZZCHECK_SRC = $(FUZZCHECK_SRC) $(TOP)\test\vt02.c
+FUZZCHECK_SRC = $(FUZZCHECK_SRC) $(TOP)\ext\recover\dbdata.c
+FUZZCHECK_SRC = $(FUZZCHECK_SRC) $(TOP)\ext\recover\sqlite3recover.c
 
-FUZZCHECK_SRC = $(TOP)\test\fuzzcheck.c $(TOP)\test\ossfuzz.c $(TOP)\test\fuzzinvariants.c
 OSSSHELL_SRC = $(TOP)\test\ossshell.c $(TOP)\test\ossfuzz.c
 DBFUZZ_COMPILE_OPTS = -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION
 KV_COMPILE_OPTS = -DSQLITE_THREADSAFE=0 -DSQLITE_DIRECT_OVERFLOW_READ
diff --git a/main.mk b/main.mk
index 14ce23b01d..c0d84ed96e 100644
--- a/main.mk
+++ b/main.mk
@@ -544,7 +544,9 @@ SHELL_OPT += -DSQLITE_ENABLE_DBPAGE_VTAB
 SHELL_OPT += -DSQLITE_ENABLE_DBSTAT_VTAB
 SHELL_OPT += -DSQLITE_ENABLE_BYTECODE_VTAB
 SHELL_OPT += -DSQLITE_ENABLE_OFFSET_SQL_FUNC
-FUZZCHECK_OPT = -DSQLITE_ENABLE_MEMSYS5
+FUZZCHECK_OPT += -I$(TOP)/test
+FUZZCHECK_OPT += -I$(TOP)/ext/recover
+FUZZCHECK_OPT += -DSQLITE_ENABLE_MEMSYS5
 FUZZCHECK_OPT += -DSQLITE_MAX_MEMORY=50000000
 FUZZCHECK_OPT += -DSQLITE_PRINTF_PRECISION_LIMIT=1000
 FUZZCHECK_OPT += -DSQLITE_ENABLE_FTS4
@@ -554,7 +556,10 @@ FUZZCHECK_OPT += -DSQLITE_ENABLE_DBSTAT_VTAB
 FUZZCHECK_OPT += -DSQLITE_ENABLE_BYTECODE_VTAB
 FUZZSRC += $(TOP)/test/fuzzcheck.c
 FUZZSRC += $(TOP)/test/ossfuzz.c
+FUZZSRC += $(TOP)/test/vt02.c
 FUZZSRC += $(TOP)/test/fuzzinvariants.c
+FUZZSRC += $(TOP)/ext/recover/dbdata.c
+FUZZSRC += $(TOP)/ext/recover/sqlite3recover.c
 DBFUZZ_OPT =
 KV_OPT = -DSQLITE_THREADSAFE=0 -DSQLITE_DIRECT_OVERFLOW_READ
 ST_OPT = -DSQLITE_THREADSAFE=0
@@ -613,7 +618,7 @@ dbfuzz2$(EXE):	$(TOP)/test/dbfuzz2.c sqlite3.c sqlite3.h
 	$(TCCX) -I. -g -O0 -DSTANDALONE -o dbfuzz2$(EXE) \
 	  $(DBFUZZ2_OPTS) $(TOP)/test/dbfuzz2.c sqlite3.c  $(TLIBS) $(THREADLIB)
 
-fuzzcheck$(EXE):	$(FUZZSRC) sqlite3.c sqlite3.h
+fuzzcheck$(EXE):	$(FUZZSRC) sqlite3.c sqlite3.h $(FUZZDEP)
 	$(TCCX) -o fuzzcheck$(EXE) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION \
 		-DSQLITE_ENABLE_MEMSYS5 $(FUZZCHECK_OPT) -DSQLITE_OSS_FUZZ \
 		$(FUZZSRC) sqlite3.c $(TLIBS) $(THREADLIB)
diff --git a/manifest b/manifest
index 61bdcf19fe..d539c800db 100644
--- a/manifest
+++ b/manifest
@@ -1,11 +1,11 @@
-C Remove\ssqlite3_interrupt()\sfrom\sthe\sWASM\sbuild,\sas\sit\sis\sessentially\simpossible\sto\semploy\sin\sJS's\sthreading\smodel.
-D 2022-10-28T14:33:50.731
+C Add\ssqlite3recover()\ssupport\sto\sfuzzcheck.
+D 2022-10-28T18:35:06.668
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in 579150683deaff2d8e70559a3a117a82a740b2491d4ecb56debb6a6f7c1705cd
+F Makefile.in 78e4c4916f2c3993a8a454018745ff02094a8029d449d0c22db98f1cf8260420
 F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
-F Makefile.msc ea790f1db3c02b62cb13416a680fa909b54bc1e0533cca222db0dae3f7af3db9
+F Makefile.msc e7a564ceec71f0d9666031d5638cf0d4f88b050b44e8df5d32125137cd259ac0
 F README.md 8b8df9ca852aeac4864eb1e400002633ee6db84065bd01b78c33817f97d31f5e
 F VERSION 8868ddfa6e1eee218286021a94b3e22d13e550c76c72d878857547ca001de24a
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -555,7 +555,7 @@ F ext/wasm/wasmfs.make ee0004813e16c283ff633e08b482008d56adf9b7d42f6c5612f7ab002
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
-F main.mk d5fdf519235d657a3b87d70324f8ee1f057207626e5ab4daf23a0199d20a25ad
+F main.mk 73410c1f180660fd95c8203f35e1d4c1003e033d6bd0dbcb2c41610e4166500d
 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@ -1153,7 +1153,7 @@ F test/fuzz3.test 9c813e6613b837cb7a277b0383cd66bfa07042b4cf0317157c35852f30043c
 F test/fuzz4.test c229bcdb45518a89e1d208a21343e061503460ac69fae1539320a89f572eb634
 F test/fuzz_common.tcl b7197de6ed1ee8250a4f82d67876f4561b42ee8cbbfc6160dcb66331bad3f830
 F test/fuzz_malloc.test f348276e732e814802e39f042b1f6da6362a610af73a528d8f76898fde6b22f2
-F test/fuzzcheck.c 7b501d55631c2d759e0bed02ed329904a35690fc6563d7b6cc69b7788a024f26
+F test/fuzzcheck.c 277da15bc937e9c71ec0000223365e2e0d55366605ff12cb9c004575648a5029
 F test/fuzzdata1.db 3e86d9cf5aea68ddb8e27c02d7dfdaa226347426c7eb814918e4d95475bf8517
 F test/fuzzdata2.db 128b3feeb78918d075c9b14b48610145a0dd4c8d6f1ca7c2870c7e425f5bf31f
 F test/fuzzdata3.db c6586d3e3cef0fbc18108f9bb649aa77bfc38aba
@@ -1809,6 +1809,7 @@ F test/veryquick.test 57ab846bacf7b90cf4e9a672721ea5c5b669b661
 F test/view.test d16e49e89ada6137d1447777ef2a74574526a3b024e6733bf53ae2960da8c17c
 F test/view2.test db32c8138b5b556f610b35dfddd38c5a58a292f07fda5281eedb0851b2672679
 F test/view3.test ad8a8290ee2b55ff6ce66c9ef1ce3f1e47926273a3814e1c425293e128a95456
+F test/vt02.c b94cbc59aba9b5a47f645fc8fc8aa7bdd96e686b98f3766e4080659cc07bf631
 F test/vtab1.test 09a72330d0f31eda2ffaa828b06a6b917fb86250ee72de0301570af725774c07
 F test/vtab2.test 14d4ab26cee13ba6cf5c5601b158e4f57552d3b055cdd9406cf7f711e9c84082
 F test/vtab3.test b45f47d20f225ccc9c28dc915d92740c2dee311e
@@ -2053,8 +2054,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 24f12e681e06e3b71a6ac9c82255fe0270953a74c711405841f7e385eeafe874
-R 71ac4be467afcb9551a419bbdef91c5e
-U stephan
-Z 6815d8fe49b90127f256439e44a2ed16
+P e85387590061edbb6cdc04de792ab86f43afaa5c8d1b0792206cb5b481c7d76a
+R dbf1d43633dc57fc37ff5c25dc929e02
+U drh
+Z 6124d4e303fc5fa0fccc696b151a8f8d
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f8eb050b17..ba8bf21b2a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e85387590061edbb6cdc04de792ab86f43afaa5c8d1b0792206cb5b481c7d76a
\ No newline at end of file
+e65c5bdc5bd6e1989c3de59798ff0a761125fc490fdec8c7671ca70ed688c4f8
\ No newline at end of file
diff --git a/test/fuzzcheck.c b/test/fuzzcheck.c
index fe56262211..406192239b 100644
--- a/test/fuzzcheck.c
+++ b/test/fuzzcheck.c
@@ -85,6 +85,7 @@
 #include <ctype.h>
 #include <assert.h>
 #include "sqlite3.h"
+#include "sqlite3recover.h"
 #define ISSPACE(X) isspace((unsigned char)(X))
 #define ISDIGIT(X) isdigit((unsigned char)(X))
 
@@ -158,12 +159,10 @@ static struct GlobalVars {
 } g;
 
 /*
-** Include the external vt02.c module, if requested by compile-time
-** options.
+** Include the external vt02.c module.
 */
-#ifdef VT02_SOURCES
-# include "vt02.c"
-#endif
+extern int sqlite3_vt02_init(sqlite3*,char***,void*);
+
 
 /*
 ** Print an error message and quit.
@@ -629,6 +628,9 @@ static unsigned int oomCounter = 0;    /* Simulate OOM when equals 1 */
 static unsigned int oomRepeat = 0;     /* Number of OOMs in a row */
 static void*(*defaultMalloc)(int) = 0; /* The low-level malloc routine */
 
+/* Enable recovery */
+static int bNoRecover = 0;
+
 /* This routine is called when a simulated OOM occurs.  It is broken
 ** out as a separate routine to make it easy to set a breakpoint on
 ** the OOM
@@ -969,7 +971,7 @@ static int block_troublesome_sql(
 }
 
 /* Implementation found in fuzzinvariant.c */
-int fuzz_invariant(
+extern int fuzz_invariant(
   sqlite3 *db,            /* The database connection */
   sqlite3_stmt *pStmt,    /* Test statement stopped on an SQLITE_ROW */
   int iCnt,               /* Invariant sequence number, starting at 0 */
@@ -979,6 +981,52 @@ int fuzz_invariant(
   int eVerbosity          /* How much debugging output */
 );
 
+/* Implementation of sqlite_dbdata and sqlite_dbptr */
+extern int sqlite3_dbdata_init(sqlite3*,const char**,void*);
+
+
+/*
+** This function is used as a callback by the recover extension. Simply
+** print the supplied SQL statement to stdout.
+*/
+static int recoverSqlCb(void *pCtx, const char *zSql){
+  if( eVerbosity>=2 ){
+    printf("%s\n", zSql);
+  }
+  return SQLITE_OK;
+}
+
+/*
+** This function is called to recover data from the database.
+*/
+static int recoverDatabase(sqlite3 *db){
+  int rc = SQLITE_OK;
+  const char *zRecoveryDb = "";   /* Name of "recovery" database */
+  const char *zLAF = "lost_and_found";
+  int bFreelist = 1;
+  int bRowids = 1;
+  sqlite3_recover *p = 0;
+
+  p = sqlite3_recover_init_sql(db, "main", recoverSqlCb, 0);
+  sqlite3_recover_config(p, 789, (void*)zRecoveryDb);
+  sqlite3_recover_config(p, SQLITE_RECOVER_LOST_AND_FOUND, (void*)zLAF);
+  sqlite3_recover_config(p, SQLITE_RECOVER_ROWIDS, (void*)&bRowids);
+  sqlite3_recover_config(p, SQLITE_RECOVER_FREELIST_CORRUPT,(void*)&bFreelist);
+  sqlite3_recover_run(p);
+  if( sqlite3_recover_errcode(p)!=SQLITE_OK ){
+    const char *zErr = sqlite3_recover_errmsg(p);
+    int errCode = sqlite3_recover_errcode(p);
+    if( eVerbosity>0 ){
+      printf("recovery error: %s (%d)\n", zErr, errCode);
+    }
+  }
+  rc = sqlite3_recover_finish(p);
+  if( eVerbosity>0 && rc ){
+     printf("recovery returns error code %d\n", rc);
+  }
+  return rc;
+}
+
 /*
 ** Run the SQL text
 */
@@ -1189,9 +1237,12 @@ int runCombinedDbSqlInput(
   ** deserialize to do this because deserialize depends on ATTACH */
   sqlite3_set_authorizer(cx.db, block_troublesome_sql, &btsFlags);
 
-#ifdef VT02_SOURCES
+  /* Add the vt02 virtual table */
   sqlite3_vt02_init(cx.db, 0, 0);
-#endif
+
+  /* Add support for sqlite_dbdata and sqlite_dbptr virtual tables used
+  ** by the recovery API */
+  sqlite3_dbdata_init(cx.db, 0, 0);
 
   /* Consistent PRNG seed */
 #ifdef SQLITE_TESTCTRL_PRNG_SEED
@@ -1201,6 +1252,12 @@ int runCombinedDbSqlInput(
   sqlite3_randomness(0,0);
 #endif
 
+  /* Run recovery on the initial database, just to make sure recovery
+  ** works. */
+  if( !bNoRecover ){
+    recoverDatabase(cx.db);
+  }
+
   zSql = sqlite3_malloc( nSql + 1 );
   if( zSql==0 ){
     fprintf(stderr, "Out of memory!\n");
@@ -1700,6 +1757,7 @@ static void showHelp(void){
 "  -m TEXT              Add a description to the database\n"
 "  --native-vfs         Use the native VFS for initially empty database files\n"
 "  --native-malloc      Turn off MEMSYS3/5 and Lookaside\n"
+"  --no-recover         Do not run recovery on dbsqlfuzz databases\n"
 "  --oss-fuzz           Enable OSS-FUZZ testing\n"
 "  --prng-seed N        Seed value for the PRGN inside of SQLite\n"
 "  -q|--quiet           Reduced output\n"
@@ -1851,6 +1909,9 @@ int main(int argc, char **argv){
       if( strcmp(z,"native-vfs")==0 ){
         nativeFlag = 1;
       }else
+      if( strcmp(z,"no-recover")==0 ){
+        bNoRecover = 1;
+      }else
       if( strcmp(z,"oss-fuzz")==0 ){
         ossFuzz = 1;
       }else
diff --git a/test/vt02.c b/test/vt02.c
new file mode 100644
index 0000000000..b4e76a891b
--- /dev/null
+++ b/test/vt02.c
@@ -0,0 +1,1020 @@
+/*
+** This file implements an eponymous, read-only table-valued function
+** (a virtual table) designed to be used for testing.  We are not aware
+** of any practical real-world use case for the virtual table.
+**
+** This virtual table originated in the TH3 test suite.  It is still used
+** there, but has now been copied into the public SQLite source tree and
+** reused for a variety of testing purpose.  The name "vt02" comes from the
+** fact that there are many different testing virtual tables in TH3, of which
+** this one is the second.
+**
+** ## SUBJECT TO CHANGE
+**
+** Because this virtual table is intended for testing, its interface is not
+** guaranteed to be stable across releases.  Future releases may contain
+** changes in the vt02 design and interface.
+**
+** ## OVERVIEW
+**
+** The vt02 table-valued function has 10000 rows with 5 data columns.
+** Column X contains all integer values between 0 and 9999 inclusive.
+** Columns A, B, C, and D contain the individual base-10 digits associated
+** with each X value:
+**
+**      X     A  B  C  D
+**      ----  -  -  -  -
+**      0     0  0  0  0
+**      1     0  0  0  1
+**      2     0  0  0  2
+**              ...
+**      4998  4  9  9  8
+**      4999  4  9  9  9
+**      5000  5  0  0  0
+**              ...
+**      9995  9  9  9  5
+**      9996  9  9  9  6
+**      9997  9  9  9  7
+**
+** The xBestIndex method recognizes a variety of equality constraints
+** and attempts to optimize its output accordingly.
+**
+**      x=...
+**      a=...
+**      a=... AND b=...
+**      a=... AND b=... AND c=...
+**      a=... AND b=... AND c=... AND d=...
+**
+** Various ORDER BY constraints are also recognized and consumed.  The
+** OFFSET constraint is recognized and consumed.
+**
+** ## TABLE-VALUED FUNCTION
+**
+** The vt02 virtual table is eponymous and has two hidden columns, meaning
+** that it can functions a table-valued function.  The two hidden columns
+** are "flags" and "logtab", in that order.  The "flags" column can be set
+** to an integer where various bits enable or disable behaviors of the
+** virtual table.  The "logtab" can set to the name of an ordinary SQLite
+** table into which is written information about each call to xBestIndex.
+**
+** The bits of "flags" are as follows:
+**
+**       0x01           Ignore the aConstraint[].usable flag.  This might
+**                      result in the xBestIndex method incorrectly using
+**                      unusable entries in the aConstraint[] array, which
+**                      should result in the SQLite core detecting and
+**                      reporting that the virtual table is not behaving
+**                      to spec.
+**
+**       0x02           Do not set the orderByConsumed flag, even if it
+**                      could be set.
+**
+**       0x04           Do not consume the OFFSET constraint, if there is
+**                      one.  Instead, let the generated byte-code visit
+**                      and ignore the first few columns of output.
+**
+**       0x08           Use sqlite3_mprintf() to allocate an idxStr string.
+**                      The string is never used, but allocating it does
+**                      test the idxStr deallocation logic inside of the
+**                      SQLite core.
+**
+**       0x10           Cause the xBestIndex method to generate an idxNum
+**                      that xFilter does not understand, thus causing
+**                      the OP_VFilter opcode to raise an error.
+**
+**       0x20           Set the omit flag for all equality constraints on
+**                      columns X, A, B, C, and D that are used to limit
+**                      the search.
+**
+**       0x40           Add all constraints against X,A,B,C,D to the
+**                      vector of results sent to xFilter.  Only the first
+**                      few are used, as required by idxNum.
+**
+** Because these flags take effect during xBestIndex, the RHS of the
+** flag= constraint must be accessible.  In other words, the RHS of flag=
+** needs to be an integer literal, not another column of a join or a
+** bound parameter.
+**
+** ## LOGGING OUTPUT
+**
+** If the "logtab" columns is set, then each call to the xBestIndex method
+** inserts multiple rows into the table identified by "logtab".  These
+** rows collectively show the content of the sqlite3_index_info object and
+** other context associated with the xBestIndex call.
+**
+** If the table named by "logtab" does not previously exist, it is created
+** automatically.  The schema for the logtab table is like this:
+**
+**   CREATE TEMP TABLE vt02_log(
+**     bi INT,         -- BestIndex call counter
+**     vn TEXT,        -- Variable Name
+**     ix INT,         -- Index or value
+**     cn TEXT,        -- Column Name
+**     op INT,         -- Opcode or "DESC" value
+**     ux INT,         -- "Usable" flag
+**     ra BOOLEAN,     -- Right-hand side Available.
+**     rhs ANY,        -- Right-Hand Side value
+**     cs TEXT         -- Collating Sequence for this constraint
+**  );
+**
+** Because logging happens during xBestIindex, the RHS value of "logtab" must
+** be known to xBestIndex, which means it must be a string literal, not a
+** column in a join, or a bound parameter.
+** 
+** ## VIRTUAL TABLE SCHEMA
+**
+**    CREATE TABLE vt02(
+**      x INT,              -- integer between 0 and 9999 inclusive
+**      a INT,              -- The 1000s digit
+**      b INT,              -- The 100s digit
+**      c INT,              -- The 10s digit
+**      d INT,              -- The 1s digit
+**      flags INT HIDDEN,   -- Option flags
+**      logtab TEXT HIDDEN, -- Name of table into which to log xBestIndex
+**    );
+**
+** ## COMPILING AND RUNNING
+**
+** This file can also be compiled separately as a loadable extension
+** for SQLite (as long as the -DTH3_VERSION is not defined).  To compile as a
+** loadable extension do his:
+**
+**    gcc -Wall -g -shared -fPIC -I. -DSQLITE_DEBUG vt02.c -o vt02.so
+**
+** Or on Windows:
+**
+**    cl vt02.c -link -dll -out:vt02.dll
+**
+** Then load into the CLI using:
+**
+**    .load ./vt02 sqlite3_vt02_init
+**
+** ## IDXNUM SUMMARY
+**
+** The xBestIndex method communicates the query plan to xFilter using
+** the idxNum value, as follows:
+**
+**     0           unconstrained
+**     1           X=argv[0]
+**     2           A=argv[0]
+**     3           A=argv[0], B=argv[1]
+**     4           A=argv[0], B=argv[1], C=argv[2]
+**     5           A=argv[0], B=argv[1], C=argv[2], D=argv[3]
+**     6           A=argv[0], D IN argv[2]
+**     7           A=argv[0], B=argv[2], D IN argv[3]
+**     8           A=argv[0], B=argv[2], C=argv[3], D IN argv[4]
+**    1x           increment by 10
+**    2x           increment by 100
+**    3x           increment by 1000
+**   1xx           Use offset provided by argv[N]
+*/
+#ifndef TH3_VERSION
+  /* These bits for separate compilation as a loadable extension, only */
+  #include "sqlite3ext.h"
+  SQLITE_EXTENSION_INIT1
+  #include <stdlib.h>
+  #include <string.h>
+  #include <assert.h>
+#endif
+
+/* Forward declarations */
+typedef struct vt02_vtab vt02_vtab;
+typedef struct vt02_cur vt02_cur;
+
+/*
+** The complete virtual table
+*/
+struct vt02_vtab {
+  sqlite3_vtab parent;        /* Base clase.  Must be first. */
+  sqlite3 *db;                /* Database connection */
+  int busy;                   /* Currently running xBestIndex */
+};
+
+#define VT02_IGNORE_USABLE  0x0001  /* Ignore usable flags */
+#define VT02_NO_SORT_OPT    0x0002  /* Do not do any sorting optimizations */
+#define VT02_NO_OFFSET      0x0004  /* Omit the offset optimization */
+#define VT02_ALLOC_IDXSTR   0x0008  /* Alloate an idxStr */
+#define VT02_BAD_IDXNUM     0x0010  /* Generate an invalid idxNum */
+
+/*
+** A cursor
+*/
+struct vt02_cur {
+  sqlite3_vtab_cursor parent; /* Base class.  Must be first */
+  sqlite3_int64 i;            /* Current entry */
+  sqlite3_int64 iEof;         /* Indicate EOF when reaching this value */
+  int iIncr;                  /* Amount by which to increment */
+  unsigned int mD;            /* Mask of allowed D-column values */
+};
+
+/* The xConnect method */
+int vt02Connect(
+  sqlite3 *db,                /* The database connection */
+  void *pAux,                 /* Pointer to an alternative schema */
+  int argc,                   /* Number of arguments */
+  const char *const*argv,     /* Text of the arguments */
+  sqlite3_vtab **ppVTab,      /* Write the new vtab here */
+  char **pzErr                /* Error message written here */
+){
+  vt02_vtab *pVtab;
+  int rc;
+  const char *zSchema = (const char*)pAux;
+  static const char zDefaultSchema[] = 
+    "CREATE TABLE x(x INT, a INT, b INT, c INT, d INT,"
+    " flags INT HIDDEN, logtab TEXT HIDDEN);";
+#define VT02_COL_X       0
+#define VT02_COL_A       1
+#define VT02_COL_B       2
+#define VT02_COL_C       3
+#define VT02_COL_D       4
+#define VT02_COL_FLAGS   5
+#define VT02_COL_LOGTAB  6
+#define VT02_COL_NONE    7
+
+  pVtab = sqlite3_malloc( sizeof(*pVtab) );
+  if( pVtab==0 ){
+    *pzErr = sqlite3_mprintf("out of memory");
+    return SQLITE_NOMEM;
+  }
+  memset(pVtab, 0, sizeof(*pVtab));
+  pVtab->db = db;
+  rc = sqlite3_declare_vtab(db, zSchema ? zSchema : zDefaultSchema);
+  if( rc ){
+    sqlite3_free(pVtab);
+  }else{
+    *ppVTab = &pVtab->parent;
+  }
+  return rc;
+}
+
+/* the xDisconnect method
+*/
+int vt02Disconnect(sqlite3_vtab *pVTab){
+  sqlite3_free(pVTab);
+  return SQLITE_OK;
+}
+
+/* Put an error message into the zErrMsg string of the virtual table.
+*/
+static void vt02ErrMsg(sqlite3_vtab *pVtab, const char *zFormat, ...){
+  va_list ap;
+  sqlite3_free(pVtab->zErrMsg);
+  va_start(ap, zFormat);
+  pVtab->zErrMsg = sqlite3_vmprintf(zFormat, ap);
+  va_end(ap);
+}
+
+
+/* Open a cursor for scanning
+*/
+static int vt02Open(sqlite3_vtab *pVTab, sqlite3_vtab_cursor **ppCursor){
+  vt02_cur *pCur;
+  pCur = sqlite3_malloc( sizeof(*pCur) );
+  if( pCur==0 ){
+    vt02ErrMsg(pVTab, "out of memory");
+    return SQLITE_NOMEM;
+  }
+  *ppCursor = &pCur->parent;
+  pCur->i = -1;
+  return SQLITE_OK;
+}
+
+/* Close a cursor
+*/
+static int vt02Close(sqlite3_vtab_cursor *pCursor){
+  vt02_cur *pCur = (vt02_cur*)pCursor;
+  sqlite3_free(pCur);
+  return SQLITE_OK;
+}
+
+/* Return TRUE if we are at the end of the BVS and there are
+** no more entries.
+*/
+static int vt02Eof(sqlite3_vtab_cursor *pCursor){
+  vt02_cur *pCur = (vt02_cur*)pCursor;
+  return pCur->i<0 || pCur->i>=pCur->iEof;
+}
+
+/* Advance the cursor to the next row in the table
+*/
+static int vt02Next(sqlite3_vtab_cursor *pCursor){
+  vt02_cur *pCur = (vt02_cur*)pCursor;
+  do{
+    pCur->i += pCur->iIncr;
+    if( pCur->i<0 ) pCur->i = pCur->iEof;
+  }while( (pCur->mD & (1<<(pCur->i%10)))==0 && pCur->i<pCur->iEof );
+  return SQLITE_OK;
+}
+
+/* Rewind a cursor back to the beginning of its scan.
+**
+** Scanning is always increasing.
+**
+**   idxNum
+**     0           unconstrained
+**     1           X=argv[0]
+**     2           A=argv[0]
+**     3           A=argv[0], B=argv[1]
+**     4           A=argv[0], B=argv[1], C=argv[2]
+**     5           A=argv[0], B=argv[1], C=argv[2], D=argv[3]
+**     6           A=argv[0], D IN argv[2]
+**     7           A=argv[0], B=argv[2], D IN argv[3]
+**     8           A=argv[0], B=argv[2], C=argv[3], D IN argv[4]
+**    1x           increment by 10
+**    2x           increment by 100
+**    3x           increment by 1000
+**   1xx           Use offset provided by argv[N]
+*/
+static int vt02Filter(
+  sqlite3_vtab_cursor *pCursor, /* The cursor to rewind */
+  int idxNum,                   /* Search strategy */
+  const char *idxStr,           /* Not used */
+  int argc,                     /* Not used */
+  sqlite3_value **argv          /* Not used */
+){
+  vt02_cur *pCur = (vt02_cur*)pCursor; /* The vt02 cursor */
+  int bUseOffset = 0;                  /* True to use OFFSET value */
+  int iArg = 0;                        /* argv[] values used so far */
+  int iOrigIdxNum = idxNum;            /* Original value for idxNum */
+
+  pCur->iIncr = 1;
+  pCur->mD = 0x3ff;
+  if( idxNum>=100 ){
+    bUseOffset = 1;
+    idxNum -= 100;
+  }
+  if( idxNum<0 || idxNum>38 ) goto vt02_bad_idxnum;
+  while( idxNum>=10 ){
+    pCur->iIncr *= 10;
+    idxNum -= 10;
+  }
+  if( idxNum==0 ){
+    pCur->i = 0;
+    pCur->iEof = 10000;
+  }else if( idxNum==1 ){
+    pCur->i = sqlite3_value_int64(argv[0]);
+    if( pCur->i<0 ) pCur->i = -1;
+    if( pCur->i>9999 ) pCur->i = 10000;
+    pCur->iEof = pCur->i+1;
+    if( pCur->i<0 || pCur->i>9999 ) pCur->i = pCur->iEof;
+  }else if( idxNum>=2 && idxNum<=5 ){
+    int i, e, m;
+    e = idxNum - 2;
+    assert( e<=argc-1 );
+    pCur->i = 0;
+    for(m=1000, i=0; i<=e; i++, m /= 10){
+      sqlite3_int64 v = sqlite3_value_int64(argv[iArg++]);
+      if( v<0 ) v = 0;
+      if( v>9 ) v = 9;
+      pCur->i += m*v;
+      pCur->iEof = pCur->i+m;
+    }
+  }else if( idxNum>=6 && idxNum<=8 ){
+    int i, e, m, rc;
+    sqlite3_value *pIn, *pVal;
+    e = idxNum - 6;
+    assert( e<=argc-2 );
+    pCur->i = 0;
+    for(m=1000, i=0; i<=e; i++, m /= 10){
+      sqlite3_int64 v;
+      sqlite3_value *pVal = 0;
+      if( sqlite3_vtab_in_first(0, &pVal)!=SQLITE_MISUSE
+       || sqlite3_vtab_in_first(argv[iArg], &pVal)!=SQLITE_MISUSE
+      ){
+        vt02ErrMsg(pCursor->pVtab, 
+                "unexpected success from sqlite3_vtab_in_first()");
+        return SQLITE_ERROR;
+      }
+      v = sqlite3_value_int64(argv[iArg++]);
+      if( v<0 ) v = 0;
+      if( v>9 ) v = 9;
+      pCur->i += m*v;
+      pCur->iEof = pCur->i+m;
+    }
+    pCur->mD = 0;
+    pIn = argv[iArg++];
+    assert( sqlite3_value_type(pIn)==SQLITE_NULL );
+    for( rc = sqlite3_vtab_in_first(pIn, &pVal);
+         rc==SQLITE_OK && pVal!=0;
+         rc = sqlite3_vtab_in_next(pIn, &pVal)
+    ){
+      int eType = sqlite3_value_numeric_type(pVal);
+      if( eType==SQLITE_FLOAT ){
+        double r = sqlite3_value_double(pVal);
+        if( r<0.0 || r>9.0 || r!=(int)r ) continue;
+      }else if( eType!=SQLITE_INTEGER ){
+        continue;
+      }
+      i = sqlite3_value_int(pVal);
+      if( i<0 || i>9 ) continue;
+      pCur->mD |= 1<<i;
+    }
+    if( rc!=SQLITE_OK && rc!=SQLITE_DONE ){
+      vt02ErrMsg(pCursor->pVtab, "Error from sqlite3_vtab_in_first/next()");
+      return rc;
+    }
+  }else{
+    goto vt02_bad_idxnum;
+  }
+  if( bUseOffset ){
+    int nSkip = sqlite3_value_int(argv[iArg]);
+    while( nSkip-- > 0 ) vt02Next(pCursor);
+  }
+  return SQLITE_OK;
+
+vt02_bad_idxnum:
+  vt02ErrMsg(pCursor->pVtab, "invalid idxNum for vt02: %d", iOrigIdxNum);
+  return SQLITE_ERROR;
+}
+
+/* Return the Nth column of the current row.
+*/
+static int vt02Column(
+  sqlite3_vtab_cursor *pCursor,
+  sqlite3_context *context,
+  int N
+){
+  vt02_cur *pCur = (vt02_cur*)pCursor;
+  int v = pCur->i;
+  if( N==VT02_COL_X ){
+    sqlite3_result_int(context, v);
+  }else if( N>=VT02_COL_A && N<=VT02_COL_D ){
+    static const int iDivisor[] = { 1, 1000, 100, 10, 1 };
+    v = (v/iDivisor[N])%10;
+    sqlite3_result_int(context, v);
+  }
+  return SQLITE_OK;
+}
+
+/* Return the rowid of the current row
+*/
+static int vt02Rowid(sqlite3_vtab_cursor *pCursor, sqlite3_int64 *pRowid){
+  vt02_cur *pCur = (vt02_cur*)pCursor;
+  *pRowid = pCur->i+1;
+  return SQLITE_OK;
+}
+
+/*************************************************************************
+** Logging Subsystem
+**
+** The sqlite3BestIndexLog() routine implements a logging system for
+** xBestIndex calls.  This code is portable to any virtual table.
+**
+** sqlite3BestIndexLog() is the main routine,  sqlite3RunSql() is a
+** helper routine used for running various SQL statements as part of
+** creating the log.
+**
+** These two routines should be portable to other virtual tables.  Simply
+** extract this code and call sqlite3BestIndexLog() near the end of the
+** xBestIndex method in cases where logging is desired.
+*/
+/*
+** Run SQL on behalf of sqlite3BestIndexLog.
+**
+** Construct the SQL using the zFormat string and subsequent arguments.
+** Or if zFormat is NULL, take the SQL as the first argument after the
+** zFormat.  In either case, the dynamically allocated SQL string is
+** freed after it has been run.  If something goes wrong with the SQL,
+** then an error is left in pVTab->zErrMsg.
+*/
+static void sqlite3RunSql(
+  sqlite3 *db,               /* Run the SQL on this database connection */
+  sqlite3_vtab *pVTab,       /* Report errors to this virtual table */
+  const char *zFormat,       /* Format string for SQL, or NULL */
+  ...                        /* Arguments, according to the format string */
+){
+  char *zSql;
+
+  va_list ap;
+  va_start(ap, zFormat);
+  if( zFormat==0 ){
+    zSql = va_arg(ap, char*);
+  }else{
+    zSql = sqlite3_vmprintf(zFormat, ap);
+  }
+  va_end(ap);
+  if( zSql ){
+    char *zErrMsg = 0;
+    (void)sqlite3_exec(db, zSql, 0, 0, &zErrMsg);
+    if( zErrMsg ){
+      if( pVTab->zErrMsg==0 ){
+        pVTab->zErrMsg = sqlite3_mprintf("%s in [%s]", zErrMsg, zSql);
+      }
+      sqlite3_free(zErrMsg);
+    }
+    sqlite3_free(zSql);
+  }
+}
+
+/*
+** Record information about each xBestIndex method call in a separate
+** table:
+**
+**   CREATE TEMP TABLE [log-table-name] (
+**     bi INT,      -- BestIndex call number
+**     vn TEXT,     -- Variable Name
+**     ix INT,      -- Index or value
+**     cn TEXT,     -- Column Name
+**     op INT,      -- Opcode or argvIndex
+**     ux INT,      -- "usable" or "omit" flag
+**     rx BOOLEAN,  -- True if has a RHS value
+**     rhs ANY,     -- The RHS value
+**     cs TEXT,     -- Collating Sequence
+**     inop BOOLEAN -- True if this is a batchable IN operator
+**  );
+**
+** If an error occurs, leave an error message in pVTab->zErrMsg.
+*/
+static void sqlite3BestIndexLog(
+  sqlite3_index_info *pInfo,  /* The sqlite3_index_info object */
+  const char *zLogTab,        /* Log into this table */
+  sqlite3 *db,                /* Database connection containing zLogTab */
+  const char **azColname,     /* Names of columns in the virtual table */
+  sqlite3_vtab *pVTab         /* Record errors into this object */
+){
+  int i, rc;
+  sqlite3_str *pStr;
+  int iBI;
+
+  if( sqlite3_table_column_metadata(db,0,zLogTab,0,0,0,0,0,0) ){
+    /* The log table does not previously exist.  Create it. */
+    sqlite3RunSql(db,pVTab, 
+      "CREATE TABLE IF NOT EXISTS temp.\"%w\"(\n"
+      " bi INT,          -- BestIndex call number\n"
+      " vn TEXT,         -- Variable Name\n"
+      " ix INT,          -- Index or value\n"
+      " cn TEXT,         -- Column Name\n"
+      " op INT,          -- Opcode or argvIndex\n"
+      " ux INT,          -- usable for omit flag\n"
+      " rx BOOLEAN,      -- Right-hand side value is available\n"
+      " rhs ANY,         -- RHS value\n"
+      " cs TEXT,         -- Collating Sequence\n"
+      " inop BOOLEAN     -- IN operator capable of batch reads\n"
+      ");", zLogTab
+    );
+    iBI = 1;
+  }else{
+    /* The log table does already exist.  We assume that it has the
+    ** correct schema and proceed to find the largest prior "bi" value.
+    ** If the schema is wrong, errors might result.  The code is able
+    ** to deal with this. */
+    sqlite3_stmt *pStmt;
+    char *zSql;
+    zSql = sqlite3_mprintf("SELECT max(bi) FROM temp.\"%w\"",zLogTab);
+    if( zSql==0 ){
+      sqlite3_free(pVTab->zErrMsg);
+      pVTab->zErrMsg = sqlite3_mprintf("out of memory");
+      return;
+    }
+    rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0);
+    sqlite3_free(zSql);
+    if( rc ){
+      sqlite3_free(pVTab->zErrMsg);
+      pVTab->zErrMsg = sqlite3_mprintf("%s", sqlite3_errmsg(db));
+      iBI = 0;
+    }else if( sqlite3_step(pStmt)==SQLITE_ROW ){
+      iBI = sqlite3_column_int(pStmt, 0)+1;
+    }else{
+      iBI = 1;
+    }
+    sqlite3_finalize(pStmt);
+  }
+  sqlite3RunSql(db,pVTab,
+    "INSERT INTO temp.\"%w\"(bi,vn,ix) VALUES(%d,'nConstraint',%d)",
+    zLogTab, iBI, pInfo->nConstraint
+  );
+  for(i=0; i<pInfo->nConstraint; i++){
+    sqlite3_value *pVal;
+    char *zSql;
+    int iCol = pInfo->aConstraint[i].iColumn;
+    int op = pInfo->aConstraint[i].op;
+    int rc;
+    const char *zCol;
+    if( op==SQLITE_INDEX_CONSTRAINT_LIMIT
+     || op==SQLITE_INDEX_CONSTRAINT_OFFSET
+    ){
+      zCol = "";
+    }else if( iCol<0 ){
+      zCol = "rowid";
+    }else{
+      zCol = azColname[iCol];
+    }
+    pStr = sqlite3_str_new(0);
+    sqlite3_str_appendf(pStr,
+       "INSERT INTO temp.\"%w\"(bi,vn,ix,cn,op,ux,rx,rhs,cs,inop)"
+       "VALUES(%d,'aConstraint',%d,%Q,%d,%d",
+       zLogTab, iBI,
+       i,
+       zCol,
+       op,
+       pInfo->aConstraint[i].usable);
+    pVal = 0;
+    rc = sqlite3_vtab_rhs_value(pInfo, i, &pVal);
+    assert( pVal!=0 || rc!=SQLITE_OK );
+    if( rc==SQLITE_OK ){
+      sqlite3_str_appendf(pStr,",1,?1");
+    }else{
+      sqlite3_str_appendf(pStr,",0,NULL");
+    }
+    sqlite3_str_appendf(pStr,",%Q,%d)",
+         sqlite3_vtab_collation(pInfo,i),
+         sqlite3_vtab_in(pInfo,i,-1));
+    zSql = sqlite3_str_finish(pStr);
+    if( zSql==0 ){
+      if( pVTab->zErrMsg==0 ) pVTab->zErrMsg = sqlite3_mprintf("out of memory");
+    }else{
+      sqlite3_stmt *pStmt = 0;
+      rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0);
+      if( rc ){
+        if( pVTab->zErrMsg==0 ){
+          pVTab->zErrMsg = sqlite3_mprintf("%s", sqlite3_errmsg(db));
+        }
+      }else{
+        if( pVal ) sqlite3_bind_value(pStmt, 1, pVal);
+        sqlite3_step(pStmt);
+        rc = sqlite3_reset(pStmt);
+        if( rc && pVTab->zErrMsg==0 ){
+          pVTab->zErrMsg = sqlite3_mprintf("%s", sqlite3_errmsg(db));
+        }
+      }
+      sqlite3_finalize(pStmt);
+      sqlite3_free(zSql);
+    }
+  }
+  sqlite3RunSql(db,pVTab,
+    "INSERT INTO temp.\"%w\"(bi,vn,ix) VALUES(%d,'nOrderBy',%d)",
+    zLogTab, iBI, pInfo->nOrderBy
+  );
+  for(i=0; i<pInfo->nOrderBy; i++){
+    int iCol = pInfo->aOrderBy[i].iColumn;
+    sqlite3RunSql(db,pVTab,
+      "INSERT INTO temp.\"%w\"(bi,vn,ix,cn,op)VALUES(%d,'aOrderBy',%d,%Q,%d)",
+      zLogTab, iBI,
+      i,
+      iCol>=0 ? azColname[iCol] : "rowid",
+      pInfo->aOrderBy[i].desc
+    );
+  }
+  sqlite3RunSql(db,pVTab,
+    "INSERT INTO temp.\"%w\"(bi,vn,ix) VALUES(%d,'sqlite3_vtab_distinct',%d)",
+    zLogTab, iBI, sqlite3_vtab_distinct(pInfo)
+  );
+  sqlite3RunSql(db,pVTab,
+    "INSERT INTO temp.\"%w\"(bi,vn,ix) VALUES(%d,'colUsed',%lld)",
+    zLogTab, iBI, pInfo->colUsed
+  );
+  for(i=0; i<pInfo->nConstraint; i++){
+    int iCol = pInfo->aConstraint[i].iColumn;
+    int op = pInfo->aConstraint[i].op;
+    const char *zCol;
+    if( op==SQLITE_INDEX_CONSTRAINT_LIMIT
+     || op==SQLITE_INDEX_CONSTRAINT_OFFSET
+    ){
+      zCol = "";
+    }else if( iCol<0 ){
+      zCol = "rowid";
+    }else{
+      zCol = azColname[iCol];
+    }
+    sqlite3RunSql(db,pVTab,
+       "INSERT INTO temp.\"%w\"(bi,vn,ix,cn,op,ux)"
+       "VALUES(%d,'aConstraintUsage',%d,%Q,%d,%d)",
+       zLogTab, iBI,
+       i,
+       zCol,
+       pInfo->aConstraintUsage[i].argvIndex,
+       pInfo->aConstraintUsage[i].omit
+    );
+  }
+  sqlite3RunSql(db,pVTab,
+    "INSERT INTO temp.\"%w\"(bi,vn,ix)VALUES(%d,'idxNum',%d)",
+    zLogTab, iBI, pInfo->idxNum
+  );
+  sqlite3RunSql(db,pVTab,
+    "INSERT INTO temp.\"%w\"(bi,vn,ix)VALUES(%d,'estimatedCost',%f)",
+    zLogTab, iBI, pInfo->estimatedCost
+  );
+  sqlite3RunSql(db,pVTab,
+    "INSERT INTO temp.\"%w\"(bi,vn,ix)VALUES(%d,'estimatedRows',%lld)",
+    zLogTab, iBI, pInfo->estimatedRows
+  );
+  if( pInfo->idxStr ){
+    sqlite3RunSql(db,pVTab,
+      "INSERT INTO temp.\"%w\"(bi,vn,ix)VALUES(%d,'idxStr',%Q)",
+      zLogTab, iBI, pInfo->idxStr
+    );
+    sqlite3RunSql(db,pVTab,
+      "INSERT INTO temp.\"%w\"(bi,vn,ix)VALUES(%d,'needToFreeIdxStr',%d)",
+      zLogTab, iBI, pInfo->needToFreeIdxStr
+    );
+  }
+  if( pInfo->nOrderBy ){
+    sqlite3RunSql(db,pVTab,
+      "INSERT INTO temp.\"%w\"(bi,vn,ix)VALUES(%d,'orderByConsumed',%d)",
+      zLogTab, iBI, pInfo->orderByConsumed
+    );
+  }
+}
+/*
+** End of Logging Subsystem
+*****************************************************************************/
+
+
+/* Find an estimated cost of running a query against vt02.
+*/
+static int vt02BestIndex(sqlite3_vtab *pVTab, sqlite3_index_info *pInfo){
+  int i;                      /* Loop counter */
+  int isEq[5];                /* Equality constraints on X, A, B, C, and D */
+  int isUsed[5];              /* Other non-== cosntraints X, A, B, C, and D */
+  int argvIndex = 0;          /* Next available argv[] slot */
+  int iOffset = -1;           /* Constraint for OFFSET */
+  void *pX = 0;               /* idxStr value */
+  int flags = 0;              /* RHS value for flags= */
+  const char *zLogTab = 0;    /* RHS value for logtab= */
+  int iFlagTerm = -1;         /* Constraint term for flags= */
+  int iLogTerm = -1;          /* Constraint term for logtab= */
+  int iIn = -1;               /* Index of the IN constraint */
+  vt02_vtab *pSelf;           /* This virtual table */
+
+  pSelf = (vt02_vtab*)pVTab;
+  if( pSelf->busy ){
+    vt02ErrMsg(pVTab, "recursive use  of vt02 prohibited");
+    return SQLITE_CONSTRAINT;
+  }
+  pSelf->busy++;
+ 
+
+  /* Do an initial scan for flags=N and logtab=TAB constraints with
+  ** usable RHS values */
+  for(i=0; i<pInfo->nConstraint; i++){
+    sqlite3_value *pVal;
+    if( !pInfo->aConstraint[i].usable ) continue;
+    if( pInfo->aConstraint[i].op!=SQLITE_INDEX_CONSTRAINT_EQ ) continue;
+    switch( pInfo->aConstraint[i].iColumn ){
+      case VT02_COL_FLAGS:
+        if( sqlite3_vtab_rhs_value(pInfo, i, &pVal)==SQLITE_OK
+         && sqlite3_value_type(pVal)==SQLITE_INTEGER
+        ){
+          flags = sqlite3_value_int(pVal);
+        }
+        iFlagTerm = i;
+        break;
+      case VT02_COL_LOGTAB:
+        if( sqlite3_vtab_rhs_value(pInfo, i, &pVal)==SQLITE_OK
+         && sqlite3_value_type(pVal)==SQLITE_TEXT
+        ){
+          zLogTab = (const char*)sqlite3_value_text(pVal);
+        }
+        iLogTerm = i;
+        break;
+    }
+  }
+
+  /* Do a second scan to actually analyze the index information */
+  memset(isEq, 0xff, sizeof(isEq));
+  memset(isUsed, 0xff, sizeof(isUsed));
+  for(i=0; i<pInfo->nConstraint; i++){
+    int j = pInfo->aConstraint[i].iColumn;
+    if( j>=VT02_COL_FLAGS ) continue;
+    if( pInfo->aConstraint[i].usable==0
+     && (flags & VT02_IGNORE_USABLE)==0 ) continue;
+    if( j<0 ) j = VT02_COL_X;
+    switch( pInfo->aConstraint[i].op ){
+      case SQLITE_INDEX_CONSTRAINT_FUNCTION:
+      case SQLITE_INDEX_CONSTRAINT_EQ:
+        isEq[j] = i;
+        break;
+      case SQLITE_INDEX_CONSTRAINT_LT:
+      case SQLITE_INDEX_CONSTRAINT_LE:
+      case SQLITE_INDEX_CONSTRAINT_GT:
+      case SQLITE_INDEX_CONSTRAINT_GE:
+        isUsed[j] = i;
+        break;
+      case SQLITE_INDEX_CONSTRAINT_OFFSET:
+        iOffset = i;
+        break;
+    }
+  }
+
+  /* Use the analysis to find an appropriate query plan */
+  if( isEq[0]>=0 ){
+    /* A constraint of X= takes priority */
+    pInfo->estimatedCost = 1;
+    pInfo->aConstraintUsage[isEq[0]].argvIndex = ++argvIndex;
+    if( flags & 0x20 ) pInfo->aConstraintUsage[isEq[0]].omit = 1;
+    pInfo->idxNum = 1;
+  }else if( isEq[1]<0 ){
+    /* If there is no X= nor A= then we have to do a full scan */
+    pInfo->idxNum = 0;
+    pInfo->estimatedCost = 10000;
+  }else{
+    int v = 1000;
+    pInfo->aConstraintUsage[isEq[1]].argvIndex = ++argvIndex;
+    if( flags & 0x20 ) pInfo->aConstraintUsage[isEq[1]].omit = 1;
+    for(i=2; i<=4 && isEq[i]>=0; i++){
+      if( i==4 && sqlite3_vtab_in(pInfo, isEq[4], 0) ) break;
+      pInfo->aConstraintUsage[isEq[i]].argvIndex = ++argvIndex;
+      if( flags & 0x20 ) pInfo->aConstraintUsage[isEq[i]].omit = 1;
+      v /= 10;
+    }
+    pInfo->idxNum = i;
+    if( isEq[4]>=0 && sqlite3_vtab_in(pInfo,isEq[4],1) ){
+      iIn = isEq[4];
+      pInfo->aConstraintUsage[iIn].argvIndex = ++argvIndex;
+      if( flags & 0x20 ) pInfo->aConstraintUsage[iIn].omit = 1;
+      v /= 5;
+      i++;
+      pInfo->idxNum += 4;
+    }
+    pInfo->estimatedCost = v;
+  }
+  pInfo->estimatedRows = (sqlite3_int64)pInfo->estimatedCost;
+
+  /* Attempt to consume the ORDER BY clause.  Except, always leave
+  ** orderByConsumed set to 0 for vt02_no_sort_opt.  In this way,
+  ** we can compare vt02 and vt02_no_sort_opt to ensure they get
+  ** the same answer.
+  */
+  if( pInfo->nOrderBy>0 && (flags & VT02_NO_SORT_OPT)==0 ){
+    if( pInfo->idxNum==1 ){
+      /* There will only be one row of output.  So it is always sorted. */
+      pInfo->orderByConsumed = 1;
+    }else
+    if( pInfo->aOrderBy[0].iColumn<=0 
+     && pInfo->aOrderBy[0].desc==0
+    ){
+      /* First column of order by is X ascending */
+      pInfo->orderByConsumed = 1;
+    }else
+    if( sqlite3_vtab_distinct(pInfo)>=1 ){
+      unsigned int x = 0;
+      for(i=0; i<pInfo->nOrderBy; i++){
+        int iCol = pInfo->aOrderBy[i].iColumn;
+        if( iCol<0 ) iCol = 0;
+        x |= 1<<iCol;
+      }
+      if( sqlite3_vtab_distinct(pInfo)==2 ){
+        if( x==0x02 ){
+          /* DISTINCT A */
+          pInfo->idxNum += 30;
+          pInfo->orderByConsumed = 1;
+        }else if( x==0x06 ){
+          /* DISTINCT A,B */
+          pInfo->idxNum += 20;
+          pInfo->orderByConsumed = 1;
+        }else if( x==0x0e ){
+          /* DISTINCT A,B,C */
+          pInfo->idxNum += 10;
+          pInfo->orderByConsumed = 1;
+        }else if( x & 0x01 ){
+          /* DISTINCT X */
+          pInfo->orderByConsumed = 1;
+        }else if( x==0x1e ){
+          /* DISTINCT A,B,C,D */
+          pInfo->orderByConsumed = 1;
+        }
+      }else{
+        if( x==0x02 ){
+          /* GROUP BY A */
+          pInfo->orderByConsumed = 1;
+        }else if( x==0x06 ){
+          /* GROUP BY A,B */
+          pInfo->orderByConsumed = 1;
+        }else if( x==0x0e ){
+          /* GROUP BY A,B,C */
+          pInfo->orderByConsumed = 1;
+        }else if( x & 0x01 ){
+          /* GROUP BY X */
+          pInfo->orderByConsumed = 1;
+        }else if( x==0x1e ){
+          /* GROUP BY A,B,C,D */
+          pInfo->orderByConsumed = 1;
+        }
+      }
+    }
+  }
+
+  if( flags & VT02_ALLOC_IDXSTR ){
+    pInfo->idxStr = sqlite3_mprintf("test");
+    pInfo->needToFreeIdxStr = 1;
+  }
+  if( flags & VT02_BAD_IDXNUM ){
+    pInfo->idxNum += 1000;
+  }
+
+  if( iOffset>=0 ){
+    pInfo->aConstraintUsage[iOffset].argvIndex = ++argvIndex;
+    if( (flags & VT02_NO_OFFSET)==0
+     && (pInfo->nOrderBy==0 || pInfo->orderByConsumed)
+    ){
+      pInfo->aConstraintUsage[iOffset].omit = 1;
+      pInfo->idxNum += 100;
+    }
+  }
+
+
+  /* Always omit flags= and logtab= constraints to prevent them from
+  ** interfering with the bytecode.  Put them at the end of the argv[]
+  ** array to keep them out of the way.
+  */
+  if( iFlagTerm>=0 ){
+    pInfo->aConstraintUsage[iFlagTerm].omit = 1;
+    pInfo->aConstraintUsage[iFlagTerm].argvIndex = ++argvIndex;
+  }
+  if( iLogTerm>=0 ){
+    pInfo->aConstraintUsage[iLogTerm].omit = 1;
+    pInfo->aConstraintUsage[iLogTerm].argvIndex = ++argvIndex;
+  }
+
+  /* The 0x40 flag means add all usable constraints to the output set */
+  if( flags & 0x40 ){
+    for(i=0; i<pInfo->nConstraint; i++){
+      if( pInfo->aConstraint[i].usable
+       && pInfo->aConstraintUsage[i].argvIndex==0
+      ){
+        pInfo->aConstraintUsage[i].argvIndex = ++argvIndex;
+        if( flags & 0x20 )  pInfo->aConstraintUsage[i].omit = 1;
+      }
+    }
+  }
+
+
+  /* Generate the log if requested */
+  if( zLogTab ){
+    static const char *azColname[] = {
+       "x", "a", "b", "c", "d", "flags", "logtab"
+    };
+    sqlite3 *db = ((vt02_vtab*)pVTab)->db;
+    sqlite3BestIndexLog(pInfo, zLogTab, db, azColname, pVTab);
+  }
+  pSelf->busy--;
+
+  /* Try to do a memory allocation solely for the purpose of causing
+  ** an error under OOM testing loops */
+  pX = sqlite3_malloc(800);
+  if( pX==0 ) return SQLITE_NOMEM;
+  sqlite3_free(pX);
+
+  return pVTab->zErrMsg!=0 ? SQLITE_ERROR : SQLITE_OK;
+}
+
+/* This is the sqlite3_module definition for the the virtual table defined
+** by this include file.
+*/
+const sqlite3_module vt02Module = {
+  /* iVersion      */  2,
+  /* xCreate       */  0,   /* This is an eponymous table */
+  /* xConnect      */  vt02Connect,
+  /* xBestIndex    */  vt02BestIndex,
+  /* xDisconnect   */  vt02Disconnect,
+  /* xDestroy      */  vt02Disconnect,
+  /* xOpen         */  vt02Open,
+  /* xClose        */  vt02Close,
+  /* xFilter       */  vt02Filter,
+  /* xNext         */  vt02Next,
+  /* xEof          */  vt02Eof,
+  /* xColumn       */  vt02Column,
+  /* xRowid        */  vt02Rowid,
+  /* xUpdate       */  0,
+  /* xBegin        */  0, 
+  /* xSync         */  0,
+  /* xCommit       */  0, 
+  /* xRollback     */  0,
+  /* xFindFunction */  0,
+  /* xRename       */  0,
+  /* xSavepoint    */  0,
+  /* xRelease      */  0,
+  /* xRollbackTo   */  0
+};
+
+static void vt02CoreInit(sqlite3 *db){
+  static const char zPkXSchema[] = 
+    "CREATE TABLE x(x INT NOT NULL PRIMARY KEY, a INT, b INT, c INT, d INT,"
+    " flags INT HIDDEN, logtab TEXT HIDDEN);";
+  static const char zPkABCDSchema[] = 
+    "CREATE TABLE x(x INT, a INT NOT NULL, b INT NOT NULL, c INT NOT NULL, "
+    "d INT NOT NULL, flags INT HIDDEN, logtab TEXT HIDDEN, "
+    "PRIMARY KEY(a,b,c,d));";
+  sqlite3_create_module(db, "vt02", &vt02Module, 0);
+  sqlite3_create_module(db, "vt02pkx", &vt02Module, (void*)zPkXSchema);
+  sqlite3_create_module(db, "vt02pkabcd", &vt02Module, (void*)zPkABCDSchema);
+}
+
+#ifdef TH3_VERSION
+static void vt02_init(th3state *p, int iDb, char *zArg){
+  vt02CoreInit(th3dbPointer(p, iDb));
+}
+#else
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
+int sqlite3_vt02_init(
+  sqlite3 *db, 
+  char **pzErrMsg, 
+  const sqlite3_api_routines *pApi
+){
+  SQLITE_EXTENSION_INIT2(pApi);
+  vt02CoreInit(db);
+  return SQLITE_OK;
+}
+#endif /* TH3_VERSION */

From 053bb22f35c5dd153a62158ed2cc6376b5979212 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Fri, 28 Oct 2022 18:52:05 +0000
Subject: [PATCH 386/428] Fix harmless compiler warnings in testing code.

FossilOrigin-Name: 2f53612388507f9b1ecbec3c15281825beab54b8062d97d0ab6f009c5fed347b
---
 ext/recover/dbdata.c         |  4 ++--
 ext/recover/sqlite3recover.c |  2 +-
 manifest                     | 18 +++++++++---------
 manifest.uuid                |  2 +-
 test/fuzzinvariants.c        |  2 +-
 test/vt02.c                  |  3 +--
 6 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/ext/recover/dbdata.c b/ext/recover/dbdata.c
index 2ad7e639ce..dca468f7b8 100644
--- a/ext/recover/dbdata.c
+++ b/ext/recover/dbdata.c
@@ -697,9 +697,9 @@ static int dbdataEof(sqlite3_vtab_cursor *pCursor){
 ** otherwise.
 */
 static int dbdataIsFunction(const char *zSchema){
-  int n = strlen(zSchema);
+  size_t n = strlen(zSchema);
   if( n>2 && zSchema[n-2]=='(' && zSchema[n-1]==')' ){
-    return n-2;
+    return (int)n-2;
   }
   return 0;
 }
diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index d3783b3200..f18903f658 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -2261,7 +2261,7 @@ static int recoverVfsDetectPagesize(
         }
       }
     }
-    if( pgsz>p->detected_pgsz ){
+    if( pgsz>(u32)p->detected_pgsz ){
       p->detected_pgsz = pgsz;
       p->nReserve = nReserve;
     }
diff --git a/manifest b/manifest
index d539c800db..0be8e46c1c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\ssqlite3recover()\ssupport\sto\sfuzzcheck.
-D 2022-10-28T18:35:06.668
+C Fix\sharmless\scompiler\swarnings\sin\stesting\scode.
+D 2022-10-28T18:52:05.114
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -385,7 +385,7 @@ F ext/rbu/rbuvacuum4.test a78898e438a44803eb2bc897ba3323373c9f277418e2d6d76e90f2
 F ext/rbu/sqlite3rbu.c 8737cabdfbee84bb25a7851ecef8b1312be332761238da9be6ddb10c62ad4291
 F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9cd389812
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
-F ext/recover/dbdata.c 76b4040547dc5f448f5d4599ccde8ab4311e0ab9df002adc410fef3f13fd822e
+F ext/recover/dbdata.c 3ae32f9b7f02a141889b9075beb87895a826d0fcf3b702b8251cbb0dd3c91a83
 F ext/recover/recover1.test e08dc7a0513eab9de33e7b8e2260b9538bedb57c9bd6fbb278f328d29a102827
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
 F ext/recover/recoverclobber.test 294dcc894124ab4ca3a7b35766630742a3d25810fceac22220beb64f70a33a60
@@ -398,7 +398,7 @@ F ext/recover/recoverpgsz.test 93e970eab05e4e89f8fd6b1bd23f9ec137ea09857e66ba0d4
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
 F ext/recover/recoverslowidx.test f356bb9fba7ffd6fc50e045e419464f0129ac6e24decf6e919584f79c3493727
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
-F ext/recover/sqlite3recover.c 69656992f1dd3b0645c30e465372bb73c6f64f9620845622424fec8f84a8b42b
+F ext/recover/sqlite3recover.c ec7b6cddae10476312ff22c0a59d97d550fefba3e85fce3750f722d3520350f5
 F ext/recover/sqlite3recover.h f698ccc94bd4da38761035415ad08c4549a408491ff9fd5f52d34d2214f64e36
 F ext/recover/test_recover.c 61ec931e47abca6b2210f46239cafd9f3060741605e3d3c45a7c7a53f63dd957
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -1165,7 +1165,7 @@ F test/fuzzdata8.db 653423800b7671e67caa740e977d80e1360f0d69e9992851f3ea5c4a69a2
 F test/fuzzer1.test 3d4c4b7e547aba5e5511a2991e3e3d07166cfbb8
 F test/fuzzer2.test a85ef814ce071293bce1ad8dffa217cbbaad4c14
 F test/fuzzerfault.test f64c4aef4c9e9edf1d6dc0d3f1e65dcc81e67c996403c88d14f09b74807a42bc
-F test/fuzzinvariants.c 760a1004ae4c4cef398310631ea6d441c5e8297af0f688a2dc7a467afd22df33
+F test/fuzzinvariants.c 7877178eaa10eb3ea986f81a7010efc371ccd3e13ee5b14fa290b0459002a36a
 F test/gcfault.test dd28c228a38976d6336a3fc42d7e5f1ad060cb8c
 F test/gencol1.test cc0dbb0ee116e5602e18ea7d47f2a0f76b26e09a823b7c36ef254370c2b0f3c1
 F test/genesis.tcl 1e2e2e8e5cc4058549a154ff1892fe5c9de19f98
@@ -1809,7 +1809,7 @@ F test/veryquick.test 57ab846bacf7b90cf4e9a672721ea5c5b669b661
 F test/view.test d16e49e89ada6137d1447777ef2a74574526a3b024e6733bf53ae2960da8c17c
 F test/view2.test db32c8138b5b556f610b35dfddd38c5a58a292f07fda5281eedb0851b2672679
 F test/view3.test ad8a8290ee2b55ff6ce66c9ef1ce3f1e47926273a3814e1c425293e128a95456
-F test/vt02.c b94cbc59aba9b5a47f645fc8fc8aa7bdd96e686b98f3766e4080659cc07bf631
+F test/vt02.c 33ecddc0832d4cd24e9e9fa83d868981b1e049462f4ec9080710353f6479a534
 F test/vtab1.test 09a72330d0f31eda2ffaa828b06a6b917fb86250ee72de0301570af725774c07
 F test/vtab2.test 14d4ab26cee13ba6cf5c5601b158e4f57552d3b055cdd9406cf7f711e9c84082
 F test/vtab3.test b45f47d20f225ccc9c28dc915d92740c2dee311e
@@ -2054,8 +2054,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 e85387590061edbb6cdc04de792ab86f43afaa5c8d1b0792206cb5b481c7d76a
-R dbf1d43633dc57fc37ff5c25dc929e02
+P e65c5bdc5bd6e1989c3de59798ff0a761125fc490fdec8c7671ca70ed688c4f8
+R 2092bbb0212ed06397996f6b20b31c55
 U drh
-Z 6124d4e303fc5fa0fccc696b151a8f8d
+Z 91f846334499b4960f1a923dbe22c496
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index ba8bf21b2a..8160792046 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e65c5bdc5bd6e1989c3de59798ff0a761125fc490fdec8c7671ca70ed688c4f8
\ No newline at end of file
+2f53612388507f9b1ecbec3c15281825beab54b8062d97d0ab6f009c5fed347b
\ No newline at end of file
diff --git a/test/fuzzinvariants.c b/test/fuzzinvariants.c
index c2df82b4aa..c0ed2dde58 100644
--- a/test/fuzzinvariants.c
+++ b/test/fuzzinvariants.c
@@ -263,7 +263,7 @@ static char *fuzz_invariant_sql(sqlite3_stmt *pStmt, int iCnt){
   pTest = sqlite3_str_new(0);
   sqlite3_str_appendf(pTest, "SELECT %s* FROM (",  
                       bDistinct ? "DISTINCT " : "");
-  sqlite3_str_append(pTest, zIn, nIn);
+  sqlite3_str_append(pTest, zIn, (int)nIn);
   sqlite3_str_append(pTest, ")", 1);
   rc = sqlite3_prepare_v2(db, sqlite3_str_value(pTest), -1, &pBase, 0);
   if( rc ){
diff --git a/test/vt02.c b/test/vt02.c
index b4e76a891b..40bd6fcb3e 100644
--- a/test/vt02.c
+++ b/test/vt02.c
@@ -377,7 +377,7 @@ static int vt02Filter(
     pCur->i = 0;
     for(m=1000, i=0; i<=e; i++, m /= 10){
       sqlite3_int64 v;
-      sqlite3_value *pVal = 0;
+      pVal = 0;
       if( sqlite3_vtab_in_first(0, &pVal)!=SQLITE_MISUSE
        || sqlite3_vtab_in_first(argv[iArg], &pVal)!=SQLITE_MISUSE
       ){
@@ -588,7 +588,6 @@ static void sqlite3BestIndexLog(
     char *zSql;
     int iCol = pInfo->aConstraint[i].iColumn;
     int op = pInfo->aConstraint[i].op;
-    int rc;
     const char *zCol;
     if( op==SQLITE_INDEX_CONSTRAINT_LIMIT
      || op==SQLITE_INDEX_CONSTRAINT_OFFSET

From 8948fbee29f8860ff6d116eaa66626ff11ab8064 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sat, 29 Oct 2022 07:54:10 +0000
Subject: [PATCH 387/428] Move the sqlite3.capi.wasm namespace to sqlite3.wasm.
 This causes a tiny bit of naming confusion with the sqlite3.wasm *file*, but
 seems to make more sense than having it as a sub-namespace of capi.

FossilOrigin-Name: 3f16eb18d6186ca972fca952ccac18649e7a905213f589e53c0c9333e695448d
---
 ext/wasm/GNUmakefile                 |  15 ++
 ext/wasm/api/sqlite3-api-cleanup.js  |   2 +-
 ext/wasm/api/sqlite3-api-glue.js     |  11 +-
 ext/wasm/api/sqlite3-api-oo1.js      |   5 +-
 ext/wasm/api/sqlite3-api-opfs.js     |   4 +-
 ext/wasm/api/sqlite3-api-prologue.js | 211 +++++++++++++--------------
 ext/wasm/api/sqlite3-api-worker1.js  |   4 +-
 ext/wasm/api/sqlite3-worker1.js      |   6 +-
 ext/wasm/batch-runner.js             |  10 +-
 ext/wasm/demo-jsstorage.js           |   2 +-
 ext/wasm/fiddle/fiddle-worker.js     |  20 +--
 ext/wasm/module-symbols.html         |  55 ++++---
 ext/wasm/scratchpad-wasmfs-main.js   |   2 +-
 ext/wasm/speedtest1-worker.html      |   2 +-
 ext/wasm/speedtest1-worker.js        |   6 +-
 ext/wasm/speedtest1.html             |   2 +-
 ext/wasm/tester1.js                  |  33 ++---
 manifest                             |  46 +++---
 manifest.uuid                        |   2 +-
 19 files changed, 227 insertions(+), 211 deletions(-)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index a191668d5b..dafe430de0 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -586,3 +586,18 @@ push:
     $(wasm-testing.include) $(wasm-testing.dest)
 	ssh wasm-testing 'cd $(wasm-testing.dir) && bash .gzip' || \
     echo "SSH failed: it's likely that stale content will be served via old gzip files." 
+
+WDOCS.home := $(wildcard ../../../wdoc)
+ifneq (,$(WDOCS.home))
+WDOCS.jswasm += $(WDOCS.home)/jswasm
+update-docs:
+	cp $(sqlite3.wasm) $(WDOCS.jswasm)/.
+	$(bin.stripccomments) -k -k < $(sqlite3.js) > $(WDOCS.jswasm)/sqlite3.js
+	cp demo-123.js demo-123.html demo-123-worker.html $(WDOCS.home)
+	sed -n -e '/EXTRACT_BEGIN/,/EXTRACT_END/p' \
+		module-symbols.html > $(WDOCS.home)/module-symbols.html
+
+else
+update-docs:
+  @echo "Cannot find wasm docs checkout."
+endif
diff --git a/ext/wasm/api/sqlite3-api-cleanup.js b/ext/wasm/api/sqlite3-api-cleanup.js
index 555e5d31c5..bef4d91d70 100644
--- a/ext/wasm/api/sqlite3-api-cleanup.js
+++ b/ext/wasm/api/sqlite3-api-cleanup.js
@@ -59,7 +59,7 @@ if('undefined' !== typeof Module){ // presumably an Emscripten build
   }
 
   /* Clean up temporary references to our APIs... */
-  delete sqlite3.capi.util /* arguable, but these are (currently) internal-use APIs */;
+  delete sqlite3.util /* arguable, but these are (currently) internal-use APIs */;
   Module.sqlite3 = sqlite3 /* Needed for customized sqlite3InitModule() to be able to
                               pass the sqlite3 object off to the client. */;
 }else{
diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index 16840e79f3..63425e538c 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -20,8 +20,8 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
   'use strict';
   const toss = (...args)=>{throw new Error(args.join(' '))};
   const toss3 = sqlite3.SQLite3Error.toss;
-  const capi = sqlite3.capi, wasm = capi.wasm, util = capi.util;
-  self.WhWasmUtilInstaller(capi.wasm);
+  const capi = sqlite3.capi, wasm = sqlite3.wasm, util = sqlite3.util;
+  self.WhWasmUtilInstaller(wasm);
   delete self.WhWasmUtilInstaller;
 
   /**
@@ -88,7 +88,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
       capi[e[0]] = wasm.xWrap.apply(null, e);
     }
     for(const e of wasm.bindingSignatures.wasm){
-      capi.wasm[e[0]] = wasm.xWrap.apply(null, e);
+      wasm[e[0]] = wasm.xWrap.apply(null, e);
     }
 
     /* For C API functions which cannot work properly unless
@@ -109,7 +109,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     delete wasm.bindingSignatures;
 
     if(wasm.exports.sqlite3_wasm_db_error){
-      util.sqlite3_wasm_db_error = capi.wasm.xWrap(
+      util.sqlite3_wasm_db_error = wasm.xWrap(
         'sqlite3_wasm_db_error', 'int', 'sqlite3*', 'int', 'string'
       );
     }else{
@@ -176,7 +176,6 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
       }
       /* Wrap the callback in a WASM-bound function and convert the callback's
          `(char**)` arguments to arrays of strings... */
-      const wasm = capi.wasm;
       const cbwrap = function(pVoid, nCols, pColVals, pColNames){
         let rc = capi.SQLITE_ERROR;
         try {
@@ -399,7 +398,6 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
         return __dbArgcMismatch(pDb,"sqlite3_create_function_v2",f.length);
       }
       /* Wrap the callbacks in a WASM-bound functions... */
-      const wasm = capi.wasm;
       const uninstall = [/*funcs to uninstall on error*/];
       let rc;
       try{
@@ -441,7 +439,6 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
         return __dbArgcMismatch(pDb,"sqlite3_create_window_function",f.length);
       }
       /* Wrap the callbacks in a WASM-bound functions... */
-      const wasm = capi.wasm;
       const uninstall = [/*funcs to uninstall on error*/];
       let rc;
       try{
diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index bab5a64ef2..cbdf40f9be 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -18,7 +18,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
   const toss = (...args)=>{throw new Error(args.join(' '))};
   const toss3 = (...args)=>{throw new sqlite3.SQLite3Error(...args)};
 
-  const capi = sqlite3.capi, wasm = capi.wasm, util = capi.util;
+  const capi = sqlite3.capi, wasm = sqlite3.wasm, util = sqlite3.util;
   /* What follows is colloquially known as "OO API #1". It is a
      binding of the sqlite3 API which is designed to be run within
      the same thread (main or worker) as the one in which the
@@ -694,7 +694,6 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     */
     exec: function(/*(sql [,obj]) || (obj)*/){
       affirmDbOpen(this);
-      const wasm = capi.wasm;
       const arg = parseExecArgs(arguments);
       if(!arg.sql){
         return (''===arg.sql) ? this : toss3("exec() requires an SQL string.");
@@ -925,7 +924,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
       const pApp = opt.pApp;
       if(undefined!==pApp &&
          null!==pApp &&
-         (('number'!==typeof pApp) || !capi.util.isInt32(pApp))){
+         (('number'!==typeof pApp) || !util.isInt32(pApp))){
         toss3("Invalid value for pApp property. Must be a legal WASM pointer value.");
       }
       const xDestroy = opt.xDestroy || 0;
diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index 41efe0ab6d..a4516513cb 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -118,7 +118,7 @@ const installOpfsVfs = function callee(options){
     const error =  (...args)=>logImpl(0, ...args);
     const toss = function(...args){throw new Error(args.join(' '))};
     const capi = sqlite3.capi;
-    const wasm = capi.wasm;
+    const wasm = sqlite3.wasm;
     const sqlite3_vfs = capi.sqlite3_vfs;
     const sqlite3_file = capi.sqlite3_file;
     const sqlite3_io_methods = capi.sqlite3_io_methods;
@@ -924,7 +924,7 @@ const installOpfsVfs = function callee(options){
        cannot add an after-initialize callback mechanism.
     */
     opfsUtil.registerVfs = (asDefault=false)=>{
-      return capi.wasm.exports.sqlite3_vfs_register(
+      return wasm.exports.sqlite3_vfs_register(
         opfsVfs.pointer, asDefault ? 1 : 0
       );
     };
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index b841a0491d..6dae0b6060 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -557,110 +557,107 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
        values.
      */
     sqlite3_randomness: (n, outPtr)=>{/*installed later*/},
-
-    /**
-       Various internal-use utilities are added here as needed. They
-       are bound to an object only so that we have access to them in
-       the differently-scoped steps of the API bootstrapping
-       process. At the end of the API setup process, this object gets
-       removed. These are NOT part of the public API.
-    */
-    util:{
-      affirmBindableTypedArray, flexibleString,
-      bigIntFits32, bigIntFits64, bigIntFitsDouble,
-      isBindableTypedArray,
-      isInt32, isSQLableTypedArray, isTypedArray, 
-      typedArrayToString,
-      isUIThread: ()=>'undefined'===typeof WorkerGlobalScope,
-      isSharedTypedArray,
-      typedArrayPart
-    },
-    
-    /**
-       Holds state which are specific to the WASM-related
-       infrastructure and glue code. It is not expected that client
-       code will normally need these, but they're exposed here in case
-       it does. These APIs are _not_ to be considered an
-       official/stable part of the sqlite3 WASM API. They may change
-       as the developers' experience suggests appropriate changes.
-
-       Note that a number of members of this object are injected
-       dynamically after the api object is fully constructed, so
-       not all are documented inline here.
-    */
-    wasm: {
-    //^^^ TODO?: move wasm from sqlite3.capi.wasm to sqlite3.wasm
-      /**
-         Emscripten APIs have a deep-seated assumption that all pointers
-         are 32 bits. We'll remain optimistic that that won't always be
-         the case and will use this constant in places where we might
-         otherwise use a hard-coded 4.
-      */
-      ptrSizeof: config.wasmPtrSizeof || 4,
-      /**
-         The WASM IR (Intermediate Representation) value for
-         pointer-type values. It MUST refer to a value type of the
-         size described by this.ptrSizeof _or_ it may be any value
-         which ends in '*', which Emscripten's glue code internally
-         translates to i32.
-      */
-      ptrIR: config.wasmPtrIR || "i32",
-      /**
-         True if BigInt support was enabled via (e.g.) the
-         Emscripten -sWASM_BIGINT flag, else false. When
-         enabled, certain 64-bit sqlite3 APIs are enabled which
-         are not otherwise enabled due to JS/WASM int64
-         impedence mismatches.
-      */
-      bigIntEnabled: !!config.bigIntEnabled,
-      /**
-         The symbols exported by the WASM environment.
-      */
-      exports: config.exports
-        || toss("Missing API config.exports (WASM module exports)."),
-
-      /**
-         When Emscripten compiles with `-sIMPORT_MEMORY`, it
-         initalizes the heap and imports it into wasm, as opposed to
-         the other way around. In this case, the memory is not
-         available via this.exports.memory.
-      */
-      memory: config.memory || config.exports['memory']
-        || toss("API config object requires a WebAssembly.Memory object",
-                "in either config.exports.memory (exported)",
-                "or config.memory (imported)."),
-
-      /**
-         The API's one single point of access to the WASM-side memory
-         allocator. Works like malloc(3) (and is likely bound to
-         malloc()) but throws an WasmAllocError if allocation fails. It is
-         important that any code which might pass through the sqlite3 C
-         API NOT throw and must instead return SQLITE_NOMEM (or
-         equivalent, depending on the context).
-
-         That said, very few cases in the API can result in
-         client-defined functions propagating exceptions via the C-style
-         API. Most notably, this applies ot User-defined SQL Functions
-         (UDFs) registered via sqlite3_create_function_v2(). For that
-         specific case it is recommended that all UDF creation be
-         funneled through a utility function and that a wrapper function
-         be added around the UDF which catches any exception and sets
-         the error state to OOM. (The overall complexity of registering
-         UDFs essentially requires a helper for doing so!)
-      */
-      alloc: undefined/*installed later*/,
-      /**
-         The API's one single point of access to the WASM-side memory
-         deallocator. Works like free(3) (and is likely bound to
-         free()).
-      */
-      dealloc: undefined/*installed later*/
-
-      /* Many more wasm-related APIs get installed later on. */
-    }/*wasm*/
   }/*capi*/;
 
-  const wasm = capi.wasm, util = capi.util;
+  /**
+     Various internal-use utilities are added here as needed. They
+     are bound to an object only so that we have access to them in
+     the differently-scoped steps of the API bootstrapping
+     process. At the end of the API setup process, this object gets
+     removed. These are NOT part of the public API.
+  */
+  const util = {
+    affirmBindableTypedArray, flexibleString,
+    bigIntFits32, bigIntFits64, bigIntFitsDouble,
+    isBindableTypedArray,
+    isInt32, isSQLableTypedArray, isTypedArray, 
+    typedArrayToString,
+    isUIThread: ()=>'undefined'===typeof WorkerGlobalScope,
+    isSharedTypedArray,
+    typedArrayPart
+  };
+    
+  /**
+     Holds state which are specific to the WASM-related
+     infrastructure and glue code. It is not expected that client
+     code will normally need these, but they're exposed here in case
+     it does. These APIs are _not_ to be considered an
+     official/stable part of the sqlite3 WASM API. They may change
+     as the developers' experience suggests appropriate changes.
+
+     Note that a number of members of this object are injected
+     dynamically after the api object is fully constructed, so
+     not all are documented inline here.
+  */
+  const wasm = {
+    /**
+       Emscripten APIs have a deep-seated assumption that all pointers
+       are 32 bits. We'll remain optimistic that that won't always be
+       the case and will use this constant in places where we might
+       otherwise use a hard-coded 4.
+    */
+    ptrSizeof: config.wasmPtrSizeof || 4,
+    /**
+       The WASM IR (Intermediate Representation) value for
+       pointer-type values. It MUST refer to a value type of the
+       size described by this.ptrSizeof _or_ it may be any value
+       which ends in '*', which Emscripten's glue code internally
+       translates to i32.
+    */
+    ptrIR: config.wasmPtrIR || "i32",
+    /**
+       True if BigInt support was enabled via (e.g.) the
+       Emscripten -sWASM_BIGINT flag, else false. When
+       enabled, certain 64-bit sqlite3 APIs are enabled which
+       are not otherwise enabled due to JS/WASM int64
+       impedence mismatches.
+    */
+    bigIntEnabled: !!config.bigIntEnabled,
+    /**
+       The symbols exported by the WASM environment.
+    */
+    exports: config.exports
+      || toss("Missing API config.exports (WASM module exports)."),
+
+    /**
+       When Emscripten compiles with `-sIMPORT_MEMORY`, it
+       initalizes the heap and imports it into wasm, as opposed to
+       the other way around. In this case, the memory is not
+       available via this.exports.memory.
+    */
+    memory: config.memory || config.exports['memory']
+      || toss("API config object requires a WebAssembly.Memory object",
+              "in either config.exports.memory (exported)",
+              "or config.memory (imported)."),
+
+    /**
+       The API's one single point of access to the WASM-side memory
+       allocator. Works like malloc(3) (and is likely bound to
+       malloc()) but throws an WasmAllocError if allocation fails. It is
+       important that any code which might pass through the sqlite3 C
+       API NOT throw and must instead return SQLITE_NOMEM (or
+       equivalent, depending on the context).
+
+       That said, very few cases in the API can result in
+       client-defined functions propagating exceptions via the C-style
+       API. Most notably, this applies ot User-defined SQL Functions
+       (UDFs) registered via sqlite3_create_function_v2(). For that
+       specific case it is recommended that all UDF creation be
+       funneled through a utility function and that a wrapper function
+       be added around the UDF which catches any exception and sets
+       the error state to OOM. (The overall complexity of registering
+       UDFs essentially requires a helper for doing so!)
+    */
+    alloc: undefined/*installed later*/,
+    /**
+       The API's one single point of access to the WASM-side memory
+       deallocator. Works like free(3) (and is likely bound to
+       free()).
+    */
+    dealloc: undefined/*installed later*/
+
+    /* Many more wasm-related APIs get installed later on. */
+  }/*wasm*/;
 
   /**
      wasm.alloc()'s srcTypedArray.byteLength bytes,
@@ -915,7 +912,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
   /**
      Functions which are intended solely for API-internal use by the
      WASM components, not client code. These get installed into
-     capi.wasm.
+     sqlite3.wasm.
   */
   wasm.bindingSignatures.wasm = [
     ["sqlite3_wasm_db_reset", "int", "sqlite3*"],
@@ -1127,7 +1124,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
       }
       return ta;
     }
-    capi.wasm.exports.sqlite3_randomness(...args);
+    wasm.exports.sqlite3_randomness(...args);
   };
 
   /** State for sqlite3_wasmfs_opfs_dir(). */
@@ -1304,7 +1301,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
           : 0);
   };
   
-  if( capi.util.isUIThread() ){
+  if( util.isUIThread() ){
     /* Features specific to the main window thread... */
 
     /**
@@ -1390,6 +1387,8 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     WasmAllocError: WasmAllocError,
     SQLite3Error: SQLite3Error,
     capi,
+    util,
+    wasm,
     config,
     /**
        Holds the version info of the sqlite3 source tree from which
@@ -1489,7 +1488,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
   this array is deleted.
 
   Note that the order of insertion into this array is significant for
-  some pieces. e.g. sqlite3.capi and sqlite3.capi.wasm cannot be fully
+  some pieces. e.g. sqlite3.capi and sqlite3.wasm cannot be fully
   utilized until the whwasmutil.js part is plugged in via
   sqlite3-api-glue.js.
 */
diff --git a/ext/wasm/api/sqlite3-api-worker1.js b/ext/wasm/api/sqlite3-api-worker1.js
index 748ce4c6f5..1e8048159e 100644
--- a/ext/wasm/api/sqlite3-api-worker1.js
+++ b/ext/wasm/api/sqlite3-api-worker1.js
@@ -367,11 +367,11 @@ sqlite3.initWorker1API = function(){
       if(db){
         delete this.dbs[getDbId(db)];
         const filename = db.filename;
-        const pVfs = sqlite3.capi.wasm.sqlite3_wasm_db_vfs(db.pointer, 0);
+        const pVfs = sqlite3.wasm.sqlite3_wasm_db_vfs(db.pointer, 0);
         db.close();
         if(db===this.defaultDb) this.defaultDb = undefined;
         if(alsoUnlink && filename && pVfs){
-          sqlite3.capi.wasm.sqlite3_wasm_vfs_unlink(pVfs, filename);
+          sqlite3.wasm.sqlite3_wasm_vfs_unlink(pVfs, filename);
         }
       }
     },
diff --git a/ext/wasm/api/sqlite3-worker1.js b/ext/wasm/api/sqlite3-worker1.js
index 4cff68b08b..942437908f 100644
--- a/ext/wasm/api/sqlite3-worker1.js
+++ b/ext/wasm/api/sqlite3-worker1.js
@@ -30,8 +30,6 @@
 
   - `sqlite3.dir`, if set, treats the given directory name as the
     directory from which `sqlite3.js` will be loaded.
-
-  By default is loads 'sqlite3.js'.
 */
 "use strict";
 (()=>{
@@ -43,7 +41,9 @@
   //console.warn("worker1 theJs =",theJs);
   importScripts(theJs);
   sqlite3InitModule().then((sqlite3)=>{
-    sqlite3.capi.sqlite3_wasmfs_opfs_dir();
+    if(sqlite3.capi.sqlite3_wasmfs_opfs_dir){
+      sqlite3.capi.sqlite3_wasmfs_opfs_dir();
+    }
     sqlite3.initWorker1API();
   });
 })();
diff --git a/ext/wasm/batch-runner.js b/ext/wasm/batch-runner.js
index c40157bb59..11c43217ff 100644
--- a/ext/wasm/batch-runner.js
+++ b/ext/wasm/batch-runner.js
@@ -68,7 +68,7 @@
     // This would be SO much easier with the oo1 API, but we specifically want to
     // inject metrics we can't get via that API, and we cannot reliably (OPFS)
     // open the same DB twice to clear it using that API, so...
-    const rc = sqlite3.capi.wasm.exports.sqlite3_wasm_db_reset(db.handle);
+    const rc = sqlite3.wasm.exports.sqlite3_wasm_db_reset(db.handle);
     App.logHtml("reset db rc =",rc,db.id, db.filename);
   };
 
@@ -115,7 +115,7 @@
       const banner = "========================================";
       this.logHtml(banner,
                    "Running",name,'('+sql.length,'bytes) using',db.id);
-      const capi = this.sqlite3.capi, wasm = capi.wasm;
+      const capi = this.sqlite3.capi, wasm = this.sqlite3.wasm;
       let pStmt = 0, pSqlBegin;
       const stack = wasm.scopedAllocPush();
       const metrics = db.metrics = Object.create(null);
@@ -289,7 +289,7 @@
         return;
       }
       if(!db.handle) return;
-      const capi = this.sqlite3, wasm = capi.wasm;
+      const capi = this.sqlite3, wasm = this.sqlite3.wasm;
       //const scope = wasm.scopedAllocPush(
       this.logErr("TODO: clear db");
     },
@@ -488,7 +488,7 @@
           App.logHtml(dbId,"cache_size =",cacheSize);
         });
       }else{
-        const capi = this.sqlite3.capi, wasm = capi.wasm;
+        const capi = this.sqlite3.capi, wasm = this.sqlite3.wasm;
         const stack = wasm.scopedAllocPush();
         let pDb = 0;
         try{
@@ -516,7 +516,7 @@
     run: function(sqlite3){
       delete this.run;
       this.sqlite3 = sqlite3;
-      const capi = sqlite3.capi, wasm = capi.wasm;
+      const capi = sqlite3.capi, wasm = sqlite3.wasm;
       this.logHtml("Loaded module:",capi.sqlite3_libversion(), capi.sqlite3_sourceid());
       this.logHtml("WASM heap size =",wasm.heap8().length);
       this.loadSqlList();
diff --git a/ext/wasm/demo-jsstorage.js b/ext/wasm/demo-jsstorage.js
index 0621cb2dca..cf820e4033 100644
--- a/ext/wasm/demo-jsstorage.js
+++ b/ext/wasm/demo-jsstorage.js
@@ -44,7 +44,7 @@
   const runTests = function(sqlite3){
     const capi = sqlite3.capi,
           oo = sqlite3.oo1,
-          wasm = capi.wasm;
+          wasm = sqlite3.wasm;
     log("Loaded module:",capi.sqlite3_libversion(), capi.sqlite3_sourceid());
     T.assert( 0 !== capi.sqlite3_vfs_find(null) );
     if(!capi.sqlite3_vfs_find('kvvfs')){
diff --git a/ext/wasm/fiddle/fiddle-worker.js b/ext/wasm/fiddle/fiddle-worker.js
index 935878c81a..a60b79ab2e 100644
--- a/ext/wasm/fiddle/fiddle-worker.js
+++ b/ext/wasm/fiddle/fiddle-worker.js
@@ -122,11 +122,11 @@
   const Sqlite3Shell = {
     /** Returns the name of the currently-opened db. */
     dbFilename: function f(){
-      if(!f._) f._ = sqlite3.capi.wasm.xWrap('fiddle_db_filename', "string", ['string']);
+      if(!f._) f._ = sqlite3.wasm.xWrap('fiddle_db_filename', "string", ['string']);
       return f._(0);
     },
     dbHandle: function f(){
-      if(!f._) f._ = sqlite3.capi.wasm.xWrap("fiddle_db_handle", "sqlite3*");
+      if(!f._) f._ = sqlite3.wasm.xWrap("fiddle_db_handle", "sqlite3*");
       return f._();
     },
     dbIsOpfs: function f(){
@@ -145,7 +145,7 @@
            that any argv strings passed to its main() are valid until
            the wasm environment shuts down. */
       ];
-      const capi = sqlite3.capi;
+      const capi = sqlite3.capi, wasm = sqlite3.wasm;
       /* We need to call sqlite3_shutdown() in order to avoid numerous
          legitimate warnings from the shell about it being initialized
          after sqlite3_initialize() has been called. This means,
@@ -154,8 +154,8 @@
          VFSes). We need a more generic approach to running such
          init-level code. */
       capi.sqlite3_shutdown();
-      f.argv.pArgv = capi.wasm.allocMainArgv(f.argv);
-      f.argv.rc = capi.wasm.exports.fiddle_main(
+      f.argv.pArgv = wasm.allocMainArgv(f.argv);
+      f.argv.rc = wasm.exports.fiddle_main(
         f.argv.length, f.argv.pArgv
       );
       if(f.argv.rc){
@@ -187,7 +187,7 @@
     exec: function f(sql){
       if(!f._){
         if(!this.runMain()) return;
-        f._ = sqlite3.capi.wasm.xWrap('fiddle_exec', null, ['string']);
+        f._ = sqlite3.wasm.xWrap('fiddle_exec', null, ['string']);
       }
       if(fiddleModule.isDead){
         stderr("shell module has exit()ed. Cannot run SQL.");
@@ -208,7 +208,7 @@
       }
     },
     resetDb: function f(){
-      if(!f._) f._ = sqlite3.capi.wasm.xWrap('fiddle_reset_db', null);
+      if(!f._) f._ = sqlite3.wasm.xWrap('fiddle_reset_db', null);
       stdout("Resetting database.");
       f._();
       stdout("Reset",this.dbFilename());
@@ -216,7 +216,7 @@
     /* Interrupt can't work: this Worker is tied up working, so won't get the
        interrupt event which would be needed to perform the interrupt. */
     interrupt: function f(){
-      if(!f._) f._ = sqlite3.capi.wasm.xWrap('fiddle_interrupt', null);
+      if(!f._) f._ = sqlite3.wasm.xWrap('fiddle_interrupt', null);
       stdout("Requesting interrupt.");
       f._();
     }
@@ -370,9 +370,9 @@
   */
   sqlite3InitModule(fiddleModule).then((_sqlite3)=>{
     sqlite3 = _sqlite3;
-    const dbVfs = sqlite3.capi.wasm.xWrap('fiddle_db_vfs', "*", ['string']);
+    const dbVfs = sqlite3.wasm.xWrap('fiddle_db_vfs', "*", ['string']);
     fiddleModule.fsUnlink = (fn)=>{
-      return sqlite3.capi.wasm.sqlite3_wasm_vfs_unlink(dbVfs(0), fn);
+      return sqlite3.wasm.sqlite3_wasm_vfs_unlink(dbVfs(0), fn);
     };
     wMsg('fiddle-ready');
   })/*then()*/;
diff --git a/ext/wasm/module-symbols.html b/ext/wasm/module-symbols.html
index e77866a5e7..450abb9327 100644
--- a/ext/wasm/module-symbols.html
+++ b/ext/wasm/module-symbols.html
@@ -4,11 +4,17 @@
     <meta charset="utf-8">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
-    <script src="jswasm/sqlite3.js"></script>
     <title>sqlite3 Module Symbols</title>
   </head>
   <body>
-<div class="fossil-doc" data-title="sqlite3 Module Symbols">
+
+<div class="fossil-doc" data-title="sqlite3 Module Symbols"><!-- EXTRACT_BEGIN -->
+<!--
+    The part of this doc wrapped in div.fossil-doc gets snipped out
+    from the canonical copy in the main tree (ext/wasm/module-symbols.html)
+    and added to the wasm docs repository, where it's served from
+    fossil.
+ -->
   <style>
     .pseudolist {
         column-count: auto;
@@ -85,7 +91,7 @@
     <p>Jump to...</p>
     <ul>
       <li><a href='#sqlite3-namespace'><code>sqlite3</code> namespace</a></li>
-      <li><a href='#sqlite3-version'><code>sqlite3.version</code></a></li>
+      <li><a href='#sqlite3-version'><code>sqlite3.version</code> object</a></li>
       <li><a href='#sqlite3-functions'><code>sqlite3_...()</code> functions</a></li>
       <li><a href='#sqlite3-constants'><code>SQLITE_...</code> functions</a></li>
       <li><a href='#sqlite3.oo1'><code>sqlite3.oo1</code></a>
@@ -94,8 +100,8 @@
           <li><a href='#sqlite3.oo1.Stmt'><code>sqlite3.oo1.Stmt</code></a></li>
         </ul-->
       </li>
-      <li><a href='#sqlite3.capi.wasm'><code>sqlite3.capi.wasm</code></a></li>
-      <li><a href='#sqlite3.capi.wasm.pstack'><code>sqlite3.capi.wasm.pstack</code></a></li>
+      <li><a href='#sqlite3.wasm'><code>sqlite3.wasm</code> namespace</a></li>
+      <li><a href='#sqlite3.wasm.pstack'><code>sqlite3.wasm.pstack</code> namespace</a></li>
       <li><a href='#compile-options'>Compilation options used in this module build.</a></li>
     </ul>
 
@@ -107,7 +113,7 @@
     <div id='list-namespace' class='pseudolist'></div>
 
     <a id="sqlite3-version"></a>
-    <h1><code>sqlite3.version</code></h1>
+    <h1><code>sqlite3.version</code> Object</h1>
     <p>
       The <code>sqlite3.version</code> object exposes the following...
     </p>
@@ -116,7 +122,7 @@
     <a id="sqlite3-functions"></a>
     <h1><code>sqlite3_...()</code> Function List</h1>
     
-    <p>The <code>sqlite3.capi</code> object exposes the following
+    <p>The <code>sqlite3.capi</code> namespace exposes the following
       <a href='https://sqlite.org/c3ref/funclist.html'><code>sqlite3_...()</code>
         functions</a>...
     </p>
@@ -129,31 +135,31 @@
     <a id="sqlite3-constants"></a>
     <h1><code>SQLITE_...</code> Constants</h1>
 
-    <p>The <code>sqlite3.capi</code> object exposes the following
+    <p>The <code>sqlite3.capi</code> namespace exposes the following
       <a href='https://sqlite.org/c3ref/constlist.html'><code>SQLITE_...</code>
         constants</a>...
     </p>
     <div id='list-constants' class='pseudolist'></div>
 
     <a id="sqlite3.oo1"></a>
-    <h1><code>sqlite3.oo1</code></h1>
+    <h1><code>sqlite3.oo1</code> Namespace</h1>
     <p>
-      The <code>sqlite3.oo1</code> object exposes the following...
+      The <code>sqlite3.oo1</code> namespace exposes the following...
     </p>
     <div id='list-oo1' class='pseudolist'></div>
 
-    <a id="sqlite3.capi.wasm"></a>
-    <h1><code>sqlite3.capi.wasm</code></h1>
+    <a id="sqlite3.wasm"></a>
+    <h1><code>sqlite3.wasm</code> Namespace</h1>
     <p>
-      The <code>sqlite3.capi.wasm</code> object exposes the
+      The <code>sqlite3.wasm</code> namespace exposes the
       following...
     </p>
     <div id='list-wasm' class='pseudolist'></div>
 
-    <a id="sqlite3.capi.wasm.pstack"></a>
-    <h1><code>sqlite3.capi.wasm.pstack</code></h1>
+    <a id="sqlite3.wasm.pstack"></a>
+    <h1><code>sqlite3.wasm.pstack</code> Namespace</h1>
     <p>
-      The <code>sqlite3.capi.wasm.pstack</code> object exposes the
+      The <code>sqlite3.wasm.pstack</code> namespace exposes the
       following...
     </p>
     <div id='list-wasm-pstack' class='pseudolist'></div>
@@ -166,6 +172,9 @@
     <div id='list-compile-options' class='pseudolist'></div>
 
   </div><!-- .initially-hidden -->
+  <script src="jswasm/sqlite3.js">/* This tag MUST be in side the
+  fossil-doc block so that this part can work without modification in
+  the wasm docs repo.  */</script>
   <script>(async function(){
     const eNew = (tag,parent)=>{
         const e = document.createElement(tag);
@@ -212,7 +221,7 @@
     const renderIt = async function(sqlite3){
         self.sqlite3 = sqlite3;
         console.warn("sqlite3 installed as global symbol self.sqlite3.");
-        const capi = sqlite3.capi;
+        const capi = sqlite3.capi, wasm = sqlite3.wasm;
         const cmpIcase = (a,b)=>a.toLowerCase().localeCompare(b.toLowerCase());
         const renderX = function(tgtElem, container, keys){
             for(const k of keys.sort(cmpIcase)){
@@ -253,17 +262,15 @@
 
         const excludeWasm = ['ctype'];
         renderX(E('#list-wasm'),
-                capi.wasm,
-                Object.keys(capi.wasm)
-                .filter((v)=>{
+                wasm, Object.keys(wasm).filter((v)=>{
                     return !v.startsWith('sqlite3_wasm_')
                         && excludeWasm.indexOf(v)<0;
                 }));
-        const psKeys = Object.keys(capi.wasm.pstack);
+        const psKeys = Object.keys(wasm.pstack);
         psKeys.push('pointer','quota','remaining');
-        renderX(E('#list-wasm-pstack'), capi.wasm.pstack, psKeys);
+        renderX(E('#list-wasm-pstack'), wasm.pstack, psKeys);
 
-        const cou = capi.wasm.compileOptionUsed();
+        const cou = wasm.compileOptionUsed();
         renderX(E('#list-compile-options'), cou, Object.keys(cou));
     };
 
@@ -303,5 +310,5 @@
     }/*myModule*/;
     self.sqlite3InitModule(myModule).then(renderIt);
 })();</script>
-</div><!-- .fossil-doc -->
+</div><!-- .fossil-doc EXTRACT_END -->
 </body></html>
diff --git a/ext/wasm/scratchpad-wasmfs-main.js b/ext/wasm/scratchpad-wasmfs-main.js
index d0f5fdeb54..56f9325de5 100644
--- a/ext/wasm/scratchpad-wasmfs-main.js
+++ b/ext/wasm/scratchpad-wasmfs-main.js
@@ -37,7 +37,7 @@
   const runTests = function(sqlite3){
     const capi = sqlite3.capi,
           oo = sqlite3.oo1,
-          wasm = capi.wasm;
+          wasm = sqlite3.wasm;
     stdout("Loaded sqlite3:",capi.sqlite3_libversion(), capi.sqlite3_sourceid());
     const persistentDir = capi.sqlite3_wasmfs_opfs_dir();
     if(persistentDir){
diff --git a/ext/wasm/speedtest1-worker.html b/ext/wasm/speedtest1-worker.html
index 56b6913352..5bdd32acf5 100644
--- a/ext/wasm/speedtest1-worker.html
+++ b/ext/wasm/speedtest1-worker.html
@@ -31,7 +31,7 @@
         <div id='toolbar-select'>
           <select id='select-flags' size='10' multiple></select>
           <div>The following flags can be passed as URL parameters:
-            vfs=NAME, size=N, journal=MODE, cachesize=BYTES
+            vfs=NAME, size=N, journal=MODE, cachesize=SIZE
           </div>
         </div>
         <div class='toolbar-inner-vertical'>
diff --git a/ext/wasm/speedtest1-worker.js b/ext/wasm/speedtest1-worker.js
index b5683bc1db..c61cab9190 100644
--- a/ext/wasm/speedtest1-worker.js
+++ b/ext/wasm/speedtest1-worker.js
@@ -86,11 +86,11 @@
   self.sqlite3InitModule(EmscriptenModule).then((sqlite3)=>{
     const S = sqlite3;
     App.vfsUnlink = function(pDb, fname){
-      const pVfs = S.capi.wasm.sqlite3_wasm_db_vfs(pDb, 0);
-      if(pVfs) S.capi.wasm.sqlite3_wasm_vfs_unlink(pVfs, fname||0);
+      const pVfs = S.wasm.sqlite3_wasm_db_vfs(pDb, 0);
+      if(pVfs) S.wasm.sqlite3_wasm_vfs_unlink(pVfs, fname||0);
     };
     App.pDir = wasmfsDir(S.wasm);
-    App.wasm = S.capi.wasm;
+    App.wasm = S.wasm;
     //if(App.pDir) log("Persistent storage:",pDir);
     //else log("Using transient storage.");
     mPost('ready',true);
diff --git a/ext/wasm/speedtest1.html b/ext/wasm/speedtest1.html
index ef74380373..5286b9e482 100644
--- a/ext/wasm/speedtest1.html
+++ b/ext/wasm/speedtest1.html
@@ -92,7 +92,7 @@
     };
 
     const runTests = function(sqlite3){
-        const capi = sqlite3.capi, wasm = capi.wasm;
+        const capi = sqlite3.capi, wasm = sqlite3.wasm;
         //console.debug('sqlite3 =',sqlite3);
         const pDir = wasmfsDir(wasm);
         if(pDir){
diff --git a/ext/wasm/tester1.js b/ext/wasm/tester1.js
index c7729a6635..16cbdf6b2a 100644
--- a/ext/wasm/tester1.js
+++ b/ext/wasm/tester1.js
@@ -44,7 +44,7 @@
   /* Predicate for tests/groups. */
   const testIsTodo = ()=>false;
   const haveWasmCTests = ()=>{
-    return !!wasm.exports.sqlite3_wasm_test_int64_max;
+    return !!wasm.exports.sqlite3_wasm_test_intptr;
   };
   {
     const mapToString = (v)=>{
@@ -358,7 +358,7 @@
 
   ////////////////////////////////////////////////////////////////////
   T.g('C/WASM Utilities')
-    .t('sqlite3.capi.wasm', function(sqlite3){
+    .t('sqlite3.wasm namespace', function(sqlite3){
       const w = wasm;
       const chr = (x)=>x.charCodeAt(0);
       //log("heap getters...");
@@ -587,7 +587,7 @@
 
   ////////////////////////////////////////////////////////////////////
     .t('sqlite3.StructBinder (jaccwabyt)', function(sqlite3){
-      const S = sqlite3, W = S.capi.wasm;
+      const S = sqlite3, W = S.wasm;
       const MyStructDef = {
         sizeof: 16,
         members: {
@@ -766,7 +766,6 @@
     .t('sqlite3.StructBinder part 2', function(sqlite3){
       // https://www.sqlite.org/c3ref/vfs.html
       // https://www.sqlite.org/c3ref/io_methods.html
-      const W = wasm;
       const sqlite3_io_methods = capi.sqlite3_io_methods,
             sqlite3_vfs = capi.sqlite3_vfs,
             sqlite3_file = capi.sqlite3_file;
@@ -792,7 +791,7 @@
               this.__ondispose.forEach(
                 (v)=>{
                   if('number'===typeof v){
-                    try{capi.wasm.uninstallFunction(v)}
+                    try{wasm.uninstallFunction(v)}
                     catch(e){/*ignore*/}
                   }else{/*wasm function wrapper property*/
                     delete who[v];
@@ -812,7 +811,7 @@
           tgt.__ondispose = [];
         }
         const fProxy = callee.argcProxy(func, sigN);
-        const pFunc = capi.wasm.installFunction(fProxy, tgt.memberSignature(name, true));
+        const pFunc = wasm.installFunction(fProxy, tgt.memberSignature(name, true));
         tgt[memKey] = pFunc;
         /**
            ACHTUNG: function pointer IDs are from a different pool than
@@ -868,7 +867,7 @@
               /* int (*xRead)(sqlite3_file*, void*, int iAmt, sqlite3_int64 iOfst) */
               log("xRead(",arguments,")");
               if(!(f = instm._requireFileArg(f))) return capi.SQLITE_MISUSE;
-              capi.wasm.heap8().fill(0, dest + offset, n);
+              wasm.heap8().fill(0, dest + offset, n);
               return 0;
             },
             xWrite: /*i(Ppij)*/function(f,dest,n,offset){
@@ -893,7 +892,7 @@
               /* int (*xFileSize)(sqlite3_file*, sqlite3_int64 *pSize) */
               log("xFileSize(",arguments,")");
               if(!(f=instm._requireFileArg(f,'xFileSize'))) return capi.SQLITE_MISUSE;
-              capi.wasm.setMemValue(pSz, 0/*file size*/);
+              wasm.setMemValue(pSz, 0/*file size*/);
               return 0;
             },
             xLock: /*i(Pi)*/function(f){
@@ -973,7 +972,7 @@
           .assert(dVfs.$iVersion>0)
           .assert('number'===typeof dVfs.$zName)
           .assert('number'===typeof dVfs.$xSleep)
-          .assert(capi.wasm.functionEntry(dVfs.$xOpen))
+          .assert(wasm.functionEntry(dVfs.$xOpen))
           .assert(dVfs.memberIsString('zName'))
           .assert(dVfs.memberIsString('$zName'))
           .assert(!dVfs.memberIsString('pAppData'))
@@ -999,7 +998,7 @@
             }
             //log(prefix, sep, val);
           }else{
-            //log(prefix," = funcptr @",addr, capi.wasm.functionEntry(addr));
+            //log(prefix," = funcptr @",addr, wasm.functionEntry(addr));
           }
         });
       }finally{
@@ -1009,8 +1008,8 @@
     }/*StructBinder part 2*/)
   
   ////////////////////////////////////////////////////////////////////
-    .t('sqlite3.capi.wasm.pstack', function(sqlite3){
-      const w = sqlite3.capi.wasm, P = w.pstack;
+    .t('sqlite3.wasm.pstack', function(sqlite3){
+      const P = wasm.pstack;
       const isAllocErr = (e)=>e instanceof sqlite3.WasmAllocError;
       const stack = P.pointer;
       T.assert(0===stack % 8 /* must be 8-byte aligned */);
@@ -1116,7 +1115,7 @@
   T.g('sqlite3.oo1')
     .t('Create db', function(sqlite3){
       const dbFile = '/tester1.db';
-      sqlite3.capi.wasm.sqlite3_wasm_vfs_unlink(0, dbFile);
+      wasm.sqlite3_wasm_vfs_unlink(0, dbFile);
       const db = this.db = new sqlite3.oo1.DB(dbFile);
       T.assert(Number.isInteger(db.pointer)).
         mustThrowMatching(()=>db.pointer=1, /read-only/).
@@ -1233,7 +1232,7 @@
       T.assert(2 === list.length)
         .assert('string'===typeof list[1])
         .assert(4===db.changes());
-      if(capi.wasm.bigIntEnabled){
+      if(wasm.bigIntEnabled){
         T.assert(4n===db.changes(false,true));
       }
       let blob = db.selectValue("select b from t where a='blob'");
@@ -1270,8 +1269,8 @@
                db.selectValue("SELECT "+Number.MIN_SAFE_INTEGER)).
         assert(Number.MAX_SAFE_INTEGER ===
                db.selectValue("SELECT "+Number.MAX_SAFE_INTEGER));
-      if(capi.wasm.bigIntEnabled && haveWasmCTests()){
-        const mI = capi.wasm.xCall('sqlite3_wasm_test_int64_max');
+      if(wasm.bigIntEnabled && haveWasmCTests()){
+        const mI = wasm.xCall('sqlite3_wasm_test_int64_max');
         const b = BigInt(Number.MAX_SAFE_INTEGER * 2);
         T.assert(b === db.selectValue("SELECT "+b)).
           assert(b === db.selectValue("SELECT ?", b)).
@@ -1742,7 +1741,7 @@
     //console.log('sqlite3 =',sqlite3);
     log("Done initializing WASM/JS bits. Running tests...");
     capi = sqlite3.capi;
-    wasm = capi.wasm;
+    wasm = sqlite3.wasm;
     log("sqlite3 version:",capi.sqlite3_libversion(),
         capi.sqlite3_sourceid());
     if(wasm.bigIntEnabled){
diff --git a/manifest b/manifest
index 0be8e46c1c..ee0e2baed7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarnings\sin\stesting\scode.
-D 2022-10-28T18:52:05.114
+C Move\sthe\ssqlite3.capi.wasm\snamespace\sto\ssqlite3.wasm.\sThis\scauses\sa\stiny\sbit\sof\snaming\sconfusion\swith\sthe\ssqlite3.wasm\s*file*,\sbut\sseems\sto\smake\smore\ssense\sthan\shaving\sit\sas\sa\ssub-namespace\sof\scapi.
+D 2022-10-29T07:54:10.497
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -487,7 +487,7 @@ F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
-F ext/wasm/GNUmakefile 7a8c06f9bdbb791f8ef084ecd47e099da81e5797b9b1d60e33ac9a07eedd5dbd
+F ext/wasm/GNUmakefile 10fabfc07b7eba712dee566de7e62569b020ab11a4dfa5e9bea205fc28f47516
 F ext/wasm/README-dist.txt 2d670b426fc7c613b90a7d2f2b05b433088fe65181abead970980f0a4a75ea20
 F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 9120c2f8f51fa85f46dcf4dcb6b12f4a807d428f6089b99cdb08d8ddfcfd88b2
@@ -498,20 +498,20 @@ F ext/wasm/api/extern-pre-js.js cc61c09c7a24a07dbecb4c352453c3985170cec12b4e7e7e
 F ext/wasm/api/post-js-footer.js cd0a8ec768501d9bd45d325ab0442037fb0e33d1f3b4f08902f15c34720ee4a1
 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
 F ext/wasm/api/pre-js.js 151e0616614a49f3db19ed544fa13b38c87c108959fbcd4029ea8399a562d94f
-F ext/wasm/api/sqlite3-api-cleanup.js 4d07a7524dc9b7b050acfde57163e839243ad2383bd7ee0de0178b1b3e988588
-F ext/wasm/api/sqlite3-api-glue.js c47e86a1b91917cf37de8386e4a94669612565df7f35a5ad7e04028330e5db54
-F ext/wasm/api/sqlite3-api-oo1.js 9ae79193d05712f9883a3e1a1a54f0620354aeb85fef5850fad5e4a9437a5b4d
-F ext/wasm/api/sqlite3-api-opfs.js a4316c04b2eb6ae69fc9a8b33f1d0ff22a0398665d98e6504ee13221cbf5cc5b
-F ext/wasm/api/sqlite3-api-prologue.js 9ca7f1636cc401354e12c13b1f537a1ad9e024c6c0fddfa216f4aabf00bf206b
-F ext/wasm/api/sqlite3-api-worker1.js b2d650514ccc75f80dff666fd3ee68dc8fb4137bcd01caac2c62ff93a7ebf638
+F ext/wasm/api/sqlite3-api-cleanup.js ecdc69dbfccfe26146f04799fcfd4a6f5790d46e7e3b9b6e9b0491f92ed8ae34
+F ext/wasm/api/sqlite3-api-glue.js b87543534821ecfa56fc0d0cd153a115fa974e70d6217964baf6e93ef8d25fb1
+F ext/wasm/api/sqlite3-api-oo1.js 612063da9838286310712c5411f97b8b20759b1e31e75a9b25b6381541db79a8
+F ext/wasm/api/sqlite3-api-opfs.js c67cbe0b1451ec43bc6b3199e13453e1ca56d718a75c0498253b0d479c336256
+F ext/wasm/api/sqlite3-api-prologue.js a218dda5e5ced8894f65760131371e4cabd31062af58803af8952cc00ea778d2
+F ext/wasm/api/sqlite3-api-worker1.js efdca1b42299d80b54f366d15a8fc5343f3b3e9e3647e5c1fd6f3ee1015e501b
 F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
 F ext/wasm/api/sqlite3-opfs-async-proxy.js f04cb1eb483c92bc61fe02749f7afcf17ec803968171aedd7d96faf428c26bcb
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 940d576bda7068ba60492e206d06a3567b8a89a3770700aa88690a6e246a0c78
 F ext/wasm/api/sqlite3-worker1-promiser.js 0c7a9826dbf82a5ed4e4f7bf7816e825a52aff253afbf3350431f5773faf0e4b
-F ext/wasm/api/sqlite3-worker1.js dbe54b69c1520a2d25eae148cd2750ded2dd7f219ea4ee46f83e0a851dca5974
+F ext/wasm/api/sqlite3-worker1.js 1e54ea3d540161bcfb2100368a2fc0cad871a207b8336afee1c445715851ec54
 F ext/wasm/batch-runner.html 4deeed44fe41496dc6898d9fb17938ea3291f40f4bfb977e29d0cef96fbbe4c8
-F ext/wasm/batch-runner.js 5bae81684728b6be157d1f92b39824153f0fd019345b39f2ab8930f7ee2a57d8
+F ext/wasm/batch-runner.js 49609e89aaac9989d6c1ad3fae268e4878e1ad7bc5fd3e5c2f44959660780b2e
 F ext/wasm/common/SqliteTestUtil.js d8bf97ecb0705a2299765c8fc9e11b1a5ac7f10988bbf375a6558b7ca287067b
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 739b58c44511f642f16f57b701c84dc9ee412d8bc47b3d8a99d947babfa69d9d
@@ -520,7 +520,7 @@ F ext/wasm/demo-123-worker.html a0b58d9caef098a626a1a1db567076fca4245e8d60ba9455
 F ext/wasm/demo-123.html 8c70a412ce386bd3796534257935eb1e3ea5c581e5d5aea0490b8232e570a508
 F ext/wasm/demo-123.js ebae30756585bca655b4ab2553ec9236a87c23ad24fc8652115dcedb06d28df6
 F ext/wasm/demo-jsstorage.html 409c4be4af5f207fb2877160724b91b33ea36a3cd8c204e8da1acb828ffe588e
-F ext/wasm/demo-jsstorage.js 105596bd2ccd0b1deb5fde8e99b536e8242d4bb5932fac0c8403ff3a6bc547e8
+F ext/wasm/demo-jsstorage.js 44e3ae7ec2483b6c511384c3c290beb6f305c721186bcf5398ca4e00004a06b8
 F ext/wasm/demo-worker1-promiser.html 1de7c248c7c2cfd4a5783d2aa154bce62d74c6de98ab22f5786620b3354ed15f
 F ext/wasm/demo-worker1-promiser.js f68ffbbe1c6086e18ce7961b8fc2b40dd88db174f59052e228c06b07484945ca
 F ext/wasm/demo-worker1.html 2c178c1890a2beb5a5fecb1453e796d067a4b8d3d2a04d65ca2eb1ab2c68ef5d
@@ -528,20 +528,20 @@ F ext/wasm/demo-worker1.js 8ba51d94c4601fa5c313d9e59b63b238f5305b5d5739ad21f4782
 F ext/wasm/dist.make b687dc07db2dc9669369f126ac42c4ff6539dce2531063a0e75405c74a3cee1d
 F ext/wasm/fiddle.make 68abe5dcfdd6fdf8dc1b715b94b96fae771b5b28bc1843997b9b1ec79407f2c9
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
-F ext/wasm/fiddle/fiddle-worker.js 41b9796d689fabbef1ad9447496d14645eeb4101b534e54951fa5259c877c341
+F ext/wasm/fiddle/fiddle-worker.js b4a0c8ab6c0983218543ca771c45f6075449f63a1dcf290ae5a681b2cba8800d
 F ext/wasm/fiddle/fiddle.js 974b995119ac443685d7d94d3b3c58c6a36540e9eb3fed7069d5653284071715
 F ext/wasm/fiddle/index.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
 F ext/wasm/index-dist.html cb0da16cba0f21cda2c25724c5869102d48eb0af04446acd3cd0ca031f80ed19
 F ext/wasm/index.html ce6a68a75532b47e3c0adb83381a06d15de8c0ac0331fb7bf31d33f8e7c77dc4
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 9aa6951b529a8b29f578ec8f0355713c39584c92cf1708f63ba0cf917cb5b68e
-F ext/wasm/module-symbols.html e521cf07f8d136748e60d91e49b7b956e8bd56c58fc52acbe5ad58eaeaacf719
+F ext/wasm/module-symbols.html 25f6d585ef1d5034447701f18e972c2f3b98785250c9036cef93a4e36648d178
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
-F ext/wasm/scratchpad-wasmfs-main.js 1841c124a58e3f9e7ee580a0868d6e1834c5a01dbb47c8fdd565eda5db362437
+F ext/wasm/scratchpad-wasmfs-main.js 4c140457f4d6da9d646a49addd91edb6e9ad1643c6c48e3258b5bce24725dc18
 F ext/wasm/speedtest1-wasmfs.html bc28eb29b69a73864b8d7aae428448f8b7e1de81d8bfb9bba99541322054dbd0
-F ext/wasm/speedtest1-worker.html 7b0cceab6a68b2883738e19f61d21620fe1244ba36c1b2e38d0efde57ecce86d
-F ext/wasm/speedtest1-worker.js 942af0909dee6e6a43af85d3e4a5e6aa74956290ca4b78fd4e753be13673ccd6
-F ext/wasm/speedtest1.html 3b3321eee32b6becf0b2134fd8f17db5802b400b8233c3537527d3c46e4e17b9
+F ext/wasm/speedtest1-worker.html 94246488e10af9daa1ebd0979b1b8d7a22a579e5a983fa2a5ad94591ecf55f2c
+F ext/wasm/speedtest1-worker.js 13b57c4a41729678a1194014afec2bd5b94435dcfc8d1039dfa9a533ac819ee1
+F ext/wasm/speedtest1.html e4c4e5c1c8ec1ad13c995e346e4216a1df152fd2c5cd17e0793b865b2f3c5000
 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
@@ -549,7 +549,7 @@ F ext/wasm/test-opfs-vfs.html 1f2d672f3f3fce810dfd48a8d56914aba22e45c6834e262555
 F ext/wasm/test-opfs-vfs.js 48fc59110e8775bb43c9be25b6d634fc07ebadab7da8fbd44889e8129c6e2548
 F ext/wasm/tester1-worker.html d02b9d38876b023854cf8955e77a40912f7e516956b4dbe1ec7f215faac273ee
 F ext/wasm/tester1.html c6c47e5a8071eb09cb1301104435c8e44fbb5719c92411f5b2384a461f9793c5
-F ext/wasm/tester1.js 2b971e6dd291513685f38552340adc1d2e09f7b0a5bccf21c81f8037d6242bf3
+F ext/wasm/tester1.js 679013b874152427d302e56f78bf542c47a090a85c8ca010bb4002859431cf61
 F ext/wasm/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd72273503ae7d5
 F ext/wasm/wasmfs.make ee0004813e16c283ff633e08b482008d56adf9b7d42f6c5612f7ab002b924f69
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
@@ -2054,8 +2054,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 e65c5bdc5bd6e1989c3de59798ff0a761125fc490fdec8c7671ca70ed688c4f8
-R 2092bbb0212ed06397996f6b20b31c55
-U drh
-Z 91f846334499b4960f1a923dbe22c496
+P 2f53612388507f9b1ecbec3c15281825beab54b8062d97d0ab6f009c5fed347b
+R d0f4845aee84bee01e10da61e480927d
+U stephan
+Z c420db9475e5b45210b3c19ba7dfb33a
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 8160792046..61151e8484 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2f53612388507f9b1ecbec3c15281825beab54b8062d97d0ab6f009c5fed347b
\ No newline at end of file
+3f16eb18d6186ca972fca952ccac18649e7a905213f589e53c0c9333e695448d
\ No newline at end of file

From df52a0bc78053ab105660bbf1aa36aa089fc688d Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sat, 29 Oct 2022 09:45:01 +0000
Subject: [PATCH 388/428] Expand and document the wasm doc-update make rules.
 Extend the dist rules to fail more readily if there's a problem.

FossilOrigin-Name: 362ec11ec09f441b745cbd8ac8366b6bc998aba6e2b70782a88f189a3ffa9923
---
 ext/wasm/GNUmakefile         | 31 +++++++++++++++++++++----------
 ext/wasm/dist.make           |  4 +++-
 ext/wasm/module-symbols.html |  2 +-
 manifest                     | 16 ++++++++--------
 manifest.uuid                |  2 +-
 5 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index dafe430de0..5316181208 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -580,24 +580,35 @@ wasm-testing.exclude = sql/speedtest1.sql
 wasm-testing.dir     = /jail/sites/wasm-testing
 wasm-testing.dest   ?= wasm-testing:$(wasm-testing.dir)
 # ---------------------^^^^^^^^^^^^ ssh alias
-push:
+.PHONY: push-testing
+push-testing:
 	rsync -z -e ssh --ignore-times --chown=stephan:www-data --group -r \
     $(patsubst %,--exclude=%,$(wasm-testing.exclude)) \
     $(wasm-testing.include) $(wasm-testing.dest)
-	ssh wasm-testing 'cd $(wasm-testing.dir) && bash .gzip' || \
-    echo "SSH failed: it's likely that stale content will be served via old gzip files." 
+	@echo "Updating gzipped copies..."; \
+		ssh wasm-testing 'cd $(wasm-testing.dir) && bash .gzip' || \
+    echo "SSH failed: it's likely that stale content will be served via old gzip files."
 
-WDOCS.home := $(wildcard ../../../wdoc)
-ifneq (,$(WDOCS.home))
-WDOCS.jswasm += $(WDOCS.home)/jswasm
-update-docs:
+########################################################################
+# If we find a copy of the sqlite.org/wasm docs checked out, copy
+# certain files over to it, noting that some need automatable edits...
+WDOCS.home ?= ../../../wdoc
+.PHONY: update-docs
+ifneq (,$(wildcard $(WDOCS.home)/api-index.md))
+WDOCS.jswasm := $(WDOCS.home)/jswasm
+update-docs: $(bin.stripccomments) $(sqlite3.js) $(sqlite3.wasm)
+	@echo "Copying files to the /wasm docs. Be sure to use an -Oz build for this!"
 	cp $(sqlite3.wasm) $(WDOCS.jswasm)/.
-	$(bin.stripccomments) -k -k < $(sqlite3.js) > $(WDOCS.jswasm)/sqlite3.js
+	$(bin.stripccomments) -k -k < $(sqlite3.js) \
+		| sed -e '/^[ \t]*$$/d' > $(WDOCS.jswasm)/sqlite3.js
 	cp demo-123.js demo-123.html demo-123-worker.html $(WDOCS.home)
 	sed -n -e '/EXTRACT_BEGIN/,/EXTRACT_END/p' \
 		module-symbols.html > $(WDOCS.home)/module-symbols.html
-
 else
 update-docs:
-  @echo "Cannot find wasm docs checkout."
+	@echo "Cannot find wasm docs checkout."; \
+	echo "Pass WDOCS.home=/path/to/wasm/docs/checkout or edit this makefile to suit."; \
+	exit 127
 endif
+# end /wasm docs
+########################################################################
diff --git a/ext/wasm/dist.make b/ext/wasm/dist.make
index 13e750dbc5..5aee8af779 100644
--- a/ext/wasm/dist.make
+++ b/ext/wasm/dist.make
@@ -79,7 +79,8 @@ dist: \
 	@$(bin.stripccomments) -k -k < $(sqlite3.js) \
 		> $(dist-dir.jswasm)/$(notdir $(sqlite3.js))
 	@cp -p $(dist.common.extras) $(dist-dir.common)
-	@vnum=$$($(bin.version-info) --download-version); \
+	@set -e; \
+		vnum=$$($(bin.version-info) --download-version); \
 		vdir=sqlite-wasm-$$vnum; \
 		arczip=$$vdir.zip; \
 		echo "Making $$arczip ..."; \
@@ -88,6 +89,7 @@ dist: \
 		zip -qr $$arczip $$vdir; \
 		rm -fr $$vdir; \
 		ls -la $$arczip; \
+		set +e; \
 		unzip -lv $$arczip || echo "Missing unzip app? Not fatal."
 
 # We need a separate `clean` rule to account for weirdness in
diff --git a/ext/wasm/module-symbols.html b/ext/wasm/module-symbols.html
index 450abb9327..f2170031e4 100644
--- a/ext/wasm/module-symbols.html
+++ b/ext/wasm/module-symbols.html
@@ -93,7 +93,7 @@
       <li><a href='#sqlite3-namespace'><code>sqlite3</code> namespace</a></li>
       <li><a href='#sqlite3-version'><code>sqlite3.version</code> object</a></li>
       <li><a href='#sqlite3-functions'><code>sqlite3_...()</code> functions</a></li>
-      <li><a href='#sqlite3-constants'><code>SQLITE_...</code> functions</a></li>
+      <li><a href='#sqlite3-constants'><code>SQLITE_...</code> constants</a></li>
       <li><a href='#sqlite3.oo1'><code>sqlite3.oo1</code></a>
         <!--ul>
           <li><a href='#sqlite3.oo1.DB'><code>sqlite3.oo1.DB</code></a></li>
diff --git a/manifest b/manifest
index ee0e2baed7..46221cc4b7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Move\sthe\ssqlite3.capi.wasm\snamespace\sto\ssqlite3.wasm.\sThis\scauses\sa\stiny\sbit\sof\snaming\sconfusion\swith\sthe\ssqlite3.wasm\s*file*,\sbut\sseems\sto\smake\smore\ssense\sthan\shaving\sit\sas\sa\ssub-namespace\sof\scapi.
-D 2022-10-29T07:54:10.497
+C Expand\sand\sdocument\sthe\swasm\sdoc-update\smake\srules.\sExtend\sthe\sdist\srules\sto\sfail\smore\sreadily\sif\sthere's\sa\sproblem.
+D 2022-10-29T09:45:01.066
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -487,7 +487,7 @@ F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
-F ext/wasm/GNUmakefile 10fabfc07b7eba712dee566de7e62569b020ab11a4dfa5e9bea205fc28f47516
+F ext/wasm/GNUmakefile 94b55d2dea0eb16f82a2691bceeed265273c7fbb61a6063abfbc1efdf70aeb9c
 F ext/wasm/README-dist.txt 2d670b426fc7c613b90a7d2f2b05b433088fe65181abead970980f0a4a75ea20
 F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 9120c2f8f51fa85f46dcf4dcb6b12f4a807d428f6089b99cdb08d8ddfcfd88b2
@@ -525,7 +525,7 @@ F ext/wasm/demo-worker1-promiser.html 1de7c248c7c2cfd4a5783d2aa154bce62d74c6de98
 F ext/wasm/demo-worker1-promiser.js f68ffbbe1c6086e18ce7961b8fc2b40dd88db174f59052e228c06b07484945ca
 F ext/wasm/demo-worker1.html 2c178c1890a2beb5a5fecb1453e796d067a4b8d3d2a04d65ca2eb1ab2c68ef5d
 F ext/wasm/demo-worker1.js 8ba51d94c4601fa5c313d9e59b63b238f5305b5d5739ad21f4782a0161e6682e
-F ext/wasm/dist.make b687dc07db2dc9669369f126ac42c4ff6539dce2531063a0e75405c74a3cee1d
+F ext/wasm/dist.make 481289899a07958439d07ee4302ff86235fa0fbb72f17ea05db2be90a94abf90
 F ext/wasm/fiddle.make 68abe5dcfdd6fdf8dc1b715b94b96fae771b5b28bc1843997b9b1ec79407f2c9
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js b4a0c8ab6c0983218543ca771c45f6075449f63a1dcf290ae5a681b2cba8800d
@@ -535,7 +535,7 @@ F ext/wasm/index-dist.html cb0da16cba0f21cda2c25724c5869102d48eb0af04446acd3cd0c
 F ext/wasm/index.html ce6a68a75532b47e3c0adb83381a06d15de8c0ac0331fb7bf31d33f8e7c77dc4
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 9aa6951b529a8b29f578ec8f0355713c39584c92cf1708f63ba0cf917cb5b68e
-F ext/wasm/module-symbols.html 25f6d585ef1d5034447701f18e972c2f3b98785250c9036cef93a4e36648d178
+F ext/wasm/module-symbols.html c473958c921adc4877ccaad94dafb506e807aced1949090180aa31cb29f1b9fc
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
 F ext/wasm/scratchpad-wasmfs-main.js 4c140457f4d6da9d646a49addd91edb6e9ad1643c6c48e3258b5bce24725dc18
 F ext/wasm/speedtest1-wasmfs.html bc28eb29b69a73864b8d7aae428448f8b7e1de81d8bfb9bba99541322054dbd0
@@ -2054,8 +2054,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 2f53612388507f9b1ecbec3c15281825beab54b8062d97d0ab6f009c5fed347b
-R d0f4845aee84bee01e10da61e480927d
+P 3f16eb18d6186ca972fca952ccac18649e7a905213f589e53c0c9333e695448d
+R 9d0a0a43f67e35a7a9fafd5def96ccb8
 U stephan
-Z c420db9475e5b45210b3c19ba7dfb33a
+Z 6030ea3dadf7300cfa17e8c84bb8145d
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 61151e8484..6978e03c11 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3f16eb18d6186ca972fca952ccac18649e7a905213f589e53c0c9333e695448d
\ No newline at end of file
+362ec11ec09f441b745cbd8ac8366b6bc998aba6e2b70782a88f189a3ffa9923
\ No newline at end of file

From da27e4aa02d54021cb0b771e623dc01325c17742 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sat, 29 Oct 2022 10:14:56 +0000
Subject: [PATCH 389/428] More styling of module-symbols.html.

FossilOrigin-Name: a36f42a8364b745c410a6f837d005a193f6a93134cac087ac18bee2897cad730
---
 ext/wasm/module-symbols.html | 43 ++++++++++++++++++++++++++----------
 manifest                     | 12 +++++-----
 manifest.uuid                |  2 +-
 3 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/ext/wasm/module-symbols.html b/ext/wasm/module-symbols.html
index f2170031e4..11319534a9 100644
--- a/ext/wasm/module-symbols.html
+++ b/ext/wasm/module-symbols.html
@@ -5,24 +5,35 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
     <title>sqlite3 Module Symbols</title>
+    <style>
+      body {
+          font-size: 12.5pt;
+          padding-bottom: 1em;
+      }
+      </style>
   </head>
   <body>
-
 <div class="fossil-doc" data-title="sqlite3 Module Symbols"><!-- EXTRACT_BEGIN -->
 <!--
     The part of this doc wrapped in div.fossil-doc gets snipped out
     from the canonical copy in the main tree (ext/wasm/module-symbols.html)
     and added to the wasm docs repository, where it's served from
     fossil.
- -->
+-->
   <style>
     .pseudolist {
         column-count: auto;
-        column-width: 20rem;
+        column-width: 12rem;
         column-gap: 1.5em;
-        width: 95%;
+        width: 90%;
         margin: auto;
     }
+    .pseudolist.wide {
+        column-width: 21rem;
+    }
+    .pseudolist.wide2 {
+        column-width: 25rem;
+    }
     .pseudolist > span {
         font-family: monospace;
         margin: 0.25em 0;
@@ -51,8 +62,13 @@
         
     }
     .func-wasm::after {
-        content: "*";
-        color: blue;
+        content: "WASM";
+        color: saddlebrown;
+        /* ^^^^ the color must be legible in both "bright" and "dark"
+           s    ite themes. */
+        font-size: 0.65em;
+    /* baseline-shift: super; */
+        vertical-align: super;
     }
   </style>
   <p id='module-load-status'><strong>Loading WASM module...</strong>
@@ -102,7 +118,7 @@
       </li>
       <li><a href='#sqlite3.wasm'><code>sqlite3.wasm</code> namespace</a></li>
       <li><a href='#sqlite3.wasm.pstack'><code>sqlite3.wasm.pstack</code> namespace</a></li>
-      <li><a href='#compile-options'>Compilation options used in this module build.</a></li>
+      <li><a href='#compile-options'>Compilation options used in this module build</a></li>
     </ul>
 
     <a id="sqlite3-namespace"></a>
@@ -117,7 +133,7 @@
     <p>
       The <code>sqlite3.version</code> object exposes the following...
     </p>
-    <div id='list-version' class='pseudolist wrap-anywhere'></div>
+    <div id='list-version' class='pseudolist wide wrap-anywhere'></div>
     
     <a id="sqlite3-functions"></a>
     <h1><code>sqlite3_...()</code> Function List</h1>
@@ -126,7 +142,7 @@
       <a href='https://sqlite.org/c3ref/funclist.html'><code>sqlite3_...()</code>
         functions</a>...
     </p>
-    <div id='list-functions' class='pseudolist'></div>
+    <div id='list-functions' class='pseudolist wide'></div>
     <p>
       <code class='func-wasm'></code> = function is specific to the JS/WASM
       bindings, not part of the C API.
@@ -139,7 +155,7 @@
       <a href='https://sqlite.org/c3ref/constlist.html'><code>SQLITE_...</code>
         constants</a>...
     </p>
-    <div id='list-constants' class='pseudolist'></div>
+    <div id='list-constants' class='pseudolist wide'></div>
 
     <a id="sqlite3.oo1"></a>
     <h1><code>sqlite3.oo1</code> Namespace</h1>
@@ -167,9 +183,10 @@
     <a id="compile-options"></a>
     <h1>Compilation Options</h1>
     <p>
-      Compilation options used in this build of <code>sqlite3.wasm</code>...
+      <code>SQLITE_...</code> compilation options used in this build
+      of <code>sqlite3.wasm</code>...
     </p>
-    <div id='list-compile-options' class='pseudolist'></div>
+    <div id='list-compile-options' class='pseudolist wide2'></div>
 
   </div><!-- .initially-hidden -->
   <script src="jswasm/sqlite3.js">/* This tag MUST be in side the
@@ -271,6 +288,8 @@
         renderX(E('#list-wasm-pstack'), wasm.pstack, psKeys);
 
         const cou = wasm.compileOptionUsed();
+        //const cou2 = Object.create(null);
+        //Object.entries(cou).forEach((e)=>cou2['SQLITE_'+e[0]] = e[1]);
         renderX(E('#list-compile-options'), cou, Object.keys(cou));
     };
 
diff --git a/manifest b/manifest
index 46221cc4b7..62fa3702a4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Expand\sand\sdocument\sthe\swasm\sdoc-update\smake\srules.\sExtend\sthe\sdist\srules\sto\sfail\smore\sreadily\sif\sthere's\sa\sproblem.
-D 2022-10-29T09:45:01.066
+C More\sstyling\sof\smodule-symbols.html.
+D 2022-10-29T10:14:56.834
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -535,7 +535,7 @@ F ext/wasm/index-dist.html cb0da16cba0f21cda2c25724c5869102d48eb0af04446acd3cd0c
 F ext/wasm/index.html ce6a68a75532b47e3c0adb83381a06d15de8c0ac0331fb7bf31d33f8e7c77dc4
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 9aa6951b529a8b29f578ec8f0355713c39584c92cf1708f63ba0cf917cb5b68e
-F ext/wasm/module-symbols.html c473958c921adc4877ccaad94dafb506e807aced1949090180aa31cb29f1b9fc
+F ext/wasm/module-symbols.html ee4061a4a68e789a4a9403bc7e745f027d4789a8577e94f9d9d7a4ab9b616ed8
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
 F ext/wasm/scratchpad-wasmfs-main.js 4c140457f4d6da9d646a49addd91edb6e9ad1643c6c48e3258b5bce24725dc18
 F ext/wasm/speedtest1-wasmfs.html bc28eb29b69a73864b8d7aae428448f8b7e1de81d8bfb9bba99541322054dbd0
@@ -2054,8 +2054,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 3f16eb18d6186ca972fca952ccac18649e7a905213f589e53c0c9333e695448d
-R 9d0a0a43f67e35a7a9fafd5def96ccb8
+P 362ec11ec09f441b745cbd8ac8366b6bc998aba6e2b70782a88f189a3ffa9923
+R b91e2c9b4a071a7a86b2de4a121116c1
 U stephan
-Z 6030ea3dadf7300cfa17e8c84bb8145d
+Z 1ad6c02cb88f8b4d1e237d5aecb20d32
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 6978e03c11..2b82cdf430 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-362ec11ec09f441b745cbd8ac8366b6bc998aba6e2b70782a88f189a3ffa9923
\ No newline at end of file
+a36f42a8364b745c410a6f837d005a193f6a93134cac087ac18bee2897cad730
\ No newline at end of file

From 1cc77c95439154848714f92e3c407c7a155a4f64 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sat, 29 Oct 2022 12:31:50 +0000
Subject: [PATCH 390/428] Update ext/wasm/README.md for recent developments.

FossilOrigin-Name: c76ec31ebf4d80ec8cbd2aa2017e1d6bc32eae66bfbcc130c053ddb403599c6b
---
 ext/wasm/README.md           | 68 +++++++++++-------------------------
 ext/wasm/module-symbols.html |  2 +-
 manifest                     | 14 ++++----
 manifest.uuid                |  2 +-
 4 files changed, 30 insertions(+), 56 deletions(-)

diff --git a/ext/wasm/README.md b/ext/wasm/README.md
index 103295384b..e8d66865d8 100644
--- a/ext/wasm/README.md
+++ b/ext/wasm/README.md
@@ -57,42 +57,41 @@ $ cd ext/wasm
 $ make
 ```
 
-That will generate the fiddle application under
-[ext/fiddle](/dir/ext/wasm/fiddle), as `fiddle.html`. That application
-cannot, due to XMLHttpRequest security limitations, run if the HTML
-file is opened directly in the browser (i.e. if it is opened using a
-`file://` URL), so it needs to be served via an HTTP server.  For
-example, using [althttpd][]:
+That will generate the a number of files required for a handful of
+test and demo applications which can be accessed via
+`index.html`. WASM content cannot, due to XMLHttpRequest security
+limitations, be loaded if the containing HTML file is opened directly
+in the browser (i.e. if it is opened using a `file://` URL), so it
+needs to be served via an HTTP server.  For example, using
+[althttpd][]:
 
 ```
-$ cd ext/wasm/fiddle
-$ althttpd -page fiddle.html
+$ cd ext/wasm
+$ althttpd --enable-sab --max-age 1 --page index.html
 ```
 
-That will open the system's browser and run the fiddle app's page.
+That will open the system's browser and run the index page, from which
+all of the test and demo applications can be accessed.
 
 Note that when serving this app via [althttpd][], it must be a version
-from 2022-05-17 or newer so that it recognizes the `.wasm` file
-extension and responds with the mimetype `application/wasm`, as the
-WASM loader is pedantic about that detail.
+from 2022-09-26 or newer so that it recognizes the `--enable-sab`
+flag, which causes althttpd to emit two HTTP response headers which
+are required to enable JavaScript's `SharedArrayBuffer` and `Atomics`
+APIs. Those APIs are required in order to enable the OPFS-related
+features in the apps which use them.
 
 # Testing on a remote machine that is accessed via SSH
 
 *NB: The following are developer notes, last validated on 2022-08-18*
 
   *  Remote: Install git, emsdk, and althttpd
-     *  Use a [version of althttpd](https://sqlite.org/althttpd/timeline?r=enable-atomics)
-        that adds HTTP reply header lines to enable SharedArrayBuffers.  These header
-        lines are required:
-```
-            Cross-Origin-Opener-Policy: same-origin
-            Cross-Origin-Embedder-Policy: require-corp
-```
+     *  Use a [version of althttpd][althttpd] from
+        September 26, 2022 or newer.
   *  Remote: Install the SQLite source tree.  CD to ext/wasm
   *  Remote: "`make`" to build WASM
-  *  Remote: althttpd --port 8080 --popup
-  *  Local:  ssh -L 8180:localhost:8080 remote
-  *  Local:  Point your web-browser at http://localhost:8180/testing1.html
+  *  Remote: `althttpd --enable-sab --port 8080 --popup`
+  *  Local:  `ssh -L 8180:localhost:8080 remote`
+  *  Local:  Point your web-browser at http://localhost:8180/index.html
 
 In order to enable [SharedArrayBuffers](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/SharedArrayBuffer),
 the web-browser requires that the two extra Cross-Origin lines be present
@@ -102,30 +101,5 @@ the web-broser, the localhost requirement means that the connection must be tunn
 using SSH.
 
 
-
-# Known Quirks and Limitations
-
-Some "impedence mismatch" between C and WASM/JavaScript is to be
-expected.
-
-## No I/O
-
-sqlite3 shell commands which require file I/O or pipes are disabled in
-the WASM build.
-
-## `exit()` Triggered from C
-
-When C code calls `exit()`, as happens (for example) when running an
-"unsafe" command when safe mode is active, WASM's connection to the
-sqlite3 shell environment has no sensible choice but to shut down
-because `exit()` leaves it in a state we can no longer recover
-from. The JavaScript-side application attempts to recognize this and
-warn the user that restarting the application is necessary. Currently
-the only way to restart it is to reload the page. Restructuring the
-shell code such that it could be "rebooted" without restarting the
-JS app would require some invasive changes which are not currently
-on any TODO list but have not been entirely ruled out long-term.
-
-
 [emscripten]: https://emscripten.org
 [althttpd]: https://sqlite.org/althttpd
diff --git a/ext/wasm/module-symbols.html b/ext/wasm/module-symbols.html
index 11319534a9..bebefffac8 100644
--- a/ext/wasm/module-symbols.html
+++ b/ext/wasm/module-symbols.html
@@ -110,7 +110,7 @@
       <li><a href='#sqlite3-version'><code>sqlite3.version</code> object</a></li>
       <li><a href='#sqlite3-functions'><code>sqlite3_...()</code> functions</a></li>
       <li><a href='#sqlite3-constants'><code>SQLITE_...</code> constants</a></li>
-      <li><a href='#sqlite3.oo1'><code>sqlite3.oo1</code></a>
+      <li><a href='#sqlite3.oo1'><code>sqlite3.oo1</code> namespace</a>
         <!--ul>
           <li><a href='#sqlite3.oo1.DB'><code>sqlite3.oo1.DB</code></a></li>
           <li><a href='#sqlite3.oo1.Stmt'><code>sqlite3.oo1.Stmt</code></a></li>
diff --git a/manifest b/manifest
index 62fa3702a4..4313f85d57 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C More\sstyling\sof\smodule-symbols.html.
-D 2022-10-29T10:14:56.834
+C Update\sext/wasm/README.md\sfor\srecent\sdevelopments.
+D 2022-10-29T12:31:50.367
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -489,7 +489,7 @@ F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
 F ext/wasm/GNUmakefile 94b55d2dea0eb16f82a2691bceeed265273c7fbb61a6063abfbc1efdf70aeb9c
 F ext/wasm/README-dist.txt 2d670b426fc7c613b90a7d2f2b05b433088fe65181abead970980f0a4a75ea20
-F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
+F ext/wasm/README.md ef39861aa21632fdbca0bdd469f78f0096f6449a720f3f39642594af503030e9
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 9120c2f8f51fa85f46dcf4dcb6b12f4a807d428f6089b99cdb08d8ddfcfd88b2
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
 F ext/wasm/api/README.md 1350088aee90e959ad9a94fab1bb6bcb5e99d4d27f976db389050f54f2640c78
@@ -535,7 +535,7 @@ F ext/wasm/index-dist.html cb0da16cba0f21cda2c25724c5869102d48eb0af04446acd3cd0c
 F ext/wasm/index.html ce6a68a75532b47e3c0adb83381a06d15de8c0ac0331fb7bf31d33f8e7c77dc4
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 9aa6951b529a8b29f578ec8f0355713c39584c92cf1708f63ba0cf917cb5b68e
-F ext/wasm/module-symbols.html ee4061a4a68e789a4a9403bc7e745f027d4789a8577e94f9d9d7a4ab9b616ed8
+F ext/wasm/module-symbols.html eca884ef4380612145ee550213be57478ee2b9cd9a9c2b27530cc23359c99682
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
 F ext/wasm/scratchpad-wasmfs-main.js 4c140457f4d6da9d646a49addd91edb6e9ad1643c6c48e3258b5bce24725dc18
 F ext/wasm/speedtest1-wasmfs.html bc28eb29b69a73864b8d7aae428448f8b7e1de81d8bfb9bba99541322054dbd0
@@ -2054,8 +2054,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 362ec11ec09f441b745cbd8ac8366b6bc998aba6e2b70782a88f189a3ffa9923
-R b91e2c9b4a071a7a86b2de4a121116c1
+P a36f42a8364b745c410a6f837d005a193f6a93134cac087ac18bee2897cad730
+R 7905691af970d052de1153df66321807
 U stephan
-Z 1ad6c02cb88f8b4d1e237d5aecb20d32
+Z f92abe7cb111b048f2eaf4abd561cacb
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 2b82cdf430..0ddcd5212f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a36f42a8364b745c410a6f837d005a193f6a93134cac087ac18bee2897cad730
\ No newline at end of file
+c76ec31ebf4d80ec8cbd2aa2017e1d6bc32eae66bfbcc130c053ddb403599c6b
\ No newline at end of file

From f5e7691e2b6e2ed35eff5fbfc37a0ba6ba448855 Mon Sep 17 00:00:00 2001
From: mistachkin <mistachkin@noemail.net>
Date: Sun, 30 Oct 2022 07:01:31 +0000
Subject: [PATCH 391/428] Minor updates to the Windows batch tools.

FossilOrigin-Name: b42f56205fa8e06431fb1a45c48257d93605fea0ed95bd766f71e27292d1af33
---
 manifest                | 16 ++++++++--------
 manifest.uuid           |  2 +-
 tool/GetTclKit.bat      |  2 ++
 tool/build-all-msvc.bat |  5 +++++
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index 4313f85d57..1cd7a00402 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sext/wasm/README.md\sfor\srecent\sdevelopments.
-D 2022-10-29T12:31:50.367
+C Minor\supdates\sto\sthe\sWindows\sbatch\stools.
+D 2022-10-30T07:01:31.341
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1950,9 +1950,9 @@ F test/zipfile.test 0d8758d8c0d63f16644f959689f78969d223789d998964276554039f067b
 F test/zipfile2.test 9903388a602a3834189857a985106ff95c3bba6a3969e0134127df991889db5d
 F test/zipfilefault.test 44d4d7a7f7cca7521d569d7f71026b241d65a6b1757aa409c1a168827edbbc2c
 F tool/GetFile.cs 47852aa0d806fe47ed1ac5138bdce7f000fe87aaa7f28107d0cb1e26682aeb44
-F tool/GetTclKit.bat e95747c0f7a9fe279a9979178b71f6431a21f945b390fc3120244897ff3f5135
+F tool/GetTclKit.bat d84033c6a93dfe735d247f48ba00292a1cc284dcf69963e5e672444e04534bbf
 F tool/Replace.cs 02c67258801c2fb5f63231e0ac0f220b4b36ba91
-F tool/build-all-msvc.bat c12328d06c45fec8baada5949e3d5af54bf8c887 x
+F tool/build-all-msvc.bat c817b716e0edeecaf265a6775b63e5f45c34a6544f1d4114a222701ed5ac79ab x
 F tool/build-shell.sh 950f47c6174f1eea171319438b93ba67ff5bf367
 F tool/cg_anno.tcl c1f875f5a4c9caca3d59937b16aff716f8b1883935f1b4c9ae23124705bc8099 x
 F tool/checkSpacing.c 810e51703529a204fc4e1eb060e9ab663e3c06d2
@@ -2054,8 +2054,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 a36f42a8364b745c410a6f837d005a193f6a93134cac087ac18bee2897cad730
-R 7905691af970d052de1153df66321807
-U stephan
-Z f92abe7cb111b048f2eaf4abd561cacb
+P c76ec31ebf4d80ec8cbd2aa2017e1d6bc32eae66bfbcc130c053ddb403599c6b
+R 363016fa4e28705ed2554d72d33a3740
+U mistachkin
+Z e1214828164be445021f6f541770bc23
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 0ddcd5212f..33b0ec78a8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c76ec31ebf4d80ec8cbd2aa2017e1d6bc32eae66bfbcc130c053ddb403599c6b
\ No newline at end of file
+b42f56205fa8e06431fb1a45c48257d93605fea0ed95bd766f71e27292d1af33
\ No newline at end of file
diff --git a/tool/GetTclKit.bat b/tool/GetTclKit.bat
index e2be7c7f6c..cd295a0d00 100644
--- a/tool/GetTclKit.bat
+++ b/tool/GetTclKit.bat
@@ -13,6 +13,8 @@ REM SET __ECHO2=ECHO
 REM SET __ECHO3=ECHO
 IF NOT DEFINED _AECHO (SET _AECHO=REM)
 IF NOT DEFINED _CECHO (SET _CECHO=REM)
+IF NOT DEFINED _CECHO2 (SET _CECHO2=REM)
+IF NOT DEFINED _CECHO3 (SET _CECHO3=REM)
 IF NOT DEFINED _VECHO (SET _VECHO=REM)
 
 SET OVERWRITE=^>
diff --git a/tool/build-all-msvc.bat b/tool/build-all-msvc.bat
index aaeb67bdfb..8f9a1b7b09 100755
--- a/tool/build-all-msvc.bat
+++ b/tool/build-all-msvc.bat
@@ -129,6 +129,8 @@ REM SET __ECHO2=ECHO
 REM SET __ECHO3=ECHO
 IF NOT DEFINED _AECHO (SET _AECHO=REM)
 IF NOT DEFINED _CECHO (SET _CECHO=REM)
+IF NOT DEFINED _CECHO2 (SET _CECHO2=REM)
+IF NOT DEFINED _CECHO3 (SET _CECHO3=REM)
 IF NOT DEFINED _VECHO (SET _VECHO=REM)
 
 SET REDIRECT=^>
@@ -177,6 +179,7 @@ REM
 REM NOTE: Change the current directory to the root of the source tree, saving
 REM       the current directory on the directory stack.
 REM
+%_CECHO2% PUSHD "%ROOT%"
 %__ECHO2% PUSHD "%ROOT%"
 
 IF ERRORLEVEL 1 (
@@ -524,6 +527,7 @@ FOR %%P IN (%PLATFORMS%) DO (
         REM
         REM NOTE: Attempt to setup the MSVC environment for this platform.
         REM
+        %_CECHO3% CALL "%VCVARSALL%" %%P
         %__ECHO3% CALL "%VCVARSALL%" %%P
 
         IF ERRORLEVEL 1 (
@@ -749,6 +753,7 @@ FOR %%P IN (%PLATFORMS%) DO (
 REM
 REM NOTE: Restore the saved current directory from the directory stack.
 REM
+%_CECHO2% POPD
 %__ECHO2% POPD
 
 IF ERRORLEVEL 1 (

From af9cee12c1e57bbd92db0ebdd2a4f9f551b1d790 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sun, 30 Oct 2022 08:39:18 +0000
Subject: [PATCH 392/428] Reduce wasm module's starting memory from 128mb to
 16mb. The latter value is needed only for WASMFS-based batch-runner.js, as
 WASMFS builds cannot be configured for dynamic memory growth without a
 tremendous performance hit.

FossilOrigin-Name: ed9d93c48752ba6e18edc1238a8ccdbf6bb65c74fb52a89d515f8b0ab6bea13a
---
 ext/wasm/GNUmakefile | 31 +++++++++++++++++++++++++------
 ext/wasm/wasmfs.make |  1 +
 manifest             | 16 ++++++++--------
 manifest.uuid        |  2 +-
 4 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 5316181208..195c57305b 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -335,13 +335,32 @@ emcc.jsflags += $(emcc.exportedRuntimeMethods)
 emcc.jsflags += -sUSE_CLOSURE_COMPILER=0
 emcc.jsflags += -sIMPORTED_MEMORY
 emcc.environment := -sENVIRONMENT=web,worker
+########################################################################
+# -sINITIAL_MEMORY: How much memory we need to start with is governed
+# at least in part by whether -sALLOW_MEMORY_GROWTH is enabled. If so,
+# we can start with less. If not, we need as much as we'll ever
+# possibly use (which, of course, we can't know for sure).  Note,
+# however, that speedtest1 shows that performance for even moderate
+# workloads MAY suffer considerably if we start small and have to grow
+# at runtime. e.g. OPFS-backed (speedtest1 --size 75) take MAY take X
+# time with 16mb+ memory and 3X time when starting with 8MB. However,
+# such test results are inconsistent due to browser internals which
+# are opaque to us.
 emcc.jsflags += -sALLOW_MEMORY_GROWTH
-# emcc: warning: USE_PTHREADS + ALLOW_MEMORY_GROWTH may run non-wasm code
-#       slowly, see https://github.com/WebAssembly/design/issues/1271
-#       [-Wpthreads-mem-growth]
-emcc.jsflags += -sINITIAL_MEMORY=13107200
-#emcc.jsflags += -sINITIAL_MEMORY=64225280
-# ^^^^ 64MB is not enough for WASMFS/OPFS test runs using batch-runner.js
+emcc.INITIAL_MEMORY.128 := 13107200
+emcc.INITIAL_MEMORY.96  := 100663296
+emcc.INITIAL_MEMORY.64  := 64225280
+emcc.INITIAL_MEMORY.32  := 33554432
+emcc.INITIAL_MEMORY.16  := 16777216
+emcc.INITIAL_MEMORY.8   := 8388608
+emcc.INITIAL_MEMORY ?= 16
+ifeq (,$(emcc.INITIAL_MEMORY.$(emcc.INITIAL_MEMORY)))
+$(error emcc.INITIAL_MEMORY must be one of: 8, 16, 32, 64, 96, 128 (megabytes))
+endif
+emcc.jsflags += -sINITIAL_MEMORY=$(emcc.INITIAL_MEMORY.$(emcc.INITIAL_MEMORY))
+# /INITIAL_MEMORY
+########################################################################
+
 emcc.jsflags += $(emcc.environment)
 #emcc.jsflags += -sTOTAL_STACK=4194304
 
diff --git a/ext/wasm/wasmfs.make b/ext/wasm/wasmfs.make
index f27c9d631d..dfca586ce0 100644
--- a/ext/wasm/wasmfs.make
+++ b/ext/wasm/wasmfs.make
@@ -57,6 +57,7 @@ sqlite3-wasmfs.jsflags += -sLLD_REPORT_UNDEFINED
 #sqlite3-wasmfs.jsflags += --import-undefined
 sqlite3-wasmfs.jsflags += -sMEMORY64=0
 sqlite3-wasmfs.jsflags += -sINITIAL_MEMORY=128450560
+# ^^^^ 64MB is not enough for WASMFS/OPFS test runs using batch-runner.js
 sqlite3-wasmfs.fsflags := -pthread -sWASMFS -sPTHREAD_POOL_SIZE=2 -sENVIRONMENT=web,worker
 # -sPTHREAD_POOL_SIZE values of 2 or higher trigger that bug.
 sqlite3-wasmfs.jsflags += $(sqlite3-wasmfs.fsflags)
diff --git a/manifest b/manifest
index 1cd7a00402..1c3e5c70d6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\supdates\sto\sthe\sWindows\sbatch\stools.
-D 2022-10-30T07:01:31.341
+C Reduce\swasm\smodule's\sstarting\smemory\sfrom\s128mb\sto\s16mb.\sThe\slatter\svalue\sis\sneeded\sonly\sfor\sWASMFS-based\sbatch-runner.js,\sas\sWASMFS\sbuilds\scannot\sbe\sconfigured\sfor\sdynamic\smemory\sgrowth\swithout\sa\stremendous\sperformance\shit.
+D 2022-10-30T08:39:18.647
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -487,7 +487,7 @@ F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
-F ext/wasm/GNUmakefile 94b55d2dea0eb16f82a2691bceeed265273c7fbb61a6063abfbc1efdf70aeb9c
+F ext/wasm/GNUmakefile 63d6b799daa7dff24378370642170a69872bdd225d4d40e8557b07bcdab0fb22
 F ext/wasm/README-dist.txt 2d670b426fc7c613b90a7d2f2b05b433088fe65181abead970980f0a4a75ea20
 F ext/wasm/README.md ef39861aa21632fdbca0bdd469f78f0096f6449a720f3f39642594af503030e9
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 9120c2f8f51fa85f46dcf4dcb6b12f4a807d428f6089b99cdb08d8ddfcfd88b2
@@ -551,7 +551,7 @@ F ext/wasm/tester1-worker.html d02b9d38876b023854cf8955e77a40912f7e516956b4dbe1e
 F ext/wasm/tester1.html c6c47e5a8071eb09cb1301104435c8e44fbb5719c92411f5b2384a461f9793c5
 F ext/wasm/tester1.js 679013b874152427d302e56f78bf542c47a090a85c8ca010bb4002859431cf61
 F ext/wasm/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd72273503ae7d5
-F ext/wasm/wasmfs.make ee0004813e16c283ff633e08b482008d56adf9b7d42f6c5612f7ab002b924f69
+F ext/wasm/wasmfs.make 86177d02df29cb0eb03c3cc48f07783148834a4c659889908f82625666148fce
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
@@ -2054,8 +2054,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 c76ec31ebf4d80ec8cbd2aa2017e1d6bc32eae66bfbcc130c053ddb403599c6b
-R 363016fa4e28705ed2554d72d33a3740
-U mistachkin
-Z e1214828164be445021f6f541770bc23
+P b42f56205fa8e06431fb1a45c48257d93605fea0ed95bd766f71e27292d1af33
+R fee21034df3950eed20c15397fa0e46a
+U stephan
+Z 5acb90fd6218fca4312e02f1c60a0679
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 33b0ec78a8..a65b566b1a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b42f56205fa8e06431fb1a45c48257d93605fea0ed95bd766f71e27292d1af33
\ No newline at end of file
+ed9d93c48752ba6e18edc1238a8ccdbf6bb65c74fb52a89d515f8b0ab6bea13a
\ No newline at end of file

From 1fc6ffccc55fc7105ce9426149e63446e062c01f Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sun, 30 Oct 2022 09:47:33 +0000
Subject: [PATCH 393/428] Minor WASM build cleanups. Enable custom
 Module.instantiateWasm() when not in WASMFS mode (where it doesn't work). Add
 sqlite3.debugModule URL param to enable some module-init-time debugging
 output.

FossilOrigin-Name: 50f678846a2b3c3d0818f0bae89f2ee86252a2e6a9c7029ebaae3953ca0fa14c
---
 ext/wasm/GNUmakefile           | 25 +++++++++++-------
 ext/wasm/api/extern-post-js.js |  7 +++++-
 ext/wasm/api/post-js-header.js |  2 +-
 ext/wasm/api/pre-js.js         | 46 +++++++++++++++++++++-------------
 ext/wasm/api/sqlite3-wasm.c    |  2 +-
 ext/wasm/fiddle.make           |  2 +-
 ext/wasm/wasmfs.make           | 11 ++++----
 manifest                       | 24 +++++++++---------
 manifest.uuid                  |  2 +-
 9 files changed, 73 insertions(+), 48 deletions(-)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 195c57305b..b76ed5cd2f 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -106,7 +106,7 @@ endif
 
 cflags.common :=  -I. -I.. -I$(dir.top)
 CLEAN_FILES += *~ $(dir.jacc)/*~ $(dir.api)/*~ $(dir.common)/*~
-emcc_enable_bigint ?= 1
+emcc.WASM_BIGINT ?= 1
 sqlite3.c := $(dir.top)/sqlite3.c
 sqlite3.h := $(dir.top)/sqlite3.h
 SQLITE_OPT = \
@@ -295,7 +295,11 @@ define call-make-pre-js
 pre-post-$(1).flags ?=
 $$(dir.tmp)/pre-js-$(1).js: $$(pre-js.js) $$(MAKEFILE)
 	cp $$(pre-js.js) $$@
-	echo "Module[xInstantiateWasm].uri = '$(1).wasm';" >> $$@
+	@if [ sqlite3-wasmfs = $(1) ]; then \
+		echo "delete Module[xNameOfInstantiateWasm] /*for WASMFS build*/;"; \
+	elif [ sqlite3 != $(1) ]; then \
+		echo "Module[xNameOfInstantiateWasm].uri = '$(1).wasm';"; \
+	fi >> $$@
 pre-post-$(1).deps := $$(pre-post-jses.deps) $$(dir.tmp)/pre-js-$(1).js
 pre-post-$(1).flags += --pre-js=$$(dir.tmp)/pre-js-$(1).js
 endef
@@ -388,14 +392,16 @@ emcc.jsflags += -sLLD_REPORT_UNDEFINED
 #emcc.jsflags += --unresolved-symbols=import-dynamic --experimental-pic
 #emcc.jsflags += --experimental-pic --unresolved-symbols=ingore-all --import-undefined
 #emcc.jsflags += --unresolved-symbols=ignore-all
-emcc.jsflags += -sWASM_BIGINT=$(emcc_enable_bigint)
-# ^^^^ MEMORY64=1 fails to load, erroring with:
+emcc.jsflags += -sWASM_BIGINT=$(emcc.WASM_BIGINT)
+
+########################################################################
+# -sMEMORY64=1 fails to load, erroring with:
 #  invalid memory limits flags 0x5
 #    (enable via --experimental-wasm-memory64)
 #
 # ^^^^ MEMORY64=2 builds and loads but dies when we do things like:
 #
-#  new Uint8Array(heapWrappers().HEAP8U.buffer, ptr, n)
+#  new Uint8Array(wasm.heap8u().buffer, ptr, n)
 #
 # because ptr is now a BigInt, so is invalid for passing to arguments
 # which have strict must-be-a-Number requirements.
@@ -405,10 +411,10 @@ emcc.jsflags += -sWASM_BIGINT=$(emcc_enable_bigint)
 ########################################################################
 # -sSINGLE_FILE:
 # https://github.com/emscripten-core/emscripten/blob/main/src/settings.js#L1704
-# -sSINGLE_FILE=1 would be really nice but we have to build with -g
+# -sSINGLE_FILE=1 would be really nice but we have to build with -g3
 # for -O2 and higher to work (else minification breaks the code) and
 # cannot wasm-strip the binary before it gets encoded into the JS
-# file. The result is that the generated JS file is, because of the -g
+# file. The result is that the generated JS file is, because of the -g3
 # debugging info, _huge_.
 ########################################################################
 
@@ -468,11 +474,12 @@ all: batch
 speedtest1-common.eflags := $(emcc_opt_full)
 speedtest1.eflags :=
 speedtest1.eflags += -sENVIRONMENT=web
+speedtest1.eflags += -sALLOW_MEMORY_GROWTH
+speedtest1.eflags += -sINITIAL_MEMORY=$(emcc.INITIAL_MEMORY.$(emcc.INITIAL_MEMORY))
 speedtest1-common.eflags += -sINVOKE_RUN=0
 speedtest1-common.eflags += --no-entry
 #speedtest1-common.eflags += -flto
 speedtest1-common.eflags += -sABORTING_MALLOC
-speedtest1-common.eflags += -sINITIAL_MEMORY=128450560
 speedtest1-common.eflags += -sSTRICT_JS
 speedtest1-common.eflags += -sMODULARIZE
 speedtest1-common.eflags += -Wno-limited-postlink-optimizations
@@ -483,7 +490,7 @@ speedtest1-common.eflags += -sALLOW_TABLE_GROWTH
 speedtest1-common.eflags += -sDYNAMIC_EXECUTION=0
 speedtest1-common.eflags += --minify 0
 speedtest1-common.eflags += -sEXPORT_NAME=$(sqlite3.js.init-func)
-speedtest1-common.eflags += -sWASM_BIGINT=$(emcc_enable_bigint)
+speedtest1-common.eflags += -sWASM_BIGINT=$(emcc.WASM_BIGINT)
 speedtest1-common.eflags += $(pre-post-common.flags) 
 speedtest1.exit-runtime0 := -sEXIT_RUNTIME=0
 speedtest1.exit-runtime1 := -sEXIT_RUNTIME=1
diff --git a/ext/wasm/api/extern-post-js.js b/ext/wasm/api/extern-post-js.js
index 67b32e8912..84b99b53a6 100644
--- a/ext/wasm/api/extern-post-js.js
+++ b/ext/wasm/api/extern-post-js.js
@@ -36,6 +36,11 @@
     location: self.location,
     urlParams: new URL(self.location.href).searchParams
   });
+  initModuleState.debugModule =
+    (new URL(self.location.href).searchParams).has('sqlite3.debugModule')
+    ? (...args)=>console.warn('sqlite3.debugModule:',...args)
+    : ()=>{};
+
   if(initModuleState.urlParams.has('sqlite3.dir')){
     initModuleState.sqlite3Dir = initModuleState.urlParams.get('sqlite3.dir') +'/';
   }else if(initModuleState.moduleScript){
@@ -43,7 +48,6 @@
     li.pop();
     initModuleState.sqlite3Dir = li.join('/') + '/';
   }
-  //console.warn("initModuleState =",initModuleState);
 
   self.sqlite3InitModule = (...args)=>{
     //console.warn("Using replaced sqlite3InitModule()",self.location);
@@ -79,6 +83,7 @@
     src.pop();
     sim.scriptDir = src.join('/') + '/';
   }
+  initModuleState.debugModule('sqlite3InitModuleState =',initModuleState);
   if(0){
     console.warn("Replaced sqlite3InitModule()");
     console.warn("self.location.href =",self.location.href);
diff --git a/ext/wasm/api/post-js-header.js b/ext/wasm/api/post-js-header.js
index f377a6541c..82a80e5a17 100644
--- a/ext/wasm/api/post-js-header.js
+++ b/ext/wasm/api/post-js-header.js
@@ -5,7 +5,7 @@
    environment must have been set up already but it will not have
    loaded its WASM when the code in this file is run. The function it
    installs will be run after the WASM module is loaded, at which
-   point the sqlite3 WASM API bits will be set up.
+   point the sqlite3 JS API bits will get set up.
 */
 if(!Module.postRun) Module.postRun = [];
 Module.postRun.push(function(Module/*the Emscripten-style module object*/){
diff --git a/ext/wasm/api/pre-js.js b/ext/wasm/api/pre-js.js
index c07d0373cd..f31dea1794 100644
--- a/ext/wasm/api/pre-js.js
+++ b/ext/wasm/api/pre-js.js
@@ -8,6 +8,7 @@
 // See notes in extern-post-js.js
 const sqlite3InitModuleState = self.sqlite3InitModuleState || Object.create(null);
 delete self.sqlite3InitModuleState;
+sqlite3InitModuleState.debugModule('self.location =',self.location);
 
 /**
    This custom locateFile() tries to figure out where to load `path`
@@ -30,12 +31,6 @@ delete self.sqlite3InitModuleState;
 Module['locateFile'] = function(path, prefix) {
   let theFile;
   const up = this.urlParams;
-  if(0){
-    console.warn("locateFile(",arguments[0], ',', arguments[1],")",
-                 'self.location =',self.location,
-                 'sqlite3InitModuleState.scriptDir =',this.scriptDir,
-                 'up.entries() =',Array.from(up.entries()));
-  }
   if(up.has(path)){
     theFile = up.get(path);
   }else if(this.sqlite3Dir){
@@ -45,22 +40,37 @@ Module['locateFile'] = function(path, prefix) {
   }else{
     theFile = prefix + path;
   }
+  sqlite3InitModuleState.debugModule(
+    "locateFile(",arguments[0], ',', arguments[1],")",
+    'sqlite3InitModuleState.scriptDir =',this.scriptDir,
+    'up.entries() =',Array.from(up.entries()),
+    "result =", theFile
+  );
   return theFile;
 }.bind(sqlite3InitModuleState);
 
 /**
-   Bug warning: this xInstantiateWasm bit must remain disabled
-   until this bug is resolved or wasmfs won't work:
+   Bug warning: a custom Module.instantiateWasm() does not work
+   in WASMFS builds:
 
    https://github.com/emscripten-core/emscripten/issues/17951
+
+   In such builds we must disable this.
 */
-const xInstantiateWasm = 1
-      ? 'emscripten-bug-17951'
-      : 'instantiateWasm';
-Module[xInstantiateWasm] = function callee(imports,onSuccess){
+const xNameOfInstantiateWasm = true
+      ? 'instantiateWasm'
+      : 'emscripten-bug-17951';
+Module[xNameOfInstantiateWasm] = function callee(imports,onSuccess){
   imports.env.foo = function(){};
-  console.warn("instantiateWasm() uri =",callee.uri, self.location.href);
-  const wfetch = ()=>fetch(callee.uri, {credentials: 'same-origin'});
+  const uri = Module.locateFile(
+    callee.uri, (
+      ('undefined'===typeof scriptDirectory/*var defined by Emscripten glue*/)
+        ? '' : scriptDirectory)
+  );
+  sqlite3InitModuleState.debugModule(
+    "instantiateWasm() uri =", uri
+  );
+  const wfetch = ()=>fetch(uri, {credentials: 'same-origin'});
   const loadWasm = WebAssembly.instantiateStreaming
         ? async ()=>{
           return WebAssembly.instantiateStreaming(wfetch(), imports)
@@ -79,10 +89,12 @@ Module[xInstantiateWasm] = function callee(imports,onSuccess){
   It is literally impossible to reliably get the name of _this_ script
   at runtime, so impossible to derive X.wasm from script name
   X.js. Thus we need, at build-time, to redefine
-  Module[xInstantiateWasm].uri by appending it to a build-specific
+  Module[xNameOfInstantiateWasm].uri by appending it to a build-specific
   copy of this file with the name of the wasm file. This is apparently
   why Emscripten hard-codes the name of the wasm file into their glue
   scripts.
 */
-Module[xInstantiateWasm].uri = 'sqlite3.wasm';
-/* END FILE: api/pre-js.js */
+Module[xNameOfInstantiateWasm].uri = 'sqlite3.wasm';
+/* END FILE: api/pre-js.js, noting that the build process may add a
+   line after this one to change the above .uri to a build-specific
+   one. */
diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index 754f9cf0d4..1ca51f0d2f 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -1028,7 +1028,7 @@ int sqlite3_wasm_init_wasmfs(const char *zMountPoint){
 #else
 SQLITE_WASM_KEEP
 int sqlite3_wasm_init_wasmfs(const char *zUnused){
-  emscripten_console_warn("WASMFS OPFS is not compiled in.");
+  //emscripten_console_warn("WASMFS OPFS is not compiled in.");
   if(zUnused){/*unused*/}
   return SQLITE_NOTFOUND;
 }
diff --git a/ext/wasm/fiddle.make b/ext/wasm/fiddle.make
index bed7bf367e..43e6941f55 100644
--- a/ext/wasm/fiddle.make
+++ b/ext/wasm/fiddle.make
@@ -33,7 +33,7 @@ fiddle.emcc-flags = \
   -sENVIRONMENT=web,worker \
   -sMODULARIZE \
   -sDYNAMIC_EXECUTION=0 \
-  -sWASM_BIGINT=$(emcc_enable_bigint) \
+  -sWASM_BIGINT=$(emcc.WASM_BIGINT) \
   -sEXPORT_NAME=$(sqlite3.js.init-func) \
   -Wno-limited-postlink-optimizations \
   $(sqlite3.js.flags.--post-js) \
diff --git a/ext/wasm/wasmfs.make b/ext/wasm/wasmfs.make
index dfca586ce0..12144f7900 100644
--- a/ext/wasm/wasmfs.make
+++ b/ext/wasm/wasmfs.make
@@ -11,7 +11,8 @@ MAKEFILE.wasmfs := $(lastword $(MAKEFILE_LIST))
 # subdirectory because loading of the auxiliary
 # sqlite3-wasmfs.worker.js file it creates fails if sqlite3-wasmfs.js
 # is loaded from any directory other than the one in which the
-# containing HTML lives.
+# containing HTML lives. Similarly, they cannot be loaded from a
+# Worker to an Emscripten quirk regarding loading nested Workers.
 dir.wasmfs := $(dir.wasm)
 sqlite3-wasmfs.js     := $(dir.wasmfs)/sqlite3-wasmfs.js
 sqlite3-wasmfs.wasm   := $(dir.wasmfs)/sqlite3-wasmfs.wasm
@@ -65,7 +66,7 @@ sqlite3-wasmfs.jsflags += $(sqlite3-wasmfs.fsflags)
 #^^^ using ALLOW_MEMORY_GROWTH produces a warning from emcc:
 #   USE_PTHREADS + ALLOW_MEMORY_GROWTH may run non-wasm code slowly,
 #   see https://github.com/WebAssembly/design/issues/1271 [-Wpthreads-mem-growth]
-sqlite3-wasmfs.jsflags += -sWASM_BIGINT=$(emcc_enable_bigint)
+sqlite3-wasmfs.jsflags += -sWASM_BIGINT=$(emcc.WASM_BIGINT)
 $(eval $(call call-make-pre-js,sqlite3-wasmfs))
 sqlite3-wasmfs.jsflags += $(pre-post-common.flags) $(pre-post-sqlite3-wasmfs.flags)
 $(sqlite3-wasmfs.js): $(sqlite3-wasm.c) \
@@ -83,13 +84,13 @@ wasmfs: $(sqlite3-wasmfs.js)
 all: wasmfs
 
 ########################################################################
-# speedtest1 for wasmfs. Re. sqlite3-wasm.o vs sqlite3-wasm.c:
-# building against the latter (predictably) results in a slightly
-# faster binary.
+# speedtest1 for wasmfs.
 speedtest1-wasmfs.js := $(dir.wasmfs)/speedtest1-wasmfs.js
 speedtest1-wasmfs.wasm := $(subst .js,.wasm,$(speedtest1-wasmfs.js))
 speedtest1-wasmfs.eflags := $(sqlite3-wasmfs.fsflags)
 speedtest1-wasmfs.eflags += $(SQLITE_OPT) -DSQLITE_WASM_WASMFS
+speedtest1-wasmfs.eflags += -sALLOW_MEMORY_GROWTH=0
+speedtest1-wasmfs.eflags += -sINITIAL_MEMORY=$(emcc.INITIAL_MEMORY.128)
 $(eval $(call call-make-pre-js,speedtest1-wasmfs))
 $(speedtest1-wasmfs.js): $(speedtest1.cses) $(sqlite3-wasmfs.js) \
   $(MAKEFILE) $(MAKEFILE.wasmfs) \
diff --git a/manifest b/manifest
index 1c3e5c70d6..454dc4e56b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Reduce\swasm\smodule's\sstarting\smemory\sfrom\s128mb\sto\s16mb.\sThe\slatter\svalue\sis\sneeded\sonly\sfor\sWASMFS-based\sbatch-runner.js,\sas\sWASMFS\sbuilds\scannot\sbe\sconfigured\sfor\sdynamic\smemory\sgrowth\swithout\sa\stremendous\sperformance\shit.
-D 2022-10-30T08:39:18.647
+C Minor\sWASM\sbuild\scleanups.\sEnable\scustom\sModule.instantiateWasm()\swhen\snot\sin\sWASMFS\smode\s(where\sit\sdoesn't\swork).\sAdd\ssqlite3.debugModule\sURL\sparam\sto\senable\ssome\smodule-init-time\sdebugging\soutput.
+D 2022-10-30T09:47:33.723
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -487,17 +487,17 @@ F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
-F ext/wasm/GNUmakefile 63d6b799daa7dff24378370642170a69872bdd225d4d40e8557b07bcdab0fb22
+F ext/wasm/GNUmakefile 49dbcffa0195d47b89b61f52795f7ed3af97ad0e1f765ff20be16d3e63e6f52b
 F ext/wasm/README-dist.txt 2d670b426fc7c613b90a7d2f2b05b433088fe65181abead970980f0a4a75ea20
 F ext/wasm/README.md ef39861aa21632fdbca0bdd469f78f0096f6449a720f3f39642594af503030e9
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 9120c2f8f51fa85f46dcf4dcb6b12f4a807d428f6089b99cdb08d8ddfcfd88b2
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
 F ext/wasm/api/README.md 1350088aee90e959ad9a94fab1bb6bcb5e99d4d27f976db389050f54f2640c78
-F ext/wasm/api/extern-post-js.js 926d192b72fa808378e5e7843721dc7ba3908c163a0260e06d8aa501c12f5469
+F ext/wasm/api/extern-post-js.js f3dc4219a2a1f183d98452dcbd55a0c5351b759eccca75480a92473974d8b047
 F ext/wasm/api/extern-pre-js.js cc61c09c7a24a07dbecb4c352453c3985170cec12b4e7e7e7a4d11d43c5c8f41
 F ext/wasm/api/post-js-footer.js cd0a8ec768501d9bd45d325ab0442037fb0e33d1f3b4f08902f15c34720ee4a1
-F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b
-F ext/wasm/api/pre-js.js 151e0616614a49f3db19ed544fa13b38c87c108959fbcd4029ea8399a562d94f
+F ext/wasm/api/post-js-header.js d6ab3dfef4a06960d28a7eaa338d4e2a1a5981e9b38718168bbde8fdb2a439b8
+F ext/wasm/api/pre-js.js 287e462f969342b032c03900e668099fa1471d852df7a472de5bc349161d9c04
 F ext/wasm/api/sqlite3-api-cleanup.js ecdc69dbfccfe26146f04799fcfd4a6f5790d46e7e3b9b6e9b0491f92ed8ae34
 F ext/wasm/api/sqlite3-api-glue.js b87543534821ecfa56fc0d0cd153a115fa974e70d6217964baf6e93ef8d25fb1
 F ext/wasm/api/sqlite3-api-oo1.js 612063da9838286310712c5411f97b8b20759b1e31e75a9b25b6381541db79a8
@@ -507,7 +507,7 @@ F ext/wasm/api/sqlite3-api-worker1.js efdca1b42299d80b54f366d15a8fc5343f3b3e9e36
 F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
 F ext/wasm/api/sqlite3-opfs-async-proxy.js f04cb1eb483c92bc61fe02749f7afcf17ec803968171aedd7d96faf428c26bcb
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c 940d576bda7068ba60492e206d06a3567b8a89a3770700aa88690a6e246a0c78
+F ext/wasm/api/sqlite3-wasm.c 14ac9c03f6585332f882703f3427f11ffe8ffe8b6c0e252be2c518f7aac6ab6a
 F ext/wasm/api/sqlite3-worker1-promiser.js 0c7a9826dbf82a5ed4e4f7bf7816e825a52aff253afbf3350431f5773faf0e4b
 F ext/wasm/api/sqlite3-worker1.js 1e54ea3d540161bcfb2100368a2fc0cad871a207b8336afee1c445715851ec54
 F ext/wasm/batch-runner.html 4deeed44fe41496dc6898d9fb17938ea3291f40f4bfb977e29d0cef96fbbe4c8
@@ -526,7 +526,7 @@ F ext/wasm/demo-worker1-promiser.js f68ffbbe1c6086e18ce7961b8fc2b40dd88db174f590
 F ext/wasm/demo-worker1.html 2c178c1890a2beb5a5fecb1453e796d067a4b8d3d2a04d65ca2eb1ab2c68ef5d
 F ext/wasm/demo-worker1.js 8ba51d94c4601fa5c313d9e59b63b238f5305b5d5739ad21f4782a0161e6682e
 F ext/wasm/dist.make 481289899a07958439d07ee4302ff86235fa0fbb72f17ea05db2be90a94abf90
-F ext/wasm/fiddle.make 68abe5dcfdd6fdf8dc1b715b94b96fae771b5b28bc1843997b9b1ec79407f2c9
+F ext/wasm/fiddle.make e570ec1bfc7d803507a2e514fe32f673fe001b2114b85c73c3964a462ba8bcfc
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js b4a0c8ab6c0983218543ca771c45f6075449f63a1dcf290ae5a681b2cba8800d
 F ext/wasm/fiddle/fiddle.js 974b995119ac443685d7d94d3b3c58c6a36540e9eb3fed7069d5653284071715
@@ -551,7 +551,7 @@ F ext/wasm/tester1-worker.html d02b9d38876b023854cf8955e77a40912f7e516956b4dbe1e
 F ext/wasm/tester1.html c6c47e5a8071eb09cb1301104435c8e44fbb5719c92411f5b2384a461f9793c5
 F ext/wasm/tester1.js 679013b874152427d302e56f78bf542c47a090a85c8ca010bb4002859431cf61
 F ext/wasm/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd72273503ae7d5
-F ext/wasm/wasmfs.make 86177d02df29cb0eb03c3cc48f07783148834a4c659889908f82625666148fce
+F ext/wasm/wasmfs.make fb2d3c4a298b12cf1ec994ad1d0f1d027ae297449b364cde43d2eb807d68048f
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
@@ -2054,8 +2054,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 b42f56205fa8e06431fb1a45c48257d93605fea0ed95bd766f71e27292d1af33
-R fee21034df3950eed20c15397fa0e46a
+P ed9d93c48752ba6e18edc1238a8ccdbf6bb65c74fb52a89d515f8b0ab6bea13a
+R 152da8e4d58aa2b6c53dba6c132052cb
 U stephan
-Z 5acb90fd6218fca4312e02f1c60a0679
+Z 872cdab51141e46959dbd774870191f4
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index a65b566b1a..1f7864d394 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ed9d93c48752ba6e18edc1238a8ccdbf6bb65c74fb52a89d515f8b0ab6bea13a
\ No newline at end of file
+50f678846a2b3c3d0818f0bae89f2ee86252a2e6a9c7029ebaae3953ca0fa14c
\ No newline at end of file

From 9163ef1f4dcd60ff2e7d77fcc130b523a9a6b4f3 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sun, 30 Oct 2022 10:24:53 +0000
Subject: [PATCH 394/428] Adjust automatic OPFS locking retries such that they
 will wait up to a total of 3 seconds spanning 4 attempts.

FossilOrigin-Name: bbce49d81abc491ca666474040a53057e26e99131fea9449de253f88f4415ded
---
 ext/wasm/api/sqlite3-opfs-async-proxy.js |  6 +++---
 manifest                                 | 12 ++++++------
 manifest.uuid                            |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ext/wasm/api/sqlite3-opfs-async-proxy.js b/ext/wasm/api/sqlite3-opfs-async-proxy.js
index 254da7ee5d..d32390f07d 100644
--- a/ext/wasm/api/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/api/sqlite3-opfs-async-proxy.js
@@ -150,9 +150,9 @@ const getSyncHandle = async (fh)=>{
   if(!fh.syncHandle){
     const t = performance.now();
     log("Acquiring sync handle for",fh.filenameAbs);
-    const maxTries = 3;
-    let i = 1, ms = 300;
-    for(; true; ms *= ++i){
+    const maxTries = 4, msBase = 300;
+    let i = 1, ms = msBase;
+    for(; true; ms = msBase * ++i){
       try {
         //if(i<3) toss("Just testing.");
         //TODO? A config option which tells it to throw here
diff --git a/manifest b/manifest
index 454dc4e56b..86bfd3fda1 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\sWASM\sbuild\scleanups.\sEnable\scustom\sModule.instantiateWasm()\swhen\snot\sin\sWASMFS\smode\s(where\sit\sdoesn't\swork).\sAdd\ssqlite3.debugModule\sURL\sparam\sto\senable\ssome\smodule-init-time\sdebugging\soutput.
-D 2022-10-30T09:47:33.723
+C Adjust\sautomatic\sOPFS\slocking\sretries\ssuch\sthat\sthey\swill\swait\sup\sto\sa\stotal\sof\s3\sseconds\sspanning\s4\sattempts.
+D 2022-10-30T10:24:53.526
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -505,7 +505,7 @@ F ext/wasm/api/sqlite3-api-opfs.js c67cbe0b1451ec43bc6b3199e13453e1ca56d718a75c0
 F ext/wasm/api/sqlite3-api-prologue.js a218dda5e5ced8894f65760131371e4cabd31062af58803af8952cc00ea778d2
 F ext/wasm/api/sqlite3-api-worker1.js efdca1b42299d80b54f366d15a8fc5343f3b3e9e3647e5c1fd6f3ee1015e501b
 F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
-F ext/wasm/api/sqlite3-opfs-async-proxy.js f04cb1eb483c92bc61fe02749f7afcf17ec803968171aedd7d96faf428c26bcb
+F ext/wasm/api/sqlite3-opfs-async-proxy.js 29f6f5c314c2956e77573c6ab975c2455a0839721ed44f38004382c2a1463ab5
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 14ac9c03f6585332f882703f3427f11ffe8ffe8b6c0e252be2c518f7aac6ab6a
 F ext/wasm/api/sqlite3-worker1-promiser.js 0c7a9826dbf82a5ed4e4f7bf7816e825a52aff253afbf3350431f5773faf0e4b
@@ -2054,8 +2054,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 ed9d93c48752ba6e18edc1238a8ccdbf6bb65c74fb52a89d515f8b0ab6bea13a
-R 152da8e4d58aa2b6c53dba6c132052cb
+P 50f678846a2b3c3d0818f0bae89f2ee86252a2e6a9c7029ebaae3953ca0fa14c
+R 1972183d0891a999ac8d66d2a75ace56
 U stephan
-Z 872cdab51141e46959dbd774870191f4
+Z d56b11be64ada51bbacb5dad8807cd55
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 1f7864d394..3eef8bbcc7 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-50f678846a2b3c3d0818f0bae89f2ee86252a2e6a9c7029ebaae3953ca0fa14c
\ No newline at end of file
+bbce49d81abc491ca666474040a53057e26e99131fea9449de253f88f4415ded
\ No newline at end of file

From 50ef01398d73f38d1204cf00b0371d188e8aef85 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sun, 30 Oct 2022 11:39:47 +0000
Subject: [PATCH 395/428] Add oo1.DB.selectArray() and selectObject().

FossilOrigin-Name: 7660db2a2e9c4f3a6a9343d6929744ad0f4be6820976411f9080165491da59b7
---
 ext/wasm/api/sqlite3-api-oo1.js | 47 +++++++++++++++++++++++++++++++++
 ext/wasm/tester1.js             | 18 +++++++++++++
 manifest                        | 14 +++++-----
 manifest.uuid                   |  2 +-
 4 files changed, 73 insertions(+), 8 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index cbdf40f9be..b44dce690f 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -429,6 +429,21 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     return out;
   };
 
+  /**
+     Internal impl of the DB.selectRowArray() and
+     selectRowObject() methods.
+  */
+  const __selectFirstRow = (db, sql, bind, getArg)=>{
+    let stmt, rc;
+    try {
+      stmt = db.prepare(sql).bind(bind);
+      if(stmt.step()) rc = stmt.get(getArg);
+    }finally{
+      if(stmt) stmt.finalize();
+    }
+    return rc;
+  };
+
   /**
      Expects to be given a DB instance or an `sqlite3*` pointer (may
      be null) and an sqlite3 API result code. If the result code is
@@ -982,6 +997,38 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
       }
       return rc;
     },
+    /**
+       Prepares the given SQL, step()s it one time, and returns an
+       array containing the values of the first result row. If it has
+       no results, `undefined` is returned.
+
+       If passed a second argument other than `undefined`, it is
+       treated like an argument to Stmt.bind(), so may be any type
+       supported by that function.
+
+       Throws on error (e.g. malformed SQL).
+    */
+    selectArray: function(sql,bind){
+      return __selectFirstRow(this, sql, bind, []);
+    },
+
+    /**
+       Prepares the given SQL, step()s it one time, and returns an
+       object containing the key/value pairs of the first result
+       row. If it has no results, `undefined` is returned.
+
+       Note that the order of returned object's keys is not guaranteed
+       to be the same as the order of the fields in the query string.
+
+       If passed a second argument other than `undefined`, it is
+       treated like an argument to Stmt.bind(), so may be any type
+       supported by that function.
+
+       Throws on error (e.g. malformed SQL).
+    */
+    selectObject: function(sql,bind){
+      return __selectFirstRow(this, sql, bind, {});
+    },
 
     /**
        Returns the number of currently-opened Stmt handles for this db
diff --git a/ext/wasm/tester1.js b/ext/wasm/tester1.js
index 16cbdf6b2a..3c6136b907 100644
--- a/ext/wasm/tester1.js
+++ b/ext/wasm/tester1.js
@@ -1301,6 +1301,24 @@
           .assert(0==e.message.indexOf('Cannot prepare empty'));
       }
     })
+
+  ////////////////////////////////////////////////////////////////////////
+    .t('selectArray/Object()', function(sqlite3){
+      const db = this.db;
+      let rc = db.selectArray('select a, b from t where a=?', 5);
+      T.assert(Array.isArray(rc))
+        .assert(2===rc.length)
+        .assert(5===rc[0] && 6===rc[1]);
+      rc = db.selectArray('select a, b from t where b=-1');
+      T.assert(undefined === rc);
+      rc = db.selectObject('select a A, b b from t where b=?', 6);
+      T.assert(rc && 'object'===typeof rc)
+        .assert(5===rc.A)
+        .assert(6===rc.b);
+      rc = db.selectArray('select a, b from t where b=-1');
+      T.assert(undefined === rc);
+    })
+
   ////////////////////////////////////////////////////////////////////////
     .t('sqlite3_js_db_export()', function(){
       const db = this.db;
diff --git a/manifest b/manifest
index 86bfd3fda1..53c96a5202 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Adjust\sautomatic\sOPFS\slocking\sretries\ssuch\sthat\sthey\swill\swait\sup\sto\sa\stotal\sof\s3\sseconds\sspanning\s4\sattempts.
-D 2022-10-30T10:24:53.526
+C Add\soo1.DB.selectArray()\sand\sselectObject().
+D 2022-10-30T11:39:47.998
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -500,7 +500,7 @@ F ext/wasm/api/post-js-header.js d6ab3dfef4a06960d28a7eaa338d4e2a1a5981e9b387181
 F ext/wasm/api/pre-js.js 287e462f969342b032c03900e668099fa1471d852df7a472de5bc349161d9c04
 F ext/wasm/api/sqlite3-api-cleanup.js ecdc69dbfccfe26146f04799fcfd4a6f5790d46e7e3b9b6e9b0491f92ed8ae34
 F ext/wasm/api/sqlite3-api-glue.js b87543534821ecfa56fc0d0cd153a115fa974e70d6217964baf6e93ef8d25fb1
-F ext/wasm/api/sqlite3-api-oo1.js 612063da9838286310712c5411f97b8b20759b1e31e75a9b25b6381541db79a8
+F ext/wasm/api/sqlite3-api-oo1.js a17e2624967073f86cc50f4c1e30f8822ef631dc20dfc73b1143847b9e9723fe
 F ext/wasm/api/sqlite3-api-opfs.js c67cbe0b1451ec43bc6b3199e13453e1ca56d718a75c0498253b0d479c336256
 F ext/wasm/api/sqlite3-api-prologue.js a218dda5e5ced8894f65760131371e4cabd31062af58803af8952cc00ea778d2
 F ext/wasm/api/sqlite3-api-worker1.js efdca1b42299d80b54f366d15a8fc5343f3b3e9e3647e5c1fd6f3ee1015e501b
@@ -549,7 +549,7 @@ F ext/wasm/test-opfs-vfs.html 1f2d672f3f3fce810dfd48a8d56914aba22e45c6834e262555
 F ext/wasm/test-opfs-vfs.js 48fc59110e8775bb43c9be25b6d634fc07ebadab7da8fbd44889e8129c6e2548
 F ext/wasm/tester1-worker.html d02b9d38876b023854cf8955e77a40912f7e516956b4dbe1ec7f215faac273ee
 F ext/wasm/tester1.html c6c47e5a8071eb09cb1301104435c8e44fbb5719c92411f5b2384a461f9793c5
-F ext/wasm/tester1.js 679013b874152427d302e56f78bf542c47a090a85c8ca010bb4002859431cf61
+F ext/wasm/tester1.js 08ccc16972562ff604b7bda387b56d6eea380aaf968697fc8e2a9bb3c6ba2dda
 F ext/wasm/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd72273503ae7d5
 F ext/wasm/wasmfs.make fb2d3c4a298b12cf1ec994ad1d0f1d027ae297449b364cde43d2eb807d68048f
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
@@ -2054,8 +2054,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 50f678846a2b3c3d0818f0bae89f2ee86252a2e6a9c7029ebaae3953ca0fa14c
-R 1972183d0891a999ac8d66d2a75ace56
+P bbce49d81abc491ca666474040a53057e26e99131fea9449de253f88f4415ded
+R db56e1c7d598fb49e6f4c473767fbbc1
 U stephan
-Z d56b11be64ada51bbacb5dad8807cd55
+Z bb0672930fc07425c0c9d9cd4f958f03
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 3eef8bbcc7..9f2d2e8315 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bbce49d81abc491ca666474040a53057e26e99131fea9449de253f88f4415ded
\ No newline at end of file
+7660db2a2e9c4f3a6a9343d6929744ad0f4be6820976411f9080165491da59b7
\ No newline at end of file

From 1e84e1e632601b0eecc2e2616fe25721616c5706 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 31 Oct 2022 01:22:38 +0000
Subject: [PATCH 396/428] Extra OOM check in shell_error_context() of the CLI.
 [forum:/forumpost/5708841db0|forum post 5708841db0].

FossilOrigin-Name: cb12ac5de17e677f089d7b0b46803efbd9a9178972ffb0454a8b557b06633658
---
 manifest       | 14 +++++++-------
 manifest.uuid  |  2 +-
 src/shell.c.in |  1 +
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/manifest b/manifest
index 53c96a5202..66b0442ca1 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\soo1.DB.selectArray()\sand\sselectObject().
-D 2022-10-30T11:39:47.998
+C Extra\sOOM\scheck\sin\sshell_error_context()\sof\sthe\sCLI.\n[forum:/forumpost/5708841db0|forum\spost\s5708841db0].
+D 2022-10-31T01:22:38.233
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -637,7 +637,7 @@ F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 8a709a8e19b32d2c411eaae1a10e2ee214cf740288859a9f9a362fcb2f50eaf1
-F src/shell.c.in 70e7c85074806cdb35c019a5cb5b16f989edb98d1b0e8ca441c2693cbb2e3dca
+F src/shell.c.in bde69ad6a9887396c87d089da84c0fe1e432957faebd9206b9185be735341104
 F src/sqlite.h.in d9c8a6243fc0a1c270d69db33758e34b810af3462f9bc5b4af113b347e07c69d
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 5336beea1868d99d2f62e628dbea55e97267dbff8193291ab175e960c5df9141
@@ -2054,8 +2054,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 bbce49d81abc491ca666474040a53057e26e99131fea9449de253f88f4415ded
-R db56e1c7d598fb49e6f4c473767fbbc1
-U stephan
-Z bb0672930fc07425c0c9d9cd4f958f03
+P 7660db2a2e9c4f3a6a9343d6929744ad0f4be6820976411f9080165491da59b7
+R 39f668d8fe2469c4ce02b92540fc594e
+U drh
+Z ccf68645ddf326b444fdf39a1dc53fe4
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 9f2d2e8315..3fa01659b9 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7660db2a2e9c4f3a6a9343d6929744ad0f4be6820976411f9080165491da59b7
\ No newline at end of file
+cb12ac5de17e677f089d7b0b46803efbd9a9178972ffb0454a8b557b06633658
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index cbac2a7302..94be71be26 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -2664,6 +2664,7 @@ static char *shell_error_context(const char *zSql, sqlite3 *db){
     while( (zSql[len]&0xc0)==0x80 ) len--;
   }
   zCode = sqlite3_mprintf("%.*s", len, zSql);
+  shell_check_oom(zCode);
   for(i=0; zCode[i]; i++){ if( IsSpace(zSql[i]) ) zCode[i] = ' '; }
   if( iOffset<25 ){
     zMsg = sqlite3_mprintf("\n  %z\n  %*s^--- error here", zCode, iOffset, "");

From 549907fd677909ae9bfba31d08e8edb1e347a777 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Mon, 31 Oct 2022 10:53:23 +0000
Subject: [PATCH 397/428] Avoid a segfault that could occur when running the
 recover API on a database handle with memory-mapping enabled.

FossilOrigin-Name: e02c697281a777c33070168af784b2d291397e488244a217620897f40aed7158
---
 ext/recover/recover1.test    |  9 +++++++++
 ext/recover/sqlite3recover.c | 18 +++++++++++++++++-
 manifest                     | 16 ++++++++--------
 manifest.uuid                |  2 +-
 4 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/ext/recover/recover1.test b/ext/recover/recover1.test
index 7c3b0a0eef..94bcd348a7 100644
--- a/ext/recover/recover1.test
+++ b/ext/recover/recover1.test
@@ -269,5 +269,14 @@ do_execsql_test 14.1 {
 }
 do_recover_test 14 
 
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 15.1 {
+  PRAGMA journal_mode=OFF;
+  PRAGMA mmap_size=10;
+  CREATE TABLE t1(x);
+} {off 10}
+do_recover_test 15 
+
 finish_test
 
diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index f18903f658..022d03f50b 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -2161,6 +2161,8 @@ static int recoverVfsShmMap(sqlite3_file*, int, int, int, void volatile**);
 static int recoverVfsShmLock(sqlite3_file*, int offset, int n, int flags);
 static void recoverVfsShmBarrier(sqlite3_file*);
 static int recoverVfsShmUnmap(sqlite3_file*, int deleteFlag);
+static int recoverVfsFetch(sqlite3_file*, sqlite3_int64, int, void**);
+static int recoverVfsUnfetch(sqlite3_file *pFd, sqlite3_int64 iOff, void *p);
 
 static sqlite3_io_methods recover_methods = {
   2, /* iVersion */
@@ -2180,7 +2182,8 @@ static sqlite3_io_methods recover_methods = {
   recoverVfsShmLock,
   recoverVfsShmBarrier,
   recoverVfsShmUnmap,
-  0, 0
+  recoverVfsFetch,
+  recoverVfsUnfetch
 };
 
 static int recoverVfsClose(sqlite3_file *pFd){
@@ -2486,6 +2489,19 @@ static int recoverVfsShmUnmap(sqlite3_file *pFd, int deleteFlag){
   );
 }
 
+static int recoverVfsFetch(
+  sqlite3_file *pFd, 
+  sqlite3_int64 iOff, 
+  int iAmt, 
+  void **pp
+){
+  *pp = 0;
+  return SQLITE_OK;
+}
+static int recoverVfsUnfetch(sqlite3_file *pFd, sqlite3_int64 iOff, void *p){
+  return SQLITE_OK;
+}
+
 /*
 ** Install the VFS wrapper around the file-descriptor open on the input
 ** database for recover handle p. Mutex RECOVER_MUTEX_ID must be held
diff --git a/manifest b/manifest
index 66b0442ca1..40e385cfd6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Extra\sOOM\scheck\sin\sshell_error_context()\sof\sthe\sCLI.\n[forum:/forumpost/5708841db0|forum\spost\s5708841db0].
-D 2022-10-31T01:22:38.233
+C Avoid\sa\ssegfault\sthat\scould\soccur\swhen\srunning\sthe\srecover\sAPI\son\sa\sdatabase\shandle\swith\smemory-mapping\senabled.
+D 2022-10-31T10:53:23.735
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -386,7 +386,7 @@ F ext/rbu/sqlite3rbu.c 8737cabdfbee84bb25a7851ecef8b1312be332761238da9be6ddb10c6
 F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9cd389812
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
 F ext/recover/dbdata.c 3ae32f9b7f02a141889b9075beb87895a826d0fcf3b702b8251cbb0dd3c91a83
-F ext/recover/recover1.test e08dc7a0513eab9de33e7b8e2260b9538bedb57c9bd6fbb278f328d29a102827
+F ext/recover/recover1.test 522e2c3353734dbef9118f08e47209470e50308ba35ce818fed00b8e265aee44
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
 F ext/recover/recoverclobber.test 294dcc894124ab4ca3a7b35766630742a3d25810fceac22220beb64f70a33a60
 F ext/recover/recovercorrupt.test 6540aae95e17398dd70b44518367fd56588c44962cb276d2623a0fedba9efe9e
@@ -398,7 +398,7 @@ F ext/recover/recoverpgsz.test 93e970eab05e4e89f8fd6b1bd23f9ec137ea09857e66ba0d4
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
 F ext/recover/recoverslowidx.test f356bb9fba7ffd6fc50e045e419464f0129ac6e24decf6e919584f79c3493727
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
-F ext/recover/sqlite3recover.c ec7b6cddae10476312ff22c0a59d97d550fefba3e85fce3750f722d3520350f5
+F ext/recover/sqlite3recover.c 0b9962b4fb4f9af408e9a1a535bb77a0a89d871040e429909225d09c2285bc6a
 F ext/recover/sqlite3recover.h f698ccc94bd4da38761035415ad08c4549a408491ff9fd5f52d34d2214f64e36
 F ext/recover/test_recover.c 61ec931e47abca6b2210f46239cafd9f3060741605e3d3c45a7c7a53f63dd957
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -2054,8 +2054,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 7660db2a2e9c4f3a6a9343d6929744ad0f4be6820976411f9080165491da59b7
-R 39f668d8fe2469c4ce02b92540fc594e
-U drh
-Z ccf68645ddf326b444fdf39a1dc53fe4
+P cb12ac5de17e677f089d7b0b46803efbd9a9178972ffb0454a8b557b06633658
+R 46019e96ebee7f43e27063daa1a45bd1
+U dan
+Z 31c01b86489219dc9c143f294c0c509f
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 3fa01659b9..37b316cefb 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cb12ac5de17e677f089d7b0b46803efbd9a9178972ffb0454a8b557b06633658
\ No newline at end of file
+e02c697281a777c33070168af784b2d291397e488244a217620897f40aed7158
\ No newline at end of file

From 1acfe915826060d0e8e253fd9154c746ac97c30a Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 31 Oct 2022 11:09:14 +0000
Subject: [PATCH 398/428] Add oo1.DB.exec() 'returnValue' option, which
 specifies what exec() should return. Defaults to the db object and enables
 direct return of the result rows array or a list of the individual SQL
 statements. Other code-adjacent internal cleanups.

FossilOrigin-Name: 69d36a6aa5e2cd79d26c0fd3e0d20fe8838fd1be97db07725233bfff1dfe6643
---
 ext/wasm/api/sqlite3-api-oo1.js      | 111 +++++++++++++++--------
 ext/wasm/api/sqlite3-api-prologue.js | 129 ++++++++++++++-------------
 ext/wasm/tester1.js                  | 128 ++++++++++++++++----------
 manifest                             |  18 ++--
 manifest.uuid                        |   2 +-
 5 files changed, 229 insertions(+), 159 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index b44dce690f..e318b72001 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -365,7 +365,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
      current Stmt and returns the callback argument of the type
      indicated by the input arguments.
   */
-  const parseExecArgs = function(args){
+  const parseExecArgs = function(db, args){
     const out = Object.create(null);
     out.opt = Object.create(null);
     switch(args.length){
@@ -385,20 +385,34 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
           break;
         default: toss3("Invalid argument count for exec().");
     };
-    if(util.isSQLableTypedArray(out.sql)){
-      out.sql = util.typedArrayToString(out.sql);
-    }else if(Array.isArray(out.sql)){
-      out.sql = out.sql.join('');
-    }else if('string'!==typeof out.sql){
+    out.sql = util.flexibleString(out.sql);
+    if('string'!==typeof out.sql){
       toss3("Missing SQL argument or unsupported SQL value type.");
     }
-    if(out.opt.callback || out.opt.resultRows){
-      switch((undefined===out.opt.rowMode)
-             ? 'array' : out.opt.rowMode) {
+    const opt = out.opt;
+    switch(opt.returnValue){
+        case 'resultRows':
+          if(!opt.resultRows) opt.resultRows = [];
+          out.returnVal = ()=>opt.resultRows;
+          break;
+        case 'saveSql':
+          if(!opt.saveSql) opt.saveSql = [];
+          out.returnVal = ()=>opt.saveSql;
+          break;
+        case undefined:
+        case 'this':
+          break;
+        default:
+          toss3("Invalid returnValue value:",opt.returnValue);
+    }
+    if(!out.returnVal) out.returnVal = ()=>db;
+    if(opt.callback || opt.resultRows){
+      switch((undefined===opt.rowMode)
+             ? 'array' : opt.rowMode) {
           case 'object': out.cbArg = (stmt)=>stmt.get(Object.create(null)); break;
           case 'array': out.cbArg = (stmt)=>stmt.get([]); break;
           case 'stmt':
-            if(Array.isArray(out.opt.resultRows)){
+            if(Array.isArray(opt.resultRows)){
               toss3("exec(): invalid rowMode for a resultRows array: must",
                     "be one of 'array', 'object',",
                     "a result column number, or column name reference.");
@@ -406,32 +420,32 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
             out.cbArg = (stmt)=>stmt;
             break;
           default:
-            if(util.isInt32(out.opt.rowMode)){
-              out.cbArg = (stmt)=>stmt.get(out.opt.rowMode);
+            if(util.isInt32(opt.rowMode)){
+              out.cbArg = (stmt)=>stmt.get(opt.rowMode);
               break;
-            }else if('string'===typeof out.opt.rowMode && out.opt.rowMode.length>1){
+            }else if('string'===typeof opt.rowMode && opt.rowMode.length>1){
               /* "$X", ":X", and "@X" fetch column named "X" (case-sensitive!) */
-              const prefix = out.opt.rowMode[0];
+              const prefix = opt.rowMode[0];
               if(':'===prefix || '@'===prefix || '$'===prefix){
                 out.cbArg = function(stmt){
                   const rc = stmt.get(this.obj)[this.colName];
                   return (undefined===rc) ? toss3("exec(): unknown result column:",this.colName) : rc;
                 }.bind({
                   obj:Object.create(null),
-                  colName: out.opt.rowMode.substr(1)
+                  colName: opt.rowMode.substr(1)
                 });
                 break;
               }
             }
-            toss3("Invalid rowMode:",out.opt.rowMode);
+            toss3("Invalid rowMode:",opt.rowMode);
       }
     }
     return out;
   };
 
   /**
-     Internal impl of the DB.selectRowArray() and
-     selectRowObject() methods.
+     Internal impl of the DB.selectArray() and
+     selectObject() methods.
   */
   const __selectFirstRow = (db, sql, bind, getArg)=>{
     let stmt, rc;
@@ -588,9 +602,10 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     /**
        Executes one or more SQL statements in the form of a single
        string. Its arguments must be either (sql,optionsObject) or
-       (optionsObject). In the latter case, optionsObject.sql
-       must contain the SQL to execute. Returns this
-       object. Throws on error.
+       (optionsObject). In the latter case, optionsObject.sql must
+       contain the SQL to execute. By default it returns this object
+       but that can be changed via the `returnValue` option as
+       described below. Throws on error.
 
        If no SQL is provided, or a non-string is provided, an
        exception is triggered. Empty SQL, on the other hand, is
@@ -599,21 +614,25 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        The optional options object may contain any of the following
        properties:
 
-       - `.sql` = the SQL to run (unless it's provided as the first
+       - `sql` = the SQL to run (unless it's provided as the first
        argument). This must be of type string, Uint8Array, or an array
        of strings. In the latter case they're concatenated together
        as-is, _with no separator_ between elements, before evaluation.
        The array form is often simpler for long hand-written queries.
 
-       - `.bind` = a single value valid as an argument for
+       - `bind` = a single value valid as an argument for
        Stmt.bind(). This is _only_ applied to the _first_ non-empty
        statement in the SQL which has any bindable parameters. (Empty
        statements are skipped entirely.)
 
-       - `.saveSql` = an optional array. If set, the SQL of each
+       - `saveSql` = an optional array. If set, the SQL of each
        executed statement is appended to this array before the
        statement is executed (but after it is prepared - we don't have
-       the string until after that). Empty SQL statements are elided.
+       the string until after that). Empty SQL statements are elided
+       but can have odd effects in the output. e.g. SQL of: `"select
+       1; -- empty\n; select 2"` will result in an array containing
+       `["select 1;", "--empty \n; select 2"]`. That's simply how
+       sqlite3 records the SQL for the 2nd statement.
 
        ==================================================================
        The following options apply _only_ to the _first_ statement
@@ -621,14 +640,14 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        the statement actually produces any result rows.
        ==================================================================
 
-       - `.columnNames`: if this is an array, the column names of the
+       - `columnNames`: if this is an array, the column names of the
        result set are stored in this array before the callback (if
        any) is triggered (regardless of whether the query produces any
        result rows). If no statement has result columns, this value is
        unchanged. Achtung: an SQL result may have multiple columns
        with identical names.
 
-       - `.callback` = a function which gets called for each row of
+       - `callback` = a function which gets called for each row of
        the result set, but only if that statement has any result
        _rows_. The callback's "this" is the options object, noting
        that this function synthesizes one if the caller does not pass
@@ -647,7 +666,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        The first argument passed to the callback defaults to an array of
        values from the current result row but may be changed with ...
 
-       - `.rowMode` = specifies the type of he callback's first argument.
+       - `rowMode` = specifies the type of he callback's first argument.
        It may be any of...
 
        A) A string describing what type of argument should be passed
@@ -655,7 +674,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
 
          A.1) `'array'` (the default) causes the results of
          `stmt.get([])` to be passed to the `callback` and/or appended
-         to `resultRows`.
+         to `resultRows`
 
          A.2) `'object'` causes the results of
          `stmt.get(Object.create(null))` to be passed to the
@@ -687,7 +706,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
 
        Any other `rowMode` value triggers an exception.
 
-       - `.resultRows`: if this is an array, it functions similarly to
+       - `resultRows`: if this is an array, it functions similarly to
        the `callback` option: each row of the result set (if any),
        with the exception that the `rowMode` 'stmt' is not legal. It
        is legal to use both `resultRows` and `callback`, but
@@ -695,28 +714,44 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
        and can be used over a WebWorker-style message interface.
        exec() throws if `resultRows` is set and `rowMode` is 'stmt'.
 
+       - `returnValue`: is a string specifying what this function
+       should return:
+
+         A) The default value is `"this"`, meaning that the
+            DB object itself should be returned.
+
+         B) `"resultRows"` means to return the value of the
+            `resultRows` option. If `resultRows` is not set, this
+            function behaves as if it were set to an empty array.
+
+         C) `"saveSql"` means to return the value of the
+            `saveSql` option. If `saveSql` is not set, this
+            function behaves as if it were set to an empty array.
 
        Potential TODOs:
 
-       - `.bind`: permit an array of arrays/objects to bind. The first
+       - `bind`: permit an array of arrays/objects to bind. The first
        sub-array would act on the first statement which has bindable
        parameters (as it does now). The 2nd would act on the next such
        statement, etc.
 
-       - `.callback` and `.resultRows`: permit an array entries with
-       semantics similar to those described for `.bind` above.
+       - `callback` and `resultRows`: permit an array entries with
+       semantics similar to those described for `bind` above.
 
     */
     exec: function(/*(sql [,obj]) || (obj)*/){
       affirmDbOpen(this);
-      const arg = parseExecArgs(arguments);
+      const arg = parseExecArgs(this, arguments);
       if(!arg.sql){
         return (''===arg.sql) ? this : toss3("exec() requires an SQL string.");
       }
       const opt = arg.opt;
       const callback = opt.callback;
-      let resultRows = (Array.isArray(opt.resultRows)
-                          ? opt.resultRows : undefined);
+      const returnValue = opt.returnValue || 'this';
+      const resultRows = (Array.isArray(opt.resultRows)
+                          ? opt.resultRows : (
+                            'resultRows'===returnValue ? [] : undefined
+                          ));
       let stmt;
       let bind = opt.bind;
       let evalFirstResult = !!(arg.cbArg || opt.columnNames) /* true to evaluate the first result-returning query */;
@@ -774,7 +809,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
               stmt._isLocked = true;
               const row = arg.cbArg(stmt);
               if(resultRows) resultRows.push(row);
-              if(callback) callback.apply(opt,[row,stmt]);
+              if(callback) callback.call(opt, row, stmt);
               stmt._isLocked = false;
             }
           }else{
@@ -793,7 +828,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
         }
         wasm.scopedAllocPop(stack);
       }
-      return this;
+      return arg.returnVal();
     }/*exec()*/,
     /**
        Creates a new scalar UDF (User-Defined Function) which is
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 6dae0b6060..a5ff0c40ad 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -162,12 +162,64 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     }
   });
 
-  /** Throws a new Error, the message of which is the concatenation
-      all args with a space between each. */
-  const toss = (...args)=>{throw new Error(args.join(' '))};
+  /**
+     An Error subclass specifically for reporting DB-level errors and
+     enabling clients to unambiguously identify such exceptions.
+     The C-level APIs never throw, but some of the higher-level
+     C-style APIs do and the object-oriented APIs use exceptions
+     exclusively to report errors.
+  */
+  class SQLite3Error extends Error {
+    /**
+       Constructs this object with a message equal to all arguments
+       concatenated with a space between each one. As a special case,
+       if it's passed only a single integer argument, the string form
+       of that argument is the result of
+       sqlite3.capi.sqlite3_js_rc_str() or (if that returns falsy), a
+       synthesized string which contains that integer.
+    */
+    constructor(...args){
+      if(1===args.length && 'number'===typeof args[0] && args[0]===(args[0] | 0)){
+        super((capi.sqlite3_js_rc_str && capi.sqlite3_js_rc_str(args[0]))
+              || ("Unknown result code #"+args[0]));
+      }else{
+        super(args.join(' '));
+      }
+      this.name = 'SQLite3Error';
+    }
+  };
+
+  /** 
+      The main sqlite3 binding API gets installed into this object,
+      mimicking the C API as closely as we can. The numerous members
+      names with prefixes 'sqlite3_' and 'SQLITE_' behave, insofar as
+      possible, identically to the C-native counterparts, as documented at:
+
+      https://www.sqlite.org/c3ref/intro.html
+
+      A very few exceptions require an additional level of proxy
+      function or may otherwise require special attention in the WASM
+      environment, and all such cases are document here. Those not
+      documented otherwise are installed as 1-to-1 proxies for their
+      C-side counterparts.
+  */
+  const capi = Object.create(null);
+
+  /**
+     Functionally equivalent to the SQLite3Error constructor but may
+     be used as part of an expression, e.g.:
+
+     ```
+     return someFunction(x) || SQLite3Error.toss(...);
+     ```
+  */
+  SQLite3Error.toss = (...args)=>{
+    throw new SQLite3Error(...args);
+  };
+  const toss3 = SQLite3Error.toss;
 
   if(config.wasmfsOpfsDir && !/^\/[^/]+$/.test(config.wasmfsOpfsDir)){
-    toss("config.wasmfsOpfsDir must be falsy or in the form '/dir-name'.");
+    toss3("config.wasmfsOpfsDir must be falsy or in the form '/dir-name'.");
   }
 
   /**
@@ -267,7 +319,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
       that v is not a supported TypedArray value. */
   const affirmBindableTypedArray = (v)=>{
     return isBindableTypedArray(v)
-      || toss("Value is not of a supported TypedArray type.");
+      || toss3("Value is not of a supported TypedArray type.");
   };
 
   const utf8Decoder = new TextDecoder('utf-8');
@@ -318,21 +370,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     throw new WasmAllocError(...args);
   };
 
-  /** 
-      The main sqlite3 binding API gets installed into this object,
-      mimicking the C API as closely as we can. The numerous members
-      names with prefixes 'sqlite3_' and 'SQLITE_' behave, insofar as
-      possible, identically to the C-native counterparts, as documented at:
-
-      https://www.sqlite.org/c3ref/intro.html
-
-      A very few exceptions require an additional level of proxy
-      function or may otherwise require special attention in the WASM
-      environment, and all such cases are document here. Those not
-      documented here are installed as 1-to-1 proxies for their C-side
-      counterparts.
-  */
-  const capi = {
+  Object.assign(capi, {
     /**
        sqlite3_create_function_v2() differs from its native
        counterpart only in the following ways:
@@ -557,7 +595,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
        values.
      */
     sqlite3_randomness: (n, outPtr)=>{/*installed later*/},
-  }/*capi*/;
+  }/*capi*/);
 
   /**
      Various internal-use utilities are added here as needed. They
@@ -617,7 +655,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
        The symbols exported by the WASM environment.
     */
     exports: config.exports
-      || toss("Missing API config.exports (WASM module exports)."),
+      || toss3("Missing API config.exports (WASM module exports)."),
 
     /**
        When Emscripten compiles with `-sIMPORT_MEMORY`, it
@@ -626,7 +664,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
        available via this.exports.memory.
     */
     memory: config.memory || config.exports['memory']
-      || toss("API config object requires a WebAssembly.Memory object",
+      || toss3("API config object requires a WebAssembly.Memory object",
               "in either config.exports.memory (exported)",
               "or config.memory (imported)."),
 
@@ -688,7 +726,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
         keyDealloc =  config.deallocExportName || 'free';
   for(const key of [keyAlloc, keyDealloc]){
     const f = wasm.exports[key];
-    if(!(f instanceof Function)) toss("Missing required exports[",key,"] function.");
+    if(!(f instanceof Function)) toss3("Missing required exports[",key,"] function.");
   }
 
   wasm.alloc = function(n){
@@ -1057,43 +1095,6 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     }
   })/*wasm.pstack properties*/;
 
-  /**
-     An Error subclass specifically for reporting DB-level errors and
-     enabling clients to unambiguously identify such exceptions.
-     The C-level APIs never throw, but some of the higher-level
-     C-style APIs do and the object-oriented APIs use exceptions
-     exclusively to report errors.
-  */
-  class SQLite3Error extends Error {
-    /**
-       Constructs this object with a message equal to all arguments
-       concatenated with a space between each one. As a special case,
-       if it's passed only a single integer argument, the string form
-       of that argument is the result of
-       sqlite3.capi.sqlite3_js_rc_str() or (if that returns falsy), a
-       synthesized string which contains that integer.
-    */
-    constructor(...args){
-      if(1===args.length && 'number'===typeof args[0] && args[0]===(args[0] | 0)){
-        super(capi.sqlite3_js_rc_str(args[0]) || ("Unknown result code #"+args[0]));
-      }else{
-        super(args.join(' '));
-      }
-      this.name = 'SQLite3Error';
-    }
-  };
-  /**
-     Functionally equivalent to the SQLite3Error constructor but may
-     be used as part of an expression, e.g.:
-
-     ```
-     return someFunction(x) || SQLite3Error.toss(...);
-     ```
-  */
-  SQLite3Error.toss = (...args)=>{
-    throw new SQLite3Error(...args);
-  };
-
   capi.sqlite3_randomness = (...args)=>{
     if(1===args.length && util.isTypedArray(args[0])
       && 1===args[0].BYTES_PER_ELEMENT){
@@ -1245,8 +1246,8 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
      error it throws with a description of the problem.
   */
   capi.sqlite3_js_db_export = function(pDb){
-    if(!pDb) toss('Invalid sqlite3* argument.');
-    if(!wasm.bigIntEnabled) toss('BigInt64 support is not enabled.');
+    if(!pDb) toss3('Invalid sqlite3* argument.');
+    if(!wasm.bigIntEnabled) toss3('BigInt64 support is not enabled.');
     const stack = wasm.pstack.pointer;
     let pOut;
     try{
@@ -1263,7 +1264,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
         pDb, ppOut, pSize, 0
       );
       if(rc){
-        toss("Database serialization failed with code",
+        toss3("Database serialization failed with code",
              sqlite3.capi.sqlite3_js_rc_str(rc));
       }
       pOut = wasm.getPtrValue(ppOut);
diff --git a/ext/wasm/tester1.js b/ext/wasm/tester1.js
index 3c6136b907..016886a30a 100644
--- a/ext/wasm/tester1.js
+++ b/ext/wasm/tester1.js
@@ -1220,8 +1220,9 @@
     .t('Table t', function(sqlite3){
       const db = this.db;
       let list = [];
-      db.exec({
+      let rc = db.exec({
         sql:['CREATE TABLE t(a,b);',
+             // ^^^ using TEMP TABLE breaks the db export test
              "INSERT INTO t(a,b) VALUES(1,2),(3,4),",
              "(?,?),('blob',X'6869')"/*intentionally missing semicolon to test for
                                        off-by-one bug in string-to-WASM conversion*/],
@@ -1229,7 +1230,8 @@
         bind: [5,6]
       });
       //debug("Exec'd SQL:", list);
-      T.assert(2 === list.length)
+      T.assert(rc === db)
+        .assert(2 === list.length)
         .assert('string'===typeof list[1])
         .assert(4===db.changes());
       if(wasm.bigIntEnabled){
@@ -1502,30 +1504,61 @@
           xValue: xValueFinal
         });
         db.exec([
-          "CREATE TABLE twin(x, y); INSERT INTO twin VALUES",
+          "CREATE TEMP TABLE twin(x, y); INSERT INTO twin VALUES",
           "('a', 4),('b', 5),('c', 3),('d', 8),('e', 1)"
         ]);
-        let count = 0;
-        db.exec({
+        let rc = db.exec({
+          returnValue: 'resultRows',
           sql:[
             "SELECT x, winsumint(y) OVER (",
             "ORDER BY x ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING",
             ") AS sum_y ",
-            "FROM twin ORDER BY x;",
-            "DROP TABLE twin;"
-          ],
-          callback: function(row){
-            switch(++count){
-                case 1: T.assert('a'===row[0] && 9===row[1]); break;
-                case 2: T.assert('b'===row[0] && 12===row[1]); break;
-                case 3: T.assert('c'===row[0] && 16===row[1]); break;
-                case 4: T.assert('d'===row[0] && 12===row[1]); break;
-                case 5: T.assert('e'===row[0] && 9===row[1]); break;
-                default: toss("Too many rows to window function.");
-            }
-          }
+            "FROM twin ORDER BY x;"
+          ]
         });
-        T.assert(5 === count);
+        T.assert(Array.isArray(rc))
+          .assert(5 === rc.length);
+        let count = 0;
+        for(const row of rc){
+          switch(++count){
+              case 1: T.assert('a'===row[0] && 9===row[1]); break;
+              case 2: T.assert('b'===row[0] && 12===row[1]); break;
+              case 3: T.assert('c'===row[0] && 16===row[1]); break;
+              case 4: T.assert('d'===row[0] && 12===row[1]); break;
+              case 5: T.assert('e'===row[0] && 9===row[1]); break;
+              default: toss("Too many rows to window function.");
+          }
+        }
+        const resultRows = [];
+        rc = db.exec({
+          resultRows,
+          returnValue: 'resultRows',
+          sql:[
+            "SELECT x, winsumint(y) OVER (",
+            "ORDER BY x ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING",
+            ") AS sum_y ",
+            "FROM twin ORDER BY x;"
+          ]
+        });
+        T.assert(rc === resultRows)
+          .assert(5 === rc.length);
+
+        rc = db.exec({
+          returnValue: 'saveSql',
+          sql: "select 1; select 2; -- empty\n; select 3"
+        });
+        T.assert(Array.isArray(rc))
+          .assert(3===rc.length)
+          .assert('select 1;' === rc[0])
+          .assert('select 2;' === rc[1])
+          .assert('-- empty\n; select 3' === rc[2]
+                  /* Strange but true. */);
+        
+        T.mustThrowMatching(()=>{
+          db.exec({sql:'', returnValue: 'nope'});
+        }, /^Invalid returnValue/);
+
+        db.exec("DROP TABLE twin");
       }
     }/*window UDFs*/)
 
@@ -1536,7 +1569,7 @@
       db.exec({
         sql:new TextEncoder('utf-8').encode([
           // ^^^ testing string-vs-typedarray handling in exec()
-          "attach 'session' as foo;" /* name 'session' is magic for kvvfs! */,
+          "attach 'session' as foo;",
           "create table foo.bar(a);",
           "insert into foo.bar(a) values(1),(2),(3);",
           "select a from foo.bar order by a;"
@@ -1665,27 +1698,24 @@
   ;/* end of oo1 checks */
 
   ////////////////////////////////////////////////////////////////////////
-  T.g('kvvfs (Worker thread only)', isWorker)
-    .t({
-      name: 'kvvfs is disabled',
-      test: ()=>{
+  T.g('kvvfs')
+    .t('kvvfs sanity checks', function(sqlite3){
+      if(isWorker()){
         T.assert(
           !capi.sqlite3_vfs_find('kvvfs'),
           "Expecting kvvfs to be unregistered."
         );
+        log("kvvfs is (correctly) unavailable in a Worker.");
+        return;
       }
-    });
-  T.g('kvvfs (UI thread only)', isUIThread)
-    .t({
-      name: 'kvvfs sanity checks',
-      test: function(sqlite3){
-        const filename = 'session';
-        const pVfs = capi.sqlite3_vfs_find('kvvfs');
-        T.assert(pVfs);
-        const JDb = sqlite3.oo1.JsStorageDb;
-        const unlink = ()=>JDb.clearStorage(filename);
-        unlink();
-        let db = new JDb(filename);
+      const filename = 'session';
+      const pVfs = capi.sqlite3_vfs_find('kvvfs');
+      T.assert(pVfs);
+      const JDb = sqlite3.oo1.JsStorageDb;
+      const unlink = ()=>JDb.clearStorage(filename);
+      unlink();
+      let db = new JDb(filename);
+      try {
         db.exec([
           'create table kvvfs(a);',
           'insert into kvvfs(a) values(1),(2),(3)'
@@ -1695,6 +1725,7 @@
         db = new JDb(filename);
         db.exec('insert into kvvfs(a) values(4),(5),(6)');
         T.assert(6 === db.selectValue('select count(*) from kvvfs'));
+      }finally{
         db.close();
         unlink();
       }
@@ -1713,17 +1744,20 @@
         const unlink = (fn=filename)=>wasm.sqlite3_wasm_vfs_unlink(pVfs,fn);
         unlink();
         let db = new sqlite3.opfs.OpfsDb(filename);
-        db.exec([
-          'create table p(a);',
-          'insert into p(a) values(1),(2),(3)'
-        ]);
-        T.assert(3 === db.selectValue('select count(*) from p'));
-        db.close();
-        db = new sqlite3.opfs.OpfsDb(filename);
-        db.exec('insert into p(a) values(4),(5),(6)');
-        T.assert(6 === db.selectValue('select count(*) from p'));
-        db.close();
-        unlink();
+        try {
+          db.exec([
+            'create table p(a);',
+            'insert into p(a) values(1),(2),(3)'
+          ]);
+          T.assert(3 === db.selectValue('select count(*) from p'));
+          db.close();
+          db = new sqlite3.opfs.OpfsDb(filename);
+          db.exec('insert into p(a) values(4),(5),(6)');
+          T.assert(6 === db.selectValue('select count(*) from p'));
+        }finally{
+          db.close();
+          unlink();
+        }
       }
     }/*OPFS sanity checks*/)
   ;/* end OPFS tests */
diff --git a/manifest b/manifest
index 40e385cfd6..24403f2ca2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\sa\ssegfault\sthat\scould\soccur\swhen\srunning\sthe\srecover\sAPI\son\sa\sdatabase\shandle\swith\smemory-mapping\senabled.
-D 2022-10-31T10:53:23.735
+C Add\soo1.DB.exec()\s'returnValue'\soption,\swhich\sspecifies\swhat\sexec()\sshould\sreturn.\sDefaults\sto\sthe\sdb\sobject\sand\senables\sdirect\sreturn\sof\sthe\sresult\srows\sarray\sor\sa\slist\sof\sthe\sindividual\sSQL\sstatements.\sOther\scode-adjacent\sinternal\scleanups.
+D 2022-10-31T11:09:14.111
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -500,9 +500,9 @@ F ext/wasm/api/post-js-header.js d6ab3dfef4a06960d28a7eaa338d4e2a1a5981e9b387181
 F ext/wasm/api/pre-js.js 287e462f969342b032c03900e668099fa1471d852df7a472de5bc349161d9c04
 F ext/wasm/api/sqlite3-api-cleanup.js ecdc69dbfccfe26146f04799fcfd4a6f5790d46e7e3b9b6e9b0491f92ed8ae34
 F ext/wasm/api/sqlite3-api-glue.js b87543534821ecfa56fc0d0cd153a115fa974e70d6217964baf6e93ef8d25fb1
-F ext/wasm/api/sqlite3-api-oo1.js a17e2624967073f86cc50f4c1e30f8822ef631dc20dfc73b1143847b9e9723fe
+F ext/wasm/api/sqlite3-api-oo1.js 4028bc2bac7e3ae2d23b7c99828155b4a06da006b51dc2a929bc0db26337370d
 F ext/wasm/api/sqlite3-api-opfs.js c67cbe0b1451ec43bc6b3199e13453e1ca56d718a75c0498253b0d479c336256
-F ext/wasm/api/sqlite3-api-prologue.js a218dda5e5ced8894f65760131371e4cabd31062af58803af8952cc00ea778d2
+F ext/wasm/api/sqlite3-api-prologue.js 873986ca150c79510f647b910f8349bc71b14db21e444cab3b9fad9c4f39ffc7
 F ext/wasm/api/sqlite3-api-worker1.js efdca1b42299d80b54f366d15a8fc5343f3b3e9e3647e5c1fd6f3ee1015e501b
 F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
 F ext/wasm/api/sqlite3-opfs-async-proxy.js 29f6f5c314c2956e77573c6ab975c2455a0839721ed44f38004382c2a1463ab5
@@ -549,7 +549,7 @@ F ext/wasm/test-opfs-vfs.html 1f2d672f3f3fce810dfd48a8d56914aba22e45c6834e262555
 F ext/wasm/test-opfs-vfs.js 48fc59110e8775bb43c9be25b6d634fc07ebadab7da8fbd44889e8129c6e2548
 F ext/wasm/tester1-worker.html d02b9d38876b023854cf8955e77a40912f7e516956b4dbe1ec7f215faac273ee
 F ext/wasm/tester1.html c6c47e5a8071eb09cb1301104435c8e44fbb5719c92411f5b2384a461f9793c5
-F ext/wasm/tester1.js 08ccc16972562ff604b7bda387b56d6eea380aaf968697fc8e2a9bb3c6ba2dda
+F ext/wasm/tester1.js 2427ac48e255f658ad81163b5dc6372a8609ab6ab60e295e371d1e5fe9a495ab
 F ext/wasm/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd72273503ae7d5
 F ext/wasm/wasmfs.make fb2d3c4a298b12cf1ec994ad1d0f1d027ae297449b364cde43d2eb807d68048f
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
@@ -2054,8 +2054,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 cb12ac5de17e677f089d7b0b46803efbd9a9178972ffb0454a8b557b06633658
-R 46019e96ebee7f43e27063daa1a45bd1
-U dan
-Z 31c01b86489219dc9c143f294c0c509f
+P e02c697281a777c33070168af784b2d291397e488244a217620897f40aed7158
+R 26339704ab975fcc1e6818338a87c2a1
+U stephan
+Z 2aa3561d4216c084633673f53cc5adc1
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 37b316cefb..52bd63380e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e02c697281a777c33070168af784b2d291397e488244a217620897f40aed7158
\ No newline at end of file
+69d36a6aa5e2cd79d26c0fd3e0d20fe8838fd1be97db07725233bfff1dfe6643
\ No newline at end of file

From 43b442a6267bf28270a399c10334216969b7227f Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 31 Oct 2022 11:53:34 +0000
Subject: [PATCH 399/428] Internal tweaks to the OPFS VFS result codes.

FossilOrigin-Name: 32e1a2d2eb8738ae1635e413829f6cf7f64c63d2a86b72940a573de89948e529
---
 ext/wasm/api/sqlite3-api-opfs.js         | 30 +++++++++------
 ext/wasm/api/sqlite3-opfs-async-proxy.js | 49 +++++++++++++++++-------
 manifest                                 | 14 +++----
 manifest.uuid                            |  2 +-
 4 files changed, 62 insertions(+), 33 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index a4516513cb..1a89432c5f 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -316,19 +316,27 @@ const installOpfsVfs = function callee(options){
     */
     state.sq3Codes = Object.create(null);
     [
-      'SQLITE_ERROR', 'SQLITE_IOERR',
-      'SQLITE_NOTFOUND', 'SQLITE_MISUSE',
-      'SQLITE_IOERR_READ', 'SQLITE_IOERR_SHORT_READ',
-      'SQLITE_IOERR_WRITE', 'SQLITE_IOERR_FSYNC',
-      'SQLITE_IOERR_TRUNCATE', 'SQLITE_IOERR_DELETE',
-      'SQLITE_IOERR_ACCESS', 'SQLITE_IOERR_CLOSE',
+      'SQLITE_ERROR',
+      'SQLITE_IOERR',
+      'SQLITE_IOERR_ACCESS',
+      'SQLITE_IOERR_CLOSE',
       'SQLITE_IOERR_DELETE',
-      'SQLITE_LOCK_NONE',
-      'SQLITE_LOCK_SHARED',
-      'SQLITE_LOCK_RESERVED',
-      'SQLITE_LOCK_PENDING',
+      'SQLITE_IOERR_FSYNC',
+      'SQLITE_IOERR_LOCK',
+      'SQLITE_IOERR_READ',
+      'SQLITE_IOERR_SHORT_READ',
+      'SQLITE_IOERR_TRUNCATE',
+      'SQLITE_IOERR_UNLOCK',
+      'SQLITE_IOERR_WRITE',
       'SQLITE_LOCK_EXCLUSIVE',
-      'SQLITE_OPEN_CREATE', 'SQLITE_OPEN_DELETEONCLOSE',
+      'SQLITE_LOCK_NONE',
+      'SQLITE_LOCK_PENDING',
+      'SQLITE_LOCK_RESERVED',
+      'SQLITE_LOCK_SHARED',
+      'SQLITE_MISUSE',
+      'SQLITE_NOTFOUND',
+      'SQLITE_OPEN_CREATE',
+      'SQLITE_OPEN_DELETEONCLOSE',
       'SQLITE_OPEN_READONLY'
     ].forEach((k)=>{
       if(undefined === (state.sq3Codes[k] = capi[k])){
diff --git a/ext/wasm/api/sqlite3-opfs-async-proxy.js b/ext/wasm/api/sqlite3-opfs-async-proxy.js
index d32390f07d..71c822c1f2 100644
--- a/ext/wasm/api/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/api/sqlite3-opfs-async-proxy.js
@@ -135,6 +135,25 @@ const getDirForFilename = async function f(absFilename, createDirs = false){
   return [dh, filename];
 };
 
+/**
+   An error class specifically for use with getSyncHandle(), the goal
+   of which is to eventually be able to distinguish unambiguously
+   between locking-related failures and other types, noting that we
+   cannot currently do so because createSyncAccessHandle() does not
+   define its exceptions in the required level of detail.
+*/
+class GetSyncHandleError extends Error {
+  constructor(errorObject, ...msg){
+    super();
+    this.error = errorObject;
+    this.message = [
+      ...msg, ': Original exception ['+errorObject.name+']:',
+      errorObject.message
+    ].join(' ');
+    this.name = 'GetSyncHandleError';
+  }
+};
+
 /**
    Returns the sync access handle associated with the given file
    handle object (which must be a valid handle object, as created by
@@ -154,16 +173,17 @@ const getSyncHandle = async (fh)=>{
     let i = 1, ms = msBase;
     for(; true; ms = msBase * ++i){
       try {
-        //if(i<3) toss("Just testing.");
+        //if(i<3) toss("Just testing getSyncHandle() wait-and-retry.");
         //TODO? A config option which tells it to throw here
         //randomly every now and then, for testing purposes.
         fh.syncHandle = await fh.fileHandle.createSyncAccessHandle();
         break;
       }catch(e){
         if(i === maxTries){
-          toss("Error getting sync handle.",maxTries,
-               "attempts failed. ",fh.filenameAbs, ":", e.message);
-          throw e;
+          throw new GetSyncHandleError(
+            e, "Error getting sync handle.",maxTries,
+            "attempts failed.",fh.filenameAbs
+          );
         }
         warn("Error getting sync handle. Waiting",ms,
               "ms and trying again.",fh.filenameAbs,e);
@@ -199,7 +219,7 @@ const closeSyncHandle = async (fh)=>{
    Atomics.notify()'s it.
 */
 const storeAndNotify = (opName, value)=>{
-  log(opName+"() => notify(",state.opIds.rc,",",value,")");
+  log(opName+"() => notify(",value,")");
   Atomics.store(state.sabOPView, state.opIds.rc, value);
   Atomics.notify(state.sabOPView, state.opIds.rc);
 };
@@ -371,18 +391,18 @@ const vfsAsyncImpls = {
   xFileSize: async function(fid/*sqlite3_file pointer*/){
     mTimeStart('xFileSize');
     const fh = __openFiles[fid];
-    let sz;
+    let rc;
     wTimeStart('xFileSize');
     try{
-      sz = await (await getSyncHandle(fh)).getSize();
-      state.s11n.serialize(Number(sz));
-      sz = 0;
+      rc = await (await getSyncHandle(fh)).getSize();
+      state.s11n.serialize(Number(rc));
+      rc = 0;
     }catch(e){
       state.s11n.storeException(2,e);
-      sz = state.sq3Codes.SQLITE_IOERR;
+      rc = state.sq3Codes.SQLITE_IOERR;
     }
     wTimeEnd();
-    storeAndNotify('xFileSize', sz);
+    storeAndNotify('xFileSize', rc);
     mTimeEnd();
   },
   xLock: async function(fid/*sqlite3_file pointer*/,
@@ -395,7 +415,7 @@ const vfsAsyncImpls = {
       try { await getSyncHandle(fh) }
       catch(e){
         state.s11n.storeException(1,e);
-        rc = state.sq3Codes.SQLITE_IOERR;
+        rc = state.sq3Codes.SQLITE_IOERR_LOCK;
       }
       wTimeEnd();
     }
@@ -480,6 +500,7 @@ const vfsAsyncImpls = {
         await fh.syncHandle.flush();
       }catch(e){
         state.s11n.storeException(2,e);
+        rc = state.sq3Codes.SQLITE_IOERR_FSYNC;
       }
       wTimeEnd();
     }
@@ -514,7 +535,7 @@ const vfsAsyncImpls = {
       try { await closeSyncHandle(fh) }
       catch(e){
         state.s11n.storeException(1,e);
-        rc = state.sq3Codes.SQLITE_IOERR;
+        rc = state.sq3Codes.SQLITE_IOERR_UNLOCK;
       }
       wTimeEnd();
     }
@@ -641,7 +662,7 @@ const initS11n = ()=>{
   state.s11n.storeException = state.asyncS11nExceptions
     ? ((priority,e)=>{
       if(priority<=state.asyncS11nExceptions){
-        state.s11n.serialize(e.message);
+        state.s11n.serialize([e.name,': ',e.message].join(''));
       }
     })
     : ()=>{};
diff --git a/manifest b/manifest
index 24403f2ca2..022d02a5b3 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\soo1.DB.exec()\s'returnValue'\soption,\swhich\sspecifies\swhat\sexec()\sshould\sreturn.\sDefaults\sto\sthe\sdb\sobject\sand\senables\sdirect\sreturn\sof\sthe\sresult\srows\sarray\sor\sa\slist\sof\sthe\sindividual\sSQL\sstatements.\sOther\scode-adjacent\sinternal\scleanups.
-D 2022-10-31T11:09:14.111
+C Internal\stweaks\sto\sthe\sOPFS\sVFS\sresult\scodes.
+D 2022-10-31T11:53:34.287
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -501,11 +501,11 @@ F ext/wasm/api/pre-js.js 287e462f969342b032c03900e668099fa1471d852df7a472de5bc34
 F ext/wasm/api/sqlite3-api-cleanup.js ecdc69dbfccfe26146f04799fcfd4a6f5790d46e7e3b9b6e9b0491f92ed8ae34
 F ext/wasm/api/sqlite3-api-glue.js b87543534821ecfa56fc0d0cd153a115fa974e70d6217964baf6e93ef8d25fb1
 F ext/wasm/api/sqlite3-api-oo1.js 4028bc2bac7e3ae2d23b7c99828155b4a06da006b51dc2a929bc0db26337370d
-F ext/wasm/api/sqlite3-api-opfs.js c67cbe0b1451ec43bc6b3199e13453e1ca56d718a75c0498253b0d479c336256
+F ext/wasm/api/sqlite3-api-opfs.js 6880cc79a4d1b6075942298d9d1ab07e24d81fbd9e5fe6b7c797b86e4b2af596
 F ext/wasm/api/sqlite3-api-prologue.js 873986ca150c79510f647b910f8349bc71b14db21e444cab3b9fad9c4f39ffc7
 F ext/wasm/api/sqlite3-api-worker1.js efdca1b42299d80b54f366d15a8fc5343f3b3e9e3647e5c1fd6f3ee1015e501b
 F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
-F ext/wasm/api/sqlite3-opfs-async-proxy.js 29f6f5c314c2956e77573c6ab975c2455a0839721ed44f38004382c2a1463ab5
+F ext/wasm/api/sqlite3-opfs-async-proxy.js b2264efef84c4a0af5dab426d7573d8b4ee5af3a25ba108b709a835a613c5e36
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 14ac9c03f6585332f882703f3427f11ffe8ffe8b6c0e252be2c518f7aac6ab6a
 F ext/wasm/api/sqlite3-worker1-promiser.js 0c7a9826dbf82a5ed4e4f7bf7816e825a52aff253afbf3350431f5773faf0e4b
@@ -2054,8 +2054,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 e02c697281a777c33070168af784b2d291397e488244a217620897f40aed7158
-R 26339704ab975fcc1e6818338a87c2a1
+P 69d36a6aa5e2cd79d26c0fd3e0d20fe8838fd1be97db07725233bfff1dfe6643
+R a5a69989c955a2bef03fc5f6b9426b6e
 U stephan
-Z 2aa3561d4216c084633673f53cc5adc1
+Z 2e8ea5a9464277cec17ca6c43e6fd2fa
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 52bd63380e..2c99a664e4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-69d36a6aa5e2cd79d26c0fd3e0d20fe8838fd1be97db07725233bfff1dfe6643
\ No newline at end of file
+32e1a2d2eb8738ae1635e413829f6cf7f64c63d2a86b72940a573de89948e529
\ No newline at end of file

From 02d15a7ebd73a26e7d2b87f2a6c978170778ffcc Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 31 Oct 2022 13:50:05 +0000
Subject: [PATCH 400/428] Worker1: use a list, rather than a single slot, to
 manage the default db link so that we can keep the least-recently-opened db
 as the default. Re-introduce worker1.export() but do not yet expose it until
 an equivalent import() (or open() option) is implemented.

FossilOrigin-Name: c7750c101d9b7baa31496731bc34ea0a9b2bad0c11e2b3e92a8c7b327135c1bb
---
 ext/wasm/api/sqlite3-api-glue.js    | 10 ++++-
 ext/wasm/api/sqlite3-api-worker1.js | 59 ++++++++++++++---------------
 manifest                            | 14 +++----
 manifest.uuid                       |  2 +-
 4 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index 63425e538c..1477af7598 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -634,7 +634,13 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
       const kvvfsStorage = (zClass)=>
             ((115/*=='s'*/===wasm.getMemValue(zClass))
              ? sessionStorage : localStorage);
-      
+
+      /**
+         Implementations for members of the object referred to by
+         sqlite3_wasm_kvvfs_methods(). We swap out the native
+         implementations with these, which use localStorage or
+         sessionStorage for their backing store.
+      */
       const kvvfsImpls = {
         xRead: (zClass, zKey, zBuf, nBuf)=>{
           const stack = pstack.pointer,
@@ -696,7 +702,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
           }
         }
       }/*kvvfsImpls*/;
-      for(let k of Object.keys(kvvfsImpls)){
+      for(const k of Object.keys(kvvfsImpls)){
         kvvfsMethods[kvvfsMethods.memberKey(k)] =
           wasm.installFunction(
             kvvfsMethods.memberSignature(k),
diff --git a/ext/wasm/api/sqlite3-api-worker1.js b/ext/wasm/api/sqlite3-api-worker1.js
index 1e8048159e..aa438a52dc 100644
--- a/ext/wasm/api/sqlite3-api-worker1.js
+++ b/ext/wasm/api/sqlite3-api-worker1.js
@@ -204,9 +204,10 @@
       dbId: an opaque ID value which must be passed in the message
       envelope to other calls in this API to tell them which db to
       use. If it is not provided to future calls, they will default to
-      operating on the first-opened db. This property is, for API
-      consistency's sake, also part of the containing message envelope.
-      Only the `open` operation includes it in the `result` property.
+      operating on the least-recently-opened db. This property is, for
+      API consistency's sake, also part of the containing message
+      envelope.  Only the `open` operation includes it in the `result`
+      property.
 
       persistent: true if the given filename resides in the
       known-persistent storage, else false.
@@ -348,9 +349,12 @@ sqlite3.initWorker1API = function(){
      Internal helper for managing Worker-level state.
   */
   const wState = {
-    /** First-opened db is the default for future operations when no
-        dbId is provided by the client. */
-    defaultDb: undefined,
+    /**
+       Each opened DB is added to this.dbList, and the first entry in
+       that list is the default db. As each db is closed, its entry is
+       removed from the list.
+    */
+    dbList: [],
     /** Sequence number of dbId generation. */
     idSeq: 0,
     /** Map of DB instances to dbId. */
@@ -360,7 +364,7 @@ sqlite3.initWorker1API = function(){
     open: function(opt){
       const db = new DB(opt.filename);
       this.dbs[getDbId(db)] = db;
-      if(!this.defaultDb) this.defaultDb = db;
+      if(this.dbList.indexOf(db)<0) this.dbList.push(db);
       return db;
     },
     close: function(db,alsoUnlink){
@@ -369,7 +373,8 @@ sqlite3.initWorker1API = function(){
         const filename = db.filename;
         const pVfs = sqlite3.wasm.sqlite3_wasm_db_vfs(db.pointer, 0);
         db.close();
-        if(db===this.defaultDb) this.defaultDb = undefined;
+        const ddNdx = this.dbList.indexOf(db);
+        if(ddNdx>=0) this.dbList.splice(ddNdx, 1);
         if(alsoUnlink && filename && pVfs){
           sqlite3.wasm.sqlite3_wasm_vfs_unlink(pVfs, filename);
         }
@@ -399,24 +404,25 @@ sqlite3.initWorker1API = function(){
     }
   };
 
-  /** Throws if the given db is falsy or not opened. */
-  const affirmDbOpen = function(db = wState.defaultDb){
+  /** Throws if the given db is falsy or not opened, else returns its
+      argument. */
+  const affirmDbOpen = function(db = wState.dbList[0]){
     return (db && db.pointer) ? db : toss("DB is not opened.");
   };
 
   /** Extract dbId from the given message payload. */
   const getMsgDb = function(msgData,affirmExists=true){
-    const db = wState.getDb(msgData.dbId,false) || wState.defaultDb;
+    const db = wState.getDb(msgData.dbId,false) || wState.dbList[0];
     return affirmExists ? affirmDbOpen(db) : db;
   };
 
   const getDefaultDbId = function(){
-    return wState.defaultDb && getDbId(wState.defaultDb);
+    return wState.dbList[0] && getDbId(wState.dbList[0]);
   };
 
   /**
-     A level of "organizational abstraction" for the Worker
-     API. Each method in this object must map directly to a Worker
+     A level of "organizational abstraction" for the Worker1
+     API. Each method in this object must map directly to a Worker1
      message type key. The onmessage() dispatcher attempts to
      dispatch all inbound messages to a method of this object,
      passing it the event.data part of the inbound event object. All
@@ -440,7 +446,7 @@ sqlite3.initWorker1API = function(){
       const db = wState.open(oargs);
       rc.filename = db.filename;
       rc.persistent = (!!pDir && db.filename.startsWith(pDir+'/'))
-        || sqlite3.capi.sqlite3_js_db_uses_vfs(db.pointer, "opfs");
+        || !!sqlite3.capi.sqlite3_js_db_uses_vfs(db.pointer, "opfs");
       rc.dbId = getDbId(db);
       return rc;
     },
@@ -526,38 +532,29 @@ sqlite3.initWorker1API = function(){
     },
 
     /**
-       TO(RE)DO, once we can abstract away access to the
-       JS environment's virtual filesystem. Currently this
-       always throws.
-
-       Response is (should be) an object:
+       Exports the database to a byte array, as per
+       sqlite3_serialize(). Response is an object:
 
        {
-         buffer: Uint8Array (db file contents),
+         bytearray: Uint8Array (db file contents),
          filename: the current db filename,
          mimetype: 'application/x-sqlite3'
        }
-
-       2022-09-30: we have shell.c:fiddle_export_db() which works fine
-       for disk-based databases (even if it's a virtual disk like an
-       Emscripten VFS). sqlite3_serialize() can return this for
-       :memory: and temp databases.
     */
     export: function(ev){
-      toss("export() requires reimplementing for portability reasons.");
       /**
          We need to reimplement this to use the Emscripten FS
          interface. That part used to be in the OO#1 API but that
          dependency was removed from that level of the API.
       */
-      /**const db = getMsgDb(ev);
+      const db = getMsgDb(ev);
       const response = {
-        buffer: db.exportBinaryImage(),
+        bytearray: sqlite3.capi.sqlite3_js_db_export(db.pointer),
         filename: db.filename,
         mimetype: 'application/x-sqlite3'
       };
-      wState.xfer.push(response.buffer.buffer);
-      return response;**/
+      wState.xfer.push(response.bytearray.buffer);
+      return response;
     }/*export()*/,
 
     toss: function(ev){
diff --git a/manifest b/manifest
index 022d02a5b3..de9c7c6178 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Internal\stweaks\sto\sthe\sOPFS\sVFS\sresult\scodes.
-D 2022-10-31T11:53:34.287
+C Worker1:\suse\sa\slist,\srather\sthan\sa\ssingle\sslot,\sto\smanage\sthe\sdefault\sdb\slink\sso\sthat\swe\scan\skeep\sthe\sleast-recently-opened\sdb\sas\sthe\sdefault.\sRe-introduce\sworker1.export()\sbut\sdo\snot\syet\sexpose\sit\suntil\san\sequivalent\simport()\s(or\sopen()\soption)\sis\simplemented.
+D 2022-10-31T13:50:05.655
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -499,11 +499,11 @@ F ext/wasm/api/post-js-footer.js cd0a8ec768501d9bd45d325ab0442037fb0e33d1f3b4f08
 F ext/wasm/api/post-js-header.js d6ab3dfef4a06960d28a7eaa338d4e2a1a5981e9b38718168bbde8fdb2a439b8
 F ext/wasm/api/pre-js.js 287e462f969342b032c03900e668099fa1471d852df7a472de5bc349161d9c04
 F ext/wasm/api/sqlite3-api-cleanup.js ecdc69dbfccfe26146f04799fcfd4a6f5790d46e7e3b9b6e9b0491f92ed8ae34
-F ext/wasm/api/sqlite3-api-glue.js b87543534821ecfa56fc0d0cd153a115fa974e70d6217964baf6e93ef8d25fb1
+F ext/wasm/api/sqlite3-api-glue.js ebfd1d01b249c705482bfe3bdef3b1feaecf55821c46abf79b8105ec9b1c2b1a
 F ext/wasm/api/sqlite3-api-oo1.js 4028bc2bac7e3ae2d23b7c99828155b4a06da006b51dc2a929bc0db26337370d
 F ext/wasm/api/sqlite3-api-opfs.js 6880cc79a4d1b6075942298d9d1ab07e24d81fbd9e5fe6b7c797b86e4b2af596
 F ext/wasm/api/sqlite3-api-prologue.js 873986ca150c79510f647b910f8349bc71b14db21e444cab3b9fad9c4f39ffc7
-F ext/wasm/api/sqlite3-api-worker1.js efdca1b42299d80b54f366d15a8fc5343f3b3e9e3647e5c1fd6f3ee1015e501b
+F ext/wasm/api/sqlite3-api-worker1.js 7de5160ba86ed216e8b99ba1ae0c39c1ff85c11a4818252bfc8dd0dc21109b84
 F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
 F ext/wasm/api/sqlite3-opfs-async-proxy.js b2264efef84c4a0af5dab426d7573d8b4ee5af3a25ba108b709a835a613c5e36
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
@@ -2054,8 +2054,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 69d36a6aa5e2cd79d26c0fd3e0d20fe8838fd1be97db07725233bfff1dfe6643
-R a5a69989c955a2bef03fc5f6b9426b6e
+P 32e1a2d2eb8738ae1635e413829f6cf7f64c63d2a86b72940a573de89948e529
+R be757150eb7a7434baec9e7c2d1f82d1
 U stephan
-Z 2e8ea5a9464277cec17ca6c43e6fd2fa
+Z e060f282e47bf79484c50e0b31025d45
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 2c99a664e4..15cf0e3aad 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-32e1a2d2eb8738ae1635e413829f6cf7f64c63d2a86b72940a573de89948e529
\ No newline at end of file
+c7750c101d9b7baa31496731bc34ea0a9b2bad0c11e2b3e92a8c7b327135c1bb
\ No newline at end of file

From c7dd9b60eb95ebd65e53ed238e77ecfe6247b3b0 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 31 Oct 2022 18:01:05 +0000
Subject: [PATCH 401/428] Make the UPDATE method of the sqlite_dbpage virtual
 table rebust against OOM errors.  [forum:/forumpost/bbcf0dd6ca|Forum post
 bbcf0dd6ca].  Test case in TH3.

FossilOrigin-Name: d15c9a4a323b825eb80e706e12e9df95e5db458024f51e6e537940efc8234d8b
---
 manifest      | 14 +++++++-------
 manifest.uuid |  2 +-
 src/dbpage.c  | 11 ++++++-----
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/manifest b/manifest
index de9c7c6178..2d888a58ab 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Worker1:\suse\sa\slist,\srather\sthan\sa\ssingle\sslot,\sto\smanage\sthe\sdefault\sdb\slink\sso\sthat\swe\scan\skeep\sthe\sleast-recently-opened\sdb\sas\sthe\sdefault.\sRe-introduce\sworker1.export()\sbut\sdo\snot\syet\sexpose\sit\suntil\san\sequivalent\simport()\s(or\sopen()\soption)\sis\simplemented.
-D 2022-10-31T13:50:05.655
+C Make\sthe\sUPDATE\smethod\sof\sthe\ssqlite_dbpage\svirtual\stable\srebust\sagainst\nOOM\serrors.\s\s[forum:/forumpost/bbcf0dd6ca|Forum\spost\sbbcf0dd6ca].\s\sTest\scase\nin\sTH3.
+D 2022-10-31T18:01:05.280
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -583,7 +583,7 @@ F src/callback.c 4cd7225b26a97f7de5fee5ae10464bed5a78f2adefe19534cc2095b3a8ca484
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c 20507cc0b0a6c19cd882fcd0eaeda32ae6a4229fb4b024cfdf3183043d9b703d
 F src/date.c 94ce83b4cd848a387680a5f920c9018c16655db778c4d36525af0a0f34679ac5
-F src/dbpage.c 433f13b34f1e5a84cbb5f10214c12471c6f0197f276389634a1cc393ec821c3d
+F src/dbpage.c f1a87f4ebcf22284e0aaf0697862f4ccfc120dcd6db3d8dfa3b049b2580c01d8
 F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
 F src/delete.c 86573edae75e3d3e9a8b590d87db8e47222103029df4f3e11fa56044459b514e
 F src/expr.c 847f87d9df3ede2b2b0a8db088af0b9c1923b21009f8ea1b9b7b28cb0a383170
@@ -2054,8 +2054,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 32e1a2d2eb8738ae1635e413829f6cf7f64c63d2a86b72940a573de89948e529
-R be757150eb7a7434baec9e7c2d1f82d1
-U stephan
-Z e060f282e47bf79484c50e0b31025d45
+P c7750c101d9b7baa31496731bc34ea0a9b2bad0c11e2b3e92a8c7b327135c1bb
+R 196f3951f65687c9f90c3fbde15932cd
+U drh
+Z 5dce30cfcdbfc3a472a813e27f5eb193
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 15cf0e3aad..0771c2adac 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c7750c101d9b7baa31496731bc34ea0a9b2bad0c11e2b3e92a8c7b327135c1bb
\ No newline at end of file
+d15c9a4a323b825eb80e706e12e9df95e5db458024f51e6e537940efc8234d8b
\ No newline at end of file
diff --git a/src/dbpage.c b/src/dbpage.c
index e13740d81d..458f2bd501 100644
--- a/src/dbpage.c
+++ b/src/dbpage.c
@@ -354,11 +354,12 @@ static int dbpageUpdate(
   pPager = sqlite3BtreePager(pBt);
   rc = sqlite3PagerGet(pPager, pgno, (DbPage**)&pDbPage, 0);
   if( rc==SQLITE_OK ){
-    rc = sqlite3PagerWrite(pDbPage);
-    if( rc==SQLITE_OK ){
-      memcpy(sqlite3PagerGetData(pDbPage),
-             sqlite3_value_blob(argv[3]),
-             szPage);
+    const void *pData = sqlite3_value_blob(argv[3]);
+    assert( pData!=0 || pTab->db->mallocFailed );
+    if( pData
+     && (rc = sqlite3PagerWrite(pDbPage))==SQLITE_OK
+    ){
+      memcpy(sqlite3PagerGetData(pDbPage), pData, szPage);
     }
   }
   sqlite3PagerUnref(pDbPage);

From 5fdb9a352c771c673458009069b5e865632a28b6 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Tue, 1 Nov 2022 00:52:22 +0000
Subject: [PATCH 402/428] Enforce column affinity on the materialization of a
 subquery or view.

FossilOrigin-Name: b6692de374d7f489d8cf8877bdfef19501bc5ecb0781d42750807eeb58f2e7cd
---
 manifest           | 23 +++++++++++++----------
 manifest.uuid      |  2 +-
 src/insert.c       | 39 +++++++++++++++++++++++++--------------
 src/select.c       |  6 ++++++
 src/sqliteInt.h    |  1 +
 test/cast.test     |  2 +-
 test/unionall.test | 21 +++++++++++++++++++++
 7 files changed, 68 insertions(+), 26 deletions(-)

diff --git a/manifest b/manifest
index 2d888a58ab..9ddb872316 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\sthe\sUPDATE\smethod\sof\sthe\ssqlite_dbpage\svirtual\stable\srebust\sagainst\nOOM\serrors.\s\s[forum:/forumpost/bbcf0dd6ca|Forum\spost\sbbcf0dd6ca].\s\sTest\scase\nin\sTH3.
-D 2022-10-31T18:01:05.280
+C Enforce\scolumn\saffinity\son\sthe\smaterialization\sof\sa\ssubquery\sor\sview.
+D 2022-11-01T00:52:22.740
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -595,7 +595,7 @@ F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
 F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
 F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
-F src/insert.c b972b1642cd0f7d5ae4964d713b65158a7bfa6a6e8786a9e8e57bd9c0b4a896d
+F src/insert.c 90a32bc7faa755cd5292ade21d2b3c6edba8fd1d70754a364caccabfde2c3bb2
 F src/json.c 7749b98c62f691697c7ee536b570c744c0583cab4a89200fdd0fc2aa8cc8cbd6
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 8086232d10e51e183a7f64199815bad1c579896354db69435347665f62f481e9
@@ -636,12 +636,12 @@ F src/printf.c e99ee9741e79ae3873458146f59644276657340385ade4e76a5f5d1c25793764
 F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c 8a709a8e19b32d2c411eaae1a10e2ee214cf740288859a9f9a362fcb2f50eaf1
+F src/select.c 0c4d77f94a413b355b66b401b977e9dc6994f858fe3a6e0cc0fad18a8199132e
 F src/shell.c.in bde69ad6a9887396c87d089da84c0fe1e432957faebd9206b9185be735341104
 F src/sqlite.h.in d9c8a6243fc0a1c270d69db33758e34b810af3462f9bc5b4af113b347e07c69d
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 5336beea1868d99d2f62e628dbea55e97267dbff8193291ab175e960c5df9141
-F src/sqliteInt.h 2449c9ea2936e077dfba0f116178d8be2b908cf1ed8fa8eaabe73540a4df4331
+F src/sqliteInt.h 960d80f44302c6d6159eb5c39c7f70203b6b6f19aaf8d34fcce23b0173e95517
 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -853,7 +853,7 @@ F test/capi3c.test 54e2dc0c8fd7c34ad1590d1be6864397da2438c95a9f5aee2f8fbc60c112e
 F test/capi3d.test 8b778794af891b0dca3d900bd345fbc8ebd2aa2aae425a9dccdd10d5233dfbde
 F test/capi3e.test 3d49c01ef2a1a55f41d73cba2b23b5059ec460fe
 F test/carray01.test d55d57bf66b1af1c7ac55fae66ff4910884a8f5d21a90a18797ce386212a2634
-F test/cast.test 336fa21989b5170ebcaf90c24266be22dd97b3e23d1fad5ecf6ad4efb04c4423
+F test/cast.test 6064022ba9af31a8a2ff7bb345e5bd0e74172ffad85bdab5898a42d8227c7585
 F test/cffault.test 9d6b20606afe712374952eec4f8fd74b1a8097ef
 F test/changes.test 9dd8e597d84072122fc8a4fcdea837f4a54a461e6e536053ea984303e8ca937b
 F test/changes2.test d222c0cbf5ab0ac4d7c180594e486c1bf20b2098d33e56ce33b8e12eba6823b9
@@ -1769,7 +1769,7 @@ F test/tt3_vacuum.c 71b254cde1fc49d6c8c44efd54f4668f3e57d7b3a8f4601ade069f75a999
 F test/types.test bf816ce73c7dfcfe26b700c19f97ef4050d194ff
 F test/types2.test 1aeb81976841a91eef292723649b5c4fe3bc3cac
 F test/types3.test 99e009491a54f4dc02c06bdbc0c5eea56ae3e25a
-F test/unionall.test fee6e6adebe5446938475432ae8b042835a286c7e2efdc1b186d2182dfb93ffb
+F test/unionall.test 9706d2a0c03619f5fce3bcadc30e1e74f9cc60aae4398cf28b5359503fb83758
 F test/unionall2.test 71e8fa08d5699d50dc9f9dc0c9799c2e7a6bb7931a330d369307a4df7f157fa1
 F test/unionallfault.test 652bfbb630e6c43135965dc1e8f0a9a791da83aec885d626a632fe1909c56f73
 F test/unionvtab.test e1704ab1b4c1bb3ffc9da4681f8e85a0b909fd80b937984fc94b27415ac8e5a4
@@ -2054,8 +2054,11 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P c7750c101d9b7baa31496731bc34ea0a9b2bad0c11e2b3e92a8c7b327135c1bb
-R 196f3951f65687c9f90c3fbde15932cd
+P d15c9a4a323b825eb80e706e12e9df95e5db458024f51e6e537940efc8234d8b
+R 1fa17b7dffe4e486e0be3f5c9bbb7b7f
+T *branch * tkt-57c47526
+T *sym-tkt-57c47526 *
+T -sym-trunk *
 U drh
-Z 5dce30cfcdbfc3a472a813e27f5eb193
+Z 3735a0196c01b073213c0a5a2d772463
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 0771c2adac..cee32d755d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d15c9a4a323b825eb80e706e12e9df95e5db458024f51e6e537940efc8234d8b
\ No newline at end of file
+b6692de374d7f489d8cf8877bdfef19501bc5ecb0781d42750807eeb58f2e7cd
\ No newline at end of file
diff --git a/src/insert.c b/src/insert.c
index 3e0d696d74..1f6cdffcc3 100644
--- a/src/insert.c
+++ b/src/insert.c
@@ -110,6 +110,28 @@ const char *sqlite3IndexAffinityStr(sqlite3 *db, Index *pIdx){
   return pIdx->zColAff;
 }
 
+/*
+** Compute an affinity string for a table.   Space is obtained
+** from sqlite3DbMalloc().  The caller is responsible for freeing
+** the space when done.
+*/
+char *sqlite3TableAffinityStr(sqlite3 *db, const Table *pTab){
+  char *zColAff;
+  zColAff = (char *)sqlite3DbMallocRaw(db, pTab->nCol+1);
+  if( zColAff ){
+    int i, j;
+    for(i=j=0; i<pTab->nCol; i++){
+      if( (pTab->aCol[i].colFlags & COLFLAG_VIRTUAL)==0 ){
+        zColAff[j++] = pTab->aCol[i].affinity;
+      }
+    }
+    do{
+      zColAff[j--] = 0;
+    }while( j>=0 && zColAff[j]<=SQLITE_AFF_BLOB );
+  }
+  return zColAff;  
+}
+
 /*
 ** Make changes to the evolving bytecode to do affinity transformations
 ** of values that are about to be gathered into a row for table pTab.
@@ -151,7 +173,7 @@ const char *sqlite3IndexAffinityStr(sqlite3 *db, Index *pIdx){
 ** Apply the type checking to that array of registers.
 */
 void sqlite3TableAffinity(Vdbe *v, Table *pTab, int iReg){
-  int i, j;
+  int i;
   char *zColAff;
   if( pTab->tabFlags & TF_Strict ){
     if( iReg==0 ){
@@ -174,22 +196,11 @@ void sqlite3TableAffinity(Vdbe *v, Table *pTab, int iReg){
   }
   zColAff = pTab->zColAff;
   if( zColAff==0 ){
-    sqlite3 *db = sqlite3VdbeDb(v);
-    zColAff = (char *)sqlite3DbMallocRaw(0, pTab->nCol+1);
+    zColAff = sqlite3TableAffinityStr(0, pTab);
     if( !zColAff ){
-      sqlite3OomFault(db);
+      sqlite3OomFault(sqlite3VdbeDb(v));
       return;
     }
-
-    for(i=j=0; i<pTab->nCol; i++){
-      assert( pTab->aCol[i].affinity!=0 || sqlite3VdbeParser(v)->nErr>0 );
-      if( (pTab->aCol[i].colFlags & COLFLAG_VIRTUAL)==0 ){
-        zColAff[j++] = pTab->aCol[i].affinity;
-      }
-    }
-    do{
-      zColAff[j--] = 0;
-    }while( j>=0 && zColAff[j]<=SQLITE_AFF_BLOB );
     pTab->zColAff = zColAff;
   }
   assert( zColAff!=0 );
diff --git a/src/select.c b/src/select.c
index 0925f102eb..e8c12b593c 100644
--- a/src/select.c
+++ b/src/select.c
@@ -1287,6 +1287,9 @@ static void selectInnerLoop(
       testcase( eDest==SRT_Fifo );
       testcase( eDest==SRT_DistFifo );
       sqlite3VdbeAddOp3(v, OP_MakeRecord, regResult, nResultCol, r1+nPrefixReg);
+      if( pDest->zAffSdst ){
+        sqlite3VdbeChangeP4(v, -1, pDest->zAffSdst, nResultCol);
+      }
 #ifndef SQLITE_OMIT_CTE
       if( eDest==SRT_DistFifo ){
         /* If the destination is DistFifo, then cursor (iParm+1) is open
@@ -7071,7 +7074,10 @@ int sqlite3Select(
       }
       sqlite3SelectDestInit(&dest, SRT_EphemTab, pItem->iCursor);
       ExplainQueryPlan((pParse, 1, "MATERIALIZE %!S", pItem));
+      dest.zAffSdst = sqlite3TableAffinityStr(db, pItem->pTab);
       sqlite3Select(pParse, pSub, &dest);
+      sqlite3DbFree(db, dest.zAffSdst);
+      dest.zAffSdst = 0;
       pItem->pTab->nRowLogEst = pSub->nSelectRow;
       if( onceAddr ) sqlite3VdbeJumpHere(v, onceAddr);
       sqlite3VdbeAddOp2(v, OP_Return, pItem->regReturn, topAddr+1);
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index f272f1a4f6..7d82e7222c 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -4981,6 +4981,7 @@ int sqlite3VarintLen(u64 v);
 
 
 const char *sqlite3IndexAffinityStr(sqlite3*, Index*);
+char *sqlite3TableAffinityStr(sqlite3*,const Table*);
 void sqlite3TableAffinity(Vdbe*, Table*, int);
 char sqlite3CompareAffinity(const Expr *pExpr, char aff2);
 int sqlite3IndexAffinityOk(const Expr *pExpr, char idx_affinity);
diff --git a/test/cast.test b/test/cast.test
index 6ac9bc7efa..cbeec47c9d 100644
--- a/test/cast.test
+++ b/test/cast.test
@@ -481,7 +481,7 @@ do_execsql_test cast-9.0 {
   CREATE VIEW v1(c0, c1) AS 
     SELECT CAST(0.0 AS NUMERIC), COUNT(*) OVER () FROM t0;
   SELECT v1.c0 FROM v1, t0 WHERE v1.c0=0; 
-} {0.0}
+} {0}
 
 
 finish_test
diff --git a/test/unionall.test b/test/unionall.test
index 7554a3b308..538a5f77b7 100644
--- a/test/unionall.test
+++ b/test/unionall.test
@@ -55,6 +55,27 @@ do_execsql_test 1.3 {
 } {1 one 2 two 5 five 6 six}
 
 
+# 2022-10-31 part of ticket 57c47526c34f01e8
+# The queries below were causing an assertion fault in
+# the comparison operators of the VDBE.
+#
+reset_db
+database_never_corrupt
+optimization_control db all 0
+do_execsql_test 1.10 {
+  CREATE TABLE t0(c0 INT);
+  INSERT INTO t0 VALUES(0);
+  CREATE TABLE t1_a(a INTEGER PRIMARY KEY, b TEXT);
+  INSERT INTO t1_a VALUES(1,'one');
+  CREATE TABLE t1_b(c INTEGER PRIMARY KEY, d TEXT);
+  INSERT INTO t1_b VALUES(2,'two');
+  CREATE VIEW t1 AS SELECT a, b FROM t1_a UNION ALL SELECT c, c FROM t1_b;
+  SELECT * FROM (SELECT t1.a, t1.b AS b, t0.c0 FROM t0, t1);
+} {1 one 0 2 2 0}
+do_execsql_test 1.11 {
+  SELECT * FROM (SELECT t1.a, t1.b AS b, t0.c0 FROM t0, t1) WHERE b=2;
+} {2 2 0}
+
 #-------------------------------------------------------------------------
 reset_db
 

From b6d9167945651e39f0caf5560e5edee184529138 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Tue, 1 Nov 2022 01:07:29 +0000
Subject: [PATCH 403/428] Do not flatten a UNION ALL subquery where the column
 affinities do not match on all arms.  Force that subquery to be materialized.

FossilOrigin-Name: 1b8a128832c1633cbb86999d347fef64ac45fe134dac61132112fc97f24676a0
---
 manifest           | 19 +++++++---------
 manifest.uuid      |  2 +-
 src/select.c       | 19 +++++++++++++++-
 src/test1.c        | 10 ++++-----
 test/unionall.test | 56 ++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 88 insertions(+), 18 deletions(-)

diff --git a/manifest b/manifest
index 9ddb872316..f5ca913494 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enforce\scolumn\saffinity\son\sthe\smaterialization\sof\sa\ssubquery\sor\sview.
-D 2022-11-01T00:52:22.740
+C Do\snot\sflatten\sa\sUNION\sALL\ssubquery\swhere\sthe\scolumn\saffinities\sdo\snot\smatch\non\sall\sarms.\s\sForce\sthat\ssubquery\sto\sbe\smaterialized.
+D 2022-11-01T01:07:29.799
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -636,7 +636,7 @@ F src/printf.c e99ee9741e79ae3873458146f59644276657340385ade4e76a5f5d1c25793764
 F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c 0c4d77f94a413b355b66b401b977e9dc6994f858fe3a6e0cc0fad18a8199132e
+F src/select.c 12cb5162e606290354f9512ff0c30fc6dc4d7a77a92b6c5b581395f9c4edd047
 F src/shell.c.in bde69ad6a9887396c87d089da84c0fe1e432957faebd9206b9185be735341104
 F src/sqlite.h.in d9c8a6243fc0a1c270d69db33758e34b810af3462f9bc5b4af113b347e07c69d
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -646,7 +646,7 @@ F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a3
 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
 F src/tclsqlite.c 4e64ba300a5a26e0f1170e09032429faeb65e45e8f3d1a7833e8edb69fc2979e
-F src/test1.c 790c8cd24d1ac39b8cf4e2f618ce16ecc028accfcde60660f7bd983e0f4c7d28
+F src/test1.c 373e57d7735ee42eb4578f1df4f072a495ae5ce5154a73862e1ef2134fd7a040
 F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
 F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
 F src/test4.c 4533b76419e7feb41b40582554663ed3cd77aaa54e135cf76b3205098cd6e664
@@ -1769,7 +1769,7 @@ F test/tt3_vacuum.c 71b254cde1fc49d6c8c44efd54f4668f3e57d7b3a8f4601ade069f75a999
 F test/types.test bf816ce73c7dfcfe26b700c19f97ef4050d194ff
 F test/types2.test 1aeb81976841a91eef292723649b5c4fe3bc3cac
 F test/types3.test 99e009491a54f4dc02c06bdbc0c5eea56ae3e25a
-F test/unionall.test 9706d2a0c03619f5fce3bcadc30e1e74f9cc60aae4398cf28b5359503fb83758
+F test/unionall.test bfeeea6c18c09a46f7e8bed69173e31c71336152e6253fb37c7257c76509f0e4
 F test/unionall2.test 71e8fa08d5699d50dc9f9dc0c9799c2e7a6bb7931a330d369307a4df7f157fa1
 F test/unionallfault.test 652bfbb630e6c43135965dc1e8f0a9a791da83aec885d626a632fe1909c56f73
 F test/unionvtab.test e1704ab1b4c1bb3ffc9da4681f8e85a0b909fd80b937984fc94b27415ac8e5a4
@@ -2054,11 +2054,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 d15c9a4a323b825eb80e706e12e9df95e5db458024f51e6e537940efc8234d8b
-R 1fa17b7dffe4e486e0be3f5c9bbb7b7f
-T *branch * tkt-57c47526
-T *sym-tkt-57c47526 *
-T -sym-trunk *
+P b6692de374d7f489d8cf8877bdfef19501bc5ecb0781d42750807eeb58f2e7cd
+R 2239c7e612edeebb85a48ece2742b418
 U drh
-Z 3735a0196c01b073213c0a5a2d772463
+Z 6ea1a8314858728c345b400d643954f7
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index cee32d755d..fa596718f9 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b6692de374d7f489d8cf8877bdfef19501bc5ecb0781d42750807eeb58f2e7cd
\ No newline at end of file
+1b8a128832c1633cbb86999d347fef64ac45fe134dac61132112fc97f24676a0
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index e8c12b593c..602a9d7df4 100644
--- a/src/select.c
+++ b/src/select.c
@@ -4152,6 +4152,8 @@ static ExprList *findLeftmostExprlist(Select *pSel){
 **        (17g) either the subquery is the first element of the outer
 **              query or there are no RIGHT or FULL JOINs in any arm
 **              of the subquery.  (This is a duplicate of condition (27b).)
+**        (17h) The corresponding result set expressions in all arms of the
+**              compound must have the same affinity.
 **
 **        The parent and sub-query may contain WHERE clauses. Subject to
 **        rules (11), (13) and (14), they may also contain ORDER BY,
@@ -4328,6 +4330,7 @@ static int flattenSubquery(
   ** queries.
   */
   if( pSub->pPrior ){
+    int ii;
     if( pSub->pOrderBy ){
       return 0;  /* Restriction (20) */
     }
@@ -4360,7 +4363,6 @@ static int flattenSubquery(
 
     /* Restriction (18). */
     if( p->pOrderBy ){
-      int ii;
       for(ii=0; ii<p->pOrderBy->nExpr; ii++){
         if( p->pOrderBy->a[ii].u.x.iOrderByCol==0 ) return 0;
       }
@@ -4369,6 +4371,21 @@ static int flattenSubquery(
     /* Restriction (23) */
     if( (p->selFlags & SF_Recursive) ) return 0;
 
+    /* Restriction (17h) */
+    for(ii=0; ii<pSub->pEList->nExpr; ii++){
+      char aff;
+      assert( pSub->pEList->a[ii].pExpr!=0 );
+      aff = sqlite3ExprAffinity(pSub->pEList->a[ii].pExpr);
+      for(pSub1=pSub->pPrior; pSub1; pSub1=pSub1->pPrior){
+        assert( pSub1->pEList!=0 );
+        assert( pSub1->pEList->nExpr>ii );
+        assert( pSub1->pEList->a[ii].pExpr!=0 );
+        if( sqlite3ExprAffinity(pSub1->pEList->a[ii].pExpr)!=aff ){
+          return 0;
+        }
+      }
+    }
+
     if( pSrc->nSrc>1 ){
       if( pParse->nSelect>500 ) return 0;
       if( OptimizationDisabled(db, SQLITE_FlttnUnionAll) ) return 0;
diff --git a/src/test1.c b/src/test1.c
index 994e5d262a..fda8e206cb 100644
--- a/src/test1.c
+++ b/src/test1.c
@@ -7642,6 +7642,7 @@ static int SQLITE_TCLAPI optimization_control(
   const char *zOpt;
   int onoff;
   int mask = 0;
+  int cnt = 0;
   static const struct {
     const char *zOptName;
     int mask;
@@ -7661,7 +7662,6 @@ static int SQLITE_TCLAPI optimization_control(
     { "push-down",           SQLITE_PushDown       },
     { "balanced-merge",      SQLITE_BalancedMerge  },
     { "propagate-const",     SQLITE_PropagateConst },
-    { 0, 0 }
   };
 
   if( objc!=4 ){
@@ -7672,13 +7672,13 @@ static int SQLITE_TCLAPI optimization_control(
   if( Tcl_GetBooleanFromObj(interp, objv[3], &onoff) ) return TCL_ERROR;
   zOpt = Tcl_GetString(objv[2]);
   for(i=0; i<sizeof(aOpt)/sizeof(aOpt[0]); i++){
-    if( strcmp(zOpt, aOpt[i].zOptName)==0 ){
-      mask = aOpt[i].mask;
-      break;
+    if( strstr(zOpt, aOpt[i].zOptName)!=0 ){
+      mask |= aOpt[i].mask;
+      cnt++;
     }
   }
   if( onoff ) mask = ~mask;
-  if( i>=sizeof(aOpt)/sizeof(aOpt[0]) ){
+  if( cnt==0 ){
     Tcl_AppendResult(interp, "unknown optimization - should be one of:",
                      (char*)0);
     for(i=0; i<sizeof(aOpt)/sizeof(aOpt[0]); i++){
diff --git a/test/unionall.test b/test/unionall.test
index 538a5f77b7..7783c04a67 100644
--- a/test/unionall.test
+++ b/test/unionall.test
@@ -385,4 +385,60 @@ do_execsql_test 7.1 {
    ORDER BY x, y;
 } {0 1 | 0 101 | 0 102 | 1 1 | 1 101 | 1 102 | 100 1 | 100 101 | 100 102 | 101 1 | 101 101 | 101 102 |}
 
+# 2022-10-31 ticket https://sqlite.org/src/info/57c47526c34f01e8
+# dbsqlfuzz 37230460b46b3b6049f0d768eb801f3428189382
+# UNION ALL subqueries or views which have arms with different
+# affinities should not be flattened.
+#
+reset_db
+do_execsql_test 8.1 {
+  CREATE TABLE t0(c0 INT);
+  INSERT INTO t0 VALUES(0);
+  CREATE TABLE t1_a(a INTEGER PRIMARY KEY, b TEXT);
+  INSERT INTO t1_a VALUES(1,'one');
+  INSERT INTO t1_a VALUES(4,'four');
+  CREATE TABLE t1_b(c INTEGER PRIMARY KEY, d TEXT);
+  INSERT INTO t1_b VALUES(2,'two');
+  INSERT INTO t1_b VALUES(5,'five');
+  CREATE TABLE t1_c(e INTEGER PRIMARY KEY, f TEXT);
+  INSERT INTO t1_c VALUES(3,'three');
+  INSERT INTO t1_c VALUES(6,'six');
+  CREATE VIEW v0(c0) AS SELECT CAST(t0.c0 AS INTEGER) FROM t0;
+  CREATE VIEW t1 AS 
+    SELECT a, b FROM t1_a   UNION ALL
+    SELECT c, c FROM t1_b   UNION ALL
+    SELECT e, f FROM t1_c;
+}
+optimization_control db all 1
+do_execsql_test 8.2 {
+  SELECT * FROM (SELECT t1.a, t1.b, t0.c0 AS c, v0.c0 AS d FROM t0 LEFT JOIN v0 ON v0.c0>'0',t1) WHERE b=2;
+} {2 2 0 {}}
+do_execsql_test 8.3 {
+  SELECT * FROM (SELECT t1.a, t1.b, t0.c0 AS c, v0.c0 AS d FROM t0 LEFT JOIN v0 ON v0.c0>'0',t1) WHERE b=2.0;
+} {}
+do_execsql_test 8.4 {
+  SELECT * FROM (SELECT t1.a, t1.b, t0.c0 AS c, v0.c0 AS d FROM t0 LEFT JOIN v0 ON v0.c0>'0',t1) WHERE b='2';
+} {2 2 0 {}}
+optimization_control db query-flattener,push-down 0
+do_execsql_test 8.5 {
+  SELECT * FROM (SELECT t1.a, t1.b, t0.c0 AS c, v0.c0 AS d FROM t0 LEFT JOIN v0 ON v0.c0>'0',t1) WHERE b=2;
+} {2 2 0 {}}
+do_execsql_test 8.6 {
+  SELECT * FROM (SELECT t1.a, t1.b, t0.c0 AS c, v0.c0 AS d FROM t0 LEFT JOIN v0 ON v0.c0>'0',t1) WHERE b=2.0;
+} {}
+do_execsql_test 8.7 {
+  SELECT * FROM (SELECT t1.a, t1.b, t0.c0 AS c, v0.c0 AS d FROM t0 LEFT JOIN v0 ON v0.c0>'0',t1) WHERE b='2';
+} {2 2 0 {}}
+optimization_control db all 0
+do_execsql_test 8.8 {
+  SELECT * FROM (SELECT t1.a, t1.b, t0.c0 AS c, v0.c0 AS d FROM t0 LEFT JOIN v0 ON v0.c0>'0',t1) WHERE b=2;
+} {2 2 0 {}}
+do_execsql_test 8.9 {
+  SELECT * FROM (SELECT t1.a, t1.b, t0.c0 AS c, v0.c0 AS d FROM t0 LEFT JOIN v0 ON v0.c0>'0',t1) WHERE b=2.0;
+} {}
+do_execsql_test 8.10 {
+  SELECT * FROM (SELECT t1.a, t1.b, t0.c0 AS c, v0.c0 AS d FROM t0 LEFT JOIN v0 ON v0.c0>'0',t1) WHERE b='2';
+} {2 2 0 {}}
+
+
 finish_test

From 49048b148eac5f74eb6f1e9dfbd85ee8f95694a4 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 1 Nov 2022 07:49:49 +0000
Subject: [PATCH 404/428] Significant cleanups and expansion of the
 sqlite3.opfs utilities. Add oo1.DB.dbVfsName(). Add VFS name to
 worker1:open's arguments and result.

FossilOrigin-Name: 86a341d7e061f946b39e8647ddd4743013b851b33ae9e6e755d8dbc53fba5286
---
 ext/wasm/api/sqlite3-api-oo1.js          |  25 ++-
 ext/wasm/api/sqlite3-api-opfs.js         | 240 ++++++++++++++++++++---
 ext/wasm/api/sqlite3-api-prologue.js     |  21 +-
 ext/wasm/api/sqlite3-api-worker1.js      |  23 ++-
 ext/wasm/api/sqlite3-opfs-async-proxy.js |   1 +
 ext/wasm/common/testing.css              |   2 +
 ext/wasm/demo-worker1-promiser.js        |   3 +-
 ext/wasm/demo-worker1.js                 |   3 +-
 ext/wasm/test-opfs-vfs.js                |  17 +-
 ext/wasm/tester1-worker.html             |  10 +-
 ext/wasm/tester1.html                    |   2 +-
 ext/wasm/tester1.js                      |  62 +++---
 manifest                                 |  36 ++--
 manifest.uuid                            |   2 +-
 14 files changed, 341 insertions(+), 106 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index e318b72001..aaaeaa3d5a 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -258,9 +258,9 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
      in the form of a single configuration object with the following
      properties:
 
-     - `.filename`: database file name
-     - `.flags`: open-mode flags
-     - `.vfs`: the VFS fname
+     - `filename`: database file name
+     - `flags`: open-mode flags
+     - `vfs`: the VFS fname
 
      The `filename` and `vfs` arguments may be either JS strings or
      C-strings allocated via WASM. `flags` is required to be a JS
@@ -560,6 +560,25 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     dbName: function(dbNumber=0){
       return capi.sqlite3_db_name(affirmDbOpen(this).pointer, dbNumber);
     },
+    /**
+       Returns the name of the sqlite3_vfs used by the given database
+       of this connection (defaulting to 'main'). The argument may be
+       either a JS string or a WASM C-string. Returns undefined if the
+       given db name is invalid. Throws if this object has been
+       close()d.
+    */
+    dbVfsName: function(dbName=0){
+      let rc;
+      const pVfs = capi.sqlite3_js_db_vfs(
+        affirmDbOpen(this).pointer, dbName
+      );
+      if(pVfs){
+        const v = new capi.sqlite3_vfs(pVfs);
+        try{ rc = wasm.cstringToJs(v.$zName) }
+        finally { v.dispose() }
+      }
+      return rc;        
+    },
     /**
        Compiles the given SQL and returns a prepared Stmt. This is
        the only way to create new Stmt objects. Throws on error.
diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index 1a89432c5f..90337d5279 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -371,6 +371,20 @@ const installOpfsVfs = function callee(options){
       return rc;
     };
 
+    /**
+       Not part of the public API. Only for test/development use.
+    */
+    opfsUtil.debug = {
+      asyncShutdown: ()=>{
+        warn("Shutting down OPFS async listener. The OPFS VFS will no longer work.");
+        opRun('opfs-async-shutdown');
+      },
+      asyncRestart: ()=>{
+        warn("Attempting to restart OPFS VFS async listener. Might work, might not.");
+        W.postMessage({type: 'opfs-async-restart'});
+      }
+    };
+
     const initS11n = ()=>{
       /**
          !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -876,37 +890,61 @@ const installOpfsVfs = function callee(options){
     }
 
     /**
-       Syncronously deletes the given OPFS filesystem entry, ignoring
-       any errors. As this environment has no notion of "current
-       directory", the given name must be an absolute path. If the 2nd
-       argument is truthy, deletion is recursive (use with caution!).
-
-       Returns true if the deletion succeeded and false if it fails,
-       but cannot report the nature of the failure.
+       Expects an OPFS file path. It gets resolved, such that ".."
+       components are properly expanded, and returned. If the 2nd arg
+       is true, the result is returned as an array of path elements,
+       else an absolute path string is returned.
     */
-    opfsUtil.deleteEntry = function(fsEntryName,recursive=false){
-      mTimeStart('xDelete');
-      const rc = opRun('xDelete', fsEntryName, 0, recursive);
-      mTimeEnd();
-      return 0===rc;
+    opfsUtil.getResolvedPath = function(filename,splitIt){
+      const p = new URL(filename, "file://irrelevant").pathname;
+      return splitIt ? p.split('/').filter((v)=>!!v) : p;
     };
+
     /**
-       Synchronously creates the given directory name, recursively, in
+       Takes the absolute path to a filesystem element. Returns an
+       array of [handleOfContainingDir, filename]. If the 2nd argument
+       is truthy then each directory element leading to the file is
+       created along the way. Throws if any creation or resolution
+       fails.
+    */
+    opfsUtil.getDirForFilename = async function f(absFilename, createDirs = false){
+      const path = opfsUtil.getResolvedPath(absFilename, true);
+      const filename = path.pop();
+      let dh = opfsUtil.rootDirectory;
+      for(const dirName of path){
+        if(dirName){
+          dh = await dh.getDirectoryHandle(dirName, {create: !!createDirs});
+        }
+      }
+      return [dh, filename];
+    };
+
+    /**
+       Creates the given directory name, recursively, in
        the OPFS filesystem. Returns true if it succeeds or the
        directory already exists, else false.
     */
-    opfsUtil.mkdir = function(absDirName){
-      mTimeStart('mkdir');
-      const rc = opRun('mkdir', absDirName);
-      mTimeEnd();
-      return 0===rc;
+    opfsUtil.mkdir = async function(absDirName){
+      try {
+        await opfsUtil.getDirForFilename(absDirName+"/filepart", true);
+        return true;
+      }catch(e){
+        //console.warn("mkdir(",absDirName,") failed:",e);
+        return false;
+      }
     };
     /**
-       Synchronously checks whether the given OPFS filesystem exists,
+       Checks whether the given OPFS filesystem entry exists,
        returning true if it does, false if it doesn't.
     */
-    opfsUtil.entryExists = function(fsEntryName){
-      return 0===opRun('xAccess', fsEntryName);
+    opfsUtil.entryExists = async function(fsEntryName){
+      try {
+        const [dh, fn] = await opfsUtil.getDirForFilename(filename);
+        await dh.getFileHandle(fn);
+        return true;
+      }catch(e){
+        return false;
+      }
     };
 
     /**
@@ -938,20 +976,160 @@ const installOpfsVfs = function callee(options){
     };
 
     /**
-       Only for test/development use.
+       Returns a promise which resolves to an object which represents
+       all files and directories in the OPFS tree. The top-most object
+       has two properties: `dirs` is an array of directory entries
+       (described below) and `files` is a list of file names for all
+       files in that directory.
+
+       Traversal starts at sqlite3.opfs.rootDirectory.
+
+       Each `dirs` entry is an object in this form:
+
+       ```
+       { name: directoryName,
+         dirs: [...subdirs],
+         files: [...file names]
+       }
+       ```
+
+       The `files` and `subdirs` entries are always set but may be
+       empty arrays.
+
+       The returned object has the same structure but its `name` is
+       an empty string. All returned objects are created with
+       Object.create(null), so have no prototype.
+
+       Design note: the entries do not contain more information,
+       e.g. file sizes, because getting such info is not only
+       expensive but is subject to locking-related errors.
     */
-    opfsUtil.debug = {
-      asyncShutdown: ()=>{
-        warn("Shutting down OPFS async listener. OPFS will no longer work.");
-        opRun('opfs-async-shutdown');
-      },
-      asyncRestart: ()=>{
-        warn("Attempting to restart OPFS async listener. Might work, might not.");
-        W.postMessage({type: 'opfs-async-restart'});
+    opfsUtil.treeList = async function(){
+      const doDir = async function callee(dirHandle,tgt){
+        tgt.name = dirHandle.name;
+        tgt.dirs = [];
+        tgt.files = [];
+        for await (const handle of dirHandle.values()){
+          if('directory' === handle.kind){
+            const subDir = Object.create(null);
+            tgt.dirs.push(subDir);
+            await callee(handle, subDir);
+          }else{
+            tgt.files.push(handle.name);
+          }
+        }
+      };
+      const root = Object.create(null);
+      await doDir(opfsUtil.rootDirectory, root);
+      return root;
+    };
+
+    /**
+       Irrevocably deletes _all_ files in the current origin's OPFS.
+       Obviously, this must be used with great caution. It may throw
+       an exception if removal of anything fails (e.g. a file is
+       locked), but the precise conditions under which it will throw
+       are not documented (so we cannot tell you what they are).
+    */
+    opfsUtil.rmfr = async function(){
+      const dir = opfsUtil.rootDirectory, opt = {recurse: true};
+      for await (const handle of dir.values()){
+        dir.removeEntry(handle.name, opt);
       }
     };
 
-    //TODO to support fiddle db upload:
+    /**
+       Deletes the given OPFS filesystem entry.  As this environment
+       has no notion of "current directory", the given name must be an
+       absolute path. If the 2nd argument is truthy, deletion is
+       recursive (use with caution!).
+
+       The returned Promise resolves to true if the deletion was
+       successful, else false (but...). The OPFS API reports the
+       reason for the failure only in human-readable form, not
+       exceptions which can be type-checked to determine the
+       failure. Because of that...
+
+       If the final argument is truthy then this function will
+       propagate any exception on error, rather than returning false.
+    */
+    opfsUtil.unlink = async function(fsEntryName, recursive = false,
+                                          throwOnError = false){
+      try {
+        const [hDir, filenamePart] =
+              await opfsUtil.getDirForFilename(fsEntryName, false);
+        await hDir.removeEntry(filenamePart, {recursive});
+        return true;
+      }catch(e){
+        if(throwOnError){
+          throw new Error("unlink(",arguments[0],") failed: "+e.message,{
+            cause: e
+          });
+        }
+        return false;
+      }
+    };
+
+    /**
+       Traverses the OPFS filesystem, calling a callback for each one.
+       The argument may be either a callback function or an options object
+       with any of the following properties:
+
+       - `callback`: function which gets called for each filesystem
+         entry.  It gets passed 3 arguments: 1) the
+         FileSystemFileHandle or FileSystemDirectoryHandle of each
+         entry (noting that both are instanceof FileSystemHandle). 2)
+         the FileSystemDirectoryHandle of the parent directory. 3) the
+         current depth level, with 0 being at the top of the tree
+         relative to the starting directory. If the callback returns a
+         literal false, as opposed to any other falsy value, traversal
+         stops without an error. Any exceptions it throws are
+         propagated. Results are undefined if the callback manipulate
+         the filesystem (e.g. removing or adding entries) because the
+         how OPFS iterators behave in the face of such changes is
+         undocumented.
+
+       - `recursive` [bool=true]: specifies whether to recurse into
+         subdirectories or not. Whether recursion is depth-first or
+         breadth-first is unspecified!
+
+       - `directory` [FileSystemDirectoryEntry=sqlite3.opfs.rootDirectory]
+         specifies the starting directory.
+
+       If this function is passed a function, it is assumed to be the
+       callback.
+
+       Returns a promise because it has to (by virtue of being async)
+       but that promise has no specific meaning: the traversal it
+       performs is synchronous. The promise must be used to catch any
+       exceptions propagated by the callback, however.
+
+       TODO: add an option which specifies whether to traverse
+       depth-first or breadth-first. We currently do depth-first but
+       an incremental file browsing widget would benefit more from
+       breadth-first.
+    */
+    opfsUtil.traverse = async function(opt){
+      const defaultOpt = {
+        recursive: true,
+        directory: opfsUtil.rootDirectory
+      };
+      if('function'===typeof opt){
+        opt = {callback:opt};
+      }
+      opt = Object.assign(defaultOpt, opt||{});
+      const doDir = async function callee(dirHandle, depth){
+        for await (const handle of dirHandle.values()){
+          if(false === opt.callback(handle, dirHandle, depth)) return false;
+          else if(opt.recursive && 'directory' === handle.kind){
+            if(false === await callee(handle, depth + 1)) break;
+          }
+        }
+      };
+      doDir(opt.directory, 0);
+    };
+
+    //TODO to support fiddle and worker1 db upload:
     //opfsUtil.createFile = function(absName, content=undefined){...}
 
     if(sqlite3.oo1){
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index a5ff0c40ad..ca6fad8f84 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -1187,14 +1187,15 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
   }
 
   /**
-     Given an `sqlite3*`, an sqlite3_vfs name, and an optional db
-     name, returns a truthy value (see below) if that db handle uses
-     that VFS, else returns false. If pDb is falsy then the 3rd
-     argument is ignored and this function returns a truthy value if
-     the default VFS name matches that of the 2nd argument. Results
-     are undefined if pDb is truthy but refers to an invalid
-     pointer. The 3rd argument specifies the database name of the
-     given database connection to check, defaulting to the main db.
+     Given an `sqlite3*`, an sqlite3_vfs name, and an optional db name
+     (defaulting to "main"), returns a truthy value (see below) if
+     that db uses that VFS, else returns false. If pDb is falsy then
+     the 3rd argument is ignored and this function returns a truthy
+     value if the default VFS name matches that of the 2nd
+     argument. Results are undefined if pDb is truthy but refers to an
+     invalid pointer. The 3rd argument specifies the database name of
+     the given database connection to check, defaulting to the main
+     db.
 
      The 2nd and 3rd arguments may either be a JS string or a WASM
      C-string. If the 2nd argument is a NULL WASM pointer, the default
@@ -1209,14 +1210,14 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
      bad arguments cause a conversion error when passing into
      wasm-space, false is returned.
   */
-  capi.sqlite3_js_db_uses_vfs = function(pDb,vfsName,dbName="main"){
+  capi.sqlite3_js_db_uses_vfs = function(pDb,vfsName,dbName=0){
     try{
       const pK = capi.sqlite3_vfs_find(vfsName);
       if(!pK) return false;
       else if(!pDb){
         return pK===capi.sqlite3_vfs_find(0) ? pK : false;
       }else{
-        return pK===capi.sqlite3_js_db_vfs(pDb) ? pK : false;
+        return pK===capi.sqlite3_js_db_vfs(pDb,dbName) ? pK : false;
       }
     }catch(e){
       /* Ignore - probably bad args to a wasm-bound function. */
diff --git a/ext/wasm/api/sqlite3-api-worker1.js b/ext/wasm/api/sqlite3-api-worker1.js
index aa438a52dc..532d61b67e 100644
--- a/ext/wasm/api/sqlite3-api-worker1.js
+++ b/ext/wasm/api/sqlite3-api-worker1.js
@@ -188,6 +188,8 @@
       See the sqlite3.oo1.DB constructor for peculiarities and
       transformations,
 
+      vfs: sqlite3_vfs name. Ignored if filename is ":memory:" or "".
+           This may change how the given filename is resolved.
     }
   }
   ```
@@ -212,6 +214,7 @@
       persistent: true if the given filename resides in the
       known-persistent storage, else false.
 
+      vfs: name of the VFS the "main" db is using.
    }
   }
   ```
@@ -362,7 +365,7 @@ sqlite3.initWorker1API = function(){
     /** Temp holder for "transferable" postMessage() state. */
     xfer: [],
     open: function(opt){
-      const db = new DB(opt.filename);
+      const db = new DB(opt);
       this.dbs[getDbId(db)] = db;
       if(this.dbList.indexOf(db)<0) this.dbList.push(db);
       return db;
@@ -442,12 +445,14 @@ sqlite3.initWorker1API = function(){
         oargs.filename = args.filename || '';
       }else{
         oargs.filename = args.filename;
+        oargs.vfs = args.vfs;
       }
       const db = wState.open(oargs);
       rc.filename = db.filename;
       rc.persistent = (!!pDir && db.filename.startsWith(pDir+'/'))
         || !!sqlite3.capi.sqlite3_js_db_uses_vfs(db.pointer, "opfs");
       rc.dbId = getDbId(db);
+      rc.vfs = db.dbVfsName();
       return rc;
     },
 
@@ -528,6 +533,7 @@ sqlite3.initWorker1API = function(){
       rc.wasmfsOpfsEnabled = !!sqlite3.capi.sqlite3_wasmfs_opfs_dir();
       rc.version = sqlite3.version;
       rc.vfsList = sqlite3.capi.sqlite3_js_vfs_list();
+      rc.opfsEnabled = !!sqlite3.opfs;
       return rc;
     },
 
@@ -542,11 +548,6 @@ sqlite3.initWorker1API = function(){
        }
     */
     export: function(ev){
-      /**
-         We need to reimplement this to use the Emscripten FS
-         interface. That part used to be in the OO#1 API but that
-         dependency was removed from that level of the API.
-      */
       const db = getMsgDb(ev);
       const response = {
         bytearray: sqlite3.capi.sqlite3_js_db_export(db.pointer),
@@ -559,17 +560,23 @@ sqlite3.initWorker1API = function(){
 
     toss: function(ev){
       toss("Testing worker exception");
+    },
+
+    'opfs-tree': async function(ev){
+      if(!sqlite3.opfs) toss("OPFS support is unavailable.");
+      const response = await sqlite3.opfs.treeList();
+      return response;
     }
   }/*wMsgHandler*/;
 
-  self.onmessage = function(ev){
+  self.onmessage = async function(ev){
     ev = ev.data;
     let result, dbId = ev.dbId, evType = ev.type;
     const arrivalTime = performance.now();
     try {
       if(wMsgHandler.hasOwnProperty(evType) &&
          wMsgHandler[evType] instanceof Function){
-        result = wMsgHandler[evType](ev);
+        result = await wMsgHandler[evType](ev);
       }else{
         toss("Unknown db worker message type:",ev.type);
       }
diff --git a/ext/wasm/api/sqlite3-opfs-async-proxy.js b/ext/wasm/api/sqlite3-opfs-async-proxy.js
index 71c822c1f2..3aa20fa634 100644
--- a/ext/wasm/api/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/api/sqlite3-opfs-async-proxy.js
@@ -377,6 +377,7 @@ const vfsAsyncImpls = {
         if(!filenamePart) break;
         await hDir.removeEntry(filenamePart, {recursive});
         if(0x1234 !== syncDir) break;
+        recursive = false;
         filename = getResolvedPath(filename, true);
         filename.pop();
         filename = filename.join('/');
diff --git a/ext/wasm/common/testing.css b/ext/wasm/common/testing.css
index a4433af8c6..9438b330c9 100644
--- a/ext/wasm/common/testing.css
+++ b/ext/wasm/common/testing.css
@@ -37,6 +37,8 @@ span.labeled-input {
 .strong { font-weight: 700 }
 .warning { color: firebrick; }
 .green { color: darkgreen; }
+.tests-pass { background-color: green; color: white }
+.tests-fail { background-color: red; color: yellow }
 .faded { opacity: 0.5; }
 .group-start { color: blue; }
 .group-end { color: blue; }
diff --git a/ext/wasm/demo-worker1-promiser.js b/ext/wasm/demo-worker1-promiser.js
index 855643b2d2..3f50ef9e08 100644
--- a/ext/wasm/demo-worker1-promiser.js
+++ b/ext/wasm/demo-worker1-promiser.js
@@ -91,7 +91,8 @@
       const r = ev.result;
       log("then open result",r);
       T.assert(ev.dbId === r.dbId)
-        .assert(ev.messageId);
+        .assert(ev.messageId)
+        .assert('string' === typeof r.vfs);
       promiserConfig.dbId = ev.dbId;
     }).then(runTests2);
   };
diff --git a/ext/wasm/demo-worker1.js b/ext/wasm/demo-worker1.js
index 2da80bc239..ac4e9f4234 100644
--- a/ext/wasm/demo-worker1.js
+++ b/ext/wasm/demo-worker1.js
@@ -291,7 +291,8 @@
       log("open result",ev);
       T.assert('testing2.sqlite3'===ev.result.filename)
         .assert(ev.dbId)
-        .assert(ev.messageId);
+        .assert(ev.messageId)
+        .assert('string' === typeof ev.result.vfs);
       DbState.id = ev.dbId;
       if(waitForOpen) setTimeout(runTests2, 0);
     });
diff --git a/ext/wasm/test-opfs-vfs.js b/ext/wasm/test-opfs-vfs.js
index e22acc0e3d..bba31bb9c9 100644
--- a/ext/wasm/test-opfs-vfs.js
+++ b/ext/wasm/test-opfs-vfs.js
@@ -37,7 +37,7 @@ const tryOpfsVfs = async function(sqlite3){
 
   const urlArgs = new URL(self.location.href).searchParams;
   const dbFile = "my-persistent.db";
-  if(urlArgs.has('delete')) sqlite3.opfs.deleteEntry(dbFile);
+  if(urlArgs.has('delete')) sqlite3.opfs.unlink(dbFile);
 
   const db = new opfs.OpfsDb(dbFile,'ct');
   log("db file:",db.filename);
@@ -62,13 +62,14 @@ const tryOpfsVfs = async function(sqlite3){
     // Some sanity checks of the opfs utility functions...
     const testDir = '/sqlite3-opfs-'+opfs.randomFilename(12);
     const aDir = testDir+'/test/dir';
-    opfs.mkdir(aDir) || toss("mkdir failed");
-    opfs.mkdir(aDir) || toss("mkdir must pass if the dir exists");
-    opfs.deleteEntry(testDir+'/test') && toss("delete 1 should have failed (dir not empty)");
-    opfs.deleteEntry(testDir+'/test/dir') || toss("delete 2 failed");
-    opfs.deleteEntry(testDir+'/test/dir') && toss("delete 2b should have failed (dir already deleted)");
-    opfs.deleteEntry(testDir,true) || toss("delete 3 failed");
-    opfs.entryExists(testDir) && toss("entryExists(",testDir,") should have failed");
+    await opfs.mkdir(aDir) || toss("mkdir failed");
+    await opfs.mkdir(aDir) || toss("mkdir must pass if the dir exists");
+    await opfs.unlink(testDir+'/test') && toss("delete 1 should have failed (dir not empty)");
+    //await opfs.entryExists(testDir)
+    await opfs.unlink(testDir+'/test/dir') || toss("delete 2 failed");
+    await opfs.unlink(testDir+'/test/dir') && toss("delete 2b should have failed (dir already deleted)");
+    await opfs.unlink(testDir, true) || toss("delete 3 failed");
+    await opfs.entryExists(testDir) && toss("entryExists(",testDir,") should have failed");
   }finally{
     db.close();
   }
diff --git a/ext/wasm/tester1-worker.html b/ext/wasm/tester1-worker.html
index e1a7247e3e..4d2df0c8d1 100644
--- a/ext/wasm/tester1-worker.html
+++ b/ext/wasm/tester1-worker.html
@@ -14,7 +14,7 @@
     </style>
   </head>
   <body>
-    <h1>sqlite3 WASM/JS tester #1 (Worker thread)</h1>
+    <h1 id='color-target'>sqlite3 WASM/JS tester #1 (Worker thread)</h1>
     <div>See <a href='tester1.html' target='tester1.html'>tester1.html</a>
       for the UI-thread variant.</div>
     <div class='input-wrapper'>
@@ -46,6 +46,14 @@
             case 'log':
               logHtml(data.payload.cssClass, ...data.payload.args);
               break;
+            case 'error':
+              logHtml('error', ...data.payload.args);
+              break;
+            case 'test-result':
+              document.querySelector('#color-target').classList.add(
+                data.payload.pass ? 'tests-pass' : 'tests-fail'
+              );
+              break;
             default:
               logHtml('error',"Unhandled message:",data.type);
         };
diff --git a/ext/wasm/tester1.html b/ext/wasm/tester1.html
index 0ceacc5c36..f7a2fba4af 100644
--- a/ext/wasm/tester1.html
+++ b/ext/wasm/tester1.html
@@ -14,7 +14,7 @@
     </style>
   </head>
   <body>
-    <h1>sqlite3 WASM/JS tester #1 (UI thread)</h1>
+    <h1 id='color-target'>sqlite3 WASM/JS tester #1 (UI thread)</h1>
     <div>See <a href='tester1-worker.html' target='tester1-worker.html'>tester1-worker.html</a>
       for the Worker-thread variant.</div>
     <div class='input-wrapper'>
diff --git a/ext/wasm/tester1.js b/ext/wasm/tester1.js
index 016886a30a..4f32368701 100644
--- a/ext/wasm/tester1.js
+++ b/ext/wasm/tester1.js
@@ -99,6 +99,14 @@
       };
     }
   }
+  const reportFinalTestStatus = function(pass){
+    if(isUIThread()){
+      const e = document.querySelector('#color-target');
+      e.classList.add(pass ? 'tests-pass' : 'tests-fail');
+    }else{
+      postMessage({type:'test-result', payload:{pass}});
+    }
+  };
   const log = (...args)=>{
     //console.log(...args);
     logClass('',...args);
@@ -139,28 +147,19 @@
     toBool: function(expr){
       return (expr instanceof Function) ? !!expr() : !!expr;
     },
-    /** abort() if expr is false. If expr is a function, it
-        is called and its result is evaluated.
+    /** Throws if expr is false. If expr is a function, it is called
+        and its result is evaluated. If passed multiple arguments,
+        those after the first are a message string which get applied
+        as an exception message if the assertion fails. The message
+        arguments are concatenated together with a space between each.
     */
-    assert: function f(expr, msg){
-      if(!f._){
-        f._ = ('undefined'===typeof abort
-               ? (msg)=>{throw new Error(msg)}
-               : abort);
-      }
+    assert: function f(expr, ...msg){
       ++this.counter;
       if(!this.toBool(expr)){
-        f._(msg || "Assertion failed.");
+        throw new Error(msg.length ? msg.join(' ') : "Assertion failed.");
       }
       return this;
     },
-    /** Identical to assert() but throws instead of calling
-        abort(). */
-    affirm: function(expr, msg){
-      ++this.counter;
-      if(!this.toBool(expr)) throw new Error(msg || "Affirmation failed.");
-      return this;
-    },
     /** Calls f() and squelches any exception it throws. If it
         does not throw, this function throws. */
     mustThrow: function(f, msg){
@@ -301,9 +300,11 @@
                    "Done running tests.",TestUtil.counter,"assertions in",
                    roundMs(runtime),'ms');
           pok();
+          reportFinalTestStatus(true);
         }catch(e){
           error(e);
           pnok(e);
+          reportFinalTestStatus(false);
         }
       }.bind(this));
     }
@@ -1117,10 +1118,11 @@
       const dbFile = '/tester1.db';
       wasm.sqlite3_wasm_vfs_unlink(0, dbFile);
       const db = this.db = new sqlite3.oo1.DB(dbFile);
-      T.assert(Number.isInteger(db.pointer)).
-        mustThrowMatching(()=>db.pointer=1, /read-only/).
-        assert(0===sqlite3.capi.sqlite3_extended_result_codes(db.pointer,1)).
-        assert('main'===db.dbName(0));
+      T.assert(Number.isInteger(db.pointer))
+        .mustThrowMatching(()=>db.pointer=1, /read-only/)
+        .assert(0===sqlite3.capi.sqlite3_extended_result_codes(db.pointer,1))
+        .assert('main'===db.dbName(0))
+        .assert('string' === typeof db.dbVfsName());
       // Custom db error message handling via sqlite3_prepare_v2/v3()
       let rc = capi.sqlite3_prepare_v3(db.pointer, {/*invalid*/}, -1, 0, null, null);
       T.assert(capi.SQLITE_MISUSE === rc)
@@ -1737,13 +1739,14 @@
       (sqlite3)=>{return !!sqlite3.opfs})
     .t({
       name: 'OPFS sanity checks',
-      test: function(sqlite3){
+      test: async function(sqlite3){
+        const opfs = sqlite3.opfs;
         const filename = 'sqlite3-tester1.db';
         const pVfs = capi.sqlite3_vfs_find('opfs');
         T.assert(pVfs);
         const unlink = (fn=filename)=>wasm.sqlite3_wasm_vfs_unlink(pVfs,fn);
         unlink();
-        let db = new sqlite3.opfs.OpfsDb(filename);
+        let db = new opfs.OpfsDb(filename);
         try {
           db.exec([
             'create table p(a);',
@@ -1751,13 +1754,26 @@
           ]);
           T.assert(3 === db.selectValue('select count(*) from p'));
           db.close();
-          db = new sqlite3.opfs.OpfsDb(filename);
+          db = new opfs.OpfsDb(filename);
           db.exec('insert into p(a) values(4),(5),(6)');
           T.assert(6 === db.selectValue('select count(*) from p'));
         }finally{
           db.close();
           unlink();
         }
+
+        // Some sanity checks of the opfs utility functions...
+        const testDir = '/sqlite3-opfs-'+opfs.randomFilename(12);
+        const aDir = testDir+'/test/dir';
+        T.assert(await opfs.mkdir(aDir), "mkdir failed")
+          .assert(await opfs.mkdir(aDir), "mkdir must pass if the dir exists")
+          .assert(!(await opfs.unlink(testDir+'/test')), "delete 1 should have failed (dir not empty)")
+          .assert((await opfs.unlink(testDir+'/test/dir')), "delete 2 failed")
+          .assert(!(await opfs.unlink(testDir+'/test/dir')),
+                  "delete 2b should have failed (dir already deleted)")
+          .assert((await opfs.unlink(testDir, true)), "delete 3 failed")
+          .assert(!(await opfs.entryExists(testDir)),
+                  "entryExists(",testDir,") should have failed");
       }
     }/*OPFS sanity checks*/)
   ;/* end OPFS tests */
diff --git a/manifest b/manifest
index 2d888a58ab..f644d6bc06 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\sthe\sUPDATE\smethod\sof\sthe\ssqlite_dbpage\svirtual\stable\srebust\sagainst\nOOM\serrors.\s\s[forum:/forumpost/bbcf0dd6ca|Forum\spost\sbbcf0dd6ca].\s\sTest\scase\nin\sTH3.
-D 2022-10-31T18:01:05.280
+C Significant\scleanups\sand\sexpansion\sof\sthe\ssqlite3.opfs\sutilities.\sAdd\soo1.DB.dbVfsName().\sAdd\sVFS\sname\sto\sworker1:open's\sarguments\sand\sresult.
+D 2022-11-01T07:49:49.018
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -500,12 +500,12 @@ F ext/wasm/api/post-js-header.js d6ab3dfef4a06960d28a7eaa338d4e2a1a5981e9b387181
 F ext/wasm/api/pre-js.js 287e462f969342b032c03900e668099fa1471d852df7a472de5bc349161d9c04
 F ext/wasm/api/sqlite3-api-cleanup.js ecdc69dbfccfe26146f04799fcfd4a6f5790d46e7e3b9b6e9b0491f92ed8ae34
 F ext/wasm/api/sqlite3-api-glue.js ebfd1d01b249c705482bfe3bdef3b1feaecf55821c46abf79b8105ec9b1c2b1a
-F ext/wasm/api/sqlite3-api-oo1.js 4028bc2bac7e3ae2d23b7c99828155b4a06da006b51dc2a929bc0db26337370d
-F ext/wasm/api/sqlite3-api-opfs.js 6880cc79a4d1b6075942298d9d1ab07e24d81fbd9e5fe6b7c797b86e4b2af596
-F ext/wasm/api/sqlite3-api-prologue.js 873986ca150c79510f647b910f8349bc71b14db21e444cab3b9fad9c4f39ffc7
-F ext/wasm/api/sqlite3-api-worker1.js 7de5160ba86ed216e8b99ba1ae0c39c1ff85c11a4818252bfc8dd0dc21109b84
+F ext/wasm/api/sqlite3-api-oo1.js ce8db98ab7c394fd8fb99ae135c46269a1a0162250a70e39e7975b4317a03640
+F ext/wasm/api/sqlite3-api-opfs.js 59b278ed00764fc47ba88be0582ab3fc3ce725e02b6d86459464cc029b9ac356
+F ext/wasm/api/sqlite3-api-prologue.js 850581aa0c759db25c04d64b340b0c5272f253fb195377acc8d851e376710ad3
+F ext/wasm/api/sqlite3-api-worker1.js 4f920a54fb97d4ca50632d45bd7d011a55016eb5a5883725033abb450903bc6f
 F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
-F ext/wasm/api/sqlite3-opfs-async-proxy.js b2264efef84c4a0af5dab426d7573d8b4ee5af3a25ba108b709a835a613c5e36
+F ext/wasm/api/sqlite3-opfs-async-proxy.js 2627bf8dc04c24783a55de40d8a6d18da31e81a9bb926a5b672b402f582099b5
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 14ac9c03f6585332f882703f3427f11ffe8ffe8b6c0e252be2c518f7aac6ab6a
 F ext/wasm/api/sqlite3-worker1-promiser.js 0c7a9826dbf82a5ed4e4f7bf7816e825a52aff253afbf3350431f5773faf0e4b
@@ -514,7 +514,7 @@ F ext/wasm/batch-runner.html 4deeed44fe41496dc6898d9fb17938ea3291f40f4bfb977e29d
 F ext/wasm/batch-runner.js 49609e89aaac9989d6c1ad3fae268e4878e1ad7bc5fd3e5c2f44959660780b2e
 F ext/wasm/common/SqliteTestUtil.js d8bf97ecb0705a2299765c8fc9e11b1a5ac7f10988bbf375a6558b7ca287067b
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
-F ext/wasm/common/testing.css 739b58c44511f642f16f57b701c84dc9ee412d8bc47b3d8a99d947babfa69d9d
+F ext/wasm/common/testing.css 35889709547d89a6109ff83b25c11bbc91d8dd43aab8722e428655ca98880a06
 F ext/wasm/common/whwasmutil.js 77930367c2a65cf6fd6f99ad3644ede33e4d20466f5e506eb87b8d101a0a7655
 F ext/wasm/demo-123-worker.html a0b58d9caef098a626a1a1db567076fca4245e8d60ba94557ede8684350a81ed
 F ext/wasm/demo-123.html 8c70a412ce386bd3796534257935eb1e3ea5c581e5d5aea0490b8232e570a508
@@ -522,9 +522,9 @@ F ext/wasm/demo-123.js ebae30756585bca655b4ab2553ec9236a87c23ad24fc8652115dcedb0
 F ext/wasm/demo-jsstorage.html 409c4be4af5f207fb2877160724b91b33ea36a3cd8c204e8da1acb828ffe588e
 F ext/wasm/demo-jsstorage.js 44e3ae7ec2483b6c511384c3c290beb6f305c721186bcf5398ca4e00004a06b8
 F ext/wasm/demo-worker1-promiser.html 1de7c248c7c2cfd4a5783d2aa154bce62d74c6de98ab22f5786620b3354ed15f
-F ext/wasm/demo-worker1-promiser.js f68ffbbe1c6086e18ce7961b8fc2b40dd88db174f59052e228c06b07484945ca
+F ext/wasm/demo-worker1-promiser.js 988ce92220c1cf1dd95fcb6b59734f0ae677942469390ddd8a64f4bbb5f99821
 F ext/wasm/demo-worker1.html 2c178c1890a2beb5a5fecb1453e796d067a4b8d3d2a04d65ca2eb1ab2c68ef5d
-F ext/wasm/demo-worker1.js 8ba51d94c4601fa5c313d9e59b63b238f5305b5d5739ad21f4782a0161e6682e
+F ext/wasm/demo-worker1.js 117e4eedc62e103e287f0e4a694add7e13a200a4d7056e718645032288c4a8ab
 F ext/wasm/dist.make 481289899a07958439d07ee4302ff86235fa0fbb72f17ea05db2be90a94abf90
 F ext/wasm/fiddle.make e570ec1bfc7d803507a2e514fe32f673fe001b2114b85c73c3964a462ba8bcfc
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
@@ -546,10 +546,10 @@ F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f129
 F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
 F ext/wasm/test-opfs-vfs.html 1f2d672f3f3fce810dfd48a8d56914aba22e45c6834e262555e685bce3da8c3f
-F ext/wasm/test-opfs-vfs.js 48fc59110e8775bb43c9be25b6d634fc07ebadab7da8fbd44889e8129c6e2548
-F ext/wasm/tester1-worker.html d02b9d38876b023854cf8955e77a40912f7e516956b4dbe1ec7f215faac273ee
-F ext/wasm/tester1.html c6c47e5a8071eb09cb1301104435c8e44fbb5719c92411f5b2384a461f9793c5
-F ext/wasm/tester1.js 2427ac48e255f658ad81163b5dc6372a8609ab6ab60e295e371d1e5fe9a495ab
+F ext/wasm/test-opfs-vfs.js 44363db07b2a20e73b0eb1808de4400ca71b703af718d0fa6d962f15e73bf2ac
+F ext/wasm/tester1-worker.html 51bf39e2b87f974ae3d5bc3086e2fb36d258f3698c54f6e21ba4b3b99636fa27
+F ext/wasm/tester1.html 624ec41cd9f78a1f2b6d7df70aaa7a6394396b1f2455ecbd6de5775c1275b121
+F ext/wasm/tester1.js 157eb499aad3365e33a7d95d6847c1d58d533335bc19d79bd3bc700b6350d1a5
 F ext/wasm/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd72273503ae7d5
 F ext/wasm/wasmfs.make fb2d3c4a298b12cf1ec994ad1d0f1d027ae297449b364cde43d2eb807d68048f
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
@@ -2054,8 +2054,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 c7750c101d9b7baa31496731bc34ea0a9b2bad0c11e2b3e92a8c7b327135c1bb
-R 196f3951f65687c9f90c3fbde15932cd
-U drh
-Z 5dce30cfcdbfc3a472a813e27f5eb193
+P d15c9a4a323b825eb80e706e12e9df95e5db458024f51e6e537940efc8234d8b
+R 095ddbe256b2c65febf55a9bc126a8d9
+U stephan
+Z 25b125153b5de3e07d69ba6b59e3eede
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 0771c2adac..f229779db4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d15c9a4a323b825eb80e706e12e9df95e5db458024f51e6e537940efc8234d8b
\ No newline at end of file
+86a341d7e061f946b39e8647ddd4743013b851b33ae9e6e755d8dbc53fba5286
\ No newline at end of file

From 0f32760e3c51975c27801e9f51b995fc1ed07c38 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 1 Nov 2022 11:09:34 +0000
Subject: [PATCH 405/428] Minor internal cleanups in the js pieces.

FossilOrigin-Name: 271391b4e32220ab4c32d69f579ecd2b03eb99da898955a1ef8fffc27216719d
---
 ext/wasm/api/sqlite3-api-glue.js     |  4 ++--
 ext/wasm/api/sqlite3-api-oo1.js      | 11 ++++-----
 ext/wasm/api/sqlite3-api-prologue.js | 36 +++++++++++++++-------------
 manifest                             | 16 ++++++-------
 manifest.uuid                        |  2 +-
 5 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index 1477af7598..7e3e433cec 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -51,8 +51,8 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     });
   }
 
-  if(1){/* Convert Arrays and certain TypedArrays to strings for
-           'flexible-string'-type arguments */
+  {/* Convert Arrays and certain TypedArrays to strings for
+      'flexible-string'-type arguments */
     const xString = wasm.xWrap.argAdapter('string');
     wasm.xWrap.argAdapter(
       'flexible-string', (v)=>xString(util.flexibleString(v))
diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index aaaeaa3d5a..02ce9c0ced 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -401,11 +401,11 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
           break;
         case undefined:
         case 'this':
+          out.returnVal = ()=>db;
           break;
         default:
           toss3("Invalid returnValue value:",opt.returnValue);
     }
-    if(!out.returnVal) out.returnVal = ()=>db;
     if(opt.callback || opt.resultRows){
       switch((undefined===opt.rowMode)
              ? 'array' : opt.rowMode) {
@@ -762,15 +762,12 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
       affirmDbOpen(this);
       const arg = parseExecArgs(this, arguments);
       if(!arg.sql){
-        return (''===arg.sql) ? this : toss3("exec() requires an SQL string.");
+        return toss3("exec() requires an SQL string.");
       }
       const opt = arg.opt;
       const callback = opt.callback;
-      const returnValue = opt.returnValue || 'this';
-      const resultRows = (Array.isArray(opt.resultRows)
-                          ? opt.resultRows : (
-                            'resultRows'===returnValue ? [] : undefined
-                          ));
+      const resultRows =
+            Array.isArray(opt.resultRows) ? opt.resultRows : undefined;
       let stmt;
       let bind = opt.bind;
       let evalFirstResult = !!(arg.cbArg || opt.columnNames) /* true to evaluate the first result-returning query */;
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index ca6fad8f84..5e7f1bae2e 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -199,11 +199,25 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
 
       A very few exceptions require an additional level of proxy
       function or may otherwise require special attention in the WASM
-      environment, and all such cases are document here. Those not
-      documented otherwise are installed as 1-to-1 proxies for their
+      environment, and all such cases are documented somewhere below
+      in this file or in sqlite3-api-glue.js. capi members which are
+      not documented are installed as 1-to-1 proxies for their
       C-side counterparts.
   */
   const capi = Object.create(null);
+  /**
+     Holds state which are specific to the WASM-related
+     infrastructure and glue code. It is not expected that client
+     code will normally need these, but they're exposed here in case
+     it does. These APIs are _not_ to be considered an
+     official/stable part of the sqlite3 WASM API. They may change
+     as the developers' experience suggests appropriate changes.
+
+     Note that a number of members of this object are injected
+     dynamically after the api object is fully constructed, so
+     not all are documented in this file.
+  */
+  const wasm = Object.create(null);
 
   /**
      Functionally equivalent to the SQLite3Error constructor but may
@@ -339,11 +353,13 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
   /**
      If v is-a Array, its join('') result is returned.  If
      isSQLableTypedArray(v) is true then typedArrayToString(v) is
+     returned. If it looks like a WASM pointer, wasm.cstringToJs(v) is
      returned. Else v is returned as-is.
   */
   const flexibleString = function(v){
     if(isSQLableTypedArray(v)) return typedArrayToString(v);
     else if(Array.isArray(v)) return v.join('');
+    else if(wasm.isPtr(v)) v = wasm.cstringToJs(v);
     return v;
   };
 
@@ -615,19 +631,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     typedArrayPart
   };
     
-  /**
-     Holds state which are specific to the WASM-related
-     infrastructure and glue code. It is not expected that client
-     code will normally need these, but they're exposed here in case
-     it does. These APIs are _not_ to be considered an
-     official/stable part of the sqlite3 WASM API. They may change
-     as the developers' experience suggests appropriate changes.
-
-     Note that a number of members of this object are injected
-     dynamically after the api object is fully constructed, so
-     not all are documented inline here.
-  */
-  const wasm = {
+  Object.assign(wasm, {
     /**
        Emscripten APIs have a deep-seated assumption that all pointers
        are 32 bits. We'll remain optimistic that that won't always be
@@ -695,7 +699,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     dealloc: undefined/*installed later*/
 
     /* Many more wasm-related APIs get installed later on. */
-  }/*wasm*/;
+  }/*wasm*/);
 
   /**
      wasm.alloc()'s srcTypedArray.byteLength bytes,
diff --git a/manifest b/manifest
index f644d6bc06..13ac4f9c1a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Significant\scleanups\sand\sexpansion\sof\sthe\ssqlite3.opfs\sutilities.\sAdd\soo1.DB.dbVfsName().\sAdd\sVFS\sname\sto\sworker1:open's\sarguments\sand\sresult.
-D 2022-11-01T07:49:49.018
+C Minor\sinternal\scleanups\sin\sthe\sjs\spieces.
+D 2022-11-01T11:09:34.309
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -499,10 +499,10 @@ F ext/wasm/api/post-js-footer.js cd0a8ec768501d9bd45d325ab0442037fb0e33d1f3b4f08
 F ext/wasm/api/post-js-header.js d6ab3dfef4a06960d28a7eaa338d4e2a1a5981e9b38718168bbde8fdb2a439b8
 F ext/wasm/api/pre-js.js 287e462f969342b032c03900e668099fa1471d852df7a472de5bc349161d9c04
 F ext/wasm/api/sqlite3-api-cleanup.js ecdc69dbfccfe26146f04799fcfd4a6f5790d46e7e3b9b6e9b0491f92ed8ae34
-F ext/wasm/api/sqlite3-api-glue.js ebfd1d01b249c705482bfe3bdef3b1feaecf55821c46abf79b8105ec9b1c2b1a
-F ext/wasm/api/sqlite3-api-oo1.js ce8db98ab7c394fd8fb99ae135c46269a1a0162250a70e39e7975b4317a03640
+F ext/wasm/api/sqlite3-api-glue.js 9cfa26a9818532c80c2555bc98615de3b170d5db0cf4b141cc3aa83c33c8758f
+F ext/wasm/api/sqlite3-api-oo1.js e9a83489bbb4838ce0aee46eaaa9350e0e25a5b926b565e4f5ae8e840e4fbaed
 F ext/wasm/api/sqlite3-api-opfs.js 59b278ed00764fc47ba88be0582ab3fc3ce725e02b6d86459464cc029b9ac356
-F ext/wasm/api/sqlite3-api-prologue.js 850581aa0c759db25c04d64b340b0c5272f253fb195377acc8d851e376710ad3
+F ext/wasm/api/sqlite3-api-prologue.js 201b9ab9d101fdefa3175b02748ef39cba43bc7abe87a69b6faac24e58cd70f0
 F ext/wasm/api/sqlite3-api-worker1.js 4f920a54fb97d4ca50632d45bd7d011a55016eb5a5883725033abb450903bc6f
 F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
 F ext/wasm/api/sqlite3-opfs-async-proxy.js 2627bf8dc04c24783a55de40d8a6d18da31e81a9bb926a5b672b402f582099b5
@@ -2054,8 +2054,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 d15c9a4a323b825eb80e706e12e9df95e5db458024f51e6e537940efc8234d8b
-R 095ddbe256b2c65febf55a9bc126a8d9
+P 86a341d7e061f946b39e8647ddd4743013b851b33ae9e6e755d8dbc53fba5286
+R c124f1782fbda1f872463378ecd48f84
 U stephan
-Z 25b125153b5de3e07d69ba6b59e3eede
+Z b4351b5e7b55104b1aa36757ad482931
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f229779db4..25de52f69f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-86a341d7e061f946b39e8647ddd4743013b851b33ae9e6e755d8dbc53fba5286
\ No newline at end of file
+271391b4e32220ab4c32d69f579ecd2b03eb99da898955a1ef8fffc27216719d
\ No newline at end of file

From dc5e8c63bd8295c7f96a8f187c2fb2d601e6966e Mon Sep 17 00:00:00 2001
From: drh <>
Date: Tue, 1 Nov 2022 12:01:10 +0000
Subject: [PATCH 406/428] Improvements to comments.  Change the
 "optimization_control" TCL command in the test harness so that it returns the
 new optimization mask, for verification.

FossilOrigin-Name: a3a500127d4752ee05c183e9ac97a2bc27768bf7063b04b5c1405cd3fd3931f5
---
 manifest        | 14 +++++++-------
 manifest.uuid   |  2 +-
 src/sqliteInt.h |  2 +-
 src/test1.c     |  8 +++++++-
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/manifest b/manifest
index f5ca913494..117ff1aa86 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\sflatten\sa\sUNION\sALL\ssubquery\swhere\sthe\scolumn\saffinities\sdo\snot\smatch\non\sall\sarms.\s\sForce\sthat\ssubquery\sto\sbe\smaterialized.
-D 2022-11-01T01:07:29.799
+C Improvements\sto\scomments.\s\sChange\sthe\s"optimization_control"\sTCL\scommand\nin\sthe\stest\sharness\sso\sthat\sit\sreturns\sthe\snew\soptimization\smask,\sfor\nverification.
+D 2022-11-01T12:01:10.112
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -641,12 +641,12 @@ F src/shell.c.in bde69ad6a9887396c87d089da84c0fe1e432957faebd9206b9185be73534110
 F src/sqlite.h.in d9c8a6243fc0a1c270d69db33758e34b810af3462f9bc5b4af113b347e07c69d
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 5336beea1868d99d2f62e628dbea55e97267dbff8193291ab175e960c5df9141
-F src/sqliteInt.h 960d80f44302c6d6159eb5c39c7f70203b6b6f19aaf8d34fcce23b0173e95517
+F src/sqliteInt.h 2c24ba38f78e32fe5d7ec136321a6ad827698b33ca98664970a8b7274d69ef7c
 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
 F src/tclsqlite.c 4e64ba300a5a26e0f1170e09032429faeb65e45e8f3d1a7833e8edb69fc2979e
-F src/test1.c 373e57d7735ee42eb4578f1df4f072a495ae5ce5154a73862e1ef2134fd7a040
+F src/test1.c 40c9a40975512985762f87b83d0c63e4904833a9fe78cbcca664a37095301b1d
 F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
 F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
 F src/test4.c 4533b76419e7feb41b40582554663ed3cd77aaa54e135cf76b3205098cd6e664
@@ -2054,8 +2054,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 b6692de374d7f489d8cf8877bdfef19501bc5ecb0781d42750807eeb58f2e7cd
-R 2239c7e612edeebb85a48ece2742b418
+P 1b8a128832c1633cbb86999d347fef64ac45fe134dac61132112fc97f24676a0
+R daeb60466918e3dda02245c22fc0e7c1
 U drh
-Z 6ea1a8314858728c345b400d643954f7
+Z 86e1166aa35e2fecc39df00fadd1a39d
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index fa596718f9..0435389eae 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1b8a128832c1633cbb86999d347fef64ac45fe134dac61132112fc97f24676a0
\ No newline at end of file
+a3a500127d4752ee05c183e9ac97a2bc27768bf7063b04b5c1405cd3fd3931f5
\ No newline at end of file
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 7d82e7222c..e4b74f6d0b 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -3511,7 +3511,7 @@ struct SelectDest {
   int iSDParm2;        /* A second parameter for the eDest disposal method */
   int iSdst;           /* Base register where results are written */
   int nSdst;           /* Number of registers allocated */
-  char *zAffSdst;      /* Affinity used when eDest==SRT_Set */
+  char *zAffSdst;      /* Affinity used for SRT_Set, SRT_Table, and similar */
   ExprList *pOrderBy;  /* Key columns for SRT_Queue and SRT_DistQueue */
 };
 
diff --git a/src/test1.c b/src/test1.c
index fda8e206cb..ba1a2252fd 100644
--- a/src/test1.c
+++ b/src/test1.c
@@ -7629,7 +7629,12 @@ static int SQLITE_TCLAPI win32_rmdir(
 **
 ** Enable or disable query optimizations using the sqlite3_test_control()
 ** interface.  Disable if BOOLEAN is false and enable if BOOLEAN is true.
-** OPT is the name of the optimization to be disabled.
+** OPT is the name of the optimization to be disabled.  OPT can also be a
+** list or optimizations names, in which case all optimizations named are
+** enabled or disabled.
+**
+** Each invocation of this control overrides all prior invocations.  The
+** changes are not cumulative.
 */
 static int SQLITE_TCLAPI optimization_control(
   void * clientData,
@@ -7687,6 +7692,7 @@ static int SQLITE_TCLAPI optimization_control(
     return TCL_ERROR;
   }
   sqlite3_test_control(SQLITE_TESTCTRL_OPTIMIZATIONS, db, mask);
+  Tcl_SetObjResult(interp, Tcl_NewIntObj(mask));
   return TCL_OK;
 }
 

From dddec5caddd0184283fc26712d7f824b9ba3bdb5 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Tue, 1 Nov 2022 13:12:20 +0000
Subject: [PATCH 407/428] Fix a #ifdef involving SQLITE_OS_KV that was adding
 code unnecessarily.

FossilOrigin-Name: b6c1b6e4a3bc21c40d6faca6f70842df5201f21c96a076a895410660630461c0
---
 manifest      | 13 ++++++-------
 manifest.uuid |  2 +-
 src/main.c    |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index 7b9cd35678..b88ee5ad90 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enforce\saffinity\son\smaterialized\stables\sfor\ssubqueries\sand\sviews.\s\sAlso,\ndo\snot\sallow\sUNION\sALL\sflattening\sif\sthe\saffinity\sof\sa\sresult\scolumn\svaries\nbetween\sdifferent\sarms\sof\sthe\scompound.\s\sThis\sis\sa\sfix\sfor\nticket\s[57c47526c34f01e8].
-D 2022-11-01T12:10:39.967
+C Fix\sa\s#ifdef\sinvolving\sSQLITE_OS_KV\sthat\swas\sadding\scode\sunnecessarily.
+D 2022-11-01T13:12:20.513
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -599,7 +599,7 @@ F src/insert.c 90a32bc7faa755cd5292ade21d2b3c6edba8fd1d70754a364caccabfde2c3bb2
 F src/json.c 7749b98c62f691697c7ee536b570c744c0583cab4a89200fdd0fc2aa8cc8cbd6
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 8086232d10e51e183a7f64199815bad1c579896354db69435347665f62f481e9
-F src/main.c 5bf12aca926324eb804de3f38e5231ccd68e238f640c45dadd9756c96a2817af
+F src/main.c 9cfec10a066121554edc9058156c412b9dc4550680c588122b67b445bb91e271
 F src/malloc.c dfddca1e163496c0a10250cedeafaf56dff47673e0f15888fb0925340a8e3f90
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@ -2054,9 +2054,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 271391b4e32220ab4c32d69f579ecd2b03eb99da898955a1ef8fffc27216719d a3a500127d4752ee05c183e9ac97a2bc27768bf7063b04b5c1405cd3fd3931f5
-R 60e75a792dff45d600a3259961a93e92
-T +closed a3a500127d4752ee05c183e9ac97a2bc27768bf7063b04b5c1405cd3fd3931f5
+P 88a05141c28e5ff1357c3c599493e4ffb8f3821bab04be80244deac62e49135c
+R f61fe44f0a9f4aa5e8b7b1d8cb7aafca
 U drh
-Z b380e750784c0847900a6a6007ece443
+Z a22eca35ee43b99ebcb7efc4ac7709fc
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 0aa341e0bd..213d245adc 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-88a05141c28e5ff1357c3c599493e4ffb8f3821bab04be80244deac62e49135c
\ No newline at end of file
+b6c1b6e4a3bc21c40d6faca6f70842df5201f21c96a076a895410660630461c0
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index 646683558d..5a372aa30e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -3396,7 +3396,7 @@ static int openDatabase(
     goto opendb_out;
   }
   assert( db->pVfs!=0 );
-#if defined(SQLITE_OS_KV) || defined(SQLITE_OS_KV_OPTIONAL)
+#if SQLITE_OS_KV || defined(SQLITE_OS_KV_OPTIONAL)
   if( sqlite3_stricmp(db->pVfs->zName, "kvvfs")==0 ){
     db->temp_store = 2;
   }

From 11980a6b8e5cba2c854dc11c9e4e0aa9bfe7656e Mon Sep 17 00:00:00 2001
From: mistachkin <mistachkin@noemail.net>
Date: Tue, 1 Nov 2022 14:13:05 +0000
Subject: [PATCH 408/428] Fix compilation errors in the recover API seen with
 MSVC.

FossilOrigin-Name: 78d17c4fedc1629bf161f9858f2b8bf35506155ccaa0acc084b419d244d4f75d
---
 ext/recover/sqlite3recover.c |  8 +++++---
 manifest                     | 14 +++++++-------
 manifest.uuid                |  2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index 022d03f50b..daeb1cc48a 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -693,9 +693,11 @@ static void recoverGetPage(
     if( pStmt ){
       sqlite3_bind_int64(pStmt, 1, pgno);
       if( SQLITE_ROW==sqlite3_step(pStmt) ){
+        const u8 *aPg;
+        int nPg;
         assert( p->errCode==SQLITE_OK );
-        const u8 *aPg = sqlite3_column_blob(pStmt, 0);
-        int nPg = sqlite3_column_bytes(pStmt, 0);
+        aPg = sqlite3_column_blob(pStmt, 0);
+        nPg = sqlite3_column_bytes(pStmt, 0);
         if( pgno==1 && nPg==p->pgsz && 0==memcmp(p->pPage1Cache, aPg, nPg) ){
           aPg = p->pPage1Disk;
         }
@@ -2528,8 +2530,8 @@ static void recoverInstallWrapper(sqlite3_recover *p){
 ** held when this function is called.
 */
 static void recoverUninstallWrapper(sqlite3_recover *p){
-  recoverAssertMutexHeld();
   sqlite3_file *pFd = 0;
+  recoverAssertMutexHeld();
   sqlite3_file_control(p->dbIn, p->zDb,SQLITE_FCNTL_FILE_POINTER,(void*)&pFd);
   if( pFd && pFd->pMethods ){
     pFd->pMethods = recover_g.pMethods;
diff --git a/manifest b/manifest
index b88ee5ad90..07294871f7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\s#ifdef\sinvolving\sSQLITE_OS_KV\sthat\swas\sadding\scode\sunnecessarily.
-D 2022-11-01T13:12:20.513
+C Fix\scompilation\serrors\sin\sthe\srecover\sAPI\sseen\swith\sMSVC.
+D 2022-11-01T14:13:05.112
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -398,7 +398,7 @@ F ext/recover/recoverpgsz.test 93e970eab05e4e89f8fd6b1bd23f9ec137ea09857e66ba0d4
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
 F ext/recover/recoverslowidx.test f356bb9fba7ffd6fc50e045e419464f0129ac6e24decf6e919584f79c3493727
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
-F ext/recover/sqlite3recover.c 0b9962b4fb4f9af408e9a1a535bb77a0a89d871040e429909225d09c2285bc6a
+F ext/recover/sqlite3recover.c 7eb4bdb249b979dae34723ea71a356ad6667df4f848d63a5462e81ac127d21ae
 F ext/recover/sqlite3recover.h f698ccc94bd4da38761035415ad08c4549a408491ff9fd5f52d34d2214f64e36
 F ext/recover/test_recover.c 61ec931e47abca6b2210f46239cafd9f3060741605e3d3c45a7c7a53f63dd957
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -2054,8 +2054,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 88a05141c28e5ff1357c3c599493e4ffb8f3821bab04be80244deac62e49135c
-R f61fe44f0a9f4aa5e8b7b1d8cb7aafca
-U drh
-Z a22eca35ee43b99ebcb7efc4ac7709fc
+P b6c1b6e4a3bc21c40d6faca6f70842df5201f21c96a076a895410660630461c0
+R 8ed6b3007f662ca34a8779a141508876
+U mistachkin
+Z b5fe103640025881e47477a5f031a9c6
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 213d245adc..11435bbc11 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b6c1b6e4a3bc21c40d6faca6f70842df5201f21c96a076a895410660630461c0
\ No newline at end of file
+78d17c4fedc1629bf161f9858f2b8bf35506155ccaa0acc084b419d244d4f75d
\ No newline at end of file

From 52d5d474f5497a34e6167b9aeee9ad1e47588da3 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Tue, 1 Nov 2022 17:43:19 +0000
Subject: [PATCH 409/428] Instead of (const char*), use a special type -
 sqlite3_filename - as the filename argument passed to VFS method xOpen().

FossilOrigin-Name: bd1fe4de8a2e8b8de19a7f90b9fdafb641ad11a6f0c96c0b4495d5bf80885675
---
 manifest         | 21 ++++++++++++---------
 manifest.uuid    |  2 +-
 src/main.c       |  8 ++++----
 src/sqlite.h.in  | 42 +++++++++++++++++++++++++++++++-----------
 src/sqlite3ext.h |  4 ++--
 5 files changed, 50 insertions(+), 27 deletions(-)

diff --git a/manifest b/manifest
index 07294871f7..d9ec047a83 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\scompilation\serrors\sin\sthe\srecover\sAPI\sseen\swith\sMSVC.
-D 2022-11-01T14:13:05.112
+C Instead\sof\s(const\schar*),\suse\sa\sspecial\stype\s-\ssqlite3_filename\s-\sas\sthe\sfilename\sargument\spassed\sto\sVFS\smethod\sxOpen().
+D 2022-11-01T17:43:19.845
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -599,7 +599,7 @@ F src/insert.c 90a32bc7faa755cd5292ade21d2b3c6edba8fd1d70754a364caccabfde2c3bb2
 F src/json.c 7749b98c62f691697c7ee536b570c744c0583cab4a89200fdd0fc2aa8cc8cbd6
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 8086232d10e51e183a7f64199815bad1c579896354db69435347665f62f481e9
-F src/main.c 9cfec10a066121554edc9058156c412b9dc4550680c588122b67b445bb91e271
+F src/main.c fa53bb2ae09549dab5629271c3cfd681f89059f5192afaaaf5c0d396bb3957fe
 F src/malloc.c dfddca1e163496c0a10250cedeafaf56dff47673e0f15888fb0925340a8e3f90
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@ -638,9 +638,9 @@ F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 12cb5162e606290354f9512ff0c30fc6dc4d7a77a92b6c5b581395f9c4edd047
 F src/shell.c.in bde69ad6a9887396c87d089da84c0fe1e432957faebd9206b9185be735341104
-F src/sqlite.h.in d9c8a6243fc0a1c270d69db33758e34b810af3462f9bc5b4af113b347e07c69d
+F src/sqlite.h.in bf5846820130b6cf01b002e90427eae29f02db07d9cb9b5ccd0e0aad867eed14
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
-F src/sqlite3ext.h 5336beea1868d99d2f62e628dbea55e97267dbff8193291ab175e960c5df9141
+F src/sqlite3ext.h c4b9fa7a7e2bcdf850cfeb4b8a91d5ec47b7a00033bc996fd2ee96cbf2741f5f
 F src/sqliteInt.h 2c24ba38f78e32fe5d7ec136321a6ad827698b33ca98664970a8b7274d69ef7c
 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
@@ -2054,8 +2054,11 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P b6c1b6e4a3bc21c40d6faca6f70842df5201f21c96a076a895410660630461c0
-R 8ed6b3007f662ca34a8779a141508876
-U mistachkin
-Z b5fe103640025881e47477a5f031a9c6
+P 78d17c4fedc1629bf161f9858f2b8bf35506155ccaa0acc084b419d244d4f75d
+R d6f4dd34441d21f0221621a80542629d
+T *branch * sqlite3_filename
+T *sym-sqlite3_filename *
+T -sym-trunk *
+U dan
+Z 2fb2647049877153f1471b440a0d1d12
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 11435bbc11..50aecc886c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-78d17c4fedc1629bf161f9858f2b8bf35506155ccaa0acc084b419d244d4f75d
\ No newline at end of file
+bd1fe4de8a2e8b8de19a7f90b9fdafb641ad11a6f0c96c0b4495d5bf80885675
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index 5a372aa30e..b0645efe61 100644
--- a/src/main.c
+++ b/src/main.c
@@ -4510,7 +4510,7 @@ static char *appendText(char *p, const char *z){
 ** Memory layout must be compatible with that generated by the pager
 ** and expected by sqlite3_uri_parameter() and databaseName().
 */
-char *sqlite3_create_filename(
+const char *sqlite3_create_filename(
   const char *zDatabase,
   const char *zJournal,
   const char *zWal,
@@ -4546,10 +4546,10 @@ char *sqlite3_create_filename(
 ** error to call this routine with any parameter other than a pointer
 ** previously obtained from sqlite3_create_filename() or a NULL pointer.
 */
-void sqlite3_free_filename(char *p){
+void sqlite3_free_filename(const char *p){
   if( p==0 ) return;
-  p = (char*)databaseName(p);
-  sqlite3_free(p - 4);
+  p = databaseName(p);
+  sqlite3_free((char*)p - 4);
 }
 
 
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 7a697305e6..6271a9becc 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -1263,6 +1263,26 @@ typedef struct sqlite3_mutex sqlite3_mutex;
 */
 typedef struct sqlite3_api_routines sqlite3_api_routines;
 
+/*
+** CAPI3REF: File Name
+**
+** Type [sqlite3_filename] is used by SQLite to pass filenames to the
+** xOpen method of a [VFS]. It may be cast to (const char*) and treated
+** as a normal, nul-terminated, UTF-8 buffer containing the filename, but
+** may also be passed to special APIs such as:
+**
+** <ul>
+** <li>  sqlite3_filename_database()
+** <li>  sqlite3_filename_journal()
+** <li>  sqlite3_filename_wal()
+** <li>  sqlite3_uri_parameter()
+** <li>  sqlite3_uri_boolean()
+** <li>  sqlite3_uri_int64()
+** <li>  sqlite3_uri_key()
+** </ul>
+*/
+typedef const char *sqlite3_filename;
+
 /*
 ** CAPI3REF: OS Interface Object
 **
@@ -1441,7 +1461,7 @@ struct sqlite3_vfs {
   sqlite3_vfs *pNext;      /* Next registered VFS */
   const char *zName;       /* Name of this virtual file system */
   void *pAppData;          /* Pointer to application-specific data */
-  int (*xOpen)(sqlite3_vfs*, const char *zName, sqlite3_file*,
+  int (*xOpen)(sqlite3_vfs*, sqlite3_filename zName, sqlite3_file*,
                int flags, int *pOutFlags);
   int (*xDelete)(sqlite3_vfs*, const char *zName, int syncDir);
   int (*xAccess)(sqlite3_vfs*, const char *zName, int flags, int *pResOut);
@@ -3711,10 +3731,10 @@ int sqlite3_open_v2(
 **
 ** See the [URI filename] documentation for additional information.
 */
-const char *sqlite3_uri_parameter(const char *zFilename, const char *zParam);
-int sqlite3_uri_boolean(const char *zFile, const char *zParam, int bDefault);
-sqlite3_int64 sqlite3_uri_int64(const char*, const char*, sqlite3_int64);
-const char *sqlite3_uri_key(const char *zFilename, int N);
+const char *sqlite3_uri_parameter(sqlite3_filename z, const char *zParam);
+int sqlite3_uri_boolean(sqlite3_filename z, const char *zParam, int bDefault);
+sqlite3_int64 sqlite3_uri_int64(sqlite3_filename, const char*, sqlite3_int64);
+const char *sqlite3_uri_key(sqlite3_filename z, int N);
 
 /*
 ** CAPI3REF:  Translate filenames
@@ -3743,9 +3763,9 @@ const char *sqlite3_uri_key(const char *zFilename, int N);
 ** return value from [sqlite3_db_filename()], then the result is
 ** undefined and is likely a memory access violation.
 */
-const char *sqlite3_filename_database(const char*);
-const char *sqlite3_filename_journal(const char*);
-const char *sqlite3_filename_wal(const char*);
+const char *sqlite3_filename_database(sqlite3_filename);
+const char *sqlite3_filename_journal(sqlite3_filename);
+const char *sqlite3_filename_wal(sqlite3_filename);
 
 /*
 ** CAPI3REF:  Database File Corresponding To A Journal
@@ -3811,14 +3831,14 @@ sqlite3_file *sqlite3_database_file_object(const char*);
 ** then the corresponding [sqlite3_module.xClose() method should also be
 ** invoked prior to calling sqlite3_free_filename(Y).
 */
-char *sqlite3_create_filename(
+sqlite3_filename sqlite3_create_filename(
   const char *zDatabase,
   const char *zJournal,
   const char *zWal,
   int nParam,
   const char **azParam
 );
-void sqlite3_free_filename(char*);
+void sqlite3_free_filename(sqlite3_filename);
 
 /*
 ** CAPI3REF: Error Codes And Messages
@@ -6352,7 +6372,7 @@ const char *sqlite3_db_name(sqlite3 *db, int N);
 ** <li> [sqlite3_filename_wal()]
 ** </ul>
 */
-const char *sqlite3_db_filename(sqlite3 *db, const char *zDbName);
+sqlite3_filename sqlite3_db_filename(sqlite3 *db, const char *zDbName);
 
 /*
 ** CAPI3REF: Determine if a database is read-only
diff --git a/src/sqlite3ext.h b/src/sqlite3ext.h
index 964af09c0e..79702d7b21 100644
--- a/src/sqlite3ext.h
+++ b/src/sqlite3ext.h
@@ -331,9 +331,9 @@ struct sqlite3_api_routines {
   const char *(*filename_journal)(const char*);
   const char *(*filename_wal)(const char*);
   /* Version 3.32.0 and later */
-  char *(*create_filename)(const char*,const char*,const char*,
+  const char *(*create_filename)(const char*,const char*,const char*,
                            int,const char**);
-  void (*free_filename)(char*);
+  void (*free_filename)(const char*);
   sqlite3_file *(*database_file_object)(const char*);
   /* Version 3.34.0 and later */
   int (*txn_state)(sqlite3*,const char*);

From 6da7cc9b4ccc95912c54d319d212d59d5d24d552 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Tue, 1 Nov 2022 18:56:39 +0000
Subject: [PATCH 410/428] Fix harmless compiler warnings.

FossilOrigin-Name: de829770aa0f59b4cd3ab1dc5eec90be82663dca3199c2cf6d97f4c41ce9f799
---
 ext/recover/sqlite3recover.c |  2 +-
 manifest                     | 19 ++++++++-----------
 manifest.uuid                |  2 +-
 src/test_multiplex.c         |  2 +-
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index daeb1cc48a..4bb70f8458 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -2687,7 +2687,7 @@ sqlite3_recover *recoverInit(
     pRet->zDb = (char*)&pRet[1];
     pRet->zUri = &pRet->zDb[nDb+1];
     memcpy(pRet->zDb, zDb, nDb);
-    if( nUri>0 ) memcpy(pRet->zUri, zUri, nUri);
+    if( nUri>0 && zUri ) memcpy(pRet->zUri, zUri, nUri);
     pRet->xSql = xSql;
     pRet->pSqlCtx = pSqlCtx;
     pRet->bRecoverRowid = RECOVER_ROWID_DEFAULT;
diff --git a/manifest b/manifest
index d9ec047a83..6d21fb2b56 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Instead\sof\s(const\schar*),\suse\sa\sspecial\stype\s-\ssqlite3_filename\s-\sas\sthe\sfilename\sargument\spassed\sto\sVFS\smethod\sxOpen().
-D 2022-11-01T17:43:19.845
+C Fix\sharmless\scompiler\swarnings.
+D 2022-11-01T18:56:39.349
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -398,7 +398,7 @@ F ext/recover/recoverpgsz.test 93e970eab05e4e89f8fd6b1bd23f9ec137ea09857e66ba0d4
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
 F ext/recover/recoverslowidx.test f356bb9fba7ffd6fc50e045e419464f0129ac6e24decf6e919584f79c3493727
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
-F ext/recover/sqlite3recover.c 7eb4bdb249b979dae34723ea71a356ad6667df4f848d63a5462e81ac127d21ae
+F ext/recover/sqlite3recover.c 63d749775290776fcf4eb2635622aa09d43470b64c15960ce34c0f8dda6e3c10
 F ext/recover/sqlite3recover.h f698ccc94bd4da38761035415ad08c4549a408491ff9fd5f52d34d2214f64e36
 F ext/recover/test_recover.c 61ec931e47abca6b2210f46239cafd9f3060741605e3d3c45a7c7a53f63dd957
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -675,7 +675,7 @@ F src/test_journal.c a0b9709b2f12b1ec819eea8a1176f283bca6d688a6d4a502bd6fd79786f
 F src/test_loadext.c 337056bae59f80b9eb00ba82088b39d0f4fe6dfd
 F src/test_malloc.c 21121ea85b49ec0bdb69995847cef9036ef9beca3ce63bbb776e4ea2ecc44b97
 F src/test_md5.c 7268e1e8c399d4a5e181b64ac20e1e6f3bc4dd9fc87abac02db145a3d951fa8c
-F src/test_multiplex.c 1b23782212a01349fac382913ef82b8de4ae8a4cb46556602c2ee733edabbbc9
+F src/test_multiplex.c d8bc260a57c2028946a9bce9918d24e69e44cebd71ac6be240aa5b6b75e2b369
 F src/test_multiplex.h 5436d03f2d0501d04f3ed50a75819e190495b635
 F src/test_mutex.c abf486e91bd65e2448027d4bb505e7cce6ba110e1afb9bd348d1996961cadf0d
 F src/test_onefile.c f31e52e891c5fef6709b9fcef54ce660648a34172423a9cbdf4cbce3ba0049f4
@@ -2054,11 +2054,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 78d17c4fedc1629bf161f9858f2b8bf35506155ccaa0acc084b419d244d4f75d
-R d6f4dd34441d21f0221621a80542629d
-T *branch * sqlite3_filename
-T *sym-sqlite3_filename *
-T -sym-trunk *
-U dan
-Z 2fb2647049877153f1471b440a0d1d12
+P bd1fe4de8a2e8b8de19a7f90b9fdafb641ad11a6f0c96c0b4495d5bf80885675
+R 4bc99ce0536a6d4bfa62e67f4cbaae6f
+U drh
+Z 7d1b7257636379ffa5427e4fa5a84909
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 50aecc886c..34498255f1 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bd1fe4de8a2e8b8de19a7f90b9fdafb641ad11a6f0c96c0b4495d5bf80885675
\ No newline at end of file
+de829770aa0f59b4cd3ab1dc5eec90be82663dca3199c2cf6d97f4c41ce9f799
\ No newline at end of file
diff --git a/src/test_multiplex.c b/src/test_multiplex.c
index ff12817158..226131f75c 100644
--- a/src/test_multiplex.c
+++ b/src/test_multiplex.c
@@ -272,7 +272,7 @@ static int multiplexSubFilename(multiplexGroup *pGroup, int iChunk){
       return SQLITE_NOMEM;
     }
     multiplexFilename(pGroup->zName, pGroup->nName, pGroup->flags, iChunk, z);
-    pGroup->aReal[iChunk].z = sqlite3_create_filename(z,"","",0,0);
+    pGroup->aReal[iChunk].z = (char*)sqlite3_create_filename(z,"","",0,0);
     sqlite3_free(z);
     if( pGroup->aReal[iChunk].z==0 ) return SQLITE_NOMEM;
   }

From b9f8ff0e8f432ad157a83f7abc59c560c671c5ba Mon Sep 17 00:00:00 2001
From: drh <>
Date: Tue, 1 Nov 2022 21:42:50 +0000
Subject: [PATCH 411/428] Fix a harmless compiler warning.

FossilOrigin-Name: 663a89164fdd43529a13cab4b9d9f04fe519e7c6b954f9c91e32e4d7ae25eb46
---
 ext/recover/sqlite3recover.c |  5 ++++-
 manifest                     | 15 +++++++--------
 manifest.uuid                |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index 4bb70f8458..f51ee41291 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -2010,7 +2010,10 @@ static void recoverFinalCleanup(sqlite3_recover *p){
   p->pGetPage = 0;
 
   {
-    int res = sqlite3_close(p->dbOut);
+#ifdef SQLITE_DEBUG
+    int res = 
+#endif
+       sqlite3_close(p->dbOut);
     assert( res==SQLITE_OK );
   }
   p->dbOut = 0;
diff --git a/manifest b/manifest
index 45b6d0a6bf..52ff313863 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Instead\sof\s(const\schar*),\suse\sa\sspecial\stype\s-\ssqlite3_filename\s-\sas\sthe\sfilename\sargument\spassed\sto\sVFS\smethod\sxOpen().
-D 2022-11-01T19:35:54.477
+C Fix\sa\sharmless\scompiler\swarning.
+D 2022-11-01T21:42:50.260
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -398,7 +398,7 @@ F ext/recover/recoverpgsz.test 93e970eab05e4e89f8fd6b1bd23f9ec137ea09857e66ba0d4
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
 F ext/recover/recoverslowidx.test f356bb9fba7ffd6fc50e045e419464f0129ac6e24decf6e919584f79c3493727
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
-F ext/recover/sqlite3recover.c 63d749775290776fcf4eb2635622aa09d43470b64c15960ce34c0f8dda6e3c10
+F ext/recover/sqlite3recover.c 903569a39d4af37a59e031dd71c8e023e897962b1aac5ae9f0363b7351552777
 F ext/recover/sqlite3recover.h f698ccc94bd4da38761035415ad08c4549a408491ff9fd5f52d34d2214f64e36
 F ext/recover/test_recover.c 61ec931e47abca6b2210f46239cafd9f3060741605e3d3c45a7c7a53f63dd957
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -2054,9 +2054,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 78d17c4fedc1629bf161f9858f2b8bf35506155ccaa0acc084b419d244d4f75d de829770aa0f59b4cd3ab1dc5eec90be82663dca3199c2cf6d97f4c41ce9f799
-R 4bc99ce0536a6d4bfa62e67f4cbaae6f
-T +closed de829770aa0f59b4cd3ab1dc5eec90be82663dca3199c2cf6d97f4c41ce9f799
-U dan
-Z d6d95c54aad641d986a1bac14e5407be
+P 90df04e5a25907e748227c484b601b7dbd87c037556a0e87f8423f529d08bb6b
+R 30e62bf4d97fbf6a5ecd162aed479b05
+U drh
+Z cdaea71a1d5c316b60f8cd73cf8b9961
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 17050b4d91..3dfdebd2d2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-90df04e5a25907e748227c484b601b7dbd87c037556a0e87f8423f529d08bb6b
\ No newline at end of file
+663a89164fdd43529a13cab4b9d9f04fe519e7c6b954f9c91e32e4d7ae25eb46
\ No newline at end of file

From f170b97985c8944d195aef01e159fbc627df1197 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 2 Nov 2022 08:10:22 +0000
Subject: [PATCH 412/428] Fix a missing symbol in non-SQLITE_DEBUG builds.

FossilOrigin-Name: 17cdcad627205cdc8ae8114df44ad2a44e59603200efb238fbbb5c30ea0a453e
---
 ext/recover/sqlite3recover.c |  2 ++
 manifest                     | 14 +++++++-------
 manifest.uuid                |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index f51ee41291..f81ddf302a 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -2014,7 +2014,9 @@ static void recoverFinalCleanup(sqlite3_recover *p){
     int res = 
 #endif
        sqlite3_close(p->dbOut);
+#ifdef SQLITE_DEBUG
     assert( res==SQLITE_OK );
+#endif
   }
   p->dbOut = 0;
 }
diff --git a/manifest b/manifest
index 52ff313863..c37adcf603 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sharmless\scompiler\swarning.
-D 2022-11-01T21:42:50.260
+C Fix\sa\smissing\ssymbol\sin\snon-SQLITE_DEBUG\sbuilds.
+D 2022-11-02T08:10:22.314
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -398,7 +398,7 @@ F ext/recover/recoverpgsz.test 93e970eab05e4e89f8fd6b1bd23f9ec137ea09857e66ba0d4
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
 F ext/recover/recoverslowidx.test f356bb9fba7ffd6fc50e045e419464f0129ac6e24decf6e919584f79c3493727
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
-F ext/recover/sqlite3recover.c 903569a39d4af37a59e031dd71c8e023e897962b1aac5ae9f0363b7351552777
+F ext/recover/sqlite3recover.c bd0723710da404a85d9a4194d7b694e238118d3431df1b036c1090f3cb22c795
 F ext/recover/sqlite3recover.h f698ccc94bd4da38761035415ad08c4549a408491ff9fd5f52d34d2214f64e36
 F ext/recover/test_recover.c 61ec931e47abca6b2210f46239cafd9f3060741605e3d3c45a7c7a53f63dd957
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -2054,8 +2054,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 90df04e5a25907e748227c484b601b7dbd87c037556a0e87f8423f529d08bb6b
-R 30e62bf4d97fbf6a5ecd162aed479b05
-U drh
-Z cdaea71a1d5c316b60f8cd73cf8b9961
+P 663a89164fdd43529a13cab4b9d9f04fe519e7c6b954f9c91e32e4d7ae25eb46
+R 227ae1040979c47f4c4150c594db2a2c
+U stephan
+Z eb5eb9f9c505195d442f3d8d45ded094
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 3dfdebd2d2..93146abe21 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-663a89164fdd43529a13cab4b9d9f04fe519e7c6b954f9c91e32e4d7ae25eb46
\ No newline at end of file
+17cdcad627205cdc8ae8114df44ad2a44e59603200efb238fbbb5c30ea0a453e
\ No newline at end of file

From c18c8bf957f9b44ba1d87d8c43db66ff6d537d25 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 2 Nov 2022 08:49:05 +0000
Subject: [PATCH 413/428] Fix a symbol name typo which broke and
 exception-handling case in OPFS xOpen().

FossilOrigin-Name: 5bc83d569594e104e90b1acef1a5fd23655b2089de393a6776e799fdef2082f5
---
 ext/wasm/api/sqlite3-opfs-async-proxy.js |  3 ++-
 manifest                                 | 12 ++++++------
 manifest.uuid                            |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ext/wasm/api/sqlite3-opfs-async-proxy.js b/ext/wasm/api/sqlite3-opfs-async-proxy.js
index 3aa20fa634..e3c3b82146 100644
--- a/ext/wasm/api/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/api/sqlite3-opfs-async-proxy.js
@@ -435,7 +435,8 @@ const vfsAsyncImpls = {
       try {
         [hDir, filenamePart] = await getDirForFilename(filename, !!create);
       }catch(e){
-        storeAndNotify(opName, state.sql3Codes.SQLITE_NOTFOUND);
+        state.s11n.storeException(1,e);
+        storeAndNotify(opName, state.sq3Codes.SQLITE_NOTFOUND);
         mTimeEnd();
         wTimeEnd();
         return;
diff --git a/manifest b/manifest
index c37adcf603..83294c85a5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\smissing\ssymbol\sin\snon-SQLITE_DEBUG\sbuilds.
-D 2022-11-02T08:10:22.314
+C Fix\sa\ssymbol\sname\stypo\swhich\sbroke\sand\sexception-handling\scase\sin\sOPFS\sxOpen().
+D 2022-11-02T08:49:05.552
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -505,7 +505,7 @@ F ext/wasm/api/sqlite3-api-opfs.js 59b278ed00764fc47ba88be0582ab3fc3ce725e02b6d8
 F ext/wasm/api/sqlite3-api-prologue.js 201b9ab9d101fdefa3175b02748ef39cba43bc7abe87a69b6faac24e58cd70f0
 F ext/wasm/api/sqlite3-api-worker1.js 4f920a54fb97d4ca50632d45bd7d011a55016eb5a5883725033abb450903bc6f
 F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
-F ext/wasm/api/sqlite3-opfs-async-proxy.js 2627bf8dc04c24783a55de40d8a6d18da31e81a9bb926a5b672b402f582099b5
+F ext/wasm/api/sqlite3-opfs-async-proxy.js 9815bd045b638af06350bfe04eaaae17ddf33c3593a9ca2d3f7fdbfd3c6a2205
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 14ac9c03f6585332f882703f3427f11ffe8ffe8b6c0e252be2c518f7aac6ab6a
 F ext/wasm/api/sqlite3-worker1-promiser.js 0c7a9826dbf82a5ed4e4f7bf7816e825a52aff253afbf3350431f5773faf0e4b
@@ -2054,8 +2054,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 663a89164fdd43529a13cab4b9d9f04fe519e7c6b954f9c91e32e4d7ae25eb46
-R 227ae1040979c47f4c4150c594db2a2c
+P 17cdcad627205cdc8ae8114df44ad2a44e59603200efb238fbbb5c30ea0a453e
+R b5852b88f4b76c009c5011f611c070bf
 U stephan
-Z eb5eb9f9c505195d442f3d8d45ded094
+Z 3a7fb0297f0bfd236153f29f2af79966
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 93146abe21..51bcea29bb 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-17cdcad627205cdc8ae8114df44ad2a44e59603200efb238fbbb5c30ea0a453e
\ No newline at end of file
+5bc83d569594e104e90b1acef1a5fd23655b2089de393a6776e799fdef2082f5
\ No newline at end of file

From faff0410dc6de77edb727eac65c570e604599a83 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Wed, 2 Nov 2022 11:25:33 +0000
Subject: [PATCH 414/428] Emcc seems confused by SQLITE_DEBUG, for reasons
 unknown.  Use NDEBUG instead to simplify the #ifdef logic in
 sqlite3recover.c.

FossilOrigin-Name: 2610779ac84ac4a1a6901b6244653faf0c49ac6f0a4710a19aaf2a13106ae742
---
 ext/recover/sqlite3recover.c |  4 +---
 manifest                     | 14 +++++++-------
 manifest.uuid                |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index f81ddf302a..1597d4abf7 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -2010,13 +2010,11 @@ static void recoverFinalCleanup(sqlite3_recover *p){
   p->pGetPage = 0;
 
   {
-#ifdef SQLITE_DEBUG
+#ifndef NDEBUG
     int res = 
 #endif
        sqlite3_close(p->dbOut);
-#ifdef SQLITE_DEBUG
     assert( res==SQLITE_OK );
-#endif
   }
   p->dbOut = 0;
 }
diff --git a/manifest b/manifest
index 83294c85a5..618b053ced 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\ssymbol\sname\stypo\swhich\sbroke\sand\sexception-handling\scase\sin\sOPFS\sxOpen().
-D 2022-11-02T08:49:05.552
+C Emcc\sseems\sconfused\sby\sSQLITE_DEBUG,\sfor\sreasons\sunknown.\s\sUse\sNDEBUG\sinstead\nto\ssimplify\sthe\s#ifdef\slogic\sin\ssqlite3recover.c.
+D 2022-11-02T11:25:33.199
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -398,7 +398,7 @@ F ext/recover/recoverpgsz.test 93e970eab05e4e89f8fd6b1bd23f9ec137ea09857e66ba0d4
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
 F ext/recover/recoverslowidx.test f356bb9fba7ffd6fc50e045e419464f0129ac6e24decf6e919584f79c3493727
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
-F ext/recover/sqlite3recover.c bd0723710da404a85d9a4194d7b694e238118d3431df1b036c1090f3cb22c795
+F ext/recover/sqlite3recover.c 89488d58e45645f38eaf46d65c90434976da40b25304282f7a54858244d63d7e
 F ext/recover/sqlite3recover.h f698ccc94bd4da38761035415ad08c4549a408491ff9fd5f52d34d2214f64e36
 F ext/recover/test_recover.c 61ec931e47abca6b2210f46239cafd9f3060741605e3d3c45a7c7a53f63dd957
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -2054,8 +2054,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 17cdcad627205cdc8ae8114df44ad2a44e59603200efb238fbbb5c30ea0a453e
-R b5852b88f4b76c009c5011f611c070bf
-U stephan
-Z 3a7fb0297f0bfd236153f29f2af79966
+P 5bc83d569594e104e90b1acef1a5fd23655b2089de393a6776e799fdef2082f5
+R 9c17a1415bba7769c29ae72a7a64647a
+U drh
+Z c15361b7db363b8dd30434361c36431b
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 51bcea29bb..14e359d140 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5bc83d569594e104e90b1acef1a5fd23655b2089de393a6776e799fdef2082f5
\ No newline at end of file
+2610779ac84ac4a1a6901b6244653faf0c49ac6f0a4710a19aaf2a13106ae742
\ No newline at end of file

From f45c33701dde9412e6aeab464a8148ab112bb033 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 2 Nov 2022 11:53:31 +0000
Subject: [PATCH 415/428] Add sqlite3_wasm_vfs_create_file() to replace
 Emscripten's FS.createDataFile() in a (mostly) VFS-agnostic way. Add a test
 for worker1's export (to bytearray) support. Re-add worker1
 open-from-bytearray using sqlite3_wasm_vfs_create_file() but it's untested
 (requires a new interactive test app or maybe reconsideration).

FossilOrigin-Name: b35e1225c91a3cadc0d25af1e4e790237256d194990faa13190e343ed03e11c5
---
 ext/wasm/api/sqlite3-api-opfs.js         |   4 +-
 ext/wasm/api/sqlite3-api-prologue.js     |  75 +++++++++++------
 ext/wasm/api/sqlite3-api-worker1.js      |  50 +++++++++--
 ext/wasm/api/sqlite3-opfs-async-proxy.js |  16 +++-
 ext/wasm/api/sqlite3-wasm.c              | 102 ++++++++++++++++++++++-
 ext/wasm/demo-worker1-promiser.js        |   8 ++
 ext/wasm/demo-worker1.js                 |  20 ++---
 ext/wasm/tester1.js                      |  25 ++++++
 manifest                                 |  28 +++----
 manifest.uuid                            |   2 +-
 10 files changed, 264 insertions(+), 66 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index 90337d5279..86285df1d3 100644
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -316,6 +316,8 @@ const installOpfsVfs = function callee(options){
     */
     state.sq3Codes = Object.create(null);
     [
+      'SQLITE_ACCESS_EXISTS',
+      'SQLITE_ACCESS_READWRITE',
       'SQLITE_ERROR',
       'SQLITE_IOERR',
       'SQLITE_IOERR_ACCESS',
@@ -939,7 +941,7 @@ const installOpfsVfs = function callee(options){
     */
     opfsUtil.entryExists = async function(fsEntryName){
       try {
-        const [dh, fn] = await opfsUtil.getDirForFilename(filename);
+        const [dh, fn] = await opfsUtil.getDirForFilename(fsEntryName);
         await dh.getFileHandle(fn);
         return true;
       }catch(e){
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index 5e7f1bae2e..abee820cf9 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -162,33 +162,6 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     }
   });
 
-  /**
-     An Error subclass specifically for reporting DB-level errors and
-     enabling clients to unambiguously identify such exceptions.
-     The C-level APIs never throw, but some of the higher-level
-     C-style APIs do and the object-oriented APIs use exceptions
-     exclusively to report errors.
-  */
-  class SQLite3Error extends Error {
-    /**
-       Constructs this object with a message equal to all arguments
-       concatenated with a space between each one. As a special case,
-       if it's passed only a single integer argument, the string form
-       of that argument is the result of
-       sqlite3.capi.sqlite3_js_rc_str() or (if that returns falsy), a
-       synthesized string which contains that integer.
-    */
-    constructor(...args){
-      if(1===args.length && 'number'===typeof args[0] && args[0]===(args[0] | 0)){
-        super((capi.sqlite3_js_rc_str && capi.sqlite3_js_rc_str(args[0]))
-              || ("Unknown result code #"+args[0]));
-      }else{
-        super(args.join(' '));
-      }
-      this.name = 'SQLite3Error';
-    }
-  };
-
   /** 
       The main sqlite3 binding API gets installed into this object,
       mimicking the C API as closely as we can. The numerous members
@@ -219,6 +192,52 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
   */
   const wasm = Object.create(null);
 
+  /** Internal helper for SQLite3Error ctor. */
+  const __rcStr = (rc)=>{
+    return (capi.sqlite3_js_rc_str && capi.sqlite3_js_rc_str(rc))
+           || ("Unknown result code #"+rc);
+  };
+
+  /** Internal helper for SQLite3Error ctor. */
+  const __isInt = (n)=>'number'===typeof n && n===(n | 0);
+
+  /**
+     An Error subclass specifically for reporting DB-level errors and
+     enabling clients to unambiguously identify such exceptions.
+     The C-level APIs never throw, but some of the higher-level
+     C-style APIs do and the object-oriented APIs use exceptions
+     exclusively to report errors.
+  */
+  class SQLite3Error extends Error {
+    /**
+       Constructs this object with a message depending on its arguments:
+
+       - If it's passed only a single integer argument, it is assumed
+       to be an sqlite3 C API result code. The message becomes the
+       result of sqlite3.capi.sqlite3_js_rc_str() or (if that returns
+       falsy) a synthesized string which contains that integer.
+
+       - If passed 2 arguments and the 2nd is a object, it bevaves
+       like the Error(string,object) constructor except that the first
+       argument is subject to the is-integer semantics from the
+       previous point.
+
+       - Else all arguments are concatenated with a space between each
+       one, using args.join(' '), to create the error message.
+    */
+    constructor(...args){
+      if(1===args.length && __isInt(args[0])){
+        super(__rcStr(args[0]));
+      }else if(2===args.length && 'object'===typeof args){
+        if(__isInt(args[0])) super(__rcStr(args[0]), args[1]);
+        else super(...args);
+      }else{
+        super(args.join(' '));
+      }
+      this.name = 'SQLite3Error';
+    }
+  };
+
   /**
      Functionally equivalent to the SQLite3Error constructor but may
      be used as part of an expression, e.g.:
@@ -959,6 +978,8 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
   wasm.bindingSignatures.wasm = [
     ["sqlite3_wasm_db_reset", "int", "sqlite3*"],
     ["sqlite3_wasm_db_vfs", "sqlite3_vfs*", "sqlite3*","string"],
+    ["sqlite3_wasm_vfs_create_file", "int",
+     "sqlite3_vfs*","string","*", "int"],
     ["sqlite3_wasm_vfs_unlink", "int", "sqlite3_vfs*","string"]
   ];
 
diff --git a/ext/wasm/api/sqlite3-api-worker1.js b/ext/wasm/api/sqlite3-api-worker1.js
index 532d61b67e..32fbc5bb17 100644
--- a/ext/wasm/api/sqlite3-api-worker1.js
+++ b/ext/wasm/api/sqlite3-api-worker1.js
@@ -423,6 +423,15 @@ sqlite3.initWorker1API = function(){
     return wState.dbList[0] && getDbId(wState.dbList[0]);
   };
 
+  const guessVfs = function(filename){
+    const m = /^file:.+(vfs=(\w+))/.exec(filename);
+    return sqlite3.capi.sqlite3_vfs_find(m ? m[2] : 0);
+  };
+
+  const isSpecialDbFilename = (n)=>{
+    return ''===n || ':'===n[0];
+  };
+
   /**
      A level of "organizational abstraction" for the Worker1
      API. Each method in this object must map directly to a Worker1
@@ -441,11 +450,35 @@ sqlite3.initWorker1API = function(){
       }
       const rc = Object.create(null);
       const pDir = sqlite3.capi.sqlite3_wasmfs_opfs_dir();
-      if(!args.filename || ':memory:'===args.filename){
+      let byteArray, pVfs;
+      oargs.vfs = args.vfs;
+      if(isSpecialDbFilename(args.filename)){
         oargs.filename = args.filename || '';
       }else{
         oargs.filename = args.filename;
-        oargs.vfs = args.vfs;
+        byteArray = args.byteArray;
+        if(byteArray) pVfs = guessVfs(args.filename);
+      }
+      if(pVfs){
+        /* 2022-11-02: this feature is as-yet untested except that
+           sqlite3_wasm_vfs_create_file() has been tested from the
+           browser dev console. */
+        let pMem;
+        try{
+          pMem = sqlite3.wasm.allocFromTypedArray(byteArray);
+          const rc = sqlite3.wasm.sqlite3_wasm_vfs_create_file(
+            pVfs, oargs.filename, pMem, byteArray.byteLength
+          );
+          if(rc) sqlite3.SQLite3Error.toss(rc);
+        }catch(e){
+          throw new sqlite3.SQLite3Error(
+            e.name+' creating '+args.filename+": "+e.message, {
+              cause: e
+            }
+          );                           
+        }finally{
+          if(pMem) sqlite3.wasm.dealloc(pMem);
+        }
       }
       const db = wState.open(oargs);
       rc.filename = db.filename;
@@ -462,10 +495,9 @@ sqlite3.initWorker1API = function(){
         filename: db && db.filename
       };
       if(db){
-        // Keep the "unlink" flag undocumented until we figure out how
-        // to apply it consistently, independent of the db storage.
-        wState.close(db, ((ev.args && 'object'===typeof ev.args)
-                          ? !!ev.args.unlink : false));
+        const doUnlink = ((ev.args && 'object'===typeof ev.args)
+                         ? !!ev.args.unlink : false);
+        wState.close(db, doUnlink);
       }
       return response;
     },
@@ -542,7 +574,7 @@ sqlite3.initWorker1API = function(){
        sqlite3_serialize(). Response is an object:
 
        {
-         bytearray: Uint8Array (db file contents),
+         byteArray:  Uint8Array (db file contents),
          filename: the current db filename,
          mimetype: 'application/x-sqlite3'
        }
@@ -550,11 +582,11 @@ sqlite3.initWorker1API = function(){
     export: function(ev){
       const db = getMsgDb(ev);
       const response = {
-        bytearray: sqlite3.capi.sqlite3_js_db_export(db.pointer),
+        byteArray: sqlite3.capi.sqlite3_js_db_export(db.pointer),
         filename: db.filename,
         mimetype: 'application/x-sqlite3'
       };
-      wState.xfer.push(response.bytearray.buffer);
+      wState.xfer.push(response.byteArray.buffer);
       return response;
     }/*export()*/,
 
diff --git a/ext/wasm/api/sqlite3-opfs-async-proxy.js b/ext/wasm/api/sqlite3-opfs-async-proxy.js
index e3c3b82146..86276910aa 100644
--- a/ext/wasm/api/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/api/sqlite3-opfs-async-proxy.js
@@ -230,6 +230,16 @@ const storeAndNotify = (opName, value)=>{
 const affirmNotRO = function(opName,fh){
   if(fh.readOnly) toss(opName+"(): File is read-only: "+fh.filenameAbs);
 };
+const affirmLocked = function(opName,fh){
+  //if(!fh.syncHandle) toss(opName+"(): File does not have a lock: "+fh.filenameAbs);
+  /**
+     Currently a no-op, as speedtest1 triggers xRead() without a
+     lock (that seems like a bug but it's currently uninvestigated).
+     This means, however, that some OPFS VFS routines may trigger
+     acquisition of a lock but never let it go until xUnlock() is
+     called (which it likely won't be if xLock() was not called).
+  */
+};
 
 /**
    We track 2 different timers: the "metrics" timer records how much
@@ -395,6 +405,7 @@ const vfsAsyncImpls = {
     let rc;
     wTimeStart('xFileSize');
     try{
+      affirmLocked('xFileSize',fh);
       rc = await (await getSyncHandle(fh)).getSize();
       state.s11n.serialize(Number(rc));
       rc = 0;
@@ -473,6 +484,7 @@ const vfsAsyncImpls = {
     let rc = 0, nRead;
     const fh = __openFiles[fid];
     try{
+      affirmLocked('xRead',fh);
       wTimeStart('xRead');
       nRead = (await getSyncHandle(fh)).read(
         fh.sabView.subarray(0, n),
@@ -515,6 +527,7 @@ const vfsAsyncImpls = {
     const fh = __openFiles[fid];
     wTimeStart('xTruncate');
     try{
+      affirmLocked('xTruncate',fh);
       affirmNotRO('xTruncate', fh);
       await (await getSyncHandle(fh)).truncate(size);
     }catch(e){
@@ -547,9 +560,10 @@ const vfsAsyncImpls = {
   xWrite: async function(fid/*sqlite3_file pointer*/,n,offset64){
     mTimeStart('xWrite');
     let rc;
+    const fh = __openFiles[fid];
     wTimeStart('xWrite');
     try{
-      const fh = __openFiles[fid];
+      affirmLocked('xWrite',fh);
       affirmNotRO('xWrite', fh);
       rc = (
         n === (await getSyncHandle(fh))
diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index 1ca51f0d2f..62082edda0 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -12,7 +12,6 @@
 **
 ** emcc -o sqlite3.wasm ... -I/path/to/sqlite3-c-and-h sqlite3-wasm.c
 */
-
 #define SQLITE_WASM
 #ifdef SQLITE_WASM_ENABLE_C_TESTS
 /*
@@ -928,8 +927,8 @@ int sqlite3_wasm_db_export_chunked( sqlite3* pDb,
 ** sqlite3_free() to free it.
 */
 SQLITE_WASM_KEEP
-int sqlite3_wasm_db_serialize( sqlite3* pDb, unsigned char **pOut,
-                               sqlite3_int64 * nOut, unsigned int mFlags ){
+int sqlite3_wasm_db_serialize( sqlite3 *pDb, unsigned char **pOut,
+                               sqlite3_int64 *nOut, unsigned int mFlags ){
   unsigned char * z;
   if( !pDb || !pOut ) return SQLITE_MISUSE;
   if(nOut) *nOut = 0;
@@ -942,6 +941,103 @@ int sqlite3_wasm_db_serialize( sqlite3* pDb, unsigned char **pOut,
   }
 }
 
+/*
+** This function is NOT part of the sqlite3 public API. It is strictly
+** for use by the sqlite project's own JS/WASM bindings.
+**
+** Creates a new file using the I/O API of the given VFS, containing
+** the given number of bytes of the given data. If the file exists,
+** it is truncated to the given length and populated with the given
+** data.
+**
+** This function exists so that we can implement the equivalent of
+** Emscripten's FS.createDataFile() in a VFS-agnostic way. This
+** functionality is intended for use in uploading database files.
+**
+** If pVfs is NULL, sqlite3_vfs_find(0) is used.
+**
+** If zFile is NULL, pVfs is NULL (and sqlite3_vfs_find(0) returns
+** NULL), or nData is negative, SQLITE_MISUSE are returned.
+**
+** On success, it creates a new file with the given name, populated
+** with the fist nData bytes of pData. If pData is NULL, the file is
+** created and/or truncated to nData bytes.
+**
+** Whether or not directory components of zFilename are created
+** automatically or not is unspecified: that detail is left to the
+** VFS. The "opfs" VFS, for example, create them.
+**
+** Not all VFSes support this functionality, e.g. the "kvvfs" does
+** not.
+**
+** If an error happens while populating or truncating the file, the
+** target file will be deleted (if needed) if this function created
+** it. If this function did not create it, it is not deleted but may
+** be left in an undefined state.
+**
+** Returns 0 on success. On error, it returns a code described above
+** or propagates a code from one of the I/O methods.
+**
+** Design note: nData is an integer, instead of int64, for WASM
+** portability, so that the API can still work in builds where BigInt
+** support is disabled or unavailable.
+*/
+SQLITE_WASM_KEEP
+int sqlite3_wasm_vfs_create_file( sqlite3_vfs *pVfs,
+                                  const char *zFilename,
+                                  const unsigned char * pData,
+                                  int nData ){
+  int rc;
+  sqlite3_file *pFile = 0;
+  sqlite3_io_methods const *pIo;
+  const int openFlags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE;
+  int flagsOut = 0;
+  int fileExisted = 0;
+  int doUnlock = 0;
+  const unsigned char *pPos = pData;
+  const int blockSize = 512
+    /* Because we are using pFile->pMethods->xWrite() for writing, and
+    ** it may have a buffer limit related to sqlite3's pager size, we
+    ** conservatively write in 512-byte blocks (smallest page
+    ** size). */;
+
+  if( !pVfs ) pVfs = sqlite3_vfs_find(0);
+  if( !pVfs || !zFilename || nData<0 ) return SQLITE_MISUSE;
+  pVfs->xAccess(pVfs, zFilename, SQLITE_ACCESS_EXISTS, &fileExisted);
+  rc = sqlite3OsOpenMalloc(pVfs, zFilename, &pFile, openFlags, &flagsOut);
+  if(rc) return rc;
+  pIo = pFile->pMethods;
+  if( pIo->xLock ) {
+    /* We need xLock() in order to accommodate the OPFS VFS, as it
+    ** obtains a writeable handle via the lock operation and releases
+    ** it in xUnlock(). If we don't do those here, we have to add code
+    ** to the VFS to account check whether it was locked before
+    ** xFileSize(), xTruncate(), and the like, and release the lock
+    ** only if it was unlocked when the op was started. */
+    rc = pIo->xLock(pFile, SQLITE_LOCK_EXCLUSIVE);
+    doUnlock = 0==rc;
+  }
+  if( 0==rc) rc = pIo->xTruncate(pFile, nData);
+  if( 0==rc && 0!=pData && nData>0 ){
+    while( 0==rc && nData>0 ){
+      const int n = nData>=blockSize ? blockSize : nData;
+      rc = pIo->xWrite(pFile, pPos, n, (sqlite3_int64)(pPos - pData));
+      nData -= n;
+      pPos += n;
+    }
+    if( 0==rc && nData>0 ){
+      assert(nData<512);
+      rc = pIo->xWrite(pFile, pPos, nData, (sqlite3_int64)(pPos - pData));
+    }
+  }
+  if( pIo->xUnlock && doUnlock!=0 ) pIo->xUnlock(pFile, SQLITE_LOCK_NONE);
+  pIo->xClose(pFile);
+  if( rc!=0 && 0==fileExisted ){
+    pVfs->xDelete(pVfs, zFilename, 1);
+  }
+  return rc;
+}
+
 /*
 ** This function is NOT part of the sqlite3 public API. It is strictly
 ** for use by the sqlite project's own JS/WASM bindings.
diff --git a/ext/wasm/demo-worker1-promiser.js b/ext/wasm/demo-worker1-promiser.js
index 3f50ef9e08..a65cc31b6e 100644
--- a/ext/wasm/demo-worker1-promiser.js
+++ b/ext/wasm/demo-worker1-promiser.js
@@ -248,6 +248,14 @@
         .assert(2===ev.resultRows[0][0]);
     });
 
+    await wtest('export', function(ev){
+      ev = ev.result;
+      T.assert('string' === typeof ev.filename)
+        .assert(ev.byteArray instanceof Uint8Array)
+        .assert(ev.byteArray.length > 1024)
+        .assert('application/x-sqlite3' === ev.mimetype);
+    });
+
     /***** close() tests must come last. *****/
     await wtest('close',{},function(ev){
       T.assert('string' === typeof ev.result.filename);
diff --git a/ext/wasm/demo-worker1.js b/ext/wasm/demo-worker1.js
index ac4e9f4234..cc63f3a7cc 100644
--- a/ext/wasm/demo-worker1.js
+++ b/ext/wasm/demo-worker1.js
@@ -229,16 +229,14 @@
       T.assert(1===ev.resultRows.length)
         .assert(2===ev.resultRows[0][0]);
     });
-    if(0){
-      // export requires reimpl. for portability reasons.
-      runOneTest('export',{}, function(ev){
-        ev = ev.result;
-        T.assert('string' === typeof ev.filename)
-          .assert(ev.buffer instanceof Uint8Array)
-          .assert(ev.buffer.length > 1024)
-          .assert('application/x-sqlite3' === ev.mimetype);
-      });
-    }
+    runOneTest('export',{}, function(ev){
+      ev = ev.result;
+      log("export result:",ev);
+      T.assert('string' === typeof ev.filename)
+        .assert(ev.byteArray instanceof Uint8Array)
+        .assert(ev.byteArray.length > 1024)
+        .assert('application/x-sqlite3' === ev.mimetype);
+    });
     /***** close() tests must come last. *****/
     runOneTest('close',{unlink:true},function(ev){
       ev = ev.result;
@@ -342,4 +340,6 @@
     }
   };
   log("Init complete, but async init bits may still be running.");
+  log("Installing Worker into global scope SW for dev purposes.");
+  self.SW = SW;
 })();
diff --git a/ext/wasm/tester1.js b/ext/wasm/tester1.js
index 4f32368701..825d529f6f 100644
--- a/ext/wasm/tester1.js
+++ b/ext/wasm/tester1.js
@@ -346,6 +346,11 @@
       }
       try{ throw new sqlite3.SQLite3Error(capi.SQLITE_SCHEMA) }
       catch(e){ T.assert('SQLITE_SCHEMA' === e.message) }
+      try{ sqlite3.SQLite3Error.toss(capi.SQLITE_CORRUPT,{cause: true}) }
+      catch(e){
+        T.assert('SQLITE_CORRUPT'===e.message)
+          .assert(true===e.cause);
+      }
     })
   ////////////////////////////////////////////////////////////////////
     .t('strglob/strlike', function(sqlite3){
@@ -1762,6 +1767,26 @@
           unlink();
         }
 
+        if(1){
+          // Sanity-test sqlite3_wasm_vfs_create_file()...
+          const fSize = 1379;
+          let sh;
+          try{
+            T.assert(!(await opfs.entryExists(filename)));
+            let rc = wasm.sqlite3_wasm_vfs_create_file(
+              pVfs, filename, null, fSize
+            );
+            T.assert(0===rc)
+              .assert(await opfs.entryExists(filename));
+            const fh = await opfs.rootDirectory.getFileHandle(filename);
+            sh = await fh.createSyncAccessHandle();
+            T.assert(fSize === await sh.getSize());
+          }finally{
+            if(sh) sh.close();
+            unlink();
+          }
+        }
+
         // Some sanity checks of the opfs utility functions...
         const testDir = '/sqlite3-opfs-'+opfs.randomFilename(12);
         const aDir = testDir+'/test/dir';
diff --git a/manifest b/manifest
index 618b053ced..d045e6e877 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Emcc\sseems\sconfused\sby\sSQLITE_DEBUG,\sfor\sreasons\sunknown.\s\sUse\sNDEBUG\sinstead\nto\ssimplify\sthe\s#ifdef\slogic\sin\ssqlite3recover.c.
-D 2022-11-02T11:25:33.199
+C Add\ssqlite3_wasm_vfs_create_file()\sto\sreplace\sEmscripten's\sFS.createDataFile()\sin\sa\s(mostly)\sVFS-agnostic\sway.\sAdd\sa\stest\sfor\sworker1's\sexport\s(to\sbytearray)\ssupport.\sRe-add\sworker1\sopen-from-bytearray\susing\ssqlite3_wasm_vfs_create_file()\sbut\sit's\suntested\s(requires\sa\snew\sinteractive\stest\sapp\sor\smaybe\sreconsideration).
+D 2022-11-02T11:53:31.000
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -501,13 +501,13 @@ F ext/wasm/api/pre-js.js 287e462f969342b032c03900e668099fa1471d852df7a472de5bc34
 F ext/wasm/api/sqlite3-api-cleanup.js ecdc69dbfccfe26146f04799fcfd4a6f5790d46e7e3b9b6e9b0491f92ed8ae34
 F ext/wasm/api/sqlite3-api-glue.js 9cfa26a9818532c80c2555bc98615de3b170d5db0cf4b141cc3aa83c33c8758f
 F ext/wasm/api/sqlite3-api-oo1.js e9a83489bbb4838ce0aee46eaaa9350e0e25a5b926b565e4f5ae8e840e4fbaed
-F ext/wasm/api/sqlite3-api-opfs.js 59b278ed00764fc47ba88be0582ab3fc3ce725e02b6d86459464cc029b9ac356
-F ext/wasm/api/sqlite3-api-prologue.js 201b9ab9d101fdefa3175b02748ef39cba43bc7abe87a69b6faac24e58cd70f0
-F ext/wasm/api/sqlite3-api-worker1.js 4f920a54fb97d4ca50632d45bd7d011a55016eb5a5883725033abb450903bc6f
+F ext/wasm/api/sqlite3-api-opfs.js cdcbb57acc66f4569ac9e18f9d13d5a3657d8aae195725c6324943da56c1005d
+F ext/wasm/api/sqlite3-api-prologue.js 1f97261b4d8a60a48f30ee41261e1c4a0c3efff35ae08d7ece243fcf49b3eee3
+F ext/wasm/api/sqlite3-api-worker1.js cac2f5c63f950f69b5249c9880d4cd385e914c354c459d4096ed5dbb1248de76
 F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
-F ext/wasm/api/sqlite3-opfs-async-proxy.js 9815bd045b638af06350bfe04eaaae17ddf33c3593a9ca2d3f7fdbfd3c6a2205
+F ext/wasm/api/sqlite3-opfs-async-proxy.js 936f57737eb65afc0f4c3494b93f7b02208055226a7b3cb58f551c38b03ab083
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c 14ac9c03f6585332f882703f3427f11ffe8ffe8b6c0e252be2c518f7aac6ab6a
+F ext/wasm/api/sqlite3-wasm.c 41f4c807d5e027d5dd61d507cb0a78d0cee5618220e100860ff4c45ed1bd7c78
 F ext/wasm/api/sqlite3-worker1-promiser.js 0c7a9826dbf82a5ed4e4f7bf7816e825a52aff253afbf3350431f5773faf0e4b
 F ext/wasm/api/sqlite3-worker1.js 1e54ea3d540161bcfb2100368a2fc0cad871a207b8336afee1c445715851ec54
 F ext/wasm/batch-runner.html 4deeed44fe41496dc6898d9fb17938ea3291f40f4bfb977e29d0cef96fbbe4c8
@@ -522,9 +522,9 @@ F ext/wasm/demo-123.js ebae30756585bca655b4ab2553ec9236a87c23ad24fc8652115dcedb0
 F ext/wasm/demo-jsstorage.html 409c4be4af5f207fb2877160724b91b33ea36a3cd8c204e8da1acb828ffe588e
 F ext/wasm/demo-jsstorage.js 44e3ae7ec2483b6c511384c3c290beb6f305c721186bcf5398ca4e00004a06b8
 F ext/wasm/demo-worker1-promiser.html 1de7c248c7c2cfd4a5783d2aa154bce62d74c6de98ab22f5786620b3354ed15f
-F ext/wasm/demo-worker1-promiser.js 988ce92220c1cf1dd95fcb6b59734f0ae677942469390ddd8a64f4bbb5f99821
+F ext/wasm/demo-worker1-promiser.js b85a2bb1b918db4f09dfa24419241cb3edad7791389425c2505092e9b715017d
 F ext/wasm/demo-worker1.html 2c178c1890a2beb5a5fecb1453e796d067a4b8d3d2a04d65ca2eb1ab2c68ef5d
-F ext/wasm/demo-worker1.js 117e4eedc62e103e287f0e4a694add7e13a200a4d7056e718645032288c4a8ab
+F ext/wasm/demo-worker1.js a619adffc98b75b66c633b00f747b856449a134a9a0357909287d80a182d70fa
 F ext/wasm/dist.make 481289899a07958439d07ee4302ff86235fa0fbb72f17ea05db2be90a94abf90
 F ext/wasm/fiddle.make e570ec1bfc7d803507a2e514fe32f673fe001b2114b85c73c3964a462ba8bcfc
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
@@ -549,7 +549,7 @@ F ext/wasm/test-opfs-vfs.html 1f2d672f3f3fce810dfd48a8d56914aba22e45c6834e262555
 F ext/wasm/test-opfs-vfs.js 44363db07b2a20e73b0eb1808de4400ca71b703af718d0fa6d962f15e73bf2ac
 F ext/wasm/tester1-worker.html 51bf39e2b87f974ae3d5bc3086e2fb36d258f3698c54f6e21ba4b3b99636fa27
 F ext/wasm/tester1.html 624ec41cd9f78a1f2b6d7df70aaa7a6394396b1f2455ecbd6de5775c1275b121
-F ext/wasm/tester1.js 157eb499aad3365e33a7d95d6847c1d58d533335bc19d79bd3bc700b6350d1a5
+F ext/wasm/tester1.js db50ca105d683d1089f540dae4c2baf89a3c101704a05f22cefdcb517587ae8c
 F ext/wasm/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd72273503ae7d5
 F ext/wasm/wasmfs.make fb2d3c4a298b12cf1ec994ad1d0f1d027ae297449b364cde43d2eb807d68048f
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
@@ -2054,8 +2054,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 5bc83d569594e104e90b1acef1a5fd23655b2089de393a6776e799fdef2082f5
-R 9c17a1415bba7769c29ae72a7a64647a
-U drh
-Z c15361b7db363b8dd30434361c36431b
+P 2610779ac84ac4a1a6901b6244653faf0c49ac6f0a4710a19aaf2a13106ae742
+R 54447cdf301faadeadecf9cb178cd6b7
+U stephan
+Z 0f92ea26c92634fd686db2350d9751fe
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 14e359d140..4b6ad41d7d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2610779ac84ac4a1a6901b6244653faf0c49ac6f0a4710a19aaf2a13106ae742
\ No newline at end of file
+b35e1225c91a3cadc0d25af1e4e790237256d194990faa13190e343ed03e11c5
\ No newline at end of file

From 12de518db46e0a83c9bb812c9127177e7ca52ad4 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Wed, 2 Nov 2022 13:09:14 +0000
Subject: [PATCH 416/428] Minor improvements to API documentation in comments
 for the recovery extension.

FossilOrigin-Name: ed1c3515ad6a988e07a8b4583fbc38be257e6eae7443b01a242b98207ce78162
---
 ext/recover/sqlite3recover.h | 21 +++++++++++++++++++--
 manifest                     | 14 +++++++-------
 manifest.uuid                |  2 +-
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/ext/recover/sqlite3recover.h b/ext/recover/sqlite3recover.h
index d0a37504e7..7a1cd1cd87 100644
--- a/ext/recover/sqlite3recover.h
+++ b/ext/recover/sqlite3recover.h
@@ -57,7 +57,25 @@ extern "C" {
 #endif
 
 /*
-** Opaque handle type.
+** An instance of the sqlite3_recover object represents a recovery
+** operation in progress.
+**
+** Constructors:
+**
+**    sqlite3_recover_init()
+**    sqlite3_recover_init_sql()
+**
+** Destructor:
+**
+**    sqlite3_recover_finish()
+**
+** Methods:
+**
+**    sqlite3_recover_config()
+**    sqlite3_recover_errcode()
+**    sqlite3_recover_errmsg()
+**    sqlite3_recover_run()
+**    sqlite3_recover_step()
 */
 typedef struct sqlite3_recover sqlite3_recover;
 
@@ -229,4 +247,3 @@ int sqlite3_recover_finish(sqlite3_recover*);
 #endif
 
 #endif /* ifndef _SQLITE_RECOVER_H */
-
diff --git a/manifest b/manifest
index d045e6e877..4c757be943 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\ssqlite3_wasm_vfs_create_file()\sto\sreplace\sEmscripten's\sFS.createDataFile()\sin\sa\s(mostly)\sVFS-agnostic\sway.\sAdd\sa\stest\sfor\sworker1's\sexport\s(to\sbytearray)\ssupport.\sRe-add\sworker1\sopen-from-bytearray\susing\ssqlite3_wasm_vfs_create_file()\sbut\sit's\suntested\s(requires\sa\snew\sinteractive\stest\sapp\sor\smaybe\sreconsideration).
-D 2022-11-02T11:53:31.000
+C Minor\simprovements\sto\sAPI\sdocumentation\sin\scomments\sfor\sthe\srecovery\nextension.
+D 2022-11-02T13:09:14.779
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -399,7 +399,7 @@ F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858b
 F ext/recover/recoverslowidx.test f356bb9fba7ffd6fc50e045e419464f0129ac6e24decf6e919584f79c3493727
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
 F ext/recover/sqlite3recover.c 89488d58e45645f38eaf46d65c90434976da40b25304282f7a54858244d63d7e
-F ext/recover/sqlite3recover.h f698ccc94bd4da38761035415ad08c4549a408491ff9fd5f52d34d2214f64e36
+F ext/recover/sqlite3recover.h 011c799f02deb70ab685916f6f538e6bb32c4e0025e79bfd0e24ff9c74820959
 F ext/recover/test_recover.c 61ec931e47abca6b2210f46239cafd9f3060741605e3d3c45a7c7a53f63dd957
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
 F ext/repair/checkfreelist.c e21f06995ff4efdc1622dcceaea4dcba2caa83ca2f31a1607b98a8509168a996
@@ -2054,8 +2054,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 2610779ac84ac4a1a6901b6244653faf0c49ac6f0a4710a19aaf2a13106ae742
-R 54447cdf301faadeadecf9cb178cd6b7
-U stephan
-Z 0f92ea26c92634fd686db2350d9751fe
+P b35e1225c91a3cadc0d25af1e4e790237256d194990faa13190e343ed03e11c5
+R a16d6e67f5c5ba22e134aa878c96eeeb
+U drh
+Z cc407503cda4120809bd1c2e059cd29e
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 4b6ad41d7d..da30602bc5 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b35e1225c91a3cadc0d25af1e4e790237256d194990faa13190e343ed03e11c5
\ No newline at end of file
+ed1c3515ad6a988e07a8b4583fbc38be257e6eae7443b01a242b98207ce78162
\ No newline at end of file

From 2cdcc7f01a30d75b9534213c1a0793af3f71ef3b Mon Sep 17 00:00:00 2001
From: drh <>
Date: Wed, 2 Nov 2022 14:08:26 +0000
Subject: [PATCH 417/428] Clarify documentation regarding the --recovery-db
 option to ".recover" and the magic 789 configuration option it is associated
 with.

FossilOrigin-Name: f6fa0cffa921ccde8910e7fa4a63c2e4ef8ddb376c8ce99e436b27ac332c4498
---
 ext/recover/sqlite3recover.c |  5 +++++
 manifest                     | 16 ++++++++--------
 manifest.uuid                |  2 +-
 src/shell.c.in               | 10 +++++++---
 test/fuzzcheck.c             | 12 +++++-------
 5 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index 1597d4abf7..2952274ebb 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -2750,6 +2750,11 @@ int sqlite3_recover_config(sqlite3_recover *p, int op, void *pArg){
   }else{
     switch( op ){
       case 789:
+        /* This undocumented magic configuration option is used to set the
+        ** name of the auxiliary database that is ATTACH-ed to the database
+        ** connection and used to hold state information during the
+        ** recovery process.  This option is for debugging use only and
+        ** is subject to change or removal at any time. */
         sqlite3_free(p->zStateDb);
         p->zStateDb = recoverMPrintf(p, "%s", (char*)pArg);
         break;
diff --git a/manifest b/manifest
index 4c757be943..33c94a290f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\simprovements\sto\sAPI\sdocumentation\sin\scomments\sfor\sthe\srecovery\nextension.
-D 2022-11-02T13:09:14.779
+C Clarify\sdocumentation\sregarding\sthe\s--recovery-db\soption\sto\s".recover"\sand\nthe\smagic\s789\sconfiguration\soption\sit\sis\sassociated\swith.
+D 2022-11-02T14:08:26.051
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -398,7 +398,7 @@ F ext/recover/recoverpgsz.test 93e970eab05e4e89f8fd6b1bd23f9ec137ea09857e66ba0d4
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
 F ext/recover/recoverslowidx.test f356bb9fba7ffd6fc50e045e419464f0129ac6e24decf6e919584f79c3493727
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
-F ext/recover/sqlite3recover.c 89488d58e45645f38eaf46d65c90434976da40b25304282f7a54858244d63d7e
+F ext/recover/sqlite3recover.c d2feca815f489f3beed4af94b916e0cba046937b9cc760b0f2baacf1ae515fa2
 F ext/recover/sqlite3recover.h 011c799f02deb70ab685916f6f538e6bb32c4e0025e79bfd0e24ff9c74820959
 F ext/recover/test_recover.c 61ec931e47abca6b2210f46239cafd9f3060741605e3d3c45a7c7a53f63dd957
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -637,7 +637,7 @@ F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 12cb5162e606290354f9512ff0c30fc6dc4d7a77a92b6c5b581395f9c4edd047
-F src/shell.c.in bde69ad6a9887396c87d089da84c0fe1e432957faebd9206b9185be735341104
+F src/shell.c.in 84bb08d8762920285f08f1c0993f1b3992ac43af5d72445cb8a973fc50c71923
 F src/sqlite.h.in bf5846820130b6cf01b002e90427eae29f02db07d9cb9b5ccd0e0aad867eed14
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h c4b9fa7a7e2bcdf850cfeb4b8a91d5ec47b7a00033bc996fd2ee96cbf2741f5f
@@ -1153,7 +1153,7 @@ F test/fuzz3.test 9c813e6613b837cb7a277b0383cd66bfa07042b4cf0317157c35852f30043c
 F test/fuzz4.test c229bcdb45518a89e1d208a21343e061503460ac69fae1539320a89f572eb634
 F test/fuzz_common.tcl b7197de6ed1ee8250a4f82d67876f4561b42ee8cbbfc6160dcb66331bad3f830
 F test/fuzz_malloc.test f348276e732e814802e39f042b1f6da6362a610af73a528d8f76898fde6b22f2
-F test/fuzzcheck.c 277da15bc937e9c71ec0000223365e2e0d55366605ff12cb9c004575648a5029
+F test/fuzzcheck.c 30475c820dc5ab8a87fa3be1fe8ba8199ebfe2544508a759d653688d8d168766
 F test/fuzzdata1.db 3e86d9cf5aea68ddb8e27c02d7dfdaa226347426c7eb814918e4d95475bf8517
 F test/fuzzdata2.db 128b3feeb78918d075c9b14b48610145a0dd4c8d6f1ca7c2870c7e425f5bf31f
 F test/fuzzdata3.db c6586d3e3cef0fbc18108f9bb649aa77bfc38aba
@@ -2054,8 +2054,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 b35e1225c91a3cadc0d25af1e4e790237256d194990faa13190e343ed03e11c5
-R a16d6e67f5c5ba22e134aa878c96eeeb
+P ed1c3515ad6a988e07a8b4583fbc38be257e6eae7443b01a242b98207ce78162
+R 61e877321a6044c9940b1e7ec483318d
 U drh
-Z cc407503cda4120809bd1c2e059cd29e
+Z c1f74c9b622ab0020ca49c89b60463b4
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index da30602bc5..9f8575c32d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ed1c3515ad6a988e07a8b4583fbc38be257e6eae7443b01a242b98207ce78162
\ No newline at end of file
+f6fa0cffa921ccde8910e7fa4a63c2e4ef8ddb376c8ce99e436b27ac332c4498
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index 94be71be26..635361aa92 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -4515,7 +4515,6 @@ static const char *(azHelp[]) = {
 #if SQLITE_SHELL_HAVE_RECOVER
   ".recover                 Recover as much data as possible from corrupt db.",
   "   --ignore-freelist        Ignore pages that appear to be on db freelist",
-  "   --recovery-db NAME       Store recovery metadata in database file NAME",
   "   --lost-and-found TABLE   Alternative name for the lost-and-found table",
   "   --no-rowids              Do not attempt to recover rowid values",
   "                            that are not also INTEGER PRIMARY KEYs",
@@ -7304,7 +7303,7 @@ static int recoverSqlCb(void *pCtx, const char *zSql){
 */
 static int recoverDatabaseCmd(ShellState *pState, int nArg, char **azArg){
   int rc = SQLITE_OK;
-  const char *zRecoveryDb = "";   /* Name of "recovery" database */
+  const char *zRecoveryDb = "";   /* Name of "recovery" database.  Debug only */
   const char *zLAF = "lost_and_found";
   int bFreelist = 1;              /* 0 if --ignore-freelist is specified */
   int bRowids = 1;                /* 0 if --no-rowids */
@@ -7320,6 +7319,11 @@ static int recoverDatabaseCmd(ShellState *pState, int nArg, char **azArg){
       bFreelist = 0;
     }else
     if( n<=12 && memcmp("-recovery-db", z, n)==0 && i<(nArg-1) ){
+      /* This option determines the name of the ATTACH-ed database used
+      ** internally by the recovery extension.  The default is "" which
+      ** means to use a temporary database that is automatically deleted
+      ** when closed.  This option is undocumented and might disappear at
+      ** any moment. */
       i++;
       zRecoveryDb = azArg[i];
     }else
@@ -7341,7 +7345,7 @@ static int recoverDatabaseCmd(ShellState *pState, int nArg, char **azArg){
       pState->db, "main", recoverSqlCb, (void*)pState
   );
 
-  sqlite3_recover_config(p, 789, (void*)zRecoveryDb);
+  sqlite3_recover_config(p, 789, (void*)zRecoveryDb);  /* Debug use only */
   sqlite3_recover_config(p, SQLITE_RECOVER_LOST_AND_FOUND, (void*)zLAF);
   sqlite3_recover_config(p, SQLITE_RECOVER_ROWIDS, (void*)&bRowids);
   sqlite3_recover_config(p, SQLITE_RECOVER_FREELIST_CORRUPT,(void*)&bFreelist);
diff --git a/test/fuzzcheck.c b/test/fuzzcheck.c
index 406192239b..a0bcc3bf07 100644
--- a/test/fuzzcheck.c
+++ b/test/fuzzcheck.c
@@ -1000,15 +1000,13 @@ static int recoverSqlCb(void *pCtx, const char *zSql){
 ** This function is called to recover data from the database.
 */
 static int recoverDatabase(sqlite3 *db){
-  int rc = SQLITE_OK;
-  const char *zRecoveryDb = "";   /* Name of "recovery" database */
-  const char *zLAF = "lost_and_found";
-  int bFreelist = 1;
-  int bRowids = 1;
-  sqlite3_recover *p = 0;
+  int rc;                                 /* Return code from this routine */
+  const char *zLAF = "lost_and_found";    /* Name of "lost_and_found" table */
+  int bFreelist = 1;                      /* True to scan the freelist */
+  int bRowids = 1;                        /* True to restore ROWID values */
+  sqlite3_recover *p;                     /* The recovery object */
 
   p = sqlite3_recover_init_sql(db, "main", recoverSqlCb, 0);
-  sqlite3_recover_config(p, 789, (void*)zRecoveryDb);
   sqlite3_recover_config(p, SQLITE_RECOVER_LOST_AND_FOUND, (void*)zLAF);
   sqlite3_recover_config(p, SQLITE_RECOVER_ROWIDS, (void*)&bRowids);
   sqlite3_recover_config(p, SQLITE_RECOVER_FREELIST_CORRUPT,(void*)&bFreelist);

From de6186e04f96ddca46ab6a100b954a5db300fa1c Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Wed, 2 Nov 2022 14:08:59 +0000
Subject: [PATCH 418/428] Minor build cleanups and fix a harmless race
 condition in the OPFS part of tester1.js.

FossilOrigin-Name: 70ee6ee014bc4e2c1daa9b4a8909cf76ccecf32de1eb39055f20d3d0b1daa1bd
---
 ext/wasm/GNUmakefile        | 14 ++++++++------
 ext/wasm/api/sqlite3-wasm.c | 19 +++++++++----------
 ext/wasm/tester1.js         |  2 +-
 ext/wasm/wasmfs.make        |  4 ++--
 manifest                    | 20 ++++++++++----------
 manifest.uuid               |  2 +-
 6 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index b76ed5cd2f..993c668697 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -568,12 +568,14 @@ oz: clean
 
 include fiddle.make
 
-ifneq (,$(filter wasmfs,$(MAKECMDGOALS)))
-# wasmfs build disabled 2022-10-19 per /chat
-# discussion. OPFS-over-wasmfs was initially a stopgap measure and a
-# convenient point of comparison for the OPFS sqlite3_vfs's
-# performance, but it currently doubles our deliverables and build
-# maintenance burden for very little, if any, benefit.
+# Only add wasmfs if wasmfs.enable=1 or we're running (dist)clean
+wasmfs.enable ?= $(if $(filter %clean,$(MAKECMDGOALS)),1,0)
+ifeq (1,$(wasmfs.enable))
+# wasmfs build disabled 2022-10-19 per /chat discussion.
+# OPFS-over-wasmfs was initially a stopgap measure and a convenient
+# point of comparison for the OPFS sqlite3_vfs's performance, but it
+# currently doubles our deliverables and build maintenance burden for
+# little, if any, benefit.
 #
 ########################################################################
 # Some platforms do not support the WASMFS build. Raspberry Pi OS is one
diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index 62082edda0..203e70a3e6 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -15,9 +15,11 @@
 #define SQLITE_WASM
 #ifdef SQLITE_WASM_ENABLE_C_TESTS
 /*
-** Functions blocked off by SQLITE_WASM_TESTS are intended solely for
-** use in unit/regression testing. They may be safely omitted from
-** client-side builds.
+** Code blocked off by SQLITE_WASM_TESTS is intended solely for use in
+** unit/regression testing. They may be safely omitted from
+** client-side builds. The main unit test script, tester1.js, will
+** skip related tests if it doesn't find the corresponding functions
+** in the WASM exports.
 */
 #  define SQLITE_WASM_TESTS 1
 #else
@@ -1026,7 +1028,7 @@ int sqlite3_wasm_vfs_create_file( sqlite3_vfs *pVfs,
       pPos += n;
     }
     if( 0==rc && nData>0 ){
-      assert(nData<512);
+      assert( nData<blockSize );
       rc = pIo->xWrite(pFile, pPos, nData, (sqlite3_int64)(pPos - pData));
     }
   }
@@ -1072,7 +1074,7 @@ sqlite3_kvvfs_methods * sqlite3_wasm_kvvfs_methods(void){
   return &sqlite3KvvfsMethods;
 }
 
-#if defined(__EMSCRIPTEN__) && defined(SQLITE_WASM_WASMFS)
+#if defined(__EMSCRIPTEN__) && defined(SQLITE_ENABLE_WASMFS)
 #include <emscripten/wasmfs.h>
 
 /*
@@ -1093,7 +1095,7 @@ sqlite3_kvvfs_methods * sqlite3_wasm_kvvfs_methods(void){
 **
 ** Returns 0 on success, SQLITE_NOMEM if instantiation of the backend
 ** object fails, SQLITE_IOERR if mkdir() of the zMountPoint dir in
-** the virtual FS fails. In builds compiled without SQLITE_WASM_WASMFS
+** the virtual FS fails. In builds compiled without SQLITE_ENABLE_WASMFS
 ** defined, SQLITE_NOTFOUND is returned without side effects.
 */
 SQLITE_WASM_KEEP
@@ -1102,9 +1104,6 @@ int sqlite3_wasm_init_wasmfs(const char *zMountPoint){
   if( !zMountPoint || !*zMountPoint ) zMountPoint = "/opfs";
   if( !pOpfs ){
     pOpfs = wasmfs_create_opfs_backend();
-    if( pOpfs ){
-      emscripten_console_log("Created WASMFS OPFS backend.");
-    }
   }
   /** It's not enough to instantiate the backend. We have to create a
       mountpoint in the VFS and attach the backend to it. */
@@ -1128,7 +1127,7 @@ int sqlite3_wasm_init_wasmfs(const char *zUnused){
   if(zUnused){/*unused*/}
   return SQLITE_NOTFOUND;
 }
-#endif /* __EMSCRIPTEN__ && SQLITE_WASM_WASMFS */
+#endif /* __EMSCRIPTEN__ && SQLITE_ENABLE_WASMFS */
 
 #if SQLITE_WASM_TESTS
 
diff --git a/ext/wasm/tester1.js b/ext/wasm/tester1.js
index 825d529f6f..3fe6a0ac79 100644
--- a/ext/wasm/tester1.js
+++ b/ext/wasm/tester1.js
@@ -1782,7 +1782,7 @@
             sh = await fh.createSyncAccessHandle();
             T.assert(fSize === await sh.getSize());
           }finally{
-            if(sh) sh.close();
+            if(sh) await sh.close();
             unlink();
           }
         }
diff --git a/ext/wasm/wasmfs.make b/ext/wasm/wasmfs.make
index 12144f7900..81b41870c8 100644
--- a/ext/wasm/wasmfs.make
+++ b/ext/wasm/wasmfs.make
@@ -26,7 +26,7 @@ sqlite3-wasmfs.cflags :=
 sqlite3-wasmfs.cflags += -std=c99 -fPIC
 sqlite3-wasmfs.cflags += -pthread
 sqlite3-wasmfs.cflags += $(cflags.common)
-sqlite3-wasmfs.cflags += $(SQLITE_OPT) -DSQLITE_WASM_WASMFS
+sqlite3-wasmfs.cflags += $(SQLITE_OPT) -DSQLITE_ENABLE_WASMFS
 
 ########################################################################
 # emcc flags specific to building the final .js/.wasm file...
@@ -88,7 +88,7 @@ all: wasmfs
 speedtest1-wasmfs.js := $(dir.wasmfs)/speedtest1-wasmfs.js
 speedtest1-wasmfs.wasm := $(subst .js,.wasm,$(speedtest1-wasmfs.js))
 speedtest1-wasmfs.eflags := $(sqlite3-wasmfs.fsflags)
-speedtest1-wasmfs.eflags += $(SQLITE_OPT) -DSQLITE_WASM_WASMFS
+speedtest1-wasmfs.eflags += $(SQLITE_OPT) -DSQLITE_ENABLE_WASMFS
 speedtest1-wasmfs.eflags += -sALLOW_MEMORY_GROWTH=0
 speedtest1-wasmfs.eflags += -sINITIAL_MEMORY=$(emcc.INITIAL_MEMORY.128)
 $(eval $(call call-make-pre-js,speedtest1-wasmfs))
diff --git a/manifest b/manifest
index 33c94a290f..2443057143 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Clarify\sdocumentation\sregarding\sthe\s--recovery-db\soption\sto\s".recover"\sand\nthe\smagic\s789\sconfiguration\soption\sit\sis\sassociated\swith.
-D 2022-11-02T14:08:26.051
+C Minor\sbuild\scleanups\sand\sfix\sa\sharmless\srace\scondition\sin\sthe\sOPFS\spart\sof\stester1.js.
+D 2022-11-02T14:08:59.340
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -487,7 +487,7 @@ F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
-F ext/wasm/GNUmakefile 49dbcffa0195d47b89b61f52795f7ed3af97ad0e1f765ff20be16d3e63e6f52b
+F ext/wasm/GNUmakefile 78b64d110e66e18709c11437a74c29bc7855d85a713217db99127c7f304a332f
 F ext/wasm/README-dist.txt 2d670b426fc7c613b90a7d2f2b05b433088fe65181abead970980f0a4a75ea20
 F ext/wasm/README.md ef39861aa21632fdbca0bdd469f78f0096f6449a720f3f39642594af503030e9
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 9120c2f8f51fa85f46dcf4dcb6b12f4a807d428f6089b99cdb08d8ddfcfd88b2
@@ -507,7 +507,7 @@ F ext/wasm/api/sqlite3-api-worker1.js cac2f5c63f950f69b5249c9880d4cd385e914c354c
 F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
 F ext/wasm/api/sqlite3-opfs-async-proxy.js 936f57737eb65afc0f4c3494b93f7b02208055226a7b3cb58f551c38b03ab083
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c 41f4c807d5e027d5dd61d507cb0a78d0cee5618220e100860ff4c45ed1bd7c78
+F ext/wasm/api/sqlite3-wasm.c af472ec27bc7a398a2b94329cb7a77f3411109fc17529a289fa10cc55424ece1
 F ext/wasm/api/sqlite3-worker1-promiser.js 0c7a9826dbf82a5ed4e4f7bf7816e825a52aff253afbf3350431f5773faf0e4b
 F ext/wasm/api/sqlite3-worker1.js 1e54ea3d540161bcfb2100368a2fc0cad871a207b8336afee1c445715851ec54
 F ext/wasm/batch-runner.html 4deeed44fe41496dc6898d9fb17938ea3291f40f4bfb977e29d0cef96fbbe4c8
@@ -549,9 +549,9 @@ F ext/wasm/test-opfs-vfs.html 1f2d672f3f3fce810dfd48a8d56914aba22e45c6834e262555
 F ext/wasm/test-opfs-vfs.js 44363db07b2a20e73b0eb1808de4400ca71b703af718d0fa6d962f15e73bf2ac
 F ext/wasm/tester1-worker.html 51bf39e2b87f974ae3d5bc3086e2fb36d258f3698c54f6e21ba4b3b99636fa27
 F ext/wasm/tester1.html 624ec41cd9f78a1f2b6d7df70aaa7a6394396b1f2455ecbd6de5775c1275b121
-F ext/wasm/tester1.js db50ca105d683d1089f540dae4c2baf89a3c101704a05f22cefdcb517587ae8c
+F ext/wasm/tester1.js 3a5558201359ff8a1c3051ab24fcc8bed5a4e99ae5e086e5184cbfc915d08724
 F ext/wasm/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd72273503ae7d5
-F ext/wasm/wasmfs.make fb2d3c4a298b12cf1ec994ad1d0f1d027ae297449b364cde43d2eb807d68048f
+F ext/wasm/wasmfs.make edfd60691d10fd19ada4c061280fd7fbe4cf5f6bf6b913268e8ebedfccea6ab5
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
@@ -2054,8 +2054,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 ed1c3515ad6a988e07a8b4583fbc38be257e6eae7443b01a242b98207ce78162
-R 61e877321a6044c9940b1e7ec483318d
-U drh
-Z c1f74c9b622ab0020ca49c89b60463b4
+P f6fa0cffa921ccde8910e7fa4a63c2e4ef8ddb376c8ce99e436b27ac332c4498
+R 49cc6fc37416a3ba7fdfd0b20ce15895
+U stephan
+Z b66cc4ccdf23cf485ede2fda7e429a86
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 9f8575c32d..f545a72735 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f6fa0cffa921ccde8910e7fa4a63c2e4ef8ddb376c8ce99e436b27ac332c4498
\ No newline at end of file
+70ee6ee014bc4e2c1daa9b4a8909cf76ccecf32de1eb39055f20d3d0b1daa1bd
\ No newline at end of file

From 4df2ab575facacd8987b65078202cc638e0252ae Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Thu, 3 Nov 2022 21:21:10 +0000
Subject: [PATCH 419/428] Globally replace '' with "" for empty JS strings to
 please C preprocessor.

FossilOrigin-Name: e92e1f42bef94a1df29f66b4111ebfde93eba3759bc5d5a9c95f714508851346
---
 ext/wasm/api/sqlite3-api-glue.js         |  4 ++--
 ext/wasm/api/sqlite3-api-prologue.js     | 18 +++++++++---------
 ext/wasm/api/sqlite3-api-worker1.js      |  4 ++--
 ext/wasm/api/sqlite3-opfs-async-proxy.js |  2 +-
 ext/wasm/common/whwasmutil.js            |  2 +-
 ext/wasm/jaccwabyt/jaccwabyt.js          |  2 +-
 manifest                                 | 22 +++++++++++-----------
 manifest.uuid                            |  2 +-
 8 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index 7e3e433cec..86aa1d1813 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -141,7 +141,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
   const __dbArgcMismatch = (pDb,f,n)=>{
     return sqlite3.util.sqlite3_wasm_db_error(pDb, capi.SQLITE_MISUSE,
                                               f+"() requires "+n+" argument"+
-                                              (1===n?'':'s')+".");
+                                              (1===n?"":'s')+".");
   };
 
   /**
@@ -158,7 +158,7 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
       n = v.byteLength;
       v = util.typedArrayToString(v);
     }else if(Array.isArray(v)){
-      v = v.join('');
+      v = v.join("");
       n = -1;
     }
     return [v, n];
diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js
index abee820cf9..cf44f39707 100644
--- a/ext/wasm/api/sqlite3-api-prologue.js
+++ b/ext/wasm/api/sqlite3-api-prologue.js
@@ -370,14 +370,14 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
   };
 
   /**
-     If v is-a Array, its join('') result is returned.  If
+     If v is-a Array, its join("") result is returned.  If
      isSQLableTypedArray(v) is true then typedArrayToString(v) is
      returned. If it looks like a WASM pointer, wasm.cstringToJs(v) is
      returned. Else v is returned as-is.
   */
   const flexibleString = function(v){
     if(isSQLableTypedArray(v)) return typedArrayToString(v);
-    else if(Array.isArray(v)) return v.join('');
+    else if(Array.isArray(v)) return v.join("");
     else if(wasm.isPtr(v)) v = wasm.cstringToJs(v);
     return v;
   };
@@ -1333,21 +1333,21 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
 
     /**
        Internal helper for sqlite3_js_kvvfs_clear() and friends.
-       Its argument should be one of ('local','session','').
+       Its argument should be one of ('local','session',"").
     */
     const __kvvfsInfo = function(which){
       const rc = Object.create(null);
       rc.prefix = 'kvvfs-'+which;
       rc.stores = [];
-      if('session'===which || ''===which) rc.stores.push(self.sessionStorage);
-      if('local'===which || ''===which) rc.stores.push(self.localStorage);
+      if('session'===which || ""===which) rc.stores.push(self.sessionStorage);
+      if('local'===which || ""===which) rc.stores.push(self.localStorage);
       return rc;
     };
 
     /**
        Clears all storage used by the kvvfs DB backend, deleting any
        DB(s) stored there. Its argument must be either 'session',
-       'local', or ''. In the first two cases, only sessionStorage
+       'local', or "". In the first two cases, only sessionStorage
        resp. localStorage is cleared. If it's an empty string (the
        default) then both are cleared. Only storage keys which match
        the pattern used by kvvfs are cleared: any other client-side
@@ -1357,7 +1357,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
 
        Returns the number of entries cleared.
     */
-    capi.sqlite3_js_kvvfs_clear = function(which=''){
+    capi.sqlite3_js_kvvfs_clear = function(which=""){
       let rc = 0;
       const kvinfo = __kvvfsInfo(which);
       kvinfo.stores.forEach((s)=>{
@@ -1377,7 +1377,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
        This routine guesses the approximate amount of
        window.localStorage and/or window.sessionStorage in use by the
        kvvfs database backend. Its argument must be one of
-       ('session', 'local', ''). In the first two cases, only
+       ('session', 'local', ""). In the first two cases, only
        sessionStorage resp. localStorage is counted. If it's an empty
        string (the default) then both are counted. Only storage keys
        which match the pattern used by kvvfs are counted. The returned
@@ -1390,7 +1390,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
        those limits are unspecified and may include per-entry
        overhead invisible to clients.
     */
-    capi.sqlite3_js_kvvfs_size = function(which=''){
+    capi.sqlite3_js_kvvfs_size = function(which=""){
       let sz = 0;
       const kvinfo = __kvvfsInfo(which);
       kvinfo.stores.forEach((s)=>{
diff --git a/ext/wasm/api/sqlite3-api-worker1.js b/ext/wasm/api/sqlite3-api-worker1.js
index 32fbc5bb17..62e2bb9bdf 100644
--- a/ext/wasm/api/sqlite3-api-worker1.js
+++ b/ext/wasm/api/sqlite3-api-worker1.js
@@ -429,7 +429,7 @@ sqlite3.initWorker1API = function(){
   };
 
   const isSpecialDbFilename = (n)=>{
-    return ''===n || ':'===n[0];
+    return ""===n || ':'===n[0];
   };
 
   /**
@@ -453,7 +453,7 @@ sqlite3.initWorker1API = function(){
       let byteArray, pVfs;
       oargs.vfs = args.vfs;
       if(isSpecialDbFilename(args.filename)){
-        oargs.filename = args.filename || '';
+        oargs.filename = args.filename || "";
       }else{
         oargs.filename = args.filename;
         byteArray = args.byteArray;
diff --git a/ext/wasm/api/sqlite3-opfs-async-proxy.js b/ext/wasm/api/sqlite3-opfs-async-proxy.js
index 86276910aa..09c56ff1df 100644
--- a/ext/wasm/api/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/api/sqlite3-opfs-async-proxy.js
@@ -678,7 +678,7 @@ const initS11n = ()=>{
   state.s11n.storeException = state.asyncS11nExceptions
     ? ((priority,e)=>{
       if(priority<=state.asyncS11nExceptions){
-        state.s11n.serialize([e.name,': ',e.message].join(''));
+        state.s11n.serialize([e.name,': ',e.message].join(""));
       }
     })
     : ()=>{};
diff --git a/ext/wasm/common/whwasmutil.js b/ext/wasm/common/whwasmutil.js
index 24c67ef78f..7e5e7981f7 100644
--- a/ext/wasm/common/whwasmutil.js
+++ b/ext/wasm/common/whwasmutil.js
@@ -1101,7 +1101,7 @@ self.WhWasmUtilInstaller = function(target){
      property and a forEach() method. A block of memory list.length
      entries long is allocated and each pointer-sized block of that
      memory is populated with a scopedAllocCString() conversion of the
-     (''+value) of each element. Returns a pointer to the start of the
+     (""+value) of each element. Returns a pointer to the start of the
      list, suitable for passing as the 2nd argument to a C-style
      main() function.
 
diff --git a/ext/wasm/jaccwabyt/jaccwabyt.js b/ext/wasm/jaccwabyt/jaccwabyt.js
index 14c93b3a2e..dee7258c51 100644
--- a/ext/wasm/jaccwabyt/jaccwabyt.js
+++ b/ext/wasm/jaccwabyt/jaccwabyt.js
@@ -361,7 +361,7 @@ self.Jaccwabyt = function StructBinderFactory(config){
      framework's native format or in Emscripten format.
   */
   const __memberSignature = function f(obj,memberName,emscriptenFormat=false){
-    if(!f._) f._ = (x)=>x.replace(/[^vipPsjrd]/g,'').replace(/[pPs]/g,'i');
+    if(!f._) f._ = (x)=>x.replace(/[^vipPsjrd]/g,"").replace(/[pPs]/g,'i');
     const m = __lookupMember(obj.structInfo, memberName, true);
     return emscriptenFormat ? f._(m.signature) : m.signature;
   };
diff --git a/manifest b/manifest
index 2443057143..3942c53535 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\sbuild\scleanups\sand\sfix\sa\sharmless\srace\scondition\sin\sthe\sOPFS\spart\sof\stester1.js.
-D 2022-11-02T14:08:59.340
+C Globally\sreplace\s''\swith\s""\sfor\sempty\sJS\sstrings\sto\splease\sC\spreprocessor.
+D 2022-11-03T21:21:10.223
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -499,13 +499,13 @@ F ext/wasm/api/post-js-footer.js cd0a8ec768501d9bd45d325ab0442037fb0e33d1f3b4f08
 F ext/wasm/api/post-js-header.js d6ab3dfef4a06960d28a7eaa338d4e2a1a5981e9b38718168bbde8fdb2a439b8
 F ext/wasm/api/pre-js.js 287e462f969342b032c03900e668099fa1471d852df7a472de5bc349161d9c04
 F ext/wasm/api/sqlite3-api-cleanup.js ecdc69dbfccfe26146f04799fcfd4a6f5790d46e7e3b9b6e9b0491f92ed8ae34
-F ext/wasm/api/sqlite3-api-glue.js 9cfa26a9818532c80c2555bc98615de3b170d5db0cf4b141cc3aa83c33c8758f
+F ext/wasm/api/sqlite3-api-glue.js 056f44b82c126358a0175e08a892d56fadfce177b0d7a0012502a6acf67ea6d5
 F ext/wasm/api/sqlite3-api-oo1.js e9a83489bbb4838ce0aee46eaaa9350e0e25a5b926b565e4f5ae8e840e4fbaed
 F ext/wasm/api/sqlite3-api-opfs.js cdcbb57acc66f4569ac9e18f9d13d5a3657d8aae195725c6324943da56c1005d
-F ext/wasm/api/sqlite3-api-prologue.js 1f97261b4d8a60a48f30ee41261e1c4a0c3efff35ae08d7ece243fcf49b3eee3
-F ext/wasm/api/sqlite3-api-worker1.js cac2f5c63f950f69b5249c9880d4cd385e914c354c459d4096ed5dbb1248de76
+F ext/wasm/api/sqlite3-api-prologue.js 952ba908cc5ee42728c5c09dd549af32ef0c3cc15ab7b919a8007c5684f69320
+F ext/wasm/api/sqlite3-api-worker1.js e94ba98e44afccfa482874cd9acb325883ade50ed1f9f9526beb9de1711f182f
 F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
-F ext/wasm/api/sqlite3-opfs-async-proxy.js 936f57737eb65afc0f4c3494b93f7b02208055226a7b3cb58f551c38b03ab083
+F ext/wasm/api/sqlite3-opfs-async-proxy.js ab7d2888ad9b3dd24bb782bd882fcada2a20cb88eb78c8f36e7bfe708857dbd1
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c af472ec27bc7a398a2b94329cb7a77f3411109fc17529a289fa10cc55424ece1
 F ext/wasm/api/sqlite3-worker1-promiser.js 0c7a9826dbf82a5ed4e4f7bf7816e825a52aff253afbf3350431f5773faf0e4b
@@ -515,7 +515,7 @@ F ext/wasm/batch-runner.js 49609e89aaac9989d6c1ad3fae268e4878e1ad7bc5fd3e5c2f449
 F ext/wasm/common/SqliteTestUtil.js d8bf97ecb0705a2299765c8fc9e11b1a5ac7f10988bbf375a6558b7ca287067b
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 35889709547d89a6109ff83b25c11bbc91d8dd43aab8722e428655ca98880a06
-F ext/wasm/common/whwasmutil.js 77930367c2a65cf6fd6f99ad3644ede33e4d20466f5e506eb87b8d101a0a7655
+F ext/wasm/common/whwasmutil.js 16a592d5c304a2d268ca1c28e08a5b029a2f3cbe10af78dbc3456cfc9e3559d1
 F ext/wasm/demo-123-worker.html a0b58d9caef098a626a1a1db567076fca4245e8d60ba94557ede8684350a81ed
 F ext/wasm/demo-123.html 8c70a412ce386bd3796534257935eb1e3ea5c581e5d5aea0490b8232e570a508
 F ext/wasm/demo-123.js ebae30756585bca655b4ab2553ec9236a87c23ad24fc8652115dcedb06d28df6
@@ -533,7 +533,7 @@ F ext/wasm/fiddle/fiddle.js 974b995119ac443685d7d94d3b3c58c6a36540e9eb3fed7069d5
 F ext/wasm/fiddle/index.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
 F ext/wasm/index-dist.html cb0da16cba0f21cda2c25724c5869102d48eb0af04446acd3cd0ca031f80ed19
 F ext/wasm/index.html ce6a68a75532b47e3c0adb83381a06d15de8c0ac0331fb7bf31d33f8e7c77dc4
-F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
+F ext/wasm/jaccwabyt/jaccwabyt.js 95f573de1826474c9605dda620ee622fcb1673ae74f191eb324c0853aa4dcb66
 F ext/wasm/jaccwabyt/jaccwabyt.md 9aa6951b529a8b29f578ec8f0355713c39584c92cf1708f63ba0cf917cb5b68e
 F ext/wasm/module-symbols.html eca884ef4380612145ee550213be57478ee2b9cd9a9c2b27530cc23359c99682
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
@@ -2054,8 +2054,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 f6fa0cffa921ccde8910e7fa4a63c2e4ef8ddb376c8ce99e436b27ac332c4498
-R 49cc6fc37416a3ba7fdfd0b20ce15895
+P 70ee6ee014bc4e2c1daa9b4a8909cf76ccecf32de1eb39055f20d3d0b1daa1bd
+R eaaf8a7ca25305cffe9e8f7e734e3ee8
 U stephan
-Z b66cc4ccdf23cf485ede2fda7e429a86
+Z b98d96f31e9b735c045c03e6eefd13f8
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f545a72735..8348da8467 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-70ee6ee014bc4e2c1daa9b4a8909cf76ccecf32de1eb39055f20d3d0b1daa1bd
\ No newline at end of file
+e92e1f42bef94a1df29f66b4111ebfde93eba3759bc5d5a9c95f714508851346
\ No newline at end of file

From 7d24ff29713e86730ffab173637fa022f24afca2 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Thu, 3 Nov 2022 22:51:20 +0000
Subject: [PATCH 420/428] Add experimental esm target to ext/wasm/GNUmakefile
 to tell emcc to generate sqlite3.mjs (ES6 module) instead of sqlite3.js.
 Related to discussion at [forum:ed4596cf8496a39b].

FossilOrigin-Name: e55d8eba83012492d85418dc0faedce5896027ecc70295a5ca1826f61a5edbaf
---
 ext/wasm/GNUmakefile | 17 +++++++++++++++--
 manifest             | 12 ++++++------
 manifest.uuid        |  2 +-
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 993c668697..039dff410f 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -96,7 +96,7 @@ dir.dout := $(dir.wasm)/jswasm
 # dir.tmp = output dir for intermediary build files, as opposed to
 # end-user deliverables.
 dir.tmp := $(dir.wasm)/bld
-#CLEAN_FILES += $(wildcard $(dir.dout)/*) $(wildcard $(dir.tmp)/*)
+CLEAN_FILES += $(dir.tmp)/* $(dir.dout)/*
 ifeq (,$(wildcard $(dir.dout)))
   dir._tmp := $(shell mkdir -p $(dir.dout))
 endif
@@ -418,7 +418,20 @@ emcc.jsflags += -sWASM_BIGINT=$(emcc.WASM_BIGINT)
 # debugging info, _huge_.
 ########################################################################
 
-sqlite3.js := $(dir.dout)/sqlite3.js
+########################################################################
+# AN EXPERIMENT: undocumented Emscripten feature: if the target file
+# extension is "mjs", it defaults to ES6 module builds:
+# https://github.com/emscripten-core/emscripten/issues/14383
+ifeq (,$(filter esm,$(MAKECMDGOALS)))
+sqlite3.js.ext := js
+else
+esm.deps := $(filter-out esm,$(MAKECMDGOALS))
+esm: $(if $(esm.deps),$(esm.deps),all)
+sqlite3.js.ext := mjs
+endif
+# /esm
+########################################################################
+sqlite3.js := $(dir.dout)/sqlite3.$(sqlite3.js.ext)
 sqlite3.wasm := $(dir.dout)/sqlite3.wasm
 sqlite3-wasm.c := $(dir.api)/sqlite3-wasm.c
 # sqlite3-wasm.o vs sqlite3-wasm.c: building against the latter
diff --git a/manifest b/manifest
index 3942c53535..a64c5bbc8d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Globally\sreplace\s''\swith\s""\sfor\sempty\sJS\sstrings\sto\splease\sC\spreprocessor.
-D 2022-11-03T21:21:10.223
+C Add\sexperimental\sesm\starget\sto\sext/wasm/GNUmakefile\sto\stell\semcc\sto\sgenerate\ssqlite3.mjs\s(ES6\smodule)\sinstead\sof\ssqlite3.js.\sRelated\sto\sdiscussion\sat\s[forum:ed4596cf8496a39b].
+D 2022-11-03T22:51:20.329
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -487,7 +487,7 @@ F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
-F ext/wasm/GNUmakefile 78b64d110e66e18709c11437a74c29bc7855d85a713217db99127c7f304a332f
+F ext/wasm/GNUmakefile 3aa8c160705ab9d9d4d552a1f4e630925a65a27df216befe2e9a956904434c1d
 F ext/wasm/README-dist.txt 2d670b426fc7c613b90a7d2f2b05b433088fe65181abead970980f0a4a75ea20
 F ext/wasm/README.md ef39861aa21632fdbca0bdd469f78f0096f6449a720f3f39642594af503030e9
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 9120c2f8f51fa85f46dcf4dcb6b12f4a807d428f6089b99cdb08d8ddfcfd88b2
@@ -2054,8 +2054,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 70ee6ee014bc4e2c1daa9b4a8909cf76ccecf32de1eb39055f20d3d0b1daa1bd
-R eaaf8a7ca25305cffe9e8f7e734e3ee8
+P e92e1f42bef94a1df29f66b4111ebfde93eba3759bc5d5a9c95f714508851346
+R 4cda7dd2938aaeec0aa59e31a649b872
 U stephan
-Z b98d96f31e9b735c045c03e6eefd13f8
+Z a58e3ce7633c7dbf732eedcffb48463a
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 8348da8467..9dbf0c1a1d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e92e1f42bef94a1df29f66b4111ebfde93eba3759bc5d5a9c95f714508851346
\ No newline at end of file
+e55d8eba83012492d85418dc0faedce5896027ecc70295a5ca1826f61a5edbaf
\ No newline at end of file

From c75445087f1d18a61899e5ca0f36bafc6e35b572 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Fri, 4 Nov 2022 09:02:21 +0000
Subject: [PATCH 421/428] Correct sqlite3-wasm.c's SQLITE_DEFAULT_CACHE_SIZE
 (it's measured in kb, not bytes).

FossilOrigin-Name: 479ad980dfe509403e184e39a5aa441171e47b3297e05039f85516e72e9f15be
---
 ext/wasm/api/sqlite3-wasm.c |  2 +-
 manifest                    | 12 ++++++------
 manifest.uuid               |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index 203e70a3e6..9d04ad1291 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -67,7 +67,7 @@
 ** larger cache benefits the larger workloads. Speed differences
 ** between 2x and nearly 3x have been measured with ample page cache.
 */
-# define SQLITE_DEFAULT_CACHE_SIZE -16777216
+# define SQLITE_DEFAULT_CACHE_SIZE -16384
 #endif
 #if 0 && !defined(SQLITE_DEFAULT_PAGE_SIZE)
 /* TODO: experiment with this. */
diff --git a/manifest b/manifest
index a64c5bbc8d..722381d98d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sexperimental\sesm\starget\sto\sext/wasm/GNUmakefile\sto\stell\semcc\sto\sgenerate\ssqlite3.mjs\s(ES6\smodule)\sinstead\sof\ssqlite3.js.\sRelated\sto\sdiscussion\sat\s[forum:ed4596cf8496a39b].
-D 2022-11-03T22:51:20.329
+C Correct\ssqlite3-wasm.c's\sSQLITE_DEFAULT_CACHE_SIZE\s(it's\smeasured\sin\skb,\snot\sbytes).
+D 2022-11-04T09:02:21.697
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -507,7 +507,7 @@ F ext/wasm/api/sqlite3-api-worker1.js e94ba98e44afccfa482874cd9acb325883ade50ed1
 F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
 F ext/wasm/api/sqlite3-opfs-async-proxy.js ab7d2888ad9b3dd24bb782bd882fcada2a20cb88eb78c8f36e7bfe708857dbd1
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c af472ec27bc7a398a2b94329cb7a77f3411109fc17529a289fa10cc55424ece1
+F ext/wasm/api/sqlite3-wasm.c 778409e00fb25a4d6989be17fc856c84460198fd3b05ba2ef8289e60c50157ca
 F ext/wasm/api/sqlite3-worker1-promiser.js 0c7a9826dbf82a5ed4e4f7bf7816e825a52aff253afbf3350431f5773faf0e4b
 F ext/wasm/api/sqlite3-worker1.js 1e54ea3d540161bcfb2100368a2fc0cad871a207b8336afee1c445715851ec54
 F ext/wasm/batch-runner.html 4deeed44fe41496dc6898d9fb17938ea3291f40f4bfb977e29d0cef96fbbe4c8
@@ -2054,8 +2054,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 e92e1f42bef94a1df29f66b4111ebfde93eba3759bc5d5a9c95f714508851346
-R 4cda7dd2938aaeec0aa59e31a649b872
+P e55d8eba83012492d85418dc0faedce5896027ecc70295a5ca1826f61a5edbaf
+R ed499c9cb026bf1534e3c8df6cd8d101
 U stephan
-Z a58e3ce7633c7dbf732eedcffb48463a
+Z 6c99d342f72317b3aef3c23e350c462b
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 9dbf0c1a1d..5db0742a44 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e55d8eba83012492d85418dc0faedce5896027ecc70295a5ca1826f61a5edbaf
\ No newline at end of file
+479ad980dfe509403e184e39a5aa441171e47b3297e05039f85516e72e9f15be
\ No newline at end of file

From 093677add459cac0f472a64d22af0b547562b074 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Fri, 4 Nov 2022 11:54:42 +0000
Subject: [PATCH 422/428] Enhance the ability of the OP_Found and similar
 opcodes to detect truncated index records and report SQLITE_CORRUPT.
 dbsqlfuzz 2b12f90aeff8e081706c7e9b58834f04869f446c.  Test cases in TH3.

FossilOrigin-Name: 059a09da2c5fd9c7e723c713565fbaf71602079feef0704129cc5cbbd0033936
---
 manifest           | 16 ++++++++--------
 manifest.uuid      |  2 +-
 src/vdbeaux.c      |  9 +++++++--
 test/corruptL.test |  7 +------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/manifest b/manifest
index 722381d98d..98392fbb49 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Correct\ssqlite3-wasm.c's\sSQLITE_DEFAULT_CACHE_SIZE\s(it's\smeasured\sin\skb,\snot\sbytes).
-D 2022-11-04T09:02:21.697
+C Enhance\sthe\sability\sof\sthe\sOP_Found\sand\ssimilar\sopcodes\sto\sdetect\struncated\nindex\srecords\sand\sreport\sSQLITE_CORRUPT.\ndbsqlfuzz\s2b12f90aeff8e081706c7e9b58834f04869f446c.\s\sTest\scases\sin\sTH3.
+D 2022-11-04T11:54:42.284
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -712,7 +712,7 @@ F src/vdbe.c 0c7cb1b934ad8611e14e7efaf2c3a95df7dd3f7964d63ea07fef42a23df86131
 F src/vdbe.h 58675f47dcf3105bab182c3ad3726efd60ffd003e954386904ac9107d0d2b743
 F src/vdbeInt.h 17b7461ffcf9ee760d1341731715a419f6b8c763089a7ece25c2e8098d702b3f
 F src/vdbeapi.c 1e8713d0b653acb43cd1bdf579c40e005c4844ea90f414f065946a83db3c27fb
-F src/vdbeaux.c 6d0a75c1fbc7efea6924f6895ebceca664001464bc7ac56949d3c60aa5e498a0
+F src/vdbeaux.c 87684b89877eae0c58c78b340bb5356aa1c8fb1dd650b29410c8b745aeeb20b5
 F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
 F src/vdbemem.c 6cfed43758d57b6e3b99d9cdedfeccd86e45a07e427b22d8487cbdbebb6c522a
 F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
@@ -901,7 +901,7 @@ F test/corruptH.test 79801d97ec5c2f9f3c87739aa1ec2eb786f96454
 F test/corruptI.test a17bbf54fdde78d43cf3cc34b0057719fd4a173a3d824285b67dc5257c064c7b
 F test/corruptJ.test 4d5ccc4bf959464229a836d60142831ef76a5aa4
 F test/corruptK.test 5b4212fe346699831c5ad559a62c54e11c0611bdde1ea8423a091f9c01aa32af
-F test/corruptL.test ecce40d7b9b909a670a42a45d86e30d927735d7e7f09041af438b19529d35532
+F test/corruptL.test 7fcb0686fb7ca6e758753fcae7edf5b7f8904f7f81e9c218c9dab01c67331029
 F test/corruptM.test 7d574320e08c1b36caa3e47262061f186367d593a7e305d35f15289cc2c3e067
 F test/corruptN.test 7c099d153a554001b4fb829c799b01f2ea6276cbc32479131e0db0da4efd9cc4
 F test/cost.test b11cdbf9f11ffe8ef99c9881bf390e61fe92baf2182bad1dbe6de59a7295c576
@@ -2054,8 +2054,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 e55d8eba83012492d85418dc0faedce5896027ecc70295a5ca1826f61a5edbaf
-R ed499c9cb026bf1534e3c8df6cd8d101
-U stephan
-Z 6c99d342f72317b3aef3c23e350c462b
+P 479ad980dfe509403e184e39a5aa441171e47b3297e05039f85516e72e9f15be
+R ea5a2ea0615ceff4124a8a06806293de
+U drh
+Z 42163979e271d3b2ca0257f8b39abb54
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 5db0742a44..81d7094062 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-479ad980dfe509403e184e39a5aa441171e47b3297e05039f85516e72e9f15be
\ No newline at end of file
+059a09da2c5fd9c7e723c713565fbaf71602079feef0704129cc5cbbd0033936
\ No newline at end of file
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 131740ac6c..2e5e769d74 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -4575,7 +4575,7 @@ int sqlite3VdbeRecordCompareWithSkip(
   assert( pPKey2->pKeyInfo->aSortFlags!=0 );
   assert( pPKey2->pKeyInfo->nKeyField>0 );
   assert( idx1<=szHdr1 || CORRUPT_DB );
-  do{
+  while( 1 /*exit-by-break*/ ){
     u32 serial_type;
 
     /* RHS is an integer */
@@ -4713,8 +4713,13 @@ int sqlite3VdbeRecordCompareWithSkip(
     if( i==pPKey2->nField ) break;
     pRhs++;
     d1 += sqlite3VdbeSerialTypeLen(serial_type);
+    if( d1>(unsigned)nKey1 ) break;
     idx1 += sqlite3VarintLen(serial_type);
-  }while( idx1<(unsigned)szHdr1 && d1<=(unsigned)nKey1 );
+    if( idx1>=(unsigned)szHdr1 ){
+      pPKey2->errCode = (u8)SQLITE_CORRUPT_BKPT;
+      return 0;  /* Corrupt index */
+    }
+  }
 
   /* No memory allocation is ever used on mem1.  Prove this using
   ** the following assert().  If the assert() fails, it indicates a
diff --git a/test/corruptL.test b/test/corruptL.test
index 7361a0b35e..98b7de31e2 100644
--- a/test/corruptL.test
+++ b/test/corruptL.test
@@ -1479,13 +1479,8 @@ do_test 19.0 {
 do_execsql_test 19.1 {
   PRAGMA writable_schema=ON;
 }
-
-set err "UNIQUE constraint failed: index 'a'"
-ifcapable oversize_cell_check {
-  set err "database disk image is malformed"
-}
 do_catchsql_test 19.2 {
   UPDATE t1 SET a=1;
-} [list 1 $err]
+} {1 {database disk image is malformed}}
 
 finish_test

From 4868a8651378350785948d0fc0849d5bdb3f1fab Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Fri, 4 Nov 2022 11:59:40 +0000
Subject: [PATCH 423/428] Add another test case for the OP_Found fix.

FossilOrigin-Name: 6cdd64a445fe16d547d7bf5ea26dad3ab6d9d5f7d1c2b49fdc9d7a2edaa031c6
---
 manifest           | 14 +++++++-------
 manifest.uuid      |  2 +-
 test/corruptL.test | 18 ++++++++++++++++++
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/manifest b/manifest
index 98392fbb49..bdb8d750d5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\sthe\sability\sof\sthe\sOP_Found\sand\ssimilar\sopcodes\sto\sdetect\struncated\nindex\srecords\sand\sreport\sSQLITE_CORRUPT.\ndbsqlfuzz\s2b12f90aeff8e081706c7e9b58834f04869f446c.\s\sTest\scases\sin\sTH3.
-D 2022-11-04T11:54:42.284
+C Add\sanother\stest\scase\sfor\sthe\sOP_Found\sfix.
+D 2022-11-04T11:59:40.243
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -901,7 +901,7 @@ F test/corruptH.test 79801d97ec5c2f9f3c87739aa1ec2eb786f96454
 F test/corruptI.test a17bbf54fdde78d43cf3cc34b0057719fd4a173a3d824285b67dc5257c064c7b
 F test/corruptJ.test 4d5ccc4bf959464229a836d60142831ef76a5aa4
 F test/corruptK.test 5b4212fe346699831c5ad559a62c54e11c0611bdde1ea8423a091f9c01aa32af
-F test/corruptL.test 7fcb0686fb7ca6e758753fcae7edf5b7f8904f7f81e9c218c9dab01c67331029
+F test/corruptL.test 9d1a0055c8db19baccd12f22ac36a33ec7d63afb59e82eb30835aea8f89b94df
 F test/corruptM.test 7d574320e08c1b36caa3e47262061f186367d593a7e305d35f15289cc2c3e067
 F test/corruptN.test 7c099d153a554001b4fb829c799b01f2ea6276cbc32479131e0db0da4efd9cc4
 F test/cost.test b11cdbf9f11ffe8ef99c9881bf390e61fe92baf2182bad1dbe6de59a7295c576
@@ -2054,8 +2054,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 479ad980dfe509403e184e39a5aa441171e47b3297e05039f85516e72e9f15be
-R ea5a2ea0615ceff4124a8a06806293de
-U drh
-Z 42163979e271d3b2ca0257f8b39abb54
+P 059a09da2c5fd9c7e723c713565fbaf71602079feef0704129cc5cbbd0033936
+R 08a61842a2cf3252dbce1b3ebc62dc67
+U dan
+Z a637e63175929a1fad82a808eec8de8e
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 81d7094062..2143804efd 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-059a09da2c5fd9c7e723c713565fbaf71602079feef0704129cc5cbbd0033936
\ No newline at end of file
+6cdd64a445fe16d547d7bf5ea26dad3ab6d9d5f7d1c2b49fdc9d7a2edaa031c6
\ No newline at end of file
diff --git a/test/corruptL.test b/test/corruptL.test
index 98b7de31e2..3a841a8199 100644
--- a/test/corruptL.test
+++ b/test/corruptL.test
@@ -1483,4 +1483,22 @@ do_catchsql_test 19.2 {
   UPDATE t1 SET a=1;
 } {1 {database disk image is malformed}}
 
+reset_db
+do_execsql_test 19.3 {
+  CREATE TABLE t1(a INTEGER PRIMARY KEY, b TEXT, c INTEGER, d TEXT);
+  CREATE INDEX i1 ON t1((NULL));
+  INSERT INTO t1 VALUES(1, NULL, 1, 'text value');
+  PRAGMA writable_schema = on;
+  UPDATE sqlite_schema SET 
+      sql = 'CREATE INDEX i1 ON t1(b, c, d)', 
+      tbl_name = 't1', 
+      type='index' 
+  WHERE name='i1';
+}
+db close
+sqlite3 db test.db
+do_catchsql_test 19.4 {
+  PRAGMA integrity_check;
+} {1 {database disk image is malformed}}
+
 finish_test

From 881f0f4114392021047dd2dabf419b8280fbb8ec Mon Sep 17 00:00:00 2001
From: drh <>
Date: Fri, 4 Nov 2022 12:59:04 +0000
Subject: [PATCH 424/428] Remove an unimportant testcase() macro that is no
 longer reachable due to the improvement in corruption detection.

FossilOrigin-Name: cd7e3568a9b0c0f5ef5ca8a29c55cefe2bbad2dbc88a3718a87bb24a8ada3b7f
---
 manifest      | 14 +++++++-------
 manifest.uuid |  2 +-
 src/btree.c   |  1 -
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index bdb8d750d5..91b3460bfd 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sanother\stest\scase\sfor\sthe\sOP_Found\sfix.
-D 2022-11-04T11:59:40.243
+C Remove\san\sunimportant\stestcase()\smacro\sthat\sis\sno\slonger\sreachable\sdue\sto\sthe\nimprovement\sin\scorruption\sdetection.
+D 2022-11-04T12:59:04.079
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -575,7 +575,7 @@ F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
 F src/backup.c a2891172438e385fdbe97c11c9745676bec54f518d4447090af97189fd8e52d7
 F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d
 F src/btmutex.c 6ffb0a22c19e2f9110be0964d0731d2ef1c67b5f7fabfbaeb7b9dabc4b7740ca
-F src/btree.c 74fc5f6a0577df703d6f98d0c51ee0d8d91d22dbc0ba86e42e056517e2b45576
+F src/btree.c 36f21a5596227507e285dd7a9ed967118031fdf331fe56d61625d7c8958f2d1e
 F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
 F src/btreeInt.h 8ce1332edd89dfd2461d561ac10a0ab5601c8e06200cb5230596c3caaf54482e
 F src/build.c d3e43e950e4e377c1d451a4862556792acdef1faba14a03f899d30d09731c48b
@@ -2054,8 +2054,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 059a09da2c5fd9c7e723c713565fbaf71602079feef0704129cc5cbbd0033936
-R 08a61842a2cf3252dbce1b3ebc62dc67
-U dan
-Z a637e63175929a1fad82a808eec8de8e
+P 6cdd64a445fe16d547d7bf5ea26dad3ab6d9d5f7d1c2b49fdc9d7a2edaa031c6
+R 4d302e2fe000f7347174d7f20a725958
+U drh
+Z 607b13981a898ce53680e748b8acf681
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 2143804efd..895f6be651 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6cdd64a445fe16d547d7bf5ea26dad3ab6d9d5f7d1c2b49fdc9d7a2edaa031c6
\ No newline at end of file
+cd7e3568a9b0c0f5ef5ca8a29c55cefe2bbad2dbc88a3718a87bb24a8ada3b7f
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index 1c48d6e8c8..2ccd09c277 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -1655,7 +1655,6 @@ static u8 *pageFindSlot(MemPage *pPg, int nByte, int *pRc){
         ** fragmented bytes within the page. */
         memcpy(&aData[iAddr], &aData[pc], 2);
         aData[hdr+7] += (u8)x;
-        testcase( pc+x>maxPC );
         return &aData[pc];
       }else if( x+pc > maxPC ){
         /* This slot extends off the end of the usable part of the page */

From ffc9b1b0469f115ebca2bf4e70214e4f7db7e28a Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Fri, 4 Nov 2022 15:17:14 +0000
Subject: [PATCH 425/428] Fix Tcl tests so that they again build and run with
 SQLITE_OMIT_VIRTUALTABLE defined.

FossilOrigin-Name: 06a9dbea40c8a0cdfae6b127a1ce1cba0547acdf1115c087e9b790a78c264b52
---
 ext/recover/dbdata.c             |  5 ++++
 ext/recover/recover1.test        |  7 ------
 ext/recover/recover_common.tcl   | 13 ++++++++--
 ext/recover/recoverclobber.test  |  8 ------
 ext/recover/recovercorrupt.test  |  5 ----
 ext/recover/recovercorrupt2.test |  5 ----
 ext/recover/recoverfault.test    |  5 ----
 ext/recover/recoverfault2.test   |  5 ----
 ext/recover/recoverold.test      |  8 ------
 ext/recover/recoverpgsz.test     |  4 ---
 ext/recover/recoverrowid.test    |  8 ------
 ext/recover/recoverslowidx.test  |  8 ------
 ext/recover/recoversql.test      |  8 ------
 ext/recover/sqlite3recover.c     |  5 ++++
 ext/recover/test_recover.c       |  7 ++++--
 manifest                         | 42 ++++++++++++++++----------------
 manifest.uuid                    |  2 +-
 17 files changed, 48 insertions(+), 97 deletions(-)

diff --git a/ext/recover/dbdata.c b/ext/recover/dbdata.c
index dca468f7b8..4132b83d71 100644
--- a/ext/recover/dbdata.c
+++ b/ext/recover/dbdata.c
@@ -71,6 +71,7 @@
 **   It contains one entry for each b-tree pointer between a parent and
 **   child page in the database.
 */
+
 #if !defined(SQLITEINT_H) 
 #include "sqlite3ext.h"
 
@@ -82,6 +83,8 @@ SQLITE_EXTENSION_INIT1
 #include <string.h>
 #include <assert.h>
 
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+
 #define DBDATA_PADDING_BYTES 100 
 
 typedef struct DbdataTable DbdataTable;
@@ -935,3 +938,5 @@ int sqlite3_dbdata_init(
   SQLITE_EXTENSION_INIT2(pApi);
   return sqlite3DbdataRegister(db);
 }
+
+#endif /* ifndef SQLITE_OMIT_VIRTUALTABLE */
diff --git a/ext/recover/recover1.test b/ext/recover/recover1.test
index 94bcd348a7..dfe176fe85 100644
--- a/ext/recover/recover1.test
+++ b/ext/recover/recover1.test
@@ -10,16 +10,9 @@
 #***********************************************************************
 #
 
-if {![info exists testdir]} {
-  set testdir [file join [file dirname [info script]] .. .. test]
-} 
 source [file join [file dirname [info script]] recover_common.tcl]
-source $testdir/tester.tcl
-
 set testprefix recover1
 
-
-
 proc compare_result {db1 db2 sql} {
   set r1 [$db1 eval $sql]
   set r2 [$db2 eval $sql]
diff --git a/ext/recover/recover_common.tcl b/ext/recover/recover_common.tcl
index 3f2ff2d6cc..fdf735ee75 100644
--- a/ext/recover/recover_common.tcl
+++ b/ext/recover/recover_common.tcl
@@ -1,5 +1,14 @@
-
-
+
+
+if {![info exists testdir]} {
+  set testdir [file join [file dirname [info script]] .. .. test]
+} 
+source $testdir/tester.tcl
+
+if {[info commands sqlite3_recover_init]==""} {
+  finish_test
+  return -code return
+}
 
 
 
diff --git a/ext/recover/recoverclobber.test b/ext/recover/recoverclobber.test
index 537af8e7c1..e096b2e216 100644
--- a/ext/recover/recoverclobber.test
+++ b/ext/recover/recoverclobber.test
@@ -12,17 +12,9 @@
 # Tests for the SQLITE_RECOVER_ROWIDS option.
 #
 
-if {![info exists testdir]} {
-  set testdir [file join [file dirname [info script]] .. .. test]
-} 
 source [file join [file dirname [info script]] recover_common.tcl]
-source $testdir/tester.tcl
 set testprefix recoverclobber
 
-ifcapable !vtab {
-  finish_test; return
-}
-
 proc recover {db output} {
   set R [sqlite3_recover_init db main test.db2]
   $R run
diff --git a/ext/recover/recovercorrupt.test b/ext/recover/recovercorrupt.test
index 40859f3d1c..eb6fe53add 100644
--- a/ext/recover/recovercorrupt.test
+++ b/ext/recover/recovercorrupt.test
@@ -10,12 +10,7 @@
 #***********************************************************************
 #
 
-if {![info exists testdir]} {
-  set testdir [file join [file dirname [info script]] .. .. test]
-} 
 source [file join [file dirname [info script]] recover_common.tcl]
-source $testdir/tester.tcl
-
 set testprefix recovercorrupt
 
 database_may_be_corrupt
diff --git a/ext/recover/recovercorrupt2.test b/ext/recover/recovercorrupt2.test
index 20d4c39bcd..7147c67e93 100644
--- a/ext/recover/recovercorrupt2.test
+++ b/ext/recover/recovercorrupt2.test
@@ -10,12 +10,7 @@
 #***********************************************************************
 #
 
-if {![info exists testdir]} {
-  set testdir [file join [file dirname [info script]] .. .. test]
-} 
 source [file join [file dirname [info script]] recover_common.tcl]
-source $testdir/tester.tcl
-
 set testprefix recovercorrupt2
 
 do_execsql_test 1.0 {
diff --git a/ext/recover/recoverfault.test b/ext/recover/recoverfault.test
index 2ea87860b3..30bb65527d 100644
--- a/ext/recover/recoverfault.test
+++ b/ext/recover/recoverfault.test
@@ -10,12 +10,7 @@
 #***********************************************************************
 #
 
-if {![info exists testdir]} {
-  set testdir [file join [file dirname [info script]] .. .. test]
-} 
 source [file join [file dirname [info script]] recover_common.tcl]
-source $testdir/tester.tcl
-
 set testprefix recoverfault
 
 
diff --git a/ext/recover/recoverfault2.test b/ext/recover/recoverfault2.test
index 4f7131ecfb..e80d480ce1 100644
--- a/ext/recover/recoverfault2.test
+++ b/ext/recover/recoverfault2.test
@@ -10,12 +10,7 @@
 #***********************************************************************
 #
 
-if {![info exists testdir]} {
-  set testdir [file join [file dirname [info script]] .. .. test]
-} 
 source [file join [file dirname [info script]] recover_common.tcl]
-source $testdir/tester.tcl
-
 set testprefix recoverfault2
 
 
diff --git a/ext/recover/recoverold.test b/ext/recover/recoverold.test
index 691737bdc5..e942192827 100644
--- a/ext/recover/recoverold.test
+++ b/ext/recover/recoverold.test
@@ -11,17 +11,9 @@
 #
 #
 
-if {![info exists testdir]} {
-  set testdir [file join [file dirname [info script]] .. .. test]
-} 
 source [file join [file dirname [info script]] recover_common.tcl]
-source $testdir/tester.tcl
 set testprefix recoverold
 
-ifcapable !vtab {
-  finish_test; return
-}
-
 proc compare_result {db1 db2 sql} {
   set r1 [$db1 eval $sql]
   set r2 [$db2 eval $sql]
diff --git a/ext/recover/recoverpgsz.test b/ext/recover/recoverpgsz.test
index 71413b0ead..8d064a4e9c 100644
--- a/ext/recover/recoverpgsz.test
+++ b/ext/recover/recoverpgsz.test
@@ -10,11 +10,7 @@
 #***********************************************************************
 #
 
-if {![info exists testdir]} {
-  set testdir [file join [file dirname [info script]] .. .. test]
-} 
 source [file join [file dirname [info script]] recover_common.tcl]
-source $testdir/tester.tcl
 
 db close
 sqlite3_test_control_pending_byte 0x1000000
diff --git a/ext/recover/recoverrowid.test b/ext/recover/recoverrowid.test
index bd47422eaf..5855e84fa6 100644
--- a/ext/recover/recoverrowid.test
+++ b/ext/recover/recoverrowid.test
@@ -12,17 +12,9 @@
 # Tests for the SQLITE_RECOVER_ROWIDS option.
 #
 
-if {![info exists testdir]} {
-  set testdir [file join [file dirname [info script]] .. .. test]
-} 
 source [file join [file dirname [info script]] recover_common.tcl]
-source $testdir/tester.tcl
 set testprefix recoverrowid
 
-ifcapable !vtab {
-  finish_test; return
-}
-
 proc recover {db bRowids output} {
   forcedelete $output
 
diff --git a/ext/recover/recoverslowidx.test b/ext/recover/recoverslowidx.test
index 4dfb7e5f53..ecd7743a4e 100644
--- a/ext/recover/recoverslowidx.test
+++ b/ext/recover/recoverslowidx.test
@@ -12,17 +12,9 @@
 # Tests for the SQLITE_RECOVER_SLOWINDEXES option.
 #
 
-if {![info exists testdir]} {
-  set testdir [file join [file dirname [info script]] .. .. test]
-} 
 source [file join [file dirname [info script]] recover_common.tcl]
-source $testdir/tester.tcl
 set testprefix recoverslowidx
 
-ifcapable !vtab {
-  finish_test; return
-}
-
 do_execsql_test 1.0 {
   CREATE TABLE t1(a, b);
   CREATE INDEX i1 ON t1(a);
diff --git a/ext/recover/recoversql.test b/ext/recover/recoversql.test
index 19f7ec7a1c..0a6726727d 100644
--- a/ext/recover/recoversql.test
+++ b/ext/recover/recoversql.test
@@ -11,17 +11,9 @@
 #
 #
 
-if {![info exists testdir]} {
-  set testdir [file join [file dirname [info script]] .. .. test]
-} 
 source [file join [file dirname [info script]] recover_common.tcl]
-source $testdir/tester.tcl
 set testprefix recoversql
 
-ifcapable !vtab {
-  finish_test; return
-}
-
 do_execsql_test 1.0 {
   CREATE TABLE "x.1" (x, y);
   INSERT INTO "x.1" VALUES(1, 1), (2, 2), (3, 3);
diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index 2952274ebb..1dd63fb3f4 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -17,6 +17,8 @@
 #include <assert.h>
 #include <string.h>
 
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+
 /*
 ** Declaration for public API function in file dbdata.c. This may be called
 ** with NULL as the final two arguments to register the sqlite_dbptr and
@@ -2844,3 +2846,6 @@ int sqlite3_recover_finish(sqlite3_recover *p){
   }
   return rc;
 }
+
+#endif /* ifndef SQLITE_OMIT_VIRTUALTABLE */
+
diff --git a/ext/recover/test_recover.c b/ext/recover/test_recover.c
index 99c7aeca34..1c333df8e0 100644
--- a/ext/recover/test_recover.c
+++ b/ext/recover/test_recover.c
@@ -18,6 +18,8 @@
 #include <tcl.h>
 #include <assert.h>
 
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+
 typedef struct TestRecover TestRecover;
 struct TestRecover {
   sqlite3_recover *p;
@@ -284,9 +286,10 @@ static int test_sqlite3_dbdata_init(
   return TCL_OK;
 }
 
-
+#endif /* SQLITE_OMIT_VIRTUALTABLE */
 
 int TestRecover_Init(Tcl_Interp *interp){
+#ifndef SQLITE_OMIT_VIRTUALTABLE
   struct Cmd {
     const char *zCmd;
     Tcl_ObjCmdProc *xProc;
@@ -302,7 +305,7 @@ int TestRecover_Init(Tcl_Interp *interp){
     struct Cmd *p = &aCmd[i];
     Tcl_CreateObjCommand(interp, p->zCmd, p->xProc, p->pArg, 0);
   }
-
+#endif
   return TCL_OK;
 }
 
diff --git a/manifest b/manifest
index 91b3460bfd..4e680ffbc0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\san\sunimportant\stestcase()\smacro\sthat\sis\sno\slonger\sreachable\sdue\sto\sthe\nimprovement\sin\scorruption\sdetection.
-D 2022-11-04T12:59:04.079
+C Fix\sTcl\stests\sso\sthat\sthey\sagain\sbuild\sand\srun\swith\sSQLITE_OMIT_VIRTUALTABLE\sdefined.
+D 2022-11-04T15:17:14.910
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -385,22 +385,22 @@ F ext/rbu/rbuvacuum4.test a78898e438a44803eb2bc897ba3323373c9f277418e2d6d76e90f2
 F ext/rbu/sqlite3rbu.c 8737cabdfbee84bb25a7851ecef8b1312be332761238da9be6ddb10c62ad4291
 F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9cd389812
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
-F ext/recover/dbdata.c 3ae32f9b7f02a141889b9075beb87895a826d0fcf3b702b8251cbb0dd3c91a83
-F ext/recover/recover1.test 522e2c3353734dbef9118f08e47209470e50308ba35ce818fed00b8e265aee44
-F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
-F ext/recover/recoverclobber.test 294dcc894124ab4ca3a7b35766630742a3d25810fceac22220beb64f70a33a60
-F ext/recover/recovercorrupt.test 6540aae95e17398dd70b44518367fd56588c44962cb276d2623a0fedba9efe9e
-F ext/recover/recovercorrupt2.test a7e0735cefb79de7959ebd1ee6d963f9505305fe7983ac58394eb5f5aa9236c7
-F ext/recover/recoverfault.test 3a0a32b9fc216592b97775d69220695b0926980c0f7424b7a59144e47d7cb568
-F ext/recover/recoverfault2.test 321036336af23e778a87f148c4cc4407f88fbdab1fd72ddb661669be9020d36b
-F ext/recover/recoverold.test 46e9d99b595fac583d4c67f74d7d89c20a435c752ef6eeb3e918b599940c88e0
-F ext/recover/recoverpgsz.test 93e970eab05e4e89f8fd6b1bd23f9ec137ea09857e66ba0d4d27a83cd1ba4a89
-F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
-F ext/recover/recoverslowidx.test f356bb9fba7ffd6fc50e045e419464f0129ac6e24decf6e919584f79c3493727
-F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
-F ext/recover/sqlite3recover.c d2feca815f489f3beed4af94b916e0cba046937b9cc760b0f2baacf1ae515fa2
+F ext/recover/dbdata.c 1d5353d3af247c4e0656f8f88a80564aa840644c1177212dd11a186dce4ab213
+F ext/recover/recover1.test 5758c1900d8feacbdf9cc1f2796cfcb5715885a33e2ab14bdeeec8b7c938f576
+F ext/recover/recover_common.tcl a61306c1eb45c0c3fc45652c35b2d4ec19729e340bdf65a272ce4c229cefd85a
+F ext/recover/recoverclobber.test 3ba6c0c373c5c63d17e82eced64c05c57ccaf26c1abe1ca7141334022a79f32e
+F ext/recover/recovercorrupt.test 64c081ad1200ae77b447da99eb724785d6bf71715f394543dc7689642e92bf49
+F ext/recover/recovercorrupt2.test 74bef7dd2d7dd4856f3da21be6e213d27da44827e0f5f0946ca0325b46d163ed
+F ext/recover/recoverfault.test 9d9f88eeb222615a25e7514f234c950d46bee20d24cd8db49d8fff8d650dcfe1
+F ext/recover/recoverfault2.test 730e7371bcda769554d15460cb23126abba1be8eca9539ccabf63623e7bb7e09
+F ext/recover/recoverold.test b0eeb4507cb5dba2ba7dfffe4c6e8c82bd14beaf718b227d647f21b5341eb8b4
+F ext/recover/recoverpgsz.test 481abf7d584cd67daa3ab72f65ff943b07c3887d206cc1c73d914b965596d8ca
+F ext/recover/recoverrowid.test f948bf4024a5f41b0e21b8af80c60564c5b5d78c05a8d64fc00787715ff9f45f
+F ext/recover/recoverslowidx.test 7e1bd4b1a201d94f39da436a9606047a352d7cbad69ac8f4d46495a46e993fe3
+F ext/recover/recoversql.test e66d01f95302a223bcd3fd42b5ee58dc2b53d70afa90b0d00e41e4b8eab20486
+F ext/recover/sqlite3recover.c 3e38f2bd607f6ecd8dc10ed419363448c206791c7ce344e3a2a6848731b9f37c
 F ext/recover/sqlite3recover.h 011c799f02deb70ab685916f6f538e6bb32c4e0025e79bfd0e24ff9c74820959
-F ext/recover/test_recover.c 61ec931e47abca6b2210f46239cafd9f3060741605e3d3c45a7c7a53f63dd957
+F ext/recover/test_recover.c 1a34e2d04533d919a30ae4d5caeb1643f6684e9ccd7597ca27721d8af81f4ade
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
 F ext/repair/checkfreelist.c e21f06995ff4efdc1622dcceaea4dcba2caa83ca2f31a1607b98a8509168a996
 F ext/repair/checkindex.c 4383e4469c21e5b9ae321d0d63cec53e981af9d7a6564be6374f0eeb93dfc890
@@ -2054,8 +2054,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 6cdd64a445fe16d547d7bf5ea26dad3ab6d9d5f7d1c2b49fdc9d7a2edaa031c6
-R 4d302e2fe000f7347174d7f20a725958
-U drh
-Z 607b13981a898ce53680e748b8acf681
+P cd7e3568a9b0c0f5ef5ca8a29c55cefe2bbad2dbc88a3718a87bb24a8ada3b7f
+R bd8a5ca9186cd7d971a738eb8929f158
+U dan
+Z 3cd700d63552d3b4d0ea3e514d09d144
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 895f6be651..9acb9ffd75 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cd7e3568a9b0c0f5ef5ca8a29c55cefe2bbad2dbc88a3718a87bb24a8ada3b7f
\ No newline at end of file
+06a9dbea40c8a0cdfae6b127a1ce1cba0547acdf1115c087e9b790a78c264b52
\ No newline at end of file

From 80dbd818f2f24750af783f29fb16da563d76f6e3 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Fri, 4 Nov 2022 16:39:39 +0000
Subject: [PATCH 426/428] Fixes to recover module test scripts so that they may
 be used with SQLITE_DEFAULT_AUTOVACUUM and SQLITE_SECURE_DELETE builds.

FossilOrigin-Name: 0e5597ce5353dea2cdb092b166b57ba1d60f8115eb468349f2b2869803691a2c
---
 ext/recover/recoverold.test  | 25 +++++++++++++------------
 ext/recover/recoverpgsz.test |  1 +
 manifest                     | 16 ++++++++--------
 manifest.uuid                |  2 +-
 test/recover.test            |  1 +
 5 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/ext/recover/recoverold.test b/ext/recover/recoverold.test
index e942192827..26bbe322a1 100644
--- a/ext/recover/recoverold.test
+++ b/ext/recover/recoverold.test
@@ -147,7 +147,6 @@ do_recover_test 2.4.1 {
   2 2 3 {} 8 9 7
 }
 
-breakpoint
 do_execsql_test 2.5 {
   CREATE TABLE x1(a, b, c);
   WITH s(i) AS (
@@ -165,17 +164,19 @@ do_recover_test 2.5.1 {
   2 2 3 {} 8 9 7
 }
 
-do_test 2.6 {
-  forcedelete test.db2
-  set R [sqlite3_recover_init db main test.db2]
-  $R config lostandfound lost_and_found
-  $R config freelistcorrupt 1
-  $R run
-  $R finish
-  sqlite3 db2 test.db2
-  execsql { SELECT count(*) FROM lost_and_found_1; } db2
-} {103}
-db2 close
+ifcapable !secure_delete {
+  do_test 2.6 {
+    forcedelete test.db2
+    set R [sqlite3_recover_init db main test.db2]
+    $R config lostandfound lost_and_found
+    $R config freelistcorrupt 1
+    $R run
+    $R finish
+    sqlite3 db2 test.db2
+    execsql { SELECT count(*) FROM lost_and_found_1; } db2
+  } {103}
+  db2 close
+}
 
 #-------------------------------------------------------------------------
 breakpoint
diff --git a/ext/recover/recoverpgsz.test b/ext/recover/recoverpgsz.test
index 8d064a4e9c..1a91f08459 100644
--- a/ext/recover/recoverpgsz.test
+++ b/ext/recover/recoverpgsz.test
@@ -23,6 +23,7 @@ foreach {pgsz bOverflow} {
 } {
   reset_db
   execsql "PRAGMA page_size = $pgsz"
+  execsql "PRAGMA auto_vacuum = 0"
   do_execsql_test 1.$pgsz.$bOverflow.1 {
     CREATE TABLE t1(a, b, c);
     CREATE INDEX i1 ON t1(b, a, c);
diff --git a/manifest b/manifest
index 4e680ffbc0..938d3cff8e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sTcl\stests\sso\sthat\sthey\sagain\sbuild\sand\srun\swith\sSQLITE_OMIT_VIRTUALTABLE\sdefined.
-D 2022-11-04T15:17:14.910
+C Fixes\sto\srecover\smodule\stest\sscripts\sso\sthat\sthey\smay\sbe\sused\swith\sSQLITE_DEFAULT_AUTOVACUUM\sand\sSQLITE_SECURE_DELETE\sbuilds.
+D 2022-11-04T16:39:39.210
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -393,8 +393,8 @@ F ext/recover/recovercorrupt.test 64c081ad1200ae77b447da99eb724785d6bf71715f3945
 F ext/recover/recovercorrupt2.test 74bef7dd2d7dd4856f3da21be6e213d27da44827e0f5f0946ca0325b46d163ed
 F ext/recover/recoverfault.test 9d9f88eeb222615a25e7514f234c950d46bee20d24cd8db49d8fff8d650dcfe1
 F ext/recover/recoverfault2.test 730e7371bcda769554d15460cb23126abba1be8eca9539ccabf63623e7bb7e09
-F ext/recover/recoverold.test b0eeb4507cb5dba2ba7dfffe4c6e8c82bd14beaf718b227d647f21b5341eb8b4
-F ext/recover/recoverpgsz.test 481abf7d584cd67daa3ab72f65ff943b07c3887d206cc1c73d914b965596d8ca
+F ext/recover/recoverold.test 55a06e18e79a702e778c63324261fce2a0911089444384a97c423c05c42d4cab
+F ext/recover/recoverpgsz.test 3658ab8e68475b1bb87d6af88baa04551c84b73280a566a1be847182410ffc58
 F ext/recover/recoverrowid.test f948bf4024a5f41b0e21b8af80c60564c5b5d78c05a8d64fc00787715ff9f45f
 F ext/recover/recoverslowidx.test 7e1bd4b1a201d94f39da436a9606047a352d7cbad69ac8f4d46495a46e993fe3
 F ext/recover/recoversql.test e66d01f95302a223bcd3fd42b5ee58dc2b53d70afa90b0d00e41e4b8eab20486
@@ -1409,7 +1409,7 @@ F test/randexpr1.tcl 40dec52119ed3a2b8b2a773bce24b63a3a746459
 F test/randexpr1.test eda062a97e60f9c38ae8d806b03b0ddf23d796df
 F test/rbu.test 168573d353cd0fd10196b87b0caa322c144ef736
 F test/rdonly.test 64e2696c322e3538df0b1ed624e21f9a23ed9ff8
-F test/recover.test cd81539661b9a6263d68f7bfd1440f4ac0aeb68f0fa0370db32a9e706da89de7
+F test/recover.test f90e776adeb6b5da41cee56aa2aaa995c5d1d3c7b5b99dffb090041f12f8e3e5
 F test/regexp1.test 83c631617357150f8054ca1d1fed40a552b0d0f8eb7a7f090c3be02cee9f9913
 F test/regexp2.test 55ed41da802b0e284ac7e2fe944be3948f93ff25abbca0361a609acfed1368b5
 F test/reindex.test cd9d6021729910ece82267b4f5e1b5ac2911a7566c43b43c176a6a4732e2118d
@@ -2054,8 +2054,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 cd7e3568a9b0c0f5ef5ca8a29c55cefe2bbad2dbc88a3718a87bb24a8ada3b7f
-R bd8a5ca9186cd7d971a738eb8929f158
+P 06a9dbea40c8a0cdfae6b127a1ce1cba0547acdf1115c087e9b790a78c264b52
+R 6a7f92408352b77a850cadea400d3dbe
 U dan
-Z 3cd700d63552d3b4d0ea3e514d09d144
+Z bd09347f876f10f602844e0bea6358b0
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 9acb9ffd75..12fed04857 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-06a9dbea40c8a0cdfae6b127a1ce1cba0547acdf1115c087e9b790a78c264b52
\ No newline at end of file
+0e5597ce5353dea2cdb092b166b57ba1d60f8115eb468349f2b2869803691a2c
\ No newline at end of file
diff --git a/test/recover.test b/test/recover.test
index b60892459f..b7ff639403 100644
--- a/test/recover.test
+++ b/test/recover.test
@@ -141,6 +141,7 @@ do_recover_test 3.0
 
 #-------------------------------------------------------------------------
 reset_db 
+execsql { PRAGMA secure_delete = 0 }
 do_execsql_test 4.0 {
   CREATE TABLE t1(a, b, c);
   CREATE TABLE t2(d, e, f);

From 5f7e173abfa2704331708bd432fb2a9a50cfde03 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Fri, 4 Nov 2022 17:07:33 +0000
Subject: [PATCH 427/428] Another test case fix for auto-vacuum builds.

FossilOrigin-Name: c1c47eff48e0831b5aed987e90d797aee99caf1861fa8318c6c3ecfb108de7e6
---
 ext/recover/recoverslowidx.test |  1 +
 manifest                        | 16 ++++++++--------
 manifest.uuid                   |  2 +-
 test/recover.test               |  1 +
 test/wapptest.tcl               |  2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/ext/recover/recoverslowidx.test b/ext/recover/recoverslowidx.test
index ecd7743a4e..269105113d 100644
--- a/ext/recover/recoverslowidx.test
+++ b/ext/recover/recoverslowidx.test
@@ -16,6 +16,7 @@ source [file join [file dirname [info script]] recover_common.tcl]
 set testprefix recoverslowidx
 
 do_execsql_test 1.0 {
+  PRAGMA auto_vacuum = 0;
   CREATE TABLE t1(a, b);
   CREATE INDEX i1 ON t1(a);
   INSERT INTO t1 VALUES(1, 1), (2, 2), (3, 3), (4, 4);
diff --git a/manifest b/manifest
index 938d3cff8e..0a05dc00ca 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fixes\sto\srecover\smodule\stest\sscripts\sso\sthat\sthey\smay\sbe\sused\swith\sSQLITE_DEFAULT_AUTOVACUUM\sand\sSQLITE_SECURE_DELETE\sbuilds.
-D 2022-11-04T16:39:39.210
+C Another\stest\scase\sfix\sfor\sauto-vacuum\sbuilds.
+D 2022-11-04T17:07:33.450
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -396,7 +396,7 @@ F ext/recover/recoverfault2.test 730e7371bcda769554d15460cb23126abba1be8eca9539c
 F ext/recover/recoverold.test 55a06e18e79a702e778c63324261fce2a0911089444384a97c423c05c42d4cab
 F ext/recover/recoverpgsz.test 3658ab8e68475b1bb87d6af88baa04551c84b73280a566a1be847182410ffc58
 F ext/recover/recoverrowid.test f948bf4024a5f41b0e21b8af80c60564c5b5d78c05a8d64fc00787715ff9f45f
-F ext/recover/recoverslowidx.test 7e1bd4b1a201d94f39da436a9606047a352d7cbad69ac8f4d46495a46e993fe3
+F ext/recover/recoverslowidx.test 5205a9742dd9490ee99950dabb622307355ef1662dea6a3a21030057bfd81411
 F ext/recover/recoversql.test e66d01f95302a223bcd3fd42b5ee58dc2b53d70afa90b0d00e41e4b8eab20486
 F ext/recover/sqlite3recover.c 3e38f2bd607f6ecd8dc10ed419363448c206791c7ce344e3a2a6848731b9f37c
 F ext/recover/sqlite3recover.h 011c799f02deb70ab685916f6f538e6bb32c4e0025e79bfd0e24ff9c74820959
@@ -1409,7 +1409,7 @@ F test/randexpr1.tcl 40dec52119ed3a2b8b2a773bce24b63a3a746459
 F test/randexpr1.test eda062a97e60f9c38ae8d806b03b0ddf23d796df
 F test/rbu.test 168573d353cd0fd10196b87b0caa322c144ef736
 F test/rdonly.test 64e2696c322e3538df0b1ed624e21f9a23ed9ff8
-F test/recover.test f90e776adeb6b5da41cee56aa2aaa995c5d1d3c7b5b99dffb090041f12f8e3e5
+F test/recover.test fd5199f928757cb308661b5fdca1abc19398a798ff7f24b57c3071e9f8e0471e
 F test/regexp1.test 83c631617357150f8054ca1d1fed40a552b0d0f8eb7a7f090c3be02cee9f9913
 F test/regexp2.test 55ed41da802b0e284ac7e2fe944be3948f93ff25abbca0361a609acfed1368b5
 F test/reindex.test cd9d6021729910ece82267b4f5e1b5ac2911a7566c43b43c176a6a4732e2118d
@@ -1872,7 +1872,7 @@ F test/walslow.test c05c68d4dc2700a982f89133ce103a1a84cc285f
 F test/walthread.test 14b20fcfa6ae152f5d8e12f5dc8a8a724b7ef189f5d8ef1e2ceab79f2af51747
 F test/walvfs.test e1a6ad0f3c78e98b55c3d5f0889cf366cc0d0a1cb2bccb44ac9ec67384adc4a1
 F test/wapp.tcl b440cd8cf57953d3a49e7ee81e6a18f18efdaf113b69f7d8482b0710a64566ec
-F test/wapptest.tcl e3b6d5afa021c39a0f459ea9fbd1077459c1d81fca98eb40af8404ad3fc2360f x
+F test/wapptest.tcl 1bea58a6a8e68a73f542ee4fca28b771b84ed803bd0c9e385087070b3d747b3c x
 F test/where.test d13cd7c24e80009d2b54e2f7a8893c457afa49c64f99359c9eb3fe668ba1d9d4
 F test/where2.test 03c21a11e7b90e2845fc3c8b4002fc44cc2797fa74c86ee47d70bd7ea4f29ed6
 F test/where3.test 5b4ffc0ac2ea0fe92f02b1244b7531522fe4d7bccf6fa8741d54e82c10e67753
@@ -2054,8 +2054,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 06a9dbea40c8a0cdfae6b127a1ce1cba0547acdf1115c087e9b790a78c264b52
-R 6a7f92408352b77a850cadea400d3dbe
+P 0e5597ce5353dea2cdb092b166b57ba1d60f8115eb468349f2b2869803691a2c
+R d1d62643ac88e13cebbaf7579524f719
 U dan
-Z bd09347f876f10f602844e0bea6358b0
+Z e9d84ba59d4f6ae1792a730414132be7
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 12fed04857..700664af5f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0e5597ce5353dea2cdb092b166b57ba1d60f8115eb468349f2b2869803691a2c
\ No newline at end of file
+c1c47eff48e0831b5aed987e90d797aee99caf1861fa8318c6c3ecfb108de7e6
\ No newline at end of file
diff --git a/test/recover.test b/test/recover.test
index b7ff639403..8d9ad013c0 100644
--- a/test/recover.test
+++ b/test/recover.test
@@ -142,6 +142,7 @@ do_recover_test 3.0
 #-------------------------------------------------------------------------
 reset_db 
 execsql { PRAGMA secure_delete = 0 }
+execsql { PRAGMA auto_vacuum = 0 }
 do_execsql_test 4.0 {
   CREATE TABLE t1(a, b, c);
   CREATE TABLE t2(d, e, f);
diff --git a/test/wapptest.tcl b/test/wapptest.tcl
index fa28ec7600..d37b2e48c6 100755
--- a/test/wapptest.tcl
+++ b/test/wapptest.tcl
@@ -476,7 +476,7 @@ proc generate_main_page {{extra {}}} {
   generate_select_widget Test control_test $lOpt $G(test)
 
   # Build the "jobs" select widget. Options are 1 to 8.
-  generate_select_widget Jobs control_jobs {1 2 3 4 5 6 7 8} $G(jobs)
+  generate_select_widget Jobs control_jobs {1 2 3 4 5 6 7 8 12 16} $G(jobs)
 
   switch $G(state) {
     config {

From a16edfa29b1a346308b6e794741d8a3f525158a6 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Fri, 4 Nov 2022 18:32:45 +0000
Subject: [PATCH 428/428] Tweaks to recover module test scripts to work with
 various permutations.

FossilOrigin-Name: 454c61e818f6941c9a23f6600e37828a3f2b2ad3c6dbc8d6223570aed5d9cd8b
---
 ext/recover/recover1.test   |  6 ++++--
 ext/recover/recoverold.test |  3 +++
 manifest                    | 16 ++++++++--------
 manifest.uuid               |  2 +-
 test/permutations.test      |  2 ++
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/ext/recover/recover1.test b/ext/recover/recover1.test
index dfe176fe85..75f5dba1ff 100644
--- a/ext/recover/recover1.test
+++ b/ext/recover/recover1.test
@@ -264,11 +264,13 @@ do_recover_test 14
 
 #-------------------------------------------------------------------------
 reset_db
-do_execsql_test 15.1 {
+execsql {
   PRAGMA journal_mode=OFF;
   PRAGMA mmap_size=10;
+}
+do_execsql_test 15.1 {
   CREATE TABLE t1(x);
-} {off 10}
+} {}
 do_recover_test 15 
 
 finish_test
diff --git a/ext/recover/recoverold.test b/ext/recover/recoverold.test
index 26bbe322a1..c6acbb2f42 100644
--- a/ext/recover/recoverold.test
+++ b/ext/recover/recoverold.test
@@ -63,7 +63,10 @@ proc do_recover_test {tn {tsql {}} {res {}}} {
   sqlite3 db2 test.db2
   db2 eval [join $::sqlhook ";"]
 
+
+  db cache flush
   if {$tsql==""} {
+  compare_dbs db db2
     uplevel [list do_test $tn.sql [list compare_dbs db db2] {}]
   } else {
     uplevel [list do_execsql_test -db db2 $tn.sql $tsql $res]
diff --git a/manifest b/manifest
index 0a05dc00ca..d60d45244e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Another\stest\scase\sfix\sfor\sauto-vacuum\sbuilds.
-D 2022-11-04T17:07:33.450
+C Tweaks\sto\srecover\smodule\stest\sscripts\sto\swork\swith\svarious\spermutations.
+D 2022-11-04T18:32:45.744
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -386,14 +386,14 @@ F ext/rbu/sqlite3rbu.c 8737cabdfbee84bb25a7851ecef8b1312be332761238da9be6ddb10c6
 F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9cd389812
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
 F ext/recover/dbdata.c 1d5353d3af247c4e0656f8f88a80564aa840644c1177212dd11a186dce4ab213
-F ext/recover/recover1.test 5758c1900d8feacbdf9cc1f2796cfcb5715885a33e2ab14bdeeec8b7c938f576
+F ext/recover/recover1.test 02004eb8f9ec2825ba77e24742c18e45162cb21d27e76a3a435b83a759a1131a
 F ext/recover/recover_common.tcl a61306c1eb45c0c3fc45652c35b2d4ec19729e340bdf65a272ce4c229cefd85a
 F ext/recover/recoverclobber.test 3ba6c0c373c5c63d17e82eced64c05c57ccaf26c1abe1ca7141334022a79f32e
 F ext/recover/recovercorrupt.test 64c081ad1200ae77b447da99eb724785d6bf71715f394543dc7689642e92bf49
 F ext/recover/recovercorrupt2.test 74bef7dd2d7dd4856f3da21be6e213d27da44827e0f5f0946ca0325b46d163ed
 F ext/recover/recoverfault.test 9d9f88eeb222615a25e7514f234c950d46bee20d24cd8db49d8fff8d650dcfe1
 F ext/recover/recoverfault2.test 730e7371bcda769554d15460cb23126abba1be8eca9539ccabf63623e7bb7e09
-F ext/recover/recoverold.test 55a06e18e79a702e778c63324261fce2a0911089444384a97c423c05c42d4cab
+F ext/recover/recoverold.test 68db3d6f85dd2b98e785b6c4da4f5eea4bbe52ccf6674d9a94c7506dc92596aa
 F ext/recover/recoverpgsz.test 3658ab8e68475b1bb87d6af88baa04551c84b73280a566a1be847182410ffc58
 F ext/recover/recoverrowid.test f948bf4024a5f41b0e21b8af80c60564c5b5d78c05a8d64fc00787715ff9f45f
 F ext/recover/recoverslowidx.test 5205a9742dd9490ee99950dabb622307355ef1662dea6a3a21030057bfd81411
@@ -1385,7 +1385,7 @@ F test/parser1.test 6ccdf5e459a5dc4673d3273dc311a7e9742ca952dd0551a6a6320d27035c
 F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
 F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
 F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
-F test/permutations.test 650d89ab5aad0c9fab9325b11deca8662cb5e72f43e005073d35f12ad00eaca2
+F test/permutations.test 3e0d6eea70e5087f3240b1a2fe621b0c73445f38a262029f0a1d2d89564026f7
 F test/pg_common.tcl 3b27542224db1e713ae387459b5d117c836a5f6e328846922993b6d2b7640d9f
 F test/pragma.test cae534c12a033a5c319ccc94f50b32811acdef9f67bf19a82ff42697caccd69f
 F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
@@ -2054,8 +2054,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 0e5597ce5353dea2cdb092b166b57ba1d60f8115eb468349f2b2869803691a2c
-R d1d62643ac88e13cebbaf7579524f719
+P c1c47eff48e0831b5aed987e90d797aee99caf1861fa8318c6c3ecfb108de7e6
+R 96c1a1e097290369d58e43a186b26522
 U dan
-Z e9d84ba59d4f6ae1792a730414132be7
+Z 0f3def2d760a90c1360a62b337e54d9b
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 700664af5f..85565b8a84 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c1c47eff48e0831b5aed987e90d797aee99caf1861fa8318c6c3ecfb108de7e6
\ No newline at end of file
+454c61e818f6941c9a23f6600e37828a3f2b2ad3c6dbc8d6223570aed5d9cd8b
\ No newline at end of file
diff --git a/test/permutations.test b/test/permutations.test
index 8a5484944a..add02d27c0 100644
--- a/test/permutations.test
+++ b/test/permutations.test
@@ -806,6 +806,8 @@ test_suite "inmemory_journal" -description {
   # This test depends on a successful recovery from the pager error 
   # state. Which is not possible with an in-memory journal
   fts5fault1.test
+
+  recoverpgsz.test
 }]
 
 ifcapable mem3 {