Pickup stray oput?() calls that should have gone to stdout. Simplify console line reading, sacrificing speed (which does not matter then) for code size.

FossilOrigin-Name: 8e20645cc29335408c86a98b2141abc7d276abbffee728ffaf2960338d65bc60
Get all CLI print calls which went to stdout in 3.44.0 to do so again.
2023-11-27 15:08:50 +00:00 · 2023-11-24 16:17:54 +00:00 · 2023-11-24 14:02:36 +00:00 · 2023-11-24 13:30:49 +00:00 · 2023-11-23 07:10:52 +00:00 · 2023-11-21 18:37:16 +00:00
28 changed files with 1573 additions and 4287 deletions
@@ -2,26 +2,6 @@

 # The testrunner.tcl Script

-<ul type=none>
-  <li> 1. <a href=#overview>Overview</a>
-  <li> 2. <a href=#binary_tests>Binary Tests</a>
-<ul type=none>
-  <li> 2.1. <a href=#organization_tests>Organization of Tcl Tests</a>
-  <li> 2.2. <a href=#run_tests>Commands to Run Tests</a>
-  <li> 2.3. <a href=#binary_test_failures>Investigating Binary Test Failures</a>
-</ul>
-  <li> 3. <a href=#source_code_tests>Source Tests</a>
-<ul type=none>
-  <li> 3.1. <a href=#commands_to_run_tests>Commands to Run SQLite Tests</a>
-  <li> 3.2. <a href=#zipvfs_tests>Running ZipVFS Tests</a>
-  <li> 3.3. <a href=#source_code_test_failures>Investigating Source Code Test Failures</a>
-</ul>
-  <li> 4. <a href=#testrunner_options>Extra testrunner.tcl Options</a>
-# 4. Extra testrunner.tcl Options
-  <li> 5. <a href=#cpu_cores>Controlling CPU Core Utilization</a>
-</ul>
-
-<a name=overview></a>
 # 1. Overview

 testrunner.tcl is a Tcl script used to run multiple SQLite tests using 
@@ -64,7 +44,6 @@ Sometimes testrunner.tcl uses the [testfixture] binary that it is run with
 to run tests (see "Binary Tests" below). Sometimes it builds testfixture and
 other binaries in specific configurations to test (see "Source Tests").

-<a name=binary_tests></a>
 # 2. Binary Tests

 The commands described in this section all run various combinations of the Tcl
@@ -82,7 +61,6 @@ these tests is therefore:
 The following sub-sections describe the various options that can be
 passed to testrunner.tcl to test binary testfixture builds.

-<a name=organization_tests></a>
 ## 2.1. Organization of Tcl Tests

 Tcl tests are stored in files that match the pattern *\*.test*. They are
@@ -113,7 +91,6 @@ Running **all** tests is to run all tests in the full test set, plus a dozen
 or so permutations. The specific permutations that are run as part of "all"
 are defined in file *testrunner_data.tcl*.

-<a name=run_tests></a>
 ## 2.2. Commands to Run Tests

 To run the "veryquick" test set, use either of the following:
@@ -137,12 +114,6 @@ a specified pattern (e.g. all tests that start with "fts5"), either of:
  ./testfixture $TESTDIR/testrunner.tcl 'fts5*'
 ```

-Strictly speaking, for a test to be run the pattern must match the script
-filename, not including the directory, using the rules of Tcl's 
-\[string match\] command. Except that before the matching is done, any "%"
-characters specified as part of the pattern are transformed to "\*".
-
-
 To run "all" tests (full + permutations):

 ```
@@ -170,7 +141,6 @@ Or, if the failure occured as part of a permutation:

 TODO: An example instead of "$PERMUTATION" and $PATH\_TO\_SCRIPT?

-<a name=source_code_tests></a>
 # 3. Source Code Tests

 The commands described in this section invoke the C compiler to build 
@@ -189,8 +159,7 @@ shell that supports SQLite 3.31.1 or newer via "package require sqlite3".

 TODO: ./configure + Makefile.msc build systems.

-<a name=commands_to_run_tests></a>
-## 3.1. Commands to Run SQLite Tests
+## Commands to Run SQLite Tests

 The **mdevtest** command is equivalent to running the veryquick tests and
 the [make fuzztest] target once for each of two --enable-all builds - one 
@@ -232,18 +201,7 @@ of the specific tests run.
  tclsh $TESTDIR/testrunner.tcl release
 ```

-As with <a href=#source code tests>source code tests</a>, one or more patterns
-may be appended to any of the above commands (mdevtest, sdevtest or release).
-In that case only Tcl tests (no fuzz or other tests) that match the specified
-pattern are run. For example, to run the just the Tcl rtree tests in all 
-builds and configurations supported by "release":
-
-```
-  tclsh $TESTDIR/testrunner.tcl release rtree%
-```
-
-<a name=zipvfs_tests></a>
-## 3.2. Running ZipVFS Tests
+## Running ZipVFS Tests

 testrunner.tcl can build a zipvfs-enabled testfixture and use it to run
 tests from the Zipvfs project with the following command:
@@ -259,8 +217,7 @@ test both SQLite and Zipvfs with a single command:
  tclsh $TESTDIR/testrunner.tcl --zipvfs $PATH_TO_ZIPVFS mdevtest
 ```

-<a name=source_code_test_failures></a>
-## 3.3. Investigating Source Code Test Failures
+## Investigating Source Code Test Failures

 Investigating a test failure that occurs during source code testing is a
 two step process:
@@ -287,31 +244,9 @@ target to build. This may be used either to run a [make] command test directly,
 or else to build a testfixture (or testfixture.exe) binary with which to
 run a Tcl test script, as <a href=#binary_test_failures>described above</a>.

-<a name=testrunner_options></a>
-# 4. Extra testrunner.tcl Options

-The testrunner.tcl script options in this section may be used with both source
-code and binary tests.

-The **--buildonly** option instructs testrunner.tcl just to build the binaries
-required by a test, not to run any actual tests. For example:
-
-```
-  # Build binaries required by release test.
-  tclsh $TESTDIR/testrunner.tcl --buildonly release"
-```
-
-The **--dryrun** option prevents testrunner.tcl from building any binaries
-or running any tests. Instead, it just writes the shell commands that it
-would normally execute into the testrunner.log file. Example:
-
-```
-  # Log the shell commmands that make up the mdevtest test.
-  tclsh $TESTDIR/testrunner.tcl --dryrun mdevtest"
-```
-
-<a name=cpu_cores></a>
-# 5. Controlling CPU Core Utilization
+# 4. Controlling CPU Core Utilization

 When running either binary or source code tests, testrunner.tcl reports the
 number of jobs it intends to use to stdout. e.g.
@@ -342,3 +277,8 @@ testrunner.log and testrunner.db files:



