Merge 3.44.2 changes into the wal2-3.44 sub-branch.

FossilOrigin-Name: 0118e8c981fdfa4f8e593b56a2cbb97c489c3a97a3494f21a7a63b196659530c

Makefile.in

@@ -426,6 +426,7 @@ TESTSRC += \
   $(TOP)/ext/expert/sqlite3expert.c \
   $(TOP)/ext/expert/test_expert.c \
   $(TOP)/ext/misc/amatch.c \
+  $(TOP)/ext/misc/bgckpt.c \
   $(TOP)/ext/misc/appendvfs.c \
   $(TOP)/ext/misc/basexx.c \
   $(TOP)/ext/misc/carray.c \
@@ -710,21 +711,6 @@ fuzzcheck-asan$(TEXE):	$(FUZZCHECK_SRC) sqlite3.c sqlite3.h $(FUZZCHECK_DEP)
 fuzzcheck-ubsan$(TEXE):	$(FUZZCHECK_SRC) sqlite3.c sqlite3.h $(FUZZCHECK_DEP)
 	$(LTLINK) -o $@ -fsanitize=undefined $(FUZZCHECK_OPT) $(FUZZCHECK_SRC) sqlite3.c $(TLIBS)
 
-# Usage:    FUZZDB=filename make run-fuzzcheck
-#
-# Where filename is a fuzzcheck database, this target builds and runs
-# fuzzcheck, fuzzcheck-asan, and fuzzcheck-ubsan on that database.
-#
-# FUZZDB can be a glob pattern of two or more databases. Example:
-#
-#     FUZZDB=test/fuzzdata*.db make run-fuzzcheck
-#
-run-fuzzcheck:	fuzzcheck$(TEXE) fuzzcheck-asan$(TEXE) fuzzcheck-ubsan$(TEXE)
-	@if test "$(FUZZDB)" = ""; then echo 'ERROR: No FUZZDB specified. Rerun with FUZZDB=filename'; exit 1; fi
-	./fuzzcheck$(TEXE) --spinner $(FUZZDB)
-	./fuzzcheck-asan$(TEXE) --spinner $(FUZZDB)
-	./fuzzcheck-ubsan$(TEXE) --spinner $(FUZZDB)
-
 ossshell$(TEXE):	$(TOP)/test/ossfuzz.c $(TOP)/test/ossshell.c sqlite3.c sqlite3.h
 	$(LTLINK) -o $@ $(FUZZCHECK_OPT) $(TOP)/test/ossshell.c \
              $(TOP)/test/ossfuzz.c sqlite3.c $(TLIBS)
@@ -1150,21 +1136,21 @@ keywordhash.h:	$(TOP)/tool/mkkeywordhash.c
 # Source files that go into making shell.c
 SHELL_SRC = \
 	$(TOP)/src/shell.c.in \
-	$(TOP)/ext/consio/console_io.c \
-	$(TOP)/ext/consio/console_io.h \
-	$(TOP)/ext/misc/appendvfs.c \
+        $(TOP)/ext/misc/appendvfs.c \
 	$(TOP)/ext/misc/completion.c \
-	$(TOP)/ext/misc/decimal.c \
-	$(TOP)/ext/misc/basexx.c \
-	$(TOP)/ext/misc/base64.c \
-	$(TOP)/ext/misc/base85.c \
+        $(TOP)/ext/consio/console_io.c \
+        $(TOP)/ext/consio/console_io.h \
+        $(TOP)/ext/misc/decimal.c \
+        $(TOP)/ext/misc/basexx.c \
+        $(TOP)/ext/misc/base64.c \
+        $(TOP)/ext/misc/base85.c \
 	$(TOP)/ext/misc/fileio.c \
-	$(TOP)/ext/misc/ieee754.c \
-	$(TOP)/ext/misc/regexp.c \
-	$(TOP)/ext/misc/series.c \
+        $(TOP)/ext/misc/ieee754.c \
+        $(TOP)/ext/misc/regexp.c \
+        $(TOP)/ext/misc/series.c \
 	$(TOP)/ext/misc/shathree.c \
 	$(TOP)/ext/misc/sqlar.c \
-	$(TOP)/ext/misc/uint.c \
+        $(TOP)/ext/misc/uint.c \
 	$(TOP)/ext/expert/sqlite3expert.c \
 	$(TOP)/ext/expert/sqlite3expert.h \
 	$(TOP)/ext/misc/zipfile.c \
@@ -1173,7 +1159,7 @@ SHELL_SRC = \
 	$(TOP)/ext/recover/dbdata.c \
 	$(TOP)/ext/recover/sqlite3recover.c \
 	$(TOP)/ext/recover/sqlite3recover.h \
-	$(TOP)/src/test_windirent.c
+        $(TOP)/src/test_windirent.c
 
 shell.c:	$(SHELL_SRC) $(TOP)/tool/mkshellc.tcl has_tclsh84
 	$(TCLSH_CMD) $(TOP)/tool/mkshellc.tcl >shell.c

Makefile.msc

@@ -1565,6 +1565,7 @@ TESTEXT = \
   $(TOP)\ext\misc\amatch.c \
   $(TOP)\ext\misc\appendvfs.c \
   $(TOP)\ext\misc\basexx.c \
+  $(TOP)\ext\misc\bgckpt.c \
   $(TOP)\ext\misc\carray.c \
   $(TOP)\ext\misc\cksumvfs.c \
   $(TOP)\ext\misc\closure.c \

VERSION

@@ -1 +1 @@
-3.45.0
+3.44.2

autoconf/tea/configure.ac

@@ -19,7 +19,7 @@ dnl	to configure the system for the local environment.
 # so that we create the export library with the dll.
 #-----------------------------------------------------------------------
 
-AC_INIT([sqlite],[3.45.0])
+AC_INIT([sqlite],[3.44.2])
 
 #--------------------------------------------------------------------
 # Call TEA_INIT as the first TEA_ macro to set up initial vars.

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for sqlite 3.45.0.
+# Generated by GNU Autoconf 2.69 for sqlite 3.44.2.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -726,8 +726,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='sqlite'
 PACKAGE_TARNAME='sqlite'
-PACKAGE_VERSION='3.45.0'
-PACKAGE_STRING='sqlite 3.45.0'
+PACKAGE_VERSION='3.44.2'
+PACKAGE_STRING='sqlite 3.44.2'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1472,7 +1472,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures sqlite 3.45.0 to adapt to many kinds of systems.
+\`configure' configures sqlite 3.44.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1537,7 +1537,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sqlite 3.45.0:";;
+     short | recursive ) echo "Configuration of sqlite 3.44.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1668,7 +1668,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-sqlite configure 3.45.0
+sqlite configure 3.44.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2087,7 +2087,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by sqlite $as_me 3.45.0, which was
+It was created by sqlite $as_me 3.44.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -12481,7 +12481,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by sqlite $as_me 3.45.0, which was
+This file was extended by sqlite $as_me 3.44.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12547,7 +12547,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-sqlite config.status 3.45.0
+sqlite config.status 3.44.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -74,7 +74,7 @@
 # you don't need (for example BLT) by erasing or commenting out
 # the corresponding code.
 #
-AC_INIT([sqlite],m4_esyscmd(cat VERSION | tr -d '\n'))
+AC_INIT([sqlite],[m4_esyscmd(cat VERSION | tr -d '\n')])
 
 dnl Make sure the local VERSION file matches this configure script
 sqlite_version_sanity_check=`cat $srcdir/VERSION | tr -d '\n'`

doc/compile-for-windows.md

@@ -1,7 +1,7 @@
 # Notes On Compiling SQLite On Windows 11
 
 Here are step-by-step instructions on how to build SQLite from
-canonical source on a new Windows 11 PC, as of 2023-11-01:
+canonical source on a new Windows 11 PC, as of 2023-08-16:
 
   1.  Install Microsoft Visual Studio. The free "community edition" 
       will work fine.  Do a standard install for C++ development.
@@ -84,18 +84,6 @@ following minor changes:
       <li>  `set PATH=c:\tcl32\bin;%PATH%`
       </ul>
 
-## Building a DLL
-
-The command the developers use for building the deliverable DLL on the 
-[download page](https://sqlite.org/download.html) is as follows:
-
-> ~~~~
-nmake /f Makefile.msc sqlite3.dll USE_NATIVE_LIBPATHS=1 "OPTS=-DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS4=1 -DSQLITE_ENABLE_FTS5=1 -DSQLITE_ENABLE_RTREE=1 -DSQLITE_ENABLE_JSON1=1 -DSQLITE_ENABLE_GEOPOLY=1 -DSQLITE_ENABLE_SESSION=1 -DSQLITE_ENABLE_PREUPDATE_HOOK=1 -DSQLITE_ENABLE_SERIALIZE=1 -DSQLITE_ENABLE_MATH_FUNCTIONS=1"
-~~~~
-
-That command generates both the sqlite3.dll and sqlite3.def files.  The same
-command works for both 32-bit and 64-bit builds.
-
 ## Statically Linking The TCL Library
 
 Some utility programs associated with SQLite need to be linked

doc/wal2.md

@@ -0,0 +1,98 @@
+
+Wal2 Mode Notes
+===============
+
+## Activating/Deactivating Wal2 Mode
+
+"Wal2" mode is very similar to "wal" mode. To change a database to wal2 mode,
+use the command:
+
+>
+     PRAGMA journal_mode = wal2;
+
+It is not possible to change a database directly from "wal" mode to "wal2"
+mode. Instead, it must first be changed to rollback mode. So, to change a wal
+mode database to wal2 mode, the following two commands may be used:
+
+>
+     PRAGMA journal_mode = delete;
+     PRAGMA journal_mode = wal2;
+
+A database in wal2 mode may only be accessed by versions of SQLite compiled
+from this branch. Attempting to use any other version of SQLite results in an
+SQLITE_NOTADB error. A wal2 mode database may be changed back to rollback mode
+(making it accessible by all versions of SQLite) using:
+
+>
+     PRAGMA journal_mode = delete;
+
+## The Advantage of Wal2 Mode
+
+In legacy wal mode, when a writer writes data to the database, it doesn't
+modify the database file directly. Instead, it appends new data to the
+"<database>-wal" file. Readers read data from both the original database
+file and the "<database>-wal" file. At some point, data is copied from the
+"<database>-wal" file into the database file, after which the wal file can
+be deleted or overwritten. Copying data from the wal file into the database
+file is called a "checkpoint", and may be done explictly (either by "PRAGMA
+wal_checkpoint" or sqlite3_wal_checkpoint_v2()), or
+automatically (by configuring "PRAGMA wal_autocheckpoint" - this is the
+default).
+
+Checkpointers do not block writers, and writers do not block checkpointers.
+However, if a writer writes to the database while a checkpoint is ongoing,
+then the new data is appended to the end of the wal file. This means that,
+even following the checkpoint, the wal file cannot be overwritten or deleted,
+and so all subsequent transactions must also be appended to the wal file. The
+work of the checkpointer is not wasted - SQLite remembers which parts of the
+wal file have already been copied into the db file so that the next checkpoint
+does not have to do so again - but it does mean that the wal file may grow
+indefinitely if the checkpointer never gets a chance to finish without a
+writer appending to the wal file. There are also circumstances in which
+long-running readers may prevent a checkpointer from checkpointing the entire
+wal file - also causing the wal file to grow indefinitely in a busy system.
+
+Wal2 mode does not have this problem. In wal2 mode, wal files do not grow
+indefinitely even if the checkpointer never has a chance to finish
+uninterrupted.
+
+In wal2 mode, the system uses two wal files instead of one. The files are named
+"<database>-wal" and "<database>-wal2", where "<database>" is of
+course the name of the database file. When data is written to the database, the
+writer begins by appending the new data to the first wal file. Once the first
+wal file has grown large enough, writers switch to appending data to the second
+wal file. At this point the first wal file can be checkpointed (after which it
+can be overwritten). Then, once the second wal file has grown large enough and
+the first wal file has been checkpointed, writers switch back to the first wal
+file. And so on.
+
+## Application Programming
+
+From the point of view of the user, the main differences between wal and 
+wal2 mode are to do with checkpointing:
+
+  * In wal mode, a checkpoint may be attempted at any time. In wal2 
+    mode, the checkpointer has to wait until writers have switched 
+    to the "other" wal file before a checkpoint can take place.
+
+  * In wal mode, the wal-hook (callback registered using
+    sqlite3_wal_hook()) is invoked after a transaction is committed
+    with the total number of pages in the wal file as an argument. In wal2
+    mode, the argument is either the total number of uncheckpointed pages in
+    both wal files, or - if the "other" wal file is empty or already
+    checkpointed - 0.
+
+Clients are recommended to use the same strategies for checkpointing wal2 mode
+databases as for wal databases - by registering a wal-hook using
+sqlite3_wal_hook() and attempting a checkpoint when the parameter
+exceeds a certain threshold.
+
+However, it should be noted that although the wal-hook is invoked after each
+transaction is committed to disk and database locks released, it is still
+invoked from within the sqlite3_step() call used to execute the "COMMIT"
+command. In BEGIN CONCURRENT systems, where the "COMMIT" is often protected by
+an application mutex, this may reduce concurrency. In such systems, instead of
+executing a checkpoint from within the wal-hook, a thread might defer this
+action until after the application mutex has been released.
+
+

ext/consio/console_io.c

@@ -549,11 +549,12 @@ 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
+
+#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 +564,13 @@ 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
+}
+#endif /* defined(CONSIO_SPUTB) */
 
 SQLITE_INTERNAL_LINKAGE int
 oPutbUtf8(const char *cBuf, int nAccept){

ext/consio/console_io.h

@@ -166,8 +166,8 @@ SQLITE_INTERNAL_LINKAGE int ePutsUtf8(const char *z);
 #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
+/* Like fPutbUtf8 except stream is always the designated output. */
 SQLITE_INTERNAL_LINKAGE int
 oPutbUtf8(const char *cBuf, int nAccept);
 /* Like fPutbUtf8 except stream is always the designated error. */

ext/fts5/fts5_aux.c

@@ -211,14 +211,6 @@ static int fts5HighlightCb(
   }
 
   if( iPos==p->iRangeEnd ){
-    if( p->bOpen ){
-      if( p->iter.iStart>=0 && iPos>=p->iter.iStart ){
-        fts5HighlightAppend(&rc, p, &p->zIn[p->iOff], iEndOff - p->iOff);
-        p->iOff = iEndOff;
-      }
-      fts5HighlightAppend(&rc, p, p->zClose, -1);
-      p->bOpen = 0;
-    }
     fts5HighlightAppend(&rc, p, &p->zIn[p->iOff], iEndOff - p->iOff);
     p->iOff = iEndOff;
   }

ext/fts5/fts5_tokenize.c

@@ -229,12 +229,6 @@ static const unsigned char sqlite3Utf8Trans1[] = {
 
 #endif /* ifndef SQLITE_AMALGAMATION */
 
-#define FTS5_SKIP_UTF8(zIn) {                               \
-  if( ((unsigned char)(*(zIn++)))>=0xc0 ){                              \
-    while( (((unsigned char)*zIn) & 0xc0)==0x80 ){ zIn++; }             \
-  }                                                    \
-}
-
 typedef struct Unicode61Tokenizer Unicode61Tokenizer;
 struct Unicode61Tokenizer {
   unsigned char aTokenChar[128];  /* ASCII range token characters */
@@ -1270,7 +1264,6 @@ static int fts5PorterTokenize(
 typedef struct TrigramTokenizer TrigramTokenizer;
 struct TrigramTokenizer {
   int bFold;                      /* True to fold to lower-case */
-  int iFoldParam;                 /* Parameter to pass to Fts5UnicodeFold() */
 };
 
 /*
@@ -1297,7 +1290,6 @@ static int fts5TriCreate(
   }else{
     int i;
     pNew->bFold = 1;
-    pNew->iFoldParam = 0;
     for(i=0; rc==SQLITE_OK && i<nArg; i+=2){
       const char *zArg = azArg[i+1];
       if( 0==sqlite3_stricmp(azArg[i], "case_sensitive") ){
@@ -1306,21 +1298,10 @@ static int fts5TriCreate(
         }else{
           pNew->bFold = (zArg[0]=='0');
         }
-      }else if( 0==sqlite3_stricmp(azArg[i], "remove_diacritics") ){
-        if( (zArg[0]!='0' && zArg[0]!='1' && zArg[0]!='2') || zArg[1] ){
-          rc = SQLITE_ERROR;
-        }else{
-          pNew->iFoldParam = (zArg[0]!='0') ? 2 : 0;
-        }
       }else{
         rc = SQLITE_ERROR;
       }
     }
-
-    if( pNew->iFoldParam!=0 && pNew->bFold==0 ){
-      rc = SQLITE_ERROR;
-    }
-
     if( rc!=SQLITE_OK ){
       fts5TriDelete((Fts5Tokenizer*)pNew);
       pNew = 0;
@@ -1343,62 +1324,40 @@ static int fts5TriTokenize(
   TrigramTokenizer *p = (TrigramTokenizer*)pTok;
   int rc = SQLITE_OK;
   char aBuf[32];
-  char *zOut = aBuf;
-  int ii;
   const unsigned char *zIn = (const unsigned char*)pText;
   const unsigned char *zEof = &zIn[nText];
   u32 iCode;
-  int aStart[3];                  /* Input offset of each character in aBuf[] */
 
   UNUSED_PARAM(unusedFlags);
-
-  /* Populate aBuf[] with the characters for the first trigram. */
-  for(ii=0; ii<3; ii++){
-    do {
-      aStart[ii] = zIn - (const unsigned char*)pText;
-      READ_UTF8(zIn, zEof, iCode);
-      if( iCode==0 ) return SQLITE_OK;
-      if( p->bFold ) iCode = sqlite3Fts5UnicodeFold(iCode, p->iFoldParam);
-    }while( iCode==0 );
-    WRITE_UTF8(zOut, iCode);
-  }
-
-  /* At the start of each iteration of this loop:
-  **
-  **  aBuf:      Contains 3 characters. The 3 characters of the next trigram.
-  **  zOut:      Points to the byte following the last character in aBuf.
-  **  aStart[3]: Contains the byte offset in the input text corresponding
-  **             to the start of each of the three characters in the buffer.
-  */
-  assert( zIn<=zEof );
   while( 1 ){
-    int iNext;                    /* Start of character following current tri */
-    const char *z1;
+    char *zOut = aBuf;
+    int iStart = zIn - (const unsigned char*)pText;
+    const unsigned char *zNext; 
 
-    /* Read characters from the input up until the first non-diacritic */
-    do {
-      iNext = zIn - (const unsigned char*)pText;
+    READ_UTF8(zIn, zEof, iCode);
+    if( iCode==0 ) break;
+    zNext = zIn;
+    if( zIn<zEof ){
+      if( p->bFold ) iCode = sqlite3Fts5UnicodeFold(iCode, 0);
+      WRITE_UTF8(zOut, iCode);
       READ_UTF8(zIn, zEof, iCode);
       if( iCode==0 ) break;
-      if( p->bFold ) iCode = sqlite3Fts5UnicodeFold(iCode, p->iFoldParam);
-    }while( iCode==0 );
-
-    /* Pass the current trigram back to fts5 */
-    rc = xToken(pCtx, 0, aBuf, zOut-aBuf, aStart[0], iNext);
-    if( iCode==0 || rc!=SQLITE_OK ) break;
-
-    /* Remove the first character from buffer aBuf[]. Append the character
-    ** with codepoint iCode.  */
-    z1 = aBuf;
-    FTS5_SKIP_UTF8(z1);
-    memmove(aBuf, z1, zOut - z1);
-    zOut -= (z1 - aBuf);
-    WRITE_UTF8(zOut, iCode);
-
-    /* Update the aStart[] array */
-    aStart[0] = aStart[1];
-    aStart[1] = aStart[2];
-    aStart[2] = iNext;
+    }else{
+      break;
+    }
+    if( zIn<zEof ){
+      if( p->bFold ) iCode = sqlite3Fts5UnicodeFold(iCode, 0);
+      WRITE_UTF8(zOut, iCode);
+      READ_UTF8(zIn, zEof, iCode);
+      if( iCode==0 ) break;
+      if( p->bFold ) iCode = sqlite3Fts5UnicodeFold(iCode, 0);
+      WRITE_UTF8(zOut, iCode);
+    }else{
+      break;
+    }
+    rc = xToken(pCtx, 0, aBuf, zOut-aBuf, iStart, iStart + zOut-aBuf);
+    if( rc!=SQLITE_OK ) break;
+    zIn = zNext;
   }
 
   return rc;
@@ -1421,9 +1380,7 @@ int sqlite3Fts5TokenizerPattern(
 ){
   if( xCreate==fts5TriCreate ){
     TrigramTokenizer *p = (TrigramTokenizer*)pTok;
-    if( p->iFoldParam==0 ){
-      return p->bFold ? FTS5_PATTERN_LIKE : FTS5_PATTERN_GLOB;
-    }
+    return p->bFold ? FTS5_PATTERN_LIKE : FTS5_PATTERN_GLOB;
   }
   return FTS5_PATTERN_NONE;
 }

ext/fts5/test/fts5tokenizer2.test

@@ -1,89 +0,0 @@
-# 2023 Nov 03
-#
-# 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 focusing on the built-in fts5 tokenizers. 
-#
-
-source [file join [file dirname [info script]] fts5_common.tcl]
-set testprefix fts5tokenizer2
-
-# If SQLITE_ENABLE_FTS5 is defined, omit this file.
-ifcapable !fts5 {
-  finish_test
-  return
-}
-
-sqlite3_fts5_create_tokenizer db tst get_tst_tokenizer
-proc get_tst_tokenizer {args} {
-  return "tst_tokenizer"
-}
-proc tst_tokenizer {flags txt} {
-  set token ""
-  set lTok [list]
-
-  foreach c [split $txt {}] {
-    if {$token==""} {
-      append token $c
-    } else {
-      set t1 [string is upper $token]
-      set t2 [string is upper $c]
-
-      if {$t1!=$t2} {
-        lappend lTok $token
-        set token ""
-      }
-      append token $c
-    }
-  }
-  if {$token!=""} { lappend lTok $token }
-
-  set iOff 0
-  foreach t $lTok {
-    set n [string length $t]
-    sqlite3_fts5_token $t $iOff [expr $iOff+$n]
-    incr iOff $n
-  }
-}
-
-do_execsql_test 1.0 {
-  CREATE VIRTUAL TABLE t1 USING fts5(t, tokenize=tst);
-}
-
-do_execsql_test 1.1 {
-  INSERT INTO t1 VALUES('AAdontBBmess');
-}
-
-do_execsql_test 1.2 {
-  SELECT snippet(t1, 0, '>', '<', '...', 4) FROM t1('BB');
-} {AAdont>BB<mess}
-
-do_execsql_test 1.3 {
-  SELECT highlight(t1, 0, '>', '<') FROM t1('BB');
-} {AAdont>BB<mess}
-
-do_execsql_test 1.4 {
-  SELECT highlight(t1, 0, '>', '<') FROM t1('AA');
-} {>AA<dontBBmess}
-
-do_execsql_test 1.5 {
-  SELECT highlight(t1, 0, '>', '<') FROM t1('dont');
-} {AA>dont<BBmess}
-
-do_execsql_test 1.6 {
-  SELECT highlight(t1, 0, '>', '<') FROM t1('mess');
-} {AAdontBB>mess<}
-
-do_execsql_test 1.7 {
-  SELECT highlight(t1, 0, '>', '<') FROM t1('BB mess');
-} {AAdont>BBmess<}
-
-
-finish_test

ext/fts5/test/fts5trigram2.test

@@ -1,109 +0,0 @@
-# 2023 October 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.
-#
-#*************************************************************************
-#
-# Tests for the fts5 "trigram" tokenizer.
-#
-
-source [file join [file dirname [info script]] fts5_common.tcl]
-ifcapable !fts5 { finish_test ; return }
-set ::testprefix fts5trigram2
-
-do_execsql_test 1.0 "
-  CREATE VIRTUAL TABLE t1 USING fts5(y, tokenize='trigram remove_diacritics 1');
-  INSERT INTO t1 VALUES('abc\u0303defghijklm');
-  INSERT INTO t1 VALUES('a\u0303b\u0303c\u0303defghijklm');
-"
-
-do_execsql_test 1.1 {
-  SELECT highlight(t1, 0, '(', ')') FROM t1('abc');
-} [list \
-  "(abc\u0303)defghijklm"                          \
-  "(a\u0303b\u0303c\u0303)defghijklm"              \
-]
-
-do_execsql_test 1.2 {
-  SELECT highlight(t1, 0, '(', ')') FROM t1('bcde');
-} [list \
-  "a(bc\u0303de)fghijklm"                          \
-  "a\u0303(b\u0303c\u0303de)fghijklm"              \
-]
-
-do_execsql_test 1.3 {
-  SELECT highlight(t1, 0, '(', ')') FROM t1('cdef');
-} [list \
-  "ab(c\u0303def)ghijklm"                          \
-  "a\u0303b\u0303(c\u0303def)ghijklm"              \
-]
-
-do_execsql_test 1.4 {
-  SELECT highlight(t1, 0, '(', ')') FROM t1('def');
-} [list \
-  "abc\u0303(def)ghijklm"                          \
-  "a\u0303b\u0303c\u0303(def)ghijklm"              \
-]
-
-
-#-------------------------------------------------------------------------
-do_catchsql_test 2.0 {
-  CREATE VIRTUAL TABLE t2 USING fts5(
-      z, tokenize='trigram case_sensitive 1 remove_diacritics 1'
-  );
-} {1 {error in tokenizer constructor}}
-
-do_execsql_test 2.1 {
-  CREATE VIRTUAL TABLE t2 USING fts5(
-      z, tokenize='trigram case_sensitive 0 remove_diacritics 1'
-  );
-}
-do_execsql_test 2.2 "
-  INSERT INTO t2 VALUES('\u00E3bcdef');
-  INSERT INTO t2 VALUES('b\u00E3cdef');
-  INSERT INTO t2 VALUES('bc\u00E3def');
-  INSERT INTO t2 VALUES('bcd\u00E3ef');
-"
-
-do_execsql_test 2.3 {
-  SELECT highlight(t2, 0, '(', ')') FROM t2('abc');
-} "(\u00E3bc)def"
-do_execsql_test 2.4 {
-  SELECT highlight(t2, 0, '(', ')') FROM t2('bac');
-} "(b\u00E3c)def"
-do_execsql_test 2.5 {
-  SELECT highlight(t2, 0, '(', ')') FROM t2('bca');
-} "(bc\u00E3)def"
-do_execsql_test 2.6 "
-  SELECT highlight(t2, 0, '(', ')') FROM t2('\u00E3bc');
-" "(\u00E3bc)def"
-
-#-------------------------------------------------------------------------
-do_execsql_test 3.0 {
-  CREATE VIRTUAL TABLE t3 USING fts5(
-      z, tokenize='trigram remove_diacritics 1'
-  );
-} {}
-do_execsql_test 3.1 "
-  INSERT INTO t3 VALUES ('\u0303abc\u0303');
-"
-do_execsql_test 3.2 {
-  SELECT highlight(t3, 0, '(', ')') FROM t3('abc');
-} "\u0303(abc\u0303)"
-
-#-------------------------------------------------------------------------
-do_execsql_test 4.0 {
-  CREATE VIRTUAL TABLE t4 USING fts5(z, tokenize=trigram);
-} {}
-
-breakpoint
-do_execsql_test 4.1 {
-  INSERT INTO t4 VALUES('ABCD');
-} {}
-
-finish_test

ext/jni/GNUmakefile

@@ -35,8 +35,6 @@ $(dir.bld.c):
 
 javac.flags ?= -Xlint:unchecked -Xlint:deprecation
 java.flags ?=
-javac.flags += -encoding utf8
-# -------------^^^^^^^^^^^^^^ required for Windows builds
 jnicheck ?= 1
 ifeq (1,$(jnicheck))
   java.flags += -Xcheck:jni
@@ -81,7 +79,6 @@ $(bin.version-info): $(dir.tool)/version-info.c $(sqlite3.h) $(dir.top)/Makefile
 # Be explicit about which Java files to compile so that we can work on
 # in-progress files without requiring them to be in a compilable statae.
 JAVA_FILES.main := $(patsubst %,$(dir.src.jni)/annotation/%,\
-  Experimental.java \
   NotNull.java \
   Nullable.java \
 ) $(patsubst %,$(dir.src.capi)/%,\
@@ -94,7 +91,7 @@ JAVA_FILES.main := $(patsubst %,$(dir.src.jni)/annotation/%,\
   CollationNeededCallback.java \
   CommitHookCallback.java \
   ConfigLogCallback.java \
-  ConfigSqlLogCallback.java \
+  ConfigSqllogCallback.java \
   NativePointerHolder.java \
   OutputPointer.java \
   PrepareMultiCallback.java \
@@ -113,7 +110,6 @@ JAVA_FILES.main := $(patsubst %,$(dir.src.jni)/annotation/%,\
   WindowFunction.java \
   XDestroyCallback.java \
   sqlite3.java \
-  sqlite3_blob.java \
   sqlite3_context.java \
   sqlite3_stmt.java \
   sqlite3_value.java \
@@ -124,7 +120,6 @@ JAVA_FILES.main := $(patsubst %,$(dir.src.jni)/annotation/%,\
   Sqlite.java \
   SqliteException.java \
   ValueHolder.java \
-  WindowFunction.java \
 )
 
 JAVA_FILES.unittest := $(patsubst %,$(dir.src.jni)/%,\
@@ -164,13 +159,12 @@ endif
 CLASS_FILES :=
 define CLASSFILE_DEPS
 all: $(1).class
-$(1).class: $(1).java
 CLASS_FILES += $(1).class
 endef
 $(foreach B,$(basename \
   $(JAVA_FILES.main) $(JAVA_FILES.unittest) $(JAVA_FILES.tester)),\
   $(eval $(call CLASSFILE_DEPS,$(B))))
-$(CLASS_FILES): $(MAKEFILE)
+$(CLASS_FILES): $(JAVA_FILES) $(MAKEFILE)
 	$(bin.javac) $(javac.flags) -h $(dir.bld.c) -cp $(classpath) $(JAVA_FILES)
 
 #.PHONY: classfiles
@@ -232,8 +226,7 @@ SQLITE_OPT += -DSQLITE_ENABLE_RTREE \
   -DSQLITE_ENABLE_OFFSET_SQL_FUNC \
   -DSQLITE_ENABLE_PREUPDATE_HOOK \
   -DSQLITE_ENABLE_NORMALIZE \
-  -DSQLITE_ENABLE_SQLLOG \
-  -DSQLITE_ENABLE_COLUMN_METADATA
+  -DSQLITE_ENABLE_SQLLOG
 endif
 
 ifeq (1,$(opt.debug))
@@ -323,7 +316,7 @@ test-one: $(test.deps)
 	$(bin.java) $(test.flags.jvm) org.sqlite.jni.wrapper1.Tester2 $(Tester2.flags)
 test-sqllog: $(test.deps)
 	@echo "Testing with -sqllog..."
-	$(bin.java) $(test.flags.jvm) org.sqlite.jni.capi.Tester1 $(Tester1.flags) -sqllog
+	$(bin.java) $(test.flags.jvm) -sqllog
 test-mt: $(test.deps)
 	@echo "Testing in multi-threaded mode:";
 	$(bin.java) $(test.flags.jvm) org.sqlite.jni.capi.Tester1 \

ext/jni/README.md

@@ -16,8 +16,9 @@ Technical support is available in the forum:
 > **FOREWARNING:** this subproject is very much in development and
   subject to any number of changes. Please do not rely on any
   information about its API until this disclaimer is removed.  The JNI
-  bindings released with version 3.43 are a "tech preview." Once
-  finalized, strong backward compatibility guarantees will apply.
+  bindings released with version 3.43 are a "tech preview" and 3.44
+  will be "final," at which point strong backward compatibility
+  guarantees will apply.
 
 Project goals/requirements:
 
@@ -42,13 +43,11 @@ Non-goals:
 - Creation of high-level OO wrapper APIs. Clients are free to create
   them off of the C-style API.
 
-- Virtual tables are unlikely to be supported due to the amount of
-  glue code needed to fit them into Java.
-
 - Support for mixed-mode operation, where client code accesses SQLite
   both via the Java-side API and the C API via their own native
-  code. Such cases would be a minefield of potential mis-interactions
-  between this project's JNI bindings and mixed-mode client code.
+  code. In such cases, proxy functionalities (primarily callback
+  handler wrappers of all sorts) may fail because the C-side use of
+  the SQLite APIs will bypass those proxies.
 
 
 Hello World
@@ -124,13 +123,15 @@ sensible default argument values. In all such cases they are thin
 proxies around the corresponding C APIs and do not introduce new
 semantics.
 
-In a few cases, Java-specific capabilities have been added in
+In some very few cases, Java-specific capabilities have been added in
 new APIs, all of which have "_java" somewhere in their names.
 Examples include:
 
 - `sqlite3_result_java_object()`
 - `sqlite3_column_java_object()`
+- `sqlite3_column_java_casted()`
 - `sqlite3_value_java_object()`
+- `sqlite3_value_java_casted()`
 
 which, as one might surmise, collectively enable the passing of
 arbitrary Java objects from user-defined SQL functions through to the
@@ -149,9 +150,6 @@ pending statements have been closed. Be aware that Java garbage
 collection _cannot_ close a database or finalize a prepared statement.
 Those things require explicit API calls.
 
-Classes for which it is sensible support Java's `AutoCloseable`
-interface so can be used with try-with-resources constructs.
-
 
 Golden Rule #2: _Never_ Throw from Callbacks (Unless...)
 ------------------------------------------------------------------------
@@ -161,15 +159,14 @@ retain C-like semantics. For example, they are not permitted to throw
 or propagate exceptions and must return error information (if any) via
 result codes or `null`. The only cases where the C-style APIs may
 throw is through client-side misuse, e.g. passing in a null where it
-may cause a `NullPointerException`. The APIs clearly mark function
-parameters which should not be null, but does not generally actively
-defend itself against such misuse. Some C-style APIs explicitly accept
-`null` as a no-op for usability's sake, and some of the JNI APIs
-deliberately return an error code, instead of segfaulting, when passed
-a `null`.
+shouldn't be used. The APIs clearly mark function parameters which
+should not be null, but does not actively defend itself against such
+misuse. Some C-style APIs explicitly accept `null` as a no-op for
+usability's sake, and some of the JNI APIs deliberately return an
+error code, instead of segfaulting, when passed a `null`.
 
 Client-defined callbacks _must never throw exceptions_ unless _very
-explitly documented_ as being throw-safe. Exceptions are generally
+explicitly documented_ as being throw-safe. Exceptions are generally
 reserved for higher-level bindings which are constructed to
 specifically deal with them and ensure that they do not leak C-level
 resources. In some cases, callback handlers are permitted to throw, in
@@ -295,14 +292,14 @@ int sqlite3_create_function(sqlite3 db, String funcName, int nArgs,
 `SQLFunction` is not used directly, but is instead instantiated via
 one of its three subclasses:
 
-- `ScalarFunction` implements simple scalar functions using but a
+- `SQLFunction.Scalar` implements simple scalar functions using but a
   single callback.
-- `AggregateFunction` implements aggregate functions using two
+- `SQLFunction.Aggregate` implements aggregate functions using two
   callbacks.
-- `WindowFunction` implements window functions using four
+- `SQLFunction.Window` implements window functions using four
   callbacks.
 
-Search [`Tester1.java`](/file/ext/jni/src/org/sqlite/jni/capi/Tester1.java) for
+Search [`Tester1.java`](/file/ext/jni/src/org/sqlite/jni/Tester1.java) for
 `SQLFunction` for how it's used.
 
 Reminder: see the disclaimer at the top of this document regarding the

ext/jni/src/c/sqlite3-jni.h

@@ -427,6 +427,8 @@ extern "C" {
 #define org_sqlite_jni_capi_CApi_SQLITE_OPEN_EXRESCODE 33554432L
 #undef org_sqlite_jni_capi_CApi_SQLITE_PREPARE_PERSISTENT
 #define org_sqlite_jni_capi_CApi_SQLITE_PREPARE_PERSISTENT 1L
+#undef org_sqlite_jni_capi_CApi_SQLITE_PREPARE_NORMALIZE
+#define org_sqlite_jni_capi_CApi_SQLITE_PREPARE_NORMALIZE 2L
 #undef org_sqlite_jni_capi_CApi_SQLITE_PREPARE_NO_VTAB
 #define org_sqlite_jni_capi_CApi_SQLITE_PREPARE_NO_VTAB 4L
 #undef org_sqlite_jni_capi_CApi_SQLITE_OK
@@ -705,12 +707,8 @@ extern "C" {
 #define org_sqlite_jni_capi_CApi_SQLITE_DETERMINISTIC 2048L
 #undef org_sqlite_jni_capi_CApi_SQLITE_DIRECTONLY
 #define org_sqlite_jni_capi_CApi_SQLITE_DIRECTONLY 524288L
-#undef org_sqlite_jni_capi_CApi_SQLITE_SUBTYPE
-#define org_sqlite_jni_capi_CApi_SQLITE_SUBTYPE 1048576L
 #undef org_sqlite_jni_capi_CApi_SQLITE_INNOCUOUS
 #define org_sqlite_jni_capi_CApi_SQLITE_INNOCUOUS 2097152L
-#undef org_sqlite_jni_capi_CApi_SQLITE_RESULT_SUBTYPE
-#define org_sqlite_jni_capi_CApi_SQLITE_RESULT_SUBTYPE 16777216L
 #undef org_sqlite_jni_capi_CApi_SQLITE_INDEX_SCAN_UNIQUE
 #define org_sqlite_jni_capi_CApi_SQLITE_INDEX_SCAN_UNIQUE 1L
 #undef org_sqlite_jni_capi_CApi_SQLITE_INDEX_CONSTRAINT_EQ
@@ -777,22 +775,6 @@ JNIEXPORT void JNICALL Java_org_sqlite_jni_capi_CApi_init
 JNIEXPORT jboolean JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1java_1uncache_1thread
   (JNIEnv *, jclass);
 
-/*
- * Class:     org_sqlite_jni_capi_CApi
- * Method:    sqlite3_jni_supports_nio
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1jni_1supports_1nio
-  (JNIEnv *, jclass);
-
-/*
- * Class:     org_sqlite_jni_capi_CApi
- * Method:    sqlite3_jni_db_error
- * Signature: (Lorg/sqlite/jni/capi/sqlite3;ILjava/lang/String;)I
- */
-JNIEXPORT jint JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1jni_1db_1error
-  (JNIEnv *, jclass, jobject, jint, jstring);
-
 /*
  * Class:     org_sqlite_jni_capi_CApi
  * Method:    sqlite3_aggregate_context
@@ -889,14 +871,6 @@ JNIEXPORT jint JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1bind_1int64
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1bind_1java_1object
   (JNIEnv *, jclass, jlong, jint, jobject);
 
-/*
- * Class:     org_sqlite_jni_capi_CApi
- * Method:    sqlite3_bind_nio_buffer
- * Signature: (Lorg/sqlite/jni/capi/sqlite3_stmt;ILjava/nio/ByteBuffer;II)I
- */
-JNIEXPORT jint JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1bind_1nio_1buffer
-  (JNIEnv *, jclass, jobject, jint, jobject, jint, jint);
-
 /*
  * Class:     org_sqlite_jni_capi_CApi
  * Method:    sqlite3_bind_null
@@ -1001,14 +975,6 @@ JNIEXPORT jint JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1blob_1open
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1blob_1read
   (JNIEnv *, jclass, jlong, jbyteArray, jint);
 
-/*
- * Class:     org_sqlite_jni_capi_CApi
- * Method:    sqlite3_blob_read_nio_buffer
- * Signature: (JILjava/nio/ByteBuffer;II)I
- */
-JNIEXPORT jint JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1blob_1read_1nio_1buffer
-  (JNIEnv *, jclass, jlong, jint, jobject, jint, jint);
-
 /*
  * Class:     org_sqlite_jni_capi_CApi
  * Method:    sqlite3_blob_reopen
@@ -1025,14 +991,6 @@ JNIEXPORT jint JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1blob_1reopen
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1blob_1write
   (JNIEnv *, jclass, jlong, jbyteArray, jint);
 
-/*
- * Class:     org_sqlite_jni_capi_CApi
- * Method:    sqlite3_blob_write_nio_buffer
- * Signature: (JILjava/nio/ByteBuffer;II)I
- */
-JNIEXPORT jint JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1blob_1write_1nio_1buffer
-  (JNIEnv *, jclass, jlong, jint, jobject, jint, jint);
-
 /*
  * Class:     org_sqlite_jni_capi_CApi
  * Method:    sqlite3_busy_handler
@@ -1129,14 +1087,6 @@ JNIEXPORT jint JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1column_1bytes16
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1column_1count
   (JNIEnv *, jclass, jlong);
 
-/*
- * Class:     org_sqlite_jni_capi_CApi
- * Method:    sqlite3_column_database_name
- * Signature: (JI)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1column_1database_1name
-  (JNIEnv *, jclass, jlong, jint);
-
 /*
  * Class:     org_sqlite_jni_capi_CApi
  * Method:    sqlite3_column_decltype
@@ -1169,14 +1119,6 @@ JNIEXPORT jint JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1column_1int
 JNIEXPORT jlong JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1column_1int64
   (JNIEnv *, jclass, jobject, jint);
 
-/*
- * Class:     org_sqlite_jni_capi_CApi
- * Method:    sqlite3_column_java_object
- * Signature: (JI)Ljava/lang/Object;
- */
-JNIEXPORT jobject JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1column_1java_1object
-  (JNIEnv *, jclass, jlong, jint);
-
 /*
  * Class:     org_sqlite_jni_capi_CApi
  * Method:    sqlite3_column_name
@@ -1187,11 +1129,11 @@ JNIEXPORT jstring JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1column_1name
 
 /*
  * Class:     org_sqlite_jni_capi_CApi
- * Method:    sqlite3_column_nio_buffer
- * Signature: (Lorg/sqlite/jni/capi/sqlite3_stmt;I)Ljava/nio/ByteBuffer;
+ * Method:    sqlite3_column_database_name
+ * Signature: (JI)Ljava/lang/String;
  */
-JNIEXPORT jobject JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1column_1nio_1buffer
-  (JNIEnv *, jclass, jobject, jint);
+JNIEXPORT jstring JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1column_1database_1name
+  (JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     org_sqlite_jni_capi_CApi
@@ -1283,26 +1225,26 @@ JNIEXPORT jint JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1complete
 
 /*
  * Class:     org_sqlite_jni_capi_CApi
- * Method:    sqlite3_config__enable
+ * Method:    sqlite3_config
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1config_1_1enable
+JNIEXPORT jint JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1config__I
   (JNIEnv *, jclass, jint);
 
 /*
  * Class:     org_sqlite_jni_capi_CApi
- * Method:    sqlite3_config__CONFIG_LOG
- * Signature: (Lorg/sqlite/jni/capi/ConfigLogCallback;)I
+ * Method:    sqlite3_config
+ * Signature: (Lorg/sqlite/jni/capi/ConfigSqllogCallback;)I
  */
-JNIEXPORT jint JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1config_1_1CONFIG_1LOG
+JNIEXPORT jint JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1config__Lorg_sqlite_jni_capi_ConfigSqllogCallback_2
   (JNIEnv *, jclass, jobject);
 
 /*
  * Class:     org_sqlite_jni_capi_CApi
- * Method:    sqlite3_config__SQLLOG
- * Signature: (Lorg/sqlite/jni/capi/ConfigSqlLogCallback;)I
+ * Method:    sqlite3_config
+ * Signature: (Lorg/sqlite/jni/capi/ConfigLogCallback;)I
  */
-JNIEXPORT jint JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1config_1_1SQLLOG
+JNIEXPORT jint JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1config__Lorg_sqlite_jni_capi_ConfigLogCallback_2
   (JNIEnv *, jclass, jobject);
 
 /*
@@ -1452,9 +1394,9 @@ JNIEXPORT jint JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1extended_1errcode
 /*
  * Class:     org_sqlite_jni_capi_CApi
  * Method:    sqlite3_extended_result_codes
- * Signature: (Lorg/sqlite/jni/capi/sqlite3;Z)I
+ * Signature: (Lorg/sqlite/jni/capi/sqlite3;Z)Z
  */
-JNIEXPORT jint JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1extended_1result_1codes
+JNIEXPORT jboolean JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1extended_1result_1codes
   (JNIEnv *, jclass, jobject, jboolean);
 
 /*
@@ -1737,6 +1679,14 @@ JNIEXPORT void JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1result_1error_1nom
 JNIEXPORT void JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1result_1error_1code
   (JNIEnv *, jclass, jobject, jint);
 
+/*
+ * Class:     org_sqlite_jni_capi_CApi
+ * Method:    sqlite3_result_null
+ * Signature: (Lorg/sqlite/jni/capi/sqlite3_context;)V
+ */
+JNIEXPORT void JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1result_1null
+  (JNIEnv *, jclass, jobject);
+
 /*
  * Class:     org_sqlite_jni_capi_CApi
  * Method:    sqlite3_result_int
@@ -1761,30 +1711,6 @@ JNIEXPORT void JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1result_1int64
 JNIEXPORT void JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1result_1java_1object
   (JNIEnv *, jclass, jobject, jobject);
 
-/*
- * Class:     org_sqlite_jni_capi_CApi
- * Method:    sqlite3_result_nio_buffer
- * Signature: (Lorg/sqlite/jni/capi/sqlite3_context;Ljava/nio/ByteBuffer;II)V
- */
-JNIEXPORT void JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1result_1nio_1buffer
-  (JNIEnv *, jclass, jobject, jobject, jint, jint);
-
-/*
- * Class:     org_sqlite_jni_capi_CApi
- * Method:    sqlite3_result_null
- * Signature: (Lorg/sqlite/jni/capi/sqlite3_context;)V
- */
-JNIEXPORT void JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1result_1null
-  (JNIEnv *, jclass, jobject);
-
-/*
- * Class:     org_sqlite_jni_capi_CApi
- * Method:    sqlite3_result_subtype
- * Signature: (Lorg/sqlite/jni/capi/sqlite3_context;I)V
- */
-JNIEXPORT void JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1result_1subtype
-  (JNIEnv *, jclass, jobject, jint);
-
 /*
  * Class:     org_sqlite_jni_capi_CApi
  * Method:    sqlite3_result_value
@@ -1924,10 +1850,10 @@ JNIEXPORT jint JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1status64
 /*
  * Class:     org_sqlite_jni_capi_CApi
  * Method:    sqlite3_step
- * Signature: (J)I
+ * Signature: (Lorg/sqlite/jni/capi/sqlite3_stmt;)I
  */
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1step
-  (JNIEnv *, jclass, jlong);
+  (JNIEnv *, jclass, jobject);
 
 /*
  * Class:     org_sqlite_jni_capi_CApi
@@ -2137,14 +2063,6 @@ JNIEXPORT jlong JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1value_1int64
 JNIEXPORT jobject JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1value_1java_1object
   (JNIEnv *, jclass, jlong);
 
-/*
- * Class:     org_sqlite_jni_capi_CApi
- * Method:    sqlite3_value_nio_buffer
- * Signature: (Lorg/sqlite/jni/capi/sqlite3_value;)Ljava/nio/ByteBuffer;
- */
-JNIEXPORT jobject JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1value_1nio_1buffer
-  (JNIEnv *, jclass, jobject);
-
 /*
  * Class:     org_sqlite_jni_capi_CApi
  * Method:    sqlite3_value_nochange

ext/jni/src/org/sqlite/jni/annotation/Experimental.java

@@ -1,30 +0,0 @@
-/*
-** 2023-09-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.
-**
-*************************************************************************
-** This file houses the Experimental annotation for the sqlite3 C API.
-*/
-package org.sqlite.jni.annotation;
-import java.lang.annotation.*;
-
-/**
-   This annotation is for flagging methods, constructors, and types
-   which are expressly experimental and subject to any amount of
-   change or outright removal. Client code should not rely on such
-   features.
-*/
-@Documented
-@Retention(RetentionPolicy.SOURCE)
-@Target({
-    ElementType.METHOD,
-    ElementType.CONSTRUCTOR,
-    ElementType.TYPE
-})
-public @interface Experimental{}

ext/jni/src/org/sqlite/jni/annotation/NotNull.java

@@ -9,22 +9,21 @@
 **    May you share freely, never taking more than you give.
 **
 *************************************************************************
-** This file houses the NotNull annotation for the sqlite3 C API.
+** This file houses the NotNull annotaion for the sqlite3 C API.
 */
 package org.sqlite.jni.annotation;
-import java.lang.annotation.*;
 
 /**
    This annotation is for flagging parameters which may not legally be
    null or point to closed/finalized C-side resources.
 
    <p>In the case of Java types which map directly to C struct types
-   (e.g. {@link org.sqlite.jni.capi.sqlite3}, {@link
-   org.sqlite.jni.capi.sqlite3_stmt}, and {@link
-   org.sqlite.jni.capi.sqlite3_context}), a closed/finalized resource
-   is also considered to be null for purposes this annotation because
-   the C-side effect of passing such a handle is the same as if null
-   is passed.</p>
+   (e.g. {@link org.sqlite.jni.sqlite3}, {@link
+   org.sqlite.jni.sqlite3_stmt}, and {@link
+   org.sqlite.jni.sqlite3_context}), a closed/finalized resource is
+   also considered to be null for purposes this annotation because the
+   C-side effect of passing such a handle is the same as if null is
+   passed.</p>
 
    <p>When used in the context of Java interfaces which are called
    from the C APIs, this annotation communicates that the C API will
@@ -32,23 +31,12 @@ import java.lang.annotation.*;
 
    <p>Passing a null, for this annotation's definition of null, for
    any parameter marked with this annoation specifically invokes
-   undefined behavior (see below).</p>
+   undefined behavior.</p>
 
    <p>Passing 0 (i.e. C NULL) or a negative value for any long-type
    parameter marked with this annoation specifically invokes undefined
-   behavior (see below). Such values are treated as C pointers in the
-   JNI layer.</p>
-
-   <p><b>Undefined behaviour:</b> the JNI build uses the {@code
-   SQLITE_ENABLE_API_ARMOR} build flag, meaning that the C code
-   invoked with invalid NULL pointers and the like will not invoke
-   undefined behavior in the conventional C sense, but may, for
-   example, return result codes which are not documented for the
-   affected APIs or may otherwise behave unpredictably. In no known
-   cases will such arguments result in C-level code dereferencing a
-   NULL pointer or accessing out-of-bounds (or otherwise invalid)
-   memory. In other words, they may cause unexpected behavior but
-   should never cause an outright crash or security issue.</p>
+   behavior. Such values are treated as C pointers in the JNI
+   layer.</p>
 
    <p>Note that the C-style API does not throw any exceptions on its
    own because it has a no-throw policy in order to retain its C-style
@@ -60,12 +48,12 @@ import java.lang.annotation.*;
    code.</p>
 
    <p>This annotation is solely for the use by the classes in the
-   org.sqlite.jni package and subpackages, but is made public so that
+   org.sqlite package and subpackages, but is made public so that
    javadoc will link to it from the annotated functions. It is not
    part of the public API and client-level code must not rely on
    it.</p>
 */
-@Documented
-@Retention(RetentionPolicy.SOURCE)
-@Target(ElementType.PARAMETER)
+@java.lang.annotation.Documented
+@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE)
+@java.lang.annotation.Target(java.lang.annotation.ElementType.PARAMETER)
 public @interface NotNull{}

ext/jni/src/org/sqlite/jni/annotation/Nullable.java

@@ -9,10 +9,9 @@
 **    May you share freely, never taking more than you give.
 **
 *************************************************************************
-** This file houses the Nullable annotation for the sqlite3 C API.
+** This file houses the Nullable annotaion for the sqlite3 C API.
 */
 package org.sqlite.jni.annotation;
-import java.lang.annotation.*;
 
 /**
    This annotation is for flagging parameters which may legally be
@@ -27,7 +26,7 @@ import java.lang.annotation.*;
    annotated functions. It is not part of the public API and
    client-level code must not rely on it.
 */
-@Documented
-@Retention(RetentionPolicy.SOURCE)
-@Target(ElementType.PARAMETER)
+@java.lang.annotation.Documented
+@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE)
+@java.lang.annotation.Target(java.lang.annotation.ElementType.PARAMETER)
 public @interface Nullable{}

ext/jni/src/org/sqlite/jni/capi/AggregateFunction.java

@@ -42,75 +42,9 @@ public abstract class AggregateFunction<T> implements SQLFunction {
   */
   public void xDestroy() {}
 
-  /**
-     PerContextState assists aggregate and window functions in
-     managing their accumulator state across calls to the UDF's
-     callbacks.
-
-     <p>T must be of a type which can be legally stored as a value in
-     java.util.HashMap<KeyType,T>.
-
-     <p>If a given aggregate or window function is called multiple times
-     in a single SQL statement, e.g. SELECT MYFUNC(A), MYFUNC(B)...,
-     then the clients need some way of knowing which call is which so
-     that they can map their state between their various UDF callbacks
-     and reset it via xFinal(). This class takes care of such
-     mappings.
-
-     <p>This class works by mapping
-     sqlite3_context.getAggregateContext() to a single piece of
-     state, of a client-defined type (the T part of this class), which
-     persists across a "matching set" of the UDF's callbacks.
-
-     <p>This class is a helper providing commonly-needed functionality
-     - it is not required for use with aggregate or window functions.
-     Client UDFs are free to perform such mappings using custom
-     approaches. The provided {@link AggregateFunction} and {@link
-     WindowFunction} classes use this.
-  */
-  public static final class PerContextState<T> {
-    private final java.util.Map<Long,ValueHolder<T>> map
-      = new java.util.HashMap<>();
-
-    /**
-       Should be called from a UDF's xStep(), xValue(), and xInverse()
-       methods, passing it that method's first argument and an initial
-       value for the persistent state. If there is currently no
-       mapping for the given context within the map, one is created
-       using the given initial value, else the existing one is used
-       and the 2nd argument is ignored.  It returns a ValueHolder<T>
-       which can be used to modify that state directly without
-       requiring that the client update the underlying map's entry.
-
-       <p>The caller is obligated to eventually call
-       takeAggregateState() to clear the mapping.
-    */
-    public ValueHolder<T> getAggregateState(sqlite3_context cx, T initialValue){
-      final Long key = cx.getAggregateContext(true);
-      ValueHolder<T> rc = null==key ? null : map.get(key);
-      if( null==rc ){
-        map.put(key, rc = new ValueHolder<>(initialValue));
-      }
-      return rc;
-    }
-
-    /**
-       Should be called from a UDF's xFinal() method and passed that
-       method's first argument. This function removes the value
-       associated with cx.getAggregateContext() from the map and
-       returns it, returning null if no other UDF method has been
-       called to set up such a mapping. The latter condition will be
-       the case if a UDF is used in a statement which has no result
-       rows.
-    */
-    public T takeAggregateState(sqlite3_context cx){
-      final ValueHolder<T> h = map.remove(cx.getAggregateContext(false));
-      return null==h ? null : h.value;
-    }
-  }
-
   /** Per-invocation state for the UDF. */
-  private final PerContextState<T> map = new PerContextState<>();
+  private final SQLFunction.PerContextState<T> map =
+    new SQLFunction.PerContextState<>();
 
   /**
      To be called from the implementation's xStep() method, as well

ext/jni/src/org/sqlite/jni/capi/AuthorizerCallback.java

@@ -20,8 +20,7 @@ import org.sqlite.jni.annotation.*;
 public interface AuthorizerCallback extends CallbackProxy {
   /**
      Must function as described for the C-level
-     sqlite3_set_authorizer() callback. If it throws, the error is
-     converted to a db-level error and the exception is suppressed.
+     sqlite3_set_authorizer() callback.
   */
   int call(int opId, @Nullable String s1, @Nullable String s2,
            @Nullable String s3, @Nullable String s4);

ext/jni/src/org/sqlite/jni/capi/CallbackProxy.java

@@ -24,9 +24,8 @@ package org.sqlite.jni.capi;
    propagated.  For callback interfaces which support returning error
    info to the core, the JNI binding will convert any exceptions to
    C-level error information. For callback interfaces which do not
-   support returning error information, all exceptions will
-   necessarily be suppressed in order to retain the C-style no-throw
-   semantics and avoid invoking undefined behavior in the C layer.
+   support, all exceptions will necessarily be suppressed in order to
+   retain the C-style no-throw semantics.
 
    <p>Callbacks of this style follow a common naming convention:
 

ext/jni/src/org/sqlite/jni/capi/CollationNeededCallback.java

@@ -21,9 +21,8 @@ public interface CollationNeededCallback extends CallbackProxy {
      Has the same semantics as the C-level sqlite3_create_collation()
      callback.
 
-     <p>Because the C API has no mechanism for reporting errors
-     from this callbacks, any exceptions thrown by this callback
-     are suppressed.
+     <p>If it throws, the exception message is passed on to the db and
+     the exception is suppressed.
   */
-  void call(sqlite3 db, int eTextRep, String collationName);
+  int call(sqlite3 db, int eTextRep, String collationName);
 }

ext/jni/src/org/sqlite/jni/capi/CommitHookCallback.java

@@ -19,8 +19,7 @@ package org.sqlite.jni.capi;
 public interface CommitHookCallback extends CallbackProxy {
   /**
      Works as documented for the C-level sqlite3_commit_hook()
-     callback. If it throws, the exception is translated into
-     a db-level error.
+     callback.  Must not throw.
   */
   int call();
 }

ext/jni/src/org/sqlite/jni/capi/ConfigSqllogCallback.java

@@ -16,10 +16,10 @@ package org.sqlite.jni.capi;
 /**
    A callback for use with sqlite3_config().
 */
-public interface ConfigSqlLogCallback {
+public interface ConfigSqllogCallback {
   /**
      Must function as described for a C-level callback for
-     {@link CApi#sqlite3_config(ConfigSqlLogCallback)}, with the slight signature change.
+     {@link CApi#sqlite3_config(ConfigSqllogCallback)}, with the slight signature change.
   */
   void call(sqlite3 db, String msg, int msgType );
 }

ext/jni/src/org/sqlite/jni/capi/OutputPointer.java

@@ -228,26 +228,4 @@ public final class OutputPointer {
     /** Sets the current value. */
     public final void set(byte[] v){value = v;}
   }
-
-  /**
-     Output pointer for use with native routines which return
-     blobs via java.nio.ByteBuffer.
-
-     See {@link org.sqlite.jni.capi.CApi#sqlite3_jni_supports_nio}
-  */
-  public static final class ByteBuffer {
-    /**
-       This is public for ease of use. Accessors are provided for
-       consistency with the higher-level types.
-    */
-    public java.nio.ByteBuffer value;
-    /** Initializes with the value null. */
-    public ByteBuffer(){this(null);}
-    /** Initializes with the value v. */
-    public ByteBuffer(java.nio.ByteBuffer v){value = v;}
-    /** Returns the current value. */
-    public final java.nio.ByteBuffer get(){return value;}
-    /** Sets the current value. */
-    public final void set(java.nio.ByteBuffer v){value = v;}
-  }
 }

ext/jni/src/org/sqlite/jni/capi/PrepareMultiCallback.java

@@ -25,10 +25,7 @@ public interface PrepareMultiCallback extends CallbackProxy {
      sqlite3_prepare_multi() will _not_ finalize st - it is up
      to the call() implementation how st is handled.
 
-     Must return 0 on success or an SQLITE_... code on error. If it
-     throws, sqlite3_prepare_multi() will transform the exception into
-     a db-level error in order to retain the C-style error semantics
-     of the API.
+     Must return 0 on success or an SQLITE_... code on error.
 
      See the {@link Finalize} class for a wrapper which finalizes the
      statement after calling a proxy PrepareMultiCallback.
@@ -40,7 +37,7 @@ public interface PrepareMultiCallback extends CallbackProxy {
      any sqlite3_stmt passed to its callback.
   */
   public static final class Finalize implements PrepareMultiCallback {
-    private final PrepareMultiCallback p;
+    private PrepareMultiCallback p;
     /**
        p is the proxy to call() when this.call() is called.
     */

ext/jni/src/org/sqlite/jni/capi/PreupdateHookCallback.java

@@ -19,8 +19,7 @@ package org.sqlite.jni.capi;
 public interface PreupdateHookCallback extends CallbackProxy {
   /**
      Must function as described for the C-level sqlite3_preupdate_hook()
-     callback. If it throws, the exception is translated to a
-     db-level error and the exception is suppressed.
+     callback.
   */
   void call(sqlite3 db, int op, String dbName, String dbTable,
             long iKey1, long iKey2 );

ext/jni/src/org/sqlite/jni/capi/RollbackHookCallback.java

@@ -18,9 +18,8 @@ package org.sqlite.jni.capi;
 */
 public interface RollbackHookCallback extends CallbackProxy {
   /**
-     Must function as documented for the C-level sqlite3_rollback_hook()
-     callback. If it throws, the exception is translated into
-     a db-level error.
+     Works as documented for the C-level sqlite3_rollback_hook()
+     callback.
   */
   void call();
 }

ext/jni/src/org/sqlite/jni/capi/SQLFunction.java

@@ -33,4 +33,71 @@ package org.sqlite.jni.capi;
 */
 public interface SQLFunction {
 
+  /**
+     PerContextState assists aggregate and window functions in
+     managing their accumulator state across calls to the UDF's
+     callbacks.
+
+     <p>T must be of a type which can be legally stored as a value in
+     java.util.HashMap<KeyType,T>.
+
+     <p>If a given aggregate or window function is called multiple times
+     in a single SQL statement, e.g. SELECT MYFUNC(A), MYFUNC(B)...,
+     then the clients need some way of knowing which call is which so
+     that they can map their state between their various UDF callbacks
+     and reset it via xFinal(). This class takes care of such
+     mappings.
+
+     <p>This class works by mapping
+     sqlite3_context.getAggregateContext() to a single piece of
+     state, of a client-defined type (the T part of this class), which
+     persists across a "matching set" of the UDF's callbacks.
+
+     <p>This class is a helper providing commonly-needed functionality
+     - it is not required for use with aggregate or window functions.
+     Client UDFs are free to perform such mappings using custom
+     approaches. The provided {@link AggregateFunction} and {@link
+     WindowFunction} classes use this.
+  */
+  public static final class PerContextState<T> {
+    private final java.util.Map<Long,ValueHolder<T>> map
+      = new java.util.HashMap<>();
+
+    /**
+       Should be called from a UDF's xStep(), xValue(), and xInverse()
+       methods, passing it that method's first argument and an initial
+       value for the persistent state. If there is currently no
+       mapping for the given context within the map, one is created
+       using the given initial value, else the existing one is used
+       and the 2nd argument is ignored.  It returns a ValueHolder<T>
+       which can be used to modify that state directly without
+       requiring that the client update the underlying map's entry.
+
+       <p>The caller is obligated to eventually call
+       takeAggregateState() to clear the mapping.
+    */
+    public ValueHolder<T> getAggregateState(sqlite3_context cx, T initialValue){
+      final Long key = cx.getAggregateContext(true);
+      ValueHolder<T> rc = null==key ? null : map.get(key);
+      if( null==rc ){
+        map.put(key, rc = new ValueHolder<>(initialValue));
+      }
+      return rc;
+    }
+
+    /**
+       Should be called from a UDF's xFinal() method and passed that
+       method's first argument. This function removes the value
+       associated with cx.getAggregateContext() from the map and
+       returns it, returning null if no other UDF method has been
+       called to set up such a mapping. The latter condition will be
+       the case if a UDF is used in a statement which has no result
+       rows.
+    */
+    public T takeAggregateState(sqlite3_context cx){
+      final ValueHolder<T> h = map.remove(cx.getAggregateContext(false));
+      return null==h ? null : h.value;
+    }
+  }
+
 }

ext/jni/src/org/sqlite/jni/capi/Tester1.java

@@ -38,14 +38,6 @@ import java.util.concurrent.Future;
 @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD})
 @interface SingleThreadOnly{}
 
-/**
-   Annotation for Tester1 tests which must only be run if
-   sqlite3_jni_supports_nio() is true.
-*/
-@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME)
-@java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD})
-@interface RequiresJniNio{}
-
 public class Tester1 implements Runnable {
   //! True when running in multi-threaded mode.
   private static boolean mtMode = false;
@@ -54,7 +46,7 @@ public class Tester1 implements Runnable {
   //! True to shuffle the order of the tests.
   private static boolean shuffle = false;
   //! True to dump the list of to-run tests to stdout.
-  private static int listRunTests = 0;
+  private static boolean listRunTests = false;
   //! True to squelch all out() and outln() output.
   private static boolean quietMode = false;
   //! Total number of runTests() calls.
@@ -335,7 +327,7 @@ public class Tester1 implements Runnable {
 
 
     rc = sqlite3_prepare_v3(db, "INSERT INTO t2(a) VALUES(1),(2),(3)",
-                            0, outStmt);
+                            SQLITE_PREPARE_NORMALIZE, outStmt);
     affirm(0 == rc);
     stmt = outStmt.get();
     affirm(0 != stmt.getNativePointer());
@@ -390,15 +382,6 @@ public class Tester1 implements Runnable {
     stmt = prepare(db, "SELECT a FROM t ORDER BY a DESC;");
     affirm( sqlite3_stmt_readonly(stmt) );
     affirm( !sqlite3_stmt_busy(stmt) );
-    if( sqlite3_compileoption_used("ENABLE_COLUMN_METADATA") ){
-      /* Unlike in native C code, JNI won't trigger an
-         UnsatisfiedLinkError until these are called (on Linux, at
-         least). */
-      affirm("t".equals(sqlite3_column_table_name(stmt,0)));
-      affirm("main".equals(sqlite3_column_database_name(stmt,0)));
-      affirm("a".equals(sqlite3_column_origin_name(stmt,0)));
-    }
-
     int total2 = 0;
     while( SQLITE_ROW == sqlite3_step(stmt) ){
       affirm( sqlite3_stmt_busy(stmt) );
@@ -494,7 +477,6 @@ public class Tester1 implements Runnable {
     stmt = prepare(db, "SELECT a FROM t ORDER BY a DESC;");
     StringBuilder sbuf = new StringBuilder();
     n = 0;
-    final boolean tryNio = sqlite3_jni_supports_nio();
     while( SQLITE_ROW == sqlite3_step(stmt) ){
       final sqlite3_value sv = sqlite3_value_dup(sqlite3_column_value(stmt,0));
       final String txt = sqlite3_column_text16(stmt, 0);
@@ -509,15 +491,6 @@ public class Tester1 implements Runnable {
                            StandardCharsets.UTF_8)) );
       affirm( txt.length() == sqlite3_value_bytes16(sv)/2 );
       affirm( txt.equals(sqlite3_value_text16(sv)) );
-      if( tryNio ){
-        java.nio.ByteBuffer bu = sqlite3_value_nio_buffer(sv);
-        byte ba[] = sqlite3_value_blob(sv);
-        affirm( ba.length == bu.capacity() );
-        int i = 0;
-        for( byte b : ba ){
-          affirm( b == bu.get(i++) );
-        }
-      }
       sqlite3_value_free(sv);
       ++n;
     }
@@ -575,79 +548,6 @@ public class Tester1 implements Runnable {
     sqlite3_close_v2(db);
   }
 
-  @RequiresJniNio
-  private void testBindByteBuffer(){
-    /* TODO: these tests need to be much more extensive to check the
-       begin/end range handling. */
-
-    java.nio.ByteBuffer zeroCheck =
-      java.nio.ByteBuffer.allocateDirect(0);
-    affirm( null != zeroCheck );
-    zeroCheck = null;
-    sqlite3 db = createNewDb();
-    execSql(db, "CREATE TABLE t(a)");
-
-    final java.nio.ByteBuffer buf = java.nio.ByteBuffer.allocateDirect(10);
-    buf.put((byte)0x31)/*note that we'll skip this one*/
-      .put((byte)0x32)
-      .put((byte)0x33)
-      .put((byte)0x34)
-      .put((byte)0x35)/*we'll skip this one too*/;
-
-    final int expectTotal = buf.get(1) + buf.get(2) + buf.get(3);
-    sqlite3_stmt stmt = prepare(db, "INSERT INTO t(a) VALUES(?);");
-    affirm( SQLITE_ERROR == sqlite3_bind_blob(stmt, 1, buf, -1, 0),
-            "Buffer offset may not be negative." );
-    affirm( 0 == sqlite3_bind_blob(stmt, 1, buf, 1, 3) );
-    affirm( SQLITE_DONE == sqlite3_step(stmt) );
-    sqlite3_finalize(stmt);
-    stmt = prepare(db, "SELECT a FROM t;");
-    int total = 0;
-    affirm( SQLITE_ROW == sqlite3_step(stmt) );
-    byte blob[] = sqlite3_column_blob(stmt, 0);
-    java.nio.ByteBuffer nioBlob =
-      sqlite3_column_nio_buffer(stmt, 0);
-    affirm(3 == blob.length);
-    affirm(blob.length == nioBlob.capacity());
-    affirm(blob.length == nioBlob.limit());
-    int i = 0;
-    for(byte b : blob){
-      affirm( i<=3 );
-      affirm(b == buf.get(1 + i));
-      affirm(b == nioBlob.get(i));
-      ++i;
-      total += b;
-    }
-    affirm( SQLITE_DONE == sqlite3_step(stmt) );
-    sqlite3_finalize(stmt);
-    affirm(total == expectTotal);
-
-    SQLFunction func =
-      new ScalarFunction(){
-        public void xFunc(sqlite3_context cx, sqlite3_value[] args){
-          sqlite3_result_blob(cx, buf, 1, 3);
-        }
-      };
-
-    affirm( 0 == sqlite3_create_function(db, "myfunc", -1, SQLITE_UTF8, func) );
-    stmt = prepare(db, "SELECT myfunc()");
-    affirm( SQLITE_ROW == sqlite3_step(stmt) );
-    blob = sqlite3_column_blob(stmt, 0);
-    affirm(3 == blob.length);
-    i = 0;
-    total = 0;
-    for(byte b : blob){
-      affirm( i<=3 );
-      affirm(b == buf.get(1 + i++));
-      total += b;
-    }
-    affirm( SQLITE_DONE == sqlite3_step(stmt) );
-    sqlite3_finalize(stmt);
-    affirm(total == expectTotal);
-
-    sqlite3_close_v2(db);
-  }
-
   private void testSql(){
     sqlite3 db = createNewDb();
     sqlite3_stmt stmt = prepare(db, "SELECT 1");
@@ -693,9 +593,9 @@ public class Tester1 implements Runnable {
       };
     final CollationNeededCallback collLoader = new CollationNeededCallback(){
         @Override
-        public void call(sqlite3 dbArg, int eTextRep, String collationName){
+        public int call(sqlite3 dbArg, int eTextRep, String collationName){
           affirm(dbArg == db/* as opposed to a temporary object*/);
-          sqlite3_create_collation(dbArg, "reversi", eTextRep, myCollation);
+          return sqlite3_create_collation(dbArg, "reversi", eTextRep, myCollation);
         }
       };
     int rc = sqlite3_collation_needed(db, collLoader);
@@ -903,17 +803,13 @@ public class Tester1 implements Runnable {
     affirm( 0==rc );
     int n = 0;
     if( SQLITE_ROW == sqlite3_step(stmt) ){
-      affirm( testResult.value == sqlite3_column_java_object(stmt, 0) );
-      affirm( testResult.value == sqlite3_column_java_object(stmt, 0, sqlite3.class) );
-      affirm( null == sqlite3_column_java_object(stmt, 0, sqlite3_stmt.class) );
-      affirm( null == sqlite3_column_java_object(stmt,1) );
       final sqlite3_value v = sqlite3_column_value(stmt, 0);
       affirm( testResult.value == sqlite3_value_java_object(v) );
-      affirm( testResult.value == sqlite3_value_java_object(v, sqlite3.class) );
+      affirm( testResult.value == sqlite3_value_java_casted(v, sqlite3.class) );
       affirm( testResult.value ==
-              sqlite3_value_java_object(v, testResult.value.getClass()) );
-      affirm( testResult.value == sqlite3_value_java_object(v, Object.class) );
-      affirm( null == sqlite3_value_java_object(v, String.class) );
+              sqlite3_value_java_casted(v, testResult.value.getClass()) );
+      affirm( testResult.value == sqlite3_value_java_casted(v, Object.class) );
+      affirm( null == sqlite3_value_java_casted(v, String.class) );
       ++n;
     }
     sqlite3_finalize(stmt);
@@ -928,28 +824,15 @@ public class Tester1 implements Runnable {
       // To confirm that xFinal() is called with no aggregate state
       // when the corresponding result set is empty.
       new ValueHolder<>(false);
-    final ValueHolder<sqlite3_value[]> neverEverDoThisInClientCode = new ValueHolder<>(null);
-    final ValueHolder<sqlite3_context> neverEverDoThisInClientCode2 = new ValueHolder<>(null);
     SQLFunction func = new AggregateFunction<Integer>(){
         @Override
         public void xStep(sqlite3_context cx, sqlite3_value[] args){
-          if( null==neverEverDoThisInClientCode.value ){
-            /* !!!NEVER!!! hold a reference to an sqlite3_value or
-               sqlite3_context object like this in client code! They
-               are ONLY legal for the duration of their single
-               call. We do it here ONLY to test that the defenses
-               against clients doing this are working. */
-            neverEverDoThisInClientCode.value = args;
-          }
           final ValueHolder<Integer> agg = this.getAggregateState(cx, 0);
           agg.value += sqlite3_value_int(args[0]);
           affirm( agg == this.getAggregateState(cx, 0) );
         }
         @Override
         public void xFinal(sqlite3_context cx){
-          if( null==neverEverDoThisInClientCode2.value ){
-            neverEverDoThisInClientCode2.value = cx;
-          }
           final Integer v = this.takeAggregateState(cx);
           if(null == v){
             xFinalNull.value = true;
@@ -974,10 +857,6 @@ public class Tester1 implements Runnable {
     }
     affirm( 1==n );
     affirm(!xFinalNull.value);
-    affirm( null!=neverEverDoThisInClientCode.value );
-    affirm( null!=neverEverDoThisInClientCode2.value );
-    affirm( 0<neverEverDoThisInClientCode.value.length );
-    affirm( 0==neverEverDoThisInClientCode2.value.getNativePointer() );
     sqlite3_reset(stmt);
     affirm( 1==sqlite3_stmt_status(stmt, SQLITE_STMTSTATUS_RUN, false) );
     // Ensure that the accumulator is reset on subsequent calls...
@@ -1046,6 +925,7 @@ public class Tester1 implements Runnable {
                          "ORDER BY x ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING"+
                          ") AS sum_y "+
                          "FROM twin ORDER BY x;");
+    affirm( 0 == rc );
     int n = 0;
     while( SQLITE_ROW == sqlite3_step(stmt) ){
       final String s = sqlite3_column_text16(stmt, 0);
@@ -1148,48 +1028,48 @@ public class Tester1 implements Runnable {
   @SingleThreadOnly /* because threads inherently break this test */
   private static void testBusy(){
     final String dbName = "_busy-handler.db";
+    final OutputPointer.sqlite3 outDb = new OutputPointer.sqlite3();
+    final OutputPointer.sqlite3_stmt outStmt = new OutputPointer.sqlite3_stmt();
+
+    int rc = sqlite3_open(dbName, outDb);
+    ++metrics.dbOpen;
+    affirm( 0 == rc );
+    final sqlite3 db1 = outDb.get();
+    execSql(db1, "CREATE TABLE IF NOT EXISTS t(a)");
+    rc = sqlite3_open(dbName, outDb);
+    ++metrics.dbOpen;
+    affirm( 0 == rc );
+    affirm( outDb.get() != db1 );
+    final sqlite3 db2 = outDb.get();
+
+    affirm( "main".equals( sqlite3_db_name(db1, 0) ) );
+    rc = sqlite3_db_config(db1, SQLITE_DBCONFIG_MAINDBNAME, "foo");
+    affirm( sqlite3_db_filename(db1, "foo").endsWith(dbName) );
+    affirm( "foo".equals( sqlite3_db_name(db1, 0) ) );
+
+    final ValueHolder<Integer> xBusyCalled = new ValueHolder<>(0);
+    BusyHandlerCallback handler = new BusyHandlerCallback(){
+        @Override public int call(int n){
+          //outln("busy handler #"+n);
+          return n > 2 ? 0 : ++xBusyCalled.value;
+        }
+      };
+    rc = sqlite3_busy_handler(db2, handler);
+    affirm(0 == rc);
+
+    // Force a locked condition...
+    execSql(db1, "BEGIN EXCLUSIVE");
+    rc = sqlite3_prepare_v2(db2, "SELECT * from t", outStmt);
+    affirm( SQLITE_BUSY == rc);
+    affirm( null == outStmt.get() );
+    affirm( 3 == xBusyCalled.value );
+    sqlite3_close_v2(db1);
+    sqlite3_close_v2(db2);
     try{
-      final OutputPointer.sqlite3 outDb = new OutputPointer.sqlite3();
-      final OutputPointer.sqlite3_stmt outStmt = new OutputPointer.sqlite3_stmt();
-
-      int rc = sqlite3_open(dbName, outDb);
-      ++metrics.dbOpen;
-      affirm( 0 == rc );
-      final sqlite3 db1 = outDb.get();
-      execSql(db1, "CREATE TABLE IF NOT EXISTS t(a)");
-      rc = sqlite3_open(dbName, outDb);
-      ++metrics.dbOpen;
-      affirm( 0 == rc );
-      affirm( outDb.get() != db1 );
-      final sqlite3 db2 = outDb.get();
-
-      affirm( "main".equals( sqlite3_db_name(db1, 0) ) );
-      rc = sqlite3_db_config(db1, SQLITE_DBCONFIG_MAINDBNAME, "foo");
-      affirm( sqlite3_db_filename(db1, "foo").endsWith(dbName) );
-      affirm( "foo".equals( sqlite3_db_name(db1, 0) ) );
-      affirm( SQLITE_MISUSE == sqlite3_db_config(db1, 0, 0, null) );
-
-      final ValueHolder<Integer> xBusyCalled = new ValueHolder<>(0);
-      BusyHandlerCallback handler = new BusyHandlerCallback(){
-          @Override public int call(int n){
-            //outln("busy handler #"+n);
-            return n > 2 ? 0 : ++xBusyCalled.value;
-          }
-        };
-      rc = sqlite3_busy_handler(db2, handler);
-      affirm(0 == rc);
-
-      // Force a locked condition...
-      execSql(db1, "BEGIN EXCLUSIVE");
-      rc = sqlite3_prepare_v2(db2, "SELECT * from t", outStmt);
-      affirm( SQLITE_BUSY == rc);
-      affirm( null == outStmt.get() );
-      affirm( 3 == xBusyCalled.value );
-      sqlite3_close_v2(db1);
-      sqlite3_close_v2(db2);
-    }finally{
-      try{(new java.io.File(dbName)).delete();}
-      catch(Exception e){/* ignore */}
+      final java.io.File f = new java.io.File(dbName);
+      f.delete();
+    }catch(Exception e){
+      /* ignore */
     }
   }
 
@@ -1213,7 +1093,6 @@ public class Tester1 implements Runnable {
 
   private void testCommitHook(){
     final sqlite3 db = createNewDb();
-    sqlite3_extended_result_codes(db, true);
     final ValueHolder<Integer> counter = new ValueHolder<>(0);
     final ValueHolder<Integer> hookResult = new ValueHolder<>(0);
     final CommitHookCallback theHook = new CommitHookCallback(){
@@ -1256,7 +1135,7 @@ public class Tester1 implements Runnable {
     affirm( 5 == counter.value );
     hookResult.value = SQLITE_ERROR;
     int rc = execSql(db, false, "BEGIN; update t set a='j' where a='i'; COMMIT;");
-    affirm( SQLITE_CONSTRAINT_COMMITHOOK == rc );
+    affirm( SQLITE_CONSTRAINT == rc );
     affirm( 6 == counter.value );
     sqlite3_close_v2(db);
   }
@@ -1475,9 +1354,6 @@ public class Tester1 implements Runnable {
     authRc.value = SQLITE_DENY;
     int rc = execSql(db, false, "UPDATE t SET a=2");
     affirm( SQLITE_AUTH==rc );
-    sqlite3_set_authorizer(db, null);
-    rc = execSql(db, false, "UPDATE t SET a=2");
-    affirm( 0==rc );
     // TODO: expand these tests considerably
     sqlite3_close(db);
   }
@@ -1539,7 +1415,7 @@ public class Tester1 implements Runnable {
 
     val.value = 0;
     final AutoExtensionCallback ax2 = new AutoExtensionCallback(){
-        @Override public int call(sqlite3 db){
+        @Override public synchronized int call(sqlite3 db){
           ++val.value;
           return 0;
         }
@@ -1750,7 +1626,7 @@ public class Tester1 implements Runnable {
     sqlite3_finalize(stmt);
 
     b = sqlite3_blob_open(db, "main", "t", "a",
-                          sqlite3_last_insert_rowid(db), 0);
+                          sqlite3_last_insert_rowid(db), 1);
     affirm( null!=b );
     rc = sqlite3_blob_reopen(b, 2);
     affirm( 0==rc );
@@ -1760,86 +1636,6 @@ public class Tester1 implements Runnable {
     affirm( 100==tgt[0] && 101==tgt[1] && 102==tgt[2], "DEF" );
     rc = sqlite3_blob_close(b);
     affirm( 0==rc );
-
-    if( !sqlite3_jni_supports_nio() ){
-      outln("WARNING: skipping tests for ByteBuffer-using sqlite3_blob APIs ",
-            "because this platform lacks that support.");
-      sqlite3_close_v2(db);
-      return;
-    }
-    /* Sanity checks for the java.nio.ByteBuffer-taking overloads of
-       sqlite3_blob_read/write(). */
-    execSql(db, "UPDATE t SET a=zeroblob(10)");
-    b = sqlite3_blob_open(db, "main", "t", "a", 1, 1);
-    affirm( null!=b );
-    java.nio.ByteBuffer bb = java.nio.ByteBuffer.allocateDirect(10);
-    for( byte i = 0; i < 10; ++i ){
-      bb.put((int)i, (byte)(48+i & 0xff));
-    }
-    rc = sqlite3_blob_write(b, 1, bb, 1, 10);
-    affirm( rc==SQLITE_ERROR, "b length < (srcOffset + bb length)" );
-    rc = sqlite3_blob_write(b, -1, bb);
-    affirm( rc==SQLITE_ERROR, "Target offset may not be negative" );
-    rc = sqlite3_blob_write(b, 0, bb, -1, -1);
-    affirm( rc==SQLITE_ERROR, "Source offset may not be negative" );
-    rc = sqlite3_blob_write(b, 1, bb, 1, 8);
-    affirm( rc==0 );
-    // b's contents: 0 49  50  51  52  53  54  55  56  0
-    //        ascii: 0 '1' '2' '3' '4' '5' '6' '7' '8' 0
-    byte br[] = new byte[10];
-    java.nio.ByteBuffer bbr =
-      java.nio.ByteBuffer.allocateDirect(bb.limit());
-    rc = sqlite3_blob_read( b, br, 0 );
-    affirm( rc==0 );
-    rc = sqlite3_blob_read( b, bbr );
-    affirm( rc==0 );
-    java.nio.ByteBuffer bbr2 = sqlite3_blob_read_nio_buffer(b, 0, 12);
-    affirm( null==bbr2, "Read size is too big");
-    bbr2 = sqlite3_blob_read_nio_buffer(b, -1, 3);
-    affirm( null==bbr2, "Source offset is negative");
-    bbr2 = sqlite3_blob_read_nio_buffer(b, 5, 6);
-    affirm( null==bbr2, "Read pos+size is too big");
-    bbr2 = sqlite3_blob_read_nio_buffer(b, 4, 7);
-    affirm( null==bbr2, "Read pos+size is too big");
-    bbr2 = sqlite3_blob_read_nio_buffer(b, 4, 6);
-    affirm( null!=bbr2 );
-    java.nio.ByteBuffer bbr3 =
-      java.nio.ByteBuffer.allocateDirect(2 * bb.limit());
-    java.nio.ByteBuffer bbr4 =
-      java.nio.ByteBuffer.allocateDirect(5);
-    rc = sqlite3_blob_read( b, bbr3 );
-    affirm( rc==0 );
-    rc = sqlite3_blob_read( b, bbr4 );
-    affirm( rc==0 );
-    affirm( sqlite3_blob_bytes(b)==bbr3.limit() );
-    affirm( 5==bbr4.limit() );
-    sqlite3_blob_close(b);
-    affirm( 0==br[0] );
-    affirm( 0==br[9] );
-    affirm( 0==bbr.get(0) );
-    affirm( 0==bbr.get(9) );
-    affirm( bbr2.limit() == 6 );
-    affirm( 0==bbr3.get(0) );
-    {
-      Exception ex = null;
-      try{ bbr3.get(11); }
-      catch(Exception e){ex = e;}
-      affirm( ex instanceof IndexOutOfBoundsException,
-              "bbr3.limit() was reset by read()" );
-      ex = null;
-    }
-    affirm( 0==bbr4.get(0) );
-    for( int i = 1; i < 9; ++i ){
-      affirm( br[i] == 48 + i );
-      affirm( br[i] == bbr.get(i) );
-      affirm( br[i] == bbr3.get(i) );
-      if( i>3 ){
-        affirm( br[i] == bbr2.get(i-4) );
-      }
-      if( i < bbr4.limit() ){
-        affirm( br[i] == bbr4.get(i) );
-      }
-    }
     sqlite3_close_v2(db);
   }
 
@@ -1852,13 +1648,9 @@ public class Tester1 implements Runnable {
     };
     final List<sqlite3_stmt> liStmt = new ArrayList<sqlite3_stmt>();
     final PrepareMultiCallback proxy = new PrepareMultiCallback.StepAll();
-    final ValueHolder<String> toss = new ValueHolder<>(null);
     PrepareMultiCallback m = new PrepareMultiCallback() {
         @Override public int call(sqlite3_stmt st){
           liStmt.add(st);
-          if( null!=toss.value ){
-            throw new RuntimeException(toss.value);
-          }
           return proxy.call(st);
         }
       };
@@ -1868,10 +1660,6 @@ public class Tester1 implements Runnable {
     for( sqlite3_stmt st : liStmt ){
       sqlite3_finalize(st);
     }
-    toss.value = "This is an exception.";
-    rc = sqlite3_prepare_multi(db, "SELECT 1", m);
-    affirm( SQLITE_ERROR==rc );
-    affirm( sqlite3_errmsg(db).indexOf(toss.value)>0 );
     sqlite3_close_v2(db);
   }
 
@@ -1910,7 +1698,7 @@ public class Tester1 implements Runnable {
       mlist = new ArrayList<>( testMethods.subList(0, testMethods.size()) );
       java.util.Collections.shuffle(mlist);
     }
-    if( (!fromThread && listRunTests>0) || listRunTests>1 ){
+    if( listRunTests ){
       synchronized(this.getClass()){
         if( !fromThread ){
           out("Initial test"," list: ");
@@ -1972,11 +1760,8 @@ public class Tester1 implements Runnable {
      -naps: sleep small random intervals between tests in order to add
      some chaos for cross-thread contention.
 
-
      -list-tests: outputs the list of tests being run, minus some
-      which are hard-coded. In multi-threaded mode, use this twice to
-      to emit the list run by each thread (which may differ from the initial
-      list, in particular if -shuffle is used).
+      which are hard-coded. This is noisy in multi-threaded mode.
 
      -fail: forces an exception to be thrown during the test run.  Use
      with -shuffle to make its appearance unpredictable.
@@ -2005,7 +1790,7 @@ public class Tester1 implements Runnable {
         }else if(arg.equals("shuffle")){
           shuffle = true;
         }else if(arg.equals("list-tests")){
-          ++listRunTests;
+          listRunTests = true;
         }else if(arg.equals("fail")){
           forceFail = true;
         }else if(arg.equals("sqllog")){
@@ -2024,7 +1809,7 @@ public class Tester1 implements Runnable {
 
     if( sqlLog ){
       if( sqlite3_compileoption_used("ENABLE_SQLLOG") ){
-        final ConfigSqlLogCallback log = new ConfigSqlLogCallback() {
+        final ConfigSqllogCallback log = new ConfigSqllogCallback() {
             @Override public void call(sqlite3 db, String msg, int op){
               switch(op){
                 case 0: outln("Opening db: ",db); break;
@@ -2035,7 +1820,7 @@ public class Tester1 implements Runnable {
           };
         int rc = sqlite3_config( log );
         affirm( 0==rc );
-        rc = sqlite3_config( (ConfigSqlLogCallback)null );
+        rc = sqlite3_config( (ConfigSqllogCallback)null );
         affirm( 0==rc );
         rc = sqlite3_config( log );
         affirm( 0==rc );
@@ -2073,20 +1858,18 @@ public class Tester1 implements Runnable {
           if( forceFail ){
             testMethods.add(m);
           }
-        }else if( m.isAnnotationPresent( RequiresJniNio.class )
-                  && !sqlite3_jni_supports_nio() ){
-          outln("Skipping test for lack of JNI java.nio.ByteBuffer support: ",
-                name,"()\n");
-          ++nSkipped;
         }else if( !m.isAnnotationPresent( ManualTest.class ) ){
           if( nThread>1 && m.isAnnotationPresent( SingleThreadOnly.class ) ){
-            out("Skipping test in multi-thread mode: ",name,"()\n");
-            ++nSkipped;
+            if( 0==nSkipped++ ){
+              out("Skipping tests in multi-thread mode:");
+            }
+            out(" "+name+"()");
           }else if( name.startsWith("test") ){
             testMethods.add(m);
           }
         }
       }
+      if( nSkipped>0 ) out("\n");
     }
 
     final long timeStart = System.currentTimeMillis();
@@ -2118,7 +1901,6 @@ public class Tester1 implements Runnable {
           sqlite3_libversion_number(),"\n",
           sqlite3_libversion(),"\n",SQLITE_SOURCE_ID,"\n",
           "SQLITE_THREADSAFE=",sqlite3_threadsafe());
-    outln("JVM NIO support? ",sqlite3_jni_supports_nio() ? "YES" : "NO");
     final boolean showLoopCount = (nRepeat>1 && nThread>1);
     if( showLoopCount ){
       outln("Running ",nRepeat," loop(s) with ",nThread," thread(s) each.");

ext/jni/src/org/sqlite/jni/capi/UpdateHookCallback.java

@@ -19,8 +19,7 @@ package org.sqlite.jni.capi;
 public interface UpdateHookCallback extends CallbackProxy {
   /**
      Must function as described for the C-level sqlite3_update_hook()
-     callback. If it throws, the exception is translated into
-     a db-level error.
+     callback.
   */
   void call(int opId, String dbName, String tableName, long rowId);
 }

ext/jni/src/org/sqlite/jni/capi/ValueHolder.java

@@ -9,16 +9,14 @@
 **    May you share freely, never taking more than you give.
 **
 *************************************************************************
-** This file contains the ValueHolder utility class for the sqlite3
-** JNI bindings.
+** This file contains a set of tests for the sqlite3 JNI bindings.
 */
 package org.sqlite.jni.capi;
 
 /**
    A helper class which simply holds a single value. Its primary use
    is for communicating values out of anonymous classes, as doing so
-   requires a "final" reference, as well as communicating aggregate
-   SQL function state across calls to such functions.
+   requires a "final" reference.
 */
 public class ValueHolder<T> {
   public T value;

ext/jni/src/org/sqlite/jni/capi/sqlite3.java

@@ -38,6 +38,6 @@ public final class sqlite3 extends NativePointerHolder<sqlite3>
   }
 
   @Override public void close(){
-    CApi.sqlite3_close_v2(this);
+    CApi.sqlite3_close_v2(this.clearNativePointer());
   }
 }

ext/jni/src/org/sqlite/jni/capi/sqlite3_blob.java

@@ -25,6 +25,7 @@ public final class sqlite3_blob extends NativePointerHolder<sqlite3_blob>
   private sqlite3_blob(){}
 
   @Override public void close(){
-    CApi.sqlite3_blob_close(this);
+    CApi.sqlite3_blob_close(this.clearNativePointer());
   }
+
 }

ext/jni/src/org/sqlite/jni/capi/sqlite3_stmt.java

@@ -25,6 +25,6 @@ public final class sqlite3_stmt extends NativePointerHolder<sqlite3_stmt>
   private sqlite3_stmt(){}
 
   @Override public void close(){
-    CApi.sqlite3_finalize(this);
+    CApi.sqlite3_finalize(this.clearNativePointer());
   }
 }

ext/jni/src/org/sqlite/jni/wrapper1/AggregateFunction.java

@@ -12,6 +12,10 @@
 ** This file is part of the wrapper1 interface for sqlite3.
 */
 package org.sqlite.jni.wrapper1;
+import org.sqlite.jni.capi.CApi;
+import org.sqlite.jni.annotation.*;
+import org.sqlite.jni.capi.sqlite3_context;
+import org.sqlite.jni.capi.sqlite3_value;
 
 /**
    EXPERIMENTAL/INCOMPLETE/UNTESTED
@@ -47,75 +51,9 @@ public abstract class AggregateFunction<T> implements SqlFunction  {
   */
   public void xDestroy() {}
 
-  /**
-     PerContextState assists aggregate and window functions in
-     managing their accumulator state across calls to the UDF's
-     callbacks.
-
-     <p>T must be of a type which can be legally stored as a value in
-     java.util.HashMap<KeyType,T>.
-
-     <p>If a given aggregate or window function is called multiple times
-     in a single SQL statement, e.g. SELECT MYFUNC(A), MYFUNC(B)...,
-     then the clients need some way of knowing which call is which so
-     that they can map their state between their various UDF callbacks
-     and reset it via xFinal(). This class takes care of such
-     mappings.
-
-     <p>This class works by mapping
-     sqlite3_context.getAggregateContext() to a single piece of
-     state, of a client-defined type (the T part of this class), which
-     persists across a "matching set" of the UDF's callbacks.
-
-     <p>This class is a helper providing commonly-needed functionality
-     - it is not required for use with aggregate or window functions.
-     Client UDFs are free to perform such mappings using custom
-     approaches. The provided {@link AggregateFunction} and {@link
-     WindowFunction} classes use this.
-  */
-  public static final class PerContextState<T> {
-    private final java.util.Map<Long,ValueHolder<T>> map
-      = new java.util.HashMap<>();
-
-    /**
-       Should be called from a UDF's xStep(), xValue(), and xInverse()
-       methods, passing it that method's first argument and an initial
-       value for the persistent state. If there is currently no
-       mapping for the given context within the map, one is created
-       using the given initial value, else the existing one is used
-       and the 2nd argument is ignored.  It returns a ValueHolder<T>
-       which can be used to modify that state directly without
-       requiring that the client update the underlying map's entry.
-
-       <p>The caller is obligated to eventually call
-       takeAggregateState() to clear the mapping.
-    */
-    public ValueHolder<T> getAggregateState(SqlFunction.Arguments args, T initialValue){
-      final Long key = args.getContext().getAggregateContext(true);
-      ValueHolder<T> rc = null==key ? null : map.get(key);
-      if( null==rc ){
-        map.put(key, rc = new ValueHolder<>(initialValue));
-      }
-      return rc;
-    }
-
-    /**
-       Should be called from a UDF's xFinal() method and passed that
-       method's first argument. This function removes the value
-       associated with with the arguments' aggregate context from the
-       map and returns it, returning null if no other UDF method has
-       been called to set up such a mapping. The latter condition will
-       be the case if a UDF is used in a statement which has no result
-       rows.
-    */
-    public T takeAggregateState(SqlFunction.Arguments args){
-      final ValueHolder<T> h = map.remove(args.getContext().getAggregateContext(false));
-      return null==h ? null : h.value;
-    }
-  }
-
   /** Per-invocation state for the UDF. */
-  private final PerContextState<T> map = new PerContextState<>();
+  private final SqlFunction.PerContextState<T> map =
+    new SqlFunction.PerContextState<>();
 
   /**
      To be called from the implementation's xStep() method, as well

ext/jni/src/org/sqlite/jni/wrapper1/SqlFunction.java

@@ -22,14 +22,6 @@ import org.sqlite.jni.capi.sqlite3_value;
 */
 public interface SqlFunction  {
 
-  public static final int DETERMINISTIC = CApi.SQLITE_DETERMINISTIC;
-  public static final int INNOCUOUS = CApi.SQLITE_INNOCUOUS;
-  public static final int DIRECTONLY = CApi.SQLITE_DIRECTONLY;
-  public static final int SUBTYPE = CApi.SQLITE_SUBTYPE;
-  public static final int RESULT_SUBTYPE = CApi.SQLITE_RESULT_SUBTYPE;
-  public static final int UTF8 = CApi.SQLITE_UTF8;
-  public static final int UTF16 = CApi.SQLITE_UTF16;
-
   /**
      The Arguments type is an abstraction on top of the lower-level
      UDF function argument types. It provides _most_ of the functionality
@@ -53,118 +45,12 @@ public interface SqlFunction  {
     */
     Arguments(sqlite3_context cx, sqlite3_value args[]){
       this.cx = cx;
-      this.args = args==null ? new sqlite3_value[0] : args;
+      this.args = args==null ? new sqlite3_value[0] : args;;
       this.length = this.args.length;
     }
 
     /**
-       Returns the sqlite3_value at the given argument index or throws
-       an IllegalArgumentException exception if ndx is out of range.
-    */
-    private sqlite3_value valueAt(int ndx){
-      if(ndx<0 || ndx>=args.length){
-        throw new IllegalArgumentException(
-          "SQL function argument index "+ndx+" is out of range."
-        );
-      }
-      return args[ndx];
-    }
-
-    //! Returns the underlying sqlite3_context for these arguments.
-    sqlite3_context getContext(){return cx;}
-
-    /**
-       Returns the Sqlite (db) object associated with this UDF call,
-       or null if the UDF is somehow called without such an object or
-       the db has been closed in an untimely manner (e.g. closed by a
-       UDF call).
-    */
-    public Sqlite getDb(){
-      return Sqlite.fromNative( CApi.sqlite3_context_db_handle(cx) );
-    }
-
-    public int getArgCount(){ return args.length; }
-
-    public int getInt(int argNdx){return CApi.sqlite3_value_int(valueAt(argNdx));}
-    public long getInt64(int argNdx){return CApi.sqlite3_value_int64(valueAt(argNdx));}
-    public double getDouble(int argNdx){return CApi.sqlite3_value_double(valueAt(argNdx));}
-    public byte[] getBlob(int argNdx){return CApi.sqlite3_value_blob(valueAt(argNdx));}
-    public byte[] getText(int argNdx){return CApi.sqlite3_value_text(valueAt(argNdx));}
-    public String getText16(int argNdx){return CApi.sqlite3_value_text16(valueAt(argNdx));}
-    public int getBytes(int argNdx){return CApi.sqlite3_value_bytes(valueAt(argNdx));}
-    public int getBytes16(int argNdx){return CApi.sqlite3_value_bytes16(valueAt(argNdx));}
-    public Object getObject(int argNdx){return CApi.sqlite3_value_java_object(valueAt(argNdx));}
-    public <T> T getObject(int argNdx, Class<T> type){
-      return CApi.sqlite3_value_java_object(valueAt(argNdx), type);
-    }
-
-    public int getType(int argNdx){return CApi.sqlite3_value_type(valueAt(argNdx));}
-    public int getSubtype(int argNdx){return CApi.sqlite3_value_subtype(valueAt(argNdx));}
-    public int getNumericType(int argNdx){return CApi.sqlite3_value_numeric_type(valueAt(argNdx));}
-    public int getNoChange(int argNdx){return CApi.sqlite3_value_nochange(valueAt(argNdx));}
-    public boolean getFromBind(int argNdx){return CApi.sqlite3_value_frombind(valueAt(argNdx));}
-    public int getEncoding(int argNdx){return CApi.sqlite3_value_encoding(valueAt(argNdx));}
-
-    public void resultInt(int v){ CApi.sqlite3_result_int(cx, v); }
-    public void resultInt64(long v){ CApi.sqlite3_result_int64(cx, v); }
-    public void resultDouble(double v){ CApi.sqlite3_result_double(cx, v); }
-    public void resultError(String msg){CApi.sqlite3_result_error(cx, msg);}
-    public void resultError(Exception e){CApi.sqlite3_result_error(cx, e);}
-    public void resultErrorTooBig(){CApi.sqlite3_result_error_toobig(cx);}
-    public void resultErrorCode(int rc){CApi.sqlite3_result_error_code(cx, rc);}
-    public void resultObject(Object o){CApi.sqlite3_result_java_object(cx, o);}
-    public void resultNull(){CApi.sqlite3_result_null(cx);}
-    /**
-       Analog to sqlite3_result_value(), using the Value object at the
-       given argument index.
-    */
-    public void resultArg(int argNdx){CApi.sqlite3_result_value(cx, valueAt(argNdx));}
-    public void resultSubtype(int subtype){CApi.sqlite3_result_subtype(cx, subtype);}
-    public void resultZeroBlob(long n){
-      // Throw on error? If n is too big,
-      // sqlite3_result_error_toobig() is automatically called.
-      CApi.sqlite3_result_zeroblob64(cx, n);
-    }
-
-    public void resultBlob(byte[] blob){CApi.sqlite3_result_blob(cx, blob);}
-    public void resultText(byte[] utf8){CApi.sqlite3_result_text(cx, utf8);}
-    public void resultText(String txt){CApi.sqlite3_result_text(cx, txt);}
-    public void resultText16(byte[] utf16){CApi.sqlite3_result_text16(cx, utf16);}
-    public void resultText16(String txt){CApi.sqlite3_result_text16(cx, txt);}
-
-    /**
-       Callbacks should invoke this on OOM errors, instead of throwing
-       OutOfMemoryError, because the latter cannot be propagated
-       through the C API.
-    */
-    public void resultNoMem(){CApi.sqlite3_result_error_nomem(cx);}
-
-    /**
-       Analog to sqlite3_set_auxdata() but throws if argNdx is out of
-       range.
-    */
-    public void setAuxData(int argNdx, Object o){
-      /* From the API docs: https://www.sqlite.org/c3ref/get_auxdata.html
-
-         The value of the N parameter to these interfaces should be
-         non-negative. Future enhancements may make use of negative N
-         values to define new kinds of function caching behavior.
-      */
-      valueAt(argNdx);
-      CApi.sqlite3_set_auxdata(cx, argNdx, o);
-    }
-
-    /**
-       Analog to sqlite3_get_auxdata() but throws if argNdx is out of
-       range.
-    */
-    public Object getAuxData(int argNdx){
-      valueAt(argNdx);
-      return CApi.sqlite3_get_auxdata(cx, argNdx);
-    }
-
-    /**
-       Represents a single SqlFunction argument. Primarily intended
+       Wrapper for a single SqlFunction argument. Primarily intended
        for use with the Arguments class's Iterable interface.
     */
     public final static class Arg {
@@ -186,7 +72,7 @@ public interface SqlFunction  {
       public int getBytes(){return a.getBytes(ndx);}
       public int getBytes16(){return a.getBytes16(ndx);}
       public Object getObject(){return a.getObject(ndx);}
-      public <T> T getObject(Class<T> type){ return a.getObject(ndx, type); }
+      public <T> T getObjectCasted(Class<T> type){ return a.getObjectCasted(ndx, type); }
       public int getType(){return a.getType(ndx);}
       public Object getAuxData(){return a.getAuxData(ndx);}
       public void setAuxData(Object o){a.setAuxData(ndx, o);}
@@ -201,6 +87,147 @@ public interface SqlFunction  {
       return java.util.Arrays.stream(proxies).iterator();
     }
 
+    /**
+       Returns the sqlite3_value at the given argument index or throws
+       an IllegalArgumentException exception if ndx is out of range.
+    */
+    private sqlite3_value valueAt(int ndx){
+      if(ndx<0 || ndx>=args.length){
+        throw new IllegalArgumentException(
+          "SQL function argument index "+ndx+" is out of range."
+        );
+      }
+      return args[ndx];
+    }
+
+    sqlite3_context getContext(){return cx;}
+
+    public int getArgCount(){ return args.length; }
+
+    public int getInt(int arg){return CApi.sqlite3_value_int(valueAt(arg));}
+    public long getInt64(int arg){return CApi.sqlite3_value_int64(valueAt(arg));}
+    public double getDouble(int arg){return CApi.sqlite3_value_double(valueAt(arg));}
+    public byte[] getBlob(int arg){return CApi.sqlite3_value_blob(valueAt(arg));}
+    public byte[] getText(int arg){return CApi.sqlite3_value_text(valueAt(arg));}
+    public String getText16(int arg){return CApi.sqlite3_value_text16(valueAt(arg));}
+    public int getBytes(int arg){return CApi.sqlite3_value_bytes(valueAt(arg));}
+    public int getBytes16(int arg){return CApi.sqlite3_value_bytes16(valueAt(arg));}
+    public Object getObject(int arg){return CApi.sqlite3_value_java_object(valueAt(arg));}
+    public <T> T getObjectCasted(int arg, Class<T> type){
+      return CApi.sqlite3_value_java_casted(valueAt(arg), type);
+    }
+
+    public int getType(int arg){return CApi.sqlite3_value_type(valueAt(arg));}
+    public int getSubtype(int arg){return CApi.sqlite3_value_subtype(valueAt(arg));}
+    public int getNumericType(int arg){return CApi.sqlite3_value_numeric_type(valueAt(arg));}
+    public int getNoChange(int arg){return CApi.sqlite3_value_nochange(valueAt(arg));}
+    public boolean getFromBind(int arg){return CApi.sqlite3_value_frombind(valueAt(arg));}
+    public int getEncoding(int arg){return CApi.sqlite3_value_encoding(valueAt(arg));}
+
+    public void resultInt(int v){ CApi.sqlite3_result_int(cx, v); }
+    public void resultInt64(long v){ CApi.sqlite3_result_int64(cx, v); }
+    public void resultDouble(double v){ CApi.sqlite3_result_double(cx, v); }
+    public void resultError(String msg){CApi.sqlite3_result_error(cx, msg);}
+    public void resultError(Exception e){CApi.sqlite3_result_error(cx, e);}
+    public void resultErrorTooBig(){CApi.sqlite3_result_error_toobig(cx);}
+    public void resultErrorCode(int rc){CApi.sqlite3_result_error_code(cx, rc);}
+    public void resultObject(Object o){CApi.sqlite3_result_java_object(cx, o);}
+    public void resultNull(){CApi.sqlite3_result_null(cx);}
+    public void resultArg(int argNdx){CApi.sqlite3_result_value(cx, valueAt(argNdx));}
+    public void resultZeroBlob(long n){
+      // Throw on error? If n is too big,
+      // sqlite3_result_error_toobig() is automatically called.
+      CApi.sqlite3_result_zeroblob64(cx, n);
+    }
+
+    public void resultBlob(byte[] blob){CApi.sqlite3_result_blob(cx, blob);}
+    public void resultText(byte[] utf8){CApi.sqlite3_result_text(cx, utf8);}
+    public void resultText(String txt){CApi.sqlite3_result_text(cx, txt);}
+    public void resultText16(byte[] utf16){CApi.sqlite3_result_text16(cx, utf16);}
+    public void resultText16(String txt){CApi.sqlite3_result_text16(cx, txt);}
+
+    public void setAuxData(int arg, Object o){
+      /* From the API docs: https://www.sqlite.org/c3ref/get_auxdata.html
+
+         The value of the N parameter to these interfaces should be
+         non-negative. Future enhancements may make use of negative N
+         values to define new kinds of function caching behavior.
+      */
+      valueAt(arg);
+      CApi.sqlite3_set_auxdata(cx, arg, o);
+    }
+
+    public Object getAuxData(int arg){
+      valueAt(arg);
+      return CApi.sqlite3_get_auxdata(cx, arg);
+    }
+  }
+
+  /**
+     PerContextState assists aggregate and window functions in
+     managing their accumulator state across calls to the UDF's
+     callbacks.
+
+     <p>T must be of a type which can be legally stored as a value in
+     java.util.HashMap<KeyType,T>.
+
+     <p>If a given aggregate or window function is called multiple times
+     in a single SQL statement, e.g. SELECT MYFUNC(A), MYFUNC(B)...,
+     then the clients need some way of knowing which call is which so
+     that they can map their state between their various UDF callbacks
+     and reset it via xFinal(). This class takes care of such
+     mappings.
+
+     <p>This class works by mapping
+     sqlite3_context.getAggregateContext() to a single piece of
+     state, of a client-defined type (the T part of this class), which
+     persists across a "matching set" of the UDF's callbacks.
+
+     <p>This class is a helper providing commonly-needed functionality
+     - it is not required for use with aggregate or window functions.
+     Client UDFs are free to perform such mappings using custom
+     approaches. The provided {@link AggregateFunction} and {@link
+     WindowFunction} classes use this.
+  */
+  public static final class PerContextState<T> {
+    private final java.util.Map<Long,ValueHolder<T>> map
+      = new java.util.HashMap<>();
+
+    /**
+       Should be called from a UDF's xStep(), xValue(), and xInverse()
+       methods, passing it that method's first argument and an initial
+       value for the persistent state. If there is currently no
+       mapping for the given context within the map, one is created
+       using the given initial value, else the existing one is used
+       and the 2nd argument is ignored.  It returns a ValueHolder<T>
+       which can be used to modify that state directly without
+       requiring that the client update the underlying map's entry.
+
+       <p>The caller is obligated to eventually call
+       takeAggregateState() to clear the mapping.
+    */
+    public ValueHolder<T> getAggregateState(SqlFunction.Arguments args, T initialValue){
+      final Long key = args.getContext().getAggregateContext(true);
+      ValueHolder<T> rc = null==key ? null : map.get(key);
+      if( null==rc ){
+        map.put(key, rc = new ValueHolder<>(initialValue));
+      }
+      return rc;
+    }
+
+    /**
+       Should be called from a UDF's xFinal() method and passed that
+       method's first argument. This function removes the value
+       associated with with the arguments' aggregate context from the
+       map and returns it, returning null if no other UDF method has
+       been called to set up such a mapping. The latter condition will
+       be the case if a UDF is used in a statement which has no result
+       rows.
+    */
+    public T takeAggregateState(SqlFunction.Arguments args){
+      final ValueHolder<T> h = map.remove(args.getContext().getAggregateContext(false));
+      return null==h ? null : h.value;
+    }
   }
 
   /**
@@ -208,7 +235,7 @@ public interface SqlFunction  {
      for use with the org.sqlite.jni.capi.ScalarFunction interface.
   */
   static final class ScalarAdapter extends org.sqlite.jni.capi.ScalarFunction {
-    private final ScalarFunction impl;
+    final ScalarFunction impl;
     ScalarAdapter(ScalarFunction impl){
       this.impl = impl;
     }
@@ -234,9 +261,8 @@ public interface SqlFunction  {
      Internal-use adapter for wrapping this package's AggregateFunction
      for use with the org.sqlite.jni.capi.AggregateFunction interface.
   */
-  static /*cannot be final without duplicating the whole body in WindowAdapter*/
-  class AggregateAdapter extends org.sqlite.jni.capi.AggregateFunction {
-    private final AggregateFunction impl;
+  static final class AggregateAdapter extends org.sqlite.jni.capi.AggregateFunction {
+    final AggregateFunction impl;
     AggregateAdapter(AggregateFunction impl){
       this.impl = impl;
     }
@@ -256,9 +282,8 @@ public interface SqlFunction  {
     }
 
     /**
-       As for the xFinal() argument of the C API's
-       sqlite3_create_function().  If the proxied function throws, it
-       is translated into a sqlite3_result_error().
+       As for the xFinal() argument of the C API's sqlite3_create_function().
+       If the proxied function throws, it is translated into a sqlite3_result_error().
     */
     public void xFinal(sqlite3_context cx){
       try{
@@ -273,46 +298,4 @@ public interface SqlFunction  {
     }
   }
 
-  /**
-     Internal-use adapter for wrapping this package's WindowFunction
-     for use with the org.sqlite.jni.capi.WindowFunction interface.
-  */
-  static final class WindowAdapter extends AggregateAdapter {
-    private final WindowFunction impl;
-    WindowAdapter(WindowFunction impl){
-      super(impl);
-      this.impl = impl;
-    }
-
-    /**
-       Proxies this.impl.xInverse(), adapting the call arguments to that
-       function's signature. If the proxied function throws, it is
-       translated to sqlite_result_error() with the exception's
-       message.
-    */
-    public void xInverse(sqlite3_context cx, sqlite3_value[] args){
-      try{
-        impl.xInverse( new SqlFunction.Arguments(cx, args) );
-      }catch(Exception e){
-        CApi.sqlite3_result_error(cx, e);
-      }
-    }
-
-    /**
-       As for the xValue() argument of the C API's sqlite3_create_window_function().
-       If the proxied function throws, it is translated into a sqlite3_result_error().
-    */
-    public void xValue(sqlite3_context cx){
-      try{
-        impl.xValue( new SqlFunction.Arguments(cx, null) );
-      }catch(Exception e){
-        CApi.sqlite3_result_error(cx, e);
-      }
-    }
-
-    public void xDestroy(){
-      impl.xDestroy();
-    }
-  }
-
 }

ext/jni/src/org/sqlite/jni/wrapper1/SqliteException.java

@@ -12,7 +12,7 @@
 ** This file is part of the wrapper1 interface for sqlite3.
 */
 package org.sqlite.jni.wrapper1;
-import org.sqlite.jni.capi.CApi;
+import static org.sqlite.jni.capi.CApi.*;
 import org.sqlite.jni.capi.sqlite3;
 
 /**
@@ -22,10 +22,10 @@ import org.sqlite.jni.capi.sqlite3;
    and C via JNI.
 */
 public final class SqliteException extends java.lang.RuntimeException {
-  private int errCode = CApi.SQLITE_ERROR;
-  private int xerrCode = CApi.SQLITE_ERROR;
-  private int errOffset = -1;
-  private int sysErrno = 0;
+  int errCode = SQLITE_ERROR;
+  int xerrCode = SQLITE_ERROR;
+  int errOffset = -1;
+  int sysErrno = 0;
 
   /**
      Records the given error string and uses SQLITE_ERROR for both the
@@ -38,31 +38,28 @@ public final class SqliteException extends java.lang.RuntimeException {
   /**
      Uses sqlite3_errstr(sqlite3ResultCode) for the error string and
      sets both the error code and extended error code to the given
-     value. This approach includes no database-level information and
-     systemErrno() will be 0, so is intended only for use with sqlite3
-     APIs for which a result code is not an error but which the
-     higher-level wrapper should treat as one.
+     value.
   */
   public SqliteException(int sqlite3ResultCode){
-    super(CApi.sqlite3_errstr(sqlite3ResultCode));
+    super(sqlite3_errstr(sqlite3ResultCode));
     errCode = xerrCode = sqlite3ResultCode;
   }
 
   /**
      Records the current error state of db (which must not be null and
-     must refer to an opened db object). Note that this does not close
+     must refer to an opened db object). Note that this does NOT close
      the db.
 
-     Design note: closing the db on error is really only useful during
+     Design note: closing the db on error is likely only useful during
      a failed db-open operation, and the place(s) where that can
      happen are inside this library, not client-level code.
   */
   SqliteException(sqlite3 db){
-    super(CApi.sqlite3_errmsg(db));
-    errCode = CApi.sqlite3_errcode(db);
-    xerrCode = CApi.sqlite3_extended_errcode(db);
-    errOffset = CApi.sqlite3_error_offset(db);
-    sysErrno = CApi.sqlite3_system_errno(db);
+    super(sqlite3_errmsg(db));
+    errCode = sqlite3_errcode(db);
+    xerrCode = sqlite3_extended_errcode(db);
+    errOffset = sqlite3_error_offset(db);
+    sysErrno = sqlite3_system_errno(db);
   }
 
   /**
@@ -74,7 +71,7 @@ public final class SqliteException extends java.lang.RuntimeException {
   }
 
   public SqliteException(Sqlite.Stmt stmt){
-    this(stmt.getDb());
+    this( stmt.db() );
   }
 
   public int errcode(){ return errCode; }

ext/jni/src/org/sqlite/jni/wrapper1/ValueHolder.java

@@ -9,13 +9,13 @@
 **    May you share freely, never taking more than you give.
 **
 *************************************************************************
-** This file contains the ValueHolder utility class.
+** This file contains a set of tests for the sqlite3 JNI bindings.
 */
 package org.sqlite.jni.wrapper1;
 
 /**
    A helper class which simply holds a single value. Its primary use
-   is for communicating values out of anonymous callbacks, as doing so
+   is for communicating values out of anonymous classes, as doing so
    requires a "final" reference.
 */
 public class ValueHolder<T> {

ext/jni/src/org/sqlite/jni/wrapper1/WindowFunction.java

@@ -1,42 +0,0 @@
-/*
-** 2023-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 is part of the wrapper1 interface for sqlite3.
-*/
-package org.sqlite.jni.wrapper1;
-
-/**
-   A SqlFunction implementation for window functions. The T type
-   represents the type of data accumulated by this function while it
-   works. e.g. a SUM()-like UDF might use Integer or Long and a
-   CONCAT()-like UDF might use a StringBuilder or a List<String>.
-*/
-public abstract class WindowFunction<T> extends AggregateFunction<T>  {
-
-  /**
-     As for the xInverse() argument of the C API's
-     sqlite3_create_window_function().  If this function throws, the
-     exception is reported via sqlite3_result_error().
-  */
-  public abstract void xInverse(SqlFunction.Arguments args);
-
-  /**
-     As for the xValue() argument of the C API's
-     sqlite3_create_window_function(). If this function throws, it is
-     translated into sqlite3_result_error().
-
-     Note that the passed-in object will not actually contain any
-     arguments for xValue() but will contain the context object needed
-     for setting the call's result or error state.
-  */
-  public abstract void xValue(SqlFunction.Arguments args);
-
-}

ext/misc/bgckpt.c

@@ -0,0 +1,244 @@
+/*
+** 2017-10-11
+**
+** 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 !defined(SQLITE_TEST) || defined(SQLITE_OS_UNIX)
+
+#include "sqlite3.h"
+#include <string.h>
+#include <pthread.h>
+
+/*
+** API declarations.
+*/
+typedef struct Checkpointer Checkpointer;
+int sqlite3_bgckpt_create(const char *zFilename, Checkpointer **pp);
+int sqlite3_bgckpt_checkpoint(Checkpointer *p, int bBlock);
+void sqlite3_bgckpt_destroy(Checkpointer *p);
+
+
+struct Checkpointer {
+  sqlite3 *db;                    /* Database handle */
+
+  pthread_t thread;               /* Background thread */
+  pthread_mutex_t mutex;
+  pthread_cond_t cond;
+
+  int rc;                         /* Error from "PRAGMA wal_checkpoint" */
+  int bCkpt;                      /* True if checkpoint requested */
+  int bExit;                      /* True if exit requested */
+};
+
+static void *bgckptThreadMain(void *pCtx){
+  int rc = SQLITE_OK;
+  Checkpointer *p = (Checkpointer*)pCtx;
+
+  while( rc==SQLITE_OK ){
+    int bExit;
+
+    pthread_mutex_lock(&p->mutex);
+    if( p->bCkpt==0 && p->bExit==0 ){
+      pthread_cond_wait(&p->cond, &p->mutex);
+    }
+    p->bCkpt = 0;
+    bExit = p->bExit;
+    pthread_mutex_unlock(&p->mutex);
+
+    if( bExit ) break;
+    rc = sqlite3_exec(p->db, "PRAGMA wal_checkpoint", 0, 0, 0);
+    if( rc==SQLITE_BUSY ){
+      rc = SQLITE_OK;
+    }
+  }
+
+  pthread_mutex_lock(&p->mutex);
+  p->rc = rc;
+  pthread_mutex_unlock(&p->mutex);
+  return 0;
+}
+
+void sqlite3_bgckpt_destroy(Checkpointer *p){
+  if( p ){
+    void *ret = 0;
+
+    /* Signal the background thread to exit */
+    pthread_mutex_lock(&p->mutex);
+    p->bExit = 1;
+    pthread_cond_broadcast(&p->cond);
+    pthread_mutex_unlock(&p->mutex);
+
+    pthread_join(p->thread, &ret);
+    sqlite3_close(p->db);
+    sqlite3_free(p);
+  }
+}
+
+
+int sqlite3_bgckpt_create(const char *zFilename, Checkpointer **pp){
+  Checkpointer *pNew = 0;
+  int rc;
+
+  pNew = (Checkpointer*)sqlite3_malloc(sizeof(Checkpointer));
+  if( pNew==0 ){
+    rc = SQLITE_NOMEM;
+  }else{
+    memset(pNew, 0, sizeof(Checkpointer));
+    rc = sqlite3_open(zFilename, &pNew->db);
+  }
+
+  if( rc==SQLITE_OK ){
+    pthread_mutex_init(&pNew->mutex, 0);
+    pthread_cond_init(&pNew->cond, 0);
+    pthread_create(&pNew->thread, 0, bgckptThreadMain, (void*)pNew);
+  }
+
+  if( rc!=SQLITE_OK ){
+    sqlite3_bgckpt_destroy(pNew);
+    pNew = 0;
+  }
+  *pp = pNew;
+  return rc;
+}
+
+int sqlite3_bgckpt_checkpoint(Checkpointer *p, int bBlock){
+  int rc;
+  pthread_mutex_lock(&p->mutex);
+  rc = p->rc;
+  if( rc==SQLITE_OK ){
+    p->bCkpt = 1;
+    pthread_cond_broadcast(&p->cond);
+  }
+  pthread_mutex_unlock(&p->mutex);
+  return rc;
+}
+
+#ifdef SQLITE_TEST
+
+#if defined(INCLUDE_SQLITE_TCL_H)
+#  include "sqlite_tcl.h"
+#else
+#  include "tcl.h"
+#  ifndef SQLITE_TCLAPI
+#    define SQLITE_TCLAPI
+#  endif
+#endif
+
+const char *sqlite3ErrName(int rc);
+
+static void SQLITE_TCLAPI bgckpt_del(void * clientData){
+  Checkpointer *pCkpt = (Checkpointer*)clientData;
+  sqlite3_bgckpt_destroy(pCkpt);
+}
+
+/*
+** Tclcmd: $ckpt SUBCMD ...
+*/
+static int SQLITE_TCLAPI bgckpt_obj_cmd(
+  void * clientData,
+  Tcl_Interp *interp,
+  int objc,
+  Tcl_Obj *CONST objv[]
+){
+  Checkpointer *pCkpt = (Checkpointer*)clientData;
+  const char *aCmd[] = { "checkpoint", "destroy", 0 };
+  int iCmd;
+
+  if( objc<2 ){
+    Tcl_WrongNumArgs(interp, 1, objv, "SUBCMD ...");
+    return TCL_ERROR;
+  }
+
+  if( Tcl_GetIndexFromObj(interp, objv[1], aCmd, "sub-command", 0, &iCmd) ){
+    return TCL_ERROR;
+  }
+
+  switch( iCmd ){
+    case 0: {
+      int rc;
+      int bBlock = 0;
+
+      if( objc>3 ){
+        Tcl_WrongNumArgs(interp, 2, objv, "?BLOCKING?");
+        return TCL_ERROR;
+      }
+      if( objc==3 && Tcl_GetBooleanFromObj(interp, objv[2], &bBlock) ){
+        return TCL_ERROR;
+      }
+
+      rc = sqlite3_bgckpt_checkpoint(pCkpt, bBlock);
+      if( rc!=SQLITE_OK ){
+        Tcl_SetObjResult(interp, Tcl_NewStringObj(sqlite3ErrName(rc), -1));
+        return TCL_ERROR;
+      }
+      break;
+    }
+
+    case 1: {
+      Tcl_DeleteCommand(interp, Tcl_GetString(objv[0]));
+      break;
+    }
+  }
+
+  return TCL_OK;
+}
+
+/*
+** Tclcmd: bgckpt CMDNAME FILENAME
+*/
+static int SQLITE_TCLAPI bgckpt_cmd(
+  void * clientData,
+  Tcl_Interp *interp,
+  int objc,
+  Tcl_Obj *CONST objv[]
+){
+  const char *zCmd;
+  const char *zFilename;
+  int rc;
+  Checkpointer *pCkpt;
+
+  if( objc!=3 ){
+    Tcl_WrongNumArgs(interp, 1, objv, "CMDNAME FILENAME");
+    return TCL_ERROR;
+  }
+  zCmd = Tcl_GetString(objv[1]);
+  zFilename = Tcl_GetString(objv[2]);
+
+  rc = sqlite3_bgckpt_create(zFilename, &pCkpt);
+  if( rc!=SQLITE_OK ){
+    Tcl_SetObjResult(interp, Tcl_NewStringObj(sqlite3ErrName(rc), -1));
+    return TCL_ERROR;
+  }
+
+  Tcl_CreateObjCommand(interp, zCmd, bgckpt_obj_cmd, (void*)pCkpt, bgckpt_del);
+  Tcl_SetObjResult(interp, objv[1]);
+  return TCL_OK;
+}
+
+int Bgckpt_Init(Tcl_Interp *interp){
+  Tcl_CreateObjCommand(interp, "bgckpt", bgckpt_cmd, 0, 0);
+  return TCL_OK;
+}
+#endif   /* SQLITE_TEST */
+
+#else
+#if defined(INCLUDE_SQLITE_TCL_H)
+#  include "sqlite_tcl.h"
+#else
+#  include "tcl.h"
+#  ifndef SQLITE_TCLAPI
+#    define SQLITE_TCLAPI
+#  endif
+#endif
+int Bgckpt_Init(Tcl_Interp *interp){ return TCL_OK; }
+#endif
+

ext/wasm/EXPORTED_FUNCTIONS.fiddle

@@ -1,10 +1,7 @@
+_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_db_handle
-_fiddle_db_vfs
-_fiddle_export_db

ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api

@@ -1,8 +1,3 @@
-_malloc
-_free
-_realloc
-_sqlite3_aggregate_context
-_sqlite3_auto_extension
 _sqlite3_bind_blob
 _sqlite3_bind_double
 _sqlite3_bind_int
@@ -10,16 +5,11 @@ _sqlite3_bind_int64
 _sqlite3_bind_null
 _sqlite3_bind_parameter_count
 _sqlite3_bind_parameter_index
-_sqlite3_bind_pointer
 _sqlite3_bind_text
-_sqlite3_busy_handler
-_sqlite3_busy_timeout
-_sqlite3_cancel_auto_extension
 _sqlite3_changes
 _sqlite3_changes64
 _sqlite3_clear_bindings
 _sqlite3_close_v2
-_sqlite3_collation_needed
 _sqlite3_column_blob
 _sqlite3_column_bytes
 _sqlite3_column_count
@@ -30,28 +20,12 @@ _sqlite3_column_int64
 _sqlite3_column_name
 _sqlite3_column_text
 _sqlite3_column_type
-_sqlite3_column_value
-_sqlite3_commit_hook
 _sqlite3_compileoption_get
 _sqlite3_compileoption_used
-_sqlite3_complete
-_sqlite3_context_db_handle
-_sqlite3_create_collation
-_sqlite3_create_collation_v2
-_sqlite3_create_function
 _sqlite3_create_function_v2
-_sqlite3_create_module
-_sqlite3_create_module_v2
-_sqlite3_create_window_function
 _sqlite3_data_count
 _sqlite3_db_filename
-_sqlite3_db_handle
 _sqlite3_db_name
-_sqlite3_db_status
-_sqlite3_declare_vtab
-_sqlite3_deserialize
-_sqlite3_drop_modules
-_sqlite3_errcode
 _sqlite3_errmsg
 _sqlite3_error_offset
 _sqlite3_errstr
@@ -59,39 +33,16 @@ _sqlite3_exec
 _sqlite3_expanded_sql
 _sqlite3_extended_errcode
 _sqlite3_extended_result_codes
-_sqlite3_file_control
 _sqlite3_finalize
-_sqlite3_free
-_sqlite3_get_auxdata
-_sqlite3_get_autocommit
 _sqlite3_initialize
-_sqlite3_keyword_count
-_sqlite3_keyword_name
-_sqlite3_keyword_check
-_sqlite3_last_insert_rowid
+_sqlite3_interrupt
 _sqlite3_libversion
 _sqlite3_libversion_number
-_sqlite3_limit
-_sqlite3_malloc
-_sqlite3_malloc64
-_sqlite3_msize
 _sqlite3_open
 _sqlite3_open_v2
-_sqlite3_overload_function
 _sqlite3_prepare_v2
 _sqlite3_prepare_v3
-_sqlite3_preupdate_blobwrite
-_sqlite3_preupdate_count
-_sqlite3_preupdate_depth
-_sqlite3_preupdate_hook
-_sqlite3_preupdate_new
-_sqlite3_preupdate_old
-_sqlite3_progress_handler
-_sqlite3_randomness
-_sqlite3_realloc
-_sqlite3_realloc64
 _sqlite3_reset
-_sqlite3_reset_auto_extension
 _sqlite3_result_blob
 _sqlite3_result_double
 _sqlite3_result_error
@@ -99,106 +50,23 @@ _sqlite3_result_error_code
 _sqlite3_result_error_nomem
 _sqlite3_result_error_toobig
 _sqlite3_result_int
-_sqlite3_result_int64
 _sqlite3_result_null
-_sqlite3_result_pointer
-_sqlite3_result_subtype
 _sqlite3_result_text
-_sqlite3_result_zeroblob
-_sqlite3_result_zeroblob64
-_sqlite3_rollback_hook
-_sqlite3_serialize
-_sqlite3_set_authorizer
-_sqlite3_set_auxdata
-_sqlite3_set_last_insert_rowid
-_sqlite3_shutdown
 _sqlite3_sourceid
 _sqlite3_sql
-_sqlite3_status
-_sqlite3_status64
 _sqlite3_step
-_sqlite3_stmt_isexplain
-_sqlite3_stmt_readonly
-_sqlite3_stmt_status
 _sqlite3_strglob
-_sqlite3_stricmp
 _sqlite3_strlike
-_sqlite3_strnicmp
-_sqlite3_table_column_metadata
 _sqlite3_total_changes
 _sqlite3_total_changes64
-_sqlite3_trace_v2
-_sqlite3_txn_state
-_sqlite3_update_hook
-_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_dup
-_sqlite3_value_free
-_sqlite3_value_frombind
-_sqlite3_value_int
-_sqlite3_value_int64
-_sqlite3_value_nochange
-_sqlite3_value_numeric_type
-_sqlite3_value_pointer
-_sqlite3_value_subtype
 _sqlite3_value_text
 _sqlite3_value_type
 _sqlite3_vfs_find
 _sqlite3_vfs_register
-_sqlite3_vfs_unregister
-_sqlite3_vtab_collation
-_sqlite3_vtab_distinct
-_sqlite3_vtab_in
-_sqlite3_vtab_in_first
-_sqlite3_vtab_in_next
-_sqlite3_vtab_nochange
-_sqlite3_vtab_on_conflict
-_sqlite3_vtab_rhs_value
-_sqlite3changegroup_add
-_sqlite3changegroup_add_strm
-_sqlite3changegroup_delete
-_sqlite3changegroup_new
-_sqlite3changegroup_output
-_sqlite3changegroup_output_strm
-_sqlite3changeset_apply
-_sqlite3changeset_apply_strm
-_sqlite3changeset_apply_v2
-_sqlite3changeset_apply_v2_strm
-_sqlite3changeset_concat
-_sqlite3changeset_concat_strm
-_sqlite3changeset_conflict
-_sqlite3changeset_finalize
-_sqlite3changeset_fk_conflicts
-_sqlite3changeset_invert
-_sqlite3changeset_invert_strm
-_sqlite3changeset_new
-_sqlite3changeset_next
-_sqlite3changeset_old
-_sqlite3changeset_op
-_sqlite3changeset_pk
-_sqlite3changeset_start
-_sqlite3changeset_start_strm
-_sqlite3changeset_start_v2
-_sqlite3changeset_start_v2_strm
-_sqlite3session_attach
-_sqlite3session_changeset
-_sqlite3session_changeset_size
-_sqlite3session_changeset_strm
-_sqlite3session_config
-_sqlite3session_create
-_sqlite3session_delete
-_sqlite3session_diff
-_sqlite3session_enable
-_sqlite3session_indirect
-_sqlite3session_isempty
-_sqlite3session_memory_used
-_sqlite3session_object_config
-_sqlite3session_patchset
-_sqlite3session_patchset_strm
-_sqlite3session_table_filter
+_sqlite3_wasm_db_error
+_sqlite3_wasm_enum_json
+_malloc
+_free

ext/wasm/api/sqlite3-api-glue.js

@@ -188,7 +188,6 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     ["sqlite3_file_control", "int", "sqlite3*", "string", "int", "*"],
     ["sqlite3_finalize", "int", "sqlite3_stmt*"],
     ["sqlite3_free", undefined,"*"],
-    ["sqlite3_get_autocommit", "int", "sqlite3*"],
     ["sqlite3_get_auxdata", "*", "sqlite3_context*", "int"],
     ["sqlite3_initialize", undefined],
     /*["sqlite3_interrupt", undefined, "sqlite3*"

ext/wasm/api/sqlite3-api-worker1.js

@@ -62,7 +62,7 @@
 
   ```
   {
-    type: string, // one of: 'open', 'close', 'exec', 'export', 'config-get'
+    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.
@@ -325,37 +325,6 @@
   passed only a string), noting that options.resultRows and
   options.columnNames may be populated by the call to db.exec().
 