+
+
+
+
+
@@ -128,7 +128,7 @@ static short streamOfConsole(FILE *pf, /* out */ PerStreamTags *ppst){
 # if CIO_WIN_WC_XLATE
 /* Define console modes for use with the Windows Console API. */
 #  define SHELL_CONI_MODE \
-  (ENABLE_ECHO_INPUT | ENABLE_INSERT_MODE | ENABLE_LINE_INPUT | 0x80 \
+  (ENABLE_ECHO_INPUT | ENABLE_INSERT_MODE | ENABLE_LINE_INPUT \
  | ENABLE_QUICK_EDIT_MODE | ENABLE_EXTENDED_FLAGS | ENABLE_PROCESSED_INPUT)
 #  define SHELL_CONO_MODE (ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT \
  | ENABLE_VIRTUAL_TERMINAL_PROCESSING)
@@ -549,11 +549,10 @@ zSkipValidUtf8(const char *z, int nAccept, long ccm){
 #endif /*!(defined(SQLITE_CIO_NO_UTF8SCAN)&&defined(SQLITE_CIO_NO_TRANSLATE))*/

 #ifndef SQLITE_CIO_NO_TRANSLATE
-# ifdef CONSIO_SPUTB
 SQLITE_INTERNAL_LINKAGE int
 fPutbUtf8(FILE *pfO, const char *cBuf, int nAccept){
  assert(pfO!=0);
-#  if CIO_WIN_WC_XLATE
+# if CIO_WIN_WC_XLATE
  PerStreamTags pst = PST_INITIALIZER; /* for unknown streams */
  PerStreamTags *ppst = getEmitStreamInfo(0, &pst, &pfO);
  if( pstReachesConsole(ppst) ){
@@ -563,13 +562,12 @@ fPutbUtf8(FILE *pfO, const char *cBuf, int nAccept){
    if( 0 == isKnownWritable(ppst->pf) ) restoreConsoleArb(ppst);
    return rv;
  }else {
-#  endif
-    return (int)fwrite(cBuf, 1, nAccept, pfO);
-#  if CIO_WIN_WC_XLATE
-  }
-#  endif
-}
 # endif
+    return (int)fwrite(cBuf, 1, nAccept, pfO);
+# if CIO_WIN_WC_XLATE
+  }
+# endif
+}

 SQLITE_INTERNAL_LINKAGE int
 oPutbUtf8(const char *cBuf, int nAccept){
@@ -609,56 +607,56 @@ ePutbUtf8(const char *cBuf, int nAccept){
 }
 # endif /* defined(CONSIO_EPUTB) */

+# if CIO_WIN_WC_XLATE
+
+
+/* Read up to two UTF-16 words.
+** Return 0 at EOF, 1 for ordinary UTF-16, or 2 for UTF-16 surrogate pair.
+** Buffer at *pwc must have at least 2 WCHAR slots remaining.
+*/
+static DWORD readConsoleCharacter(PerStreamTags *ppst, WCHAR *pwc){
+  DWORD ncr = 0;
+  BOOL bRC = ReadConsoleW(ppst->hx, pwc, 1, &ncr, 0);
+  if( !bRC || ncr == 0 ) return 0;
+  assert(ncr==1);
+  if( (pwc[0] & 0xF800)==0xD800 ){
+    DWORD ncrx;
+    /* WHAR just read leads a UTF-16 surrogate pair. Grab its mate. */
+    bRC = ReadConsoleW(ppst->hx, pwc+1, 1, &ncrx, 0);
+    if( !bRC || ncrx == 0 ) return 1;
+    ncr += ncrx;
+  }
+  return ncr;
+}
+# endif
+
 SQLITE_INTERNAL_LINKAGE char* fGetsUtf8(char *cBuf, int ncMax, FILE *pfIn){
  if( pfIn==0 ) pfIn = stdin;
 # if CIO_WIN_WC_XLATE
  if( pfIn == consoleInfo.pstSetup[0].pf
      && (consoleInfo.sacSetup & SAC_InConsole)!=0 ){
 #  if CIO_WIN_WC_XLATE==1
-#   define SHELL_GULP 150 /* Count of WCHARS to be gulped at a time */
-    WCHAR wcBuf[SHELL_GULP+1];
+    WCHAR wcBuf[2];
    int lend = 0, noc = 0;
    if( ncMax > 0 ) cBuf[0] = 0;
-    while( noc < ncMax-8-1 && !lend ){
-      /* There is room for at least 2 more characters and a 0-terminator. */
-      int na = (ncMax > SHELL_GULP*4+1 + noc)? SHELL_GULP : (ncMax-1 - noc)/4;
-#   undef SHELL_GULP
-      DWORD nbr = 0;
-      BOOL bRC = ReadConsoleW(consoleInfo.pstSetup[0].hx, wcBuf, na, &nbr, 0);
-      if( bRC && nbr>0 && (wcBuf[nbr-1]&0xF800)==0xD800 ){
-        /* Last WHAR read is first of a UTF-16 surrogate pair. Grab its mate. */
-        DWORD nbrx;
-        bRC &= ReadConsoleW(consoleInfo.pstSetup[0].hx, wcBuf+nbr, 1, &nbrx, 0);
-        if( bRC ) nbr += nbrx;
+    while( noc < ncMax-4-1 && !lend ){
+      /* Have room for at least 1 more UTF-8 character and a 0-terminator. */
+      DWORD ncr = readConsoleCharacter(&consoleInfo.pstSetup[0], wcBuf);
+      WCHAR wc = wcBuf[0];
+      if( ncr==0 ) break;
+      assert(ncr <= 2);
+      if( wc>=L'\x80' || ncr>1 ){
+        int nmb = WideCharToMultiByte(CP_UTF8, 0, wcBuf,ncr,cBuf+noc,4,0,0);
+        noc += nmb;
+      }else{
+        switch( wc ){
+        case L'\n': lend = 1; break;
+        case L'\x1a': lend = 1; continue;
+        case L'\r': continue;
+        default: break;
+        }
+        cBuf[noc++] = (char)wc;
      }
-      if( !bRC || (noc==0 && nbr==0) ) return 0;
-      if( nbr > 0 ){
-        int nmb = WideCharToMultiByte(CP_UTF8, 0, wcBuf,nbr,0,0,0,0);
-        if( nmb != 0 && noc+nmb <= ncMax ){
-          int iseg = noc;
-          nmb = WideCharToMultiByte(CP_UTF8, 0, wcBuf,nbr,cBuf+noc,nmb,0,0);
-          noc += nmb;
-          /* Fixup line-ends as coded by Windows for CR (or "Enter".)
-          ** This is done without regard for any setMode{Text,Binary}()
-          ** call that might have been done on the interactive input.
-          */
-          if( noc > 0 ){
-            if( cBuf[noc-1]=='\n' ){
-              lend = 1;
-              if( noc > 1 && cBuf[noc-2]=='\r' ) cBuf[--noc-1] = '\n';
-            }
-          }
-          /* Check for ^Z (anywhere in line) too, to act as EOF. */
-          while( iseg < noc ){
-            if( cBuf[iseg]=='\x1a' ){
-              noc = iseg; /* Chop ^Z and anything following. */
-              lend = 1; /* Counts as end of line too. */
-              break;
-            }
-            ++iseg;
-          }
-        }else break; /* Drop apparent garbage in. (Could assert.) */
-      }else break;
    }
    /* If got nothing, (after ^Z chop), must be at end-of-file. */
    if( noc > 0 ){
@@ -163,11 +163,9 @@ SQLITE_INTERNAL_LINKAGE int ePutsUtf8(const char *z);
 **
 ** Returns the number of accepted char values.
 */
-#ifdef CONSIO_SPUTB
 SQLITE_INTERNAL_LINKAGE int
 fPutbUtf8(FILE *pfOut, const char *cBuf, int nAccept);
 /* Like fPutbUtf8 except stream is always the designated output. */
-#endif
 SQLITE_INTERNAL_LINKAGE int
 oPutbUtf8(const char *cBuf, int nAccept);
 /* Like fPutbUtf8 except stream is always the designated error. */
@@ -181,11 +179,10 @@ ePutbUtf8(const char *cBuf, int nAccept);
 ** from the console on platforms that require same. Defers to the
 ** C library fgets() when input is not from the console. Newline
 ** translation may be done as set by set{Binary,Text}Mode(). As a
-** convenience, pfIn==NULL is treated as stdin.
+** convenience, pfIn==NULL is treated as stdin. Argument ncMax
+** must be 5 or greater, otherwise 0 (EOF indicator) is returned.
 */
 SQLITE_INTERNAL_LINKAGE char* fGetsUtf8(char *cBuf, int ncMax, FILE *pfIn);
-/* Like fGetsUtf8 except stream is always the designated input. */
-/* SQLITE_INTERNAL_LINKAGE char* iGetsUtf8(char *cBuf, int ncMax); */

 #endif /* !defined(SQLITE_CIO_NO_TRANSLATE) */

@@ -5137,24 +5137,18 @@ static void fts5DoSecureDelete(

  iOff = iStart;

-  /* If the position-list for the entry being removed flows over past
-  ** the end of this page, delete the portion of the position-list on the
-  ** next page and beyond.
-  **
-  ** Set variable bLastInDoclist to true if this entry happens 
-  ** to be the last rowid in the doclist for its term.  */
-  if( iNextOff>=iPgIdx ){
-    int pgno = pSeg->iLeafPgno+1;
-    fts5SecureDeleteOverflow(p, pSeg->pSeg, pgno, &bLastInDoclist);
-    iNextOff = iPgIdx;
-  }
-
+  /* Set variable bLastInDoclist to true if this entry happens to be
+  ** the last rowid in the doclist for its term.  */
  if( pSeg->bDel==0 ){
-    if( iNextOff!=iPgIdx ){
+    if( iNextOff>=iPgIdx ){
+      int pgno = pSeg->iLeafPgno+1;
+      fts5SecureDeleteOverflow(p, pSeg->pSeg, pgno, &bLastInDoclist);
+      iNextOff = iPgIdx;
+    }else{
      /* Loop through the page-footer. If iNextOff (offset of the
      ** entry following the one we are removing) is equal to the 
      ** offset of a key on this page, then the entry is the last 
-      ** in its doclist. */
+      ** in its doclist.  */
      int iKeyOff = 0;
      for(iIdx=0; iIdx<nIdx; /* no-op */){
        u32 iVal = 0;
@@ -880,91 +880,6 @@ do_catchsql_test 5.4 {
  UPDATE t1 SET content=randomblob(500);
 } {1 {database disk image is malformed}}

-#-------------------------------------------------------------------------
-reset_db
-do_test 6.0 {
-  sqlite3 db {}
-  db deserialize [decode_hexdb {
-.open --hexdb
-| size 32768 pagesize 4096 filename crash-42fa37b694d45a.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 07   .....@  ........
-|     96: 00 00 00 00 0d 00 00 00 07 0d d2 00 0f c4 0f 6d   ...............m
-|    112: 0f 02 0e ab 0e 4e 0d f6 0d d2 00 00 00 00 00 00   .....N..........
-|   3536: 00 00 22 07 06 17 11 11 01 31 74 61 62 6c 65 74   .........1tablet
-|   3552: 32 74 32 07 43 52 45 41 54 45 20 54 41 42 4c 45   2t2.CREATE TABLE
-|   3568: 20 74 32 28 78 29 56 06 06 17 1f 1f 01 7d 74 61    t2(x)V.......ta
-|   3584: 62 6c 65 74 31 5f 63 6f 6e 66 69 67 74 31 5f 63   blet1_configt1_c
-|   3600: 6f 6e 66 69 67 06 43 52 45 41 54 45 20 54 41 42   onfig.CREATE TAB
-|   3616: 4c 45 20 27 74 31 5f 63 6f 6e 66 69 67 27 28 6b   LE 't1_config'(k
-|   3632: 20 50 52 49 4d 41 52 59 20 4b 45 59 2c 20 76 29    PRIMARY KEY, v)
-|   3648: 20 57 49 54 48 4f 55 54 20 52 4f 57 49 44 5b 05    WITHOUT ROWID[.
-|   3664: 07 17 21 21 01 81 01 74 61 62 6c 65 74 31 5f 64   ..!!...tablet1_d
-|   3680: 6f 63 73 69 7a 65 74 31 5f 64 6f 63 73 69 7a 65   ocsizet1_docsize
-|   3696: 05 43 52 45 41 54 45 20 54 41 42 4c 45 20 27 74   .CREATE TABLE 't
-|   3712: 31 5f 64 6f 63 73 69 7a 65 27 28 69 64 20 49 4e   1_docsize'(id IN
-|   3728: 54 45 47 45 52 20 50 52 49 4d 41 52 59 20 4b 45   TEGER PRIMARY KE
-|   3744: 59 2c 20 73 7a 20 42 4c 4f 42 29 55 04 06 17 21   Y, sz BLOB)U...!
-|   3760: 21 01 77 74 61 62 6c 65 74 31 5f 63 6f 6e 74 65   !.wtablet1_conte
-|   3776: 6e 74 74 31 5f 63 6f 6e 74 65 6e 74 04 43 52 45   ntt1_content.CRE
-|   3792: 41 54 45 20 54 41 42 4c 45 20 27 74 31 5f 63 6f   ATE TABLE 't1_co
-|   3808: 6e 74 65 6e 74 27 28 69 64 20 49 4e 54 45 47 45   ntent'(id INTEGE
-|   3824: 52 20 50 52 49 4d 41 52 49 20 4b 45 59 2c 20 63   R PRIMARI KEY, c
-|   3840: 30 29 69 03 07 17 19 19 01 81 2d 74 61 62 6c 65   0)i.......-table
-|   3856: 74 31 5f 69 64 78 74 31 5f 69 64 78 03 43 52 45   t1_idxt1_idx.CRE
-|   3872: 41 54 45 20 54 41 42 4c 45 20 27 74 31 5f 69 64   ATE TABLE 't1_id
-|   3888: 78 27 28 73 65 67 69 64 2c 20 74 65 72 6d 2c 20   x'(segid, term, 
-|   3904: 70 67 6e 6f 2c 20 50 52 49 4d 41 52 59 20 4b 45   pgno, PRIMARY KE
-|   3920: 59 28 73 65 67 69 64 2c 20 74 65 72 6d 29 29 20   Y(segid, term)) 
-|   3936: 57 49 54 48 4f 55 54 20 52 4f 57 49 44 55 02 07   WITHOUT ROWIDU..
-|   3952: 17 1b 1b 01 81 01 74 61 62 6c 65 74 31 5f 64 61   ......tablet1_da
-|   3968: 74 61 74 31 5f 64 61 74 61 02 43 52 45 41 54 45   tat1_data.CREATE
-|   3984: 20 54 41 42 4c 45 20 27 74 31 5f 64 61 74 61 27    TABLE 't1_data'
-|   4000: 28 69 64 20 49 4e 54 45 47 45 52 20 50 52 49 4d   (id INTEGER PRIM
-|   4016: 41 52 b9 20 4b 45 59 2c 20 62 6c 6f 63 6b 20 42   AR. KEY, block B
-|   4032: 4c 4f 42 29 3a 01 06 17 11 11 08 63 74 61 62 6c   LOB):......ctabl
-|   4048: 65 74 31 74 31 43 52 45 41 54 45 20 56 49 52 54   et1t1CREATE VIRT
-|   4064: 55 41 4c 20 54 41 42 4c 45 20 74 31 20 55 53 49   UAL TABLE t1 USI
-|   4080: 4e 47 20 66 74 73 35 28 63 6f 6e 74 65 6e 74 29   NG fts5(content)
-| page 2 offset 4096
-|      0: 0d 00 00 00 03 0f bd 00 0f e8 0f ef 0f bd f0 00   ................
-|     16: 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
-|   4016: 00 00 00 00 00 00 00 00 00 00 00 00 00 24 84 80   .............$..
-|   4032: 80 80 80 01 03 00 4e 00 10 00 1e 06 30 61 62 61   ......N.....0aba
-|   4048: 63 6c 01 02 02 04 02 66 74 02 5f 02 04 04 6e 64   cl.....ft._...nd
-|   4064: 6f 6e 02 02 02 04 0a 07 05 01 03 00 10 03 03 0f   on..............
-|   4080: 0a 03 00 24 00 00 00 00 01 01 01 00 01 01 01 11   ...$............
-| page 3 offset 8192
-|      0: 0a 00 00 00 01 0f 00 01 00 00 00 00 00 00 00 00   ................
-|   4080: 00 00 00 00 00 00 00 00 00 00 05 04 09 0c 01 02   ................
-| page 4 offset 12288
-|      0: 0d 00 00 00 03 0f e0 00 0f f6 0f ec 0f e0 00 00   ................
-|   4064: 0a 03 03 00 1b 61 62 61 6e 64 6f 6e 08 02 03 00   .....abandon....
-|   4080: 17 61 62 61 66 74 08 01 03 00 17 61 62 61 63 6b   .abaft.....aback
-| page 5 offset 16384
-|      0: 0d 00 00 00 03 0f ee 00 0f fa 0f 00 00 00 00 00   ................
-|   4064: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 03   ................
-|   4080: 03 00 0e 01 04 02 03 00 0e 01 04 01 03 00 0e 01   ................
-| page 6 offset 20480
-|      0: 0a 00 00 00 01 0f f4 00 0f f4 00 00 00 00 00 00   ................
-|   4080: 00 00 00 00 0b 03 1b 01 76 65 72 73 69 6f 6e 04   ........version.
-| page 7 offset 24576
-|      0: 0d 00 00 10 03 0f d6 00 0f 00 00 00 00 00 00 00   ................
-|   4048: 00 00 00 00 00 00 09 03 02 1b 72 65 62 75 69 6c   ..........rebuil
-|   4064: 64 11 02 02 2b 69 6e 74 65 67 72 69 74 79 2d 63   d...+integrity-c
-|   4080: 68 65 63 6b 0a 01 02 1d 6f 70 74 69 6d 00 00 00   heck....optim...
-| page 8 offset 28672
-|      0: 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
-| end crash-42fa37b694d45a.db
-}]} {}
-
-do_execsql_test 6.1 {
-  INSERT INTO t1(t1,rank) VALUES('secure-delete',1);
-}
-do_catchsql_test 6.2 {
-  UPDATE t1 SET content=randomblob(500) WHERE t1;
-} {1 {constraint failed}}

 sqlite3_fts5_may_be_corrupt 0
 finish_test
@@ -1,51 +0,0 @@
-# 2023 Nov 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.
-#
-#*************************************************************************
-#
-
-source [file join [file dirname [info script]] fts5_common.tcl]
-ifcapable !fts5 { finish_test ; return }
-set ::testprefix fts5secure8
-
-proc sql_repeat {txt n} {
-  string repeat $txt $n
-}
-db func repeat sql_repeat
-
-do_execsql_test 1.0 {
-  CREATE VIRTUAL TABLE ft USING fts5(x);
-
-  INSERT INTO ft(ft, rank) VALUES('pgsz', 64);
-
-  INSERT INTO ft(rowid, x) VALUES(100, 'hello world');
-  INSERT INTO ft(rowid, x) VALUES(200, 'one day');
-
-  BEGIN;
-    INSERT INTO ft(rowid, x) VALUES(45, 'one two three');
-    UPDATE ft SET x = repeat('hello world ', 500) WHERE rowid=100;
-  COMMIT
-}
-
-do_execsql_test 1.1 {
-  INSERT INTO ft(ft, rank) VALUES('secure-delete', 1);
-  DELETE FROM ft WHERE rowid=100;
-}
-
-do_execsql_test 1.2 {
-  PRAGMA integrity_check;
-} {ok}
-
-
-
-
-
-finish_test
-
-
@@ -247,8 +247,9 @@ globalThis.sqlite3Worker1Promiser = function callee(config = callee.defaultConfi
 globalThis.sqlite3Worker1Promiser.defaultConfig = {
  worker: function(){
 //#if target=es6-bundler-friendly
-    return new Worker(new URL("sqlite3-worker1-bundler-friendly.mjs", import.meta.url),{
-      type: 'module'
+    return new Worker("sqlite3-worker1-bundler-friendly.mjs",{
+      type: 'module' /* Noting that neither Firefox nor Safari suppor this,
+                        as of this writing. */
    });
 //#else
    let theJs = "sqlite3-worker1.js";
@@ -266,12 +267,8 @@ globalThis.sqlite3Worker1Promiser.defaultConfig = {
    }
    return new Worker(theJs + globalThis.location.search);
 //#endif
-  }
-//#ifnot target=es6-bundler-friendly
-  .bind({
+  }.bind({
    currentScript: globalThis?.document?.currentScript
-  })
-//#endif
-  ,
+  }),
  onerror: (...args)=>console.error('worker1 promiser error',...args)
 };
@@ -1,5 +1,5 @@
-C Enhance\sjson_set()\sand\sjson_insert()\sso\sthat\sthey\screate\smissing\nsubstructure.
-D 2023-11-30T19:06:27.003
+C Pickup\sstray\soput?()\scalls\sthat\sshould\shave\sgone\sto\sstdout.\sSimplify\sconsole\sline\sreading,\ssacrificing\sspeed\s(which\sdoes\snot\smatter\sthen)\sfor\scode\ssize.
+D 2023-11-27T15:08:50.454
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -41,7 +41,7 @@ F doc/compile-for-windows.md 50b27d77be96195c66031a3181cb8684ed822327ea834e07f9c
 F doc/json-enhancements.md e356fc834781f1f1aa22ee300027a270b2c960122468499bf347bb123ce1ea4f
 F doc/lemon.html 44a53a1d2b42d7751f7b2f478efb23c978e258d794bfd172442307a755b9fa44
 F doc/pager-invariants.txt 27fed9a70ddad2088750c4a2b493b63853da2710
-F doc/testrunner.md 8d36ec692cf4994bb66d84a4645b9afa1ce9d47dc12cbf8d437c5a5fb6ddeedb
+F doc/testrunner.md 2434864be2219d4f0b6ffc99d0a2172d531c4ca4345340776f67ad4edd90dc90
 F doc/trusted-schema.md 33625008620e879c7bcfbbfa079587612c434fa094d338b08242288d358c3e8a
 F doc/vdbesort-memory.md 4da2639c14cd24a31e0af694b1a8dd37eaf277aff3867e9a8cc14046bc49df56
 F doc/vfs-shm.txt e101f27ea02a8387ce46a05be2b1a902a021d37a
@@ -50,8 +50,8 @@ F ext/README.md fd5f78013b0a2bc6f0067afb19e6ad040e89a10179b4f6f03eee58fac5f169bd
 F ext/async/README.txt e12275968f6fde133a80e04387d0e839b0c51f91
 F ext/async/sqlite3async.c 6f247666b495c477628dd19364d279c78ea48cd90c72d9f9b98ad1aff3294f94
 F ext/async/sqlite3async.h 46b47c79357b97ad85d20d2795942c0020dc20c532114a49808287f04aa5309a
-F ext/consio/console_io.c 097323f60037d70523421f0248958d2280851f8ff2f9a443d4ee1474c4769118 x
-F ext/consio/console_io.h 3228dff1717481202a24f6dcf45ce0b75e7a778bf6877089518a44e1473b76a3
+F ext/consio/console_io.c 274bff35fe8dd94c7428393c92e336bf84e693e1dacfd26f4edd55e766c6c11c x
+F ext/consio/console_io.h 030661ee4ed0dae5d3a8309b15a8e81a0f83b2d3d5fdb02b20748a5f1bf50e16
 F ext/expert/README.md b321c2762bb93c18ea102d5a5f7753a4b8bac646cb392b3b437f633caf2020c3
 F ext/expert/expert.c d548d603a4cc9e61f446cc179c120c6713511c413f82a4a32b1e1e69d3f086a4
 F ext/expert/expert1.test 0dd5cb096d66bed593e33053a3b364f6ef52ed72064bf5cf298364636dbf3cd6
@@ -96,7 +96,7 @@ F ext/fts5/fts5_buffer.c 3001fbabb585d6de52947b44b455235072b741038391f830d6b7292
 F ext/fts5/fts5_config.c 054359543566cbff1ba65a188330660a5457299513ac71c53b3a07d934c7b081
 F ext/fts5/fts5_expr.c bd3b81ce669c4104e34ffe66570af1999a317b142c15fccb112de9fb0caa57a6
 F ext/fts5/fts5_hash.c 076058f93327051952a752dc765df1acfe783eb11b419b30652aa1fc1f987902
-F ext/fts5/fts5_index.c 458cbed8a3e17617cbf7e80cdfb7612000b9bb3781f286b345fb9655858658cf
+F ext/fts5/fts5_index.c 809407c520c6afc3c1a0b8080cbd9080e4d84442f52a31654cc0e3d3acccea17
 F ext/fts5/fts5_main.c a07ed863b8bd9e6fefb62db2fd40a3518eb30a5f7dcfda5be915dd2db45efa2f
 F ext/fts5/fts5_storage.c 5d10b9bdcce5b90656cad13c7d12ad4148677d4b9e3fca0481fca56d6601426d
 F ext/fts5/fts5_tcl.c b1445cbe69908c411df8084a10b2485500ac70a9c747cdc8cda175a3da59d8ae
@@ -145,7 +145,7 @@ F ext/fts5/test/fts5corrupt.test b6d4034b682bb3387bc44c510c71b3c67d4349e4df13949
 F ext/fts5/test/fts5corrupt2.test 99e7e23a58b4d89eb7167c6de1669cbc595cd3c79ab333e0eb56405473319e77
 F ext/fts5/test/fts5corrupt3.test 7da9895dafa404efd20728f66ff4b94399788bdc042c36fe2689801bba2ccd78
 F ext/fts5/test/fts5corrupt4.test f4c08e2182a48d8b70975fd869ee5391855c06d8a0ff87b6a2529e7c5a88a1d3
-F ext/fts5/test/fts5corrupt5.test 38a238df26c4de471e1c4b98f8de6c902bc692577a1c08d0ff4f2251f3559644
+F ext/fts5/test/fts5corrupt5.test eb6ba5ca28ef7c4c6b01e850d388cdb3dacc8c4c2f383f79d0a98128257742b4
 F ext/fts5/test/fts5corrupt6.test bf8eeae07825b088b9665d9d8e4accbd8dc9bf3cb85b6c64cf6c9e18ccc420a4
 F ext/fts5/test/fts5corrupt7.test 80ad7f683a8bda2404731bb77e8c3dbbb620c1f6cc583cca8239f6accd6338c0
 F ext/fts5/test/fts5delete.test 619295b20dbc1d840b403ee07c878f52378849c3c02e44f2ee143b3e978a0aa7
@@ -209,7 +209,6 @@ F ext/fts5/test/fts5secure4.test 0d10a80590c07891478700af7793b232962042677432b98
 F ext/fts5/test/fts5secure5.test c07a68ced5951567ac116c22f2d2aafae497e47fe9fcb6a335c22f9c7a4f2c3a
 F ext/fts5/test/fts5secure6.test 74bf04733cc523bccca519bb03d3b4e2ed6f6e3db7c59bf6be82c88a0ac857fd
 F ext/fts5/test/fts5secure7.test fd03d0868d64340a1db8615b02e5508fea409de13910114e4f19eaefc120777a
-F ext/fts5/test/fts5secure8.test eb3579e9d58b0acad97e8082dee1f99b2d393198f03500b453c2b25761c0c298
 F ext/fts5/test/fts5securefault.test dbca2b6a1c16700017f5051138991b705410889933f2a37c57ae8a23b296b10b
 F ext/fts5/test/fts5simple.test a298670508c1458b88ce6030440f26a30673931884eb5f4094ac1773b3ba217b
 F ext/fts5/test/fts5simple2.test 258a1b0c590409bfa5271e872c79572b319d2a56554d0585f68f146a0da603f0
@@ -596,7 +595,7 @@ F ext/wasm/api/sqlite3-v-helper.js 7daa0eab0a513a25b05e9abae7b5beaaa39209b3ed12f
 F ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js 595953994aa3ae2287c889c4da39ab3d6f17b6461ecf4bec334b7a3faafddb02
 F ext/wasm/api/sqlite3-vfs-opfs.c-pp.js 46c4afa6c50d7369252c104f274ad977a97e91ccfafc38b400fe36e90bdda88e
 F ext/wasm/api/sqlite3-wasm.c d0e09eb5ed3743c00294e30019e591c3aa150572ae7ffe8a8994568a7377589f
-F ext/wasm/api/sqlite3-worker1-promiser.c-pp.js 569d4e859968e65f55dec5fac0b879828a23c8b179162cc7812fec19f844dd21
+F ext/wasm/api/sqlite3-worker1-promiser.c-pp.js bc06df0d599e625bde6a10a394e326dc68da9ff07fa5404354580f81566e591f
 F ext/wasm/api/sqlite3-worker1.c-pp.js a541112aa51e16705f13a99bb943c64efe178aa28c86704a955f8fd9afe4ba37
 F ext/wasm/batch-runner.html 4deeed44fe41496dc6898d9fb17938ea3291f40f4bfb977e29d0cef96fbbe4c8
 F ext/wasm/batch-runner.js 0dad6a02ad796f1003d3b7048947d275c4d6277f63767b8e685c27df8fdac93e
@@ -669,7 +668,7 @@ F src/bitvec.c 9eac5f42c11914d5ef00a75605bb205e934f435c579687f985f1f8b0995c8645
 F src/btmutex.c 79a43670447eacc651519a429f6ece9fd638563cf95b469d6891185ddae2b522
 F src/btree.c f3b09c5414de3a11db73e11e1d66f4c5e53c9e89876ff3b531a887ab656ca303 x
 F src/btree.h 03e3356f5208bcab8eed4e094240fdac4a7f9f5ddf5e91045ce589f67d47c240
-F src/btreeInt.h 3e2589726c4f105e653461814f65857465da68be1fac688de340c43b873f4062
+F src/btreeInt.h ef12a72b708677e48d6bc8dcd66fed25434740568b89e2cfa368093cfc5b9d15
 F src/build.c 189e4517d67f09f0a3e0d8e1faa6e2ef0c2e95f6ac82e33c912cb7efa2a359cc
 F src/callback.c db3a45e376deff6a16c0058163fe0ae2b73a2945f3f408ca32cf74960b28d490
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
@@ -688,7 +687,7 @@ F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
 F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 F src/insert.c 3f0a94082d978bbdd33c38fefea15346c6c6bffb70bc645a71dc0f1f87dd3276
-F src/json.c 92cc05dcf87cdace6fbf2a76e0cb2b030f04ddb1819e024af4ce8885261b4cef
+F src/json.c f93bf3df3651b1e01e2b57f7dc56f727e7b0e212d934eacf21c6fc8b31bf685e
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
 F src/main.c 1b89f3de98d1b59fec5bac1d66d6ece21f703821b8eaa0d53d9604c35309f6f9
@@ -712,7 +711,7 @@ F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
 F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e06
 F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a
 F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107
-F src/os_unix.c 97bdcd43315da7aaec9fea2da1ff7c9de458f93dd363e073f2742403a7f2e011
+F src/os_unix.c dc5404b56da7fb13cf272ddb94c3753cf9e82d32a65cba35dbb6aadcb849419c
 F src/os_win.c 4a50a154aeebc66a1f8fb79c1ff6dd5fe3d005556533361e0d460d41cb6a45a8
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c 987ab3a2cd9065d62e9955474470ff733445e2357432a67e3d0f5a8f9313e334
@@ -721,7 +720,7 @@ F src/parse.y 020d80386eb216ec9520549106353c517d2bbc89be28752ffdca649a9eaf56ec
 F src/pcache.c 040b165f30622a21b7a9a77c6f2e4877a32fb7f22d4c7f0d2a6fa6833a156a75
 F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5
 F src/pcache1.c 602acb23c471bb8d557a6f0083cc2be641d6cafcafa19e481eba7ef4c9ca0f00
-F src/pragma.c b5b4cff830575e6188cd56a295a57448d2b9dbc53f0dae58e22b97354cda3781
+F src/pragma.c b3b4ad9c0298d63098a067acca613c21a5f56b4d176d5842922bcd0b07b7164e
 F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 F src/prepare.c 371f6115cb69286ebc12c6f2d7511279c2e47d9f54f475d46a554d687a3b312c
 F src/printf.c 9da63b9ae1c14789bcae12840f5d800fd9302500cd2d62733fac77f0041b4750
@@ -729,11 +728,11 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c d017bad7ba8e778617701a0e986fdeb393d67d6afa84fb28ef4e8b8ad2acf916
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c 85857bedd2913d888aa571755b48c54cd2e6e7fcb0087e19b226ee0368cfda1e
-F src/shell.c.in 7bb83293775e1a5586d65212997442bc7acc70a2f1b781745da64ec3c2e4ea97
+F src/shell.c.in a731aa9fe56329a093dae62296e98f0bb2ea8bdb771032238992dd137a865950
 F src/sqlite.h.in d93a4821d2f792467a60f7dc81268d1bb8634f40c31694ef254cab4f9921f96a
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
-F src/sqliteInt.h 6b82eb99a9d2887e873fb29e56befb7c50cf4624df615d23a28f071dc8abf5f6
+F src/sqliteInt.h cd171cba32c7a553e7623fbd82b68b36a1b6c81079ab963260777ea9b3abe4d9
 F src/sqliteLimit.h 33b1c9baba578d34efe7dfdb43193b366111cdf41476b1e82699e14c11ee1fb6
 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -798,11 +797,11 @@ F src/upsert.c fa125a8d3410ce9a97b02cb50f7ae68a2476c405c76aa692d3acf6b8586e9242
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 F src/util.c b22cc9f203a8c0b9ee5338a67f8860347d14845864c10248bebe84518a781677
 F src/vacuum.c 604fcdaebe76f3497c855afcbf91b8fa5046b32de3045bab89cc008d68e40104
-F src/vdbe.c f73bead140670fac1aa4227188827ada52387a5fe0ccff0dd5af2a906754d904
-F src/vdbe.h 88e19a982df9027ec1c177c793d1a5d34dc23d8f06e3b2d997f43688b05ee0eb
+F src/vdbe.c 319af2cf092d20e233e8ad4267ae49bfe33c50ac4db4ee7e47af898f824c2368
+F src/vdbe.h 41485521f68e9437fdb7ec4a90f9d86ab294e9bb8281e33b235915e29122cfc0
 F src/vdbeInt.h 949669dfd8a41550d27dcb905b494f2ccde9a2e6c1b0b04daa1227e2e74c2b2c
-F src/vdbeapi.c 8f57d60c89da0b60e6d4e272358c511f6bae4e24330bdb11f8b42f986d1bf21b
-F src/vdbeaux.c c5a471b34e9c4cfc0295a3e10734fd197670ffaebcb742f284c8e17e8026ceea
+F src/vdbeapi.c b07df805110dc6e81f2a3f9cd4e83f56ea523277a59bcec489a12b740c1079e7
+F src/vdbeaux.c b34dfbc09403ccb676608da16ff0780d23d466470563d24fdf6350b8d2271d5e
 F src/vdbeblob.c 13f9287b55b6356b4b1845410382d6bede203ceb29ef69388a4a3d007ffacbe5
 F src/vdbemem.c 0012d5f01cc866833847c2f3ae4c318ac53a1cb3d28acad9c35e688039464cf0
 F src/vdbesort.c 237840ca1947511fa59bd4e18b9eeae93f2af2468c34d2427b059f896230a547
@@ -810,7 +809,7 @@ F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf8
 F src/vdbevtab.c 2143db7db0ceed69b21422581f434baffc507a08d831565193a7a02882a1b6a7
 F src/vtab.c 154725ebecd3bc02f7fbd7ad3974334f73fff76e02a964e828e48a7c5fb7efff
 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
-F src/wal.c e5247a3406531b705b44630e9ccf9ca0e5c74955ef19c06fbb146d765c500c20
+F src/wal.c 69aa3ce60b2862a24cd86bb528e653e2137388ead258ef64db49ec9038807f5f
 F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452
 F src/walker.c 7c7ea0115345851c3da4e04e2e239a29983b61fb5b038b94eede6aba462640e2
 F src/where.c 1fdc69ce1333e9bd6d7d3df9fa5af1373a3f5bfdd52108d1dbc0ca85a55f777e
@@ -1322,17 +1321,15 @@ F test/jrnlmode2.test 8759a1d4657c064637f8b079592651530db738419e1d649c6df7048cd7
 F test/jrnlmode3.test 556b447a05be0e0963f4311e95ab1632b11c9eaa
 F test/json/README.md 63e3e589e1df8fd3cc1588ba1faaff659214003f8b77a15af5c6452b35e30ee2
 F test/json/json-generator.tcl dc0dd0f393800c98658fc4c47eaa6af29d4e17527380cd28656fb261bddc8a3f
-F test/json/json-q1-b.txt 606818a5fba6d9e418c9f4ea7d8418af026775042dad81439b72447a147a462c
 F test/json/json-q1.txt 65f9d1cdcc4cffa9823fb73ed936aae5658700cd001fde448f68bfb91c807307
-F test/json/json-speed-check.sh b060a9a6c696c0a807d8929400fa11bd7113edc58b0d66b9795f424f8d0db326 x
-F test/json101.test 70587d7d35ef9e2126364ba70f0c951f70827cfbd28649d779ff3df7e8f87547
-F test/json102.test 557a46e16df1aa9bdbc4076a71a45814ea0e7503d6621d87d42a8c04cbc2b0ef
+F test/json/json-speed-check.sh 8b7babf530faa58bd59d6d362cec8e9036a68c5457ff46f3b1f1511d21af6737 x
+F test/json101.test bc05d2476fd6f7ead31ec05b43d1b24b2b193ae112fd8f0d2ed56d9a904f9fa5
+F test/json102.test 4c69694773a470f1fda34e5f4ba24920b35184fb66050b450fc2ef9ab5ad310b
 F test/json103.test 53df87f83a4e5fa0c0a56eb29ff6c94055c6eb919f33316d62161a8880112dbe
 F test/json104.test 1b844a70cddcfa2e4cd81a5db0657b2e61e7f00868310f24f56a9ba0114348c1
-F test/json105.test e64a8d73677fbae67886642cd5076e2ef3efe89f8483b87595cf9c030216c9bd
-F test/json501.test ab168a12eb6eb14d479f8c1cdae3ac062fd5a4679f17f976e96f1af518408330
+F test/json105.test 11670a4387f4308ae0318cadcbd6a918ea7edcd19fbafde020720a073952675d
+F test/json501.test c419deb835b70c1a2c8532936927bcc1146730328edd2052276715bfd209724d
 F test/json502.test 98c38e3c4573841028a1381dfb81d4c3f9b105d39668167da10d055e503f6d0b
-F test/jsonb01.test cace70765b36a36aec9a85a41ea65667d3bbf647d4400ddc3ac76f8fe7d94f90
 F test/keyword1.test 37ef6bba5d2ed5b07ecdd6810571de2956599dff
 F test/kvtest.c 6e0228409ea7ca0497dad503fbd109badb5e59545d131014b6aaac68b56f484a
 F test/lastinsert.test 42e948fd6442f07d60acbd15d33fb86473e0ef63
@@ -1655,7 +1652,7 @@ F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d163
 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 F test/tester.tcl 68454ef88508c196d19e8694daa27bff7107a91857799eaa12f417188ae53ede
-F test/testrunner.tcl e18d71f2e797da808ba6d31335e504ed6b2791581b89287a72b697a2f31b1ea1
+F test/testrunner.tcl 8a6721213bce1cfd3b33e1588cc6431143d96b98819206bf91f5a205fbb150d4
 F test/testrunner_data.tcl e4d5017290a6d5c11785e36cc94c67d8bb950c8cdc2dbe4c1db2a3a583812560
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
@@ -2145,8 +2142,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 04c0d5644372446c924a2e31a26edf51ddc563a1990d170b0ed4739e3e8b239b
-R 4a2861d7ab7860f80e426ce44e32c50f
-U drh
-Z 1fffc27f10fd5ca429d5618946ebb513
+P d65d9579ee6e1f2270917213d2b6bc25b66182a33176b2df50c691e02e612b0c
+Q +e9951ede184ce07cf725152723d795f299922460715ab76225cd3071bf0f18ee
+R 9e56423e4aab5da81ec6b75e9ca1e2d0
+U larrybr
+Z 8a82498f1d45fd5c83b1705256102297
 # Remove this line to create a well-formed Fossil manifest.
@@ -1 +1 @@
-cc7a641ab5ae739d31c24f0ad0caeb15a481a63fa8f13720718ea922c25862ff
+8e20645cc29335408c86a98b2141abc7d276abbffee728ffaf2960338d65bc60
@@ -64,7 +64,7 @@
 **     22       1     Min embedded payload fraction (must be 32)
 **     23       1     Min leaf payload fraction (must be 32)
 **     24       4     File change counter
-**     28       4     The size of the database in pages
+**     28       4     Reserved for future use
 **     32       4     First freelist page
 **     36       4     Number of freelist pages in the file
 **     40      60     15 4-byte meta values passed to higher layers
@@ -4595,20 +4595,7 @@ static int unixLockSharedMemory(unixFile *pDbFd, unixShmNode *pShmNode){
      pShmNode->isUnlocked = 1;
      rc = SQLITE_READONLY_CANTINIT;
    }else{
-#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
-      /* Do not use a blocking lock here. If the lock cannot be obtained
-      ** immediately, it means some other connection is truncating the
-      ** *-shm file. And after it has done so, it will not release its
-      ** lock, but only downgrade it to a shared lock. So no point in
-      ** blocking here. The call below to obtain the shared DMS lock may 
-      ** use a blocking lock. */
-      int iSaveTimeout = pDbFd->iBusyTimeout;
-      pDbFd->iBusyTimeout = 0;
-#endif
      rc = unixShmSystemLock(pDbFd, F_WRLCK, UNIX_SHM_DMS, 1);
-#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
-      pDbFd->iBusyTimeout = iSaveTimeout;
-#endif
      /* The first connection to attach must truncate the -shm file.  We
      ** truncate to 3 bytes (an arbitrary small number, less than the
      ** -shm header size) rather than 0 as a system debugging aid, to
@@ -1779,8 +1779,7 @@ void sqlite3Pragma(
          if( pVTab->pModule->iVersion<4 ) continue;
          if( pVTab->pModule->xIntegrity==0 ) continue;
          sqlite3VdbeAddOp3(v, OP_VCheck, i, 3, isQuick);
-          pTab->nTabRef++;
-          sqlite3VdbeAppendP4(v, pTab, P4_TABLEREF);
+          sqlite3VdbeAppendP4(v, pTab, P4_TABLE);
          a1 = sqlite3VdbeAddOp1(v, OP_IsNull, 3); VdbeCoverage(v);
          integrityCheckResultRow(v);
          sqlite3VdbeJumpHere(v, a1);
@@ -817,12 +817,11 @@ static char *local_getline(char *zLine, FILE *in){
 */
 #ifndef SQLITE_SHELL_FIDDLE
 static char *one_input_line(FILE *in, char *zPrior, int isContinuation){
-  char *zPrompt;
  char *zResult;
  if( in!=0 ){
    zResult = local_getline(zPrior, in);
  }else{
-    zPrompt = isContinuation ? CONTINUATION_PROMPT : mainPrompt;
+    char *zPrompt = isContinuation ? CONTINUATION_PROMPT : mainPrompt;
 #if SHELL_USE_LOCAL_GETLINE
    sputz(stdout, zPrompt);
    fflush(stdout);
@@ -2114,11 +2114,11 @@ struct FuncDestructor {
 #define MFUNCTION(zName, nArg, xPtr, xFunc) \
  {nArg, SQLITE_FUNC_BUILTIN|SQLITE_FUNC_CONSTANT|SQLITE_UTF8, \
   xPtr, 0, xFunc, 0, 0, 0, #zName, {0} }
-#define JFUNCTION(zName, nArg, bUseCache, bWS, bRS, bJsonB, iArg, xFunc) \
+#define JFUNCTION(zName, nArg, bUseCache, bWS, bRS, iArg, xFunc) \
  {nArg, SQLITE_FUNC_BUILTIN|SQLITE_DETERMINISTIC|SQLITE_FUNC_CONSTANT|\
   SQLITE_UTF8|((bUseCache)*SQLITE_FUNC_RUNONLY)|\
   ((bRS)*SQLITE_SUBTYPE)|((bWS)*SQLITE_RESULT_SUBTYPE), \
-   SQLITE_INT_TO_PTR(iArg|((bJsonB)*JSON_BLOB)),0,xFunc,0, 0, 0, #zName, {0} }
+   SQLITE_INT_TO_PTR(iArg), 0, xFunc, 0, 0, 0, #zName, {0} }
 #define INLINE_FUNC(zName, nArg, iArg, mFlags) \
  {nArg, SQLITE_FUNC_BUILTIN|\
   SQLITE_UTF8|SQLITE_FUNC_INLINE|SQLITE_FUNC_CONSTANT|(mFlags), \
@@ -8180,10 +8180,9 @@ case OP_VCheck: {             /* out2 */

  pOut = &aMem[pOp->p2];
  sqlite3VdbeMemSetNull(pOut);  /* Innocent until proven guilty */
-  assert( pOp->p4type==P4_TABLEREF );
+  assert( pOp->p4type==P4_TABLE );
  pTab = pOp->p4.pTab;
  assert( pTab!=0 );
-  assert( pTab->nTabRef>0 );
  assert( IsVirtual(pTab) );
  if( pTab->u.vtab.p==0 ) break;
  pVtab = pTab->u.vtab.p->pVtab;
@@ -8192,11 +8191,13 @@ case OP_VCheck: {             /* out2 */
  assert( pModule!=0 );
  assert( pModule->iVersion>=4 );
  assert( pModule->xIntegrity!=0 );
+  pTab->nTabRef++;
  sqlite3VtabLock(pTab->u.vtab.p);
  assert( pOp->p1>=0 && pOp->p1<db->nDb );
  rc = pModule->xIntegrity(pVtab, db->aDb[pOp->p1].zDbSName, pTab->zName,
                           pOp->p3, &zErr);
  sqlite3VtabUnlock(pTab->u.vtab.p);
+  sqlite3DeleteTable(db, pTab);
  if( rc ){
    sqlite3_free(zErr);
    goto abort_due_to_error;
@@ -8321,7 +8322,6 @@ case OP_VColumn: {           /* ncycle */
  const sqlite3_module *pModule;
  Mem *pDest;
  sqlite3_context sContext;
-  FuncDef nullFunc;

  VdbeCursor *pCur = p->apCsr[pOp->p1];
  assert( pCur!=0 );
@@ -8339,9 +8339,6 @@ case OP_VColumn: {           /* ncycle */
  memset(&sContext, 0, sizeof(sContext));
  sContext.pOut = pDest;
  sContext.enc = encoding;
-  nullFunc.pUserData = 0;
-  nullFunc.funcFlags = SQLITE_RESULT_SUBTYPE;
-  sContext.pFunc = &nullFunc;
  assert( pOp->p5==OPFLAG_NOCHNG || pOp->p5==0 );
  if( pOp->p5 & OPFLAG_NOCHNG ){
    sqlite3VdbeMemSetNull(pDest);
@@ -126,7 +126,6 @@ typedef struct VdbeOpList VdbeOpList;
 #define P4_INT64      (-13) /* P4 is a 64-bit signed integer */
 #define P4_INTARRAY   (-14) /* P4 is a vector of 32-bit integers */
 #define P4_FUNCCTX    (-15) /* P4 is a pointer to an sqlite3_context object */
-#define P4_TABLEREF   (-16) /* Like P4_TABLE, but reference counted */

 /* Error message codes for OP_Halt */
 #define P5_ConstraintNotNull 1
@@ -950,8 +950,9 @@ int sqlite3_step(sqlite3_stmt *pStmt){
 void *sqlite3_user_data(sqlite3_context *p){
 #ifdef SQLITE_ENABLE_API_ARMOR
  if( p==0 ) return 0;
-#endif
+#else
  assert( p && p->pFunc );
+#endif
  return p->pFunc->pUserData;
 }

@@ -1400,10 +1400,6 @@ static void freeP4(sqlite3 *db, int p4type, void *p4){
      if( db->pnBytesFreed==0 ) sqlite3VtabUnlock((VTable *)p4);
      break;
    }
-    case P4_TABLEREF: {
-      if( db->pnBytesFreed==0 ) sqlite3DeleteTable(db, (Table*)p4);
-      break;
-    }
  }
 }

@@ -2004,19 +2004,6 @@ static int walIteratorInit(Wal *pWal, u32 nBackfill, WalIterator **pp){
 }

 #ifdef SQLITE_ENABLE_SETLK_TIMEOUT
-
-
-/*
-** Attempt to enable blocking locks that block for nMs ms. Return 1 if 
-** blocking locks are successfully enabled, or 0 otherwise.
-*/
-static int walEnableBlockingMs(Wal *pWal, int nMs){
-  int rc = sqlite3OsFileControl(
-      pWal->pDbFd, SQLITE_FCNTL_LOCK_TIMEOUT, (void*)&nMs
-  );
-  return (rc==SQLITE_OK);
-}
-
 /*
 ** Attempt to enable blocking locks. Blocking locks are enabled only if (a)
 ** they are supported by the VFS, and (b) the database handle is configured
@@ -2028,7 +2015,11 @@ static int walEnableBlocking(Wal *pWal){
  if( pWal->db ){
    int tmout = pWal->db->busyTimeout;
    if( tmout ){
-      res = walEnableBlockingMs(pWal, tmout);
+      int rc;
+      rc = sqlite3OsFileControl(
+          pWal->pDbFd, SQLITE_FCNTL_LOCK_TIMEOUT, (void*)&tmout
+      );
+      res = (rc==SQLITE_OK);
    }
  }
  return res;
@@ -2077,10 +2068,20 @@ void sqlite3WalDb(Wal *pWal, sqlite3 *db){
  pWal->db = db;
 }

+/*
+** Take an exclusive WRITE lock. Blocking if so configured.
+*/
+static int walLockWriter(Wal *pWal){
+  int rc;
+  walEnableBlocking(pWal);
+  rc = walLockExclusive(pWal, WAL_WRITE_LOCK, 1);
+  walDisableBlocking(pWal);
+  return rc;
+}
 #else
 # define walEnableBlocking(x) 0
 # define walDisableBlocking(x)
-# define walEnableBlockingMs(pWal, ms) 0
+# define walLockWriter(pWal) walLockExclusive((pWal), WAL_WRITE_LOCK, 1)
 # define sqlite3WalDb(pWal, db)
 #endif   /* ifdef SQLITE_ENABLE_SETLK_TIMEOUT */

@@ -2681,9 +2682,7 @@ static int walIndexReadHdr(Wal *pWal, int *pChanged){
      }
    }else{
      int bWriteLock = pWal->writeLock;
-      if( bWriteLock 
-       || SQLITE_OK==(rc = walLockExclusive(pWal, WAL_WRITE_LOCK, 1)) 
-      ){
+      if( bWriteLock || SQLITE_OK==(rc = walLockWriter(pWal)) ){
        pWal->writeLock = 1;
        if( SQLITE_OK==(rc = walIndexPage(pWal, 0, &page0)) ){
          badHdr = walIndexTryHdr(pWal, pChanged);
@@ -2691,8 +2690,7 @@ static int walIndexReadHdr(Wal *pWal, int *pChanged){
            /* If the wal-index header is still malformed even while holding
            ** a WRITE lock, it can only mean that the header is corrupted and
            ** needs to be reconstructed.  So run recovery to do exactly that.
-            ** Disable blocking locks first.  */
-            walDisableBlocking(pWal);
+            */
            rc = walIndexRecover(pWal);
            *pChanged = 1;
          }
@@ -2959,9 +2957,6 @@ static int walTryBeginRead(Wal *pWal, int *pChanged, int useWal, int cnt){
  int i;                          /* Loop counter */
  int rc = SQLITE_OK;             /* Return code  */
  u32 mxFrame;                    /* Wal frame to lock to */
-#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
-  int nBlockTmout = 0;
-#endif

  assert( pWal->readLock<0 );     /* Not currently locked */

@@ -2992,19 +2987,6 @@ static int walTryBeginRead(Wal *pWal, int *pChanged, int useWal, int cnt){
      return SQLITE_PROTOCOL;
    }
    if( cnt>=10 ) nDelay = (cnt-9)*(cnt-9)*39;
-#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
-    /* In SQLITE_ENABLE_SETLK_TIMEOUT builds, configure the file-descriptor
-    ** to block for locks for approximately nDelay us. This affects three
-    ** locks: (a) the shared lock taken on the DMS slot in os_unix.c (if
-    ** using os_unix.c), (b) the WRITER lock taken in walIndexReadHdr() if the
-    ** first attempted read fails, and (c) the shared lock taken on the DMS
-    ** slot in os_unix.c. All three of these locks are attempted from within 
-    ** the call to walIndexReadHdr() below.  */
-    nBlockTmout = (nDelay+998) / 1000;
-    if( !useWal && walEnableBlockingMs(pWal, nBlockTmout) ){
-      nDelay = 1;
-    }
-#endif
    sqlite3OsSleep(pWal->pVfs, nDelay);
  }

@@ -3013,10 +2995,6 @@ static int walTryBeginRead(Wal *pWal, int *pChanged, int useWal, int cnt){
    if( pWal->bShmUnreliable==0 ){
      rc = walIndexReadHdr(pWal, pChanged);
    }
-#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
-    walDisableBlocking(pWal);
-    if( rc==SQLITE_BUSY_TIMEOUT ) rc = SQLITE_BUSY;
-#endif
    if( rc==SQLITE_BUSY ){
      /* If there is not a recovery running in another thread or process
      ** then convert BUSY errors to WAL_RETRY.  If recovery is known to
@@ -3131,12 +3109,9 @@ static int walTryBeginRead(Wal *pWal, int *pChanged, int useWal, int cnt){
    return rc==SQLITE_BUSY ? WAL_RETRY : SQLITE_READONLY_CANTINIT;
  }

-  (void)walEnableBlockingMs(pWal, nBlockTmout);
  rc = walLockShared(pWal, WAL_READ_LOCK(mxI));
-  walDisableBlocking(pWal);
  if( rc ){
-    assert( (rc&0xFF)!=SQLITE_BUSY||rc==SQLITE_BUSY||rc==SQLITE_BUSY_TIMEOUT );
-    return (rc&0xFF)==SQLITE_BUSY ? WAL_RETRY : rc;
+    return rc==SQLITE_BUSY ? WAL_RETRY : rc;
  }
  /* Now that the read-lock has been obtained, check that neither the
  ** value in the aReadMark[] array or the contents of the wal-index
@@ -1,25 +0,0 @@
-.mode qbox
-.timer on
-.param set $label '$.q87'
-SELECT rowid, x->>$label FROM data1 WHERE x->>$label IS NOT NULL;
-
-CREATE TEMP TABLE t2(x JSON TEXT);
-WITH RECURSIVE
-  c(x) AS (VALUES(1) UNION ALL SELECT x+1 FROM c WHERE x<25000),
-  array1(y) AS (
-    SELECT json_group_array(
-             json_object('x',x,'y',random(),'z',hex(randomblob(50)))
-           )
-      FROM c
-  ),
-  c2(n) AS (VALUES(1) UNION ALL SELECT n+1 FROM c2 WHERE n<5)
-INSERT INTO t2(x)
-  SELECT jsonb(json_object('a',n,'b',n*2,'c',y,'d',3,'e',5,'f',6))
-    FROM array1, c2;
-CREATE INDEX t2x1 ON t2(x->>'a');
-CREATE INDEX t2x2 ON t2(x->>'b');
-CREATE INDEX t2x3 ON t2(x->>'e');
-CREATE INDEX t2x4 ON t2(x->>'f');
-UPDATE t2 SET x=jsonb_replace(x,'$.f',(x->>'f')+1);
-UPDATE t2 SET x=jsonb_set(x,'$.e',(x->>'f')-1);
-UPDATE t2 SET x=jsonb_remove(x,'$.d');
@@ -40,7 +40,6 @@ doCachegrind=1
 doVdbeProfile=0
 doWal=1
 doDiff=1
-doJsonB=0
 while test "$1" != ""; do
  case $1 in
    --nodiff)
@@ -55,9 +54,6 @@ while test "$1" != ""; do
    --gcc7)
        CC=gcc-7
        ;;
-    --jsonb)
-        doJsonB=1
-        ;;
    -*)
        CC_OPTS="$CC_OPTS $1"
        ;;
@@ -73,18 +69,12 @@ rm -f cachegrind.out.* jsonshell
 $CC -g -Os -Wall -I. $CC_OPTS ./shell.c ./sqlite3.c -o jsonshell -ldl -lpthread
 ls -l jsonshell | tee -a summary-$NAME.txt
 home=`echo $0 | sed -e 's,/[^/]*$,,'`
-if test $doJsonB -eq 1; then
-  echo ./jsonshell json100mb_b.db "<$home/json-q1-b.txt"
-  valgrind --tool=cachegrind ./jsonshell json100mb_b.db <$home/json-q1-b.txt \
-        2>&1 | tee -a summary-$NAME.txt
-else
-  echo ./jsonshell json100mb.db "<$home/json-q1.txt"
-  valgrind --tool=cachegrind ./jsonshell json100mb.db <$home/json-q1.txt \
-        2>&1 | tee -a summary-$NAME.txt
-fi
+echo ./jsonshell json100mb.db "<$home/json-q1.txt"
+valgrind --tool=cachegrind ./jsonshell json100mb.db <$home/json-q1.txt \
+      2>&1 | tee -a summary-$NAME.txt
 cg_anno.tcl cachegrind.out.* >jout-$NAME.txt
 echo '*****************************************************' >>jout-$NAME.txt
 sed 's/^[0-9=-]\{9\}/==00000==/' summary-$NAME.txt >>jout-$NAME.txt
-if test "$NAME" != "$BASELINE" -a $doDiff -ne 0; then
+if test "$NAME" != "$BASELINE"; then
  fossil xdiff --tk -c 20 jout-$BASELINE.txt jout-$NAME.txt
 fi
@@ -36,9 +36,6 @@ do_execsql_test json101-1.2 {
 do_catchsql_test json101-1.3 {
  SELECT json_array(1,printf('%.1000c','x'),x'abcd',3);
 } {1 {JSON cannot hold BLOB values}}
-do_catchsql_test json101-1.3b {
-  SELECT jsonb_array(1,printf('%.1000c','x'),x'abcd',3);
-} {1 {JSON cannot hold BLOB values}}
 do_execsql_test json101-1.4 {
  SELECT json_array(-9223372036854775808,9223372036854775807,0,1,-1,
                    0.0, 1.0, -1.0, -1e99, +2e100,
@@ -50,83 +47,36 @@ do_execsql_test json101-1.4 {
                    'abcdefghijklmnopqrstuvwyxzABCDEFGHIJKLMNOPQRSTUVWXYZ',
                    99);
 } {[-9223372036854775808,9223372036854775807,0,1,-1,0.0,1.0,-1.0,-1.0e+99,2.0e+100,"one","two","three",4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,null,21,22,23,24,25,26,27,28,29,30,31,"abcdefghijklmnopqrstuvwyxzABCDEFGHIJKLMNOPQRSTUVWXYZ","abcdefghijklmnopqrstuvwyxzABCDEFGHIJKLMNOPQRSTUVWXYZ","abcdefghijklmnopqrstuvwyxzABCDEFGHIJKLMNOPQRSTUVWXYZ",99]}
-do_execsql_test json101-1.4b {
-  SELECT json(jsonb_array(-9223372036854775808,9223372036854775807,0,1,-1,
-                    0.0, 1.0, -1.0, -1e99, +2e100,
-                    'one','two','three',
-                    4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
-                    19, NULL, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-                    'abcdefghijklmnopqrstuvwyxzABCDEFGHIJKLMNOPQRSTUVWXYZ',
-                    'abcdefghijklmnopqrstuvwyxzABCDEFGHIJKLMNOPQRSTUVWXYZ',
-                    'abcdefghijklmnopqrstuvwyxzABCDEFGHIJKLMNOPQRSTUVWXYZ',
-                    99));
-} {[-9223372036854775808,9223372036854775807,0,1,-1,0.0,1.0,-1.0,-1.0e+99,2.0e+100,"one","two","three",4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,null,21,22,23,24,25,26,27,28,29,30,31,"abcdefghijklmnopqrstuvwyxzABCDEFGHIJKLMNOPQRSTUVWXYZ","abcdefghijklmnopqrstuvwyxzABCDEFGHIJKLMNOPQRSTUVWXYZ","abcdefghijklmnopqrstuvwyxzABCDEFGHIJKLMNOPQRSTUVWXYZ",99]}

 do_execsql_test json101-2.1 {
  SELECT json_object('a',1,'b',2.5,'c',null,'d','String Test');
 } {{{"a":1,"b":2.5,"c":null,"d":"String Test"}}}
-do_execsql_test json101-2.1b {
-  SELECT json(jsonb_object('a',1,'b',2.5,'c',null,'d','String Test'));
-} {{{"a":1,"b":2.5,"c":null,"d":"String Test"}}}
 do_catchsql_test json101-2.2 {
  SELECT json_object('a',printf('%.1000c','x'),2,2.5);
 } {1 {json_object() labels must be TEXT}}
-do_catchsql_test json101-2.2b {
-  SELECT jsonb_object('a',printf('%.1000c','x'),2,2.5);
-} {1 {json_object() labels must be TEXT}}
-do_execsql_test json101-2.2.2 {
-  SELECT json_object('a',json_array('xyx',77,4.5),'x',2.5);
-} {{{"a":["xyx",77,4.5],"x":2.5}}}
-do_execsql_test json101-2.2.2b {
-  SELECT json(jsonb_object('a',json_array('xyx',77,4.5),'x',2.5));
-} {{{"a":["xyx",77,4.5],"x":2.5}}}
-do_execsql_test json101-2.2.3 {
-  SELECT json_object('a',jsonb_array('xyx',77,4.5),'x',2.5);
-} {{{"a":["xyx",77,4.5],"x":2.5}}}
-do_execsql_test json101-2.2.3b {
-  SELECT json(jsonb_object('a',jsonb_array('xyx',77,4.5),'x',2.5));
-} {{{"a":["xyx",77,4.5],"x":2.5}}}
 do_catchsql_test json101-2.3 {
  SELECT json_object('a',1,'b');
 } {1 {json_object() requires an even number of arguments}}
 do_catchsql_test json101-2.4 {
  SELECT json_object('a',printf('%.1000c','x'),'b',x'abcd');
 } {1 {JSON cannot hold BLOB values}}
-do_execsql_test json101-2.5 {
-  SELECT json_object('a',printf('%.10c','x'),'b',jsonb_array(1,2,3));
-} {{{"a":"xxxxxxxxxx","b":[1,2,3]}}}

 do_execsql_test json101-3.1 {
  SELECT json_replace('{"a":1,"b":2}','$.a','[3,4,5]');
 } {{{"a":"[3,4,5]","b":2}}}
-do_execsql_test json101-3.1b {
-  SELECT json(jsonb_replace('{"a":1,"b":2}','$.a','[3,4,5]'));
-} {{{"a":"[3,4,5]","b":2}}}
 do_execsql_test json101-3.2 {
  SELECT json_replace('{"a":1,"b":2}','$.a',json('[3,4,5]'));
 } {{{"a":[3,4,5],"b":2}}}
-do_execsql_test json101-3.2b {
-  SELECT json_replace('{"a":1,"b":2}','$.a',jsonb('[3,4,5]'));
-} {{{"a":[3,4,5],"b":2}}}
 do_execsql_test json101-3.3 {
  SELECT json_type(json_set('{"a":1,"b":2}','$.b','{"x":3,"y":4}'),'$.b');
 } {text}
-do_execsql_test json101-3.3b {
-  SELECT json_type(jsonb_set('{"a":1,"b":2}','$.b','{"x":3,"y":4}'),'$.b');
-} {text}
 do_execsql_test json101-3.4 {
  SELECT json_type(json_set('{"a":1,"b":2}','$.b',json('{"x":3,"y":4}')),'$.b');
 } {object}
-do_execsql_test json101-3.4b {
-  SELECT json_type(jsonb_set('{"a":1,"b":2}','$.b',jsonb('{"x":3,"y":4}')),'$.b');
-} {object}
 ifcapable vtab {
-  do_execsql_test json101-3.5 {
-    SELECT fullkey, atom, '|' FROM json_tree(json_set('{}','$.x',123,'$.x',456));
-  } {{$} {} | {$.x} 456 |}
-  do_execsql_test json101-3.5b {
-    SELECT fullkey, atom, '|' FROM json_tree(jsonb_set('{}','$.x',123,'$.x',456));
-  } {{$} {} | {$.x} 456 |}
+do_execsql_test json101-3.5 {
+  SELECT fullkey, atom, '|' FROM json_tree(json_set('{}','$.x',123,'$.x',456));
+} {{$} {} | {$.x} 456 |}
 }

 # Per rfc7159, any JSON value is allowed at the top level, and whitespace
@@ -181,13 +131,6 @@ do_execsql_test json101-4.10 {
   WHERE json_extract(x,'$')<>x
     AND json_type(x) IN ('object','array');
 } {4}
-do_execsql_test json101-4.10b {
-  CREATE TABLE j1b AS SELECT jsonb(x) AS "x" FROM j1;
-  SELECT count(*) FROM j1b WHERE json_type(x) IN ('object','array');
-  SELECT json(x) FROM j1b
-   WHERE json_extract(x,'$')<>json(x)
-     AND json_type(x) IN ('object','array');
-} {4}

 do_execsql_test json101-5.1 {
  CREATE TABLE j2(id INTEGER PRIMARY KEY, json, src);
@@ -315,17 +258,11 @@ do_execsql_test json101-5.1 {
 	}
   ]','https://adobe.github.io/Spry/samples/data_region/JSONDataSetSample.html');
   SELECT count(*) FROM j2;
-   CREATE TABLE j2b(id INTEGER PRIMARY KEY, json, src);
-   INSERT INTO J2b(id,json,src) SELECT id, jsonb(json), src FROM j2;
-   SELECT count(*) FROM j2b;
-} {3 3}
+} {3}

 do_execsql_test json101-5.2 {
  SELECT id, json_valid(json), json_type(json), '|' FROM j2 ORDER BY id;
 } {1 1 object | 2 1 object | 3 1 array |}
-do_execsql_test json101-5.2b {
-  SELECT id, json_valid(json,5), json_type(json), '|' FROM j2b ORDER BY id;
-} {1 1 object | 2 1 object | 3 1 array |}

 ifcapable !vtab {
  finish_test
@@ -340,12 +277,6 @@ do_execsql_test json101-5.3 {
   WHERE fullkey!=(path || CASE WHEN typeof(key)=='integer' THEN '['||key||']'
                                ELSE '.'||key END);
 } {}
-do_execsql_test json101-5.3b {
-  SELECT j2b.rowid, jx.rowid, fullkey, path, key
-    FROM j2b, json_tree(j2b.json) AS jx
-   WHERE fullkey!=(path || CASE WHEN typeof(key)=='integer' THEN '['||key||']'
-                                ELSE '.'||key END);
-} {}
 do_execsql_test json101-5.4 {
  SELECT j2.rowid, jx.rowid, fullkey, path, key
    FROM j2, json_each(j2.json) AS jx
@@ -440,13 +371,6 @@ do_execsql_test json101-8.1 {
  UPDATE t8 SET b=json_array(a);
  SELECT b FROM t8;
 } {{["abc\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#xyz"]}}
-do_execsql_test json101-8.1b {
-  DROP TABLE IF EXISTS t8;
-  CREATE TABLE t8(a,b);
-  INSERT INTO t8(a) VALUES('abc' || char(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35) || 'xyz');
-  UPDATE t8 SET b=jsonb_array(a);
-  SELECT json(b) FROM t8;
-} {{["abc\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#xyz"]}}
 do_execsql_test json101-8.2 {
  SELECT a=json_extract(b,'$[0]') FROM t8;
 } {1}
@@ -477,7 +401,7 @@ do_execsql_test json101-9.4 {
  SELECT json_quote(null);
 } {"null"}
 do_catchsql_test json101-9.5 {
-  SELECT json_quote(x'3031323334');
+  SELECT json_quote(x'30313233');
 } {1 {JSON cannot hold BLOB values}}
 do_catchsql_test json101-9.6 {
  SELECT json_quote(123,456)
@@ -845,23 +769,14 @@ do_execsql_test json101-12.100 {
        }
     }');
 } {}
-
 do_execsql_test json101-12.110 {
  SELECT json_remove(x, '$.settings.layer2."dis.legomenon".forceDisplay')
    FROM t12;
 } {{{"settings":{"layer2":{"hapax.legomenon":{"forceDisplay":true,"transliterate":true,"add.footnote":true,"summary.report":true},"dis.legomenon":{"transliterate":false,"add.footnote":false,"summary.report":true},"tris.legomenon":{"forceDisplay":true,"transliterate":false,"add.footnote":false,"summary.report":false}}}}}}
-do_execsql_test json101-12.110b {
-  SELECT json_remove(jsonb(x), '$.settings.layer2."dis.legomenon".forceDisplay')
-    FROM t12;
-} {{{"settings":{"layer2":{"hapax.legomenon":{"forceDisplay":true,"transliterate":true,"add.footnote":true,"summary.report":true},"dis.legomenon":{"transliterate":false,"add.footnote":false,"summary.report":true},"tris.legomenon":{"forceDisplay":true,"transliterate":false,"add.footnote":false,"summary.report":false}}}}}}
 do_execsql_test json101-12.120 {
  SELECT json_extract(x, '$.settings.layer2."tris.legomenon"."summary.report"')
    FROM t12;
 } {0}
-do_execsql_test json101-12.120b {
-  SELECT json_extract(jsonb(x), '$.settings.layer2."tris.legomenon"."summary.report"')
-    FROM t12;
-} {0}

 # 2018-01-26
 # ticket https://www.sqlite.org/src/tktview/80177f0c226ff54f6ddd41
@@ -925,16 +840,16 @@ do_execsql_test json101-14.170 {
 #
 do_execsql_test json101-15.100 {
  SELECT * FROM JSON_EACH('{"a":1, "b":2}');
-} {a 1 integer 1 1 {} {$.a} {$} b 2 integer 2 5 {} {$.b} {$}}
+} {a 1 integer 1 2 {} {$.a} {$} b 2 integer 2 4 {} {$.b} {$}}
 do_execsql_test json101-15.110 {
  SELECT xyz.* FROM JSON_EACH('{"a":1, "b":2}') AS xyz;
-} {a 1 integer 1 1 {} {$.a} {$} b 2 integer 2 5 {} {$.b} {$}}
+} {a 1 integer 1 2 {} {$.a} {$} b 2 integer 2 4 {} {$.b} {$}}
 do_execsql_test json101-15.120 {
  SELECT * FROM (JSON_EACH('{"a":1, "b":2}'));
-} {a 1 integer 1 1 {} {$.a} {$} b 2 integer 2 5 {} {$.b} {$}}
+} {a 1 integer 1 2 {} {$.a} {$} b 2 integer 2 4 {} {$.b} {$}}
 do_execsql_test json101-15.130 {
  SELECT xyz.* FROM (JSON_EACH('{"a":1, "b":2}')) AS xyz;
-} {a 1 integer 1 1 {} {$.a} {$} b 2 integer 2 5 {} {$.b} {$}}
+} {a 1 integer 1 2 {} {$.a} {$} b 2 integer 2 4 {} {$.b} {$}}

 # 2019-11-10
 # Mailing list bug report on the handling of surrogate pairs
@@ -974,7 +889,7 @@ do_execsql_test json101-18.4 {
 } {6}
 do_catchsql_test json101-18.5 {
  SELECT json_extract('{"":8}', '$.');
-} {1 {bad JSON path: '$.'}}
+} {1 {JSON path error near ''}}

 # 2022-08-29 https://sqlite.org/forum/forumpost/9b9e4716c0d7bbd1
 # This is not a problem specifically with JSON functions.  It is
@@ -1139,29 +1054,6 @@ do_execsql_test json101-23.2 {
    FROM (SELECT json_set('[]','$[#]',0,'$[#]',1) AS j);
 } {{[0,1]} 0 1}

-# Insert/Set/Replace where the path specifies substructure that
-# does not yet exist
-#
-proc tx x {return [string map [list ( \173 ) \175 ' \042 < \133 > \135] $x]}
-foreach {id start path ins set repl} {
-  1 {{}}       {$.a.b.c}     ('a':('b':('c':9)))      ('a':('b':('c':9)))      ()
-  2 {{a:4}}    {$.a.b.c}     ('a':4)                  ('a':4)                  ('a':4)
-  3 {{a:{}}}   {$.a.b.c}     ('a':('b':('c':9)))      ('a':('b':('c':9)))      ('a':())
-  4 {[0,1,2]}  {$[3].a[0].b} <0,1,2,('a':<('b':9)>)>  <0,1,2,('a':<('b':9)>)>  <0,1,2>
-  5 {[0,1,2]}  {$[1].a[0].b} <0,1,2>                  <0,1,2>                  <0,1,2>
-  6 {[0,{},2]} {$[1].a[0].b} <0,('a':<('b':9)>),2>    <0,('a':<('b':9)>),2>    <0,(),2>
-  7 {[0,1,2]}  {$[3][0].b}   <0,1,2,<('b':9)>>        <0,1,2,<('b':9)>>        <0,1,2>
-  8 {[0,1,2]}  {$[1][0].b}   <0,1,2>                  <0,1,2>                  <0,1,2>
-} {
-  do_execsql_test json101-24.$id.insert {
-    SELECT json_insert($start,$path,9);
-  } [list [tx $ins]]
-  do_execsql_test json101-24.$id.set {
-    SELECT json_set($start,$path,9);
-  } [list [tx $set]]
-  do_execsql_test json101-24.$id.replace {
-    SELECT json_replace($start,$path,9);
-  } [list [tx $repl]]
-}
+

 finish_test
@@ -21,492 +21,159 @@ source $testdir/tester.tcl
 do_execsql_test json102-100 {
  SELECT json_object('ex','[52,3.14159]');
 } {{{"ex":"[52,3.14159]"}}}
-do_execsql_test json102-100b {
-  SELECT json(jsonb_object('ex','[52,3.14159]'));
-} {{{"ex":"[52,3.14159]"}}}
 do_execsql_test json102-110 {
  SELECT json_object('ex',json('[52,3.14159]'));
 } {{{"ex":[52,3.14159]}}}
-do_execsql_test json102-110-2 {
-  SELECT json(jsonb_object('ex',json('[52,3.14159]')));
-} {{{"ex":[52,3.14159]}}}
-do_execsql_test json102-110-3 {
-  SELECT json_object('ex',jsonb('[52,3.14159]'));
-} {{{"ex":[52,3.14159]}}}
-do_execsql_test json102-110-3 {
-  SELECT json(jsonb_object('ex',jsonb('[52,3.14159]')));
-} {{{"ex":[52,3.14159]}}}
 do_execsql_test json102-120 {
  SELECT json_object('ex',json_array(52,3.14159));
 } {{{"ex":[52,3.14159]}}}
-do_execsql_test json102-120-2 {
-  SELECT json(jsonb_object('ex',json_array(52,3.14159)));
-} {{{"ex":[52,3.14159]}}}
-do_execsql_test json102-120-3 {
-  SELECT json_object('ex',jsonb_array(52,3.14159));
-} {{{"ex":[52,3.14159]}}}
-do_execsql_test json102-120-4 {
-  SELECT json(jsonb_object('ex',jsonb_array(52,3.14159)));
-} {{{"ex":[52,3.14159]}}}
 do_execsql_test json102-130 {
  SELECT json(' { "this" : "is", "a": [ "test" ] } ');
 } {{{"this":"is","a":["test"]}}}
-do_execsql_test json102-130b {
-  SELECT json(jsonb(' { "this" : "is", "a": [ "test" ] } '));
-} {{{"this":"is","a":["test"]}}}
 do_execsql_test json102-140 {
  SELECT json_array(1,2,'3',4);
 } {{[1,2,"3",4]}}
-do_execsql_test json102-140b {
-  SELECT json(jsonb_array(1,2,'3',4));
-} {{[1,2,"3",4]}}
 do_execsql_test json102-150 {
  SELECT json_array('[1,2]');
 } {{["[1,2]"]}}
-do_execsql_test json102-150b {
-  SELECT json(jsonb_array('[1,2]'));
-} {{["[1,2]"]}}
 do_execsql_test json102-160 {
  SELECT json_array(json_array(1,2));
 } {{[[1,2]]}}
-do_execsql_test json102-160-2 {
-  SELECT json_array(jsonb_array(1,2));
-} {{[[1,2]]}}
-do_execsql_test json102-160-3 {
-  SELECT json(jsonb_array(json_array(1,2)));
-} {{[[1,2]]}}
-do_execsql_test json102-160-4 {
-  SELECT json(jsonb_array(jsonb_array(1,2)));
-} {{[[1,2]]}}
 do_execsql_test json102-170 {
  SELECT json_array(1,null,'3','[4,5]','{"six":7.7}');
 } {{[1,null,"3","[4,5]","{\"six\":7.7}"]}}
-do_execsql_test json102-170b {
-  SELECT json(jsonb_array(1,null,'3','[4,5]','{"six":7.7}'));
-} {{[1,null,"3","[4,5]","{\"six\":7.7}"]}}
 do_execsql_test json102-180 {
  SELECT json_array(1,null,'3',json('[4,5]'),json('{"six":7.7}'));
 } {{[1,null,"3",[4,5],{"six":7.7}]}}
-do_execsql_test json102-180-2 {
-  SELECT json_array(1,null,'3',jsonb('[4,5]'),json('{"six":7.7}'));
-} {{[1,null,"3",[4,5],{"six":7.7}]}}
-do_execsql_test json102-180-3 {
-  SELECT json(jsonb_array(1,null,'3',json('[4,5]'),json('{"six":7.7}')));
-} {{[1,null,"3",[4,5],{"six":7.7}]}}
-do_execsql_test json102-180-4 {
-  SELECT json(jsonb_array(1,null,'3',jsonb('[4,5]'),jsonb('{"six":7.7}')));
-} {{[1,null,"3",[4,5],{"six":7.7}]}}
 do_execsql_test json102-190 {
  SELECT json_array_length('[1,2,3,4]');
 } {{4}}
-do_execsql_test json102-190b {
-  SELECT json_array_length(jsonb('[1,2,3,4]'));
-} {{4}}
 do_execsql_test json102-191 {
  SELECT json_array_length( json_remove('[1,2,3,4]','$[2]') );
 } {{3}}
-do_execsql_test json102-191b {
-  SELECT json_array_length( jsonb_remove('[1,2,3,4]','$[2]') );
-} {{3}}
 do_execsql_test json102-200 {
  SELECT json_array_length('[1,2,3,4]', '$');
 } {{4}}
-do_execsql_test json102-200b {
-  SELECT json_array_length(jsonb('[1,2,3,4]'), '$');
-} {{4}}
 do_execsql_test json102-210 {
  SELECT json_array_length('[1,2,3,4]', '$[2]');
 } {{0}}
-do_execsql_test json102-210b {
-  SELECT json_array_length(jsonb('[1,2,3,4]'), '$[2]');
-} {{0}}
 do_execsql_test json102-220 {
  SELECT json_array_length('{"one":[1,2,3]}');
 } {{0}}
-do_execsql_test json102-220 {
-  SELECT json_array_length('{"one":[1,2,3]}');
-} {{0}}
-do_execsql_test json102-230b {
-  SELECT json_array_length(jsonb('{"one":[1,2,3]}'), '$.one');
+do_execsql_test json102-230 {
+  SELECT json_array_length('{"one":[1,2,3]}', '$.one');
 } {{3}}
 do_execsql_test json102-240 {
  SELECT json_array_length('{"one":[1,2,3]}', '$.two');
 } {{}}
-do_execsql_test json102-240b {
-  SELECT json_array_length(jsonb('{"one":[1,2,3]}'), '$.two');
-} {{}}
 do_execsql_test json102-250 {
  SELECT json_extract('{"a":2,"c":[4,5,{"f":7}]}', '$');
 } {{{"a":2,"c":[4,5,{"f":7}]}}}
-do_execsql_test json102-250-2 {
-  SELECT json_extract(jsonb('{"a":2,"c":[4,5,{"f":7}]}'), '$');
-} {{{"a":2,"c":[4,5,{"f":7}]}}}
-do_execsql_test json102-250-3 {
-  SELECT json(jsonb_extract('{"a":2,"c":[4,5,{"f":7}]}', '$'));
-} {{{"a":2,"c":[4,5,{"f":7}]}}}
-do_execsql_test json102-250-4 {
-  SELECT json(jsonb_extract(jsonb('{"a":2,"c":[4,5,{"f":7}]}'), '$'));
-} {{{"a":2,"c":[4,5,{"f":7}]}}}
 do_execsql_test json102-260 {
  SELECT json_extract('{"a":2,"c":[4,5,{"f":7}]}', '$.c');
 } {{[4,5,{"f":7}]}}
-do_execsql_test json102-260-2 {
-  SELECT json_extract(jsonb('{"a":2,"c":[4,5,{"f":7}]}'), '$.c');
-} {{[4,5,{"f":7}]}}
-do_execsql_test json102-260-3 {
-  SELECT json(jsonb_extract('{"a":2,"c":[4,5,{"f":7}]}', '$.c'));
-} {{[4,5,{"f":7}]}}
-do_execsql_test json102-260-4 {
-  SELECT json(jsonb_extract(jsonb('{"a":2,"c":[4,5,{"f":7}]}'), '$.c'));
-} {{[4,5,{"f":7}]}}
 do_execsql_test json102-270 {
  SELECT json_extract('{"a":2,"c":[4,5,{"f":7}]}', '$.c[2]');
 } {{{"f":7}}}
-do_execsql_test json102-270-2 {
-  SELECT json_extract(jsonb('{"a":2,"c":[4,5,{"f":7}]}'), '$.c[2]');
-} {{{"f":7}}}
-do_execsql_test json102-270-3 {
-  SELECT json(jsonb_extract(jsonb('{"a":2,"c":[4,5,{"f":7}]}'), '$.c[2]'));
-} {{{"f":7}}}
-do_execsql_test json102-270-4 {
-  SELECT json(jsonb_extract('{"a":2,"c":[4,5,{"f":7}]}', '$.c[2]'));
-} {{{"f":7}}}
 do_execsql_test json102-280 {
  SELECT json_extract('{"a":2,"c":[4,5,{"f":7}]}', '$.c[2].f');
 } {{7}}
-do_execsql_test json102-280b {
-  SELECT jsonb_extract('{"a":2,"c":[4,5,{"f":7}]}', '$.c[2].f');
-} {{7}}
 do_execsql_test json102-290 {
  SELECT json_extract('{"a":2,"c":[4,5],"f":7}','$.c','$.a');
 } {{[[4,5],2]}}
-do_execsql_test json102-290-2 {
-  SELECT json_extract(jsonb('{"a":2,"c":[4,5],"f":7}'),'$.c','$.a');
-} {{[[4,5],2]}}
-do_execsql_test json102-290-3 {
-  SELECT json(jsonb_extract('{"a":2,"c":[4,5],"f":7}','$.c','$.a'));
-} {{[[4,5],2]}}
-do_execsql_test json102-290-4 {
-  SELECT json(jsonb_extract(jsonb('{"a":2,"c":[4,5],"f":7}'),'$.c','$.a'));
-} {{[[4,5],2]}}
 do_execsql_test json102-300 {
  SELECT json_extract('{"a":2,"c":[4,5,{"f":7}]}', '$.x');
 } {{}}
-do_execsql_test json102-300b {
-  SELECT jsonb_extract('{"a":2,"c":[4,5,{"f":7}]}', '$.x');
-} {{}}
 do_execsql_test json102-310 {
  SELECT json_extract('{"a":2,"c":[4,5,{"f":7}]}', '$.x', '$.a');
 } {{[null,2]}}
-do_execsql_test json102-310-2 {
-  SELECT json_extract(jsonb('{"a":2,"c":[4,5,{"f":7}]}'), '$.x', '$.a');
-} {{[null,2]}}
-do_execsql_test json102-310-3 {
-  SELECT json(jsonb_extract(jsonb('{"a":2,"c":[4,5,{"f":7}]}'), '$.x', '$.a'));
-} {{[null,2]}}
-do_execsql_test json102-310-43 {
-  SELECT json(jsonb_extract('{"a":2,"c":[4,5,{"f":7}]}', '$.x', '$.a'));
-} {{[null,2]}}
 do_execsql_test json102-320 {
  SELECT json_insert('{"a":2,"c":4}', '$.a', 99);
 } {{{"a":2,"c":4}}}
-do_execsql_test json102-320-2 {
-  SELECT json_insert(jsonb('{"a":2,"c":4}'), '$.a', 99);
-} {{{"a":2,"c":4}}}
-do_execsql_test json102-320-3 {
-  SELECT json(jsonb_insert('{"a":2,"c":4}', '$.a', 99));
-} {{{"a":2,"c":4}}}
-do_execsql_test json102-320-4 {
-  SELECT json(jsonb_insert(jsonb('{"a":2,"c":4}'), '$.a', 99));
-} {{{"a":2,"c":4}}}
 do_execsql_test json102-330 {
  SELECT json_insert('{"a":2,"c":4}', '$.e', 99);
 } {{{"a":2,"c":4,"e":99}}}
-do_execsql_test json102-330-2 {
-  SELECT json_insert(jsonb('{"a":2,"c":4}'), '$.e', 99);
-} {{{"a":2,"c":4,"e":99}}}
-do_execsql_test json102-330-3 {
-  SELECT json(jsonb_insert('{"a":2,"c":4}', '$.e', 99));
-} {{{"a":2,"c":4,"e":99}}}
-do_execsql_test json102-330-4 {
-  SELECT json(jsonb_insert(jsonb('{"a":2,"c":4}'), '$.e', 99));
-} {{{"a":2,"c":4,"e":99}}}
 do_execsql_test json102-340 {
  SELECT json_replace('{"a":2,"c":4}', '$.a', 99);
 } {{{"a":99,"c":4}}}
-do_execsql_test json102-340-2 {
-  SELECT json_replace(jsonb('{"a":2,"c":4}'), '$.a', 99);
-} {{{"a":99,"c":4}}}
-do_execsql_test json102-340-3 {
-  SELECT json(jsonb_replace('{"a":2,"c":4}', '$.a', 99));
-} {{{"a":99,"c":4}}}
-do_execsql_test json102-340-4 {
-  SELECT json(jsonb_replace(jsonb('{"a":2,"c":4}'), '$.a', 99));
-} {{{"a":99,"c":4}}}
 do_execsql_test json102-350 {
  SELECT json_replace('{"a":2,"c":4}', '$.e', 99);
 } {{{"a":2,"c":4}}}
-do_execsql_test json102-350-2 {
-  SELECT json_replace(jsonb('{"a":2,"c":4}'), '$.e', 99);
-} {{{"a":2,"c":4}}}
-do_execsql_test json102-350-3 {
-  SELECT json(jsonb_replace('{"a":2,"c":4}', '$.e', 99));
-} {{{"a":2,"c":4}}}
-do_execsql_test json102-350-4 {
-  SELECT json(jsonb_replace(jsonb('{"a":2,"c":4}'), '$.e', 99));
-} {{{"a":2,"c":4}}}
 do_execsql_test json102-360 {
  SELECT json_set('{"a":2,"c":4}', '$.a', 99);
 } {{{"a":99,"c":4}}}
-do_execsql_test json102-360-2 {
-  SELECT json_set(jsonb('{"a":2,"c":4}'), '$.a', 99);
-} {{{"a":99,"c":4}}}
-do_execsql_test json102-360-3 {
-  SELECT json(jsonb_set('{"a":2,"c":4}', '$.a', 99));
-} {{{"a":99,"c":4}}}
-do_execsql_test json102-360-4 {
-  SELECT json(jsonb_set(jsonb('{"a":2,"c":4}'), '$.a', 99));
-} {{{"a":99,"c":4}}}
 do_execsql_test json102-370 {
  SELECT json_set('{"a":2,"c":4}', '$.e', 99);
 } {{{"a":2,"c":4,"e":99}}}
-do_execsql_test json102-370-2 {
-  SELECT json_set(jsonb('{"a":2,"c":4}'), '$.e', 99);
-} {{{"a":2,"c":4,"e":99}}}
-do_execsql_test json102-370-3 {
-  SELECT json(jsonb_set('{"a":2,"c":4}', '$.e', 99));
-} {{{"a":2,"c":4,"e":99}}}
-do_execsql_test json102-370-4 {
-  SELECT json(jsonb_set(jsonb('{"a":2,"c":4}'), '$.e', 99));
-} {{{"a":2,"c":4,"e":99}}}
 do_execsql_test json102-380 {
  SELECT json_set('{"a":2,"c":4}', '$.c', '[97,96]');
 } {{{"a":2,"c":"[97,96]"}}}
-do_execsql_test json102-380-2 {
-  SELECT json_set(jsonb('{"a":2,"c":4}'), '$.c', '[97,96]');
-} {{{"a":2,"c":"[97,96]"}}}
-do_execsql_test json102-380-3 {
-  SELECT json(jsonb_set('{"a":2,"c":4}', '$.c', '[97,96]'));
-} {{{"a":2,"c":"[97,96]"}}}
-do_execsql_test json102-380-4 {
-  SELECT json(jsonb_set(jsonb('{"a":2,"c":4}'), '$.c', '[97,96]'));
-} {{{"a":2,"c":"[97,96]"}}}
 do_execsql_test json102-390 {
  SELECT json_set('{"a":2,"c":4}', '$.c', json('[97,96]'));
 } {{{"a":2,"c":[97,96]}}}
-do_execsql_test json102-390-2 {
-  SELECT json_set(jsonb('{"a":2,"c":4}'), '$.c', json('[97,96]'));
-} {{{"a":2,"c":[97,96]}}}
-do_execsql_test json102-390-3 {
-  SELECT json(jsonb_set('{"a":2,"c":4}', '$.c', json('[97,96]')));
-} {{{"a":2,"c":[97,96]}}}
-do_execsql_test json102-390-4 {
-  SELECT json(jsonb_set(jsonb('{"a":2,"c":4}'), '$.c', json('[97,96]')));
-} {{{"a":2,"c":[97,96]}}}
-do_execsql_test json102-390-5 {
-  SELECT json_set('{"a":2,"c":4}', '$.c', jsonb('[97,96]'));
-} {{{"a":2,"c":[97,96]}}}
-do_execsql_test json102-390-6 {
-  SELECT json_set(jsonb('{"a":2,"c":4}'), '$.c', jsonb('[97,96]'));
-} {{{"a":2,"c":[97,96]}}}
-do_execsql_test json102-390-7 {
-  SELECT json(jsonb_set('{"a":2,"c":4}', '$.c', jsonb('[97,96]')));
-} {{{"a":2,"c":[97,96]}}}
-do_execsql_test json102-390-8 {
-  SELECT json(jsonb_set(jsonb('{"a":2,"c":4}'), '$.c', jsonb('[97,96]')));
-} {{{"a":2,"c":[97,96]}}}
 do_execsql_test json102-400 {
  SELECT json_set('{"a":2,"c":4}', '$.c', json_array(97,96));
 } {{{"a":2,"c":[97,96]}}}
-do_execsql_test json102-400-2 {
-  SELECT json_set(jsonb('{"a":2,"c":4}'), '$.c', json_array(97,96));
-} {{{"a":2,"c":[97,96]}}}
-do_execsql_test json102-400-3 {
-  SELECT json(jsonb_set('{"a":2,"c":4}', '$.c', json_array(97,96)));
-} {{{"a":2,"c":[97,96]}}}
-do_execsql_test json102-400-4 {
-  SELECT json(jsonb_set(jsonb('{"a":2,"c":4}'), '$.c', json_array(97,96)));
-} {{{"a":2,"c":[97,96]}}}
-do_execsql_test json102-400-5 {
-  SELECT json_set('{"a":2,"c":4}', '$.c', jsonb_array(97,96));
-} {{{"a":2,"c":[97,96]}}}
-do_execsql_test json102-400-6 {
-  SELECT json_set(jsonb('{"a":2,"c":4}'), '$.c', jsonb_array(97,96));
-} {{{"a":2,"c":[97,96]}}}
-do_execsql_test json102-400-7 {
-  SELECT json(jsonb_set('{"a":2,"c":4}', '$.c', jsonb_array(97,96)));
-} {{{"a":2,"c":[97,96]}}}
-do_execsql_test json102-400-8 {
-  SELECT json(jsonb_set(jsonb('{"a":2,"c":4}'), '$.c', jsonb_array(97,96)));
-} {{{"a":2,"c":[97,96]}}}
 do_execsql_test json102-410 {
  SELECT json_object('a',2,'c',4);
 } {{{"a":2,"c":4}}}
-do_execsql_test json102-410b {
-  SELECT json(jsonb_object('a',2,'c',4));
-} {{{"a":2,"c":4}}}
 do_execsql_test json102-420 {
  SELECT json_object('a',2,'c','{e:5}');
 } {{{"a":2,"c":"{e:5}"}}}
-do_execsql_test json102-420b {
-  SELECT json(jsonb_object('a',2,'c','{e:5}'));
-} {{{"a":2,"c":"{e:5}"}}}
 do_execsql_test json102-430 {
  SELECT json_object('a',2,'c',json_object('e',5));
 } {{{"a":2,"c":{"e":5}}}}
-do_execsql_test json102-430-2 {
-  SELECT json(jsonb_object('a',2,'c',json_object('e',5)));
-} {{{"a":2,"c":{"e":5}}}}
-do_execsql_test json102-430-3 {
-  SELECT json_object('a',2,'c',jsonb_object('e',5));
-} {{{"a":2,"c":{"e":5}}}}
-do_execsql_test json102-430-4 {
-  SELECT json(jsonb_object('a',2,'c',jsonb_object('e',5)));
-} {{{"a":2,"c":{"e":5}}}}
 do_execsql_test json102-440 {
  SELECT json_remove('[0,1,2,3,4]','$[2]');
 } {{[0,1,3,4]}}
-do_execsql_test json102-440-2 {
-  SELECT json_remove(jsonb('[0,1,2,3,4]'),'$[2]');
-} {{[0,1,3,4]}}
-do_execsql_test json102-440-3 {
-  SELECT json(jsonb_remove('[0,1,2,3,4]','$[2]'));
-} {{[0,1,3,4]}}
-do_execsql_test json102-440-4 {
-  SELECT json(jsonb_remove(jsonb('[0,1,2,3,4]'),'$[2]'));
-} {{[0,1,3,4]}}
 do_execsql_test json102-450 {
  SELECT json_remove('[0,1,2,3,4]','$[2]','$[0]');
 } {{[1,3,4]}}
-do_execsql_test json102-450-2 {
-  SELECT json_remove(jsonb('[0,1,2,3,4]'),'$[2]','$[0]');
-} {{[1,3,4]}}
-do_execsql_test json102-450-3 {
-  SELECT json(jsonb_remove('[0,1,2,3,4]','$[2]','$[0]'));
-} {{[1,3,4]}}
-do_execsql_test json102-450-4 {
-  SELECT json(jsonb_remove(jsonb('[0,1,2,3,4]'),'$[2]','$[0]'));
-} {{[1,3,4]}}
 do_execsql_test json102-460 {
  SELECT json_remove('[0,1,2,3,4]','$[0]','$[2]');
 } {{[1,2,4]}}
-do_execsql_test json102-460-2 {
-  SELECT json_remove(jsonb('[0,1,2,3,4]'),'$[0]','$[2]');
-} {{[1,2,4]}}
-do_execsql_test json102-460-3 {
-  SELECT json(jsonb_remove('[0,1,2,3,4]','$[0]','$[2]'));
-} {{[1,2,4]}}
-do_execsql_test json102-460-4 {
-  SELECT json(jsonb_remove(jsonb('[0,1,2,3,4]'),'$[0]','$[2]'));
-} {{[1,2,4]}}
 do_execsql_test json102-470 {
  SELECT json_remove('{"x":25,"y":42}');
 } {{{"x":25,"y":42}}}
-do_execsql_test json102-470-2 {
-  SELECT json_remove(jsonb('{"x":25,"y":42}'));
-} {{{"x":25,"y":42}}}
-do_execsql_test json102-470-3 {
-  SELECT json(jsonb_remove('{"x":25,"y":42}'));
-} {{{"x":25,"y":42}}}
-do_execsql_test json102-470-4 {
-  SELECT json(jsonb_remove(jsonb('{"x":25,"y":42}')));
-} {{{"x":25,"y":42}}}
 do_execsql_test json102-480 {
  SELECT json_remove('{"x":25,"y":42}','$.z');
 } {{{"x":25,"y":42}}}
-do_execsql_test json102-480-2 {
-  SELECT json_remove(jsonb('{"x":25,"y":42}'),'$.z');
-} {{{"x":25,"y":42}}}
-do_execsql_test json102-480-3 {
-  SELECT json(jsonb_remove('{"x":25,"y":42}','$.z'));
-} {{{"x":25,"y":42}}}
-do_execsql_test json102-480-4 {
-  SELECT json(jsonb_remove(jsonb('{"x":25,"y":42}'),'$.z'));
-} {{{"x":25,"y":42}}}
 do_execsql_test json102-490 {
  SELECT json_remove('{"x":25,"y":42}','$.y');
 } {{{"x":25}}}
-do_execsql_test json102-490-2 {
-  SELECT json_remove(jsonb('{"x":25,"y":42}'),'$.y');
-} {{{"x":25}}}
-do_execsql_test json102-490-3 {
-  SELECT json(jsonb_remove('{"x":25,"y":42}','$.y'));
-} {{{"x":25}}}
-do_execsql_test json102-490-4 {
-  SELECT json(jsonb_remove(jsonb('{"x":25,"y":42}'),'$.y'));
-} {{{"x":25}}}
 do_execsql_test json102-500 {
  SELECT json_remove('{"x":25,"y":42}','$');
 } {{}}
-do_execsql_test json102-500-2 {
-  SELECT json_remove(jsonb('{"x":25,"y":42}'),'$');
-} {{}}
-do_execsql_test json102-500-3 {
-  SELECT json(jsonb_remove('{"x":25,"y":42}','$'));
-} {{}}
-do_execsql_test json102-500-4 {
-  SELECT json(jsonb_remove(jsonb('{"x":25,"y":42}'),'$'));
-} {{}}
 do_execsql_test json102-510 {
  SELECT json_type('{"a":[2,3.5,true,false,null,"x"]}');
 } {{object}}
-do_execsql_test json102-510b {
-  SELECT json_type(x'cc0f1761cb0b133235332e350102001778');
-} {{object}}
 do_execsql_test json102-520 {
  SELECT json_type('{"a":[2,3.5,true,false,null,"x"]}','$');
 } {{object}}
-do_execsql_test json102-520b {
-  SELECT json_type(x'cc0f1761cb0b133235332e350102001778','$');
-} {{object}}
 do_execsql_test json102-530 {
  SELECT json_type('{"a":[2,3.5,true,false,null,"x"]}','$.a');
 } {{array}}
-do_execsql_test json102-530b {
-  SELECT json_type(x'cc0f1761cb0b133235332e350102001778','$.a');
-} {{array}}
 do_execsql_test json102-540 {
  SELECT json_type('{"a":[2,3.5,true,false,null,"x"]}','$.a[0]');
 } {{integer}}
-do_execsql_test json102-540b {
-  SELECT json_type(x'cc0f1761cb0b133235332e350102001778','$.a[0]');
-} {{integer}}
 do_execsql_test json102-550 {
  SELECT json_type('{"a":[2,3.5,true,false,null,"x"]}','$.a[1]');
 } {{real}}
-do_execsql_test json102-550b {
-  SELECT json_type(x'cc0f1761cb0b133235332e350102001778','$.a[1]');
-} {{real}}
 do_execsql_test json102-560 {
  SELECT json_type('{"a":[2,3.5,true,false,null,"x"]}','$.a[2]');
 } {{true}}
-do_execsql_test json102-560b {
-  SELECT json_type(x'cc0f1761cb0b133235332e350102001778','$.a[2]');
-} {{true}}
 do_execsql_test json102-570 {
  SELECT json_type('{"a":[2,3.5,true,false,null,"x"]}','$.a[3]');
 } {{false}}
-do_execsql_test json102-570b {
-  SELECT json_type(x'cc0f1761cb0b133235332e350102001778','$.a[3]');
-} {{false}}
 do_execsql_test json102-580 {
  SELECT json_type('{"a":[2,3.5,true,false,null,"x"]}','$.a[4]');
 } {{null}}
-do_execsql_test json102-580b {
-  SELECT json_type(x'cc0f1761cb0b133235332e350102001778','$.a[4]');
-} {{null}}
 do_execsql_test json102-590 {
  SELECT json_type('{"a":[2,3.5,true,false,null,"x"]}','$.a[5]');
 } {{text}}
-do_execsql_test json102-590b {
-  SELECT json_type(x'cc0f1761cb0b133235332e350102001778','$.a[5]');
-} {{text}}
 do_execsql_test json102-600 {
  SELECT json_type('{"a":[2,3.5,true,false,null,"x"]}','$.a[6]');
 } {{}}
-do_execsql_test json102-600b {
-  SELECT json_type(x'cc0f1761cb0b133235332e350102001778','$.a[6]');
-} {{}}
 do_execsql_test json102-610 {
  SELECT json_valid(char(123)||'"x":35'||char(125));
 } {{1}}
@@ -516,24 +183,17 @@ do_execsql_test json102-620 {

 ifcapable vtab {
 do_execsql_test json102-1000 {
-  CREATE TABLE user(name,phone,phoneb);
+  CREATE TABLE user(name,phone);
  INSERT INTO user(name,phone) VALUES
     ('Alice','["919-555-2345","804-555-3621"]'),
     ('Bob','["201-555-8872"]'),
     ('Cindy','["704-555-9983"]'),
     ('Dave','["336-555-8421","704-555-4321","803-911-4421"]');
-  UPDATE user SET phoneb=jsonb(phone);
  SELECT DISTINCT user.name
    FROM user, json_each(user.phone)
   WHERE json_each.value LIKE '704-%'
   ORDER BY 1;
 } {Cindy Dave}
-do_execsql_test json102-1000b {
-  SELECT DISTINCT user.name
-    FROM user, json_each(user.phoneb)
-   WHERE json_each.value LIKE '704-%'
-   ORDER BY 1;
-} {Cindy Dave}

 do_execsql_test json102-1010 {
  UPDATE user
@@ -593,12 +253,6 @@ do_execsql_test json102-1110 {
   WHERE json_tree.type NOT IN ('object','array')
   ORDER BY +big.rowid, +json_tree.id
 } $correct_answer
-do_execsql_test json102-1110b {
-  SELECT big.rowid, fullkey, value
-    FROM big, json_tree(jsonb(big.json))
-   WHERE json_tree.type NOT IN ('object','array')
-   ORDER BY +big.rowid, +json_tree.id
-} $correct_answer
 do_execsql_test json102-1120 {
  SELECT big.rowid, fullkey, atom
    FROM big, json_tree(big.json)
@@ -96,18 +96,18 @@ json_replace_test 80 {'$.b[#-1]','AAA','$.b[#-1]','BBB'} \

 do_catchsql_test json105-6.10 {
  SELECT json_extract(j, '$.b[#-]') FROM t1;
-} {1 {bad JSON path: '$.b[#-]'}}
+} {1 {JSON path error near '[#-]'}}
 do_catchsql_test json105-6.20 {
  SELECT json_extract(j, '$.b[#9]') FROM t1;
-} {1 {bad JSON path: '$.b[#9]'}}
+} {1 {JSON path error near '[#9]'}}
 do_catchsql_test json105-6.30 {
  SELECT json_extract(j, '$.b[#+2]') FROM t1;
-} {1 {bad JSON path: '$.b[#+2]'}}
+} {1 {JSON path error near '[#+2]'}}
 do_catchsql_test json105-6.40 {
  SELECT json_extract(j, '$.b[#-1') FROM t1;
-} {1 {bad JSON path: '$.b[#-1'}}
+} {1 {JSON path error near '[#-1'}}
 do_catchsql_test json105-6.50 {
  SELECT json_extract(j, '$.b[#-1x]') FROM t1;
-} {1 {bad JSON path: '$.b[#-1x]'}}
+} {1 {JSON path error near '[#-1x]'}}

 finish_test
@@ -252,13 +252,13 @@ do_execsql_test 8.11 {

 do_execsql_test 9.1 {
  WITH c(x) AS (VALUES('{x: +Infinity}')) SELECT x->>'x', json(x) FROM c;
-} {Inf {{"x":9e999}}}
+} {Inf {{"x":9.0e999}}}
 do_execsql_test 9.2 {
  WITH c(x) AS (VALUES('{x: -Infinity}')) SELECT x->>'x', json(x) FROM c;
-} {-Inf {{"x":-9e999}}}
+} {-Inf {{"x":-9.0e999}}}
 do_execsql_test 9.3 {
  WITH c(x) AS (VALUES('{x: Infinity}')) SELECT x->>'x', json(x) FROM c;
-} {Inf {{"x":9e999}}}
+} {Inf {{"x":9.0e999}}}
 do_execsql_test 9.4 {
  WITH c(x) AS (VALUES('{x: NaN}')) SELECT x->>'x', json(x) FROM c;
 } {{} {{"x":null}}}
@@ -1,49 +0,0 @@
-# 2023-11-15
-#
-# 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.
-#
-#***********************************************************************
-# Test cases for JSONB
-#
-
-set testdir [file dirname $argv0]
-source $testdir/tester.tcl
-
-do_execsql_test jsonb01-1.1 {
-  CREATE TABLE t1(x JSON BLOB);
-  INSERT INTO t1 VALUES(jsonb('{a:5,b:{x:10,y:11},c:[1,2,3,4]}'));
-}
-foreach {id path res} {
-  1 {$.a}    {{{"b":{"x":10,"y":11},"c":[1,2,3,4]}}}
-  2 {$.b}    {{{"a":5,"c":[1,2,3,4]}}}
-  3 {$.c}    {{{"a":5,"b":{"x":10,"y":11}}}}
-  4 {$.d}    {{{"a":5,"b":{"x":10,"y":11},"c":[1,2,3,4]}}}
-  5 {$.b.x}  {{{"a":5,"b":{"y":11},"c":[1,2,3,4]}}}
-  6 {$.b.y}  {{{"a":5,"b":{"x":10},"c":[1,2,3,4]}}}
-  7 {$.c[0]}  {{{"a":5,"b":{"x":10,"y":11},"c":[2,3,4]}}}
-  8 {$.c[1]}  {{{"a":5,"b":{"x":10,"y":11},"c":[1,3,4]}}}
-  9 {$.c[2]}  {{{"a":5,"b":{"x":10,"y":11},"c":[1,2,4]}}}
- 10 {$.c[3]}  {{{"a":5,"b":{"x":10,"y":11},"c":[1,2,3]}}}
- 11 {$.c[4]}  {{{"a":5,"b":{"x":10,"y":11},"c":[1,2,3,4]}}}
- 12 {$.c[#]}  {{{"a":5,"b":{"x":10,"y":11},"c":[1,2,3,4]}}}
- 13 {$.c[#-1]}  {{{"a":5,"b":{"x":10,"y":11},"c":[1,2,3]}}}
- 14 {$.c[#-2]}  {{{"a":5,"b":{"x":10,"y":11},"c":[1,2,4]}}}
- 15 {$.c[#-3]}  {{{"a":5,"b":{"x":10,"y":11},"c":[1,3,4]}}}
- 16 {$.c[#-4]}  {{{"a":5,"b":{"x":10,"y":11},"c":[2,3,4]}}}
- 17 {$.c[#-5]}  {{{"a":5,"b":{"x":10,"y":11},"c":[1,2,3,4]}}}
- 18 {$.c[#-6]}  {{{"a":5,"b":{"x":10,"y":11},"c":[1,2,3,4]}}}
-} {
-  do_execsql_test jsonb01-1.2.$id.1 {
-    SELECT json(jsonb_remove(x,$path)) FROM t1;
-  } $res
-  do_execsql_test jsonb01-1.2.$id.2 {
-    SELECT json_remove(x,$path) FROM t1;
-  } $res
-}
-
-finish_test
@@ -148,8 +148,6 @@ set TRG(cmdline) $argv
 set TRG(reporttime) 2000
 set TRG(fuzztest) 0                 ;# is the fuzztest option present.
 set TRG(zipvfs) ""                  ;# -zipvfs option, if any
-set TRG(buildonly) 0                ;# True if --buildonly option 
-set TRG(dryrun) 0                   ;# True if --dryrun option 

 switch -nocase -glob -- $tcl_platform(os) {
  *darwin* {
@@ -429,10 +427,6 @@ for {set ii 0} {$ii < [llength $argv]} {incr ii} {
      incr ii
      set TRG(zipvfs) [file normalize [lindex $argv $ii]]
      if {$isLast} { usage }
-    } elseif {($n>2 && [string match "$a*" --buildonly]) || $a=="-b"} {
-      set TRG(buildonly) 1
-    } elseif {($n>2 && [string match "$a*" --dryrun]) || $a=="-d"} {
-      set TRG(dryrun) 1
    } else {
      usage
    }
@@ -758,20 +752,6 @@ proc add_zipvfs_jobs {} {
  set ::env(SQLITE_TEST_DIR) $::testdir
 }

-# Used to add jobs for "mdevtest" and "sdevtest".
-#
-proc add_devtest_jobs {lBld patternlist} {
-  global TRG
-
-  foreach b $lBld {
-    set bld [add_build_job $b $TRG(testfixture)]
-    add_tcl_jobs $bld veryquick $patternlist
-    if {$patternlist==""} {
-      add_fuzztest_jobs $b
-    }
-  }
-}
-
 proc add_jobs_from_cmdline {patternlist} {
  global TRG

@@ -795,28 +775,33 @@ proc add_jobs_from_cmdline {patternlist} {
    }

    mdevtest {
-      add_devtest_jobs {All-O0 All-Debug} [lrange $patternlist 1 end]
+      foreach b [list All-O0 All-Debug] {
+        set bld [add_build_job $b $TRG(testfixture)]
+        add_tcl_jobs $bld veryquick ""
+        add_fuzztest_jobs $b
+      }
    }

    sdevtest {
-      add_devtest_jobs {All-Sanitize All-Debug} [lrange $patternlist 1 end]
+      foreach b [list All-Sanitize All-Debug] {
+        set bld [add_build_job $b $TRG(testfixture)]
+        add_tcl_jobs $bld veryquick ""
+        add_fuzztest_jobs $b
+      }
    }

    release {
-      set patternlist [lrange $patternlist 1 end]
      foreach b [trd_builds $TRG(platform)] {
        set bld [add_build_job $b $TRG(testfixture)]
        foreach c [trd_configs $TRG(platform) $b] {
-          add_tcl_jobs $bld $c $patternlist
+          add_tcl_jobs $bld $c ""
        }

-        if {$patternlist==""} {
-          foreach e [trd_extras $TRG(platform) $b] {
-            if {$e=="fuzztest"} {
-              add_fuzztest_jobs $b
-            } else {
-              add_make_job $bld $e
-            }
+        foreach e [trd_extras $TRG(platform) $b] {
+          if {$e=="fuzztest"} {
+            add_fuzztest_jobs $b
+          } else {
+            add_make_job $bld $e
          }
        }
      }
@@ -849,17 +834,6 @@ proc make_new_testset {} {

 }

-proc mark_job_as_finished {jobid output state endtm} {
-  r_write_db {
-    trdb eval {
-      UPDATE jobs 
-        SET output=$output, state=$state, endtime=$endtm
-        WHERE jobid=$jobid;
-      UPDATE jobs SET state='ready' WHERE depid=$jobid;
-    }
-  }
-}
-
 proc script_input_ready {fd iJob jobid} {
  global TRG
  global O
@@ -894,7 +868,15 @@ proc script_input_ready {fd iJob jobid} {
    puts $TRG(log) "### $job(displayname) ${jobtm}ms ($state)"
    puts $TRG(log) [string trim $O($iJob)]

-    mark_job_as_finished $jobid $O($iJob) $state $tm
+    r_write_db {
+      set output $O($iJob)
+      trdb eval {
+        UPDATE jobs 
+          SET output=$output, state=$state, endtime=$tm
+          WHERE jobid=$jobid;
+        UPDATE jobs SET state='ready' WHERE depid=$jobid;
+      }
+    }

    dirs_freeDir $iJob
    launch_some_jobs
@@ -946,28 +928,16 @@ proc launch_another_job {iJob} {
    close $fd
  }

-  if { $TRG(dryrun) } {
+  set pwd [pwd]
+  cd $dir
+  set fd [open $TRG(run) w]
+  puts $fd $job(cmd) 
+  close $fd
+  set fd [open "|$TRG(runcmd) 2>@1" r]
+  cd $pwd

-    mark_job_as_finished $job(jobid) "" done 0
-    dirs_freeDir $iJob
-    if {$job(build)!=""} {
-      puts $TRG(log) "(cd $dir ; $job(cmd) )"
-    } else {
-      puts $TRG(log) "$job(cmd)"
-    }
-
-  } else {
-    set pwd [pwd]
-    cd $dir
-    set fd [open $TRG(run) w]
-    puts $fd $job(cmd) 
-    close $fd
-    set fd [open "|$TRG(runcmd) 2>@1" r]
-    cd $pwd
-
-    fconfigure $fd -blocking false
-    fileevent $fd readable [list script_input_ready $fd $iJob $job(jobid)]
-  }
+  fconfigure $fd -blocking false
+  fileevent $fd readable [list script_input_ready $fd $iJob $job(jobid)]

  return 1
 }
@@ -1065,16 +1035,6 @@ proc run_testset {} {
  puts "Test log is $TRG(logname)"
 }

-# Handle the --buildonly option, if it was specified.
-#
-proc handle_buildonly {} {
-  global TRG
-  if {$TRG(buildonly)} {
-    r_write_db {
-      trdb eval { DELETE FROM jobs WHERE displaytype!='bld' }
-    }
-  }
-}

 sqlite3 trdb $TRG(dbname)
 trdb timeout $TRG(timeout)
@@ -1083,8 +1043,6 @@ if {$TRG(nJob)>1} {
  puts "splitting work across $TRG(nJob) jobs"
 }
 puts "built testset in [expr $tm/1000]ms.."
-
-handle_buildonly
 run_testset
 trdb close
 #puts [pwd]
Author	SHA1	Message	Date
larrybr	101672d8d8	Pickup stray oput?() calls that should have gone to stdout. Simplify console line reading, sacrificing speed (which does not matter then) for code size. FossilOrigin-Name: 8e20645cc29335408c86a98b2141abc7d276abbffee728ffaf2960338d65bc60	2023-11-27 15:08:50 +00:00
larrybr	7da2faaff9	Get all CLI print calls which went to stdout in 3.44.0 to do so again. FossilOrigin-Name: d65d9579ee6e1f2270917213d2b6bc25b66182a33176b2df50c691e02e612b0c	2023-11-24 16:17:54 +00:00
drh	cd2c8036f8	Omit precompiled binaries from the source tree. FossilOrigin-Name: 3a8a75bfd20bd819cd4d748a9023edc10c06ec164213cc989b0aad70c6750447	2023-11-24 14:02:36 +00:00
larrybr	c44950df00	CLI .output/.once to not redirect ".timer on" results. FossilOrigin-Name: 626c4353f2257f47dbad0e5cac4963f5d9ee91408382352374a712a42979fc78	2023-11-24 13:30:49 +00:00
larrybr	ef24be9adb	Fix output redirect bug reported in [forum:/forumposts/cbf4933cfeee74bb\|the forum]. FossilOrigin-Name: 60bdd5c3d922fdd25204e5f6bae33b08c25042cec3539dd7c36234a96be92338	2023-11-23 07:10:52 +00:00
larrybr	23a39edb1f	Pickup minor changes related to console I/O. FossilOrigin-Name: 24774e77c78705de9e10b9091b9d140cc7581de476b3d3e8febaff08c804a9c4	2023-11-21 18:37:16 +00:00