-
-  ====================================================================
-  "export" the current db
-
-  To export the underlying database as a byte array...
-
-  Message format:
-
-  ```
-  {
-    type: "export",
-    messageId: ...as above...,
-    dbId: ...as above...
-  }
-  ```
-
-  Response:
-
-  ```
-  {
-    type: "export",
-    messageId: ...as above...,
-    dbId: ...as above...
-    result: {
-      byteArray: Uint8Array (as per sqlite3_js_db_export()),
-      filename: the db filename,
-      mimetype: "application/x-sqlite3"
-    }
-  }
-  ```
-
 */
 globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
 sqlite3.initWorker1API = function(){

ext/wasm/api/sqlite3-worker1-promiser.c-pp.js

@@ -114,7 +114,7 @@
    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 the
+   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
@@ -122,17 +122,8 @@
    the end of the result set has been reached. Note that the rows
    arrive via worker-posted messages, with all the implications
    of that.
-
-   Notable shortcomings:
-
-   - This API was not designed with ES6 modules in mind. Neither Firefox
-     nor Safari support, as of March 2023, the {type:"module"} flag to the
-     Worker constructor, so that particular usage is not something we're going
-     to target for the time being:
-
-     https://developer.mozilla.org/en-US/docs/Web/API/Worker/Worker
 */
-globalThis.sqlite3Worker1Promiser = function callee(config = callee.defaultConfig){
+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;
@@ -169,7 +160,7 @@ globalThis.sqlite3Worker1Promiser = function callee(config = callee.defaultConfi
       if(msgHandler && msgHandler.onrow){
         msgHandler.onrow(ev);
         return;
-      }
+      }        
       if(config.onunhandled) config.onunhandled(arguments[0]);
       else err("sqlite3Worker1Promiser() unhandled worker message:",ev);
       return;
@@ -196,9 +187,10 @@ globalThis.sqlite3Worker1Promiser = function callee(config = callee.defaultConfi
     if(1===arguments.length){
       msg = arguments[0];
     }else if(2===arguments.length){
-      msg = Object.create(null);
-      msg.type = arguments[0];
-      msg.args = arguments[1];
+      msg = {
+        type: arguments[0],
+        args: arguments[1]
+      };
     }else{
       toss("Invalid arugments for sqlite3Worker1Promiser()-created factory.");
     }
@@ -244,34 +236,28 @@ globalThis.sqlite3Worker1Promiser = function callee(config = callee.defaultConfi
     return p;
   };
 }/*sqlite3Worker1Promiser()*/;
-globalThis.sqlite3Worker1Promiser.defaultConfig = {
+self.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.js");
 //#else
     let theJs = "sqlite3-worker1.js";
     if(this.currentScript){
       const src = this.currentScript.src.split('/');
       src.pop();
       theJs = src.join('/')+'/' + theJs;
-      //sqlite3.config.warn("promiser currentScript, theJs =",this.currentScript,theJs);
-    }else if(globalThis.location){
-      //sqlite3.config.warn("promiser globalThis.location =",globalThis.location);
-      const urlParams = new URL(globalThis.location.href).searchParams;
+      //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 + globalThis.location.search);
+    return new Worker(theJs + self.location.search);
 //#endif
-  }
-//#ifnot target=es6-bundler-friendly
-  .bind({
-    currentScript: globalThis?.document?.currentScript
-  })
-//#endif
-  ,
+  }.bind({
+    currentScript: self?.document?.currentScript
+  }),
   onerror: (...args)=>console.error('worker1 promiser error',...args)
 };

ext/wasm/fiddle/fiddle.html

@@ -273,6 +273,11 @@
         </fieldset>
       </div>
     </div> <!-- #view-split -->
+    <!-- Maintenance notes:
+
+        ... TODO... currently being refactored...
+
+    -->
     <script src="fiddle.js"></script>
   </body>
 </html>

ext/wasm/test-opfs-vfs.js

@@ -22,7 +22,7 @@ const tryOpfsVfs = async function(sqlite3){
   const opfs = sqlite3.opfs;
   log("tryOpfsVfs()");
   if(!sqlite3.opfs){
-    const e = new Error("OPFS is not available.");
+    const e = toss("OPFS is not available.");
     error(e);
     throw e;
   }

ext/wasm/tester1.c-pp.js

@@ -1688,7 +1688,7 @@ globalThis.sqlite3InitModule = sqlite3InitModule;
           wasm.sqlite3_wasm_vfs_unlink(0, filename);
         }
       }
-    }/*sqlite3_js_posix_create_file()*/)
+    }/*sqlite3_js_vfs_create_file()*/)
 
   ////////////////////////////////////////////////////////////////////
     .t({
@@ -2605,6 +2605,28 @@ globalThis.sqlite3InitModule = sqlite3InitModule;
         }
       }
     }/*kvvfs sanity checks*/)
+    .t({
+      name: 'kvvfs sqlite3_js_vfs_create_file()',
+      predicate: ()=>"kvvfs does not currently support this",
+      test: function(sqlite3){
+        let db;
+        try {
+          db = new this.JDb(this.kvvfsDbFile);
+          const exp = capi.sqlite3_js_db_export(db);
+          db.close();
+          this.kvvfsUnlink();
+          capi.sqlite3_js_vfs_create_file("kvvfs", this.kvvfsDbFile, exp);
+          db = new this.JDb(filename);
+          T.assert(6 === db.selectValue('select count(*) from kvvfs'));
+        }finally{
+          db.close();
+          this.kvvfsUnlink();
+        }
+        delete this.kvvfsDbFile;
+        delete this.kvvfsUnlink;
+        delete this.JDb;
+      }
+   }/*kvvfs sqlite3_js_vfs_create_file()*/)
   ;/* end kvvfs tests */
 
   ////////////////////////////////////////////////////////////////////////
@@ -2622,17 +2644,13 @@ globalThis.sqlite3InitModule = sqlite3InitModule;
         T.assert( 0 === rc /*void pointer*/ );
 
         // Commit hook...
-        T.assert( 0!=capi.sqlite3_get_autocommit(db) );
         db.exec("BEGIN; SELECT 1; COMMIT");
         T.assert(0 === countCommit,
                  "No-op transactions (mostly) do not trigger commit hook.");
         db.exec("BEGIN EXCLUSIVE; SELECT 1; COMMIT");
         T.assert(1 === countCommit,
                  "But EXCLUSIVE transactions do.");
-        db.transaction((d)=>{
-          T.assert( 0==capi.sqlite3_get_autocommit(db) );
-          d.exec("create table t(a)");
-        });
+        db.transaction((d)=>{d.exec("create table t(a)");});
         T.assert(2 === countCommit);
 
         // Rollback hook:

main.mk

@@ -344,6 +344,7 @@ TESTSRC += \
   $(TOP)/ext/misc/amatch.c \
   $(TOP)/ext/misc/appendvfs.c \
   $(TOP)/ext/misc/basexx.c \
+  $(TOP)/ext/misc/bgckpt.c \
   $(TOP)/ext/misc/carray.c \
   $(TOP)/ext/misc/cksumvfs.c \
   $(TOP)/ext/misc/closure.c \

manifest

@@ -1,13 +1,13 @@
-C Do\snot\sset\sthe\sJ\ssubtype\swhen\sthe\soutput\sis\sJSONB.
-D 2023-11-28T23:18:04.442
+C Merge\s3.44.2\schanges\sinto\sthe\swal2-3.44\ssub-branch.
+D 2023-11-24T12:38:54.644
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in 890caf094636c308bc981032baf8f9208bf307755f9197ae4218a9fbcec2e449
+F Makefile.in a116e61f0fcf16c2305a70e40be4c2c7b236a3a6c1ce09c3263575cf8493bb69
 F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
-F Makefile.msc 59bb36dba001f0b38212be0794fb838f25371008b180929bcf08aa799694c168
+F Makefile.msc e7455bcbcd4853c5c6980d15d5217ff720aeb6f1c0256117929332554c106c19
 F README.md 963d30019abf0cc06b263cd2824bce022893f3f93a531758f6f04ff2194a16a8
-F VERSION 73573d4545343f001bf5dc5461173a7c78c203dd046cabcf99153878cf25d3a6
+F VERSION 672a5ddf487d19856d8b1015797e14578fd8f8d59c14d9832ab0fe5938c6ab9b
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
 F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@ -22,7 +22,7 @@ F autoconf/configure.ac ec7fa914c5e74ff212fe879f9bb6918e1234497e05facfb641f30c4d
 F autoconf/tea/Makefile.in 106a96f2f745d41a0f6193f1de98d7355830b65d45032c18cd7c90295ec24196
 F autoconf/tea/README 3e9a3c060f29a44344ab50aec506f4db903fb873
 F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43
-F autoconf/tea/configure.ac 4c32b08691a5b296206b38422b53b92b65be3d3f6b3dd6552a50981a61f5acda
+F autoconf/tea/configure.ac 0c358d924fe9cd5c624b9038e025bca35b572a15501014c69afe38b8ae4d7371
 F autoconf/tea/doc/sqlite3.n e1fe45d4f5286ee3d0ccc877aca2a0def488e9bb
 F autoconf/tea/license.terms 13bd403c9610fd2b76ece0ab50c4c5eda933d523
 F autoconf/tea/pkgIndex.tcl.in b9eb6dd37f64e08e637d576b3c83259814b9cddd78bec4af2e5abfc6c5c750ce
@@ -33,11 +33,11 @@ F autoconf/tea/win/nmakehlp.c b01f822eabbe1ed2b64e70882d97d48402b42d2689a1ea0034
 F autoconf/tea/win/rules.vc c511f222b80064096b705dbeb97060ee1d6b6d63
 F config.guess 883205ddf25b46f10c181818bf42c09da9888884af96f79e1719264345053bd6
 F config.sub c2d0260f17f3e4bc0b6808fccf1b291cb5e9126c14fc5890efc77b9fd0175559
-F configure bcb1042e92775424a1021d2f4c89c78a699a6225df01fa8c593df7df0be6ad10 x
-F configure.ac f25bd7843120f2c2b8bc9db5a92b0502bbdd28e68907415c3d42fc8e57c657b9
+F configure a56c8f24e118eff90e3870411bfc844e86c00577faf092ded131120a637ad2da x
+F configure.ac de31fea7d975bb7ebafbe0e2190a855cc80d48558bf0c9a6578a1836daf1cd3a
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/F2FS.txt c1d4a0ae9711cfe0e1d8b019d154f1c29e0d3abfe820787ba1e9ed7691160fcd
-F doc/compile-for-windows.md 50b27d77be96195c66031a3181cb8684ed822327ea834e07f9c014213e5e3bcf
+F doc/compile-for-windows.md 922ba580d210a1f1bd3ef9d0413121556f9b5714fb5c01e664d980f85fa4ac8c
 F doc/json-enhancements.md e356fc834781f1f1aa22ee300027a270b2c960122468499bf347bb123ce1ea4f
 F doc/lemon.html 44a53a1d2b42d7751f7b2f478efb23c978e258d794bfd172442307a755b9fa44
 F doc/pager-invariants.txt 27fed9a70ddad2088750c4a2b493b63853da2710
@@ -46,12 +46,13 @@ F doc/trusted-schema.md 33625008620e879c7bcfbbfa079587612c434fa094d338b08242288d
 F doc/vdbesort-memory.md 4da2639c14cd24a31e0af694b1a8dd37eaf277aff3867e9a8cc14046bc49df56
 F doc/vfs-shm.txt e101f27ea02a8387ce46a05be2b1a902a021d37a
 F doc/wal-lock.md 781726aaba20bafeceb7ba9f91d5c98c6731691b30c954e37cf0b49a053d461d
+F doc/wal2.md a807405a05e19a4945c5905a9ffa0fe45b8560dd7572461192501f565c19cdb5
 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 e048bd69f3a357a4b6b5da01c504728631d944ad5735ad83c44800c80a91e978 x
+F ext/consio/console_io.h d18bcc50f4e4d42b65be8fecba72918364ae77182c86360aca842e44b823384e
 F ext/expert/README.md b321c2762bb93c18ea102d5a5f7753a4b8bac646cb392b3b437f633caf2020c3
 F ext/expert/expert.c d548d603a4cc9e61f446cc179c120c6713511c413f82a4a32b1e1e69d3f086a4
 F ext/expert/expert1.test 0dd5cb096d66bed593e33053a3b364f6ef52ed72064bf5cf298364636dbf3cd6
@@ -91,7 +92,7 @@ F ext/fts3/unicode/parseunicode.tcl a981bd6466d12dd17967515801c3ff23f74a281be1a0
 F ext/fts5/extract_api_docs.tcl a36e54ec777172ddd3f9a88daf593b00848368e0
 F ext/fts5/fts5.h 05501612cc655504c5dce8ba765ab621d50fc478490089beaa0d75e00b23e520
 F ext/fts5/fts5Int.h 78a63cc0795186cde5384816a9403a68c65774b35d952e05b81a1b4b158e07c8
-F ext/fts5/fts5_aux.c ee770eec0af8646db9e18fc01a0dad7345b5f5e8cbba236704cfae2d777022ad
+F ext/fts5/fts5_aux.c 35c4101613eff86902877a4dedd9400b07922e412cbdd637b45041dce2fd5388
 F ext/fts5/fts5_buffer.c 3001fbabb585d6de52947b44b455235072b741038391f830d6b729225eeaf6a5
 F ext/fts5/fts5_config.c 054359543566cbff1ba65a188330660a5457299513ac71c53b3a07d934c7b081
 F ext/fts5/fts5_expr.c bd3b81ce669c4104e34ffe66570af1999a317b142c15fccb112de9fb0caa57a6
@@ -102,7 +103,7 @@ F ext/fts5/fts5_storage.c 5d10b9bdcce5b90656cad13c7d12ad4148677d4b9e3fca0481fca5
 F ext/fts5/fts5_tcl.c b1445cbe69908c411df8084a10b2485500ac70a9c747cdc8cda175a3da59d8ae
 F ext/fts5/fts5_test_mi.c 08c11ec968148d4cb4119d96d819f8c1f329812c568bac3684f5464be177d3ee
 F ext/fts5/fts5_test_tok.c 3cb0a9b508b30d17ef025ccddd26ae3dc8ddffbe76c057616e59a9aa85d36f3b
-F ext/fts5/fts5_tokenize.c 83cfcede3898001cab84432a36ce1503e3080cf9b1c682b022ec82e267ea4c13
+F ext/fts5/fts5_tokenize.c 5e251efb0f1af99a25ed50010ba6b1ad1250aca5921af1988fdcabe5ebc3cb43
 F ext/fts5/fts5_unicode2.c eca63dbc797f8ff0572e97caf4631389c0ab900d6364861b915bdd4735973f00
 F ext/fts5/fts5_varint.c e64d2113f6e1bfee0032972cffc1207b77af63319746951bf1d09885d1dadf80
 F ext/fts5/fts5_vocab.c aed56169ae5c1aa9b8189c779ffeef04ed516d3c712c06914e6d91a6759f4e4a
@@ -219,9 +220,7 @@ F ext/fts5/test/fts5synonym2.test 8f891fc49cc1e8daed727051e77e1f42849c784a6a54be
 F ext/fts5/test/fts5tok1.test 1f7817499f5971450d8c4a652114b3d833393c8134e32422d0af27884ffe9cef
 F ext/fts5/test/fts5tok2.test dcacb32d4a2a3f0dd3215d4a3987f78ae4be21a2
 F ext/fts5/test/fts5tokenizer.test ac3c9112b263a639fb0508ae73a3ee886bf4866d2153771a8e8a20c721305a43
-F ext/fts5/test/fts5tokenizer2.test cb5428c7cfb3b6a74b7adfcde65506e329112003e8dffa7501d01c2d18d02569
 F ext/fts5/test/fts5trigram.test 6c4e37864f3e7d90673db5563d9736d7e40080ab94d10ebdffa94c1b77941da0
-F ext/fts5/test/fts5trigram2.test 9fe4207f8a4241747aff1005258b564958588d21bfd240d6cd4c2e955d31c156
 F ext/fts5/test/fts5ubsan.test 783d5a8d13ebfa169e634940228db54540780e3ba7a87ad1e4510e61440bf64b
 F ext/fts5/test/fts5umlaut.test a42fe2fe6387c40c49ab27ccbd070e1ae38e07f38d05926482cc0bccac9ad602
 F ext/fts5/test/fts5unicode.test 17056f4efe6b0a5d4f41fdf7a7dc9af2873004562eaa899d40633b93dc95f5a9
@@ -241,50 +240,49 @@ F ext/fts5/tool/showfts5.tcl d54da0e067306663e2d5d523965ca487698e722c
 F ext/icu/README.txt 7ab7ced8ae78e3a645b57e78570ff589d4c672b71370f5aa9e1cd7024f400fc9
 F ext/icu/icu.c c074519b46baa484bb5396c7e01e051034da8884bad1a1cb7f09bbe6be3f0282
 F ext/icu/sqliteicu.h fa373836ed5a1ee7478bdf8a1650689294e41d0c89c1daab26e9ae78a32075a8
-F ext/jni/GNUmakefile 59eb05f2a363bdfac8d15d66bed624bfe1ff289229184f3861b95f98a19cf4b2
-F ext/jni/README.md d899789a9082a07b99bf30b1bbb6204ae57c060efcaa634536fa669323918f42
+F ext/jni/GNUmakefile 5c3ac326bf3853486ebe0d70819abc790cc65c412182ce4ebd5012b008d9b059
+F ext/jni/README.md ef9ac115e97704ea995d743b4a8334e23c659e5534c3b64065a5405256d5f2f4
 F ext/jni/jar-dist.make 030aaa4ae71dd86e4ec5e7c1e6cd86f9dfa47c4592c070d2e35157e42498e1fa
-F ext/jni/src/c/sqlite3-jni.c 6040c0de97644a1fb14bb589ee9f2f4208f6e6b165d14a0e33ed24945b118838
-F ext/jni/src/c/sqlite3-jni.h 913ab8e8fee432ae40f0e387c8231118d17053714703f5ded18202912a8a3fbf
-F ext/jni/src/org/sqlite/jni/annotation/Experimental.java 8603498634e41d0f7c70f661f64e05df64376562ea8f126829fd1e0cdd47e82b
-F ext/jni/src/org/sqlite/jni/annotation/NotNull.java 38e7e58a69b26dc100e458b31dfa3b2a7d67bc36d051325526ef1987d5bc8a24
-F ext/jni/src/org/sqlite/jni/annotation/Nullable.java 56e3dee1f3f703a545dfdeddc1c3d64d1581172b1ad01ffcae95c18547fafd90
+F ext/jni/src/c/sqlite3-jni.c 6f6df9657989e9ca2cfdcc2fe9a71c279de56d5c941adfd09a0f24256de35c8f
+F ext/jni/src/c/sqlite3-jni.h b4c413a0d0c734683da1049cfcf89e35ae2719759d0656ec0f8c57188f18cab8
+F ext/jni/src/org/sqlite/jni/annotation/NotNull.java a99341e88154e70447596b1af6a27c586317df41a7e0f246fd41370cd7b723b2
+F ext/jni/src/org/sqlite/jni/annotation/Nullable.java 0b1879852707f752512d4db9d7edd0d8db2f0c2612316ce1c832715e012ff6ba
 F ext/jni/src/org/sqlite/jni/annotation/package-info.java 977b374aed9d5853cbf3438ba3b0940abfa2ea4574f702a2448ee143b98ac3ca
 F ext/jni/src/org/sqlite/jni/capi/AbstractCollationCallback.java 1afa90d3f236f79cc7fcd2497e111992644f7596fbc8e8bcf7f1908ae00acd6c
-F ext/jni/src/org/sqlite/jni/capi/AggregateFunction.java 0b72cdff61533b564d65b63418129656daa9a9f30e7e7be982bd5ab394b1dbd0
-F ext/jni/src/org/sqlite/jni/capi/AuthorizerCallback.java c045a5b47e02bb5f1af91973814a905f12048c428a3504fbc5266d1c1be3de5a
+F ext/jni/src/org/sqlite/jni/capi/AggregateFunction.java bc29e986c866c2ddbbb9f935f5b7264c1c1026864e50a4a735192864f75e37c0
+F ext/jni/src/org/sqlite/jni/capi/AuthorizerCallback.java 7ed409d5449684616cc924534e22ff6b07d361f12ad904b69ecb10e0568a8013
 F ext/jni/src/org/sqlite/jni/capi/AutoExtensionCallback.java 74cc4998a73d6563542ecb90804a3c4f4e828cb4bd69e61226d1a51f4646e759
 F ext/jni/src/org/sqlite/jni/capi/BusyHandlerCallback.java 7b8e19810c42b0ad21a04b5d8c804b32ee5905d137148703f16a75b612c380ca
-F ext/jni/src/org/sqlite/jni/capi/CApi.java d428a1fd3b827f01c55d10d21ff35e33e7dac9e8a1d92a8b5c7d7255e67407d8
-F ext/jni/src/org/sqlite/jni/capi/CallbackProxy.java 57e2d275dcebe690b1fc1f3d34eb96879b2d7039bce30b563aee547bf45d8a8b
+F ext/jni/src/org/sqlite/jni/capi/CApi.java bccb442ca81cd4decb1adae99006a60b7a9f54e5153842e738c01104e97d1de0
+F ext/jni/src/org/sqlite/jni/capi/CallbackProxy.java 0bfd6e56e8265c2f05c9207665707285534d78f8466ef0e0430c65677f00943d
 F ext/jni/src/org/sqlite/jni/capi/CollationCallback.java e29bcfc540fdd343e2f5cca4d27235113f2886acb13380686756d5cabdfd065a
-F ext/jni/src/org/sqlite/jni/capi/CollationNeededCallback.java 5bfa226a8e7a92e804fd52d6e42b4c7b875fa7a94f8e2c330af8cc244a8920ab
-F ext/jni/src/org/sqlite/jni/capi/CommitHookCallback.java 482f53dfec9e3ac2a9070d3fceebd56250932aaaf7c4f5bc8de29fc011416e0c
+F ext/jni/src/org/sqlite/jni/capi/CollationNeededCallback.java f81cf10b79c52f9b2e9247d523d29ae48863935f60420eae35f257c38c80ce95
+F ext/jni/src/org/sqlite/jni/capi/CommitHookCallback.java 29c002f3c638cc80f7db1594564a262d1beb32637824c3dca2d60a224d1f71d7
 F ext/jni/src/org/sqlite/jni/capi/ConfigLogCallback.java b995ca412f59b631803b93aa5b3684fce62e335d1e123207084c054abfd488d4
-F ext/jni/src/org/sqlite/jni/capi/ConfigSqlLogCallback.java e5723900b6458bc6288f52187090a78ebe0a20f403ac7c887ec9061dfe51aba7
+F ext/jni/src/org/sqlite/jni/capi/ConfigSqllogCallback.java 701f2e4d8bdeb27cfbeeb56315d15b13d8752b0fdbca705f31bd4366c58d8a33
 F ext/jni/src/org/sqlite/jni/capi/NativePointerHolder.java b7036dcb1ef1b39f1f36ac605dde0ff1a24a9a01ade6aa1a605039443e089a61
-F ext/jni/src/org/sqlite/jni/capi/OutputPointer.java 246b0e66c4603f41c567105a21189d138aaf8c58203ecd4928802333da553e7c
-F ext/jni/src/org/sqlite/jni/capi/PrepareMultiCallback.java 97352091abd7556167f4799076396279a51749fdae2b72a6ba61cd39b3df0359
-F ext/jni/src/org/sqlite/jni/capi/PreupdateHookCallback.java efcf57545c5e282d1dd332fa63329b3b218d98f356ef107a9dbe3979be82213a
+F ext/jni/src/org/sqlite/jni/capi/OutputPointer.java 68f60aec7aeb5cd4e5fb83449037f668c63cb99f682ee1036cc226d0cbd909b9
+F ext/jni/src/org/sqlite/jni/capi/PrepareMultiCallback.java aca8f9fa72e3b6602bc9a7dd3ae9f5b2808103fbbee9b2749dc96c19cdc261a1
+F ext/jni/src/org/sqlite/jni/capi/PreupdateHookCallback.java 819d938e26208adde17ca4b7ddde1d8cd6915b6ab7b708249a9787beca6bd6b6
 F ext/jni/src/org/sqlite/jni/capi/ProgressHandlerCallback.java 01bc0c238eed2d5f93c73522cb7849a445cc9098c2ed1e78248fa20ed1cfde5b
 F ext/jni/src/org/sqlite/jni/capi/ResultCode.java 8141171f1bcf9f46eef303b9d3c5dc2537a25ad1628f3638398d8a60cacefa7f
-F ext/jni/src/org/sqlite/jni/capi/RollbackHookCallback.java e172210a2080e851ebb694c70e9f0bf89284237795e38710a7f5f1b61e3f6787
-F ext/jni/src/org/sqlite/jni/capi/SQLFunction.java 0d1e9afc9ff8a2adb94a155b72385155fa3b8011a5cca0bb3c28468c7131c1a5
+F ext/jni/src/org/sqlite/jni/capi/RollbackHookCallback.java 105e324d09c207100485e7667ad172e64322c62426bb49b547e9b0dc9c33f5f0
+F ext/jni/src/org/sqlite/jni/capi/SQLFunction.java fef556adbc3624292423083a648bdf97fa8a4f6b3b6577c9660dd7bd6a6d3c4a
 F ext/jni/src/org/sqlite/jni/capi/SQLTester.java 09bee15aa0eedac68d767ae21d9a6a62a31ade59182a3ccbf036d6463d9e30b1
 F ext/jni/src/org/sqlite/jni/capi/ScalarFunction.java 93b9700fca4c68075ccab12fe0fbbc76c91cafc9f368e835b9bd7cd7732c8615
 F ext/jni/src/org/sqlite/jni/capi/TableColumnMetadata.java addf120e0e76e5be1ff2260daa7ce305ff9b5fafd64153a7a28e9d8f000a815f
-F ext/jni/src/org/sqlite/jni/capi/Tester1.java e5fa17301b7266c1cbe4bcce67788e08e45871c7c72c153d515abb37e501de0a
+F ext/jni/src/org/sqlite/jni/capi/Tester1.java ca195521b6bda3e0cd00e76bb71ec8060d1fab76a2f13b1af9feea40789f44bb
 F ext/jni/src/org/sqlite/jni/capi/TraceV2Callback.java 0a25e117a0daae3394a77f24713e36d7b44c67d6e6d30e9e1d56a63442eef723
-F ext/jni/src/org/sqlite/jni/capi/UpdateHookCallback.java c8bdf7848e6599115d601bcc9427ff902cb33129b9be32870ac6808e04b6ae56
-F ext/jni/src/org/sqlite/jni/capi/ValueHolder.java 2ce069f3e007fdbbe1f4e507a5a407fc9679da31a0aa40985e6317ed4d5ec7b5
+F ext/jni/src/org/sqlite/jni/capi/UpdateHookCallback.java 2766b8526bbffc4f1045f70e79f1bc1b1efe1c3e95ca06cdb8a7391032dda3b4
+F ext/jni/src/org/sqlite/jni/capi/ValueHolder.java 9f9e151f1da017b706c0ee5f40f4c86b54e773d6ae4339723e0cc85a456251ab
 F ext/jni/src/org/sqlite/jni/capi/WindowFunction.java caf4396f91b2567904cf94bc538a069fd62260d975bd037d15a02a890ed1ef9e
 F ext/jni/src/org/sqlite/jni/capi/XDestroyCallback.java f3abb8dd7381f53ebba909437090caf68200f06717b8a7d6aa96fa3e8133117d
 F ext/jni/src/org/sqlite/jni/capi/package-info.java 08ff986a65d2be9162442c82d28a65ce431d826f188520717c2ecb1484d0a50e
-F ext/jni/src/org/sqlite/jni/capi/sqlite3.java c6a5c555d163d76663534f2b2cce7cab15325b9852d0f58c6688a85e73ae52f0
+F ext/jni/src/org/sqlite/jni/capi/sqlite3.java 4010bbebc5bf44e2044e610786088cdee7dc155da2b333c0551492ff1cedf33b
 F ext/jni/src/org/sqlite/jni/capi/sqlite3_backup.java 6742b431cd4d77e8000c1f92ec66265a58414c86bf3b0b5fbcb1164e08477227
-F ext/jni/src/org/sqlite/jni/capi/sqlite3_blob.java 59e26ca5254cd4771f467237bcfe2d8deed30a77152fabcd4574fd406c301d63
+F ext/jni/src/org/sqlite/jni/capi/sqlite3_blob.java f204ab6ab1263e119fe43730141a00662d80972129a5351dfb11aae5d282df36
 F ext/jni/src/org/sqlite/jni/capi/sqlite3_context.java f0ef982009c335c4393ffcb68051809ca1711e4f47bcb8d1d46952f22c01bc22
-F ext/jni/src/org/sqlite/jni/capi/sqlite3_stmt.java 293b5fa7d5b5724c87de544654aca1103d76f3092bc2c8f4360102a65ba25dff
+F ext/jni/src/org/sqlite/jni/capi/sqlite3_stmt.java ff579621e9bd5ffbc6b2ef9f996c12db4df6e0c8cc5697c91273e5fca279fcf8
 F ext/jni/src/org/sqlite/jni/capi/sqlite3_value.java e1d62a257c13504b46d39d5c21c49cf157ad73fda00cc5f34c931aa008c37049
 F ext/jni/src/org/sqlite/jni/fts5/Fts5.java e94681023785f1eff5399f0ddc82f46b035977d350f14838db659236ebdf6b41
 F ext/jni/src/org/sqlite/jni/fts5/Fts5Context.java 338637e6e5a2cc385d962b220f3c1f475cc371d12ae43d18ef27327b6e6225f7
@@ -297,14 +295,13 @@ F ext/jni/src/org/sqlite/jni/fts5/fts5_api.java a8e88c3783d21cec51b0748568a96653
 F ext/jni/src/org/sqlite/jni/fts5/fts5_extension_function.java 9e2b954d210d572552b28aca523b272fae14bd41e318921b22f65b728d5bf978
 F ext/jni/src/org/sqlite/jni/fts5/fts5_tokenizer.java 92bdaa3893bd684533004d64ade23d329843f809cd0d0f4f1a2856da6e6b4d90
 F ext/jni/src/org/sqlite/jni/test-script-interpreter.md f9f25126127045d051e918fe59004a1485311c50a13edbf18c79a6ff9160030e
-F ext/jni/src/org/sqlite/jni/wrapper1/AggregateFunction.java d5c108b02afd3c63c9e5e53f71f85273c1bfdc461ae526e0a0bb2b25e4df6483
+F ext/jni/src/org/sqlite/jni/wrapper1/AggregateFunction.java 5ad99bd74c85f56bbef324d9ec29b4048f4620547c9a80093d8586c3557f9f9a
 F ext/jni/src/org/sqlite/jni/wrapper1/ScalarFunction.java 43c43adfb7866098aadaaca1620028a6ec82d5193149970019b1cce9eb59fb03
-F ext/jni/src/org/sqlite/jni/wrapper1/SqlFunction.java 27b141f5914c7cb0e40e90a301d5e05b77f3bd42236834a68031b7086381fafd
-F ext/jni/src/org/sqlite/jni/wrapper1/Sqlite.java ada39f18e4e3e9d4868dadbc3f7bfe1c6c7fde74fb1fb2954c3f0f70120b805c
-F ext/jni/src/org/sqlite/jni/wrapper1/SqliteException.java 982538ddb4c0719ef87dfa664cd137b09890b546029a7477810bd64d4c47ee35
-F ext/jni/src/org/sqlite/jni/wrapper1/Tester2.java ce45f2ec85facbb73690096547ed166e7be82299e3d92eaa206f82b60a6ec969
-F ext/jni/src/org/sqlite/jni/wrapper1/ValueHolder.java a84e90c43724a69c2ecebd601bc8e5139f869b7d08cb705c77ef757dacdd0593
-F ext/jni/src/org/sqlite/jni/wrapper1/WindowFunction.java c7d1452f9ff26175b3c19bbf273116cc2846610af68e01756d755f037fe7319f
+F ext/jni/src/org/sqlite/jni/wrapper1/SqlFunction.java 004394eeb944baa56e36cd7ae69ba6d4a52b52db3c49439db16e98270b861421
+F ext/jni/src/org/sqlite/jni/wrapper1/Sqlite.java a9ddc6a9e8c113168cc67592ae24c0e56d30dd06226eeab012f2761a0889d7bb
+F ext/jni/src/org/sqlite/jni/wrapper1/SqliteException.java 1386f7b753134fc12253ce2fbbc448ba8c970567fac01a3356cb672e14408d73
+F ext/jni/src/org/sqlite/jni/wrapper1/Tester2.java c24b510ebe801c30533cc62efdf69a4a5e2da9ec4b49f8d403f2060693f060a0
+F ext/jni/src/org/sqlite/jni/wrapper1/ValueHolder.java 7b89a7391f771692c5b83b0a5b86266abe8d59f1c77d7a0eccc9b79f259d79af
 F ext/jni/src/tests/000-000-sanity.test c3427a0e0ac84d7cbe4c95fdc1cd4b61f9ddcf43443408f3000139478c4dc745
 F ext/jni/src/tests/000-001-ignored.test e17e874c6ab3c437f1293d88093cf06286083b65bf162317f91bbfd92f961b70
 F ext/jni/src/tests/900-001-fts.test bf0ce17a8d082773450e91f2388f5bbb2dfa316d0b676c313c637a91198090f0
@@ -360,6 +357,7 @@ F ext/misc/appendvfs.c 9642c7a194a2a25dca7ad3e36af24a0a46d7702168c4ad7e59c9f9b0e
 F ext/misc/base64.c a71b131e50300c654a66c469a25b62874481f3d1cb3beb56aca9a68edd812e0d
 F ext/misc/base85.c 073054111988db593ef5fdb87ab8c459df1ea0c3aaaddf0f5bfa3d72b7e6280a
 F ext/misc/basexx.c 89ad6b76558efbceb627afd5e2ef1d84b2e96d9aaf9b7ecb20e3d00b51be6fcf
+F ext/misc/bgckpt.c 49ae19aa03e6da393db5d17da256374d4c4d36889fdd89d6e4bc93aca2b752e6
 F ext/misc/blobio.c a867c4c4617f6ec223a307ebfe0eabb45e0992f74dd47722b96f3e631c0edb2a
 F ext/misc/btreeinfo.c cb952620eedf5c0b7625b678f0f08e54d2ec0011d4e50efda5ebdc97f3df7d04
 F ext/misc/carray.c 34fac63770971611c5285de0a9f0ac67d504eaf66be891f637add9290f1c76a5
@@ -567,7 +565,7 @@ F ext/session/test_session.c 7b94ad945cd4afe6c73ee935aeb3d44b4446186e1729362af61
 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_FUNCTIONS.fiddle 7fb73f7150ab79d83bb45a67d257553c905c78cd3d693101699243f36c5ae6c3
 F ext/wasm/GNUmakefile 0e362f3fc04eab6628cbe4f1e35f4ab4a200881f6b5f753b27fb45eabeddd9d2
 F ext/wasm/README-dist.txt 6382cb9548076fca472fb3330bbdba3a55c1ea0b180ff9253f084f07ff383576
 F ext/wasm/README.md a8a2962c3aebdf8d2104a9102e336c5554e78fc6072746e5daf9c61514e7d193
@@ -576,7 +574,7 @@ F ext/wasm/SQLTester/SQLTester.mjs ec2f6ba63a0f2f0562941a0fb8e46b7dc55589711513f
 F ext/wasm/SQLTester/SQLTester.run.mjs c72b7fe2072d05992f7a3d8c6a1d34e95712513ceabe40849784e24e41c84638
 F ext/wasm/SQLTester/index.html 3f8a016df0776be76605abf20e815ecaafbe055abac0e1fe5ea080e7846b760d
 F ext/wasm/SQLTester/touint8array.c 2d5ece04ec1393a6a60c4bf96385bda5e1a10ad49f3038b96460fc5e5aa7e536
-F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api f442460ed9a109e637dd3ea1caa4489553ad9414e8988118b208bb7a4bbece6b
+F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api c5eaceabb9e759aaae7d3101a4a3e542f96ab2c99d89a80ce20ec18c23115f33
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-see fb29e62082a658f0d81102488414d422c393c4b20cc2f685b216bc566237957b
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
 F ext/wasm/api/README.md 5eb44fa02e9c693a1884a3692428647894b0380b24bca120866b7a24c8786134
@@ -586,17 +584,17 @@ F ext/wasm/api/post-js-footer.js cd0a8ec768501d9bd45d325ab0442037fb0e33d1f3b4f08
 F ext/wasm/api/post-js-header.js 47b6b281f39ad59fa6e8b658308cd98ea292c286a68407b35ff3ed9cfd281a62
 F ext/wasm/api/pre-js.c-pp.js ad906703f7429590f2fbf5e6498513bf727a1a4f0ebfa057afb08161d7511219
 F ext/wasm/api/sqlite3-api-cleanup.js d235ad237df6954145404305040991c72ef8b1881715d2a650dda7b3c2576d0e
-F ext/wasm/api/sqlite3-api-glue.js 119b91c8a7ce6648679eb66fcdd1ed07ef7fd892eb501d658fbfefcc962012d9
+F ext/wasm/api/sqlite3-api-glue.js 26aedfb27915f4f316f6eac84078443e4f0d2dfe5f012310014923ed4b77b2b6
 F ext/wasm/api/sqlite3-api-oo1.js 9678dc4d9a5d39632b6ffe6ea94a023119260815bf32f265bf5f6c36c9516db8
 F ext/wasm/api/sqlite3-api-prologue.js 9aeba7b45cf41b3a26d34d7fb2525633cd1adfc544888c1ea8dbb077496f4ce9
-F ext/wasm/api/sqlite3-api-worker1.js 88770ac01fc756f89a3e060eec17111d6c1688e89ebfd34cb9d9e54d25affbb9
+F ext/wasm/api/sqlite3-api-worker1.js f941382f21006b4a817754184e2661b0a63ce650201f3419cd60f4758b6fd60e
 F ext/wasm/api/sqlite3-license-version-header.js 0c807a421f0187e778dc1078f10d2994b915123c1223fe752b60afdcd1263f89
 F ext/wasm/api/sqlite3-opfs-async-proxy.js 8cf8a897726f14071fae6be6648125162b256dfb4f96555b865dbb7a6b65e379
 F ext/wasm/api/sqlite3-v-helper.js 7daa0eab0a513a25b05e9abae7b5beaaa39209b3ed12f86aeae9ef8d2719ed25
 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 f10c3ecd9df06f6320073c2ce230a7ed7c56034d8b88c1e57095f2a97faf423a
 F ext/wasm/api/sqlite3-worker1.c-pp.js a541112aa51e16705f13a99bb943c64efe178aa28c86704a955f8fd9afe4ba37
 F ext/wasm/batch-runner.html 4deeed44fe41496dc6898d9fb17938ea3291f40f4bfb977e29d0cef96fbbe4c8
 F ext/wasm/batch-runner.js 0dad6a02ad796f1003d3b7048947d275c4d6277f63767b8e685c27df8fdac93e
@@ -619,8 +617,8 @@ F ext/wasm/example_extra_init.c 2347cd69d19d839ef4e5e77b7855103a7fe3ef2af86f2e8c
 F ext/wasm/fiddle.make fa2ba6e90457ba2a71cb745f200d409caf773076df75ae5b177cc225d7627a11
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js e0153f9af6500805c6f09c0b3cfdb7d857e9d6863dbee9d50d1628fccf5f4b4d
+F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
 F ext/wasm/fiddle/fiddle.js 974b995119ac443685d7d94d3b3c58c6a36540e9eb3fed7069d5653284071715
-F ext/wasm/fiddle/index.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
 F ext/wasm/index-dist.html 22379774f0ad4edcaaa8cf9c674c82e794cc557719a8addabed74eb8069d412e
 F ext/wasm/index.html 4e7847b909f4ae0da8c829b150b79454050e53b3658431f138636257729cd42b
 F ext/wasm/jaccwabyt/jaccwabyt.js 1264710db3cfbcb6887d95665b7aeba60c1126eaef789ca4cf1a4a17d5bc7f54
@@ -637,10 +635,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 1618670e466f424aa289859fe0ec8ded223e42e9e69b5c851f809baaaca1a00c
+F ext/wasm/test-opfs-vfs.js f09266873e1a34d9bdb6d3981ec8c9e382f31f215c9fd2f9016d2394b8ae9b7b
 F ext/wasm/tester1-worker.html ebc4b820a128963afce328ecf63ab200bd923309eb939f4110510ab449e9814c
 F ext/wasm/tester1.c-pp.html 1c1bc78b858af2019e663b1a31e76657b73dc24bede28ca92fbe917c3a972af2
-F ext/wasm/tester1.c-pp.js a92dc256738dbd1b50f142d1fd0c835294ba09b7bb6526650360e942f88cb63f
+F ext/wasm/tester1.c-pp.js fb20d9e1c308ea34a29d8afdda1a6c5edc406241b5560fa23c19c14747ee41bc
 F ext/wasm/tests/opfs/concurrency/index.html 0802373d57034d51835ff6041cda438c7a982deea6079efd98098d3e42fbcbc1
 F ext/wasm/tests/opfs/concurrency/test.js a98016113eaf71e81ddbf71655aa29b0fed9a8b79a3cdd3620d1658eb1cc9a5d
 F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2
@@ -648,7 +646,7 @@ F ext/wasm/wasmfs.make 8a4955882aaa0783b3f60a9484a1f0f3d8b6f775c0fcd17c082f31966
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
-F main.mk 51fd5fc8565007266e6bfd9e299199c752b171707a667b8914a204b38258e1b1
+F main.mk 45dfa7a1a9745188f08d9a5bcf15680fe14382d24add829e34b281cd761d7eb7
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@ -667,18 +665,18 @@ F src/auth.c 19b7ccacae3dfba23fc6f1d0af68134fa216e9040e53b0681b4715445ea030b4
 F src/backup.c 5c97e8023aab1ce14a42387eb3ae00ba5a0644569e3476f38661fa6f824c3523
 F src/bitvec.c 9eac5f42c11914d5ef00a75605bb205e934f435c579687f985f1f8b0995c8645
 F src/btmutex.c 79a43670447eacc651519a429f6ece9fd638563cf95b469d6891185ddae2b522
-F src/btree.c f3b09c5414de3a11db73e11e1d66f4c5e53c9e89876ff3b531a887ab656ca303 x
+F src/btree.c edb79e04dbb4df37a67bcebdde0de4495dfba3c9948a93f6d10f74fd61ab2391 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
-F src/ctime.c 23331529e654be40ca97d171cbbffe9b3d4c71cc53b78fe5501230675952da8b
-F src/date.c 3b8d02977d160e128469de38493b4085f7c5cf4073193459909a6af3cf6d7c91
+F src/ctime.c 047a0613c4c3ff65e05903d5b6931185b3df8f34b5178ad2f8d865ada4e9da44
+F src/date.c eebc54a00e888d3c56147779e9f361b77d62fd69ff2008c5373946aa1ba1d574
 F src/dbpage.c 80e46e1df623ec40486da7a5086cb723b0275a6e2a7b01d9f9b5da0f04ba2782
 F src/dbstat.c 3b677254d512fcafd4d0b341bf267b38b235ccfddbef24f9154e19360fa22e43
 F src/delete.c cb766727c78e715f9fb7ec8a7d03658ed2a3016343ca687acfcec9083cdca500
-F src/expr.c e9a491c7f156e5b25641c28af11b735a424e108a21b9f83b6f3e51c99a8141d9
+F src/expr.c cacf230b124891ea830d80395ea2119c2d7ee52c134a010f3950de9391ab79d1
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c a47610f0a5c6cb0ad79f8fcef039c01833dec0c751bb695f28dc0ec6a4c3ba00
 F src/func.c 472f6dcfa39cf54f89a6aec76c79c225fb880a6c14469c15d361331662b9bf43
@@ -688,7 +686,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 dd5c3f52877448cc9644887e83a2ff33ab0be87e158de7d5a86db12f90b28045
+F src/json.c b2045aafc52f0475dc5d723d11cc0aaa9e1d233a28031b08c8174a3e407ed50c
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
 F src/main.c 1b89f3de98d1b59fec5bac1d66d6ece21f703821b8eaa0d53d9604c35309f6f9
@@ -712,28 +710,28 @@ 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 dc5404b56da7fb13cf272ddb94c3753cf9e82d32a65cba35dbb6aadcb849419c
+F src/os_unix.c cb116fde9e3ca3c1bbfdf89d6928f776a2a34da168e2667426523a4db353b271
 F src/os_win.c 4a50a154aeebc66a1f8fb79c1ff6dd5fe3d005556533361e0d460d41cb6a45a8
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
-F src/pager.c 987ab3a2cd9065d62e9955474470ff733445e2357432a67e3d0f5a8f9313e334
-F src/pager.h f4d33fec8052603758792045493423b8871a996da2d0973927b7d36cd6070473
+F src/pager.c 3f41b76db0cf601f05ab4df508a9f19b90ad50fc5031a5f41fb8f23b16ed9429
+F src/pager.h 1da654b51a4a002e6d8bf68fbdb454e1f31ebe43cc4d399a4dfb8da4ad2fe182
 F src/parse.y 020d80386eb216ec9520549106353c517d2bbc89be28752ffdca649a9eaf56ec
 F src/pcache.c 040b165f30622a21b7a9a77c6f2e4877a32fb7f22d4c7f0d2a6fa6833a156a75
 F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5
 F src/pcache1.c 602acb23c471bb8d557a6f0083cc2be641d6cafcafa19e481eba7ef4c9ca0f00
-F src/pragma.c b3b4ad9c0298d63098a067acca613c21a5f56b4d176d5842922bcd0b07b7164e
+F src/pragma.c 087234c661e4f09e0cc53ae29ed59ed2e555d49c0dd12d913665a6bcf5ab9e1b
 F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
-F src/prepare.c 371f6115cb69286ebc12c6f2d7511279c2e47d9f54f475d46a554d687a3b312c
+F src/prepare.c bde74add20fc0e8ce0c4e937a1f70a36d17413afe4f71d3e103f5cb74b17c8d9
 F src/printf.c 9da63b9ae1c14789bcae12840f5d800fd9302500cd2d62733fac77f0041b4750
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
-F src/resolve.c d017bad7ba8e778617701a0e986fdeb393d67d6afa84fb28ef4e8b8ad2acf916
+F src/resolve.c 31229276a8eb5b5de1428cd2d80f6f1cf8ffc5248be25e47cf575df12f1b8f23
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c 85857bedd2913d888aa571755b48c54cd2e6e7fcb0087e19b226ee0368cfda1e
-F src/shell.c.in a492f9209fe62ce3d1048802d59cd6e38e8444f88573fe1aebaadcd22e04156b
-F src/sqlite.h.in d93a4821d2f792467a60f7dc81268d1bb8634f40c31694ef254cab4f9921f96a
+F src/shell.c.in cbe850737d4166347bfe5fc7d695229379347509bf114cf6abeb1e384f2d7a70
+F src/sqlite.h.in 4f841d3d117b830ee5ee45e8d89ceff1195f3ebb72d041ace8d116ba4c103b35
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
-F src/sqliteInt.h 6b82eb99a9d2887e873fb29e56befb7c50cf4624df615d23a28f071dc8abf5f6
+F src/sqliteInt.h 08efc0ad9ddbbc5ea859111521dff2c4cecc589c0c9a3e4840c927663b31445b
 F src/sqliteLimit.h 33b1c9baba578d34efe7dfdb43193b366111cdf41476b1e82699e14c11ee1fb6
 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -758,7 +756,7 @@ F src/test_demovfs.c 38a459d1c78fd9afa770445b224c485e079018d6ac07332ff9bd07b54d2
 F src/test_devsym.c 649434ed34d0b03fbd5a6b42df80f0f9a7e53f94dd1710aad5dd8831e91c4e86
 F src/test_fs.c 56cc17e4fdc57efa61695026e2ba96e910b17060d7ee01d775ec048791522e2f
 F src/test_func.c 24df3a346c012b1fc9e1001d346db6054deb426db0a7437e92490630e71c9b0a
-F src/test_hexio.c 9478e56a0f08e07841a014a93b20e4ba2709ab56d039d1ca8020e26846aa19bd
+F src/test_hexio.c a605a100e628d39330044ae5f34cb19d50843061ed3178c3f83b37aef65f7e0a
 F src/test_init.c f2cc4774b7c9140f76e45ecbb2ae219f68e3acbbe248c0179db666a70eae9f08
 F src/test_intarray.c 26ffba666beb658d73cd925d9b4fb56913a3ca9aaeac122b3691436abb192b92
 F src/test_intarray.h 6c3534641108cd1bea517a8e117dcba237081310a29a4c35bd2190caa8972293
@@ -779,7 +777,7 @@ F src/test_schema.c cbfd7a9a9b6b40d4377d0c76a6c5b2a58387385977f26edab4e77eb5f90a
 F src/test_sqllog.c 540feaea7280cd5f926168aee9deb1065ae136d0bbbe7361e2ef3541783e187a
 F src/test_superlock.c 4839644b9201da822f181c5bc406c0b2385f672e
 F src/test_syscall.c 9fdb13b1df05e639808d44fcb8f6064aaded32b6565c00b215cfd05a060d1aca
-F src/test_tclsh.c 3ff5d188a72f00807425954ea3b493dfd3a4b890ecc6700ea83bad2fd1332ecf
+F src/test_tclsh.c 01c76e2ee362cda246710c476351b105371cf4620857c8492121858744998dc9
 F src/test_tclvar.c 3273f9d59395b336e381b53cfc68ec6ebdaada4e93106a2e976ffb0550504e1c
 F src/test_thread.c 7ddcf0c8b79fa3c1d172f82f322302c963d923cdb503c6171f3c8081586d0b01
 F src/test_vdbecov.c f60c6f135ec42c0de013a1d5136777aa328a776d33277f92abac648930453d43
@@ -791,18 +789,18 @@ F src/test_window.c cdae419fdcea5bad6dcd9368c685abdad6deb59e9fc8b84b153de513d394
 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
 F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
 F src/tokenize.c 23d9f4539880b40226254ad9072f4ecf12eb1902e62aea47aac29928afafcfd5
-F src/treeview.c c6fc972683fd00f975d8b32a81c1f25d2fb7d4035366bf45c9f5622d3ccd70ee
+F src/treeview.c 62fafcd31eea60b718f8daf448116b7b19f90134ebc6c20777ddbb07f56a3d28
 F src/trigger.c 0905b96b04bb6658509f711a8207287f1315cdbc3df1a1b13ba6483c8e341c81
 F src/update.c 6904814dd62a7a93bbb86d9f1419c7f134a9119582645854ab02b36b676d9f92
 F src/upsert.c fa125a8d3410ce9a97b02cb50f7ae68a2476c405c76aa692d3acf6b8586e9242
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 F src/util.c b22cc9f203a8c0b9ee5338a67f8860347d14845864c10248bebe84518a781677
 F src/vacuum.c 604fcdaebe76f3497c855afcbf91b8fa5046b32de3045bab89cc008d68e40104
-F src/vdbe.c a5bf636ef502cfac538418fbf537a5e0cf825c7ce9ff784cddee2eb813dfe7a7
+F src/vdbe.c 7bd1c8301f01b1febaaeec52d5df62fcaf83f5e90ba9326f8b18470b4d52836a
 F src/vdbe.h 41485521f68e9437fdb7ec4a90f9d86ab294e9bb8281e33b235915e29122cfc0
 F src/vdbeInt.h 949669dfd8a41550d27dcb905b494f2ccde9a2e6c1b0b04daa1227e2e74c2b2c
-F src/vdbeapi.c 8f57d60c89da0b60e6d4e272358c511f6bae4e24330bdb11f8b42f986d1bf21b
-F src/vdbeaux.c b34dfbc09403ccb676608da16ff0780d23d466470563d24fdf6350b8d2271d5e
+F src/vdbeapi.c dd812ddd2f7806519e9d492c820456f86628bb6014b559034506e7f9d7f683c5
+F src/vdbeaux.c b51bdb7b2c6d17af604fb187bb22775e38cbca9e4e3f485a06a5fb7a6f9c21ca
 F src/vdbeblob.c 13f9287b55b6356b4b1845410382d6bede203ceb29ef69388a4a3d007ffacbe5
 F src/vdbemem.c 0012d5f01cc866833847c2f3ae4c318ac53a1cb3d28acad9c35e688039464cf0
 F src/vdbesort.c 237840ca1947511fa59bd4e18b9eeae93f2af2468c34d2427b059f896230a547
@@ -810,10 +808,10 @@ F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf8
 F src/vdbevtab.c 2143db7db0ceed69b21422581f434baffc507a08d831565193a7a02882a1b6a7
 F src/vtab.c 154725ebecd3bc02f7fbd7ad3974334f73fff76e02a964e828e48a7c5fb7efff
 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
-F src/wal.c 69aa3ce60b2862a24cd86bb528e653e2137388ead258ef64db49ec9038807f5f
-F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452
+F src/wal.c ffbca820a2ee9827269488cf8e1356ae66ad1e65da636da4eb4f3fcdf9d6ddd5
+F src/wal.h 97b8a9903387401377b59507e86b93a148ef1ad4e5ce0f23659a12dcdce56af2
 F src/walker.c 7c7ea0115345851c3da4e04e2e239a29983b61fb5b038b94eede6aba462640e2
-F src/where.c 1fdc69ce1333e9bd6d7d3df9fa5af1373a3f5bfdd52108d1dbc0ca85a55f777e
+F src/where.c 45b2239e127beaaae2367e503ca4c82868d8fef707c7f7f4a6c0528e7d5f65ff
 F src/whereInt.h 4b38c5889514e3aead3f27d0ee9a26e47c3f150efc59e2a8b4e3bc8835e4d7a1
 F src/wherecode.c 5d77db30a2a3dd532492ae882de114edba2fae672622056b1c7fd61f5917a8f1
 F src/whereexpr.c dc5096eca5ed503999be3bdee8a90c51361289a678d396a220912e9cb73b3c00
@@ -823,7 +821,7 @@ F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867d
 F test/affinity3.test f094773025eddf31135c7ad4cde722b7696f8eb07b97511f98585addf2a510a9
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/aggfault.test 777f269d0da5b0c2524c7ff6d99ae9a93db4f1b1839a914dd2a12e3035c29829
-F test/aggnested.test ce85a6af7d59c3109e35c5f03b2cd11da1a9b1417371e2f942102d0f0d77fd62
+F test/aggnested.test 2e738bfe2980df301a782f6e7bbf9459266f64f7e72f58f3b5c843bf897c568c
 F test/aggorderby.test e6b98dbbf3ababa96892435d387de2dcf602ef02c2b848d2d817473066f154ba
 F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
 F test/all.test 2ecb8bbd52416642e41c9081182a8df05d42c75637afd4488aace78cc4b69e13
@@ -985,7 +983,7 @@ F test/corrupt6.test fc6a891716139665dae0073b6945e3670bf92568
 F test/corrupt7.test ffa86896fe63a3d00b0a131e1e64f402e4da9f7e5d89609d6501c851e511d73a
 F test/corrupt8.test 2399dfe40d2c0c63af86706e30f3e6302a8d0516
 F test/corrupt9.test 730a3db08d4ab9aa43392ea30d9c2b4879cbff85
-F test/corruptA.test 112f4b2ae0b95ebf3ea63718642fb969a93acea557ace3a307234d19c245989b
+F test/corruptA.test 56e8f321adaf3411960e9d2c7136669d8e1a91cbde6cf401ea84e6d6c7ccbe10
 F test/corruptB.test 73a8d6c0b9833697ecf16b63e3c5c05c945b5dec
 F test/corruptC.test 9cf32275dae3ca33f645afe5d1d3f5ba5ac2af2b0833dfb5282f9dccb6fb81bb
 F test/corruptD.test a828c788535946a372a56a750b242cd96287cd823657abe5a73c5e51b91bdd28
@@ -1020,7 +1018,7 @@ F test/ctime.test 340f362f41f92972bbd71f44e10569a5cc694062b692231bd08aa6fe6c1c47
 F test/cursorhint.test 05cf0febe5c5f8a31f199401fd1c9322249e753950d55f26f9d5aca61408a270
 F test/cursorhint2.test 6f3aa9cb19e7418967a10ec6905209bcbb5968054da855fc36c8beee9ae9c42f
 F test/dataversion1.test 6e5e86ac681f0782e766ebcb56c019ae001522d114e0e111e5ebf68ccf2a7bb8
-F test/date.test ff2341a1ef71b9a27979494d299222f9a293aa22cb9ff6e9c38d88a895317ebf
+F test/date.test c0d17cdfd89395bc78087b131e3538d96f864b5029c335318011accc7c0d0934
 F test/date2.test 7e12ec14aaf4d5e6294b4ba140445b0eca06ea50062a9c3a69c4ee13d0b6f8b1
 F test/date3.test a1b77abf05c6772fe5ca2337cac1398892f2a41e62bce7e6be0f4a08a0e64ae5
 F test/date4.test 8aeb3de5b5e9fda968baa9357e4c0fae573724b7904943410195a19e96e31b6a
@@ -1322,17 +1320,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 8f5d1a3350c36945c8b58f538e1c92cfd87fd50ab6f5e3d5f4cf3cdb03b9546d
-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
@@ -1464,7 +1460,7 @@ F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
 F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
 F test/pendingrace.test 6aa33756b950c4529f79c4f3817a9a1e4025bd0d9961571a05c0279bd183d9c6
 F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
-F test/permutations.test f7caf8dd5c7b1da74842a48df116f7f193399c656d4ffc805cd0d9658568c675
+F test/permutations.test 58188152f3e0e319cd916f5f6e1afb34c8d3a5219fe49fe62c0c706514e54970
 F test/pg_common.tcl 3b27542224db1e713ae387459b5d117c836a5f6e328846922993b6d2b7640d9f
 F test/pragma.test 57a36226218c03cfb381019fe43234b2cefbd8a1f12825514f906a17ccf7991e
 F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
@@ -1488,11 +1484,12 @@ F test/quote.test ffb40f0eb7a25c1d8cfe11ee2fe67f8e85fbf3fed348810834114be1fdada1
 F test/randexpr1.tcl 40dec52119ed3a2b8b2a773bce24b63a3a746459
 F test/randexpr1.test eda062a97e60f9c38ae8d806b03b0ddf23d796df
 F test/rbu.test 168573d353cd0fd10196b87b0caa322c144ef736
-F test/rdonly.test 64e2696c322e3538df0b1ed624e21f9a23ed9ff8
+F test/rdonly.test 21e99ee237265d0cf95a0c84b50c784e834acaa4ef05d92a27b262626a656682
 F test/recover.test fd5199f928757cb308661b5fdca1abc19398a798ff7f24b57c3071e9f8e0471e
 F test/regexp1.test 8f2a8bc1569666e29a4cee6c1a666cd224eb6d50e2470d1dc1df995170f3e0f1
 F test/regexp2.test 55ed41da802b0e284ac7e2fe944be3948f93ff25abbca0361a609acfed1368b5
 F test/reindex.test cd9d6021729910ece82267b4f5e1b5ac2911a7566c43b43c176a6a4732e2118d
+F test/releasetest_data.tcl 80ef3941bf7ad136f4dc3d8960786f10a4f488797238171bdd757cc6eb4c3efa
 F test/resetdb.test 54c06f18bc832ac6d6319e5ab23d5c8dd49fdbeec7c696d791682a8006bd5fc3
 F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb
 F test/returning1.test db532cde29d6aebbc48c6ddc3149b30476f8e69ca7a2c4b53986c7635e6fd8ec
@@ -1518,11 +1515,11 @@ 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 6e9804a17767f08432c7a5e738b9a8f4b891d243110b63d3a41d270d3d1378ec
+F test/savepoint.test 63a120ec4fbbd5025b238c259d12ed0516fbf4bca6384041cb995ade9a5f00d2
 F test/savepoint2.test 9b8543940572a2f01a18298c3135ad0c9f4f67d7
 F test/savepoint4.test c8f8159ade6d2acd9128be61e1230f1c1edc6cc0
 F test/savepoint5.test 0735db177e0ebbaedc39812c8d065075d563c4fd
-F test/savepoint6.test f41279c5e137139fa5c21485773332c7adb98cd7
+F test/savepoint6.test 48a645a7bb3a59a6fcf06a7364cfe5b655c336760de39068f7c241b0fc80d963
 F test/savepoint7.test cde525ea3075283eb950cdcdefe23ead4f700daa
 F test/savepointfault.test f044eac64b59f09746c7020ee261734de82bf9b2
 F test/scanstatus.test b249328caf4d317e71058006872b8012598a5fa045b30bf24a81eeff650ab49e
@@ -1592,7 +1589,7 @@ F test/snapshot2.test 8d6ff5dd9cc503f6e12d408a30409c3f9c653507b24408d9cd7195931c
 F test/snapshot3.test 8744313270c55f6e18574283553d3c5c5fe4c5970585663613a0e75c151e599b
 F test/snapshot4.test d4e9347ef2fcabc491fc893506c7bbaf334da3be111d6eb4f3a97cc623b78322
 F test/snapshot_fault.test 129234ceb9b26a0e1000e8563a16e790f5c1412354e70749cbd78c3d5d07d60a
-F test/snapshot_up.test 77dc7853bfb2b4fa249f76e1714cfa1e596826165d9ef22c06ac3a0b7b778d9a
+F test/snapshot_up.test a0a29c4cf33475fcef07c3f8e64af795e24ab91b4cc68295863402a393cdd41c
 F test/soak.test 18944cf21b94a7fe0df02016a6ee1e9632bc4e8d095a0cb49d95e15d5cca2d5c
 F test/softheap1.test 843cd84db9891b2d01b9ab64cef3e9020f98d087
 F test/sort.test f86751134159abb5e5fd4381a0d7038c91013638cd1e3fa1d7850901f6df6196
@@ -1654,9 +1651,9 @@ F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
 F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d1631311a16
 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
-F test/tester.tcl 68454ef88508c196d19e8694daa27bff7107a91857799eaa12f417188ae53ede
-F test/testrunner.tcl 8a6721213bce1cfd3b33e1588cc6431143d96b98819206bf91f5a205fbb150d4
-F test/testrunner_data.tcl e4d5017290a6d5c11785e36cc94c67d8bb950c8cdc2dbe4c1db2a3a583812560
+F test/tester.tcl e6b9adcf4e56aa5c658501c10650646fee467b85d51a4ac80263d2cdae3993ba
+F test/testrunner.tcl 14c8b8ece841b1dd17516a0dc9c7ad9b5f4d4db7987974d3fdf66ae56b2a71fa
+F test/testrunner_data.tcl 7f73f93634d32dafc857ed491b840f371113d09fde6a8bfb9e47b938d47b8c85
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
 F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@ -1821,7 +1818,7 @@ F test/tokenize.test ce430a7aed48fc98301611429595883fdfcab5d7
 F test/tpch01.test 4479008f85f6f8f25f7ab2cb305d665752b4727fa28a8df3d8e0ad46520c62ff
 F test/trace.test a659a9862957f4789e37a92b3bf6d2caf5c86b02cdeefc41e850ae53acf6992a
 F test/trace2.test f5cb67ad3bc09e0c58e8cca78dfd0b5639259983
-F test/trace3.test 4f418ed30d15d9d17dcf13a17f0bd99a92e3038e038798e35db7525f82f4c281
+F test/trace3.test ae2004df24b585fed9046cc0bae4601762bc6fc4aa321d475f1350bba5047f31
 F test/trans.test 45f6f9ab6f66a7b5744f1caac06b558f95da62501916906cf55586a896f9f439
 F test/trans2.test 62bd045bfc7a1c14c5ba83ba64d21ade31583f76
 F test/trans3.test 91a100e5412b488e22a655fe423a14c26403ab94
@@ -1877,7 +1874,7 @@ F test/upsert3.test 88d7d590a1948a9cb6eac1b54b0642f67a9f35a1fc0f19b200e97d5d39e3
 F test/upsert4.test 25d2a1da92f149331ae0c51ca6e3eee78189577585eab92de149900d62994fa5
 F test/upsert5.test fff0dcfce73c649204543088d8e5bde01172676063ec9b8f8fc7f195abc386fe
 F test/upsertfault.test f21ca47740841fdb4d61acfa7b17646d773e67724fe8c185b71c018db8a94b35
-F test/uri.test c1abaaaa28e9422d61e5f3f9cbc8ef993ec49fe802f581520731708561d49384
+F test/uri.test 8f27eaa41804099fca15101e30fd1b29aebbebf32d4e3c24614fa6319216936d
 F test/uri2.test 9d3ba7a53ee167572d53a298ee4a5d38ec4a8fb7
 F test/userauth01.test e740a2697a7b40d7c5003a7d7edaee16acd349a9
 F test/utf16align.test 9fde0bb5d3a821594aa68c6829ab9c5453a084384137ebb9f6153e2d678039da
@@ -1920,8 +1917,20 @@ F test/vtab_shared.test 5253bff2355a9a3f014c15337da7e177ab0ef8ad
 F test/vtabdistinct.test 7688f0889358f849fd60bbfde1ded38b014b18066076d4bfbb75395804dfe072
 F test/vtabdrop.test 65d4cf6722972e5499bdaf0c0d70ee3b8133944a4e4bc31862563f32a7edca12
 F test/vtabrhs1.test 9b5ecbc74a689500c33a4b2b36761f9bcc22fcc4e3f9d21066ee0c9c74cf5f6c
-F test/wal.test b7cc6984709f54afbf8441747ced1f646af120bf0c1b1d847bfa39306fbea089
+F test/wal.test 07d61ee522bc203235a7979645d6c5d84f86882afad5b678532ee37b5b85b133
 F test/wal2.test 31f6e2c404b9f2cdf9ca19b105a1742fdc19653c2c936da39e3658c617524046
+F test/wal2big.test 829141cbecdda4329db8fa38705424c4a73db72a06b9540b06811a825d330409
+F test/wal2fault.test 2e8e60cacd5bcd451618aeffd05f676894d17202d3e2986e288d36e2c5993249
+F test/wal2lock.test 0ef98d72dc6bcf7711dedd684760488400d9a9a6eec0dc5d3822060437793552
+F test/wal2openclose.test 2b26be723ea7f4263c8d5d70b37efd1c359561a0526e39466c45fe8e6478daee
+F test/wal2recover.test 28b3fa0acb4e8725211a02803cd51116cd048841a876224f244af78039ba34fa
+F test/wal2recover2.test 3fe5d5932b16a3a38304a85bafed1f965faef40c230fd450838a0502e61343bb
+F test/wal2recover3.test 4a91689e165a38bc401736e6518188c2b0ff4fa1566d1810b8867536db128177
+F test/wal2rewrite.test 6ca6f631ffcf871240beab5f02608913fd075c6d0d31310b026c8383c65c9f9c
+F test/wal2rollback.test 23adc4a099b23f6aaea8b04fdca1c35861d887dd80f8be7da2d5273eb777e428
+F test/wal2savepoint.test 2c82bd6a6ee5066c156040d2e9c2415646fcf96116ae7ad127eaf0c0b4a85f22
+F test/wal2simple.test 320a08927f307d0ead26fa3fcef4e3f64279f49be9504f918cb33294f75aeec8
+F test/wal2snapshot.test 7a5f4629a3c43a43c3440b8b2ea9f07de91a46b0b9eea5f08f62b5bf5b6468df
 F test/wal3.test 5de023bb862fd1eb9d2ad26fa8d9c43abb5370582e5b08b2ae0d6f93661bc310
 F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
 F test/wal5.test 9c11da7aeccd83a46d79a556ad11a18d3cb15aa9
@@ -1947,7 +1956,7 @@ F test/walnoshm.test 84ca10c544632a756467336b7c3b864d493ee496
 F test/waloverwrite.test dad2f26567f1b45174e54fbf9a8dc1cb876a7f03
 F test/walpersist.test 8d78a1ec91299163451417b451a2bac3481f8eb9f455b1ca507a6625c927ca6e
 F test/walprotocol.test 1b3f922125e341703f6e946d77fdc564d38fb3e07a9385cfdc6c99cac1ecf878
-F test/walprotocol2.test 7d3b6b4bf0b12f8007121b1e6ef714bc99101fb3b48e46371df1db868eebc131
+F test/walprotocol2.test 7e4bedd5ee83607e2928ac438bf7332a396b980d3e02aa0746509ce11ad1f13c
 F test/walro.test cb438d05ba0d191f10b688e39c4f0cd5b71569a1d1f4440e5bdf3c6880e08c20
 F test/walro2.test 33955a6fd874dd9724005e17f77fef89d334b3171454a1256fe4941a96766cdc
 F test/walrofault.test c70cb6e308c443867701856cce92ad8288cd99488fa52afab77cca6cfd51af68
@@ -1957,6 +1966,8 @@ F test/walshared.test 42e3808582504878af237ea02c42ca793e8a0efaa19df7df26ac573370
 F test/walslow.test c05c68d4dc2700a982f89133ce103a1a84cc285f
 F test/walthread.test 14b20fcfa6ae152f5d8e12f5dc8a8a724b7ef189f5d8ef1e2ceab79f2af51747
 F test/walvfs.test e1a6ad0f3c78e98b55c3d5f0889cf366cc0d0a1cb2bccb44ac9ec67384adc4a1
+F test/wapp.tcl b440cd8cf57953d3a49e7ee81e6a18f18efdaf113b69f7d8482b0710a64566ec
+F test/wapptest.tcl 1bea58a6a8e68a73f542ee4fca28b771b84ed803bd0c9e385087070b3d747b3c x
 F test/where.test 59abb854eee24f166b5f7ba9d17eb250abc59ce0a66c48912ffb10763648196d
 F test/where2.test 03c21a11e7b90e2845fc3c8b4002fc44cc2797fa74c86ee47d70bd7ea4f29ed6
 F test/where3.test 5b4ffc0ac2ea0fe92f02b1244b7531522fe4d7bccf6fa8741d54e82c10e67753
@@ -1988,7 +1999,7 @@ F test/win32heap.test 10fd891266bd00af68671e702317726375e5407561d859be1aa04696f2
 F test/win32lock.test e0924eb8daac02bf80e9da88930747bd44dd9b230b7759fed927b1655b467c9c
 F test/win32longpath.test 4baffc3acb2e5188a5e3a895b2b543ed09e62f7c72d713c1feebf76222fe9976
 F test/win32nolock.test ac4f08811a562e45a5755e661f45ca85892bdbbc
-F test/window1.test 5e8abe56a7d667eeddbba6de180086dcf69ed528d046447a25464f945ece101f
+F test/window1.test ccfeaf116afc6a8f748a8122a4f1ee6b69e6bbc5acee61197d3c17167338b100
 F test/window2.tcl 492c125fa550cda1dd3555768a2303b3effbeceee215293adf8871efc25f1476
 F test/window2.test e466a88bd626d66edc3d352d7d7e1d5531e0079b549ba44efb029d1fbff9fd3c
 F test/window3.tcl acea6e86a4324a210fd608d06741010ca83ded9fde438341cb978c49928faf03
@@ -2065,7 +2076,7 @@ F tool/max-limits.c cbb635fbb37ae4d05f240bfb5b5270bb63c54439
 F tool/merge-test.tcl de76b62f2de2a92d4c1ca4f976bce0aea6899e0229e250479b229b2a1914b176
 F tool/mkautoconfamal.sh cbdcf993fa83dccbef7fb77b39cdeb31ef9f77d9d88c9e343b58d35ca3898a6a
 F tool/mkccode.tcl 86463e68ce9c15d3041610fedd285ce32a5cf7a58fc88b3202b8b76837650dbe x
-F tool/mkctimec.tcl a16682eae5f01f85e5861b2aa215ca0d46b4230658ee25977e02b4508566fb75 x
+F tool/mkctimec.tcl 9edac3f6d9b867cfeb9da44fe2ab6ab9bb2bdfe66a7f171a8035013a15253b95 x
 F tool/mkkeywordhash.c b9faa0ae7e14e4dbbcd951cddd786bf46b8a65bb07b129ba8c0cfade723aaffd
 F tool/mkmsvcmin.tcl 8897d515ef7f94772322db95a3b6fce6c614d84fe0bdd06ba5a1c786351d5a1d
 F tool/mkopcodec.tcl 33d20791e191df43209b77d37f0ff0904620b28465cca6990cf8d60da61a07ef
@@ -2112,7 +2123,7 @@ F tool/sqltclsh.c.in 1bcc2e9da58fadf17b0bf6a50e68c1159e602ce057210b655d50bad5aaa
 F tool/sqltclsh.tcl 862f4cf1418df5e1315b5db3b5ebe88969e2a784525af5fbf9596592f14ed848
 F tool/src-verify.c 41c586dee84d0b190ad13e0282ed83d4a65ec9fefde9adf4943efdf6558eea7f
 F tool/srcck1.c 371de5363b70154012955544f86fdee8f6e5326f
-F tool/srctree-check.tcl c15f860a3c97d5f7b4c14b60392d9466af29dd006c4ef18127f502641e2977a8
+F tool/srctree-check.tcl 9f1098d439159692ece45cc9e701b35df4956269399fe0c770e41f235d1ce5e6
 F tool/stack_usage.tcl f8e71b92cdb099a147dad572375595eae55eca43
 F tool/stripccomments.c 20b8aabc4694d0d4af5566e42da1f1a03aff057689370326e9269a9ddcffdc37
 F tool/symbols-mingw.sh 4dbcea7e74768305384c9fd2ed2b41bbf9f0414d
@@ -2145,8 +2156,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 6231ec43adb7436195eb1497de39a6c13c6b4f1c5032e6ea52515d214e61fdbc
-R e440543ab70160e0cdb3ca23863ac507
+P 2672572cc373e97054cc56dd0d48aaf56be5fef9704f7c177f64bd622151eadb ebead0e7230cd33bcec9f95d2183069565b9e709bf745c9b5db65cc0cbf92c0f
+R 79dd4db7e84abf2dfef496293e208c75
 U drh
-Z d79a3adcec115b27b232bb847ce59659
+Z c2e274816d57ff4863e5f579538a274a
 # Remove this line to create a well-formed Fossil manifest.

manifest.uuid

@@ -1 +1 @@
-4f106b64fe8988435872806bd0a6c223b61f53af0dd1c47c847bb4eec4e03e27
+0118e8c981fdfa4f8e593b56a2cbb97c489c3a97a3494f21a7a63b196659530c

src/btree.c

@@ -3260,10 +3260,10 @@ static int lockBtree(BtShared *pBt){
       goto page1_init_failed;
     }
 #else
-    if( page1[18]>2 ){
+    if( page1[18]>3 ){
       pBt->btsFlags |= BTS_READ_ONLY;
     }
-    if( page1[19]>2 ){
+    if( page1[19]>3 ){
       goto page1_init_failed;
     }
 
@@ -3275,9 +3275,9 @@ static int lockBtree(BtShared *pBt){
     ** may not be the latest version - there may be a newer one in the log
     ** file.
     */
-    if( page1[19]==2 && (pBt->btsFlags & BTS_NO_WAL)==0 ){
+    if( page1[19]>=2 && (pBt->btsFlags & BTS_NO_WAL)==0 ){
       int isOpen = 0;
-      rc = sqlite3PagerOpenWal(pBt->pPager, &isOpen);
+      rc = sqlite3PagerOpenWal(pBt->pPager, (page1[19]==3), &isOpen);
       if( rc!=SQLITE_OK ){
         goto page1_init_failed;
       }else{
@@ -11306,7 +11306,7 @@ int sqlite3BtreeSetVersion(Btree *pBtree, int iVersion){
   BtShared *pBt = pBtree->pBt;
   int rc;                         /* Return code */
 
-  assert( iVersion==1 || iVersion==2 );
+  assert( iVersion==1 || iVersion==2 || iVersion==3 );
 
   /* If setting the version fields to 1, do not automatically open the
   ** WAL connection, even if the version fields are currently set to 2.

src/btreeInt.h

@@ -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

src/ctime.c

@@ -776,6 +776,7 @@ static const char * const sqlite3azCompileOpt[] = {
 #ifdef SQLITE_VDBE_COVERAGE
   "VDBE_COVERAGE",
 #endif
+"WAL2",
 #ifdef SQLITE_WIN32_MALLOC
   "WIN32_MALLOC",
 #endif

src/date.c

@@ -1043,12 +1043,6 @@ static int isDate(
   }
   computeJD(p);
   if( p->isError || !validJulianDay(p->iJD) ) return 1;
-  if( argc==1 && p->validYMD && p->D>28 ){
-    /* Make sure a YYYY-MM-DD is normalized.
-    ** Example: 2023-02-31 -> 2023-03-03 */
-    assert( p->validJD );
-    p->validYMD = 0;  
-  }
   return 0;
 }
 

src/expr.c

@@ -6769,14 +6769,13 @@ static int analyzeAggregate(Walker *pWalker, Expr *pExpr){
     case TK_AGG_FUNCTION: {
       if( (pNC->ncFlags & NC_InAggFunc)==0
        && pWalker->walkerDepth==pExpr->op2
-       && pExpr->pAggInfo==0
       ){
         /* Check to see if pExpr is a duplicate of another aggregate
         ** function that is already in the pAggInfo structure
         */
         struct AggInfo_func *pItem = pAggInfo->aFunc;
         for(i=0; i<pAggInfo->nFunc; i++, pItem++){
-          if( NEVER(pItem->pFExpr==pExpr) ) break;
+          if( pItem->pFExpr==pExpr ) break;
           if( sqlite3ExprCompare(0, pItem->pFExpr, pExpr, -1)==0 ){
             break;
           }

src/os_unix.c

@@ -4054,13 +4054,7 @@ static int unixFileControl(sqlite3_file *id, int op, void *pArg){
 #ifdef SQLITE_ENABLE_SETLK_TIMEOUT
     case SQLITE_FCNTL_LOCK_TIMEOUT: {
       int iOld = pFile->iBusyTimeout;
-#if SQLITE_ENABLE_SETLK_TIMEOUT==1
       pFile->iBusyTimeout = *(int*)pArg;
-#elif SQLITE_ENABLE_SETLK_TIMEOUT==2
-      pFile->iBusyTimeout = !!(*(int*)pArg);
-#else
-# error "SQLITE_ENABLE_SETLK_TIMEOUT must be set to 1 or 2"
-#endif
       *(int*)pArg = iOld;
       return SQLITE_OK;
     }
@@ -4313,25 +4307,6 @@ static int unixGetpagesize(void){
 ** Either unixShmNode.pShmMutex must be held or unixShmNode.nRef==0 and
 ** unixMutexHeld() is true when reading or writing any other field
 ** in this structure.
-**
-** aLock[SQLITE_SHM_NLOCK]:
-**   This array records the various locks held by clients on each of the
-**   SQLITE_SHM_NLOCK slots. If the aLock[] entry is set to 0, then no
-**   locks are held by the process on this slot. If it is set to -1, then
-**   some client holds an EXCLUSIVE lock on the locking slot. If the aLock[]
-**   value is set to a positive value, then it is the number of shared 
-**   locks currently held on the slot.
-**
-** aMutex[SQLITE_SHM_NLOCK]:
-**   Normally, when SQLITE_ENABLE_SETLK_TIMEOUT is not defined, mutex 
-**   pShmMutex is used to protect the aLock[] array and the right to
-**   call fcntl() on unixShmNode.hShm to obtain or release locks.
-**
-**   If SQLITE_ENABLE_SETLK_TIMEOUT is defined though, we use an array
-**   of mutexes - one for each locking slot. To read or write locking
-**   slot aLock[iSlot], the caller must hold the corresponding mutex
-**   aMutex[iSlot]. Similarly, to call fcntl() to obtain or release a
-**   lock corresponding to slot iSlot, mutex aMutex[iSlot] must be held.
 */
 struct unixShmNode {
   unixInodeInfo *pInode;     /* unixInodeInfo that owns this SHM node */
@@ -4345,11 +4320,10 @@ struct unixShmNode {
   char **apRegion;           /* Array of mapped shared-memory regions */
   int nRef;                  /* Number of unixShm objects pointing to this */
   unixShm *pFirst;           /* All unixShm objects pointing to this */
-#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
-  sqlite3_mutex *aMutex[SQLITE_SHM_NLOCK];
-#endif
   int aLock[SQLITE_SHM_NLOCK];  /* # shared locks on slot, -1==excl lock */
 #ifdef SQLITE_DEBUG
+  u8 exclMask;               /* Mask of exclusive locks held */
+  u8 sharedMask;             /* Mask of shared locks held */
   u8 nextShmId;              /* Next available unixShm.id value */
 #endif
 };
@@ -4432,29 +4406,16 @@ static int unixShmSystemLock(
   struct flock f;        /* The posix advisory locking structure */
   int rc = SQLITE_OK;    /* Result code form fcntl() */
 
+  /* Access to the unixShmNode object is serialized by the caller */
   pShmNode = pFile->pInode->pShmNode;
-
-  /* Assert that the correct mutex or mutexes are held. */
-  if( pShmNode->nRef==0 ){
-    assert( ofst==UNIX_SHM_DMS && n==1 && unixMutexHeld() );
-  }else{
-#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
-    int ii;
-    for(ii=ofst-UNIX_SHM_BASE; ii<ofst-UNIX_SHM_BASE+n; ii++){
-      assert( sqlite3_mutex_held(pShmNode->aMutex[ii]) );
-    }
-#else
-    assert( sqlite3_mutex_held(pShmNode->pShmMutex) );
-    assert( pShmNode->nRef>0 );
-#endif
-  }
+  assert( pShmNode->nRef==0 || sqlite3_mutex_held(pShmNode->pShmMutex) );
+  assert( pShmNode->nRef>0 || unixMutexHeld() );
 
   /* Shared locks never span more than one byte */
   assert( n==1 || lockType!=F_RDLCK );
 
   /* Locks are within range */
   assert( n>=1 && n<=SQLITE_SHM_NLOCK );
-  assert( ofst>=UNIX_SHM_BASE && ofst<=(UNIX_SHM_DMS+SQLITE_SHM_NLOCK) );
 
   if( pShmNode->hShm>=0 ){
     int res;
@@ -4465,7 +4426,7 @@ static int unixShmSystemLock(
     f.l_len = n;
     res = osSetPosixAdvisoryLock(pShmNode->hShm, &f, pFile);
     if( res==-1 ){
-#if defined(SQLITE_ENABLE_SETLK_TIMEOUT) && SQLITE_ENABLE_SETLK_TIMEOUT==1
+#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
       rc = (pFile->iBusyTimeout ? SQLITE_BUSY_TIMEOUT : SQLITE_BUSY);
 #else
       rc = SQLITE_BUSY;
@@ -4473,28 +4434,39 @@ static int unixShmSystemLock(
     }
   }
 
-  /* Do debug tracing */
+  /* Update the global lock state and do debug tracing */
 #ifdef SQLITE_DEBUG
+  { u16 mask;
   OSTRACE(("SHM-LOCK "));
+  mask = ofst>31 ? 0xffff : (1<<(ofst+n)) - (1<<ofst);
   if( rc==SQLITE_OK ){
     if( lockType==F_UNLCK ){
-      OSTRACE(("unlock %d..%d ok\n", ofst, ofst+n-1));
+      OSTRACE(("unlock %d ok", ofst));
+      pShmNode->exclMask &= ~mask;
+      pShmNode->sharedMask &= ~mask;
     }else if( lockType==F_RDLCK ){
-      OSTRACE(("read-lock %d..%d ok\n", ofst, ofst+n-1));
+      OSTRACE(("read-lock %d ok", ofst));
+      pShmNode->exclMask &= ~mask;
+      pShmNode->sharedMask |= mask;
     }else{
       assert( lockType==F_WRLCK );
-      OSTRACE(("write-lock %d..%d ok\n", ofst, ofst+n-1));
+      OSTRACE(("write-lock %d ok", ofst));
+      pShmNode->exclMask |= mask;
+      pShmNode->sharedMask &= ~mask;
     }
   }else{
     if( lockType==F_UNLCK ){
-      OSTRACE(("unlock %d..%d failed\n", ofst, ofst+n-1));
+      OSTRACE(("unlock %d failed", ofst));
     }else if( lockType==F_RDLCK ){
-      OSTRACE(("read-lock %d..%d failed\n", ofst, ofst+n-1));
+      OSTRACE(("read-lock failed"));
     }else{
       assert( lockType==F_WRLCK );
-      OSTRACE(("write-lock %d..%d failed\n", ofst, ofst+n-1));
+      OSTRACE(("write-lock %d failed", ofst));
     }
   }
+  OSTRACE((" - afterwards %03x,%03x\n",
+           pShmNode->sharedMask, pShmNode->exclMask));
+  }
 #endif
 
   return rc;      
@@ -4531,11 +4503,6 @@ static void unixShmPurge(unixFile *pFd){
     int i;
     assert( p->pInode==pFd->pInode );
     sqlite3_mutex_free(p->pShmMutex);
-#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
-    for(i=0; i<SQLITE_SHM_NLOCK; i++){
-      sqlite3_mutex_free(p->aMutex[i]);
-    }
-#endif
     for(i=0; i<p->nRegion; i+=nShmPerMap){
       if( p->hShm>=0 ){
         osMunmap(p->apRegion[i], p->szRegion);
@@ -4716,18 +4683,6 @@ static int unixOpenSharedMemory(unixFile *pDbFd){
         rc = SQLITE_NOMEM_BKPT;
         goto shm_open_err;
       }
-#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
-      {
-        int ii;
-        for(ii=0; ii<SQLITE_SHM_NLOCK; ii++){
-          pShmNode->aMutex[ii] = sqlite3_mutex_alloc(SQLITE_MUTEX_FAST);
-          if( pShmNode->aMutex[ii]==0 ){
-            rc = SQLITE_NOMEM_BKPT;
-            goto shm_open_err;
-          }
-        }
-      }
-#endif
     }
 
     if( pInode->bProcessLock==0 ){
@@ -4949,11 +4904,9 @@ shmpage_out:
 */
 #ifdef SQLITE_DEBUG
 static int assertLockingArrayOk(unixShmNode *pShmNode){
-#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
-  return 1;
-#else
   unixShm *pX;
   int aLock[SQLITE_SHM_NLOCK];
+  assert( sqlite3_mutex_held(pShmNode->pShmMutex) );
 
   memset(aLock, 0, sizeof(aLock));
   for(pX=pShmNode->pFirst; pX; pX=pX->pNext){
@@ -4971,14 +4924,13 @@ static int assertLockingArrayOk(unixShmNode *pShmNode){
 
   assert( 0==memcmp(pShmNode->aLock, aLock, sizeof(aLock)) );
   return (memcmp(pShmNode->aLock, aLock, sizeof(aLock))==0);
-#endif
 }
 #endif
 
 /*
 ** Change the lock state for a shared-memory segment.
 **
-** Note that the relationship between SHARED and EXCLUSIVE locks is a little
+** Note that the relationship between SHAREd and EXCLUSIVE locks is a little
 ** different here than in posix.  In xShmLock(), one can go from unlocked
 ** to shared and back or from unlocked to exclusive and back.  But one may
 ** not go from shared to exclusive or from exclusive to shared.
@@ -4993,7 +4945,7 @@ static int unixShmLock(
   unixShm *p;                           /* The shared memory being locked */
   unixShmNode *pShmNode;                /* The underlying file iNode */
   int rc = SQLITE_OK;                   /* Result code */
-  u16 mask = (1<<(ofst+n)) - (1<<ofst); /* Mask of locks to take or release */
+  u16 mask;                             /* Mask of locks to take or release */
   int *aLock;
 
   p = pDbFd->pShm;
@@ -5028,150 +4980,88 @@ static int unixShmLock(
   ** It is not permitted to block on the RECOVER lock.
   */
 #ifdef SQLITE_ENABLE_SETLK_TIMEOUT
-  {
-    u16 lockMask = (p->exclMask|p->sharedMask);
-    assert( (flags & SQLITE_SHM_UNLOCK) || pDbFd->iBusyTimeout==0 || (
-          (ofst!=2)                                   /* not RECOVER */
-       && (ofst!=1 || lockMask==0 || lockMask==2)
-       && (ofst!=0 || lockMask<3)
-       && (ofst<3  || lockMask<(1<<ofst))
-    ));
-  }
+  assert( (flags & SQLITE_SHM_UNLOCK) || pDbFd->iBusyTimeout==0 || (
+         (ofst!=2)                                   /* not RECOVER */
+      && (ofst!=1 || (p->exclMask|p->sharedMask)==0)
+      && (ofst!=0 || (p->exclMask|p->sharedMask)<3)
+      && (ofst<3  || (p->exclMask|p->sharedMask)<(1<<ofst))
+  ));
 #endif
 
-  /* Check if there is any work to do. There are three cases:
-  **
-  **    a) An unlock operation where there are locks to unlock,
-  **    b) An shared lock where the requested lock is not already held
-  **    c) An exclusive lock where the requested lock is not already held
-  **
-  ** The SQLite core never requests an exclusive lock that it already holds.
-  ** This is assert()ed below.
-  */
-  assert( flags!=(SQLITE_SHM_EXCLUSIVE|SQLITE_SHM_LOCK) 
-       || 0==(p->exclMask & mask) 
-  );
-  if( ((flags & SQLITE_SHM_UNLOCK) && ((p->exclMask|p->sharedMask) & mask))
-   || (flags==(SQLITE_SHM_SHARED|SQLITE_SHM_LOCK) && 0==(p->sharedMask & mask))
-   || (flags==(SQLITE_SHM_EXCLUSIVE|SQLITE_SHM_LOCK))
-  ){
+  mask = (1<<(ofst+n)) - (1<<ofst);
+  assert( n>1 || mask==(1<<ofst) );
+  sqlite3_mutex_enter(pShmNode->pShmMutex);
+  assert( assertLockingArrayOk(pShmNode) );
+  if( flags & SQLITE_SHM_UNLOCK ){
+    if( (p->exclMask|p->sharedMask) & mask ){
+      int ii;
+      int bUnlock = 1;
 
-    /* Take the required mutexes. In SETLK_TIMEOUT mode (blocking locks), if
-    ** this is an attempt on an exclusive lock use sqlite3_mutex_try(). If any
-    ** other thread is holding this mutex, then it is either holding or about
-    ** to hold a lock exclusive to the one being requested, and we may
-    ** therefore return SQLITE_BUSY to the caller.
-    **
-    ** Doing this prevents some deadlock scenarios. For example, thread 1 may
-    ** be a checkpointer blocked waiting on the WRITER lock. And thread 2
-    ** may be a normal SQL client upgrading to a write transaction. In this
-    ** case thread 2 does a non-blocking request for the WRITER lock. But -
-    ** if it were to use sqlite3_mutex_enter() then it would effectively
-    ** become a (doomed) blocking request, as thread 2 would block until thread
-    ** 1 obtained WRITER and released the mutex. Since thread 2 already holds
-    ** a lock on a read-locking slot at this point, this breaks the
-    ** anti-deadlock rules (see above).  */
-#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
-    int iMutex;
-    for(iMutex=ofst; iMutex<ofst+n; iMutex++){
-      if( flags==(SQLITE_SHM_LOCK|SQLITE_SHM_EXCLUSIVE) ){
-        rc = sqlite3_mutex_try(pShmNode->aMutex[iMutex]);
-        if( rc!=SQLITE_OK ) break;
-      }else{
-        sqlite3_mutex_enter(pShmNode->aMutex[iMutex]);
+      for(ii=ofst; ii<ofst+n; ii++){
+        if( aLock[ii]>((p->sharedMask & (1<<ii)) ? 1 : 0) ){
+          bUnlock = 0;
+        }
+      }
+
+      if( bUnlock ){
+        rc = unixShmSystemLock(pDbFd, F_UNLCK, ofst+UNIX_SHM_BASE, n);
+        if( rc==SQLITE_OK ){
+          memset(&aLock[ofst], 0, sizeof(int)*n);
+        }
+      }else if( ALWAYS(p->sharedMask & (1<<ofst)) ){
+        assert( n==1 && aLock[ofst]>1 );
+        aLock[ofst]--;
+      }
+
+      /* Undo the local locks */
+      if( rc==SQLITE_OK ){
+        p->exclMask &= ~mask;
+        p->sharedMask &= ~mask;
       }
     }
-#else
-    sqlite3_mutex_enter(pShmNode->pShmMutex);
-#endif
+  }else if( flags & SQLITE_SHM_SHARED ){
+    assert( n==1 );
+    assert( (p->exclMask & (1<<ofst))==0 );
+    if( (p->sharedMask & mask)==0 ){
+      if( aLock[ofst]<0 ){
+        rc = SQLITE_BUSY;
+      }else if( aLock[ofst]==0 ){
+        rc = unixShmSystemLock(pDbFd, F_RDLCK, ofst+UNIX_SHM_BASE, n);
+      }
 
+      /* Get the local shared locks */
+      if( rc==SQLITE_OK ){
+        p->sharedMask |= mask;
+        aLock[ofst]++;
+      }
+    }
+  }else{
+    /* Make sure no sibling connections hold locks that will block this
+    ** lock.  If any do, return SQLITE_BUSY right away.  */
+    int ii;
+    for(ii=ofst; ii<ofst+n; ii++){
+      assert( (p->sharedMask & mask)==0 );
+      if( ALWAYS((p->exclMask & (1<<ii))==0) && aLock[ii] ){
+        rc = SQLITE_BUSY;
+        break;
+      }
+    }
+
+    /* Get the exclusive locks at the system level. Then if successful
+    ** also update the in-memory values. */
     if( rc==SQLITE_OK ){
-      if( flags & SQLITE_SHM_UNLOCK ){
-        /* Case (a) - unlock.  */
-        int bUnlock = 1;
-        assert( (p->exclMask & p->sharedMask)==0 );
-        assert( !(flags & SQLITE_SHM_EXCLUSIVE) || (p->exclMask & mask)==mask );
-        assert( !(flags & SQLITE_SHM_SHARED) || (p->sharedMask & mask)==mask );
-  
-        /* If this is a SHARED lock being unlocked, it is possible that other
-        ** clients within this process are holding the same SHARED lock. In
-        ** this case, set bUnlock to 0 so that the posix lock is not removed
-        ** from the file-descriptor below.  */
-        if( flags & SQLITE_SHM_SHARED ){
-          assert( n==1 );
-          assert( aLock[ofst]>=1 );
-          if( aLock[ofst]>1 ){
-            bUnlock = 0;
-            aLock[ofst]--;
-            p->sharedMask &= ~mask;
-          }
-        }
-  
-        if( bUnlock ){
-          rc = unixShmSystemLock(pDbFd, F_UNLCK, ofst+UNIX_SHM_BASE, n);
-          if( rc==SQLITE_OK ){
-            memset(&aLock[ofst], 0, sizeof(int)*n);
-            p->sharedMask &= ~mask;
-            p->exclMask &= ~mask;
-          }
-        }
-      }else if( flags & SQLITE_SHM_SHARED ){
-        /* Case (b) - a shared lock.  */
-  
-        if( aLock[ofst]<0 ){
-          /* An exclusive lock is held by some other connection. BUSY. */ 
-          rc = SQLITE_BUSY;
-        }else if( aLock[ofst]==0 ){
-          rc = unixShmSystemLock(pDbFd, F_RDLCK, ofst+UNIX_SHM_BASE, n);
-        }
-  
-        /* Get the local shared locks */
-        if( rc==SQLITE_OK ){
-          p->sharedMask |= mask;
-          aLock[ofst]++;
-        }
-      }else{
-        /* Case (c) - an exclusive lock.  */
-        int ii;
-  
-        assert( flags==(SQLITE_SHM_LOCK|SQLITE_SHM_EXCLUSIVE) );
+      rc = unixShmSystemLock(pDbFd, F_WRLCK, ofst+UNIX_SHM_BASE, n);
+      if( rc==SQLITE_OK ){
         assert( (p->sharedMask & mask)==0 );
-        assert( (p->exclMask & mask)==0 );
-  
-        /* Make sure no sibling connections hold locks that will block this
-        ** lock.  If any do, return SQLITE_BUSY right away.  */
+        p->exclMask |= mask;
         for(ii=ofst; ii<ofst+n; ii++){
-          if( aLock[ii] ){
-            rc = SQLITE_BUSY;
-            break;
-          }
-        }
-  
-        /* Get the exclusive locks at the system level. Then if successful
-        ** also update the in-memory values. */
-        if( rc==SQLITE_OK ){
-          rc = unixShmSystemLock(pDbFd, F_WRLCK, ofst+UNIX_SHM_BASE, n);
-          if( rc==SQLITE_OK ){
-            p->exclMask |= mask;
-            for(ii=ofst; ii<ofst+n; ii++){
-              aLock[ii] = -1;
-            }
-          }
+          aLock[ii] = -1;
         }
       }
-      assert( assertLockingArrayOk(pShmNode) );
     }
-
-    /* Drop the mutexes acquired above. */
-#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
-    for(iMutex--; iMutex>=ofst; iMutex--){
-      sqlite3_mutex_leave(pShmNode->aMutex[iMutex]);
-    }
-#else
-    sqlite3_mutex_leave(pShmNode->pShmMutex);
-#endif
   }
-
+  assert( assertLockingArrayOk(pShmNode) );
+  sqlite3_mutex_leave(pShmNode->pShmMutex);
   OSTRACE(("SHM-LOCK shmid-%d, pid-%d got %03x,%03x\n",
            p->id, osGetpid(0), p->sharedMask, p->exclMask));
   return rc;

src/pager.c

@@ -789,20 +789,6 @@ static const unsigned char aJournalMagic[] = {
 # define USEFETCH(x) 0
 #endif
 
-/*
-** The argument to this macro is a file descriptor (type sqlite3_file*).
-** Return 0 if it is not open, or non-zero (but not 1) if it is.
-**
-** This is so that expressions can be written as:
-**
-**   if( isOpen(pPager->jfd) ){ ...
-**
-** instead of
-**
-**   if( pPager->jfd->pMethods ){ ...
-*/
-#define isOpen(pFd) ((pFd)->pMethods!=0)
-
 #ifdef SQLITE_DIRECT_OVERFLOW_READ
 /*
 ** Return true if page pgno can be read directly from the database file
@@ -934,6 +920,7 @@ static int assert_pager_state(Pager *p){
         assert( isOpen(p->jfd)
              || p->journalMode==PAGER_JOURNALMODE_OFF
              || p->journalMode==PAGER_JOURNALMODE_WAL
+             || p->journalMode==PAGER_JOURNALMODE_WAL2
         );
       }
       assert( pPager->dbOrigSize==pPager->dbFileSize );
@@ -948,6 +935,7 @@ static int assert_pager_state(Pager *p){
       assert( isOpen(p->jfd)
            || p->journalMode==PAGER_JOURNALMODE_OFF
            || p->journalMode==PAGER_JOURNALMODE_WAL
+           || p->journalMode==PAGER_JOURNALMODE_WAL2
            || (sqlite3OsDeviceCharacteristics(p->fd)&SQLITE_IOCAP_BATCH_ATOMIC)
       );
       assert( pPager->dbOrigSize<=pPager->dbHintSize );
@@ -960,6 +948,7 @@ static int assert_pager_state(Pager *p){
       assert( isOpen(p->jfd)
            || p->journalMode==PAGER_JOURNALMODE_OFF
            || p->journalMode==PAGER_JOURNALMODE_WAL
+           || p->journalMode==PAGER_JOURNALMODE_WAL2
            || (sqlite3OsDeviceCharacteristics(p->fd)&SQLITE_IOCAP_BATCH_ATOMIC)
       );
       break;
@@ -2081,7 +2070,7 @@ static int pager_end_transaction(Pager *pPager, int hasSuper, int bCommit){
       }
       pPager->journalOff = 0;
     }else if( pPager->journalMode==PAGER_JOURNALMODE_PERSIST
-      || (pPager->exclusiveMode && pPager->journalMode!=PAGER_JOURNALMODE_WAL)
+      || (pPager->exclusiveMode && pPager->journalMode<PAGER_JOURNALMODE_WAL)
     ){
       rc = zeroJournalHdr(pPager, hasSuper||pPager->tempFile);
       pPager->journalOff = 0;
@@ -2096,6 +2085,7 @@ static int pager_end_transaction(Pager *pPager, int hasSuper, int bCommit){
       assert( pPager->journalMode==PAGER_JOURNALMODE_DELETE
            || pPager->journalMode==PAGER_JOURNALMODE_MEMORY
            || pPager->journalMode==PAGER_JOURNALMODE_WAL
+           || pPager->journalMode==PAGER_JOURNALMODE_WAL2
       );
       sqlite3OsClose(pPager->jfd);
       if( bDelete ){
@@ -3251,6 +3241,10 @@ static int pagerBeginReadTransaction(Pager *pPager){
   if( rc!=SQLITE_OK || changed ){
     pager_reset(pPager);
     if( USEFETCH(pPager) ) sqlite3OsUnfetch(pPager->fd, 0, 0);
+    assert( pPager->journalMode==PAGER_JOURNALMODE_WAL
+         || pPager->journalMode==PAGER_JOURNALMODE_WAL2
+    );
+    pPager->journalMode = sqlite3WalJournalMode(pPager->pWal);
   }
 
   return rc;
@@ -3346,9 +3340,9 @@ static int pagerOpenWalIfPresent(Pager *pPager){
           rc = sqlite3OsDelete(pPager->pVfs, pPager->zWal, 0);
         }else{
           testcase( sqlite3PcachePagecount(pPager->pPCache)==0 );
-          rc = sqlite3PagerOpenWal(pPager, 0);
+          rc = sqlite3PagerOpenWal(pPager, 0, 0);
         }
-      }else if( pPager->journalMode==PAGER_JOURNALMODE_WAL ){
+      }else if( pPager->journalMode>=PAGER_JOURNALMODE_WAL ){
         pPager->journalMode = PAGER_JOURNALMODE_DELETE;
       }
     }
@@ -4852,6 +4846,7 @@ int sqlite3PagerOpen(
     nPathname + 8 + 1 +                  /* Journal filename */
 #ifndef SQLITE_OMIT_WAL
     nPathname + 4 + 1 +                  /* WAL filename */
+    nPathname + 5 + 1 +                  /* Second WAL filename */
 #endif
     3                                    /* Terminator */
   );
@@ -4904,6 +4899,8 @@ int sqlite3PagerOpen(
     sqlite3FileSuffix3(zFilename, pPager->zWal);
     pPtr = (u8*)(pPager->zWal + sqlite3Strlen30(pPager->zWal)+1);
 #endif
+    memcpy(pPtr, zPathname, nPathname);   pPtr += nPathname;
+    memcpy(pPtr, "-wal2", 5);             pPtr += 5 + 1;
   }else{
     pPager->zWal = 0;
   }
@@ -7340,7 +7337,8 @@ int sqlite3PagerSetJournalMode(Pager *pPager, int eMode){
             || eMode==PAGER_JOURNALMODE_OFF       /* 2 */
             || eMode==PAGER_JOURNALMODE_TRUNCATE  /* 3 */
             || eMode==PAGER_JOURNALMODE_MEMORY    /* 4 */
-            || eMode==PAGER_JOURNALMODE_WAL       /* 5 */ );
+            || eMode==PAGER_JOURNALMODE_WAL       /* 5 */
+            || eMode==PAGER_JOURNALMODE_WAL2      /* 6 */ );
 
   /* This routine is only called from the OP_JournalMode opcode, and
   ** the logic there will never allow a temporary file to be changed
@@ -7374,9 +7372,12 @@ int sqlite3PagerSetJournalMode(Pager *pPager, int eMode){
     assert( (PAGER_JOURNALMODE_MEMORY & 5)==4 );
     assert( (PAGER_JOURNALMODE_OFF & 5)==0 );
     assert( (PAGER_JOURNALMODE_WAL & 5)==5 );
+    assert( (PAGER_JOURNALMODE_WAL2 & 5)==4 );
 
     assert( isOpen(pPager->fd) || pPager->exclusiveMode );
-    if( !pPager->exclusiveMode && (eOld & 5)==1 && (eMode & 1)==0 ){
+    if( !pPager->exclusiveMode && (eOld & 5)==1 && (eMode & 1)==0 
+     && eMode!=PAGER_JOURNALMODE_WAL2       /* TODO: fix this if possible */
+    ){
       /* In this case we would like to delete the journal file. If it is
       ** not possible, then that is not a problem. Deleting the journal file
       ** here is an optimization only.
@@ -7551,7 +7552,7 @@ static int pagerExclusiveLock(Pager *pPager){
 ** lock on the database file and use heap-memory to store the wal-index
 ** in. Otherwise, use the normal shared-memory.
 */
-static int pagerOpenWal(Pager *pPager){
+static int pagerOpenWal(Pager *pPager, int bWal2){
   int rc = SQLITE_OK;
 
   assert( pPager->pWal==0 && pPager->tempFile==0 );
@@ -7572,7 +7573,7 @@ static int pagerOpenWal(Pager *pPager){
   if( rc==SQLITE_OK ){
     rc = sqlite3WalOpen(pPager->pVfs,
         pPager->fd, pPager->zWal, pPager->exclusiveMode,
-        pPager->journalSizeLimit, &pPager->pWal
+        pPager->journalSizeLimit, bWal2, &pPager->pWal
     );
   }
   pagerFixMaplimit(pPager);
@@ -7598,6 +7599,7 @@ static int pagerOpenWal(Pager *pPager){
 */
 int sqlite3PagerOpenWal(
   Pager *pPager,                  /* Pager object */
+  int bWal2,                      /* Open in wal2 mode if not already open */
   int *pbOpen                     /* OUT: Set to true if call is a no-op */
 ){
   int rc = SQLITE_OK;             /* Return code */
@@ -7614,9 +7616,9 @@ int sqlite3PagerOpenWal(
     /* Close any rollback journal previously open */
     sqlite3OsClose(pPager->jfd);
 
-    rc = pagerOpenWal(pPager);
+    rc = pagerOpenWal(pPager, bWal2);
     if( rc==SQLITE_OK ){
-      pPager->journalMode = PAGER_JOURNALMODE_WAL;
+      pPager->journalMode = bWal2?PAGER_JOURNALMODE_WAL2:PAGER_JOURNALMODE_WAL;
       pPager->eState = PAGER_OPEN;
     }
   }else{
@@ -7638,7 +7640,9 @@ int sqlite3PagerOpenWal(
 int sqlite3PagerCloseWal(Pager *pPager, sqlite3 *db){
   int rc = SQLITE_OK;
 
-  assert( pPager->journalMode==PAGER_JOURNALMODE_WAL );
+  assert( pPager->journalMode==PAGER_JOURNALMODE_WAL 
+       || pPager->journalMode==PAGER_JOURNALMODE_WAL2
+  );
 
   /* If the log file is not already open, but does exist in the file-system,
   ** it may need to be checkpointed before the connection can switch to
@@ -7653,7 +7657,7 @@ int sqlite3PagerCloseWal(Pager *pPager, sqlite3 *db){
       );
     }
     if( rc==SQLITE_OK && logexists ){
-      rc = pagerOpenWal(pPager);
+      rc = pagerOpenWal(pPager, 0);
     }
   }
    

src/pager.h

@@ -82,6 +82,23 @@ typedef struct PgHdr DbPage;
 #define PAGER_JOURNALMODE_TRUNCATE    3   /* Commit by truncating journal */
 #define PAGER_JOURNALMODE_MEMORY      4   /* In-memory journal file */
 #define PAGER_JOURNALMODE_WAL         5   /* Use write-ahead logging */
+#define PAGER_JOURNALMODE_WAL2        6   /* Use write-ahead logging mode 2 */
+
+#define isWalMode(x) ((x)==PAGER_JOURNALMODE_WAL || (x)==PAGER_JOURNALMODE_WAL2)
+
+/*
+** The argument to this macro is a file descriptor (type sqlite3_file*).
+** Return 0 if it is not open, or non-zero (but not 1) if it is.
+**
+** This is so that expressions can be written as:
+**
+**   if( isOpen(pPager->jfd) ){ ...
+**
+** instead of
+**
+**   if( pPager->jfd->pMethods ){ ...
+*/
+#define isOpen(pFd) ((pFd)->pMethods!=0)
 
 /*
 ** Flags that make up the mask passed to sqlite3PagerGet().
@@ -175,7 +192,7 @@ int sqlite3PagerSharedLock(Pager *pPager);
   int sqlite3PagerCheckpoint(Pager *pPager, sqlite3*, int, int*, int*);
   int sqlite3PagerWalSupported(Pager *pPager);
   int sqlite3PagerWalCallback(Pager *pPager);
-  int sqlite3PagerOpenWal(Pager *pPager, int *pisOpen);
+  int sqlite3PagerOpenWal(Pager *pPager, int, int *pisOpen);
   int sqlite3PagerCloseWal(Pager *pPager, sqlite3*);
 # ifdef SQLITE_ENABLE_SNAPSHOT
   int sqlite3PagerSnapshotGet(Pager*, sqlite3_snapshot **ppSnapshot);

src/pragma.c

@@ -262,7 +262,7 @@ const char *sqlite3JournalModename(int eMode){
   static char * const azModeName[] = {
     "delete", "persist", "off", "truncate", "memory"
 #ifndef SQLITE_OMIT_WAL
-     , "wal"
+     , "wal", "wal2"
 #endif
   };
   assert( PAGER_JOURNALMODE_DELETE==0 );
@@ -271,6 +271,7 @@ const char *sqlite3JournalModename(int eMode){
   assert( PAGER_JOURNALMODE_TRUNCATE==3 );
   assert( PAGER_JOURNALMODE_MEMORY==4 );
   assert( PAGER_JOURNALMODE_WAL==5 );
+  assert( PAGER_JOURNALMODE_WAL2==6 );
   assert( eMode>=0 && eMode<=ArraySize(azModeName) );
 
   if( eMode==ArraySize(azModeName) ) return 0;

src/prepare.c

@@ -868,7 +868,6 @@ static int sqlite3LockAndPrepare(
   assert( (rc&db->errMask)==rc );
   db->busyHandler.nBusy = 0;
   sqlite3_mutex_leave(db->mutex);
-  assert( rc==SQLITE_OK || (*ppStmt)==0 );
   return rc;
 }
 

src/resolve.c

@@ -1249,12 +1249,11 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){
           while( pNC2
               && sqlite3ReferencesSrcList(pParse, pExpr, pNC2->pSrcList)==0
           ){
-            pExpr->op2 += (1 + pNC2->nNestedSelect);
+            pExpr->op2++;
             pNC2 = pNC2->pNext;
           }
           assert( pDef!=0 || IN_RENAME_OBJECT );
           if( pNC2 && pDef ){
-            pExpr->op2 += pNC2->nNestedSelect;
             assert( SQLITE_FUNC_MINMAX==NC_MinMaxAgg );
             assert( SQLITE_FUNC_ANYORDER==NC_OrderAgg );
             testcase( (pDef->funcFlags & SQLITE_FUNC_MINMAX)!=0 );
@@ -1813,7 +1812,6 @@ static int resolveSelectStep(Walker *pWalker, Select *p){
  
     /* Recursively resolve names in all subqueries in the FROM clause
     */
-    if( pOuterNC ) pOuterNC->nNestedSelect++;
     for(i=0; i<p->pSrc->nSrc; i++){
       SrcItem *pItem = &p->pSrc->a[i];
       if( pItem->pSelect && (pItem->pSelect->selFlags & SF_Resolved)==0 ){
@@ -1838,9 +1836,6 @@ static int resolveSelectStep(Walker *pWalker, Select *p){
         }
       }
     }
-    if( pOuterNC && ALWAYS(pOuterNC->nNestedSelect>0) ){
-      pOuterNC->nNestedSelect--;
-    }
  
     /* Set up the local name-context to pass to sqlite3ResolveExprNames() to
     ** resolve the result-set expression list.

src/shell.c.in

@@ -251,7 +251,6 @@ INCLUDE ../ext/consio/console_io.h
 INCLUDE ../ext/consio/console_io.c
 
 #ifndef SQLITE_SHELL_FIDDLE
-
 /* From here onward, fgets() is redirected to the console_io library. */
 # define fgets(b,n,f) fGetsUtf8(b,n,f)
 /*
@@ -276,7 +275,6 @@ INCLUDE ../ext/consio/console_io.c
 # define eputz(z) ePutsUtf8(z)
 # define eputf ePrintfUtf8
 # define oputb(buf,na) oPutbUtf8(buf,na)
-
 #else
 /* For Fiddle, all console handling and emit redirection is omitted. */
 # define sputz(fp,z) fputs(z,fp)
@@ -360,7 +358,7 @@ static void endTimer(void){
     sqlite3_int64 iEnd = timeOfDay();
     struct rusage sEnd;
     getrusage(RUSAGE_SELF, &sEnd);
-    sputf(stdout, "Run Time: real %.3f user %f sys %f\n",
+    oputf("Run Time: real %.3f user %f sys %f\n",
           (iEnd - iBegin)*0.001,
           timeDiff(&sBegin.ru_utime, &sEnd.ru_utime),
           timeDiff(&sBegin.ru_stime, &sEnd.ru_stime));

src/sqlite.h.in

@@ -3954,17 +3954,15 @@ void sqlite3_free_filename(sqlite3_filename);
 ** </ul>
 **
 ** ^The sqlite3_errmsg() and sqlite3_errmsg16() return English-language
-** text that describes the error, as either UTF-8 or UTF-16 respectively,
-** or NULL if no error message is available.
+** text that describes the error, as either UTF-8 or UTF-16 respectively.
 ** (See how SQLite handles [invalid UTF] for exceptions to this rule.)
 ** ^(Memory to hold the error message string is managed internally.
 ** The application does not need to worry about freeing the result.
 ** However, the error string might be overwritten or deallocated by
 ** subsequent calls to other SQLite interface functions.)^
 **
-** ^The sqlite3_errstr(E) interface returns the English-language text
-** that describes the [result code] E, as UTF-8, or NULL if E is not an
-** result code for which a text error message is available.
+** ^The sqlite3_errstr() interface returns the English-language text
+** that describes the [result code], as UTF-8.
 ** ^(Memory to hold the error message string is managed internally
 ** and must not be freed by the application)^.
 **

src/sqliteInt.h

@@ -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), \
@@ -3399,7 +3399,6 @@ struct NameContext {
   int nRef;            /* Number of names resolved by this context */
   int nNcErr;          /* Number of errors encountered while resolving names */
   int ncFlags;         /* Zero or more NC_* flags defined below */
-  u32 nNestedSelect;   /* Number of nested selects using this NC */
   Select *pWinSelect;  /* SELECT statement for any window functions */
 };
 

src/test_hexio.c

@@ -190,7 +190,7 @@ static int SQLITE_TCLAPI hexio_write(
 }
 
 /*
-** USAGE:   hexio_get_int   HEXDATA
+** USAGE:   hexio_get_int [-littleendian] HEXDATA
 **
 ** Interpret the HEXDATA argument as a big-endian integer.  Return
 ** the value of that integer.  HEXDATA can contain between 2 and 8
@@ -207,12 +207,20 @@ static int SQLITE_TCLAPI hexio_get_int(
   const unsigned char *zIn;
   unsigned char *aOut;
   unsigned char aNum[4];
+  int bLittle = 0;
 
-  if( objc!=2 ){
-    Tcl_WrongNumArgs(interp, 1, objv, "HEXDATA");
+  if( objc==3 ){
+    int n;
+    char *z = Tcl_GetStringFromObj(objv[1], &n);
+    if( n>=2 && n<=13 && memcmp(z, "-littleendian", n)==0 ){
+      bLittle = 1;
+    }
+  }
+  if( (objc-bLittle)!=2 ){
+    Tcl_WrongNumArgs(interp, 1, objv, "[-littleendian] HEXDATA");
     return TCL_ERROR;
   }
-  zIn = (const unsigned char *)Tcl_GetStringFromObj(objv[1], &nIn);
+  zIn = (const unsigned char *)Tcl_GetStringFromObj(objv[1+bLittle], &nIn);
   aOut = sqlite3_malloc( 1 + nIn/2 );
   if( aOut==0 ){
     return TCL_ERROR;
@@ -225,7 +233,11 @@ static int SQLITE_TCLAPI hexio_get_int(
     memcpy(&aNum[4-nOut], aOut, nOut);
   }
   sqlite3_free(aOut);
-  val = (aNum[0]<<24) | (aNum[1]<<16) | (aNum[2]<<8) | aNum[3];
+  if( bLittle ){
+    val = (aNum[3]<<24) | (aNum[2]<<16) | (aNum[1]<<8) | aNum[0];
+  }else{
+    val = (aNum[0]<<24) | (aNum[1]<<16) | (aNum[2]<<8) | aNum[3];
+  }
   Tcl_SetObjResult(interp, Tcl_NewIntObj(val));
   return TCL_OK;
 }

src/test_tclsh.c

@@ -98,6 +98,7 @@ const char *sqlite3TestInit(Tcl_Interp *interp){
   extern int Fts5tcl_Init(Tcl_Interp *);
   extern int SqliteRbu_Init(Tcl_Interp*);
   extern int Sqlitetesttcl_Init(Tcl_Interp*);
+  extern int Bgckpt_Init(Tcl_Interp*);
 #if defined(SQLITE_ENABLE_FTS3) || defined(SQLITE_ENABLE_FTS4)
   extern int Sqlitetestfts3_Init(Tcl_Interp *interp);
 #endif
@@ -167,6 +168,8 @@ const char *sqlite3TestInit(Tcl_Interp *interp){
   Fts5tcl_Init(interp);
   SqliteRbu_Init(interp);
   Sqlitetesttcl_Init(interp);
+  Bgckpt_Init(interp);
+
 
 #if defined(SQLITE_ENABLE_FTS3) || defined(SQLITE_ENABLE_FTS4)
   Sqlitetestfts3_Init(interp);

src/treeview.c

@@ -781,7 +781,7 @@ void sqlite3TreeViewExpr(TreeView *pView, const Expr *pExpr, u8 moreToFollow){
       assert( pExpr->x.pList->nExpr==2 );
       pY = pExpr->x.pList->a[0].pExpr;
       pZ = pExpr->x.pList->a[1].pExpr;
-      sqlite3TreeViewLine(pView, "BETWEEN%s", zFlgs);
+      sqlite3TreeViewLine(pView, "BETWEEN");
       sqlite3TreeViewExpr(pView, pX, 1);
       sqlite3TreeViewExpr(pView, pY, 1);
       sqlite3TreeViewExpr(pView, pZ, 0);

src/vdbe.c

@@ -2034,7 +2034,7 @@ case OP_AddImm: {            /* in1 */
   pIn1 = &aMem[pOp->p1];
   memAboutToChange(p, pIn1);
   sqlite3VdbeMemIntegerify(pIn1);
-  *(u64*)&pIn1->u.i += (u64)pOp->p2;
+  pIn1->u.i += pOp->p2;
   break;
 }
 
@@ -7841,6 +7841,7 @@ case OP_JournalMode: {    /* out2 */
        || eNew==PAGER_JOURNALMODE_OFF
        || eNew==PAGER_JOURNALMODE_MEMORY
        || eNew==PAGER_JOURNALMODE_WAL
+       || eNew==PAGER_JOURNALMODE_WAL2
        || eNew==PAGER_JOURNALMODE_QUERY
   );
   assert( pOp->p1>=0 && pOp->p1<db->nDb );
@@ -7859,16 +7860,25 @@ case OP_JournalMode: {    /* out2 */
   /* Do not allow a transition to journal_mode=WAL for a database
   ** in temporary storage or if the VFS does not support shared memory
   */
-  if( eNew==PAGER_JOURNALMODE_WAL
+  if( isWalMode(eNew)
    && (sqlite3Strlen30(zFilename)==0           /* Temp file */
        || !sqlite3PagerWalSupported(pPager))   /* No shared-memory support */
   ){
     eNew = eOld;
   }
 
-  if( (eNew!=eOld)
-   && (eOld==PAGER_JOURNALMODE_WAL || eNew==PAGER_JOURNALMODE_WAL)
-  ){
+  if( eNew!=eOld && (isWalMode(eNew) || isWalMode(eOld)) ){
+
+    /* Prevent changing directly to wal2 from wal mode. And vice versa. */
+    if( isWalMode(eNew) && isWalMode(eOld) ){
+      rc = SQLITE_ERROR;
+      sqlite3VdbeError(p, "cannot change from %s to %s mode",
+          sqlite3JournalModename(eOld), sqlite3JournalModename(eNew)
+      );
+      goto abort_due_to_error;
+    }
+
+    /* Prevent switching into or out of wal/wal2 mode mid-transaction */
     if( !db->autoCommit || db->nVdbeRead>1 ){
       rc = SQLITE_ERROR;
       sqlite3VdbeError(p,
@@ -7876,31 +7886,34 @@ case OP_JournalMode: {    /* out2 */
           (eNew==PAGER_JOURNALMODE_WAL ? "into" : "out of")
       );
       goto abort_due_to_error;
-    }else{
-
-      if( eOld==PAGER_JOURNALMODE_WAL ){
-        /* If leaving WAL mode, close the log file. If successful, the call
-        ** to PagerCloseWal() checkpoints and deletes the write-ahead-log
-        ** file. An EXCLUSIVE lock may still be held on the database file
-        ** after a successful return.
-        */
-        rc = sqlite3PagerCloseWal(pPager, db);
-        if( rc==SQLITE_OK ){
-          sqlite3PagerSetJournalMode(pPager, eNew);
-        }
-      }else if( eOld==PAGER_JOURNALMODE_MEMORY ){
-        /* Cannot transition directly from MEMORY to WAL.  Use mode OFF
-        ** as an intermediate */
-        sqlite3PagerSetJournalMode(pPager, PAGER_JOURNALMODE_OFF);
-      }
+    }
  
-      /* Open a transaction on the database file. Regardless of the journal
-      ** mode, this transaction always uses a rollback journal.
+    if( isWalMode(eOld) ){
+      /* If leaving WAL mode, close the log file. If successful, the call
+      ** to PagerCloseWal() checkpoints and deletes the write-ahead-log 
+      ** file. An EXCLUSIVE lock may still be held on the database file 
+      ** after a successful return. 
       */
-      assert( sqlite3BtreeTxnState(pBt)!=SQLITE_TXN_WRITE );
+      rc = sqlite3PagerCloseWal(pPager, db);
       if( rc==SQLITE_OK ){
-        rc = sqlite3BtreeSetVersion(pBt, (eNew==PAGER_JOURNALMODE_WAL ? 2 : 1));
+        sqlite3PagerSetJournalMode(pPager, eNew);
       }
+    }else if( eOld==PAGER_JOURNALMODE_MEMORY ){
+      /* Cannot transition directly from MEMORY to WAL.  Use mode OFF
+      ** as an intermediate */
+      sqlite3PagerSetJournalMode(pPager, PAGER_JOURNALMODE_OFF);
+    }
+
+    /* Open a transaction on the database file. Regardless of the journal
+    ** mode, this transaction always uses a rollback journal.
+    */
+    assert( sqlite3BtreeTxnState(pBt)!=SQLITE_TXN_WRITE );
+    if( rc==SQLITE_OK ){
+      /* 1==rollback, 2==wal, 3==wal2 */
+      rc = sqlite3BtreeSetVersion(pBt, 
+          1 + isWalMode(eNew) + (eNew==PAGER_JOURNALMODE_WAL2)
+      );
+
     }
   }
 #endif /* ifndef SQLITE_OMIT_WAL */
@@ -8322,7 +8335,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 );
@@ -8340,9 +8352,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);

src/vdbeapi.c

@@ -152,15 +152,7 @@ int sqlite3_clear_bindings(sqlite3_stmt *pStmt){
   int rc = SQLITE_OK;
   Vdbe *p = (Vdbe*)pStmt;
 #if SQLITE_THREADSAFE
-  sqlite3_mutex *mutex;
-#endif
-#ifdef SQLITE_ENABLE_API_ARMOR
-  if( pStmt==0 ){
-    return SQLITE_MISUSE_BKPT;
-  }
-#endif
-#if SQLITE_THREADSAFE
-  mutex = p->db->mutex;
+  sqlite3_mutex *mutex = ((Vdbe*)pStmt)->db->mutex;
 #endif
   sqlite3_mutex_enter(mutex);
   for(i=0; i<p->nVar; i++){
@@ -950,8 +942,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;
 }
 

src/vdbeaux.c

@@ -1527,7 +1527,7 @@ static void SQLITE_NOINLINE vdbeChangeP4Full(
   int n
 ){
   if( pOp->p4type ){
-    assert( pOp->p4type > P4_FREE_IF_LE );
+    freeP4(p->db, pOp->p4type, pOp->p4.p);
     pOp->p4type = 0;
     pOp->p4.p = 0;
   }
@@ -2917,7 +2917,8 @@ static int vdbeCommit(sqlite3 *db, Vdbe *p){
         /* OFF       */ 0,
         /* TRUNCATE  */ 1,
         /* MEMORY    */ 0,
-        /* WAL       */ 0
+        /* WAL       */ 0,
+        /* WAL2      */ 0
       };
       Pager *pPager;   /* Pager associated with pBt */
       needXcommit = 1;

src/wal.h

@@ -26,7 +26,7 @@
 #define CKPT_SYNC_FLAGS(X)  (((X)>>2)&0x03)
 
 #ifdef SQLITE_OMIT_WAL
-# define sqlite3WalOpen(x,y,z)                   0
+# define sqlite3WalOpen(w,x,y,z)                 0
 # define sqlite3WalLimit(x,y)
 # define sqlite3WalClose(v,w,x,y,z)              0
 # define sqlite3WalBeginReadTransaction(y,z)     0
@@ -45,6 +45,7 @@
 # define sqlite3WalFramesize(z)                  0
 # define sqlite3WalFindFrame(x,y,z)              0
 # define sqlite3WalFile(x)                       0
+# define sqlite3WalJournalMode(x)                0
 # undef SQLITE_USE_SEH
 #else
 
@@ -56,7 +57,7 @@
 typedef struct Wal Wal;
 
 /* Open and close a connection to a write-ahead log. */
-int sqlite3WalOpen(sqlite3_vfs*, sqlite3_file*, const char *, int, i64, Wal**);
+int sqlite3WalOpen(sqlite3_vfs*, sqlite3_file*, const char *,int,i64,int,Wal**);
 int sqlite3WalClose(Wal *pWal, sqlite3*, int sync_flags, int, u8 *);
 
 /* Set the limiting size of a WAL file. */
@@ -147,6 +148,9 @@ int sqlite3WalFramesize(Wal *pWal);
 /* Return the sqlite3_file object for the WAL file */
 sqlite3_file *sqlite3WalFile(Wal *pWal);
 
+/* Return the journal mode (WAL or WAL2) used by this Wal object. */
+int sqlite3WalJournalMode(Wal *pWal);
+
 #ifdef SQLITE_ENABLE_SETLK_TIMEOUT
 int sqlite3WalWriteLock(Wal *pWal, int bLock);
 void sqlite3WalDb(Wal *pWal, sqlite3 *db);

src/where.c

@@ -678,22 +678,12 @@ static void translateColumnToCopy(
   for(; iStart<iEnd; iStart++, pOp++){
     if( pOp->p1!=iTabCur ) continue;
     if( pOp->opcode==OP_Column ){
-#ifdef SQLITE_DEBUG
-      if( pParse->db->flags & SQLITE_VdbeAddopTrace ){
-        printf("TRANSLATE OP_Column to OP_Copy at %d\n", iStart);
-      }
-#endif
       pOp->opcode = OP_Copy;
       pOp->p1 = pOp->p2 + iRegister;
       pOp->p2 = pOp->p3;
       pOp->p3 = 0;
       pOp->p5 = 2;  /* Cause the MEM_Subtype flag to be cleared */
     }else if( pOp->opcode==OP_Rowid ){
-#ifdef SQLITE_DEBUG
-      if( pParse->db->flags & SQLITE_VdbeAddopTrace ){
-        printf("TRANSLATE OP_Rowid to OP_Sequence at %d\n", iStart);
-      }
-#endif
       pOp->opcode = OP_Sequence;
       pOp->p1 = iAutoidxCur;
 #ifdef SQLITE_ALLOW_ROWID_IN_VIEW

test/aggnested.test

@@ -358,119 +358,7 @@ do_execsql_test 6.2.2 {
   FROM t2 GROUP BY 'constant_string';
 } {{}}
 
-#-------------------------------------------------------------------------
-reset_db
 
-do_execsql_test 7.0 {
-  CREATE TABLE invoice (
-      id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
-      amount DOUBLE PRECISION DEFAULT NULL,
-      name VARCHAR(100) DEFAULT NULL
-  );
-
-  INSERT INTO invoice (amount, name) VALUES 
-      (4.0, 'Michael'), (15.0, 'Bara'), (4.0, 'Michael'), (6.0, 'John');
-}
-
-do_execsql_test 7.1 {
-  SELECT sum(amount), name
-    from invoice
-  group by name
-  having (select v > 6 from (select sum(amount) v) t)
-} {
-  15.0 Bara
-  8.0 Michael
-}
-
-do_execsql_test 7.2 {
-  SELECT (select 1 from (select sum(amount))) FROM invoice
-} {1}
-
-do_execsql_test 8.0 {
-  CREATE TABLE t1(x INT);
-  INSERT INTO t1 VALUES(100);
-  INSERT INTO t1 VALUES(20);
-  INSERT INTO t1 VALUES(3);
-  SELECT (SELECT y FROM (SELECT sum(x) AS y) AS t2 ) FROM t1;
-} {123}
-
-do_execsql_test 8.1 {
-  SELECT (
-    SELECT y FROM (
-      SELECT z AS y FROM (SELECT sum(x) AS z) AS t2 
-    ) 
-  ) FROM t1;
-} {123}
-
-do_execsql_test 8.2 {
-  SELECT (
-    SELECT a FROM (
-      SELECT y AS a FROM (
-        SELECT z AS y FROM (SELECT sum(x) AS z) AS t2 
-      ) 
-    )
-  ) FROM t1;
-} {123}
-
-#-------------------------------------------------------------------------
-# dbsqlfuzz 04408efc51ae46897c4c122b407412045ed221b4
-#
-reset_db
-
-do_execsql_test 9.1 {
-  WITH out(i, j, k) AS ( 
-      VALUES(1234, 5678, 9012) 
-  )
-  SELECT (
-    SELECT (
-      SELECT min(abc) = ( SELECT ( SELECT 1234 fROM (SELECT abc) ) ) 
-      FROM (
-        SELECT sum( out.i ) + ( SELECT sum( out.i ) ) AS abc FROM (SELECT out.j)
-      )
-    ) 
-  ) FROM out;
-} {0}
-
-do_execsql_test 9.2 {
-  CREATE TABLE t1(a);
-  CREATE TABLE t2(b);
-  INSERT INTO t1 VALUES(1), (2), (3);
-  INSERT INTO t2 VALUES(4), (5), (6);
-
-  SELECT ( 
-    SELECT min(y) + (SELECT x) FROM (
-      SELECT sum(a) AS x, b AS y FROM t2
-    )
-  )
-  FROM t1;
-} {10}
-
-do_execsql_test 9.3 {
-  SELECT ( 
-    SELECT min(y) + (SELECT (SELECT x)) FROM (
-      SELECT sum(a) AS x, b AS y FROM t2
-    )
-  )
-  FROM t1;
-} {10}
-
-do_execsql_test 9.4 {
-  SELECT (
-    SELECT (SELECT x) FROM (
-      SELECT sum(a) AS x, b AS y FROM t2
-      ) GROUP BY y
-    )
-  FROM t1;
-} {6}
-
-do_execsql_test 9.5 {
-  SELECT (
-    SELECT (SELECT (SELECT x)) FROM (
-      SELECT sum(a) AS x, b AS y FROM t2
-      ) GROUP BY y
-    )
-  FROM t1;
-} {6}
 
  
 

test/corruptA.test

@@ -47,7 +47,7 @@ db close
 forcecopy test.db test.db-template
 
 set unreadable_version 02
-ifcapable wal { set unreadable_version 03 }
+ifcapable wal { set unreadable_version 04 }
 do_test corruptA-2.1 {
   forcecopy test.db-template test.db
   hexio_write test.db 19 $unreadable_version   ;# the read format number

test/date.test

@@ -146,8 +146,6 @@ datetest 2.49 {datetime('2003-10-22 12:24','0000 second')} {2003-10-22 12:24:00}
 datetest 2.50 {datetime('2003-10-22 12:24','0001 second')} {2003-10-22 12:24:01}
 datetest 2.51 {datetime('2003-10-22 12:24','nonsense')} NULL
 
-datetest 2.60 {datetime('2023-02-31')} {2023-03-03 00:00:00}
-
 datetest 3.1 {strftime('%d','2003-10-31 12:34:56.432')} 31
 datetest 3.2.1 {strftime('pre%fpost','2003-10-31 12:34:56.432')} pre56.432post
 datetest 3.2.2 {strftime('%f','2003-10-31 12:34:59.9999999')} 59.999
@@ -454,9 +452,6 @@ datetest 13.31 {date('2001-01-01','+1.5 years')} {2002-07-02}
 datetest 13.32 {date('2002-01-01','+1.5 years')} {2003-07-02}
 datetest 13.33 {date('2002-01-01','-1.5 years')} {2000-07-02}
 datetest 13.34 {date('2001-01-01','-1.5 years')} {1999-07-02}
-datetest 13.35 {date('2023-02-28')} {2023-02-28}
-datetest 13.36 {date('2023-02-29')} {2023-03-01}
-datetest 13.37 {date('2023-04-31')} {2023-05-01}
 
 # Test for issues reported by BareFeet (list.sql at tandb.com.au)
 # on mailing list on 2008-06-12.

test/json/json-q1-b.txt

@@ -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');

test/json/json-speed-check.sh

@@ -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

test/json101.test

@@ -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,4 +1054,6 @@ do_execsql_test json101-23.2 {
     FROM (SELECT json_set('[]','$[#]',0,'$[#]',1) AS j);
 } {{[0,1]} 0 1}
 
+
+
 finish_test

test/json102.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)

test/json105.test

@@ -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

test/json501.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}}}

test/jsonb01.test

@@ -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

test/permutations.test

@@ -464,18 +464,21 @@ lappend ::testsuitelist xxx
 test_suite "coverage-wal" -description {
   Coverage tests for file wal.c.
 } -files {
-  wal.test wal2.test wal3.test wal4.test wal5.test
+  wal2big.test wal2recover.test wal2rewrite.test
+  wal2simple.test wal2snapshot.test wal2.test
+  wal3.test wal4.test wal5.test
   wal64k.test wal6.test wal7.test wal8.test wal9.test
-  walbak.test walbig.test walblock.test walcksum.test walcrash2.test
-  walcrash3.test walcrash4.test walcrash.test walfault.test walhook.test
-  walmode.test walnoshm.test waloverwrite.test walpersist.test 
-  walprotocol2.test walprotocol.test walro2.test walrofault.test 
-  walro.test walshared.test walslow.test walvfs.test
-  walfault2.test
-  nockpt.test
-
+  walbak.test walbig.test walblock.test walcksum.test 
+  walfault.test walhook.test walmode.test walnoshm.test
+  waloverwrite.test walpersist.test walprotocol2.test
+  walprotocol.test walro2.test walrofault.test walro.test
+  walshared.test walslow.test wal.test
+  wal2savepoint.test wal2lock.test wal2recover2.test
+  walvfs.test walfault2.test nockpt.test
   snapshot2.test snapshot3.test snapshot4.test
   snapshot_fault.test snapshot.test snapshot_up.test
+  walcrash2.test walcrash3.test walcrash4.test walcrash.test
+  wal2fault.test
 } 
 
 test_suite "coverage-pager" -description {
@@ -1033,6 +1036,23 @@ test_suite "wal" -description {
   fts3c.test   fts3d.test   fts3e.test   fts3query.test 
 }
 
+test_suite "wal2" -description {
+  Run tests with journal_mode=WAL2
+} -initialize {
+  set ::G(savepoint6_iterations) 100
+} -shutdown {
+  unset -nocomplain ::G(savepoint6_iterations)
+} -files {
+  savepoint.test     savepoint2.test     savepoint6.test
+  trans.test         avtrans.test
+
+  fts3aa.test  fts3ab.test  fts3ac.test  fts3ad.test
+  fts3ae.test  fts3af.test  fts3ag.test  fts3ah.test
+  fts3ai.test  fts3aj.test  fts3ak.test  fts3al.test
+  fts3am.test  fts3an.test  fts3ao.test  fts3b.test
+  fts3c.test   fts3d.test   fts3e.test   fts3query.test 
+}
+
 test_suite "rtree" -description {
   All R-tree related tests. Provides coverage of source file rtree.c.
 } -files [glob -nocomplain $::testdir/../ext/rtree/*.test]

test/rdonly.test

@@ -41,7 +41,7 @@ do_test rdonly-1.1.1 {
   sqlite3_db_readonly db main
 } {0}
 
-# Changes the write version from 1 to 3.  Verify that the database
+# Changes the write version from 1 to 4.  Verify that the database
 # can be read but not written.
 #
 do_test rdonly-1.2 {
@@ -49,7 +49,7 @@ do_test rdonly-1.2 {
   hexio_get_int [hexio_read test.db 18 1]
 } 1
 do_test rdonly-1.3 {
-  hexio_write test.db 18 03
+  hexio_write test.db 18 04
   sqlite3 db test.db
   execsql {
     SELECT * FROM t1;
@@ -83,7 +83,7 @@ do_test rdonly-1.5 {
 # the database is read-only until after it is locked.
 #
 set ro_version 02
-ifcapable wal { set ro_version 03 }
+ifcapable wal { set ro_version 04 }
 do_test rdonly-1.6 {
   hexio_write test.db 18 $ro_version     ; # write-version
   hexio_write test.db 24 11223344        ; # change-counter

test/releasetest_data.tcl

@@ -0,0 +1,845 @@
+# 2019 August 01
+#
+# 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 program that produces scripts (either shell scripts
+# or batch files) to implement a particular test that is part of the SQLite
+# release testing procedure. For example, to run veryquick.test with a 
+# specified set of -D compiler switches.
+#
+# A "configuration" is a set of options passed to [./configure] and [make]
+# to build the SQLite library in a particular fashion. A "platform" is a
+# list of tests; most platforms are named after the hardware/OS platform
+# that the tests will be run on as part of the release procedure. Each 
+# "test" is a combination of a configuration and a makefile target (e.g.
+# "fulltest"). The program may be invoked as follows:
+#
+set USAGE {
+$argv0 script ?-msvc? CONFIGURATION TARGET
+    Given a configuration and make target, return a bash (or, if -msvc
+    is specified, batch) script to execute the test. The first argument
+    passed to the script must be a directory containing SQLite source code.
+
+$argv0 configurations
+    List available configurations.
+
+$argv0 platforms
+    List available platforms.
+
+$argv0 tests ?-nodebug? PLATFORM
+    List tests in a specified platform. If the -nodebug switch is 
+    specified, synthetic debug/ndebug configurations are omitted. Each
+    test is a combination of a configuration and a makefile target.
+}
+
+# Omit comments (text between # and \n) in a long multi-line string.
+#
+proc strip_comments {in} {
+  regsub -all {#[^\n]*\n} $in {} out
+  return $out
+}
+
+array set ::Configs [strip_comments {
+  "Default" {
+    -O2
+    --disable-amalgamation --disable-shared
+    --enable-session
+    -DSQLITE_ENABLE_RBU
+  }
+  "All-Debug" {
+    --enable-debug --enable-all
+  }
+  "All-O0" {
+    -O0 --enable-all
+  }
+  "Sanitize" {
+    CC=clang -fsanitize=address,undefined
+    -DSQLITE_ENABLE_STAT4
+    -DCONFIG_SLOWDOWN_FACTOR=5.0
+    --enable-debug
+    --enable-all
+  }
+  "Stdcall" {
+    -DUSE_STDCALL=1
+    -O2
+  }
+  "Have-Not" {
+    # The "Have-Not" configuration sets all possible -UHAVE_feature options
+    # in order to verify that the code works even on platforms that lack
+    # these support services.
+    -DHAVE_FDATASYNC=0
+    -DHAVE_GMTIME_R=0
+    -DHAVE_ISNAN=0
+    -DHAVE_LOCALTIME_R=0
+    -DHAVE_LOCALTIME_S=0
+    -DHAVE_MALLOC_USABLE_SIZE=0
+    -DHAVE_STRCHRNUL=0
+    -DHAVE_USLEEP=0
+    -DHAVE_UTIME=0
+  }
+  "Unlock-Notify" {
+    -O2
+    -DSQLITE_ENABLE_UNLOCK_NOTIFY
+    -DSQLITE_THREADSAFE
+    -DSQLITE_TCL_DEFAULT_FULLMUTEX=1
+  }
+  "User-Auth" {
+    -O2
+    -DSQLITE_USER_AUTHENTICATION=1
+  }
+  "Secure-Delete" {
+    -O2
+    -DSQLITE_SECURE_DELETE=1
+    -DSQLITE_SOUNDEX=1
+  }
+  "Update-Delete-Limit" {
+    -O2
+    -DSQLITE_DEFAULT_FILE_FORMAT=4
+    -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT=1
+    -DSQLITE_ENABLE_STMT_SCANSTATUS
+    -DSQLITE_LIKE_DOESNT_MATCH_BLOBS
+    -DSQLITE_ENABLE_CURSOR_HINTS
+  }
+  "Check-Symbols" {
+    -DSQLITE_MEMDEBUG=1
+    -DSQLITE_ENABLE_FTS3_PARENTHESIS=1
+    -DSQLITE_ENABLE_FTS3=1
+    -DSQLITE_ENABLE_RTREE=1
+    -DSQLITE_ENABLE_MEMSYS5=1
+    -DSQLITE_ENABLE_MEMSYS3=1
+    -DSQLITE_ENABLE_COLUMN_METADATA=1
+    -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT=1
+    -DSQLITE_SECURE_DELETE=1
+    -DSQLITE_SOUNDEX=1
+    -DSQLITE_ENABLE_ATOMIC_WRITE=1
+    -DSQLITE_ENABLE_MEMORY_MANAGEMENT=1
+    -DSQLITE_ENABLE_OVERSIZE_CELL_CHECK=1
+    -DSQLITE_ENABLE_STAT4
+    -DSQLITE_ENABLE_STMT_SCANSTATUS
+    --enable-fts5 --enable-session
+  }
+  "Debug-One" {
+    --disable-shared
+    -O2 -funsigned-char
+    -DSQLITE_DEBUG=1
+    -DSQLITE_MEMDEBUG=1
+    -DSQLITE_MUTEX_NOOP=1
+    -DSQLITE_TCL_DEFAULT_FULLMUTEX=1
+    -DSQLITE_ENABLE_FTS3=1
+    -DSQLITE_ENABLE_RTREE=1
+    -DSQLITE_ENABLE_MEMSYS5=1
+    -DSQLITE_ENABLE_COLUMN_METADATA=1
+    -DSQLITE_ENABLE_STAT4
+    -DSQLITE_ENABLE_HIDDEN_COLUMNS
+    -DSQLITE_MAX_ATTACHED=125
+    -DSQLITE_MUTATION_TEST
+    --enable-fts5
+  }
+  "Debug-Two" {
+    -DSQLITE_DEFAULT_MEMSTATUS=0
+    -DSQLITE_MAX_EXPR_DEPTH=0
+    --enable-debug
+  }
+  "Fast-One" {
+    -O6
+    -DSQLITE_ENABLE_FTS4=1
+    -DSQLITE_ENABLE_RTREE=1
+    -DSQLITE_ENABLE_STAT4
+    -DSQLITE_ENABLE_RBU
+    -DSQLITE_MAX_ATTACHED=125
+    -DSQLITE_MAX_MMAP_SIZE=12884901888
+    -DSQLITE_ENABLE_SORTER_MMAP=1
+    -DLONGDOUBLE_TYPE=double
+    --enable-session
+  }
+  "Device-One" {
+    -O2
+    -DSQLITE_DEBUG=1
+    -DSQLITE_DEFAULT_AUTOVACUUM=1
+    -DSQLITE_DEFAULT_CACHE_SIZE=64
+    -DSQLITE_DEFAULT_PAGE_SIZE=1024
+    -DSQLITE_DEFAULT_TEMP_CACHE_SIZE=32
+    -DSQLITE_DISABLE_LFS=1
+    -DSQLITE_ENABLE_ATOMIC_WRITE=1
+    -DSQLITE_ENABLE_IOTRACE=1
+    -DSQLITE_ENABLE_MEMORY_MANAGEMENT=1
+    -DSQLITE_MAX_PAGE_SIZE=4096
+    -DSQLITE_OMIT_LOAD_EXTENSION=1
+    -DSQLITE_OMIT_PROGRESS_CALLBACK=1
+    -DSQLITE_OMIT_VIRTUALTABLE=1
+    -DSQLITE_ENABLE_HIDDEN_COLUMNS
+    -DSQLITE_TEMP_STORE=3
+  }
+  "Device-Two" {
+    -DSQLITE_4_BYTE_ALIGNED_MALLOC=1
+    -DSQLITE_DEFAULT_AUTOVACUUM=1
+    -DSQLITE_DEFAULT_CACHE_SIZE=1000
+    -DSQLITE_DEFAULT_LOCKING_MODE=0
+    -DSQLITE_DEFAULT_PAGE_SIZE=1024
+    -DSQLITE_DEFAULT_TEMP_CACHE_SIZE=1000
+    -DSQLITE_DISABLE_LFS=1
+    -DSQLITE_ENABLE_FTS3=1
+    -DSQLITE_ENABLE_MEMORY_MANAGEMENT=1
+    -DSQLITE_ENABLE_RTREE=1
+    -DSQLITE_MAX_COMPOUND_SELECT=50
+    -DSQLITE_MAX_PAGE_SIZE=32768
+    -DSQLITE_OMIT_TRACE=1
+    -DSQLITE_TEMP_STORE=3
+    -DSQLITE_THREADSAFE=2
+    --enable-fts5 --enable-session
+  }
+  "Locking-Style" {
+    -O2
+    -DSQLITE_ENABLE_LOCKING_STYLE=1
+  }
+  "Apple" {
+    -Os
+    -DHAVE_GMTIME_R=1
+    -DHAVE_ISNAN=1
+    -DHAVE_LOCALTIME_R=1
+    -DHAVE_PREAD=1
+    -DHAVE_PWRITE=1
+    -DHAVE_UTIME=1
+    -DSQLITE_DEFAULT_CACHE_SIZE=1000
+    -DSQLITE_DEFAULT_CKPTFULLFSYNC=1
+    -DSQLITE_DEFAULT_MEMSTATUS=1
+    -DSQLITE_DEFAULT_PAGE_SIZE=1024
+    -DSQLITE_DISABLE_PAGECACHE_OVERFLOW_STATS=1
+    -DSQLITE_ENABLE_API_ARMOR=1
+    -DSQLITE_ENABLE_AUTO_PROFILE=1
+    -DSQLITE_ENABLE_FLOCKTIMEOUT=1
+    -DSQLITE_ENABLE_FTS3=1
+    -DSQLITE_ENABLE_FTS3_PARENTHESIS=1
+    -DSQLITE_ENABLE_FTS3_TOKENIZER=1
+    -DSQLITE_ENABLE_PERSIST_WAL=1
+    -DSQLITE_ENABLE_PURGEABLE_PCACHE=1
+    -DSQLITE_ENABLE_RTREE=1
+    -DSQLITE_ENABLE_SNAPSHOT=1
+    # -DSQLITE_ENABLE_SQLLOG=1
+    -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT=1
+    -DSQLITE_MAX_LENGTH=2147483645
+    -DSQLITE_MAX_VARIABLE_NUMBER=500000
+    # -DSQLITE_MEMDEBUG=1
+    -DSQLITE_NO_SYNC=1
+    -DSQLITE_OMIT_AUTORESET=1
+    -DSQLITE_OMIT_LOAD_EXTENSION=1
+    -DSQLITE_PREFER_PROXY_LOCKING=1
+    -DSQLITE_SERIES_CONSTRAINT_VERIFY=1
+    -DSQLITE_THREADSAFE=2
+    -DSQLITE_USE_URI=1
+    -DSQLITE_WRITE_WALFRAME_PREBUFFERED=1
+    -DUSE_GUARDED_FD=1
+    -DUSE_PREAD=1
+    --enable-fts5
+  }
+  "Extra-Robustness" {
+    -DSQLITE_ENABLE_OVERSIZE_CELL_CHECK=1
+    -DSQLITE_MAX_ATTACHED=62
+  }
+  "Devkit" {
+    -DSQLITE_DEFAULT_FILE_FORMAT=4
+    -DSQLITE_MAX_ATTACHED=30
+    -DSQLITE_ENABLE_COLUMN_METADATA
+    -DSQLITE_ENABLE_FTS4
+    -DSQLITE_ENABLE_FTS5
+    -DSQLITE_ENABLE_FTS4_PARENTHESIS
+    -DSQLITE_DISABLE_FTS4_DEFERRED
+    -DSQLITE_ENABLE_RTREE
+    --enable-fts5
+  }
+  "No-lookaside" {
+    -DSQLITE_TEST_REALLOC_STRESS=1
+    -DSQLITE_OMIT_LOOKASIDE=1
+  }
+  "Valgrind" {
+    -DSQLITE_ENABLE_STAT4
+    -DSQLITE_ENABLE_FTS4
+    -DSQLITE_ENABLE_RTREE
+    -DSQLITE_ENABLE_HIDDEN_COLUMNS
+    -DLONGDOUBLE_TYPE=double
+    -DCONFIG_SLOWDOWN_FACTOR=8.0
+  }
+
+  "Windows-Memdebug" {
+    MEMDEBUG=1
+    DEBUG=3
+  }
+  "Windows-Win32Heap" {
+    WIN32HEAP=1
+    DEBUG=4
+  }
+
+  # The next group of configurations are used only by the
+  # Failure-Detection platform.  They are all the same, but we need
+  # different names for them all so that they results appear in separate
+  # subdirectories.
+  #
+  Fail0     {-O0}
+  Fail2     {-O0}
+  Fail3     {-O0}
+  Fail4     {-O0}
+  FuzzFail1 {-O0}
+  FuzzFail2 {-O0}
+}]
+if {$tcl_platform(os)=="Darwin"} {
+  lappend Configs(Apple) -DSQLITE_ENABLE_LOCKING_STYLE=1
+}
+
+array set ::Platforms [strip_comments {
+  Linux-x86_64 {
+    "Check-Symbols*"          "" checksymbols
+    "Fast-One"                QUICKTEST_INCLUDE=rbu.test "fuzztest test"
+    "Debug-One"               "" "mptest test"
+    "Debug-Two"               "" test
+    "Have-Not"                "" test
+    "Secure-Delete"           "" test
+    "Unlock-Notify"           QUICKTEST_INCLUDE=notify2.test test
+    "User-Auth"               "" tcltest
+    "Update-Delete-Limit"     "" test
+    "Extra-Robustness"        "" test
+    "Device-Two"              "" "threadtest test"
+    "No-lookaside"            "" test
+    "Devkit"                  "" test
+    "Apple"                   "" test
+    "Sanitize*"               "" test
+    "Device-One"              "" alltest
+    "Default"                 "" "threadtest fuzztest alltest"
+    "Valgrind*"               "" valgrindtest
+  }
+  Linux-i686 {
+    "Devkit"                  "" test
+    "Have-Not"                "" test
+    "Unlock-Notify"           QUICKTEST_INCLUDE=notify2.test test
+    "Device-One"              "" test
+    "Device-Two"              "" test
+    "Default"                 "" "threadtest fuzztest alltest"
+  }
+  Darwin-i386 {
+    "Locking-Style"           "" "mptest test"
+    "Have-Not"                "" test
+    "Apple"                   "" "threadtest fuzztest alltest"
+  }
+  Darwin-x86_64 {
+    "Locking-Style"           "" "mptest test"
+    "Have-Not"                "" test
+    "Apple"                   "" "threadtest fuzztest alltest"
+  }
+  Darwin-arm64 {
+    "Locking-Style"           "" "mptest test"
+    "Have-Not"                "" test
+    "Apple"                   "" "threadtest fuzztest alltest"
+  }
+  "Windows NT-intel" {
+    "Stdcall"                 "" test
+    "Have-Not"                "" test
+    "Windows-Memdebug*"       "" test
+    "Windows-Win32Heap*"      "" test
+    "Default"                 "" "mptest fulltestonly"
+  }
+  "Windows NT-amd64" {
+    "Stdcall"                 "" test
+    "Have-Not"                "" test
+    "Windows-Memdebug*"       "" test
+    "Windows-Win32Heap*"      "" test
+    "Default"                 "" "mptest fulltestonly"
+  }
+
+  # The Failure-Detection platform runs various tests that deliberately
+  # fail.  This is used as a test of this script to verify that this script
+  # correctly identifies failures.
+  #
+  Failure-Detection {
+    Fail0*     "TEST_FAILURE=0" test
+    Sanitize*  "TEST_FAILURE=1" test
+    Fail2*     "TEST_FAILURE=2" valgrindtest
+    Fail3*     "TEST_FAILURE=3" valgrindtest
+    Fail4*     "TEST_FAILURE=4" test
+    FuzzFail1* "TEST_FAILURE=5" test
+    FuzzFail2* "TEST_FAILURE=5" valgrindtest
+  }
+}]
+
+#--------------------------------------------------------------------------
+#--------------------------------------------------------------------------
+#--------------------------------------------------------------------------
+# End of configuration section.
+#--------------------------------------------------------------------------
+#--------------------------------------------------------------------------
+#--------------------------------------------------------------------------
+
+# Configuration verification: Check that each entry in the list of configs
+# specified for each platforms exists.
+#
+foreach {key value} [array get ::Platforms] {
+  foreach {v vars t} $value {
+    if {[string range $v end end]=="*"} {
+      set v [string range $v 0 end-1]
+    }
+    if {0==[info exists ::Configs($v)]} {
+      puts stderr "No such configuration: \"$v\""
+      exit -1
+    }
+  }
+}
+
+proc usage {} {
+  global argv0
+  puts stderr [subst $::USAGE]
+  exit 1
+}
+
+proc is_prefix {p str min} {
+  set n [string length $p]
+  if {$n<$min} { return 0 }
+  if {[string range $str 0 [expr $n-1]]!=$p} { return 0 }
+  return 1
+}
+
+proc main_configurations {} {
+  foreach k [lsort [array names ::Configs]] {
+    puts $k
+  }
+}
+
+proc main_platforms {} {
+  foreach k [lsort [array names ::Platforms]] {
+    puts "\"$k\""
+  }
+}
+
+proc main_script {args} {
+  set bMsvc 0
+  set nArg [llength $args]
+  if {$nArg==3} {
+    if {![is_prefix [lindex $args 0] -msvc 2]} usage
+    set bMsvc 1
+  } elseif {$nArg<2 || $nArg>3} {
+    usage
+  }
+  set config [lindex $args end-1]
+  set target [lindex $args end]
+
+  set opts       [list]                         ;# OPTS value
+  set cflags     [expr {$bMsvc ? "-Zi" : "-g"}] ;# CFLAGS value
+  set makeOpts   [list]                         ;# Extra args for [make]
+  set configOpts [list]                         ;# Extra args for [configure]
+
+  if {$::tcl_platform(platform)=="windows" || $bMsvc} {
+    lappend opts -DSQLITE_OS_WIN=1
+  } else {
+    lappend opts -DSQLITE_OS_UNIX=1
+  }
+
+  # Figure out if this is a synthetic ndebug or debug configuration.
+  #
+  set bRemoveDebug 0
+  if {[string match *-ndebug $config]} {
+    set bRemoveDebug 1
+    set config [string range $config 0 end-7]
+  }
+  if {[string match *-debug $config]} {
+    lappend opts -DSQLITE_DEBUG
+    lappend opts -DSQLITE_EXTRA_IFNULLROW
+    set config [string range $config 0 end-6]
+  }
+  regexp {^(.*)-[0-9]+} $config -> config
+
+  # Ensure that the named configuration exists.
+  #
+  if {![info exists ::Configs($config)]} {
+    puts stderr "No such config: $config"
+    exit 1
+  }
+
+  # Loop through the parameters of the nominated configuration, updating
+  # $opts, $cflags, $makeOpts and $configOpts along the way. Rules are as
+  # follows:
+  #
+  #   1. If the parameter begins with a "*", discard it.
+  #
+  #   2. If $bRemoveDebug is set and the parameter is -DSQLITE_DEBUG or
+  #      -DSQLITE_DEBUG=1, discard it
+  #
+  #   3. If the parameter begins with "-D", add it to $opts.
+  #
+  #   4. If the parameter begins with "--" add it to $configOpts. Unless
+  #      this command is preparing a script for MSVC - then add an 
+  #      equivalent to $makeOpts or $opts.
+  #
+  #   5. If the parameter begins with "-" add it to $cflags. If in MSVC
+  #      mode and the parameter is an -O<integer> option, instead add
+  #      an OPTIMIZATIONS=<integer> switch to $makeOpts.
+  #
+  #   6. If none of the above apply, add the parameter to $makeOpts
+  #
+  foreach param $::Configs($config) {
+    if {[string range $param 0 0]=="*"} continue
+
+    if {$bRemoveDebug} {
+      if {$param=="-DSQLITE_DEBUG" || $param=="-DSQLITE_DEBUG=1"
+       || $param=="-DSQLITE_MEMDEBUG" || $param=="-DSQLITE_MEMDEBUG=1"
+       || $param=="--enable-debug"
+      } {
+        continue
+      }
+    }
+
+    if {[string range $param 0 1]=="-D"} {
+      lappend opts $param
+      continue
+    }
+
+    if {[string range $param 0 1]=="--"} {
+      if {$bMsvc} {
+        switch -- $param {
+          --disable-amalgamation {
+            lappend makeOpts USE_AMALGAMATION=0
+          }
+          --disable-shared {
+            lappend makeOpts USE_CRT_DLL=0 DYNAMIC_SHELL=0
+          }
+          --enable-fts5 {
+            lappend opts -DSQLITE_ENABLE_FTS5
+          } 
+          --enable-shared {
+            lappend makeOpts USE_CRT_DLL=1 DYNAMIC_SHELL=1
+          }
+          --enable-session {
+            lappend opts -DSQLITE_ENABLE_PREUPDATE_HOOK
+            lappend opts -DSQLITE_ENABLE_SESSION
+          }
+          default {
+            error "Cannot translate $param for MSVC"
+          }
+        }
+      } else {
+        lappend configOpts $param
+      }
+
+      continue
+    }
+
+    if {[string range $param 0 0]=="-"} {
+      if {$bMsvc && [regexp -- {^-O(\d+)$} $param -> level]} {
+        lappend makeOpts OPTIMIZATIONS=$level
+      } else {
+        lappend cflags $param
+      }
+      continue
+    }
+
+    lappend makeOpts $param
+  }
+
+  # Some configurations specify -DHAVE_USLEEP=0. For all others, add
+  # -DHAVE_USLEEP=1.
+  #
+  if {[lsearch $opts "-DHAVE_USLEEP=0"]<0} {
+    lappend opts -DHAVE_USLEEP=1
+  }
+
+  if {$bMsvc==0} {
+    puts {set -e}
+    puts {}
+    puts {if [ "$#" -ne 1 ] ; then}
+    puts {  echo "Usage: $0 <sqlite-src-dir>" }
+    puts {  exit -1 }
+    puts {fi }
+    puts {SRCDIR=$1}
+    puts {}
+    puts "TCL=\"[::tcl::pkgconfig get libdir,install]\""
+
+    puts "\$SRCDIR/configure --with-tcl=\$TCL $configOpts"
+    puts {}
+    puts {OPTS="      -DSQLITE_NO_SYNC=1"}
+    foreach o $opts { 
+      puts "OPTS=\"\$OPTS $o\"" 
+    }
+    puts {}
+    puts "CFLAGS=\"$cflags\""
+    puts {}
+    puts "make $target \"CFLAGS=\$CFLAGS\" \"OPTS=\$OPTS\" $makeOpts"
+  } else {
+
+    puts {set SRCDIR=%1}
+    set makecmd    "nmake /f %SRCDIR%\\Makefile.msc TOP=%SRCDIR% $target "
+    append makecmd "\"CFLAGS=$cflags\" \"OPTS=$opts\" $makeOpts"
+
+    puts "set TMP=%CD%"
+    puts $makecmd
+  }
+}
+
+proc main_trscript {args} {
+  set bMsvc 0
+  set nArg [llength $args]
+  if {$nArg==3} {
+    if {![is_prefix [lindex $args 0] -msvc 2]} usage
+    set bMsvc 1
+  } elseif {$nArg<2 || $nArg>3} {
+    usage
+  }
+  set config [lindex $args end-1]
+  set srcdir [lindex $args end]
+
+  set opts       [list]                         ;# OPTS value
+  set cflags     [expr {$bMsvc ? "-Zi" : "-g"}] ;# CFLAGS value
+  set makeOpts   [list]                         ;# Extra args for [make]
+  set configOpts [list]                         ;# Extra args for [configure]
+
+  if {$::tcl_platform(platform)=="windows" || $bMsvc} {
+    lappend opts -DSQLITE_OS_WIN=1
+  } else {
+    lappend opts -DSQLITE_OS_UNIX=1
+  }
+
+  # Figure out if this is a synthetic ndebug or debug configuration.
+  #
+  set bRemoveDebug 0
+  if {[string match *-ndebug $config]} {
+    set bRemoveDebug 1
+    set config [string range $config 0 end-7]
+  }
+  if {[string match *-debug $config]} {
+    lappend opts -DSQLITE_DEBUG
+    lappend opts -DSQLITE_EXTRA_IFNULLROW
+    set config [string range $config 0 end-6]
+  }
+  regexp {^(.*)-[0-9]+} $config -> config
+
+  # Ensure that the named configuration exists.
+  #
+  if {![info exists ::Configs($config)]} {
+    puts stderr "No such config: $config"
+    exit 1
+  }
+
+  # Loop through the parameters of the nominated configuration, updating
+  # $opts, $cflags, $makeOpts and $configOpts along the way. Rules are as
+  # follows:
+  #
+  #   1. If the parameter begins with a "*", discard it.
+  #
+  #   2. If $bRemoveDebug is set and the parameter is -DSQLITE_DEBUG or
+  #      -DSQLITE_DEBUG=1, discard it
+  #
+  #   3. If the parameter begins with "-D", add it to $opts.
+  #
+  #   4. If the parameter begins with "--" add it to $configOpts. Unless
+  #      this command is preparing a script for MSVC - then add an 
+  #      equivalent to $makeOpts or $opts.
+  #
+  #   5. If the parameter begins with "-" add it to $cflags. If in MSVC
+  #      mode and the parameter is an -O<integer> option, instead add
+  #      an OPTIMIZATIONS=<integer> switch to $makeOpts.
+  #
+  #   6. If none of the above apply, add the parameter to $makeOpts
+  #
+  foreach param $::Configs($config) {
+    if {[string range $param 0 0]=="*"} continue
+
+    if {$bRemoveDebug} {
+      if {$param=="-DSQLITE_DEBUG" || $param=="-DSQLITE_DEBUG=1"
+       || $param=="-DSQLITE_MEMDEBUG" || $param=="-DSQLITE_MEMDEBUG=1"
+       || $param=="--enable-debug"
+      } {
+        continue
+      }
+    }
+
+    if {[string range $param 0 1]=="-D"} {
+      lappend opts $param
+      continue
+    }
+
+    if {[string range $param 0 1]=="--"} {
+      if {$bMsvc} {
+        switch -- $param {
+          --disable-amalgamation {
+            lappend makeOpts USE_AMALGAMATION=0
+          }
+          --disable-shared {
+            lappend makeOpts USE_CRT_DLL=0 DYNAMIC_SHELL=0
+          }
+          --enable-fts5 {
+            lappend opts -DSQLITE_ENABLE_FTS5
+          } 
+          --enable-shared {
+            lappend makeOpts USE_CRT_DLL=1 DYNAMIC_SHELL=1
+          }
+          --enable-session {
+            lappend opts -DSQLITE_ENABLE_PREUPDATE_HOOK
+            lappend opts -DSQLITE_ENABLE_SESSION
+          }
+          --enable-all {
+          }
+          --enable-debug {
+            # lappend makeOpts OPTIMIZATIONS=0
+            lappend opts -DSQLITE_DEBUG
+          }
+          default {
+            error "Cannot translate $param for MSVC"
+          }
+        }
+      } else {
+        lappend configOpts $param
+      }
+
+      continue
+    }
+
+    if {[string range $param 0 0]=="-"} {
+      if {$bMsvc && [regexp -- {^-O(\d+)$} $param -> level]} {
+        lappend makeOpts OPTIMIZATIONS=$level
+      } else {
+        lappend cflags $param
+      }
+      continue
+    }
+
+    lappend makeOpts $param
+  }
+
+  # Some configurations specify -DHAVE_USLEEP=0. For all others, add
+  # -DHAVE_USLEEP=1.
+  #
+  if {[lsearch $opts "-DHAVE_USLEEP=0"]<0} {
+    lappend opts -DHAVE_USLEEP=1
+  }
+
+  if {$bMsvc==0} {
+    puts {set -e}
+    puts {}
+    puts {if [ "$#" -ne 1 ] ; then}
+    puts {  echo "Usage: $0 <target>" }
+    puts {  exit -1 }
+    puts {fi }
+    puts "SRCDIR=\"$srcdir\""
+    puts {}
+    puts "TCL=\"[::tcl::pkgconfig get libdir,install]\""
+
+    puts {if [ ! -f Makefile ] ; then}
+    puts "  \$SRCDIR/configure --with-tcl=\$TCL $configOpts"
+    puts {fi}
+    puts {}
+    if {[info exists ::env(OPTS)]} {
+      puts "# From environment variable:"
+      puts "OPTS=$::env(OPTS)"
+      puts ""
+    }
+    puts {OPTS="$OPTS -DSQLITE_NO_SYNC=1"}
+    foreach o $opts { 
+      puts "OPTS=\"\$OPTS $o\"" 
+    }
+    puts {}
+    puts "CFLAGS=\"$cflags\""
+    puts {}
+    puts "make \$1 \"CFLAGS=\$CFLAGS\" \"OPTS=\$OPTS\" $makeOpts"
+  } else {
+
+    set srcdir [file nativename [file normalize $srcdir]]
+    # set srcdir [string map [list "\\" "\\\\"] $srcdir]
+
+    puts {set TARGET=%1}
+    set makecmd    "nmake /f $srcdir\\Makefile.msc TOP=\"$srcdir\" %TARGET% "
+    append makecmd "\"CFLAGS=$cflags\" \"OPTS=$opts\" $makeOpts"
+
+    puts "set TMP=%CD%"
+    puts $makecmd
+  }
+}
+
+proc main_tests {args} {
+  set bNodebug 0
+  set nArg [llength $args]
+  if {$nArg==2} {
+    if {[is_prefix [lindex $args 0] -nodebug 2]} {
+      set bNodebug 1
+    } elseif {[is_prefix [lindex $args 0] -debug 2]} {
+      set bNodebug 0
+    } else usage
+  } elseif {$nArg==0 || $nArg>2} {
+    usage
+  }
+  set p [lindex $args end]
+  if {![info exists ::Platforms($p)]} {
+    puts stderr "No such platform: $p"
+    exit 1
+  }
+
+  set lTest [list]
+
+  foreach {config vars target} $::Platforms($p) {
+    if {[string range $config end end]=="*"} {
+      set config [string range $config 0 end-1]
+    } elseif {$bNodebug==0} {
+      set dtarget test
+      if {[lsearch $target fuzztest]<0 && [lsearch $target test]<0} {
+        set dtarget tcltest
+      }
+      if {$vars!=""} { set dtarget "$vars $dtarget" }
+
+      if {[string first SQLITE_DEBUG $::Configs($config)]>=0
+       || [string first --enable-debug $::Configs($config)]>=0
+      } {
+        lappend lTest "$config-ndebug \"$dtarget\""
+      } else {
+        lappend lTest "$config-debug \"$dtarget\""
+      }
+    }
+
+    if {[llength $target]==1 && ([string match "*TEST_FAILURE*" $vars] || (
+        [lsearch $target "valgrindtest"]<0
+     && [lsearch $target "alltest"]<0
+     && [lsearch $target "fulltestonly"]<0
+     && ![string match Sanitize* $config]
+    ))} {
+      if {$vars!=""} { set target "$vars $target" }
+      lappend lTest "$config \"$target\""
+    } else {
+      set idir -1
+      foreach t $target {
+        if {$t=="valgrindtest" || $t=="alltest" || $t=="fulltestonly"
+         || [string match Sanitize* $config]
+        } {
+          if {$vars!=""} { set t "$vars $t" }
+          for {set ii 1} {$ii<=4} {incr ii} {
+            lappend lTest "$config-[incr idir] \"TCLTEST_PART=$ii/4 $t\""
+          }
+        } else {
+          if {$vars!=""} { set t "$vars $t" }
+          lappend lTest "$config-[incr idir] \"$t\""
+        }
+      }
+    }
+  }
+
+  foreach l $lTest {
+    puts $l
+  }
+
+}
+
+if {[llength $argv]==0} { usage }
+set cmd [lindex $argv 0]
+set n [expr [llength $argv]-1]
+if {[string match ${cmd}* configurations] && $n==0} {
+  main_configurations 
+} elseif {[string match ${cmd}* script]} {
+  main_script {*}[lrange $argv 1 end]
+} elseif {[string match ${cmd}* trscript]} {
+  main_trscript {*}[lrange $argv 1 end]
+} elseif {[string match ${cmd}* platforms] && $n==0} {
+  main_platforms
+} elseif {[string match ${cmd}* tests]} {
+  main_tests {*}[lrange $argv 1 end]
+} else {
+  usage
+}

test/savepoint.test

@@ -30,6 +30,7 @@ do_test savepoint-1.1 {
     RELEASE sp1;
   }
 } {}
+wal_check_journal_mode savepoint-1.1
 do_test savepoint-1.2 {
   execsql {
     SAVEPOINT sp1;
@@ -807,7 +808,8 @@ do_test savepoint-11.6 {
 integrity_check savepoint-11.7
 do_test savepoint-11.8 {
   execsql { ROLLBACK }
-  execsql { PRAGMA wal_checkpoint }
+  db close
+  sqlite3 db test.db
   file size test.db
 } {8192}
 

test/savepoint6.test

@@ -15,6 +15,10 @@ set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
 proc sql {zSql} {
+  if {0 && $::debug_op} {
+    puts stderr "$zSql ;"
+    flush stderr
+  }
   uplevel db eval [list $zSql]
   #puts stderr "$zSql ;"
 }
@@ -67,11 +71,13 @@ proc x_to_y {x} {
 #   delete_rows XVALUES
 #
 proc savepoint {zName} {
+  if {$::debug_op} { puts stderr "savepoint $zName" ; flush stderr }
   catch { sql "SAVEPOINT $zName" }
   lappend ::lSavepoint [list $zName [array get ::aEntry]]
 }
 
 proc rollback {zName} {
+  if {$::debug_op} { puts stderr "rollback $zName" ; flush stderr }
   catch { sql "ROLLBACK TO $zName" }
   for {set i [expr {[llength $::lSavepoint]-1}]} {$i>=0} {incr i -1} {
     set zSavepoint [lindex $::lSavepoint $i 0]
@@ -89,6 +95,7 @@ proc rollback {zName} {
 }
 
 proc release {zName} {
+  if {$::debug_op} { puts stderr "release $zName" ; flush stderr }
   catch { sql "RELEASE $zName" }
   for {set i [expr {[llength $::lSavepoint]-1}]} {$i>=0} {incr i -1} {
     set zSavepoint [lindex $::lSavepoint $i 0]
@@ -104,6 +111,7 @@ proc release {zName} {
 }
 
 proc insert_rows {lX} {
+  if {$::debug_op} { puts stderr "insert_rows $lX" ; flush stderr }
   foreach x $lX {
     set y [x_to_y $x]
 
@@ -116,6 +124,7 @@ proc insert_rows {lX} {
 }
 
 proc delete_rows {lX} {
+  if {$::debug_op} { puts stderr "delete_rows $lX" ; flush stderr }
   foreach x $lX {
     # Update database [db]
     sql "DELETE FROM t1 WHERE x = $x"
@@ -164,6 +173,11 @@ proc random_integers {nRes nRange} {
 } 
 #-------------------------------------------------------------------------
 
+set ::debug_op 0
+proc debug_ops {} {
+  set ::debug_op 1
+}
+
 proc database_op {} {
   set i [expr int(rand()*2)] 
   if {$i==0} {
@@ -185,9 +199,6 @@ proc savepoint_op {} {
   set C [lindex $cmds [expr int(rand()*6)]]
   set N [lindex $names [expr int(rand()*5)]]
 
-  #puts stderr "   $C $N ;  "
-  #flush stderr
-
   $C $N
   return ok
 }

test/snapshot_up.test

@@ -27,8 +27,6 @@ if {[permutation]=="inmemory_journal"} {
   return
 }
 
-db timeout 1000
-
 do_execsql_test 1.0 {
   CREATE TABLE t1(a, b, c);
   PRAGMA journal_mode = wal;

test/tester.tcl

@@ -613,6 +613,7 @@ proc reset_db {} {
   forcedelete test.db
   forcedelete test.db-journal
   forcedelete test.db-wal
+  forcedelete test.db-wal2
   sqlite3 db ./test.db
   set ::DB [sqlite3_connection_pointer db]
   if {[info exists ::SETUP_SQL]} {
@@ -2317,17 +2318,32 @@ proc drop_all_indexes {{db db}} {
 #     Returns true if this test should be run in WAL mode. False otherwise.
 #
 proc wal_is_wal_mode {} {
-  expr {[permutation] eq "wal"}
+  if {[permutation] eq "wal"} { return 1 }
+  if {[permutation] eq "wal2"} { return 2 }
+  return 0
 }
 proc wal_set_journal_mode {{db db}} {
-  if { [wal_is_wal_mode] } {
-    $db eval "PRAGMA journal_mode = WAL"
+  switch -- [wal_is_wal_mode] {
+    0 {
+    }
+
+    1 {
+      $db eval "PRAGMA journal_mode = WAL"
+    }
+
+    2 {
+      $db eval "PRAGMA journal_mode = WAL2"
+    }
   }
 }
 proc wal_check_journal_mode {testname {db db}} {
   if { [wal_is_wal_mode] } {
     $db eval { SELECT * FROM sqlite_master }
-    do_test $testname [list $db eval "PRAGMA main.journal_mode"] {wal}
+    set expected "wal"
+    if {[wal_is_wal_mode]==2} {
+      set expected "wal2"
+    }
+    do_test $testname [list $db eval "PRAGMA main.journal_mode"] $expected
   }
 }
 

test/testrunner.tcl

@@ -425,7 +425,7 @@ for {set ii 0} {$ii < [llength $argv]} {incr ii} {
       if {$isLast} { usage }
     } elseif {($n>2 && [string match "$a*" --zipvfs]) || $a=="-z"} {
       incr ii
-      set TRG(zipvfs) [file normalize [lindex $argv $ii]]
+      set TRG(zipvfs) [lindex $argv $ii]
       if {$isLast} { usage }
     } else {
       usage